merge-steward 0.26.0 → 0.26.1

package/dist/reconciler-merge.d.ts

@@ -1,3 +1,7 @@
 import type { QueueEntry } from "./types.ts";
 import type { ReconcileContext } from "./reconciler-core.ts";
 export declare function mergeHead(ctx: ReconcileContext, entry: QueueEntry): Promise<void>;
+export declare function deletePrBranchAfterGitHubMarksMerged(ctx: ReconcileContext, entry: QueueEntry, options?: {
+    attempts?: number;
+    delayMs?: number;
+}): Promise<void>;

package/dist/reconciler-merge.js

@@ -2,6 +2,11 @@ import { CLEAN_CI, CLEAN_SPEC, emit, isBudgetExhausted, ref } from "./reconciler
 import { cleanupSpec, evictEntry, invalidateDownstream } from "./reconciler-evict.js";
 import { verifyPostMergeStatus } from "./reconciler-post-merge.js";
 import { getEffectiveMainStatus } from "./reconciler-main-status.js";
+const DEFAULT_PR_MERGED_POLL_ATTEMPTS = 6;
+const DEFAULT_PR_MERGED_POLL_DELAY_MS = 2_000;
+function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 export async function mergeHead(ctx, entry) {
     emit(ctx, entry, "merge_revalidating");
     const prStatus = await ctx.github.getStatus(entry.prNumber);
@@ -133,10 +138,36 @@ export async function mergeHead(ctx, entry) {
         postMergeCheckedAt: new Date().toISOString(),
     }, `spec pushed to main; ${verificationResult.postMergeSummary}`);
     await cleanupSpec(ctx, entry);
-    try {
-        await ctx.github.deleteBranch(entry.prNumber);
-    }
-    catch {
-        /* cosmetic */
+    await deletePrBranchAfterGitHubMarksMerged(ctx, entry);
+}
+export async function deletePrBranchAfterGitHubMarksMerged(ctx, entry, options = {}) {
+    const attempts = options.attempts ?? DEFAULT_PR_MERGED_POLL_ATTEMPTS;
+    const delayMs = options.delayMs ?? DEFAULT_PR_MERGED_POLL_DELAY_MS;
+    for (let attempt = 0; attempt < attempts; attempt++) {
+        let merged = false;
+        try {
+            merged = (await ctx.github.getStatus(entry.prNumber)).merged;
+        }
+        catch {
+            // Keep polling briefly. If GitHub is unavailable, branch cleanup is
+            // cosmetic; preserving correct PR merge classification matters more.
+        }
+        if (merged) {
+            try {
+                await ctx.github.deleteBranch(entry.prNumber);
+            }
+            catch {
+                emit(ctx, entry, "pr_branch_cleanup_failed", {
+                    detail: "GitHub marked the PR merged, but deleting the head branch failed",
+                });
+            }
+            return;
+        }
+        if (attempt < attempts - 1 && delayMs > 0) {
+            await delay(delayMs);
+        }
     }
+    emit(ctx, entry, "pr_branch_cleanup_deferred", {
+        detail: "waiting for GitHub to classify the fast-forwarded PR as merged before deleting the head branch",
+    });
 }

package/dist/types.d.ts

@@ -224,7 +224,7 @@ export interface QueueConfig {
     flakyRetries: number;
     pollIntervalMs: number;
 }
-export type ReconcileAction = "promoted" | "fetch_started" | "main_broken" | "branch_mismatch" | "spec_build_started" | "spec_build_succeeded" | "spec_build_conflict" | "ci_triggered" | "ci_pending" | "ci_passed" | "ci_failed" | "ci_flaky_retry" | "merge_revalidating" | "merge_succeeded" | "merge_rejected" | "merge_external" | "policy_changed" | "evicted" | "invalidated" | "retry_gated" | "budget_exhausted" | "merge_waiting_approval" | "merge_waiting_main" | "main_pending_bypassed" | "sanitized_closed" | "sanitized_duplicate" | "post_merge_verification_started" | "post_merge_verification_completed" | "branch_unreachable";
+export type ReconcileAction = "promoted" | "fetch_started" | "main_broken" | "branch_mismatch" | "spec_build_started" | "spec_build_succeeded" | "spec_build_conflict" | "ci_triggered" | "ci_pending" | "ci_passed" | "ci_failed" | "ci_flaky_retry" | "merge_revalidating" | "merge_succeeded" | "merge_rejected" | "merge_external" | "policy_changed" | "evicted" | "invalidated" | "retry_gated" | "budget_exhausted" | "merge_waiting_approval" | "merge_waiting_main" | "main_pending_bypassed" | "pr_branch_cleanup_deferred" | "pr_branch_cleanup_failed" | "sanitized_closed" | "sanitized_duplicate" | "post_merge_verification_started" | "post_merge_verification_completed" | "branch_unreachable";
 export interface ReconcileEvent {
     at: string;
     entryId: string;

package/package.json

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