@mutmutco/cli 3.19.0 → 3.19.1

package/dist/main.cjs

@@ -9222,6 +9222,25 @@ async function mergeAutoWithTransientRetry(prNumber, repo, deps) {
   if (retried.mergeStatus !== "failed") return retried;
   return { mergeStatus: "failed", error: `merge retry after transient failure also failed: ${retried.error ?? first.error ?? "unknown error"}` };
 }
+var AUTO_MERGE_CONFIRM_RETRIES = 3;
+var AUTO_MERGE_CONFIRM_DELAY_MS = 3e3;
+async function confirmAutoMergeEnqueued(deps, options) {
+  const retries = options?.retries ?? AUTO_MERGE_CONFIRM_RETRIES;
+  const delayMs = options?.delayMs ?? AUTO_MERGE_CONFIRM_DELAY_MS;
+  const sleep2 = deps.sleep ?? ((ms) => new Promise((resolve5) => setTimeout(resolve5, ms)));
+  for (let attempt = 0; attempt < retries; attempt++) {
+    if (await deps.readMerged().catch(() => false)) return "merged";
+    const stuck = await deps.readAutoMergeRequest().then((s) => s.trim()).catch(() => "");
+    if (stuck) return "enqueued";
+    if (attempt < retries - 1) {
+      await sleep2(delayMs);
+      await deps.reEnqueue().catch(() => {
+      });
+    }
+  }
+  if (await deps.readMerged().catch(() => false)) return "merged";
+  return "not-stuck";
+}
 async function readGhPrStateWithRetry(fetchState, options) {
   const retries = options?.retries ?? PR_LAND_STATE_READ_RETRIES;
   const delayMs = options?.delayMs ?? PR_LAND_STATE_READ_DELAY_MS;
@@ -21441,7 +21460,20 @@ async function ghMergeAutoEnqueue(prNumber, repo, method) {
   if (!stateRead.ok) {
     return { mergeStatus: "failed", error: `could not read PR state after merge: ${stateRead.error}` };
   }
-  return { mergeStatus: stateRead.state === "MERGED" ? "merged" : "auto-merge-enqueued" };
+  if (stateRead.state === "MERGED") return { mergeStatus: "merged" };
+  const confirmation = await confirmAutoMergeEnqueued({
+    readAutoMergeRequest: async () => (await execFileP2("gh", ["pr", "view", prNumber, ...args, "--json", "autoMergeRequest", "--jq", '.autoMergeRequest // ""'], { timeout: GC_GH_TIMEOUT_MS5 })).stdout,
+    readMerged: async () => {
+      const s = await readMergeState();
+      return s.ok && s.state === "MERGED";
+    },
+    reEnqueue: async () => {
+      await execFileP2("gh", buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: true, deleteBranch }), { timeout: GH_MUTATION_TIMEOUT_MS });
+    }
+  });
+  if (confirmation === "merged") return { mergeStatus: "merged" };
+  if (confirmation === "enqueued") return { mergeStatus: "auto-merge-enqueued" };
+  return { mergeStatus: "failed", error: "auto-merge did not stick \u2014 GitHub reported no autoMergeRequest after enqueue; retry once the PR has a pending check" };
 }
 pr.command("land <number>").description("agent merge path (#1440): train probe \u2192 checks-wait \u2192 merge --auto \u2192 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("--preserve-worktree", "after merge, keep the local PR worktree/stage/branch for an active batch (#1888)").action(async (number, o) => {
   const repoArgs = o.repo ? ["--repo", o.repo] : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.19.0",
+  "version": "3.19.1",
   "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",