@mutmutco/cli 4.3.2 → 4.3.4

package/dist/main.cjs

@@ -5555,6 +5555,31 @@ function rewriteNegatedClosingPhrases(text) {
     (seg, i) => i % 2 === 1 ? seg : seg.replace(NEGATED_CLOSING_PHRASE_RE, (_m, plain, linked) => `leaves #${plain ?? linked} open`)
   ).join("");
 }
+var LINE_START_CLOSING_RE = /^\s*(?:[-*+]\s+)?(?:\*\*|__)?\s*(?:close[sd]?|fix(?:e[sd])?|resolve[sd]?)\s+(?:#\d+|\[#\d+\]\()/i;
+var FENCE_LINE_RE = /^\s*(?:```|~~~)/;
+function rewriteCloseKeywordProse(text) {
+  if (!text.includes("#")) return { text, rewritten: [] };
+  const rewritten = /* @__PURE__ */ new Set();
+  let inFence = false;
+  const lines = text.split("\n").map((line) => {
+    if (FENCE_LINE_RE.test(line)) {
+      inFence = !inFence;
+      return line;
+    }
+    if (inFence || LINE_START_CLOSING_RE.test(line)) return line;
+    CLOSING_MENTION_RE.lastIndex = 0;
+    return line.split(/(`[^`\n]*`)/g).map((seg, i) => {
+      if (i % 2 === 1) return seg;
+      return seg.replace(CLOSING_MENTION_RE, (match, _keyword, plain, linked) => {
+        const n = Number(plain ?? linked);
+        if (!Number.isInteger(n) || n <= 0) return match;
+        rewritten.add(n);
+        return `part of #${n}`;
+      });
+    }).join("");
+  });
+  return rewritten.size ? { text: lines.join("\n"), rewritten: [...rewritten] } : { text, rewritten: [] };
+}
 function findClosingMentions(text) {
   const mentions = [];
   for (const match of text.matchAll(CLOSING_MENTION_RE)) {
@@ -5588,11 +5613,12 @@ var CROSS_REPO_TOKEN_RE = /\b([\w.-]+\/[\w.-]+)#(\d+)\b/g;
 function findCrossRepoAmbiguousClosings(text, closingNumbers, repo) {
   if (!closingNumbers.length) return [];
   const closing = new Set(closingNumbers);
+  const bareClosing = new Set(findClosingMentions(text).map((m) => m.issue));
   const flagged = /* @__PURE__ */ new Set();
   const repoLower = repo.toLowerCase();
   for (const match of text.matchAll(CROSS_REPO_TOKEN_RE)) {
     const n = Number(match[2]);
-    if (!closing.has(n)) continue;
+    if (!closing.has(n) || !bareClosing.has(n)) continue;
     if ((match[1] ?? "").toLowerCase() === repoLower) continue;
     flagged.add(n);
   }
@@ -11708,7 +11734,16 @@ async function gatherClaimLiveness(client, repo, number, fetchOpenPulls) {
   const out = { failed: [] };
   try {
     const comments = await client.restPaginate(`repos/${repo}/issues/${number}/comments`);
-    out.marker = latestClaimMarker(comments.map((comment) => ({ body: comment.body ?? "" })));
+    const rows = comments.map((comment) => ({ body: comment.body ?? "", login: comment.user?.login ?? void 0 }));
+    out.marker = latestClaimMarker(rows);
+    if (out.marker) {
+      for (let i = rows.length - 1; i >= 0; i -= 1) {
+        if (latestClaimMarker([rows[i]])) {
+          out.markerBy = rows[i].login;
+          break;
+        }
+      }
+    }
     out.markerAgeMs = out.marker ? Date.now() - Date.parse(out.marker.ts) : void 0;
     if (out.marker) {
       const state = probeLocalClaimSession(out.marker);
@@ -11775,17 +11810,26 @@ function laneOwnership(marker, current) {
   }
   return "unknown";
 }
-async function checkLaneContest(client, item, actor = describeSessionIdentity()) {
+function laneResumeEvidence(evidence) {
+  if (!evidence.marker || evidence.sessionState !== "dead" || evidence.failed.length > 0) return void 0;
+  if (!isHostSessionId(evidence.marker.session)) return void 0;
+  const artifacts = [evidence.openPr, evidence.branch ? `live branch ${evidence.branch}` : void 0].filter(Boolean);
+  return `prior claim by lane ${describeClaimMarker(evidence.marker)} (@${evidence.markerBy}, ${formatClaimAge(evidence.markerAgeMs)} old) is verifiably not running on this host \u2014 its local session transcript is gone or stale${artifacts.length ? `; resuming over ${artifacts.join("; ")}` : ""}`;
+}
+async function checkLaneContest(client, item, actor = describeSessionIdentity(), viewerLogin) {
   const evidence = await gatherClaimLiveness(client, item.repository, item.number, openPullsFetcher(client));
   const ownership = laneOwnership(evidence.marker, actor);
+  const sameOwner = Boolean(viewerLogin && evidence.markerBy && evidence.markerBy.toLowerCase() === viewerLogin.toLowerCase());
+  const resume = ownership !== "mine" && sameOwner ? laneResumeEvidence(evidence) : void 0;
   const live = ownership === "mine" ? [] : liveEvidenceLines(evidence, item.repository);
   const unverifiable = ownership === "mine" ? [] : evidence.failed;
   return {
-    contested: ownership !== "mine" && (live.length > 0 || unverifiable.length > 0),
+    contested: ownership !== "mine" && !resume && (live.length > 0 || unverifiable.length > 0),
     live,
     unverifiable,
     ownership,
-    marker: evidence.marker
+    marker: evidence.marker,
+    resume
   };
 }
 function laneContestMessage(ref, contest, verb) {
@@ -12084,8 +12128,9 @@ async function claimOneBoardItem(ctx, selector, options) {
     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 };
+  let resumeEvidence;
+  const claimedReceipt = () => previousHolder ? resumeEvidence ? { outcome: "resumed", holder, previousHolder, resumeEvidence } : { outcome: "took-over", holder, previousHolder } : { outcome: "claimed", holder };
+  const heldReceipt = () => previousHolder ? resumeEvidence ? { outcome: "resumed", holder, previousHolder, resumeEvidence } : { 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);
@@ -12096,17 +12141,25 @@ async function claimOneBoardItem(ctx, selector, options) {
   if (!verdict.ok) throw new Error(verdict.reason);
   item = fresh;
   const refuseIfContested = async () => {
-    const contest = await checkLaneContest(client, item, ctx.session);
-    if (!contest.contested) return;
-    if (!options.force) throw new Error(laneContestMessage(item.ref, contest, "claim"));
-    previousHolder = {
+    const contest = await checkLaneContest(client, item, ctx.session, report.viewer);
+    resumeEvidence = void 0;
+    const displaced = () => ({
       login: assignedLogin,
       ...contest.marker ? {
         session: contest.marker.session,
         surface: contest.marker.surface,
         host: contest.marker.host
       } : {}
-    };
+    });
+    if (!contest.contested) {
+      if (contest.resume && contest.marker) {
+        resumeEvidence = contest.resume;
+        previousHolder = displaced();
+      }
+      return;
+    }
+    if (!options.force) throw new Error(laneContestMessage(item.ref, contest, "claim"));
+    previousHolder = displaced();
   };
   await refuseIfContested();
   if (verdict.alreadyClaimed) {
@@ -12176,7 +12229,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, outcome: result.outcome, holder: result.holder, previousHolder: result.previousHolder, 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, resumeEvidence: result.resumeEvidence, alreadyClaimed: result.alreadyClaimed, checked: result.checked };
       } catch (e) {
         results[index] = { ref, claimed: false, reason: e.message };
       }
@@ -15322,10 +15375,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.3.2",
-    tag: "v4.3.2",
-    commit: "c4aa995c1dfc",
-    npm: "@mutmutco/cli@4.3.2"
+    version: "4.3.4",
+    tag: "v4.3.4",
+    commit: "cd7d0dd9cc3a",
+    npm: "@mutmutco/cli@4.3.4"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -15342,14 +15395,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.3.2"
+          v3Target: "v4.3.4"
         }
       ],
       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.3.2 and redeploy the Hub Lambda from tag v4.3.2 (c4aa995c1dfc); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.3.2 (@mutmutco/cli@4.3.2, tag commit c4aa995c1dfc \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.3.4 and redeploy the Hub Lambda from tag v4.3.4 (cd7d0dd9cc3a); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.3.4 (@mutmutco/cli@4.3.4, tag commit cd7d0dd9cc3a \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -23765,19 +23818,23 @@ function registerBoardCommands(program3) {
     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)`;
+      if (result.outcome === "resumed") return `Check ${ref}: prior lane ${previousHolder} is verifiably dead - claim would resume its work for ${holder} (nothing written; ${result.resumeEvidence})`;
       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 `Partially took over ${ref} from ${previousHolder}: ${result.warning}`;
+      if (result.outcome === "resumed") return `Partially resumed ${ref} from ${previousHolder}: ${result.warning}`;
+      return `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 === "resumed") return `Resumed ${ref} from ${previousHolder} for ${holder} - In Progress (${result.resumeEvidence})`;
     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 }).alias("list").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));
   withExamples(mutating(
-    board.command("claim <issues...>").description("claim issues: assign them and move their Project v2 Status to In Progress \u2014 idempotent, so an item already yours and In Progress succeeds unchanged (one or more refs)").addHelpText("after", "\nevery claim stamps a lane-identity marker comment on the issue (`<!-- mmi-claim: \u2026 -->`,\nsurface/session@host) so other agents can attribute the hold (#3727). The session is the\nhost-exported id when the surface provides one, otherwise a per-process `synth-` fallback \u2014\na claim is never anonymous (#5245). `board show`, doctor and unclaim read the latest marker.\n").option("--json", "machine-readable output").option("--repo <owner/repo>", "current repo for local issue numbers (defaults to git origin)").option("--for <login>", "assign to this login instead of @me \u2014 agent claims on behalf of the master").option("--force", "take an item already claimed by another lane that shows live evidence of active work (#3727)").option("--check", "read-only: run every claim gate and report the verdict, writing nothing \u2014 exits 1 with the same refusal a real claim would raise (#4511)").option("--allow-partial", "return success JSON if assignment succeeds but the status move fails"),
+    board.command("claim <issues...>").description("claim issues: assign them and move their Project v2 Status to In Progress \u2014 idempotent, so an item already yours and In Progress succeeds unchanged (one or more refs)").addHelpText("after", "\nevery claim stamps a lane-identity marker comment on the issue (`<!-- mmi-claim: \u2026 -->`,\nsurface/session@host) so other agents can attribute the hold (#3727). The session is the\nhost-exported id when the surface provides one, otherwise a per-process `synth-` fallback \u2014\na claim is never anonymous (#5245). `board show`, doctor and unclaim read the latest marker.\n\nsame-owner resume (#6035): when the prior marker was posted by YOUR login on THIS host and its\nlocal session is verifiably dead (transcript probe), the claim proceeds as a resume without\n--force and names the evidence. A live, foreign-host, or unprobeable prior lane still refuses.\n").option("--json", "machine-readable output").option("--repo <owner/repo>", "current repo for local issue numbers (defaults to git origin)").option("--for <login>", "assign to this login instead of @me \u2014 agent claims on behalf of the master").option("--force", "take an item already claimed by another lane that shows live evidence of active work (#3727)").option("--check", "read-only: run every claim gate and report the verdict, writing nothing \u2014 exits 1 with the same refusal a real claim would raise (#4511)").option("--allow-partial", "return success JSON if assignment succeeds but the status move fails"),
     (_opts, args) => ({ command: "board claim", issues: args[0] ?? [] })
   ).action(async (issueRefs, o) => {
     if (issueRefs.length === 1) {
@@ -35372,6 +35429,10 @@ function ghPrMergeLocalBranchDeleteWarning(message) {
 function mergeAutoRejectedPrAlreadyClean(message) {
   return /clean status \(enablePullRequestAutoMerge\)|is in clean status/i.test(message);
 }
+function mergeRejectedBaseBranchModified(message) {
+  return /base branch was modified\. review and try the merge again/i.test(message);
+}
+var PR_MERGE_BASE_RACE_RETRY_DELAY_MS = 3e3;
 function assertRemoteBranchPreservedOnMerge(repo, deleteBranchOnMerge) {
   if (deleteBranchOnMerge === false) return;
   throw new Error(
@@ -35616,7 +35677,8 @@ async function mergeAutoEnqueueWithBody(prNumber, args, method, io, bodyFile) {
   return confirmEnqueueOutcome();
 }
 function cleanupGitArgs(cwd, args) {
-  return cwd ? ["-C", cwd, ...args] : args;
+  if (!cwd || args[0] === "-C") return args;
+  return ["-C", cwd, ...args];
 }
 async function remoteBranchExists2(branch, options = {}) {
   if (!branch) return void 0;
@@ -35651,14 +35713,16 @@ async function deleteMergedRemoteBranch(options) {
   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
-    };
+    if (exists2 !== true) {
+      return {
+        branch: options.branch,
+        existedBefore: false,
+        attempted: false,
+        status: "failed",
+        error: `could not verify absence of origin/${options.branch}`,
+        remediation
+      };
+    }
   }
   try {
     await options.execGit(["push", "origin", "--delete", options.branch]);
@@ -36028,6 +36092,24 @@ async function checkDocsIndexAtHead(opts, deps) {
   };
 }
 
+// src/pr-create-claim-guard.ts
+async function prCreateClaimRefusal(body, repoOption, deps = {}) {
+  const issues = [...new Set(findClosingMentions(body).map((mention) => mention.issue))];
+  if (!issues.length) return void 0;
+  const repo = await requireRepo(repoOption);
+  const client = deps.client ?? defaultGitHubClient();
+  const actor = deps.actor ?? describeSessionIdentity();
+  const checkContest = deps.checkContest ?? checkLaneContest;
+  for (const number of issues) {
+    const contest = await checkContest(client, { repository: repo, number }, actor);
+    if (!contest.contested) continue;
+    const ref = `${repo}#${number}`;
+    const holder = contest.marker ? `lane ${describeClaimMarker(contest.marker)}` : "another lane";
+    return `pr create: REFUSED \u2014 ${ref} is held by ${holder} with live or unreadable work evidence; run \`mmi-cli oracle board claim ${ref} --force\` before creating this PR`;
+  }
+  return void 0;
+}
+
 // src/worktree-merge-cleanup.ts
 var import_node_fs40 = require("node:fs");
 var import_node_path37 = require("node:path");
@@ -36313,6 +36395,22 @@ function samePath(a, b) {
   const nb = normPath2(b);
   return process.platform === "win32" ? na.toLowerCase() === nb.toLowerCase() : na === nb;
 }
+function isPathAtOrWithin(path2, worktreePath) {
+  if (!path2) return false;
+  const candidate = normPath2(path2);
+  const target = normPath2(worktreePath);
+  const normalize = (value) => process.platform === "win32" ? value.toLowerCase() : value;
+  const normalizedCandidate = normalize(candidate);
+  const normalizedTarget = normalize(target);
+  return normalizedCandidate === normalizedTarget || normalizedCandidate.startsWith(`${normalizedTarget}/`);
+}
+function isWindowsCwdLockResidueError(error) {
+  return process.platform === "win32" && /\bEPERM\b|access(?: is)? denied/i.test(error);
+}
+function deferredCwdLockRemediation(primaryRoot, wtPath) {
+  const quote = (path2) => path2.replace(/'/g, "''");
+  return `After this command exits: Set-Location -LiteralPath '${quote(primaryRoot)}'; Remove-Item -LiteralPath '${quote(wtPath)}' -Recurse -Force`;
+}
 function selectPrMergeCleanupWorktree(branch, before, after, startingPath) {
   if (!branch) return void 0;
   const current = after.find((w) => w.branch === branch)?.path;
@@ -36481,6 +36579,10 @@ async function removeWorktreeWithReconcile(wtPath, git3, listWorktrees, pathExis
     })
   };
 }
+function isPrMergeWorktreePartial(cleanup) {
+  const worktree = cleanup?.worktree;
+  return Boolean(worktree?.path && worktree.status !== "removed" && worktree.status !== "preserved" && worktree.status !== "retained-locked");
+}
 function prMergeLocalCleanupExitCode(cleanup) {
   return cleanup?.worktree?.status === "failed" || cleanup?.localBranch?.status === "failed" ? 1 : void 0;
 }
@@ -36651,11 +36753,17 @@ 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, "''")}' -Force`;
+      if (isWindowsCwdLockResidueError(residue.error) && isPathAtOrWithin(options.startingPath, wtPath)) {
+        report.worktree.status = "retained-locked";
+        report.worktree.reason = "parent-cwd-lock";
+        report.worktree.remediation = deferredCwdLockRemediation(options.primaryRoot, wtPath);
+      } else {
+        report.worktree.status = "failed";
+        report.worktree.reason = "residue-remains";
+        report.worktree.remediation = `Remove-Item -LiteralPath '${wtPath.replace(/'/g, "''")}' -Force`;
+      }
     }
   }
   try {
@@ -36684,8 +36792,10 @@ function renderPrMergeCleanupLines(cleanup) {
     lines.push(`pr merge: worktree ${wt.path} removal failed${wt.error ? ` \u2014 ${wt.error}` : ""}`);
   } else if (wt.status === "preserved") {
     lines.push(`pr merge: preserved worktree ${wt.path} (--preserve-worktree)`);
+  } else if (wt.status === "retained-locked") {
+    lines.push(`pr merge: worktree ${wt.path} cleanup deferred \u2014 its Windows parent shell still holds the cwd; ${wt.remediation ?? "exit the shell and remove the residue from the primary checkout"}`);
   }
-  if (wt.residue === "left") {
+  if (wt.residue === "left" && wt.status !== "retained-locked") {
     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) {
@@ -37331,10 +37441,20 @@ ${list}`);
     }
     body = normalizeClosingDirectives(body);
     body = rewriteNegatedClosingPhrases(body);
+    const prose = rewriteCloseKeywordProse(body);
+    if (prose.rewritten.length) {
+      body = prose.text;
+      process.stderr.write(
+        `pr create: WARNING \u2014 rewrote close-keyword prose to "part of #N" for ${prose.rewritten.map((n) => `#${n}`).join(", ")}: GitHub parses close/fix/resolve + #N even mid-sentence (#6039). Keep closing keywords on a dedicated "Closes #N" line.
+`
+      );
+    }
     const docsCheck = await checkDocsIndexAtHead({ repo: o.repo, head: o.head }, createPrCreateDocsIndexDeps());
     if (docsCheck && !docsCheck.ok) {
       return fail(`pr create: ${docsCheck.detail} \u2014 ${docsCheck.fix}`);
     }
+    const claimRefusal = await prCreateClaimRefusal(body, o.repo);
+    if (claimRefusal) return fail(claimRefusal);
     const created = await ghCreate(buildPrArgs({ title, body, base: o.base, head: o.head, repo: o.repo, draft: o.draft }));
     if (isGhCreateRateLimited(created)) {
       console.log(JSON.stringify(created));
@@ -37349,7 +37469,8 @@ ${list}`);
   ], [
     "--head and --base default to the current branch and the repo default; only pass them to override.",
     "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."
+    "Write that file under .jerv/ inside the host workspace (#4405); host policy governs untracked files.",
+    'Keep closing keywords on a dedicated line ("Closes #N") \u2014 GitHub parses close/fix/resolve + #N even mid-sentence, so pr create rewrites such prose to "part of #N" (#6039).'
   ]);
   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;
@@ -37738,7 +37859,7 @@ ${list}`);
     else printLine(`pr land: ${result.status}${result.error ? ` \u2014 ${result.error}` : ""}`);
     if (result.status === "failed") process.exitCode = 1;
   });
-  jsonParity(pr.command("merge <number>").description("merge a PR (squash by default); archives gitignored tmp/** before worktree teardown; on no-ci repos run pr ci-policy / checks-wait first (#1432, #5679)").option("--squash", "squash merge (default)").option("--merge", "create a merge commit").option("--rebase", "rebase merge").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--auto", "enable auto-merge \u2014 merge once the base-branch policy is satisfied (use for policy-gated repos)").addOption(new Option("--disable-auto", "disable a queued auto-merge without merging").conflicts(["auto", "wait", "squash", "merge", "rebase", "preserveWorktree", "gc", "squashBodyFile", "force"])).option("--wait", `wait for checks to reach a terminal passing verdict before merging (default budget ${PR_CHECKS_TIMEOUT_MS / 6e4}m)`).option("--preserve-worktree", "after merge, keep the local PR worktree/branch for an active batch (#1888)").option("--gc", "acknowledge deleting unarchived gitignored tmp/** evidence newer than the branch base (#5679)").option("--squash-body-file <path>", "squash commit body (overrides GitHub COMMIT_MESSAGES); use when a pushed commit mentions close/fix/resolve + #N that must not close (#5723)").option("--force", "acknowledge and merge 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) => {
+  jsonParity(pr.command("merge <number>").description("merge a PR (squash by default); archives gitignored tmp/** before worktree teardown; on no-ci repos run pr ci-policy / checks-wait first (#1432, #5679)").option("--squash", "squash merge (default)").option("--merge", "create a merge commit").option("--rebase", "rebase merge").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--auto", "enable auto-merge \u2014 merge once the base-branch policy is satisfied (use for policy-gated repos)").addOption(new Option("--disable-auto", "disable a queued auto-merge without merging").conflicts(["auto", "wait", "squash", "merge", "rebase", "preserveWorktree", "gc", "squashBodyFile", "force"])).option("--wait", `wait for checks to reach a terminal passing verdict before merging (default budget ${PR_CHECKS_TIMEOUT_MS / 6e4}m) \u2014 run as a background/monitor task or under a shell timeout above that budget; a short foreground timeout (e.g. 120s) kills it after checks pass and leaves the PR open (#6027)`).option("--preserve-worktree", "after merge, keep the local PR worktree/branch for an active batch (#1888)").option("--gc", "acknowledge deleting unarchived gitignored tmp/** evidence newer than the branch base (#5679)").option("--squash-body-file <path>", "squash commit body (overrides GitHub COMMIT_MESSAGES); use when a pushed commit mentions close/fix/resolve + #N that must not close (#5723)").option("--force", "acknowledge and merge 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 method = o.rebase ? "--rebase" : o.merge ? "--merge" : "--squash";
     const repoArgs = o.repo ? ["--repo", o.repo] : [];
     if (o.disableAuto) {
@@ -37802,6 +37923,7 @@ ${list}`);
     const ciHeadRef = repoForPostCleanup ? await prHeadRefForCiProbe(number, repoForPostCleanup) : void 0;
     const ciPolicy = await resolveMergeCiPolicyForCheckout(o.repo, ciHeadRef);
     if (o.wait) {
+      console.warn(`pr merge: --wait can hold the shell up to the full ${PR_CHECKS_TIMEOUT_MS / 6e4}m budget plus the merge \u2014 run under a shell timeout above that budget or as a background/monitor task (#6027)`);
       const repo = await requireRepo(o.repo);
       const budgetMs = PR_CHECKS_TIMEOUT_MS;
       const waitStarted = Date.now();
@@ -37887,6 +38009,21 @@ ${list}`);
           });
           return;
         }
+        if (!o.auto && mergeRejectedBaseBranchModified(message)) {
+          console.warn(`pr merge: the base branch was modified by a concurrent merge \u2014 waiting ${PR_MERGE_BASE_RACE_RETRY_DELAY_MS / 1e3}s and retrying PR #${number}'s merge once (#6052).`);
+          await new Promise((resolve7) => setTimeout(resolve7, PR_MERGE_BASE_RACE_RETRY_DELAY_MS));
+          await execFileP("gh", buildPrMergeArgs({ number, repoArgs, method, auto: false, deleteBranch: false, bodyFile }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch((e2) => {
+            const m2 = String(e2.message || "");
+            if (/already been merged/i.test(m2)) {
+              remoteNotAttemptedReason = "pr-already-merged";
+              return;
+            }
+            const note2 = timeoutKillNote(e2, GH_MUTATION_TIMEOUT_MS);
+            if (note2) throw new Error(`gh pr merge ${number}: ${note2}`);
+            if (!ghPrMergeLocalBranchDeleteWarning(m2)) throw e2;
+          });
+          return;
+        }
         if (o.auto && mergeAutoRejectedPrAlreadyClean(message)) {
           await execFileP("gh", buildPrMergeArgs({ number, repoArgs, method, auto: false, deleteBranch: false, bodyFile }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch((e2) => {
             const m2 = String(e2.message || "");
@@ -37995,12 +38132,13 @@ ${list}`);
       execGit: async (args) => (await execFileP("git", cleanupGitArgs(primaryRoot, args), { timeout: GIT_TIMEOUT_MS })).stdout,
       branchExists: (b) => remoteBranchExists2(b, { cwd: primaryRoot })
     });
-    const worktreePartial = localCleanup?.worktree?.path && localCleanup.worktree.status !== "removed" ? {
+    const worktree = localCleanup?.worktree;
+    const worktreePartial = isPrMergeWorktreePartial(localCleanup) && worktree?.path ? {
       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`
+      path: worktree.path,
+      reason: worktree.reason ?? worktree.status,
+      error: worktree.error ?? worktree.residueError,
+      remediation: worktree.remediation ?? `Remove-Item -LiteralPath '${worktree.path.replace(/'/g, "''")}' -Recurse -Force`
     } : void 0;
     const partialCleanup = [
       ...worktreePartial ? [worktreePartial] : [],
@@ -38345,11 +38483,16 @@ function registerBoxCommands(program3) {
         await failGraceful("runtime box get: --script requires --ssh (it writes the ssh connect recipe)");
         return;
       }
-      if (o.json) console.log(JSON.stringify({ box: found, incomplete }, null, 2));
-      else if (o.ssh && o.script) {
-        (0, import_node_fs42.writeFileSync)(o.script, sshRecipeScript(found), "utf8");
-        console.log(`wrote ${o.script} \u2014 run: bash "${o.script}"`);
-      } else if (o.ssh) console.log(`${formatSshRecipe(found)}
+      const wroteScript = o.ssh && o.script ? o.script : null;
+      if (wroteScript) (0, import_node_fs42.writeFileSync)(wroteScript, sshRecipeScript(found), "utf8");
+      if (o.json) {
+        console.log(JSON.stringify({
+          box: found,
+          incomplete,
+          ...wroteScript ? { script: { path: wroteScript, run: `bash "${wroteScript}"` } } : {}
+        }, null, 2));
+      } else if (wroteScript) console.log(`wrote ${wroteScript} \u2014 run: bash "${wroteScript}"`);
+      else if (o.ssh) console.log(`${formatSshRecipe(found)}
 ${SSH_RECIPE_AGENT_NOTE}`);
       else console.log(formatBoxTable([found]));
       if (!o.json) warnIncomplete2(incomplete);

package/package.json

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