@mutmutco/cli 4.3.11 → 4.3.13

package/dist/main.cjs

@@ -11867,7 +11867,7 @@ async function checkLaneContest(client, item, actor = describeSessionIdentity(),
   };
 }
 function laneContestMessage(ref, contest, verb) {
-  const holder = contest.marker ? `lane ${describeClaimMarker(contest.marker)}` : "another lane";
+  const holder = contest.marker ? `lane ${describeClaimMarker(contest.marker)}` : contest.unverifiable.includes("comments") ? "an unreadable lane (its claim-marker comments could not be read, so no holder can be named)" : "another lane";
   const seen = contest.live.join("; ");
   const unreadable = contest.unverifiable.length ? `liveness could not be fully verified (failed to read: ${contest.unverifiable.join(", ")})` : "";
   const why = [seen, unreadable].filter(Boolean).join("; ");
@@ -12060,6 +12060,9 @@ function withPowerShellChainHint(message2, platform2 = process.platform) {
   return `${message2}
 note: in PowerShell a ';' chain runs every statement regardless of the previous exit code, so the chain ran past this refusal \u2014 rerun the refused write solo or chain gated writes with '&&'`;
 }
+function isArchivedItemRefusal(message2) {
+  return /The item is archived and cannot be updated/i.test(message2);
+}
 async function moveBoardItem(options, deps = {}) {
   if (!BOARD_STATUSES.includes(options.status)) {
     throw new Error(`unknown status '${options.status}'; expected one of ${BOARD_STATUSES.join(", ")}`);
@@ -12077,6 +12080,17 @@ async function moveBoardItem(options, deps = {}) {
   try {
     await updateItemSingleSelect(client, cfg.projectId, item.itemId, cfg.statusFieldId, optionId);
   } catch (e) {
+    if (options.status === "Done" && isArchivedItemRefusal(ghError(e))) {
+      return {
+        item,
+        viewer: lookup.viewer,
+        repo: currentRepo,
+        status: item.status,
+        partial: false,
+        archived: true,
+        warning: `${item.ref} is archived (already terminal \u2014 its close archived the card); no ${options.status} move was performed`
+      };
+    }
     const warning = `partial move: ${item.ref} status was not changed to ${options.status} (${ghError(e)})`;
     if (!options.allowPartial) throw new Error(warning);
     return { item, viewer: lookup.viewer, repo: currentRepo, status: item.status, partial: true, warning };
@@ -15462,10 +15476,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.11",
-    tag: "v4.3.11",
-    commit: "c898259b41c3",
-    npm: "@mutmutco/cli@4.3.11"
+    version: "4.3.13",
+    tag: "v4.3.13",
+    commit: "8442cc0ac255",
+    npm: "@mutmutco/cli@4.3.13"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -15482,14 +15496,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.3.11"
+          v3Target: "v4.3.13"
         }
       ],
       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.11 and redeploy the Hub Lambda from tag v4.3.11 (c898259b41c3); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.3.11 (@mutmutco/cli@4.3.11, tag commit c898259b41c3 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.3.13 and redeploy the Hub Lambda from tag v4.3.13 (8442cc0ac255); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.3.13 (@mutmutco/cli@4.3.13, tag commit 8442cc0ac255 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -24159,6 +24173,10 @@ async function finalizeCiReconcile(repo, deps, result, before, pendingReason) {
       result.errors.push(`post-apply audit failed \u2014 remaining: ${remaining.join(", ")}`);
       return result;
     }
+    const unowned = after.checks.filter((c) => !c.ok && !remaining.includes(c.label)).map((c) => c.label);
+    if (unowned.length > 0) {
+      result.skipped.push(`audit still failing on rows reconcile does not own (${unowned.join("; ")}) \u2014 follow each row's remediation; re-running reconcile cannot fix them`);
+    }
     const repaired = reconcileOwnedFailures(before).length > 0;
     result.postApply = { state: repaired ? "repaired" : "clean", audit: after, remaining: [] };
     (repaired ? result.applied : result.skipped).push(
@@ -25532,7 +25550,7 @@ function registerBoardCommands(program3) {
         const result = await moveBoardItem({ config: await loadConfigForBoardSelector2(issueRefs[0], o.repo), selector: issueRefs[0], status: canonicalStatus, repo: o.repo, allowPartial: o.allowPartial });
         invalidateStatuslineBoardCache();
         if (o.json) return console.log(JSON.stringify(result));
-        console.log(result.partial ? `Partially moved ${result.item.ref}: ${result.warning}` : `Moved ${result.item.ref} -> ${result.status}`);
+        console.log(result.archived ? `Already terminal ${result.item.ref}: ${result.warning}` : result.partial ? `Partially moved ${result.item.ref}: ${result.warning}` : `Moved ${result.item.ref} -> ${result.status}`);
       } catch (e) {
         return failGraceful(`board move failed: ${e.message}`);
       }
@@ -33494,9 +33512,35 @@ async function fetchBranchTipSha(repo, ref, gh = defaultGhApi) {
 async function fetchRestPrSnapshot(prNumber, repo, gh = defaultGhApi) {
   return parseRestPrSnapshot(JSON.parse(await gh([`repos/${repo}/pulls/${prNumber}`])));
 }
-async function fetchRestRepoMergeSettings(repo, gh = defaultGhApi) {
-  const payload = JSON.parse(await gh([`repos/${repo}`]));
-  return typeof payload.delete_branch_on_merge === "boolean" ? { deleteBranchOnMerge: payload.delete_branch_on_merge } : {};
+async function readRepoMergeSettingsOnce(repo, gh) {
+  let raw;
+  try {
+    raw = await gh([`repos/${repo}`]);
+  } catch (e) {
+    return { proven: false, reason: `read failed: ${e.message}` };
+  }
+  let payload;
+  try {
+    payload = JSON.parse(raw);
+  } catch {
+    return { proven: false, reason: "payload was not JSON" };
+  }
+  if (typeof payload.delete_branch_on_merge === "boolean") {
+    return { proven: true, deleteBranchOnMerge: payload.delete_branch_on_merge };
+  }
+  const apiMessage = typeof payload.message === "string" ? ` (${payload.message})` : "";
+  return { proven: false, reason: `payload carried no delete_branch_on_merge${apiMessage}` };
+}
+async function ambientGhApi(args) {
+  const { stdout } = await execFileP("gh", ["api", ...args], { timeout: REST_GH_TIMEOUT_MS });
+  return stdout;
+}
+async function fetchRestRepoMergeSettings(repo, gh = defaultGhApi, ambientGh = ambientGhApi) {
+  const primary = await readRepoMergeSettingsOnce(repo, gh);
+  if (primary.proven) return primary;
+  const fallback = await readRepoMergeSettingsOnce(repo, ambientGh);
+  if (fallback.proven) return fallback;
+  return { proven: false, reason: `${primary.reason}; ambient fallback: ${fallback.reason}` };
 }
 var PR_SNAPSHOT_READ_RETRIES = 3;
 var PR_SNAPSHOT_READ_DELAY_MS = 2e3;
@@ -36124,6 +36168,10 @@ async function advanceClosedIssuesToDone(deps) {
     const issue = `#${ref.number}`;
     try {
       const outcome = await deps.moveIssueToDone(issue);
+      if (outcome.archived) {
+        entries.push({ issue, moved: true, status: "archived-terminal" });
+        continue;
+      }
       if (!outcome.moved) {
         entries.push({ issue, moved: false, status: "failed", error: outcome.error });
         continue;
@@ -36988,7 +37036,7 @@ var PR_MERGE_BASE_RACE_RETRY_DELAY_MS = 3e3;
 function assertRemoteBranchPreservedOnMerge(repo, deleteBranchOnMerge) {
   if (deleteBranchOnMerge === false) return;
   throw new Error(
-    `pr merge: ${repo} does not prove delete_branch_on_merge=false. Automatic deletion can irreversibly close stacked PRs. Run \`mmi-cli devops ci reconcile --repo ${repo} --apply\`, then retry; remote branch cleanup is delayed.`
+    `pr merge: ${repo} does not prove delete_branch_on_merge=false. Automatic deletion can irreversibly close stacked PRs. Run \`mmi-cli devops ci reconcile --repo ${repo} --apply\`, then retry; when that proof cannot be settled (or an active batch must merge now), rerun with --preserve-worktree \u2014 the designed settings-proof bypass (#6210). Remote branch cleanup is delayed either way.`
   );
 }
 function mergeMethodFromParentCount(parentCount) {
@@ -37031,6 +37079,7 @@ async function resolveBoardAdvanceForPr(prNumber, repoOption) {
     },
     moveIssueToDone: async (ref) => {
       const moved = await moveBoardItem({ config: await loadConfigForBoardSelector2(ref, repoOption), selector: ref, status: "Done", repo: repoOption, allowPartial: true });
+      if (moved.archived) return { moved: true, archived: true };
       return moved.partial ? { moved: false, error: moved.warning } : { moved: true };
     },
     // #5317: after a successful move, re-read the board to verify Done actually holds — a move the API
@@ -37647,11 +37696,35 @@ async function checkDocsIndexAtHead(opts, deps) {
 }
 
 // src/pr-create-claim-guard.ts
+var CLAIM_GUARD_RATE_LIMIT_WAIT_CAP_MS = 3e4;
+function withRateLimitRetry(client, seams = {}) {
+  const throttledPaths = /* @__PURE__ */ new Set();
+  const retry = (path2, op) => runWithRateLimitBackoff(op, {
+    context: `pr create claim guard: GET ${path2}`,
+    retryCommand: "re-run `mmi-cli devops pr create` after the rate limit resets",
+    capMs: seams.rateLimitWaitCapMs ?? CLAIM_GUARD_RATE_LIMIT_WAIT_CAP_MS,
+    now: seams.now,
+    sleep: seams.sleep,
+    log: seams.log
+  }).catch((e) => {
+    if (isRateLimitedError(e)) throttledPaths.add(path2);
+    throw e;
+  });
+  return {
+    // The guard path issues only REST reads; graphql passes through untouched.
+    client: {
+      rest: (method, path2, init) => retry(path2, () => client.rest(method, path2, init)),
+      restPaginate: (path2, init) => retry(path2, () => client.restPaginate(path2, init)),
+      graphql: (query, variables, init) => client.graphql(query, variables, init)
+    },
+    throttledPaths
+  };
+}
 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 { client, throttledPaths } = withRateLimitRetry(deps.client ?? defaultGitHubClient(), deps);
   const actor = deps.actor ?? describeSessionIdentity();
   const checkContest = deps.checkContest ?? checkLaneContest;
   for (const number of issues) {
@@ -37660,7 +37733,8 @@ async function prCreateClaimRefusal(body, repoOption, deps = {}) {
     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";
+    const commentsPath = `repos/${repo}/issues/${number}/comments`;
+    const holder = contest.marker ? `lane ${describeClaimMarker(contest.marker)}` : contest.unverifiable.includes("comments") ? `an unreadable lane (its claim-marker comments could not be read${throttledPaths.has(commentsPath) ? " \u2014 GitHub rate-limited the read (HTTP 403) and the bounded reset-aware retry could not clear it" : ""}; the holder may be this very lane)` : "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\` (move it to In Progress first if it sits In Review) or drop the closing line before creating this PR`;
   }
   return void 0;
@@ -39612,7 +39686,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); from a foreign checkout the remote probe/delete address this repo and local cleanup runs only in the verified sibling checkout ../<repo>, else localBranch reports skipped-foreign-cwd and the receipt carries foreignCwd: true (#6148)").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) => {
+  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); from a foreign checkout the remote probe/delete address this repo and local cleanup runs only in the verified sibling checkout ../<repo>, else localBranch reports skipped-foreign-cwd and the receipt carries foreignCwd: true (#6148)").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); also the merge settings-proof bypass when delete_branch_on_merge cannot be proven (#6210)").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) {
@@ -39667,6 +39741,9 @@ ${list}`);
     if (prMeta.state !== "MERGED" && !o.preserveWorktree) {
       if (!repoForPostCleanup) throw new Error("pr merge: repository is unreadable; cannot prove remote branch preservation");
       const repoSettings = await fetchRestRepoMergeSettings(repoForPostCleanup);
+      if (!repoSettings.proven) {
+        throw new Error(`pr merge: ${repoForPostCleanup} cannot prove delete_branch_on_merge=false \u2014 ${repoSettings.reason}. Automatic deletion can irreversibly close stacked PRs (#5789). When the proof cannot be settled (or an active batch must merge now), rerun with --preserve-worktree \u2014 the designed settings-proof bypass (#6210).`);
+      }
       assertRemoteBranchPreservedOnMerge(repoForPostCleanup, repoSettings.deleteBranchOnMerge);
     }
     const startingPath = (await execFileP("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();

package/package.json

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