merge-steward 0.35.1 → 0.35.2

package/dist/config.js

@@ -14,7 +14,7 @@ export const stewardConfigSchema = z.object({
     maxRetries: z.number().int().min(0).default(2),
     flakyRetries: z.number().int().min(0).default(1),
     /** Max speculative branches to maintain in parallel. 1 = serial mode. */
-    speculativeDepth: z.number().int().min(1).default(10),
+    speculativeDepth: z.number().int().min(1).default(3),
     pollIntervalMs: z.number().int().min(1000).default(30_000),
     reconcileStaleAfterMs: z.number().int().min(1000).default(5 * 60_000),
     server: z.object({

package/dist/install.js

@@ -163,7 +163,7 @@ export async function upsertRepoConfig(options) {
         gitBin: existing?.gitBin ?? "git",
         maxRetries: existing?.maxRetries ?? 2,
         flakyRetries: existing?.flakyRetries ?? 1,
-        speculativeDepth: existing?.speculativeDepth ?? 10,
+        speculativeDepth: existing?.speculativeDepth ?? 3,
         pollIntervalMs: existing?.pollIntervalMs ?? 30_000,
         server: {
             bind: existing?.server.bind ?? (homeConfig.server?.bind ?? "127.0.0.1"),

package/dist/reconciler-validate.js

@@ -13,7 +13,9 @@ async function holdForIntegrationRepair(ctx, entry, allActive, index, checks) {
         .map((check) => check.name)
         .join(", ");
     ctx.store.transition(entry.id, "validating", {
-        candidateKind: "integration",
+        // A failed repaired candidate is still a repaired candidate. Preserve the
+        // provenance so a same-SHA rerun remains gated by integration review.
+        candidateKind: entry.candidateKind === "integration_repair" ? "integration_repair" : "integration",
         ciRunId: entry.ciRunId ?? `head:${entry.candidateSha ?? entry.headSha}`,
         candidateRef,
         candidateSha: entry.candidateSha ?? entry.headSha,
@@ -142,9 +144,21 @@ export async function checkValidation(ctx, entry, allActive, index, isLandingHea
     if (entry.candidateRef && !await ctx.git.isAncestor(entry.headSha, entry.candidateSha)) {
         return;
     }
-    if (entry.candidateRef && entry.candidateKind === "integration" && entry.lastFailedBaseSha && entry.ciRunId) {
-        // The same failed SHA is intentionally quiescent until PatchRelay moves
-        // the workspace ref. Do not manufacture another CI run on every wakeup.
+    if (entry.candidateRef && entry.lastFailedBaseSha && entry.ciRunId) {
+        // Do not manufacture another CI run on every wakeup, but do re-read the
+        // exact SHA: an operator or GitHub may have rerun the failed workflow in
+        // place. A green rerun must resume the queue without a no-op commit.
+        const checks = (await ctx.github.listChecksForRef(entry.candidateSha))
+            .filter((check) => check.name.toLowerCase() !== INTEGRATION_REVIEW_CHECK);
+        const evaluation = evaluateCheckPolicy(ctx.policy.getRequiredCheckRules(), ctx.policy.shouldRequireAllChecksOnEmptyRequiredSet(), checks);
+        if (evaluation.status === "pass") {
+            await acceptPassingIntegrationCandidate(ctx, entry, allActive, index, isLandingHead, entry.ciRunId);
+        }
+        else if (evaluation.status === "pending") {
+            ctx.store.transition(entry.id, "validating", {
+                waitDetail: "waiting for exact-candidate rerun",
+            }, "exact-candidate rerun pending");
+        }
         return;
     }
     if (entry.candidateKind === "head") {

package/package.json

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