@mutmutco/cli 4.2.4 → 4.2.6

package/dist/main.cjs

@@ -5844,13 +5844,20 @@ async function waitForPrChecks(deps) {
       failureStreak += 1;
       if (failureStreak >= PR_CHECKS_FAILURE_CONFIRMATIONS) {
         const diagnosis = deps.diagnoseFailure ? await deps.diagnoseFailure().catch(() => null) : null;
+        const diagnosticCommand = diagnosis?.failedChecks.find((check) => check.diagnosticCommand)?.diagnosticCommand ?? deps.checksDiagnosticCommand;
+        const failureReceipt = {
+          failedChecks: diagnosis?.failedChecks ?? [],
+          ...deps.checksUrl ? { checksUrl: deps.checksUrl } : {},
+          ...diagnosticCommand ? { diagnosticCommand } : {},
+          ...diagnosis?.checksFailureDetail ? { checksFailureDetail: diagnosis.checksFailureDetail } : {}
+        };
         if (diagnosis?.cause === "stale-head") {
-          return { policy, status: "failure", reason: diagnosis.reason, detail: "stale-head" };
+          return { policy, status: "failure", reason: diagnosis.reason, detail: "stale-head", ...failureReceipt };
         }
         if (diagnosis?.cause === "runner-infra") {
-          return { policy, status: "failure", reason: diagnosis.reason, detail: "runner-infra" };
+          return { policy, status: "failure", reason: diagnosis.reason, detail: "runner-infra", ...failureReceipt };
         }
-        return { policy, status: "failure", reason, detail: "checks-failure" };
+        return { policy, status: "failure", reason, detail: "checks-failure", ...failureReceipt };
       }
       lastDetail = "confirming-failure";
       await deps.sleep(PR_CHECKS_POLL_MS);
@@ -9340,6 +9347,27 @@ function boardConfigFromProject(meta, floor = {}) {
   };
 }
 
+// src/issue-ref.ts
+var ISSUE_REF_SHAPES = "123, #123, owner/repo#123, or a GitHub issue or PR URL";
+function invalidReference(ref) {
+  return new Error(`invalid reference "${ref}" \u2014 expected ${ISSUE_REF_SHAPES}`);
+}
+function parseIssueRef(ref, expectedRepo) {
+  const trimmed = ref.trim();
+  const url = trimmed.match(/^https:\/\/github\.com\/([^/]+\/[^/]+)\/(?:issues|pull)\/(\d+)$/i);
+  const qualified = trimmed.match(/^([^/\s#]+\/[^/\s#]+)#(\d+)$/);
+  const bare = trimmed.match(/^#?(\d+)$/);
+  const match = url ?? qualified ?? bare;
+  if (!match) throw invalidReference(ref);
+  const number = Number(match[match.length - 1]);
+  if (!Number.isInteger(number) || number <= 0) throw invalidReference(ref);
+  const repo = (url ?? qualified)?.[1];
+  if (repo && expectedRepo && repo.toLowerCase() !== expectedRepo.toLowerCase()) {
+    throw new Error(`reference "${ref}" names ${repo}, which does not match --repo ${expectedRepo} \u2014 expected ${ISSUE_REF_SHAPES}`);
+  }
+  return repo ? { repo, number } : { number };
+}
+
 // src/repo-resolve.ts
 function slugOf(repoOrSlug) {
   return (repoOrSlug.includes("/") ? repoOrSlug.split("/").pop() : repoOrSlug).toLowerCase();
@@ -9349,11 +9377,11 @@ function repoFromRemoteUrl(remoteUrl) {
   return m ? `${m[1]}/${m[2]}` : void 0;
 }
 function repoFromSelector(selector) {
-  const trimmed = selector.trim();
-  const url = trimmed.match(/^https:\/\/github\.com\/([^/]+\/[^/]+)\/(?:issues|pull)\/\d+$/i);
-  if (url) return url[1];
-  const qualified = trimmed.match(/^([^/\s#]+\/[^/\s#]+)#\d+$/);
-  return qualified?.[1];
+  try {
+    return parseIssueRef(selector).repo;
+  } catch {
+    return void 0;
+  }
 }
 async function resolveRepo(repo) {
   if (repo) return repo;
@@ -11802,10 +11830,10 @@ var rollout_plan_default = {
     note: "The v4.0.0 stamp happens at cut time (D6e #4463); until then the candidate is the origin/development head artifacts (built cli/dist + npm pack), identity proven by dist content hash (D6a)."
   },
   baseline: {
-    version: "4.2.4",
-    tag: "v4.2.4",
-    commit: "91aa25abb871",
-    npm: "@mutmutco/cli@4.2.4"
+    version: "4.2.6",
+    tag: "v4.2.6",
+    commit: "608eebe09477",
+    npm: "@mutmutco/cli@4.2.6"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -11822,14 +11850,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.2.4"
+          v3Target: "v4.2.6"
         }
       ],
       rollbackTrigger: "Any red inside the post-contract soak window: `devops train gate` FAIL attributable to the v4 doors, Hub endpoint health probe failure, a pre-v4 client admitted instead of receiving actionable HTTP 426, or npm consumer install/doctor failure on the v4-only dist.",
       rollback: {
         independent: true,
-        mechanism: "npm dist-tag latest -> 4.2.4 and redeploy the Hub Lambda from tag v4.2.4 (91aa25abb871); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.2.4 (@mutmutco/cli@4.2.4, tag commit 91aa25abb871 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.2.6 and redeploy the Hub Lambda from tag v4.2.6 (608eebe09477); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.2.6 (@mutmutco/cli@4.2.6, tag commit 608eebe09477 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -12136,16 +12164,6 @@ function formatOrgVersions(report) {
 }
 
 // src/sub-issue.ts
-function parseIssueRef(ref) {
-  const trimmed = ref.trim();
-  const url = trimmed.match(/^https:\/\/github\.com\/([^/]+\/[^/]+)\/issues\/(\d+)$/i);
-  if (url) return { repo: url[1], number: Number(url[2]) };
-  const qualified = trimmed.match(/^([^/\s#]+\/[^/\s#]+)#(\d+)$/);
-  if (qualified) return { repo: qualified[1], number: Number(qualified[2]) };
-  const bare = trimmed.match(/^#?(\d+)$/);
-  if (bare) return { number: Number(bare[1]) };
-  throw new Error(`invalid issue reference "${ref}" \u2014 expected #123, 123, owner/repo#123, or an issue URL`);
-}
 function buildResolveIdArgs(ref) {
   const args = ["issue", "view", String(ref.number), "--json", "id", "--jq", ".id"];
   if (ref.repo) args.push("--repo", ref.repo);
@@ -14855,19 +14873,19 @@ async function discoverRequiredCheckContexts(deps, ctx, branch) {
   }
   return [...contexts];
 }
-async function findOpenAlignmentPr(deps, ctx, target) {
-  const out = clean2(await deps.run("gh", ["pr", "list", "--repo", ctx.repo, "--base", target, "--head", "main", "--state", "open", "--json", "number,url"]));
+async function findAlignmentPr(deps, ctx, target) {
+  const out = clean2(await deps.run("gh", ["pr", "list", "--repo", ctx.repo, "--base", target, "--head", "main", "--state", "all", "--json", "number,url,state"]));
   if (!out) return void 0;
   const rows = JSON.parse(out);
-  const row = rows.find((r) => typeof r.number === "number" && typeof r.url === "string");
-  return row ? { number: row.number, url: row.url } : void 0;
+  const row = rows.filter((r) => typeof r.number === "number" && typeof r.url === "string" && (r.state === "OPEN" || r.state === "MERGED")).sort((a, b) => b.number - a.number)[0];
+  return row;
 }
 function parsePrNumber(url) {
   const n = Number.parseInt(url.split("/").pop() ?? "", 10);
   return Number.isFinite(n) ? n : void 0;
 }
 async function rollDevelopmentForward(deps, ctx, tag) {
-  await runGitRemoteRead(deps, ["fetch", "origin", "main"]);
+  await runGitRemoteRead(deps, ["fetch", "origin", "main", "development"]);
   const required = await discoverRequiredCheckContexts(deps, ctx, "development");
   if (required.length === 0) {
     await deps.run("git", ["checkout", "development"]);
@@ -14876,13 +14894,17 @@ async function rollDevelopmentForward(deps, ctx, tag) {
     await deps.run("git", ["push", "origin", "development"]);
     return { status: "pushed", note: "development rolled forward to the released main (development has no required checks)" };
   }
-  const existing = await findOpenAlignmentPr(deps, ctx, "development");
-  if (existing) {
-    return enqueueAlignmentAutoMerge(deps, ctx, existing.number, existing.url, `alignment PR already open: ${existing.url}`);
-  }
   const ahead = clean2(await deps.run("git", ["rev-list", "--count", "origin/development..origin/main"]));
+  const existing = await findAlignmentPr(deps, ctx, "development");
   if (ahead === "0") {
-    return { status: "aligned", note: "development already contains the released main; nothing to roll forward" };
+    return {
+      status: "aligned",
+      alignment: "already-merged",
+      note: existing?.state === "MERGED" ? `alignment: already-merged \u2014 development already contains main via alignment PR #${existing.number}` : "alignment: already-merged \u2014 development already contains the released main; nothing to roll forward"
+    };
+  }
+  if (existing?.state === "OPEN") {
+    return enqueueAlignmentAutoMerge(deps, ctx, existing.number, existing.url, `alignment PR already open: ${existing.url}`);
   }
   const body = `Carries the ${tag} release (including the version fold) from \`main\` back to \`development\`.
 
@@ -14919,7 +14941,7 @@ async function enqueueAlignmentAutoMerge(deps, ctx, prNumber, prUrl, openedNote)
   return { ...base, note: manual };
 }
 async function alignRcForward(deps, ctx, tag) {
-  await runGitRemoteRead(deps, ["fetch", "origin", "main"]);
+  await runGitRemoteRead(deps, ["fetch", "origin", "main", "rc"]);
   const required = await discoverRequiredCheckContexts(deps, ctx, "rc");
   if (required.length === 0) {
     const ahead2 = clean2(await deps.run("git", ["rev-list", "--count", "origin/rc..origin/main"]));
@@ -14929,13 +14951,17 @@ async function alignRcForward(deps, ctx, tag) {
     await runGitPush(deps, ["push", "origin", "origin/main:refs/heads/rc"]);
     return { status: "pushed", note: "rc aligned to the released main (rc has no required checks)" };
   }
-  const existing = await findOpenAlignmentPr(deps, ctx, "rc");
-  if (existing) {
-    return enqueueAlignmentAutoMerge(deps, ctx, existing.number, existing.url, `rc alignment PR already open: ${existing.url}`);
-  }
   const ahead = clean2(await deps.run("git", ["rev-list", "--count", "origin/rc..origin/main"]));
+  const existing = await findAlignmentPr(deps, ctx, "rc");
   if (ahead === "0") {
-    return { status: "aligned", note: "rc already contains the released main; nothing to align" };
+    return {
+      status: "aligned",
+      alignment: "already-merged",
+      note: existing?.state === "MERGED" ? `alignment: already-merged \u2014 rc already contains main via alignment PR #${existing.number}` : "alignment: already-merged \u2014 rc already contains the released main; nothing to align"
+    };
+  }
+  if (existing?.state === "OPEN") {
+    return enqueueAlignmentAutoMerge(deps, ctx, existing.number, existing.url, `rc alignment PR already open: ${existing.url}`);
   }
   const body = `Carries the ${tag} release from \`main\` back to \`rc\`.
 
@@ -15847,10 +15873,16 @@ function resolveGreenGateNpmFromGateWorkflows(files) {
   return pin ? bundledNpmForNodePin(pin) : void 0;
 }
 function parsePublishWorkflowNpmPin(workflowBody) {
-  const match = /(?:^|[^\w])npm@(\d+\.\d+\.\d+)/m.exec(workflowBody);
+  const match = /(?:^|[^\w])npm@(\d+(?:\.\d+\.\d+)?)/m.exec(workflowBody);
   return match?.[1];
 }
+function parseGateNpmVersionPins(workflowBody) {
+  if (!/runner-node-toolchain/.test(workflowBody)) return [];
+  return [...workflowBody.matchAll(/^\s*npm-version:\s*['"]?(\d+(?:\.\d+\.\d+)?)/gm)].map((m) => m[1]);
+}
 function resolveExpectedCiNpmFromWorkflows(gateFiles, allFiles) {
+  const declared = gateFiles?.flatMap((file) => parseGateNpmVersionPins(file.body)) ?? [];
+  if (declared.length) return declared[0];
   const fromGate = resolveGreenGateNpmFromGateWorkflows(gateFiles);
   if (fromGate) return fromGate;
   const files = allFiles ?? gateFiles;
@@ -20683,15 +20715,9 @@ function resolveBoardConfig(cfg) {
     priorityOptions: cfg.priorityOptions
   };
 }
-function parseIssueSelector(selector, defaultRepo) {
-  const trimmed = selector.trim();
-  const url = trimmed.match(/^https:\/\/github\.com\/([^/]+\/[^/]+)\/(?:issues|pull)\/(\d+)$/i);
-  if (url) return { repo: url[1], number: Number(url[2]) };
-  const qualified = trimmed.match(/^([^/\s#]+\/[^/\s#]+)#(\d+)$/);
-  if (qualified) return { repo: qualified[1], number: Number(qualified[2]) };
-  const local = trimmed.match(/^#?(\d+)$/);
-  if (local) return { repo: defaultRepo, number: Number(local[1]) };
-  throw new Error(`expected an issue selector like 123, #123, owner/repo#123, or a GitHub issue URL`);
+function parseIssueSelector(selector, defaultRepo, expectedRepo) {
+  const parsed = parseIssueRef(selector, expectedRepo);
+  return { repo: parsed.repo ?? defaultRepo, number: parsed.number };
 }
 function sameRepo(itemRepo, selectorKey) {
   const repo = itemRepo.toLowerCase();
@@ -21016,7 +21042,7 @@ async function moveBoardItem(options, deps = {}) {
   const cfg = resolveBoardConfig(options.config);
   const client = deps.client ?? defaultGitHubClient();
   const currentRepo = await resolveCurrentRepo(options, deps);
-  const selector = parseIssueSelector(options.selector, currentRepo);
+  const selector = parseIssueSelector(options.selector, currentRepo, options.repo);
   const lookup = await fetchIssueProjectItem(client, cfg, selector);
   const item = lookup.item;
   if (!item) {
@@ -21090,7 +21116,7 @@ async function showBoardItem(options, deps = {}) {
   const cfg = resolveBoardConfig(options.config);
   const client = deps.client ?? defaultGitHubClient();
   const currentRepo = await resolveCurrentRepo(options, deps);
-  const selector = parseIssueSelector(options.selector, currentRepo);
+  const selector = parseIssueSelector(options.selector, currentRepo, options.repo);
   const { item } = await fetchIssueProjectItem(client, cfg, selector);
   if (!item) throw boardNotFoundError(`${selector.repo}#${selector.number}`, { owner: cfg.projectOwner, number: cfg.projectNumber });
   if (item.contentType === "Issue") {
@@ -21181,6 +21207,15 @@ async function claimOneBoardItem(ctx, selector, options) {
   }
   const assignee = options.assignee ?? "@me";
   const assignedLogin = assignee === "@me" ? report.viewer : assignee.replace(/^@/, "");
+  const holder = {
+    login: assignedLogin,
+    session: ctx.session.session,
+    surface: ctx.session.surface,
+    host: ctx.session.host
+  };
+  let previousHolder;
+  const claimedReceipt = () => previousHolder ? { outcome: "took-over", holder, previousHolder } : { outcome: "claimed", holder };
+  const heldReceipt = () => previousHolder ? { outcome: "took-over", holder, previousHolder } : { outcome: "held", holder };
   if (flatItem.contentType !== "Issue") throw new Error(`${flatItem.ref} is not an issue`);
   const pre = evaluateClaim(flatItem, assignedLogin);
   if (!pre.ok) throw new Error(pre.reason);
@@ -21191,20 +21226,28 @@ async function claimOneBoardItem(ctx, selector, options) {
   if (!verdict.ok) throw new Error(verdict.reason);
   item = fresh;
   const refuseIfContested = async () => {
-    if (options.force) return;
     const contest = await checkLaneContest(client, item, ctx.session);
-    if (contest.contested) throw new Error(laneContestMessage(item.ref, contest, "claim"));
+    if (!contest.contested) return;
+    if (!options.force) throw new Error(laneContestMessage(item.ref, contest, "claim"));
+    previousHolder = {
+      login: assignedLogin,
+      ...contest.marker ? {
+        session: contest.marker.session,
+        surface: contest.marker.surface,
+        host: contest.marker.host
+      } : {}
+    };
   };
   await refuseIfContested();
   if (verdict.alreadyClaimed) {
     if (options.check) {
-      return { item, viewer: report.viewer, repo: report.repo, status: "In Progress", partial: false, alreadyClaimed: true, checked: true };
+      return { item, viewer: report.viewer, repo: report.repo, status: "In Progress", partial: false, ...heldReceipt(), alreadyClaimed: true, checked: true };
     }
     await postClaimMarkerComment(client, item, ctx.session);
-    return { item, viewer: report.viewer, repo: report.repo, status: "In Progress", partial: false, alreadyClaimed: true };
+    return { item, viewer: report.viewer, repo: report.repo, status: "In Progress", partial: false, ...heldReceipt(), alreadyClaimed: true };
   }
   if (options.check) {
-    return { item, viewer: report.viewer, repo: report.repo, status: item.status, partial: false, checked: true };
+    return { item, viewer: report.viewer, repo: report.repo, status: item.status, partial: false, ...claimedReceipt(), checked: true };
   }
   await refuseIfContested();
   try {
@@ -21218,7 +21261,7 @@ async function claimOneBoardItem(ctx, selector, options) {
   } catch (e) {
     const warning = `partial claim: ${item.ref} was assigned to @${assignedLogin}, but Status was not moved to In Progress (${ghError(e)})`;
     if (!options.allowPartial) throw new Error(warning);
-    return { item, viewer: report.viewer, repo: report.repo, status: "Todo", partial: true, warning };
+    return { item, viewer: report.viewer, repo: report.repo, status: "Todo", partial: true, warning, ...claimedReceipt() };
   }
   return {
     item: {
@@ -21230,13 +21273,14 @@ async function claimOneBoardItem(ctx, selector, options) {
     viewer: report.viewer,
     repo: report.repo,
     status: "In Progress",
-    partial: false
+    partial: false,
+    ...claimedReceipt()
   };
 }
 async function claimBoardIssue(options, deps = {}) {
   const cfg = resolveBoardConfig(options.config);
   const collected = await collectBoardItems(cfg, { repo: options.repo, allowPartial: options.allowPartial, activeOnly: true }, deps);
-  const selector = parseIssueSelector(options.selector, collected.repo);
+  const selector = parseIssueSelector(options.selector, collected.repo, options.repo);
   const ctx = await prepareClaimContext(options, [selector], deps, collected);
   return claimOneBoardItem(ctx, selector, options);
 }
@@ -21246,7 +21290,7 @@ async function claimBoardIssues(options, deps = {}) {
   const selectors = [];
   const seen = /* @__PURE__ */ new Set();
   for (const raw of options.selectors) {
-    const selector = parseIssueSelector(raw, collected.repo);
+    const selector = parseIssueSelector(raw, collected.repo, options.repo);
     const key = `${selector.repo.toLowerCase()}#${selector.number}`;
     if (seen.has(key)) continue;
     seen.add(key);
@@ -21262,7 +21306,7 @@ async function claimBoardIssues(options, deps = {}) {
       const ref = `${selector.repo}#${selector.number}`;
       try {
         const result = await claimOneBoardItem(ctx, selector, options);
-        results[index] = { ref: result.item.ref, claimed: true, item: result.item, status: result.status, partial: result.partial, warning: result.warning, alreadyClaimed: result.alreadyClaimed, checked: result.checked };
+        results[index] = { ref: result.item.ref, claimed: true, item: result.item, status: result.status, partial: result.partial, warning: result.warning, outcome: result.outcome, holder: result.holder, previousHolder: result.previousHolder, alreadyClaimed: result.alreadyClaimed, checked: result.checked };
       } catch (e) {
         results[index] = { ref, claimed: false, reason: e.message };
       }
@@ -21283,7 +21327,7 @@ async function moveBoardIssues(options, deps = {}) {
   const selectors = [];
   const seen = /* @__PURE__ */ new Set();
   for (const raw of options.selectors) {
-    const selector = parseIssueSelector(raw, currentRepo);
+    const selector = parseIssueSelector(raw, currentRepo, options.repo);
     const key = `${selector.repo.toLowerCase()}#${selector.number}`;
     if (seen.has(key)) continue;
     seen.add(key);
@@ -21363,7 +21407,7 @@ async function unclaimBoardIssue(options, deps = {}) {
   const cfg = resolveBoardConfig(options.config);
   const client = deps.client ?? defaultGitHubClient();
   const currentRepo = await resolveCurrentRepo(options, deps);
-  const selector = parseIssueSelector(options.selector, currentRepo);
+  const selector = parseIssueSelector(options.selector, currentRepo, options.repo);
   const { viewer, item } = await fetchIssueProjectItem(client, cfg, selector);
   if (!item) {
     throw boardNotFoundError(`${selector.repo}#${selector.number}`, { owner: cfg.projectOwner, number: cfg.projectNumber });
@@ -22485,6 +22529,20 @@ var REQUIRED_OPTION_HELP = {
   optionDescription(option) {
     const described = Help.prototype.optionDescription.call(this, option);
     return option.mandatory ? `(required) ${described}` : described;
+  },
+  // #5874: resolveHouseShim removes the house token before Commander renders help. Its stock usage
+  // therefore teaches a removed flat alias; render the manifest's canonical house-qualified path instead.
+  commandUsage(command) {
+    const parts = [];
+    for (let node = command; node && node.parent; node = node.parent) {
+      parts.unshift(node.name());
+    }
+    if (!parts.length) return Help.prototype.commandUsage.call(this, command);
+    const flatPath = parts.join(" ");
+    const canonicalPath = canonicalPathFor(flatPath) ?? flatPath;
+    const alias = command.alias();
+    const name = alias ? `${command.name()}|${alias}` : command.name();
+    return `mmi-cli ${canonicalPath.slice(0, -command.name().length)}${name} ${command.usage()}`;
   }
 };
 function classifyTree(command, path2, inherited, hideFromParent) {
@@ -31295,6 +31353,69 @@ async function remoteBranchExists2(branch, options = {}) {
     return void 0;
   }
 }
+async function deleteMergedRemoteBranch(options) {
+  const remediation = `git push origin --delete ${options.branch}`;
+  if (!options.branch) {
+    return {
+      branch: options.branch,
+      existedBefore: options.existedBefore,
+      attempted: false,
+      status: "failed",
+      error: "missing PR head branch",
+      remediation
+    };
+  }
+  if (options.existedBefore === false) {
+    const exists2 = await options.branchExists(options.branch);
+    if (exists2 === false) return { branch: options.branch, existedBefore: false, attempted: false, status: "already-gone" };
+    return {
+      branch: options.branch,
+      existedBefore: false,
+      attempted: false,
+      status: "failed",
+      error: exists2 ? `origin reports ${options.branch} after merge` : `could not verify absence of origin/${options.branch}`,
+      remediation
+    };
+  }
+  try {
+    await options.execGit(["push", "origin", "--delete", options.branch]);
+  } catch (e) {
+    const exists2 = await options.branchExists(options.branch);
+    if (exists2 === false) {
+      return {
+        branch: options.branch,
+        existedBefore: options.existedBefore,
+        attempted: true,
+        status: "deleted"
+      };
+    }
+    return {
+      branch: options.branch,
+      existedBefore: options.existedBefore,
+      attempted: true,
+      status: "failed",
+      error: e instanceof Error ? e.message : String(e),
+      remediation
+    };
+  }
+  const exists = await options.branchExists(options.branch);
+  if (exists === false) {
+    return {
+      branch: options.branch,
+      existedBefore: options.existedBefore,
+      attempted: true,
+      status: "deleted"
+    };
+  }
+  return {
+    branch: options.branch,
+    existedBefore: options.existedBefore,
+    attempted: true,
+    status: "failed",
+    error: exists ? `origin still reports ${options.branch} after deletion` : `could not verify deletion of origin/${options.branch}`,
+    remediation
+  };
+}
 
 // src/worktree-merge-cleanup.ts
 var import_node_fs36 = require("node:fs");
@@ -31484,6 +31605,7 @@ function removeResidueDirectory(wtPath) {
     } catch {
     }
     (0, import_node_fs36.rmSync)(wtPath, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+    if ((0, import_node_fs36.existsSync)(wtPath)) return { ok: false, error: `directory remains after removal: ${wtPath}` };
     return { ok: true };
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
@@ -31776,8 +31898,11 @@ async function cleanupPrMergeLocalBranch(branch, options) {
     if (residue.ok) {
       report.worktree.residue = "swept";
     } else {
+      report.worktree.status = "failed";
+      report.worktree.reason = "residue-remains";
       report.worktree.residue = "left";
       report.worktree.residueError = residue.error;
+      report.worktree.remediation = `Remove-Item -LiteralPath '${wtPath.replace(/'/g, "''")}' -Recurse -Force`;
     }
   }
   try {
@@ -31808,7 +31933,7 @@ function renderPrMergeCleanupLines(cleanup) {
     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}`);
+    lines.push(`pr merge: worktree ${wt.path} registration is gone but residue remains \u2014 ${wt.residueError ?? wt.path}; remediate: ${wt.remediation ?? wt.path}`);
   }
   if (wt.artifactsArchive?.status === "archived" && wt.artifactsArchive.path) {
     lines.push(`pr merge: archived worktree evidence to ${wt.artifactsArchive.path}`);
@@ -31863,8 +31988,24 @@ function registerBoardCommands(program3) {
       return failGraceful(`board read failed: ${withDiscoverMissDetail(e.message)}`);
     }
   }
-  function checkVerdict(ref, alreadyClaimed) {
-    return alreadyClaimed ? `Check ${ref}: claimed and In Progress, no live contest - claim would renew the lease (nothing written)` : `Check ${ref}: free - claim would proceed (nothing written)`;
+  function formatClaimHolder(holder) {
+    const lane = holder.surface && holder.session && holder.host ? ` (${holder.surface}/${holder.session}@${holder.host})` : "";
+    return `@${holder.login}${lane}`;
+  }
+  function claimVerdict(ref, result) {
+    const holder = formatClaimHolder(result.holder);
+    const previousHolder = result.previousHolder ? formatClaimHolder(result.previousHolder) : "another lane";
+    if (result.checked) {
+      if (result.outcome === "held") return `Check ${ref}: held by ${holder} - claim would renew the lease (nothing written)`;
+      if (result.outcome === "took-over") return `Check ${ref}: held by ${previousHolder} - --force claim would take it over for ${holder} (nothing written)`;
+      return `Check ${ref}: free - claim would proceed for ${holder} (nothing written)`;
+    }
+    if (result.partial) {
+      return result.outcome === "took-over" ? `Partially took over ${ref} from ${previousHolder}: ${result.warning}` : `Partially claimed ${ref} for ${holder}: ${result.warning}`;
+    }
+    if (result.outcome === "took-over") return `Took over ${ref} from ${previousHolder} for ${holder} - In Progress`;
+    if (result.outcome === "held") return `${ref} is held by ${holder} - In Progress`;
+    return `Claimed ${ref} for ${holder} - In Progress`;
   }
   const board = program3.command("board").description("read, claim, show, and move Project v2 work items for the current repo");
   board.command("read", { isDefault: true }).description("read the board and print user-owned, claimable, and taken items").option("--json", "machine-readable output").option("--repo <owner/repo>", "current repo (defaults to git origin)").option("--direct", "bypass the Hub snapshot and read the live board through direct GitHub GraphQL").option("--bundle-details", "fetch body/comments only for user-owned and claimable issues").option("--bodies", "fetch body/comments for EVERY scoped row, including taken and unowned in-flight ones \u2014 for consumers that scope by Status rather than ownership (#4861); implies --bundle-details and costs one extra read per row").option("--allow-partial", "return partial board results when later page/detail reads fail").option("--out <path>", "write the output to this file as UTF-8 (no BOM) instead of stdout \u2014 the shell-free receipt path (#5802)").addHelpText("after", "\nread is always the authoritative live GitHub Project v2 board (#4926).\n--direct skips the Hub snapshot and uses the existing direct GitHub GraphQL read immediately.\n--allow-partial applies to the paginated path and detail reads.\n\nNever capture the JSON with a shell redirect on Windows: PowerShell 5.1's `> file.json` is Out-File,\nwhich writes UTF-16LE with a BOM, and Node reading it as 'utf8' then fails JSON.parse at position 1\n(#5802). Use --out instead \u2014 the CLI writes the file itself as UTF-8:\n  mmi-cli oracle board read --json --out .jerv/tmp/board.json\n").action((o) => runBoardRead(o));
@@ -31886,7 +32027,7 @@ function registerBoardCommands(program3) {
         });
         if (!result.checked) invalidateStatuslineBoardCache();
         if (o.json) return console.log(JSON.stringify(result));
-        console.log(result.checked ? checkVerdict(result.item.ref, result.alreadyClaimed) : result.partial ? `Partially claimed ${result.item.ref}: ${result.warning}` : result.alreadyClaimed ? `Already claimed ${result.item.ref} - In Progress (no change)` : `Claimed ${result.item.ref} - In Progress`);
+        console.log(claimVerdict(result.item.ref, result));
       } catch (e) {
         if (refuseRateLimited(e, o.json)) return;
         return failGraceful(`board claim failed: ${e.message}`);
@@ -31908,7 +32049,7 @@ function registerBoardCommands(program3) {
         console.log(JSON.stringify(bulk.results));
       } else {
         for (const result of bulk.results) {
-          console.log(result.claimed ? result.checked ? checkVerdict(result.ref, result.alreadyClaimed) : result.partial ? `Partially claimed ${result.ref}: ${result.warning}` : result.alreadyClaimed ? `Already claimed ${result.ref} - In Progress (no change)` : `Claimed ${result.ref} - In Progress` : `Skipped ${result.ref}: ${result.reason}`);
+          console.log(result.claimed ? claimVerdict(result.ref, result) : `Skipped ${result.ref}: ${result.reason}`);
         }
       }
       if (bulk.failed > 0) process.exitCode = 1;
@@ -32004,7 +32145,7 @@ function registerBoardCommands(program3) {
     }
     try {
       const defaultRepo = await resolveRepo(o.repo) ?? "";
-      const selector = parseIssueSelector(issueRef, defaultRepo);
+      const selector = parseIssueSelector(issueRef, defaultRepo, o.repo);
       if (!selector.repo) {
         return fail("board set-priority failed: could not resolve the repo \u2014 pass owner/repo#123 or use --repo");
       }
@@ -32249,7 +32390,7 @@ async function fetchRestClosingGuardPayload(prNumber, repo, gh = defaultGhApi) {
   return { pr: pr2, commits };
 }
 async function fetchHeadCheckRuns(headSha, repo, gh) {
-  const runsOut = await gh(["--paginate", `repos/${repo}/commits/${headSha}/check-runs?per_page=100`, "--jq", ".check_runs[] | {id, name, status, conclusion, app_id: .app.id}"]);
+  const runsOut = await gh(["--paginate", `repos/${repo}/commits/${headSha}/check-runs?per_page=100`, "--jq", ".check_runs[] | {id, name, status, conclusion, app_id: .app.id, details_url}"]);
   return dedupeLatestCheckRuns(parseNdjsonLines(runsOut));
 }
 async function fetchHeadCheckEntries(headSha, repo, gh) {
@@ -32321,6 +32462,29 @@ var RUNNER_INFRA_PRESTART_CONCLUSIONS = /* @__PURE__ */ new Set([
   "cancelled",
   "startup_failure"
 ]);
+var BARE_CHECKS_FAILURE_MESSAGE = "GitHub reported a checks failure but exposed no per-check data.";
+function actionRunIdFromDetailsUrl(detailsUrl) {
+  const match = detailsUrl?.match(/\/actions\/runs\/(\d+)(?:\/|$)/);
+  if (!match) return void 0;
+  const runId = Number(match[1]);
+  return Number.isSafeInteger(runId) ? runId : void 0;
+}
+function failedCheckReceipt(run, repo) {
+  const name = run.name ?? `check-run ${run.id ?? "unknown"}`;
+  const conclusion = run.conclusion ?? "unknown";
+  const detailsUrl = typeof run.details_url === "string" && run.details_url ? run.details_url : void 0;
+  const runId = actionRunIdFromDetailsUrl(detailsUrl);
+  return {
+    name,
+    conclusion,
+    ...detailsUrl ? { detailsUrl } : {},
+    ...runId !== void 0 ? {
+      runId,
+      runUrl: `https://github.com/${repo}/actions/runs/${runId}`,
+      diagnosticCommand: `gh run view ${runId} --log-failed --repo ${repo}`
+    } : {}
+  };
+}
 function isErrorAnnotation(a) {
   const level = a.annotation_level?.toLowerCase();
   return level === "failure" || level === "error";
@@ -32353,6 +32517,7 @@ function classifyFailedChecks(failing) {
       cause: "runner-infra",
       infraFailures,
       otherFailures,
+      failedChecks: [],
       reason: `${infraFailures.length} check(s) failed on RUNNER INFRASTRUCTURE, not your diff: ${infraFailures.join(", ")}. No test failed \u2014 the shared runner hit a wall-clock budget kill, ran out of disk, was missing a toolchain, could not acquire an mmi-live lane, or Actions returned Service Unavailable before checkout (the check annotation / conclusion names which). Re-run once the runner drains/heals (gh run rerun --failed); do not debug the diff.`
     };
   }
@@ -32360,6 +32525,7 @@ function classifyFailedChecks(failing) {
     cause: "checks-failure",
     infraFailures,
     otherFailures,
+    failedChecks: [],
     reason: infraFailures.length ? `checks failed: ${otherFailures.join(", ")}; separately, ${infraFailures.join(", ")} failed on runner infrastructure, not a test.` : `checks failed: ${otherFailures.join(", ") || "unknown"}.`
   };
 }
@@ -32380,6 +32546,7 @@ async function diagnoseFailedRestChecks(prNumber, repo, gh = defaultGhApi) {
           cause: "stale-head",
           infraFailures: [],
           otherFailures: [],
+          failedChecks: [],
           reason: `the PR head (${snapshot.headSha.slice(0, 7)}) is BEHIND the branch tip (${tip.sha.slice(0, 7)}) \u2014 GitHub likely dropped a \`synchronize\` event, so the reported red is a superseded commit and NO run exists for your current push. This is not your diff failing. Re-push (an empty commit is enough) or close and reopen the PR to re-sync the head and trigger a fresh run.`
         }
       };
@@ -32392,15 +32559,20 @@ async function diagnoseFailedRestChecks(prNumber, repo, gh = defaultGhApi) {
     return { state: "failed", error: `check-runs read failed for ${snapshot.headSha.slice(0, 7)} on ${repo}: ${readErrorText(e)}` };
   }
   if (!failing.length) return { state: "absent", reason: "no failing check-run on the current head to diagnose" };
+  const failedChecks = failing.map((run) => failedCheckReceipt(run, repo));
   try {
     const annotated = await Promise.all(failing.map(async (run) => ({
       name: run.name ?? `check-run ${run.id}`,
       conclusion: run.conclusion ?? null,
       annotations: JSON.parse(await gh([`repos/${repo}/check-runs/${run.id}/annotations`]))
     })));
-    return { state: "ok", diagnosis: classifyFailedChecks(annotated) };
+    return { state: "ok", diagnosis: { ...classifyFailedChecks(annotated), failedChecks } };
   } catch (e) {
-    return { state: "failed", error: `annotations read failed for a failing check-run on ${repo}: ${readErrorText(e)}` };
+    return {
+      state: "failed",
+      error: `annotations read failed for a failing check-run on ${repo}: ${readErrorText(e)}`,
+      failedChecks
+    };
   }
 }
 function isNotFoundError2(e) {
@@ -33240,6 +33412,7 @@ function registerIssueLifecycleCommands(program3, deps = {}) {
     (opts, args) => ({ command: "issue edit", ref: args[0], fields: Object.keys(opts).filter((k) => k !== "repo" && opts[k] !== void 0) })
   ).action(async (ref, o) => {
     try {
+      parseIssueRef(ref, o.repo);
       const defaultRepo = await resolveRepo(o.repo);
       const result = await editIssue(defaultGitHubClient(), {
         ref,
@@ -33284,6 +33457,7 @@ function registerIssueLifecycleCommands(program3, deps = {}) {
   ).action(async (ref, o) => {
     const parsed = parseCloseReason(o.reason);
     try {
+      parseIssueRef(ref, o.repo);
       const defaultRepo = await resolveRepo(o.repo);
       const result = await closeIssue(defaultGitHubClient(), {
         ref,
@@ -33303,6 +33477,7 @@ function registerIssueLifecycleCommands(program3, deps = {}) {
     (_opts, args) => ({ command: "issue reopen", ref: args[0] })
   ).action(async (ref, o) => {
     try {
+      parseIssueRef(ref, o.repo);
       const defaultRepo = await resolveRepo(o.repo);
       const result = await reopenIssue(defaultGitHubClient(), ref, defaultRepo);
       console.log(JSON.stringify(result));
@@ -33315,6 +33490,7 @@ function registerIssueLifecycleCommands(program3, deps = {}) {
     (_opts, args) => ({ command: "issue assign", ref: args[0], login: args[1] })
   ).action(async (ref, login, o) => {
     try {
+      parseIssueRef(ref, o.repo);
       const defaultRepo = await resolveRepo(o.repo);
       const result = await assignIssue(defaultGitHubClient(), ref, login, defaultRepo);
       console.log(JSON.stringify(result));
@@ -33327,6 +33503,7 @@ function registerIssueLifecycleCommands(program3, deps = {}) {
     (_opts, args) => ({ command: "issue unassign", ref: args[0], login: args[1] })
   ).action(async (ref, login, o) => {
     try {
+      parseIssueRef(ref, o.repo);
       const defaultRepo = await resolveRepo(o.repo);
       const result = await unassignIssue(defaultGitHubClient(), ref, login, defaultRepo);
       console.log(JSON.stringify(result));
@@ -33339,6 +33516,7 @@ function registerIssueLifecycleCommands(program3, deps = {}) {
     (opts, args) => ({ command: "issue relocate", ref: args[0], to: opts.to })
   ).action(async (ref, o) => {
     try {
+      parseIssueRef(ref, o.repo);
       const defaultRepo = await resolveRepo(o.repo);
       const result = await relocateIssue(defaultGitHubClient(), ref, o.to, defaultRepo);
       console.log(JSON.stringify(result));
@@ -33350,8 +33528,10 @@ function registerIssueLifecycleCommands(program3, deps = {}) {
     issue2.command("unlink-child <parent> <child>").description("unlink a child issue from its parent (inverse of link-child) and print {parentNumber,subIssueNumber,totalCount} JSON").option("--repo <owner/repo>", "repo for bare refs on either side (defaults to the current repo)"),
     (_opts, args) => ({ command: "issue unlink-child", parent: args[0], child: args[1] })
   ).action(async (parentRef, childRef, o) => {
-    const defaultRepo = await resolveRepo(o.repo);
     try {
+      parseIssueRef(parentRef, o.repo);
+      parseIssueRef(childRef, o.repo);
+      const defaultRepo = await resolveRepo(o.repo);
       const result = await unlinkSubIssue(ghRunner, parentRef, childRef, defaultRepo);
       console.log(JSON.stringify(result));
     } catch (e) {
@@ -34985,7 +35165,7 @@ function registerLearningPickupCommand(program3) {
       let selector;
       try {
         if (ref) {
-          selector = parseIssueSelector(ref, defaultRepo);
+          selector = parseIssueSelector(ref, defaultRepo, o.repo);
         } else if (o.number) {
           selector = { repo: defaultRepo, number: Number.parseInt(o.number, 10) };
           if (!Number.isFinite(selector.number)) throw new Error("invalid --number");
@@ -39659,7 +39839,7 @@ withExamples(mutating(
       repo: targetRepo2,
       labels: extraLabels.length ? extraLabels : void 0
     });
-    if (o.parent !== void 0) parseIssueRef(o.parent);
+    if (o.parent !== void 0) parseIssueRef(o.parent, o.repo);
   } catch (e) {
     return fail(`issue create: ${e.message}`, e instanceof TextArgError ? { code: e.code, offending_flag: e.offendingFlag } : void 0);
   }
@@ -39741,10 +39921,15 @@ async function readParentField(number, repo) {
   }
   return resolveParentField(payload);
 }
-issue.command("view <number>").aliases(["show", "get"]).description('read an issue as structured JSON \u2014 the mmi-cli path for non-board issue reads (#2347). --comments folds in every comment; --context also adds linkedPrs + children (the one-shot "load the whole item" read, #2894). `show` and `get` alias view (#5483/#5706)').option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--json [fields...]", 'gh --json field list (overrides the default field set). Accepts commas, spaces, or repeated --json flags \u2014 in PowerShell an unquoted comma list is an array literal, so QUOTE it: --json "number,title,body,url"').option("--comments", 'include every comment (body + comments in one call) \u2014 the agentic "read the whole item before working it" read (#2894)').option("--context", "full working context in one call: implies --comments and also adds linkedPrs and, for an epic, a children summary (#2894)").action(async (number, o) => {
-  const n = Number(number);
-  if (!Number.isInteger(n) || n <= 0) return fail("issue view: <number> must be a positive integer");
-  const repo = await resolveRepo(o.repo);
+issue.command("view <ref>").aliases(["show", "get"]).description('read an issue as structured JSON \u2014 the mmi-cli path for non-board issue reads (#2347). --comments folds in every comment; --context also adds linkedPrs + children (the one-shot "load the whole item" read, #2894). `show` and `get` alias view (#5483/#5706)').option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--json [fields...]", 'gh --json field list (overrides the default field set). Accepts commas, spaces, or repeated --json flags \u2014 in PowerShell an unquoted comma list is an array literal, so QUOTE it: --json "number,title,body,url"').option("--comments", 'include every comment (body + comments in one call) \u2014 the agentic "read the whole item before working it" read (#2894)').option("--context", "full working context in one call: implies --comments and also adds linkedPrs and, for an epic, a children summary (#2894)").action(async (ref, o) => {
+  let parsed;
+  try {
+    parsed = parseIssueRef(ref, o.repo);
+  } catch (e) {
+    return fail(`issue view: ${e.message}`);
+  }
+  const n = parsed.number;
+  const repo = await resolveRepo(parsed.repo ?? o.repo);
   if (!repo) return fail("issue view: could not resolve repo (pass --repo <owner/repo>)");
   const fields = normalizeIssueViewJsonFields(o.json);
   try {
@@ -39804,12 +39989,14 @@ issue.command("discover-related").description("find related issues for an existi
 jsonParity(issue.command("link-child <parent> <child>").description("link an existing issue as a native sub-issue of a parent and print {parentNumber,subIssueNumber,totalCount} JSON").option("--repo <owner/repo>", "repo for bare refs on either side (defaults to the current repo)")).action(async (parentRef, childRef, o) => {
   const defaultRepo = await resolveRepo(o.repo);
   try {
+    parseIssueRef(parentRef, o.repo);
+    parseIssueRef(childRef, o.repo);
     const result = await linkSubIssue(ghRunner2, parentRef, childRef, defaultRepo);
     console.log(JSON.stringify(result));
   } catch (e) {
     let conflict;
     try {
-      const child2 = parseIssueRef(childRef);
+      const child2 = parseIssueRef(childRef, o.repo);
       const childRepo = child2.repo ?? defaultRepo;
       if (childRepo) conflict = await classifyReparentFailure(e, ghRunner2, childRepo, child2.number, parentRef);
     } catch {
@@ -39824,7 +40011,7 @@ jsonParity(issue.command("link-child <parent> <child>").description("link an exi
 jsonParity(issue.command("comment <ref>").description("post a Markdown comment to an issue and print {number,repo,url,commentUrl} JSON").option("--body <body>", "comment body (markdown; prefer --body-file for multiline Markdown)").option("--body-file <path|->", "read comment body from a UTF-8 file, or from stdin with -").option("--repo <owner/repo>", "repo for a bare ref (defaults to the current repo)")).action(async (ref, o) => {
   let parsed;
   try {
-    parsed = parseIssueRef(ref);
+    parsed = parseIssueRef(ref, o.repo);
   } catch (e) {
     return fail(`issue comment: ${e.message}`);
   }
@@ -39847,7 +40034,7 @@ jsonParity(issue.command("comment <ref>").description("post a Markdown comment t
 jsonParity(issue.command("check <ref>").description("tick (or with --off untick) a task-list checkbox in an issue/epic body by its item text and print {number,repo,item,checked,changed} JSON").requiredOption("--item <text>", "the checklist item to match \u2014 exact item text, else a unique substring").option("--off", "untick the item ([x] \u2014 [ ]) instead of ticking it").option("--repo <owner/repo>", "repo for a bare ref (defaults to the current repo)")).action(async (ref, o) => {
   let parsed;
   try {
-    parsed = parseIssueRef(ref);
+    parsed = parseIssueRef(ref, o.repo);
   } catch (e) {
     return fail(`issue check: ${e.message}`);
   }
@@ -40034,10 +40221,15 @@ withExamples(pr.command("create").description("create a PR and print {number,url
   "Use --body-file for multiline PR bodies instead of shell-escaped inline markdown.",
   "Write that file under .jerv/ inside the host workspace (#4405); host policy governs untracked files."
 ]);
-pr.command("view <number>").description("read a PR as structured JSON (merged state, head/base, URL, merge commit) \u2014 the mmi-cli read path (#2347). --comments folds in every comment; --context also adds linkedIssues (the issues it closes/references, #2894)").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--json [fields...]", 'gh --json field list (overrides the default field set). Accepts commas, spaces, or repeated --json flags \u2014 in PowerShell an unquoted comma list is an array literal, so QUOTE it: --json "state,baseRefName,mergeCommit"').option("--comments", "include every comment (body + comments in one call) \u2014 read the whole PR before landing it (#2894)").option("--context", "full working context in one call: implies --comments and also adds linkedIssues (the issues the PR closes/references) (#2894)").action(async (number, o) => {
-  const n = Number(number);
-  if (!Number.isInteger(n) || n <= 0) return fail("pr view: <number> must be a positive integer");
-  const repo = await resolveRepo(o.repo);
+pr.command("view <ref>").description("read a PR as structured JSON (merged state, head/base, URL, merge commit) \u2014 the mmi-cli read path (#2347). --comments folds in every comment; --context also adds linkedIssues (the issues it closes/references, #2894)").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--json [fields...]", 'gh --json field list (overrides the default field set). Accepts commas, spaces, or repeated --json flags \u2014 in PowerShell an unquoted comma list is an array literal, so QUOTE it: --json "state,baseRefName,mergeCommit"').option("--comments", "include every comment (body + comments in one call) \u2014 read the whole PR before landing it (#2894)").option("--context", "full working context in one call: implies --comments and also adds linkedIssues (the issues the PR closes/references) (#2894)").action(async (ref, o) => {
+  let parsed;
+  try {
+    parsed = parseIssueRef(ref, o.repo);
+  } catch (e) {
+    return fail(`pr view: ${e.message}`);
+  }
+  const n = parsed.number;
+  const repo = await resolveRepo(parsed.repo ?? o.repo);
   if (!repo) return fail("pr view: could not resolve repo (pass --repo <owner/repo>)");
   const defaultPrFields = "number,title,state,url,isDraft,mergeable,mergedAt,mergeCommit,headRefName,baseRefName,author,labels";
   const effective = resolvePrViewFields(o.json, defaultPrFields);
@@ -40146,13 +40338,44 @@ async function waitLoopCorePool(label) {
 async function waitLoopDiagnosis(label, prNumber, repo) {
   const read = await diagnoseFailedRestChecks(prNumber, repo);
   if (read.state === "ok") return read.diagnosis;
+  if (read.state === "absent") {
+    return {
+      cause: "checks-failure",
+      infraFailures: [],
+      otherFailures: [],
+      failedChecks: [],
+      checksFailureDetail: BARE_CHECKS_FAILURE_MESSAGE,
+      reason: BARE_CHECKS_FAILURE_MESSAGE
+    };
+  }
   if (read.state === "failed") {
     console.warn(
       `${label}: CI failure diagnosis read FAILED (${read.error}) \u2014 the red verdict stands UNDIAGNOSED; this is not evidence the failure is a real test failure. Re-read it with \`gh pr checks ${prNumber} --repo ${repo}\`.`
     );
+    return {
+      cause: "checks-failure",
+      infraFailures: [],
+      otherFailures: [],
+      failedChecks: read.failedChecks ?? [],
+      reason: "checks failure diagnosis unavailable"
+    };
   }
   return null;
 }
+function failedChecksReceiptLines(context, wait) {
+  if (wait.detail !== "checks-failure") return [];
+  const lines = [];
+  for (const check of wait.failedChecks ?? []) {
+    lines.push(`${context}: failed check: ${check.name} (${check.conclusion})${check.detailsUrl ? ` \u2014 ${check.detailsUrl}` : ""}`);
+    if (check.diagnosticCommand) lines.push(`${context}: next diagnostic: ${check.diagnosticCommand}`);
+  }
+  if (!wait.failedChecks?.length && wait.checksFailureDetail) lines.push(`${context}: ${wait.checksFailureDetail}`);
+  if (!wait.failedChecks?.some((check) => check.diagnosticCommand) && wait.diagnosticCommand) {
+    lines.push(`${context}: next diagnostic: ${wait.diagnosticCommand}`);
+  }
+  if (wait.checksUrl) lines.push(`${context}: PR checks: ${wait.checksUrl}`);
+  return lines;
+}
 async function waitLoopHeadWorkflowRunCount(label, prNumber, repo) {
   let snapshot;
   try {
@@ -40206,6 +40429,8 @@ pr.command("checks-wait <number>").description(`bounded wait for ALL checks on t
     // #3388: on a confirmed red, read the failing runs' annotations so a wall-clock budget kill stops
     // reading as "your tests failed". One call per failing run, only at the verdict.
     diagnoseFailure: () => waitLoopDiagnosis("pr checks-wait", number, repo),
+    checksUrl: `https://github.com/${repo}/pull/${number}/checks`,
+    checksDiagnosticCommand: `gh pr checks ${number} --repo ${repo}`,
     // #5400: after grace, name "GitHub delivered zero runs" instead of burning the full budget as pending.
     pollHeadWorkflowRunCount: () => waitLoopHeadWorkflowRunCount("pr checks-wait", number, repo),
     baseBranch,
@@ -40232,21 +40457,21 @@ pr.command("checks-wait <number>").description(`bounded wait for ALL checks on t
     printLine(`pr checks-wait: failure (stale PR head, NOT a test failure) \u2014 ${result.reason}`);
   } else if (result.detail === "zero-runs") {
     printLine(`pr checks-wait: failure (zero workflow runs delivered, NOT pending checks) \u2014 ${result.reason}`);
-  } else printLine(`pr checks-wait: ${result.status}${result.reason ? ` \u2014 ${result.reason}` : ""}${result.detail ? ` (${result.detail})` : ""}`);
+  } else {
+    printLine(`pr checks-wait: ${result.status}${result.reason ? ` \u2014 ${result.reason}` : ""}${result.detail ? ` (${result.detail})` : ""}`);
+    for (const line of failedChecksReceiptLines("pr checks-wait", result)) printLine(line);
+  }
   if (result.status === "failure" || result.status === "conflicting") process.exitCode = 1;
   if (result.status === "timeout" || result.status === "rate-limited") process.exitCode = PR_CHECKS_TIMEOUT_EXIT_CODE;
 });
 pr.command("land <number>").description("agent merge path (#1440): train probe \u2014 checks-wait \u2014 merge --auto \u2014 poll enqueued \u2014 development PRs only").option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the PR repo)").option("--no-require-train", "skip train-authority preflight (not recommended for autonomous agents)").option("--force", "acknowledge and land past a remaining prunable/severe scratch housekeeping block (advisory kept plans/ never blocks, #3012) or a negated-closing-keyword (#3718) or ambiguous-cross-repo-closing (#4279) refusal").action(async (number, o) => {
-  const refMatch = /^(?:([^/]+\/[^/]+))?#(\d+)$/.exec(number.trim());
-  if (refMatch) {
-    number = refMatch[2];
-    if (refMatch[1]) {
-      if (o.repo && o.repo !== refMatch[1]) {
-        console.error(`pr land: --repo ${o.repo} conflicts with ref repo ${refMatch[1]}`);
-        process.exitCode = 1;
-        return;
-      }
-      o.repo = refMatch[1];
+  if (/^(?:[^/]+\/[^/]+)?#\d+$/.test(number.trim())) {
+    try {
+      const parsed = parseIssueRef(number, o.repo);
+      number = String(parsed.number);
+      if (parsed.repo) o.repo = parsed.repo;
+    } catch (e) {
+      return fail(`pr land: ${e.message}`);
     }
   }
   const repoArgs = o.repo ? ["--repo", o.repo] : [];
@@ -40308,6 +40533,8 @@ pr.command("land <number>").description("agent merge path (#1440): train probe \
         // #3388: `pr land` is the batch path — the one most likely to self-DOS the shared runner and
         // then read its own wall-clock kill as a broken diff.
         diagnoseFailure: () => waitLoopDiagnosis("pr land", prNumber, repo),
+        checksUrl: `https://github.com/${repo}/pull/${prNumber}/checks`,
+        checksDiagnosticCommand: `gh pr checks ${prNumber} --repo ${repo}`,
         // #5400: same zero-runs delivery probe as checks-wait — do not burn the land budget on silence.
         pollHeadWorkflowRunCount: () => waitLoopHeadWorkflowRunCount("pr land", prNumber, repo),
         baseBranch: "development",
@@ -40490,6 +40717,8 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
       pollMergeable: () => pollRestPrMergeable(number, repo),
       pollRateLimit: () => waitLoopCorePool("pr merge --wait"),
       diagnoseFailure: () => waitLoopDiagnosis("pr merge --wait", number, repo),
+      checksUrl: `https://github.com/${repo}/pull/${number}/checks`,
+      checksDiagnosticCommand: `gh pr checks ${number} --repo ${repo}`,
       pollHeadWorkflowRunCount: () => waitLoopHeadWorkflowRunCount("pr merge --wait", number, repo),
       baseBranch,
       sleep: (ms) => new Promise((resolve6) => setTimeout(resolve6, ms)),
@@ -40498,7 +40727,20 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
       progress: ({ state, elapsedMs, remainingMs }) => console.warn(`pr merge: --wait checks \u2014 ${state}, ${Math.round(elapsedMs / 1e3)}s elapsed, ${Math.round(remainingMs / 6e4)}m left`)
     });
     if (wait.status !== "success" && wait.status !== "skipped") {
+      if (wait.detail === "checks-failure") {
+        console.log(JSON.stringify({
+          mergeStatus: "not-merged",
+          reason: "checks-failure",
+          pr: number,
+          repo,
+          failedChecks: wait.failedChecks ?? [],
+          ...wait.checksUrl ? { checksUrl: wait.checksUrl } : {},
+          ...wait.diagnosticCommand ? { diagnosticCommand: wait.diagnosticCommand } : {},
+          ...wait.checksFailureDetail ? { checksFailureDetail: wait.checksFailureDetail } : {}
+        }));
+      }
       console.warn(`pr merge: --wait stopped before merge \u2014 ${wait.status}${wait.reason ? `: ${wait.reason}` : ""}${wait.detail ? ` (${wait.detail})` : ""}`);
+      for (const line of failedChecksReceiptLines("pr merge", wait)) console.warn(line);
       process.exitCode = wait.status === "timeout" || wait.status === "rate-limited" ? PR_CHECKS_TIMEOUT_EXIT_CODE : 1;
       return;
     }
@@ -40610,7 +40852,6 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
     process.exitCode = 1;
     return;
   }
-  const remoteBranch = { branch: headRef, existedBefore: remoteBefore, attempted: false, reason: remoteNotAttemptedReason };
   const primaryRoot = beforeWorktrees[0]?.path ?? (startingPath || process.cwd());
   let localCleanup;
   try {
@@ -40635,6 +40876,28 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
       }
     };
   }
+  const remoteBranch = await deleteMergedRemoteBranch({
+    branch: headRef,
+    existedBefore: remoteBefore,
+    execGit: async (args) => (await execFileP2("git", args, { timeout: GIT_TIMEOUT_MS })).stdout,
+    branchExists: remoteBranchExists2
+  });
+  const worktreePartial = localCleanup?.worktree?.path && localCleanup.worktree.status !== "removed" ? {
+    kind: "worktree-directory",
+    path: localCleanup.worktree.path,
+    reason: localCleanup.worktree.reason ?? localCleanup.worktree.status,
+    error: localCleanup.worktree.error ?? localCleanup.worktree.residueError,
+    remediation: localCleanup.worktree.remediation ?? `Remove-Item -LiteralPath '${localCleanup.worktree.path?.replace(/'/g, "''")}' -Recurse -Force`
+  } : void 0;
+  const partialCleanup = [
+    ...worktreePartial ? [worktreePartial] : [],
+    ...remoteBranch.status === "failed" ? [{
+      kind: "remote-branch",
+      branch: remoteBranch.branch,
+      error: remoteBranch.error,
+      remediation: remoteBranch.remediation
+    }] : []
+  ];
   const boardAdvance = await advanceClosedIssuesToDone2(number, repoForPostCleanup);
   const crossRepoFilingIssue = repoForPostCleanup ? await reconcileCrossRepoFilingIssue(defaultGitHubClient(), repoForPostCleanup, Number(number)) : { status: "failed", error: "could not resolve the PR repo for cross-repo filing-issue reconciliation" };
   const recovery = repoForPostCleanup ? buildPostMergeReconRecovery({
@@ -40672,12 +40935,13 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
     observedMethod
   });
   console.log(JSON.stringify({
-    mergeStatus: "merged",
+    mergeStatus: partialCleanup.length ? "partial-cleanup" : "merged",
     merged: number,
     branch: headRef,
     ...methodField ? { method: methodField } : {},
     remoteBranch,
     housekeeping,
+    ...partialCleanup.length ? { cleanupStatus: "partial", partialCleanup } : {},
     ...localCleanup?.worktree ? { worktree: localCleanup.worktree } : {},
     ...localCleanup?.localBranch ? { localBranch: localCleanup.localBranch } : {},
     // `boardAdvance` keeps its published array shape; `boardAdvanceStatus` is the field a caller reads to
@@ -40701,7 +40965,7 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
   })) {
     console.error(line);
   }
-  process.exitCode = prMergeLocalCleanupExitCode(localCleanup) ?? postMergeReconExitCode({ boardAdvance, crossRepoFilingIssue }) ?? process.exitCode;
+  process.exitCode = (partialCleanup.length ? 1 : void 0) ?? prMergeLocalCleanupExitCode(localCleanup) ?? postMergeReconExitCode({ boardAdvance, crossRepoFilingIssue }) ?? process.exitCode;
 });
 registerQueryCommands(program2);
 registerIssueLifecycleCommands(program2, { attach: attachToProject });
@@ -40844,6 +41108,52 @@ function renderAlignment(label, alignment) {
   }
   return `${label}: ALIGNMENT PR PENDING \u2014 land it with \`mmi-cli devops pr merge ${alignment.prNumber ?? "<number>"} --auto --merge\`${alignment.prUrl ? ` (${alignment.prUrl})` : ""}`;
 }
+function followUpLegStatus(status) {
+  return status === "failure" ? "failed" : status;
+}
+function releaseFollowUpLegs(result, projectInfoSync) {
+  const legs = [
+    {
+      leg: "project-info",
+      status: projectInfoSync && "error" in projectInfoSync ? "failed" : "success",
+      ...projectInfoSync && "error" in projectInfoSync ? { error: projectInfoSync.error } : {}
+    }
+  ];
+  const runs = result.workflowRuns ?? [];
+  if (runs.length > 0) {
+    legs.push(...runs.map((run) => ({
+      leg: run.workflow,
+      status: followUpLegStatus(run.conclusion),
+      ...run.conclusion === "failure" ? { error: run.workflow === "jerv-gateway" ? result.dispatch : `${run.workflow} reported failure` } : {}
+    })));
+  } else if (result.deployStatus !== "success") {
+    legs.push({
+      leg: "deploy",
+      status: followUpLegStatus(result.deployStatus),
+      ...result.deployStatus === "failure" ? { error: result.dispatch } : {}
+    });
+  }
+  if (result.rcRetirement) {
+    legs.push({
+      leg: "rc-retirement",
+      status: result.rcRetirement === "failed" ? "failed" : "success",
+      ...result.rcRetirement === "failed" ? { error: result.rcRetirementNote ?? "rc retirement failed" } : {}
+    });
+  }
+  if (result.devRollForward) {
+    legs.push({
+      leg: "development-alignment",
+      status: result.devRollForward.status === "pr-pending" ? "pending" : "success"
+    });
+  }
+  if (result.rcAlignment) {
+    legs.push({
+      leg: "rc-alignment",
+      status: result.rcAlignment.status === "pr-pending" ? "pending" : "success"
+    });
+  }
+  return legs;
+}
 var JERV_POWERTOOLS_REPO = "mutmutco/Jerv-PowerTools";
 async function runPostReleaseJervDoctor(repo) {
   if (repo.toLowerCase() !== JERV_POWERTOOLS_REPO.toLowerCase()) return void 0;
@@ -40884,7 +41194,11 @@ function renderTrainApply(commandName, r) {
   if (r.releaseVerdict) {
     const v = r.releaseVerdict;
     const verdict = v.followUpStatus === "failed" ? "PROMOTED, FOLLOW-UP FAILED" : v.followUpStatus === "pending" ? "PROMOTED, FOLLOW-UP PENDING" : "SUCCEEDED";
-    return `${base}; release verdict: ${verdict}; promoted=${v.promoted}; tag=${v.tag}; release=${v.releaseUrl ?? "unreported"}; follow-up: ${v.followUpStatus.toUpperCase()}`;
+    const failedLegs = v.legs.filter((leg) => leg.status === "failed");
+    return [
+      `${base}; release verdict: ${verdict}; promoted=${v.promoted}; tag=${v.tag}; release=${v.releaseUrl ?? "unreported"}; follow-up: ${v.followUpStatus.toUpperCase()}`,
+      ...failedLegs.map((leg) => `  - follow-up leg ${leg.leg}: FAILED \u2014 ${leg.error ?? "no diagnostic recorded"}`)
+    ].join("\n");
   }
   return base;
 }
@@ -41055,7 +41369,8 @@ for (const commandName of ["rcand", "release"]) {
           followUpStatus,
           promoted: result.promoted,
           tag: result.tag,
-          releaseUrl: result.release?.url ?? null
+          releaseUrl: result.release?.url ?? null,
+          legs: releaseFollowUpLegs(result, projectInfoSync)
         } : void 0;
         const reported = {
           ...result,
@@ -41105,7 +41420,7 @@ function renderHotfixRelease(r) {
     `  - ${r.tagNote}`,
     `  - ${r.releaseNote}`,
     `  - deploy: ${r.deployNote}`,
-    ...r.runs.map((run) => `  - ${run.workflow}: ${run.conclusion}${run.url ? ` (${run.url})` : ""}`),
+    ...r.runs.map((run) => `  - ${run.workflow}: ${run.conclusion}${run.conclusion === "failure" ? " \u2014 error: workflow reported failure" : ""}${run.url ? ` (${run.url})` : ""}`),
     `  - ${r.verifyNote}`,
     ...r.announceNote ? [`  - announce: ${r.announceNote}`] : [],
     `  - fold: ${r.foldNote}`,
@@ -41116,7 +41431,7 @@ function renderHotfixStatus(r) {
   return [
     `mmi-cli devops hotfix status: ${r.tag} on ${r.repo} \u2014 ${r.state}`,
     `  - branch: ${r.branchExists ? "pushed" : "absent"} \u2014 PR: ${r.pr ? `#${r.pr.number} ${r.pr.state}` : "none"} \u2014 tag: ${r.tagPushed ? "pushed" : "absent"} \u2014 Release: ${r.releaseExists ? "exists" : "absent"}`,
-    ...r.runs.map((run) => `  - ${run.workflow}: ${run.conclusion}${run.url ? ` (${run.url})` : ""}`),
+    ...r.runs.map((run) => `  - ${run.workflow}: ${run.conclusion}${run.conclusion === "failure" ? " \u2014 error: workflow reported failure" : ""}${run.url ? ` (${run.url})` : ""}`),
     `  - npm @mutmutco/cli: ${r.npmVersion}`,
     `  - next: ${r.next}`,
     ...r.warnings.map((w) => `  - warning: ${w}`)
@@ -41127,13 +41442,25 @@ function hotfixRunOutcome(conclusion) {
   if (conclusion === "failure") return "failure";
   return "unresolved";
 }
+function hotfixFollowUpLegs(runs, foldPort, foldNote) {
+  const legs = runs.map((run) => ({
+    leg: run.workflow,
+    status: followUpLegStatus(run.conclusion === "failure" ? "failure" : run.conclusion === "success" ? "success" : "pending"),
+    ...run.conclusion === "failure" ? { error: "workflow reported failure" } : {}
+  }));
+  if (foldPort === "failure") {
+    legs.push({ leg: "development-fold-port", status: "failed", error: foldNote ?? "development fold port failed" });
+  }
+  return legs;
+}
 async function runHotfixSub(sub, body, json, render) {
   try {
     await requireFreshTrainCli("hotfix");
     const result = await body();
-    printLine(json ? JSON.stringify(result, null, 2) : render(result));
     const runs = result.runs;
     const foldPort = result.foldStatus ?? "ok";
+    const legs = runs ? hotfixFollowUpLegs(runs, foldPort, result.foldNote) : void 0;
+    printLine(json ? JSON.stringify(legs ? Object.assign({}, result, { legs }) : result, null, 2) : render(result));
     if (runs) applyTrainFollowUpExit(deriveTrainFollowUpStatus({
       projectInfo: "ok",
       deploy: reduceFollowUpOutcomes(runs.map((r) => hotfixRunOutcome(r.conclusion))),

package/package.json

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