@mutmutco/cli 3.0.0 → 3.1.0

package/dist/main.cjs

@@ -6994,6 +6994,18 @@ var PR_LAND_POLL_MS = 3e4;
 var PR_LAND_ENQUEUE_TIMEOUT_MS = 10 * 6e4;
 var PR_LAND_STATE_READ_RETRIES = 3;
 var PR_LAND_STATE_READ_DELAY_MS = 2e3;
+var PR_LAND_MERGE_RETRY_DELAY_MS = 3e3;
+async function mergeAutoWithTransientRetry(prNumber, repo, deps) {
+  const first = await deps.mergeAuto(prNumber, repo);
+  if (first.mergeStatus !== "failed") return first;
+  const ready = await deps.probeMergeReady(prNumber, repo).catch(() => ({ open: false, mergeable: false, checksPassing: false }));
+  if (!ready.open || !ready.mergeable || !ready.checksPassing) return first;
+  const sleep = deps.sleep ?? ((ms) => new Promise((resolve6) => setTimeout(resolve6, ms)));
+  await sleep(PR_LAND_MERGE_RETRY_DELAY_MS);
+  const retried = await deps.mergeAuto(prNumber, repo);
+  if (retried.mergeStatus !== "failed") return retried;
+  return { mergeStatus: "failed", error: `merge retry after transient failure also failed: ${retried.error ?? first.error ?? "unknown error"}` };
+}
 async function readGhPrStateWithRetry(fetchState, options) {
   const retries = options?.retries ?? PR_LAND_STATE_READ_RETRIES;
   const delayMs = options?.delayMs ?? PR_LAND_STATE_READ_DELAY_MS;
@@ -7037,7 +7049,7 @@ async function runPrLand(prNumber, options, deps) {
       error: `checks-wait ${checksWait.status}${checksWait.detail ? `: ${checksWait.detail}` : ""}`
     };
   }
-  const merge = await deps.mergeAuto(prNumber, repo);
+  const merge = await mergeAutoWithTransientRetry(prNumber, repo, deps);
   base.mergeStatus = merge.mergeStatus;
   if (merge.mergeStatus === "failed") {
     return { ...base, error: merge.error ?? "merge failed" };
@@ -9411,7 +9423,7 @@ function trainPlan(command, options = {}) {
         { label: "merge development to main", gated: true },
         { label: "fold the version bump into the release commit (Hub: full distribution set; app repos: root package manifest) \u2014 runs inside the apply step, no separate bump PR", gated: true },
         { label: "tag release and publish GitHub Release", gated: true },
-        { label: "trigger the repo deploy path from the release event", command: "hub-serverless: deploy.yml + publish.yml auto-fire on the release; other models deploy via their own workflow", gated: true },
+        { label: "trigger the repo deploy path from the release event", command: "hub-serverless: deploy.yml + publish.yml auto-fire on the release; registry-publish: own publish.yml auto-fires, watched on that repo, never a central dispatch (#2428); other models deploy via their own workflow", gated: true },
         { label: "roll development forward", gated: true }
       ];
     }
@@ -9439,7 +9451,7 @@ function trainPlan(command, options = {}) {
       { label: "merge rc to main", gated: true },
       { label: "fold the version bump into the release commit (app repos: root package manifest) \u2014 runs inside the apply step, no separate bump PR", gated: true },
       { label: "tag release and publish GitHub Release", gated: true },
-      { label: "trigger the deploy path for this repo model, returning Hub Actions run id/url data (and, with --watch, its outcome)", command: "tenant-container: gh workflow run tenant-deploy.yml ... then gh run list/watch; hub-serverless: no manual dispatch, deploy.yml + publish.yml auto-fire on the release, correlate/watch those runs", gated: true },
+      { label: "trigger the deploy path for this repo model, returning Hub Actions run id/url data (and, with --watch, its outcome)", command: "tenant-container: gh workflow run tenant-deploy.yml ... then gh run list/watch; hub-serverless: no manual dispatch, deploy.yml + publish.yml auto-fire on the release, correlate/watch those runs; registry-publish: no manual dispatch, own publish.yml auto-fires on the release, correlate/watch that run on the product repo (#2428)", gated: true },
       { label: "roll development forward", gated: true }
     ];
   }
@@ -9684,6 +9696,12 @@ async function foldReleaseVersion(deps, model, tag, foldPaths) {
   for (const path2 of foldPaths) {
     await deps.run("git", ["add", "--", path2]).catch(() => void 0);
   }
+  const strayVersionEdits = (await deps.run("git", ["diff", "--name-only"])).split("\n").map((s) => s.trim()).filter(Boolean);
+  if (strayVersionEdits.length > 0) {
+    throw new Error(
+      `version fold left tracked changes outside the fold set uncommitted: ${strayVersionEdits.join(", ")}. The repo's \`version\` script modified paths the train does not stage (fold set: ${foldPaths.join(", ") || "(none)"}). Add them to that script's git-add list (or the fold set) so the release commit is complete \u2014 shipping now would tag a main whose version-lockstep check is red.`
+    );
+  }
   const staged = (await deps.run("git", ["diff", "--cached", "--name-only"])).trim();
   if (!staged) return `version fold: manifests already at ${version} \u2014 nothing committed`;
   await deps.run("git", ["commit", "-m", `chore(release): bump distribution to ${tag}`]);
@@ -9937,9 +9955,12 @@ var TRAIN_PROTECTION_CONTEXTS_JQ = "[.contexts[]]";
 var TRAIN_RULES_CONTEXTS_JQ = '[.[]|select(.type=="required_status_checks")|.parameters.required_status_checks[].context]';
 var TRAIN_CHECK_ATTEMPTS = 40;
 var TRAIN_CHECK_DELAY_MS = 15e3;
+var TRAIN_PR_ONLY_AUTOMATION_CONTEXTS = /* @__PURE__ */ new Set(["add-to-project", "mark-merged-pr-done"]);
+var TRAIN_PR_AUTOMATION_GRACE_ATTEMPTS = 3;
 async function correlateRun(deps, args) {
   const sleep = resolveSleep(deps);
   const threshold = args.since - CORRELATE_SKEW_SLACK_MS;
+  const repo = args.mode === "workflow" ? args.repo ?? HUB_REPO3 : HUB_REPO3;
   let lastError;
   let parsedAnyResponse = false;
   for (let attempt = 0; attempt < CORRELATE_ATTEMPTS; attempt++) {
@@ -9948,7 +9969,7 @@ async function correlateRun(deps, args) {
       "run",
       "list",
       "--repo",
-      HUB_REPO3,
+      repo,
       "--workflow",
       args.workflow,
       ...args.mode === "workflow" ? ["--event", args.event] : [],
@@ -9991,10 +10012,10 @@ function correlateControlRun(deps, since, titleIncludes) {
 async function correlateWorkflowRun(deps, args) {
   return correlateRun(deps, { ...args, mode: "workflow" });
 }
-async function watchTenantRun(deps, runId) {
+async function watchTenantRun(deps, runId, repo = HUB_REPO3) {
   if (runId == null) return "pending";
   try {
-    await deps.run("gh", ["run", "watch", String(runId), "--repo", HUB_REPO3, "--exit-status"]);
+    await deps.run("gh", ["run", "watch", String(runId), "--repo", repo, "--exit-status"]);
     return "success";
   } catch {
     return "failure";
@@ -10007,9 +10028,9 @@ async function fetchControlRunLog(deps, runId) {
     return "";
   }
 }
-async function watchWorkflowRun(deps, workflow, run) {
+async function watchWorkflowRun(deps, workflow, run, repo = HUB_REPO3) {
   if (run.runId == null) return { workflow, conclusion: "pending" };
-  const conclusion = await watchTenantRun(deps, run.runId);
+  const conclusion = await watchTenantRun(deps, run.runId, repo);
   return { workflow, runId: run.runId, runUrl: run.runUrl, conclusion };
 }
 function aggregateWorkflowRuns(runs) {
@@ -10068,7 +10089,7 @@ async function rollDevelopmentForward(deps, ctx, tag) {
       status: "pr-pending",
       prNumber: existing.number,
       prUrl: existing.url,
-      note: `alignment PR already open: ${existing.url} \u2014 land it with \`gh pr merge ${existing.number} --merge\``
+      note: `alignment PR already open: ${existing.url} \u2014 land it with \`mmi-cli pr merge ${existing.number} --auto --merge\``
     };
   }
   const ahead = clean(await deps.run("git", ["rev-list", "--count", "origin/development..main"]));
@@ -10077,14 +10098,14 @@ async function rollDevelopmentForward(deps, ctx, tag) {
   }
   const body = `Carries the ${tag} release (including the version fold) from \`main\` back to \`development\`.
 
-\`development\` requires status checks, so the release train opens this alignment PR instead of a direct push of the un-checked merge commit (#1143). Land it with a **true merge** (\`gh pr merge --merge\`, not squash) so the merge parentage survives and the misalignment guard stays satisfied.`;
+\`development\` requires status checks, so the release train opens this alignment PR instead of a direct push of the un-checked merge commit (#1143). Land it with a **true merge** \u2014 \`mmi-cli pr merge <n> --auto --merge\` (not squash) so the merge parentage survives and the misalignment guard stays satisfied. \`--auto\` waits out the checks this PR triggers, which otherwise block an immediate merge right after the release.`;
   const url = clean(await deps.run("gh", ["pr", "create", "--repo", ctx.repo, "--base", "development", "--head", "main", "--title", `chore(release): align development to ${tag}`, "--body", body]));
   const number = parsePrNumber(url);
   return {
     status: "pr-pending",
     prNumber: number,
     prUrl: url || void 0,
-    note: `development requires checks (${required.join(", ")}); opened alignment PR ${url || "(url unavailable)"} \u2014 land it with \`gh pr merge ${number ?? "<number>"} --merge\``
+    note: `development requires checks (${required.join(", ")}); opened alignment PR ${url || "(url unavailable)"} \u2014 land it with \`mmi-cli pr merge ${number ?? "<number>"} --auto --merge\``
   };
 }
 function resolveContextState(context, checkRuns, statuses) {
@@ -10118,6 +10139,7 @@ async function waitForRequiredTrainChecks(deps, ctx, sha, required) {
   let lastStatus = "not checked";
   let lastError;
   const everObserved = /* @__PURE__ */ new Set();
+  const autoSatisfied = /* @__PURE__ */ new Set();
   for (let attempt = 0; attempt < TRAIN_CHECK_ATTEMPTS; attempt++) {
     if (attempt > 0) await sleep(TRAIN_CHECK_DELAY_MS);
     let checkRuns;
@@ -10139,18 +10161,25 @@ async function waitForRequiredTrainChecks(deps, ctx, sha, required) {
     for (const c of required) {
       if (checkRuns.some((r) => r.name === c) || statuses.some((s) => s.context === c)) everObserved.add(c);
     }
-    const states = required.map((c) => [c, resolveContextState(c, checkRuns, statuses)]);
-    lastStatus = states.map(([c, s]) => `${c}=${s}`).join(", ");
+    if (attempt >= TRAIN_PR_AUTOMATION_GRACE_ATTEMPTS - 1) {
+      for (const c of required) {
+        if (TRAIN_PR_ONLY_AUTOMATION_CONTEXTS.has(c) && !everObserved.has(c)) autoSatisfied.add(c);
+      }
+    }
+    const pending = required.filter((c) => !autoSatisfied.has(c));
+    const states = pending.map((c) => [c, resolveContextState(c, checkRuns, statuses)]);
+    const satisfiedNote = autoSatisfied.size ? `, auto-satisfied (never runs on a tag, see #2404): ${[...autoSatisfied].join(", ")}` : "";
+    lastStatus = `${states.map(([c, s]) => `${c}=${s}`).join(", ")}${satisfiedNote}`;
     const failed = states.filter(([, s]) => s === "failed").map(([c]) => c);
     if (failed.length > 0) {
       throw new Error(`required train check failed: ${failed.join(", ")} (${lastStatus})`);
     }
     if (states.every(([, s]) => s === "success")) {
-      return `required checks passed: ${required.join(", ")}`;
+      return `required checks passed: ${pending.join(", ") || "(none pending)"}${satisfiedNote}`;
     }
   }
   const waitedMin = Math.round((TRAIN_CHECK_ATTEMPTS - 1) * TRAIN_CHECK_DELAY_MS / 6e4);
-  const neverMaterialized = required.filter((c) => !everObserved.has(c));
+  const neverMaterialized = required.filter((c) => !everObserved.has(c) && !autoSatisfied.has(c));
   const neverNote = neverMaterialized.length ? ` Never materialized on ${sha} (no check-run or commit status ever appeared \u2014 the workflow that produces them was likely not triggered by the tag event): ${neverMaterialized.join(", ")}.` : "";
   throw new Error(
     `timed out after ~${waitedMin}m (${TRAIN_CHECK_ATTEMPTS} attempts) waiting for required train checks on ${sha}.${neverNote} Last observed: ${lastError ? `error: ${lastError}` : lastStatus}`
@@ -10240,6 +10269,19 @@ function tenantPublishRecoveryCommand(slug, repo, ref, stage2, publishDir) {
   if (publishDir && publishDir !== ".") parts.push(`-f publishDir=${publishDir}`);
   return parts.join(" ");
 }
+var PUBLISH_IDEMPOTENT_MARKER = /already on npm/i;
+var PUBLISH_LOG_RETRY_ATTEMPTS = 4;
+var PUBLISH_LOG_RETRY_DELAY_MS = 6e3;
+async function reconcilePublishFailure(deps, runId) {
+  if (runId == null) return "failure";
+  const sleep = resolveSleep(deps);
+  for (let attempt = 0; attempt < PUBLISH_LOG_RETRY_ATTEMPTS; attempt++) {
+    if (attempt > 0) await sleep(PUBLISH_LOG_RETRY_DELAY_MS);
+    const log = await fetchControlRunLog(deps, runId);
+    if (PUBLISH_IDEMPOTENT_MARKER.test(log)) return "success";
+  }
+  return "failure";
+}
 async function dispatchTenantPublish(deps, ctx, stage2, ref, watch, dispatchFailure = "throw", publishDir) {
   const since = (deps.now ?? Date.now)();
   const dispatchArgs = [
@@ -10270,8 +10312,16 @@ async function dispatchTenantPublish(deps, ctx, stage2, ref, watch, dispatchFail
     };
   }
   const { runId, runUrl } = await correlatePublishRun(deps, since, [ctx.slug, stage2]);
-  const deployStatus = watch ? await watchTenantRun(deps, runId) : "pending";
-  return { note: `dispatched tenant-publish.yml (slug=${ctx.slug}, ref=${ref}, stage=${stage2})`, runId, runUrl, deployStatus };
+  let deployStatus = watch ? await watchTenantRun(deps, runId) : "pending";
+  let note = `dispatched tenant-publish.yml (slug=${ctx.slug}, ref=${ref}, stage=${stage2})`;
+  if (deployStatus === "failure") {
+    const reconciled = await reconcilePublishFailure(deps, runId);
+    if (reconciled === "success") {
+      deployStatus = "success";
+      note = `${note}; run reported failure but its log confirms the version is already on npm (idempotent E409 \u2014 #2428)`;
+    }
+  }
+  return { note, runId, runUrl, deployStatus };
 }
 async function dispatchPublishIfRequired(deps, ctx, meta, model, stage2, publishRef, watch, dispatchFailure) {
   if (!meta.publishRequired || stage2 !== "main") return null;
@@ -10288,6 +10338,18 @@ function appendPublishDispatch(deploy, publish) {
     deployStatus: deploy.deployStatus === "failure" || publish.deployStatus === "failure" ? "failure" : deploy.deployStatus === "pending" || publish.deployStatus === "pending" ? "pending" : "success"
   };
 }
+async function watchOwnWorkflowRuns(deps, repo, targets, since, headSha) {
+  const workflowRuns = [];
+  for (const target of targets) {
+    try {
+      const run = await correlateWorkflowRun(deps, { ...target, since, headSha, repo });
+      workflowRuns.push(await watchWorkflowRun(deps, target.workflow, run, repo));
+    } catch {
+      workflowRuns.push({ workflow: target.workflow, conclusion: "failure" });
+    }
+  }
+  return workflowRuns;
+}
 async function dispatchDeploy(deps, ctx, stage2, ref, model, watch, autoRunSince, autoRunHeadSha, dispatchFailure = "throw", publishDir) {
   if (model === "tenant-container" || model === "solo-container") {
     const since = (deps.now ?? Date.now)();
@@ -10306,7 +10368,18 @@ async function dispatchDeploy(deps, ctx, stage2, ref, model, watch, autoRunSince
     return { note: `dispatched tenant-deploy.yml (slug=${ctx.slug}, ref=${ref}, stage=${stage2})`, runId, runUrl, deployStatus };
   }
   if (model === "registry-publish") {
-    return dispatchTenantPublish(deps, ctx, stage2, ref, watch, dispatchFailure, publishDir);
+    const note = ref === "rc" ? "no dispatch on rc: registry-publish repos have no rc-stage Release to publish from" : "no central dispatch: this repo's own publish.yml auto-fires on the published Release (#2428)";
+    if (ref === "rc" || !watch || !autoRunHeadSha) return { note, deployStatus: "pending" };
+    const since = autoRunSince ?? (deps.now ?? Date.now)();
+    const workflowRuns = await watchOwnWorkflowRuns(
+      deps,
+      ctx.repo,
+      [{ workflow: "publish.yml", event: "release" }],
+      since,
+      autoRunHeadSha
+    );
+    const primary = workflowRuns[0];
+    return { note, runId: primary?.runId, runUrl: primary?.runUrl, workflowRuns, deployStatus: aggregateWorkflowRuns(workflowRuns) };
   }
   if (model === "hub-serverless") {
     const note = ref === "rc" ? "no manual dispatch: deploy.yml auto-fires on the rc push (rc stage)" : "no manual dispatch: deploy.yml + publish.yml auto-fire on the published Release (prod)";
@@ -10317,15 +10390,7 @@ async function dispatchDeploy(deps, ctx, stage2, ref, model, watch, autoRunSince
       { workflow: "deploy.yml", event: "release" },
       { workflow: "publish.yml", event: "release" }
     ];
-    const workflowRuns = [];
-    for (const target of targets) {
-      try {
-        const run = await correlateWorkflowRun(deps, { ...target, since, headSha: autoRunHeadSha });
-        workflowRuns.push(await watchWorkflowRun(deps, target.workflow, run));
-      } catch {
-        workflowRuns.push({ workflow: target.workflow, conclusion: "failure" });
-      }
-    }
+    const workflowRuns = await watchOwnWorkflowRuns(deps, HUB_REPO3, targets, since, autoRunHeadSha);
     const primary = workflowRuns[0];
     return {
       note,
@@ -11159,7 +11224,11 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
       runs.push(await watchReleaseRun(deps, ctx, workflow, mergedSha));
     }
     deployNote = "watched release-triggered deploy.yml + publish.yml";
-  } else if (deployModel === "tenant-container" || deployModel === "solo-container" || deployModel === "registry-publish") {
+  } else if (deployModel === "registry-publish") {
+    const run = await watchReleaseRun(deps, ctx, "publish.yml", mergedSha);
+    runs.push(run);
+    deployNote = "watched this repo's own release-triggered publish.yml (#2428 \u2014 no central dispatch)";
+  } else if (deployModel === "tenant-container" || deployModel === "solo-container") {
     const meta = requireProjectMetaForTrain(await loadProjectMeta(deps, ctx), ctx.repo);
     const deploy = await dispatchDeploy(
       deps,
@@ -11175,7 +11244,7 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
     );
     const publish = deploy.deployStatus === "success" ? await dispatchPublishIfRequired(deps, ctx, meta, deployModel, "main", tag, true, "report") : null;
     let dispatch = appendPublishDispatch(deploy, publish);
-    if (!publish && deploy.deployStatus !== "success" && meta.publishRequired && (deployModel === "tenant-container" || deployModel === "solo-container")) {
+    if (!publish && deploy.deployStatus !== "success" && meta.publishRequired) {
       const reason = deploy.deployStatus === "failure" ? "box deploy failed \u2014 redeploy the box before publishing" : "box deploy not confirmed (run with --watch) \u2014 publish after the box deploy lands";
       dispatch = {
         ...dispatch,
@@ -11183,25 +11252,17 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
       };
     }
     deployNote = dispatch.note;
-    if (deployModel !== "registry-publish") {
-      runs.push({
-        workflow: "tenant-deploy.yml",
-        url: deploy.runUrl,
-        conclusion: deploy.deployStatus === "success" ? "success" : deploy.deployStatus === "failure" ? "failure" : deploy.deployStatus ?? "pending"
-      });
-    }
+    runs.push({
+      workflow: "tenant-deploy.yml",
+      url: deploy.runUrl,
+      conclusion: deploy.deployStatus === "success" ? "success" : deploy.deployStatus === "failure" ? "failure" : deploy.deployStatus ?? "pending"
+    });
     if (publish?.runUrl) {
       runs.push({
         workflow: "tenant-publish.yml",
         url: publish.runUrl,
         conclusion: publish.deployStatus === "success" ? "success" : publish.deployStatus === "failure" ? "failure" : publish.deployStatus ?? "pending"
       });
-    } else if (deployModel === "registry-publish") {
-      runs.push({
-        workflow: "tenant-publish.yml",
-        url: deploy.runUrl,
-        conclusion: deploy.deployStatus === "success" ? "success" : deploy.deployStatus === "failure" ? "failure" : deploy.deployStatus ?? "pending"
-      });
     }
   } else {
     deployNote = `no hotfix deploy dispatch for deployModel=${deployModel} \u2014 prod deploy is repo-specific`;
@@ -15323,10 +15384,12 @@ function isSemverVersion2(v) {
 function staleRecordCommand(surface) {
   return surface === "codex" ? CODEX_PLUGIN_RECOVERY : CLAUDE_PLUGIN_RECOVERY;
 }
+var CLAUDE_UPDATE_BUTTON_WARNING = "Windows: do NOT use the in-app Update button for this plugin (#2411, hits the #1126 MAX_PATH nesting bug) \u2014 run `mmi-cli doctor --apply` instead";
 function staleSurfacesFix(stale, releasedVersion) {
   const parts = stale.map((s) => {
     const at = s.recordPath ? ` (${s.recordPath})` : "";
-    return `${s.surface} record${at} is at ${s.installedVersion}${releasedVersion ? ` < ${releasedVersion}` : ""} \u2014 run: ${staleRecordCommand(s.surface)}`;
+    const warning = s.surface === "claude" ? ` \u2014 ${CLAUDE_UPDATE_BUTTON_WARNING}` : "";
+    return `${s.surface} record${at} is at ${s.installedVersion}${releasedVersion ? ` < ${releasedVersion}` : ""} \u2014 run: ${staleRecordCommand(s.surface)}${warning}`;
   });
   return `stale installed-plugin record on ${stale.map((s) => s.surface).join(" + ")}: ${parts.join("; ")}`;
 }
@@ -15368,18 +15431,71 @@ function buildInstalledPluginVersionCheck(input) {
     staleSurfaces: stale
   };
 }
+var MANAGED_PLUGINS = [
+  {
+    // Marketplace-qualified key exactly as installed_plugins.json stores it (same convention as
+    // MMI_PLUGIN_ID = 'mmi@mutmutco') — a bare 'jervaise-powertools' would never match a real record
+    // and the check would be a permanent no-op. The same `<marketplace>/<name>` segments also address its
+    // Cursor Team Marketplace cache dir (~/.cursor/plugins/cache/jervaise/jervaise-powertools/<version>/).
+    id: "jervaise-powertools@jervaise",
+    label: "jervaise-powertools",
+    healCommand: "jerv-cli doctor --apply",
+    opencodePackage: "@jervaise/opencode-jerv"
+  }
+];
+function parseManagedPluginId(id) {
+  const at = id.lastIndexOf("@");
+  if (at <= 0 || at === id.length - 1) return null;
+  return { name: id.slice(0, at), marketplace: id.slice(at + 1) };
+}
+var MANAGED_PLUGIN_DRIFT_LABEL = "managed org plugin version drift (cross-surface)";
+function managedPluginDriftFix(drifted) {
+  return drifted.map((d) => {
+    const versions = d.versions.map((v) => `${v.version} (${v.surface})`).join(" vs ");
+    return `${d.label} drift: ${versions} \u2192 run \`${d.healCommand}\``;
+  }).join(" ; ");
+}
+function buildManagedPluginDriftCheck(input) {
+  const base = { ok: true, label: MANAGED_PLUGIN_DRIFT_LABEL, fix: "" };
+  if (!input.isOrgRepo) return base;
+  const registry2 = input.plugins ?? MANAGED_PLUGINS;
+  const drifted = [];
+  const normalize = (v) => v.replace(/^v/, "");
+  for (const descriptor of registry2) {
+    const versions = [];
+    for (const source of input.sources) {
+      if (source.directVersions && descriptor.id in source.directVersions) {
+        const version2 = source.directVersions[descriptor.id];
+        if (isSemverVersion2(version2)) versions.push({ surface: source.surface, version: normalize(version2) });
+        continue;
+      }
+      const records = source.installed?.plugins?.[descriptor.id];
+      if (!Array.isArray(records) || records.length === 0) continue;
+      const recordVersion = bestRecord(records).version;
+      const version = isSemverVersion2(recordVersion) ? recordVersion : highestSemver(source.cacheVersions?.[descriptor.id] ?? []);
+      if (!isSemverVersion2(version)) continue;
+      versions.push({ surface: source.surface, version: normalize(version) });
+    }
+    if (versions.length < 2) continue;
+    const distinctVersions = new Set(versions.map((v) => v.version));
+    if (distinctVersions.size < 2) continue;
+    drifted.push({ pluginId: descriptor.id, label: descriptor.label, healCommand: descriptor.healCommand, versions });
+  }
+  if (drifted.length === 0) return base;
+  return { ...base, ok: false, fix: managedPluginDriftFix(drifted), drifted };
+}
 var OPENCODE_VERSION_LABEL = "installed OpenCode MMI adapter version (vs latest release)";
 function buildOpencodeVersionCheck(input) {
   const fix = pluginRecoveryFix("opencode");
   const base = { ok: true, label: OPENCODE_VERSION_LABEL, fix };
   if (!input.isOrgRepo || !isSemverVersion2(input.releasedVersion)) return base;
   if (!isSemverVersion2(input.installedVersion)) {
-    return { ...base, ok: false, releasedVersion: input.releasedVersion };
+    return { ...base, ok: false, severityOverride: "hard", releasedVersion: input.releasedVersion };
   }
   if (compareVersions(input.installedVersion, input.releasedVersion) >= 0) {
     return { ...base, installedVersion: input.installedVersion, releasedVersion: input.releasedVersion };
   }
-  return { ...base, ok: false, installedVersion: input.installedVersion, releasedVersion: input.releasedVersion };
+  return { ...base, ok: false, severityOverride: "hard", installedVersion: input.installedVersion, releasedVersion: input.releasedVersion };
 }
 function pickOpencodeActiveVersion(input) {
   for (const value of [input.envStamp, input.cacheVersion, input.diskVersion]) {
@@ -15628,9 +15744,10 @@ function buildCursorPluginInstallCheck(input) {
     return {
       ...base,
       ok: false,
+      severityOverride: "advisory",
       cacheRoot: input.cacheRoot,
       pins: input.pins,
-      fix: `Cursor MMI plugin cache is behind ${input.releasedVersion} (${stale}) \u2014 run \`mmi-cli doctor --apply\` to seed the cache from the latest release (effective after restart Cursor); when Dashboard \u2192 Settings \u2192 Plugins shows Update next to the MMI Team Marketplace, a master-admin can refresh the pin there instead; ${CURSOR_MARKETPLACE_INSTALL_GUIDE}`
+      fix: `Cursor MMI plugin cache is behind ${input.releasedVersion} (${stale}) \u2014 run \`mmi-cli doctor --apply\` to seed the cache from the latest release (effective after restart Cursor); cache healthy after that, but the Team Marketplace REGISTRATION may still show stale \u2014 a master-admin must manually refresh it: Cursor Settings \u2192 Plugins \u2192 Marketplace, click Update next to the MMI Team Marketplace (no per-user CLI exists to do this automatically, #2409); ${CURSOR_MARKETPLACE_INSTALL_GUIDE}`
     };
   }
   return { ...base, cacheRoot: input.cacheRoot, pins: input.pins };
@@ -15824,6 +15941,30 @@ function preflightOutcome(input) {
 function pluginAutonomousHaltLine(reloadHint) {
   return `\u26A0 PLUGIN RELOAD REQUIRED \u2014 mmi:* skills and agent types are unavailable until you ${reloadHint}. Halt autonomous /grind and /build until then.`;
 }
+var DOCTOR_EXTENDED_CHECK_LABELS = /* @__PURE__ */ new Set([
+  AWS_CROSS_ACCOUNT_LABEL,
+  HUB_DEPLOY_FRESHNESS_LABEL,
+  PLAYWRIGHT_MCP_VISION_CAP_LABEL,
+  PLAYWRIGHT_MCP_OUTPUT_DIR_LABEL,
+  BROWSER_ARTIFACTS_LABEL,
+  SCRATCH_GC_LABEL,
+  GIT_GC_LABEL,
+  OPENCODE_VERSION_LABEL,
+  OPENCODE_DESKTOP_BOOTSTRAP_LABEL
+]);
+function isDoctorExtendedCheck(label) {
+  if (DOCTOR_EXTENDED_CHECK_LABELS.has(label)) return true;
+  if (label.startsWith(HUB_DEPLOY_FRESHNESS_LABEL)) return true;
+  if (label.startsWith("@mutmutco design-system") || label.startsWith("@mutmutco registry components")) return true;
+  return false;
+}
+function isAdvisoryDoctorCheck(check) {
+  if (check.severityOverride) return check.severityOverride === "advisory";
+  return isDoctorExtendedCheck(check.label);
+}
+function doctorExitCode(checks) {
+  return checks.some((c) => !c.ok && !isAdvisoryDoctorCheck(c)) ? 1 : 0;
+}
 function renderPluginUpdateReportStaleOnly(report) {
   const v = report.versions;
   const released = v.released;
@@ -15838,24 +15979,97 @@ function renderPluginUpdateReportStaleOnly(report) {
   return ["Update commands (stale surfaces):", ...blocks];
 }
 var DOCTOR_VERBOSE_HINT = "Run mmi-cli doctor --verbose for the full audit checklist + version report.";
-function renderTerseDoctorReport(input) {
-  const cliVersion = input.updateReport.versions.cli;
-  const versionSuffix = cliVersion ? ` (mmi-cli ${cliVersion})` : "";
-  if (!input.gaps.length) {
-    return [`\u2713 MMI doctor: all checks passed${versionSuffix}.`, DOCTOR_VERBOSE_HINT];
+function doctorCheckGlyph(check) {
+  if (check.ok) return "\u2713";
+  return isAdvisoryDoctorCheck(check) ? "\u26A0" : "\u2717";
+}
+function doctorVerdictLine(input) {
+  const gaps = input.checks.filter((c) => !c.ok);
+  const hardGaps = gaps.filter((c) => !isAdvisoryDoctorCheck(c));
+  const softGaps = gaps.filter((c) => isAdvisoryDoctorCheck(c));
+  if (input.shouldApply) {
+    if (hardGaps.length > 0) {
+      return `\u2717 ${hardGaps.length} repair${hardGaps.length === 1 ? "" : "s"} failed \u2014 see the items above.`;
+    }
+    if (softGaps.length > 0) {
+      return `\u26A0 Healed what I could; ${softGaps.length} item${softGaps.length === 1 ? "" : "s"} still need${softGaps.length === 1 ? "s" : ""} attention (above).`;
+    }
+    const healed = input.healedCount ?? 0;
+    if (healed > 0) return `\u2713 Healed ${healed} item${healed === 1 ? "" : "s"} \u2014 everything checks out now.`;
+    return "\u2713 Everything healthy \u2014 nothing needed fixing.";
   }
-  const lines = [];
-  for (const c of input.gaps) {
-    lines.push(`\u2717 ${c.label}`);
-    lines.push(`   \u2192 ${c.fix}`);
+  const attention = gaps.length;
+  if (attention > 0) {
+    return `\u26A0 ${attention} item${attention === 1 ? " needs" : "s need"} attention \u2014 run \`mmi-cli doctor --apply\` to heal.`;
+  }
+  return "\u2713 Everything healthy.";
+}
+function doctorHumanLines(input) {
+  const gaps = input.checks.filter((c) => !c.ok);
+  const lines = [
+    doctorVerdictLine({ checks: input.checks, shouldApply: input.shouldApply, healedCount: input.healedCount }),
+    "",
+    "Checks",
+    ...input.checks.map((c) => `  ${doctorCheckGlyph(c)} ${c.label}`)
+  ];
+  if (gaps.length > 0) {
+    lines.push("", input.shouldApply ? "Repairs" : "Will fix on --apply");
+    for (const c of gaps) {
+      const mark = input.shouldApply ? isAdvisoryDoctorCheck(c) ? "\u26A0" : "\u2717" : "\u2192";
+      lines.push(`  ${mark} ${c.label} \u2014 ${c.fix}`);
+    }
+  }
+  if (input.shouldApply && input.pluginReloadRequired) {
+    lines.push("", `\u21BB ${input.reloadHint ?? "reload"} so the healed plugin/MCP installs load.`);
   }
   const stale = renderPluginUpdateReportStaleOnly(input.updateReport);
   if (stale.length) {
-    lines.push("");
-    lines.push(...stale);
+    lines.push("", ...stale);
+  } else if (!input.verbose) {
+    lines.push("", DOCTOR_VERBOSE_HINT);
+  }
+  if (!input.verbose) return lines;
+  lines.push("", ...renderPluginUpdateReport(input.updateReport));
+  lines.push(
+    "",
+    doctorSummaryLine({ checks: input.checks, updateReport: input.updateReport, shouldApply: input.shouldApply, healedCount: input.healedCount }),
+    ...doctorAuditLines({
+      checks: input.checks,
+      shouldApply: input.shouldApply,
+      healedCount: input.healedCount,
+      cliVersion: input.updateReport.versions.cli,
+      releasedVersion: input.updateReport.versions.released
+    })
+  );
+  return lines;
+}
+function doctorSummaryLine(input) {
+  const gaps = input.checks.filter((c) => !c.ok);
+  const mode = input.shouldApply ? "apply" : "plan";
+  const released = input.updateReport.versions.released ?? "unknown";
+  const failed = gaps.filter((c) => !isAdvisoryDoctorCheck(c)).length;
+  const countSummary = input.shouldApply ? `${input.healedCount ?? 0} healed` : `${gaps.length} planned`;
+  return `summary: mode ${mode} \xB7 released ${released} \xB7 ${countSummary} \xB7 ${failed} failed`;
+}
+function doctorAuditLines(input) {
+  const gaps = input.checks.filter((c) => !c.ok);
+  const failed = gaps.filter((c) => !isAdvisoryDoctorCheck(c)).length;
+  const lines = [
+    "MMI doctor audit",
+    `mode: ${input.shouldApply ? "apply" : "plan"}`,
+    `cli: ${input.cliVersion ?? "unknown"}`,
+    `released: ${input.releasedVersion ?? "unknown"}`,
+    `checks: ${input.checks.length} (${input.checks.length - gaps.length} ok, ${gaps.length} gap)`,
+    `planned actions: ${gaps.length}`,
+    `healed actions: ${input.healedCount ?? 0}`,
+    `failed actions: ${failed}`
+  ];
+  if (gaps.length) {
+    lines.push("actions:");
+    for (const c of gaps) {
+      lines.push(`[${isAdvisoryDoctorCheck(c) ? "advisory" : "auto"}] ${c.label}: ${c.fix}`);
+    }
   }
-  lines.push("");
-  lines.push(`\u26A0 ${input.gaps.length} item(s) need attention \u2014 ${DOCTOR_VERBOSE_HINT}`);
   return lines;
 }
 var PLUGIN_RESOLVABILITY_LABEL = "MMI plugin resolvability (marketplace + cache present)";
@@ -16240,6 +16454,77 @@ function installedPluginSources() {
     }
   });
 }
+function managedPluginSurfaceSources() {
+  const claudeCodex = installedPluginSources().map(({ surface, installed }) => {
+    const cacheVersions = {};
+    for (const descriptor of MANAGED_PLUGINS) {
+      const segments = parseManagedPluginId(descriptor.id);
+      if (!segments) continue;
+      try {
+        cacheVersions[descriptor.id] = (0, import_node_fs17.readdirSync)(
+          (0, import_node_path17.join)((0, import_node_os6.homedir)(), `.${surface}`, "plugins", "cache", segments.marketplace, segments.name),
+          { withFileTypes: true }
+        ).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
+      } catch {
+      }
+    }
+    return { surface, installed, cacheVersions };
+  });
+  return [
+    ...claudeCodex,
+    { surface: "cursor", directVersions: managedPluginCursorDirectVersions() },
+    { surface: "opencode", directVersions: managedPluginOpencodeDirectVersions() }
+  ];
+}
+function managedPluginCursorDirectVersions() {
+  const out = {};
+  for (const descriptor of MANAGED_PLUGINS) {
+    const segments = parseManagedPluginId(descriptor.id);
+    if (!segments) continue;
+    try {
+      const versions = (0, import_node_fs17.readdirSync)(
+        (0, import_node_path17.join)((0, import_node_os6.homedir)(), ".cursor", "plugins", "cache", segments.marketplace, segments.name),
+        { withFileTypes: true }
+      ).filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).map((entry) => entry.name);
+      out[descriptor.id] = highestSemver(versions);
+    } catch {
+    }
+  }
+  return out;
+}
+function managedPluginOpencodeDirectVersions() {
+  const out = {};
+  for (const descriptor of MANAGED_PLUGINS) {
+    if (!descriptor.opencodePackage) continue;
+    out[descriptor.id] = readOpencodePackageVersion(descriptor.opencodePackage);
+  }
+  return out;
+}
+function readOpencodePackageVersionFrom(packageJsonPath) {
+  try {
+    const parsed = JSON.parse((0, import_node_fs17.readFileSync)(packageJsonPath, "utf8"));
+    return typeof parsed.version === "string" && parsed.version.trim() ? parsed.version.trim() : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function readOpencodePackageVersion(packageName) {
+  const [scope, name] = packageName.startsWith("@") ? packageName.slice(1).split("/", 2) : [void 0, packageName];
+  if (!name) return void 0;
+  const diskCandidates = [
+    (0, import_node_path17.join)(opencodeConfigDir(), "node_modules", ...scope ? [`@${scope}`] : [], name, "package.json"),
+    (0, import_node_path17.join)((0, import_node_os6.homedir)(), ".cache", "opencode", "node_modules", ...scope ? [`@${scope}`] : [], name, "package.json")
+  ];
+  const diskVersion = diskCandidates.map(readOpencodePackageVersionFrom).find((v) => v !== void 0);
+  const packagesRoot = (0, import_node_path17.join)((0, import_node_os6.homedir)(), ".cache", "opencode", "packages", ...scope ? [`@${scope}`] : []);
+  let cacheVersion;
+  try {
+    const cacheVersions = (0, import_node_fs17.readdirSync)(packagesRoot, { withFileTypes: true }).filter((e) => e.isDirectory() && e.name.startsWith(`${name}@`) && !e.name.startsWith(".")).map((e) => readOpencodePackageVersionFrom((0, import_node_path17.join)(packagesRoot, e.name, "node_modules", ...scope ? [`@${scope}`] : [], name, "package.json"))).filter((v) => Boolean(v));
+    if (cacheVersions.length) cacheVersion = cacheVersions.reduce((lowest, v) => compareVersions(v, lowest) < 0 ? v : lowest);
+  } catch {
+  }
+  return pickOpencodeActiveVersion({ cacheVersion, diskVersion });
+}
 function readClaudeSettings() {
   try {
     return JSON.parse((0, import_node_fs17.readFileSync)((0, import_node_path17.join)(process.cwd(), ".claude", "settings.json"), "utf8"));
@@ -16698,7 +16983,6 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
   const repairLocal = !opts.json || Boolean(opts.apply) || Boolean(opts.preflight);
   const repoWritesAllowed = !opts.noRepoWrites;
   const runExtended = Boolean(opts.verbose) || Boolean(opts.json);
-  const terseOutput = !opts.verbose && !opts.json && !opts.banner && !opts.preflight;
   const checks = [];
   const REWRITE_KEY = "url.https://github.com/.insteadOf";
   const CLONE_FIX = 'run: git config --global url."https://github.com/".insteadOf "git@github.com:"';
@@ -16768,6 +17052,10 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
   const markPluginReloadRequired = () => {
     pluginReloadRequired = true;
   };
+  let healedCount = 0;
+  const markHealed = () => {
+    healedCount += 1;
+  };
   let versionReport = buildVersionLagReport({
     currentVersion: resolveClientVersion(),
     repoVersion: readRepoVersion(),
@@ -16820,6 +17108,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
     try {
       await execFileP2("git", ["config", "--global", "--add", REWRITE_KEY, "git@github.com:"]);
       cloneOk = true;
+      markHealed();
       io.err("  \u21BB repaired: git insteadOf git@github.com \u2192 https (plugin clone over HTTPS)");
     } catch {
     }
@@ -16838,6 +17127,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
   if (!pluginCheck.ok && pluginCheck.recordToInsert && repairLocal) {
     if (writeProjectInstallRecord(pluginCheck.recordToInsert)) {
       pluginCheck = { ...pluginCheck, ok: true };
+      markHealed();
       io.err(`  \u21BB repaired: registered mmi@mutmutco project install record \u2014 ${reloadHint} to load MMI commands`);
     }
   }
@@ -16857,6 +17147,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
         surface
       });
       if (legacyPluginCheck.ok) {
+        markHealed();
         io.err(`  \u21BB migrated legacy mmi@mmi \u2192 mmi@mutmutco via claude plugin \u2014 ${reloadHint} to load MMI commands`);
       }
     }
@@ -16867,6 +17158,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
         surface
       });
       if (legacyPluginCheck.ok) {
+        markHealed();
         io.err(`  \u21BB migrated legacy mmi@mmi \u2192 mmi@mutmutco via codex plugin \u2014 ${reloadHint} to load MMI commands`);
       }
     }
@@ -16885,6 +17177,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
         gitignoreCheck.removed?.length ? `removed ${gitignoreCheck.removed.join(", ")}` : ""
       ].filter(Boolean).join("; ") || "normalized the block";
       gitignoreCheck = { ...gitignoreCheck, ok: true };
+      markHealed();
       io.err(`  \u21BB repaired: org-managed .gitignore block \u2014 ${drift}`);
       io.err("     this is an org-managed update (not unrelated churn) \u2014 stage & commit .gitignore so it stops recurring");
     }
@@ -16898,6 +17191,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
   if (!driftCheck.ok && driftCheck.recordsToWrite && repairLocal) {
     if (backupAndWriteInstalledPlugins(driftCheck.recordsToWrite, driftCheck.pluginId)) {
       driftCheck = { ...driftCheck, ok: true };
+      markHealed();
       io.err(`  \u21BB repaired: collapsed mmi@mutmutco to one user-scope entry (backup at installed_plugins.json.bak) \u2014 ${reloadHint} to load MMI commands`);
     }
   }
@@ -16930,6 +17224,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
       installedVersionCheck = healed;
       if (healed.ok) {
         markPluginReloadRequired();
+        markHealed();
         io.err(`  \u21BB updated MMI plugin \u2192 ${releasedVersion ?? "latest"} via claude plugin \u2014 ${reloadAction(surface)} to load the new commands`);
       }
     }
@@ -16939,11 +17234,13 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
       installedVersionCheck = healed;
       if (healed.ok) {
         markPluginReloadRequired();
+        markHealed();
         io.err(`  \u21BB updated MMI plugin \u2192 ${releasedVersion ?? "latest"} via codex plugin \u2014 ${reloadAction(surface)} to load the new commands`);
       }
     }
   }
   checks.push(installedVersionCheck);
+  checks.push(buildManagedPluginDriftCheck({ isOrgRepo, sources: managedPluginSurfaceSources() }));
   let openCodeConfigSnapshot = opencodeConfigSnapshot();
   const inspectOpenCode = surface === "opencode" || openCodeConfigSnapshot.hasConfig || runExtended;
   if (inspectOpenCode) {
@@ -16968,6 +17265,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
         });
         if (opencodeConfigCheck.ok) {
           markPluginReloadRequired();
+          markHealed();
           io.err(`  \u21BB repaired: wired ${OPENCODE_PLUGIN_PACKAGE} in OpenCode config \u2014 ${reloadAction("opencode")} to load MMI commands`);
         }
       }
@@ -16991,6 +17289,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
         });
         if (opencodeVersionCheck.ok) {
           markPluginReloadRequired();
+          markHealed();
           io.err(`  \u21BB force-refreshed OpenCode MMI plugin \u2192 ${opencodeInstalledVersion ?? releasedVersion ?? "latest"} \u2014 ${reloadAction("opencode")} to load it`);
         }
       }
@@ -17029,6 +17328,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
         });
         if (surfaceAssetsCheck.ok) {
           markPluginReloadRequired();
+          markHealed();
           io.err(`  \u21BB materialized OpenCode MMI commands + skills path \u2014 ${reloadAction("opencode")} to load them`);
         }
       }
@@ -17050,6 +17350,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
     if (!legacyOpenCodeCheck.ok && repairLocal && legacyOpenCodeConfig.legacyPath) {
       if (quarantineOpencodeLegacyConfig(legacyOpenCodeConfig.legacyPath)) {
         legacyOpenCodeCheck = buildOpencodeLegacyConfigCheck({ isOrgRepo: true });
+        markHealed();
         io.err(`  \u21BB quarantined legacy OpenCode config \u2192 ${legacyOpenCodeConfig.legacyPath}.bak \u2014 restart OpenCode`);
       }
     }
@@ -17074,6 +17375,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
       const surfaces = [...new Set(cacheCleanupCheck.leftovers?.map((entry) => entry.surface) ?? [])].join("/");
       const names = cacheCleanupCheck.leftovers?.map((entry) => entry.name).join(", ");
       markPluginReloadRequired();
+      markHealed();
       io.err(`  \u21BB quarantined ${moved} stale MMI plugin cache dir(s) for ${surfaces || "agent surfaces"}: ${names} \u2014 ${reloadHint} to load MMI commands`);
     }
     cacheCleanupCheck = {
@@ -17101,6 +17403,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
     const canDriveCodex = surfaceToken(surface) === "codex" || await hostBinAvailable("codex");
     if (canDriveCodex && await applyPluginHeal("codex", surface, (m) => io.err(m), { force: true })) {
       markPluginReloadRequired();
+      markHealed();
       io.err(`  \u21BB restored Codex MMI plugin cache \u2192 ${releasedVersion ?? "latest"} via codex plugin \u2014 ${reloadAction("codex")} to load the new commands`);
       codexActiveCacheCheck = buildCodexActiveCacheCheck({
         isOrgRepo,
@@ -17129,6 +17432,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
       }
       if (await applyPluginHeal("claude", surface, (m) => io.err(m))) {
         markPluginReloadRequired();
+        markHealed();
         io.err(`  \u21BB reinstalled MMI plugin after nested-cache cleanup \u2014 ${reloadAction(surface)} to load MMI commands`);
         nestedPluginTreeCheck = buildNestedPluginTreeCheck({
           isOrgRepo,
@@ -17171,6 +17475,7 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
         releasedVersion
       });
       if (cursorPluginCheck.ok) {
+        markHealed();
         io.err(`  \u21BB seeded Cursor MMI plugin cache \u2192 ${releasedVersion ?? "latest"} \u2014 ${reloadAction(surface)}`);
       }
     }
@@ -17242,48 +17547,66 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
     } catch {
     }
   }
+  emitDoctorReport(opts, io, {
+    checks,
+    surface,
+    needsEagerHeal: healPlan.needsEagerHeal,
+    healedCount,
+    pluginReloadRequired,
+    reloadHint,
+    // Surface-aware update report (#865): the per-surface version snapshot + copy-paste update recipes, so
+    // an agent told "make sure the CLI and plugin are up to date" can run the right command per surface and
+    // echo back an unambiguous version line (CLI / Claude plugin / Codex marketplace / Codex active cache).
+    // Passed lazily: emitDoctorReport calls it only past the --preflight/--banner early returns, keeping
+    // the SessionStart hot path free of its synchronous fs I/O.
+    buildUpdateReport: () => {
+      const cacheRoots = mmiPluginCacheRootSnapshots();
+      const cacheVersionsFor = (s) => cacheRoots.filter((r) => r.surface === s).flatMap((r) => r.entries.filter((e) => e.isDirectory).map((e) => e.name));
+      const sourceVersions = (s) => installedPluginVersions(installedPluginSources().find((src) => src.surface === s)?.installed ?? null);
+      return buildPluginUpdateReport({
+        cliVersion: resolveClientVersion(),
+        claudePluginVersions: sourceVersions("claude"),
+        codexPluginVersions: sourceVersions("codex"),
+        codexCacheVersions: cacheVersionsFor("codex"),
+        opencodePluginVersions: opencodePluginVersionsForReport(),
+        releasedVersion
+      });
+    }
+  });
+}
+function emitDoctorReport(opts, io, ctx) {
+  const { checks, surface, healedCount, pluginReloadRequired, reloadHint } = ctx;
   const gaps = checks.filter((c) => !c.ok);
   if (opts.preflight) {
-    const outcome = preflightOutcome({ gaps, needsEagerHeal: healPlan.needsEagerHeal, surface });
+    const outcome = preflightOutcome({ gaps, needsEagerHeal: ctx.needsEagerHeal, surface });
     if (outcome.line) io.err(outcome.line);
     if (pluginReloadRequired) io.err(pluginAutonomousHaltLine(reloadHint));
     return;
   }
   if (opts.banner) {
-    if (healPlan.needsEagerHeal) io.err(doctorPreflightDoneLine(surface));
+    if (ctx.needsEagerHeal) io.err(doctorPreflightDoneLine(surface));
     if (pluginReloadRequired) io.err(pluginAutonomousHaltLine(reloadHint));
     if (gaps.length) io.log(`\u26A0 MMI setup needed \u2014 ${gaps.map((g) => g.fix).join(" \xB7 ")} \xB7 guide: ${MMI_AGENTIC_ONBOARDING_GUIDE.url}`);
     return;
   }
-  const cacheRoots = mmiPluginCacheRootSnapshots();
-  const cacheVersionsFor = (s) => cacheRoots.filter((r) => r.surface === s).flatMap((r) => r.entries.filter((e) => e.isDirectory).map((e) => e.name));
-  const sourceVersions = (s) => installedPluginVersions(installedPluginSources().find((src) => src.surface === s)?.installed ?? null);
-  const updateReport = buildPluginUpdateReport({
-    cliVersion: resolveClientVersion(),
-    claudePluginVersions: sourceVersions("claude"),
-    codexPluginVersions: sourceVersions("codex"),
-    codexCacheVersions: cacheVersionsFor("codex"),
-    opencodePluginVersions: opencodePluginVersionsForReport(),
-    releasedVersion
-  });
+  const updateReport = ctx.buildUpdateReport();
   const resources = doctorResourcesForGaps(gaps);
+  process.exitCode = doctorExitCode(checks);
   if (opts.json) {
     io.log(JSON.stringify(buildDoctorJsonPayload({ checks, updateReport, resources }), null, 2));
     return;
   }
-  if (terseOutput) {
-    if (pluginReloadRequired) io.err(pluginAutonomousHaltLine(reloadHint));
-    for (const line of renderTerseDoctorReport({ gaps, updateReport })) io.log(line);
-    for (const r of resources) io.log(`Resource: ${r.label} \u2014 ${r.url}`);
-    return;
-  }
-  for (const c of checks) io.log(c.ok ? `\u2713 ${c.label}` : `\u2717 ${c.label}
-   \u2192 ${c.fix}`);
+  if (pluginReloadRequired) io.err(pluginAutonomousHaltLine(reloadHint));
+  for (const line of doctorHumanLines({
+    checks,
+    updateReport,
+    shouldApply: Boolean(opts.apply),
+    healedCount,
+    pluginReloadRequired,
+    reloadHint,
+    verbose: Boolean(opts.verbose)
+  })) io.log(line);
   for (const r of resources) io.log(`Resource: ${r.label} \u2014 ${r.url}`);
-  io.log("");
-  for (const line of renderPluginUpdateReport(updateReport)) io.log(line);
-  io.log(gaps.length ? `
-${gaps.length} item(s) need attention.` : "\nAll set \u2014 you are ready.");
 }
 var USER_SCOPE_GUARD_MARKER = "mmi-guard:v1";
 var USER_SCOPE_GUARD_COMMAND = `mmi-cli guard --session-start || true # ${USER_SCOPE_GUARD_MARKER}`;
@@ -18868,6 +19191,21 @@ pr.command("land <number>").description("agent merge path (#1440): train probe \
       pollChecks: () => pollGhPrChecks(prNumber, repo ? ["--repo", repo] : []),
       sleep: (ms) => new Promise((resolve6) => setTimeout(resolve6, ms))
     }),
+    // #2425: re-probe used ONLY to decide whether a failed `gh pr merge --auto` is worth retrying — a
+    // fresh read of state/mergeable/checks, independent of the merge call's own (possibly stale) error.
+    probeMergeReady: async (prNumber, repo) => {
+      const args = repo ? ["--repo", repo] : [];
+      const [state, checks] = await Promise.all([
+        execFileP2("gh", ["pr", "view", prNumber, ...args, "--json", "state,mergeable", "--jq", '.state + " " + .mergeable'], { timeout: GC_GH_TIMEOUT_MS2 }).then((r) => r.stdout.trim().split(/\s+/)).catch(() => ["", ""]),
+        pollGhPrChecks(prNumber, args).catch(() => "error")
+      ]);
+      const [prState, mergeable] = state;
+      return {
+        open: prState === "OPEN",
+        mergeable: mergeable === "MERGEABLE",
+        checksPassing: checks === "success" || checks === "no-checks-reported"
+      };
+    },
     mergeAuto: async (prNumber, repo) => {
       const args = repo ? ["--repo", repo] : [];
       const readMergeState = () => readGhPrStateWithRetry(async () => (await execFileP2("gh", ["pr", "view", prNumber, ...args, "--json", "state", "--jq", ".state"], { timeout: GC_GH_TIMEOUT_MS2 })).stdout);
@@ -19625,7 +19963,7 @@ function renderTrainApply(commandName, r) {
   if (r.rcRetirement) base = `${base}; rc retirement: ${r.rcRetirement.toUpperCase()} (${r.rcRetirementNote ?? ""})`;
   if (r.devRollForward) {
     const f = r.devRollForward;
-    base = f.status === "pr-pending" ? `${base}; dev roll-forward: ALIGNMENT PR PENDING \u2014 land it with \`gh pr merge ${f.prNumber ?? "<number>"} --merge\`${f.prUrl ? ` (${f.prUrl})` : ""}` : `${base}; dev roll-forward: ${f.note}`;
+    base = f.status === "pr-pending" ? `${base}; dev roll-forward: ALIGNMENT PR PENDING \u2014 land it with \`mmi-cli pr merge ${f.prNumber ?? "<number>"} --auto --merge\`${f.prUrl ? ` (${f.prUrl})` : ""}` : `${base}; dev roll-forward: ${f.note}`;
   }
   if (r.checkout) {
     base = `${base}; checkout: ${r.checkout.note}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "MMI Future CLI — the org dev toolbox (board, registry, keyless secrets, release train, bootstrap, doctor) and the cross-IDE engine the plugin's session-start hook drives.",
   "type": "module",
   "license": "UNLICENSED",