merge: pull latest from master and resolve conflicts

- Resolve conflicts in API server, CLI, and executor.
- Maintain Gemini classification and assignment logic.
- Update UI to use generic agent config and project_dir.
- Fix ProjectDir/WorkingDir inconsistencies in Gemini runner.
- All tests passing after merge.

2 files changed, 25 insertions, 3 deletions

diff --git a/internal/task/task.go b/internal/task/task.go
index c6a321d..6b240dd 100644
--- a/internal/task/task.go
+++ b/internal/task/task.go
@@ -1,6 +1,9 @@
 package task
 
-import "time"
+import (
+	"encoding/json"
+	"time"
+)
 
 type State string
 
@@ -30,7 +33,7 @@ type AgentConfig struct {
 	Model              string   `yaml:"model"               json:"model"`
 	ContextFiles       []string `yaml:"context_files"       json:"context_files"`
 	Instructions       string   `yaml:"instructions"        json:"instructions"`
-	WorkingDir         string   `yaml:"working_dir"         json:"working_dir"`
+	ProjectDir         string   `yaml:"project_dir"         json:"project_dir"`
 	MaxBudgetUSD       float64  `yaml:"max_budget_usd"      json:"max_budget_usd"`
 	PermissionMode     string   `yaml:"permission_mode"     json:"permission_mode"`
 	AllowedTools       []string `yaml:"allowed_tools"       json:"allowed_tools"`
@@ -40,6 +43,25 @@ type AgentConfig struct {
 	SkipPlanning       bool     `yaml:"skip_planning"       json:"skip_planning"`
 }
 
+// UnmarshalJSON reads project_dir with fallback to legacy working_dir.
+func (c *AgentConfig) UnmarshalJSON(data []byte) error {
+	type Alias AgentConfig
+	aux := &struct {
+		ProjectDir string `json:"project_dir"`
+		WorkingDir string `json:"working_dir"` // legacy
+		*Alias
+	}{Alias: (*Alias)(c)}
+	if err := json.Unmarshal(data, aux); err != nil {
+		return err
+	}
+	if aux.ProjectDir != "" {
+		c.ProjectDir = aux.ProjectDir
+	} else {
+		c.ProjectDir = aux.WorkingDir
+	}
+	return nil
+}
+
 type RetryConfig struct {
 	MaxAttempts int    `yaml:"max_attempts" json:"max_attempts"`
 	Backoff     string `yaml:"backoff"      json:"backoff"` // "linear", "exponential"
diff --git a/internal/task/validator_test.go b/internal/task/validator_test.go
index 5678a00..657d93f 100644
--- a/internal/task/validator_test.go
+++ b/internal/task/validator_test.go
@@ -12,7 +12,7 @@ func validTask() *Task {
 		Agent: AgentConfig{
 			Type:         "claude",
 			Instructions: "do something",
-			WorkingDir:   "/tmp",
+			ProjectDir:   "/tmp",
 		},
 		Priority: PriorityNormal,
 		Retry:    RetryConfig{MaxAttempts: 1, Backoff: "exponential"},