ctx-cc 4.1.2 → 4.1.3

package/README.md

@@ -13,7 +13,7 @@
 
 [![npm version](https://img.shields.io/npm/v/ctx-cc.svg?style=flat-square)](https://www.npmjs.com/package/ctx-cc)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg?style=flat-square)](https://opensource.org/licenses/MIT)
-[![Tests](https://img.shields.io/badge/tests-149%20passing-brightgreen.svg?style=flat-square)](#testing)
+[![Tests](https://img.shields.io/badge/tests-154%20passing-brightgreen.svg?style=flat-square)](#testing)
 [![Zero deps](https://img.shields.io/badge/dependencies-0-brightgreen.svg?style=flat-square)](#)
 
 ```bash
@@ -493,7 +493,7 @@ Options:
 ```bash
 git clone https://github.com/jufjuf/CTX.git
 cd CTX
-npm test    # 149 tests, node:test runner
+npm test    # 154 tests, node:test runner
 ```
 
 **Project structure:**
@@ -505,7 +505,7 @@ ctx-cc/
 ├── commands/        26 slash command definitions (.md)
 ├── hooks/           3 enforcement hook scripts (.js)
 ├── src/              5 source modules (.js)
-├── test/             8 test files (.test.js)
+├── test/             9 test files (.test.js)
 ├── templates/       config.json, PRD.json, state templates
 ├── bin/ctx.js       CLI entry point (installer only)
 ├── plugin.json      Marketplace manifest
@@ -518,7 +518,7 @@ ctx-cc/
 
 ```bash
 npm test
-# 149 tests, 0 failures, ~1s
+# 154 tests, 0 failures, ~1s
 ```
 
 **Coverage:**

package/hooks/pre-tool-use.js

@@ -5,7 +5,7 @@
  * Enforces TDD mode and capability restrictions.
  * Installed to .claude/hooks/ctx-pre-tool-use.js
  *
- * Reads hook input from stdin (JSON with tool_name, tool_input, agent_name).
+ * Reads hook input from stdin (JSON with tool_name, tool_input, agent_type).
  * Exit 0 = allow, Exit 2 = block.
  */
 
@@ -28,7 +28,9 @@ try {
 
 const toolName = input.tool_name || '';
 const toolInput = input.tool_input || '';
-const agentName = input.agent_name || '';
+// Claude Code identifies the spawning subagent as `agent_type` (e.g. "ctx-reviewer").
+// Fall back to `agent_name` for forward/back compatibility across CLI versions.
+const agentName = input.agent_type || input.agent_name || '';
 
 // --- TDD Enforcement ---
 if (toolName === 'Bash' && /git commit/.test(toolInput)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctx-cc",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "CTX 4.0 — Intelligent workflow orchestration for Claude Code. 26 subagents, 7 skills, deterministic hooks. Phase-based lifecycle with autonomous execution.",
   "keywords": [
     "claude",
@@ -15,14 +15,14 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/jufjuf/CTX.git"
+    "url": "git+https://github.com/jufjuf/CTX.git"
   },
   "homepage": "https://github.com/jufjuf/CTX",
   "bugs": {
     "url": "https://github.com/jufjuf/CTX/issues"
   },
   "bin": {
-    "ctx-cc": "./bin/ctx.js"
+    "ctx-cc": "bin/ctx.js"
   },
   "files": [
     "bin/",

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "ctx",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "CTX — Intelligent workflow orchestration for Claude Code. Specialized agents, phase-based lifecycle, three-stage review gate with OpenAI Codex cross-model review, autonomous execution.",
   "author": "jufjuf",
   "license": "MIT",

package/src/install.js

@@ -212,7 +212,19 @@ function cleanupPrefixed(dir, prefix) {
   }
 }
 
-function mergeHooksIntoSettings(targetBase, hooksDir) {
+/**
+ * Merge CTX's three enforcement hooks into settings.json using Claude Code's
+ * current nested hook schema: { matcher, hooks: [{ type: 'command', command }] }.
+ * The empty matcher ("") fires on every tool call / subagent stop.
+ *
+ * The flat `{ command }` shape CTX shipped before is NOT recognized by current
+ * Claude Code — it is silently ignored, so the hooks never run. This writes the
+ * supported shape and removes any prior CTX entry (flat or nested) so reinstall
+ * stays idempotent. Non-CTX hooks are preserved verbatim.
+ *
+ * Exported for unit testing.
+ */
+export function mergeHooksIntoSettings(targetBase, hooksDir) {
   const settingsPath = path.join(targetBase, 'settings.json');
   let settings = {};
 
@@ -221,34 +233,39 @@ function mergeHooksIntoSettings(targetBase, hooksDir) {
     settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
   } catch {}
 
-  // Preserve non-CTX hooks
+  // True if a hook entry points at one of our ctx-* scripts. Handles the
+  // current nested shape and tolerates the legacy flat shape so upgrades
+  // don't leave a stale duplicate behind.
+  const isCtxEntry = (entry) => {
+    const handlers = Array.isArray(entry?.hooks) ? entry.hooks : [];
+    return handlers.some(h => typeof h?.command === 'string' && h.command.includes('ctx-'))
+      || (typeof entry?.command === 'string' && entry.command.includes('ctx-'));
+  };
+
+  // Preserve every non-CTX hook entry as-is.
   const existingHooks = settings.hooks || {};
   const userHooks = {};
-  for (const [event, hookList] of Object.entries(existingHooks)) {
-    if (Array.isArray(hookList)) {
-      userHooks[event] = hookList.filter(h => !h.command?.includes('ctx-'));
+  for (const [event, entries] of Object.entries(existingHooks)) {
+    if (Array.isArray(entries)) {
+      userHooks[event] = entries.filter(e => !isCtxEntry(e));
     }
   }
 
-  // Add CTX hooks (referencing installed script files)
+  // CTX hooks in the supported nested schema.
+  const ctxEntry = (script) => ({
+    matcher: '',
+    hooks: [{ type: 'command', command: `node ${path.join(hooksDir, script)}` }],
+  });
   const ctxHooks = {
-    SubagentStop: [
-      { command: `node ${path.join(hooksDir, 'ctx-subagent-stop.js')}` }
-    ],
-    PreToolUse: [
-      { command: `node ${path.join(hooksDir, 'ctx-pre-tool-use.js')}` }
-    ],
-    PostToolUse: [
-      { command: `node ${path.join(hooksDir, 'ctx-post-tool-use.js')}` }
-    ],
+    SubagentStop: [ctxEntry('ctx-subagent-stop.js')],
+    PreToolUse: [ctxEntry('ctx-pre-tool-use.js')],
+    PostToolUse: [ctxEntry('ctx-post-tool-use.js')],
   };
 
-  // Merge
+  // Merge: preserved user hooks first, CTX hooks appended.
   const merged = {};
-  for (const [event, hooks] of Object.entries({ ...userHooks, ...ctxHooks })) {
-    const userList = userHooks[event] || [];
-    const ctxList = ctxHooks[event] || [];
-    merged[event] = [...userList, ...ctxList];
+  for (const event of new Set([...Object.keys(userHooks), ...Object.keys(ctxHooks)])) {
+    merged[event] = [...(userHooks[event] || []), ...(ctxHooks[event] || [])];
   }
 
   settings.hooks = merged;