ccg-workflow 3.1.2 → 3.1.4

package/README.md

@@ -144,7 +144,7 @@ CCG installs 4 hooks into `~/.claude/settings.json`:
 |------|-------|---------|
 | workflow-state.js | UserPromptSubmit | Injects task state breadcrumb every turn |
 | session-start.js | SessionStart | Injects full project context on session start/clear/compact |
-| subagent-context.js | PreToolUse (Bash/Agent) | Injects spec + task context into codeagent-wrapper calls and Team member spawns |
+| subagent-context.js | PreToolUse (Bash/Agent) | Injects spec + task context: directly into Team member prompt via `updatedInput`, into lead context for codeagent-wrapper calls |
 | skill-router.js | UserPromptSubmit | Auto-injects domain knowledge when keywords detected |
 
 Hooks are JavaScript, zero dependencies, silent on failure.
@@ -253,4 +253,4 @@ MIT
 
 ---
 
-v3.1.2 | [Issues](https://github.com/fengshao1227/ccg-workflow/issues) | [Contributing](./CONTRIBUTING.md)
+v3.1.4 | [Issues](https://github.com/fengshao1227/ccg-workflow/issues) | [Contributing](./CONTRIBUTING.md)

package/README.zh-CN.md

@@ -145,7 +145,7 @@ CCG 在 `~/.claude/settings.json` 注册 4 个 Hook：
 |------|------|------|
 | workflow-state.js | UserPromptSubmit | 每轮注入任务状态面包屑 |
 | session-start.js | SessionStart | 会话开始/压缩时注入完整项目上下文 |
-| subagent-context.js | PreToolUse | codeagent-wrapper/Team spawn 时注入 spec + 任务上下文 |
+| subagent-context.js | PreToolUse | Team spawn 时通过 `updatedInput` 直接注入子 agent prompt；codeagent-wrapper 时注入主控上下文 |
 | skill-router.js | UserPromptSubmit | 检测域关键词，自动注入知识文件 |
 
 纯 JavaScript，零依赖，失败时静默退出。
@@ -248,4 +248,4 @@ MIT
 
 ---
 
-v3.0.4 | [Issues](https://github.com/fengshao1227/ccg-workflow/issues) | [Contributing](./CONTRIBUTING.md)
+v3.1.4 | [Issues](https://github.com/fengshao1227/ccg-workflow/issues) | [Contributing](./CONTRIBUTING.md)

package/dist/cli.mjs

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

package/dist/index.d.mts

@@ -196,6 +196,7 @@ interface UninstallResult {
     removedAgents: string[];
     removedSkills: string[];
     removedRules: boolean;
+    removedHooks: boolean;
     removedBin: boolean;
     errors: string[];
 }

package/dist/index.d.ts

@@ -196,6 +196,7 @@ interface UninstallResult {
     removedAgents: string[];
     removedSkills: string[];
     removedRules: boolean;
+    removedHooks: boolean;
     removedBin: boolean;
     errors: string[];
 }

package/dist/index.mjs

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

package/dist/shared/{ccg-workflow.CTnUpMWE.mjs → ccg-workflow.B4UibgqQ.mjs}

@@ -10,7 +10,7 @@ import fs from 'fs-extra';
 import { parse, stringify } from 'smol-toml';
 import i18next from 'i18next';
 
-const version = "3.1.2";
+const version = "3.1.4";
 
 function cmd(id, order, category, name, nameEn, description, descriptionEn, cmdOverride) {
   return {
@@ -1541,6 +1541,7 @@ async function uninstallWorkflows(installDir, options) {
     removedAgents: [],
     removedSkills: [],
     removedRules: false,
+    removedHooks: false,
     removedBin: false,
     errors: []
   };
@@ -1605,6 +1606,46 @@ async function uninstallWorkflows(installDir, options) {
       result.errors.push(`Failed to remove .ccg directory: ${error}`);
     }
   }
+  const hooksCcgDir = join(installDir, "hooks", "ccg");
+  if (await fs.pathExists(hooksCcgDir)) {
+    try {
+      await fs.remove(hooksCcgDir);
+      result.removedHooks = true;
+    } catch (error) {
+      result.errors.push(`Failed to remove hooks directory: ${error}`);
+      result.success = false;
+    }
+  }
+  const settingsPath = join(installDir, "settings.json");
+  if (await fs.pathExists(settingsPath)) {
+    try {
+      const settings = JSON.parse(await fs.readFile(settingsPath, "utf-8"));
+      const hooks = settings.hooks;
+      if (hooks && typeof hooks === "object") {
+        const isCcgEntry = (h) => {
+          const hHooks = h?.hooks || [];
+          return hHooks.some((hh) => typeof hh?.command === "string" && /hooks[\\/]ccg[\\/]/.test(hh.command));
+        };
+        let modified = false;
+        for (const event of Object.keys(hooks)) {
+          const arr = Array.isArray(hooks[event]) ? hooks[event] : [];
+          const filtered = arr.filter((h) => !isCcgEntry(h));
+          if (filtered.length !== arr.length) {
+            modified = true;
+            if (filtered.length === 0) delete hooks[event];
+            else hooks[event] = filtered;
+          }
+        }
+        if (modified) {
+          if (Object.keys(hooks).length === 0) delete settings.hooks;
+          await fs.writeFile(settingsPath, JSON.stringify(settings, null, 2), "utf-8");
+          result.removedHooks = true;
+        }
+      }
+    } catch (error) {
+      result.errors.push(`Failed to deregister hooks from settings.json: ${error}`);
+    }
+  }
   return result;
 }
 

package/package.json

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

package/templates/hooks/subagent-context.js

@@ -155,7 +155,23 @@ Agent role: ${detectedRole}
 
   if (contextParts.length === 0) process.exit(0);
 
-  outputHook('PreToolUse', contextParts.join('\n\n'));
+  const injected = `<ccg-injected-context>\n${contextParts.join('\n\n')}\n</ccg-injected-context>`;
+
+  // Agent/Team spawn: rewrite the spawned teammate's OWN prompt via updatedInput.
+  // A PreToolUse hook's additionalContext only reaches the CALLING (lead) session,
+  // which the not-yet-created subagent can never read. updatedInput replaces the
+  // entire tool input, so we spread toolInput to keep subagent_type/name/team_name/
+  // model intact and only prepend the spec to `prompt`. The teammate is born with
+  // the spec already in its prompt. (Docs: PreToolUse → updatedInput.)
+  if (isTeamSpawn && typeof toolInput.prompt === 'string') {
+    outputHook('PreToolUse', null, {
+      updatedInput: { ...toolInput, prompt: `${injected}\n\n---\n\n${toolInput.prompt}` }
+    });
+  } else {
+    // Bash / codeagent-wrapper: the lead builds the HEREDOC task text itself, so the
+    // spec belongs in the lead's context where it can be woven into the command.
+    outputHook('PreToolUse', injected);
+  }
 } catch {
   process.exit(0);
 }

package/templates/hooks/task-utils.js

@@ -95,13 +95,20 @@ function getGitInfo(projectRoot) {
   } catch { return { branch: 'unknown', dirtyCount: 0 }; }
 }
 
-function outputHook(eventName, additionalContext) {
-  console.log(JSON.stringify({
-    hookSpecificOutput: {
-      hookEventName: eventName,
-      additionalContext
-    }
-  }));
+// outputHook(event, additionalContext)           → inject context into the CALLING session
+// outputHook(event, null, { updatedInput, ... })  → rewrite the tool input before it runs
+//   `extra` is merged into hookSpecificOutput, so it can carry updatedInput /
+//   permissionDecision / permissionDecisionReason. Pass additionalContext = null
+//   to omit it. Back-compatible: existing 2-arg calls behave exactly as before.
+function outputHook(eventName, additionalContext, extra) {
+  const hookSpecificOutput = { hookEventName: eventName };
+  if (additionalContext != null && additionalContext !== '') {
+    hookSpecificOutput.additionalContext = additionalContext;
+  }
+  if (extra && typeof extra === 'object') {
+    Object.assign(hookSpecificOutput, extra);
+  }
+  console.log(JSON.stringify({ hookSpecificOutput }));
 }
 
 function archiveTask(taskDir, projectRoot) {