@heretyc/subagent-mcp 2.6.1 → 2.6.2

package/dist/doctor.js

@@ -1,20 +1,20 @@
 #!/usr/bin/env node
 // `subagent-mcp doctor` — read-only health check for the installed addon.
 //
-// Diagnoses without touching any file: install completeness, vendor presence,
-// and whether each vendor's wiring (MCP server + hooks) points at THIS install.
-// The fixer is always `subagent-mcp setup` (idempotent, self-repairing); doctor
-// just tells you whether you need it and what exactly is wrong.
+// Diagnoses install completeness, vendor presence, and whether each vendor's
+// wiring (MCP server + hooks) points at THIS install. Doctor self-repairs
+// missing MCP registrations via vendor CLIs; use `subagent-mcp setup` for
+// config-file and hook repairs.
 //
 // Exit code: 0 = everything healthy, 1 = at least one check failed.
 import { verifyWiring } from "./setup.js";
 export async function runDoctor() {
-    console.log("subagent-mcp doctor (read-only — changes nothing)\n");
+    console.log("subagent-mcp doctor (checks wiring; repairs missing MCP registrations via vendor CLIs)\n");
     const major = Number(process.versions.node.split(".")[0]);
     console.log(`  ${major >= 18 ? "PASS" : "FAIL"}  node version — ${process.versions.node}` +
         (major >= 18 ? "" : " (Node >= 18 required)"));
     let failed = major < 18 ? 1 : 0;
-    for (const r of verifyWiring()) {
+    for (const r of verifyWiring(undefined, true)) {
         console.log(`  ${r.ok ? "PASS" : "FAIL"}  ${r.label} — ${r.detail}`);
         if (!r.ok)
             failed++;

package/dist/setup.js

@@ -16,7 +16,7 @@
 //   - Every config file is backed up before its first edit.
 //   - Failures never abort the run: they are collected and reported at the end
 //     with a copy-paste repair prompt the user can hand to Claude/Codex.
-import { existsSync, readFileSync, writeFileSync, copyFileSync, } from "node:fs";
+import { existsSync, readFileSync, writeFileSync, copyFileSync, mkdirSync, } from "node:fs";
 import { homedir } from "node:os";
 import { join, dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -104,17 +104,14 @@ export function reconcileClaudeJson(cj, serverPath) {
     const cur = servers["subagent-mcp"];
     if (cur) {
         const args = cur.args;
-        const exact = cur.command === "node" &&
-            Array.isArray(args) &&
-            args.length === 1 &&
-            args[0] === serverPath;
+        const exact = cur.command === "subagent-mcp" && Array.isArray(args) && args.length === 0;
         if (exact)
             return { changed: false, status: "ok" };
     }
     servers["subagent-mcp"] = {
         type: "stdio",
-        command: "node",
-        args: [serverPath],
+        command: "subagent-mcp",
+        args: [],
         env: {},
     };
     return { changed: true, status: cur ? "repaired" : "added" };
@@ -144,7 +141,7 @@ export function reconcileCodexToml(toml, serverPath) {
             status: "added",
         };
     }
-    if (m[0].includes(`args = ["${serverPath}"]`)) {
+    if (m[0].includes(`command = "node"`) && m[0].includes(`args = ["${serverPath}"]`)) {
         return { toml, changed: false, status: "ok" };
     }
     return {
@@ -242,26 +239,60 @@ function backup(file) {
     }
 }
 function runCmd(cmd, cmdArgs) {
+    return runCmdCapture(cmd, cmdArgs).ok;
+}
+function quoteWinShellArg(arg) {
+    if (!/[ \t"]/.test(arg))
+        return arg;
+    return `"${arg.replace(/"/g, '\\"')}"`;
+}
+function quoteWinShellExe(exe) {
+    return `"${exe.replace(/"/g, '\\"')}"`;
+}
+function runCmdCapture(cmd, cmdArgs) {
     console.log(`  $ ${cmd} ${cmdArgs.join(" ")}`);
     if (DRY_RUN) {
         console.log("    (dry-run: skipped)");
-        return true;
+        return { ok: true, stdout: "" };
     }
     try {
-        if (process.platform === "win32") {
-            // npm-installed CLIs are .cmd shims execFileSync can't spawn directly.
-            const line = [cmd, ...cmdArgs.map((a) => (/\s/.test(a) ? `"${a}"` : a))].join(" ");
-            execSync(line, { stdio: "pipe" });
-        }
-        else {
-            execFileSync(cmd, cmdArgs, { stdio: "pipe" });
-        }
-        return true;
+        const exe = findOnPath(cmd) ?? cmd;
+        const isWinCmdShim = process.platform === "win32" && /\.(?:cmd|bat)$/i.test(exe);
+        const stdout = isWinCmdShim
+            ? execSync([quoteWinShellExe(exe), ...cmdArgs.map(quoteWinShellArg)].join(" "), { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] })
+            : execFileSync(exe, cmdArgs, { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
+        return { ok: true, stdout };
     }
     catch {
-        return false;
+        return { ok: false, stdout: "" };
     }
 }
+export function claudeAddArgs() {
+    return ["mcp", "add", "subagent-mcp", "subagent-mcp", "-s", "user"];
+}
+export function claudeRemoveArgs() {
+    return ["mcp", "remove", "subagent-mcp", "-s", "user"];
+}
+export function codexAddArgs(serverPath) {
+    return ["mcp", "add", "subagent-mcp", "--", "node", serverPath];
+}
+export function codexRemoveArgs() {
+    return ["mcp", "remove", "subagent-mcp"];
+}
+function claudeRegisteredViaCli() {
+    const get = runCmdCapture("claude", ["mcp", "get", "subagent-mcp"]);
+    if (get.ok && get.stdout.includes("subagent-mcp"))
+        return true;
+    const list = runCmdCapture("claude", ["mcp", "list"]);
+    return list.ok && list.stdout.includes("subagent-mcp");
+}
+function codexRegisteredViaCli() {
+    const get = runCmdCapture("codex", ["mcp", "get", "subagent-mcp"]);
+    if (get.ok && get.stdout.includes("subagent-mcp"))
+        return true;
+    const list = runCmdCapture("codex", ["mcp", "list"]);
+    return list.ok && list.stdout.includes("subagent-mcp");
+}
 const issues = [];
 function repairPromptFor(vendor, problem) {
     const p = serverPaths();
@@ -269,7 +300,7 @@ function repairPromptFor(vendor, problem) {
         return (`subagent-mcp setup hit a problem on my machine: ${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 ` +
-            `[node "${p.server}"] (use 'claude mcp add --scope user' or edit the mcpServers ` +
+            `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}"]}. ` +
             `Back up any file before editing it.`);
@@ -308,20 +339,27 @@ function wireClaude() {
         const probe = JSON.parse(JSON.stringify(cj));
         const { status } = reconcileClaudeJson(probe, p.server);
         if (status === "ok") {
-            describe("ok", "MCP server (user scope)");
+            let registered = claudeRegisteredViaCli();
+            if (!registered) {
+                runCmd("claude", claudeAddArgs());
+                registered = claudeRegisteredViaCli();
+            }
+            if (registered)
+                describe("ok", "MCP server (user scope)");
+            else
+                fail("claude", "MCP server file shape is correct, but 'claude mcp add' failed to register it with the CLI");
         }
         else {
             if (status === "repaired") {
                 console.log("  MCP server registration points at a stale path — re-registering.");
-                runCmd("claude", ["mcp", "remove", "-s", "user", "subagent-mcp"]);
+                runCmd("claude", claudeRemoveArgs());
             }
-            const cliOk = runCmd("claude", [
-                "mcp", "add", "--scope", "user", "subagent-mcp", "--", "node", p.server,
-            ]);
+            const cliOk = runCmd("claude", claudeAddArgs());
+            const cliVerified = cliOk && claudeRegisteredViaCli();
             // Read back; if the CLI failed or didn't take, write the entry directly.
             const after = readJson(cjFile, {});
             const verify = reconcileClaudeJson(after, p.server);
-            if (verify.status !== "ok" && !DRY_RUN) {
+            if (!cliVerified && verify.status !== "ok" && !DRY_RUN) {
                 if (!cliOk)
                     console.log("  'claude mcp add' failed — writing ~/.claude.json directly.");
                 backup(cjFile);
@@ -359,7 +397,14 @@ function wireCodex() {
         const cfg = join(codexDir, "config.toml");
         const toml = existsSync(cfg) ? readFileSync(cfg, "utf8") : "";
         const r = reconcileCodexToml(toml, p.server);
-        if (r.changed && !DRY_RUN) {
+        if (r.status === "repaired") {
+            console.log("  MCP server registration points at a stale path — re-registering.");
+            runCmd("codex", codexRemoveArgs());
+        }
+        const cliOk = r.status === "ok" && codexRegisteredViaCli() ? true : runCmd("codex", codexAddArgs(p.server));
+        if (!cliOk && r.changed && !DRY_RUN) {
+            console.log("  'codex mcp add' failed — writing ~/.codex/config.toml directly.");
+            mkdirSync(codexDir, { recursive: true });
             backup(cfg);
             writeFileSync(cfg, r.toml);
         }
@@ -377,6 +422,7 @@ function wireCodex() {
         const hookCmd = `node "${p.codexHook}"`;
         const { changed, statuses } = reconcileCodexHooks(h, hookCmd);
         if (changed && !DRY_RUN) {
+            mkdirSync(codexDir, { recursive: true });
             backup(hfile);
             writeFileSync(hfile, JSON.stringify(h, null, 2));
         }
@@ -392,7 +438,7 @@ function wireCodex() {
         fail("codex", `could not write hooks.json: ${e.message}`);
     }
 }
-export function verifyWiring(root = INSTALL_ROOT) {
+export function verifyWiring(root = INSTALL_ROOT, repair = false) {
     const p = serverPaths(root);
     const results = [];
     const home = homedir();
@@ -403,7 +449,29 @@ export function verifyWiring(root = INSTALL_ROOT) {
         detail: missing.length === 0 ? `all present under ${fwd(root)}` : `missing: ${missing.join(", ")}`,
     });
     const hasClaude = findOnPath("claude") !== null;
+    const hasClaudeConfig = existsSync(join(home, ".claude.json"));
     if (hasClaude) {
+        const sj = readJson(join(home, ".claude", "settings.json"), {});
+        let registered = claudeRegisteredViaCli();
+        let repaired = false;
+        if (!registered && repair) {
+            runCmd("claude", claudeAddArgs());
+            repaired = true;
+            registered = claudeRegisteredViaCli();
+        }
+        const hk = reconcileClaudeSettings(JSON.parse(JSON.stringify(sj)), p.claudeHook);
+        results.push({
+            label: "claude: MCP server (user scope)",
+            ok: registered,
+            detail: registered ? (repaired ? "repaired" : "registered") : "not registered; CLI repair failed",
+        });
+        results.push({
+            label: "claude: UserPromptSubmit hook",
+            ok: hk.status === "ok",
+            detail: hk.status === "ok" ? "wired" : `${hk.status === "repaired" ? "stale path" : "not wired"} - run: subagent-mcp setup`,
+        });
+    }
+    else if (hasClaudeConfig) {
         const cj = readJson(join(home, ".claude.json"), {});
         const sj = readJson(join(home, ".claude", "settings.json"), {});
         const srv = reconcileClaudeJson(JSON.parse(JSON.stringify(cj)), p.server);
@@ -411,34 +479,48 @@ export function verifyWiring(root = INSTALL_ROOT) {
         results.push({
             label: "claude: MCP server (user scope)",
             ok: srv.status === "ok",
-            detail: srv.status === "ok" ? "registered" : `${srv.status === "repaired" ? "stale path" : "not registered"} — run: subagent-mcp setup`,
+            detail: srv.status === "ok" ? "registered (file fallback)" : "not registered; claude CLI not on PATH",
         });
         results.push({
             label: "claude: UserPromptSubmit hook",
             ok: hk.status === "ok",
-            detail: hk.status === "ok" ? "wired" : `${hk.status === "repaired" ? "stale path" : "not wired"} — run: subagent-mcp setup`,
+            detail: hk.status === "ok" ? "wired" : `${hk.status === "repaired" ? "stale path" : "not wired"} - run: subagent-mcp setup`,
         });
     }
-    const hasCodex = findOnPath("codex") !== null || existsSync(join(home, ".codex"));
+    const hasCodexCli = findOnPath("codex") !== null;
+    const hasCodex = hasCodexCli || existsSync(join(home, ".codex"));
     if (hasCodex) {
         const cfg = join(home, ".codex", "config.toml");
         const toml = existsSync(cfg) ? readFileSync(cfg, "utf8") : "";
         const tomlR = reconcileCodexToml(toml, p.server);
         const hj = readJson(join(home, ".codex", "hooks.json"), { hooks: {} });
         const hkR = reconcileCodexHooks(hj, `node "${p.codexHook}"`);
+        let registered = false;
+        let repaired = false;
+        if (hasCodexCli) {
+            registered = codexRegisteredViaCli();
+            if (!registered && repair) {
+                runCmd("codex", codexAddArgs(p.server));
+                repaired = true;
+                registered = codexRegisteredViaCli();
+            }
+        }
+        else {
+            registered = tomlR.status === "ok";
+        }
         results.push({
             label: "codex: config.toml MCP server block",
-            ok: tomlR.status === "ok",
-            detail: tomlR.status === "ok" ? "registered" : `${tomlR.status === "repaired" ? "stale path" : "not registered"} — run: subagent-mcp setup`,
+            ok: registered,
+            detail: registered ? (repaired ? "repaired" : "registered") : "not registered; CLI repair failed",
         });
         const allOk = Object.values(hkR.statuses).every((s) => s === "ok");
         results.push({
             label: "codex: SessionStart + UserPromptSubmit hooks",
             ok: allOk,
-            detail: allOk ? "wired (trust via /hooks in Codex)" : "incomplete — run: subagent-mcp setup",
+            detail: allOk ? "wired (trust via /hooks in Codex)" : "incomplete - run: subagent-mcp setup",
         });
     }
-    if (!hasClaude && !hasCodex) {
+    if (!hasClaude && !hasClaudeConfig && !hasCodex) {
         results.push({
             label: "vendors",
             ok: false,
@@ -483,7 +565,7 @@ export async function runSetup() {
     // Read-back verification: report what is ACTUALLY on disk now.
     if (!DRY_RUN) {
         console.log("\n--- Verification (read-back) ---");
-        for (const r of verifyWiring()) {
+        for (const r of verifyWiring(INSTALL_ROOT, false)) {
             console.log(`  ${r.ok ? "PASS" : "FAIL"}  ${r.label} — ${r.detail}`);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heretyc/subagent-mcp",
-  "version": "2.6.1",
+  "version": "2.6.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",