@mutmutco/cli 4.2.1 → 4.2.3

package/dist/main.cjs

@@ -3416,7 +3416,7 @@ var program = new Command();
 // src/index.ts
 var import_promises8 = require("node:fs/promises");
 var import_node_fs43 = require("node:fs");
-var import_node_child_process19 = require("node:child_process");
+var import_node_child_process20 = require("node:child_process");
 
 // src/cli-shared.ts
 var import_node_child_process3 = require("node:child_process");
@@ -4522,10 +4522,29 @@ function targetFlagValueFromArgv(flag, argv) {
   if (!next || next.startsWith("-")) return void 0;
   return next;
 }
+function survivingFlagArgs(argv, rejectedFlag, ownFlags) {
+  const out = [];
+  for (let i = 0; i < argv.length; i += 1) {
+    const token = argv[i];
+    if (!token.startsWith("--")) continue;
+    const [name, inlineValue] = token.includes("=") ? [token.slice(0, token.indexOf("=")), token.slice(token.indexOf("=") + 1)] : [token, void 0];
+    const values = [];
+    if (inlineValue === void 0) {
+      while (argv[i + 1] !== void 0 && !argv[i + 1].startsWith("-")) {
+        values.push(argv[i + 1]);
+        i += 1;
+      }
+    }
+    if (name === rejectedFlag || !ownFlags.includes(name)) continue;
+    out.push(inlineValue !== void 0 ? token : name, ...values);
+  }
+  return out;
+}
 function formatPositionalTarget(commandPath3, argName, opts = {}) {
   const concrete = opts.flag && opts.argv ? targetFlagValueFromArgv(opts.flag, opts.argv) : void 0;
-  if (concrete) return `mmi-cli ${commandPath3} ${concrete}`;
-  return `mmi-cli ${commandPath3} <${argName}>`;
+  const target = concrete ?? `<${argName}>`;
+  const kept = opts.flag && opts.argv && opts.ownFlags ? survivingFlagArgs(opts.argv, opts.flag, opts.ownFlags) : [];
+  return [`mmi-cli ${commandPath3}`, target, ...kept].join(" ");
 }
 var FLAG_SYNONYMS = /* @__PURE__ */ new Map([["--outcome", "--reason"]]);
 function synonymFlagFor(flag, ownFlags) {
@@ -4545,6 +4564,27 @@ var GUIDES = /* @__PURE__ */ new Map([
       expected: ["learning report", "oracle issue create", "oracle issue list"],
       did_you_mean: "learning report"
     }
+  ],
+  // #5821: `list` is the verb `oracle issue list` and `devops pr list` teach, so callers reach for
+  // `oracle board list` next. Distance ranks the OTHER houses' `list` leaves above the board's own
+  // reader, so the receipt pointed at `devops pr list` — a different house, for a board query.
+  [
+    "oracle board:list",
+    {
+      hint: "no `oracle board list` \u2014 the bounded board query is `oracle board read` (add `--json` for the machine-readable partition)",
+      expected: ["oracle board read"],
+      did_you_mean: "oracle board read"
+    }
+  ],
+  // #5823: `label` names a capability, not a command. The mutation door is `oracle issue edit`
+  // (`--add-label` / `--remove-label`); distance cannot bridge noun→verb, so name it here.
+  [
+    "oracle issue:label",
+    {
+      hint: "no `oracle issue label` \u2014 labels are edited through `oracle issue edit --add-label <name>` / `--remove-label <name>`",
+      expected: ["oracle issue edit"],
+      did_you_mean: "oracle issue edit"
+    }
   ]
 ]);
 function unknownCommandDomainGuide(parentPath, token) {
@@ -11762,10 +11802,10 @@ var rollout_plan_default = {
     note: "The v4.0.0 stamp happens at cut time (D6e #4463); until then the candidate is the origin/development head artifacts (built cli/dist + npm pack), identity proven by dist content hash (D6a)."
   },
   baseline: {
-    version: "4.2.1",
-    tag: "v4.2.1",
-    commit: "66e67b6905a1",
-    npm: "@mutmutco/cli@4.2.1"
+    version: "4.2.3",
+    tag: "v4.2.3",
+    commit: "a54078f2ac92",
+    npm: "@mutmutco/cli@4.2.3"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -11782,14 +11822,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.2.1"
+          v3Target: "v4.2.3"
         }
       ],
       rollbackTrigger: "Any red inside the post-contract soak window: `devops train gate` FAIL attributable to the v4 doors, Hub endpoint health probe failure, a pre-v4 client admitted instead of receiving actionable HTTP 426, or npm consumer install/doctor failure on the v4-only dist.",
       rollback: {
         independent: true,
-        mechanism: "npm dist-tag latest -> 4.2.1 and redeploy the Hub Lambda from tag v4.2.1 (66e67b6905a1); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.2.1 (@mutmutco/cli@4.2.1, tag commit 66e67b6905a1 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.2.3 and redeploy the Hub Lambda from tag v4.2.3 (a54078f2ac92); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.2.3 (@mutmutco/cli@4.2.3, tag commit a54078f2ac92 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -23508,8 +23548,11 @@ var defaultDeps = {
   },
   // Re-exec the SAME command line in the fresh CLI with inherited stdio (spawn, not execFile, so
   // output streams live) and hand its exit code back — the stale parent exits with it (#5762).
-  reexec: () => new Promise((resolve6) => {
-    const args = process.argv.slice(2);
+  // #5813: the caller supplies that command line. `process.argv` is NOT it — the house shim splices
+  // the house root out in place, so re-reading it here re-ran the removed flat alias (`release …`
+  // instead of `devops release …`) and the converged child refused with exit 2.
+  reexec: (argv) => new Promise((resolve6) => {
+    const args = [...argv];
     const child2 = isWin2 ? (0, import_node_child_process10.spawn)("cmd.exe", ["/c", "mmi-cli", ...args], { stdio: "inherit", windowsHide: true }) : (0, import_node_child_process10.spawn)("mmi-cli", args, { stdio: "inherit", windowsHide: true });
     child2.on("exit", (code) => resolve6(code ?? 1));
     child2.on("error", () => resolve6(1));
@@ -23531,7 +23574,7 @@ async function selfConvergeTrainCli(input) {
         error: `self-converge did not take effect: mmi-cli on PATH still resolves to ${installed ?? "unknown"}, expected >= ${input.releasedVersion}`
       };
     }
-    const reexecCode = await deps.reexec();
+    const reexecCode = await deps.reexec(input.argv);
     return { kind: "converged", reexecCode };
   } catch (e) {
     return { kind: "failed", error: e instanceof Error ? e.message : String(e) };
@@ -23988,6 +24031,11 @@ function renderSweep(r) {
 
 // src/hotfix-apply.ts
 var HOTFIX_RELEASE_WORKFLOWS = ["deploy.yml", "publish.yml"];
+function hotfixStatusWorkflows(deployModel) {
+  if (deployModel === "registry-publish") return ["publish.yml"];
+  if (deployModel === void 0 || deployModel === "hub-serverless" || deployModel === "tenant-container" || deployModel === "solo-container") return HOTFIX_RELEASE_WORKFLOWS;
+  return [];
+}
 var HOTFIX_RUN_FIND_ATTEMPTS = 10;
 var HOTFIX_RUN_FIND_DELAY_MS = 15e3;
 var HOTFIX_VERIFY_ATTEMPTS = 5;
@@ -24623,29 +24671,35 @@ async function runHotfixStatus(deps, versionInput) {
   const work = (async () => {
     const ctx = await buildTrainApplyContext(deps);
     await deps.run("git", ["fetch", "origin", "--tags"]);
+    let workflows = HOTFIX_RELEASE_WORKFLOWS;
+    let warnings = [];
+    try {
+      workflows = hotfixStatusWorkflows(await resolveHotfixDeployModel(deps, ctx));
+    } catch (e) {
+      warnings = [`deploy model unverified (${e.message ?? e}) \u2014 probed the default deploy.yml+publish.yml run list, so an unproven run may hold the verdict at unverified`];
+    }
     let tag;
     let version;
-    let warnings = [];
     if (versionInput) {
       ({ tag, version } = normalizeHotfixVersion(versionInput));
     } else {
       const latest = await deps.run("git", ["tag", "--list", "v[0-9]*.[0-9]*.[0-9]*", "--merged", "origin/main", "--sort=-v:refname"]).then((out) => out.split("\n").map((s) => s.trim()).find((t) => /^v\d+\.\d+\.\d+$/.test(t)));
       if (latest) {
-        const latestFacts = await gatherHotfixFacts(deps, ctx, latest, latest.slice(1));
+        const latestFacts = await gatherHotfixFacts(deps, ctx, latest, latest.slice(1), workflows);
         const latestDerived = deriveHotfixState(latestFacts);
         if (latestDerived.state !== "complete") {
           return { ...ctx, command: "hotfix-status", ...latestFacts, ...latestDerived, warnings };
         }
       }
-      const found = await findInFlightHotfixVersion(deps, ctx, latest);
-      warnings = supersededHotfixWarnings(found.superseded, latest);
+      const found = await findInFlightHotfixVersion(deps, ctx, latest, workflows);
+      warnings = [...warnings, ...supersededHotfixWarnings(found.superseded, latest)];
       if (found.inFlight) {
         ({ tag, version } = found.inFlight);
       } else {
         ({ tag, version } = await deriveHotfixVersion(deps));
       }
     }
-    const facts = await gatherHotfixFacts(deps, ctx, tag, version);
+    const facts = await gatherHotfixFacts(deps, ctx, tag, version, workflows);
     return { ...ctx, command: "hotfix-status", ...facts, ...deriveHotfixState(facts), warnings };
   })();
   let timer;
@@ -24664,7 +24718,7 @@ async function runHotfixStatus(deps, versionInput) {
     if (timer) clearTimeout(timer);
   }
 }
-async function gatherHotfixFacts(deps, ctx, tag, version) {
+async function gatherHotfixFacts(deps, ctx, tag, version, workflows = HOTFIX_RELEASE_WORKFLOWS) {
   const branchExists = Boolean(clean3(await deps.run("git", ["ls-remote", "origin", `refs/heads/${hotfixBranch(tag)}`])));
   const pr2 = await findHotfixPr(deps, ctx, tag);
   const remoteTag = clean3(await deps.run("git", ["ls-remote", "origin", `refs/tags/${tag}`]));
@@ -24673,7 +24727,7 @@ async function gatherHotfixFacts(deps, ctx, tag, version) {
   const releaseExists = await hotfixReleaseExists(deps, ctx, tag);
   const runs = [];
   if (releaseExists && tagSha) {
-    for (const workflow of HOTFIX_RELEASE_WORKFLOWS) {
+    for (const workflow of workflows) {
       try {
         const out = await deps.run("gh", [
           "run",
@@ -24729,7 +24783,7 @@ function supersededHotfixWarnings(superseded, latestMainTag) {
   if (superseded.length === 0) return [];
   return [`skipped superseded hotfix marker(s) ${superseded.join(", ")} \u2014 merged to main but never released and at/below the latest released tag ${latestMainTag ?? "(none)"}; later releases already absorbed them (#976). Not actionable \u2014 run mmi-cli devops hotfix start for a new fix.`];
 }
-async function findInFlightHotfixVersion(deps, ctx, latestMainTag) {
+async function findInFlightHotfixVersion(deps, ctx, latestMainTag, workflows = HOTFIX_RELEASE_WORKFLOWS) {
   const tags = /* @__PURE__ */ new Set();
   const out = await deps.run("gh", [
     "pr",
@@ -24759,13 +24813,13 @@ async function findInFlightHotfixVersion(deps, ctx, latestMainTag) {
   const fresh = latestMainTag ? sorted.filter((t) => compareHotfixVersions(t, latestMainTag) > 0) : sorted;
   for (const tag of fresh) {
     const version = tag.slice(1);
-    const facts = await gatherHotfixFacts(deps, ctx, tag, version);
+    const facts = await gatherHotfixFacts(deps, ctx, tag, version, workflows);
     if (deriveHotfixState(facts).state !== "complete") return { inFlight: { tag, version }, superseded: [] };
   }
   const stale = latestMainTag ? sorted.filter((t) => compareHotfixVersions(t, latestMainTag) <= 0) : [];
   const superseded = [];
   for (const tag of stale) {
-    const facts = await gatherHotfixFacts(deps, ctx, tag, tag.slice(1));
+    const facts = await gatherHotfixFacts(deps, ctx, tag, tag.slice(1), workflows);
     if (deriveHotfixState(facts).state !== "complete") superseded.push(tag);
   }
   return { inFlight: null, superseded };
@@ -32376,7 +32430,53 @@ async function fetchRestCorePool(gh = defaultGhApi) {
 }
 
 // src/pr-create-docs-check.ts
+var import_node_child_process18 = require("node:child_process");
 var GIT_TIMEOUT_MS2 = 15e3;
+function catFileBatch(root, ref, paths) {
+  if (paths.length === 0) return Promise.resolve([]);
+  return new Promise((resolve6) => {
+    const chunks = [];
+    let settled = false;
+    const child2 = (0, import_node_child_process18.spawn)("git", ["-C", root, "cat-file", "--batch", "--buffer"], { windowsHide: true });
+    const finish = () => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      resolve6(parseCatFileBatch(Buffer.concat(chunks), paths.length));
+    };
+    const timer = setTimeout(() => {
+      child2.kill("SIGKILL");
+      finish();
+    }, GIT_TIMEOUT_MS2);
+    timer.unref?.();
+    child2.stdout.on("data", (c) => chunks.push(c));
+    child2.on("error", finish);
+    child2.stdin.on("error", () => {
+    });
+    child2.on("close", finish);
+    child2.stdin.end(paths.map((path2) => `${ref}:${path2}
+`).join(""));
+  });
+}
+function parseCatFileBatch(out, expected) {
+  const results = [];
+  let at = 0;
+  while (results.length < expected) {
+    const eol = out.indexOf(10, at);
+    if (eol === -1) break;
+    const header = out.toString("utf8", at, eol);
+    at = eol + 1;
+    if (header.endsWith(" missing")) {
+      results.push(void 0);
+      continue;
+    }
+    const size = Number(header.slice(header.lastIndexOf(" ") + 1));
+    if (!Number.isInteger(size) || size < 0 || at + size > out.length) break;
+    results.push(out.toString("utf8", at, at + size));
+    at = at + size + 1;
+  }
+  return results;
+}
 function createPrCreateDocsIndexDeps() {
   return {
     worktreeRoot: async () => {
@@ -32405,20 +32505,13 @@ function createPrCreateDocsIndexDeps() {
     },
     listDocsAtRef: async (root, ref) => {
       try {
-        const { stdout } = await execFileP2("git", ["-C", root, "ls-tree", "-r", "--name-only", ref, "--", "docs"], { timeout: GIT_TIMEOUT_MS2 });
-        return stdout.split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
+        const { stdout } = await execFileP2("git", ["-C", root, "ls-tree", "-r", "-z", "--name-only", ref, "--", "docs"], { timeout: GIT_TIMEOUT_MS2 });
+        return stdout.split("\0").filter(Boolean);
       } catch {
         return [];
       }
     },
-    readAtRef: async (root, ref, path2) => {
-      try {
-        const { stdout } = await execFileP2("git", ["-C", root, "show", `${ref}:${path2}`], { timeout: GIT_TIMEOUT_MS2 });
-        return stdout;
-      } catch {
-        return void 0;
-      }
-    }
+    readManyAtRef: (root, ref, paths) => catFileBatch(root, ref, paths)
   };
 }
 async function checkDocsIndexAtHead(opts, deps) {
@@ -32433,10 +32526,10 @@ async function checkDocsIndexAtHead(opts, deps) {
   const paths = await deps.listDocsAtRef(root, ref);
   if (!paths.includes(DOCS_INDEX_PATH)) return void 0;
   const relDocs = paths.filter((p) => p.startsWith("docs/") && p.endsWith(".md")).map((p) => p.slice("docs/".length)).filter(isRoutableDocsPath);
-  const [indexContent, docContents] = await Promise.all([
-    deps.readAtRef(root, ref, DOCS_INDEX_PATH),
-    Promise.all(relDocs.map((rel) => deps.readAtRef(root, ref, `docs/${rel}`)))
-  ]);
+  const contents = await deps.readManyAtRef(root, ref, [DOCS_INDEX_PATH, ...relDocs.map((rel) => `docs/${rel}`)]);
+  const [indexContent, ...docContents] = contents;
+  if (contents.length !== relDocs.length + 1) return void 0;
+  if (indexContent === void 0 || docContents.some((c) => c === void 0)) return void 0;
   const contentByPath = new Map(relDocs.map((rel, i) => [rel, docContents[i] ?? ""]));
   const atRefDeps = {
     listDocs: () => relDocs,
@@ -32452,7 +32545,7 @@ async function checkDocsIndexAtHead(opts, deps) {
   }
   return {
     ok: false,
-    detail: `${DOCS_INDEX_PATH} is stale at the commit this PR would open from \u2014 it no longer matches the docs/ tree there`,
+    detail: `${DOCS_INDEX_PATH} is stale at the commit this PR would open from \u2014 it no longer matches the docs/ tree there (checked ${ref} over ${relDocs.length} indexed doc${relDocs.length === 1 ? "" : "s"})`,
     fix: "run `mmi-cli oracle docs index --write`, commit docs/index.md, and push again before retrying `pr create`"
   };
 }
@@ -33907,12 +34000,18 @@ function catalogCommandPaths(manifest) {
 function nearestExplainTargets(query, paths, limit = 5) {
   const parentPath = query.includes(" ") ? query.slice(0, query.lastIndexOf(" ")) : void 0;
   const leaf = query.includes(" ") ? query.slice(query.lastIndexOf(" ") + 1) : query;
-  const guide = unknownCommandDomainGuide(parentPath, leaf);
-  if (guide) return guide.expected.slice(0, limit);
   const all = [...paths];
   const leafOf = (p) => p.slice(p.lastIndexOf(" ") + 1);
+  const siblings = parentPath ? all.filter((p) => p !== query && p.startsWith(`${parentPath} `) && !p.slice(parentPath.length + 1).includes(" ")).sort() : [];
+  const withSiblings = (primary) => {
+    const out2 = [...primary];
+    for (const sibling of siblings) if (!out2.includes(sibling)) out2.push(sibling);
+    return out2.slice(0, limit);
+  };
+  const guide = unknownCommandDomainGuide(parentPath, leaf);
+  if (guide) return withSiblings(guide.expected);
   const exactLeaf = all.filter((p) => p !== query && leafOf(p) === leaf).sort();
-  if (exactLeaf.length) return exactLeaf.slice(0, limit);
+  if (exactLeaf.length) return withSiblings(exactLeaf);
   const out = [];
   const nearPath = didYouMean(query, all);
   if (nearPath) out.push(nearPath);
@@ -33923,7 +34022,7 @@ function nearestExplainTargets(query, paths, limit = 5) {
       if (out.length >= limit) break;
     }
   }
-  return out.slice(0, limit);
+  return withSiblings(out);
 }
 function explainCommandManifest(manifest, command, opts = {}) {
   const base = {
@@ -36588,6 +36687,9 @@ function diagnoseSurface(evidence) {
   if (evidence.manifest === "invalid") return { ...base, state: "corrupt" };
   if (!evidence.releasedVersion) return { ...base, state: "freshness-unknown" };
   if (evidence.installedVersion && evidence.releasedVersion && compareVersions(evidence.installedVersion, evidence.releasedVersion) < 0) {
+    if (evidence.stagedVersion && evidence.stagedVersion === evidence.releasedVersion) {
+      return { ...base, state: "staged" };
+    }
     return { ...base, state: "stale" };
   }
   return { ...base, state: "clean" };
@@ -36598,14 +36700,16 @@ function reloadInstruction(descriptor) {
   return `${verb} ${descriptor.displayName}`;
 }
 function planSurfaceRepair(diagnosis) {
-  if (diagnosis.state === "clean" || diagnosis.state === "pending-reload" || diagnosis.state === "skipped" || diagnosis.state === "freshness-unknown") return null;
+  if (diagnosis.state === "clean" || diagnosis.state === "pending-reload" || diagnosis.state === "staged" || diagnosis.state === "skipped" || diagnosis.state === "freshness-unknown") return null;
   const descriptor = diagnosis.descriptor;
   if (descriptor.repairOwner === "mmi-hub") {
     return {
       supported: false,
       owner: "mmi-hub",
       changes: [],
-      instruction: `run \`mmi-hub update\` to converge the MMI-managed Hermes plugin, then ${reloadInstruction(descriptor)}`
+      // #5833: name the SURFACE this row is about — the literal "Hermes plugin" sent every other
+      // mmi-hub-owned surface (Claude Code included) chasing a different host that was already current.
+      instruction: `run \`mmi-hub update\` to converge the MMI-managed ${descriptor.displayName} plugin, then ${reloadInstruction(descriptor)}`
     };
   }
   if (descriptor.repairOwner !== "mmi-cli") {
@@ -36632,6 +36736,8 @@ function buildSurfaceDoctorCheck(diagnosis) {
     skipped: "skipped \u2014 host not active",
     clean: diagnosis.repairDetail ? `clean \u2014 repaired and verified (${diagnosis.repairDetail})` : `clean${versions ? ` \u2014 ${versions}` : ""}`,
     "pending-reload": `pending ${descriptor.token === "hermes" ? "fresh process" : descriptor.reload === "workspace" ? "reload" : "restart"} \u2014 repaired to ${diagnosis.releasedVersion}, but ${diagnosis.installedVersion} is still the version this host has loaded${diagnosis.repairDetail ? ` (${diagnosis.repairDetail})` : ""}`,
+    // #5833: the update already staged the released tree; the wording mirrors `mmi-hub status`.
+    staged: `loaded ${diagnosis.installedVersion}; staged ${diagnosis.releasedVersion} for next launch \u2014 ${descriptor.token === "hermes" ? "start a fresh process" : descriptor.reload === "workspace" ? "reload" : "restart"} ${descriptor.displayName} to converge`,
     "freshness-unknown": `${diagnosis.installedVersion ?? "installed"} \u2014 freshness UNKNOWN, the published version could not be read`,
     stale: `stale${versions ? ` \u2014 ${versions}` : ""}`,
     missing: "missing \u2014 no install record",
@@ -36643,14 +36749,14 @@ function buildSurfaceDoctorCheck(diagnosis) {
     id: `${descriptor.token}-plugin`,
     surface: descriptor.token,
     state,
-    ok: state === "clean" || state === "skipped" || state === "pending-reload",
+    ok: state === "clean" || state === "skipped" || state === "pending-reload" || state === "staged",
     ...state === "freshness-unknown" ? { reportOnly: true } : {},
-    // Nothing is broken, so this is not a ✗ — but it is the one OK row an operator must act on, and the
+    // Nothing is broken, so this is not a ✗ — but these are the OK rows an operator must act on, and the
     // short default lane and the SessionStart banner both filter to failures unless a row says otherwise.
-    ...state === "pending-reload" ? { warn: true } : {},
+    ...state === "pending-reload" || state === "staged" ? { warn: true } : {},
     label: `${descriptor.displayName} plugin`,
     detail: detailByState[state],
-    ...plan ? { fix: plan.instruction } : state === "pending-reload" ? { fix: reloadInstruction(descriptor) } : state === "freshness-unknown" ? { fix: "check `mmi-cli --version` against `npm view @mutmutco/cli version`, then rerun doctor" } : {},
+    ...plan ? { fix: plan.instruction } : state === "pending-reload" || state === "staged" ? { fix: reloadInstruction(descriptor) } : state === "freshness-unknown" ? { fix: "check `mmi-cli --version` against `npm view @mutmutco/cli version`, then rerun doctor" } : {},
     verbose: [
       // The three numbers the legacy builder used to print. They belong here now that this is the only
       // plugin row, and a report that names a state without naming the versions behind it is not evidence.
@@ -37758,7 +37864,7 @@ function ghAccountCaveat(announcedLogin, accounts) {
 var import_node_fs42 = require("node:fs");
 var import_node_os18 = require("node:os");
 var import_node_path39 = require("node:path");
-var import_node_child_process18 = require("node:child_process");
+var import_node_child_process19 = require("node:child_process");
 var import_node_util8 = require("node:util");
 
 // src/discard-sink.ts
@@ -37767,13 +37873,13 @@ function nodeDiscardSinkPath(platform2 = process.platform) {
 }
 
 // src/doctor-io.ts
-var execFileP6 = (0, import_node_util8.promisify)(import_node_child_process18.execFile);
+var execFileP6 = (0, import_node_util8.promisify)(import_node_child_process19.execFile);
 function execFileCapture(file, args, opts = {}) {
   const sink = nodeDiscardSinkPath();
   const inFd = (0, import_node_fs42.openSync)(sink, "r");
   const errFd = (0, import_node_fs42.openSync)(sink, "w");
   try {
-    return (0, import_node_child_process18.execFileSync)(file, args, {
+    return (0, import_node_child_process19.execFileSync)(file, args, {
       ...opts,
       encoding: "utf8",
       stdio: [inFd, "pipe", errFd]
@@ -37784,6 +37890,18 @@ function execFileCapture(file, args, opts = {}) {
   }
 }
 var MMI_PLUGIN_ID2 = "mmi@mutmutco";
+function stagedClaudePluginVersion() {
+  try {
+    const stagingRoot = (0, import_node_path39.join)((0, import_node_os18.homedir)(), ".claude", "plugins", "staging");
+    const record = JSON.parse((0, import_node_fs42.readFileSync)((0, import_node_path39.join)(stagingRoot, "launch-target.json"), "utf8"));
+    if (typeof record.target !== "string" || typeof record.incoming !== "string") return void 0;
+    const manifest = JSON.parse((0, import_node_fs42.readFileSync)((0, import_node_path39.join)(record.incoming, ".claude-plugin", "plugin.json"), "utf8"));
+    if (typeof manifest.version !== "string") return void 0;
+    return manifest.version === record.target ? record.target : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function installedClaudePluginVersion() {
   try {
     const file = JSON.parse(
@@ -38042,6 +38160,7 @@ function mmiDoctorDeps(opts = {}) {
     const hermes = token === "hermes" ? readHermesPluginEvidence(process.env) : void 0;
     const kimi = token === "kimi" ? kimiPluginHostEvidence(surfaceConfigRoot("kimi")) : void 0;
     const installedVersion = hermes?.installedVersion ?? installedSurfacePluginVersion(runtimeSurface);
+    const stagedVersion = token === "claude" ? stagedClaudePluginVersion() : void 0;
     surfaceEvidence = {
       descriptor,
       // Hermes' root is the host evidence: a configured but uninstalled MMI tree is missing, while an
@@ -38053,7 +38172,8 @@ function mmiDoctorDeps(opts = {}) {
       manifest: hermes?.manifest ?? (installedVersion ? "valid" : snapshot.installRecordPresent ? "invalid" : "missing"),
       guardState: buildPluginGuardDecision(snapshot).state,
       ...kimi?.receipt ? { receipt: kimi.receipt } : {},
-      ...installedVersion ? { installedVersion } : {}
+      ...installedVersion ? { installedVersion } : {},
+      ...stagedVersion ? { stagedVersion } : {}
     };
     return surfaceEvidence;
   };
@@ -38280,7 +38400,9 @@ async function requireFreshTrainCli(commandName) {
   const converge = await selfConvergeTrainCli({
     currentVersion: resolveClientVersion(),
     releasedVersion: report.releasedVersion,
-    commandName
+    commandName,
+    // The typed, house-prefixed argv — never the spliced process.argv (#5813).
+    argv: INVOKED_ARGV
   });
   if (converge.kind === "failed") {
     throw new Error(`${commandName}: ${converge.error}. ${staleTrainCliMessage(report, commandName)}`);
@@ -38375,7 +38497,10 @@ function positionalTargetForm(cmd, opts = {}) {
   const args = cmd.registeredArguments ?? [];
   const first = args[0];
   if (!first) return void 0;
-  return formatPositionalTarget(canonicalPathFor(commandPath2(cmd)) ?? commandPath2(cmd), first.name(), opts);
+  return formatPositionalTarget(canonicalPathFor(commandPath2(cmd)) ?? commandPath2(cmd), first.name(), {
+    ...opts,
+    ownFlags: commandOwnLongFlags(cmd)
+  });
 }
 function unknownCommandCandidates(parent, allPaths) {
   if (!parent) return [...allPaths];
@@ -38470,6 +38595,7 @@ function envelopeAwareWriteErr(str) {
   if (unknownFlagJsonHandled && argvWantsJson2()) return;
   process.stderr.write(str);
 }
+var INVOKED_ARGV = process.argv.slice(2);
 var program2 = new Command();
 program2.name("mmi-cli").description("MMI Future Hub CLI \u2014 the org control plane for agentic coding.").version(resolveClientVersion()).configureOutput({ writeErr: envelopeAwareWriteErr }).showHelpAfterError(PARSE_HINT_SENTINEL);
 program2.addHelpText(
@@ -38696,7 +38822,7 @@ function scheduleRelatedDiscovery(o) {
   try {
     const args = ["issue", "discover-related", "--number", String(o.number), "--title", o.title, "--body", o.body, "--fail-soft"];
     if (o.repo) args.push("--repo", o.repo);
-    spawnDetachedSelf(args, { spawn: import_node_child_process19.spawn, execPath: process.execPath, scriptPath: process.argv[1] }, { cwd: process.cwd() });
+    spawnDetachedSelf(args, { spawn: import_node_child_process20.spawn, execPath: process.execPath, scriptPath: process.argv[1] }, { cwd: process.cwd() });
   } catch {
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "4.2.1",
+  "version": "4.2.3",
   "description": "MMI Future CLI — the org dev toolbox and shared cross-IDE engine for every registry-declared MMI coding surface.",
   "type": "module",
   "license": "UNLICENSED",