ccgx-workflow 2.2.0 → 2.3.1

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.DDYfdCuM.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.DDYfdCuM.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.DDYfdCuM.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.DDYfdCuM.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.1";
 
 function cmd(id, order, category, name, nameEn, description, descriptionEn, cmdOverride) {
   return {
@@ -1378,6 +1378,14 @@ async function installShim(ctx) {
         await fs.chmod(destCallPlugin, 493);
       }
     }
+    const srcCheckPlugins = join(ctx.templateDir, "scripts", "check-plugins.cjs");
+    if (await fs.pathExists(srcCheckPlugins)) {
+      const destCheckPlugins = join(scriptDir, "check-plugins.cjs");
+      await fs.copy(srcCheckPlugins, destCheckPlugins, { overwrite: true });
+      if (process.platform !== "win32") {
+        await fs.chmod(destCheckPlugins, 493);
+      }
+    }
     if (process.platform === "win32") {
       const cmdMjs = destMjs.replace(/\//g, "\\");
       const cmdPath = join(binDir, "codeagent-wrapper.cmd");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccgx-workflow",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "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/analyze.md

@@ -42,7 +42,7 @@ CCG 把双模型并行通道从 `Bash(codeagent-wrapper)` **默认切换**为 pl
 1. **优先 plugin spawn**（默认）：装了 `codex@openai-codex` + gemini plugin（推荐 `gemini@gemini-ccgx` fork，含 P-1..P-21 + W1/W2/I1 patch；或上游 `gemini@google-gemini` 配 repatch 脚本）→ 用 `Agent(subagent_type="codex:codex-rescue")` + `Agent(subagent_type="gemini:gemini-rescue")` 并行，主线接 ≤200 token 摘要。
 2. **降级 codeagent-wrapper**（BC fallback）：plugin 未装 → fallback 到 Bash 调用，行为与 plugin 路径等价。
 
-**判定**：preflight `Bash` 跑 `ls ~/.claude/plugins/` 看有无 `codex@*` / `gemini@*` 子目录。helper 见 `src/utils/plugin-detection.ts`。
+**判定**：preflight `Bash` 跑 `node ~/.claude/.ccg/scripts/check-plugins.cjs`（解析 Claude Code 权威 `installed_plugins.json`）。exit `0` + stdout `{"codex":"<ver>","gemini":"<ver>"}` → 通道 A（plugin 默认）；非 `0` → 通道 B（wrapper BC fallback）。
 
 ⚠️ Analyze 命令在主线 context 内，**允许** `Agent(...)`——与 subagent "禁止嵌套 spawn" 约束不冲突。
 

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` 跑 `node ~/.claude/.ccg/scripts/check-plugins.cjs`（解析 Claude Code 权威 `installed_plugins.json`）。exit `0` + stdout `{"codex":"<ver>","gemini":"<ver>"}` → 通道 A（plugin 默认）；非 `0` → 通道 B（wrapper BC fallback）。
+
+**会话模型差异**：
+- **通道 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/debate.md

@@ -47,11 +47,10 @@ argument-hint: "<topic> [--max-rounds N] [--layer backend|frontend|fullstack]"
 
 1. 读 `$ARGUMENTS`，第一个非 flag token 即 topic（用引号包裹整段任务描述）
 2. 解析 `--max-rounds N` / `--layer X`
-3. **检测 plugin 可用性（纯目录探测，禁止运行时探活）**：
-   - 用 `Bash` 跑 `ls ~/.claude/plugins/ 2>/dev/null` 找 `codex@*` / `gemini@*` 前缀子目录
-   - 子目录内须含 `SKILL.md` / `plugin.json` / `package.json` / `manifest.json` 任一 marker → 标 `installed: true`
+3. **检测 plugin 可用性（解析 installed_plugins.json，禁止运行时探活）**：
+   - 用 `Bash` 跑 `node ~/.claude/.ccg/scripts/check-plugins.cjs`（解析 Claude Code 权威 `~/.claude/plugins/installed_plugins.json` 注册表）
+   - 返回 JSON `{"codex":"<ver>"|null,"gemini":"<ver>"|null}` + exit code（`0` = 两 plugin 都在；非 `0` = 至少一个缺）→ 各自标 `installed: true/false`
    - ⛔ **严禁**调用 `/gemini:status` / `/codex:status` / 任何 broker / runtime / health 探活——broker 是**懒启动**的，启动后才有；当前 `brokerRunning: false` 不代表 plugin 不可用
-   - 等价 helper：`detectPluginAvailability()`（`src/utils/plugin-detection.ts:156`）
    - 任一 plugin 真未装 → 该模型走 general-purpose 降级路径
 4. 调用 helper：`debateStateMachine(topic, { maxRounds, layer, pluginsAvailable })` 得到 `DebateRoundPlan[]`
 

package/templates/commands/execute.md

@@ -27,9 +27,7 @@ CCG 把 6 核心命令的"双模型并行"通道从 `Bash(codeagent-wrapper)` **
 1. **优先 plugin spawn 路径**（默认）：用户已装 `codex@openai-codex` 和 gemini plugin（推荐 `gemini@gemini-ccgx` fork，已含全部 patch；或上游 `gemini@google-gemini` 配 repatch）→ 用 `Agent(subagent_type="codex:codex-rescue")` + `Agent(subagent_type="gemini:gemini-rescue")` 并行 spawn，主线只接 plugin 自家 ≤200 token 摘要。
 2. **降级 codeagent-wrapper 路径**（BC fallback）：plugin 未装 → fallback 到 `Bash(~/.claude/bin/codeagent-wrapper ...)`，行为与 plugin 路径等价。
 
-**判断方法**：preflight 用 `Bash` 跑 `ls ~/.claude/plugins/ 2>/dev/null | grep -E '^(codex|gemini)@'`；两个 plugin 独立判定。
-
-**单一真相源**：`src/utils/plugin-detection.ts`（导出 `detectPlugin` / `detectPluginAvailability` / `bothPluginsInstalled`）。
+**判断方法**：preflight `Bash` 跑 `node ~/.claude/.ccg/scripts/check-plugins.cjs`（解析 Claude Code 权威 `installed_plugins.json`）。返回 JSON `{"codex":"<ver>"|null,"gemini":"<ver>"|null}`，两个 plugin 独立判定，可 mix-and-match（仅 codex 装了 → backend 走 plugin、frontend 走 codeagent）。exit `0` = 两 plugin 都在；非 `0` = 至少一个缺。
 
 ⚠️ Execute 命令在主线 context 内，**允许**调 `Agent(...)`——与 subagent "引擎层禁止嵌套 spawn" 约束不冲突。
 

package/templates/commands/optimize.md

@@ -47,7 +47,7 @@ CCG 把双模型并行通道从 `Bash(codeagent-wrapper)` **默认切换**为 pl
 1. **优先 plugin spawn**（默认）：装了 `codex@openai-codex` + gemini plugin（推荐 `gemini@gemini-ccgx` fork，含 P-1..P-21 + W1/W2/I1 patch；或上游 `gemini@google-gemini` 配 repatch 脚本）→ 用 `Agent(subagent_type="codex:codex-rescue")` + `Agent(subagent_type="gemini:gemini-rescue")` 并行，主线接 ≤200 token 摘要。
 2. **降级 codeagent-wrapper**（BC fallback）：plugin 未装 → fallback 到 Bash 调用，行为与 plugin 路径等价。
 
-**判定**：preflight `Bash` 跑 `ls ~/.claude/plugins/` 看有无 `codex@*` / `gemini@*` 子目录。helper 见 `src/utils/plugin-detection.ts`。
+**判定**：preflight `Bash` 跑 `node ~/.claude/.ccg/scripts/check-plugins.cjs`（解析 Claude Code 权威 `installed_plugins.json`）。exit `0` + stdout `{"codex":"<ver>","gemini":"<ver>"}` → 通道 A（plugin 默认）；非 `0` → 通道 B（wrapper BC fallback）。
 
 ⚠️ Optimize 命令在主线 context 内，**允许** `Agent(...)`——与 subagent "禁止嵌套 spawn" 约束不冲突。
 

package/templates/commands/plan.md

@@ -57,9 +57,7 @@ CCG 把 6 核心命令的"双模型并行"通道从 `Bash(codeagent-wrapper)` **
 1. **优先 plugin spawn 路径**（默认）：用户已装 `codex@openai-codex` 和 gemini plugin（推荐 `gemini@gemini-ccgx` fork，已含全部 patch；或上游 `gemini@google-gemini` 配 repatch）→ 用 `Agent(subagent_type="codex:codex-rescue")` + `Agent(subagent_type="gemini:gemini-rescue")` 并行 spawn，主线只接 plugin 自家 ≤200 token 摘要协议（`STATUS: ... / FINDINGS: ... / NOTES: ...`）。
 2. **降级 codeagent-wrapper 路径**（BC fallback）：plugin 未装 → fallback 到 `Bash(~/.claude/bin/codeagent-wrapper --backend ... resume ... <<'EOF' ... EOF)`，与 plugin 路径行为等价。
 
-**判断方法**：preflight 用 `Bash` 跑 `ls ~/.claude/plugins/ 2>/dev/null | grep -E '^codex@'` 与 `... | grep -E '^gemini@'` 各一次。匹配到对应行 → plugin 已装。两个 plugin 独立判定，可分别 mix-and-match（仅 codex plugin 装了 → backend 走 plugin、frontend 走 codeagent）。
-
-**单一真相源**：plugin 检测逻辑 helper 见 `src/utils/plugin-detection.ts`（导出 `detectPlugin` / `detectPluginAvailability` / `bothPluginsInstalled`）。命令模板把判定结果渲染到执行计划，`Agent(...)` 调用与 `Bash(...)` 调用的具体语法见下面"多模型调用规范"段。
+**判断方法**：preflight `Bash` 跑 `node ~/.claude/.ccg/scripts/check-plugins.cjs`（解析 Claude Code 权威 `installed_plugins.json`）。返回 JSON `{"codex":"<ver>"|null,"gemini":"<ver>"|null}`，两个 plugin 独立判定，可分别 mix-and-match（仅 codex plugin 装了 → backend 走 plugin、frontend 走 codeagent）。exit `0` = 两 plugin 都在；非 `0` = 至少一个缺。`Agent(...)` 调用与 `Bash(...)` 调用的具体语法见下面"多模型调用规范"段。
 
 **为什么默认 plugin**：nested-spawn 测试证明 plugin advisor 摘要协议（≤200 token）压制了 codeagent stdout 全文回灌主线的痛点，主线 context 增量从 +5%/调用 降到 +1.5%/调用。详见 `.ccg-research/07-multimodel-collaboration-rethink.md`。
 

package/templates/commands/review.md

@@ -21,7 +21,7 @@ argument-hint: "[代码或描述] [--adversarial] [--fix [--all] [--auto]] [--ro
 
 双模型并行审查，交叉验证综合反馈。无参数时自动审查当前 git 变更。
 
-**双模型并行通道**：默认走 plugin spawn —— 装了 `codex@openai-codex` + gemini plugin（推荐 `gemini@gemini-ccgx` fork，含 P-1..P-21 + W1/W2/I1 patch；或上游 `gemini@google-gemini` 配 repatch 脚本）→ 用 `Agent(subagent_type="codex:codex-rescue")` + `Agent(subagent_type="gemini:gemini-rescue")` 并行，主线只接 ≤200 token 摘要；plugin 未装 → fallback 到 codeagent-wrapper 路径（BC fallback）。preflight 用 `Bash` 跑 `ls ~/.claude/plugins/` 检测，helper 见 `src/utils/plugin-detection.ts`。
+**双模型并行通道**：默认走 plugin spawn —— 装了 `codex@openai-codex` + gemini plugin（推荐 `gemini@gemini-ccgx` fork，含 P-1..P-21 + W1/W2/I1 patch；或上游 `gemini@google-gemini` 配 repatch 脚本）→ 用 `Agent(subagent_type="codex:codex-rescue")` + `Agent(subagent_type="gemini:gemini-rescue")` 并行，主线只接 ≤200 token 摘要；plugin 未装 → fallback 到 codeagent-wrapper 路径（BC fallback）。preflight `Bash` 跑 `node ~/.claude/.ccg/scripts/check-plugins.cjs`（解析 Claude Code 权威 `installed_plugins.json`，exit `0` + stdout `{"codex":"<ver>","gemini":"<ver>"}` = 两 plugin 都在）。
 
 `--adversarial` 模式下额外触发第三层"敌对视角"审查，由官方 codex plugin 的 `Agent(codex:codex-rescue)` 在 fresh context 中专门挑前两轮意见的漏洞，适合极重要 PR / 安全敏感变更。需用户已装 `codex@openai-codex` plugin，否则降级为双模型审查。
 

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:
@@ -83,7 +124,7 @@ description: '按规范执行 + 多模型协作 + 归档'
    1. **优先 plugin spawn**（默认）：装了 `codex@openai-codex` + gemini plugin（推荐 `gemini@gemini-ccgx` fork；或上游 `gemini@google-gemini` 配 repatch 脚本）→ 用 `Agent(subagent_type="codex:codex-rescue")` + `Agent(subagent_type="gemini:gemini-rescue")` 并行，主线接 ≤200 token 摘要。
    2. **降级 codeagent-wrapper**（BC fallback）：plugin 未装 → fallback Bash 调用，**保留 Step 4 session resume** 以维持会话上下文。
 
-   **判定**：preflight `Bash` 跑 `ls ~/.claude/plugins/` 看有无 `codex@*` / `gemini@*` 子目录。
+   **判定**：preflight `Bash` 跑 `node ~/.claude/.ccg/scripts/check-plugins.cjs`（解析 Claude Code 权威 `installed_plugins.json`）。exit `0` + stdout `{"codex":"<ver>","gemini":"<ver>"}` → 通道 A（plugin 默认）；非 `0` → 通道 B（wrapper BC fallback）。
 
    ⚠️ spec-impl 命令在主线 context 内，**允许** `Agent(...)`——与 subagent "禁止嵌套 spawn" 约束不冲突。
    ⚠️ **plugin 路径无 session resume 能力**：通道 A 不接 Step 4 的 SESSION_ID，review 任务作为独立无状态分析跑（review 是 read-only 审查，无需会话连续性）。
@@ -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>`
    })
    ```