@heretyc/subagent-mcp 2.8.0 → 2.8.2

package/dist/routing.js

@@ -199,7 +199,7 @@ function readPairings(table, taskCategory, branch = DEFAULT_BRANCH) {
     const entries = raw.filter((e) => !!e && typeof e === "object" && typeof e.model === "string");
     return [...entries].sort((a, b) => (a.rank ?? Number.MAX_SAFE_INTEGER) - (b.rank ?? Number.MAX_SAFE_INTEGER));
 }
-// The fixed 10 task categories + fallback_default. Maps directly to the
+// The fixed 14 task categories + fallback_default. Maps directly to the
 // routing-table category keys (param-contract.md). Immutable taxonomy.
 export const TASK_CATEGORIES = [
     "math_proof",
@@ -212,6 +212,10 @@ export const TASK_CATEGORIES = [
     "coding",
     "knowledge_synthesis",
     "mechanical",
+    "prompt_engineering",
+    "vulnerability_research",
+    "molecular_biology",
+    "ml_accelerator_design",
     "fallback_default",
 ];
 // Shared error hint blocks (resolution-matrix.md). Appended verbatim.
@@ -233,11 +237,11 @@ export function validatePresence(p) {
     // 1. task_category valid?
     if (!task_category || !TASK_CATEGORIES.includes(task_category)) {
         const got = task_category ? String(task_category) : "<none>";
-        return `Error: task_category is required and must be one of: math_proof, security_review, debugging, quality_review, architecture, agentic_execution, data_analysis, coding, knowledge_synthesis, mechanical, fallback_default. Got: ${got}.\n${SPLIT_HINT}\n${AUTO_HINT}`;
+        return `Error: task_category is required and must be one of: ${TASK_CATEGORIES.join(", ")}. Got: ${got}.\n${SPLIT_HINT}\n${AUTO_HINT}`;
     }
     // 2. deadlock cannot be combined with provider/model/effort.
     if (deadlock === true && (provider || model || effort)) {
-        return `Error: deadlock cannot be combined with provider, model, or effort. If repeated attempts at this task have failed, switch to pure auto mode — pass only prompt + task_category and let the server select — unless your assignment explicitly demands a specific model. Omit provider/model/effort and retry.\n${AUTO_HINT}`;
+        return `Error: deadlock cannot be combined with provider, model, or effort. From the 3rd attempt for the same atomic task, deadlock outranks capability overrides: drop provider/model/effort and retry.\n${AUTO_HINT}`;
     }
     // 3. effort present must come with provider AND model (checked before model rule).
     if (effort && !(provider && model)) {

package/dist/setup.js

@@ -34,6 +34,7 @@ export function serverPaths(root = INSTALL_ROOT) {
     return {
         server: `${f}/dist/index.js`,
         claudeHook: `${f}/dist/hooks/orchestration-claude.js`,
+        claudePreToolHook: `${f}/dist/hooks/orchestration-claude-pretool.js`,
         codexHook: `${f}/dist/hooks/orchestration-codex.js`,
     };
 }
@@ -61,37 +62,53 @@ export function findOnPath(cmd, env = process.env, platform = process.platform)
     return null;
 }
 /**
- * Reconcile the UserPromptSubmit hook in a parsed ~/.claude/settings.json.
+ * Reconcile the UserPromptSubmit and PreToolUse hooks in a parsed ~/.claude/settings.json.
  * Mutates `s` in place. Exact wiring present -> ok. A hook referencing
  * orchestration-claude.js at any OTHER path/shape -> repaired (rewritten to the
  * canonical exec form). Absent -> added. Unrelated hooks are never touched.
  */
-export function reconcileClaudeSettings(s, hookPath) {
+export function reconcileClaudeSettings(s, hookPath, preToolHookPath = hookPath.replace(/orchestration-claude\.js$/, "orchestration-claude-pretool.js")) {
     const hooksBlock = (s.hooks ?? {});
     s.hooks = hooksBlock;
-    const upsList = (hooksBlock.UserPromptSubmit ?? []);
-    hooksBlock.UserPromptSubmit = upsList;
-    for (const grp of upsList) {
-        for (const hk of grp.hooks ?? []) {
-            if (!JSON.stringify(hk).includes("orchestration-claude.js"))
-                continue;
-            const args = hk.args;
-            const exact = hk.command === "node" &&
-                Array.isArray(args) &&
-                args.length === 1 &&
-                args[0] === hookPath;
-            if (exact)
-                return { changed: false, status: "ok" };
-            hk.type = "command";
-            hk.command = "node";
-            hk.args = [hookPath];
-            return { changed: true, status: "repaired" };
+    const reconcile = (event, scriptName, desired) => {
+        const list = (hooksBlock[event] ?? []);
+        hooksBlock[event] = list;
+        for (const grp of list) {
+            for (const hk of grp.hooks ?? []) {
+                if (!JSON.stringify(hk).includes(scriptName))
+                    continue;
+                const args = hk.args;
+                const exact = hk.type === desired.type &&
+                    hk.command === desired.command &&
+                    Array.isArray(args) &&
+                    JSON.stringify(args) === JSON.stringify(desired.args) &&
+                    (desired.timeout === undefined || hk.timeout === desired.timeout);
+                if (exact)
+                    return { changed: false, status: "ok" };
+                Object.assign(hk, desired);
+                return { changed: true, status: "repaired" };
+            }
         }
-    }
-    upsList.push({
-        hooks: [{ type: "command", command: "node", args: [hookPath] }],
+        list.push({ hooks: [{ ...desired }] });
+        return { changed: true, status: "added" };
+    };
+    const prompt = reconcile("UserPromptSubmit", "orchestration-claude.js", {
+        type: "command",
+        command: "node",
+        args: [hookPath],
+    });
+    const pretool = reconcile("PreToolUse", "orchestration-claude-pretool.js", {
+        type: "command",
+        command: "node",
+        args: [preToolHookPath],
+        timeout: 5,
     });
-    return { changed: true, status: "added" };
+    const status = prompt.status === "repaired" || pretool.status === "repaired"
+        ? "repaired"
+        : prompt.status === "added" || pretool.status === "added"
+            ? "added"
+            : "ok";
+    return { changed: prompt.changed || pretool.changed, status };
 }
 /**
  * Reconcile the user-scope MCP server entry in a parsed ~/.claude.json.
@@ -211,6 +228,7 @@ export function verifyInstall(root = INSTALL_ROOT) {
         "dist/index.js",
         "dist/advanced-ruleset.py",
         "dist/hooks/orchestration-claude.js",
+        "dist/hooks/orchestration-claude-pretool.js",
         "dist/hooks/orchestration-codex.js",
         "directives/orchestration-claude.md",
         "directives/orchestration-codex.md",
@@ -358,8 +376,9 @@ function repairPromptFor(vendor, problem) {
             `The install root is "${fwd(INSTALL_ROOT)}". Please repair my Claude Code wiring: ` +
             `(1) register a user-scope MCP server named "subagent-mcp" running ` +
             `the global bin shim "subagent-mcp" (use 'claude mcp add subagent-mcp subagent-mcp -s user' or edit the mcpServers ` +
-            `key in ~/.claude.json), and (2) ensure ~/.claude/settings.json has a ` +
-            `hooks.UserPromptSubmit entry {type:"command", command:"node", args:["${p.claudeHook}"]}. ` +
+            `key in ~/.claude.json), and (2) ensure ~/.claude/settings.json has ` +
+            `hooks.UserPromptSubmit -> {type:"command", command:"node", args:["${p.claudeHook}"]} and ` +
+            `hooks.PreToolUse -> {type:"command", command:"node", args:["${p.claudePreToolHook}"], timeout:5}. ` +
             `Back up any file before editing it.`);
     }
     return (`subagent-mcp setup hit a problem on my machine: ${problem}. ` +
@@ -474,7 +493,7 @@ function wireClaude() {
     catch (e) {
         fail("claude", `could not register the MCP server: ${e.message}`);
     }
-    // 2) UserPromptSubmit hook in ~/.claude/settings.json.
+    // 2) UserPromptSubmit and PreToolUse hooks in ~/.claude/settings.json.
     try {
         const sfile = join(homedir(), ".claude", "settings.json");
         const s = readJson(sfile, {});
@@ -483,7 +502,7 @@ function wireClaude() {
             backup(sfile);
             writeFileSync(sfile, JSON.stringify(s, null, 2));
         }
-        describe(status, "UserPromptSubmit hook");
+        describe(status, "UserPromptSubmit + PreToolUse hooks");
         if (changed && DRY_RUN)
             console.log("    (dry-run: not written)");
     }
@@ -572,7 +591,7 @@ export function verifyWiring(root = INSTALL_ROOT, repair = false) {
             detail: registrationDetail(registered, attemptedRepair),
         });
         results.push({
-            label: "claude: UserPromptSubmit hook",
+            label: "claude: UserPromptSubmit + PreToolUse hooks",
             ok: hk.status === "ok",
             detail: hk.status === "ok" ? "wired" : `${hk.status === "repaired" ? "stale path" : "not wired"} - run: subagent-mcp setup`,
         });
@@ -588,7 +607,7 @@ export function verifyWiring(root = INSTALL_ROOT, repair = false) {
             detail: srv.status === "ok" ? "registered (file fallback)" : "config stale — run: subagent-mcp setup",
         });
         results.push({
-            label: "claude: UserPromptSubmit hook",
+            label: "claude: UserPromptSubmit + PreToolUse hooks",
             ok: hk.status === "ok",
             detail: hk.status === "ok" ? "wired" : `${hk.status === "repaired" ? "stale path" : "not wired"} - run: subagent-mcp setup`,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heretyc/subagent-mcp",
-  "version": "2.8.0",
+  "version": "2.8.2",
   "description": "MCP server that launches and manages local Claude Code and Codex CLI sub-agents as child processes (no direct Anthropic/OpenAI API).",
   "type": "module",
   "main": "dist/index.js",
@@ -21,7 +21,7 @@
     "postinstall": "node scripts/postinstall.mjs",
     "prepare": "npm run build",
     "prepublishOnly": "npm test",
-    "test": "node test/effort.test.mjs && node test/platform.test.mjs && node test/wait.test.mjs && node test/status.test.mjs && node test/output.test.mjs && node test/stream.test.mjs && node test/routing.test.mjs && node test/deadlock.test.mjs && node test/handler-validation.test.mjs && node test/index-handler.test.mjs && node test/ruleset.test.mjs && node test/ruleset-exec.test.mjs && node test/ruleset-handler.test.mjs && node test/failover.test.mjs && node test/orchestration-marker.test.mjs && node test/orchestration-hook-core.test.mjs && node test/orchestration-adapters.test.mjs && node test/orchestration-directives.test.mjs && node test/performance-tier-effort.test.mjs && node test/setup-repair.test.mjs && node test/setup-quoting.test.mjs && node test/setup-wire.test.mjs && node test/setup-cli-integration.test.mjs && node test/cli-args.test.mjs && node scripts/validate_provider.mjs && node scripts/validate_seed_sites.mjs && node scripts/validate_routing_audit.mjs && node test/seed-sites.test.mjs && node test/mcp-compliance.test.mjs"
+    "test": "node test/effort.test.mjs && node test/platform.test.mjs && node test/wait.test.mjs && node test/status.test.mjs && node test/output.test.mjs && node test/stream.test.mjs && node test/routing.test.mjs && node test/deadlock.test.mjs && node test/handler-validation.test.mjs && node test/index-handler.test.mjs && node test/ruleset.test.mjs && node test/ruleset-exec.test.mjs && node test/ruleset-handler.test.mjs && node test/failover.test.mjs && node test/orchestration-marker.test.mjs && node test/orchestration-hook-core.test.mjs && node test/orchestration-adapters.test.mjs && node test/orchestration-pretool.test.mjs && node test/orchestration-directives.test.mjs && node test/performance-tier-effort.test.mjs && node test/setup-repair.test.mjs && node test/setup-quoting.test.mjs && node test/setup-wire.test.mjs && node test/setup-cli-integration.test.mjs && node test/init.test.mjs && node test/cli-args.test.mjs && node scripts/validate_provider.mjs && node scripts/validate_seed_sites.mjs && node scripts/validate_routing_audit.mjs && node test/seed-sites.test.mjs && node test/mcp-compliance.test.mjs"
   },
   "author": "Lexi Blackburn",
   "license": "Apache-2.0",

package/scripts/postinstall.mjs

@@ -71,7 +71,7 @@ try {
   // Detected vendors — concrete, so the user knows what setup will touch.
   if (hasClaude || hasCodex) {
     line("  Detected on this machine:");
-    if (hasClaude) line("    - Claude Code CLI  (will get MCP server + UserPromptSubmit hook)");
+    if (hasClaude) line("    - Claude Code CLI  (will get MCP server + UserPromptSubmit/PreToolUse hooks)");
     if (hasCodex) line("    - Codex CLI        (will get MCP server + SessionStart/UserPromptSubmit hooks)");
   } else {
     line("  No Claude Code or Codex CLI detected yet. Install one,");