merge-steward 0.9.0 → 0.9.2

package/dist/github/shell-git.js

@@ -115,7 +115,7 @@ export class ShellGitOperations {
         // PR branches are always remote refs — use explicit origin/ prefix
         // because git DWIM doesn't reliably resolve bare names in worktrees.
         const mergeRef = prBranch.startsWith("origin/") ? prBranch : `origin/${prBranch}`;
-        const mergeArgs = ["merge", "--no-ff"];
+        const mergeArgs = ["merge", "--no-ff", "-X", "patience"];
         if (mergeMessage)
             mergeArgs.push("-m", mergeMessage);
         mergeArgs.push(mergeRef);

package/dist/service.d.ts

@@ -67,6 +67,12 @@ export declare class MergeStewardService {
     updateHeadByPR(prNumber: number, headSha: string): void;
     /** Acknowledge an external merge (webhook: PR merged outside queue). */
     acknowledgeExternalMerge(prNumber: number): void;
+    /**
+     * Reset all active entries positioned after the given entry to preparing_head
+     * with clean spec/CI state. Prevents downstream specs that included the
+     * dequeued entry's changes from being merged to main.
+     */
+    private invalidateDownstreamOf;
     private runTick;
     private scheduleNextTick;
     private describeMainBroken;

package/dist/service.js

@@ -127,6 +127,7 @@ export class MergeStewardService {
         if (!entry)
             return false;
         this.store.dequeue(entryId);
+        this.invalidateDownstreamOf(entry);
         this.logger.info({ entryId, prNumber: entry.prNumber }, "Entry dequeued");
         return true;
     }
@@ -252,6 +253,7 @@ export class MergeStewardService {
         const entry = this.store.getEntryByPR(this.config.repoId, prNumber);
         if (entry) {
             this.store.dequeue(entry.id);
+            this.invalidateDownstreamOf(entry);
             this.logger.info({ prNumber, entryId: entry.id }, "PR dequeued");
         }
     }
@@ -275,6 +277,29 @@ export class MergeStewardService {
             this.logger.info({ prNumber, entryId: entry.id }, "External merge acknowledged");
         }
     }
+    /**
+     * Reset all active entries positioned after the given entry to preparing_head
+     * with clean spec/CI state. Prevents downstream specs that included the
+     * dequeued entry's changes from being merged to main.
+     */
+    invalidateDownstreamOf(removedEntry) {
+        const allActive = this.store.listActive(this.config.repoId);
+        let invalidated = 0;
+        for (const downstream of allActive) {
+            if (downstream.position <= removedEntry.position)
+                continue;
+            if (TERMINAL_STATUSES.includes(downstream.status))
+                continue;
+            this.store.transition(downstream.id, "preparing_head", {
+                ciRunId: null, ciRetries: 0,
+                specBranch: null, specSha: null, specBasedOn: null,
+            }, `invalidated: entry ${removedEntry.id.slice(0, 8)} dequeued`);
+            invalidated++;
+        }
+        if (invalidated > 0) {
+            this.logger.info({ removedEntryId: removedEntry.id, invalidated }, "Invalidated downstream entries after dequeue");
+        }
+    }
     async runTick() {
         if (this.tickInProgress)
             return false;

package/package.json

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