merge-steward 0.5.4 → 0.5.6

package/dist/github/pr-client.js

@@ -24,7 +24,7 @@ export class GitHubPRClient {
         const result = await exec("gh", [
             "pr", "view", String(prNumber),
             "--repo", this.repoFullName,
-            "--json", "number,headRefName,headRefOid,reviewDecision,state",
+            "--json", "number,headRefName,headRefOid,reviewDecision,state,mergeStateStatus",
         ], { githubRepoFullName: this.repoFullName });
         const data = JSON.parse(result.stdout);
         return {
@@ -32,6 +32,7 @@ export class GitHubPRClient {
             branch: data.headRefName,
             headSha: data.headRefOid,
             mergeable: data.state === "OPEN",
+            mergeStateStatus: data.mergeStateStatus,
             reviewApproved: data.reviewDecision === "APPROVED",
             merged: data.state === "MERGED",
         };

package/dist/reconciler.js

@@ -114,6 +114,19 @@ async function prepareHead(ctx, entry) {
     // Gate: non-spinning — skip if base hasn't changed since last conflict.
     if (isRetryGated(entry, baseSha)) {
         emit(ctx, entry, "retry_gated", { baseSha, detail: "base unchanged since last conflict" });
+        try {
+            const prStatus = await ctx.github.getStatus(entry.prNumber);
+            if (prStatus.mergeStateStatus === "DIRTY") {
+                emit(ctx, entry, "budget_exhausted", {
+                    baseSha,
+                    detail: "retry gated and GitHub still reports merge conflict",
+                });
+                await evictEntry(ctx, entry, "integration_conflict");
+            }
+        }
+        catch {
+            // Best-effort check. If GitHub status is unavailable, preserve the non-spinning wait.
+        }
         return;
     }
     await performBranchRefresh(ctx, entry, baseSha);
@@ -136,7 +149,7 @@ function summarizeCheckNames(checks, limit = 3) {
     return `${names.slice(0, limit).join(", ")} +${names.length - limit} more`;
 }
 async function performBranchRefresh(ctx, entry, baseSha) {
-    emit(ctx, entry, "rebase_started", { baseSha });
+    emit(ctx, entry, "rebase_started", { baseSha, detail: `refreshing ${entry.branch} with ${ctx.baseBranch}` });
     const result = await ctx.git.mergeBaseInto(entry.branch, ref(ctx, ctx.baseBranch));
     if (!result.success) {
         emit(ctx, entry, "rebase_conflict", { baseSha, conflictFiles: result.conflictFiles });
@@ -164,7 +177,7 @@ async function performBranchRefresh(ctx, entry, baseSha) {
         return;
     }
     await ctx.git.push(entry.branch, false);
-    emit(ctx, entry, "rebase_succeeded", { baseSha });
+    emit(ctx, entry, "rebase_succeeded", { baseSha, detail: `refreshed ${entry.branch} with ${ctx.baseBranch}` });
     // Build speculative branch for downstream entries.
     let specBranch = null;
     let specSha = null;
@@ -186,7 +199,7 @@ async function performBranchRefresh(ctx, entry, baseSha) {
     ctx.store.transition(entry.id, "validating", {
         headSha, baseSha, ciRunId: runId, lastFailedBaseSha: null,
         specBranch, specSha, specBasedOn: null,
-    }, `rebase onto ${baseSha.slice(0, 8)}, CI ${runId}`);
+    }, `refreshed with ${ctx.baseBranch} @ ${baseSha.slice(0, 8)}, CI ${runId}`);
 }
 // ─── Non-head entry: speculative branch ─────────────────────────
 async function prepareSpeculative(ctx, entry, prevEntry) {

package/dist/service.js

@@ -222,6 +222,10 @@ export class MergeStewardService {
     updateHeadByPR(prNumber, headSha) {
         const entry = this.store.getEntryByPR(this.config.repoId, prNumber);
         if (entry) {
+            if (entry.headSha === headSha) {
+                this.logger.debug({ prNumber, entryId: entry.id, headSha }, "Ignoring synchronize webhook for unchanged head");
+                return;
+            }
             this.store.updateHead(entry.id, headSha);
             this.logger.info({ prNumber, entryId: entry.id, headSha }, "PR head updated via webhook");
         }

package/dist/types.d.ts

@@ -158,6 +158,7 @@ export interface PRStatus {
     branch: string;
     headSha: string;
     mergeable: boolean;
+    mergeStateStatus?: string | undefined;
     reviewApproved: boolean;
     merged: boolean;
 }

package/dist/watch/format.js

@@ -76,7 +76,7 @@ export function nextStepLabel(status) {
         case "queued":
             return "waiting for head-of-line turn";
         case "preparing_head":
-            return "rebasing onto latest main";
+            return "refreshing branch with latest main";
         case "validating":
             return "waiting for CI result";
         case "merging":

package/package.json

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