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, 4 insertions, 4 deletions

diff --git a/internal/executor/gemini.go b/internal/executor/gemini.go
index 3cabed5..956d8b5 100644
--- a/internal/executor/gemini.go
+++ b/internal/executor/gemini.go
@@ -40,9 +40,9 @@ func (r *GeminiRunner) binaryPath() string {
 
 // Run executes a gemini <instructions> invocation, streaming output to log files.
 func (r *GeminiRunner) Run(ctx context.Context, t *task.Task, e *storage.Execution) error {
-	if t.Agent.WorkingDir != "" {
-		if _, err := os.Stat(t.Agent.WorkingDir); err != nil {
-			return fmt.Errorf("working_dir %q: %w", t.Agent.WorkingDir, err)
+	if t.Agent.ProjectDir != "" {
+		if _, err := os.Stat(t.Agent.ProjectDir); err != nil {
+			return fmt.Errorf("project_dir %q: %w", t.Agent.ProjectDir, err)
 		}
 	}
 
@@ -68,7 +68,7 @@ func (r *GeminiRunner) Run(ctx context.Context, t *task.Task, e *storage.Executi
 
 	// Gemini CLI doesn't necessarily have the same rate limiting behavior as Claude,
 	// but we'll use a similar execution pattern.
-	err := r.execOnce(ctx, args, t.Agent.WorkingDir, e)
+	err := r.execOnce(ctx, args, t.Agent.ProjectDir, e)
 	if err != nil {
 		return err
 	}