kojee-mcp 0.7.5-staging.2 → 0.7.5-staging.21

package/dist/{doctor-codex-PJFWIABF.js → doctor-codex-6H4OOS6O.js}

@@ -1,10 +1,14 @@
 import {
+  CODEX_TRUST_FIX_STEPS,
   defaultCodexConfigPath,
   defaultCodexHooksPath,
   isPlaceholderWebhookUrl
-} from "./chunk-6XWTUDWW.js";
-import "./chunk-TMCNB4JH.js";
+} from "./chunk-WDWVBPXA.js";
 import "./chunk-D6JKFJ6A.js";
+import {
+  classifyHookCommand,
+  isKojeeHookCommand
+} from "./chunk-AXBJQJKA.js";
 import {
   CODEX_STATUS_STALE_MS,
   readAllCodexStatusRaw,
@@ -16,14 +20,13 @@ import {
 } from "./chunk-V5VZPYMZ.js";
 import "./chunk-U5HHHRXA.js";
 import {
+  CODEX_LISTEN_CAP_MS,
   VERSION
-} from "./chunk-5DHIUN73.js";
-import {
-  CODEX_LISTEN_CAP_MS
-} from "./chunk-FJUAMJHU.js";
+} from "./chunk-6NPMVZD7.js";
 
 // src/doctor-codex.ts
 import fs from "fs";
+import path from "path";
 
 // src/hooks/codex-trust-hash.ts
 import crypto from "crypto";
@@ -129,15 +132,33 @@ function extractPairedConfigPath(toml) {
   const m = toml.match(/args\s*=\s*\[[^\]]*"--paired-config"\s*,\s*"([^"]+)"/);
   return m ? m[1].replace(/\\\\/g, "\\") : null;
 }
-function defaultReadFile(path) {
+function defaultReadFile(filePath) {
   return () => {
     try {
-      return fs.readFileSync(path, "utf8");
+      return fs.readFileSync(filePath, "utf8");
     } catch {
       return null;
     }
   };
 }
+function defaultDiscoverProjectCodexConfigs(cwd = process.cwd()) {
+  const globalToml = path.resolve(defaultCodexConfigPath());
+  const found = [];
+  let dir = cwd;
+  for (let hops = 0; hops < 64; hops++) {
+    const candidate = path.join(dir, ".codex", "config.toml");
+    if (path.resolve(candidate) !== globalToml) {
+      try {
+        found.push({ path: candidate, toml: fs.readFileSync(candidate, "utf8") });
+      } catch {
+      }
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return found;
+}
 function collectCodexDoctorReport(deps = {}) {
   const readConfigToml = deps.readConfigToml ?? defaultReadFile(defaultCodexConfigPath());
   const readHooksJson = deps.readHooksJson ?? defaultReadFile(defaultCodexHooksPath());
@@ -152,6 +173,25 @@ function collectCodexDoctorReport(deps = {}) {
     ok: configOk,
     detail: configOk ? 'present with env.KOJEE_RUNTIME="codex" (Tier-1 contract)' : `MISSING [mcp_servers.kojee] or env.KOJEE_RUNTIME="codex" \u2014 ${WIZARD_RERUN}`
   });
+  const projectConfigs = deps.discoverProjectCodexConfigs?.() ?? defaultDiscoverProjectCodexConfigs();
+  const shadowing = projectConfigs.filter(
+    (c) => c.toml.includes("[mcp_servers.kojee]") || /\[hooks\.state/.test(c.toml) || /hook --type=codex-/.test(c.toml)
+  );
+  if (shadowing.length > 0) {
+    const pins = shadowing.map((s) => /kojee-mcp@([^\s"']+)/.exec(s.toml)?.[1]).filter((v) => !!v);
+    const pinNote = pins.length ? ` (pins kojee-mcp@${[...new Set(pins)].join(", ")})` : "";
+    checks.push({
+      name: "Codex config shadowing",
+      ok: "warn",
+      detail: `project-local ${shadowing.map((s) => s.path).join(", ")} defines Kojee/hook config${pinNote} that OVERLAYS the global ~/.codex/config.toml \u2014 Codex may run it instead of the reconnected global entry (split-brain), and this doctor's other checks read only the global file so they may not reflect what Codex actually runs. Reconcile or move the project file(s) aside (e.g. rename to config.toml.bak) so the global reconnect takes effect.`
+    });
+  } else {
+    checks.push({
+      name: "Codex config shadowing",
+      ok: true,
+      detail: "no project-local .codex/config.toml overlaying the global"
+    });
+  }
   const hooksRaw = readHooksJson() ?? "{}";
   let hooksJson = {};
   try {
@@ -175,6 +215,39 @@ function collectCodexDoctorReport(deps = {}) {
     ok: upsPresent ? true : "warn",
     detail: upsPresent ? "present (pending-wake catch-up at the next prompt)" : `MISSING \u2014 a silently-dropped Stop block is never re-surfaced. ${WIZARD_RERUN}`
   });
+  const codexHookCommands = [];
+  for (const event of ["Stop", "UserPromptSubmit"]) {
+    for (const e of hooksJson.hooks?.[event] ?? []) {
+      for (const h of e.hooks ?? []) {
+        if (typeof h.command === "string" && isKojeeHookCommand(h.command)) codexHookCommands.push(h.command);
+      }
+    }
+  }
+  if (codexHookCommands.length > 0) {
+    const states = codexHookCommands.map((c) => classifyHookCommand(c));
+    const repin = "fix: `npm i -g kojee-mcp` then re-run connect for codex (re-pins in place, no re-pair)";
+    if (states.includes("pinned-broken")) {
+      checks.push({
+        name: "hook pin (hooks.json)",
+        ok: false,
+        detail: `pinned cli.js is GONE \u2014 hooks fail with exit 127 RIGHT NOW; ${repin}`
+      });
+    } else if (states.includes("pinned-ephemeral")) {
+      checks.push({
+        name: "hook pin (hooks.json)",
+        ok: false,
+        detail: `pinned INTO the npx cache (~/.npm/_npx/\u2026) \u2014 cache GC will silently kill the hooks (exit 127 every turn); ${repin}`
+      });
+    } else if (states.includes("npx")) {
+      checks.push({
+        name: "hook pin (hooks.json)",
+        ok: "warn",
+        detail: `unpinned (npx -y) \u2014 pays npx resolution every turn and can stall on a registry fetch; ${repin}`
+      });
+    } else {
+      checks.push({ name: "hook pin (hooks.json)", ok: true, detail: "pinned to a durable binary" });
+    }
+  }
   const featureHooks = parseCodexFeatureHooks(toml);
   if (featureHooks !== true) {
     checks.push({
@@ -212,13 +285,13 @@ function collectCodexDoctorReport(deps = {}) {
           checks.push({
             name: `hook trust (${event})`,
             ok: "warn",
-            detail: `${label} is UNTRUSTED \u2014 no [hooks.state]."${key}" trusted_hash. Codex will NOT run it (wakes silently stop) until you launch Codex and APPROVE its trust prompt.`
+            detail: `${label} is UNTRUSTED \u2014 no [hooks.state]."${key}" trusted_hash. Codex will NOT run it (wakes silently stop) \u2014 ${CODEX_TRUST_FIX_STEPS}.`
           });
         } else {
           checks.push({
             name: `hook trust (${event})`,
             ok: "warn",
-            detail: `${label} trust is STALE \u2014 trusted_hash no longer matches the current hooks.json entry (a rewrite invalidated it). Codex will NOT run it until you re-approve the trust prompt.`
+            detail: `${label} trust is STALE \u2014 trusted_hash no longer matches the current hooks.json entry (a rewrite invalidated it). Codex will NOT run it \u2014 ${CODEX_TRUST_FIX_STEPS}.`
           });
         }
       }
@@ -365,6 +438,7 @@ function formatCodexDoctorReport(report) {
 }
 export {
   collectCodexDoctorReport,
+  defaultDiscoverProjectCodexConfigs,
   formatCodexDoctorReport,
   parseCodexEnvFromToml
 };