@mutmutco/cli 4.6.38 → 4.6.39

package/dist/main.cjs

@@ -28405,10 +28405,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.6.38",
-    tag: "v4.6.38",
-    commit: "975581f0f6ce",
-    npm: "@mutmutco/cli@4.6.38"
+    version: "4.6.39",
+    tag: "v4.6.39",
+    commit: "2669c496b69e",
+    npm: "@mutmutco/cli@4.6.39"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -28425,14 +28425,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.6.38"
+          v3Target: "v4.6.39"
         }
       ],
       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.6.38 and redeploy the Hub Lambda from tag v4.6.38 (975581f0f6ce); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.6.38 (@mutmutco/cli@4.6.38, tag commit 975581f0f6ce \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.6.39 and redeploy the Hub Lambda from tag v4.6.39 (2669c496b69e); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.6.39 (@mutmutco/cli@4.6.39, tag commit 2669c496b69e \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -44015,7 +44015,7 @@ async function submitQueueAdmission(pr, repo, head, read, write, options, resume
     for (let readAttempt = 0; readAttempt < maxReads; readAttempt++) {
       if (readAttempt) await sleep3(readAttempt * 1e3);
       try {
-        const observed = await readPrMergeQueue(pr, repo, read);
+        const observed = await readPrMergeQueue(pr, repo, read, options.sleep);
         if (observed.state === "MERGED" && observed.headRefOid === head) return markReenqueued({ mergeStatus: "merged" });
         if (observed.isInMergeQueue && observed.headRefOid === head) {
           const entry = observed.mergeQueueEntry;
@@ -44057,13 +44057,13 @@ async function submitQueueAdmission(pr, repo, head, read, write, options, resume
   if (receipt && (receipt.state === "enqueued" || receipt.state === "merged")) {
     if (receipt.head.toLowerCase() !== head.toLowerCase()) {
       try {
-        const observed = await readPrMergeQueue(pr, repo, read);
+        const observed = await readPrMergeQueue(pr, repo, read, options.sleep);
         superseded = observed.state === "OPEN" && !observed.isInMergeQueue;
       } catch {
       }
     } else {
       try {
-        const observed = await readPrMergeQueue(pr, repo, read);
+        const observed = await readPrMergeQueue(pr, repo, read, options.sleep);
         if (observed.state === "OPEN" && !observed.isInMergeQueue && observed.headRefOid?.toLowerCase() === receipt.head.toLowerCase()) {
           const boundMs = receipt.queueEntry ? Date.parse(receipt.queueEntry.enqueuedAt) : receipt.observedAt + UNWITNESSED_EJECTION_GRACE_MS;
           const events = await readArrayPages(
@@ -44266,6 +44266,15 @@ ${list}
 Co-authored-by: GitHub <noreply@github.com>
 `;
 }
+var WAIVER_KEYS = /^(?:Test-Policy-Override|Runbook-Unaffected)\s*:/i;
+function clipTrailer(trailer) {
+  return trailer.length > 120 ? `${trailer.slice(0, 117)}...` : trailer;
+}
+function describeWaiverText(label, message2, cwd) {
+  const block = parseTrailers(message2, cwd).filter((trailer) => WAIVER_KEYS.test(trailer));
+  const found = block.length ? `final trailer block holds ${block.map((trailer) => `\`${clipTrailer(trailer)}\``).join(" and ")}` : "git parses no Test-Policy-Override or Runbook-Unaffected trailer there";
+  return `${label}: ${found}`;
+}
 function checkQueueSquashOverride(title, pr, messages, root) {
   if (messages.length <= 1 || !messages.some((message2) => /^\s*Test-Policy-Override\s*:/im.test(`${message2.headline}
 ${message2.body}`)) || readMessageOverride2(githubQueueSquashMessage(title, pr, messages), root)) return void 0;
@@ -44399,7 +44408,8 @@ ${pull.body}`;
   }
   const requiredBody = options.bodyText ?? composedBody;
   const prBodyPreservesOverrides = requiredBody != null && method === "SQUASH" && policy.body === "PR_BODY" && options.bodyText == null && prBodyPreservesCommitOverrides(messages, headline, pull.body, process.cwd());
-  if (requiredBody && !prBodyPreservesOverrides && (method !== "SQUASH" || requiredBody.trim() !== body.trim())) {
+  const queueKeepsWaiver = options.bodyText == null && method !== "SQUASH" && Boolean(readMessageOverride2(actualMessage, process.cwd()));
+  if (requiredBody && !prBodyPreservesOverrides && !queueKeepsWaiver && (method !== "SQUASH" || requiredBody.trim() !== body.trim())) {
     if (method === "SQUASH" && policy.body === "PR_BODY" && options.bodyText == null) {
       return {
         kind: "refused",
@@ -44411,7 +44421,9 @@ ${pull.body}`;
             issueTargets: [],
             nextAction: `PR author: this repository squashes with PR_BODY, so place the required Test-Policy-Override trailer(s) in the PR body final trailer block (e.g. \`mmi-cli devops pr edit ${pr} --repo ${repo} --body-file .jerv/tmp/pr-${pr}-body.md\`) without a body override, then rerun \`pr land\`. Keep repository settings unchanged.`
           },
-          error: "queue preparation needed: repository squash policy is PR_BODY, and the PR body does not carry the required Test-Policy-Override trailer(s) in its final Git-recognized trailer block"
+          error: `queue preparation needed: repository squash policy is PR_BODY, and the PR body does not carry the required Test-Policy-Override trailer(s) in its final Git-recognized trailer block \u2014 ${describeWaiverText("the PR body", pull.body, process.cwd())}; ${describeWaiverText("the source commit messages", messages.map((message2) => `${message2.headline}
+
+${message2.body}`).join("\n\n"), process.cwd())}`
         }
       };
     }
@@ -44420,9 +44432,12 @@ ${pull.body}`;
       return keys.length ? keys.join(", ") : "none";
     };
     const source = options.bodyText != null ? "the explicit body override" : "the body composed from the source commit messages";
+    const sentLabel = method === "SQUASH" ? `squash ${policy.body ?? "unknown"}, ${messages.length} commit message${messages.length === 1 ? "" : "s"}` : `${method}${repository.merge_commit_message === "PR_BODY" ? " + PR body" : ""}`;
     const detail = `the requested sanitized body or trailer arrangement cannot be sent to queue admission: queue merge method ${method}, squash body policy ${policy.body ?? "unknown"}; required body is ${source} (trailer keys: ${trailerKeys(`${headline}
 
-${requiredBody}`)}), but the message the queue would send carries trailer keys: ${trailerKeys(actualMessage)}`;
+${requiredBody}`)}), but the message the queue would send carries trailer keys: ${trailerKeys(actualMessage)}. ${describeWaiverText(`the message the queue sends (${sentLabel})`, actualMessage, process.cwd())}; ${describeWaiverText("the source commit messages", messages.map((message2) => `${message2.headline}
+
+${message2.body}`).join("\n\n"), process.cwd())}.`;
     const next = options.bodyText != null ? `PR author: a merge queue accepts no body override; drop --body/--squash-body-file and place the required trailer(s) where the queue's ${method}${method === "SQUASH" ? ` (${policy.body})` : ""} message reads them, then rerun \`mmi-cli devops pr land ${pr} --repo ${repo}\`. Keep repository settings unchanged.` : method !== "SQUASH" ? `PR author: the queue's ${method} method keeps the original commit messages, so the required trailer(s) must sit in a source commit message's final trailer block; amend the commit, push, re-run checks and \`mmi-cli devops pr land ${pr} --repo ${repo}\`. Keep repository settings unchanged.` : policy.body === "BLANK" ? `PR author: squash body policy BLANK sends an empty body, so no trailer from the commits or PR body reaches the queue commit; the waiver cannot survive queue admission with unchanged repository settings \u2014 remove the need for the override or ask a maintainer. Keep repository settings unchanged.` : `PR author: squash body policy ${policy.body} does not reproduce the composed body; consolidate the required trailer(s) into one source commit message's final trailer block, push, re-run checks and \`mmi-cli devops pr land ${pr} --repo ${repo}\`. Keep repository settings unchanged.`;
     const caveat = " GitHub may append coauthors even to one source commit, so source consolidation alone does not prove the generated message passes test policy; the combined queue candidate must pass with the shared trailer reader.";
     return { kind: "refused", result: preparation("queue-message-override", [], detail, next + caveat) };
@@ -44472,7 +44487,7 @@ async function abandonQueueAdmission(pr, repo, options = {}) {
   }
   let snapshot;
   try {
-    snapshot = await readPrMergeQueue(pr, repo, options.read ?? actorReadApi);
+    snapshot = await readPrMergeQueue(pr, repo, options.read ?? actorReadApi, options.sleep);
   } catch (error) {
     return refuse(`the PR and queue state could not be read (${error.message}); the admission is unchanged`);
   }
@@ -44497,13 +44512,19 @@ function decideQueueMergeRoute(hasQueue, method, headRef) {
   if (!hasQueue) return "normal";
   return method === "--merge" && /^(release-align|hotfix-fold)\//.test(headRef) ? "admin-true-merge" : "pr-land";
 }
-async function readPrMergeQueue(pr, repo, gh2 = actorReadApi) {
+async function readPrMergeQueue(pr, repo, gh2 = actorReadApi, sleep2 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms))) {
   if (!/^\d+$/.test(pr)) throw new Error("merge queue read requires a PR number");
-  const result = await queueGraphql(
-    repo,
-    `pullRequest(number:${pr}) { state isInMergeQueue mergeQueueEntry { state position enqueuedAt headCommit { oid } } autoMergeRequest { enabledAt } headRefOid }`,
-    gh2
-  );
+  const fields = `pullRequest(number:${pr}) { state isInMergeQueue mergeQueueEntry { state position enqueuedAt headCommit { oid } } autoMergeRequest { enabledAt } headRefOid }`;
+  let result;
+  for (let attempt = 0; ; attempt++) {
+    try {
+      result = await queueGraphql(repo, fields, gh2);
+      break;
+    } catch (error) {
+      if (attempt >= 2 || !isUpstreamGitHubFault(execErrorText(error))) throw error;
+      await sleep2(2e3 * (attempt + 1));
+    }
+  }
   if (!result.pullRequest) throw new Error(`merge queue PR #${pr} not found`);
   const entry = result.pullRequest.mergeQueueEntry;
   if (entry && (entry.enqueuedAt !== void 0 && !Number.isFinite(Date.parse(entry.enqueuedAt)) || entry.headCommit && !/^[a-f0-9]{40}$/i.test(entry.headCommit.oid))) throw new Error("queue entry identity is unreadable");
@@ -44932,7 +44953,7 @@ async function dispatchWorkflow(repo, workflow, ref, inputs, deps) {
   const fields = ["-f", `ref=${ref}`];
   const names = /* @__PURE__ */ new Set();
   for (const input of inputs) {
-    const match = /^([A-Za-z_][A-Za-z0-9_]{0,63})=([^\r\n]{0,2048})$/.exec(input);
+    const match = /^([A-Za-z_][A-Za-z0-9_-]{0,63})=([^\r\n]{0,2048})$/.exec(input);
     if (!match || names.has(match[1])) throw new Error("run dispatch: invalid or duplicate input");
     names.add(match[1]);
     fields.push("-f", `inputs[${match[1]}]=${match[2]}`);

package/package.json

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