@mutmutco/cli 3.7.0 → 3.8.0

package/dist/main.cjs

@@ -9270,7 +9270,7 @@ function parseNpmVersion(stdout) {
   return /^\d+\.\d+\.\d+(-[0-9A-Za-z.-]+)?$/.test(v) ? v : void 0;
 }
 function staleTrainCliMessage(report, commandName) {
-  return `running mmi-cli ${report.currentVersion} is stale against released ${report.releasedVersion}; this is recoverable \u2014 run \`mmi-cli doctor --apply --no-repo-writes\` to update to ${report.releasedVersion}, then rerun ${commandName} so it uses the current train path`;
+  return `running mmi-cli ${report.currentVersion} is stale against released ${report.releasedVersion}; this is recoverable \u2014 run \`mmi-cli doctor --apply --no-repo-writes\` to update to ${report.releasedVersion}, then rerun ${commandName} so it uses the current train path. This gate runs before any train mutation, so this invocation changed nothing; any partial train state (local merge, pushed tag) is from an earlier run and the rerun resumes it safely`;
 }
 async function resolveReleasedVersion(runners) {
   try {
@@ -10038,7 +10038,7 @@ var defaultSleep2 = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
 function resolveSleep(deps) {
   return deps.sleep ?? defaultSleep2;
 }
-var TRAIN_CHECK_RUNS_JQ = "[.check_runs[]|{name:.name,status:.status,conclusion:.conclusion}]";
+var TRAIN_CHECK_RUNS_JQ = "[.check_runs[]|{name:.name,status:.status,conclusion:.conclusion,startedAt:.started_at}]";
 var TRAIN_COMMIT_STATUS_JQ = "[.statuses[]|{context:.context,state:.state}]";
 var TRAIN_PROTECTION_CONTEXTS_JQ = "[.contexts[]]";
 var TRAIN_RULES_CONTEXTS_JQ = '[.[]|select(.type=="required_status_checks")|.parameters.required_status_checks[].context]';
@@ -10046,6 +10046,7 @@ var TRAIN_CHECK_ATTEMPTS = 40;
 var TRAIN_CHECK_DELAY_MS = 15e3;
 var TRAIN_PR_ONLY_AUTOMATION_CONTEXTS = /* @__PURE__ */ new Set(["add-to-project", "mark-merged-pr-done"]);
 var TRAIN_PR_AUTOMATION_GRACE_ATTEMPTS = 3;
+var TRAIN_FRESH_RUN_GRACE_ATTEMPTS = 4;
 async function correlateRun(deps, args) {
   const sleep = resolveSleep(deps);
   const threshold = args.since - CORRELATE_SKEW_SLACK_MS;
@@ -10103,12 +10104,19 @@ async function correlateWorkflowRun(deps, args) {
 }
 async function watchTenantRun(deps, runId, repo = HUB_REPO3) {
   if (runId == null) return "pending";
+  let watchSaidSuccess = true;
   try {
     await deps.run("gh", ["run", "watch", String(runId), "--repo", repo, "--exit-status"]);
-    return "success";
   } catch {
-    return "failure";
+    watchSaidSuccess = false;
   }
+  try {
+    const out = await deps.run("gh", ["run", "view", String(runId), "--repo", repo, "--json", "status,conclusion"]);
+    const parsed = JSON.parse(out);
+    if (parsed.status === "completed") return parsed.conclusion === "success" ? "success" : "failure";
+  } catch {
+  }
+  return watchSaidSuccess ? "success" : "failure";
 }
 async function fetchControlRunLog(deps, runId) {
   try {
@@ -10220,10 +10228,16 @@ function resolveContextState(context, checkRuns, statuses) {
   if (sawSuccess) return "success";
   return sawFailure ? "failed" : "pending";
 }
-async function waitForRequiredTrainChecks(deps, ctx, sha, required) {
+async function waitForRequiredTrainChecks(deps, ctx, sha, required, freshSince) {
   if (required.length === 0) {
     return "no required status checks configured on the target branch \u2014 check wait skipped (GitHub push gate is the backstop)";
   }
+  const freshThreshold = freshSince !== void 0 ? freshSince - CORRELATE_SKEW_SLACK_MS : void 0;
+  const isFreshRun = (r) => {
+    if (freshThreshold === void 0) return true;
+    const t = Date.parse(String(r.startedAt ?? ""));
+    return !Number.isFinite(t) || t >= freshThreshold;
+  };
   const sleep = resolveSleep(deps);
   let lastStatus = "not checked";
   let lastError;
@@ -10256,7 +10270,14 @@ async function waitForRequiredTrainChecks(deps, ctx, sha, required) {
       }
     }
     const pending = required.filter((c) => !autoSatisfied.has(c));
-    const states = pending.map((c) => [c, resolveContextState(c, checkRuns, statuses)]);
+    const holdStale = freshThreshold !== void 0 && attempt < TRAIN_FRESH_RUN_GRACE_ATTEMPTS;
+    const states = pending.map((c) => {
+      if (holdStale) {
+        const runsFor = checkRuns.filter((r) => r.name === c);
+        if (runsFor.length > 0 && !runsFor.some(isFreshRun)) return [c, "pending"];
+      }
+      return [c, resolveContextState(c, checkRuns, statuses)];
+    });
     const satisfiedNote = autoSatisfied.size ? `, auto-satisfied (never runs on a tag, see #2404): ${[...autoSatisfied].join(", ")}` : "";
     lastStatus = `${states.map(([c, s]) => `${c}=${s}`).join(", ")}${satisfiedNote}`;
     const failed = states.filter(([, s]) => s === "failed").map(([c]) => c);
@@ -10308,14 +10329,14 @@ async function ensureTagPushed(deps, tag, sha) {
     if (localSha && localSha !== sha) {
       throw new Error(`local tag ${tag} points at ${localSha} but origin has it at ${sha} \u2014 delete the stale local tag (git tag -d ${tag}) and rerun`);
     }
-    return `tag ${tag} already on origin at ${sha.slice(0, 7)} \u2014 resumed without re-pushing`;
+    return { note: `tag ${tag} already on origin at ${sha.slice(0, 7)} \u2014 resumed without re-pushing`, pushed: false };
   }
   if (localSha && localSha !== sha) {
     throw new Error(`local tag ${tag} already points at ${localSha}, not the intended ${sha} \u2014 delete the stale local tag (git tag -d ${tag}) and rerun`);
   }
   if (!localSha) await deps.run("git", ["tag", tag, sha]);
   await deps.run("git", ["push", "origin", tag]);
-  return `tag ${tag} pushed at ${sha.slice(0, 7)}`;
+  return { note: `tag ${tag} pushed at ${sha.slice(0, 7)}`, pushed: true };
 }
 async function resolveRcResumeTag(deps, base, sha) {
   const out = await deps.run("git", ["ls-remote", "--tags", "origin", `refs/tags/${base}-rc.*`]);
@@ -10621,11 +10642,12 @@ async function runFoldStage(deps, startBranch, preFold, fn) {
   }
 }
 async function completeMainRelease(deps, ctx, meta, deployModel, watch, options, tag, releaseSha) {
-  await ensureTagPushed(deps, tag, releaseSha);
+  const tagPush = await ensureTagPushed(deps, tag, releaseSha);
+  const tagPushSince = (deps.now ?? Date.now)();
   const requiredChecks = await discoverRequiredCheckContexts(deps, ctx, "main");
   let checks;
   try {
-    checks = await waitForRequiredTrainChecks(deps, ctx, releaseSha, requiredChecks);
+    checks = await waitForRequiredTrainChecks(deps, ctx, releaseSha, requiredChecks, tagPush.pushed ? tagPushSince : void 0);
   } catch (e) {
     throw partialTrainRecoveryError(e, { repo: ctx.repo, tag, stage: "main" });
   }
@@ -10677,11 +10699,12 @@ async function runTrainApplyPipeline(mode, input) {
     const resume = await resolveRcResumeTag(deps, releaseBase, rcSha);
     const tag2 = resume.tag ?? requireValue(clean(await deps.run("node", ["scripts/next-version.mjs", "rc"])), "rc tag");
     const resumeNote = resume.tag ? resume.note : void 0;
-    await ensureTagPushed(deps, tag2, rcSha);
+    const tagPush = await ensureTagPushed(deps, tag2, rcSha);
+    const tagPushSince = (deps.now ?? Date.now)();
     const requiredChecks = await discoverRequiredCheckContexts(deps, ctx, "rc");
     let checks2;
     try {
-      checks2 = await waitForRequiredTrainChecks(deps, ctx, rcSha, requiredChecks);
+      checks2 = await waitForRequiredTrainChecks(deps, ctx, rcSha, requiredChecks, tagPush.pushed ? tagPushSince : void 0);
     } catch (e) {
       throw partialTrainRecoveryError(e, { repo: ctx.repo, tag: tag2, stage: "rc" });
     }
@@ -11383,9 +11406,11 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
   await deps.run("git", ["merge-base", "--is-ancestor", mergedSha, "origin/main"]).catch(() => {
     throw new Error(`merged hotfix SHA ${mergedSha.slice(0, 7)} is not on origin/main \u2014 refusing to tag`);
   });
-  const tagNote = await ensureTagPushed(deps, tag, mergedSha);
+  const tagPush = await ensureTagPushed(deps, tag, mergedSha);
+  const tagPushSince = Date.now();
+  const tagNote = tagPush.note;
   const required = await discoverRequiredCheckContexts(deps, ctx, "main");
-  const checks = await waitForRequiredTrainChecks(deps, ctx, mergedSha, required);
+  const checks = await waitForRequiredTrainChecks(deps, ctx, mergedSha, required, tagPush.pushed ? tagPushSince : void 0);
   let releaseNote;
   let releaseExists = false;
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "MMI Future CLI — the org dev toolbox (board, registry, keyless secrets, release train, bootstrap, doctor) and the cross-IDE engine the plugin's session-start hook drives.",
   "type": "module",
   "license": "UNLICENSED",