@mutmutco/cli 4.5.196 → 4.5.198

package/dist/main.cjs

@@ -7798,7 +7798,7 @@ function waitReadFailureMessage(e) {
 }
 var PR_CHECKS_POLL_MS = 6e4;
 function pollIntervalMs(elapsedMs) {
-  return Math.min(4 * PR_CHECKS_POLL_MS, PR_CHECKS_POLL_MS * 2 ** Math.floor(Math.max(0, elapsedMs) / 3e5));
+  return Math.min(4 * PR_CHECKS_POLL_MS, PR_CHECKS_POLL_MS * 2 ** Math.floor(Math.max(0, elapsedMs) / 9e5));
 }
 var PR_CHECKS_TIMEOUT_MS = 30 * 6e4;
 var PR_CHECKS_SUCCESS_CONFIRMATIONS = 2;
@@ -19279,10 +19279,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.5.196",
-    tag: "v4.5.196",
-    commit: "b0a1e2a76ba0",
-    npm: "@mutmutco/cli@4.5.196"
+    version: "4.5.198",
+    tag: "v4.5.198",
+    commit: "6d3c999e17f5",
+    npm: "@mutmutco/cli@4.5.198"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -19299,14 +19299,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.5.196"
+          v3Target: "v4.5.198"
         }
       ],
       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.5.196 and redeploy the Hub Lambda from tag v4.5.196 (b0a1e2a76ba0); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.5.196 (@mutmutco/cli@4.5.196, tag commit b0a1e2a76ba0 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.5.198 and redeploy the Hub Lambda from tag v4.5.198 (6d3c999e17f5); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.5.198 (@mutmutco/cli@4.5.198, tag commit 6d3c999e17f5 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -30269,6 +30269,69 @@ function auditRunnerFallbacks(repo, files) {
   }
   return checks;
 }
+var PENDING_LANDING_LABEL = "pending PRs landing (#8783)";
+var PENDING_LANDING_LIST_CAP = 50;
+var PENDING_LANDING_STALL_MS = 15 * 60 * 1e3;
+function summarizePendingLanding(nodes, base, capped, now) {
+  const prs = nodes.filter((n) => !n.isDraft);
+  const s = {
+    base,
+    considered: prs.length,
+    capped,
+    autoMergeRequested: 0,
+    autoMergeNotRequested: 0,
+    inMergeQueue: 0,
+    blockers: { DIRTY: 0, BLOCKED: 0, BEHIND: 0, UNKNOWN: 0, CLEAN_NOT_QUEUED: 0 },
+    stalled: []
+  };
+  for (const pr of prs) {
+    const requested = Boolean(pr.autoMergeRequest);
+    const queued = pr.isInMergeQueue === true;
+    if (requested) s.autoMergeRequested++;
+    else s.autoMergeNotRequested++;
+    if (queued) s.inMergeQueue++;
+    const state = pr.mergeStateStatus ?? "UNKNOWN";
+    if (state === "DIRTY") s.blockers.DIRTY++;
+    else if (state === "BLOCKED") s.blockers.BLOCKED++;
+    else if (state === "BEHIND") s.blockers.BEHIND++;
+    else if (state === "CLEAN") {
+      if (!requested && !queued) {
+        s.blockers.CLEAN_NOT_QUEUED++;
+        const updated = Date.parse(pr.updatedAt ?? "");
+        if (Number.isFinite(updated) && now - updated > PENDING_LANDING_STALL_MS) s.stalled.push(pr.number);
+      }
+    } else if (state !== "HAS_HOOKS" && state !== "UNSTABLE") s.blockers.UNKNOWN++;
+  }
+  return s;
+}
+function pendingLandingCheck(summary, base) {
+  if (!summary) {
+    return { ok: true, severity: "info", label: PENDING_LANDING_LABEL, detail: `UNAVAILABLE: open-PR read for ${base} failed \u2014 counts unknown, not zero` };
+  }
+  const b = summary.blockers;
+  const detail = `${summary.considered} open non-draft PR(s) into ${base}${summary.capped ? ` (capped: first ${PENDING_LANDING_LIST_CAP} by most recent update; more exist)` : ""}; auto-merge REQUESTED on ${summary.autoMergeRequested}, not requested on ${summary.autoMergeNotRequested} (per-PR requests, not the repo allow_auto_merge permission); in merge queue ${summary.inMergeQueue}; blockers: DIRTY ${b.DIRTY}, BLOCKED ${b.BLOCKED}, BEHIND ${b.BEHIND}, UNKNOWN ${b.UNKNOWN}, CLEAN-not-queued ${b.CLEAN_NOT_QUEUED}` + (summary.stalled.length ? `; STALLED (CLEAN, no auto-merge request or queue entry, idle >15 min): ${summary.stalled.map((n) => `#${n}`).join(", ")}` : "");
+  return {
+    ok: true,
+    severity: summary.stalled.length ? "warn" : "info",
+    label: PENDING_LANDING_LABEL,
+    detail,
+    remediation: summary.stalled.length ? "mmi-cli pr land <n> --repo <repo> for each stalled PR" : void 0
+  };
+}
+async function auditPendingLanding(repo, base, deps) {
+  try {
+    const [owner, name] = repo.split("/");
+    const data = await deps.client.graphql(
+      "query($owner:String!,$name:String!,$base:String!,$n:Int!){repository(owner:$owner,name:$name){pullRequests(states:OPEN,baseRefName:$base,first:$n,orderBy:{field:UPDATED_AT,direction:DESC}){totalCount nodes{number isDraft updatedAt mergeStateStatus isInMergeQueue autoMergeRequest{enabledAt}}}}}",
+      { owner, name, base, n: PENDING_LANDING_LIST_CAP }
+    );
+    const prs = data?.repository?.pullRequests;
+    if (!prs?.nodes) return pendingLandingCheck(void 0, base);
+    return pendingLandingCheck(summarizePendingLanding(prs.nodes, base, (prs.totalCount ?? 0) > prs.nodes.length, (deps.now ?? Date.now)()), base);
+  } catch {
+    return pendingLandingCheck(void 0, base);
+  }
+}
 function slugFromRepo(repo) {
   return (repo.includes("/") ? repo.split("/")[1] : repo).toLowerCase();
 }
@@ -30973,6 +31036,7 @@ async function auditRepoCi(repo, callerDeps) {
     const fresh = await auditDevStageFreshness(repo, deps);
     if (fresh) checks.push(fresh);
   }
+  checks.push(await auditPendingLanding(repo, baseBranch, deps));
   const failure = unauditedReason();
   if (failure) {
     return { repo, class: repoClass, mergePolicy: policy, ok: false, checks: [], explicitNoCi, unauditedReason: failure };
@@ -31021,6 +31085,8 @@ function renderCiAuditMarkdown(report) {
     const gap = r.unauditedReason ? `CANNOT AUDIT \u2014 ${r.unauditedReason}` : r.checks.find((c) => !c.ok)?.label ?? "\u2014";
     lines2.push(`| ${r.repo} | ${r.class} | ${r.mergePolicy} | ${r.ok ? "yes" : "no"} | ${gap} |`);
   }
+  const advisories = report.repos.flatMap((r) => r.checks.filter((c) => c.severity && c.label === PENDING_LANDING_LABEL).map((c) => `- ${c.severity === "warn" ? "WARN" : "INFO"} ${r.repo}: ${c.label} \u2014 ${c.detail ?? ""}`));
+  if (advisories.length) lines2.push("", ...advisories);
   return lines2.join("\n");
 }
 function renderCiAuditText(report) {
@@ -31037,7 +31103,7 @@ ${r.repo} (${r.class}, policy=${r.mergePolicy}) ${verdict}`);
       continue;
     }
     for (const c of r.checks) {
-      lines2.push(`  ${c.ok ? "OK" : "FAIL"} ${c.label}${c.detail ? ` \u2014 ${c.detail}` : ""}`);
+      lines2.push(`  ${!c.ok ? "FAIL" : c.severity === "warn" ? "WARN" : c.severity === "info" ? "INFO" : "OK"} ${c.label}${c.detail ? ` \u2014 ${c.detail}` : ""}`);
     }
   }
   return lines2.join("\n");
@@ -42913,19 +42979,18 @@ function evaluatePrMergeHousekeeping(report, context, force = false) {
   const failed2 = scratch?.status === "failed";
   const prunable = scratch?.safeAuto ?? 0;
   const unprunable = scratch?.skipped ?? 0;
-  if (!(failed2 || prunable > 0 || unprunable > 0)) return { blocked: false };
-  if (force) return { blocked: false };
+  if (!(failed2 || prunable > 0 || unprunable > 0) || force) return {};
   const detail = failed2 ? `scratch housekeeping failed${scratch?.error ? `: ${scratch.error}` : ""}` : `${prunable} prunable + ${unprunable} un-prunable scratch item(s) remain after cleanup`;
   return {
-    blocked: true,
-    reason: `${context} housekeeping blocked merge: ${detail}. Run \`mmi-cli doctor --apply\` to prune aged repo-root scratch (or \`mmi-cli doctor --verbose\` to inspect what could not be removed), then retry \u2014 or re-run \`mmi-cli devops ${context} --force\` to acknowledge an unresolved scratch block without cleaning it and proceed anyway. (Kept advisory plans/ scratch never blocks: it is gitignored and can never reach origin.)`
+    warning: `${context} housekeeping warning (not blocking): ${detail}. Run \`mmi-cli doctor --apply\` to prune aged repo-root scratch (or \`mmi-cli doctor --verbose\` to inspect what could not be removed). Local scratch never reaches origin, so the merge proceeds.`
   };
 }
-function assertPrMergeHousekeepingClean(startingPath, context, options = {}) {
+function reportPrMergeHousekeeping(startingPath, context, options = {}) {
   const build = options.buildHousekeeping ?? ((repoRoot2) => buildPrMergeScratchHousekeeping(repoRoot2));
   const housekeeping = build(startingPath || process.cwd());
   const verdict = evaluatePrMergeHousekeeping(housekeeping, context, options.force);
-  if (verdict.blocked) throw new Error(verdict.reason);
+  if (verdict.warning) process.stderr.write(`${verdict.warning}
+`);
   return housekeeping;
 }
 async function pollGhPrChecks(prNumber, repoArgs) {
@@ -48696,7 +48761,7 @@ ${list}`);
   }
   class PrHeadBehindBaseError extends Error {
   }
-  pr.command("land <numbers...>").description("agent merge path (#1440): train probe \u2014 checks-wait \u2014 merge --auto \u2014 poll enqueued \u2014 development PRs only. Several PR numbers land together (#8322): all are enqueued, waited on together, a queue-ejected PR is updated and re-enqueued once, a queue merge is followed by worktree/branch cleanup and board Done, and one table (or --json) reports each outcome").option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the PR repo)").option("--enqueue-only", "return once queue membership is confirmed; without a merge queue, land normally").option("--no-require-train", "skip train-authority preflight (not recommended for autonomous agents)").option("--force", "acknowledge and land 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").option("--without-review <reason>", "compatibility option; shared merge helpers do not require a review verdict").option("--timeout <minutes>", `merge-queue wait per PR (default ${PR_LAND_QUEUE_TIMEOUT_MS / 6e4} minutes, one window per ${PR_LAND_QUEUE_BATCH_SIZE} PRs \u2014 the queue's own check timeout is 60)`).option("--preserve-worktree", "after a queue merge keep the local worktree and branch (skips the post-merge cleanup)").option("--expect-head <sha>", "pin the PR head to this full 40-hex SHA (#8456): checked before landing, after checks and by GitHub at enqueue (--match-head-commit); never updates a BEHIND head and never retries an ejection \u2014 it stops with pinnedHead.refused instead. One PR only").action(async (numbers, opts) => {
+  pr.command("land <numbers...>").description("agent merge path (#1440): train probe \u2014 checks-wait \u2014 merge --auto \u2014 poll enqueued \u2014 development PRs only. Several PR numbers land together (#8322): all are enqueued, waited on together, a queue-ejected PR is updated and re-enqueued once, a queue merge is followed by worktree/branch cleanup and board Done, and one table (or --json) reports each outcome").option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the PR repo)").option("--enqueue-only", "return once queue membership is confirmed; without a merge queue, land normally").option("--no-require-train", "skip train-authority preflight (not recommended for autonomous agents)").option("--force", "silence the leftover-scratch warning (scratch never blocks, #8785) and acknowledge a negated-closing-keyword (#3718) or ambiguous-cross-repo-closing (#4279) refusal").option("--without-review <reason>", "compatibility option; shared merge helpers do not require a review verdict").option("--timeout <minutes>", `merge-queue wait per PR (default ${PR_LAND_QUEUE_TIMEOUT_MS / 6e4} minutes, one window per ${PR_LAND_QUEUE_BATCH_SIZE} PRs \u2014 the queue's own check timeout is 60)`).option("--preserve-worktree", "after a queue merge keep the local worktree and branch (skips the post-merge cleanup)").option("--expect-head <sha>", "pin the PR head to this full 40-hex SHA (#8456): checked before landing, after checks and by GitHub at enqueue (--match-head-commit); never updates a BEHIND head and never retries an ejection \u2014 it stops with pinnedHead.refused instead. One PR only").action(async (numbers, opts) => {
     const timeoutMinutes = opts.timeout === void 0 ? void 0 : Number(opts.timeout);
     if (timeoutMinutes !== void 0 && !(timeoutMinutes > 0)) return fail("pr land: --timeout must be a positive number of minutes");
     if (opts.expectHead !== void 0) {
@@ -48721,7 +48786,7 @@ ${list}`);
       }
       const repoArgs = o.repo ? ["--repo", o.repo] : [];
       const startingPath = (await execFileP("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
-      assertPrMergeHousekeepingClean(startingPath || process.cwd(), "pr land", { force: o.force });
+      reportPrMergeHousekeeping(startingPath || process.cwd(), "pr land", { force: o.force });
       const landRepoForGuard = await resolveRepo(o.repo).catch(() => void 0) ?? o.repo;
       const landClosingGuardInput = await withAlreadyClosedCommitTargets(
         await readClosingGuardInput(number, repoArgs, landRepoForGuard, "pr land"),
@@ -48816,7 +48881,11 @@ ${list}`);
             log: (message2) => console.warn(message2),
             // `pr land` inherits the same (raised) checks budget, so it needs the same liveness — otherwise the
             // 30m wait is SILENT and reads exactly like the hang #2940 was filed about, only three times longer.
-            progress: ({ state, elapsedMs, remainingMs }) => console.warn(`pr land: waiting on checks \u2014 ${state}, ${Math.round(elapsedMs / 1e3)}s elapsed, ${Math.round(remainingMs / 6e4)}m left`)
+            progress: ({ state, elapsedMs, remainingMs }) => (
+              // #8797: the wait counts only required checks; an aggregator like `gate` appears only after its
+              // needs finish, so "no-checks-reported" there means CI is still running, not that nothing ran.
+              console.warn(`pr land: waiting on checks \u2014 ${state === "no-checks-reported" ? "required check not created yet (CI running)" : state}, ${Math.round(elapsedMs / 1e3)}s elapsed, ${Math.round(remainingMs / 6e4)}m left`)
+            )
           });
         },
         // #2425: re-probe used ONLY to decide whether a failed `gh pr merge --auto` is worth retrying — a
@@ -48950,7 +49019,7 @@ ${list}`);
     }
     if (entries.some((e) => e.outcome !== "merged" && e.outcome !== "queued")) 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); on a merge-queue base use `pr land <n> [<n>...]` instead (#8322) \u2014 this verb is refused there except for train PRs").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").option("--without-review <reason>", "compatibility option; shared merge helpers do not require a review verdict")).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); on a merge-queue base use `pr land <n> [<n>...]` instead (#8322) \u2014 this verb is refused there except for train PRs").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", "silence the leftover-scratch warning (scratch never blocks, #8785) and acknowledge a negated-closing-keyword (#3718) or ambiguous-cross-repo-closing (#4279) refusal").option("--without-review <reason>", "compatibility option; shared merge helpers do not require a review verdict")).action(async (number, o) => {
     const method = o.rebase ? "--rebase" : o.merge ? "--merge" : "--squash";
     const repoArgs = o.repo ? ["--repo", o.repo] : [];
     if (o.disableAuto) {
@@ -49010,7 +49079,7 @@ ${list}`);
       assertRemoteBranchPreservedOnMerge(repoForPostCleanup, repoSettings.deleteBranchOnMerge);
     }
     const startingPath = (await execFileP("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
-    const housekeeping = assertPrMergeHousekeepingClean(startingPath || process.cwd(), "pr merge", { force: o.force });
+    const housekeeping = reportPrMergeHousekeeping(startingPath || process.cwd(), "pr merge", { force: o.force });
     const beforeWorktreesRead = await execFileP("git", ["worktree", "list", "--porcelain"], { timeout: GIT_TIMEOUT_MS }).then((r) => ({ state: "ok", stdout: r.stdout })).catch((e) => ({ state: "failed", error: e.message || "git worktree list failed" }));
     let beforeWorktrees = beforeWorktreesRead.state === "ok" ? parseGitWorktreePorcelain(beforeWorktreesRead.stdout) : [];
     const cwdRepo = repoFromRemoteUrl(await gitOut(["remote", "get-url", "origin"]).catch(() => ""));

package/dist/runbook-sweep.cjs

@@ -5827,6 +5827,7 @@ function registryRepoKey(repo) {
 // src/ci-audit.ts
 var HUB_REPO4 = "mutmutco/MMI-Hub";
 var DEV_STAGE_STALE_TOLERANCE_MS = 30 * 60 * 1e3;
+var PENDING_LANDING_STALL_MS = 15 * 60 * 1e3;
 function collectRegistryRepos(projects) {
   const seen = /* @__PURE__ */ new Map();
   for (const project of projects) {

package/package.json

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