ccgx-workflow 1.0.10 → 2.1.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.9nxM0FK2.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.DVsx1kL4.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.9nxM0FK2.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.9nxM0FK2.mjs';
+import { h as collectSkills, j as resolvePluginBashCommand } from './shared/ccgx-workflow.DVsx1kL4.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.DVsx1kL4.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.9nxM0FK2.mjs → ccgx-workflow.DVsx1kL4.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.10";
+const version = "2.1.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.10",
+  "version": "2.1.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,37 @@ 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'],
+}
+
+// ---------------------------------------------------------------------------
+// Vendor → preferred entry script (relative to <installPath>/scripts/).
+//
+// gemini: prefer `gemini-batch.mjs` (CCG-only, bypasses ACP broker entirely
+// — direct gemini-cli batch mode via stdin + --output-format json). Falls
+// back to the legacy `gemini-companion.mjs task` (ACP path) only if the
+// batch entry isn't shipped.
+//
+// Why bypass ACP: gemini-cli 0.40+'s session/new RPC runs MCP setup + auth
+// refresh + chat startup synchronously inside the agent. On Windows the
+// gemini-plugin-cc ACP broker + named-pipe transport reliably hangs trivial
+// trips for 5+ minutes even when the direct CLI returns in 10-30s. Batch
+// mode side-steps the entire transport stack (no broker, no detached
+// process, no orphan MCP children).
+// ---------------------------------------------------------------------------
+
+const VENDOR_ENTRY_SCRIPTS = {
+  codex: ['codex-companion.mjs'],
+  gemini: ['gemini-batch.mjs', 'gemini-companion.mjs'],
 }
 
 // ---------------------------------------------------------------------------
@@ -80,6 +105,13 @@ function parseArgs(argv) {
     json: true,
     timeoutMs: 600000,
     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
+    // read-only review flows.
+    write: true,
+    model: null,
+    effort: null,
+    cwd: null,
   }
 
   const positional = []
@@ -96,6 +128,11 @@ function parseArgs(argv) {
       case '--no-json':        opts.json = false; break
       case '--timeout-ms':     opts.timeoutMs = Number.parseInt(next(), 10); break
       case '--max-budget-usd': opts.maxBudgetUsd = Number.parseFloat(next()); break
+      case '--write':          opts.write = true; break
+      case '--no-write':       opts.write = false; break
+      case '--model':          opts.model = next(); break
+      case '--effort':         opts.effort = next(); break
+      case '--cwd':            opts.cwd = next(); break
       case '--help':
       case '-h':
         printHelp()
@@ -131,6 +168,11 @@ Optional:
   --no-json               Disable --json (text output)
   --timeout-ms <N>        Kill companion after N ms (default: 600000)
   --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)
+  --model <name>          Override model (codex only; gemini ignores)
+  --effort <level>        Reasoning effort: none|minimal|low|medium|high|xhigh (codex only)
+  --cwd <path>            Override working directory for the companion call. codex sandbox is cwd-bound; set this when auditing a repo other than the caller's cwd.
 
 Outputs JSON to stdout: {status, vendor, version, durationMs, exitCode, stdout, stderr, error?}
 `)
@@ -154,21 +196,41 @@ 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`)
-  if (!existsSync(companionPath)) {
-    return { error: `companion script missing: ${companionPath}` }
+  // Walk the preferred entry-script list. First existing file wins.
+  // BC: vendors with only the legacy companion still resolve correctly.
+  const entryCandidates = VENDOR_ENTRY_SCRIPTS[vendor] ?? [`${vendor}-companion.mjs`]
+  let companionPath = null
+  for (const name of entryCandidates) {
+    const candidate = join(installPath, 'scripts', name)
+    if (existsSync(candidate)) {
+      companionPath = candidate
+      break
+    }
+  }
+  if (!companionPath) {
+    return { error: `no entry script found for ${vendor} (tried: ${entryCandidates.join(', ')}) in ${join(installPath, 'scripts')}` }
   }
 
   return {
@@ -238,6 +300,15 @@ async function main(argv) {
     promptBody,
   ]
   if (opts.json) companionArgs.push('--json')
+  // codex-companion flag pass-through (1.0.5 regression fix). gemini-companion
+  // ignores unknown flags safely; both vendors accept this surface.
+  if (opts.write) companionArgs.push('--write')
+  if (opts.model) companionArgs.push('--model', opts.model)
+  if (opts.effort) companionArgs.push('--effort', opts.effort)
+  // --cwd pass-through: codex sandbox is cwd-bound. For cross-repo audits
+  // the caller must set this to the repo being audited (codex-companion
+  // does not expose --add-dir; multi-workspace requires deeper changes).
+  if (opts.cwd) companionArgs.push('--cwd', opts.cwd)
 
   const startedAt = Date.now()
 

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`);