@mutmutco/cli 3.95.0 → 3.97.0

package/dist/main.cjs

@@ -5235,7 +5235,7 @@ function deferredWorktreesRegistryPath(gitDir) {
   return `${base}/mmi-deferred-worktrees.json`;
 }
 function parseDeferredWorktreesFile(text) {
-  const parsed = JSON.parse(text);
+  const parsed = JSON.parse(text.replace(/^\uFEFF/, ""));
   if (!parsed || !Array.isArray(parsed.entries)) return [];
   return parsed.entries.filter((e) => Boolean(e) && typeof e === "object" && typeof e.path === "string" && typeof e.branch === "string" && e.reason === "lock-held").map((e) => ({ ...e, registeredAt: e.registeredAt || (/* @__PURE__ */ new Date(0)).toISOString() }));
 }
@@ -6999,7 +6999,7 @@ function commandLadderHint() {
 }
 
 // src/index.ts
-var import_node_path38 = require("node:path");
+var import_node_path37 = require("node:path");
 
 // src/merge-ci-policy.ts
 function resolveMergeCiPolicy(input) {
@@ -8788,6 +8788,9 @@ function detectSurface(env) {
   if (env.MMI_AGENT_SURFACE === "codex" || has("CODEX_THREAD_ID") || has("CODEX_MANAGED_BY_NPM") || has("CODEX_MANAGED_PACKAGE_ROOT") || (env.CLAUDE_PLUGIN_ROOT ?? "").includes(".codex")) {
     return "codex";
   }
+  if (env.MMI_AGENT_SURFACE === "jervcode" || has("PI_SESSION_ID")) {
+    return "jervcode";
+  }
   if (env.MMI_AGENT_SURFACE === "kimi" || has("KIMI_PLUGIN_ROOT") || has("KIMI_CODE_HOME")) {
     return "kimi";
   }
@@ -8817,6 +8820,8 @@ function surfaceToken(surface) {
       return "kilo";
     case "cursor":
       return "cursor";
+    case "jervcode":
+      return "jervcode";
     case "opencode":
       return "opencode";
     case "shell":
@@ -8838,6 +8843,8 @@ function reloadAction(surface) {
       return "restart OpenCode";
     case "cursor":
       return "reload the Cursor window";
+    case "jervcode":
+      return "restart JervCode (the package set is read at launch)";
     case "claude-cli":
     case "shell":
     default:
@@ -8905,7 +8912,7 @@ function nonClaudeSurfaceHealMessage(surface) {
   if (surface === "cursor") {
     return "Cursor ships an MMI plugin (#3920). Install or repair its managed local checkout with:\n  mmi-cli plugin heal\n  Then reload the Cursor window. For one-off CLI use, pass --plugin-dir <MMI-Hub checkout>.\n  Update the CLI too: npm i -g @mutmutco/cli";
   }
-  return "No Hub-shipped MMI plugin on this host \u2014 the Hub ships plugins for Claude, Codex, Kimi, Cursor, and Kilo only.\n  Update the CLI instead: npm i -g @mutmutco/cli   (org rules ride an AGENTS.md authored outside the Hub)";
+  return "No Hub-shipped MMI plugin on this host \u2014 the Hub ships plugins for Claude, Codex, Kimi, Cursor, Kilo, and JervCode only.\n  Update the CLI instead: npm i -g @mutmutco/cli   (org rules ride an AGENTS.md authored outside the Hub)";
 }
 function healStepAborts(step, ok) {
   return !ok && step.gated;
@@ -8953,6 +8960,7 @@ function surfaceConfigRoot(surface, env = process.env, home = (0, import_node_os
   if (surface === "kimi") return env.KIMI_CODE_HOME?.trim() || (0, import_node_path14.join)(home, ".kimi-code");
   if (surface === "kilo") return env.KILO_CONFIG_DIR?.trim() || (0, import_node_path14.join)(home, ".config", "kilo");
   if (surface === "cursor") return (0, import_node_path14.join)(home, ".cursor");
+  if (surface === "jervcode") return env.PI_CODING_AGENT_DIR?.trim() || (0, import_node_path14.join)(home, ".pi", "agent");
   return (0, import_node_path14.join)(home, ".claude");
 }
 var installedPluginsPath = (surface = detectSurface(process.env)) => {
@@ -8976,6 +8984,7 @@ function marketplaceCloneCandidates(surface, home, env = process.env) {
   if (surface === "kimi") return [];
   if (surface === "kilo") return [];
   if (surface === "cursor") return [];
+  if (surface === "jervcode") return [];
   return [(0, import_node_path14.join)(home, ".claude", "plugins", "marketplaces", "mutmutco")];
 }
 function marketplaceClonePresent(surface, home, exists = import_node_fs15.existsSync, env = process.env) {
@@ -9104,22 +9113,170 @@ function kimiPluginTreeHealthy(root, exists = import_node_fs15.existsSync) {
     "scripts/hook-run.mjs"
   ].every((path2) => exists((0, import_node_path14.join)(root, ...path2.split("/"))));
 }
+var JERVCODE_WRAPPER_DIR = ".pi-plugin";
+function normalizePiEntry(value) {
+  return decodeURIComponent(value.replace(/^file:\/\/\/?/, "")).replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+}
+function piEntryFsPath(entry) {
+  return decodeURIComponent(entry.replace(/^file:\/\/\/?/, ""));
+}
+function samePiEntry(entry, packagePath) {
+  return typeof entry === "string" && normalizePiEntry(entry) === normalizePiEntry(packagePath);
+}
+function jervcodePackageFamily(entry) {
+  if (typeof entry !== "string") return null;
+  const parts = normalizePiEntry(entry).split("/");
+  if (parts.length < 3 || parts[parts.length - 1] !== JERVCODE_WRAPPER_DIR) return null;
+  if (!/^\d+\.\d+\.\d+$/.test(parts[parts.length - 2])) return null;
+  parts.splice(parts.length - 2, 1);
+  return parts.join("/");
+}
+function isMmiOwnedPiEntry(entry) {
+  if (typeof entry !== "string") return false;
+  try {
+    const pkg = JSON.parse((0, import_node_fs15.readFileSync)((0, import_node_path14.join)(piEntryFsPath(entry), "package.json"), "utf8"));
+    return pkg.name === "mmi";
+  } catch {
+    return false;
+  }
+}
+function mergeMmiPiPackageEntries(entries, packagePath) {
+  const family = jervcodePackageFamily(packagePath);
+  const others = entries.filter((entry) => {
+    if (samePiEntry(entry, packagePath)) return false;
+    if (family === null || jervcodePackageFamily(entry) !== family) return true;
+    return !isMmiOwnedPiEntry(entry);
+  });
+  const already = entries.some((entry) => samePiEntry(entry, packagePath));
+  const superseded = entries.length - others.length - (already ? 1 : 0);
+  return {
+    next: [...others, packagePath],
+    superseded,
+    changed: !(already && others.length === entries.length - 1)
+  };
+}
+function readPiSettings(path2) {
+  if (!(0, import_node_fs15.existsSync)(path2)) return void 0;
+  try {
+    const parsed = JSON.parse((0, import_node_fs15.readFileSync)(path2, "utf8"));
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+function mmiPiWrapperEntry(env = process.env, home = (0, import_node_os4.homedir)()) {
+  const settings = readPiSettings((0, import_node_path14.join)(surfaceConfigRoot("jervcode", env, home), "settings.json"));
+  const entries = Array.isArray(settings?.packages) ? settings.packages : [];
+  for (const entry of entries) {
+    if (typeof entry !== "string") continue;
+    if (jervcodePackageFamily(entry)?.endsWith("/mutmutco/mmi/" + JERVCODE_WRAPPER_DIR) || isMmiOwnedPiEntry(entry)) {
+      return entry;
+    }
+  }
+  return null;
+}
+function mmiPiWrapperHealthy(entry) {
+  if (!entry) return false;
+  const wrapper = piEntryFsPath(entry);
+  return isMmiOwnedPiEntry(entry) && (0, import_node_fs15.existsSync)((0, import_node_path14.join)((0, import_node_path14.dirname)(wrapper), "skills", "mmi", "SKILL.md"));
+}
+function findMmiPiSourceClone(home = (0, import_node_os4.homedir)()) {
+  const cacheRoot = (0, import_node_path14.join)(home, ".claude", "plugins", "cache", "mutmutco", "mmi");
+  let best = null;
+  try {
+    for (const entry of (0, import_node_fs15.readdirSync)(cacheRoot, { withFileTypes: true })) {
+      if (!entry.isDirectory() || !/^\d+\.\d+\.\d+$/.test(entry.name)) continue;
+      if (!(0, import_node_fs15.existsSync)((0, import_node_path14.join)(cacheRoot, entry.name, JERVCODE_WRAPPER_DIR, "package.json"))) continue;
+      if (!best || compareVersions(entry.name, best.version) > 0) {
+        best = { path: (0, import_node_path14.join)(cacheRoot, entry.name), version: entry.name };
+      }
+    }
+  } catch {
+    return null;
+  }
+  return best;
+}
+function healJervCodePackageRegistration(opts = {}) {
+  const env = opts.env ?? process.env;
+  if (env.PI_SESSION_ID?.trim()) {
+    return {
+      available: true,
+      ok: true,
+      changed: false,
+      version: null,
+      detail: "skipped \u2014 live JervCode/Pi seat (PI_SESSION_ID set); the package set is read at launch, so this registration is deferred to an out-of-session doctor run"
+    };
+  }
+  const home = opts.home ?? (0, import_node_os4.homedir)();
+  const agentDir = surfaceConfigRoot("jervcode", env, home);
+  if (!(0, import_node_fs15.existsSync)(agentDir)) {
+    return { available: false, ok: true, changed: false, version: null, detail: "skipped \u2014 no Pi/JervCode install (no agent config dir)" };
+  }
+  const clone = opts.clone === void 0 ? findMmiPiSourceClone(home) : opts.clone;
+  if (!clone) {
+    return { available: true, ok: true, changed: false, version: null, detail: "skipped \u2014 no installed MMI clone carries the pi wrapper (install the Claude plugin first)" };
+  }
+  const packagePath = `${clone.path.replace(/\\/g, "/").replace(/\/+$/, "")}/${JERVCODE_WRAPPER_DIR}`;
+  const settingsPath = (0, import_node_path14.join)(agentDir, "settings.json");
+  const settings = readPiSettings(settingsPath);
+  if (settings === null) {
+    return {
+      available: true,
+      ok: false,
+      changed: false,
+      version: clone.version,
+      detail: `package NOT registered \u2014 ${settingsPath} is not a strict JSON object, so mmi left it alone; add ${packagePath} to its packages array by hand`
+    };
+  }
+  const current = settings ?? {};
+  const entries = Array.isArray(current.packages) ? current.packages : [];
+  const merged = mergeMmiPiPackageEntries(entries, packagePath);
+  if (!merged.changed) {
+    return { available: true, ok: true, changed: false, version: clone.version, detail: `holds ${clone.version}` };
+  }
+  current.packages = merged.next;
+  try {
+    (0, import_node_fs15.mkdirSync)((0, import_node_path14.dirname)(settingsPath), { recursive: true });
+    const tmp = `${settingsPath}.tmp-${process.pid}`;
+    (0, import_node_fs15.writeFileSync)(tmp, `${JSON.stringify(current, null, 2)}
+`, "utf8");
+    try {
+      (0, import_node_fs15.renameSync)(tmp, settingsPath);
+    } catch (renameError) {
+      (0, import_node_fs15.rmSync)(tmp, { force: true });
+      throw renameError;
+    }
+  } catch (error) {
+    return { available: true, ok: false, changed: false, version: clone.version, detail: `package NOT registered \u2014 ${error.message}` };
+  }
+  const beside = `package registered in settings.json (${merged.next.length - 1} other package(s) untouched)`;
+  return {
+    available: true,
+    ok: true,
+    changed: true,
+    version: clone.version,
+    detail: `${clone.version}: ${merged.superseded > 0 ? `${beside}, superseding ${merged.superseded} earlier mmi version(s)` : beside}`
+  };
+}
 function snapshotPluginGuardInput(surface = detectSurface(process.env), isOrgRepo = false) {
   const root = surfaceConfigRoot(surface);
   const installed = readInstalledPlugins(surface);
   const codexStatus = surface === "codex" ? codexPluginStatus() : void 0;
+  const piEntry = surface === "jervcode" ? mmiPiWrapperEntry() : null;
   return {
     isOrgRepo,
     installRecordPresent: hasUserInstallRecord(installed, MMI_PLUGIN_ID) || hasProjectInstallRecord(installed, MMI_PLUGIN_ID, process.cwd()) || // Kimi's managed plugin directory is its native install record; it has no Claude-style ledger.
     surface === "kimi" && (0, import_node_fs15.existsSync)((0, import_node_path14.join)(root, "plugins", "managed", "mmi")) || // kilo-p1: the install record is the config file itself.
-    surface === "kilo" && kiloConfigListsPlugin(root) || surface === "cursor" && (0, import_node_fs15.existsSync)(cursorLocalPluginRoot()),
+    surface === "kilo" && kiloConfigListsPlugin(root) || // #4188: jervcode's install record is the settings-file packages[] entry itself.
+    surface === "jervcode" && piEntry !== null || surface === "cursor" && (0, import_node_fs15.existsSync)(cursorLocalPluginRoot()),
     // Kilo has no marketplace to clone — the config file IS the install record, so this dimension of
-    // the shared guard table is vacuously satisfied.
-    marketplaceClonePresent: surface === "kimi" || surface === "kilo" || surface === "cursor" ? true : marketplaceClonePresent(surface, (0, import_node_os4.homedir)()),
+    // the shared guard table is vacuously satisfied. Same for jervcode's settings entry.
+    marketplaceClonePresent: surface === "kimi" || surface === "kilo" || surface === "cursor" || surface === "jervcode" ? true : marketplaceClonePresent(surface, (0, import_node_os4.homedir)()),
     // Kimi keeps no plugin cache dir — installs are copied to plugins/managed/<id> and run from there.
     // Kilo (kilo-p1) keeps no cache dir either: the plugin's server() provisions ~/.kilo behind the
     // version stamp, so the stamp's presence is the cache signal.
-    pluginCachePresent: surface === "kilo" ? (0, import_node_fs15.existsSync)((0, import_node_path14.join)((0, import_node_os4.homedir)(), ".kilo", ".mmi-kilo-version")) : surface === "kimi" ? kimiPluginTreeHealthy((0, import_node_path14.join)(root, "plugins", "managed", "mmi")) : surface === "cursor" ? cursorPluginTreeHealthy(cursorLocalPluginRoot()) : surface === "codex" ? Boolean(
+    pluginCachePresent: surface === "jervcode" ? mmiPiWrapperHealthy(piEntry) : surface === "kilo" ? (0, import_node_fs15.existsSync)((0, import_node_path14.join)((0, import_node_os4.homedir)(), ".kilo", ".mmi-kilo-version")) : surface === "kimi" ? kimiPluginTreeHealthy((0, import_node_path14.join)(root, "plugins", "managed", "mmi")) : surface === "cursor" ? cursorPluginTreeHealthy(cursorLocalPluginRoot()) : surface === "codex" ? Boolean(
       codexStatus?.installed && codexStatus.enabled && codexStatus.version && (0, import_node_fs15.existsSync)((0, import_node_path14.join)(root, "plugins", "cache", CODEX_MARKETPLACE, "mmi", codexStatus.version))
     ) : (0, import_node_fs15.existsSync)((0, import_node_path14.join)(root, "plugins", "cache", "mutmutco", "mmi"))
   };
@@ -9298,13 +9455,26 @@ async function healClaudePluginForDoctor(surface = detectSurface(process.env), o
     detail: ok ? `marketplace remove \u2192 add \u2192 install succeeded${pinNote ? `; ${pinNote}` : ""}` : `\`claude plugin\` reinstall failed or was skipped${steps.length ? ` (${steps[steps.length - 1]})` : ""}`
   };
 }
+async function healJervCodeForDoctor() {
+  const heal = healJervCodePackageRegistration();
+  if (!heal.ok) return { ok: false, detail: heal.detail };
+  const snapshot = snapshotPluginGuardInput("jervcode", true);
+  const state = buildPluginGuardDecision(snapshot).state;
+  const verification = `record=${snapshot.installRecordPresent ? "yes" : "no"}, payload=${snapshot.pluginCachePresent ? "yes" : "no"}`;
+  if (!heal.changed && heal.detail.startsWith("skipped")) return { ok: true, detail: heal.detail };
+  return {
+    ok: state === "healthy",
+    detail: state === "healthy" ? `${heal.detail}; full guard verified (${verification})` : `pi package registration did not verify (${verification}); ${heal.detail}`
+  };
+}
 async function healActivePluginForDoctor(surface = detectSurface(process.env), onStep) {
   const token = surfaceToken(surface);
-  if (token !== "claude" && token !== "codex" && token !== "cursor" && token !== "kilo") {
+  if (token !== "claude" && token !== "codex" && token !== "cursor" && token !== "kilo" && token !== "jervcode") {
     return { ok: false, detail: `not a supported plugin surface (${surface})` };
   }
   if (token === "claude") return healClaudePluginForDoctor(surface, onStep);
   if (token === "cursor") return installCursorPluginCheckout();
+  if (token === "jervcode") return healJervCodeForDoctor();
   const steps = [];
   const applied = await applyPluginHeal(surface, (msg) => {
     const line = msg.trim();
@@ -9421,7 +9591,7 @@ async function runGuard(readOrigin) {
   const surface = detectSurface(process.env);
   try {
     const token = surfaceToken(surface);
-    if (token !== "claude" && token !== "codex" && token !== "cursor" && token !== "kilo") {
+    if (token !== "claude" && token !== "codex" && token !== "cursor" && token !== "kilo" && token !== "jervcode") {
       process.exitCode = 0;
       return;
     }
@@ -9441,8 +9611,8 @@ async function runGuard(readOrigin) {
     if (surfaceToken(surface) === "codex") {
       console.error("[mmi-guard] Could not inspect the active Codex plugin; run `mmi-cli plugin heal`.");
       process.exitCode = 1;
-    } else if (surfaceToken(surface) === "kilo" || surfaceToken(surface) === "cursor") {
-      const host = surfaceToken(surface) === "cursor" ? "Cursor" : "Kilo";
+    } else if (surfaceToken(surface) === "kilo" || surfaceToken(surface) === "cursor" || surfaceToken(surface) === "jervcode") {
+      const host = surfaceToken(surface) === "cursor" ? "Cursor" : surfaceToken(surface) === "jervcode" ? "JervCode" : "Kilo";
       console.error(`[mmi-guard] Could not inspect the active ${host} plugin; run \`mmi-cli plugin heal\`.`);
       process.exitCode = 1;
     } else {
@@ -9452,10 +9622,21 @@ async function runGuard(readOrigin) {
 }
 async function runPluginHeal(surface = detectSurface(process.env)) {
   const token = surfaceToken(surface);
-  if (token !== "claude" && token !== "codex" && token !== "cursor" && token !== "kilo") {
+  if (token !== "claude" && token !== "codex" && token !== "cursor" && token !== "kilo" && token !== "jervcode") {
     console.log(nonClaudeSurfaceHealMessage(token ?? void 0));
     return;
   }
+  if (token === "jervcode") {
+    const result = await healJervCodeForDoctor();
+    console.log(`  \u21BB ${result.detail}`);
+    if (result.ok) {
+      console.log(`  \u2713 MMI pi package registered \u2014 ${reloadAction(surface)} to load MMI skills.`);
+    } else {
+      process.exitCode = 1;
+      console.log("  \u2717 Auto-heal failed or was skipped. Install the Claude MMI plugin first (it owns the referenced clone), then rerun `mmi-cli plugin heal`.");
+    }
+    return;
+  }
   const descriptor = PLUGIN_SURFACE_HEAL[token];
   const cursorResult = token === "cursor" ? await installCursorPluginCheckout() : void 0;
   if (cursorResult) console.log(`  \u21BB ${cursorResult.detail}`);
@@ -16990,7 +17171,7 @@ async function boardDoctor(options, deps = {}) {
     };
     await Promise.all(Array.from({ length: Math.min(concurrency, suspicious.length) }, () => ghostWorker()));
   }
-  const claimedItems = collected.items.filter(
+  const claimedItems = options.skipClaimLiveness ? [] : collected.items.filter(
     (item) => item.contentType === "Issue" && item.assignees.length > 0 && item.status === "In Progress"
   );
   const liveClaims = [];
@@ -17227,7 +17408,7 @@ function applyChecklistCheck(body, query, checked) {
 // src/command-taxonomy.ts
 var COMMAND_METADATA = /* @__PURE__ */ Symbol.for("mmi.commandTaxonomy.metadata");
 var PRIMARY_GROUPS = [
-  ["Orient", ["onboard", "status", "next", "doctor", "whoami", "commands", "explain"]],
+  ["Orient", ["onboard", "status", "next", "find", "doctor", "whoami", "commands", "explain"]],
   ["Plan and work", ["board", "issue", "worktree", "stage"]],
   ["Review and ship", ["pr", "ci", "rcand", "release", "hotfix", "train"]],
   // `tests` sits beside `docs` deliberately: both are deterministic, repo-local gates a workflow
@@ -17237,7 +17418,7 @@ var PRIMARY_GROUPS = [
   ["Coordinate and improve", ["wave", "report", "skill-lesson"]]
 ];
 var OPERATIONAL_TOP_LEVEL = /* @__PURE__ */ new Set(["org", "runtime", "plugin"]);
-var SUPPORT_PRIMARY = /* @__PURE__ */ new Set(["doctor", "whoami", "commands", "explain", "docs", "repo-index", "tests", "spawn", "wave", "report", "skill-lesson"]);
+var SUPPORT_PRIMARY = /* @__PURE__ */ new Set(["doctor", "whoami", "commands", "explain", "docs", "repo-index", "find", "tests", "spawn", "wave", "report", "skill-lesson"]);
 var TOP_LEVEL_ORDER = /* @__PURE__ */ new Map();
 var HELP_GROUP_ORDER = /* @__PURE__ */ new Map();
 var topLevelPosition = 0;
@@ -17248,6 +17429,10 @@ for (const [helpGroup, names] of PRIMARY_GROUPS) {
 HELP_GROUP_ORDER.set("Operations", HELP_GROUP_ORDER.size);
 for (const name of OPERATIONAL_TOP_LEVEL) TOP_LEVEL_ORDER.set(name, topLevelPosition++);
 var PATH_OVERRIDES = {
+  // #4184: the estate-search door reads as Orient, while rebuild/publish/gc/sync-estate stay
+  // Setup and support — that split is the point.
+  "repo-index search": { category: "support", discovery: "primary", help_group: "Orient" },
+  "repo-index status": { category: "support", discovery: "primary", help_group: "Orient" },
   "secrets find": { category: "admin", discovery: "all-only", help_group: "Operations" },
   "secrets catalog": { category: "admin", discovery: "all-only", help_group: "Operations" },
   "secrets doctor": { category: "admin", discovery: "all-only", help_group: "Operations" },
@@ -17277,6 +17462,7 @@ var COMMAND_OWNERSHIP = {
   secrets: { module_owner: "cli/src/secrets-commands.ts", consumer: "authenticated-operator" },
   docs: { module_owner: "cli/src/docs-index-command.ts", consumer: "repo-gates" },
   "repo-index": { module_owner: "cli/src/repo-index.ts", consumer: "agent-session" },
+  find: { module_owner: "cli/src/repo-index.ts", consumer: "agent-session" },
   tests: { module_owner: "cli/src/test-policy-core.ts", consumer: "repo-gates" },
   spawn: { module_owner: "cli/src/spawn-policy-core.ts", consumer: "repo-gates" },
   wave: { module_owner: "cli/src/wave-land.ts", consumer: "campaign-orchestrator" },
@@ -19342,6 +19528,12 @@ var INDEXABLE_EXT = /* @__PURE__ */ new Set([
   ".html"
 ]);
 var SYMBOL_RE = /^(?:export\s+)?(?:async\s+)?(?:function|class|const|let|var|type|interface|enum)\s+([A-Za-z_$][\w$]*)/gm;
+function repoIndexPathTieBreak(path2) {
+  const p = path2.replace(/\\/g, "/");
+  if (/(^|\/)__tests__\//.test(p) || /(^|\/)tests?\//.test(p)) return 1;
+  if (/\.(test|spec)\.[^.]+$/i.test(p)) return 1;
+  return 0;
+}
 function repoIndexStorePath(cwd) {
   return repoRuntimeStatePath(cwd, "repo-index", "index.json");
 }
@@ -19552,7 +19744,9 @@ function searchRepoIndex(idx, query, limit = 20) {
       }
     }
   }
-  hits.sort((a, b) => b.score - a.score || a.path.localeCompare(b.path));
+  hits.sort(
+    (a, b) => b.score - a.score || repoIndexPathTieBreak(a.path) - repoIndexPathTieBreak(b.path) || a.path.localeCompare(b.path)
+  );
   const seen = /* @__PURE__ */ new Set();
   const out = [];
   for (const h of hits) {
@@ -19568,10 +19762,10 @@ function inferRepoSlug(cwd, exec = import_node_child_process11.execFileSync) {
   try {
     const url = String(exec("git", ["remote", "get-url", "origin"], { cwd, encoding: "utf8" })).trim();
     const m = /[:/]([^/]+\/[^/]+?)(?:\.git)?$/.exec(url);
-    if (m?.[1]) return m[1];
+    if (m?.[1]) return m[1].toLowerCase();
   } catch {
   }
-  return (0, import_node_path20.basename)(cwd) || "local";
+  return ((0, import_node_path20.basename)(cwd) || "local").toLowerCase();
 }
 
 // src/repo-index-cloud-client.ts
@@ -19718,8 +19912,11 @@ var import_node_child_process12 = require("node:child_process");
 var MAX_EMBED_BACKFILL_ROUNDS = 40;
 function normalizeRepo(raw) {
   const t = raw.trim().replace(/\.git$/, "");
-  if (t.includes("/")) return t;
-  return `mutmutco/${t}`;
+  if (t.includes("/")) {
+    const [owner, name] = t.split("/");
+    return `${(owner || "").toLowerCase()}/${(name || "").toLowerCase()}`;
+  }
+  return `mutmutco/${t.toLowerCase()}`;
 }
 function rosterRepos(projects) {
   const set = /* @__PURE__ */ new Set();
@@ -19730,10 +19927,11 @@ function rosterRepos(projects) {
   return [...set].sort((a, b) => a.localeCompare(b));
 }
 function shallowClone(repo, dest, token) {
+  const basic = Buffer.from(`x-access-token:${token}`, "utf8").toString("base64");
   (0, import_node_child_process12.execFileSync)(
     "git",
-    ["-c", `http.extraHeader=Authorization: Bearer ${token}`, "clone", "--depth", "1", "--single-branch", `https://github.com/${repo}.git`, dest],
-    { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }
+    ["-c", `http.extraHeader=Authorization: Basic ${basic}`, "clone", "--depth", "1", "--single-branch", `https://github.com/${repo}.git`, dest],
+    { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"], windowsHide: true }
   );
 }
 async function syncEstateRepoIndex(opts) {
@@ -19813,17 +20011,56 @@ async function syncEstateRepoIndex(opts) {
 
 // src/repo-index-health.ts
 var import_node_fs24 = require("node:fs");
-var import_node_path22 = require("node:path");
-function defaultGoldenPath(repoRoot2) {
-  return (0, import_node_path22.join)(repoRoot2, "cli", "testdata", "repo-index-golden-queries.json");
-}
-function loadGoldenSuite(path2) {
-  const raw = JSON.parse((0, import_node_fs24.readFileSync)(path2, "utf8"));
+
+// testdata/repo-index-golden-queries.json
+var repo_index_golden_queries_default = {
+  schema: 1,
+  staleThresholdHours: 12,
+  hubRepo: "mutmutco/MMI-Hub",
+  hubEmbMinCoverage: 0.5,
+  maxSyncEmbeds: 100,
+  queries: [
+    {
+      id: "rebuild-symbol-lexical",
+      q: "rebuildRepoIndex",
+      mode: "lexical",
+      expect: {
+        topRepos: ["mutmutco/MMI-Hub"],
+        topPaths: ["cli/src/repo-index.ts"],
+        minScore: 0.1
+      }
+    },
+    {
+      id: "schedules-register-semantic",
+      q: "schedules register",
+      mode: "semantic",
+      expect: {
+        topRepos: ["mutmutco/MMI-Hub"],
+        minScore: 0.05
+      }
+    }
+  ]
+};
+
+// src/repo-index-health.ts
+function assertGoldenSuite(raw, source) {
   if (!raw || raw.schema !== 1 || !Array.isArray(raw.queries)) {
-    throw new Error(`invalid golden suite at ${path2}`);
+    throw new Error(`invalid golden suite at ${source}`);
   }
   return raw;
 }
+function loadGoldenSuite(path2) {
+  let text;
+  try {
+    text = (0, import_node_fs24.readFileSync)(path2, "utf8");
+  } catch (e) {
+    throw new Error(`golden suite unreadable at ${path2}: ${e.message}`);
+  }
+  return assertGoldenSuite(JSON.parse(text), path2);
+}
+function defaultGoldenSuite() {
+  return assertGoldenSuite(repo_index_golden_queries_default, "bundled repo-index-golden-queries.json");
+}
 function evaluateQueryHits(query, hits) {
   if (!hits.length) {
     return { ok: false, code: "empty-hits", detail: `${query.id}: no hits for ${JSON.stringify(query.q)}` };
@@ -19960,7 +20197,7 @@ async function runRepoIndexHealth(opts) {
 // src/spawn-policy-core.ts
 var import_node_child_process13 = require("node:child_process");
 var import_node_fs25 = require("node:fs");
-var import_node_path23 = require("node:path");
+var import_node_path22 = require("node:path");
 var SPAWNERS = ["spawn", "spawnSync", "exec", "execSync", "execFile", "execFileSync"];
 var CALL_SOURCE = String.raw`(^|[^.\w$])(${SPAWNERS.join("|")})\s*\(`;
 var SOURCE_EXT = /\.(ts|mts|cts|js|mjs|cjs)$/;
@@ -20046,7 +20283,7 @@ function runSpawnPolicy(root) {
   for (const file of files) {
     let raw;
     try {
-      raw = (0, import_node_fs25.readFileSync)((0, import_node_path23.join)(root, file), "utf8");
+      raw = (0, import_node_fs25.readFileSync)((0, import_node_path22.join)(root, file), "utf8");
     } catch {
       continue;
     }
@@ -20065,7 +20302,7 @@ function runSpawnPolicy(root) {
 // src/test-policy-core.ts
 var import_node_child_process14 = require("node:child_process");
 var import_node_fs26 = require("node:fs");
-var import_node_path24 = require("node:path");
+var import_node_path23 = require("node:path");
 var POLICY_FILE = "test-policy.json";
 var TEST_RE = /\.(?:test|spec)\.[cm]?[jt]sx?$/;
 var PY_TEST_RE = /(?:^|\/)test_[^/]*\.py$|_test\.py$/;
@@ -20118,7 +20355,7 @@ function isTestPath(path2) {
   return TEST_RE.test(path2) || PY_TEST_RE.test(path2);
 }
 function loadPolicy(root, readFile9 = readFileOrNull2) {
-  const raw = readFile9((0, import_node_path24.join)(root, POLICY_FILE));
+  const raw = readFile9((0, import_node_path23.join)(root, POLICY_FILE));
   if (raw == null) return { mandatory: [], declared: false };
   try {
     return { ...JSON.parse(raw), declared: true };
@@ -20156,11 +20393,11 @@ function classify(changed, policy, present = () => false) {
   return { mandatoryHits, untestedHits, testChanges, addedTests, removedProtected };
 }
 function unresolvedProtectedEntries(policy, root, exists = (path2) => (0, import_node_fs26.existsSync)(path2)) {
-  return (policy.protected ?? []).map((p) => p.path).filter((p) => !exists((0, import_node_path24.join)(root, p)));
+  return (policy.protected ?? []).map((p) => p.path).filter((p) => !exists((0, import_node_path23.join)(root, p)));
 }
 function unresolvedSatisfiers(policy, root, exists = (path2) => (0, import_node_fs26.existsSync)(path2)) {
   const declared = (policy.mandatory ?? []).flatMap((m) => m.satisfiedBy ?? []);
-  return [...new Set(declared)].filter((p) => !exists((0, import_node_path24.join)(root, p)));
+  return [...new Set(declared)].filter((p) => !exists((0, import_node_path23.join)(root, p)));
 }
 function evaluate(changed, policy, present = () => false) {
   const { mandatoryHits, untestedHits, testChanges, addedTests, removedProtected } = classify(changed, policy, present);
@@ -20348,7 +20585,7 @@ function runTestPolicy(root, deps = {}) {
   const refusal = deps.changed ? null : untrustworthyRange(root, base);
   const changed = deps.changed ?? (refusal ? [] : changedFilesSince(base, root));
   const lookup = deps.override !== void 0 ? { override: deps.override, refusals: [] } : !deps.changed && !refusal ? readOverride(base, root) : { override: null, refusals: [] };
-  const present = (path2) => exists((0, import_node_path24.join)(root, path2));
+  const present = (path2) => exists((0, import_node_path23.join)(root, path2));
   const removedByThisDiff = removedPaths(changed);
   const staleFindings = [];
   const unresolved = unresolvedProtectedEntries(policy, root, exists).filter((p) => !removedByThisDiff.has(p));
@@ -20505,7 +20742,7 @@ function docsAuditStatus(fetch2, opts) {
 
 // src/project-info-sync.ts
 var import_node_fs27 = require("node:fs");
-var import_node_path25 = require("node:path");
+var import_node_path24 = require("node:path");
 var UPDATE_PROJECT_INFO = `mutation($projectId: ID!, $shortDescription: String!, $readme: String!) {
   updateProjectV2(input: { projectId: $projectId, shortDescription: $shortDescription, readme: $readme }) {
     projectV2 { id }
@@ -20550,7 +20787,7 @@ function sharedName(entries, fallback) {
 }
 function buildProjectInfoSyncPlan(targetRepo2, project2, projects, repoRoot2) {
   if (!project2.projectId) throw new Error(`org project sync-info: ${targetRepo2} registry META has no projectId`);
-  const readmePath = (0, import_node_path25.join)(repoRoot2, "README.md");
+  const readmePath = (0, import_node_path24.join)(repoRoot2, "README.md");
   if (!(0, import_node_fs27.existsSync)(readmePath)) throw new Error(`org project sync-info: ${targetRepo2} has no README.md`);
   const entries = entriesFor(project2, projects);
   const memberRepos = [...new Set(entries.flatMap((entry) => entry.repos ?? []))].filter((repo) => /^[^/]+\/[^/]+$/.test(repo)).sort((a, b) => a.localeCompare(b));
@@ -20576,8 +20813,8 @@ function buildProjectInfoSyncPlan(targetRepo2, project2, projects, repoRoot2) {
   const targetBase = `https://github.com/${targetRepo2}`;
   const targetBranch = branchFor(targetRepo2, projects);
   const orgDocs = [
-    (0, import_node_fs27.existsSync)((0, import_node_path25.join)(repoRoot2, "docs", "org-readme.md")) ? `- [Org identity](${targetBase}/blob/${targetBranch}/docs/org-readme.md)` : "",
-    (0, import_node_fs27.existsSync)((0, import_node_path25.join)(repoRoot2, "docs", "org-architecture.md")) ? `- [Org architecture](${targetBase}/blob/${targetBranch}/docs/org-architecture.md)` : ""
+    (0, import_node_fs27.existsSync)((0, import_node_path24.join)(repoRoot2, "docs", "org-readme.md")) ? `- [Org identity](${targetBase}/blob/${targetBranch}/docs/org-readme.md)` : "",
+    (0, import_node_fs27.existsSync)((0, import_node_path24.join)(repoRoot2, "docs", "org-architecture.md")) ? `- [Org architecture](${targetBase}/blob/${targetBranch}/docs/org-architecture.md)` : ""
   ].filter(Boolean);
   if (orgDocs.length) lines.push("", "## Organisation docs", "", ...orgDocs);
   return { projectId: project2.projectId, projectName, targetRepo: targetRepo2, memberRepos, shortDescription, readme: `${lines.join("\n")}
@@ -21437,7 +21674,7 @@ function writeError(res) {
 
 // src/secrets-commands.ts
 var import_node_fs28 = require("node:fs");
-var import_node_path26 = require("node:path");
+var import_node_path25 = require("node:path");
 var import_node_os10 = require("node:os");
 
 // src/project-runtime.ts
@@ -21561,11 +21798,11 @@ function collectMap(value, previous = []) {
   return [...previous, value];
 }
 async function decryptRailsCredentials(input) {
-  const appDir = (0, import_node_path26.resolve)(input.appDir ?? process.cwd());
+  const appDir = (0, import_node_path25.resolve)(input.appDir ?? process.cwd());
   const credentialsFile = input.credentialsFile ?? DEFAULT_RAILS_CREDENTIALS_FILE;
   const masterKeyFile = input.masterKeyFile ?? DEFAULT_RAILS_MASTER_KEY_FILE;
-  const credentialsPath = (0, import_node_path26.resolve)(appDir, credentialsFile);
-  const masterKeyPath = (0, import_node_path26.resolve)(appDir, masterKeyFile);
+  const credentialsPath = (0, import_node_path25.resolve)(appDir, credentialsFile);
+  const masterKeyPath = (0, import_node_path25.resolve)(appDir, masterKeyFile);
   const env = {
     ...process.env,
     MMI_RAILS_CREDENTIALS_FILE: credentialsPath,
@@ -21582,8 +21819,8 @@ async function decryptRailsCredentials(input) {
     'config = ActiveSupport::EncryptedConfiguration.new(config_path: config_path, key_path: key_path, env_key: "RAILS_MASTER_KEY", raise_if_missing_key: true)',
     "puts JSON.generate(config.config)"
   ].join("\n");
-  const scriptDir = (0, import_node_fs28.mkdtempSync)((0, import_node_path26.join)((0, import_node_os10.tmpdir)(), "mmi-rails-decrypt-"));
-  const scriptPath = (0, import_node_path26.join)(scriptDir, "decrypt.rb");
+  const scriptDir = (0, import_node_fs28.mkdtempSync)((0, import_node_path25.join)((0, import_node_os10.tmpdir)(), "mmi-rails-decrypt-"));
+  const scriptPath = (0, import_node_path25.join)(scriptDir, "decrypt.rb");
   (0, import_node_fs28.writeFileSync)(scriptPath, script, "utf8");
   try {
     const args = ["exec", "ruby", scriptPath];
@@ -21686,7 +21923,7 @@ function registerSecretsCommands(program3) {
     let body;
     if (o.file) {
       try {
-        body = (0, import_node_fs28.readFileSync)((0, import_node_path26.resolve)(o.file), "utf8");
+        body = (0, import_node_fs28.readFileSync)((0, import_node_path25.resolve)(o.file), "utf8");
       } catch (e) {
         return fail(`secrets org-catalog: cannot read --file ${o.file}: ${e.message}`);
       }
@@ -21791,7 +22028,7 @@ function registerSecretsCommands(program3) {
       {
         ...d,
         decryptRailsCredentials,
-        removeFile: (path2) => (0, import_node_fs28.unlinkSync)((0, import_node_path26.resolve)(o.appDir ?? process.cwd(), path2))
+        removeFile: (path2) => (0, import_node_fs28.unlinkSync)((0, import_node_path25.resolve)(o.appDir ?? process.cwd(), path2))
       },
       {
         repo: o.repo,
@@ -22847,7 +23084,7 @@ function registerSchedulesCommands(program3) {
 
 // src/file-lock.ts
 var import_promises5 = require("node:fs/promises");
-var import_node_path27 = require("node:path");
+var import_node_path26 = require("node:path");
 var sleep = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
 var IMMEDIATE_RETRY_BUDGET = 3;
 var FileLockBusyError = class extends Error {
@@ -22932,7 +23169,7 @@ async function releaseFileLock(lockPath, guard) {
 }
 async function withFileLock(lockPath, opts, fn) {
   const resolved = resolveFileLockOpts(opts);
-  await (0, import_promises5.mkdir)((0, import_node_path27.dirname)(lockPath), { recursive: true }).catch(() => void 0);
+  await (0, import_promises5.mkdir)((0, import_node_path26.dirname)(lockPath), { recursive: true }).catch(() => void 0);
   const guard = await acquireFileLock(lockPath, resolved, Date.now() + resolved.maxWaitMs);
   try {
     return await fn();
@@ -22943,7 +23180,7 @@ async function withFileLock(lockPath, opts, fn) {
 
 // src/schedules-lift-command.ts
 var import_promises6 = require("node:fs/promises");
-var import_node_path28 = require("node:path");
+var import_node_path27 = require("node:path");
 
 // src/schedules-lift.ts
 var SCHEDULE_HEADER_FIELDS = ["schedule", "what", "owner", "cadence", "executor", "llm", "output", "breaks", "kill"];
@@ -23049,7 +23286,7 @@ async function readWorkflowFiles(dir) {
   const files = [];
   for (const name of names.sort()) {
     if (!/\.ya?ml$/.test(name)) continue;
-    files.push({ path: `.github/workflows/${name}`, text: await (0, import_promises6.readFile)((0, import_node_path28.join)(dir, name), "utf8") });
+    files.push({ path: `.github/workflows/${name}`, text: await (0, import_promises6.readFile)((0, import_node_path27.join)(dir, name), "utf8") });
   }
   return files;
 }
@@ -23593,7 +23830,7 @@ function registerQueryCommands(program3) {
 // src/bootstrap-commands.ts
 var import_node_fs30 = require("node:fs");
 var import_node_os11 = require("node:os");
-var import_node_path29 = require("node:path");
+var import_node_path28 = require("node:path");
 
 // src/bootstrap-drift.ts
 function byteComparableSeeds(manifest, cls) {
@@ -24462,7 +24699,7 @@ function registerBootstrapCommands(program3) {
     const readFile9 = (p) => (0, import_node_fs30.existsSync)(p) ? (0, import_node_fs30.readFileSync)(p, "utf8") : null;
     const enc = (p) => p.split("/").map(encodeURIComponent).join("/");
     const putSeed = async (target, content, ref, sha) => {
-      const tmp = (0, import_node_path29.join)((0, import_node_os11.tmpdir)(), `mmi-seed-${process.pid}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}.json`);
+      const tmp = (0, import_node_path28.join)((0, import_node_os11.tmpdir)(), `mmi-seed-${process.pid}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}.json`);
       (0, import_node_fs30.writeFileSync)(tmp, JSON.stringify(contentPutBody(target, content, ref, sha)), "utf8");
       try {
         await gh(contentPutInputArgs(repo, target, tmp));
@@ -24726,11 +24963,11 @@ LIVE apply to ${repo}:
 
 // src/stage-commands.ts
 var import_node_fs32 = require("node:fs");
-var import_node_path31 = require("node:path");
+var import_node_path30 = require("node:path");
 
 // src/port-registry.ts
 var import_node_fs31 = require("node:fs");
-var import_node_path30 = require("node:path");
+var import_node_path29 = require("node:path");
 
 // ../infra/port-geometry.mjs
 var PORT_BLOCK = 100;
@@ -24783,22 +25020,22 @@ function existingPortRange(repo, registry2) {
   return registry2[repo] ?? null;
 }
 function portRangeInfraAt(root, source) {
-  const registryPath = (0, import_node_path30.join)(root, "infra", "port-ranges.json");
-  const ddbScriptPath = (0, import_node_path30.join)(root, "infra", "port-ddb.mjs");
+  const registryPath = (0, import_node_path29.join)(root, "infra", "port-ranges.json");
+  const ddbScriptPath = (0, import_node_path29.join)(root, "infra", "port-ddb.mjs");
   if (!(0, import_node_fs31.existsSync)(registryPath) || !(0, import_node_fs31.existsSync)(ddbScriptPath)) return null;
   return { root, source, registryPath, ddbScriptPath };
 }
 function resolvePortRangeInfra(cwd, packageDir) {
   const direct = portRangeInfraAt(cwd, "cwd");
   if (direct) return direct;
-  for (let dir = cwd; ; dir = (0, import_node_path30.dirname)(dir)) {
-    const sibling = portRangeInfraAt((0, import_node_path30.join)(dir, "MMI-Hub"), "sibling-hub");
+  for (let dir = cwd; ; dir = (0, import_node_path29.dirname)(dir)) {
+    const sibling = portRangeInfraAt((0, import_node_path29.join)(dir, "MMI-Hub"), "sibling-hub");
     if (sibling) return sibling;
-    const parent = (0, import_node_path30.dirname)(dir);
+    const parent = (0, import_node_path29.dirname)(dir);
     if (parent === dir) break;
   }
   if (packageDir) {
-    const pkgRoot = (0, import_node_path30.join)(packageDir, "..", "..");
+    const pkgRoot = (0, import_node_path29.join)(packageDir, "..", "..");
     const pkgFrom = portRangeInfraAt(pkgRoot, "pkg-root");
     if (pkgFrom) return pkgFrom;
   }
@@ -24992,8 +25229,8 @@ function registerStageCommands(program3) {
     const portRange = portRangeMeta && typeof portRangeMeta.start === "number" && typeof portRangeMeta.end === "number" ? [portRangeMeta.start, portRangeMeta.end] : void 0;
     return decideStage({
       registry: { deployModel: project2?.deployModel, portRange, error: read.ok ? void 0 : read.error },
-      hasCompose: (0, import_node_fs32.existsSync)((0, import_node_path31.join)(process.cwd(), "docker-compose.yml")),
-      hasEnvExample: (0, import_node_fs32.existsSync)((0, import_node_path31.join)(process.cwd(), ".env.example"))
+      hasCompose: (0, import_node_fs32.existsSync)((0, import_node_path30.join)(process.cwd(), "docker-compose.yml")),
+      hasEnvExample: (0, import_node_fs32.existsSync)((0, import_node_path30.join)(process.cwd(), ".env.example"))
     });
   }
   async function fetchStageVaultEnvMerge() {
@@ -25433,7 +25670,7 @@ function registerBoardCommands(program3) {
 // src/merge-cleanup.ts
 var import_node_fs33 = require("node:fs");
 var import_promises8 = require("node:fs/promises");
-var import_node_path33 = require("node:path");
+var import_node_path32 = require("node:path");
 var import_node_os12 = require("node:os");
 var import_node_child_process16 = require("node:child_process");
 
@@ -25521,7 +25758,7 @@ function boardAdvanceFailureMessage(result) {
 
 // src/deferred-registry-store.ts
 var import_promises7 = require("node:fs/promises");
-var import_node_path32 = require("node:path");
+var import_node_path31 = require("node:path");
 var sleep2 = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
 async function atomicWrite(target, contents) {
   const tmp = `${target}.tmp-${process.pid}-${Math.random().toString(36).slice(2)}`;
@@ -25572,12 +25809,12 @@ function makeDeferredWorktreeStore(registryPath, lockOpts = {}) {
     },
     // Standalone atomic write — THROWS on failure (no best-effort swallow, #2846).
     write: async (entries) => {
-      await (0, import_promises7.mkdir)((0, import_node_path32.dirname)(registryPath), { recursive: true });
+      await (0, import_promises7.mkdir)((0, import_node_path31.dirname)(registryPath), { recursive: true });
       await atomicWrite(registryPath, serializeDeferredWorktrees(entries));
     },
     // Serialized read-modify-write under the repo-wide lock (#2846).
     update: async (mutate) => {
-      await (0, import_promises7.mkdir)((0, import_node_path32.dirname)(registryPath), { recursive: true });
+      await (0, import_promises7.mkdir)((0, import_node_path31.dirname)(registryPath), { recursive: true });
       const deadline = Date.now() + opts.maxWaitMs;
       for (; ; ) {
         const guard = await acquireLock(lockPath, opts, deadline);
@@ -25725,7 +25962,7 @@ async function applyGcPlan(plan, remote, opts = {}) {
   );
   const repoRoot2 = (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim() || process.cwd();
   const worktreeGitRoot = await currentRepoWorktreeGitRoot(repoRoot2);
-  const primaryRepoRoot = worktreeGitRoot ? (0, import_node_path33.dirname)((0, import_node_path33.dirname)(worktreeGitRoot)) : repoRoot2;
+  const primaryRepoRoot = worktreeGitRoot ? (0, import_node_path32.dirname)((0, import_node_path32.dirname)(worktreeGitRoot)) : repoRoot2;
   const gcActor = describeActor({ env: process.env, surface: detectSurface(process.env), cwd: process.cwd() });
   const owners = readWorktreeOwners(primaryRepoRoot);
   const removalNow = Date.now();
@@ -25870,8 +26107,8 @@ async function composeOverrideBodyFile(prNumber, repoArgs, gh) {
     const commits = JSON.parse(raw).commits ?? [];
     const body = squashBodyWithOverride(commits.map((c) => ({ headline: c.messageHeadline ?? "", body: c.messageBody ?? "" })), process.cwd());
     if (!body) return void 0;
-    const dir = (0, import_node_fs33.mkdtempSync)((0, import_node_path33.join)((0, import_node_os12.tmpdir)(), "mmi-squash-body-"));
-    const path2 = (0, import_node_path33.join)(dir, "body.txt");
+    const dir = (0, import_node_fs33.mkdtempSync)((0, import_node_path32.join)((0, import_node_os12.tmpdir)(), "mmi-squash-body-"));
+    const path2 = (0, import_node_path32.join)(dir, "body.txt");
     (0, import_node_fs33.writeFileSync)(path2, `${body}
 `, "utf8");
     return { path: path2, cleanup: () => {
@@ -26391,7 +26628,7 @@ async function checkDocsIndexAtHead(opts, deps) {
 // src/worktree-lifecycle-commands.ts
 var import_node_fs34 = require("node:fs");
 var import_promises9 = require("node:fs/promises");
-var import_node_path34 = require("node:path");
+var import_node_path33 = require("node:path");
 var GH_TIMEOUT_MS = 2e4;
 var DEFAULT_BASE = "origin/development";
 var DEFAULT_REMOTE = "origin";
@@ -26537,7 +26774,7 @@ function classifyStaleLeaks(input) {
 var defaultOrphanDirScanDeps = {
   listDirs: (root) => {
     try {
-      return (0, import_node_fs34.readdirSync)(root, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => (0, import_node_path34.join)(root, e.name));
+      return (0, import_node_fs34.readdirSync)(root, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => (0, import_node_path33.join)(root, e.name));
     } catch {
       return [];
     }
@@ -26690,13 +26927,13 @@ function registerWorktreeCommands(program3) {
       const detached = headBorn && !symbolicBranch;
       const branch = symbolicBranch || (detached ? "HEAD" : "");
       if (!wtPath || !branch) return fail("worktree land: not inside a git worktree");
-      const gitFile = (0, import_node_path34.join)(wtPath, ".git");
+      const gitFile = (0, import_node_path33.join)(wtPath, ".git");
       const isLinked = (0, import_node_fs34.existsSync)(gitFile) && (0, import_node_fs34.statSync)(gitFile).isFile();
       if (apply && !isLinked) {
         return fail("worktree land: run from inside the linked worktree you want to land (this is the primary checkout)");
       }
       const commonDir = (await execFileP2("git", ["rev-parse", "--git-common-dir"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
-      const primaryCheckout = commonDir ? (0, import_node_path34.dirname)(commonDir) : wtPath;
+      const primaryCheckout = commonDir ? (0, import_node_path33.dirname)(commonDir) : wtPath;
       const localBranchNames = await execFileP2("git", ["-C", primaryCheckout, "for-each-ref", "--format=%(refname:short)", "refs/heads"], { timeout: GIT_TIMEOUT_MS }).then(({ stdout }) => new Set((stdout || "").split("\n").map((l) => l.trim()).filter(Boolean))).catch(() => void 0);
       const orphan = classifyOrphanedWorktree({
         branch,
@@ -26907,7 +27144,7 @@ async function gatherWorktreeContext() {
     if (s) stages.push({ path: wt.path, port: s.port });
   }
   const worktreeGitRoot = await currentRepoWorktreeGitRoot(repoRoot2);
-  const primaryRepoRoot = worktreeGitRoot ? (0, import_node_path34.dirname)((0, import_node_path34.dirname)(worktreeGitRoot)) : repoRoot2;
+  const primaryRepoRoot = worktreeGitRoot ? (0, import_node_path33.dirname)((0, import_node_path33.dirname)(worktreeGitRoot)) : repoRoot2;
   const wtRoot = siblingMmiWorktreesRoot(primaryRepoRoot);
   let orphanDirs = [];
   if ((0, import_node_fs34.existsSync)(wtRoot)) {
@@ -27592,7 +27829,7 @@ ${lines}`, {
 
 // src/train-commands.ts
 var import_node_fs36 = require("node:fs");
-var import_node_path35 = require("node:path");
+var import_node_path34 = require("node:path");
 
 // src/train-status.ts
 function buildTrainStatusReport(input) {
@@ -27632,7 +27869,7 @@ function formatTrainStatus(r) {
 // src/train-commands.ts
 function readRepoVersion() {
   try {
-    return JSON.parse((0, import_node_fs36.readFileSync)((0, import_node_path35.join)(process.cwd(), ".claude-plugin", "plugin.json"), "utf8")).version || void 0;
+    return JSON.parse((0, import_node_fs36.readFileSync)((0, import_node_path34.join)(process.cwd(), ".claude-plugin", "plugin.json"), "utf8")).version || void 0;
   } catch {
     return void 0;
   }
@@ -27780,7 +28017,7 @@ function registerDeployCommands(program3) {
 // src/discovery-commands.ts
 var import_node_fs37 = require("node:fs");
 var import_node_os13 = require("node:os");
-var import_node_path36 = require("node:path");
+var import_node_path35 = require("node:path");
 var GC_GH_TIMEOUT_MS3 = 2e4;
 async function collectStatus() {
   const repo = await resolveRepo();
@@ -27866,6 +28103,11 @@ async function recommendNext(repo, deps) {
   const top = sorted[0];
   return { number: top.number, title: top.title, url: top.url, priority: top.priority, repo: top.repository };
 }
+function requiredEstateCommandsPresent(commandNames) {
+  const required = ["repo-index"];
+  const present = new Set(commandNames);
+  return required.filter((name) => !present.has(name));
+}
 function onboardPluginGate(deps) {
   const { registered, declared, ref } = readKnownMarketplace(deps.readKnown(), MMI_MARKETPLACE_NAME);
   if (!registered) {
@@ -27883,8 +28125,13 @@ function onboardPluginGate(deps) {
   if (catalog && !catalog.agrees) gaps.push(`the catalog is ${catalog.unpinned ? "unpinned" : `pinned to ${catalog.ref}`} \u2014 ${CATALOG_REF_PIN_STEPS}`);
   return gaps.length === 0 ? { ok: true, detail: `auto-update on, catalog pinned to ${catalog?.ref}` } : { ok: false, detail: gaps.join("; ") };
 }
-async function collectOnboardStatus() {
+async function collectOnboardStatus(opts = {}) {
   const cfg = await loadConfig();
+  const missingEstate = requiredEstateCommandsPresent(opts.commandNames ?? []);
+  const estateCli = missingEstate.length === 0 ? { ok: true, detail: "estate commands present (repo-index)" } : {
+    ok: false,
+    detail: `global CLI missing ${missingEstate.join(", ")} \u2014 run mmi-cli doctor to heal`
+  };
   let track = "unknown";
   try {
     const revParse2 = (await execFileP2("git", ["rev-parse", "--abbrev-ref", "HEAD"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
@@ -27938,7 +28185,9 @@ async function collectOnboardStatus() {
     }
   }
   let nextCommand = "mmi-cli doctor";
-  if (!cfg.sagaApiUrl) {
+  if (!estateCli.ok) {
+    nextCommand = "mmi-cli doctor \u2014 heal global CLI (missing repo-index)";
+  } else if (!cfg.sagaApiUrl) {
     nextCommand = "mmi-cli doctor \u2014 fix Hub API URL configuration first";
   } else if (!registry2.ok) {
     nextCommand = "mmi-cli org project set <owner/repo>";
@@ -27958,10 +28207,10 @@ async function collectOnboardStatus() {
   }
   const home = (0, import_node_os13.homedir)();
   const plugin = onboardPluginGate({
-    readKnown: () => readFileSyncSafe((0, import_node_path36.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs37.readFileSync),
-    readSettings: () => readFileSyncSafe((0, import_node_path36.join)(home, ".claude", "settings.json"), import_node_fs37.readFileSync)
+    readKnown: () => readFileSyncSafe((0, import_node_path35.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs37.readFileSync),
+    readSettings: () => readFileSyncSafe((0, import_node_path35.join)(home, ".claude", "settings.json"), import_node_fs37.readFileSync)
   });
-  return { track, board, registry: registry2, secrets, plugin, nextCommand };
+  return { track, board, registry: registry2, secrets, plugin, estateCli, nextCommand };
 }
 function registerDiscoveryCommands(program3) {
   program3.command("status").description("unified repo snapshot: branch, worktrees, open PRs (yours), claimed board items, stage state").option("--json", "machine-readable output").action(async (o) => {
@@ -27998,7 +28247,8 @@ function registerDiscoveryCommands(program3) {
   });
   program3.command("onboard").description("report repo track/board/secrets/registry readiness and the concrete next command").option("--json", "machine-readable output").action(async (o) => {
     try {
-      const report = await collectOnboardStatus();
+      const commandNames = program3.commands.map((c) => c.name());
+      const report = await collectOnboardStatus({ commandNames });
       if (o.json) {
         console.log(JSON.stringify(report, null, 2));
       } else {
@@ -28007,6 +28257,7 @@ function registerDiscoveryCommands(program3) {
         console.log(`Registry: ${report.registry.ok ? "\u2713" : "\u2717"} ${report.registry.detail}`);
         console.log(`Secrets: ${report.secrets.ok ? "\u2713" : "\u2717"} ${report.secrets.detail}`);
         console.log(`Plugin:   ${report.plugin.ok ? "\u2713" : "\u2717"} ${report.plugin.detail}`);
+        console.log(`Estate CLI: ${report.estateCli.ok ? "\u2713" : "\u2717"} ${report.estateCli.detail}`);
         console.log(`
 Next command: ${report.nextCommand}`);
       }
@@ -29220,6 +29471,63 @@ var surfaces_default = {
         "Some read, write, and web-fetch tool outputs are not rewriteable by the host.",
         "Provisioned skills and agents become discoverable only after a fresh session."
       ]
+    },
+    {
+      token: "jervcode",
+      displayName: "JervCode",
+      lifecycle: "active",
+      artifactIds: ["mmi-pi-plugin", "mmi-skills", "mmi-cli"],
+      plannedArtifactIds: [],
+      assembly: {
+        mode: "source-tree",
+        rootPath: ".",
+        sync: []
+      },
+      install: {
+        mechanism: "managed-config",
+        locator: "~/.pi/agent/settings.json"
+      },
+      upgrade: {
+        mechanism: "reinstall",
+        reload: "restart"
+      },
+      skills: {
+        delivery: "manifest",
+        sourceSurfaceId: "mmi-skills",
+        artifactId: "mmi-skills",
+        invocation: {
+          entry: "/mmi",
+          any: "/<skill>"
+        }
+      },
+      hooks: {
+        adapterPath: ".pi-plugin/package.json",
+        sourceSurfaceId: "mmi-hook-policy",
+        gates: [],
+        probe: "unsupported",
+        execution: "unsupported",
+        preToolUse: "unsupported",
+        postToolOutput: "unsupported",
+        finalOutput: "unsupported"
+      },
+      cli: {
+        delivery: "standalone",
+        artifactId: "mmi-cli"
+      },
+      ownership: {
+        trust: "host",
+        cache: "host",
+        repair: "mmi-cli"
+      },
+      certification: {
+        hostCommand: "jervcode",
+        versionArgs: ["--version"]
+      },
+      enforcementCeilings: [
+        "Pi reads the user package set from ~/.pi/agent/settings.json at launch: a live seat keeps the packages it started with, the mmi-cli heal refuses to edit the file while PI_SESSION_ID is set, and a new registration reaches JervCode only on the next launch.",
+        "No hook event is wired on this host \u2014 there is no PreToolUse deny gate, no vault-edit gate, and no secret-output redaction or detection; the hook policy artifact does not ship here.",
+        "The settings entry points into a version-pinned plugin cache clone; a release that mints a new clone leaves the entry stale until `mmi-cli doctor` re-points it, and Pi keeps loading the dead path silently until then."
+      ]
     }
   ],
   surfaces: [
@@ -29530,12 +29838,38 @@ var surfaces_default = {
       applicability: "master DM notifications only; chatops out by default",
       versionCoordinated: false,
       publishVisibility: "n/a"
+    },
+    {
+      id: "mmi-pi-plugin",
+      classification: "packaging",
+      kind: "plugin",
+      ownerPath: ".pi-plugin/package.json",
+      deliveryPath: ".pi-plugin/package.json",
+      delivery: "release",
+      applicability: "JervCode (branded launcher of the pi coding agent). A generated pi package wrapper whose `pi` block references the canonical skills tree by relative path inside the shipped clone \u2014 content is never copied. mmi-cli registers the wrapper directory as a local-path entry in the `packages` array of ~/.pi/agent/settings.json.",
+      versionCoordinated: true,
+      surfaceToken: "jervcode",
+      versionPaths: [
+        { path: ".pi-plugin/package.json", pointer: "version" }
+      ],
+      artifactIdentity: {
+        kind: "sha256-tree",
+        paths: [".pi-plugin/package.json", "skills"]
+      },
+      verify: [
+        {
+          command: "node",
+          args: ["scripts/check-jervcode-consumer.mjs"],
+          expected: "JervCode consumer fitness: clean ({version})"
+        }
+      ],
+      publishVisibility: "public"
     }
   ]
 };
 
 // src/surface-doctor.ts
-var TOKENS = /* @__PURE__ */ new Set(["claude", "codex", "kimi", "cursor", "kilo"]);
+var TOKENS = /* @__PURE__ */ new Set(["claude", "codex", "kimi", "cursor", "kilo", "jervcode"]);
 function isActiveToken(value) {
   return TOKENS.has(value);
 }
@@ -30056,7 +30390,7 @@ async function runDoctorClean(opts, io, deps) {
     if (!opts.json) io.log(`\u21BB ${line}`);
   };
   const healStep = (message) => {
-    if (!opts.json) io.log(`${VERBOSE_INDENT}${message.trim()}`);
+    if (!opts.json && opts.verbose) io.log(`${VERBOSE_INDENT}${message.trim()}`);
   };
   const releasedNote = deps.releasedVersionNote?.();
   let pluginHealed = false;
@@ -30091,30 +30425,63 @@ async function runDoctorClean(opts, io, deps) {
     }
   }
   async function runCliRow() {
+    const missing = deps.missingCliCommands?.() ?? [];
     const cliInput = { currentVersion: deps.currentCliVersion(), releasedVersion: released };
     const cliReport = buildVersionLagReport(cliInput);
-    if (!(applyEnv && deps.updateCli && versionAutoUpdateAction(cliReport) === "npm")) {
+    const capabilityGap = missing.length > 0 && Boolean(cliReport.releasedVersion);
+    const shouldUpdate = Boolean(
+      applyEnv && deps.updateCli && (versionAutoUpdateAction(cliReport) === "npm" || capabilityGap)
+    );
+    if (!shouldUpdate) {
       const cli = checkCliVersion(cliInput, releasedNote);
-      if (cli) emitNow(cli);
+      if (cli) {
+        if (missing.length) {
+          emitNow({
+            ...cli,
+            ok: false,
+            detail: cli.ok ? `missing commands: ${missing.join(", ")}` : `${cli.detail ?? ""}`.trim() || `missing commands: ${missing.join(", ")}`,
+            fix: `run \`mmi-cli doctor\` to heal the global CLI (missing: ${missing.join(", ")}), or \`${cliUpdateCommand(cliReport.releasedVersion)}\``,
+            verbose: [...cli.verbose ?? [], `missing commands: ${missing.join(", ")}`]
+          });
+        } else {
+          emitNow(cli);
+        }
+      } else if (missing.length) {
+        emitNow({
+          id: "cli-version",
+          ok: false,
+          label: "mmi-cli",
+          detail: `missing commands: ${missing.join(", ")}`,
+          fix: `run \`mmi-cli doctor\` to heal the global CLI, or \`${cliUpdateCommand(cliReport.releasedVersion)}\``,
+          verbose: [`missing commands: ${missing.join(", ")}`]
+        });
+      }
       return;
     }
-    healIntent(`mmi-cli \u2014 self-updating ${cliReport.currentVersion} \u2192 ${cliReport.releasedVersion} via npm install -g`);
-    const heal = await deps.updateCli(cliReport.releasedVersion, healStep);
-    const healEvidence = [`running:  ${cliReport.currentVersion}`, `published: ${cliReport.releasedVersion}`, `heal: ${heal.detail}`];
+    const target = cliReport.releasedVersion;
+    const intent = capabilityGap && cliReport.ok ? `mmi-cli \u2014 self-updating to ${target} via npm install -g (missing commands: ${missing.join(", ")})` : `mmi-cli \u2014 self-updating ${cliReport.currentVersion} \u2192 ${target} via npm install -g`;
+    healIntent(intent);
+    const heal = await deps.updateCli(target, healStep);
+    const healEvidence = [
+      `running:  ${cliReport.currentVersion}`,
+      `published: ${target ?? "(unknown)"}`,
+      `heal: ${heal.detail}`,
+      ...missing.length ? [`missing commands before heal: ${missing.join(", ")}`] : []
+    ];
     emitNow(heal.ok ? {
       id: "cli-version",
       ok: true,
       label: "mmi-cli",
-      detail: `${cliReport.currentVersion} \u2192 ${cliReport.releasedVersion} \u2014 self-updated via npm install -g; the next mmi-cli invocation runs the new version`,
+      detail: capabilityGap && cliReport.ok ? `${cliReport.currentVersion} \u2192 ${target} \u2014 self-updated via npm install -g (was missing: ${missing.join(", ")}); the next mmi-cli invocation runs the new version` : `${cliReport.currentVersion} \u2192 ${target} \u2014 self-updated via npm install -g; the next mmi-cli invocation runs the new version`,
       verbose: healEvidence
     } : {
       id: "cli-version",
       ok: false,
       label: "mmi-cli",
-      detail: `${cliReport.currentVersion} \u2192 ${cliReport.releasedVersion}`,
+      detail: capabilityGap && cliReport.ok ? `missing commands: ${missing.join(", ")}` : `${cliReport.currentVersion} \u2192 ${target}`,
       // #3489: same split as the plugin heal above — a lock-contention skip is not this run's gap.
       ...heal.skipped ? { reportOnly: true } : {},
-      fix: heal.skipped ? `${heal.detail} \u2014 another doctor on this machine is updating it now; re-run once it finishes` : `self-update failed (${heal.detail}) \u2014 run \`${cliUpdateCommand(cliReport.releasedVersion)}\``,
+      fix: heal.skipped ? `${heal.detail} \u2014 another doctor on this machine is updating it now; re-run once it finishes` : `self-update failed (${heal.detail}) \u2014 run \`${cliUpdateCommand(target)}\``,
       verbose: healEvidence
     });
   }
@@ -30177,8 +30544,10 @@ async function runDoctorClean(opts, io, deps) {
   }
   async function runDocsIndexRow() {
     let probe;
+    let root;
     try {
-      probe = deps.docsIndexState(await deps.repoRoot());
+      root = await deps.repoRoot();
+      probe = deps.docsIndexState(root);
     } catch (e) {
       const message = e instanceof Error ? e.message : String(e);
       emitNow({
@@ -30194,10 +30563,44 @@ async function runDoctorClean(opts, io, deps) {
       });
       return;
     }
+    let healedWrite = false;
+    if (applyRepo && probe?.drift && deps.healDocsIndex) {
+      healIntent("docs index \u2014 regenerating docs/index.md");
+      try {
+        probe = deps.healDocsIndex(root);
+        healedWrite = !probe.drift;
+      } catch (e) {
+        const message = e instanceof Error ? e.message : String(e);
+        emitNow({
+          ok: false,
+          id: "docs-index",
+          label: "docs index",
+          detail: `heal failed \u2014 ${message}`,
+          fix: "run `mmi-cli docs index --write` and commit docs/index.md",
+          verbose: [`healDocsIndex threw: ${message}`]
+        });
+        return;
+      }
+    }
     const docs2 = checkDocsIndex(probe);
-    if (docs2) emitNow(docs2);
+    if (!docs2) return;
+    if (healedWrite) {
+      emitNow({
+        ...docs2,
+        detail: "rewrote docs/index.md (working-tree heal \u2014 commit still needed)"
+      });
+      restartPending = true;
+      return;
+    }
+    emitNow(docs2);
   }
   async function runRepoIndexRow() {
+    const missing = deps.missingCliCommands?.() ?? [];
+    if (missing.includes("repo-index")) {
+      const row2 = checkRepoIndexCloud({ kind: "command-absent" });
+      if (row2) emitNow(row2);
+      return;
+    }
     if (lane.preflight && !opts.self && !lane.full) {
       emitNow({
         ok: true,
@@ -30227,8 +30630,176 @@ async function runDoctorClean(opts, io, deps) {
     const row = checkRepoIndexCloud(probe);
     if (row) emitNow(row);
   }
+  async function runBoardDoctorRow() {
+    if (!deps.boardDoctorFix) return;
+    try {
+      const result = await deps.boardDoctorFix({ fix: applyRepo });
+      if (!result) {
+        emitNow({
+          ok: true,
+          warn: true,
+          reportOnly: true,
+          id: "board-doctor",
+          label: "board doctor",
+          detail: "skipped",
+          verbose: ["boardDoctorFix returned undefined"]
+        });
+        return;
+      }
+      if (result.timedOut) {
+        emitNow({
+          ok: false,
+          warn: true,
+          reportOnly: true,
+          id: "board-doctor",
+          label: "board doctor",
+          detail: "timed out",
+          fix: "run `mmi-cli board doctor --fix`",
+          verbose: [`scanned before timeout: ${result.scanned}`, `findings: ${result.findings}`]
+        });
+        return;
+      }
+      const allFixed = applyRepo && result.findings > 0 && result.failed === 0 && result.fixed >= result.findings;
+      const ok = result.findings === 0 || Boolean(allFixed);
+      emitNow(ok ? {
+        ok: true,
+        id: "board-doctor",
+        label: "board doctor",
+        detail: `scanned ${result.scanned}; fixed ${result.fixed}`,
+        verbose: [`findings: ${result.findings}`, `fixed: ${result.fixed}`, `failed: ${result.failed}`]
+      } : {
+        ok: false,
+        // Gate when fix was attempted and mechanical findings remain; detect-only stays visible but
+        // report-only would hide a red that `board doctor --fix` clears — prefer gate after a failed fix.
+        reportOnly: !applyRepo,
+        id: "board-doctor",
+        label: "board doctor",
+        detail: `scanned ${result.scanned}; ${result.findings} findings; fixed ${result.fixed}; failed ${result.failed}`,
+        fix: "run `mmi-cli board doctor --fix`",
+        verbose: [`findings: ${result.findings}`, `fixed: ${result.fixed}`, `failed: ${result.failed}`]
+      });
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      emitNow({
+        ok: true,
+        warn: true,
+        reportOnly: true,
+        id: "board-doctor",
+        label: "board doctor",
+        detail: `skipped \u2014 ${message}`,
+        verbose: [`boardDoctorFix threw: ${message}`]
+      });
+    }
+  }
+  async function runSchedulesDriftRow() {
+    if (!deps.schedulesDriftState) return;
+    try {
+      const state = await deps.schedulesDriftState();
+      if (!state) {
+        emitNow({
+          ok: true,
+          warn: true,
+          reportOnly: true,
+          id: "schedules-drift",
+          label: "schedules drift",
+          detail: "skipped",
+          verbose: ["schedulesDriftState returned undefined"]
+        });
+        return;
+      }
+      if (state.timedOut) {
+        emitNow({
+          ok: false,
+          warn: true,
+          reportOnly: true,
+          id: "schedules-drift",
+          label: "schedules drift",
+          detail: "timed out",
+          fix: "run `mmi-cli org schedules` / `org schedules register`",
+          verbose: ["schedulesDriftState timed out"]
+        });
+        return;
+      }
+      if (state.incomplete.length) {
+        emitNow({
+          ok: true,
+          warn: true,
+          reportOnly: true,
+          id: "schedules-drift",
+          label: "schedules drift",
+          detail: `incomplete \u2014 ${state.incomplete.join("; ")}`,
+          fix: "run `mmi-cli org schedules` / `org schedules register`",
+          verbose: state.incomplete
+        });
+        return;
+      }
+      if (state.driftLines.length === 0) {
+        emitNow({
+          ok: true,
+          reportOnly: true,
+          id: "schedules-drift",
+          label: "schedules drift",
+          detail: "no drift",
+          verbose: ["no drift lines"]
+        });
+        return;
+      }
+      emitNow({
+        ok: false,
+        reportOnly: true,
+        id: "schedules-drift",
+        label: "schedules drift",
+        detail: `${state.driftLines.length} drift line(s)`,
+        fix: "run `mmi-cli org schedules` / `org schedules register`",
+        verbose: state.driftLines
+      });
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      emitNow({
+        ok: true,
+        warn: true,
+        reportOnly: true,
+        id: "schedules-drift",
+        label: "schedules drift",
+        detail: `skipped \u2014 ${message}`,
+        verbose: [`schedulesDriftState threw: ${message}`]
+      });
+    }
+  }
   async function runHousekeeperRows() {
     const repoRoot2 = await deps.repoRoot();
+    if (applyRepo && deps.sweepDeferred) {
+      try {
+        const sweep = await deps.sweepDeferred();
+        const detailParts = [];
+        if (sweep.removed.length) detailParts.push(`removed ${sweep.removed.length}`);
+        if (sweep.stillQueued) detailParts.push(`${sweep.stillQueued} still queued`);
+        if (sweep.skipped) detailParts.push(`${sweep.skipped} skipped`);
+        emitNow({
+          id: "deferred-worktrees",
+          ok: true,
+          label: "deferred worktrees",
+          detail: detailParts.length ? detailParts.join("; ") : "nothing queued",
+          verbose: [
+            ...sweep.removed.map((p) => `removed: ${p}`),
+            `stillQueued: ${sweep.stillQueued}`,
+            `skipped: ${sweep.skipped}`
+          ]
+        });
+        if (sweep.removed.length) restartPending = true;
+      } catch (e) {
+        const message = e instanceof Error ? e.message : String(e);
+        emitNow({
+          id: "deferred-worktrees",
+          ok: true,
+          warn: true,
+          reportOnly: true,
+          label: "deferred worktrees",
+          detail: `sweep failed (fail-soft) \u2014 ${message}`,
+          verbose: [`sweepDeferred threw: ${message}`]
+        });
+      }
+    }
     try {
       const plan = await deps.gcPlan("origin", 200);
       if (applyRepo) {
@@ -30285,9 +30856,7 @@ async function runDoctorClean(opts, io, deps) {
       emitNow(scratch.plan.safeAuto.length === 0 ? { id: "scratch", ok: true, label: "scratch", verbose: scratchEvidence } : { id: "scratch", ok: false, label: "scratch", detail: `${scratch.plan.safeAuto.length} aged item(s)`, fix: "run `mmi-cli doctor` (without --no-repo-writes)", verbose: scratchEvidence });
     }
   }
-  const table = [
-    // Heals first: the slowest work starts at second zero, and a stale mmi-cli is the binary every row
-    // below is being measured with (#3954).
+  const prefix = [
     { id: "plugin", when: true, run: runPluginRow },
     { id: "cli-version", when: true, run: runCliRow },
     { id: "github-auth", when: true, run: runGithubAuthRow },
@@ -30296,18 +30865,22 @@ async function runDoctorClean(opts, io, deps) {
     { id: "gitignore-block", when: isOrgRepo, run: runGitignoreRow },
     { id: "plugin-cache", when: true, run: runPluginCacheRow },
     { id: "sessionstart-payload", when: true, run: runSessionPayloadRow },
-    { id: "marketplace", when: true, run: runMarketplaceRows },
-    // A `docs/` tree walk plus one batched `git check-ignore` — cheap next to the two rows below it, but a
-    // disk walk and a subprocess all the same, so full lane only (#4091).
+    { id: "marketplace", when: true, run: runMarketplaceRows }
+  ];
+  for (const entry of prefix) if (entry.when) await entry.run();
+  const parallel = [
     { id: "docs-index", when: isOrgRepo && lane.full, run: runDocsIndexRow },
     // Hub cloud probe (short timeout). Full lane + `--self`; `--preflight` may emit command-absent only (#4156).
     { id: "repo-index", when: isOrgRepo && (lane.full || Boolean(opts.self) || lane.preflight), run: runRepoIndexRow },
-    // The two most expensive things in this file — a real `git fetch` plus train-branch fast-forward,
-    // and a `gh`-backed gc sweep with a 20s timeout — so org repos on the full lane only (#3485).
+    { id: "board-doctor", when: isOrgRepo && lane.full, run: runBoardDoctorRow },
+    { id: "schedules-drift", when: isOrgRepo && lane.full, run: runSchedulesDriftRow }
+  ];
+  await Promise.all(parallel.filter((entry) => entry.when).map((entry) => entry.run()));
+  const suffix = [
     { id: "train-branches", when: isOrgRepo && lane.full, run: runTrainSyncRow },
     { id: "housekeeper", when: isOrgRepo && lane.full, run: runHousekeeperRows }
   ];
-  for (const entry of table) if (entry.when) await entry.run();
+  for (const entry of suffix) if (entry.when) await entry.run();
   const exitCode = doctorReportExitCode(checks);
   if (opts.json) {
     const payload = opts.verbose ? checks : checks.map(({ verbose: _evidence, ...check }) => check);
@@ -30360,17 +30933,17 @@ function parseOriginRepo(remoteUrl) {
 }
 function ghHostsConfigPath(env, platform2) {
   const sep3 = platform2 === "win32" ? "\\" : "/";
-  const join34 = (...parts) => parts.join(sep3);
+  const join33 = (...parts) => parts.join(sep3);
   const explicit = env.GH_CONFIG_DIR?.trim();
-  if (explicit) return join34(explicit, "hosts.yml");
+  if (explicit) return join33(explicit, "hosts.yml");
   if (platform2 === "win32") {
     const appData = (env.AppData ?? env.APPDATA)?.trim();
-    return appData ? join34(appData, "GitHub CLI", "hosts.yml") : void 0;
+    return appData ? join33(appData, "GitHub CLI", "hosts.yml") : void 0;
   }
   const xdg = env.XDG_CONFIG_HOME?.trim();
-  if (xdg) return join34(xdg, "gh", "hosts.yml");
+  if (xdg) return join33(xdg, "gh", "hosts.yml");
   const home = env.HOME?.trim();
-  return home ? join34(home, ".config", "gh", "hosts.yml") : void 0;
+  return home ? join33(home, ".config", "gh", "hosts.yml") : void 0;
 }
 function parseGhHostsAccounts(yaml, host = "github.com") {
   let hostIndent = null;
@@ -30422,7 +30995,7 @@ function ghAccountCaveat(announcedLogin, accounts) {
 // src/doctor-io.ts
 var import_node_fs38 = require("node:fs");
 var import_node_os14 = require("node:os");
-var import_node_path37 = require("node:path");
+var import_node_path36 = require("node:path");
 var import_node_child_process17 = require("node:child_process");
 var import_node_util8 = require("node:util");
 var execFileP6 = (0, import_node_util8.promisify)(import_node_child_process17.execFile);
@@ -30430,7 +31003,7 @@ var MMI_PLUGIN_ID2 = "mmi@mutmutco";
 function installedClaudePluginVersion() {
   try {
     const file = JSON.parse(
-      (0, import_node_fs38.readFileSync)((0, import_node_path37.join)((0, import_node_os14.homedir)(), ".claude", "plugins", "installed_plugins.json"), "utf8")
+      (0, import_node_fs38.readFileSync)((0, import_node_path36.join)((0, import_node_os14.homedir)(), ".claude", "plugins", "installed_plugins.json"), "utf8")
     );
     const versions = (file.plugins?.[MMI_PLUGIN_ID2] ?? []).map((r) => r.version).filter((v) => Boolean(v));
     if (versions.length === 0) return void 0;
@@ -30451,17 +31024,22 @@ function installedSurfacePluginVersion(surface) {
   const token = surfaceToken(surface);
   if (token === "kilo") {
     try {
-      const stamp = (0, import_node_fs38.readFileSync)((0, import_node_path37.join)((0, import_node_os14.homedir)(), ".kilo", ".mmi-kilo-version"), "utf8").trim();
+      const stamp = (0, import_node_fs38.readFileSync)((0, import_node_path36.join)((0, import_node_os14.homedir)(), ".kilo", ".mmi-kilo-version"), "utf8").trim();
       return stamp || void 0;
     } catch {
       return void 0;
     }
   }
   if (token === "cursor") {
-    return manifestVersion((0, import_node_path37.join)(cursorLocalPluginRoot(), ".cursor-plugin", "plugin.json"));
+    return manifestVersion((0, import_node_path36.join)(cursorLocalPluginRoot(), ".cursor-plugin", "plugin.json"));
+  }
+  if (token === "jervcode") {
+    const entry = mmiPiWrapperEntry();
+    if (!entry) return void 0;
+    return manifestVersion((0, import_node_path36.join)(decodeURIComponent(entry.replace(/^file:\/\/\/?/, "")), "package.json"));
   }
   if (token === "kimi") {
-    return manifestVersion((0, import_node_path37.join)(surfaceConfigRoot(surface), "plugins", "managed", "mmi", ".kimi-plugin", "plugin.json"));
+    return manifestVersion((0, import_node_path36.join)(surfaceConfigRoot(surface), "plugins", "managed", "mmi", ".kimi-plugin", "plugin.json"));
   }
   if (token === "claude") return installedClaudePluginVersion();
   if (token !== "codex") return void 0;
@@ -30499,7 +31077,7 @@ function worktreeRootSync() {
 }
 var gitignorePath = () => {
   const root = worktreeRootSync();
-  return root === null ? null : (0, import_node_path37.join)(root, ".gitignore");
+  return root === null ? null : (0, import_node_path36.join)(root, ".gitignore");
 };
 function readGitignore() {
   const path2 = gitignorePath();
@@ -30538,7 +31116,7 @@ async function repoRoot() {
 }
 function hasRepoLocalWorktrees() {
   const root = worktreeRootSync();
-  return root !== null && (0, import_node_fs38.existsSync)((0, import_node_path37.join)(root, ".worktrees"));
+  return root !== null && (0, import_node_fs38.existsSync)((0, import_node_path36.join)(root, ".worktrees"));
 }
 
 // src/index.ts
@@ -30583,7 +31161,7 @@ function ghMultiAccountCaveat(announcedLogin) {
 var ENV_HEAL_LOCK_STALE_MS = 10 * 6e4;
 var ENV_HEAL_LOCK_MAX_WAIT_MS = 2 * 6e4;
 function envHealLockPath(home) {
-  return (0, import_node_path38.join)(home, ".claude", "plugins", ".mmi-env-heal.lock");
+  return (0, import_node_path37.join)(home, ".claude", "plugins", ".mmi-env-heal.lock");
 }
 async function withEnvHealLock(what, run) {
   try {
@@ -30709,14 +31287,14 @@ function mmiDoctorDeps(opts = {}) {
         const home = (0, import_node_os15.homedir)();
         const rows = marketplaceRows(
           MMI_MARKETPLACE_NAME,
-          readFileSyncSafe((0, import_node_path38.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs39.readFileSync),
-          readFileSyncSafe((0, import_node_path38.join)(home, ".claude", "settings.json"), import_node_fs39.readFileSync),
+          readFileSyncSafe((0, import_node_path37.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs39.readFileSync),
+          readFileSyncSafe((0, import_node_path37.join)(home, ".claude", "settings.json"), import_node_fs39.readFileSync),
           // #3974: this CLI heals these rows, so report mode names the doctor run rather than the hand
           // edit. Unconditional ? it is a fact about mmi-cli, not about the lane this run is on.
           true
         );
         const pending = readMarketplacePinPending(
-          (0, import_node_path38.join)(home, ".claude", "plugins", ".mmi-marketplace-pin-pending.json"),
+          (0, import_node_path37.join)(home, ".claude", "plugins", ".mmi-marketplace-pin-pending.json"),
           MMI_MARKETPLACE_NAME
         );
         if (!pending) return rows;
@@ -30742,9 +31320,9 @@ function mmiDoctorDeps(opts = {}) {
         if (detectSurface(process.env) === "codex") return void 0;
         const home = (0, import_node_os15.homedir)();
         const names = [MMI_MARKETPLACE_NAME];
-        const result = applyOrgMarketplacePins((0, import_node_path38.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), names);
+        const result = applyOrgMarketplacePins((0, import_node_path37.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), names);
         if (result?.wrote) {
-          writeMarketplacePinPending((0, import_node_path38.join)(home, ".claude", "plugins", ".mmi-marketplace-pin-pending.json"), names);
+          writeMarketplacePinPending((0, import_node_path37.join)(home, ".claude", "plugins", ".mmi-marketplace-pin-pending.json"), names);
         }
         return result;
       } catch {
@@ -30760,13 +31338,91 @@ function mmiDoctorDeps(opts = {}) {
     // adopted the generated routing index (MMG-Unlive: `docs/Archive/**` only, no index, no gate.yml) would
     // get a permanent ? demanding an artifact it never asked for.
     docsIndexState: (root) => {
-      if (!(0, import_node_fs39.existsSync)((0, import_node_path38.join)(root, DOCS_INDEX_PATH))) return void 0;
+      if (!(0, import_node_fs39.existsSync)((0, import_node_path37.join)(root, DOCS_INDEX_PATH))) return void 0;
+      const real = createDocsIndexDeps(root);
+      let docs2;
+      const listDocs = () => docs2 ??= real.listDocs();
+      const drift = docsIndex({ ...real, listDocs }, { check: true }).drift;
+      return { drift, docCount: listDocs().length };
+    },
+    // #4168: working-tree heal — write if drifted, then re-check. Commit remains the operator's step.
+    healDocsIndex: (root) => {
+      if (!(0, import_node_fs39.existsSync)((0, import_node_path37.join)(root, DOCS_INDEX_PATH))) return { drift: false, docCount: 0 };
       const real = createDocsIndexDeps(root);
       let docs2;
       const listDocs = () => docs2 ??= real.listDocs();
+      docsIndex({ ...real, listDocs }, { check: false });
       const drift = docsIndex({ ...real, listDocs }, { check: true }).drift;
       return { drift, docCount: listDocs().length };
     },
+    // #4169: mirror `worktree gc --apply` — sweep deferred removals before applyGcPlan.
+    sweepDeferred: async () => {
+      const deferredStore = await createDeferredWorktreeStore();
+      const removalContext = await currentWorktreeRemovalContext("doctor deferred sweep");
+      const result = await sweepDeferredWorktrees(
+        deferredStore,
+        // #2841: same `-c core.fsmonitor=false` guard as `worktree gc --apply` / sweep-deferred.
+        worktreeRemoveDeps(async (args) => (await execFileP2("git", ["-c", "core.fsmonitor=false", ...args], { timeout: GIT_TIMEOUT_MS })).stdout),
+        removalContext
+      );
+      return {
+        removed: result.removed,
+        stillQueued: result.stillDeferred.length,
+        skipped: result.skipped.length
+      };
+    },
+    // #4170: light board doctor with 15s ceiling. skipClaimLiveness keeps Phase 3 off.
+    boardDoctorFix: async ({ fix } = {}) => {
+      const BOARD_DOCTOR_TIMEOUT_MS = 15e3;
+      try {
+        const cfg = await loadConfigForRepo();
+        const work = boardDoctor({
+          config: cfg,
+          fix: Boolean(fix),
+          skipClaimLiveness: true
+        });
+        const raced = await Promise.race([
+          work.then((r) => ({ ...r, timedOut: false })),
+          new Promise((resolve5) => {
+            setTimeout(() => resolve5({ timedOut: true, scanned: 0, findings: 0, fixed: 0, failed: 0 }), BOARD_DOCTOR_TIMEOUT_MS);
+          })
+        ]);
+        if (raced.timedOut) return { scanned: 0, findings: 0, fixed: 0, failed: 0, timedOut: true };
+        return {
+          scanned: raced.scanned,
+          findings: raced.findings,
+          fixed: raced.fixed,
+          failed: raced.failed
+        };
+      } catch {
+        return void 0;
+      }
+    },
+    // #4171: schedules drift notebook — report-only, ~20s ceiling.
+    schedulesDriftState: async () => {
+      const SCHEDULES_DRIFT_TIMEOUT_MS = 2e4;
+      try {
+        const raced = await Promise.race([
+          fetchNotebook().then((nb) => ({
+            driftLines: nb.drift,
+            incomplete: nb.incomplete,
+            timedOut: false
+          })),
+          new Promise((resolve5) => {
+            setTimeout(() => resolve5({ driftLines: [], incomplete: [], timedOut: true }), SCHEDULES_DRIFT_TIMEOUT_MS);
+          })
+        ]);
+        return raced;
+      } catch {
+        return void 0;
+      }
+    },
+    // #4173: estate commands absent from the running Commander program (stale global CLI).
+    missingCliCommands: () => {
+      const required = ["repo-index"];
+      const names = new Set((opts.program?.commands ?? []).map((c) => c.name()));
+      return required.filter((n) => !names.has(n));
+    },
     // #4156: short-timeout Hub status for the current repo. Fail-soft ? never throws to doctor.
     repoIndexCloudState: async (root) => {
       const local = repoIndexStatus(root);
@@ -31025,7 +31681,7 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 var rules = program2.command("rules").description("org-managed .gitignore delivery");
 rules.command("gitignore").option("--write", "upsert the managed block into .gitignore (default: check only, non-zero exit on drift)").option("--json", "machine-readable output").description("verify (or --write) this repo's org-managed .gitignore block matches the SSOT").action((opts) => {
-  const path2 = (0, import_node_path38.join)(process.cwd(), ".gitignore");
+  const path2 = (0, import_node_path37.join)(process.cwd(), ".gitignore");
   const current = (0, import_node_fs39.existsSync)(path2) ? (0, import_node_fs39.readFileSync)(path2, "utf8") : null;
   const plan = planManagedGitignore(current);
   const drift = [...plan.added.map((l) => `+${l}`), ...plan.removed.map((l) => `-${l}`)].join(", ") || "block normalize";
@@ -31194,7 +31850,7 @@ gcCmd.option("--dry-run", "show what would be deleted (default)").option("--appl
   if (!Number.isFinite(limit) || limit < 1) return fail("worktree gc: --limit must be a positive integer");
   let root;
   if (o.root !== void 0) {
-    root = (0, import_node_path38.resolve)(o.root);
+    root = (0, import_node_path37.resolve)(o.root);
     if (!(0, import_node_fs39.existsSync)(root) || !(0, import_node_fs39.statSync)(root).isDirectory()) return fail(`worktree gc: --root ${o.root} is not a directory`);
     const gcRepoRoot = (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim() || process.cwd();
     if (isPathUnderDirectory(gcRepoRoot, root)) {
@@ -31310,7 +31966,7 @@ function acquireWorktreeSetupLock(worktreeRoot) {
     };
   };
   try {
-    (0, import_node_fs39.mkdirSync)((0, import_node_path38.dirname)(lockPath), { recursive: true });
+    (0, import_node_fs39.mkdirSync)((0, import_node_path37.dirname)(lockPath), { recursive: true });
     return take();
   } catch {
     try {
@@ -31622,7 +32278,7 @@ repoIndex.command("publish").description("publish this checkout's projection to
     return await failGraceful(e.message);
   }
 });
-repoIndex.command("search").description("search Hub cloud by default (lexical/hybrid/semantic); use --local for checkout-only").argument("<query>", "path fragment, symbol, or meaning phrase").option("--limit <n>", "max hits", "20").option("--json", "machine-readable hits").option("--local", "search only the local projection (rebuild if missing)").option("--cloud", "force Hub cloud search (default when not --local)").option("--semantic", "semantic mode (Titan cosine over path+symbols embeddings)").option("--lexical", "lexical-only mode (paths/symbols)").option("--repo <owner/name>", "limit cloud search to one repo").action(async (query, o) => {
+async function runRepoIndexSearchCommand(query, o, defaultMode) {
   try {
     const limit = Math.max(1, Math.min(100, Number(o.limit ?? 20) || 20));
     const useLocal = o.local === true && o.cloud !== true;
@@ -31645,7 +32301,7 @@ repoIndex.command("search").description("search Hub cloud by default (lexical/hy
       }
       return;
     }
-    const mode = o.semantic ? "semantic" : o.lexical ? "lexical" : "hybrid";
+    const mode = o.semantic ? "semantic" : o.lexical ? "lexical" : defaultMode;
     const cfg = await loadConfig();
     const res = await searchRepoIndexCloud(query, { mode, limit, repo: o.repo }, registryClientDeps(cfg));
     if (!res.ok) return await failGraceful(res.error);
@@ -31664,7 +32320,13 @@ repoIndex.command("search").description("search Hub cloud by default (lexical/hy
   } catch (e) {
     return await failGraceful(e.message);
   }
-});
+}
+var REPO_INDEX_SEARCH_WHEN = 'beats grep for cross-repo questions, "where does X happen", and unknown filenames; grep wins inside a known checkout';
+function repoIndexSearchOptions(cmd) {
+  return cmd.option("--limit <n>", "max hits", "20").option("--json", "machine-readable hits").option("--local", "search only the local projection (rebuild if missing)").option("--cloud", "force Hub cloud search (default when not --local)").option("--semantic", "semantic mode (Titan cosine over path+symbols embeddings)").option("--lexical", "lexical-only mode (paths/symbols)").option("--repo <owner/name>", "limit cloud search to one repo");
+}
+repoIndexSearchOptions(repoIndex.command("search").description(`search Hub cloud by default (lexical/hybrid/semantic); use --local for checkout-only \u2014 ${REPO_INDEX_SEARCH_WHEN}`).argument("<query>", "path fragment, symbol, or meaning phrase")).action(async (query, o) => runRepoIndexSearchCommand(query, o, "hybrid"));
+repoIndexSearchOptions(program2.command("find").description(`estate code search across every registered repo (repo-index search, semantic by default) \u2014 ${REPO_INDEX_SEARCH_WHEN}`).argument("<query>", "path fragment, symbol, or meaning phrase")).action(async (query, o) => runRepoIndexSearchCommand(query, o, "semantic"));
 repoIndex.command("status").description("show local and/or cloud repo-index status").option("--json", "machine-readable status").option("--cloud", "query Hub cloud status (estate or --repo)").option("--repo <owner/name>", "cloud status for one repo").action(async (o) => {
   try {
     if (o.cloud || o.repo) {
@@ -31716,11 +32378,10 @@ repoIndex.command("status").description("show local and/or cloud repo-index stat
     return await failGraceful(e.message);
   }
 });
-repoIndex.command("health").description("post-deploy health gate: status + golden lexical/semantic queries (Hub#4149)").option("--live", "hit Hub cloud (status + searches); omit for offline golden-shape check").option("--golden <path>", "golden queries JSON (default: cli/testdata/repo-index-golden-queries.json)").option("--json", "machine-readable findings").action(async (o) => {
+repoIndex.command("health").description("post-deploy health gate: status + golden lexical/semantic queries (Hub#4149)").option("--live", "hit Hub cloud (status + searches); omit for offline golden-shape check").option("--golden <path>", "golden queries JSON (default: the suite bundled with the CLI, so the gate runs from any repo)").option("--json", "machine-readable findings").action(async (o) => {
   try {
-    const root = await repoRoot();
-    const goldenPath = o.golden || defaultGoldenPath(root);
-    const golden = loadGoldenSuite(goldenPath);
+    const goldenPath = o.golden || "bundled repo-index-golden-queries.json";
+    const golden = o.golden ? loadGoldenSuite(o.golden) : defaultGoldenSuite();
     const result = o.live ? await runRepoIndexHealth({
       golden,
       live: {
@@ -32923,11 +33584,11 @@ pr.command("view <number>").description("read a PR as structured JSON (merged st
   }
 });
 async function listCiWorkflowPaths(cwd = process.cwd()) {
-  const wfDir = (0, import_node_path38.join)(cwd, ".github", "workflows");
+  const wfDir = (0, import_node_path37.join)(cwd, ".github", "workflows");
   if (!(0, import_node_fs39.existsSync)(wfDir)) return [];
   return (0, import_node_fs39.readdirSync)(wfDir).filter((name) => /\.(ya?ml)$/i.test(name)).filter((name) => {
     try {
-      return workflowReportsPrChecks((0, import_node_fs39.readFileSync)((0, import_node_path38.join)(wfDir, name), "utf8"));
+      return workflowReportsPrChecks((0, import_node_fs39.readFileSync)((0, import_node_path37.join)(wfDir, name), "utf8"));
     } catch {
       return true;
     }
@@ -32959,16 +33620,16 @@ function ciAuditDeps() {
     // gate re-seed step is skipped gracefully rather than failing mid-run.
     readSeedFile: (path2) => {
       if (!root) return null;
-      const fullPath = (0, import_node_path38.join)(root, path2);
+      const fullPath = (0, import_node_path37.join)(root, path2);
       return (0, import_node_fs39.existsSync)(fullPath) ? (0, import_node_fs39.readFileSync)(fullPath, "utf8") : null;
     }
   };
 }
 function hubRoot() {
-  const fromPkg = (0, import_node_path38.join)(__dirname, "..", "..");
+  const fromPkg = (0, import_node_path37.join)(__dirname, "..", "..");
   const marker = "skills/bootstrap/seeds/manifest.json";
-  if ((0, import_node_fs39.existsSync)((0, import_node_path38.join)(fromPkg, marker))) return fromPkg;
-  if ((0, import_node_fs39.existsSync)((0, import_node_path38.join)(process.cwd(), marker))) return process.cwd();
+  if ((0, import_node_fs39.existsSync)((0, import_node_path37.join)(fromPkg, marker))) return fromPkg;
+  if ((0, import_node_fs39.existsSync)((0, import_node_path37.join)(process.cwd(), marker))) return process.cwd();
   return null;
 }
 pr.command("ci-policy").description("report merge CI policy: wait-for-checks vs no-ci (for grind/build agents)").option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the current checkout)").action(async (o) => {
@@ -33801,7 +34462,7 @@ program2.command("doctor").description("heal CLI/plugin wiring and clean up repo
       verbose: opts.verbose
     },
     consoleIo,
-    mmiDoctorDeps()
+    mmiDoctorDeps({ program: program2 })
   );
 });
 program2.command("guard").description("detect a pruned/unresolved MMI plugin on disk").action(() => runGuard());
@@ -33815,7 +34476,7 @@ function directoryBytes(path2) {
     return 0;
   }
   for (const entry of entries) {
-    const child2 = (0, import_node_path38.join)(path2, entry.name);
+    const child2 = (0, import_node_path37.join)(path2, entry.name);
     if (entry.isDirectory()) total += directoryBytes(child2);
     else {
       try {
@@ -33845,7 +34506,7 @@ function pluginCacheFsDeps(configRoot, dirBytes) {
     dirBytes,
     listStagingDirs: (root) => (0, import_node_fs39.readdirSync)(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => {
       try {
-        return { name: d.name, mtimeMs: newestMtimeMs((0, import_node_path38.join)(root, d.name), listDirEntries, (p) => (0, import_node_fs39.statSync)(p).mtimeMs) };
+        return { name: d.name, mtimeMs: newestMtimeMs((0, import_node_path37.join)(root, d.name), listDirEntries, (p) => (0, import_node_fs39.statSync)(p).mtimeMs) };
       } catch {
         return { name: d.name, mtimeMs: Date.now() };
       }
@@ -33859,7 +34520,7 @@ function stagingApplyFsGuard(configRoot) {
   return {
     referencedPaths: () => readInstalledPluginRefs(configRoot),
     mtimeMs: (name) => {
-      const p = (0, import_node_path38.join)(stagingRoot, name);
+      const p = (0, import_node_path37.join)(stagingRoot, name);
       if (!(0, import_node_fs39.existsSync)(p)) return null;
       try {
         return newestMtimeMs(p, listDirEntries, (q) => (0, import_node_fs39.statSync)(q).mtimeMs);
@@ -33944,7 +34605,7 @@ program2.command("session-start").description("run the SessionStart verbs (whoam
     // #3485 item 7: the ONLY lane that throttles the npm read ? it runs on every session start, on a
     // blocking hook. Every interactive lane still reads live.
     doctor: async (io) => {
-      await runDoctorClean({ banner: true }, io, mmiDoctorDeps({ throttleReleasedRead: true }));
+      await runDoctorClean({ banner: true }, io, mmiDoctorDeps({ throttleReleasedRead: true, program: program2 }));
     }
   });
   await runSessionStart(parallel, sequential, bannerIo);