ccgx-workflow 1.0.9 → 2.0.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.BmN81Bej.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.Bd3sZyxW.mjs';
 import { execSync } from 'node:child_process';
 import 'inquirer';
 import 'ora';
@@ -75,6 +75,17 @@ async function fixMcp() {
   }
 }
 
+const STUCK_MIN_AGE_SECONDS = 300;
+const STUCK_CPU_RATIO_THRESHOLD = 0.01;
+function isBrokerProcess(p) {
+  return /acp-broker|app-server-broker|broker-lifecycle/.test(p.cmdLine);
+}
+function isStuck(p) {
+  if (!isBrokerProcess(p)) return false;
+  const wallSeconds = p.ageHours * 3600;
+  if (wallSeconds < STUCK_MIN_AGE_SECONDS) return false;
+  return p.cpuSeconds / wallSeconds < STUCK_CPU_RATIO_THRESHOLD;
+}
 function categorize(cmdLine) {
   const cmd = cmdLine.toLowerCase();
   if (/quasar|vite|webpack|next\b|nuxt|astro|svelte-kit|pnpm.*run.*dev|npm.*run.*dev|yarn.*run.*dev|yarn dev|pnpm dev|npm run dev/.test(cmd)) {
@@ -92,7 +103,10 @@ function listNodeProcessesWindows() {
     $cd = $_.CreationDate
     $h = if ($cd) { ((Get-Date) - $cd).TotalHours } else { 0 }
     $cmd = if ($_.CommandLine) { $_.CommandLine } else { '' }
-    "$($_.ProcessId)|$h|$cmd"
+    $kt = if ($_.KernelModeTime) { $_.KernelModeTime } else { 0 }
+    $ut = if ($_.UserModeTime) { $_.UserModeTime } else { 0 }
+    $cpuS = ($kt + $ut) / 10000000.0
+    "$($_.ProcessId)|$h|$cpuS|$cmd"
   }`;
   let out;
   try {
@@ -111,43 +125,56 @@ function listNodeProcessesWindows() {
     if (!trimmed) continue;
     const sep1 = trimmed.indexOf("|");
     const sep2 = trimmed.indexOf("|", sep1 + 1);
-    if (sep1 < 0 || sep2 < 0) continue;
+    const sep3 = trimmed.indexOf("|", sep2 + 1);
+    if (sep1 < 0 || sep2 < 0 || sep3 < 0) continue;
     const pid = Number.parseInt(trimmed.slice(0, sep1), 10);
     const ageHours = Number.parseFloat(trimmed.slice(sep1 + 1, sep2));
-    const cmdLine = trimmed.slice(sep2 + 1);
+    const cpuSeconds = Number.parseFloat(trimmed.slice(sep2 + 1, sep3));
+    const cmdLine = trimmed.slice(sep3 + 1);
     if (Number.isNaN(pid)) continue;
     procs.push({
       pid,
       ageHours: Number.isFinite(ageHours) ? ageHours : 0,
+      cpuSeconds: Number.isFinite(cpuSeconds) ? cpuSeconds : 0,
       cmdLine,
       category: categorize(cmdLine)
     });
   }
   return procs;
 }
+function parseHmsToSeconds(spec) {
+  const parts = spec.split(/[-:]/).map((s) => Number.parseInt(s, 10));
+  if (parts.length === 4) return parts[0] * 86400 + parts[1] * 3600 + parts[2] * 60 + parts[3];
+  if (parts.length === 3) return parts[0] * 3600 + parts[1] * 60 + parts[2];
+  if (parts.length === 2) return parts[0] * 60 + parts[1];
+  return 0;
+}
 function listNodeProcessesPosix() {
   let out;
   try {
-    out = execSync("ps -eo pid,etime,command", { encoding: "utf-8", maxBuffer: 16 * 1024 * 1024 });
+    out = execSync("ps -eo pid,etime,time,command", { encoding: "utf-8", maxBuffer: 16 * 1024 * 1024 });
   } catch {
     return [];
   }
   const procs = [];
   for (const line of out.split("\n").slice(1)) {
-    const m = line.match(/^\s*(\d+)\s+(\S+)\s+(.+)$/);
+    const m = line.match(/^\s*(\d+)\s+(\S+)\s+(\S+)\s+(.+)$/);
     if (!m) continue;
-    const cmdLine = m[3];
+    const cmdLine = m[4];
     if (!/(^|\/)node(\s|$)/.test(cmdLine)) continue;
     const pid = Number.parseInt(m[1], 10);
     const etime = m[2];
+    const cpuTime = m[3];
     const parts = etime.split(/[-:]/).map((s) => Number.parseInt(s, 10));
     let ageHours = 0;
     if (parts.length === 4) ageHours = parts[0] * 24 + parts[1] + parts[2] / 60;
     else if (parts.length === 3) ageHours = parts[0] + parts[1] / 60;
     else if (parts.length === 2) ageHours = parts[0] / 60;
+    const cpuSeconds = parseHmsToSeconds(cpuTime);
     procs.push({
       pid,
       ageHours,
+      cpuSeconds,
       cmdLine,
       category: categorize(cmdLine)
     });
@@ -159,13 +186,13 @@ function listNodeProcesses() {
 }
 function killProcessWindows(pid) {
   try {
-    execSync(`powershell -NoProfile -Command "Stop-Process -Id ${pid} -Force -ErrorAction Stop"`, { stdio: "pipe" });
-    return { ok: true, method: "Stop-Process" };
+    execSync(`taskkill /F /T /PID ${pid}`, { stdio: "pipe" });
+    return { ok: true, method: "taskkill /F /T" };
   } catch {
   }
   try {
-    execSync(`taskkill /F /PID ${pid}`, { stdio: "pipe" });
-    return { ok: true, method: "taskkill /F" };
+    execSync(`powershell -NoProfile -Command "Stop-Process -Id ${pid} -Force -ErrorAction Stop"`, { stdio: "pipe" });
+    return { ok: true, method: "Stop-Process" };
   } catch {
   }
   try {
@@ -176,6 +203,11 @@ function killProcessWindows(pid) {
   }
 }
 function killProcessPosix(pid) {
+  try {
+    execSync(`kill -TERM -- -${pid}`, { stdio: "pipe" });
+    return { ok: true, method: "SIGTERM (group)" };
+  } catch {
+  }
   try {
     execSync(`kill -TERM ${pid}`, { stdio: "pipe" });
     return { ok: true, method: "SIGTERM" };
@@ -191,8 +223,10 @@ function killProcessPosix(pid) {
 async function killOrphans(options = {}) {
   const dryRun = options.dryRun ?? true;
   const minAgeHours = options.minAgeHours ?? 1;
+  const stuckOnly = options.stuckOnly ?? false;
+  const targetDesc = stuckOnly ? "stuck broker daemons only (CPU/wall < 1%, age > 5min, ignores companions/MCP)" : `orphan node processes >${minAgeHours}h`;
   console.log(ansis.cyan.bold("\n  ccgx kill-orphans"));
-  console.log(ansis.gray(`  ${dryRun ? "[DRY-RUN]" : "[KILL MODE]"} target: orphan node processes >${minAgeHours}h
+  console.log(ansis.gray(`  ${dryRun ? "[DRY-RUN]" : "[KILL MODE]"} target: ${targetDesc}
 `));
   const all = listNodeProcesses();
   if (all.length === 0) {
@@ -209,24 +243,37 @@ async function killOrphans(options = {}) {
     const list = groups.get(cat) ?? [];
     if (list.length === 0) continue;
     const oldestH = Math.max(...list.map((p) => p.ageHours));
+    const stuckCount = list.filter(isStuck).length;
     const tag = cat === "dev-server" ? ansis.green("SAFE") : cat === "other" ? ansis.gray("UNKN") : ansis.yellow("ORPH");
-    console.log(`    ${tag} ${cat.padEnd(14)} ${String(list.length).padStart(3)} processes  (oldest ${oldestH.toFixed(1)}h)`);
+    const stuckTag = stuckCount > 0 ? ansis.red(` ${stuckCount} stuck`) : "";
+    console.log(`    ${tag} ${cat.padEnd(14)} ${String(list.length).padStart(3)} processes  (oldest ${oldestH.toFixed(1)}h)${stuckTag}`);
   }
   console.log();
   const ORPHAN_CATS = ["mcp-server", "codex-cli", "gemini-cli", "phase-runner"];
-  const targets = all.filter((p) => ORPHAN_CATS.includes(p.category) && p.ageHours >= minAgeHours);
+  const targets = all.filter((p) => {
+    if (!ORPHAN_CATS.includes(p.category)) return false;
+    if (stuckOnly) return isStuck(p);
+    return p.ageHours >= minAgeHours;
+  });
   if (targets.length === 0) {
-    console.log(ansis.green(`  \u2713 No orphans >${minAgeHours}h to clean.`));
+    const reason = stuckOnly ? "stuck" : `>${minAgeHours}h`;
+    console.log(ansis.green(`  \u2713 No ${reason} orphans to clean.`));
     return;
   }
   console.log(ansis.bold(`  Targets (${targets.length}):`));
   for (const p of targets) {
-    const cmdShort = p.cmdLine.length > 70 ? `${p.cmdLine.slice(0, 70)}...` : p.cmdLine;
-    console.log(`    PID ${String(p.pid).padStart(6)}  ${p.ageHours.toFixed(1).padStart(5)}h  ${ansis.gray(p.category.padEnd(14))} ${cmdShort}`);
+    const cmdShort = p.cmdLine.length > 60 ? `${p.cmdLine.slice(0, 60)}...` : p.cmdLine;
+    const wallS = p.ageHours * 3600;
+    const ratio = wallS > 0 ? p.cpuSeconds / wallS * 100 : 0;
+    const stuckMark = isStuck(p) ? ansis.red(" STUCK") : "";
+    console.log(
+      `    PID ${String(p.pid).padStart(6)}  ${p.ageHours.toFixed(1).padStart(5)}h  CPU ${p.cpuSeconds.toFixed(1).padStart(6)}s (${ratio.toFixed(2).padStart(5)}%)  ${ansis.gray(p.category.padEnd(14))} ${cmdShort}${stuckMark}`
+    );
   }
   console.log();
   if (dryRun) {
-    console.log(ansis.gray(`  Run with --kill to actually terminate (skips dev-server / other categories).`));
+    const flag = stuckOnly ? "--stuck --kill" : "--kill";
+    console.log(ansis.gray(`  Run with ${flag} to actually terminate (skips dev-server / other categories).`));
     return;
   }
   const killer = isWindows() ? killProcessWindows : killProcessPosix;
@@ -327,10 +374,11 @@ async function setupCommands(cli) {
   cli.command("diagnose-mcp", i18n.t("cli:help.commandDescriptions.diagnoseMcp")).action(async () => {
     await diagnoseMcp();
   });
-  cli.command("kill-orphans", "\u6E05\u7406 Claude Code session \u9000\u51FA\u540E\u6B8B\u7559\u7684\u5B64\u513F node \u8FDB\u7A0B\uFF08MCP server / codex / gemini\uFF09").option("--kill", "\u5B9E\u9645\u6267\u884C kill (\u9ED8\u8BA4 dry-run)").option("--min-age-hours <N>", "\u53EA\u6E05\u7406\u8D85\u8FC7 N \u5C0F\u65F6\u7684\u8FDB\u7A0B (\u9ED8\u8BA4 1)").action(async (options) => {
+  cli.command("kill-orphans", "\u6E05\u7406 Claude Code session \u9000\u51FA\u540E\u6B8B\u7559\u7684\u5B64\u513F node \u8FDB\u7A0B\uFF08MCP server / codex / gemini\uFF09").option("--kill", "\u5B9E\u9645\u6267\u884C kill (\u9ED8\u8BA4 dry-run)").option("--min-age-hours <N>", "\u53EA\u6E05\u7406\u8D85\u8FC7 N \u5C0F\u65F6\u7684\u8FDB\u7A0B (\u9ED8\u8BA4 1)").option("--stuck", "\u53EA\u6E05\u7406\u505C\u6EDE\u8FDB\u7A0B\uFF1ACPU \u5360\u6BD4 < 1% \u4E14 wall age > 5min\uFF08\u8986\u76D6 --min-age-hours\uFF09").action(async (options) => {
     await killOrphans({
       dryRun: !options.kill,
-      minAgeHours: options.minAgeHours ? Number.parseFloat(options.minAgeHours) : 1
+      minAgeHours: options.minAgeHours ? Number.parseFloat(options.minAgeHours) : 1,
+      stuckOnly: options.stuck
     });
   });
   cli.command("fix-mcp", i18n.t("cli:help.commandDescriptions.fixMcp")).action(async () => {

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { h as collectSkills, j as resolvePluginBashCommand } from './shared/ccgx-workflow.BmN81Bej.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.BmN81Bej.mjs';
+import { h as collectSkills, j as resolvePluginBashCommand } from './shared/ccgx-workflow.Bd3sZyxW.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.Bd3sZyxW.mjs';
 import { existsSync, readFileSync, mkdirSync, writeFileSync, statSync, readdirSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { homedir } from 'node:os';
@@ -775,7 +775,7 @@ function pluginRoot(home = homedir()) {
 const PLUGIN_MARKERS = ["SKILL.md", "plugin.json", "package.json", "manifest.json"];
 const PLUGIN_PREFIXES = {
   codex: ["codex@", "codex-rescue@", "openai-codex@"],
-  gemini: ["gemini@", "gemini-rescue@", "google-gemini@"]
+  gemini: ["gemini@", "gemini-rescue@", "gemini-ccgx@", "google-gemini@"]
 };
 function detectPlugin(name, homeDir = homedir()) {
   const root = pluginRoot(homeDir);

package/dist/shared/{ccgx-workflow.BmN81Bej.mjs → ccgx-workflow.Bd3sZyxW.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 = "1.0.9";
+const version = "2.0.0";
 
 function cmd(id, order, category, name, nameEn, description, descriptionEn, cmdOverride) {
   return {
@@ -295,8 +295,18 @@ function getMcpCommand(command) {
 }
 
 const VENDOR_MARKETPLACE_KEYS = {
-  codex: "codex@openai-codex",
-  gemini: "gemini@google-gemini"
+  codex: ["codex@openai-codex"],
+  gemini: ["gemini@gemini-ccgx", "gemini@google-gemini"]
+};
+const VENDOR_PRIMARY_INSTALL = {
+  codex: {
+    marketplace: "openai/codex-plugin-cc",
+    key: "codex@openai-codex"
+  },
+  gemini: {
+    marketplace: "wzyxdwll/gemini-plugin-cc",
+    key: "gemini@gemini-ccgx"
+  }
 };
 function discoverCompanion(vendor, homeDir = homedir()) {
   const ssotPath = join$1(homeDir, ".claude", "plugins", "installed_plugins.json");
@@ -307,10 +317,16 @@ function discoverCompanion(vendor, homeDir = homedir()) {
   } catch {
     return null;
   }
-  const key = VENDOR_MARKETPLACE_KEYS[vendor];
-  const instances = raw?.plugins?.[key];
-  if (!Array.isArray(instances) || instances.length === 0) return null;
-  const inst = instances[0];
+  const keys = VENDOR_MARKETPLACE_KEYS[vendor];
+  let inst = null;
+  for (const key of keys) {
+    const instances = raw?.plugins?.[key];
+    if (Array.isArray(instances) && instances.length > 0) {
+      inst = instances[0];
+      break;
+    }
+  }
+  if (!inst) return null;
   const installPath = inst?.installPath;
   if (typeof installPath !== "string" || !installPath) return null;
   const companionPath = join$1(installPath, "scripts", `${vendor}-companion.mjs`);
@@ -335,10 +351,12 @@ function buildBashCommand(_loc, options = {}) {
   return `node ${quotedHelper} ${vendor}${jsonFlag}`;
 }
 function buildPluginMissingFallback(vendor) {
-  const key = VENDOR_MARKETPLACE_KEYS[vendor];
+  const { marketplace, key } = VENDOR_PRIMARY_INSTALL[vendor];
   return [
-    `# CCG: ${vendor} plugin (${key}) not installed at CCG install time.`,
-    `# Install with: claude plugin install ${key}`,
+    `# CCG: ${vendor} plugin not installed at CCG install time.`,
+    `# Install with:`,
+    `#   claude plugin marketplace add ${marketplace}`,
+    `#   claude plugin install ${key}`,
     `# Then re-run: npx ccgx-workflow init --skip-prompt --skip-mcp`,
     `echo 'CCG: ${vendor} plugin not available' >&2 && exit 1`
   ].join("\n");
@@ -4064,7 +4082,9 @@ ${exportCommand}
     console.log();
     console.log(`     ${ansis.green("\u2605")} ${ansis.bold("Plugin (recommended, one-click in Claude Code):")}`);
     console.log(`        ${ansis.cyan("/plugins install codex@openai-codex")}`);
-    console.log(`        ${ansis.cyan("/plugins install gemini@google-gemini")}`);
+    console.log(`        ${ansis.cyan("claude plugin marketplace add wzyxdwll/gemini-plugin-cc")} ${ansis.gray("# 2.0.0+ ccgx fork")}`);
+    console.log(`        ${ansis.cyan("/plugins install gemini@gemini-ccgx")}     ${ansis.gray("# preferred (\u542B P-1..P-21 + W1/W2/I1 patch)")}`);
+    console.log(`        ${ansis.gray("  \u2014 or upstream: /plugins install gemini@google-gemini (requires repatch)")}`);
     console.log();
     console.log(`     ${ansis.green("\u2606")} ${ansis.bold("CLI fallback (standalone binaries):")}`);
     console.log(`        ${ansis.cyan("npm i -g @openai/codex")}      ${ansis.gray("# then: codex login")}`);

package/package.json

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

@@ -39,7 +39,7 @@ argument-hint: "<分析问题或任务> [--role=architect|critic|implementer|tes
 
 CCG 把双模型并行通道从 `Bash(codeagent-wrapper)` **默认切换**为 plugin spawn：
 
-1. **优先 plugin spawn**（默认）：装了 `codex@openai-codex` + `gemini@google-gemini` plugin → 用 `Agent(subagent_type="codex:codex-rescue")` + `Agent(subagent_type="gemini:gemini-rescue")` 并行，主线接 ≤200 token 摘要。
+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`。

package/templates/commands/execute.md

@@ -24,7 +24,7 @@ $ARGUMENTS
 
 CCG 把 6 核心命令的"双模型并行"通道从 `Bash(codeagent-wrapper)` **默认切换**为 plugin spawn。判定流程：
 
-1. **优先 plugin spawn 路径**（默认）：用户已装 `codex@openai-codex` 和 `gemini@google-gemini` plugin → 用 `Agent(subagent_type="codex:codex-rescue")` + `Agent(subagent_type="gemini:gemini-rescue")` 并行 spawn，主线只接 plugin 自家 ≤200 token 摘要。
+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 独立判定。

package/templates/commands/optimize.md

@@ -44,7 +44,7 @@ argument-hint: "<优化目标> [--role=architect|critic|implementer|tester|write
 
 CCG 把双模型并行通道从 `Bash(codeagent-wrapper)` **默认切换**为 plugin spawn：
 
-1. **优先 plugin spawn**（默认）：装了 `codex@openai-codex` + `gemini@google-gemini` plugin → 用 `Agent(subagent_type="codex:codex-rescue")` + `Agent(subagent_type="gemini:gemini-rescue")` 并行，主线接 ≤200 token 摘要。
+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`。

package/templates/commands/plan.md

@@ -54,7 +54,7 @@ $ARGUMENTS
 
 CCG 把 6 核心命令的"双模型并行"通道从 `Bash(codeagent-wrapper)` **默认切换**为 plugin spawn。判定流程：
 
-1. **优先 plugin spawn 路径**（默认）：用户已装 `codex@openai-codex` 和 `gemini@google-gemini` plugin → 用 `Agent(subagent_type="codex:codex-rescue")` + `Agent(subagent_type="gemini:gemini-rescue")` 并行 spawn，主线只接 plugin 自家 ≤200 token 摘要协议（`STATUS: ... / FINDINGS: ... / NOTES: ...`）。
+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）。

package/templates/commands/review.md

@@ -21,7 +21,7 @@ argument-hint: "[代码或描述] [--adversarial] [--fix [--all] [--auto]] [--ro
 
 双模型并行审查，交叉验证综合反馈。无参数时自动审查当前 git 变更。
 
-**双模型并行通道**：默认走 plugin spawn —— 装了 `codex@openai-codex` + `gemini@google-gemini` plugin → 用 `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` 跑 `ls ~/.claude/plugins/` 检测，helper 见 `src/utils/plugin-detection.ts`。
 
 `--adversarial` 模式下额外触发第三层"敌对视角"审查，由官方 codex plugin 的 `Agent(codex:codex-rescue)` 在 fresh context 中专门挑前两轮意见的漏洞，适合极重要 PR / 安全敏感变更。需用户已装 `codex@openai-codex` plugin，否则降级为双模型审查。
 

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

@@ -61,12 +61,16 @@ import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 // ---------------------------------------------------------------------------
-// Vendor → marketplace key (matches plugin-bash-codegen.ts SSoT lookup)
+// Vendor → marketplace keys (ordered preference list).
+//
+// CCG 2.0.0: gemini-ccgx (ccgx-maintained fork shipping P-1..P-21 + W1/W2/I1
+// inline, no repatch needed) is preferred over google-gemini (upstream).
+// Keep this list in sync with src/utils/plugin-bash-codegen.ts.
 // ---------------------------------------------------------------------------
 
 const VENDOR_KEYS = {
-  codex: 'codex@openai-codex',
-  gemini: 'gemini@google-gemini',
+  codex: ['codex@openai-codex'],
+  gemini: ['gemini@gemini-ccgx', 'gemini@google-gemini'],
 }
 
 // ---------------------------------------------------------------------------
@@ -154,16 +158,26 @@ function discoverCompanion(vendor, homeDir = homedir()) {
     return { error: `installed_plugins.json parse failed: ${e.message}` }
   }
 
-  const key = VENDOR_KEYS[vendor]
-  const instances = raw?.plugins?.[key]
-  if (!Array.isArray(instances) || instances.length === 0) {
-    return { error: `plugin ${key} not installed (no entry in installed_plugins.json)` }
+  // Try preferred keys in order — fork first, upstream fallback.
+  const keys = VENDOR_KEYS[vendor]
+  let instances = null
+  let matchedKey = null
+  for (const key of keys) {
+    const candidate = raw?.plugins?.[key]
+    if (Array.isArray(candidate) && candidate.length > 0) {
+      instances = candidate
+      matchedKey = key
+      break
+    }
+  }
+  if (!instances || instances.length === 0) {
+    return { error: `${vendor} plugin not installed (tried ${keys.join(', ')})` }
   }
 
   const inst = instances[0]
   const installPath = inst?.installPath
   if (typeof installPath !== 'string' || !installPath) {
-    return { error: `plugin ${key} has no installPath in installed_plugins.json` }
+    return { error: `plugin ${matchedKey} has no installPath in installed_plugins.json` }
   }
 
   const companionPath = join(installPath, 'scripts', `${vendor}-companion.mjs`)

package/templates/scripts/invoke-model.mjs

@@ -217,7 +217,7 @@ function exitMissingBackend(backend) {
   const pluginInstall = backend === 'codex'
     ? '/plugins install codex@openai-codex'
     : backend === 'gemini'
-      ? '/plugins install gemini@google-gemini'
+      ? '/plugins install gemini@gemini-ccgx (ccgx 2.0.0 fork, recommended) — or /plugins install gemini@google-gemini (upstream)'
       : null;
   const npmInstall = backend === 'codex'
     ? 'npm i -g @openai/codex'

package/templates/scripts/repatch-gemini-plugin.mjs

@@ -51,8 +51,23 @@ function findPluginVersion() {
   return versions[versions.length - 1];
 }
 
-const VERSION = findPluginVersion();
-const SCRIPTS = join(PLUGIN_BASE, VERSION, "scripts");
+// Allow redirecting the patch target to a custom location, e.g. a local fork.
+// When GEMINI_PLUGIN_SCRIPTS is set, it must point directly to the `scripts/`
+// directory (containing acp-broker.mjs, gemini-companion.mjs, lib/...).
+// Falls back to ~/.claude/plugins/cache/.../gemini/<latest>/scripts/.
+let SCRIPTS;
+let VERSION;
+if (process.env.GEMINI_PLUGIN_SCRIPTS) {
+  SCRIPTS = process.env.GEMINI_PLUGIN_SCRIPTS;
+  if (!existsSync(SCRIPTS)) {
+    throw new Error(`GEMINI_PLUGIN_SCRIPTS path does not exist: ${SCRIPTS}`);
+  }
+  VERSION = `<custom: ${SCRIPTS}>`;
+}
+else {
+  VERSION = findPluginVersion();
+  SCRIPTS = join(PLUGIN_BASE, VERSION, "scripts");
+}
 
 console.log(`Patching gemini plugin ${VERSION} at:\n  ${SCRIPTS}\n`);
 
@@ -142,6 +157,18 @@ const PATCHES = [
     match: /(if \(message\.error\) \{\s*\r?\n\s*)pending\.reject\(message\.error\);(\s*\r?\n\s*\} else \{)/,
     replace: `$1// CCG P-9 patch: wrap JSON-RPC error object in Error instance.\n          // Without this, callers doing \`e instanceof Error ? e.message : String(e)\`\n          // get "[object Object]" — losing real error info (auth-expired, broker-dead,\n          // parse-error, etc). See .ccg-migration/PLUGIN-PATCHES.md P-9.\n          const _err = message.error;\n          const _wrapped = Object.assign(\n            new Error(typeof _err === "object" && _err !== null && _err.message\n              ? String(_err.message)\n              : String(_err)),\n            {\n              jsonrpcCode: typeof _err === "object" && _err !== null ? _err.code : undefined,\n              jsonrpcData: typeof _err === "object" && _err !== null ? _err.data : undefined,\n            },\n          );\n          pending.reject(_wrapped);$2`,
   },
+  {
+    id: "P-12",
+    file: "gemini-companion.mjs",
+    description: "CLAUDE_PLUGIN_DATA env cross-contamination — recompute from script path",
+    // Guard: any patched marker present
+    guard: /CCG P-12 patch/,
+    // Anchor on the last import line (createStreamHandler). Newer plugin
+    // versions may add imports after this; if so, the regex misses (reported
+    // by the script's [MISS] line) and the patch is re-evaluated upstream.
+    match: /(import\s+\{\s*createStreamHandler\s*\}\s+from\s+"\.\/lib\/stream-output\.mjs";?)/,
+    replace: `$1\n\n// CCG P-12 patch: prevent CLAUDE_PLUGIN_DATA cross-contamination from previous\n// plugin invocations (e.g., codex). Recompute from this script's physical path\n// so the broker session file lands in our own data dir, enabling broker reuse.\n// See .ccg-migration/PLUGIN-PATCHES.md P-12.\n{\n  const _scriptDir = path.dirname(fileURLToPath(import.meta.url));\n  const _versionDir = path.dirname(_scriptDir);\n  const _pluginDir = path.dirname(_versionDir);\n  const _marketplaceDir = path.dirname(_pluginDir);\n  const _cacheDir = path.dirname(_marketplaceDir);\n  const _pluginsDir = path.dirname(_cacheDir);\n  const _pluginName = path.basename(_pluginDir);\n  const _marketplaceName = path.basename(_marketplaceDir);\n  process.env.CLAUDE_PLUGIN_DATA = path.join(_pluginsDir, "data", _pluginName + "-" + _marketplaceName);\n}`,
+  },
 ];
 
 let applied = 0;