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.

1 files changed, 33 insertions, 1 deletions

diff --git a/internal/storage/db_test.go b/internal/storage/db_test.go
index 36f1644..f737096 100644
--- a/internal/storage/db_test.go
+++ b/internal/storage/db_test.go
@@ -41,7 +41,7 @@ func TestCreateTask_AndGetTask(t *testing.T) {
 			Type:         "claude",
 			Model:        "sonnet",
 			Instructions: "do it",
-			WorkingDir:   "/tmp",
+			ProjectDir:   "/tmp",
 			MaxBudgetUSD: 2.5,
 		},
 		Priority:  task.PriorityHigh,
@@ -124,6 +124,38 @@ func TestUpdateTaskState_NotFound(t *testing.T) {
 	}
 }
 
+func TestUpdateTaskState_InvalidTransition(t *testing.T) {
+	db := testDB(t)
+	now := time.Now().UTC()
+	tk := &task.Task{
+		ID:        "task-invalid",
+		Name:      "InvalidTransition",
+		Claude:    task.ClaudeConfig{Instructions: "test"},
+		Priority:  task.PriorityNormal,
+		Retry:     task.RetryConfig{MaxAttempts: 1, Backoff: "linear"},
+		Tags:      []string{},
+		DependsOn: []string{},
+		State:     task.StatePending,
+		CreatedAt: now,
+		UpdatedAt: now,
+	}
+	if err := db.CreateTask(tk); err != nil {
+		t.Fatal(err)
+	}
+
+	// PENDING → COMPLETED is not a valid transition.
+	err := db.UpdateTaskState("task-invalid", task.StateCompleted)
+	if err == nil {
+		t.Fatal("expected error for invalid state transition PENDING → COMPLETED")
+	}
+
+	// State must not have changed.
+	got, _ := db.GetTask("task-invalid")
+	if got.State != task.StatePending {
+		t.Errorf("state must remain PENDING, got %v", got.State)
+	}
+}
+
 func TestListTasks_FilterByState(t *testing.T) {
 	db := testDB(t)
 	now := time.Now().UTC()