ccgx-workflow 2.2.0 → 2.3.0

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import cac from 'cac';
 import ansis from 'ansis';
-import { d as diagnoseMcpConfig, i as isWindows, r as readClaudeCodeConfig, f as fixWindowsMcpConfig, w as writeClaudeCodeConfig, a as readCcgConfig, b as initI18n, c as i18n, s as showMainMenu, e as init, g as configMcp, v as version } from './shared/ccgx-workflow.k6gRMX3r.mjs';
+import { d as diagnoseMcpConfig, i as isWindows, r as readClaudeCodeConfig, f as fixWindowsMcpConfig, w as writeClaudeCodeConfig, a as readCcgConfig, b as initI18n, c as i18n, s as showMainMenu, e as init, g as configMcp, v as version } from './shared/ccgx-workflow.BYuVglaM.mjs';
 import { execSync } from 'node:child_process';
 import 'inquirer';
 import 'ora';

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { h as collectSkills, j as resolvePluginBashCommand } from './shared/ccgx-workflow.k6gRMX3r.mjs';
-export { k as changeLanguage, G as checkForUpdates, I as collectInvocableSkills, H as compareVersions, m as createDefaultConfig, n as createDefaultRouting, J as generateCommandContent, o as getCcgDir, p as getConfigPath, E as getCurrentVersion, F as getLatestVersion, t as getWorkflowById, q as getWorkflowConfigs, c as i18n, e as init, b as initI18n, y as installAceTool, z as installAceToolRs, K as installSkillCommands, x as installWorkflows, C as migrateToV1_4_0, D as needsMigration, L as parseFrontmatter, a as readCcgConfig, s as showMainMenu, B as uninstallAceTool, A as uninstallWorkflows, u as update, l as writeCcgConfig } from './shared/ccgx-workflow.k6gRMX3r.mjs';
+import { h as collectSkills, j as resolvePluginBashCommand } from './shared/ccgx-workflow.BYuVglaM.mjs';
+export { k as changeLanguage, G as checkForUpdates, I as collectInvocableSkills, H as compareVersions, m as createDefaultConfig, n as createDefaultRouting, J as generateCommandContent, o as getCcgDir, p as getConfigPath, E as getCurrentVersion, F as getLatestVersion, t as getWorkflowById, q as getWorkflowConfigs, c as i18n, e as init, b as initI18n, y as installAceTool, z as installAceToolRs, K as installSkillCommands, x as installWorkflows, C as migrateToV1_4_0, D as needsMigration, L as parseFrontmatter, a as readCcgConfig, s as showMainMenu, B as uninstallAceTool, A as uninstallWorkflows, u as update, l as writeCcgConfig } from './shared/ccgx-workflow.BYuVglaM.mjs';
 import { existsSync, readFileSync, mkdirSync, writeFileSync, statSync, readdirSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { homedir } from 'node:os';

package/dist/shared/{ccgx-workflow.k6gRMX3r.mjs → ccgx-workflow.BYuVglaM.mjs}

@@ -13,7 +13,7 @@ import { join as join$2 } from 'node:path/posix';
 import { join as join$1 } from 'node:path';
 import i18next from 'i18next';
 
-const version = "2.2.0";
+const version = "2.3.0";
 
 function cmd(id, order, category, name, nameEn, description, descriptionEn, cmdOverride) {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccgx-workflow",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Multi-model orchestration for Claude Code. Codex + Gemini parallel collaboration with fresh-context subagent protocols, OS-level process isolation, and Plan-Critic-Verify quality tiers. Successor to ccg-workflow.",
   "type": "module",
   "packageManager": "pnpm@10.17.1",

package/templates/commands/codex-exec.md

@@ -46,60 +46,80 @@ $ARGUMENTS
 - 如果用户通过 `/add-dir` 添加了多个工作区，先用 Glob/Grep 确定任务相关的工作区
 - 如果无法确定，用 `AskUserQuestion` 询问用户选择目标工作区
 
-**{{BACKEND_PRIMARY}} 执行调用语法**：
+**调用通道路由（CCG codeagent 退役，v2.2.0+）**
+
+1. **优先 plugin spawn**（默认）：plugin 已装 → `Agent(subagent_type="codex:codex-rescue")`，session 复用通过 prompt 内 `--resume` flag 表达（subagent 映射为 codex `--resume-last`）。
+2. **降级 codeagent-wrapper**（BC fallback）：plugin 未装 → Bash 调用，保留 `resume <SESSION_ID>` 显式会话管理。
+
+**判定**：preflight `Bash` 跑 `ls ~/.claude/plugins/` 看有无 `codex@*` / `gemini@*` 子目录。
+
+**会话模型差异**：
+- **通道 A（plugin）**：session 是同一 Claude session 内的最近 codex/gemini thread（`--resume-last`）。同任务多 phase 顺序执行 OK；不支持跨任务跳点 resume by ID。
+- **通道 B（wrapper）**：显式 `SESSION_ID`，可跨流程任意复用历史 thread。
+
+---
+
+**{{BACKEND_PRIMARY}} 执行调用语法（通道 A 默认）**：
+
+**预备动作**：spawn 前主线先 Read 角色提示词（如 `~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/architect.md`）拼入 `<role>` 块。
 
 ```
-Bash({
-  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EXEC_EOF'
-<TASK>
+Agent({
+  subagent_type: "codex:codex-rescue",
+  description: "简短描述",
+  prompt: `<role>
+${implementerRole}
+</role>
+
+<workdir>{{WORKDIR}}</workdir>
+
+<task>
 <指令内容>
-</TASK>
-EXEC_EOF",
-  run_in_background: true,
-  timeout: 3600000,
-  description: "简短描述"
+</task>
+
+<action_safety>
+- Stay strictly within the plan scope
+- Run lint/typecheck if available before reporting completion
+</action_safety>`
 })
 ```
 
-**{{BACKEND_PRIMARY}} 复用会话调用**：
+**{{BACKEND_PRIMARY}} 复用会话调用（通道 A，--resume）**：在 prompt 第一行加 `--resume`（subagent 提取为 routing flag 映射 codex `--resume-last`，不写入 task text）：
 
 ```
-Bash({
-  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}resume <SESSION_ID> - \"{{WORKDIR}}\" <<'EXEC_EOF'
-<TASK>
-<指令内容>
-</TASK>
-EXEC_EOF",
-  run_in_background: true,
-  timeout: 3600000,
-  description: "简短描述"
+Agent({
+  subagent_type: "codex:codex-rescue",
+  description: "简短描述",
+  prompt: `--resume
+
+<task>
+<指令内容（仅 delta，不重述完整 plan）>
+</task>`
 })
 ```
 
-**审核调用语法**（Codex ∥ Gemini 并行审查）：
+**通道 B — wrapper BC fallback**（plugin 未装时）：
 
 ```
+# 新会话（保留 SESSION_ID）
 Bash({
-  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend <{{BACKEND_PRIMARY}}|{{FRONTEND_PRIMARY}}> {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'REVIEW_EOF'
-ROLE_FILE: <角色提示词路径>
-<TASK>
-Scope: Audit the code changes made by Codex.
-Inputs:
-- The git diff (applied changes)
-- The implementation plan
-Constraints:
-- Do NOT modify any files.
-</TASK>
-OUTPUT:
-1) A prioritized list of issues (severity, file, rationale)
-2) If code changes are needed, include a Unified Diff Patch in a fenced code block.
-REVIEW_EOF",
+  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EXEC_EOF'\n<TASK>\n<指令内容>\n</TASK>\nEXEC_EOF",
   run_in_background: true,
   timeout: 3600000,
-  description: "简短描述"
+  description: "简短描述 (BC)"
+})
+
+# 复用会话
+Bash({
+  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}resume <SESSION_ID> - \"{{WORKDIR}}\" <<'EXEC_EOF'\n<TASK>\n<指令内容>\n</TASK>\nEXEC_EOF",
+  run_in_background: true,
+  timeout: 3600000,
+  description: "简短描述 (BC, resume)"
 })
 ```
 
+**审核调用（通道 A，双模型并行）**：参照 `/ccg:spec-review` 的 Step 3.1 pattern——`Agent(codex:codex-rescue)` + `Agent(gemini:gemini-rescue)` 同 message 并行，预读 `reviewer.md` 拼入 `<role>` 块。通道 B 同 `<<'REVIEW_EOF'... wrapper` 模式（已 deprecated）。
+
 **角色提示词**：
 
 | 阶段 | 后端 | 前端 |
@@ -156,12 +176,21 @@ REVIEW_EOF",
 
 `[模式：执行]`
 
-**将计划转化为 Codex 结构化指令，一次性下发**：
+**将计划转化为 Codex 结构化指令，一次性下发**。按顶部「调用通道路由」选 A 或 B：
+
+**通道 A — plugin spawn（默认）**：
 
 ```
-Bash({
-  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}resume <CODEX_SESSION> - \"{{WORKDIR}}\" <<'EXEC_EOF'
-<TASK>
+Agent({
+  subagent_type: "codex:codex-rescue",
+  description: "Codex 全权执行：<计划标题>",
+  prompt: `${codexSessionExists ? '--resume\n' : ''}<role>
+${implementerRole}  // 主线预读 ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/architect.md
+</role>
+
+<workdir>{{WORKDIR}}</workdir>
+
+<task>
 You are a full-stack execution agent. Implement the following plan end-to-end.
 
 ## Implementation Plan
@@ -180,48 +209,53 @@ Before coding, verify you have sufficient context:
 Implement each step from the plan in order:
 <将计划的实施步骤逐条列出>
 
-Constraints:
-- Follow existing code conventions in this project
-- Handle edge cases and errors properly
-- Keep changes minimal and focused on the plan
-- Do NOT modify files outside the plan's scope
-
 ### Step 3: Self-Verification
 After implementation:
 - Run lint/typecheck if available
-- Run existing tests: <从计划中提取测试命令，如无则 "run project's test suite">
+- Run existing tests: <从计划中提取测试命令>
 - Verify no regressions in touched modules
+</task>
+
+<action_safety>
+- Follow existing code conventions in this project
+- Handle edge cases and errors properly
+- Keep changes minimal and focused on the plan
+- Do NOT modify files outside the plan's scope
+</action_safety>
 
-## Output Format
-Respond with a structured report:
+<structured_output_contract>
+Respond with this structured report:
 
 ### CONTEXT_GATHERED
 <What information was searched/found, key findings from MCP tools>
 
 ### CHANGES_MADE
-For each file changed:
-- File path
-- What was changed and why
-- Lines added/removed
+For each file changed: file path / what changed / why / lines added-removed
 
 ### VERIFICATION_RESULTS
 - Lint/typecheck: pass/fail
 - Tests: pass/fail (details if fail)
-- Manual checks performed
 
 ### REMAINING_ISSUES
-<Any unresolved issues, edge cases, or suggestions>
-</TASK>
-EXEC_EOF",
+<Any unresolved issues>
+</structured_output_contract>`
+})
+```
+
+**📌 同 Claude session 内后续 Phase 2.5（修正）会自动通过 `--resume` 接到 codex 的 last thread**（plugin 路径无显式 SESSION_ID）。
+
+**通道 B — wrapper BC fallback**：
+
+```
+Bash({
+  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}resume <CODEX_SESSION> - \"{{WORKDIR}}\" <<'EXEC_EOF'\n<TASK>\nYou are a full-stack execution agent. Implement the following plan end-to-end.\n\n## Implementation Plan\n<完整计划>\n\n## Output Format\n<同上结构化报告>\n</TASK>\nEXEC_EOF",
   run_in_background: true,
   timeout: 3600000,
-  description: "Codex 全权执行：<计划标题>"
+  description: "Codex 全权执行：<计划标题> (BC)"
 })
 ```
 
-**📌 记录 SESSION_ID**（`CODEX_EXEC_SESSION`）
-
-如果计划中无 `CODEX_SESSION`（用户跳过了 `/ccg:plan` 的多模型分析），则使用新会话。
+**📌 记录 SESSION_ID**（`CODEX_EXEC_SESSION`）供 Phase 2.5 显式 resume。
 
 事件驱动等待：spawn 完后主线 turn end，等 task-notification 自动唤醒。
 
@@ -256,12 +290,17 @@ EXEC_EOF",
 
 `[模式：追加]`
 
-**复用 Codex 会话，下发修正指令**：
+**复用 Codex 会话，下发修正指令**。按顶部「调用通道路由」选 A 或 B：
+
+**通道 A — plugin spawn（默认，--resume）**：
 
 ```
-Bash({
-  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}resume <CODEX_EXEC_SESSION> - \"{{WORKDIR}}\" <<'FIXEOF'
-<TASK>
+Agent({
+  subagent_type: "codex:codex-rescue",
+  description: "Codex 修正：<问题简述>",
+  prompt: `--resume
+
+<task>
 The implementation needs corrections:
 
 ## Issues Found
@@ -272,12 +311,19 @@ The implementation needs corrections:
 1. <具体修正要求>
 2. <具体修正要求>
 
-Apply fixes and re-run tests. Report results in the same format.
-</TASK>
-FIXEOF",
+Apply fixes and re-run tests. Report results in the same format as Phase 1.
+</task>`
+})
+```
+
+**通道 B — wrapper BC fallback**：
+
+```
+Bash({
+  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}resume <CODEX_EXEC_SESSION> - \"{{WORKDIR}}\" <<'FIXEOF'\n<TASK>\nThe implementation needs corrections:\n\n## Issues Found\n1. ...\n\n## Required Fixes\n1. ...\n\nApply fixes and re-run tests. Report results in the same format.\n</TASK>\nFIXEOF",
   run_in_background: true,
   timeout: 3600000,
-  description: "Codex 修正：<问题简述>"
+  description: "Codex 修正：<问题简述> (BC)"
 })
 ```
 

package/templates/commands/spec-impl.md

@@ -45,17 +45,58 @@ description: '按规范执行 + 多模型协作 + 归档'
 
    **工作目录**：`{{WORKDIR}}` **必须通过 Bash 执行 `pwd`（Unix）或 `cd`（Windows CMD）获取当前工作目录的绝对路径**，禁止从 `$HOME` 或环境变量推断。如果用户通过 `/add-dir` 添加了多个工作区，先确定任务相关的工作区。
 
-   For each task:
+   **调用通道路由（CCG codeagent 退役，v2.2.0+）**
+
+   1. **优先 plugin spawn**（默认）：plugin 已装 → `Agent(subagent_type="<codex:codex-rescue|gemini:gemini-rescue>")`，主线接 ≤200 token 摘要。
+   2. **降级 codeagent-wrapper**（BC fallback）：plugin 未装 → Bash 调用，保留 SESSION_ID 供 Step 7 review 复用。
+
+   **预备动作**：主线先 Read 角色提示词（这里用 `architect.md` 或对应实施角色），把内容拼入 `<role>` 块。
+
+   **通道 A — plugin spawn（默认，每 task 独立 fresh-context）**：
+
    ```
-   codeagent-wrapper --progress --backend <{{BACKEND_PRIMARY}}|{{FRONTEND_PRIMARY}}> {{GEMINI_MODEL_FLAG}}- "{{WORKDIR}}" <<'EOF'
-   TASK: <task description from tasks.md>
-   CONTEXT: <relevant code context>
-   CONSTRAINTS: <constraints from spec>
-   OUTPUT: Unified Diff Patch format ONLY
-   EOF
+   Agent({
+     subagent_type: "<codex:codex-rescue|gemini:gemini-rescue>",
+     description: "spec-impl: <task name>",
+     prompt: `<role>
+${implementerRole}
+</role>
+
+<workdir>{{WORKDIR}}</workdir>
+
+<task>
+TASK: <task description from tasks.md>
+CONTEXT: <relevant code context>
+CONSTRAINTS: <constraints from spec>
+</task>
+
+<action_safety>
+- Stay strictly within tasks.md scope
+- Do NOT introduce dependencies not in the plan
+- Prefer minimal targeted changes
+</action_safety>
+
+<structured_output_contract>
+Return Unified Diff Patch format ONLY (no preamble, no commentary).
+The diff will be reviewed before apply; do not assume it's been applied.
+</structured_output_contract>`
+   })
    ```
 
-   **会话复用**：保存返回的 `SESSION_ID:`（{{BACKEND_PRIMARY}} → `CODEX_PROTO_SESSION`，{{FRONTEND_PRIMARY}} → `GEMINI_PROTO_SESSION`），Step 7 审查时复用。
+   **通道 B — codeagent-wrapper fallback**（plugin 未装时；保留 SESSION_ID 供 Step 7 复用）：
+
+   ```
+   Bash({
+     command: "~/.claude/bin/codeagent-wrapper --progress --backend <{{BACKEND_PRIMARY}}|{{FRONTEND_PRIMARY}}> {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nTASK: <task description from tasks.md>\nCONTEXT: <relevant code context>\nCONSTRAINTS: <constraints from spec>\nOUTPUT: Unified Diff Patch format ONLY\nEOF",
+     run_in_background: true,
+     timeout: 3600000,
+     description: "spec-impl: <task name> (BC)"
+   })
+   ```
+
+   **会话模型差异**：
+   - **通道 A（plugin）**：每个 task 独立 fresh-context spawn，**无显式 SESSION_ID**。Step 7 review 时由主线把 Step 4-6 的变更摘要（diff + spec 引用）显式拼入 reviewer prompt。
+   - **通道 B（wrapper BC）**：保存返回的 `SESSION_ID:`（{{BACKEND_PRIMARY}} → `CODEX_PROTO_SESSION`，{{FRONTEND_PRIMARY}} → `GEMINI_PROTO_SESSION`），Step 7 审查 `resume <SESSION_ID>` 复用上下文。
 
 5. **Rewrite Prototype to Production Code**
    Upon receiving diff patch, **NEVER apply directly**. Rewrite by:
@@ -93,6 +134,13 @@ description: '按规范执行 + 多模型协作 + 归档'
 
    **Step 7.1**: In ONE message, spawn TWO models in parallel.
 
+   **⚠ 预备动作（spawn 前必须执行）**：`codex:codex-rescue` / `gemini:gemini-rescue` 是 thin forwarder，不会主动 Read 路径文件。主线必须在 spawn 前先 Read 两个角色提示词文件，把**内容**直接拼入下方 Agent prompt 的 `<role>` 块。
+
+   - backend role: `Read("~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md")` → `${backendRole}`
+   - frontend role: `Read("~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md")` → `${frontendRole}`
+
+   Prompt 结构按 `gpt-5-4-prompting` skill 推荐：`<role>` + `<task>` + `<grounding_rules>` + `<dig_deeper_nudge>` + `<structured_output_contract>`。
+
    **通道 A — plugin spawn（默认，无 session）**：
 
    **FIRST Agent call ({{BACKEND_PRIMARY}})**:
@@ -100,21 +148,43 @@ description: '按规范执行 + 多模型协作 + 归档'
    Agent({
      subagent_type: "codex:codex-rescue",
      description: "spec-impl: correctness/security review",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md
+     prompt: `<role>
+${backendRole}
+</role>
 
-WORKDIR: {{WORKDIR}}
+<workdir>{{WORKDIR}}</workdir>
 
-<TASK>
-Review the implementation changes:
+<task>
+Review the implementation changes along backend dimensions:
 - Correctness: logic errors, edge cases
 - Security: injection, auth issues
 - Spec compliance: constraints satisfied
 
 变更摘要：<列出 Step 5/6 涉及的文件 + 关键 diff>
-</TASK>
 
-OUTPUT: JSON with findings.
-Return ≤200 token structured summary (plugin-native protocol).`
+Read-only review. Do NOT modify any file.
+</task>
+
+<grounding_rules>
+- Every finding must cite file:line in the listed diff
+- If a constraint was satisfied, list it in passed_checks
+- "I couldn't verify X" is acceptable; fabricating X is not
+</grounding_rules>
+
+<dig_deeper_nudge>
+- For each Critical finding, check whether the same root cause appears elsewhere in the diff
+- Prefer one well-cited Critical over five vague Warnings
+</dig_deeper_nudge>
+
+<structured_output_contract>
+Return JSON ONLY (no preamble):
+{
+  "findings": [{"severity": "Critical|Warning|Info", "dimension": "logic|security|spec_compliance", "file": "path", "line": N, "description": "...", "fix_suggestion": "..."}],
+  "passed_checks": ["..."],
+  "summary": "Overall assessment"
+}
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 
@@ -123,21 +193,42 @@ Return ≤200 token structured summary (plugin-native protocol).`
    Agent({
      subagent_type: "gemini:gemini-rescue",
      description: "spec-impl: maintainability/patterns review",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md
+     prompt: `<role>
+${frontendRole}
+</role>
 
-WORKDIR: {{WORKDIR}}
+<workdir>{{WORKDIR}}</workdir>
 
-<TASK>
-Review the implementation changes:
+<task>
+Review the implementation changes along maintainability/integration dimensions:
 - Maintainability: readability, complexity
 - Patterns: consistency with project style
 - Integration: cross-module impacts
 
 变更摘要：<列出 Step 5/6 涉及的文件 + 关键 diff>
-</TASK>
 
-OUTPUT: JSON with findings.
-Return ≤200 token structured summary (plugin-native protocol).`
+Read-only review. Do NOT modify any file.
+</task>
+
+<grounding_rules>
+- Every finding must cite file:line in the listed diff
+- If an aspect was clean, list it in passed_checks
+</grounding_rules>
+
+<dig_deeper_nudge>
+- Check if the same pattern issue appears in adjacent files
+- Prefer one well-cited Critical over five vague Warnings
+</dig_deeper_nudge>
+
+<structured_output_contract>
+Return JSON ONLY (no preamble):
+{
+  "findings": [{"severity": "Critical|Warning|Info", "dimension": "maintainability|patterns|integration", "file": "path", "line": N, "description": "...", "fix_suggestion": "..."}],
+  "passed_checks": ["..."],
+  "summary": "Overall assessment"
+}
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 

package/templates/commands/spec-plan.md

@@ -42,6 +42,13 @@ description: '多模型分析 → 消除歧义 → 零决策可执行计划'
 
    **Step 2.1**: In ONE message, spawn TWO models in parallel.
 
+   **⚠ 预备动作（spawn 前必须执行）**：`codex:codex-rescue` / `gemini:gemini-rescue` 是 thin forwarder，不会主动 Read 路径文件。主线必须在 spawn 前先 Read 两个角色提示词文件，把**内容**直接拼入下方 Agent prompt 的 `<role>` 块。
+
+   - backend role: `Read("~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/analyzer.md")` → `${backendRole}`
+   - frontend role: `Read("~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/analyzer.md")` → `${frontendRole}`
+
+   Prompt 结构按 `gpt-5-4-prompting` skill 推荐：`<role>` + `<task>` + `<grounding_rules>` + `<structured_output_contract>`。
+
    **通道 A — plugin spawn（默认）**：
 
    **FIRST Agent call ({{BACKEND_PRIMARY}})**:
@@ -49,20 +56,37 @@ description: '多模型分析 → 消除歧义 → 零决策可执行计划'
    Agent({
      subagent_type: "codex:codex-rescue",
      description: "spec-plan: backend analysis",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/analyzer.md
+     prompt: `<role>
+${backendRole}
+</role>
 
-WORKDIR: {{WORKDIR}}
+<workdir>{{WORKDIR}}</workdir>
 
-<TASK>
+<task>
 Analyze change <change_id> from backend perspective:
 - Implementation approach
 - Technical risks
 - Alternative architectures
 - Edge cases and failure modes
-</TASK>
-
-OUTPUT: JSON with analysis.
-Return ≤200 token structured summary (plugin-native protocol).`
+</task>
+
+<grounding_rules>
+- Cite file:line for claims about existing code
+- Mark hypotheses; don't state guesses as facts
+- For risks, distinguish "observed" (specific code path) vs "potential" (theoretical)
+</grounding_rules>
+
+<structured_output_contract>
+Return JSON ONLY (no preamble):
+{
+  "approach": "selected implementation strategy with rationale",
+  "alternatives_rejected": [{"alt": "...", "reason": "..."}],
+  "technical_risks": [{"risk": "...", "severity": "high|medium|low", "mitigation": "..."}],
+  "edge_cases": ["..."],
+  "failure_modes": ["..."]
+}
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 
@@ -71,19 +95,33 @@ Return ≤200 token structured summary (plugin-native protocol).`
    Agent({
      subagent_type: "gemini:gemini-rescue",
      description: "spec-plan: frontend analysis",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/analyzer.md
+     prompt: `<role>
+${frontendRole}
+</role>
 
-WORKDIR: {{WORKDIR}}
+<workdir>{{WORKDIR}}</workdir>
 
-<TASK>
+<task>
 Analyze change <change_id> from frontend/integration perspective:
 - Maintainability assessment
 - Scalability considerations
 - Integration conflicts
-</TASK>
-
-OUTPUT: JSON with analysis.
-Return ≤200 token structured summary (plugin-native protocol).`
+</task>
+
+<grounding_rules>
+- Cite file:line for claims about existing code
+- Mark hypotheses; don't state guesses as facts
+</grounding_rules>
+
+<structured_output_contract>
+Return JSON ONLY (no preamble):
+{
+  "maintainability": {"score": "good|moderate|concerning", "factors": ["..."]},
+  "scalability": [{"dimension": "...", "consideration": "..."}],
+  "integration_conflicts": [{"target": "...", "conflict": "...", "resolution": "..."}]
+}
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 

package/templates/commands/spec-research.md

@@ -81,6 +81,13 @@ description: '需求 → 约束集（并行探索 + OPSX 提案）'
 
    **Step 4.1**: In ONE message, spawn TWO models in parallel.
 
+   **⚠ 预备动作（spawn 前必须执行）**：`codex:codex-rescue` / `gemini:gemini-rescue` 是 thin forwarder（一行 `Bash node companion.mjs task <prompt>` 转发），**不会**主动 Read 路径文件。主线必须在 spawn 前先 Read 两个角色提示词文件，把**内容**直接拼入下方 Agent prompt 的 `<role>` 块——不是写路径。
+
+   - backend role: `Read("~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/analyzer.md")` → `${backendRole}`
+   - frontend role: `Read("~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/analyzer.md")` → `${frontendRole}`
+
+   Prompt 结构按 `gpt-5-4-prompting` skill 推荐（XML 块、紧凑、操作性）：`<role>` + `<task>` + `<grounding_rules>` + `<structured_output_contract>`。
+
    **通道 A — plugin spawn（默认）**：
 
    **FIRST Agent call ({{BACKEND_PRIMARY}} — backend boundaries)**:
@@ -88,20 +95,40 @@ description: '需求 → 约束集（并行探索 + OPSX 提案）'
    Agent({
      subagent_type: "codex:codex-rescue",
      description: "spec-research: backend boundary exploration",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/analyzer.md
+     prompt: `<role>
+${backendRole}
+</role>
 
-WORKDIR: {{WORKDIR}}
+<workdir>{{WORKDIR}}</workdir>
 
-<TASK>
+<task>
 Explore backend context boundaries for <change description>:
 - Existing structures and patterns
 - Conventions in use
 - Hard constraints limiting solution space
 - Dependencies and risks
-</TASK>
-
-OUTPUT: JSON using the output template above.
-Return ≤200 token structured summary (plugin-native protocol).`
+</task>
+
+<grounding_rules>
+- Cite file:line for every claim about existing code
+- Mark hypotheses explicitly; don't state guesses as facts
+- If a question can't be answered from the repo, list it in open_questions
+</grounding_rules>
+
+<structured_output_contract>
+Return JSON ONLY (no preamble, no commentary):
+{
+  "module_name": "context boundary explored",
+  "existing_structures": ["key patterns found"],
+  "existing_conventions": ["standards in use"],
+  "constraints_discovered": ["hard constraints limiting solution space"],
+  "open_questions": ["ambiguities requiring user input"],
+  "dependencies": ["cross-module dependencies"],
+  "risks": ["potential blockers"],
+  "success_criteria_hints": ["observable success behaviors"]
+}
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 
@@ -110,20 +137,40 @@ Return ≤200 token structured summary (plugin-native protocol).`
    Agent({
      subagent_type: "gemini:gemini-rescue",
      description: "spec-research: frontend boundary exploration",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/analyzer.md
+     prompt: `<role>
+${frontendRole}
+</role>
 
-WORKDIR: {{WORKDIR}}
+<workdir>{{WORKDIR}}</workdir>
 
-<TASK>
+<task>
 Explore frontend context boundaries for <change description>:
 - Existing structures and patterns
 - Conventions in use
 - Hard constraints limiting solution space
 - Dependencies and risks
-</TASK>
-
-OUTPUT: JSON using the output template above.
-Return ≤200 token structured summary (plugin-native protocol).`
+</task>
+
+<grounding_rules>
+- Cite file:line for every claim about existing code
+- Mark hypotheses explicitly; don't state guesses as facts
+- If a question can't be answered from the repo, list it in open_questions
+</grounding_rules>
+
+<structured_output_contract>
+Return JSON ONLY (no preamble, no commentary):
+{
+  "module_name": "context boundary explored",
+  "existing_structures": ["key patterns found"],
+  "existing_conventions": ["standards in use"],
+  "constraints_discovered": ["hard constraints limiting solution space"],
+  "open_questions": ["ambiguities requiring user input"],
+  "dependencies": ["cross-module dependencies"],
+  "risks": ["potential blockers"],
+  "success_criteria_hints": ["observable success behaviors"]
+}
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 

package/templates/commands/spec-review.md

@@ -43,6 +43,13 @@ description: '双模型交叉审查（独立工具，随时可用）'
 
    **Step 3.1**: In ONE message, spawn TWO models in parallel.
 
+   **⚠ 预备动作（spawn 前必须执行）**：`codex:codex-rescue` / `gemini:gemini-rescue` 是 thin forwarder，不会主动 Read 路径文件。主线必须在 spawn 前先 Read 两个角色提示词文件，把**内容**直接拼入下方 Agent prompt 的 `<role>` 块。
+
+   - backend role: `Read("~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md")` → `${backendRole}`
+   - frontend role: `Read("~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md")` → `${frontendRole}`
+
+   Prompt 结构按 `gpt-5-4-prompting` skill 推荐（review 类任务额外加 `<grounding_rules>` + `<dig_deeper_nudge>`）。
+
    **通道 A — plugin spawn（默认）**：
 
    **FIRST Agent call ({{BACKEND_PRIMARY}})**:
@@ -50,22 +57,37 @@ description: '双模型交叉审查（独立工具，随时可用）'
    Agent({
      subagent_type: "codex:codex-rescue",
      description: "spec-review: backend/logic review",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md
-
-WORKDIR: {{WORKDIR}}
-
-<TASK>
-Review proposal <proposal_id> implementation:
-
-## {{BACKEND_PRIMARY}} Review Dimensions
-1. **Spec Compliance**: Verify ALL constraints from spec are satisfied
-2. **PBT Properties**: Check invariants, idempotency, bounds are correctly implemented
-3. **Logic Correctness**: Edge cases, error handling, algorithm correctness
-4. **Backend Security**: Injection vulnerabilities, auth checks, input validation
-5. **Regression Risk**: Interface compatibility, type safety, breaking changes
-</TASK>
-
-OUTPUT (JSON):
+     prompt: `<role>
+${backendRole}
+</role>
+
+<workdir>{{WORKDIR}}</workdir>
+
+<task>
+Review proposal <proposal_id> implementation along backend dimensions:
+1. Spec Compliance — Verify ALL constraints from spec are satisfied
+2. PBT Properties — Check invariants, idempotency, bounds correctly implemented
+3. Logic Correctness — Edge cases, error handling, algorithm correctness
+4. Backend Security — Injection vulnerabilities, auth checks, input validation
+5. Regression Risk — Interface compatibility, type safety, breaking changes
+
+Read-only review. Do NOT modify any file.
+</task>
+
+<grounding_rules>
+- Every finding must cite file:line
+- If a constraint was satisfied, list it in passed_checks (don't omit positives)
+- "I couldn't verify X" is acceptable; fabricating X is not
+- Distinguish bug (observable failure path) from concern (style/maintainability preference)
+</grounding_rules>
+
+<dig_deeper_nudge>
+- For each Critical finding, check whether the same root cause appears elsewhere in the diff
+- Prefer one well-cited Critical over five vague Warnings
+</dig_deeper_nudge>
+
+<structured_output_contract>
+Return JSON ONLY (no preamble):
 {
   "findings": [
     {
@@ -81,8 +103,8 @@ OUTPUT (JSON):
   "passed_checks": ["List of verified constraints/properties"],
   "summary": "Overall assessment"
 }
-
-Return ≤200 token structured summary (plugin-native protocol).`
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 
@@ -91,22 +113,36 @@ Return ≤200 token structured summary (plugin-native protocol).`
    Agent({
      subagent_type: "gemini:gemini-rescue",
      description: "spec-review: patterns/integration review",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md
-
-WORKDIR: {{WORKDIR}}
-
-<TASK>
-Review proposal <proposal_id> implementation:
-
-## {{FRONTEND_PRIMARY}} Review Dimensions
-1. **Pattern Consistency**: Naming conventions, code style, project patterns
-2. **Maintainability**: Readability, complexity, documentation adequacy
-3. **Integration Risk**: Dependency changes, cross-module impacts
-4. **Frontend Security**: XSS, CSRF, sensitive data exposure
-5. **Spec Alignment**: Implementation matches spec intent (not just letter)
-</TASK>
-
-OUTPUT (JSON):
+     prompt: `<role>
+${frontendRole}
+</role>
+
+<workdir>{{WORKDIR}}</workdir>
+
+<task>
+Review proposal <proposal_id> implementation along frontend/integration dimensions:
+1. Pattern Consistency — Naming conventions, code style, project patterns
+2. Maintainability — Readability, complexity, documentation adequacy
+3. Integration Risk — Dependency changes, cross-module impacts
+4. Frontend Security — XSS, CSRF, sensitive data exposure
+5. Spec Alignment — Implementation matches spec intent (not just letter)
+
+Read-only review. Do NOT modify any file.
+</task>
+
+<grounding_rules>
+- Every finding must cite file:line
+- If an aspect was clean, list it in passed_checks
+- "I couldn't verify X" is acceptable; fabricating X is not
+</grounding_rules>
+
+<dig_deeper_nudge>
+- For each Critical finding, check whether the same pattern issue appears in adjacent files
+- Prefer one well-cited Critical over five vague Warnings
+</dig_deeper_nudge>
+
+<structured_output_contract>
+Return JSON ONLY (no preamble):
 {
   "findings": [
     {
@@ -122,8 +158,8 @@ OUTPUT (JSON):
   "passed_checks": ["List of verified aspects"],
   "summary": "Overall assessment"
 }
-
-Return ≤200 token structured summary (plugin-native protocol).`
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 

package/templates/commands/team.md

@@ -168,6 +168,11 @@ Phase 8: INTEGRATION   → Lead 全量验证 + 报告 + 清理
 
    - **CRITICAL**: 必须在一条消息中同时发起两个并行调用。
 
+   **⚠ 预备动作（spawn 前必须执行）**：`codex:codex-rescue` / `gemini:gemini-rescue` 是 thin forwarder，不会主动 Read 路径文件。主线必须在 spawn 前先 Read 两个角色提示词文件，把**内容**直接拼入下方 Agent prompt 的 `<role>` 块。
+
+   - backend role: `Read("~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/architect.md")` → `${backendRole}`
+   - frontend role: `Read("~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/architect.md")` → `${frontendRole}`
+
    **通道 A — plugin spawn（默认）**：
 
    **FIRST Agent call ({{BACKEND_PRIMARY}})**:
@@ -175,16 +180,38 @@ Phase 8: INTEGRATION   → Lead 全量验证 + 报告 + 清理
    Agent({
      subagent_type: "codex:codex-rescue",
      description: "team Phase 2: 后端架构分析",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/architect.md
+     prompt: `<role>
+${backendRole}
+</role>
+
+<workdir>{{WORKDIR}}</workdir>
 
-WORKDIR: {{WORKDIR}}
+<task>
+PRD：<PRD 内容>
 
-<TASK>
-需求：<PRD 内容>
-请分析后端架构：模块边界、API 设计、数据模型、依赖关系、实施建议。
-</TASK>
+请分析后端架构：
+- 模块边界、API 设计、数据模型
+- 依赖关系、关键算法选择
+- 实施风险与建议
+</task>
 
-Return ≤200 token structured summary (plugin-native protocol).`
+<grounding_rules>
+- 引用 file:line 标注现有代码模式
+- 区分「现有模式已支持」vs「需要新建」
+- 不要捏造未观察到的依赖
+</grounding_rules>
+
+<structured_output_contract>
+Return JSON ONLY:
+{
+  "module_boundaries": [{"name": "...", "responsibility": "...", "files_involved": []}],
+  "api_design": [{"endpoint": "...", "verb": "...", "purpose": "..."}],
+  "data_model": [{"entity": "...", "fields": [], "relations": []}],
+  "dependencies": [{"from": "...", "to": "...", "reason": "..."}],
+  "implementation_risks": [{"risk": "...", "mitigation": "..."}]
+}
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 
@@ -193,16 +220,38 @@ Return ≤200 token structured summary (plugin-native protocol).`
    Agent({
      subagent_type: "gemini:gemini-rescue",
      description: "team Phase 2: 前端架构分析",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/architect.md
+     prompt: `<role>
+${frontendRole}
+</role>
+
+<workdir>{{WORKDIR}}</workdir>
+
+<task>
+PRD：<PRD 内容>
 
-WORKDIR: {{WORKDIR}}
+请分析前端架构：
+- 组件拆分、状态管理、路由设计
+- UI/UX 关键流程、无障碍考量
+- 实施风险与建议
+</task>
 
-<TASK>
-需求：<PRD 内容>
-请分析前端架构：组件拆分、状态管理、路由设计、UI/UX 要点、实施建议。
-</TASK>
+<grounding_rules>
+- 引用 file:line 标注现有组件 / 设计 token
+- 区分「现有组件复用」vs「需新建」
+- 不要捏造未观察到的设计系统约定
+</grounding_rules>
 
-Return ≤200 token structured summary (plugin-native protocol).`
+<structured_output_contract>
+Return JSON ONLY:
+{
+  "component_decomposition": [{"component": "...", "purpose": "...", "reuses": []}],
+  "state_management": {"approach": "...", "stores": []},
+  "routing": [{"path": "...", "screen": "..."}],
+  "ux_flows": [{"flow": "...", "steps": []}],
+  "implementation_risks": [{"risk": "...", "mitigation": "..."}]
+}
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 
@@ -357,7 +406,12 @@ Return ≤200 token structured summary (plugin-native protocol).`
    - `Bash: git diff` 获取完整变更内容。
 
 2. **{{BACKEND_PRIMARY}} + {{FRONTEND_PRIMARY}} 并行审查（PARALLEL）**
-   - 模式与 Phase 2 相同（plugin 优先 + wrapper BC fallback），使用 reviewer prompt：
+   - 模式与 Phase 2 相同（plugin 优先 + wrapper BC fallback），使用 reviewer prompt。
+
+   **⚠ 预备动作（spawn 前必须执行）**：主线先 Read 角色提示词，把内容拼入 `<role>` 块。
+
+   - backend role: `Read("~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md")` → `${backendRole}`
+   - frontend role: `Read("~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md")` → `${frontendRole}`
 
    **通道 A — plugin spawn（默认）**：
 
@@ -366,23 +420,39 @@ Return ≤200 token structured summary (plugin-native protocol).`
    Agent({
      subagent_type: "codex:codex-rescue",
      description: "team Phase 6: 后端审查",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md
+     prompt: `<role>
+${backendRole}
+</role>
 
-WORKDIR: {{WORKDIR}}
+<workdir>{{WORKDIR}}</workdir>
 
-<TASK>
-审查以下变更：
+<task>
+审查以下变更（后端维度：逻辑 / 安全 / 性能 / 错误处理）：
 <git diff 输出或变更文件列表>
-</TASK>
 
-OUTPUT (JSON):
+Read-only review. Do NOT modify any file.
+</task>
+
+<grounding_rules>
+- 每条 finding 必须含 file:line
+- 区分 bug（可触发失败路径）与 concern（风格/可维护性偏好）
+- 检查过但没问题的项放进 passed_checks
+</grounding_rules>
+
+<dig_deeper_nudge>
+- 同根因可能扩散到其他文件——抽样验证
+- 一条精准 Critical > 五条模糊 Warning
+</dig_deeper_nudge>
+
+<structured_output_contract>
+Return JSON ONLY:
 {
   "findings": [{"severity": "Critical|Warning|Info", "dimension": "logic|security|performance|error_handling", "file": "path", "line": N, "description": "描述", "fix_suggestion": "修复建议"}],
   "passed_checks": ["检查项"],
   "summary": "总体评估"
 }
-
-Return ≤200 token structured summary (plugin-native protocol).`
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 
@@ -391,23 +461,38 @@ Return ≤200 token structured summary (plugin-native protocol).`
    Agent({
      subagent_type: "gemini:gemini-rescue",
      description: "team Phase 6: 前端审查",
-     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md
+     prompt: `<role>
+${frontendRole}
+</role>
 
-WORKDIR: {{WORKDIR}}
+<workdir>{{WORKDIR}}</workdir>
 
-<TASK>
-审查以下变更：
+<task>
+审查以下变更（前端维度：模式一致性 / 可维护性 / 无障碍 / UX / 前端安全）：
 <git diff 输出或变更文件列表>
-</TASK>
 
-OUTPUT (JSON):
+Read-only review. Do NOT modify any file.
+</task>
+
+<grounding_rules>
+- 每条 finding 必须含 file:line
+- 检查过但没问题的项放进 passed_checks
+</grounding_rules>
+
+<dig_deeper_nudge>
+- 同模式问题可能扩散到相邻文件——抽样验证
+- 一条精准 Critical > 五条模糊 Warning
+</dig_deeper_nudge>
+
+<structured_output_contract>
+Return JSON ONLY:
 {
   "findings": [{"severity": "Critical|Warning|Info", "dimension": "patterns|maintainability|accessibility|ux|frontend_security", "file": "path", "line": N, "description": "描述", "fix_suggestion": "修复建议"}],
   "passed_checks": ["检查项"],
   "summary": "总体评估"
 }
-
-Return ≤200 token structured summary (plugin-native protocol).`
+Return ≤200 token structured summary.
+</structured_output_contract>`
    })
    ```
 

package/templates/commands/workflow.md

@@ -39,41 +39,74 @@ subagent_freshness: required
 - 如果用户通过 `/add-dir` 添加了多个工作区，先用 Glob/Grep 确定任务相关的工作区
 - 如果无法确定，用 `AskUserQuestion` 询问用户选择目标工作区
 
-**调用语法**（并行用 `run_in_background: true`，串行用 `false`）：
+**调用通道路由（CCG codeagent 退役，v2.2.0+）**
+
+1. **优先 plugin spawn**（默认）：plugin 已装 → `Agent(subagent_type="<codex:codex-rescue|gemini:gemini-rescue>")`。session 复用通过 prompt 内 `--resume` flag 表达（subagent 映射为 codex/gemini `--resume-last`，**注意是 last，不是 by-id**）。
+2. **降级 codeagent-wrapper**（BC fallback）：plugin 未装 → Bash 调用，保留 `resume <SESSION_ID>` 显式会话管理。
+
+**判定**：preflight `Bash` 跑 `ls ~/.claude/plugins/` 看有无 `codex@*` / `gemini@*` 子目录。
+
+---
+
+**通道 A — plugin spawn（默认）**：
+
+**预备动作**：spawn 前主线先 Read 对应阶段的角色提示词（见下方表），把内容拼入 `<role>` 块。
 
 ```
 # 新会话调用
-Bash({
-  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend <{{BACKEND_PRIMARY}}|{{FRONTEND_PRIMARY}}> {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'
-ROLE_FILE: <角色提示词路径>
-<TASK>
+Agent({
+  subagent_type: "<codex:codex-rescue|gemini:gemini-rescue>",
+  description: "简短描述",
+  prompt: `<role>
+${roleContent}  // 主线 Read 后的角色提示词内容
+</role>
+
+<workdir>{{WORKDIR}}</workdir>
+
+<task>
 需求：<增强后的需求（如未增强则用 $ARGUMENTS）>
 上下文：<前序阶段收集的项目上下文、分析结果等>
-</TASK>
-OUTPUT: 期望输出格式
-EOF",
+</task>
+
+<structured_output_contract>
+<期望输出格式 / JSON schema>
+Return ≤200 token structured summary.
+</structured_output_contract>`
+})
+
+# 复用会话（同一 Claude session 内的连续阶段）
+Agent({
+  subagent_type: "<codex:codex-rescue|gemini:gemini-rescue>",
+  description: "简短描述",
+  prompt: `--resume
+
+<task>
+<delta 指令（仅本阶段变化，不重述前序上下文，由 codex/gemini thread 自带历史）>
+</task>`
+})
+```
+
+**通道 B — wrapper BC fallback**（plugin 未装时）：
+
+```
+# 新会话
+Bash({
+  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend <{{BACKEND_PRIMARY}}|{{FRONTEND_PRIMARY}}> {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: <角色提示词路径>\n<TASK>\n需求：<增强后的需求>\n上下文：<前序阶段上下文>\n</TASK>\nOUTPUT: 期望输出格式\nEOF",
   run_in_background: true,
   timeout: 3600000,
-  description: "简短描述"
+  description: "简短描述 (BC)"
 })
 
-# 复用会话调用
+# 复用会话（显式 SESSION_ID）
 Bash({
-  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend <{{BACKEND_PRIMARY}}|{{FRONTEND_PRIMARY}}> {{GEMINI_MODEL_FLAG}}resume <SESSION_ID> - \"{{WORKDIR}}\" <<'EOF'
-ROLE_FILE: <角色提示词路径>
-<TASK>
-需求：<增强后的需求（如未增强则用 $ARGUMENTS）>
-上下文：<前序阶段收集的项目上下文、分析结果等>
-</TASK>
-OUTPUT: 期望输出格式
-EOF",
+  command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend <{{BACKEND_PRIMARY}}|{{FRONTEND_PRIMARY}}> {{GEMINI_MODEL_FLAG}}resume <SESSION_ID> - \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: <角色提示词路径>\n<TASK>\n需求：<增强后的需求>\n上下文：<前序阶段上下文>\n</TASK>\nEOF",
   run_in_background: true,
   timeout: 3600000,
-  description: "简短描述"
+  description: "简短描述 (BC, resume)"
 })
 ```
 
-**角色提示词**：
+**角色提示词路径**（通道 A 主线 Read 后拼入 `<role>` 块；通道 B 仍用 `ROLE_FILE:` 写在 EOF 内）：
 
 | 阶段 | 后端 | 前端 |
 |------|-------|--------|
@@ -81,7 +114,9 @@ EOF",
 | 规划 | `~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/architect.md` | `~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/architect.md` |
 | 审查 | `~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md` | `~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md` |
 
-**会话复用**：每次调用返回 `SESSION_ID: xxx`，后续阶段用 `resume xxx` 复用上下文（注意：是 `resume`，不是 `--resume`）。
+**会话复用模型差异**：
+- **通道 A（plugin）**：同 Claude session 内连续阶段用 `--resume`，自动接上一次同 backend 的 thread（codex/gemini 各自独立的 `--resume-last` 行为）。**不支持跨任务跳点 resume by ID**——若中间插了其他 codex 调用会串。
+- **通道 B（wrapper）**：每次 spawn 返回 `SESSION_ID: xxx`，后续 `resume xxx` 任意复用（注意：是 `resume`，不是 `--resume`）。
 
 **并行调用 + 事件驱动等待**：