@mutmutco/cli 4.0.16 → 4.0.17

package/dist/main.cjs

@@ -5035,16 +5035,26 @@ function isAgentScratchPath(path2) {
   return /^tmp_[^/]+$/.test(normalized);
 }
 var PUSH_WALL_AGENT_CONFIG_DIRS = [".claude/", ".cursor/rules/", ".codex/", ".agents/"];
+var LIVE_SESSION_DIRS = [".jerv/", ".pi/"];
+function pathUnderDirPrefix(path2, dir) {
+  return path2 === dir || path2 === dir.slice(0, -1) || path2.startsWith(dir) || path2.includes(`/${dir}`);
+}
 function isUncommittableAgentConfigPath(path2) {
   const normalized = path2.replace(/\\/g, "/").trim();
-  return PUSH_WALL_AGENT_CONFIG_DIRS.some((dir) => normalized === dir || normalized === dir.slice(0, -1) || normalized.startsWith(dir) || normalized.includes(`/${dir}`));
+  return PUSH_WALL_AGENT_CONFIG_DIRS.some((dir) => pathUnderDirPrefix(normalized, dir));
+}
+function isLiveSessionPath(path2) {
+  const normalized = path2.replace(/\\/g, "/").trim();
+  return LIVE_SESSION_DIRS.some((dir) => pathUnderDirPrefix(normalized, dir));
 }
 function splitPorcelainLine(line) {
   return { status: line.slice(0, 2), path: line.slice(3).split(" -> ")[0]?.trim() ?? "" };
 }
 function isExemptPorcelainLine(status, path2) {
   if (isAgentScratchPath(path2)) return true;
-  return status === "??" && isUncommittableAgentConfigPath(path2);
+  if (status !== "??") return false;
+  if (isUncommittableAgentConfigPath(path2)) return true;
+  return isLiveSessionPath(path2);
 }
 function porcelainBlockingPaths(porcelain) {
   const blocking = [];
@@ -5059,12 +5069,21 @@ function porcelainHasBlockingChanges(porcelain) {
   return porcelainBlockingPaths(porcelain).length > 0;
 }
 var BLOCKING_PATH_PREVIEW_LIMIT = 10;
+function porcelainHasBlockingUntracked(porcelain) {
+  for (const line of porcelain.split("\n")) {
+    if (!line.trim()) continue;
+    const { status, path: path2 } = splitPorcelainLine(line);
+    if (path2 !== "" && status === "??" && !isExemptPorcelainLine(status, path2)) return true;
+  }
+  return false;
+}
 function describeBlockingPaths(porcelain) {
   const paths = porcelainBlockingPaths(porcelain);
   if (paths.length === 0) return "";
   const shown = paths.slice(0, BLOCKING_PATH_PREVIEW_LIMIT);
   const rest = paths.length - shown.length;
-  return ` \u2014 blocking: ${shown.join(", ")}${rest > 0 ? `, \u2026 and ${rest} more` : ""}`;
+  const hint = porcelainHasBlockingUntracked(porcelain) ? " (untracked: gitignore it, or add it to .git/info/exclude)" : "";
+  return ` \u2014 blocking: ${shown.join(", ")}${rest > 0 ? `, \u2026 and ${rest} more` : ""}${hint}`;
 }
 
 // src/local-train-sync.ts
@@ -5614,6 +5633,12 @@ var PR_CHECKS_FAILURE_CONFIRMATIONS = 2;
 var PR_CHECKS_RATELIMIT_FLOOR = 50;
 var PR_CHECKS_RATELIMIT_JITTER_MAX_MS = 5e3;
 var NO_CI_LIVE_CHECKS_CONTRADICTION_REASON = "ci:none contradicted by live check runs on PR head";
+var PR_CHECKS_ZERO_RUNS_GRACE_MS = 2 * 6e4;
+var PR_CHECKS_ZERO_RUNS_CONFIRMATIONS = 2;
+function zeroRunsDeliveryMessage(headSha) {
+  const tip = headSha ? ` (${headSha.slice(0, 7)})` : "";
+  return `GitHub delivered ZERO workflow runs for this PR head${tip} \u2014 not "checks still pending". Sibling PRs on the same repo can still be healthy while this head is silent. Close/reopen is insufficient. Recourse: push an empty commit on the same branch (\`git commit --allow-empty -m "ci: re-trigger gates" && git push\`) or re-branch onto a new head and open a fresh PR. See docs/Guides/gh-runner-runbook.md \xA7 Zero workflow runs on a PR head.`;
+}
 function decidePrMergeNoCiGuard(checks, policyReason = "registry META ci:none") {
   if (checks === "no-checks-reported") return { action: "proceed" };
   const staleNote = `merge CI policy says no-ci (${policyReason}), but live PR checks exist`;
@@ -5661,6 +5686,7 @@ async function waitForPrChecks(deps) {
   let lastDetail = "pending";
   let successStreak = 0;
   let failureStreak = 0;
+  let zeroRunsStreak = 0;
   report("starting");
   while (now() < deadline) {
     if (deps.pollRateLimit) {
@@ -5694,6 +5720,7 @@ async function waitForPrChecks(deps) {
     report(state);
     if (state !== "success") successStreak = 0;
     if (state !== "failure") failureStreak = 0;
+    if (state !== "no-checks-reported") zeroRunsStreak = 0;
     if (state === "failure") {
       failureStreak += 1;
       if (failureStreak >= PR_CHECKS_FAILURE_CONFIRMATIONS) {
@@ -5726,6 +5753,30 @@ async function waitForPrChecks(deps) {
     }
     if (state === "no-checks-reported") {
       lastDetail = "no-checks-reported (waiting for workflow to queue)";
+      const elapsed = now() - started;
+      if (deps.pollHeadWorkflowRunCount && elapsed >= PR_CHECKS_ZERO_RUNS_GRACE_MS) {
+        const count = await deps.pollHeadWorkflowRunCount().catch(() => null);
+        if (count === 0) {
+          zeroRunsStreak += 1;
+          if (zeroRunsStreak >= PR_CHECKS_ZERO_RUNS_CONFIRMATIONS) {
+            return {
+              policy,
+              status: "failure",
+              reason: zeroRunsDeliveryMessage(),
+              detail: "zero-runs",
+              waitedMs: elapsed
+            };
+          }
+          lastDetail = "no-checks-reported (confirming zero workflow runs on head)";
+        } else {
+          zeroRunsStreak = 0;
+          if (count !== null && count > 0) {
+            lastDetail = `no-checks-reported (${count} workflow run(s) on head; waiting for check-runs)`;
+          }
+        }
+      } else {
+        zeroRunsStreak = 0;
+      }
       await deps.sleep(PR_CHECKS_POLL_MS);
       continue;
     }
@@ -10832,10 +10883,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.0.16",
-    tag: "v4.0.16",
-    commit: "ac03c4999cb4",
-    npm: "@mutmutco/cli@4.0.16"
+    version: "4.0.17",
+    tag: "v4.0.17",
+    commit: "df1e866df4f8",
+    npm: "@mutmutco/cli@4.0.17"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -10852,14 +10903,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.0.16"
+          v3Target: "v4.0.17"
         }
       ],
       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.0.16 and redeploy the Hub Lambda from tag v4.0.16 (ac03c4999cb4); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.0.16 (@mutmutco/cli@4.0.16, tag commit ac03c4999cb4 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.0.17 and redeploy the Hub Lambda from tag v4.0.17 (df1e866df4f8); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.0.17 (@mutmutco/cli@4.0.17, tag commit df1e866df4f8 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -14659,7 +14710,11 @@ async function completeMainRelease(deps, ctx, meta, deployModel, watch, options,
     throw partialTrainRecoveryError(e, { repo: ctx.repo, tag, stage: "main", deployModel });
   }
   if (trueMergeGateNote) checks = `${trueMergeGateNote}; ${checks}`;
-  await runGitPush(deps, ["push", "origin", "main"]);
+  try {
+    await runGitPush(deps, ["push", "origin", "main"]);
+  } catch (e) {
+    throw partialTrainRecoveryError(e, { repo: ctx.repo, tag, stage: "main", deployModel });
+  }
   const releaseUrl = clean2(await deps.run("gh", ["release", "create", tag, "--target", "main", "--generate-notes", "--latest", "--repo", ctx.repo])) || void 0;
   await verifyPublishedRelease(deps, ctx.repo, tag, "main", releaseSha);
   const announceNote = deps.announce ? (await deps.announce({ repo: ctx.repo, tag, summaryFile: options.announceSummaryFile })).note : void 0;
@@ -15045,7 +15100,11 @@ async function runTrainApplyPipeline(mode, input) {
       throw partialTrainRecoveryError(e, { repo: ctx.repo, tag: tag2, stage: "rc", deployModel: deployModel2 });
     }
     const autoRunSince = (deps.now ?? Date.now)();
-    await runGitPush(deps, ["push", "origin", "rc"]);
+    try {
+      await runGitPush(deps, ["push", "origin", "rc"]);
+    } catch (e) {
+      throw partialTrainRecoveryError(e, { repo: ctx.repo, tag: tag2, stage: "rc", deployModel: deployModel2 });
+    }
     const d2 = await dispatchDeploy(deps, ctx, "rc", "rc", deployModel2, watch, autoRunSince, rcSha);
     return { ...ctx, command, stage: "rc", ref: "rc", tag: tag2, bumpIntent, deployModel: deployModel2, promoted: true, checks: checks2, resumeNote, dispatch: d2.note, runId: d2.runId, runUrl: d2.runUrl, workflowRuns: d2.workflowRuns, deployStatus: d2.deployStatus };
   }
@@ -29772,6 +29831,14 @@ function ghPrMergeLocalBranchDeleteWarning(message) {
 function mergeAutoRejectedPrAlreadyClean(message) {
   return /clean status \(enablePullRequestAutoMerge\)|is in clean status/i.test(message);
 }
+function mergeMethodFromParentCount(parentCount) {
+  if (parentCount >= 2) return "merge";
+  return void 0;
+}
+function reportedMergeMethod(input) {
+  if (!input.alreadyMerged) return input.requestedMethod;
+  return input.observedMethod;
+}
 
 // src/merge-cleanup.ts
 var GC_GH_TIMEOUT_MS = 2e4;
@@ -30410,6 +30477,25 @@ async function pollRestPrMergeable(prNumber, repo, gh = defaultGhApi) {
     return "UNKNOWN";
   }
 }
+async function countHeadWorkflowRuns(headSha, repo, gh = defaultGhApi) {
+  if (!headSha) return { state: "failed", error: "no head SHA" };
+  let raw;
+  try {
+    raw = await gh([`repos/${repo}/actions/runs?head_sha=${encodeURIComponent(headSha)}&per_page=1`]);
+  } catch (e) {
+    return { state: "failed", error: `actions/runs read failed for ${headSha.slice(0, 7)} on ${repo}: ${readErrorText(e)}` };
+  }
+  let count;
+  try {
+    count = JSON.parse(raw).total_count;
+  } catch (e) {
+    return { state: "failed", error: `actions/runs payload for ${headSha.slice(0, 7)} was not JSON: ${readErrorText(e)}` };
+  }
+  if (typeof count !== "number" || !Number.isFinite(count) || count < 0) {
+    return { state: "failed", error: `actions/runs payload for ${headSha.slice(0, 7)} carried no usable total_count` };
+  }
+  return { state: "ok", count };
+}
 async function pollRestPrMerged(prNumber, repo, gh = defaultGhApi) {
   try {
     return (await fetchRestPrSnapshot(prNumber, repo, gh)).merged ? { state: "merged" } : { state: "open" };
@@ -38057,12 +38143,29 @@ async function waitLoopDiagnosis(label, prNumber, repo) {
   }
   return null;
 }
+async function waitLoopHeadWorkflowRunCount(label, prNumber, repo) {
+  let snapshot;
+  try {
+    snapshot = await fetchRestPrSnapshot(prNumber, repo);
+  } catch (e) {
+    console.warn(
+      `${label}: zero-runs probe FAILED (pulls read: ${e?.message ?? e}) \u2014 not treating as delivery failure this cycle`
+    );
+    return null;
+  }
+  const read = await countHeadWorkflowRuns(snapshot.headSha, repo);
+  if (read.state === "ok") return read.count;
+  console.warn(
+    `${label}: zero-runs probe FAILED (${read.error}) \u2014 not treating as delivery failure this cycle`
+  );
+  return null;
+}
 pr.command("ci-policy").description("report merge CI policy: wait-for-checks vs no-ci (for grind/build agents)").option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the current checkout)").action(async (o) => {
   const result = await resolveMergeCiPolicyForCheckout(o.repo);
   if (o.json) return printLine(JSON.stringify(result));
   printLine(`merge CI policy: ${result.policy} (${result.reason})`);
 });
-pr.command("checks-wait <number>").description(`bounded wait for ALL checks on the PR head, required or not (#5336); skips immediately on no-ci repos (#1432), fails immediately on a CONFLICTING PR \u2014 GitHub never queues checks for one (#2970). REST-only polling with a pool floor (#3024). Default budget ${PR_CHECKS_TIMEOUT_MS / 6e4}m; --timeout raises it. Exit 1 = a check FAILED or the PR is CONFLICTING, exit ${PR_CHECKS_TIMEOUT_EXIT_CODE} = the wait window expired or the API pool ran dry (re-arm)`).option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--timeout <minutes>", `wait budget in minutes (default ${PR_CHECKS_TIMEOUT_MS / 6e4}) \u2014 raise it for serial self-hosted e2e queues`).action(async (number, o) => {
+pr.command("checks-wait <number>").description(`bounded wait for ALL checks on the PR head, required or not (#5336); skips immediately on no-ci repos (#1432), fails immediately on a CONFLICTING PR \u2014 GitHub never queues checks for one (#2970), and fails early on a confirmed zero-workflow-runs head instead of burning the full budget as pending (#5400). REST-only polling with a pool floor (#3024). Default budget ${PR_CHECKS_TIMEOUT_MS / 6e4}m; --timeout raises it. Exit 1 = a check FAILED, the PR is CONFLICTING, or GitHub delivered zero runs; exit ${PR_CHECKS_TIMEOUT_EXIT_CODE} = the wait window expired or the API pool ran dry (re-arm)`).option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--timeout <minutes>", `wait budget in minutes (default ${PR_CHECKS_TIMEOUT_MS / 6e4}) \u2014 raise it for serial self-hosted e2e queues`).action(async (number, o) => {
   let timeoutMs;
   if (o.timeout !== void 0) {
     const minutes = Number(o.timeout);
@@ -38088,6 +38191,8 @@ pr.command("checks-wait <number>").description(`bounded wait for ALL checks on t
     // #3388: on a confirmed red, read the failing runs' annotations so a wall-clock budget kill stops
     // reading as "your tests failed". One call per failing run, only at the verdict.
     diagnoseFailure: () => waitLoopDiagnosis("pr checks-wait", number, repo),
+    // #5400: after grace, name "GitHub delivered zero runs" instead of burning the full budget as pending.
+    pollHeadWorkflowRunCount: () => waitLoopHeadWorkflowRunCount("pr checks-wait", number, repo),
     baseBranch,
     sleep: (ms) => new Promise((resolve5) => setTimeout(resolve5, ms)),
     log: (message) => console.warn(message),
@@ -38102,7 +38207,7 @@ pr.command("checks-wait <number>").description(`bounded wait for ALL checks on t
   } else if (result.status === "timeout") {
     const stuckQueuing = /no-checks-reported/i.test(result.detail ?? "");
     printLine(
-      `pr checks-wait: timeout \u2014 waited ${Math.round((result.waitedMs ?? 0) / 6e4)}m, last state: ${result.detail ?? "pending"}. No check failed; re-run to keep waiting, or pass --timeout <minutes>.` + (stuckQueuing ? " Tip: jobs never appeared \u2014 mmi-live may be saturated or Actions may be failing before checkout; check runner health (docs/Guides/gh-runner-runbook.md) and re-run the workflow." : "")
+      `pr checks-wait: timeout \u2014 waited ${Math.round((result.waitedMs ?? 0) / 6e4)}m, last state: ${result.detail ?? "pending"}. No check failed; re-run to keep waiting, or pass --timeout <minutes>.` + (stuckQueuing ? " Tip: check-runs never appeared \u2014 if `gh api repos/<owner>/<repo>/actions/runs?head_sha=<sha>` shows total_count=0, see docs/Guides/gh-runner-runbook.md \xA7 Zero workflow runs; otherwise mmi-live may be saturated or Actions may be failing before checkout (docs/Guides/gh-runner-runbook.md)." : "")
     );
   } else if (result.status === "rate-limited") {
     printLine(`pr checks-wait: rate-limited \u2014 ${result.reason ?? "REST pool below floor"}. No check failed; re-run after the pool resets.`);
@@ -38110,6 +38215,8 @@ pr.command("checks-wait <number>").description(`bounded wait for ALL checks on t
     printLine(`pr checks-wait: failure (runner infrastructure, NOT a test failure) \u2014 ${result.reason}`);
   } else if (result.detail === "stale-head") {
     printLine(`pr checks-wait: failure (stale PR head, NOT a test failure) \u2014 ${result.reason}`);
+  } else if (result.detail === "zero-runs") {
+    printLine(`pr checks-wait: failure (zero workflow runs delivered, NOT pending checks) \u2014 ${result.reason}`);
   } else printLine(`pr checks-wait: ${result.status}${result.reason ? ` \u2014 ${result.reason}` : ""}${result.detail ? ` (${result.detail})` : ""}`);
   if (result.status === "failure" || result.status === "conflicting") process.exitCode = 1;
   if (result.status === "timeout" || result.status === "rate-limited") process.exitCode = PR_CHECKS_TIMEOUT_EXIT_CODE;
@@ -38180,6 +38287,8 @@ pr.command("land <number>").description("agent merge path (#1440): train probe \
         // #3388: `pr land` is the batch path — the one most likely to self-DOS the shared runner and
         // then read its own wall-clock kill as a broken diff.
         diagnoseFailure: () => waitLoopDiagnosis("pr land", prNumber, repo),
+        // #5400: same zero-runs delivery probe as checks-wait — do not burn the land budget on silence.
+        pollHeadWorkflowRunCount: () => waitLoopHeadWorkflowRunCount("pr land", prNumber, repo),
         baseBranch: "development",
         sleep: (ms) => new Promise((resolve5) => setTimeout(resolve5, ms)),
         log: (message) => console.warn(message),
@@ -38302,6 +38411,7 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
       pollMergeable: () => pollRestPrMergeable(number, repo),
       pollRateLimit: () => waitLoopCorePool("pr merge --wait"),
       diagnoseFailure: () => waitLoopDiagnosis("pr merge --wait", number, repo),
+      pollHeadWorkflowRunCount: () => waitLoopHeadWorkflowRunCount("pr merge --wait", number, repo),
       baseBranch,
       sleep: (ms) => new Promise((resolve5) => setTimeout(resolve5, ms)),
       log: (message) => console.warn(message),
@@ -38421,11 +38531,27 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
   invalidateStatuslineBoardCache();
   const devDeploy = devDeployPlan.applicable && devDeployDeps && remoteNotAttemptedReason !== "pr-already-merged" ? await dispatchDevDeploy(repoForPostCleanup, devDeployDeps) : void 0;
   const devDeployManual = devDeployPlan.applicable ? devDeployPlan.manualPointer : void 0;
+  let observedMethod;
+  if (remoteNotAttemptedReason === "pr-already-merged" && repoForPostCleanup) {
+    try {
+      const mergeSha = (await defaultGitHubClient().rest("GET", `repos/${repoForPostCleanup}/pulls/${number}`)).merge_commit_sha;
+      if (mergeSha) {
+        const commit = await defaultGitHubClient().rest("GET", `repos/${repoForPostCleanup}/commits/${mergeSha}`);
+        observedMethod = mergeMethodFromParentCount(Array.isArray(commit.parents) ? commit.parents.length : 0);
+      }
+    } catch {
+    }
+  }
+  const methodField = reportedMergeMethod({
+    requestedMethod: method.slice(2),
+    alreadyMerged: remoteNotAttemptedReason === "pr-already-merged",
+    observedMethod
+  });
   console.log(JSON.stringify({
     mergeStatus: "merged",
     merged: number,
     branch: headRef,
-    method: method.slice(2),
+    ...methodField ? { method: methodField } : {},
     remoteBranch,
     housekeeping,
     // `boardAdvance` keeps its published array shape; `boardAdvanceStatus` is the field a caller reads to
@@ -38807,7 +38933,8 @@ for (const commandName of ["rcand", "release"]) {
         applyTrainFollowUpExit(followUpStatus);
         return;
       } catch (e) {
-        return failGraceful(`${commandName}: ${e.message}`);
+        process.exitCode = 1;
+        return await failGraceful(`${commandName}: ${e.message}`);
       }
     }
     const repo = o.repo ?? await resolveRepo();

package/package.json

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