@mutmutco/cli 3.105.5 → 3.105.7

package/dist/main.cjs

@@ -29109,6 +29109,21 @@ function derivePollState(buckets) {
   if (anyFailure) return anyPending ? "failing" : "failure";
   return anyPending ? "pending" : "success";
 }
+function partitionByRequired(entries, requiredContexts) {
+  if (!requiredContexts || requiredContexts.size === 0) {
+    return { relevant: entries.map((e) => e.bucket), ignoredFailures: [] };
+  }
+  const relevant = [];
+  const ignoredFailures = [];
+  for (const entry of entries) {
+    if (requiredContexts.has(entry.name)) {
+      relevant.push(entry.bucket);
+    } else if (entry.bucket === "fail") {
+      ignoredFailures.push(entry.name);
+    }
+  }
+  return { relevant, ignoredFailures };
+}
 function parseNdjsonLines(stdout) {
   return stdout.split(/\r?\n/).filter((line) => line.trim()).map((line) => JSON.parse(line));
 }
@@ -29147,17 +29162,22 @@ async function fetchHeadCheckRuns(headSha, repo, gh) {
   const runsOut = await gh(["--paginate", `repos/${repo}/commits/${headSha}/check-runs?per_page=100`, "--jq", ".check_runs[] | {id, name, status, conclusion, app_id: .app.id}"]);
   return dedupeLatestCheckRuns(parseNdjsonLines(runsOut));
 }
-async function fetchHeadCheckBuckets(headSha, repo, gh) {
+async function fetchHeadCheckEntries(headSha, repo, gh) {
   const [runs, statusesOut] = await Promise.all([
     fetchHeadCheckRuns(headSha, repo, gh),
     gh(["--paginate", `repos/${repo}/commits/${headSha}/status?per_page=100`, "--jq", ".statuses[] | {context, state}"])
   ]);
   const statuses = parseNdjsonLines(statusesOut);
-  return [...runs.map(classifyCheckRun), ...statuses.map((s) => classifyCommitStatus(s.state))];
+  return [
+    ...runs.map((run) => ({ name: run.name ?? `check-run ${run.id ?? "unknown"}`, bucket: classifyCheckRun(run) })),
+    ...statuses.map((s) => ({ name: s.context ?? "unknown-status", bucket: classifyCommitStatus(s.state) }))
+  ];
 }
-async function pollRestPrChecks(prNumber, repo, gh = defaultGhApi) {
+async function pollRestPrChecks(prNumber, repo, gh = defaultGhApi, requiredContexts) {
   const snapshot = await fetchRestPrSnapshot(prNumber, repo, gh);
-  return derivePollState(await fetchHeadCheckBuckets(snapshot.headSha, repo, gh));
+  const entries = await fetchHeadCheckEntries(snapshot.headSha, repo, gh);
+  const { relevant } = partitionByRequired(entries, requiredContexts);
+  return derivePollState(relevant);
 }
 async function pollRestPrMergeable(prNumber, repo, gh = defaultGhApi) {
   try {
@@ -29258,6 +29278,37 @@ async function diagnoseFailedRestChecks(prNumber, repo, gh = defaultGhApi) {
     return null;
   }
 }
+function isNotFoundError2(e) {
+  const msg = `${e?.message ?? e} ${String(e?.stderr ?? "")}`;
+  return /HTTP 404|Not Found|\(404\)/i.test(msg);
+}
+async function fetchRequiredCheckContexts(repo, branch, gh = defaultGhApi) {
+  const contexts = /* @__PURE__ */ new Set();
+  try {
+    const raw = await gh([`repos/${repo}/branches/${encodeURIComponent(branch)}/protection/required_status_checks`]);
+    const parsed = JSON.parse(raw);
+    if (Array.isArray(parsed.contexts)) {
+      for (const c of parsed.contexts) if (typeof c === "string") contexts.add(c);
+    }
+  } catch (e) {
+    if (!isNotFoundError2(e)) return null;
+  }
+  try {
+    const raw = await gh([`repos/${repo}/rules/branches/${encodeURIComponent(branch)}`]);
+    const parsed = JSON.parse(raw);
+    if (Array.isArray(parsed)) {
+      for (const rule of parsed) {
+        if (rule.type !== "required_status_checks") continue;
+        for (const check of rule.parameters?.required_status_checks ?? []) {
+          if (check.context) contexts.add(check.context);
+        }
+      }
+    }
+  } catch (e) {
+    if (!isNotFoundError2(e)) return null;
+  }
+  return contexts;
+}
 async function fetchRestCorePool(gh = defaultGhApi) {
   try {
     const parsed = JSON.parse(await gh(["rate_limit"]));
@@ -36786,9 +36837,10 @@ pr.command("checks-wait <number>").description(`bounded wait for PR checks; skip
   const snapshot = await fetchRestPrSnapshot(number, repo).catch(() => null);
   const baseBranch = snapshot?.baseRef ?? "development";
   const ciHeadRef = snapshot && !snapshot.headIsFork && snapshot.headRef ? snapshot.headRef : void 0;
+  const requiredContexts = await fetchRequiredCheckContexts(repo, baseBranch).catch(() => null);
   const result = await waitForPrChecks({
     resolvePolicy: () => resolveMergeCiPolicyForCheckout(o.repo, ciHeadRef),
-    pollChecks: () => pollRestPrChecks(number, repo),
+    pollChecks: () => pollRestPrChecks(number, repo, void 0, requiredContexts),
     pollMergeable: () => pollRestPrMergeable(number, repo),
     pollRateLimit: () => fetchRestCorePool(),
     // #3388: on a confirmed red, read the failing runs' annotations so a wall-clock budget kill stops
@@ -36854,31 +36906,37 @@ pr.command("land <number>").description("agent merge path (#1440): train probe ?
     },
     fetchTrainAuthority: async (repo) => fetchTrainAuthority(repo, registryClientDeps(await loadConfig())),
     resolveCiPolicy: (repo) => resolveRepoMergeCiPolicy(repo, ciAuditDeps()),
-    waitForChecks: (prNumber, repo) => waitForPrChecks({
-      resolvePolicy: () => resolveRepoMergeCiPolicy(repo, ciAuditDeps()),
-      // #3024: REST-only wait loop ? runPrLand's resolveRepo already guarantees `repo` is set.
-      pollChecks: () => pollRestPrChecks(prNumber, repo),
-      // #2970: `pr land` only ever lands PRs based on development (resolveRepo above already rejects any
-      // other base), so the fast-fail message's base branch is always 'development' here.
-      pollMergeable: () => pollRestPrMergeable(prNumber, repo),
-      pollRateLimit: () => fetchRestCorePool(),
-      // #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: () => diagnoseFailedRestChecks(prNumber, repo),
-      baseBranch: "development",
-      sleep: (ms) => new Promise((resolve5) => setTimeout(resolve5, ms)),
-      log: (message) => console.warn(message),
-      // `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 ? ${state}, ${Math.round(elapsedMs / 1e3)}s elapsed, ${Math.round(remainingMs / 6e4)}m left`)
-    }),
+    waitForChecks: async (prNumber, repo) => {
+      const requiredContexts = await fetchRequiredCheckContexts(repo, "development").catch(() => null);
+      return waitForPrChecks({
+        resolvePolicy: () => resolveRepoMergeCiPolicy(repo, ciAuditDeps()),
+        // #3024: REST-only wait loop ? runPrLand's resolveRepo already guarantees `repo` is set.
+        pollChecks: () => pollRestPrChecks(prNumber, repo, void 0, requiredContexts),
+        // #2970: `pr land` only ever lands PRs based on development (resolveRepo above already rejects any
+        // other base), so the fast-fail message's base branch is always 'development' here.
+        pollMergeable: () => pollRestPrMergeable(prNumber, repo),
+        pollRateLimit: () => fetchRestCorePool(),
+        // #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: () => diagnoseFailedRestChecks(prNumber, repo),
+        baseBranch: "development",
+        sleep: (ms) => new Promise((resolve5) => setTimeout(resolve5, ms)),
+        log: (message) => console.warn(message),
+        // `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 ? ${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
     // fresh read of state/mergeable/checks, independent of the merge call's own (possibly stale) error.
+    // #4396: same required-status scoping as the wait loop above ? a non-required red must not read
+    // as "not ready to retry" any more than it should have blocked the wait itself.
     probeMergeReady: async (prNumber, repo) => {
-      const [snapshot, checks] = await Promise.all([
+      const [snapshot, requiredContexts] = await Promise.all([
         fetchRestPrSnapshot(prNumber, repo).catch(() => null),
-        pollRestPrChecks(prNumber, repo).catch(() => "error")
+        fetchRequiredCheckContexts(repo, "development").catch(() => null)
       ]);
+      const checks = await pollRestPrChecks(prNumber, repo, void 0, requiredContexts).catch(() => "error");
       return {
         open: snapshot?.state === "open",
         mergeable: snapshot?.mergeable === "MERGEABLE",
@@ -36961,9 +37019,10 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
   if (o.wait) {
     const repo = await requireRepo(o.repo);
     const baseBranch = await fetchRestPrSnapshot(number, repo).then((s) => s.baseRef).catch(() => "development");
+    const requiredContexts = await fetchRequiredCheckContexts(repo, baseBranch).catch(() => null);
     const wait = await waitForPrChecks({
       resolvePolicy: () => resolveMergeCiPolicyForCheckout(o.repo, ciHeadRef),
-      pollChecks: () => pollRestPrChecks(number, repo),
+      pollChecks: () => pollRestPrChecks(number, repo, void 0, requiredContexts),
       pollMergeable: () => pollRestPrMergeable(number, repo),
       pollRateLimit: () => fetchRestCorePool(),
       diagnoseFailure: () => diagnoseFailedRestChecks(number, repo),

package/package.json

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