ccgx-workflow 1.0.0 → 1.0.2

package/README.md

@@ -67,8 +67,13 @@ Codex   Gemini
 | **Node.js 20+** | Yes | `ora@9.x` requires Node ≥ 20 |
 | **Claude Code CLI** | Yes | [Install guide](#install-claude-code) |
 | **jq** | Yes | Used for auto-authorization hook ([install](#install-jq)) |
-| **codex@openai-codex plugin** | No | Enables backend Codex routing (strongly recommended) |
-| **gemini@google-gemini plugin** | No | Enables frontend Gemini routing (strongly recommended) |
+| **codex access** | **One of** | `codex@openai-codex` plugin (recommended) **OR** `npm i -g @openai/codex` |
+| **gemini access** | **One of** | `gemini@google-gemini` plugin (recommended) **OR** `npm i -g @google/gemini-cli` |
+
+> **Why "one of"**: ccgx-workflow prefers the plugin path (one-click install in Claude Code,
+> integrated auth). When the plugin is absent it falls back to spawning the standalone CLI
+> via `~/.claude/bin/codeagent-wrapper`. Without **either**, `/ccg:*` commands that invoke
+> codex/gemini fail with exit 127 + a friendly install hint.
 
 ### Installation
 
@@ -104,17 +109,44 @@ Supports npm / homebrew / curl / powershell / cmd.
 
 ---
 
-## Enabling Multi-Model Collaboration (codex / gemini plugins)
+## Enabling Multi-Model Collaboration (codex / gemini access)
+
+ccgx-workflow needs codex + gemini access via **one of two paths** for each:
 
-ccgx-workflow calls codex and gemini through Claude Code's official plugin mechanism, **no longer relying on the legacy `codeagent-wrapper` binary**. Install plugins to unlock full dual-model parallel capability.
+### Path A — Claude Code plugins (recommended)
 
-### Install (run inside Claude Code)
+Run inside Claude Code:
 
 ```
 /plugin install codex@openai-codex
 /plugin install gemini@google-gemini
 ```
 
+One-click install, integrated auth via Claude Code. Templates spawn plugin
+agents (`Agent(codex:codex-rescue)` / `Agent(gemini:gemini-rescue)`) directly,
+no shim involved.
+
+### Path B — standalone CLI fallback
+
+```bash
+# codex CLI
+npm i -g @openai/codex
+codex login
+
+# gemini CLI
+npm i -g @google/gemini-cli
+gemini auth login
+```
+
+When the plugin is absent, templates fall back to invoking the CLI through
+`~/.claude/bin/codeagent-wrapper` (a Node shim that wraps `codex` / `gemini`).
+You handle key configuration manually.
+
+### Mix and match
+
+You can use plugin for codex + CLI for gemini, or vice versa. ccgx-workflow
+detects each independently and picks the best available path per call site.
+
 The `@` suffix is the marketplace identifier. If a marketplace isn't configured, run `/help plugin` inside Claude Code to see local marketplace management commands, or refer to [Claude Code plugin docs](https://docs.claude.com/en/docs/claude-code/plugins).
 
 > Upstream plugin repos (for troubleshooting / issue reports):

package/README.zh-CN.md

@@ -64,8 +64,13 @@ Codex   Gemini
 | **Node.js 20+** | 是 | `ora@9.x` 要求 Node ≥ 20 |
 | **Claude Code CLI** | 是 | [安装方法](#安装-claude-code) |
 | **jq** | 是 | 自动授权 Hook 依赖（[安装方法](#安装-jq)） |
-| **codex@openai-codex plugin** | 否 | 启用后端 Codex 路由（强烈推荐） |
-| **gemini@google-gemini plugin** | 否 | 启用前端 Gemini 路由（强烈推荐） |
+| **codex 接入** | **二选一** | `codex@openai-codex` plugin（推荐）**或** `npm i -g @openai/codex` |
+| **gemini 接入** | **二选一** | `gemini@google-gemini` plugin（推荐）**或** `npm i -g @google/gemini-cli` |
+
+> **为什么是「二选一」**：ccgx-workflow 优先走 plugin（Claude Code 一键装、内置鉴权）。
+> plugin 没装时降级到 `~/.claude/bin/codeagent-wrapper` shim 启动独立 CLI。两条路
+> **任一**没装的，对应 `/ccg:*` 命令在调 codex/gemini 时会以 exit 127 退出并打印
+> 安装提示。
 
 ### 一键安装
 
@@ -101,17 +106,42 @@ npx ccgx-workflow menu  # 选择「安装 Claude Code」
 
 ---
 
-## 启用多模型协作（codex / gemini plugin）
+## 启用多模型协作（codex / gemini 接入）
+
+ccgx-workflow 需要 codex + gemini 接入，每个走 **两条路之一**：
 
-ccgx-workflow 通过 Claude Code 官方 plugin 机制调用 codex 和 gemini，**不再依赖旧的 `codeagent-wrapper` 二进制**。装 plugin 才能开启完整的双模型并行能力。
+### 路径 A — Claude Code plugin（推荐）
 
-### 安装命令（在 Claude Code 内执行）
+在 Claude Code 内执行：
 
 ```
 /plugin install codex@openai-codex
 /plugin install gemini@google-gemini
 ```
 
+一键安装，鉴权由 Claude Code 接管。模板直接 spawn plugin agent
+（`Agent(codex:codex-rescue)` / `Agent(gemini:gemini-rescue)`），不经过 shim。
+
+### 路径 B — 独立 CLI fallback
+
+```bash
+# codex CLI
+npm i -g @openai/codex
+codex login
+
+# gemini CLI
+npm i -g @google/gemini-cli
+gemini auth login
+```
+
+plugin 没装时，模板通过 `~/.claude/bin/codeagent-wrapper`（一个调 `codex` /
+`gemini` 的 Node shim）落地。鉴权 key 自己配。
+
+### 混搭
+
+可以 codex 走 plugin、gemini 走 CLI，反之亦然。ccgx-workflow 每次调用独立检测，
+按可用路径择优。
+
 `@` 后是 marketplace identifier。如果提示 marketplace 未配置，在 Claude Code 里执行 `/help plugin` 查看本地 marketplace 管理命令，或参考 [Claude Code plugin 官方文档](https://docs.claude.com/en/docs/claude-code/plugins)。
 
 > 上游 plugin 仓库地址（用于排错 / 提 issue）：

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.WgUzkiC3.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.Bq9vAaEw.mjs';
 import 'inquirer';
 import 'ora';
 import 'node:child_process';

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { h as collectSkills } from './shared/ccgx-workflow.WgUzkiC3.mjs';
-export { j as changeLanguage, F as checkForUpdates, H as collectInvocableSkills, G as compareVersions, l as createDefaultConfig, m as createDefaultRouting, I as generateCommandContent, n as getCcgDir, o as getConfigPath, D as getCurrentVersion, E as getLatestVersion, q as getWorkflowById, p as getWorkflowConfigs, c as i18n, e as init, b as initI18n, x as installAceTool, y as installAceToolRs, J as installSkillCommands, t as installWorkflows, B as migrateToV1_4_0, C as needsMigration, K as parseFrontmatter, a as readCcgConfig, s as showMainMenu, A as uninstallAceTool, z as uninstallWorkflows, u as update, k as writeCcgConfig } from './shared/ccgx-workflow.WgUzkiC3.mjs';
+import { h as collectSkills } from './shared/ccgx-workflow.Bq9vAaEw.mjs';
+export { j as changeLanguage, F as checkForUpdates, H as collectInvocableSkills, G as compareVersions, l as createDefaultConfig, m as createDefaultRouting, I as generateCommandContent, n as getCcgDir, o as getConfigPath, D as getCurrentVersion, E as getLatestVersion, q as getWorkflowById, p as getWorkflowConfigs, c as i18n, e as init, b as initI18n, x as installAceTool, y as installAceToolRs, J as installSkillCommands, t as installWorkflows, B as migrateToV1_4_0, C as needsMigration, K as parseFrontmatter, a as readCcgConfig, s as showMainMenu, A as uninstallAceTool, z as uninstallWorkflows, u as update, k as writeCcgConfig } from './shared/ccgx-workflow.Bq9vAaEw.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.WgUzkiC3.mjs → ccgx-workflow.Bq9vAaEw.mjs}

@@ -10,7 +10,7 @@ import fs from 'fs-extra';
 import { parse, stringify } from 'smol-toml';
 import i18next from 'i18next';
 
-const version = "1.0.0";
+const version = "1.0.2";
 
 function cmd(id, order, category, name, nameEn, description, descriptionEn, cmdOverride) {
   return {
@@ -1012,7 +1012,6 @@ async function removeFastContextPrompt() {
   await removeFromFile(join(homedir(), ".gemini", "GEMINI.md"));
 }
 
-const EXPECTED_BINARY_VERSION = "5.10.0";
 async function copyMdTemplates(ctx, srcDir, destDir, options = {}) {
   const installed = [];
   if (!await fs.pathExists(srcDir)) {
@@ -1256,55 +1255,6 @@ async function installHookFiles(ctx) {
 function getLauncherName() {
   return process.platform === "win32" ? "codeagent-wrapper.cmd" : "codeagent-wrapper";
 }
-async function verifyBinary(installDir) {
-  const binDir = join(installDir, "bin");
-  const launcherPath = join(binDir, getLauncherName());
-  if (!await fs.pathExists(launcherPath)) return false;
-  try {
-    const { execSync } = await import('node:child_process');
-    execSync(`"${launcherPath}" --version`, { stdio: "pipe" });
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function verifyBinaryVersion(installDir) {
-  const binDir = join(installDir, "bin");
-  const launcherPath = join(binDir, getLauncherName());
-  try {
-    const { execSync } = await import('node:child_process');
-    const output = execSync(`"${launcherPath}" --version`, { stdio: "pipe" }).toString().trim();
-    const version = output.replace(/^.*version\s*/, "");
-    return version === EXPECTED_BINARY_VERSION;
-  } catch {
-    return false;
-  }
-}
-function showBinaryDownloadWarning(binDir) {
-  const launcherName = getLauncherName();
-  const displayPath = process.platform === "win32" ? `${binDir.replace(/\//g, "\\")}\\${launcherName}` : `${binDir}/${launcherName}`;
-  console.log();
-  console.log(ansis.red.bold(`  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557`));
-  console.log(ansis.red.bold(`  \u2551  \u26A0  codeagent-wrapper \u542F\u52A8\u5668\u5B89\u88C5\u5931\u8D25                       \u2551`));
-  console.log(ansis.red.bold(`  \u2551     Launcher shim install failed (fs / package issue)      \u2551`));
-  console.log(ansis.red.bold(`  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D`));
-  console.log();
-  console.log(ansis.yellow(`  \u591A\u6A21\u578B\u534F\u4F5C\u547D\u4EE4 (/ccg:workflow, /ccg:plan \u7B49) \u9700\u8981\u6B64\u542F\u52A8\u5668\u624D\u80FD\u5DE5\u4F5C\u3002`));
-  console.log(ansis.yellow(`  Multi-model commands require this launcher to work.`));
-  console.log();
-  console.log(ansis.cyan(`  \u81EA\u52A8\u4FEE\u590D / Auto fix:`));
-  console.log();
-  console.log(ansis.white(`    1. \u6E05\u7F13\u5B58\u91CD\u88C5 / Clean & reinstall:`));
-  console.log(ansis.cyan(`       npm cache clean --force`));
-  console.log(ansis.cyan(`       npx ccg-workflow@latest`));
-  console.log();
-  console.log(ansis.white(`    2. \u68C0\u67E5\u8DEF\u5F84\u5199\u6743\u9650 / Check write permissions:`));
-  console.log(ansis.cyan(`       ${displayPath}`));
-  console.log();
-  console.log(ansis.gray(`  v3.0.0+ \u542F\u52A8\u5668\u662F ~870 \u884C Node \u811A\u672C\uFF08\u65E0 Go binary \u4E0B\u8F7D\uFF09\uFF0C`));
-  console.log(ansis.gray(`  \u5931\u8D25\u901A\u5E38\u610F\u5473\u7740 fs \u6743\u9650\u95EE\u9898\u6216 npm \u5305\u635F\u574F\uFF0C\u800C\u975E\u7F51\u7EDC\u3002`));
-  console.log();
-}
 async function installShim(ctx) {
   try {
     const binDir = join(ctx.installDir, "bin");
@@ -1332,25 +1282,6 @@ async function installShim(ctx) {
         await fs.chmod(destLauncher, 493);
       }
     }
-    for (const stale of ["codeagent-wrapper.exe", "codeagent-wrapper"]) {
-      const stalePath = join(binDir, stale);
-      if (await fs.pathExists(stalePath)) {
-        try {
-          const { execSync } = await import('node:child_process');
-          const out = execSync(`"${stalePath}" --version`, { stdio: "pipe" }).toString().trim();
-          if (out.includes(EXPECTED_BINARY_VERSION)) {
-            const stat = await fs.stat(stalePath);
-            if (stat.size > 1e5) {
-              await fs.remove(stalePath);
-            }
-          } else {
-            await fs.remove(stalePath);
-          }
-        } catch {
-          await fs.remove(stalePath);
-        }
-      }
-    }
     if (process.platform === "win32") {
       const cmdMjs = destMjs.replace(/\//g, "\\");
       const cmdPath = join(binDir, "codeagent-wrapper.cmd");
@@ -1598,36 +1529,6 @@ async function uninstallWorkflows(installDir, options) {
   return result;
 }
 
-const installer = {
-  __proto__: null,
-  collectInvocableSkills: collectInvocableSkills,
-  collectSkills: collectSkills,
-  computeSyncReport: computeSyncReport,
-  getAllCommandIds: getAllCommandIds,
-  getWorkflowById: getWorkflowById,
-  getWorkflowConfigs: getWorkflowConfigs,
-  injectConfigVariables: injectConfigVariables,
-  installAceTool: installAceTool,
-  installAceToolRs: installAceToolRs,
-  installContextWeaver: installContextWeaver,
-  installFastContext: installFastContext,
-  installMcpServer: installMcpServer,
-  installWorkflows: installWorkflows,
-  parseFrontmatter: parseFrontmatter,
-  removeFastContextPrompt: removeFastContextPrompt,
-  showBinaryDownloadWarning: showBinaryDownloadWarning,
-  syncMcpToCodex: syncMcpToCodex,
-  syncMcpToGemini: syncMcpToGemini,
-  uninstallAceTool: uninstallAceTool,
-  uninstallContextWeaver: uninstallContextWeaver,
-  uninstallFastContext: uninstallFastContext,
-  uninstallMcpServer: uninstallMcpServer,
-  uninstallWorkflows: uninstallWorkflows,
-  verifyBinary: verifyBinary,
-  verifyBinaryVersion: verifyBinaryVersion,
-  writeFastContextPrompt: writeFastContextPrompt
-};
-
 async function syncMcpMirrors() {
   const [codex, gemini] = await Promise.all([syncMcpToCodex(), syncMcpToGemini()]);
   const synced = [];
@@ -4056,7 +3957,10 @@ ${exportCommand}
         }
       }
     } else {
-      showBinaryDownloadWarning(join(installDir, "bin"));
+      console.log();
+      console.log(ansis.red.bold("  \u26A0  Launcher shim install failed"));
+      console.log(ansis.yellow("     Try: npm cache clean --force && npx ccgx-workflow@latest"));
+      console.log();
     }
     if (mcpProvider === "skip" || (mcpProvider === "ace-tool" || mcpProvider === "ace-tool-rs") && !aceToolToken || mcpProvider === "contextweaver" && !contextWeaverApiKey) {
       console.log();
@@ -4078,6 +3982,18 @@ ${exportCommand}
       console.log();
     }
     console.log();
+    console.log(ansis.cyan.bold("  \u26A0  Multi-model prerequisites \u2014 install one path for codex + gemini"));
+    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();
+    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")}`);
+    console.log(`        ${ansis.cyan("npm i -g @google/gemini-cli")} ${ansis.gray("# then: gemini auth")}`);
+    console.log();
+    console.log(ansis.gray("     Without either, /ccg:* commands invoking codex/gemini will exit 127."));
+    console.log();
   } catch (error) {
     spinner.fail(ansis.red(i18n.t("init:installFailed")));
     console.error(error);
@@ -4474,15 +4390,6 @@ async function performUpdate(fromVersion, toVersion, isNewVersion) {
       } catch {
       }
     }
-    if (!await verifyBinary(installDir)) {
-      showBinaryDownloadWarning(join(installDir, "bin"));
-    } else {
-      const { verifyBinaryVersion } = await Promise.resolve().then(function () { return installer; });
-      const versionOk = await verifyBinaryVersion(installDir);
-      if (!versionOk) {
-        showBinaryDownloadWarning(join(installDir, "bin"));
-      }
-    }
   } else {
     console.log();
     console.log(ansis.yellow.bold("  \u26A0 \u6B63\u5728\u6062\u590D\u65E7\u7248\u672C\u6587\u4EF6 / Restoring old version files..."));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccgx-workflow",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "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",
@@ -65,6 +65,7 @@
     "templates/commands/spec-plan.md",
     "templates/commands/spec-impl.md",
     "templates/commands/spec-review.md",
+    "templates/commands/team.md",
     "templates/commands/team-exec.md",
     "templates/commands/codex-exec.md",
     "templates/commands/context.md",