ccg-workflow 3.1.3 → 3.1.5

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.3 | [Issues](https://github.com/fengshao1227/ccg-workflow/issues) | [Contributing](./CONTRIBUTING.md)
+v3.1.5 | [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.5 | [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.DCFZF0Bl.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.DpOmP1et.mjs';
 import 'inquirer';
 import 'ora';
 import 'node:child_process';

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.DCFZF0Bl.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.DpOmP1et.mjs';
 import 'ansis';
 import 'inquirer';
 import 'ora';

package/dist/shared/{ccg-workflow.DCFZF0Bl.mjs → ccg-workflow.DpOmP1et.mjs}

@@ -10,7 +10,7 @@ import fs from 'fs-extra';
 import { parse, stringify } from 'smol-toml';
 import i18next from 'i18next';
 
-const version = "3.1.3";
+const version = "3.1.5";
 
 function cmd(id, order, category, name, nameEn, description, descriptionEn, cmdOverride) {
   return {
@@ -887,7 +887,7 @@ async function removeFastContextPrompt() {
   await removeFromFile(join(homedir(), ".gemini", "GEMINI.md"));
 }
 
-const EXPECTED_BINARY_VERSION = "5.11.0";
+const EXPECTED_BINARY_VERSION = "5.11.1";
 const GITHUB_REPO = "fengshao1227/ccg-workflow";
 const RELEASE_TAG = "preset";
 const BINARY_SOURCES = [

package/package.json

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

package/templates/codex/hooks/ccg-workflow.py

@@ -16,6 +16,19 @@ from pathlib import Path
 from datetime import datetime
 
 
+# Terminal task statuses — matched case-insensitively after trim. Covers common
+# synonyms the model may write (done/finished/closed/...) so a finished task is
+# never misjudged as still active. Canonical write value is "completed".
+_TERMINAL_STATUSES = frozenset({
+    "completed", "complete", "done", "finished", "finish",
+    "archived", "archive", "cancelled", "canceled", "closed", "resolved", "abandoned",
+})
+
+
+def _is_terminal_status(status):
+    return str(status or "").strip().lower() in _TERMINAL_STATUSES
+
+
 def find_project_root():
     """Walk up to find .ccg/ or .git/"""
     d = os.environ.get("CODEX_PROJECT_DIR", os.getcwd())
@@ -43,7 +56,7 @@ def get_active_task(root):
         try:
             with open(task_file) as f:
                 task = json.load(f)
-            if task.get("status") not in ("completed", "archived"):
+            if not _is_terminal_status(task.get("status")):
                 task["_dir"] = os.path.join(tasks_dir, name)
                 task["_name"] = name
                 return task
@@ -177,7 +190,7 @@ def build_guidance(task, progress, root):
             parts.append(f"Spec files available: {', '.join(specs)} — read before writing code.")
 
     # --- Archive reminder ---
-    if phase == "completed" or (task.get("status") == "completed"):
+    if phase in ("completed", "done", "finished") or _is_terminal_status(task.get("status")):
         parts.append("")
         parts.append("⛔ Task completed. You MUST archive it now:")
         parts.append(f"  mkdir -p .ccg/tasks/archive/$(date +%Y-%m) && mv .ccg/tasks/{task['_name']} .ccg/tasks/archive/$(date +%Y-%m)/")

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

@@ -18,6 +18,21 @@ function findProjectRoot(startDir) {
   return null;
 }
 
+// Terminal task statuses — a task in any of these is no longer active, so the
+// hooks stop injecting its breadcrumb. Matched case-insensitively after trim,
+// covering common synonyms the model may write (done/finished/closed/...) so a
+// committed-and-finished task is never misjudged as still in progress. The
+// canonical write-side value is "completed" (see go.md), but the read side must
+// be forgiving because status is free-text written by the model.
+const TERMINAL_STATUSES = new Set([
+  'completed', 'complete', 'done', 'finished', 'finish',
+  'archived', 'archive', 'cancelled', 'canceled', 'closed', 'resolved', 'abandoned'
+]);
+
+function isTerminalStatus(status) {
+  return TERMINAL_STATUSES.has(String(status == null ? '' : status).trim().toLowerCase());
+}
+
 function getActiveTask(projectRoot) {
   const tasksDir = path.join(projectRoot, '.ccg', 'tasks');
   if (!fs.existsSync(tasksDir)) return null;
@@ -40,7 +55,7 @@ function getActiveTask(projectRoot) {
         if (!fs.existsSync(taskPath)) continue; // stale pointer detection
         const raw = fs.readFileSync(taskPath, 'utf-8');
         const task = JSON.parse(raw);
-        if (task.status !== 'completed' && task.status !== 'archived') {
+        if (!isTerminalStatus(task.status)) {
           return { dir: path.join(tasksDir, dir), ...task, _stale: false };
         }
       } catch { /* skip malformed */ }
@@ -95,13 +110,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) {
@@ -176,6 +198,7 @@ function detectLoop(turns, threshold) {
 module.exports = {
   findProjectRoot,
   getActiveTask,
+  isTerminalStatus,
   readFileSafe,
   readJsonSafe,
   readContextJsonl,