merge-steward 0.9.2 → 0.9.4

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.js

@@ -274,6 +274,7 @@ export class MergeStewardService {
         const entry = this.store.getEntryByPR(this.config.repoId, prNumber);
         if (entry) {
             this.store.transition(entry.id, "merged");
+            this.invalidateDownstreamOf(entry);
             this.logger.info({ prNumber, entryId: entry.id }, "External merge acknowledged");
         }
     }

package/package.json

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