feat: Add orchestrator template and roles for executor and planner

- Created a new orchestrator template for Codex skill design, detailing structure and execution phases. - Introduced the executor role with responsibilities for task execution, including routing to backends and handling implementation. - Added the planner role for requirement breakdown, issue creation, and task dispatching, ensuring a structured planning process.
2026-02-28 09:23:08 +08:00 · 2026-02-16 00:17:15 +08:00
parent dc03862ca7
commit a4fff6a591
36 changed files with 4168 additions and 2589 deletions
--- a/.claude/skills/team-lifecycle/roles/coordinator.md
+++ b/.claude/skills/team-lifecycle/roles/coordinator.md
@@ -160,6 +160,43 @@ if (mode === 'spec-only' || mode === 'full-lifecycle') {

 Simple tasks can skip clarification.

+#### Execution Method Selection (impl/full-lifecycle modes)
+
+When mode includes implementation, select execution backend before team creation:
+
+```javascript
+if (mode === 'impl-only' || mode === 'full-lifecycle') {
+  const execSelection = AskUserQuestion({
+    questions: [
+      {
+        question: "选择代码执行方式:",
+        header: "Execution",
+        multiSelect: false,
+        options: [
+          { label: "Agent", description: "code-developer agent（同步，适合简单任务）" },
+          { label: "Codex", description: "Codex CLI（后台，适合复杂任务）" },
+          { label: "Gemini", description: "Gemini CLI（后台，适合分析类任务）" },
+          { label: "Auto", description: "根据任务复杂度自动选择（默认）" }
+        ]
+      },
+      {
+        question: "实现后是否进行代码审查?",
+        header: "Code Review",
+        multiSelect: false,
+        options: [
+          { label: "Skip", description: "不审查（Reviewer 角色独立负责）" },
+          { label: "Gemini Review", description: "Gemini CLI 审查" },
+          { label: "Codex Review", description: "Git-aware review（--uncommitted）" }
+        ]
+      }
+    ]
+  })
+
+  var executionMethod = execSelection.Execution || 'Auto'
+  var codeReviewTool = execSelection['Code Review'] || 'Skip'
+}
+```
+
 ### Phase 2: Create Team + Spawn Workers

 ```javascript
@@ -277,7 +314,7 @@ TaskCreate({ subject: "PLAN-001: 探索和规划实现", description: `${taskDes
 TaskUpdate({ taskId: planId, owner: "planner" })

 // IMPL-001 (blockedBy PLAN-001)
-TaskCreate({ subject: "IMPL-001: 实现已批准的计划", description: `${taskDescription}\n\nSession: ${sessionFolder}\nPlan: ${sessionFolder}/plan/plan.json`, activeForm: "实现中" })
+TaskCreate({ subject: "IMPL-001: 实现已批准的计划", description: `${taskDescription}\n\nSession: ${sessionFolder}\nPlan: ${sessionFolder}/plan/plan.json\nexecution_method: ${executionMethod || 'Auto'}\ncode_review: ${codeReviewTool || 'Skip'}`, activeForm: "实现中" })
 TaskUpdate({ taskId: implId, owner: "executor", addBlockedBy: [planId] })

 // TEST-001 (blockedBy IMPL-001)
--- a/.claude/skills/team-lifecycle/roles/executor.md
+++ b/.claude/skills/team-lifecycle/roles/executor.md
@@ -1,12 +1,12 @@
 # Role: executor

-Code implementation following approved plans. Reads plan files, implements changes, self-validates, and reports completion.
+Code implementation following approved plans. Reads plan files, routes to selected execution backend (Agent/Codex/Gemini), self-validates, and reports completion.

 ## Role Identity

 - **Name**: `executor`
 - **Task Prefix**: `IMPL-*`
- **Responsibility**: Load plan → Implement code → Self-validate → Report completion
+- **Responsibility**: Load plan → Route to backend → Implement code → Self-validate → Report completion
 - **Communication**: SendMessage to coordinator only

 ## Message Types
@@ -40,6 +40,35 @@ When `mcp__ccw-tools__team_msg` MCP is unavailable:
 Bash(`ccw team log --team "${teamName}" --from "executor" --to "coordinator" --type "impl_complete" --summary "IMPL-001 complete: 5 files changed" --json`)
 ```

+## Execution Backends
+
+| Backend | Tool | Invocation | Mode |
+|---------|------|------------|------|
+| `agent` | code-developer subagent | `Task({ subagent_type: "code-developer" })` | 同步 |
+| `codex` | Codex CLI | `ccw cli --tool codex --mode write` | 后台 |
+| `gemini` | Gemini CLI | `ccw cli --tool gemini --mode write` | 后台 |
+
+## Execution Method Resolution
+
+从 IMPL-* 任务 description 中解析执行方式（coordinator 在创建任务时已写入）:
+
+```javascript
+function resolveExecutor(taskDesc, taskCount) {
+  const methodMatch = taskDesc.match(/execution_method:\s*(Agent|Codex|Gemini|Auto)/i)
+  const method = methodMatch ? methodMatch[1] : 'Auto'
+
+  if (method.toLowerCase() === 'auto') {
+    return taskCount <= 3 ? 'agent' : 'codex'
+  }
+  return method.toLowerCase()  // 'agent' | 'codex' | 'gemini'
+}
+
+function resolveCodeReview(taskDesc) {
+  const reviewMatch = taskDesc.match(/code_review:\s*(\S+)/i)
+  return reviewMatch ? reviewMatch[1] : 'Skip'
+}
+```
+
 ## Execution (5-Phase)

 ### Phase 1: Task & Plan Loading
@@ -69,6 +98,10 @@ if (!planPath) {
 }

 const plan = JSON.parse(Read(planPath))
+
+// Resolve execution method
+const executor = resolveExecutor(task.description, plan.task_count || plan.task_ids?.length || 0)
+const codeReview = resolveCodeReview(task.description)
 ```

 ### Phase 2: Task Grouping
@@ -103,7 +136,7 @@ const planTasks = plan.task_ids.map(id => JSON.parse(Read(`${planPath.replace('p
 const batches = createBatches(planTasks)
 ```

-### Phase 3: Code Implementation
+### Phase 3: Code Implementation (Multi-Backend Routing)

 ```javascript
 // Unified Task Prompt Builder
@@ -130,33 +163,55 @@ ${(planTask.convergence?.criteria || []).map(c => `- [ ] ${c}`).join('\n')}
 `
 }

+function buildBatchPrompt(batch) {
+  const taskPrompts = batch.tasks.map(buildExecutionPrompt).join('\n\n---\n')
+  return `## Goal\n${plan.summary}\n\n## Tasks\n${taskPrompts}\n\n## Context\n### Project Guidelines\n@.workflow/project-guidelines.json\n\nComplete each task according to its "Done when" checklist.`
+}
+
 const changedFiles = []
+const sessionId = task.description.match(/TLS-[\w-]+/)?.[0] || 'lifecycle'

 for (const batch of batches) {
-  if (batch.tasks.length === 1 && isSimpleTask(batch.tasks[0])) {
-    // Simple task: direct file editing
+  const batchPrompt = buildBatchPrompt(batch)
+  const batchId = `${sessionId}-B${batches.indexOf(batch) + 1}`
+
+  if (batch.tasks.length === 1 && isSimpleTask(batch.tasks[0]) && executor === 'agent') {
+    // Simple task + Agent mode: direct file editing
    const t = batch.tasks[0]
    for (const f of (t.files || [])) {
      const content = Read(f.path)
      Edit({ file_path: f.path, old_string: "...", new_string: "..." })
      changedFiles.push(f.path)
    }
-  } else {
-    // Complex task(s): delegate to code-developer sub-agent
-    const prompt = batch.tasks.map(buildExecutionPrompt).join('\n\n---\n')
-
+  } else if (executor === 'agent') {
+    // Agent execution (synchronous)
    Task({
      subagent_type: "code-developer",
      run_in_background: false,
      description: batch.tasks.map(t => t.title).join(' | '),
-      prompt: `## Goal\n${plan.summary}\n\n## Tasks\n${prompt}\n\n## Context\n### Project Guidelines\n@.workflow/project-guidelines.json\n\nComplete each task according to its "Done when" checklist.`
+      prompt: batchPrompt
    })
-
+    batch.tasks.forEach(t => (t.files || []).forEach(f => changedFiles.push(f.path)))
+  } else if (executor === 'codex') {
+    // Codex CLI execution (background)
+    Bash(
+      `ccw cli -p "${batchPrompt}" --tool codex --mode write --id ${batchId}`,
+      { run_in_background: true }
+    )
+    // STOP — CLI 后台执行，等待 task hook callback
+    batch.tasks.forEach(t => (t.files || []).forEach(f => changedFiles.push(f.path)))
+  } else if (executor === 'gemini') {
+    // Gemini CLI execution (background)
+    Bash(
+      `ccw cli -p "${batchPrompt}" --tool gemini --mode write --id ${batchId}`,
+      { run_in_background: true }
+    )
+    // STOP — CLI 后台执行，等待 task hook callback
    batch.tasks.forEach(t => (t.files || []).forEach(f => changedFiles.push(f.path)))
  }

  // Progress update
-  mcp__ccw-tools__team_msg({ operation: "log", team: teamName, from: "executor", to: "coordinator", type: "impl_progress", summary: `Batch完成: ${changedFiles.length}个文件已变更` })
+  mcp__ccw-tools__team_msg({ operation: "log", team: teamName, from: "executor", to: "coordinator", type: "impl_progress", summary: `Batch完成 (${executor}): ${changedFiles.length}个文件已变更` })
 }

 function isSimpleTask(task) {
@@ -183,6 +238,22 @@ const testFiles = changedFiles
  .map(f => f.replace(/\/src\//, '/tests/').replace(/\.(ts|js)$/, '.test.$1'))
  .filter(f => Bash(`test -f ${f} && echo exists || true`).includes('exists'))
 if (testFiles.length > 0) Bash(`npx jest ${testFiles.join(' ')} --passWithNoTests 2>&1 || true`)
+
+// Optional: Code review (if configured by coordinator)
+if (codeReview !== 'Skip') {
+  if (codeReview === 'Gemini Review' || codeReview === 'Gemini') {
+    Bash(`ccw cli -p "PURPOSE: Code review for IMPL changes against plan convergence criteria
+TASK: • Verify convergence criteria • Check test coverage • Analyze code quality
+MODE: analysis
+CONTEXT: @**/* | Memory: Review lifecycle IMPL execution
+EXPECTED: Quality assessment with issue identification
+CONSTRAINTS: analysis=READ-ONLY" --tool gemini --mode analysis --id ${sessionId}-review`,
+      { run_in_background: true })
+  } else if (codeReview === 'Codex Review' || codeReview === 'Codex') {
+    Bash(`ccw cli --tool codex --mode review --uncommitted`,
+      { run_in_background: true })
+  }
+}
 ```

 ### Phase 5: Report to Coordinator
@@ -192,7 +263,7 @@ mcp__ccw-tools__team_msg({
  operation: "log", team: teamName,
  from: "executor", to: "coordinator",
  type: "impl_complete",
-  summary: `IMPL完成: ${[...new Set(changedFiles)].length}个文件变更, syntax=${hasSyntaxErrors ? 'errors' : 'clean'}`
+  summary: `IMPL完成 (${executor}): ${[...new Set(changedFiles)].length}个文件变更, syntax=${hasSyntaxErrors ? 'errors' : 'clean'}`
 })

 SendMessage({
@@ -201,6 +272,8 @@ SendMessage({
  content: `## Implementation Complete

 **Task**: ${task.subject}
+**Executor**: ${executor}
+**Code Review**: ${codeReview}

 ### Changed Files
 ${[...new Set(changedFiles)].map(f => '- ' + f).join('\n')}
@@ -211,9 +284,10 @@ ${acceptanceStatus.map(t => '**' + t.title + '**: ' + (t.criteria.every(c => c.m
 ### Validation
 - Syntax: ${hasSyntaxErrors ? 'Has errors (attempted fix)' : 'Clean'}
 - Tests: ${testFiles.length > 0 ? 'Ran' : 'N/A'}
+${executor !== 'agent' ? `- CLI Resume ID: ${sessionId}-B*` : ''}

 Implementation is ready for testing and review.`,
-  summary: `IMPL complete: ${[...new Set(changedFiles)].length} files changed`
+  summary: `IMPL complete (${executor}): ${[...new Set(changedFiles)].length} files changed`
 })

 TaskUpdate({ taskId: task.id, status: 'completed' })
@@ -227,8 +301,11 @@ TaskUpdate({ taskId: task.id, status: 'completed' })
 |----------|------------|
 | No IMPL-* tasks available | Idle, wait for coordinator assignment |
 | Plan file not found | Notify coordinator, request plan location |
+| Unknown execution_method | Fallback to `agent` with warning |
 | Syntax errors after implementation | Attempt auto-fix, report remaining errors |
-| Sub-agent failure | Retry once, then attempt direct implementation |
+| Agent (code-developer) failure | Retry once, then attempt direct implementation |
+| CLI (Codex/Gemini) failure | Provide resume command with fixed ID, report error |
+| CLI timeout | Use fixed ID `${sessionId}-B*` for resume |
 | File conflict / merge issue | Notify coordinator, request guidance |
 | Test failures in self-validation | Report in completion message, let tester handle |
 | Circular dependencies in plan | Execute in plan order, ignore dependency chain |