merge-steward 0.9.1 → 0.9.3

package/dist/reconciler.js

@@ -38,6 +38,25 @@ export async function reconcile(ctx) {
         // Truth guard: verify entry against GitHub before processing.
         if (await sanitizeEntry(ctx, entry))
             continue;
+        // Stale dependency guard: if this entry's spec was built on top of
+        // another entry that was dequeued or evicted (without downstream
+        // invalidation), the spec is contaminated with the removed entry's
+        // changes. Reset so it rebuilds on the correct base next tick.
+        // Exclude "merged" — a merged dependency means main advanced to its
+        // spec, so our cumulative spec is still valid (speculative consistency).
+        if (entry.specBasedOn) {
+            const dep = ctx.store.getEntry(entry.specBasedOn);
+            if (!dep || dep.status === "dequeued" || dep.status === "evicted") {
+                emit(ctx, entry, "invalidated", {
+                    detail: `dependency ${entry.specBasedOn} is ${dep?.status ?? "removed"}`,
+                });
+                await cleanupSpec(ctx, entry);
+                ctx.store.transition(entry.id, "preparing_head", {
+                    ...CLEAN_CI, ...CLEAN_SPEC,
+                }, `stale dependency ${dep?.status ?? "removed"}`);
+                continue;
+            }
+        }
         const isHead = i === 0;
         const prevEntry = i > 0 ? ctx.store.getEntry(allActive[i - 1].id) ?? null : null;
         const phase = entry.status;

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.1",
+  "version": "0.9.3",
   "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
   "type": "module",
   "repository": {