merge-steward 0.9.4 → 0.9.5

package/dist/reconciler.js

@@ -52,7 +52,7 @@ export async function reconcile(ctx) {
                 });
                 await cleanupSpec(ctx, entry);
                 ctx.store.transition(entry.id, "preparing_head", {
-                    ...CLEAN_CI, ...CLEAN_SPEC,
+                    ...CLEAN_CI, ...CLEAN_SPEC, retryAttempts: 0, lastFailedBaseSha: null,
                 }, `stale dependency ${dep?.status ?? "removed"}`);
                 continue;
             }
@@ -151,7 +151,7 @@ async function prepareEntry(ctx, entry, isHead, prevEntry) {
         // Gate: main CI must be green.
         if (ctx.ci.getMainStatus) {
             const mainStatus = await ctx.ci.getMainStatus(ctx.baseBranch);
-            if (mainStatus === "fail") {
+            if (mainStatus !== "pass") {
                 let mainChecks = [];
                 try {
                     mainChecks = await ctx.github.listChecksForRef(ref(ctx, ctx.baseBranch));
@@ -368,6 +368,15 @@ async function mergeHead(ctx, entry) {
     catch {
         // Can't verify — proceed and let push fail if needed.
     }
+    // Final main health check — don't push to a broken main.
+    if (ctx.ci.getMainStatus) {
+        const mainStatus = await ctx.ci.getMainStatus(ctx.baseBranch);
+        if (mainStatus !== "pass") {
+            emit(ctx, entry, "main_broken", { detail: "main unhealthy at merge time, re-preparing" });
+            ctx.store.transition(entry.id, "preparing_head", { ...CLEAN_CI, ...CLEAN_SPEC }, "main unhealthy at merge time");
+            return;
+        }
+    }
     // Push the spec branch to main (fast-forward).
     try {
         await ctx.git.push(entry.specBranch, false, ctx.baseBranch);
@@ -406,7 +415,7 @@ async function invalidateDownstream(ctx, allActive, afterIndex) {
             continue;
         emit(ctx, downstream, "invalidated", { detail: `base changed after position ${afterIndex}` });
         await cleanupSpec(ctx, downstream);
-        ctx.store.transition(downstream.id, "preparing_head", { ...CLEAN_CI, ...CLEAN_SPEC }, "invalidated: base changed");
+        ctx.store.transition(downstream.id, "preparing_head", { ...CLEAN_CI, ...CLEAN_SPEC, retryAttempts: 0, lastFailedBaseSha: null }, "invalidated: base changed");
     }
 }
 async function cleanupSpec(ctx, entry) {

package/dist/service.js

@@ -291,9 +291,13 @@ export class MergeStewardService {
                 continue;
             if (TERMINAL_STATUSES.includes(downstream.status))
                 continue;
+            if (downstream.specBranch) {
+                this.specBuilder.deleteSpeculative(downstream.specBranch).catch(() => { });
+            }
             this.store.transition(downstream.id, "preparing_head", {
                 ciRunId: null, ciRetries: 0,
                 specBranch: null, specSha: null, specBasedOn: null,
+                retryAttempts: 0, lastFailedBaseSha: null,
             }, `invalidated: entry ${removedEntry.id.slice(0, 8)} dequeued`);
             invalidated++;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-steward",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
   "type": "module",
   "repository": {