@mutmutco/cli 4.1.20 → 4.2.0

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_fs42 = require("node:fs");
-var import_node_child_process17 = require("node:child_process");
+var import_node_child_process18 = require("node:child_process");
 
 // src/cli-shared.ts
 var import_node_child_process3 = require("node:child_process");
@@ -5538,7 +5538,7 @@ function commandLadderHint() {
 }
 
 // src/index.ts
-var import_node_path38 = require("node:path");
+var import_node_path39 = require("node:path");
 
 // src/merge-ci-policy.ts
 function resolveMergeCiPolicy(input) {
@@ -7287,6 +7287,7 @@ function parseOwnerRepo(repo) {
   if (owner.includes("\\") || name.includes("\\")) throw new Error("repo must be owner/repo");
   return { owner, name, slug: name.toLowerCase(), fullName: `${owner}/${name}` };
 }
+var MANAGED_DELETE_BRANCH_ON_MERGE = false;
 var DEFAULT_GATE_CMD = "npm run check";
 var DEFAULT_GATE_MAX_SECONDS = "300";
 var DEFAULT_GATE_PY_VERSION = "3.11";
@@ -11761,10 +11762,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.1.20",
-    tag: "v4.1.20",
-    commit: "12c94bf54a89",
-    npm: "@mutmutco/cli@4.1.20"
+    version: "4.2.0",
+    tag: "v4.2.0",
+    commit: "d4802646ffca",
+    npm: "@mutmutco/cli@4.2.0"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -11781,14 +11782,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.1.20"
+          v3Target: "v4.2.0"
         }
       ],
       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.1.20 and redeploy the Hub Lambda from tag v4.1.20 (12c94bf54a89); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.1.20 (@mutmutco/cli@4.1.20, tag commit 12c94bf54a89 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.2.0 and redeploy the Hub Lambda from tag v4.2.0 (d4802646ffca); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.2.0 (@mutmutco/cli@4.2.0, tag commit d4802646ffca \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -15824,7 +15825,7 @@ function assertNpmMajorPreflight(opts) {
   if (localMajor === void 0 || expectedMajor === void 0) return;
   if (localMajor === expectedMajor) return;
   throw new Error(
-    `${opts.repo}: Step 0a npm-major preflight failed \u2014 local npm ${localNpm} (major ${localMajor}) \u2260 CI npm ${expectedNpm} (major ${expectedMajor}). Align local npm before --apply: \`npm install -g npm@${expectedNpm}\`. This is an npm-major mismatch (#5666/#5616/#4578), not a lockfile or publish-surface problem. When gate.yml has no bundled npm pin, read the publish workflow npm pin; otherwise compare \`npm -v\` with the green gate log's toolchain-preflight line (#3446).`
+    `${opts.repo}: Step 0a npm-major preflight failed \u2014 local npm ${localNpm} (major ${localMajor}) \u2260 CI npm ${expectedNpm} (major ${expectedMajor}). Supported repair (preserves Node): \`npm install -g npm@${expectedNpm}\`; then verify with \`node -v && npm -v\` and rerun the same release command. This is an npm-major mismatch (#5666/#5616/#4578), not a lockfile or publish-surface problem. When gate.yml has no bundled npm pin, read the publish workflow npm pin; otherwise compare \`npm -v\` with the green gate log's toolchain-preflight line (#3446).`
   );
 }
 async function assertNpmMajorPreflightFromWorkflows(deps, repo) {
@@ -16108,15 +16109,9 @@ async function runRcandResume(deps, options = {}) {
     note: `reused immutable ${tag}; pushed its exact SHA to rc and dispatched the rc deploy`
   };
 }
-async function runReleaseResume(deps, options = {}) {
+async function runReleaseResumePipeline(deps, options, prepared) {
   const watch = options.watch ?? false;
-  const ctx = await buildTrainApplyContext(deps);
-  await requireCleanTree(deps);
-  await runGitRemoteRead(deps, ["fetch", "origin", "--tags"]);
-  const meta = requireProjectMetaForTrain(await loadProjectMeta(deps, ctx), ctx.repo);
-  const branchHints = await loadReleaseTrackBranchHints(deps);
-  const directTrack = isHubControlRepo(ctx.repo) || resolveReleaseTrack(meta, branchHints) === "direct";
-  const deployModel = await preflight(deps, ctx, "main", meta);
+  const { ctx, meta, branchHints, directTrack, deployModel } = prepared;
   const tags = clean2(await deps.run("git", ["tag", "--list", "v[0-9]*.[0-9]*.[0-9]*", "--sort=-v:refname"])).split("\n").map((t) => t.trim()).filter((t) => /^v\d+\.\d+\.\d+$/.test(t));
   const tag = tags[0];
   if (!tag) throw new Error("release --resume: no final v* release tag found \u2014 there is no release to resume");
@@ -16224,6 +16219,36 @@ async function runReleaseResume(deps, options = {}) {
     note: followUp === "failed" ? `resumed ${tag} (version preserved, not re-cut) \u2014 but a watched deploy/publish run FAILED; the Release stands, re-run the failed job (do NOT re-tag)` : followUp === "pending" ? `resumed ${tag} (version preserved, not re-cut) \u2014 a deploy/publish or alignment follow-up is unresolved; watch it to completion` : `resumed and completed ${tag} \u2014 the original version was preserved, not re-cut`
   };
 }
+async function withCheckoutRestoredAfterReleaseResume(deps, startBranch, operation) {
+  let result;
+  try {
+    result = await operation();
+  } catch (error) {
+    let checkoutNote;
+    try {
+      checkoutNote = (await restoreCheckoutAfterRelease(deps, startBranch)).note;
+    } catch (restoreError) {
+      checkoutNote = `checkout restoration failed while returning to ${startBranch}: ${restoreError instanceof Error ? restoreError.message : String(restoreError)}`;
+    }
+    throw new Error(`${error instanceof Error ? error.message : String(error)}; ${checkoutNote}`);
+  }
+  return withCheckoutRestoredAfterRelease(deps, result, startBranch);
+}
+async function runReleaseResume(deps, options = {}) {
+  const ctx = await buildTrainApplyContext(deps);
+  await requireCleanTree(deps);
+  await runGitRemoteRead(deps, ["fetch", "origin", "--tags"]);
+  const meta = requireProjectMetaForTrain(await loadProjectMeta(deps, ctx), ctx.repo);
+  const branchHints = await loadReleaseTrackBranchHints(deps);
+  const directTrack = isHubControlRepo(ctx.repo) || resolveReleaseTrack(meta, branchHints) === "direct";
+  const deployModel = await preflight(deps, ctx, "main", meta);
+  const startBranch = directTrack ? "development" : "rc";
+  return withCheckoutRestoredAfterReleaseResume(
+    deps,
+    startBranch,
+    () => runReleaseResumePipeline(deps, options, { ctx, meta, branchHints, directTrack, deployModel })
+  );
+}
 async function runReleaseAbort(deps, options = {}) {
   if (!options.approved) {
     throw new Error("release --abort requires --apply after explicit approval; nothing was written");
@@ -17130,7 +17155,7 @@ async function auditRepoCi(repo, deps) {
     ok: info.allow_auto_merge === true,
     label: "allow_auto_merge enabled",
     detail: info.allow_auto_merge === true ? void 0 : "false or unavailable",
-    remediation: `gh api -X PATCH repos/${repo} -f allow_auto_merge=true -f allow_squash_merge=true -f delete_branch_on_merge=true`
+    remediation: `gh api -X PATCH repos/${repo} -f allow_auto_merge=true -f allow_squash_merge=true -F delete_branch_on_merge=${MANAGED_DELETE_BRANCH_ON_MERGE}`
   });
   checks.push({
     ok: info.allow_squash_merge === true,
@@ -17138,9 +17163,9 @@ async function auditRepoCi(repo, deps) {
     detail: info.allow_squash_merge === true ? void 0 : "false or unavailable"
   });
   checks.push({
-    ok: info.delete_branch_on_merge === true,
-    label: "delete_branch_on_merge enabled",
-    detail: info.delete_branch_on_merge === true ? void 0 : "false or unavailable"
+    ok: info.delete_branch_on_merge === MANAGED_DELETE_BRANCH_ON_MERGE,
+    label: "delete_branch_on_merge disabled",
+    detail: info.delete_branch_on_merge === MANAGED_DELETE_BRANCH_ON_MERGE ? void 0 : "merged branches must survive until delayed cleanup proves no open PR uses them as a base (#5789)"
   });
   checks.push({
     ok: info.has_wiki === false,
@@ -17447,11 +17472,11 @@ async function applyCiReconcileMergeSettingsFromReport(repo, deps, report) {
       body: {
         allow_auto_merge: true,
         allow_squash_merge: true,
-        delete_branch_on_merge: true,
+        delete_branch_on_merge: MANAGED_DELETE_BRANCH_ON_MERGE,
         has_wiki: false
       }
     });
-    applied.push("allow_auto_merge, allow_squash_merge, delete_branch_on_merge, has_wiki=false");
+    applied.push("allow_auto_merge, allow_squash_merge, preserve merged remote branches, has_wiki=false");
   } catch (e) {
     errors.push(e.message);
   }
@@ -20892,6 +20917,11 @@ async function readBoard(options, deps = {}) {
     report[scope].claimable = filtered.claimable;
     report.warnings.push(...filtered.warnings);
   }
+  for (const scope of ["primary", "secondary"]) {
+    const demoted = await demoteLiveClaimedClaimables(report[scope], client);
+    report.warnings.push(...demoted.warnings);
+    report.partial = report.partial || demoted.partial;
+  }
   return report;
 }
 function findBoardItem(items, selector, board) {
@@ -21753,6 +21783,66 @@ function boardItemClaim(item) {
     currentlyClaimed: item.assignees.length > 0 && item.status === "In Progress"
   };
 }
+function classifyClaimableMarker(comments, actor, now = Date.now()) {
+  const marker = comments ? latestClaimMarker(comments) : void 0;
+  if (!marker) return { verdict: "claimable" };
+  const ownership = laneOwnership(marker, actor);
+  if (ownership === "mine") return { verdict: "owned", holder: describeClaimMarker(marker) };
+  const age = now - Date.parse(marker.ts);
+  if (Number.isFinite(age) && age >= 0 && age < CLAIM_MARKER_LIVE_MS) {
+    return { verdict: "taken", holder: describeClaimMarker(marker) };
+  }
+  return { verdict: "claimable" };
+}
+async function demoteLiveClaimedClaimables(scope, client, actor = describeSessionIdentity(), deps = {}) {
+  const warnings = [];
+  let partial = false;
+  const fetchComments = deps.fetchComments ?? (async (item) => {
+    if (item.details) return item.details.comments;
+    const comments = await client.restPaginate(`repos/${item.repository}/issues/${item.number}/comments`);
+    return comments.map((comment) => ({ body: comment.body ?? "" }));
+  });
+  const stillClaimable = [];
+  const movedTaken = [];
+  const movedOwned = [];
+  for (const item of scope.claimable) {
+    if (item.contentType !== "Issue") {
+      stillClaimable.push(item);
+      continue;
+    }
+    let comments;
+    try {
+      comments = await fetchComments(item);
+    } catch {
+      comments = void 0;
+    }
+    if (comments === void 0) {
+      partial = true;
+      warnings.push(`${item.ref} left claimable: claim-marker evidence could not be read`);
+      continue;
+    }
+    const verdict = classifyClaimableMarker(comments, actor, deps.now);
+    if (verdict.verdict === "claimable") {
+      stillClaimable.push(item);
+    } else if (verdict.verdict === "owned") {
+      movedOwned.push(item);
+      warnings.push(`${item.ref} is held by your own lane (${verdict.holder}) \u2014 moved to user-owned`);
+    } else {
+      movedTaken.push(item);
+      warnings.push(`${item.ref} is held by a live claim marker (lane ${verdict.holder}) \u2014 no longer claimable`);
+    }
+  }
+  scope.claimable = stillClaimable;
+  if (movedTaken.length) {
+    scope.taken.push(...movedTaken);
+    scope.taken.sort(compareItems);
+  }
+  if (movedOwned.length) {
+    scope.userOwned.push(...movedOwned);
+    scope.userOwned.sort(compareItems);
+  }
+  return { warnings, partial };
+}
 async function postClaimMarkerComment(client, item, actor = describeSessionIdentity()) {
   try {
     const marker = {
@@ -23374,11 +23464,69 @@ function renderPluginCachePlan(plan, applied) {
   return lines.join("\n");
 }
 
-// src/statusline-invalidate.ts
+// src/train-self-converge.ts
 var import_node_child_process10 = require("node:child_process");
+var SELF_CONVERGE_INSTALL_TIMEOUT_MS = 12e4;
+var SELF_CONVERGE_VERSION_TIMEOUT_MS = 3e4;
+var isWin2 = process.platform === "win32";
+var defaultDeps = {
+  // Pin the exact released version (never `@latest` — a cached packument resolves the tag to the
+  // PREVIOUS version in exactly this post-publish window, #3422). execFileP rejects on nonzero exit.
+  update: async (target) => {
+    const args = ["install", "-g", `@mutmutco/cli@${target}`];
+    if (isWin2) {
+      await execFileP2("cmd.exe", ["/c", "npm", ...args], { timeout: SELF_CONVERGE_INSTALL_TIMEOUT_MS });
+    } else {
+      await execFileP2("npm", args, { timeout: SELF_CONVERGE_INSTALL_TIMEOUT_MS });
+    }
+  },
+  // Read the version the freshly installed `mmi-cli` on PATH actually resolves to. Unparseable or
+  // failed read answers undefined so the flow reports not-taken-effect instead of guessing green.
+  readInstalledVersion: async () => {
+    try {
+      const { stdout } = isWin2 ? await execFileP2("cmd.exe", ["/c", "mmi-cli", "--version"], { timeout: SELF_CONVERGE_VERSION_TIMEOUT_MS }) : await execFileP2("mmi-cli", ["--version"], { timeout: SELF_CONVERGE_VERSION_TIMEOUT_MS });
+      return parseNpmVersion(stdout);
+    } catch {
+      return void 0;
+    }
+  },
+  // 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);
+    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));
+  }),
+  // stderr only — stdout may be carrying --json output.
+  warn: (line) => console.error(line)
+};
+async function selfConvergeTrainCli(input) {
+  const deps = { ...defaultDeps, ...input.deps };
+  try {
+    deps.warn(
+      `train: running mmi-cli ${input.currentVersion} is stale against released ${input.releasedVersion} \u2014 self-converging via npm install -g @mutmutco/cli@${input.releasedVersion} before resuming ${input.commandName}`
+    );
+    await deps.update(input.releasedVersion);
+    const installed = await deps.readInstalledVersion();
+    if (!installed || compareVersions(installed, input.releasedVersion) < 0) {
+      return {
+        kind: "failed",
+        error: `self-converge did not take effect: mmi-cli on PATH still resolves to ${installed ?? "unknown"}, expected >= ${input.releasedVersion}`
+      };
+    }
+    const reexecCode = await deps.reexec();
+    return { kind: "converged", reexecCode };
+  } catch (e) {
+    return { kind: "failed", error: e instanceof Error ? e.message : String(e) };
+  }
+}
+
+// src/statusline-invalidate.ts
+var import_node_child_process11 = require("node:child_process");
 function invalidateStatuslineBoardCache() {
   try {
-    const child2 = (0, import_node_child_process10.spawn)("jerv-cli", ["lane", "ops", "invalidate-board"], {
+    const child2 = (0, import_node_child_process11.spawn)("jerv-cli", ["lane", "ops", "invalidate-board"], {
       detached: true,
       stdio: "ignore",
       windowsHide: true
@@ -23651,12 +23799,12 @@ async function putTenantArtifact(repo, stage, inputPath, deps) {
 }
 
 // src/hotfix-coverage.ts
-var import_node_child_process11 = require("node:child_process");
+var import_node_child_process12 = require("node:child_process");
 var CHERRY_TRAILER = /\(cherry picked from commit ([0-9a-f]{7,40})\)/g;
 function checkHotfixCoverage(options = {}) {
   const { cwd = process.cwd(), mainRef = "origin/main", rcRef = "origin/rc", manifestPaths = [] } = options;
   const ack = (options.ack ?? []).filter(Boolean);
-  const git2 = options.git ?? ((args, opts) => (0, import_node_child_process11.execFileSync)("git", args, { cwd, encoding: "utf8", input: opts?.input, stdio: ["pipe", "pipe", "pipe"] }));
+  const git2 = options.git ?? ((args, opts) => (0, import_node_child_process12.execFileSync)("git", args, { cwd, encoding: "utf8", input: opts?.input, stdio: ["pipe", "pipe", "pipe"] }));
   const revList = (range) => {
     const out = git2(["rev-list", "--no-merges", range]).trim();
     return out ? out.split("\n") : [];
@@ -23724,7 +23872,7 @@ function checkHotfixCoverage(options = {}) {
 }
 function checkHotfixCarries(options) {
   const { cwd = process.cwd(), branch, baseRef, targets } = options;
-  const git2 = options.git ?? ((args, opts) => (0, import_node_child_process11.execFileSync)("git", args, { cwd, encoding: "utf8", input: opts?.input, stdio: ["pipe", "pipe", "pipe"] }));
+  const git2 = options.git ?? ((args, opts) => (0, import_node_child_process12.execFileSync)("git", args, { cwd, encoding: "utf8", input: opts?.input, stdio: ["pipe", "pipe", "pipe"] }));
   const isAncestor = (sha, ref) => {
     try {
       git2(["merge-base", "--is-ancestor", sha, ref]);
@@ -24821,7 +24969,7 @@ function renderDeployPortDoctor(report) {
 }
 
 // src/spawn-policy-core.ts
-var import_node_child_process12 = require("node:child_process");
+var import_node_child_process13 = require("node:child_process");
 var import_node_fs24 = require("node:fs");
 var import_node_path21 = require("node:path");
 var SPAWNERS = ["spawn", "spawnSync", "exec", "execSync", "execFile", "execFileSync"];
@@ -24892,7 +25040,7 @@ function findViolationsInSource(raw) {
   return found;
 }
 function policedFiles(root) {
-  const r = (0, import_node_child_process12.spawnSync)("git", ["ls-files", "-z", "--cached", "--others", "--exclude-standard"], {
+  const r = (0, import_node_child_process13.spawnSync)("git", ["ls-files", "-z", "--cached", "--others", "--exclude-standard"], {
     cwd: root,
     encoding: "utf8",
     windowsHide: true,
@@ -24926,7 +25074,7 @@ function runSpawnPolicy(root) {
 }
 
 // src/test-policy-core.ts
-var import_node_child_process13 = require("node:child_process");
+var import_node_child_process14 = require("node:child_process");
 var import_node_fs25 = require("node:fs");
 var import_node_path22 = require("node:path");
 
@@ -25374,14 +25522,14 @@ function evaluate(changed, policy, present = () => false) {
   return findings;
 }
 function git(args, cwd) {
-  return (0, import_node_child_process13.execFileSync)("git", args, { windowsHide: true, cwd, encoding: "utf8", maxBuffer: 32 * 1024 * 1024 });
+  return (0, import_node_child_process14.execFileSync)("git", args, { windowsHide: true, cwd, encoding: "utf8", maxBuffer: 32 * 1024 * 1024 });
 }
 var COAUTHOR_KEY = "Co-authored-by";
 var GH_MESSAGE_SEPARATOR = /^-{5,}$/;
 var LIFTED_KEYS = new RegExp(`^(?:${TRAILER_KEY}|${COAUTHOR_KEY}):`, "i");
 function parseTrailers(message, cwd) {
   try {
-    return (0, import_node_child_process13.execFileSync)("git", ["interpret-trailers", "--parse", "--unfold"], {
+    return (0, import_node_child_process14.execFileSync)("git", ["interpret-trailers", "--parse", "--unfold"], {
       windowsHide: true,
       cwd,
       input: message,
@@ -25594,7 +25742,7 @@ function runTestPolicy(root, deps = {}) {
 }
 
 // src/dist-drift.ts
-var import_node_child_process14 = require("node:child_process");
+var import_node_child_process15 = require("node:child_process");
 var import_node_crypto7 = require("node:crypto");
 var import_node_fs27 = require("node:fs");
 var import_node_os13 = require("node:os");
@@ -25739,7 +25887,7 @@ function bomPathFor(root) {
   }
 }
 function rebuildTo(packageRoot, outDir) {
-  (0, import_node_child_process14.execFileSync)(process.execPath, ["build.mjs"], {
+  (0, import_node_child_process15.execFileSync)(process.execPath, ["build.mjs"], {
     cwd: packageRoot,
     env: { ...process.env, MMI_DIST_OUTDIR: outDir },
     windowsHide: true,
@@ -27456,9 +27604,9 @@ ${SSH_RECIPE_AGENT_NOTE}`);
 
 // src/schedules-commands.ts
 var import_promises4 = require("node:fs/promises");
-var import_node_child_process15 = require("node:child_process");
+var import_node_child_process16 = require("node:child_process");
 var import_node_util7 = require("node:util");
-var execFileP5 = (0, import_node_util7.promisify)(import_node_child_process15.execFile);
+var execFileP5 = (0, import_node_util7.promisify)(import_node_child_process16.execFile);
 var AWS_REGION = "eu-central-1";
 var AWS_TIMEOUT_MS = 3e4;
 var AWS_RETRY_DELAY_MS = 1500;
@@ -29551,7 +29699,7 @@ function registerBootstrapCommands(program3) {
     }
     let seedPrUrl;
     if (o.execute && seedPlan.mode === "pr" && seedPlan.branch && seededToBranch > 0) {
-      await gh(["api", "-X", "PATCH", `repos/${repo}`, "-f", "allow_auto_merge=true", "-f", "allow_squash_merge=true", "-f", "delete_branch_on_merge=true"]).catch(() => {
+      await gh(["api", "-X", "PATCH", `repos/${repo}`, "-f", "allow_auto_merge=true", "-f", "allow_squash_merge=true", "-F", `delete_branch_on_merge=${MANAGED_DELETE_BRANCH_ON_MERGE}`]).catch(() => {
       });
       const openPrs = await gh(["pr", "list", "--repo", repo, "--head", seedPlan.branch, "--base", baseBranch, "--state", "open", "--json", "number,url"]);
       const prDecision = decideSeedPrAction(JSON.parse(openPrs.stdout || "[]"));
@@ -29600,8 +29748,8 @@ ${onlyManagedBlock ? `Only the marker-bounded Hub-managed block inside repo-owne
     }
     if (o.execute && !onlyTarget && o.class === "deployable") {
       try {
-        await gh(["api", "-X", "PATCH", `repos/${repo}`, "-f", "allow_auto_merge=true", "-f", "allow_squash_merge=true", "-f", "delete_branch_on_merge=true"]);
-        applied.push("merge settings: allow_auto_merge, squash, delete-branch-on-merge");
+        await gh(["api", "-X", "PATCH", `repos/${repo}`, "-f", "allow_auto_merge=true", "-f", "allow_squash_merge=true", "-F", `delete_branch_on_merge=${MANAGED_DELETE_BRANCH_ON_MERGE}`]);
+        applied.push("merge settings: allow_auto_merge, squash, preserve merged remote branches");
       } catch (e) {
         applied.push(`merge settings (failed: ${e.message})`);
       }
@@ -30794,6 +30942,12 @@ function ghPrMergeLocalBranchDeleteWarning(message) {
 function mergeAutoRejectedPrAlreadyClean(message) {
   return /clean status \(enablePullRequestAutoMerge\)|is in clean status/i.test(message);
 }
+function assertRemoteBranchPreservedOnMerge(repo, deleteBranchOnMerge) {
+  if (deleteBranchOnMerge === false) return;
+  throw new Error(
+    `pr merge: ${repo} does not prove delete_branch_on_merge=false. Automatic deletion can irreversibly close stacked PRs. Run \`mmi-cli devops ci reconcile --repo ${repo} --apply\`, then retry; remote branch cleanup is delayed.`
+  );
+}
 function mergeMethodFromParentCount(parentCount) {
   if (parentCount >= 2) return "merge";
   return void 0;
@@ -31043,6 +31197,7 @@ async function remoteBranchExists2(branch, options = {}) {
 
 // src/worktree-merge-cleanup.ts
 var import_node_fs36 = require("node:fs");
+var import_node_path34 = require("node:path");
 
 // src/worktree-evidence-archive.ts
 var import_node_fs35 = require("node:fs");
@@ -31221,6 +31376,18 @@ function formatArtifactsArchiveReceipt(archive) {
 function normPath2(p) {
   return p.replace(/\\/g, "/").replace(/\/+$/, "");
 }
+function removeResidueDirectory(wtPath) {
+  try {
+    try {
+      if ((0, import_node_fs36.lstatSync)((0, import_node_path34.join)(wtPath, "node_modules")).isSymbolicLink()) (0, import_node_fs36.rmdirSync)((0, import_node_path34.join)(wtPath, "node_modules"));
+    } catch {
+    }
+    (0, import_node_fs36.rmSync)(wtPath, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: e instanceof Error ? e.message : String(e) };
+  }
+}
 function samePath(a, b) {
   const na = normPath2(a);
   const nb = normPath2(b);
@@ -31328,6 +31495,16 @@ async function removeWorktreeWithReconcile(wtPath, git2, listWorktrees, pathExis
     };
   }
   if (!isWorktreePathRegistered(worktrees, wtPath)) return pruneAndVerify("reconciled-unregistered");
+  await git2(["worktree", "prune"]).catch(() => "");
+  try {
+    worktrees = await listWorktrees();
+  } catch (e) {
+    return {
+      status: "failed",
+      error: `could not verify worktree registration after prune: ${formatGitCommandError(e)}; path=${wtPath}`
+    };
+  }
+  if (!isWorktreePathRegistered(worktrees, wtPath)) return pruneAndVerify("reconciled-pruned");
   const retryError = await attemptRemove();
   if (!retryError) return pruneAndVerify("reconciled-after-retry");
   if (isNotAWorkingTreeMessage(retryError) || isNotAWorkingTreeMessage(firstError)) {
@@ -31493,6 +31670,15 @@ async function cleanupPrMergeLocalBranch(branch, options) {
     stageTeardown,
     tmpEvidenceCount: tmpEvidence.length
   };
+  if (pathExists(wtPath)) {
+    const residue = options.removeResidueDir?.(wtPath) ?? removeResidueDirectory(wtPath);
+    if (residue.ok) {
+      report.worktree.residue = "swept";
+    } else {
+      report.worktree.residue = "left";
+      report.worktree.residueError = residue.error;
+    }
+  }
   try {
     await git2(["branch", "-D", branch]);
     report.localBranch = { name: branch, status: "deleted" };
@@ -31520,6 +31706,9 @@ function renderPrMergeCleanupLines(cleanup) {
   } else if (wt.status === "preserved") {
     lines.push(`pr merge: preserved worktree ${wt.path} (--preserve-worktree)`);
   }
+  if (wt.residue === "left") {
+    lines.push(`pr merge: worktree ${wt.path} registration is gone but residue remains \u2014 delete by hand: ${wt.residueError ?? wt.path}`);
+  }
   if (wt.artifactsArchive?.status === "archived" && wt.artifactsArchive.path) {
     lines.push(`pr merge: archived worktree evidence to ${wt.artifactsArchive.path}`);
   } else if (wt.artifactsArchive?.status === "blocked" && wt.artifactsArchive.error) {
@@ -33107,7 +33296,7 @@ ${lines}`, {
 
 // src/train-commands.ts
 var import_node_fs38 = require("node:fs");
-var import_node_path34 = require("node:path");
+var import_node_path35 = require("node:path");
 var RELEASE_BUMP_INTENTS = ["major", "minor", "patch"];
 function resolveReleaseBumpIntent(raw) {
   const intent = typeof raw === "string" ? raw.trim() : "";
@@ -33118,7 +33307,7 @@ function resolveReleaseBumpIntent(raw) {
 }
 function readRepoVersion() {
   try {
-    return JSON.parse((0, import_node_fs38.readFileSync)((0, import_node_path34.join)(process.cwd(), ".claude-plugin", "plugin.json"), "utf8")).version || void 0;
+    return JSON.parse((0, import_node_fs38.readFileSync)((0, import_node_path35.join)(process.cwd(), ".claude-plugin", "plugin.json"), "utf8")).version || void 0;
   } catch {
     return void 0;
   }
@@ -33277,7 +33466,7 @@ function registerDeployCommands(program3) {
 // src/discovery-commands.ts
 var import_node_fs39 = require("node:fs");
 var import_node_os17 = require("node:os");
-var import_node_path35 = require("node:path");
+var import_node_path36 = require("node:path");
 var GC_GH_TIMEOUT_MS2 = 2e4;
 async function collectStatus() {
   const repo = await resolveRepo();
@@ -33467,8 +33656,8 @@ async function collectOnboardStatus(opts = {}) {
   }
   const home = (0, import_node_os17.homedir)();
   const plugin = onboardPluginGate({
-    readKnown: () => readFileSyncSafe((0, import_node_path35.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs39.readFileSync),
-    readSettings: () => readFileSyncSafe((0, import_node_path35.join)(home, ".claude", "settings.json"), import_node_fs39.readFileSync)
+    readKnown: () => readFileSyncSafe((0, import_node_path36.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs39.readFileSync),
+    readSettings: () => readFileSyncSafe((0, import_node_path36.join)(home, ".claude", "settings.json"), import_node_fs39.readFileSync)
   });
   return { track, board, registry: registry2, secrets, plugin, doors: opts.doors ?? [], nextCommand };
 }
@@ -33777,7 +33966,10 @@ function findCommandInManifest(manifest, commandPath3) {
     return house ? houseRootAsParent(manifest, house) : void 0;
   }
   const visit = (command) => {
-    if (command.path === commandPath3 || command.flat_path === commandPath3) return command;
+    const aliasMatches = command.aliases?.some(
+      (alias) => [command.path, command.flat_path].some((path2) => `${path2.slice(0, path2.lastIndexOf(" ") + 1)}${alias}` === commandPath3)
+    );
+    if (command.path === commandPath3 || command.flat_path === commandPath3 || aliasMatches) return command;
     for (const child2 of command.subcommands) {
       const found = visit(child2);
       if (found) return found;
@@ -34229,7 +34421,7 @@ function registerPrLifecycleCommands(program3) {
 
 // src/post-merge-recon.ts
 var import_node_fs40 = require("node:fs");
-var import_node_path36 = require("node:path");
+var import_node_path37 = require("node:path");
 
 // src/cross-repo-filing-issue.ts
 function crossRepoFilingRetryCommand(prRepo, prNumber) {
@@ -34395,7 +34587,7 @@ function buildPostMergeReconRecovery(input) {
 }
 function writePostMergeReconRecovery(cwd, recovery) {
   const path2 = postMergeReconStatePath(cwd, recovery.repo, recovery.pr);
-  (0, import_node_fs40.mkdirSync)((0, import_node_path36.dirname)(path2), { recursive: true });
+  (0, import_node_fs40.mkdirSync)((0, import_node_path37.dirname)(path2), { recursive: true });
   (0, import_node_fs40.writeFileSync)(path2, `${JSON.stringify(recovery, null, 2)}
 `, "utf8");
   return path2;
@@ -37461,17 +37653,17 @@ function parseOriginRepo(remoteUrl) {
 }
 function ghHostsConfigPath(env, platform2) {
   const sep3 = platform2 === "win32" ? "\\" : "/";
-  const join32 = (...parts) => parts.join(sep3);
+  const join33 = (...parts) => parts.join(sep3);
   const explicit = env.GH_CONFIG_DIR?.trim();
-  if (explicit) return join32(explicit, "hosts.yml");
+  if (explicit) return join33(explicit, "hosts.yml");
   if (platform2 === "win32") {
     const appData = (env.AppData ?? env.APPDATA)?.trim();
-    return appData ? join32(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 join32(xdg, "gh", "hosts.yml");
+  if (xdg) return join33(xdg, "gh", "hosts.yml");
   const home = env.HOME?.trim();
-  return home ? join32(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;
@@ -37523,8 +37715,8 @@ function ghAccountCaveat(announcedLogin, accounts) {
 // src/doctor-io.ts
 var import_node_fs41 = require("node:fs");
 var import_node_os18 = require("node:os");
-var import_node_path37 = require("node:path");
-var import_node_child_process16 = require("node:child_process");
+var import_node_path38 = require("node:path");
+var import_node_child_process17 = require("node:child_process");
 var import_node_util8 = require("node:util");
 
 // src/discard-sink.ts
@@ -37533,13 +37725,13 @@ function nodeDiscardSinkPath(platform2 = process.platform) {
 }
 
 // src/doctor-io.ts
-var execFileP6 = (0, import_node_util8.promisify)(import_node_child_process16.execFile);
+var execFileP6 = (0, import_node_util8.promisify)(import_node_child_process17.execFile);
 function execFileCapture(file, args, opts = {}) {
   const sink = nodeDiscardSinkPath();
   const inFd = (0, import_node_fs41.openSync)(sink, "r");
   const errFd = (0, import_node_fs41.openSync)(sink, "w");
   try {
-    return (0, import_node_child_process16.execFileSync)(file, args, {
+    return (0, import_node_child_process17.execFileSync)(file, args, {
       ...opts,
       encoding: "utf8",
       stdio: [inFd, "pipe", errFd]
@@ -37553,7 +37745,7 @@ var MMI_PLUGIN_ID2 = "mmi@mutmutco";
 function installedClaudePluginVersion() {
   try {
     const file = JSON.parse(
-      (0, import_node_fs41.readFileSync)((0, import_node_path37.join)((0, import_node_os18.homedir)(), ".claude", "plugins", "installed_plugins.json"), "utf8")
+      (0, import_node_fs41.readFileSync)((0, import_node_path38.join)((0, import_node_os18.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;
@@ -37574,7 +37766,7 @@ function readHermesPluginEvidence(env = process.env) {
   const host = hermesConfigRoot(env);
   const root = hermesPluginRoot(env);
   const installRecordPresent = (0, import_node_fs41.existsSync)(root);
-  const manifestPath = (0, import_node_path37.join)(root, "plugin.yaml");
+  const manifestPath = (0, import_node_path38.join)(root, "plugin.yaml");
   let installedVersion;
   let manifest = "missing";
   try {
@@ -37598,14 +37790,14 @@ function readHermesPluginEvidence(env = process.env) {
   }
   let skills = false;
   try {
-    skills = (0, import_node_fs41.existsSync)((0, import_node_path37.join)(root, "skills")) && (0, import_node_fs41.statSync)((0, import_node_path37.join)(root, "skills")).isDirectory();
+    skills = (0, import_node_fs41.existsSync)((0, import_node_path38.join)(root, "skills")) && (0, import_node_fs41.statSync)((0, import_node_path38.join)(root, "skills")).isDirectory();
   } catch {
   }
   return {
     hostPresent: (0, import_node_fs41.existsSync)(host),
     installRecordPresent,
     manifest,
-    payloadPresent: (0, import_node_fs41.existsSync)((0, import_node_path37.join)(root, "__init__.py")) && skills && manifest === "valid",
+    payloadPresent: (0, import_node_fs41.existsSync)((0, import_node_path38.join)(root, "__init__.py")) && skills && manifest === "valid",
     ...installedVersion ? { installedVersion } : {}
   };
 }
@@ -37613,7 +37805,7 @@ function installedSurfacePluginVersion(surface) {
   const token = surfaceToken(surface);
   if (token === "kilo") {
     try {
-      const stamp = (0, import_node_fs41.readFileSync)((0, import_node_path37.join)((0, import_node_os18.homedir)(), ".kilo", ".mmi-kilo-version"), "utf8").trim();
+      const stamp = (0, import_node_fs41.readFileSync)((0, import_node_path38.join)((0, import_node_os18.homedir)(), ".kilo", ".mmi-kilo-version"), "utf8").trim();
       return stamp || void 0;
     } catch {
       return void 0;
@@ -37621,13 +37813,13 @@ function installedSurfacePluginVersion(surface) {
   }
   if (token === "hermes") return readHermesPluginEvidence().installedVersion;
   if (token === "cursor") {
-    return manifestVersion((0, import_node_path37.join)(cursorLocalPluginRoot(), ".cursor-plugin", "plugin.json"));
+    return manifestVersion((0, import_node_path38.join)(cursorLocalPluginRoot(), ".cursor-plugin", "plugin.json"));
   }
   if (token === "jervcode") {
     return installedJervCodePackageVersion();
   }
   if (token === "kimi") {
-    return manifestVersion((0, import_node_path37.join)(surfaceConfigRoot(surface), "plugins", "managed", "mmi", ".kimi-plugin", "plugin.json"));
+    return manifestVersion((0, import_node_path38.join)(surfaceConfigRoot(surface), "plugins", "managed", "mmi", ".kimi-plugin", "plugin.json"));
   }
   if (token === "claude") return installedClaudePluginVersion();
   if (token !== "codex") return void 0;
@@ -37661,7 +37853,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_path38.join)(root, ".gitignore");
 };
 function readGitignore() {
   const path2 = gitignorePath();
@@ -37683,7 +37875,7 @@ function writeGitignore(content) {
   }
 }
 function lineEndingState(root) {
-  const attributesPresent = (0, import_node_fs41.existsSync)((0, import_node_path37.join)(root, ".gitattributes"));
+  const attributesPresent = (0, import_node_fs41.existsSync)((0, import_node_path38.join)(root, ".gitattributes"));
   try {
     const output = execFileCapture("git", ["-C", root, "ls-files", "--eol", "--", ":(glob)**/*.sh"], {
       windowsHide: true
@@ -37759,7 +37951,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_path39.join)(home, ".claude", "plugins", ".mmi-env-heal.lock");
 }
 async function withEnvHealLock(what, run) {
   try {
@@ -37934,7 +38126,7 @@ 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_fs42.existsSync)((0, import_node_path38.join)(root, DOCS_INDEX_PATH))) return void 0;
+      if (!(0, import_node_fs42.existsSync)((0, import_node_path39.join)(root, DOCS_INDEX_PATH))) return void 0;
       const real = createDocsIndexDeps(root);
       let docs2;
       const listDocs = () => docs2 ??= real.listDocs();
@@ -37943,7 +38135,7 @@ function mmiDoctorDeps(opts = {}) {
     },
     // #4168: working-tree heal — write if drifted, then re-check. Commit remains the operator's step.
     healDocsIndex: (root) => {
-      if (!(0, import_node_fs42.existsSync)((0, import_node_path38.join)(root, DOCS_INDEX_PATH))) return { drift: false, docCount: 0 };
+      if (!(0, import_node_fs42.existsSync)((0, import_node_path39.join)(root, DOCS_INDEX_PATH))) return { drift: false, docCount: 0 };
       const real = createDocsIndexDeps(root);
       let docs2;
       const listDocs = () => docs2 ??= real.listDocs();
@@ -38040,7 +38232,18 @@ async function requireFreshTrainCli(commandName) {
     releasedVersion
   });
   if (report.ok) return;
-  throw new Error(staleTrainCliMessage(report, commandName));
+  if (process.env.MMI_TRAIN_NO_SELF_UPDATE === "1") {
+    throw new Error(staleTrainCliMessage(report, commandName));
+  }
+  const converge = await selfConvergeTrainCli({
+    currentVersion: resolveClientVersion(),
+    releasedVersion: report.releasedVersion,
+    commandName
+  });
+  if (converge.kind === "failed") {
+    throw new Error(`${commandName}: ${converge.error}. ${staleTrainCliMessage(report, commandName)}`);
+  }
+  process.exit(converge.reexecCode);
 }
 var cachedCommandPaths;
 function allCommandPaths() {
@@ -38253,7 +38456,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_path39.join)(process.cwd(), ".gitignore");
   const current = (0, import_node_fs42.existsSync)(path2) ? (0, import_node_fs42.readFileSync)(path2, "utf8") : null;
   const plan = planManagedGitignore(current);
   const drift = [...plan.added.map((l) => `+${l}`), ...plan.removed.map((l) => `-${l}`)].join(", ") || "block normalize";
@@ -38451,7 +38654,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_process17.spawn, execPath: process.execPath, scriptPath: process.argv[1] }, { cwd: process.cwd() });
+    spawnDetachedSelf(args, { spawn: import_node_child_process18.spawn, execPath: process.execPath, scriptPath: process.argv[1] }, { cwd: process.cwd() });
   } catch {
   }
 }
@@ -39666,11 +39869,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_path39.join)(cwd, ".github", "workflows");
   if (!(0, import_node_fs42.existsSync)(wfDir)) return [];
   return (0, import_node_fs42.readdirSync)(wfDir).filter((name) => /\.(ya?ml)$/i.test(name)).filter((name) => {
     try {
-      return workflowReportsPrChecks((0, import_node_fs42.readFileSync)((0, import_node_path38.join)(wfDir, name), "utf8"));
+      return workflowReportsPrChecks((0, import_node_fs42.readFileSync)((0, import_node_path39.join)(wfDir, name), "utf8"));
     } catch {
       return true;
     }
@@ -39736,16 +39939,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_path39.join)(root, path2);
       return (0, import_node_fs42.existsSync)(fullPath) ? (0, import_node_fs42.readFileSync)(fullPath, "utf8") : null;
     }
   };
 }
 function hubRoot() {
-  const fromPkg = (0, import_node_path38.join)(__dirname, "..", "..");
+  const fromPkg = (0, import_node_path39.join)(__dirname, "..", "..");
   const marker = "skills/bootstrap/seeds/manifest.json";
-  if ((0, import_node_fs42.existsSync)((0, import_node_path38.join)(fromPkg, marker))) return fromPkg;
-  if ((0, import_node_fs42.existsSync)((0, import_node_path38.join)(process.cwd(), marker))) return process.cwd();
+  if ((0, import_node_fs42.existsSync)((0, import_node_path39.join)(fromPkg, marker))) return fromPkg;
+  if ((0, import_node_fs42.existsSync)((0, import_node_path39.join)(process.cwd(), marker))) return process.cwd();
   return null;
 }
 async function waitLoopCorePool(label) {
@@ -40021,11 +40224,11 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
   const method = o.rebase ? "--rebase" : o.merge ? "--merge" : "--squash";
   const repoArgs = o.repo ? ["--repo", o.repo] : [];
   const repoForPostCleanup = await resolveRepo(o.repo) ?? o.repo;
-  const prMeta = await execFileP2("gh", ["pr", "view", number, ...repoArgs, "--json", "headRefName,baseRefName,headRefOid", "--jq", "{head: .headRefName, base: .baseRefName, oid: .headRefOid}"], { timeout: GC_GH_TIMEOUT_MS }).then((r) => JSON.parse(r.stdout)).catch(async (e) => {
+  const prMeta = await execFileP2("gh", ["pr", "view", number, ...repoArgs, "--json", "headRefName,baseRefName,headRefOid,state", "--jq", "{head: .headRefName, base: .baseRefName, oid: .headRefOid, state: .state}"], { timeout: GC_GH_TIMEOUT_MS }).then((r) => JSON.parse(r.stdout)).catch(async (e) => {
     if (!isGitHubRateLimitError(e) || !repoForPostCleanup) throw e;
     console.warn(`pr merge: gh GraphQL rate-limited \u2014 reading PR #${number} via REST instead (#4588).`);
     const snapshot = await fetchRestPrSnapshot(number, repoForPostCleanup);
-    return { head: snapshot.headRef, base: snapshot.baseRef, oid: snapshot.headSha };
+    return { head: snapshot.headRef, base: snapshot.baseRef, oid: snapshot.headSha, state: snapshot.merged ? "MERGED" : snapshot.state.toUpperCase() };
   });
   const headRef = prMeta.head;
   const baseRef = prMeta.base;
@@ -40060,6 +40263,11 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
     return;
   }
   if (closingGuardVerdict.message) console.warn(closingGuardVerdict.message);
+  if (prMeta.state !== "MERGED") {
+    if (!repoForPostCleanup) throw new Error("pr merge: repository is unreadable; cannot prove remote branch preservation");
+    const repoSettings = await defaultGitHubClient().rest("GET", `repos/${repoForPostCleanup}`);
+    assertRemoteBranchPreservedOnMerge(repoForPostCleanup, repoSettings.delete_branch_on_merge);
+  }
   const startingPath = (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
   const housekeeping = assertPrMergeHousekeepingClean(startingPath || process.cwd(), "pr merge", { force: o.force });
   const beforeWorktreesRead = await execFileP2("git", ["worktree", "list", "--porcelain"], { timeout: GIT_TIMEOUT_MS }).then((r) => ({ state: "ok", stdout: r.stdout })).catch((e) => ({ state: "failed", error: e.message || "git worktree list failed" }));
@@ -40107,7 +40315,7 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
   }
   const remoteBefore = await remoteBranchExists2(headRef);
   let upgradedToAuto = false;
-  let remoteNotAttemptedReason = "host-owned-lifecycle";
+  let remoteNotAttemptedReason = "preserved-delayed-cleanup";
   const overrideBody = mergeSquashBody ? { ...writeSquashBodyFile(mergeSquashBody), text: mergeSquashBody } : await composeOverrideBodyFile(
     number,
     repoArgs,
@@ -40326,7 +40534,7 @@ function trainApplyDeps() {
     run: async (file, args) => {
       const timeout = file === "node" && args[1] === "prepare" ? NODE_PREPARE_TIMEOUT_MS : file === "node" && args[1] === "verify" ? NODE_VERIFY_TIMEOUT_MS : file === "npm" ? NPM_TRAIN_TIMEOUT_MS : file === "bash" && args[0] === "scripts/jerv-gateway-release-deploy.sh" ? JERV_GATEWAY_DEPLOY_TIMEOUT_MS : file !== "gh" ? GIT_TIMEOUT_MS : args[0] === "run" && args[1] === "watch" ? GH_RUN_WATCH_TIMEOUT_MS : GH_TRAIN_TIMEOUT_MS;
       try {
-        return isWin2 && file === "npm" ? (await execFileP2("cmd.exe", ["/c", "npm", ...args], { timeout })).stdout : (await execFileP2(file, args, { timeout })).stdout;
+        return isWin3 && file === "npm" ? (await execFileP2("cmd.exe", ["/c", "npm", ...args], { timeout })).stdout : (await execFileP2(file, args, { timeout })).stdout;
       } catch (e) {
         throw surfaceTrainSubprocessFailure(e, file, args);
       }
@@ -40422,6 +40630,7 @@ function renderReleaseResume(r) {
   if (r.dispatch) lines.push(`  deploy: ${r.dispatch.note}`);
   if (r.devRollForward) lines.push(`  development: ${r.devRollForward.note}`);
   if (r.rcAlignment) lines.push(`  rc: ${r.rcAlignment.note}`);
+  if (r.checkout) lines.push(`  checkout: ${r.checkout.note}`);
   return lines.join("\n");
 }
 function renderReleaseAbort(r) {
@@ -40762,7 +40971,7 @@ function hotfixStatusDeps() {
     run: async (file, args) => {
       const timeout = file === "npm" ? STATUS_NPM_MS : file === "gh" ? STATUS_GH_MS : STATUS_GIT_MS;
       try {
-        return isWin2 && file === "npm" ? (await execFileP2("cmd.exe", ["/c", "npm", ...args], { timeout })).stdout : (await execFileP2(file, args, { timeout })).stdout;
+        return isWin3 && file === "npm" ? (await execFileP2("cmd.exe", ["/c", "npm", ...args], { timeout })).stdout : (await execFileP2(file, args, { timeout })).stdout;
       } catch (e) {
         throw surfaceTrainSubprocessFailure(e, file, args);
       }
@@ -40866,7 +41075,7 @@ access.command("audit").description("audit collaborator roles + train-branch pus
   if (!report.ok) process.exitCode = 1;
 });
 access.command("capabilities").description("enumerate your effective vault reach \u2014 every credential NAME + tier + scope you can read/use across project + org/master tiers (names only, no values) (#1615)").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--json", "machine-readable output").action((o) => withSecrets((d) => secretsCapabilities(d, o)));
-var isWin2 = process.platform === "win32";
+var isWin3 = process.platform === "win32";
 program2.command("doctor").description("safely heal active plugin wiring and report hygiene; repository cleanup requires explicit --apply (#5023), while version convergence belongs to `mmi-hub update`").option("--banner", "one-line resume summary; silent when all gates pass").option("--fast", "offline-safe fast lane; read-only, skips slow checks and network probes").option("--preflight", "read-only fast gate for automation: measures and reports with the shared exit code, zero writes").option("--verbose", "print the evidence behind every check \u2014 probes, resolved paths, versions compared, and the names behind each count (#2977)").option("--guide", "print the canonical MMI Agentic Onboarding URL").option("--json", "machine-readable output (an output format \u2014 repairs still run by lane)").option("--apply", "advanced explicit lane: also apply guarded repository maintenance (gitignore, docs index, board mechanics, merged branches, aged scratch); the host owns workspace cleanup").option("--no-repo-writes", "compatibility spelling for the safe default: env/plugin repairs only, never mutate the repository").option("--self", "verify CLI/plugin version parity and gh auth reach; suggests plugin-heal on a hard gap (reads the published version, so not offline-safe) (#2689)").addHelpText("after", "\nExit codes:\n  0  no hard gaps remain; advisory gaps may exist\n  1  one or more included hard checks failed\n\nA plain run may heal safe machine-global plugin wiring but never mutates the repository. Run\n`mmi-cli doctor --apply` only when you explicitly want the guarded full repository cleanup lane.\nCLI and host version convergence belongs to `mmi-hub update`; doctor reports lag and last-run evidence.\n--banner/--fast/--self/--preflight are read-only lanes.\n").action(async (opts) => {
   if (opts.guide) {
     consoleIo.log(`MMI Agentic Onboarding: ${CANONICAL_ONBOARDING_URL}`);
@@ -40897,7 +41106,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_path39.join)(path2, entry.name);
     if (entry.isDirectory()) total += directoryBytes(child2);
     else {
       try {
@@ -40927,7 +41136,7 @@ function pluginCacheFsDeps(configRoot, dirBytes) {
     dirBytes,
     listStagingDirs: (root) => (0, import_node_fs42.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_fs42.statSync)(p).mtimeMs) };
+        return { name: d.name, mtimeMs: newestMtimeMs((0, import_node_path39.join)(root, d.name), listDirEntries, (p) => (0, import_node_fs42.statSync)(p).mtimeMs) };
       } catch {
         return { name: d.name, mtimeMs: Date.now() };
       }
@@ -40941,7 +41150,7 @@ function stagingApplyFsGuard(configRoot) {
   return {
     referencedPaths: () => readInstalledPluginRefs(configRoot),
     mtimeMs: (name) => {
-      const p = (0, import_node_path38.join)(stagingRoot, name);
+      const p = (0, import_node_path39.join)(stagingRoot, name);
       if (!(0, import_node_fs42.existsSync)(p)) return null;
       try {
         return newestMtimeMs(p, listDirEntries, (q) => (0, import_node_fs42.statSync)(q).mtimeMs);

package/package.json

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