@mutmutco/cli 4.5.135 → 4.5.136

package/dist/main.cjs

@@ -17509,6 +17509,7 @@ function assertGitBashOnWindowsForJervHubRelease(repo, platform2 = process.platf
 
 // src/train-apply-correlation.ts
 var import_node_fs19 = require("node:fs");
+init_github_quota();
 var import_node_path17 = require("node:path");
 
 // src/fleet-lockstep-enforce.ts
@@ -18274,10 +18275,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.135",
-    tag: "v4.5.135",
-    commit: "2ae28f97dd36",
-    npm: "@mutmutco/cli@4.5.135"
+    version: "4.5.136",
+    tag: "v4.5.136",
+    commit: "642526387569",
+    npm: "@mutmutco/cli@4.5.136"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -18294,14 +18295,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.5.135"
+          v3Target: "v4.5.136"
         }
       ],
       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.135 and redeploy the Hub Lambda from tag v4.5.135 (2ae28f97dd36); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.5.135 (@mutmutco/cli@4.5.135, tag commit 2ae28f97dd36 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.5.136 and redeploy the Hub Lambda from tag v4.5.136 (642526387569); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.5.136 (@mutmutco/cli@4.5.136, tag commit 642526387569 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -20419,11 +20420,22 @@ async function loadReleaseTrackBranchHints(deps) {
   ]);
   return { hasDevelopmentBranch, hasMainBranch, hasRcBranch };
 }
+async function readTrainLogin(deps, waitMs = 18e4, attempts = 5) {
+  for (let i = 1; ; i++) {
+    try {
+      return requireValue(clean2(await deps.run("gh", ["api", "user", "--jq", ".login"])), "GitHub login");
+    } catch (e) {
+      if (i >= attempts || !isRateLimitText(e instanceof Error ? e.message : String(e))) throw e;
+      deps.warn?.(`GitHub login read rate-limited; retrying in ${waitMs / 6e4} min (${i}/${attempts - 1})`);
+      await resolveSleep(deps)(waitMs);
+    }
+  }
+}
 async function buildTrainApplyContext(deps) {
   const repo = requireValue(clean2(await deps.run("gh", ["repo", "view", "--json", "nameWithOwner", "--jq", ".nameWithOwner"])), "repo");
   const [owner, name] = repo.split("/");
   if (!owner || !name) throw new Error(`repo must be owner/name, got ${repo}`);
-  const login = requireValue(clean2(await deps.run("gh", ["api", "user", "--jq", ".login"])), "GitHub login");
+  const login = await readTrainLogin(deps);
   const verdict = await deps.trainAuthority(repo);
   if (!verdict.ok) throw new Error(`${commandAuthorityLabel(owner)}: train authority could not be verified (${verdict.error})`);
   if (!verdict.train) {
@@ -22443,7 +22455,7 @@ async function runTenantRedeploy(deps, options) {
   const repo = options.repo;
   const [owner, name] = repo.split("/");
   if (!owner || !name) throw new Error(`repo must be owner/name, got ${repo}`);
-  const login = requireValue(clean2(await deps.run("gh", ["api", "user", "--jq", ".login"])), "GitHub login");
+  const login = await readTrainLogin(deps);
   const verdict = await deps.trainAuthority(repo);
   if (!verdict.ok) throw new Error(`${commandAuthorityLabel(owner)}: train authority could not be verified (${verdict.error})`);
   if (!verdict.train) throw new Error(`${commandAuthorityLabel(owner)}: @${login} is ${verdict.role} \u2014 no train authority on ${repo}`);
@@ -39845,6 +39857,7 @@ function boardAdvanceFailureMessage(result) {
 }
 
 // src/pr-land.ts
+var PR_LAND_QUEUE_TIMEOUT_MS = 45 * 6e4;
 function prHeadBehindBase(input) {
   if ((input.mergeStateStatus ?? "").toUpperCase() === "BEHIND") return true;
   return /out[- ]of[- ]date|not up to date|up to date with the base|update (?:the|your) branch/i.test(input.message ?? "");
@@ -39968,6 +39981,17 @@ async function runPrLand(prNumber, options, deps) {
   }
   const ciPolicy = await deps.resolveCiPolicy(repo);
   base.ciPolicy = ciPolicy;
+  const hasQueue = await deps.hasMergeQueue?.(repo, resolved.base) ?? false;
+  let queueSnapshot;
+  if (hasQueue) {
+    base.mergeQueue = { base: resolved.base, state: "queued" };
+    if (!deps.readMergeQueue) throw new Error("merge queue reader unavailable");
+    queueSnapshot = await deps.readMergeQueue(prNumber, repo);
+    if (queueSnapshot.isInMergeQueue || queueSnapshot.state === "MERGED") {
+      base.mergeStatus = "auto-merge-enqueued";
+      return pollPrMergeQueue(prNumber, options, deps, base, queueSnapshot);
+    }
+  }
   const checksWaitError = (checksWait) => {
     if (checksWait.status === "conflicting") {
       return `checks-wait conflicting: ${checksWait.reason ?? "PR is conflicting with the base branch"}`;
@@ -40003,6 +40027,14 @@ async function runPrLand(prNumber, options, deps) {
   if (merge.mergeStatus === "failed") {
     return { ...base, error: merge.error ?? "merge failed" };
   }
+  if (hasQueue) {
+    if (merge.mergeStatus === "merged") {
+      return queueMerged(base, deps);
+    }
+    const deadline = (deps.now ?? (() => Date.now()))() + PR_LAND_QUEUE_TIMEOUT_MS;
+    await (deps.sleep ?? ((ms) => new Promise((resolve8) => setTimeout(resolve8, ms))))(PR_LAND_POLL_MS);
+    return pollPrMergeQueue(prNumber, options, deps, base, void 0, deadline);
+  }
   if (merge.mergeStatus === "merged") {
     return {
       ...base,
@@ -40025,6 +40057,53 @@ async function runPrLand(prNumber, options, deps) {
     error: "auto-merge enqueued but PR did not reach MERGED within timeout \u2014 poll manually with gh pr view"
   };
 }
+function queueMerged(base, deps) {
+  const result = {
+    ...base,
+    status: "merged-via-queue",
+    mergeStatus: "merged",
+    mergeQueue: { ...base.mergeQueue, state: "merged" },
+    branchFinality: prLandedBranchFinality(base.pr, base.base)
+  };
+  deps.queueProgress?.(result);
+  return result;
+}
+async function pollPrMergeQueue(pr, options, deps, base, snapshot, deadlineMs) {
+  const now = deps.now ?? (() => Date.now());
+  const sleep2 = deps.sleep ?? ((ms) => new Promise((resolve8) => setTimeout(resolve8, ms)));
+  const deadline = deadlineMs ?? now() + PR_LAND_QUEUE_TIMEOUT_MS;
+  while (now() < deadline) {
+    const read = snapshot ?? await deps.readMergeQueue(pr, base.repo);
+    snapshot = void 0;
+    if (read.state === "MERGED") return queueMerged(base, deps);
+    if (read.isInMergeQueue) {
+      base.mergeQueue = {
+        base: base.base,
+        state: "queued",
+        ...read.mergeQueueEntry ? { position: read.mergeQueueEntry.position, entryState: read.mergeQueueEntry.state } : {}
+      };
+      deps.queueProgress?.(base);
+      if (options.enqueueOnly) return { ...base, status: "queued" };
+    } else if (read.state === "OPEN" && !read.autoMergeRequest) {
+      const run = await deps.findMergeGroupRun(pr, base.repo, base.base);
+      const result2 = {
+        ...base,
+        mergeQueue: { ...base.mergeQueue, state: "ejected", ...run ? { ejectedRun: run } : {} },
+        error: `merge queue ejected PR #${pr} \u2014 ${run ? `merge_group run ${run.id} ${run.conclusion} ${run.url}` : "merge_group run not found"}`
+      };
+      deps.queueProgress?.(result2);
+      return result2;
+    }
+    await sleep2(PR_LAND_POLL_MS);
+  }
+  const result = {
+    ...base,
+    mergeQueue: { ...base.mergeQueue, state: "timeout" },
+    error: "merge queue did not reach MERGED within 45 minutes \u2014 rerun pr land to resume polling"
+  };
+  deps.queueProgress?.(result);
+  return result;
+}
 
 // src/test-policy-core.ts
 var import_node_child_process13 = require("node:child_process");
@@ -41085,18 +41164,19 @@ async function ghMergeAutoEnqueue(prNumber, repo, method, extra) {
     bodyText: method === "--squash" ? extra?.bodyText : void 0
   });
   try {
-    return await mergeAutoEnqueueWithBody(prNumber, args, method, io, overrideBody?.path);
+    return await mergeAutoEnqueueWithBody(prNumber, args, method, io, overrideBody?.path, extra?.mergeQueue);
   } finally {
     overrideBody?.cleanup();
   }
 }
-async function mergeAutoEnqueueWithBody(prNumber, args, method, io, bodyFile) {
+async function mergeAutoEnqueueWithBody(prNumber, args, method, io, bodyFile, mergeQueue = false) {
   const headRef = (await io.gh(["pr", "view", prNumber, ...args, "--json", "headRefName", "--jq", ".headRefName"], GC_GH_TIMEOUT_MS).catch(() => "")).trim();
   const deleteBranch = !isProtectedBranch(headRef);
   const readMergeState = () => readGhPrStateWithRetry(
     () => io.gh(["pr", "view", prNumber, ...args, "--json", "state", "--jq", ".state"], GC_GH_TIMEOUT_MS)
   );
   const confirmEnqueueOutcome = async () => {
+    if (mergeQueue) return { mergeStatus: "auto-merge-enqueued" };
     const stateRead = await readMergeState();
     if (!stateRead.ok) {
       return { mergeStatus: "failed", error: `could not read PR state after merge: ${stateRead.error}` };
@@ -41872,6 +41952,57 @@ function applyChecklistCheck(body, query, checked) {
   return { ok: true, edit: setChecklistMarker(body, sel.item, checked), item: sel.item };
 }
 
+// src/pr-merge-queue.ts
+init_cli_shared();
+var readApi = async (args) => {
+  const env = await ghReadEnv();
+  return (await execFileP("gh", ["api", ...args], {
+    timeout: 2e4,
+    ...env ? { env } : {}
+  })).stdout;
+};
+async function queueGraphql(repo, fields, gh2) {
+  const [owner, name] = repo.split("/");
+  const response = JSON.parse(await gh2(["graphql", "-f", `query=query { repository(owner:${JSON.stringify(owner)},name:${JSON.stringify(name)}) { ${fields} } }`]));
+  if (response.errors?.length) throw new Error(response.errors.map((e) => e.message).join("; "));
+  if (!response.data?.repository) throw new Error("merge queue repository read failed");
+  return response.data.repository;
+}
+async function hasPrMergeQueue(repo, base, gh2 = readApi) {
+  const result = await queueGraphql(repo, `mergeQueue(branch:${JSON.stringify(base)}) { id }`, gh2);
+  return result.mergeQueue !== null;
+}
+async function readPrMergeQueue(pr, repo, gh2 = readApi) {
+  if (!/^\d+$/.test(pr)) throw new Error("merge queue read requires a PR number");
+  const result = await queueGraphql(
+    repo,
+    `pullRequest(number:${pr}) { state isInMergeQueue mergeQueueEntry { state position } autoMergeRequest { enabledAt } }`,
+    gh2
+  );
+  if (!result.pullRequest) throw new Error(`merge queue PR #${pr} not found`);
+  return result.pullRequest;
+}
+async function findPrMergeGroupRun(pr, repo, base, gh2 = readApi) {
+  const pages = JSON.parse(await gh2([`repos/${repo}/actions/runs?event=merge_group&per_page=100`, "--paginate", "--slurp"]));
+  const prefix = `gh-readonly-queue/${base}/pr-${pr}-`;
+  const run = pages.flatMap((page) => page.workflow_runs).filter((run2) => run2.head_branch?.startsWith(prefix)).sort((a, b) => b.created_at.localeCompare(a.created_at) || b.id - a.id)[0];
+  return run ? { id: run.id, url: run.html_url, conclusion: run.conclusion } : void 0;
+}
+function prMergeQueueLine(result) {
+  const queue = result.mergeQueue;
+  if (!queue) return void 0;
+  switch (queue.state) {
+    case "queued":
+      return `pr land: PR #${result.pr} queued on ${queue.base}${queue.position === void 0 ? "" : ` (position ${queue.position})`}`;
+    case "merged":
+      return `pr land: PR #${result.pr} merged via merge queue`;
+    case "ejected":
+      return `pr land: PR #${result.pr} ejected from merge queue \u2014 ${queue.ejectedRun ? `merge_group run ${queue.ejectedRun.id} ${queue.ejectedRun.conclusion} ${queue.ejectedRun.url}` : "merge_group run not found"}`;
+    case "timeout":
+      return `pr land: PR #${result.pr} merge queue timeout on ${queue.base}`;
+  }
+}
+
 // src/command-register-collaboration.ts
 init_github_client();
 init_github_quota();
@@ -46819,7 +46950,7 @@ ${list}`);
   }
   class PrHeadBehindBaseError extends Error {
   }
-  pr.command("land <number>").description("agent merge path (#1440): train probe \u2014 checks-wait \u2014 merge --auto \u2014 poll enqueued \u2014 development PRs only").option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the PR repo)").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").action(async (number, o) => {
+  pr.command("land <number>").description("agent merge path (#1440): train probe \u2014 checks-wait \u2014 merge --auto \u2014 poll enqueued \u2014 development PRs only").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").action(async (number, o) => {
     if (/^(?:[^/]+\/[^/]+)?#\d+$/.test(number.trim())) {
       try {
         const parsed = parseIssueRef(number, o.repo);
@@ -46854,7 +46985,14 @@ ${list}`);
       return;
     }
     if (landClosingGuardVerdict.message) console.warn(landClosingGuardVerdict.message);
-    const result = await runPrLand(number, { repo: o.repo, requireTrain: o.requireTrain !== false }, {
+    let mergeQueueEnabled = false;
+    const result = await runPrLand(number, { repo: o.repo, requireTrain: o.requireTrain !== false, enqueueOnly: o.enqueueOnly }, {
+      hasMergeQueue: async (repo, base) => mergeQueueEnabled = await hasPrMergeQueue(repo, base),
+      readMergeQueue: readPrMergeQueue,
+      findMergeGroupRun: findPrMergeGroupRun,
+      queueProgress: (receipt) => {
+        if (!o.json) printLine(prMergeQueueLine(receipt));
+      },
       resolveRepo: async (prNumber, repoOpt) => {
         const knownRepo = repoOpt ?? await resolveRepo(o.repo).catch(() => void 0) ?? o.repo;
         let repoFromGh = "";
@@ -46944,7 +47082,8 @@ ${list}`);
       },
       mergeAuto: (prNumber, repo) => ghMergeAutoEnqueue(prNumber, repo, "--squash", {
         allowedClosing: landClosingGuardInput?.closing,
-        bodyText: landSquashBody
+        bodyText: landSquashBody,
+        mergeQueue: mergeQueueEnabled
       }),
       updateBranch: (prNumber, repo) => prLandUpdateBranch(prNumber, repo, Boolean(o.repo)),
       pollMerged: async (prNumber, repo, deadlineMs) => {
@@ -46968,7 +47107,7 @@ ${list}`);
         return false;
       }
     });
-    if (result.status !== "failed") {
+    if (result.status !== "failed" && result.status !== "queued") {
       const boardAdvance = await advanceClosedIssuesToDone2(number, result.repo);
       const crossRepoFilingIssue = result.repo ? await reconcileCrossRepoFilingIssue(defaultGitHubClient(), result.repo, Number(number)) : { status: "failed", error: "could not resolve the PR repo for cross-repo filing-issue reconciliation" };
       const recovery = result.repo ? buildPostMergeReconRecovery({
@@ -47620,7 +47759,13 @@ function trainApplyDeps() {
     // Slack release announcement (#883/#6521/#6523): the org alerts channel for the Hub, the project's own
     // registry releaseChannel META for a product repo — best-effort inside announceRelease itself.
     announce: (args) => announceRelease({
-      run: async (file, cmdArgs) => (await execFileP(file, cmdArgs, { timeout: GH_TRAIN_TIMEOUT_MS })).stdout,
+      // #8236: the announcement reads an already-PUBLISHED Release, so its `release view` rides the App
+      // read pool like the train's other reads (#8030), never the owner's personal REST quota. Scoped
+      // here, not in isAppRoutableGhReadArgs: other train paths may view a draft the App cannot see.
+      run: async (file, cmdArgs) => {
+        const env = file === "gh" && (cmdArgs[0] === "release" && cmdArgs[1] === "view" || isAppRoutableGhReadArgs(cmdArgs)) ? await ghReadEnv() : void 0;
+        return (await execFileP(file, cmdArgs, { timeout: GH_TRAIN_TIMEOUT_MS, ...env ? { env } : {} })).stdout;
+      },
       postAnnouncement: async (payload) => {
         const res = await releaseAnnouncement(payload, registryClientDeps(await loadConfig()));
         const body = res.body;
@@ -50919,7 +51064,8 @@ var surfaces_default = {
           ],
           outputs: [
             "cli/dist/index.cjs",
-            "cli/dist/main.cjs"
+            "cli/dist/main.cjs",
+            "cli/dist/runbook-sweep.cjs"
           ]
         }
       ],

package/dist/runbook-sweep.cjs

@@ -923,6 +923,9 @@ function clean(out) {
 }
 var HUB_REPO = "mutmutco/MMI-Hub";
 
+// src/train-apply-correlation.ts
+init_github_quota();
+
 // src/fleet-lockstep-enforce.ts
 init_github_client();
 init_clean_exit();

package/package.json

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