Rename workflow-lite-planex to workflow-lite-plan across documentation and code references for consistency and clarity. Update related examples, command references, and workflow comparisons to reflect the new naming convention.

2026-03-06 16:31:12 +08:00 · 2026-03-05 21:14:52 +08:00
parent cff1e16441
commit 56c06ecf3d
66 changed files with 795 additions and 877 deletions
--- a/.claude/commands/ccw-coordinator.md
+++ b/.claude/commands/ccw-coordinator.md
@@ -17,7 +17,8 @@ Interactive orchestration tool: analyze task → discover commands → recommend

 | Skill | 包含操作 |
 |-------|---------|
-| `workflow-lite-planex` | lite-plan (includes execution phase internally) |
+| `workflow-lite-plan` | lite-plan (Skill handoff to lite-execute) |
+| `workflow-lite-execute` | lite-execute (multi-mode execution engine) |
 | `workflow-plan` | plan, plan-verify, replan |
 | `workflow-execute` | execute |
 | `workflow-multi-cli-plan` | multi-cli-plan (includes execution phase internally) |
@@ -547,7 +548,7 @@ Pipeline (管道视图):
 需求 → lite-plan → 代码 → test-cycle-execute → 测试通过

 Commands (命令列表):
-1. /workflow-lite-planex
+1. /workflow-lite-plan
 2. /workflow-test-fix

 Proceed? [Confirm / Show Details / Adjust / Cancel]
@@ -851,7 +852,7 @@ workflow 操作通过 `Skill()` 调用对应的 Skill。

 ```javascript
 // Skill 调用方式
-Skill({ skill: 'workflow-lite-planex', args: '"task description"' });
+Skill({ skill: 'workflow-lite-plan', args: '"task description"' });
 Skill({ skill: 'workflow-execute', args: '--resume-session="WFS-xxx"' });
 Skill({ skill: 'brainstorm', args: '"exploration topic"' });
 Skill({ skill: 'spec-generator', args: '"product specification"' });
@@ -904,7 +905,8 @@ Task: <description>

 | Skill | 包含操作 |
 |-------|---------|
-| `workflow-lite-planex` | lite-plan (includes execution phase internally) |
+| `workflow-lite-plan` | lite-plan (Skill handoff to lite-execute) |
+| `workflow-lite-execute` | lite-execute (multi-mode execution engine) |
 | `workflow-plan` | plan, plan-verify, replan |
 | `workflow-execute` | execute |
 | `workflow-multi-cli-plan` | multi-cli-plan (includes execution phase internally) |
--- a/.claude/commands/ccw.md
+++ b/.claude/commands/ccw.md
@@ -15,7 +15,8 @@ Main process orchestrator: intent analysis → workflow selection → command ch

 | Skill | 内部流水线 |
 |-------|-----------|
-| `workflow-lite-planex` | explore → plan → confirm → execute |
+| `workflow-lite-plan` | explore → plan → confirm → handoff |
+| `workflow-lite-execute` | task grouping → batch execution → code review → sync |
 | `workflow-plan` | session → context → convention → gen → verify/replan |
 | `workflow-execute` | session discovery → task processing → commit |
 | `workflow-tdd-plan` | 6-phase TDD plan → verify |
@@ -43,14 +44,14 @@ Main process orchestrator: intent analysis → workflow selection → command ch

 | 单元类型 | Skill | 说明 |
 |---------|-------|------|
-| 轻量 Plan+Execute | `workflow-lite-planex` | 内部完成 plan→execute |
+| 轻量 Plan+Execute | `workflow-lite-plan` → `workflow-lite-execute` | plan handoff 到 execute，分离 Skill，TodoWrite 跟踪延续 (LP-Phase → LE-Phase) |
 | 标准 Planning | `workflow-plan` → `workflow-execute` | plan 和 execute 是独立 Skill |
 | TDD Planning | `workflow-tdd-plan` → `workflow-execute` | tdd-plan 和 execute 是独立 Skill |
 | 规格驱动 | `spec-generator` → `workflow-plan` → `workflow-execute` | 规格文档驱动完整开发 |
 | 测试流水线 | `workflow-test-fix` | 内部完成 gen→cycle |
 | 代码审查 | `review-cycle` | 内部完成 review→fix |
-| 多CLI协作 | `workflow-multi-cli-plan` | ACE context → CLI discussion → plan → execute |
-| 分析→规划 | `workflow:analyze-with-file` → `workflow-lite-planex` | 协作分析产物自动传递给 lite-plan |
+| 多CLI协作 | `workflow-multi-cli-plan` | ACE context → CLI discussion → plan → Skill(lite-execute) |
+| 分析→规划 | `workflow:analyze-with-file` → `workflow-lite-plan` → `workflow-lite-execute` | 协作分析产物自动传递给 lite-plan，Skill 调用 lite-execute |
 | 头脑风暴→规划 | `workflow:brainstorm-with-file` → `workflow-plan` → `workflow-execute` | 头脑风暴产物自动传递给正式规划 |
 | 0→1 开发(小) | `workflow:brainstorm-with-file` → `workflow-plan` → `workflow-execute` | 小规模从零开始，探索+正式规划+实现 |
 | 0→1 开发(中/大) | `workflow:brainstorm-with-file` → `workflow-plan` → `workflow-execute` | 探索后正式规划+执行 |
@@ -231,7 +232,7 @@ function buildCommandChain(workflow, analysis) {
  const chains = {
    // Level 2 - Lightweight
    'rapid': [
-      { cmd: 'workflow-lite-planex', args: `"${analysis.goal}"` },
+      { cmd: 'workflow-lite-plan', args: `"${analysis.goal}"` },
      ...(analysis.constraints?.includes('skip-tests') ? [] : [
        { cmd: 'workflow-test-fix', args: '' }
      ])
@@ -239,21 +240,21 @@ function buildCommandChain(workflow, analysis) {

    // Level 2 Bridge - Lightweight to Issue Workflow
    'rapid-to-issue': [
-      { cmd: 'workflow-lite-planex', args: `"${analysis.goal}" --plan-only` },
+      { cmd: 'workflow-lite-plan', args: `"${analysis.goal}" --plan-only` },
      { cmd: 'issue:convert-to-plan', args: '--latest-lite-plan -y' },
      { cmd: 'issue:queue', args: '' },
      { cmd: 'issue:execute', args: '--queue auto' }
    ],

    'bugfix.standard': [
-      { cmd: 'workflow-lite-planex', args: `--bugfix "${analysis.goal}"` },
+      { cmd: 'workflow-lite-plan', args: `--bugfix "${analysis.goal}"` },
      ...(analysis.constraints?.includes('skip-tests') ? [] : [
        { cmd: 'workflow-test-fix', args: '' }
      ])
    ],

    'bugfix.hotfix': [
-      { cmd: 'workflow-lite-planex', args: `--hotfix "${analysis.goal}"` }
+      { cmd: 'workflow-lite-plan', args: `--hotfix "${analysis.goal}"` }
    ],

    'multi-cli-plan': [
@@ -264,13 +265,13 @@ function buildCommandChain(workflow, analysis) {
    ],

    'docs': [
-      { cmd: 'workflow-lite-planex', args: `"${analysis.goal}"` }
+      { cmd: 'workflow-lite-plan', args: `"${analysis.goal}"` }
    ],

    // With-File → Auto Chain to lite-plan
    'analyze-to-plan': [
      { cmd: 'workflow:analyze-with-file', args: `"${analysis.goal}"` },
-      { cmd: 'workflow-lite-planex', args: '' }  // auto receives analysis artifacts (discussion.md)
+      { cmd: 'workflow-lite-plan', args: '' }  // auto receives analysis artifacts (discussion.md)
    ],

    'brainstorm-to-plan': [
@@ -476,7 +477,7 @@ function setupTodoTracking(chain, workflow, analysis) {
 ```

 **Output**:
- TODO: `-> CCW:rapid: [1/2] workflow-lite-planex | CCW:rapid: [2/2] workflow-test-fix | ...`
+- TODO: `-> CCW:rapid: [1/2] workflow-lite-plan | CCW:rapid: [2/2] workflow-test-fix | ...`
 - Status File: `.workflow/.ccw/{session_id}/status.json`

 ---
@@ -628,10 +629,10 @@ Phase 5: Execute Command Chain

 | Input | Type | Level | Pipeline |
 |-------|------|-------|----------|
-| "Add API endpoint" | feature (low) | 2 | workflow-lite-planex → workflow-test-fix |
-| "Fix login timeout" | bugfix | 2 | workflow-lite-planex → workflow-test-fix |
-| "Use issue workflow" | issue-transition | 2.5 | workflow-lite-planex(plan-only) → convert-to-plan → queue → execute |
-| "协作分析: 认证架构" | analyze-file | 3 | analyze-with-file → workflow-lite-planex |
+| "Add API endpoint" | feature (low) | 2 | workflow-lite-plan → workflow-test-fix |
+| "Fix login timeout" | bugfix | 2 | workflow-lite-plan → workflow-test-fix |
+| "Use issue workflow" | issue-transition | 2.5 | workflow-lite-plan(plan-only) → convert-to-plan → queue → execute |
+| "协作分析: 认证架构" | analyze-file | 3 | analyze-with-file → workflow-lite-plan |
 | "深度调试 WebSocket" | debug-file | 3 | workflow:debug-with-file |
 | "从零开始: 用户系统" | greenfield (medium) | 3 | brainstorm-with-file → workflow-plan → workflow-execute → workflow-test-fix |
 | "greenfield: 大型平台" | greenfield (high) | 4 | brainstorm-with-file → workflow-plan → workflow-execute → review-cycle → workflow-test-fix |
@@ -673,13 +674,13 @@ Phase 5: Execute Command Chain
 ```javascript
 // Initial state (rapid workflow: 2 steps)
 todos = [
-  { content: "CCW:rapid: [1/2] workflow-lite-planex", status: "in_progress" },
+  { content: "CCW:rapid: [1/2] workflow-lite-plan", status: "in_progress" },
  { content: "CCW:rapid: [2/2] workflow-test-fix", status: "pending" }
 ];

 // After step 1 completes
 todos = [
-  { content: "CCW:rapid: [1/2] workflow-lite-planex", status: "completed" },
+  { content: "CCW:rapid: [1/2] workflow-lite-plan", status: "completed" },
  { content: "CCW:rapid: [2/2] workflow-test-fix", status: "in_progress" }
 ];
 ```
@@ -704,7 +705,7 @@ todos = [
    "complexity": "medium"
  },
  "command_chain": [
-    { "index": 0, "command": "workflow-lite-planex", "status": "completed" },
+    { "index": 0, "command": "workflow-lite-plan", "status": "completed" },
    { "index": 1, "command": "workflow-test-fix", "status": "running" }
  ],
  "current_index": 1
@@ -724,11 +725,11 @@ todos = [
 |----------|---------|------------|---------------|
 | **brainstorm-with-file** | Multi-perspective ideation | → workflow-plan → workflow-execute (auto) | `.workflow/.brainstorm/` |
 | **debug-with-file** | Hypothesis-driven debugging | Standalone (self-contained) | `.workflow/.debug/` |
-| **analyze-with-file** | Collaborative analysis | → workflow-lite-planex (auto) | `.workflow/.analysis/` |
+| **analyze-with-file** | Collaborative analysis | → workflow-lite-plan → workflow-lite-execute (auto) | `.workflow/.analysis/` |
 | **collaborative-plan-with-file** | Multi-agent collaborative planning | → unified-execute-with-file | `.workflow/.planning/` |
 | **roadmap-with-file** | Strategic requirement roadmap | → team-planex | `.workflow/.planning/` |

-**Auto Chain Mechanism**: When `analyze-with-file` completes, its artifacts (discussion.md) are automatically passed to `workflow-lite-planex`. When `brainstorm-with-file` completes, its artifacts (brainstorm.md) are passed to `workflow-plan` for formal planning. No user intervention needed.
+**Auto Chain Mechanism**: When `analyze-with-file` completes, its artifacts (discussion.md) are automatically passed to `workflow-lite-plan`. When `brainstorm-with-file` completes, its artifacts (brainstorm.md) are passed to `workflow-plan` for formal planning. No user intervention needed.

 **Detection Keywords**:
 - **brainstorm**: 头脑风暴, 创意, 发散思维, multi-perspective, compare perspectives
@@ -793,7 +794,7 @@ todos = [
 /ccw "全新开发: 实时通知系统"                   # → brainstorm-with-file → workflow-plan → workflow-execute → review-cycle → workflow-test-fix

 # With-File workflows → auto chain
-/ccw "协作分析: 理解现有认证架构的设计决策"     # → analyze-with-file → workflow-lite-planex
+/ccw "协作分析: 理解现有认证架构的设计决策"     # → analyze-with-file → workflow-lite-plan → workflow-lite-execute
 /ccw "头脑风暴: 用户通知系统重新设计"           # → brainstorm-with-file → workflow-plan → workflow-execute → workflow-test-fix
 /ccw "深度调试: 系统随机崩溃问题"              # → debug-with-file (standalone)
 /ccw "从头脑风暴 BS-通知系统-2025-01-28 创建 issue"  # → brainstorm-to-issue (bridge)
--- a/.claude/commands/cli/cli-init.md
+++ b/.claude/commands/cli/cli-init.md
@@ -378,7 +378,7 @@ docker-compose.override.yml
 ## Integration Points

 ### Workflow Commands
- **After `workflow-lite-planex` skill**: Suggest running cli-init for better analysis
+- **After `workflow-lite-plan` skill**: Suggest running cli-init for better analysis
 - **Before analysis**: Recommend updating ignore patterns for cleaner results

 ### CLI Tool Integration
--- a/.claude/commands/flow-create.md
+++ b/.claude/commands/flow-create.md
@@ -107,7 +107,7 @@ async function selectCommandCategory() {
 async function selectCommand(category) {
  const commandOptions = {
    'Planning': [
-      { label: "/workflow-lite-planex", description: "Lightweight merged-mode planning" },
+      { label: "/workflow-lite-plan", description: "Lightweight merged-mode planning" },
      { label: "/workflow-plan", description: "Full planning with architecture design" },
      { label: "/workflow-multi-cli-plan", description: "Multi-CLI collaborative planning (Gemini+Codex+Claude)" },
      { label: "/workflow-tdd-plan", description: "TDD workflow planning with Red-Green-Refactor" },
@@ -132,7 +132,7 @@ async function selectCommand(category) {
      { label: "/workflow:review", description: "Post-implementation review" }
    ],
    'Bug Fix': [
-      { label: "/workflow-lite-planex", description: "Lightweight bug diagnosis and fix (with --bugfix flag)" },
+      { label: "/workflow-lite-plan", description: "Lightweight bug diagnosis and fix (with --bugfix flag)" },
      { label: "/workflow:debug-with-file", description: "Hypothesis-driven debugging with documentation" }
    ],
    'Brainstorm': [
@@ -302,7 +302,7 @@ async function defineSteps(templateDesign) {
  "description": "Quick implementation with testing",
  "level": 2,
  "steps": [
-    { "cmd": "/workflow-lite-planex", "args": "\"{{goal}}\"", "unit": "quick-implementation", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Create lightweight implementation plan (includes execution)" },
+    { "cmd": "/workflow-lite-plan", "args": "\"{{goal}}\"", "unit": "quick-implementation", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Create lightweight implementation plan (includes execution)" },
    { "cmd": "/workflow-test-fix", "unit": "test-validation", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Generate test tasks" },
    { "cmd": "/workflow-test-fix", "unit": "test-validation", "execution": { "type": "slash-command", "mode": "async" }, "contextHint": "Execute test-fix cycle until pass rate >= 95%" }
  ]
@@ -334,7 +334,7 @@ async function defineSteps(templateDesign) {
  "description": "Bug diagnosis and fix with testing",
  "level": 2,
  "steps": [
-    { "cmd": "/workflow-lite-planex", "args": "--bugfix \"{{goal}}\"", "unit": "bug-fix", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Diagnose, plan, and execute bug fix" },
+    { "cmd": "/workflow-lite-plan", "args": "--bugfix \"{{goal}}\"", "unit": "bug-fix", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Diagnose, plan, and execute bug fix" },
    { "cmd": "/workflow-test-fix", "unit": "test-validation", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Generate regression tests" },
    { "cmd": "/workflow-test-fix", "unit": "test-validation", "execution": { "type": "slash-command", "mode": "async" }, "contextHint": "Verify fix with tests" }
  ]
@@ -348,7 +348,7 @@ async function defineSteps(templateDesign) {
  "description": "Urgent production bug fix (no tests)",
  "level": 2,
  "steps": [
-    { "cmd": "/workflow-lite-planex", "args": "--hotfix \"{{goal}}\"", "unit": "standalone", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Emergency hotfix mode" }
+    { "cmd": "/workflow-lite-plan", "args": "--hotfix \"{{goal}}\"", "unit": "standalone", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Emergency hotfix mode" }
  ]
 }
 ```
@@ -417,7 +417,7 @@ async function defineSteps(templateDesign) {
  "description": "Bridge lightweight planning to issue workflow",
  "level": 2,
  "steps": [
-    { "cmd": "/workflow-lite-planex", "args": "\"{{goal}}\"", "unit": "rapid-to-issue", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Create lightweight plan" },
+    { "cmd": "/workflow-lite-plan", "args": "\"{{goal}}\"", "unit": "rapid-to-issue", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Create lightweight plan" },
    { "cmd": "/issue:convert-to-plan", "args": "--latest-lite-plan -y", "unit": "rapid-to-issue", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Convert to issue plan" },
    { "cmd": "/issue:queue", "unit": "rapid-to-issue", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Form execution queue" },
    { "cmd": "/issue:execute", "args": "--queue auto", "unit": "rapid-to-issue", "execution": { "type": "slash-command", "mode": "async" }, "contextHint": "Execute issue queue" }
--- a/.claude/commands/idaw/resume.md
+++ b/.claude/commands/idaw/resume.md
@@ -15,16 +15,16 @@ When `--yes` or `-y`: Auto-skip interrupted task, continue with remaining.

 ```javascript
 const SKILL_CHAIN_MAP = {
-  'bugfix':          ['workflow-lite-planex', 'workflow-test-fix'],
-  'bugfix-hotfix':   ['workflow-lite-planex'],
-  'feature':         ['workflow-lite-planex', 'workflow-test-fix'],
+  'bugfix':          ['workflow-lite-plan', 'workflow-test-fix'],
+  'bugfix-hotfix':   ['workflow-lite-plan'],
+  'feature':         ['workflow-lite-plan', 'workflow-test-fix'],
  'feature-complex': ['workflow-plan', 'workflow-execute', 'workflow-test-fix'],
  'refactor':        ['workflow:refactor-cycle'],
  'tdd':             ['workflow-tdd-plan', 'workflow-execute'],
  'test':            ['workflow-test-fix'],
  'test-fix':        ['workflow-test-fix'],
  'review':          ['review-cycle'],
-  'docs':            ['workflow-lite-planex']
+  'docs':            ['workflow-lite-plan']
 };
 ```

--- a/.claude/commands/idaw/run-coordinate.md
+++ b/.claude/commands/idaw/run-coordinate.md
@@ -26,16 +26,16 @@ Coordinator variant of `/idaw:run`: external CLI execution with background tasks

 ```javascript
 const SKILL_CHAIN_MAP = {
-  'bugfix':          ['workflow-lite-planex', 'workflow-test-fix'],
-  'bugfix-hotfix':   ['workflow-lite-planex'],
-  'feature':         ['workflow-lite-planex', 'workflow-test-fix'],
+  'bugfix':          ['workflow-lite-plan', 'workflow-test-fix'],
+  'bugfix-hotfix':   ['workflow-lite-plan'],
+  'feature':         ['workflow-lite-plan', 'workflow-test-fix'],
  'feature-complex': ['workflow-plan', 'workflow-execute', 'workflow-test-fix'],
  'refactor':        ['workflow:refactor-cycle'],
  'tdd':             ['workflow-tdd-plan', 'workflow-execute'],
  'test':            ['workflow-test-fix'],
  'test-fix':        ['workflow-test-fix'],
  'review':          ['review-cycle'],
-  'docs':            ['workflow-lite-planex']
+  'docs':            ['workflow-lite-plan']
 };
 ```

@@ -472,11 +472,11 @@ function assembleCliPrompt(skillName, task, previousResult, autoYes) {
  const yFlag = autoYes ? ' -y' : '';

  // Map skill to command invocation
-  if (skillName === 'workflow-lite-planex') {
+  if (skillName === 'workflow-lite-plan') {
    const goal = sanitize(`${task.title}\n${task.description}`);
-    prompt = `/workflow-lite-planex${yFlag} "${goal}"`;
-    if (task.task_type === 'bugfix') prompt = `/workflow-lite-planex${yFlag} --bugfix "${goal}"`;
-    if (task.task_type === 'bugfix-hotfix') prompt = `/workflow-lite-planex${yFlag} --hotfix "${goal}"`;
+    prompt = `/workflow-lite-plan${yFlag} "${goal}"`;
+    if (task.task_type === 'bugfix') prompt = `/workflow-lite-plan${yFlag} --bugfix "${goal}"`;
+    if (task.task_type === 'bugfix-hotfix') prompt = `/workflow-lite-plan${yFlag} --hotfix "${goal}"`;

  } else if (skillName === 'workflow-plan') {
    prompt = `/workflow-plan${yFlag} "${sanitize(task.title)}"`;
@@ -608,8 +608,8 @@ Phase 5: handleStepCompletion()
    {
      "task_id": "IDAW-001",
      "skill_index": 0,
-      "skill": "workflow-lite-planex",
-      "prompt": "/workflow-lite-planex -y \"Fix login timeout\"",
+      "skill": "workflow-lite-plan",
+      "prompt": "/workflow-lite-plan -y \"Fix login timeout\"",
      "timestamp": "ISO"
    }
  ]
--- a/.claude/commands/idaw/run.md
+++ b/.claude/commands/idaw/run.md
@@ -15,16 +15,16 @@ When `--yes` or `-y`: Skip all confirmations, auto-skip on failure, proceed with

 ```javascript
 const SKILL_CHAIN_MAP = {
-  'bugfix':          ['workflow-lite-planex', 'workflow-test-fix'],
-  'bugfix-hotfix':   ['workflow-lite-planex'],
-  'feature':         ['workflow-lite-planex', 'workflow-test-fix'],
+  'bugfix':          ['workflow-lite-plan', 'workflow-test-fix'],
+  'bugfix-hotfix':   ['workflow-lite-plan'],
+  'feature':         ['workflow-lite-plan', 'workflow-test-fix'],
  'feature-complex': ['workflow-plan', 'workflow-execute', 'workflow-test-fix'],
  'refactor':        ['workflow:refactor-cycle'],
  'tdd':             ['workflow-tdd-plan', 'workflow-execute'],
  'test':            ['workflow-test-fix'],
  'test-fix':        ['workflow-test-fix'],
  'review':          ['review-cycle'],
-  'docs':            ['workflow-lite-planex']
+  'docs':            ['workflow-lite-plan']
 };
 ```

--- a/.claude/commands/workflow/analyze-with-file.md
+++ b/.claude/commands/workflow/analyze-with-file.md
@@ -611,8 +611,8 @@ ${conclusions.open_questions.length > 0 ? `\n**Open Questions**:\n${conclusions.
 5. **Post-Completion Options** (⚠️ TERMINAL — analyze-with-file ends after user selection)

   > **WORKFLOW BOUNDARY**: After user selects any option below, the analyze-with-file workflow is **COMPLETE**.
-   > If "执行任务" is selected, workflow-lite-planex takes over exclusively — do NOT return to any analyze-with-file phase.
-   > The "Phase" numbers in workflow-lite-planex (LP-Phase 1-5) are SEPARATE from analyze-with-file phases.
+   > If "执行任务" is selected, workflow-lite-plan takes over exclusively — do NOT return to any analyze-with-file phase.
+   > The "Phase" numbers in workflow-lite-plan (LP-Phase 1-5) are SEPARATE from analyze-with-file phases.

   ```javascript
   const hasActionableRecs = conclusions.recommendations?.some(r => r.priority === 'high' || r.priority === 'medium')
@@ -623,7 +623,7 @@ ${conclusions.open_questions.length > 0 ? `\n**Open Questions**:\n${conclusions.
       header: "Next Step",
       multiSelect: false,
       options: [
-         { label: hasActionableRecs ? "执行任务 (Recommended)" : "执行任务", description: "Launch workflow-lite-planex to plan & execute" },
+         { label: hasActionableRecs ? "执行任务 (Recommended)" : "执行任务", description: "Launch workflow-lite-plan to plan & execute" },
         { label: "产出Issue", description: "Launch issue-discover with conclusions" },
         { label: "完成", description: "No further action" }
       ]
@@ -665,7 +665,7 @@ DO NOT reference any analyze-with-file phase instructions beyond this point.
 `)

     // 4. Hand off to lite-plan — analyze-with-file COMPLETE, do NOT return to any analyze phase
-     Skill(skill="workflow-lite-planex", args=`"${taskDescription}\n\n${contextLines.join('\n')}"`)
+     Skill(skill="workflow-lite-plan", args=`"${taskDescription}\n\n${contextLines.join('\n')}"`)
     return  // ⛔ analyze-with-file terminates here
   }
   ```
@@ -845,7 +845,7 @@ User agrees with current direction, wants deeper code analysis
 - Quick information gathering without multi-round iteration
 - Follow-up analysis building on existing session

-**Use `Skill(skill="workflow-lite-planex", args="\"task description\"")` when:**
+**Use `Skill(skill="workflow-lite-plan", args="\"task description\"")` when:**
 - Ready to implement (past analysis phase)
 - Need simple task breakdown
 - Focus on quick execution planning
--- a/.claude/commands/workflow/brainstorm-with-file.md
+++ b/.claude/commands/workflow/brainstorm-with-file.md
@@ -769,7 +769,7 @@ See full markdown template in original file (lines 955-1161).
 - Want shared collaborative planning document
 - Need structured task breakdown with agent coordination

-**Use `Skill(skill="workflow-lite-planex", args="\"task description\"")` when:**
+**Use `Skill(skill="workflow-lite-plan", args="\"task description\"")` when:**
 - Direction is already clear
 - Ready to move from ideas to execution
 - Need simple implementation breakdown
--- a/.claude/commands/workflow/debug-with-file.md
+++ b/.claude/commands/workflow/debug-with-file.md
@@ -651,6 +651,6 @@ if (autoYes) {
 | Empty debug.log | Verify reproduction triggered the code path |
 | All hypotheses rejected | Use Gemini to generate new hypotheses based on disproven assumptions |
 | Fix doesn't work | Document failed fix attempt, iterate with refined understanding |
-| >5 iterations | Review consolidated understanding, escalate to `workflow-lite-planex` skill with full context |
+| >5 iterations | Review consolidated understanding, escalate to `workflow-lite-plan` skill with full context |
 | Gemini unavailable | Fallback to manual hypothesis generation, document without Gemini insights |
 | Understanding too long | Consolidate aggressively, archive old iterations to separate file |
--- a/.claude/commands/workflow/refactor-cycle.md
+++ b/.claude/commands/workflow/refactor-cycle.md
@@ -827,7 +827,7 @@ AskUserQuestion({
 - Need regression-safe iterative refactoring with rollback
 - Want documented reasoning for each refactoring decision

-**Use `workflow-lite-planex` skill when:**
+**Use `workflow-lite-plan` skill when:**
 - Single specific bug or issue to fix
 - No systematic debt analysis needed

--- a/.claude/commands/workflow/roadmap-with-file.md
+++ b/.claude/commands/workflow/roadmap-with-file.md
@@ -534,10 +534,10 @@ ${selectedMode === 'progressive' ? `**Progressive Mode**:
 | Scenario | Recommended Command |
 |----------|-------------------|
 | Strategic planning, need issue tracking | `/workflow:roadmap-with-file` |
-| Quick task breakdown, immediate execution | `/workflow-lite-planex` |
+| Quick task breakdown, immediate execution | `/workflow-lite-plan` |
 | Collaborative multi-agent planning | `/workflow:collaborative-plan-with-file` |
 | Full specification documents | `spec-generator` skill |
-| Code implementation from existing plan | `/workflow-lite-planex` (Phase 1: plan → Phase 2: execute) |
+| Code implementation from existing plan | `/workflow-lite-plan` (Phase 1: plan → Phase 2: execute) |

 ---

--- a/.claude/scripts/cleanup-ghost-commands.mjs
+++ b/.claude/scripts/cleanup-ghost-commands.mjs
@@ -45,9 +45,9 @@ const COMMAND_TO_SKILL_MAP = {
  // workflow commands → skills
  '/workflow-plan': 'workflow-plan',
  '/workflow-execute': 'workflow-execute',
-  '/workflow-lite-planex': 'workflow-lite-planex',
-  '/workflow:lite-execute': 'workflow-lite-planex',  // lite-execute is part of lite-plan skill
-  '/workflow:lite-fix': 'workflow-lite-planex',       // lite-fix is part of lite-plan skill
+  '/workflow-lite-plan': 'workflow-lite-plan',
+  '/workflow:lite-execute': 'workflow-lite-plan',  // lite-execute is part of lite-plan skill
+  '/workflow:lite-fix': 'workflow-lite-plan',       // lite-fix is part of lite-plan skill
  '/workflow-multi-cli-plan': 'workflow-multi-cli-plan',
  '/workflow-plan-verify': 'workflow-plan',          // plan-verify is a phase of workflow-plan
  '/workflow:replan': 'workflow-plan',               // replan is a phase of workflow-plan
@@ -87,7 +87,7 @@ const COMMAND_TO_SKILL_MAP = {
  // general commands
  '/ccw-debug': null,  // deleted, no replacement
  '/ccw view': null,   // deleted, no replacement
-  '/workflow:lite-lite-lite': 'workflow-lite-planex',
+  '/workflow:lite-lite-lite': 'workflow-lite-plan',
  // ui-design (these still exist as commands)
  '/workflow:ui-design:auto': '/workflow:ui-design:explore-auto',
  '/workflow:ui-design:update': '/workflow:ui-design:generate',
@@ -302,8 +302,8 @@ function fixBrokenReferences() {
      "skill='compact'": "skill='memory-capture'",
      'skill="workflow:brainstorm:role-analysis"': 'skill="brainstorm"',
      "skill='workflow:brainstorm:role-analysis'": "skill='brainstorm'",
-      'skill="workflow:lite-execute"': 'skill="workflow-lite-planex"',
-      "skill='workflow:lite-execute'": "skill='workflow-lite-planex'",
+      'skill="workflow:lite-execute"': 'skill="workflow-lite-plan"',
+      "skill='workflow:lite-execute'": "skill='workflow-lite-plan'",
    };

    for (const [oldCall, newCall] of Object.entries(skillCallFixes)) {
@@ -321,8 +321,8 @@ function fixBrokenReferences() {
    const proseRefFixes = {
      '`/workflow-plan`': '`workflow-plan` skill',
      '`/workflow-execute`': '`workflow-execute` skill',
-      '`/workflow:lite-execute`': '`workflow-lite-planex` skill',
-      '`/workflow:lite-fix`': '`workflow-lite-planex` skill',
+      '`/workflow:lite-execute`': '`workflow-lite-plan` skill',
+      '`/workflow:lite-fix`': '`workflow-lite-plan` skill',
      '`/workflow-plan-verify`': '`workflow-plan` skill (plan-verify phase)',
      '`/workflow:replan`': '`workflow-plan` skill (replan phase)',
      '`/workflow-tdd-plan`': '`workflow-tdd-plan` skill',
@@ -347,8 +347,8 @@ function fixBrokenReferences() {
      '`/workflow:ui-design:auto`': '`/workflow:ui-design:explore-auto`',
      '`/workflow:ui-design:update`': '`/workflow:ui-design:generate`',
      '`/workflow-multi-cli-plan`': '`workflow-multi-cli-plan` skill',
-      '`/workflow-lite-planex`': '`workflow-lite-planex` skill',
-      '`/cli:plan`': '`workflow-lite-planex` skill',
+      '`/workflow-lite-plan`': '`workflow-lite-plan` skill',
+      '`/cli:plan`': '`workflow-lite-plan` skill',
      '`/test-cycle-execute`': '`workflow-test-fix` skill',
    };

--- a/.claude/skills/ccw-help/SKILL.md
+++ b/.claude/skills/ccw-help/SKILL.md
@@ -77,7 +77,7 @@ CCW 命令帮助系统，提供命令搜索、推荐、文档查看、Skill/Team
 - **With-File Workflows**: Documented exploration with multi-CLI collaboration
  - `brainstorm-with-file`: Multi-perspective ideation → workflow-plan → workflow-execute
  - `debug-with-file`: Hypothesis-driven debugging (standalone)
-  - `analyze-with-file`: Collaborative analysis → workflow-lite-planex
+  - `analyze-with-file`: Collaborative analysis → workflow-lite-plan
  - `collaborative-plan-with-file`: Multi-agent planning → unified-execute
  - `roadmap-with-file`: Strategic requirement roadmap → team-planex
 - **Issue Workflow**: Batch issue discovery, planning, queueing, execution
@@ -131,7 +131,7 @@ Single source of truth: **[command.json](command.json)**

 | Skill | 内部流水线 | 触发词 |
 |-------|-----------|--------|
-| `workflow-lite-planex` | explore → plan → confirm → execute | "lite-plan", 快速任务 |
+| `workflow-lite-plan` | explore → plan → confirm → execute | "lite-plan", 快速任务 |
 | `workflow-plan` | session → context → convention → gen → verify | "workflow-plan", 正式规划 |
 | `workflow-execute` | session discovery → task processing → commit | "workflow-execute", 执行 |
 | `workflow-tdd-plan` | 6-phase TDD plan → verify | "tdd-plan", TDD 开发 |
@@ -186,9 +186,9 @@ CCW 根据任务意图自动选择工作流级别（参考 [ccw.md](../../comman

 | 输入示例 | 类型 | 级别 | 流水线 |
 |---------|------|------|--------|
-| "Add API endpoint" | feature (low) | 2 | workflow-lite-planex → workflow-test-fix |
-| "Fix login timeout" | bugfix | 2 | workflow-lite-planex → workflow-test-fix |
-| "协作分析: 认证架构" | analyze-file | 3 | analyze-with-file → workflow-lite-planex |
+| "Add API endpoint" | feature (low) | 2 | workflow-lite-plan → workflow-test-fix |
+| "Fix login timeout" | bugfix | 2 | workflow-lite-plan → workflow-test-fix |
+| "协作分析: 认证架构" | analyze-file | 3 | analyze-with-file → workflow-lite-plan |
 | "重构 auth 模块" | refactor | 3 | workflow:refactor-cycle |
 | "multi-cli: API设计" | multi-cli | 3 | workflow-multi-cli-plan → workflow-test-fix |
 | "头脑风暴: 通知系统" | brainstorm | 4 | brainstorm-with-file → workflow-plan → workflow-execute |
--- a/.claude/skills/ccw-help/command.json
+++ b/.claude/skills/ccw-help/command.json
@@ -955,14 +955,14 @@
      "source": "../../../skills/workflow-execute/SKILL.md"
    },
    {
-      "name": "workflow-lite-planex",
-      "description": "Lightweight planning and execution skill (Phase 1: plan, Phase 2: execute). Triggers on \"workflow-lite-planex\".",
+      "name": "workflow-lite-plan",
+      "description": "Lightweight planning and execution skill (Phase 1: plan, Phase 2: execute). Triggers on \"workflow-lite-plan\".",
      "category": "workflow",
      "is_team": false,
      "has_phases": true,
      "has_role_specs": false,
      "version": "",
-      "source": "../../../skills/workflow-lite-planex/SKILL.md"
+      "source": "../../../skills/workflow-lite-plan/SKILL.md"
    },
    {
      "name": "workflow-multi-cli-plan",
--- a/.claude/skills/ccw-help/index/all-skills.json
+++ b/.claude/skills/ccw-help/index/all-skills.json
@@ -290,14 +290,14 @@
    "source": "../../../skills/workflow-execute/SKILL.md"
  },
  {
-    "name": "workflow-lite-planex",
-    "description": "Lightweight planning and execution skill (Phase 1: plan, Phase 2: execute). Triggers on \"workflow-lite-planex\".",
+    "name": "workflow-lite-plan",
+    "description": "Lightweight planning and execution skill (Phase 1: plan, Phase 2: execute). Triggers on \"workflow-lite-plan\".",
    "category": "workflow",
    "is_team": false,
    "has_phases": true,
    "has_role_specs": false,
    "version": "",
-    "source": "../../../skills/workflow-lite-planex/SKILL.md"
+    "source": "../../../skills/workflow-lite-plan/SKILL.md"
  },
  {
    "name": "workflow-multi-cli-plan",
--- a/.claude/skills/ccw-help/index/command-relationships.json
+++ b/.claude/skills/ccw-help/index/command-relationships.json
@@ -70,7 +70,7 @@
      "workflow:session:list"
    ]
  },
-  "workflow-lite-planex": {
+  "workflow-lite-plan": {
    "calls_internally": [],
    "next_steps": [
      "workflow:session:list"
--- a/.claude/skills/ccw-help/index/skills-by-category.json
+++ b/.claude/skills/ccw-help/index/skills-by-category.json
@@ -301,14 +301,14 @@
      "source": "../../../skills/workflow-execute/SKILL.md"
    },
    {
-      "name": "workflow-lite-planex",
-      "description": "Lightweight planning and execution skill (Phase 1: plan, Phase 2: execute). Triggers on \"workflow-lite-planex\".",
+      "name": "workflow-lite-plan",
+      "description": "Lightweight planning and execution skill (Phase 1: plan, Phase 2: execute). Triggers on \"workflow-lite-plan\".",
      "category": "workflow",
      "is_team": false,
      "has_phases": true,
      "has_role_specs": false,
      "version": "",
-      "source": "../../../skills/workflow-lite-planex/SKILL.md"
+      "source": "../../../skills/workflow-lite-plan/SKILL.md"
    },
    {
      "name": "workflow-multi-cli-plan",
--- a/.claude/skills/ccw-help/scripts/analyze_commands.py
+++ b/.claude/skills/ccw-help/scripts/analyze_commands.py
@@ -239,7 +239,7 @@ def build_command_relationships() -> Dict[str, Any]:
            "alternatives": ["workflow:resume"],
            "related": ["workflow:session:list", "workflow:status"]
        },
-        "workflow-lite-planex": {
+        "workflow-lite-plan": {
            "calls_internally": [],
            "next_steps": ["workflow:status"],
            "alternatives": ["workflow-plan"],
@@ -247,7 +247,7 @@ def build_command_relationships() -> Dict[str, Any]:
        },
        "workflow:lite-fix": {
            "next_steps": ["workflow:status"],
-            "alternatives": ["workflow-lite-planex"],
+            "alternatives": ["workflow-lite-plan"],
            "related": ["workflow-test-fix"]
        },
        "workflow:review-session-cycle": {
@@ -272,7 +272,7 @@ def build_command_relationships() -> Dict[str, Any]:
 def identify_essential_commands(all_commands: List[Dict]) -> List[Dict]:
    """Identify the most essential commands for beginners."""
    essential_names = [
-        "workflow-lite-planex", "workflow:lite-fix", "workflow-plan",
+        "workflow-lite-plan", "workflow:lite-fix", "workflow-plan",
        "workflow-execute", "workflow:status", "workflow:session:start",
        "workflow:review-session-cycle", "cli:analyze", "cli:chat",
        "memory:docs", "workflow:brainstorm:artifacts",
--- a/.claude/skills/spec-generator/README.md
+++ b/.claude/skills/spec-generator/README.md
@@ -88,7 +88,7 @@ Available types: `service`, `api`, `library`, `platform`
 ## Handoff

 After Phase 6, choose execution path:
- `workflow-lite-planex` - Execute per Epic
+- `workflow-lite-plan` - Execute per Epic
 - `workflow:req-plan-with-file` - Roadmap decomposition
 - `workflow-plan` - Full planning
 - `issue:new` - Create issues per Epic
--- a/.claude/skills/spec-generator/phases/06-readiness-check.md
+++ b/.claude/skills/spec-generator/phases/06-readiness-check.md
@@ -214,7 +214,7 @@ AskUserQuestion({
      options: [
        {
          label: "Execute via lite-plan",
-          description: "Start implementing with /workflow-lite-planex, one Epic at a time"
+          description: "Start implementing with /workflow-lite-plan, one Epic at a time"
        },
        {
          label: "Create roadmap",
@@ -250,7 +250,7 @@ if (selection === "Execute via lite-plan") {
  const epicContent = Read(firstMvpFile);
  const title = extractTitle(epicContent);       // First # heading
  const description = extractSection(epicContent, "Description");
-  Skill(skill="workflow-lite-planex", args=`"${title}: ${description}"`)
+  Skill(skill="workflow-lite-plan", args=`"${title}: ${description}"`)
 }

 if (selection === "Full planning" || selection === "Create roadmap") {
--- a/.claude/skills/workflow-lite-execute/SKILL.md
+++ b/.claude/skills/workflow-lite-execute/SKILL.md
@@ -29,8 +29,12 @@ Flexible task execution command supporting three input modes: in-memory plan (fr
 <input>                    Task description string, or path to file (required)
 ```

-Mode 1 (In-Memory) is triggered by workflow-lite-plan direct handoff when `executionContext` is available.
-Workflow preferences (`autoYes`) are passed from SKILL.md via `workflowPreferences` context variable.
+### Flags
+| Flag | Description |
+|------|-------------|
+| `--in-memory` | Mode 1: Use executionContext from workflow-lite-plan handoff (via Skill({ skill: "workflow-lite-execute", args: "--in-memory" }) |
+
+Mode 1 (In-Memory) is triggered by `--in-memory` flag or when `executionContext` global variable is available.

 ## Input Modes

--- a/.claude/skills/workflow-lite-plan/SKILL.md
+++ b/.claude/skills/workflow-lite-plan/SKILL.md
@@ -36,6 +36,13 @@ Intelligent lightweight planning command with dynamic workflow adaptation based
 <task-description>         Task description or path to .md file (required)
 ```

+### Flags
+
+| Flag | Description |
+|------|-------------|
+| `-y`, `--yes` | Auto mode: Skip clarification, auto-confirm plan, auto-select execution, skip review |
+| `--force-explore` | Force code exploration even when task has prior analysis |
+
 Workflow preferences (`autoYes`, `forceExplore`) are collected by SKILL.md via AskUserQuestion and passed as `workflowPreferences` context variable.

 ## Output Artifacts
@@ -767,12 +774,24 @@ executionContext = {
 }
 ```

-**Step 5.2: Handoff**
+**Step 5.2: Handoff with Tracking**

 ```javascript
+// Update TodoWrite to show handoff to lite-execute
+const taskCount = (plan.task_ids || []).length
+TodoWrite({ todos: [
+  { content: "LP-Phase 1: Exploration", status: "completed", activeForm: "Exploring codebase" },
+  { content: "LP-Phase 2: Clarification", status: "completed", activeForm: "Collecting clarifications" },
+  { content: "LP-Phase 3: Planning", status: "completed", activeForm: "Generating plan" },
+  { content: `LP-Phase 4: Confirmed [${executionLabel}]`, status: "completed", activeForm: "Confirmed" },
+  { content: `LP-Phase 5: Handoff → lite-execute`, status: "completed", activeForm: "Handoff to execution" },
+  { content: `LE-Phase 1: Task Loading [${taskCount} tasks]`, status: "in_progress", activeForm: "Loading tasks" }
+]})
+
 // Invoke lite-execute skill with executionContext
 Skill("lite-execute")
 // executionContext is passed as global variable (Mode 1: In-Memory Plan)
+// lite-execute will continue TodoWrite tracking with LE-Phase prefix
 ```

 ## Session Folder Structure
--- a/.claude/skills/workflow-multi-cli-plan/SKILL.md
+++ b/.claude/skills/workflow-multi-cli-plan/SKILL.md
@@ -4,10 +4,519 @@ description: Multi-CLI collaborative planning with ACE context gathering, iterat
 allowed-tools: Skill, Agent, AskUserQuestion, TodoWrite, Read, Write, Edit, Bash, Glob, Grep
 ---

-# Workflow-Multi-CLI-Plan
+# Multi-CLI Collaborative Planning

-Multi-CLI collaborative planning with ACE context gathering and iterative cross-verification.
+## Auto Mode

-## Execution
+When `workflowPreferences.autoYes` is true: Auto-approve plan, use recommended solution and execution method (Agent, Skip review).

-Execute Phase 1 directly: [phases/01-multi-cli-plan.md](phases/01-multi-cli-plan.md)
+## Quick Start
+
+```bash
+# Basic usage
+/workflow-multi-cli-plan "Implement user authentication"
+
+# With options
+/workflow-multi-cli-plan "Add dark mode support" --max-rounds=3
+/workflow-multi-cli-plan "Refactor payment module" --tools=gemini,codex,claude
+/workflow-multi-cli-plan "Fix memory leak" --mode=serial
+```
+
+**Context Source**: ACE semantic search + Multi-CLI analysis
+**Output Directory**: `.workflow/.multi-cli-plan/{session-id}/`
+**Default Max Rounds**: 3 (convergence may complete earlier)
+**CLI Tools**: @cli-discuss-agent (analysis), @cli-lite-planning-agent (plan generation)
+**Execution**: Auto-hands off to workflow-lite-execute after plan approval
+
+## What & Why
+
+### Core Concept
+
+Multi-CLI collaborative planning with **three-phase architecture**: ACE context gathering → Iterative multi-CLI discussion → Plan generation. Orchestrator delegates analysis to agents, only handles user decisions and session management.
+
+**Process**:
+- **Phase 1**: ACE semantic search gathers codebase context
+- **Phase 2**: cli-discuss-agent orchestrates Gemini/Codex/Claude for cross-verified analysis
+- **Phase 3-5**: User decision → Plan generation → Execution handoff
+
+**vs Single-CLI Planning**:
+- **Single**: One model perspective, potential blind spots
+- **Multi-CLI**: Cross-verification catches inconsistencies, builds consensus on solutions
+
+### Value Proposition
+
+1. **Multi-Perspective Analysis**: Gemini + Codex + Claude analyze from different angles
+2. **Cross-Verification**: Identify agreements/disagreements, build confidence
+3. **User-Driven Decisions**: Every round ends with user decision point
+4. **Iterative Convergence**: Progressive refinement until consensus reached
+
+### Orchestrator Boundary (CRITICAL)
+
+- **ONLY command** for multi-CLI collaborative planning
+- Manages: Session state, user decisions, agent delegation, phase transitions
+- Delegates: CLI execution to @cli-discuss-agent, plan generation to @cli-lite-planning-agent
+
+### Execution Flow
+
+```
+Phase 1: Context Gathering
+   └─ ACE semantic search, extract keywords, build context package
+
+Phase 2: Multi-CLI Discussion (Iterative, via @cli-discuss-agent)
+   ├─ Round N: Agent executes Gemini + Codex + Claude
+   ├─ Cross-verify findings, synthesize solutions
+   ├─ Write synthesis.json to rounds/{N}/
+   └─ Loop until convergence or max rounds
+
+Phase 3: Present Options
+   └─ Display solutions with trade-offs from agent output
+
+Phase 4: User Decision
+   ├─ Select solution approach
+   ├─ Select execution method (Agent/Codex/Auto)
+   ├─ Select code review tool (Skip/Gemini/Codex/Agent)
+   └─ Route:
+      ├─ Approve → Phase 5
+      ├─ Need More Analysis → Return to Phase 2
+      └─ Cancel → Save session
+
+Phase 5: Plan Generation & Execution Handoff
+   ├─ Generate plan.json + .task/*.json (via @cli-lite-planning-agent, two-layer output)
+   ├─ Build executionContext with user selections and taskFiles
+   └─ Execute via workflow-lite-execute
+```
+
+### Agent Roles
+
+| Agent | Responsibility |
+|-------|---------------|
+| **Orchestrator** | Session management, ACE context, user decisions, phase transitions, executionContext assembly |
+| **@cli-discuss-agent** | Multi-CLI execution (Gemini/Codex/Claude), cross-verification, solution synthesis, synthesis.json output |
+| **@cli-lite-planning-agent** | Task decomposition, two-layer output: plan.json (overview with task_ids[]) + .task/*.json (task files) |
+
+## Core Responsibilities
+
+### Phase 1: Context Gathering
+
+**Session Initialization**:
+```javascript
+const sessionId = `MCP-${taskSlug}-${date}`
+const sessionFolder = `.workflow/.multi-cli-plan/${sessionId}`
+Bash(`mkdir -p ${sessionFolder}/rounds`)
+```
+
+**ACE Context Queries**:
+```javascript
+const aceQueries = [
+  `Project architecture related to ${keywords}`,
+  `Existing implementations of ${keywords[0]}`,
+  `Code patterns for ${keywords} features`,
+  `Integration points for ${keywords[0]}`
+]
+// Execute via mcp__ace-tool__search_context
+```
+
+**Context Package** (passed to agent):
+- `relevant_files[]` - Files identified by ACE
+- `detected_patterns[]` - Code patterns found
+- `architecture_insights` - Structure understanding
+
+### Phase 2: Agent Delegation
+
+**Core Principle**: Orchestrator only delegates and reads output - NO direct CLI execution.
+
+**⚠️ CRITICAL - CLI EXECUTION REQUIREMENT**:
+- **MUST** execute CLI calls via `Bash` with `run_in_background: true`
+- **MUST** wait for hook callback to receive complete results
+- **MUST NOT** proceed with next phase until CLI execution fully completes
+- Do NOT use `TaskOutput` polling during CLI execution - wait passively for results
+- Minimize scope: Proceed only when 100% result available
+
+**Agent Invocation**:
+```javascript
+Agent({
+  subagent_type: "cli-discuss-agent",
+  run_in_background: false,
+  description: `Discussion round ${currentRound}`,
+  prompt: `
+## Input Context
+- task_description: ${taskDescription}
+- round_number: ${currentRound}
+- session: { id: "${sessionId}", folder: "${sessionFolder}" }
+- ace_context: ${JSON.stringify(contextPackageage)}
+- previous_rounds: ${JSON.stringify(analysisResults)}
+- user_feedback: ${userFeedback || 'None'}
+- cli_config: { tools: ["gemini", "codex"], mode: "parallel", fallback_chain: ["gemini", "codex", "claude"] }
+
+## Execution Process
+1. Parse input context (handle JSON strings)
+2. Check if ACE supplementary search needed
+3. Build CLI prompts with context
+4. Execute CLIs (parallel or serial per cli_config.mode)
+5. Parse CLI outputs, handle failures with fallback
+6. Perform cross-verification between CLI results
+7. Synthesize solutions, calculate scores
+8. Calculate convergence, generate clarification questions
+9. Write synthesis.json
+
+## Output
+Write: ${sessionFolder}/rounds/${currentRound}/synthesis.json
+
+## Completion Checklist
+- [ ] All configured CLI tools executed (or fallback triggered)
+- [ ] Cross-verification completed with agreements/disagreements
+- [ ] 2-3 solutions generated with file:line references
+- [ ] Convergence score calculated (0.0-1.0)
+- [ ] synthesis.json written with all Primary Fields
+`
+})
+```
+
+**Read Agent Output**:
+```javascript
+const synthesis = JSON.parse(Read(`${sessionFolder}/rounds/${round}/synthesis.json`))
+// Access top-level fields: solutions, convergence, cross_verification, clarification_questions
+```
+
+**Convergence Decision**:
+```javascript
+if (synthesis.convergence.recommendation === 'converged') {
+  // Proceed to Phase 3
+} else if (synthesis.convergence.recommendation === 'user_input_needed') {
+  // Collect user feedback, return to Phase 2
+} else {
+  // Continue to next round if new_insights && round < maxRounds
+}
+```
+
+### Phase 3: Present Options
+
+**Display from Agent Output** (no processing):
+```javascript
+console.log(`
+## Solution Options
+
+${synthesis.solutions.map((s, i) => `
+**Option ${i+1}: ${s.name}**
+Source: ${s.source_cli.join(' + ')}
+Effort: ${s.effort} | Risk: ${s.risk}
+
+Pros: ${s.pros.join(', ')}
+Cons: ${s.cons.join(', ')}
+
+Files: ${s.affected_files.slice(0,3).map(f => `${f.file}:${f.line}`).join(', ')}
+`).join('\n')}
+
+## Cross-Verification
+Agreements: ${synthesis.cross_verification.agreements.length}
+Disagreements: ${synthesis.cross_verification.disagreements.length}
+`)
+```
+
+### Phase 4: User Decision
+
+**Decision Options**:
+```javascript
+AskUserQuestion({
+  questions: [
+    {
+      question: "Which solution approach?",
+      header: "Solution",
+      multiSelect: false,
+      options: solutions.map((s, i) => ({
+        label: `Option ${i+1}: ${s.name}`,
+        description: `${s.effort} effort, ${s.risk} risk`
+      })).concat([
+        { label: "Need More Analysis", description: "Return to Phase 2" }
+      ])
+    },
+    {
+      question: "Execution method:",
+      header: "Execution",
+      multiSelect: false,
+      options: [
+        { label: "Agent", description: "@code-developer agent" },
+        { label: "Codex", description: "codex CLI tool" },
+        { label: "Auto", description: "Auto-select based on complexity" }
+      ]
+    },
+    {
+      question: "Code review after execution?",
+      header: "Review",
+      multiSelect: false,
+      options: [
+        { label: "Skip", description: "No review" },
+        { label: "Gemini Review", description: "Gemini CLI tool" },
+        { label: "Codex Review", description: "codex review --uncommitted" },
+        { label: "Agent Review", description: "Current agent review" }
+      ]
+    }
+  ]
+})
+```
+
+**Routing**:
+- Approve + execution method → Phase 5
+- Need More Analysis → Phase 2 with feedback
+- Cancel → Save session for resumption
+
+**TodoWrite Update (Phase 4 Decision)**:
+```javascript
+const executionLabel = userSelection.execution_method  // "Agent" / "Codex" / "Auto"
+
+TodoWrite({ todos: [
+  { content: "Phase 1: Context Gathering", status: "completed", activeForm: "Gathering context" },
+  { content: "Phase 2: Multi-CLI Discussion", status: "completed", activeForm: "Running discussion" },
+  { content: "Phase 3: Present Options", status: "completed", activeForm: "Presenting options" },
+  { content: `Phase 4: User Decision [${executionLabel}]`, status: "completed", activeForm: "Decision recorded" },
+  { content: `Phase 5: Plan Generation [${executionLabel}]`, status: "in_progress", activeForm: `Generating plan [${executionLabel}]` }
+]})
+```
+
+### Phase 5: Plan Generation & Execution Handoff
+
+**Step 1: Build Context-Package** (Orchestrator responsibility):
+```javascript
+// Extract key information from user decision and synthesis
+const contextPackage = {
+  // Core solution details
+  solution: {
+    name: selectedSolution.name,
+    source_cli: selectedSolution.source_cli,
+    feasibility: selectedSolution.feasibility,
+    effort: selectedSolution.effort,
+    risk: selectedSolution.risk,
+    summary: selectedSolution.summary
+  },
+  // Implementation plan (tasks, flow, milestones)
+  implementation_plan: selectedSolution.implementation_plan,
+  // Dependencies
+  dependencies: selectedSolution.dependencies || { internal: [], external: [] },
+  // Technical concerns
+  technical_concerns: selectedSolution.technical_concerns || [],
+  // Consensus from cross-verification
+  consensus: {
+    agreements: synthesis.cross_verification.agreements,
+    resolved_conflicts: synthesis.cross_verification.resolution
+  },
+  // User constraints (from Phase 4 feedback)
+  constraints: userConstraints || [],
+  // Task context
+  task_description: taskDescription,
+  session_id: sessionId
+}
+
+// Write context-package for traceability
+Write(`${sessionFolder}/context-package.json`, JSON.stringify(contextPackage, null, 2))
+```
+
+**Step 2: Invoke Planning Agent**:
+```javascript
+Agent({
+  subagent_type: "cli-lite-planning-agent",
+  run_in_background: false,
+  description: "Generate implementation plan",
+  prompt: `
+## Schema Reference
+Execute: cat ~/.ccw/workflows/cli-templates/schemas/plan-overview-base-schema.json
+Execute: cat ~/.ccw/workflows/cli-templates/schemas/task-schema.json
+
+## Output Format: Two-Layer Structure
+- plan.json: Overview with task_ids[] referencing .task/ files (NO tasks[] array)
+- .task/TASK-*.json: Independent task files following task-schema.json
+
+plan.json required: summary, approach, task_ids, task_count, _metadata (with plan_type)
+Task files required: id, title, description, depends_on, convergence (with criteria[])
+Task fields: files[].change (not modification_points), convergence.criteria (not acceptance), test (not verification)
+
+## Context-Package (from orchestrator)
+${JSON.stringify(contextPackage, null, 2)}
+
+## Execution Process
+1. Read plan-overview-base-schema.json + task-schema.json for output structure
+2. Read project-tech.json and specs/*.md
+3. Parse context-package fields:
+   - solution: name, feasibility, summary
+   - implementation_plan: tasks[], execution_flow, milestones
+   - dependencies: internal[], external[]
+   - technical_concerns: risks/blockers
+   - consensus: agreements, resolved_conflicts
+   - constraints: user requirements
+4. Use implementation_plan.tasks[] as task foundation
+5. Preserve task dependencies (depends_on) and execution_flow
+6. Expand tasks with convergence.criteria (testable completion conditions)
+7. Create .task/ directory and write individual TASK-*.json files
+8. Generate plan.json with task_ids[] referencing .task/ files
+
+## Output
+- ${sessionFolder}/plan.json (overview with task_ids[])
+- ${sessionFolder}/.task/TASK-*.json (independent task files)
+
+## Completion Checklist
+- [ ] plan.json has task_ids[] and task_count (NO embedded tasks[])
+- [ ] .task/*.json files preserve task dependencies from implementation_plan
+- [ ] Task execution order follows execution_flow
+- [ ] Key_points reflected in task descriptions
+- [ ] User constraints applied to implementation
+- [ ] convergence.criteria are testable
+- [ ] plan.json follows plan-overview-base-schema.json
+- [ ] Task files follow task-schema.json
+`
+})
+```
+
+**Step 3: Build executionContext**:
+```javascript
+// After plan.json is generated by cli-lite-planning-agent
+const plan = JSON.parse(Read(`${sessionFolder}/plan.json`))
+
+// Load task files from .task/ directory (two-layer format)
+const taskFiles = plan.task_ids.map(id => `${sessionFolder}/.task/${id}.json`)
+
+// Build executionContext (same structure as lite-plan)
+executionContext = {
+  planObject: plan,
+  taskFiles: taskFiles,  // Paths to .task/*.json files (two-layer format)
+  explorationsContext: null,  // Multi-CLI doesn't use exploration files
+  explorationAngles: [],      // No exploration angles
+  explorationManifest: null,  // No manifest
+  clarificationContext: null,  // Store user feedback from Phase 2 if exists
+  executionMethod: userSelection.execution_method,  // From Phase 4
+  codeReviewTool: userSelection.code_review_tool,   // From Phase 4
+  originalUserInput: taskDescription,
+
+  // Optional: Task-level executor assignments
+  executorAssignments: null,  // Could be enhanced in future
+
+  session: {
+    id: sessionId,
+    folder: sessionFolder,
+    artifacts: {
+      explorations: [],  // No explorations in multi-CLI workflow
+      explorations_manifest: null,
+      plan: `${sessionFolder}/plan.json`,
+      task_dir: plan.task_ids ? `${sessionFolder}/.task/` : null,
+      synthesis_rounds: Array.from({length: currentRound}, (_, i) =>
+        `${sessionFolder}/rounds/${i+1}/synthesis.json`
+      ),
+      context_package: `${sessionFolder}/context-package.json`
+    }
+  }
+}
+```
+
+**Step 4: Hand off to Execution**:
+```javascript
+// Skill handoff: Invoke workflow-lite-execute with in-memory context
+Skill({
+  skill: "workflow-lite-execute",
+  args: "--in-memory"
+})
+// executionContext is passed via global variable to workflow-lite-execute (Mode 1: In-Memory Plan)
+```
+
+## Output File Structure
+
+```
+.workflow/.multi-cli-plan/{MCP-task-slug-YYYY-MM-DD}/
+├── session-state.json          # Session tracking (orchestrator)
+├── rounds/
+│   ├── 1/synthesis.json        # Round 1 analysis (cli-discuss-agent)
+│   ├── 2/synthesis.json        # Round 2 analysis (cli-discuss-agent)
+│   └── .../
+├── context-package.json        # Extracted context for planning (orchestrator)
+├── plan.json                   # Plan overview with task_ids[] (NO embedded tasks[])
+└── .task/                      # Independent task files
+    ├── TASK-001.json            # Task file following task-schema.json
+    ├── TASK-002.json
+    └── ...
+```
+
+## synthesis.json Schema
+
+```json
+{
+  "round": 1,
+  "solutions": [{
+    "name": "Solution Name",
+    "source_cli": ["gemini", "codex"],
+    "feasibility": 0.85,
+    "effort": "low|medium|high",
+    "risk": "low|medium|high",
+    "summary": "Brief analysis summary",
+    "implementation_plan": {
+      "approach": "High-level technical approach",
+      "tasks": [
+        {"id": "T1", "name": "Task", "depends_on": [], "files": [], "key_point": "..."}
+      ],
+      "execution_flow": "T1 → T2 → T3",
+      "milestones": ["Checkpoint 1", "Checkpoint 2"]
+    },
+    "dependencies": {"internal": [], "external": []},
+    "technical_concerns": ["Risk 1", "Blocker 2"]
+  }],
+  "convergence": {
+    "score": 0.85,
+    "new_insights": false,
+    "recommendation": "converged|continue|user_input_needed"
+  },
+  "cross_verification": {
+    "agreements": [],
+    "disagreements": [],
+    "resolution": "..."
+  },
+  "clarification_questions": []
+}
+```
+
+## TodoWrite Structure
+
+**Initialization**:
+```javascript
+TodoWrite({ todos: [
+  { content: "Phase 1: Context Gathering", status: "in_progress", activeForm: "Gathering context" },
+  { content: "Phase 2: Multi-CLI Discussion", status: "pending", activeForm: "Running discussion" },
+  { content: "Phase 3: Present Options", status: "pending", activeForm: "Presenting options" },
+  { content: "Phase 4: User Decision", status: "pending", activeForm: "Awaiting decision" },
+  { content: "Phase 5: Plan Generation", status: "pending", activeForm: "Generating plan" }
+]})
+```
+
+## Error Handling
+
+| Error | Resolution |
+|-------|------------|
+| ACE search fails | Fall back to Glob/Grep for file discovery |
+| Agent fails | Retry once, then present partial results |
+| CLI timeout (in agent) | Agent uses fallback: gemini → codex → claude |
+| No convergence | Present best options, flag uncertainty |
+| synthesis.json parse error | Request agent retry |
+| User cancels | Save session for later resumption |
+
+## Configuration
+
+| Flag | Default | Description |
+|------|---------|-------------|
+| `--max-rounds` | 3 | Maximum discussion rounds |
+| `--tools` | gemini,codex | CLI tools for analysis |
+| `--mode` | parallel | Execution mode: parallel or serial |
+| `--auto-execute` | false | Auto-execute after approval |
+
+## Related Commands
+
+```bash
+# Simpler single-round planning
+/workflow-lite-plan "task description"
+
+# Issue-driven discovery
+/issue:discover-by-prompt "find issues"
+
+# View session files
+cat .workflow/.multi-cli-plan/{session-id}/plan.json
+cat .workflow/.multi-cli-plan/{session-id}/rounds/1/synthesis.json
+cat .workflow/.multi-cli-plan/{session-id}/context-package.json
+```
+
+## Next Phase
+
+Auto-continue via `Skill({ skill: "workflow-lite-execute", args: "--in-memory" })` with executionContext.
--- a/.claude/skills/workflow-multi-cli-plan/phases/01-multi-cli-plan.md
+++ b/.claude/skills/workflow-multi-cli-plan/phases/01-multi-cli-plan.md
@@ -1,620 +0,0 @@
-# Phase 1: Multi-CLI Collaborative Planning
-
-Complete multi-CLI collaborative planning pipeline with ACE context gathering and iterative cross-verification. This phase document preserves the full content of the original `workflow-multi-cli-plan` command.
-
-## Auto Mode
-
-When `workflowPreferences.autoYes` is true: Auto-approve plan, use recommended solution and execution method (Agent, Skip review).
-
-# Multi-CLI Collaborative Planning Command
-
-## Quick Start
-
-```bash
-# Basic usage
-/workflow-multi-cli-plan "Implement user authentication"
-
-# With options
-/workflow-multi-cli-plan "Add dark mode support" --max-rounds=3
-/workflow-multi-cli-plan "Refactor payment module" --tools=gemini,codex,claude
-/workflow-multi-cli-plan "Fix memory leak" --mode=serial
-```
-
-**Context Source**: ACE semantic search + Multi-CLI analysis
-**Output Directory**: `.workflow/.multi-cli-plan/{session-id}/`
-**Default Max Rounds**: 3 (convergence may complete earlier)
-**CLI Tools**: @cli-discuss-agent (analysis), @cli-lite-planning-agent (plan generation)
-**Execution**: Auto-hands off to Phase 2 (lite-execute) after plan approval
-
-## What & Why
-
-### Core Concept
-
-Multi-CLI collaborative planning with **three-phase architecture**: ACE context gathering → Iterative multi-CLI discussion → Plan generation. Orchestrator delegates analysis to agents, only handles user decisions and session management.
-
-**Process**:
- **Phase 1**: ACE semantic search gathers codebase context
- **Phase 2**: cli-discuss-agent orchestrates Gemini/Codex/Claude for cross-verified analysis
- **Phase 3-5**: User decision → Plan generation → Execution handoff
-
-**vs Single-CLI Planning**:
- **Single**: One model perspective, potential blind spots
- **Multi-CLI**: Cross-verification catches inconsistencies, builds consensus on solutions
-
-### Value Proposition
-
-1. **Multi-Perspective Analysis**: Gemini + Codex + Claude analyze from different angles
-2. **Cross-Verification**: Identify agreements/disagreements, build confidence
-3. **User-Driven Decisions**: Every round ends with user decision point
-4. **Iterative Convergence**: Progressive refinement until consensus reached
-
-### Orchestrator Boundary (CRITICAL)
-
- **ONLY command** for multi-CLI collaborative planning
- Manages: Session state, user decisions, agent delegation, phase transitions
- Delegates: CLI execution to @cli-discuss-agent, plan generation to @cli-lite-planning-agent
-
-### Execution Flow
-
-```
-Phase 1: Context Gathering
-   └─ ACE semantic search, extract keywords, build context package
-
-Phase 2: Multi-CLI Discussion (Iterative, via @cli-discuss-agent)
-   ├─ Round N: Agent executes Gemini + Codex + Claude
-   ├─ Cross-verify findings, synthesize solutions
-   ├─ Write synthesis.json to rounds/{N}/
-   └─ Loop until convergence or max rounds
-
-Phase 3: Present Options
-   └─ Display solutions with trade-offs from agent output
-
-Phase 4: User Decision
-   ├─ Select solution approach
-   ├─ Select execution method (Agent/Codex/Auto)
-   ├─ Select code review tool (Skip/Gemini/Codex/Agent)
-   └─ Route:
-      ├─ Approve → Phase 5
-      ├─ Need More Analysis → Return to Phase 2
-      └─ Cancel → Save session
-
-Phase 5: Plan Generation & Execution Handoff
-   ├─ Generate plan.json + .task/*.json (via @cli-lite-planning-agent, two-layer output)
-   ├─ Build executionContext with user selections and taskFiles
-   └─ Execute via Phase 2 (lite-execute)
-```
-
-### Agent Roles
-
-| Agent | Responsibility |
-|-------|---------------|
-| **Orchestrator** | Session management, ACE context, user decisions, phase transitions, executionContext assembly |
-| **@cli-discuss-agent** | Multi-CLI execution (Gemini/Codex/Claude), cross-verification, solution synthesis, synthesis.json output |
-| **@cli-lite-planning-agent** | Task decomposition, two-layer output: plan.json (overview with task_ids[]) + .task/*.json (task files) |
-
-## Core Responsibilities
-
-### Phase 1: Context Gathering
-
-**Session Initialization**:
-```javascript
-const sessionId = `MCP-${taskSlug}-${date}`
-const sessionFolder = `.workflow/.multi-cli-plan/${sessionId}`
-Bash(`mkdir -p ${sessionFolder}/rounds`)
-```
-
-**ACE Context Queries**:
-```javascript
-const aceQueries = [
-  `Project architecture related to ${keywords}`,
-  `Existing implementations of ${keywords[0]}`,
-  `Code patterns for ${keywords} features`,
-  `Integration points for ${keywords[0]}`
-]
-// Execute via mcp__ace-tool__search_context
-```
-
-**Context Package** (passed to agent):
- `relevant_files[]` - Files identified by ACE
- `detected_patterns[]` - Code patterns found
- `architecture_insights` - Structure understanding
-
-### Phase 2: Agent Delegation
-
-**Core Principle**: Orchestrator only delegates and reads output - NO direct CLI execution.
-
-**⚠️ CRITICAL - CLI EXECUTION REQUIREMENT**:
- **MUST** execute CLI calls via `Bash` with `run_in_background: true`
- **MUST** wait for hook callback to receive complete results
- **MUST NOT** proceed with next phase until CLI execution fully completes
- Do NOT use `TaskOutput` polling during CLI execution - wait passively for results
- Minimize scope: Proceed only when 100% result available
-
-**Agent Invocation**:
-```javascript
-Agent({
-  subagent_type: "cli-discuss-agent",
-  run_in_background: false,
-  description: `Discussion round ${currentRound}`,
-  prompt: `
-## Input Context
- task_description: ${taskDescription}
- round_number: ${currentRound}
- session: { id: "${sessionId}", folder: "${sessionFolder}" }
- ace_context: ${JSON.stringify(contextPackageage)}
- previous_rounds: ${JSON.stringify(analysisResults)}
- user_feedback: ${userFeedback || 'None'}
- cli_config: { tools: ["gemini", "codex"], mode: "parallel", fallback_chain: ["gemini", "codex", "claude"] }
-
-## Execution Process
-1. Parse input context (handle JSON strings)
-2. Check if ACE supplementary search needed
-3. Build CLI prompts with context
-4. Execute CLIs (parallel or serial per cli_config.mode)
-5. Parse CLI outputs, handle failures with fallback
-6. Perform cross-verification between CLI results
-7. Synthesize solutions, calculate scores
-8. Calculate convergence, generate clarification questions
-9. Write synthesis.json
-
-## Output
-Write: ${sessionFolder}/rounds/${currentRound}/synthesis.json
-
-## Completion Checklist
- [ ] All configured CLI tools executed (or fallback triggered)
- [ ] Cross-verification completed with agreements/disagreements
- [ ] 2-3 solutions generated with file:line references
- [ ] Convergence score calculated (0.0-1.0)
- [ ] synthesis.json written with all Primary Fields
-`
-})
-```
-
-**Read Agent Output**:
-```javascript
-const synthesis = JSON.parse(Read(`${sessionFolder}/rounds/${round}/synthesis.json`))
-// Access top-level fields: solutions, convergence, cross_verification, clarification_questions
-```
-
-**Convergence Decision**:
-```javascript
-if (synthesis.convergence.recommendation === 'converged') {
-  // Proceed to Phase 3
-} else if (synthesis.convergence.recommendation === 'user_input_needed') {
-  // Collect user feedback, return to Phase 2
-} else {
-  // Continue to next round if new_insights && round < maxRounds
-}
-```
-
-### Phase 3: Present Options
-
-**Display from Agent Output** (no processing):
-```javascript
-console.log(`
-## Solution Options
-
-${synthesis.solutions.map((s, i) => `
-**Option ${i+1}: ${s.name}**
-Source: ${s.source_cli.join(' + ')}
-Effort: ${s.effort} | Risk: ${s.risk}
-
-Pros: ${s.pros.join(', ')}
-Cons: ${s.cons.join(', ')}
-
-Files: ${s.affected_files.slice(0,3).map(f => `${f.file}:${f.line}`).join(', ')}
-`).join('\n')}
-
-## Cross-Verification
-Agreements: ${synthesis.cross_verification.agreements.length}
-Disagreements: ${synthesis.cross_verification.disagreements.length}
-`)
-```
-
-### Phase 4: User Decision
-
-**Decision Options**:
-```javascript
-AskUserQuestion({
-  questions: [
-    {
-      question: "Which solution approach?",
-      header: "Solution",
-      multiSelect: false,
-      options: solutions.map((s, i) => ({
-        label: `Option ${i+1}: ${s.name}`,
-        description: `${s.effort} effort, ${s.risk} risk`
-      })).concat([
-        { label: "Need More Analysis", description: "Return to Phase 2" }
-      ])
-    },
-    {
-      question: "Execution method:",
-      header: "Execution",
-      multiSelect: false,
-      options: [
-        { label: "Agent", description: "@code-developer agent" },
-        { label: "Codex", description: "codex CLI tool" },
-        { label: "Auto", description: "Auto-select based on complexity" }
-      ]
-    },
-    {
-      question: "Code review after execution?",
-      header: "Review",
-      multiSelect: false,
-      options: [
-        { label: "Skip", description: "No review" },
-        { label: "Gemini Review", description: "Gemini CLI tool" },
-        { label: "Codex Review", description: "codex review --uncommitted" },
-        { label: "Agent Review", description: "Current agent review" }
-      ]
-    }
-  ]
-})
-```
-
-**Routing**:
- Approve + execution method → Phase 5
- Need More Analysis → Phase 2 with feedback
- Cancel → Save session for resumption
-
-**TodoWrite Update (Phase 4 Decision)**:
-```javascript
-const executionLabel = userSelection.execution_method  // "Agent" / "Codex" / "Auto"
-
-TodoWrite({ todos: [
-  { content: "Phase 1: Context Gathering", status: "completed", activeForm: "Gathering context" },
-  { content: "Phase 2: Multi-CLI Discussion", status: "completed", activeForm: "Running discussion" },
-  { content: "Phase 3: Present Options", status: "completed", activeForm: "Presenting options" },
-  { content: `Phase 4: User Decision [${executionLabel}]`, status: "completed", activeForm: "Decision recorded" },
-  { content: `Phase 5: Plan Generation [${executionLabel}]`, status: "in_progress", activeForm: `Generating plan [${executionLabel}]` }
-]})
-```
-
-### Phase 5: Plan Generation & Execution Handoff
-
-**Step 1: Build Context-Package** (Orchestrator responsibility):
-```javascript
-// Extract key information from user decision and synthesis
-const contextPackage = {
-  // Core solution details
-  solution: {
-    name: selectedSolution.name,
-    source_cli: selectedSolution.source_cli,
-    feasibility: selectedSolution.feasibility,
-    effort: selectedSolution.effort,
-    risk: selectedSolution.risk,
-    summary: selectedSolution.summary
-  },
-  // Implementation plan (tasks, flow, milestones)
-  implementation_plan: selectedSolution.implementation_plan,
-  // Dependencies
-  dependencies: selectedSolution.dependencies || { internal: [], external: [] },
-  // Technical concerns
-  technical_concerns: selectedSolution.technical_concerns || [],
-  // Consensus from cross-verification
-  consensus: {
-    agreements: synthesis.cross_verification.agreements,
-    resolved_conflicts: synthesis.cross_verification.resolution
-  },
-  // User constraints (from Phase 4 feedback)
-  constraints: userConstraints || [],
-  // Task context
-  task_description: taskDescription,
-  session_id: sessionId
-}
-
-// Write context-package for traceability
-Write(`${sessionFolder}/context-package.json`, JSON.stringify(contextPackage, null, 2))
-```
-
-**Context-Package Schema**:
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `solution` | object | User-selected solution from synthesis |
-| `solution.name` | string | Solution identifier |
-| `solution.feasibility` | number | Viability score (0-1) |
-| `solution.summary` | string | Brief analysis summary |
-| `implementation_plan` | object | Task breakdown with flow and dependencies |
-| `implementation_plan.approach` | string | High-level technical strategy |
-| `implementation_plan.tasks[]` | array | Discrete tasks with id, name, depends_on, files |
-| `implementation_plan.execution_flow` | string | Task sequence (e.g., "T1 → T2 → T3") |
-| `implementation_plan.milestones` | string[] | Key checkpoints |
-| `dependencies` | object | Module and package dependencies |
-| `technical_concerns` | string[] | Risks and blockers |
-| `consensus` | object | Cross-verified agreements from multi-CLI |
-| `constraints` | string[] | User-specified constraints from Phase 4 |
-
-```json
-{
-  "solution": {
-    "name": "Strategy Pattern Refactoring",
-    "source_cli": ["gemini", "codex"],
-    "feasibility": 0.88,
-    "effort": "medium",
-    "risk": "low",
-    "summary": "Extract payment gateway interface, implement strategy pattern for multi-gateway support"
-  },
-  "implementation_plan": {
-    "approach": "Define interface → Create concrete strategies → Implement factory → Migrate existing code",
-    "tasks": [
-      {"id": "T1", "name": "Define PaymentGateway interface", "depends_on": [], "files": [{"file": "src/types/payment.ts", "line": 1, "action": "create"}], "key_point": "Include all existing Stripe methods"},
-      {"id": "T2", "name": "Implement StripeGateway", "depends_on": ["T1"], "files": [{"file": "src/payment/stripe.ts", "line": 1, "action": "create"}], "key_point": "Wrap existing logic"},
-      {"id": "T3", "name": "Create GatewayFactory", "depends_on": ["T1"], "files": [{"file": "src/payment/factory.ts", "line": 1, "action": "create"}], "key_point": null},
-      {"id": "T4", "name": "Migrate processor to use factory", "depends_on": ["T2", "T3"], "files": [{"file": "src/payment/processor.ts", "line": 45, "action": "modify"}], "key_point": "Backward compatible"}
-    ],
-    "execution_flow": "T1 → (T2 | T3) → T4",
-    "milestones": ["Interface defined", "Gateway implementations complete", "Migration done"]
-  },
-  "dependencies": {
-    "internal": ["@/lib/payment-gateway", "@/types/payment"],
-    "external": ["stripe@^14.0.0"]
-  },
-  "technical_concerns": ["Existing tests must pass", "No breaking API changes"],
-  "consensus": {
-    "agreements": ["Use strategy pattern", "Keep existing API"],
-    "resolved_conflicts": "Factory over DI for simpler integration"
-  },
-  "constraints": ["backward compatible", "no breaking changes to PaymentResult type"],
-  "task_description": "Refactor payment processing for multi-gateway support",
-  "session_id": "MCP-payment-refactor-2026-01-14"
-}
-```
-
-**Step 2: Invoke Planning Agent**:
-```javascript
-Agent({
-  subagent_type: "cli-lite-planning-agent",
-  run_in_background: false,
-  description: "Generate implementation plan",
-  prompt: `
-## Schema Reference
-Execute: cat ~/.ccw/workflows/cli-templates/schemas/plan-overview-base-schema.json
-Execute: cat ~/.ccw/workflows/cli-templates/schemas/task-schema.json
-
-## Output Format: Two-Layer Structure
- plan.json: Overview with task_ids[] referencing .task/ files (NO tasks[] array)
- .task/TASK-*.json: Independent task files following task-schema.json
-
-plan.json required: summary, approach, task_ids, task_count, _metadata (with plan_type)
-Task files required: id, title, description, depends_on, convergence (with criteria[])
-Task fields: files[].change (not modification_points), convergence.criteria (not acceptance), test (not verification)
-
-## Context-Package (from orchestrator)
-${JSON.stringify(contextPackage, null, 2)}
-
-## Execution Process
-1. Read plan-overview-base-schema.json + task-schema.json for output structure
-2. Read project-tech.json and specs/*.md
-3. Parse context-package fields:
-   - solution: name, feasibility, summary
-   - implementation_plan: tasks[], execution_flow, milestones
-   - dependencies: internal[], external[]
-   - technical_concerns: risks/blockers
-   - consensus: agreements, resolved_conflicts
-   - constraints: user requirements
-4. Use implementation_plan.tasks[] as task foundation
-5. Preserve task dependencies (depends_on) and execution_flow
-6. Expand tasks with convergence.criteria (testable completion conditions)
-7. Create .task/ directory and write individual TASK-*.json files
-8. Generate plan.json with task_ids[] referencing .task/ files
-
-## Output
- ${sessionFolder}/plan.json (overview with task_ids[])
- ${sessionFolder}/.task/TASK-*.json (independent task files)
-
-## Completion Checklist
- [ ] plan.json has task_ids[] and task_count (NO embedded tasks[])
- [ ] .task/*.json files preserve task dependencies from implementation_plan
- [ ] Task execution order follows execution_flow
- [ ] Key_points reflected in task descriptions
- [ ] User constraints applied to implementation
- [ ] convergence.criteria are testable
- [ ] plan.json follows plan-overview-base-schema.json
- [ ] Task files follow task-schema.json
-`
-})
-```
-
-**Step 3: Build executionContext**:
-```javascript
-// After plan.json is generated by cli-lite-planning-agent
-const plan = JSON.parse(Read(`${sessionFolder}/plan.json`))
-
-// Load task files from .task/ directory (two-layer format)
-const taskFiles = plan.task_ids.map(id => `${sessionFolder}/.task/${id}.json`)
-
-// Build executionContext (same structure as lite-plan)
-executionContext = {
-  planObject: plan,
-  taskFiles: taskFiles,  // Paths to .task/*.json files (two-layer format)
-  explorationsContext: null,  // Multi-CLI doesn't use exploration files
-  explorationAngles: [],      // No exploration angles
-  explorationManifest: null,  // No manifest
-  clarificationContext: null,  // Store user feedback from Phase 2 if exists
-  executionMethod: userSelection.execution_method,  // From Phase 4
-  codeReviewTool: userSelection.code_review_tool,   // From Phase 4
-  originalUserInput: taskDescription,
-
-  // Optional: Task-level executor assignments
-  executorAssignments: null,  // Could be enhanced in future
-
-  session: {
-    id: sessionId,
-    folder: sessionFolder,
-    artifacts: {
-      explorations: [],  // No explorations in multi-CLI workflow
-      explorations_manifest: null,
-      plan: `${sessionFolder}/plan.json`,
-      task_dir: plan.task_ids ? `${sessionFolder}/.task/` : null,
-      synthesis_rounds: Array.from({length: currentRound}, (_, i) =>
-        `${sessionFolder}/rounds/${i+1}/synthesis.json`
-      ),
-      context_package: `${sessionFolder}/context-package.json`
-    }
-  }
-}
-```
-
-**Step 4: Hand off to Execution**:
-```javascript
-// Skill handoff: Invoke workflow-lite-execute with in-memory context
-Skill({
-  skill: "workflow-lite-execute",
-  args: "--in-memory"
-})
-// executionContext is passed via global variable to workflow-lite-execute (Mode 1: In-Memory Plan)
-```
-
-## Output File Structure
-
-```
-.workflow/.multi-cli-plan/{MCP-task-slug-YYYY-MM-DD}/
-├── session-state.json          # Session tracking (orchestrator)
-├── rounds/
-│   ├── 1/synthesis.json        # Round 1 analysis (cli-discuss-agent)
-│   ├── 2/synthesis.json        # Round 2 analysis (cli-discuss-agent)
-│   └── .../
-├── context-package.json        # Extracted context for planning (orchestrator)
-├── plan.json                   # Plan overview with task_ids[] (NO embedded tasks[])
-└── .task/                      # Independent task files
-    ├── TASK-001.json            # Task file following task-schema.json
-    ├── TASK-002.json
-    └── ...
-```
-
-**File Producers**:
-
-| File | Producer | Content |
-|------|----------|---------|
-| `session-state.json` | Orchestrator | Session metadata, rounds, decisions |
-| `rounds/*/synthesis.json` | cli-discuss-agent | Solutions, convergence, cross-verification |
-| `context-package.json` | Orchestrator | Extracted solution, dependencies, consensus for planning |
-| `plan.json` | cli-lite-planning-agent | Plan overview with task_ids[] referencing .task/ files |
-| `.task/*.json` | cli-lite-planning-agent | Independent task files following task-schema.json |
-
-## synthesis.json Schema
-
-```json
-{
-  "round": 1,
-  "solutions": [{
-    "name": "Solution Name",
-    "source_cli": ["gemini", "codex"],
-    "feasibility": 0.85,
-    "effort": "low|medium|high",
-    "risk": "low|medium|high",
-    "summary": "Brief analysis summary",
-    "implementation_plan": {
-      "approach": "High-level technical approach",
-      "tasks": [
-        {"id": "T1", "name": "Task", "depends_on": [], "files": [], "key_point": "..."}
-      ],
-      "execution_flow": "T1 → T2 → T3",
-      "milestones": ["Checkpoint 1", "Checkpoint 2"]
-    },
-    "dependencies": {"internal": [], "external": []},
-    "technical_concerns": ["Risk 1", "Blocker 2"]
-  }],
-  "convergence": {
-    "score": 0.85,
-    "new_insights": false,
-    "recommendation": "converged|continue|user_input_needed"
-  },
-  "cross_verification": {
-    "agreements": [],
-    "disagreements": [],
-    "resolution": "..."
-  },
-  "clarification_questions": []
-}
-```
-
-**Key Planning Fields**:
-
-| Field | Purpose |
-|-------|---------|
-| `feasibility` | Viability score (0-1) |
-| `implementation_plan.tasks[]` | Discrete tasks with dependencies |
-| `implementation_plan.execution_flow` | Task sequence visualization |
-| `implementation_plan.milestones` | Key checkpoints |
-| `technical_concerns` | Risks and blockers |
-
-**Note**: Solutions ranked by internal scoring (array order = priority)
-
-## TodoWrite Structure
-
-**Initialization**:
-```javascript
-TodoWrite({ todos: [
-  { content: "Phase 1: Context Gathering", status: "in_progress", activeForm: "Gathering context" },
-  { content: "Phase 2: Multi-CLI Discussion", status: "pending", activeForm: "Running discussion" },
-  { content: "Phase 3: Present Options", status: "pending", activeForm: "Presenting options" },
-  { content: "Phase 4: User Decision", status: "pending", activeForm: "Awaiting decision" },
-  { content: "Phase 5: Plan Generation", status: "pending", activeForm: "Generating plan" }
-]})
-```
-
-**During Discussion Rounds**:
-```javascript
-TodoWrite({ todos: [
-  { content: "Phase 1: Context Gathering", status: "completed", activeForm: "Gathering context" },
-  { content: "Phase 2: Multi-CLI Discussion", status: "in_progress", activeForm: "Running discussion" },
-  { content: "  → Round 1: Initial analysis", status: "completed", activeForm: "Analyzing" },
-  { content: "  → Round 2: Deep verification", status: "in_progress", activeForm: "Verifying" },
-  { content: "Phase 3: Present Options", status: "pending", activeForm: "Presenting options" },
-  // ...
-]})
-```
-
-## Error Handling
-
-| Error | Resolution |
-|-------|------------|
-| ACE search fails | Fall back to Glob/Grep for file discovery |
-| Agent fails | Retry once, then present partial results |
-| CLI timeout (in agent) | Agent uses fallback: gemini → codex → claude |
-| No convergence | Present best options, flag uncertainty |
-| synthesis.json parse error | Request agent retry |
-| User cancels | Save session for later resumption |
-
-## Configuration
-
-| Flag | Default | Description |
-|------|---------|-------------|
-| `--max-rounds` | 3 | Maximum discussion rounds |
-| `--tools` | gemini,codex | CLI tools for analysis |
-| `--mode` | parallel | Execution mode: parallel or serial |
-| `--auto-execute` | false | Auto-execute after approval |
-
-## Best Practices
-
-1. **Be Specific**: Detailed task descriptions improve ACE context quality
-2. **Provide Feedback**: Use clarification rounds to refine requirements
-3. **Trust Cross-Verification**: Multi-CLI consensus indicates high confidence
-4. **Review Trade-offs**: Consider pros/cons before selecting solution
-5. **Check synthesis.json**: Review agent output for detailed analysis
-6. **Iterate When Needed**: Don't hesitate to request more analysis
-
-## Related Commands
-
-```bash
-# Simpler single-round planning
-/workflow-lite-planex "task description"
-
-# Issue-driven discovery
-/issue:discover-by-prompt "find issues"
-
-# View session files
-cat .workflow/.multi-cli-plan/{session-id}/plan.json
-cat .workflow/.multi-cli-plan/{session-id}/rounds/1/synthesis.json
-cat .workflow/.multi-cli-plan/{session-id}/context-package.json
-
-# Direct execution (if you have plan.json)
-# Use workflow-lite-planex or workflow-multi-cli-plan (execution is integrated)
-```
-
-## Next Phase
-
-Return to orchestrator, then auto-continue via `Skill({ skill: "workflow-lite-execute", args: "--in-memory" })` with executionContext.
--- a/.claude/skills/workflow-skill-designer/SKILL.md
+++ b/.claude/skills/workflow-skill-designer/SKILL.md
@@ -141,7 +141,7 @@ Read("phases/02-lite-execute.md")
 // Execute with executionContext (Mode 1)

 // WRONG: Skill routing (unnecessary round-trip)
-Skill(skill="workflow-lite-planex", args="--in-memory")
+Skill(skill="workflow-lite-plan", args="--in-memory")
 ```

 ### Pattern 8: Phase File Hygiene
--- a/.claude/skills/workflow-skill-designer/phases/03-phase-design.md
+++ b/.claude/skills/workflow-skill-designer/phases/03-phase-design.md
@@ -60,7 +60,7 @@ Read("phases/02-lite-execute.md")
 // Execute with executionContext (Mode 1)

 // WRONG: Skill routing (unnecessary round-trip)
-Skill(skill="workflow-lite-planex", args="--in-memory")
+Skill(skill="workflow-lite-plan", args="--in-memory")
 ```

 ### Content Restriction Enforcement