ccg-workflow 1.7.87 → 1.7.89

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import cac from 'cac';
 import ansis from 'ansis';
-import { z as diagnoseMcpConfig, A as isWindows, B as readClaudeCodeConfig, C as fixWindowsMcpConfig, D as writeClaudeCodeConfig, r as readCcgConfig, b as initI18n, a as i18n, s as showMainMenu, i as init, E as configMcp, F as version } from './shared/ccg-workflow.CJXxHH9w.mjs';
+import { z as diagnoseMcpConfig, A as isWindows, B as readClaudeCodeConfig, C as fixWindowsMcpConfig, D as writeClaudeCodeConfig, r as readCcgConfig, b as initI18n, a as i18n, s as showMainMenu, i as init, E as configMcp, F as version } from './shared/ccg-workflow.BF0FhMt8.mjs';
 import 'inquirer';
 import 'node:child_process';
 import 'node:util';

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { c as changeLanguage, x as checkForUpdates, y as compareVersions, d as createDefaultConfig, e as createDefaultRouting, g as getCcgDir, f as getConfigPath, t as getCurrentVersion, v as getLatestVersion, j as getWorkflowById, h as getWorkflowConfigs, a as i18n, i as init, b as initI18n, l as installAceTool, m as installAceToolRs, k as installWorkflows, p as migrateToV1_4_0, q as needsMigration, r as readCcgConfig, s as showMainMenu, o as uninstallAceTool, n as uninstallWorkflows, u as update, w as writeCcgConfig } from './shared/ccg-workflow.CJXxHH9w.mjs';
+export { c as changeLanguage, x as checkForUpdates, y as compareVersions, d as createDefaultConfig, e as createDefaultRouting, g as getCcgDir, f as getConfigPath, t as getCurrentVersion, v as getLatestVersion, j as getWorkflowById, h as getWorkflowConfigs, a as i18n, i as init, b as initI18n, l as installAceTool, m as installAceToolRs, k as installWorkflows, p as migrateToV1_4_0, q as needsMigration, r as readCcgConfig, s as showMainMenu, o as uninstallAceTool, n as uninstallWorkflows, u as update, w as writeCcgConfig } from './shared/ccg-workflow.BF0FhMt8.mjs';
 import 'ansis';
 import 'inquirer';
 import 'node:child_process';

package/dist/shared/{ccg-workflow.CJXxHH9w.mjs → ccg-workflow.BF0FhMt8.mjs}

@@ -10,7 +10,7 @@ import { parse, stringify } from 'smol-toml';
 import i18next from 'i18next';
 import ora from 'ora';
 
-const version = "1.7.87";
+const version = "1.7.89";
 
 function cmd(id, order, category, name, nameEn, description, descriptionEn, cmdOverride) {
   return {
@@ -2460,72 +2460,40 @@ async function needsMigration() {
   return hasOldCcgDir || hasOldPromptsDir || hasOldConfigFile;
 }
 
-async function checkJqAvailable() {
-  try {
-    const { execSync } = await import('node:child_process');
-    execSync("jq --version", { stdio: "pipe" });
-    return true;
-  } catch {
-    return false;
-  }
-}
 async function installHook(settingsPath) {
   let settings = {};
   if (await fs.pathExists(settingsPath)) {
     settings = await fs.readJSON(settingsPath);
   }
-  if (isWindows()) {
-    if (settings.hooks?.PreToolUse) {
-      const hookIdx = settings.hooks.PreToolUse.findIndex(
-        (h) => h.matcher === "Bash" && h.hooks?.some((hh) => hh.command?.includes("codeagent-wrapper"))
-      );
-      if (hookIdx >= 0) {
-        settings.hooks.PreToolUse.splice(hookIdx, 1);
-        if (settings.hooks.PreToolUse.length === 0)
-          delete settings.hooks.PreToolUse;
-        if (settings.hooks && Object.keys(settings.hooks).length === 0)
-          delete settings.hooks;
-      }
-    }
-    if (!settings.permissions)
-      settings.permissions = {};
-    if (!settings.permissions.allow)
-      settings.permissions.allow = [];
-    const permEntry = "Bash(codeagent-wrapper*)";
-    if (!settings.permissions.allow.includes(permEntry)) {
-      settings.permissions.allow.push(permEntry);
+  if (settings.hooks?.PreToolUse) {
+    const hookIdx = settings.hooks.PreToolUse.findIndex(
+      (h) => h.matcher === "Bash" && h.hooks?.some((hh) => hh.command?.includes("codeagent-wrapper"))
+    );
+    if (hookIdx >= 0) {
+      settings.hooks.PreToolUse.splice(hookIdx, 1);
+      if (settings.hooks.PreToolUse.length === 0)
+        delete settings.hooks.PreToolUse;
+      if (settings.hooks && Object.keys(settings.hooks).length === 0)
+        delete settings.hooks;
     }
-    await fs.writeJSON(settingsPath, settings, { spaces: 2 });
-    return "permission";
-  }
-  if (!settings.hooks)
-    settings.hooks = {};
-  if (!settings.hooks.PreToolUse)
-    settings.hooks.PreToolUse = [];
-  const newCommand = `jq -r '.tool_input.command' 2>/dev/null | grep -q 'codeagent-wrapper' && echo '{"hookSpecificOutput": {"hookEventName": "PreToolUse", "permissionDecision": "allow", "permissionDecisionReason": "codeagent-wrapper auto-approved"}}' || true`;
-  const existingIdx = settings.hooks.PreToolUse.findIndex(
-    (h) => h.matcher === "Bash" && h.hooks?.some((hh) => hh.command?.includes("codeagent-wrapper"))
-  );
-  if (existingIdx >= 0) {
-    const oldCmd = settings.hooks.PreToolUse[existingIdx]?.hooks?.[0]?.command || "";
-    if (oldCmd.includes("exit 1")) {
-      settings.hooks.PreToolUse[existingIdx].hooks[0].command = newCommand;
-      await fs.writeJSON(settingsPath, settings, { spaces: 2 });
+  }
+  if (settings.permissions?.allow) {
+    const oldEntry = "Bash(codeagent-wrapper*)";
+    const oldIdx = settings.permissions.allow.indexOf(oldEntry);
+    if (oldIdx >= 0) {
+      settings.permissions.allow.splice(oldIdx, 1);
     }
-  } else {
-    settings.hooks.PreToolUse.push({
-      matcher: "Bash",
-      hooks: [
-        {
-          type: "command",
-          command: newCommand,
-          timeout: 1
-        }
-      ]
-    });
-    await fs.writeJSON(settingsPath, settings, { spaces: 2 });
   }
-  return "hook";
+  if (!settings.permissions)
+    settings.permissions = {};
+  if (!settings.permissions.allow)
+    settings.permissions.allow = [];
+  const permEntry = "Bash(*codeagent-wrapper*)";
+  if (!settings.permissions.allow.includes(permEntry)) {
+    settings.permissions.allow.push(permEntry);
+  }
+  await fs.writeJSON(settingsPath, settings, { spaces: 2 });
+  return "permission";
 }
 async function appendGrokSearchPrompt() {
   const rulesDir = join(homedir(), ".claude", "rules");
@@ -3070,13 +3038,9 @@ async function init(options = {}) {
       console.log();
       console.log(`    ${ansis.green("\u2713")} API ${ansis.gray(`\u2192 ${settingsPath}`)}`);
     }
-    const hookMethod = await installHook(settingsPath);
+    await installHook(settingsPath);
     console.log();
-    if (hookMethod === "permission") {
-      console.log(`    ${ansis.green("\u2713")} ${i18n.t("init:hooks.installed")} ${ansis.gray("(permissions.allow)")}`);
-    } else {
-      console.log(`    ${ansis.green("\u2713")} ${i18n.t("init:hooks.installed")}`);
-    }
+    console.log(`    ${ansis.green("\u2713")} ${i18n.t("init:hooks.installed")} ${ansis.gray("(permissions.allow)")}`);
     if (wantGrokSearch && (tavilyKey || firecrawlKey || grokApiUrl || grokApiKey)) {
       spinner.text = i18n.t("init:grok.installing");
       const grokResult = await installGrokSearchMcp({
@@ -3129,17 +3093,6 @@ async function init(options = {}) {
         console.log(ansis.gray(`      ${geminiSyncResult.message}`));
       }
     }
-    if (hookMethod === "hook") {
-      const hasJq = await checkJqAvailable();
-      if (!hasJq) {
-        console.log();
-        console.log(ansis.yellow(`    \u26A0 ${i18n.t("init:hooks.jqNotFound")}`));
-        console.log();
-        console.log(ansis.cyan(`    \u{1F4D6} ${i18n.t("init:hooks.jqInstallHint")}:`));
-        console.log(ansis.gray(`       ${i18n.t("init:hooks.jqMac")}`));
-        console.log(ansis.gray(`       ${i18n.t("init:hooks.jqLinux")}`));
-      }
-    }
     console.log();
     console.log(ansis.cyan(`  ${i18n.t("init:installedCommands")}`));
     result.installedCommands.forEach((cmd) => {
@@ -3277,23 +3230,41 @@ const __filename$1 = fileURLToPath(import.meta.url);
 const __dirname$1 = dirname(__filename$1);
 function findPackageRoot(startDir) {
   let dir = startDir;
-  for (let i = 0; i < 5; i++) {
+  while (true) {
     if (fs.existsSync(join(dir, "package.json"))) {
       return dir;
     }
-    dir = dirname(dir);
+    const parentDir = dirname(dir);
+    if (parentDir === dir) {
+      return dir;
+    }
+    dir = parentDir;
   }
-  return startDir;
 }
 const PACKAGE_ROOT = findPackageRoot(__dirname$1);
-async function getCurrentVersion() {
+async function readPackageVersion(pkgPath) {
   try {
-    const pkgPath = join(PACKAGE_ROOT, "package.json");
+    if (!await fs.pathExists(pkgPath)) {
+      return null;
+    }
     const pkg = await fs.readJSON(pkgPath);
-    return pkg.version || "0.0.0";
+    return pkg.version || null;
   } catch {
-    return "0.0.0";
+    return null;
+  }
+}
+async function getCurrentVersion() {
+  const relativePkgPath = fileURLToPath(new URL("../../package.json", import.meta.url));
+  const relativeVersion = await readPackageVersion(relativePkgPath);
+  if (relativeVersion) {
+    return relativeVersion;
+  }
+  const rootPkgPath = join(PACKAGE_ROOT, "package.json");
+  const rootVersion = await readPackageVersion(rootPkgPath);
+  if (rootVersion) {
+    return rootVersion;
   }
+  return process.env.npm_package_version || "0.0.0";
 }
 async function getLatestVersion(packageName = "ccg-workflow") {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccg-workflow",
-  "version": "1.7.87",
+  "version": "1.7.89",
   "description": "Claude + Codex + Gemini multi-model collaboration system - smart routing development workflow",
   "type": "module",
   "packageManager": "pnpm@10.17.1",

package/templates/commands/spec-init.md

@@ -62,11 +62,11 @@ description: '初始化 OpenSpec (OPSX) 环境 + 验证多模型 MCP 工具'
    - **工作目录**：`{{WORKDIR}}` 替换为目标工作目录的绝对路径。如果用户通过 `/add-dir` 添加了多个工作区，先确定任务相关的工作区。
    - Test Codex backend:
      ```bash
-     ~/.claude/bin/codeagent-wrapper --backend codex - "{{WORKDIR}}" <<< "echo test"
+     echo "echo test" | ~/.claude/bin/codeagent-wrapper --backend codex - "{{WORKDIR}}"
      ```
    - Test Gemini backend:
      ```bash
-     ~/.claude/bin/codeagent-wrapper --backend gemini --gemini-model gemini-3.1-pro-preview - "{{WORKDIR}}" <<< "echo test"
+     echo "echo test" | ~/.claude/bin/codeagent-wrapper --backend gemini --gemini-model gemini-3.1-pro-preview - "{{WORKDIR}}"
      ```
    - For each unavailable tool, display warning with installation instructions.