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

diff --git a/internal/api/validate.go b/internal/api/validate.go
index a3b2cf0..07d293c 100644
--- a/internal/api/validate.go
+++ b/internal/api/validate.go
@@ -48,16 +48,22 @@ func (s *Server) validateBinaryPath() string {
 	if s.validateCmdPath != "" {
 		return s.validateCmdPath
 	}
-	return s.claudeBinaryPath()
+	return s.claudeBinPath
 }
 
 func (s *Server) handleValidateTask(w http.ResponseWriter, r *http.Request) {
+	if s.elaborateLimiter != nil && !s.elaborateLimiter.allow(realIP(r)) {
+		writeJSON(w, http.StatusTooManyRequests, map[string]string{"error": "rate limit exceeded"})
+		return
+	}
+
 	var input struct {
 		Name  string `json:"name"`
 		Agent struct {
 			Type         string   `json:"type"`
 			Instructions string   `json:"instructions"`
-			WorkingDir   string   `json:"working_dir"`
+			ProjectDir   string   `json:"project_dir"`
+			WorkingDir   string   `json:"working_dir"` // legacy
 			AllowedTools []string `json:"allowed_tools"`
 		} `json:"agent"`
 	}
@@ -79,9 +85,14 @@ func (s *Server) handleValidateTask(w http.ResponseWriter, r *http.Request) {
 		agentType = "claude"
 	}
 
+	projectDir := input.Agent.ProjectDir
+	if projectDir == "" {
+		projectDir = input.Agent.WorkingDir
+	}
+
 	userMsg := fmt.Sprintf("Task name: %s\nAgent: %s\n\nInstructions:\n%s", input.Name, agentType, input.Agent.Instructions)
-	if input.Agent.WorkingDir != "" {
-		userMsg += fmt.Sprintf("\n\nWorking directory: %s", input.Agent.WorkingDir)
+	if projectDir != "" {
+		userMsg += fmt.Sprintf("\n\nWorking directory: %s", projectDir)
 	}
 	if len(input.Agent.AllowedTools) > 0 {
 		userMsg += fmt.Sprintf("\n\nAllowed tools: %v", input.Agent.AllowedTools)