ccgx-workflow 2.1.1 → 2.2.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.BIcRT31-.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.k6gRMX3r.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.BIcRT31-.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.BIcRT31-.mjs';
+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 { 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.BIcRT31-.mjs → ccgx-workflow.k6gRMX3r.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.1.1";
+const version = "2.2.0";
 
 function cmd(id, order, category, name, nameEn, description, descriptionEn, cmdOverride) {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccgx-workflow",
-  "version": "2.1.1",
+  "version": "2.2.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/spec-impl.md

@@ -75,32 +75,94 @@ description: '按规范执行 + 多模型协作 + 归档'
    If issues found, make targeted corrections.
 
 7. **Multi-Model Review (PARALLEL)**
-   - **CRITICAL**: You MUST launch BOTH {{BACKEND_PRIMARY}} AND {{FRONTEND_PRIMARY}} in a SINGLE message with TWO Bash tool calls.
-   - **DO NOT** call one model first and wait. Launch BOTH simultaneously with `run_in_background: true`.
 
-   **Step 7.1**: In ONE message, make TWO parallel Bash calls:
+   **调用通道路由（CCG codeagent 退役，v2.2.0+）**
+
+   双模型并行通道从 `Bash(codeagent-wrapper)` **默认切换**为 plugin spawn：
+
+   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@*` 子目录。
+
+   ⚠️ spec-impl 命令在主线 context 内，**允许** `Agent(...)`——与 subagent "禁止嵌套 spawn" 约束不冲突。
+   ⚠️ **plugin 路径无 session resume 能力**：通道 A 不接 Step 4 的 SESSION_ID，review 任务作为独立无状态分析跑（review 是 read-only 审查，无需会话连续性）。
+
+   - **CRITICAL**: You MUST launch BOTH {{BACKEND_PRIMARY}} AND {{FRONTEND_PRIMARY}} in a SINGLE message with TWO parallel tool calls.
+   - **DO NOT** call one model first and wait. Launch BOTH simultaneously.
+
+   **Step 7.1**: In ONE message, spawn TWO models in parallel.
+
+   **通道 A — plugin spawn（默认，无 session）**：
+
+   **FIRST Agent call ({{BACKEND_PRIMARY}})**:
+   ```
+   Agent({
+     subagent_type: "codex:codex-rescue",
+     description: "spec-impl: correctness/security review",
+     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md
+
+WORKDIR: {{WORKDIR}}
+
+<TASK>
+Review the implementation changes:
+- 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).`
+   })
+   ```
+
+   **SECOND Agent call ({{FRONTEND_PRIMARY}}) - IN THE SAME MESSAGE**:
+   ```
+   Agent({
+     subagent_type: "gemini:gemini-rescue",
+     description: "spec-impl: maintainability/patterns review",
+     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md
+
+WORKDIR: {{WORKDIR}}
+
+<TASK>
+Review the implementation changes:
+- 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).`
+   })
+   ```
+
+   **通道 B — codeagent-wrapper fallback**（plugin 未装时降级，**保留 session resume**）：
 
-   **FIRST Bash call ({{BACKEND_PRIMARY}})**:
    ```
    Bash({
      command: "~/.claude/bin/codeagent-wrapper --progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}resume <CODEX_PROTO_SESSION> - \"{{WORKDIR}}\" <<'EOF'\nReview the implementation changes:\n- Correctness: logic errors, edge cases\n- Security: injection, auth issues\n- Spec compliance: constraints satisfied\nOUTPUT: JSON with findings\nEOF",
      run_in_background: true,
      timeout: 300000,
-     description: "{{BACKEND_PRIMARY}}: correctness/security review"
+     description: "{{BACKEND_PRIMARY}}: correctness/security review (BC, resume session)"
    })
-   ```
-
-   **SECOND Bash call ({{FRONTEND_PRIMARY}}) - IN THE SAME MESSAGE**:
-   ```
    Bash({
      command: "~/.claude/bin/codeagent-wrapper --progress --backend {{FRONTEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}resume <GEMINI_PROTO_SESSION> - \"{{WORKDIR}}\" <<'EOF'\nReview the implementation changes:\n- Maintainability: readability, complexity\n- Patterns: consistency with project style\n- Integration: cross-module impacts\nOUTPUT: JSON with findings\nEOF",
      run_in_background: true,
      timeout: 300000,
-     description: "{{FRONTEND_PRIMARY}}: maintainability/patterns review"
+     description: "{{FRONTEND_PRIMARY}}: maintainability/patterns review (BC, resume session)"
    })
    ```
 
-   **Step 7.2 (事件驱动)**: spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理结果。**不调 TaskOutput**。两个 task 都收到通知后才进 step 7.3。
+   > ⚠️ 通道 B `codeagent-wrapper` 已标 **deprecated**，仅为不能升级 plugin 的环境保留——但本 step 仍是 wrapper 唯一能利用 Step 4 SESSION_ID 的场景。
+
+   **Step 7.2 (事件驱动)**：
+   - **通道 A（plugin）**：两个 Agent 同 message 内 spawn，主线接 ≤200 token 摘要。Agent 完成后自动返回结果。
+   - **通道 B（BC wrapper）**：spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理结果。**不调 TaskOutput**。两个 task 都收到通知后才进 step 7.3。
 
    ⛔ **禁止**：调 `TaskOutput({block: true, timeout: 600000})` (旧 freeze poll 模式) / Kill task。
    ⚠️ **失败处理**：notification status=failed / exit ≠ 0 / parse 失败 → v1.7.87 标准 2-retry / 5s / 3-attempts；3 次全失败才降级单模型。

package/templates/commands/spec-plan.md

@@ -24,33 +24,91 @@ description: '多模型分析 → 消除歧义 → 零决策可执行计划'
    - Run `openspec status --change "<change_id>" --json` to review current state.
 
 2. **Multi-Model Implementation Analysis (PARALLEL)**
-   - **CRITICAL**: You MUST launch BOTH {{BACKEND_PRIMARY}} AND {{FRONTEND_PRIMARY}} in a SINGLE message with TWO Bash tool calls.
-   - **DO NOT** call one model first and wait. Launch BOTH simultaneously with `run_in_background: true`.
+
+   **调用通道路由（CCG codeagent 退役，v2.2.0+）**
+
+   双模型并行通道从 `Bash(codeagent-wrapper)` **默认切换**为 plugin spawn：
+
+   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 调用，行为与 plugin 路径等价。
+
+   **判定**：preflight `Bash` 跑 `ls ~/.claude/plugins/` 看有无 `codex@*` / `gemini@*` 子目录。
+
+   ⚠️ spec-plan 命令在主线 context 内，**允许** `Agent(...)`——与 subagent "禁止嵌套 spawn" 约束不冲突。
+
+   - **CRITICAL**: You MUST launch BOTH {{BACKEND_PRIMARY}} AND {{FRONTEND_PRIMARY}} in a SINGLE message with TWO parallel tool calls.
+   - **DO NOT** call one model first and wait. Launch BOTH simultaneously.
    - **工作目录**：`{{WORKDIR}}` **必须通过 Bash 执行 `pwd`（Unix）或 `cd`（Windows CMD）获取当前工作目录的绝对路径**，禁止从 `$HOME` 或环境变量推断。如果用户通过 `/add-dir` 添加了多个工作区，先确定任务相关的工作区。
 
-   **Step 2.1**: In ONE message, make TWO parallel Bash calls:
+   **Step 2.1**: In ONE message, spawn TWO models in parallel.
+
+   **通道 A — plugin spawn（默认）**：
 
-   **FIRST Bash call ({{BACKEND_PRIMARY}})**:
+   **FIRST Agent call ({{BACKEND_PRIMARY}})**:
    ```
-   Bash({
-     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nAnalyze change <change_id> from backend perspective:\n- Implementation approach\n- Technical risks\n- Alternative architectures\n- Edge cases and failure modes\nOUTPUT: JSON with analysis\nEOF",
-     run_in_background: true,
-     timeout: 300000,
-     description: "{{BACKEND_PRIMARY}}: backend analysis"
+   Agent({
+     subagent_type: "codex:codex-rescue",
+     description: "spec-plan: backend analysis",
+     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/analyzer.md
+
+WORKDIR: {{WORKDIR}}
+
+<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).`
    })
    ```
 
-   **SECOND Bash call ({{FRONTEND_PRIMARY}}) - IN THE SAME MESSAGE**:
+   **SECOND Agent call ({{FRONTEND_PRIMARY}}) - IN THE SAME MESSAGE**:
    ```
+   Agent({
+     subagent_type: "gemini:gemini-rescue",
+     description: "spec-plan: frontend analysis",
+     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/analyzer.md
+
+WORKDIR: {{WORKDIR}}
+
+<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).`
+   })
+   ```
+
+   **通道 B — codeagent-wrapper fallback**（plugin 未装时降级，并行用 `run_in_background: true`）：
+
+   ```
+   Bash({
+     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/analyzer.md\nAnalyze change <change_id> from backend perspective:\n- Implementation approach\n- Technical risks\n- Alternative architectures\n- Edge cases and failure modes\nOUTPUT: JSON with analysis\nEOF",
+     run_in_background: true,
+     timeout: 300000,
+     description: "{{BACKEND_PRIMARY}}: backend analysis (BC)"
+   })
    Bash({
-     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{FRONTEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nAnalyze change <change_id> from frontend/integration perspective:\n- Maintainability assessment\n- Scalability considerations\n- Integration conflicts\nOUTPUT: JSON with analysis\nEOF",
+     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{FRONTEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/analyzer.md\nAnalyze change <change_id> from frontend/integration perspective:\n- Maintainability assessment\n- Scalability considerations\n- Integration conflicts\nOUTPUT: JSON with analysis\nEOF",
      run_in_background: true,
      timeout: 300000,
-     description: "{{FRONTEND_PRIMARY}}: frontend analysis"
+     description: "{{FRONTEND_PRIMARY}}: frontend analysis (BC)"
    })
    ```
 
-   **Step 2.2 (事件驱动)**: spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理结果。**不调 TaskOutput**。两个 task 都收到通知后才进 step 2.3。
+   > ⚠️ 通道 B `codeagent-wrapper` 已标 **deprecated**，仅为不能升级 plugin 的环境保留。
+
+   **Step 2.2 (事件驱动)**：
+   - **通道 A（plugin）**：两个 Agent 同 message 内 spawn，主线接 ≤200 token 摘要。Agent 完成后自动返回结果。
+   - **通道 B（BC wrapper）**：spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理结果。**不调 TaskOutput**。两个 task 都收到通知后才进 step 2.3。
 
    ⛔ **禁止**：调 `TaskOutput({block: true, timeout: 600000})` (旧 freeze poll 模式) / Kill task。
    ⚠️ **失败处理**：notification status=failed / exit ≠ 0 / parse 失败 → v1.7.87 标准 2-retry / 5s / 3-attempts；3 次全失败才降级单模型。

package/templates/commands/spec-research.md

@@ -49,8 +49,20 @@ description: '需求 → 约束集（并行探索 + OPSX 提案）'
    - Each boundary should be self-contained: no cross-communication needed.
 
 4. **Parallel Multi-Model Exploration**
-   - **CRITICAL**: You MUST launch BOTH {{BACKEND_PRIMARY}} AND {{FRONTEND_PRIMARY}} in a SINGLE message with TWO Bash tool calls.
-   - **DO NOT** call one model first and wait. Launch BOTH simultaneously with `run_in_background: true`.
+
+   **调用通道路由（CCG codeagent 退役，v2.2.0+）**
+
+   双模型并行通道从 `Bash(codeagent-wrapper)` **默认切换**为 plugin spawn：
+
+   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@*` 子目录。
+
+   ⚠️ spec-research 命令在主线 context 内，**允许** `Agent(...)`——与 subagent "禁止嵌套 spawn" 约束不冲突。
+
+   - **CRITICAL**: You MUST launch BOTH {{BACKEND_PRIMARY}} AND {{FRONTEND_PRIMARY}} in a SINGLE message with TWO parallel tool calls.
+   - **DO NOT** call one model first and wait. Launch BOTH simultaneously.
    - **工作目录**：`{{WORKDIR}}` **必须通过 Bash 执行 `pwd`（Unix）或 `cd`（Windows CMD）获取当前工作目录的绝对路径**，禁止从 `$HOME` 或环境变量推断。如果用户通过 `/add-dir` 添加了多个工作区，先确定任务相关的工作区。
 
    **Output Template** (instruct both models to use this format):
@@ -67,29 +79,76 @@ description: '需求 → 约束集（并行探索 + OPSX 提案）'
    }
    ```
 
-   **Step 4.1**: In ONE message, make TWO parallel Bash calls:
+   **Step 4.1**: In ONE message, spawn TWO models in parallel.
+
+   **通道 A — plugin spawn（默认）**：
 
-   **FIRST Bash call ({{BACKEND_PRIMARY}} — backend boundaries)**:
+   **FIRST Agent call ({{BACKEND_PRIMARY}} — backend boundaries)**:
    ```
-   Bash({
-     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nExplore backend context boundaries for <change description>:\n- Existing structures and patterns\n- Conventions in use\n- Hard constraints limiting solution space\n- Dependencies and risks\nOUTPUT: JSON using the output template above\nEOF",
-     run_in_background: true,
-     timeout: 300000,
-     description: "{{BACKEND_PRIMARY}}: backend boundary exploration"
+   Agent({
+     subagent_type: "codex:codex-rescue",
+     description: "spec-research: backend boundary exploration",
+     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/analyzer.md
+
+WORKDIR: {{WORKDIR}}
+
+<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).`
    })
    ```
 
-   **SECOND Bash call ({{FRONTEND_PRIMARY}} — frontend boundaries) - IN THE SAME MESSAGE**:
+   **SECOND Agent call ({{FRONTEND_PRIMARY}} — frontend boundaries) - IN THE SAME MESSAGE**:
+   ```
+   Agent({
+     subagent_type: "gemini:gemini-rescue",
+     description: "spec-research: frontend boundary exploration",
+     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/analyzer.md
+
+WORKDIR: {{WORKDIR}}
+
+<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).`
+   })
+   ```
+
+   **通道 B — codeagent-wrapper fallback**（plugin 未装时降级，并行用 `run_in_background: true`）：
+
    ```
    Bash({
-     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{FRONTEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nExplore frontend context boundaries for <change description>:\n- Existing structures and patterns\n- Conventions in use\n- Hard constraints limiting solution space\n- Dependencies and risks\nOUTPUT: JSON using the output template above\nEOF",
+     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/analyzer.md\nExplore backend context boundaries for <change description>:\n- Existing structures and patterns\n- Conventions in use\n- Hard constraints limiting solution space\n- Dependencies and risks\nOUTPUT: JSON using the output template above\nEOF",
      run_in_background: true,
      timeout: 300000,
-     description: "{{FRONTEND_PRIMARY}}: frontend boundary exploration"
+     description: "{{BACKEND_PRIMARY}}: backend boundary exploration (BC)"
+   })
+   Bash({
+     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{FRONTEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/analyzer.md\nExplore frontend context boundaries for <change description>:\n- Existing structures and patterns\n- Conventions in use\n- Hard constraints limiting solution space\n- Dependencies and risks\nOUTPUT: JSON using the output template above\nEOF",
+     run_in_background: true,
+     timeout: 300000,
+     description: "{{FRONTEND_PRIMARY}}: frontend boundary exploration (BC)"
    })
    ```
 
-   **Step 4.2 (事件驱动)**: spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理结果。**不调 TaskOutput**。两个 task 都收到通知后才进 step 4.3。
+   > ⚠️ 通道 B `codeagent-wrapper` 已标 **deprecated**，仅为不能升级 plugin 的环境保留。
+
+   **Step 4.2 (事件驱动)**：
+   - **通道 A（plugin）**：两个 Agent 同 message 内 spawn，主线接 ≤200 token 摘要。Agent 完成后自动返回结果到调用上下文，主线直接处理。
+   - **通道 B（BC wrapper）**：spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理结果。**不调 TaskOutput**。两个 task 都收到通知后才进 step 4.3。
 
    ⛔ **禁止**：调 `TaskOutput({block: true, timeout: 600000})` (旧 freeze poll 模式) / Kill task。
    ⚠️ **失败处理**：notification status=failed / exit ≠ 0 / parse 失败 → v1.7.87 标准 2-retry / 5s / 3-attempts；3 次全失败才降级单模型。

package/templates/commands/spec-review.md

@@ -25,33 +25,130 @@ description: '双模型交叉审查（独立工具，随时可用）'
    - Load relevant spec constraints and PBT properties from `openspec/changes/<id>/specs/`.
 
 3. **Multi-Model Review (PARALLEL)**
-   - **CRITICAL**: You MUST launch BOTH {{BACKEND_PRIMARY}} AND {{FRONTEND_PRIMARY}} in a SINGLE message with TWO Bash tool calls.
-   - **DO NOT** call one model first and wait. Launch BOTH simultaneously with `run_in_background: true`.
+
+   **调用通道路由（CCG codeagent 退役，v2.2.0+）**
+
+   双模型并行通道从 `Bash(codeagent-wrapper)` **默认切换**为 plugin spawn：
+
+   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 调用，行为与 plugin 路径等价。
+
+   **判定**：preflight `Bash` 跑 `ls ~/.claude/plugins/` 看有无 `codex@*` / `gemini@*` 子目录。
+
+   ⚠️ spec-review 命令在主线 context 内，**允许** `Agent(...)`——与 subagent "禁止嵌套 spawn" 约束不冲突。
+
+   - **CRITICAL**: You MUST launch BOTH {{BACKEND_PRIMARY}} AND {{FRONTEND_PRIMARY}} in a SINGLE message with TWO parallel tool calls.
+   - **DO NOT** call one model first and wait. Launch BOTH simultaneously.
    - **工作目录**：`{{WORKDIR}}` **必须通过 Bash 执行 `pwd`（Unix）或 `cd`（Windows CMD）获取当前工作目录的绝对路径**，禁止从 `$HOME` 或环境变量推断。如果用户通过 `/add-dir` 添加了多个工作区，先确定任务相关的工作区。
 
-   **Step 3.1**: In ONE message, make TWO parallel Bash calls:
+   **Step 3.1**: In ONE message, spawn TWO models in parallel.
+
+   **通道 A — plugin spawn（默认）**：
 
-   **FIRST Bash call ({{BACKEND_PRIMARY}})**:
+   **FIRST Agent call ({{BACKEND_PRIMARY}})**:
    ```
-   Bash({
-     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nReview proposal <proposal_id> implementation:\n\n## {{BACKEND_PRIMARY}} Review Dimensions\n1. **Spec Compliance**: Verify ALL constraints from spec are satisfied\n2. **PBT Properties**: Check invariants, idempotency, bounds are correctly implemented\n3. **Logic Correctness**: Edge cases, error handling, algorithm correctness\n4. **Backend Security**: Injection vulnerabilities, auth checks, input validation\n5. **Regression Risk**: Interface compatibility, type safety, breaking changes\n\n## Output Format (JSON)\n{\n  \"findings\": [\n    {\n      \"severity\": \"Critical|Warning|Info\",\n      \"dimension\": \"spec_compliance|pbt|logic|security|regression\",\n      \"file\": \"path/to/file.ts\",\n      \"line\": 42,\n      \"description\": \"What is wrong\",\n      \"constraint_violated\": \"Constraint ID from spec (if applicable)\",\n      \"fix_suggestion\": \"How to fix\"\n    }\n  ],\n  \"passed_checks\": [\"List of verified constraints/properties\"],\n  \"summary\": \"Overall assessment\"\n}\nEOF",
-     run_in_background: true,
-     timeout: 300000,
-     description: "{{BACKEND_PRIMARY}}: backend/logic review"
+   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):
+{
+  "findings": [
+    {
+      "severity": "Critical|Warning|Info",
+      "dimension": "spec_compliance|pbt|logic|security|regression",
+      "file": "path/to/file.ts",
+      "line": 42,
+      "description": "What is wrong",
+      "constraint_violated": "Constraint ID from spec (if applicable)",
+      "fix_suggestion": "How to fix"
+    }
+  ],
+  "passed_checks": ["List of verified constraints/properties"],
+  "summary": "Overall assessment"
+}
+
+Return ≤200 token structured summary (plugin-native protocol).`
    })
    ```
 
-   **SECOND Bash call ({{FRONTEND_PRIMARY}}) - IN THE SAME MESSAGE**:
+   **SECOND Agent call ({{FRONTEND_PRIMARY}}) - IN THE SAME MESSAGE**:
+   ```
+   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):
+{
+  "findings": [
+    {
+      "severity": "Critical|Warning|Info",
+      "dimension": "patterns|maintainability|integration|security|alignment",
+      "file": "path/to/file.ts",
+      "line": 42,
+      "description": "What is wrong",
+      "spec_reference": "Spec section (if applicable)",
+      "fix_suggestion": "How to fix"
+    }
+  ],
+  "passed_checks": ["List of verified aspects"],
+  "summary": "Overall assessment"
+}
+
+Return ≤200 token structured summary (plugin-native protocol).`
+   })
+   ```
+
+   **通道 B — codeagent-wrapper fallback**（plugin 未装时降级，并行用 `run_in_background: true`）：
+
    ```
    Bash({
-     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{FRONTEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nReview proposal <proposal_id> implementation:\n\n## {{FRONTEND_PRIMARY}} Review Dimensions\n1. **Pattern Consistency**: Naming conventions, code style, project patterns\n2. **Maintainability**: Readability, complexity, documentation adequacy\n3. **Integration Risk**: Dependency changes, cross-module impacts\n4. **Frontend Security**: XSS, CSRF, sensitive data exposure\n5. **Spec Alignment**: Implementation matches spec intent (not just letter)\n\n## Output Format (JSON)\n{\n  \"findings\": [\n    {\n      \"severity\": \"Critical|Warning|Info\",\n      \"dimension\": \"patterns|maintainability|integration|security|alignment\",\n      \"file\": \"path/to/file.ts\",\n      \"line\": 42,\n      \"description\": \"What is wrong\",\n      \"spec_reference\": \"Spec section (if applicable)\",\n      \"fix_suggestion\": \"How to fix\"\n    }\n  ],\n  \"passed_checks\": [\"List of verified aspects\"],\n  \"summary\": \"Overall assessment\"\n}\nEOF",
+     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md\nReview proposal <proposal_id> implementation:\n[Backend review dimensions - same as 通道 A]\nOUTPUT (JSON): [same schema as 通道 A]\nEOF",
      run_in_background: true,
      timeout: 300000,
-     description: "{{FRONTEND_PRIMARY}}: patterns/integration review"
+     description: "{{BACKEND_PRIMARY}}: backend/logic review (BC)"
+   })
+   Bash({
+     command: "~/.claude/bin/codeagent-wrapper --progress --backend {{FRONTEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md\nReview proposal <proposal_id> implementation:\n[Frontend review dimensions - same as 通道 A]\nOUTPUT (JSON): [same schema as 通道 A]\nEOF",
+     run_in_background: true,
+     timeout: 300000,
+     description: "{{FRONTEND_PRIMARY}}: patterns/integration review (BC)"
    })
    ```
 
-   **Step 3.2 (事件驱动)**: spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理结果。**不调 TaskOutput**。两个 task 都收到通知后才进 step 3.3。
+   > ⚠️ 通道 B `codeagent-wrapper` 已标 **deprecated**，仅为不能升级 plugin 的环境保留。
+
+   **Step 3.2 (事件驱动)**：
+   - **通道 A（plugin）**：两个 Agent 同 message 内 spawn，主线接 ≤200 token 摘要。Agent 完成后自动返回结果。
+   - **通道 B（BC wrapper）**：spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理结果。**不调 TaskOutput**。两个 task 都收到通知后才进 step 3.3。
 
    ⛔ **禁止**：调 `TaskOutput({block: true, timeout: 600000})` (旧 freeze poll 模式) / Kill task。
    ⚠️ **失败处理**：notification status=failed / exit ≠ 0 / parse 失败 → v1.7.87 标准 2-retry / 5s / 3-attempts；3 次全失败才降级单模型。

package/templates/commands/team.md

@@ -70,8 +70,8 @@ TaskUpdate({ taskId: "1", owner: "architect" })
 | 📜 Dev × N | Agent Teams teammates | `Agent(team_name=T, name="dev-1")` | Sonnet | 并行编码，文件隔离 |
 | 🧪 QA | Agent Teams teammate | `Agent(team_name=T, name="qa")` | Sonnet | 写测试、跑测试、lint、typecheck |
 | 🔬 Reviewer | Agent Teams teammate | `Agent(team_name=T, name="reviewer")` | Sonnet | 综合审查，分级判决 |
-| 🔥 {{BACKEND_PRIMARY}} | 外部模型（非 teammate） | Bash + codeagent-wrapper | {{BACKEND_PRIMARY}} | 后端分析/审查（Phase 2, 6） |
-| 🔮 {{FRONTEND_PRIMARY}} | 外部模型（非 teammate） | Bash + codeagent-wrapper | {{FRONTEND_PRIMARY}} | 前端分析/审查（Phase 2, 6） |
+| 🔥 {{BACKEND_PRIMARY}} | 外部模型（非 teammate） | 默认 `Agent(codex:codex-rescue)` / BC fallback Bash codeagent-wrapper | {{BACKEND_PRIMARY}} | 后端分析/审查（Phase 2, 6） |
+| 🔮 {{FRONTEND_PRIMARY}} | 外部模型（非 teammate） | 默认 `Agent(gemini:gemini-rescue)` / BC fallback Bash codeagent-wrapper | {{FRONTEND_PRIMARY}} | 前端分析/审查（Phase 2, 6） |
 
 **8 阶段流水线**
 
@@ -156,29 +156,78 @@ Phase 8: INTEGRATION   → Lead 全量验证 + 报告 + 清理
 1. **Team 已在 Phase 0 创建**，直接使用已有的 team_name。
 
 2. **{{BACKEND_PRIMARY}} + {{FRONTEND_PRIMARY}} 并行分析（PARALLEL）**
-   - **CRITICAL**: 必须在一条消息中同时发起两个 Bash 调用，`run_in_background: true`。
 
-   **FIRST Bash call ({{BACKEND_PRIMARY}})**:
+   **调用通道路由（CCG codeagent 退役，v2.2.0+）**
+
+   双模型并行通道从 `Bash(codeagent-wrapper)` **默认切换**为 plugin spawn：
+
+   1. **优先 plugin spawn**（默认）：装了 `codex@openai-codex` + gemini plugin → 用 `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@*` 子目录。
+
+   - **CRITICAL**: 必须在一条消息中同时发起两个并行调用。
+
+   **通道 A — plugin spawn（默认）**：
+
+   **FIRST Agent call ({{BACKEND_PRIMARY}})**:
+   ```
+   Agent({
+     subagent_type: "codex:codex-rescue",
+     description: "team Phase 2: 后端架构分析",
+     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/architect.md
+
+WORKDIR: {{WORKDIR}}
+
+<TASK>
+需求：<PRD 内容>
+请分析后端架构：模块边界、API 设计、数据模型、依赖关系、实施建议。
+</TASK>
+
+Return ≤200 token structured summary (plugin-native protocol).`
+   })
+   ```
+
+   **SECOND Agent call ({{FRONTEND_PRIMARY}}) - IN THE SAME MESSAGE**:
+   ```
+   Agent({
+     subagent_type: "gemini:gemini-rescue",
+     description: "team Phase 2: 前端架构分析",
+     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/architect.md
+
+WORKDIR: {{WORKDIR}}
+
+<TASK>
+需求：<PRD 内容>
+请分析前端架构：组件拆分、状态管理、路由设计、UI/UX 要点、实施建议。
+</TASK>
+
+Return ≤200 token structured summary (plugin-native protocol).`
+   })
+   ```
+
+   **通道 B — codeagent-wrapper fallback**（plugin 未装时降级，并行用 `run_in_background: true`）：
+
    ```
    Bash({
      command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/architect.md\n<TASK>\n需求：<PRD 内容>\n请分析后端架构：模块边界、API 设计、数据模型、依赖关系、实施建议。\n</TASK>\nEOF",
      run_in_background: true,
      timeout: 3600000,
-     description: "{{BACKEND_PRIMARY}} 后端架构分析"
+     description: "{{BACKEND_PRIMARY}} 后端架构分析 (BC)"
    })
-   ```
-
-   **SECOND Bash call ({{FRONTEND_PRIMARY}}) - IN THE SAME MESSAGE**:
-   ```
    Bash({
      command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{FRONTEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/architect.md\n<TASK>\n需求：<PRD 内容>\n请分析前端架构：组件拆分、状态管理、路由设计、UI/UX 要点、实施建议。\n</TASK>\nEOF",
      run_in_background: true,
      timeout: 3600000,
-     description: "{{FRONTEND_PRIMARY}} 前端架构分析"
+     description: "{{FRONTEND_PRIMARY}} 前端架构分析 (BC)"
    })
    ```
 
-   **事件驱动等待**：spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理结果。**不调 TaskOutput**。两个 task 都收到通知后才进下一步。
+   > ⚠️ 通道 B `codeagent-wrapper` 已标 **deprecated**，仅为不能升级 plugin 的环境保留。
+
+   **事件驱动等待**：
+   - **通道 A（plugin）**：两个 Agent 同 message 内 spawn，主线接 ≤200 token 摘要。Agent 完成后自动返回结果。
+   - **通道 B（BC wrapper）**：spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理结果。**不调 TaskOutput**。两个 task 都收到通知后才进下一步。
 
    ⛔ **禁止**：调 `TaskOutput({block: true, timeout: 600000})` (旧 freeze poll 模式) / Kill task。
    ⚠️ **失败处理**：notification status=failed / exit ≠ 0 / parse 失败 → v1.7.87 标准 2-retry / 5s / 3-attempts；3 次全失败才降级单模型。
@@ -308,29 +357,82 @@ Phase 8: INTEGRATION   → Lead 全量验证 + 报告 + 清理
    - `Bash: git diff` 获取完整变更内容。
 
 2. **{{BACKEND_PRIMARY}} + {{FRONTEND_PRIMARY}} 并行审查（PARALLEL）**
-   - 模式与 Phase 2 相同，使用 reviewer prompt：
+   - 模式与 Phase 2 相同（plugin 优先 + wrapper BC fallback），使用 reviewer prompt：
 
-   **FIRST Bash call ({{BACKEND_PRIMARY}})**:
+   **通道 A — plugin spawn（默认）**：
+
+   **FIRST Agent call ({{BACKEND_PRIMARY}})**:
    ```
-   Bash({
-     command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md\n<TASK>\n审查以下变更：\n<git diff 输出或变更文件列表>\n</TASK>\nOUTPUT (JSON):\n{\n  \"findings\": [{\"severity\": \"Critical|Warning|Info\", \"dimension\": \"logic|security|performance|error_handling\", \"file\": \"path\", \"line\": N, \"description\": \"描述\", \"fix_suggestion\": \"修复建议\"}],\n  \"passed_checks\": [\"检查项\"],\n  \"summary\": \"总体评估\"\n}\nEOF",
-     run_in_background: true,
-     timeout: 3600000,
-     description: "{{BACKEND_PRIMARY}} 后端审查"
+   Agent({
+     subagent_type: "codex:codex-rescue",
+     description: "team Phase 6: 后端审查",
+     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md
+
+WORKDIR: {{WORKDIR}}
+
+<TASK>
+审查以下变更：
+<git diff 输出或变更文件列表>
+</TASK>
+
+OUTPUT (JSON):
+{
+  "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).`
    })
    ```
 
-   **SECOND Bash call ({{FRONTEND_PRIMARY}}) - IN THE SAME MESSAGE**:
+   **SECOND Agent call ({{FRONTEND_PRIMARY}}) - IN THE SAME MESSAGE**:
+   ```
+   Agent({
+     subagent_type: "gemini:gemini-rescue",
+     description: "team Phase 6: 前端审查",
+     prompt: `ROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md
+
+WORKDIR: {{WORKDIR}}
+
+<TASK>
+审查以下变更：
+<git diff 输出或变更文件列表>
+</TASK>
+
+OUTPUT (JSON):
+{
+  "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).`
+   })
+   ```
+
+   **通道 B — codeagent-wrapper fallback**（plugin 未装时降级）：
+
    ```
    Bash({
-     command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{FRONTEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md\n<TASK>\n审查以下变更：\n<git diff 输出或变更文件列表>\n</TASK>\nOUTPUT (JSON):\n{\n  \"findings\": [{\"severity\": \"Critical|Warning|Info\", \"dimension\": \"patterns|maintainability|accessibility|ux|frontend_security\", \"file\": \"path\", \"line\": N, \"description\": \"描述\", \"fix_suggestion\": \"修复建议\"}],\n  \"passed_checks\": [\"检查项\"],\n  \"summary\": \"总体评估\"\n}\nEOF",
+     command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{BACKEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{BACKEND_PRIMARY}}/reviewer.md\n<TASK>\n审查以下变更：\n<git diff 输出或变更文件列表>\n</TASK>\nOUTPUT (JSON): [same schema as 通道 A]\nEOF",
      run_in_background: true,
      timeout: 3600000,
-     description: "{{FRONTEND_PRIMARY}} 前端审查"
+     description: "{{BACKEND_PRIMARY}} 后端审查 (BC)"
+   })
+   Bash({
+     command: "~/.claude/bin/codeagent-wrapper {{LITE_MODE_FLAG}}--progress --backend {{FRONTEND_PRIMARY}} {{GEMINI_MODEL_FLAG}}- \"{{WORKDIR}}\" <<'EOF'\nROLE_FILE: ~/.claude/.ccg/prompts/{{FRONTEND_PRIMARY}}/reviewer.md\n<TASK>\n审查以下变更：\n<git diff 输出或变更文件列表>\n</TASK>\nOUTPUT (JSON): [same schema as 通道 A]\nEOF",
+     run_in_background: true,
+     timeout: 3600000,
+     description: "{{FRONTEND_PRIMARY}} 前端审查 (BC)"
    })
    ```
 
-   **事件驱动等待**：spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理。**不调 TaskOutput**。两个 task 都收到通知才进 step 3。
+   > ⚠️ 通道 B `codeagent-wrapper` 已标 **deprecated**，仅为不能升级 plugin 的环境保留。
+
+   **事件驱动等待**：
+   - **通道 A（plugin）**：两个 Agent 同 message 内 spawn，主线接 ≤200 token 摘要。
+   - **通道 B（BC wrapper）**：spawn 两个 Bash bg 后说明 task-id 然后 **turn end**。引擎在每个 task 完成时自动发 `<task-notification>`，主线在通知触发的新 turn 处理。**不调 TaskOutput**。两个 task 都收到通知才进 step 3。
 
    ⛔ **禁止**：调 `TaskOutput({block: true, timeout: 600000})` (旧 freeze poll 模式) / Kill task。
    ⚠️ **失败处理**：notification status=failed / exit ≠ 0 / parse 失败 → v1.7.87 标准 2-retry / 5s / 3-attempts；3 次全失败才降级单模型。

package/templates/scripts/ccgx-call-plugin.mjs

@@ -108,12 +108,21 @@ function parseArgs(argv) {
     // 600s default was SIGTERM-ing healthy tasks mid-thought. 2h is a
     // generous safety ceiling — pass 0 to disable entirely.
     timeoutMs: 7200000,
-    // 2.1.1: NEW idle timeout. Wall-time alone is the wrong signal — a
-    // healthy long-running audit produces continuous stdout/stderr (tool
-    // calls, progress lines). A truly hung companion produces nothing.
-    // We track lastActivityAt on every stdout/stderr chunk and SIGTERM if
-    // silent for idleTimeoutMs (default 600s = 10min). Pass 0 to disable.
-    idleTimeoutMs: 600000,
+    // 2.1.2: idle detection is OPT-IN (default 0 = disabled). The original
+    // 2.1.1 assumption that "healthy long-running audits emit continuous
+    // stdout/stderr chunks" is FALSE for both vendors:
+    //   - codex-companion `task`: writes progress to its internal job
+    //     state.json (read via `codex status`); helper sees ZERO stdout
+    //     until the final JSON envelope.
+    //   - gemini-batch / gemini-cli `--output-format json`: emits 4-5
+    //     startup warning lines, then SILENT through model reasoning + all
+    //     tool calls, then the final JSON.
+    // Deep reasoning passes can silently exceed any reasonable idle
+    // threshold while being perfectly healthy. Wall-time (default 2h)
+    // remains the only safety bound by default. Callers who know their
+    // task class is supposed to stream (e.g. future protocol additions)
+    // can pass --idle-timeout-ms <N> explicitly.
+    idleTimeoutMs: 0,
     maxBudgetUsd: 50,
     // 1.0.5 regression fix: pre-1.0.5 callers always passed --write directly
     // to codex-companion. Default true preserves BC; --no-write opt-out for
@@ -178,7 +187,7 @@ Optional:
   --json                  Pass --json to companion (default: true)
   --no-json               Disable --json (text output)
   --timeout-ms <N>        Kill companion if total wall-time exceeds N ms (default: 7200000, 2h; pass 0 to disable)
-  --idle-timeout-ms <N>   Kill companion if no stdout/stderr output for N ms (default: 600000, 10min; pass 0 to disable). Idle detection is the right signal for "hung" — healthy long-running audits keep producing tool-call progress.
+  --idle-timeout-ms <N>   Kill companion if no stdout/stderr output for N ms (default: 0 = disabled). NOTE: codex-companion and gemini-batch both emit NOTHING to stdout/stderr during execution (progress lives in internal state files); idle defaults to disabled to avoid false-positive kills of healthy long tasks. Set to a positive value only if your task class is known to stream.
   --max-budget-usd <N>    Per-call cost cap (default: 50)
   --write                 Enable workspace-write sandbox (default: true; codex needs this to spawn read commands too under default approval policy)
   --no-write              Force read-only sandbox (companion approval-policy will decline most commands)