@mutmutco/cli 4.3.30 → 4.3.32

package/dist/main.cjs

@@ -12297,8 +12297,8 @@ async function claimOneBoardItem(ctx, selector, options) {
     if (options.check) {
       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, ...heldReceipt(), alreadyClaimed: true };
+    const renewed = await postClaimMarkerComment(client, item, ctx.session);
+    return { item, viewer: report.viewer, repo: report.repo, status: "In Progress", partial: false, ...heldReceipt(), alreadyClaimed: true, renewed };
   }
   if (options.check) {
     return { item, viewer: report.viewer, repo: report.repo, status: item.status, partial: false, ...claimedReceipt(), checked: true };
@@ -12361,7 +12361,7 @@ async function claimBoardIssues(options, deps = {}) {
       const ref = `${selector.repo}#${selector.number}`;
       try {
         const result = await claimOneBoardItem(ctx, selector, { ...options, bulk: true });
-        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, reclaimedFrom: result.reclaimedFrom, 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, reclaimedFrom: result.reclaimedFrom, alreadyClaimed: result.alreadyClaimed, renewed: result.renewed, checked: result.checked };
       } catch (e) {
         results[index] = { ref, claimed: false, reason: e.message };
       }
@@ -12551,9 +12551,11 @@ async function postClaimMarkerComment(client, item, actor = describeSessionIdent
 
 <!-- mmi-claim: ${JSON.stringify(marker)} -->`
     });
+    return true;
   } catch (e) {
     process.stderr.write(`warning: ${item.ref} was claimed, but recording the claim marker comment failed: ${ghError(e)}
 `);
+    return false;
   }
 }
 
@@ -15584,10 +15586,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.30",
-    tag: "v4.3.30",
-    commit: "a8f898264f6e",
-    npm: "@mutmutco/cli@4.3.30"
+    version: "4.3.32",
+    tag: "v4.3.32",
+    commit: "fe984ee06950",
+    npm: "@mutmutco/cli@4.3.32"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -15604,14 +15606,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.3.30"
+          v3Target: "v4.3.32"
         }
       ],
       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.30 and redeploy the Hub Lambda from tag v4.3.30 (a8f898264f6e); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.3.30 (@mutmutco/cli@4.3.30, tag commit a8f898264f6e \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.3.32 and redeploy the Hub Lambda from tag v4.3.32 (fe984ee06950); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.3.32 (@mutmutco/cli@4.3.32, tag commit fe984ee06950 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -21306,6 +21308,9 @@ function troubleshootingAnchor(code) {
 }
 var SCRATCH_BRANCH_GLOBS = ["train/check/*", "hotfix-fold/*--port-*"];
 var COMPOSE_GUARD_HARD_FAIL = /^secrets preflight: .*noEnvFile is (not )?true.*$/m;
+var PREFLIGHT_TIMEOUT = /aborted due to timeout|TimeoutError|ETIMEDOUT|ESOCKETTIMEDOUT|UND_ERR_(?:HEADERS|CONNECT)_TIMEOUT/i;
+var PREFLIGHT_TIMEOUT_RETRIES = 2;
+var PREFLIGHT_RETRY_BASE_MS = 1e3;
 function readOriginWorkflowsDefault(root, ref) {
   const git3 = (args) => (0, import_node_child_process9.execFileSync)("git", args, { cwd: root, encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
   let paths;
@@ -21372,6 +21377,7 @@ var defaultDeps2 = {
     }
   },
   registryWhoami: probeRegistryWhoami,
+  sleep: (ms) => new Promise((resolve7) => setTimeout(resolve7, ms)),
   env: process.env
 };
 function message(e) {
@@ -21561,7 +21567,7 @@ async function runTrainDoctor(input) {
     } catch {
       linked = false;
     }
-    add(linked ? { code: "worktree-isolated", severity: "blocker", source: "local", title: `this is a linked worktree on ${currentBranch2 || "(detached)"}, not the lane's start branch ${startBranch} (#2770)`, remedy: `run the ${lane} lane from the primary checkout on ${startBranch}; a linked worktree never carries the train` } : { code: "branch-mismatch", severity: "blocker", source: "local", title: `on ${currentBranch2 || "(detached)"}; the ${lane} lane starts from ${startBranch}`, remedy: `git checkout ${startBranch}, then rerun` });
+    add(linked ? { code: "worktree-isolated", severity: "blocker", source: "local", title: `this is a linked worktree on ${currentBranch2 || "(detached)"}, not the lane's start branch ${startBranch} (#2770)`, remedy: `run the ${lane} lane from the primary checkout on ${startBranch}; a linked worktree never carries the train` } : { code: "branch-mismatch", severity: "blocker", source: "local", title: `on ${currentBranch2 || "(detached)"}; the ${lane} lane starts from ${startBranch}`, remedy: `git checkout ${startBranch}, then rerun; --heal never switches branches \u2014 the branch you stand on names the lane you meant, and healing it would run the train off a branch you did not pick (#6432)` });
   }
   const stage = laneStage(lane);
   const workflowsRef = `origin/${startBranch ?? "main"}`;
@@ -21664,17 +21670,28 @@ async function runTrainDoctor(input) {
       unverified("the vault npm token (`npm whoami` through the `_org` npm/NPM_TOKEN hop)", probe.detail);
     }
   }
-  try {
-    await train.runSelf(["secrets", "preflight", "--stage", stage, "--repo", repo, ...lane === "hotfix" ? ["--lane", "hotfix"] : []]);
-  } catch (e) {
-    const err = e;
-    const text = [typeof err.stdout === "string" ? err.stdout : "", typeof err.stderr === "string" ? err.stderr : "", message(e)].join("\n");
-    if (/^missing /m.test(text)) {
-      add({ code: "secrets-missing", severity: "blocker", source: "origin", title: `required ${stage} secret name(s) are absent: ${clean2(text.match(/^missing .*$/m)?.[0] ?? "")}`, remedy: `provision them in the vault (\`mmi-cli vault secrets request <KEY> --repo ${repo}\`), then rerun \`mmi-cli vault secrets preflight --stage ${stage} --repo ${repo}${lane === "hotfix" ? " --lane hotfix" : ""}\`` });
-    } else if (COMPOSE_GUARD_HARD_FAIL.test(text)) {
-      add({ code: "compose-guard-mismatch", severity: "blocker", source: "origin", title: clean2(text.match(COMPOSE_GUARD_HARD_FAIL)?.[0] ?? text), remedy: `fix the compose/DEPLOY#${stage}.noEnvFile pair per the fileless-transition guide the preflight printed, then rerun \`mmi-cli vault secrets preflight --stage ${stage} --repo ${repo}${lane === "hotfix" ? " --lane hotfix" : ""}\`; --skip-compose-guard only after independent verification (#2813)` });
-    } else {
-      unverified(`the ${stage} secrets preflight`, clean2(text) || e);
+  let preflightTimeouts = 0;
+  for (; ; ) {
+    try {
+      await train.runSelf(["secrets", "preflight", "--stage", stage, "--repo", repo, ...lane === "hotfix" ? ["--lane", "hotfix"] : []]);
+      break;
+    } catch (e) {
+      const err = e;
+      const text = [typeof err.stdout === "string" ? err.stdout : "", typeof err.stderr === "string" ? err.stderr : "", message(e)].join("\n");
+      if (PREFLIGHT_TIMEOUT.test(text) && preflightTimeouts < PREFLIGHT_TIMEOUT_RETRIES) {
+        preflightTimeouts += 1;
+        await deps.sleep(PREFLIGHT_RETRY_BASE_MS * 2 ** (preflightTimeouts - 1));
+        continue;
+      }
+      if (/^missing /m.test(text)) {
+        add({ code: "secrets-missing", severity: "blocker", source: "origin", title: `required ${stage} secret name(s) are absent: ${clean2(text.match(/^missing .*$/m)?.[0] ?? "")}`, remedy: `provision them in the vault (\`mmi-cli vault secrets request <KEY> --repo ${repo}\`), then rerun \`mmi-cli vault secrets preflight --stage ${stage} --repo ${repo}${lane === "hotfix" ? " --lane hotfix" : ""}\`` });
+      } else if (COMPOSE_GUARD_HARD_FAIL.test(text)) {
+        add({ code: "compose-guard-mismatch", severity: "blocker", source: "origin", title: clean2(text.match(COMPOSE_GUARD_HARD_FAIL)?.[0] ?? text), remedy: `fix the compose/DEPLOY#${stage}.noEnvFile pair per the fileless-transition guide the preflight printed, then rerun \`mmi-cli vault secrets preflight --stage ${stage} --repo ${repo}${lane === "hotfix" ? " --lane hotfix" : ""}\`; --skip-compose-guard only after independent verification (#2813)` });
+      } else {
+        const retried = preflightTimeouts ? ` (transient timeout, retried ${preflightTimeouts} times)` : "";
+        unverified(`the ${stage} secrets preflight`, `${clean2(text) || message(e)}${retried}`);
+      }
+      break;
     }
   }
   if (ledgerRaw !== void 0 && ledgerPath) {
@@ -21713,8 +21730,10 @@ async function runTrainDoctor(input) {
           code: failed ? "ledger-failed" : "ledger-pending",
           severity: "blocker",
           source: "local",
-          title: `a prior release ledger for ${ledger.tag} is ${derived.phaseStatus} (${open2}) \u2014 a new train must not stack on it (#5987)`,
-          remedy: failed ? `diagnose the failed leg, then \`mmi-cli devops release --resume\` once its cause is fixed \u2014 or, only when proven unpublished and with fresh approval, \`mmi-cli devops release --abort --apply\`` : `finish it first: \`mmi-cli devops release --resume\` (alignment-only pending legs close themselves with \`train doctor --heal\` once the PR merges)`
+          // #6429: each lane finishes its own run (#6068) — an rcand-lane ledger named as a release
+          // ledger, with `release --resume` as its remedy, sends the operator to a verb that refuses it.
+          title: `a prior ${ledger.lane ?? "release"} ledger for ${ledger.tag} is ${derived.phaseStatus} (${open2}) \u2014 a new train must not stack on it (#5987)`,
+          remedy: failed ? `diagnose the failed leg, then ${ledgerLaneResumeCommand(ledger)} once its cause is fixed (an abort only with fresh approval)` : `finish it first: ${ledgerLaneResumeCommand(ledger)} (alignment-only pending legs close themselves with \`train doctor --heal\` once the PR merges)`
         });
       }
     } catch (e) {
@@ -22605,6 +22624,29 @@ async function latestRemoteRcTag(deps) {
   const tag = [...tags.keys()].sort(compareRcTagsNewestFirst)[0];
   return tag ? { tag, sha: tags.get(tag) } : void 0;
 }
+async function activeRcandLedgerCandidate(deps, cwd) {
+  let path2;
+  try {
+    path2 = releaseLedgerPath(cwd);
+  } catch {
+    return void 0;
+  }
+  let prior;
+  try {
+    prior = parseReleaseLedger((0, import_node_fs24.readFileSync)(path2, "utf8"));
+  } catch {
+    return void 0;
+  }
+  if (prior.lane !== "rcand") return void 0;
+  let liveSha = "";
+  try {
+    liveSha = clean2(await runGitRemoteRead(deps, ["ls-remote", "origin", `refs/tags/${prior.tag}`])).split(/\s+/)[0] ?? "";
+  } catch {
+    return void 0;
+  }
+  if (liveSha.toLowerCase() !== prior.tagSha.toLowerCase()) return void 0;
+  return { tag: prior.tag, sha: prior.tagSha };
+}
 async function probeAncestor(deps, ancestor, descendant, label) {
   try {
     await deps.run("git", ["merge-base", "--is-ancestor", ancestor, descendant]);
@@ -22628,7 +22670,7 @@ async function runRcandResume(deps, options = {}) {
     throw new Error("rcand --resume: origin/rc does not exist \u2014 there is no candidate branch to resume");
   }
   const deployModel = await preflight(deps, ctx, "rc", meta);
-  const candidate = await latestRemoteRcTag(deps);
+  const candidate = await activeRcandLedgerCandidate(deps, process.cwd()) ?? await latestRemoteRcTag(deps);
   if (!candidate) {
     throw new Error("rcand --resume: no public v*-rc.* tag found on origin \u2014 there is no tagged candidate to resume");
   }
@@ -25669,7 +25711,9 @@ function registerBoardCommands(program3) {
     }
     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`;
+    if (result.outcome === "held") {
+      return result.renewed ? `${ref} is held by ${holder} - In Progress, claim lease renewed` : `${ref} is held by ${holder} - In Progress, claim lease NOT renewed (marker comment failed)`;
+    }
     return `Claimed ${ref} for ${holder} - In Progress${reclaimed}`;
   }
   const board = program3.command("board").description("read, claim, show, and move Project v2 work items for the current repo");

package/package.json

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