@mutmutco/cli 3.45.0 → 3.47.0

package/dist/main.cjs

@@ -14788,6 +14788,9 @@ function deriveHotfixState(f) {
   if (!f.branchExists && !f.pr && !f.tagPushed && !f.releaseExists) {
     return { state: "not-started", next: `mmi-cli hotfix start --from <pr#|sha> (would mint ${f.tag})` };
   }
+  if (!f.pr && !f.branchExists && f.tagPushed && f.releaseExists) {
+    return { state: "complete", next: "nothing \u2014 that version is a completed release, not a hotfix in flight" };
+  }
   if (!f.pr) {
     return { state: "branch-pushed (no PR)", next: `mmi-cli hotfix start --from <pr#|sha> (resumes at the PR step for ${f.tag})` };
   }
@@ -20428,13 +20431,46 @@ async function pollGhPrChecks(prNumber, repoArgs) {
   }
   return state;
 }
-async function ghMergeAutoEnqueue(prNumber, repo, method) {
+function ghFailureReason(e) {
+  const err = e;
+  const head = String(err?.message ?? "").split("\n")[0]?.trim() ?? "";
+  const detail = `${err?.stderr ?? ""}
+${err?.stdout ?? ""}`.split("\n").map((line) => line.trim()).find((line) => line.length > 0);
+  if (detail && head) return `${head} \u2014 ${detail}`;
+  return detail || head || "unknown error";
+}
+var defaultGhMergeAutoIo = {
+  gh: async (args, timeoutMs) => (await execFileP2("gh", args, { timeout: timeoutMs })).stdout
+};
+async function ghMergeAutoEnqueue(prNumber, repo, method, io = defaultGhMergeAutoIo) {
   const args = repo ? ["--repo", repo] : [];
-  const headRef = (await execFileP2("gh", ["pr", "view", prNumber, ...args, "--json", "headRefName", "--jq", ".headRefName"], { timeout: GC_GH_TIMEOUT_MS2 }).catch(() => ({ stdout: "" }))).stdout.trim();
+  const headRef = (await io.gh(["pr", "view", prNumber, ...args, "--json", "headRefName", "--jq", ".headRefName"], GC_GH_TIMEOUT_MS2).catch(() => "")).trim();
   const deleteBranch = !isProtectedBranch(headRef);
-  const readMergeState = () => readGhPrStateWithRetry(async () => (await execFileP2("gh", ["pr", "view", prNumber, ...args, "--json", "state", "--jq", ".state"], { timeout: GC_GH_TIMEOUT_MS2 })).stdout);
+  const readMergeState = () => readGhPrStateWithRetry(
+    () => io.gh(["pr", "view", prNumber, ...args, "--json", "state", "--jq", ".state"], GC_GH_TIMEOUT_MS2)
+  );
+  const confirmEnqueueOutcome = async () => {
+    const stateRead = await readMergeState();
+    if (!stateRead.ok) {
+      return { mergeStatus: "failed", error: `could not read PR state after merge: ${stateRead.error}` };
+    }
+    if (stateRead.state === "MERGED") return { mergeStatus: "merged" };
+    const confirmation = await confirmAutoMergeEnqueued({
+      readAutoMergeRequest: async () => io.gh(["pr", "view", prNumber, ...args, "--json", "autoMergeRequest", "--jq", '.autoMergeRequest // ""'], GC_GH_TIMEOUT_MS2),
+      readMerged: async () => {
+        const s = await readMergeState();
+        return s.ok && s.state === "MERGED";
+      },
+      reEnqueue: async () => {
+        await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: true, deleteBranch }), 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" };
+  };
   try {
-    await execFileP2("gh", buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: true, deleteBranch }), { timeout: GH_MUTATION_TIMEOUT_MS });
+    await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: true, deleteBranch }), GH_MUTATION_TIMEOUT_MS);
   } catch (e) {
     const message = String(e.message || "");
     if (/already been merged/i.test(message)) return { mergeStatus: "merged" };
@@ -20442,50 +20478,51 @@ async function ghMergeAutoEnqueue(prNumber, repo, method) {
     if (note) return { mergeStatus: "failed", error: note };
     if (mergeAutoRejectedPrAlreadyClean(message)) {
       try {
-        await execFileP2("gh", buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: false, deleteBranch }), { timeout: GH_MUTATION_TIMEOUT_MS });
+        await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: false, deleteBranch }), GH_MUTATION_TIMEOUT_MS);
       } catch (e2) {
         const m2 = String(e2.message || "");
         if (/already been merged/i.test(m2)) return { mergeStatus: "merged" };
-        if (!ghPrMergeLocalBranchDeleteWarning(m2)) return { mergeStatus: "failed", error: m2.split("\n")[0] };
+        if (!ghPrMergeLocalBranchDeleteWarning(m2)) {
+          const afterDirect = await readMergeState();
+          if (afterDirect.ok && afterDirect.state === "MERGED") return { mergeStatus: "merged" };
+          if (!afterDirect.ok) {
+            return { mergeStatus: "failed", error: `could not confirm PR state after clean-status fallback: ${afterDirect.error}` };
+          }
+          try {
+            await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: true, deleteBranch }), GH_MUTATION_TIMEOUT_MS);
+          } catch (e3) {
+            const m3 = String(e3.message || "");
+            if (/already been merged/i.test(m3)) return { mergeStatus: "merged" };
+            const afterRetry = await readMergeState();
+            if (afterRetry.ok && afterRetry.state === "MERGED") return { mergeStatus: "merged" };
+            const stuck = (await io.gh(["pr", "view", prNumber, ...args, "--json", "autoMergeRequest", "--jq", '.autoMergeRequest // ""'], GC_GH_TIMEOUT_MS2).catch(() => "")).trim();
+            if (stuck) return { mergeStatus: "auto-merge-enqueued" };
+            return { mergeStatus: "failed", error: `${ghFailureReason(e2)} (re-enqueue also failed: ${ghFailureReason(e3)})` };
+          }
+          return confirmEnqueueOutcome();
+        }
       }
-      const stateRead2 = await readMergeState();
-      if (stateRead2.ok && stateRead2.state === "MERGED") return { mergeStatus: "merged" };
+      const stateRead = await readMergeState();
+      if (stateRead.ok && stateRead.state === "MERGED") return { mergeStatus: "merged" };
       return {
         mergeStatus: "failed",
-        error: stateRead2.ok ? "direct merge did not land after clean-status fallback" : `could not confirm PR state after clean-status fallback: ${stateRead2.error}`
+        error: stateRead.ok ? "direct merge did not land after clean-status fallback" : `could not confirm PR state after clean-status fallback: ${stateRead.error}`
       };
     }
     if (ghPrMergeLocalBranchDeleteWarning(message)) {
-      const stateRead2 = await readMergeState();
-      if (stateRead2.ok && stateRead2.state === "MERGED") return { mergeStatus: "merged" };
+      const stateRead = await readMergeState();
+      if (stateRead.ok && stateRead.state === "MERGED") return { mergeStatus: "merged" };
       return {
         mergeStatus: "failed",
-        error: stateRead2.ok ? message.split("\n")[0] : `could not confirm PR state after local branch cleanup warning: ${stateRead2.error}`
+        error: stateRead.ok ? message.split("\n")[0] : `could not confirm PR state after local branch cleanup warning: ${stateRead.error}`
       };
     }
     if (!basePolicyBlocksImmediateMerge(message)) {
-      return { mergeStatus: "failed", error: message.split("\n")[0] };
+      return { mergeStatus: "failed", error: ghFailureReason(e) };
     }
-    return { mergeStatus: "failed", error: `merge blocked: ${message.split("\n")[0]} \u2014 ensure checks are green` };
+    return { mergeStatus: "failed", error: `merge blocked: ${ghFailureReason(e)} \u2014 ensure checks are green` };
   }
-  const stateRead = await readMergeState();
-  if (!stateRead.ok) {
-    return { mergeStatus: "failed", error: `could not read PR state after merge: ${stateRead.error}` };
-  }
-  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_MS2 })).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" };
+  return confirmEnqueueOutcome();
 }
 async function remoteBranchExists2(branch, options = {}) {
   return checkRemoteBranchExists(branch, {

package/package.json

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