@mutmutco/cli 4.1.15 → 4.1.16

package/dist/main.cjs

@@ -13181,10 +13181,10 @@ var rollout_plan_default = {
     note: "The v4.0.0 stamp happens at cut time (D6e #4463); until then the candidate is the origin/development head artifacts (built cli/dist + npm pack), identity proven by dist content hash (D6a)."
   },
   baseline: {
-    version: "4.1.15",
-    tag: "v4.1.15",
-    commit: "ed45d37a071b",
-    npm: "@mutmutco/cli@4.1.15"
+    version: "4.1.16",
+    tag: "v4.1.16",
+    commit: "3d2a1772d4b6",
+    npm: "@mutmutco/cli@4.1.16"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -13201,14 +13201,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.1.15"
+          v3Target: "v4.1.16"
         }
       ],
       rollbackTrigger: "Any red inside the post-contract soak window: `devops train gate` FAIL attributable to the v4 doors, Hub endpoint health probe failure, a pre-v4 client admitted instead of receiving actionable HTTP 426, or npm consumer install/doctor failure on the v4-only dist.",
       rollback: {
         independent: true,
-        mechanism: "npm dist-tag latest -> 4.1.15 and redeploy the Hub Lambda from tag v4.1.15 (ed45d37a071b); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.1.15 (@mutmutco/cli@4.1.15, tag commit ed45d37a071b \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.1.16 and redeploy the Hub Lambda from tag v4.1.16 (3d2a1772d4b6); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.1.16 (@mutmutco/cli@4.1.16, tag commit 3d2a1772d4b6 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -20410,13 +20410,44 @@ function crossRepoAmbiguousRefusalMessage(ambiguous, repo, context = "pr merge")
   const first = `#${ambiguous[0] ?? "N"}`;
   return `${context}: REFUSED \u2014 GitHub will close ${named} on merge (a bare \`#N\` after a closing keyword always means the repo the PR lives in), but this body also mentions ${first} qualified against a DIFFERENT repo elsewhere \u2014 check whether that closing keyword was meant to carry an explicit owner/repo#N qualifier instead. Reword the closing reference with the full owner/repo#N form, or re-run with --force to merge anyway and let ${named} close.`;
 }
-function commitMessagesText(commits) {
-  if (!Array.isArray(commits)) return "";
+function parsedCommits(commits) {
+  if (!Array.isArray(commits)) return [];
   return commits.map((commit) => {
     const { messageHeadline, messageBody } = commit ?? {};
-    return `${typeof messageHeadline === "string" ? messageHeadline : ""}
-${typeof messageBody === "string" ? messageBody : ""}`;
-  }).join("\n");
+    return {
+      headline: typeof messageHeadline === "string" ? messageHeadline : "",
+      body: typeof messageBody === "string" ? messageBody : ""
+    };
+  });
+}
+function commitMessagesText(commits) {
+  return parsedCommits(commits).map((commit) => `${commit.headline}
+${commit.body}`).join("\n");
+}
+function defaultSquashBodyFromCommits(commits) {
+  if (commits.length <= 1) {
+    const only = commits[0];
+    if (!only) return "";
+    const body = only.body.trim();
+    return body || only.headline.trim();
+  }
+  return commits.map((commit) => `${commit.headline}
+
+${commit.body}`.trim()).filter(Boolean).join("\n\n");
+}
+function rewriteUnregisteredClosingKeywords(text, allowedClosing) {
+  if (!text.includes("#")) return text;
+  const allowed = new Set(allowedClosing);
+  CLOSING_MENTION_RE.lastIndex = 0;
+  const segments = text.split(/(```[\s\S]*?```|~~~[\s\S]*?~~~|`[^`\n]*`)/g);
+  return segments.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 || allowed.has(n)) return match;
+      return `part of #${n}`;
+    });
+  }).join("");
 }
 function parseClosingGuardInput(raw, repo) {
   if (!raw || typeof raw !== "object") return void 0;
@@ -20428,17 +20459,25 @@ function parseClosingGuardInput(raw, repo) {
     if (typeof n !== "number" || !Number.isInteger(n) || n <= 0) return void 0;
     closing.push(n);
   }
+  const parsed = Array.isArray(commits) ? parsedCommits(commits) : [];
   const commitClosing = [...new Set(findClosingMentions(commitMessagesText(commits)).map((m) => m.issue))];
   const text = `${typeof title === "string" ? title : ""}
 ${typeof body === "string" ? body : ""}`;
-  return { state, text, closing, commitClosing, repo };
+  return { state, text, closing, commitClosing, commits: parsed, repo };
 }
-function restCommitMessagesText(commits) {
-  if (!Array.isArray(commits)) return "";
+function parsedRestCommits(commits) {
+  if (!Array.isArray(commits)) return [];
   return commits.map((entry) => {
     const message = (entry ?? {}).commit?.message;
-    return typeof message === "string" ? message : "";
-  }).join("\n");
+    if (typeof message !== "string" || !message) return { headline: "", body: "" };
+    const nl = message.indexOf("\n");
+    if (nl === -1) return { headline: message, body: "" };
+    return { headline: message.slice(0, nl), body: message.slice(nl + 1).replace(/^\n/, "") };
+  });
+}
+function restCommitMessagesText(commits) {
+  return parsedRestCommits(commits).map((commit) => `${commit.headline}
+${commit.body}`).join("\n");
 }
 function parseRestClosingGuardInput(prRaw, commitsRaw, repo) {
   if (!prRaw || typeof prRaw !== "object") return void 0;
@@ -20446,10 +20485,11 @@ function parseRestClosingGuardInput(prRaw, commitsRaw, repo) {
   if (typeof state !== "string") return void 0;
   const bodyText = typeof body === "string" ? body : "";
   const closing = [...new Set(findClosingMentions(bodyText).map((m) => m.issue))];
+  const parsed = parsedRestCommits(commitsRaw);
   const commitClosing = [...new Set(findClosingMentions(restCommitMessagesText(commitsRaw)).map((m) => m.issue))];
   const text = `${typeof title === "string" ? title : ""}
 ${bodyText}`;
-  return { state: merged === true ? "MERGED" : state.toUpperCase(), text, closing, commitClosing, repo };
+  return { state: merged === true ? "MERGED" : state.toUpperCase(), text, closing, commitClosing, commits: parsed, repo };
 }
 function negatedClosingRefusalMessage(negated, context = "pr merge") {
   const named = negated.map((n) => `#${n}`).join(", ");
@@ -20459,7 +20499,7 @@ function negatedClosingRefusalMessage(negated, context = "pr merge") {
 function commitClosingRefusalMessage(closing, context = "pr merge") {
   const named = closing.map((n) => `#${n}`).join(", ");
   const first = `#${closing[0] ?? "N"}`;
-  return `${context}: REFUSED \u2014 commit messages will close ${named} through the squash body, but GitHub omitted ${named} from closingIssuesReferences. Remove close/fix/resolve + ${first} from the commit message (if the issue must stay open, use "Part of ${first}" / "Refs ${first}" / "leaves ${first} open" \u2014 never "does not close ${first}"), or re-run with --force to merge anyway and let ${named} close.`;
+  return `${context}: REFUSED \u2014 commit messages will close ${named} through the squash body, but GitHub omitted ${named} from closingIssuesReferences. Remove close/fix/resolve + ${first} from the commit message (if the issue must stay open, use "Part of ${first}" / "Refs ${first}" / "leaves ${first} open" \u2014 never "does not close ${first}"), edit the squash body at merge time (--squash-body-file), or re-run with --force to merge anyway and let ${named} close.`;
 }
 function alreadyClosedCommitClosingMessage(closed, context = "pr merge") {
   const named = closed.map((n) => `#${n}`).join(", ");
@@ -20481,8 +20521,9 @@ function evaluateClosingGuard(input, opts) {
     };
   }
   if (input.state !== "OPEN") return { blocked: false };
+  const squashBodyClosing = opts.squashBodyText ? [...new Set(findClosingMentions(opts.squashBodyText).map((m) => m.issue))] : void 0;
   const { open: commitClosing, skippedClosed } = partitionCommitClosings(
-    input.commitClosing ?? [],
+    squashBodyClosing ?? input.commitClosing ?? [],
     input.closing,
     input.alreadyClosed
   );
@@ -33451,29 +33492,47 @@ ${err?.stdout ?? ""}`.split("\n").map((line) => line.trim()).find((line) => line
 var defaultGhMergeAutoIo = {
   gh: async (args, timeoutMs) => (await execFileP2("gh", args, { timeout: timeoutMs })).stdout
 };
-async function composeOverrideBodyFile(prNumber, repoArgs, gh) {
+function resolveSquashMergeBodyText(commits, allowedClosing, cwd) {
+  const policy = squashBodyWithOverride(commits, cwd);
+  const base = policy ?? defaultSquashBodyFromCommits(commits);
+  if (!base) return null;
+  const rewritten = rewriteUnregisteredClosingKeywords(base, allowedClosing);
+  if (policy) return rewritten;
+  return rewritten === base ? null : rewritten;
+}
+function writeSquashBodyFile(body) {
+  const dir = (0, import_node_fs40.mkdtempSync)((0, import_node_path37.join)((0, import_node_os18.tmpdir)(), "mmi-squash-body-"));
+  const path2 = (0, import_node_path37.join)(dir, "body.txt");
+  (0, import_node_fs40.writeFileSync)(path2, body.endsWith("\n") ? body : `${body}
+`, "utf8");
+  return { path: path2, cleanup: () => {
+    try {
+      (0, import_node_fs40.rmSync)(dir, { recursive: true, force: true });
+    } catch {
+    }
+  } };
+}
+async function composeOverrideBodyFile(prNumber, repoArgs, gh, opts) {
+  if (opts?.bodyText != null && opts.bodyText !== "") {
+    return { ...writeSquashBodyFile(opts.bodyText), text: opts.bodyText };
+  }
   try {
     const raw = await gh(["pr", "view", prNumber, ...repoArgs, "--json", "commits"], GC_GH_TIMEOUT_MS);
-    const commits = JSON.parse(raw).commits ?? [];
-    const body = squashBodyWithOverride(commits.map((c) => ({ headline: c.messageHeadline ?? "", body: c.messageBody ?? "" })), process.cwd());
+    const commits = (JSON.parse(raw).commits ?? []).map((c) => ({ headline: c.messageHeadline ?? "", body: c.messageBody ?? "" }));
+    const body = resolveSquashMergeBodyText(commits, opts?.allowedClosing ?? [], process.cwd());
     if (!body) return void 0;
-    const dir = (0, import_node_fs40.mkdtempSync)((0, import_node_path37.join)((0, import_node_os18.tmpdir)(), "mmi-squash-body-"));
-    const path2 = (0, import_node_path37.join)(dir, "body.txt");
-    (0, import_node_fs40.writeFileSync)(path2, `${body}
-`, "utf8");
-    return { path: path2, cleanup: () => {
-      try {
-        (0, import_node_fs40.rmSync)(dir, { recursive: true, force: true });
-      } catch {
-      }
-    } };
+    return { ...writeSquashBodyFile(body), text: body };
   } catch {
     return void 0;
   }
 }
-async function ghMergeAutoEnqueue(prNumber, repo, method, io = defaultGhMergeAutoIo) {
+async function ghMergeAutoEnqueue(prNumber, repo, method, extra) {
+  const io = extra?.io ?? defaultGhMergeAutoIo;
   const args = repo ? ["--repo", repo] : [];
-  const overrideBody = await composeOverrideBodyFile(prNumber, args, io.gh);
+  const overrideBody = await composeOverrideBodyFile(prNumber, args, io.gh, {
+    allowedClosing: method === "--squash" ? extra?.allowedClosing : void 0,
+    bodyText: method === "--squash" ? extra?.bodyText : void 0
+  });
   try {
     return await mergeAutoEnqueueWithBody(prNumber, args, method, io, overrideBody?.path);
   } finally {
@@ -42839,6 +42898,20 @@ async function readClosingGuardInput(number, repoArgs, repo, context) {
     return input;
   }
 }
+function squashBodyTextForMerge(input, methodIsSquash, explicitBody) {
+  if (!methodIsSquash) return void 0;
+  if (explicitBody != null && explicitBody !== "") return explicitBody;
+  if (!input) return void 0;
+  return resolveSquashMergeBodyText(input.commits ?? [], input.closing, process.cwd()) ?? void 0;
+}
+function warnSquashBodyClosingStrip(context, input, squashBodyText) {
+  if (!input || squashBodyText == null) return;
+  const { open: open2 } = partitionCommitClosings(input.commitClosing ?? [], input.closing, input.alreadyClosed);
+  if (!open2.length) return;
+  console.warn(
+    `${context}: composing a squash body that leaves unregistered ${open2.map((n) => `#${n}`).join(", ")} open \u2014 GitHub's default COMMIT_MESSAGES composition would close them (#5723).`
+  );
+}
 function ciAuditDeps() {
   const cfgPromise = loadConfig();
   const root = hubRoot();
@@ -42988,7 +43061,13 @@ pr.command("land <number>").description("agent merge path (#1440): train probe \
       return typeof viewed.state === "string" ? viewed.state : void 0;
     }
   );
-  const landClosingGuardVerdict = evaluateClosingGuard(landClosingGuardInput, { force: o.force, context: "pr land" });
+  const landSquashBody = squashBodyTextForMerge(landClosingGuardInput, true);
+  warnSquashBodyClosingStrip("pr land", landClosingGuardInput, landSquashBody);
+  const landClosingGuardVerdict = evaluateClosingGuard(landClosingGuardInput, {
+    force: o.force,
+    context: "pr land",
+    squashBodyText: landSquashBody
+  });
   if (landClosingGuardVerdict.blocked) {
     console.error(landClosingGuardVerdict.message);
     process.exitCode = 1;
@@ -43063,7 +43142,10 @@ pr.command("land <number>").description("agent merge path (#1440): train probe \
       if (!result2.ok) throw new Error(`could not read PR state: ${result2.error}`);
       return JSON.parse(result2.state);
     },
-    mergeAuto: (prNumber, repo) => ghMergeAutoEnqueue(prNumber, repo, "--squash"),
+    mergeAuto: (prNumber, repo) => ghMergeAutoEnqueue(prNumber, repo, "--squash", {
+      allowedClosing: landClosingGuardInput?.closing,
+      bodyText: landSquashBody
+    }),
     pollMerged: async (prNumber, repo, deadlineMs) => {
       let lastFailure;
       while (Date.now() < deadlineMs) {
@@ -43124,7 +43206,7 @@ pr.command("land <number>").description("agent merge path (#1440): train probe \
   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)").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("--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)").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) => {
   const method = o.rebase ? "--rebase" : o.merge ? "--merge" : "--squash";
   const repoArgs = o.repo ? ["--repo", o.repo] : [];
   const repoForPostCleanup = await resolveRepo(o.repo) ?? o.repo;
@@ -43147,7 +43229,20 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
       return typeof viewed.state === "string" ? viewed.state : void 0;
     }
   );
-  const closingGuardVerdict = evaluateClosingGuard(closingGuardInput, { force: o.force, context: "pr merge" });
+  if (o.squashBodyFile && method !== "--squash") {
+    throw new Error("pr merge: --squash-body-file applies only to squash merges");
+  }
+  const mergeSquashBody = squashBodyTextForMerge(
+    closingGuardInput,
+    method === "--squash",
+    o.squashBodyFile ? (0, import_node_fs48.readFileSync)(o.squashBodyFile, "utf8") : void 0
+  );
+  if (!o.squashBodyFile) warnSquashBodyClosingStrip("pr merge", closingGuardInput, mergeSquashBody);
+  const closingGuardVerdict = evaluateClosingGuard(closingGuardInput, {
+    force: o.force,
+    context: "pr merge",
+    squashBodyText: mergeSquashBody
+  });
   if (closingGuardVerdict.blocked) {
     console.error(closingGuardVerdict.message);
     process.exitCode = 1;
@@ -43202,7 +43297,12 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
   const remoteBefore = await remoteBranchExists2(headRef);
   let upgradedToAuto = false;
   let remoteNotAttemptedReason = "host-owned-lifecycle";
-  const overrideBody = await composeOverrideBodyFile(number, repoArgs, async (a, t) => (await execFileP2("gh", a, { timeout: t })).stdout);
+  const overrideBody = mergeSquashBody ? { ...writeSquashBodyFile(mergeSquashBody), text: mergeSquashBody } : await composeOverrideBodyFile(
+    number,
+    repoArgs,
+    async (a, t) => (await execFileP2("gh", a, { timeout: t })).stdout,
+    { allowedClosing: method === "--squash" ? closingGuardInput?.closing : void 0 }
+  );
   const bodyFile = overrideBody?.path;
   try {
     await execFileP2("gh", buildPrMergeArgs({ number, repoArgs, method, auto: o.auto, deleteBranch: false, bodyFile }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch(async (e) => {

package/package.json

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