merge-steward 0.35.3 → 0.35.4

package/dist/github/pr-client.d.ts

@@ -33,6 +33,13 @@ export declare class GitHubPRClient implements GitHubPRApi {
         headSha: string;
         baseBranch: string;
     }>>;
+    listOpenPRsByBase(baseBranch: string): Promise<Array<{
+        number: number;
+        branch: string;
+        headSha: string;
+        baseBranch: string;
+    }>>;
+    setBaseBranch(prNumber: number, baseBranch: string): Promise<void>;
     deleteBranch(prNumber: number): Promise<void>;
     findPRByBranch(branch: string): Promise<number | null>;
     listLabels(prNumber: number): Promise<string[]>;

package/dist/github/pr-client.js

@@ -117,6 +117,35 @@ export class GitHubPRClient {
             throw new Error("GitHub returned malformed open PR data", { cause: error });
         }
     }
+    async listOpenPRsByBase(baseBranch) {
+        const result = await exec("gh", [
+            "api", "--method", "GET",
+            `repos/${this.repoFullName}/pulls`,
+            "-f", "state=open",
+            "-f", `base=${baseBranch}`,
+            "-f", "per_page=100",
+            "--paginate", "--slurp",
+        ], { githubRepoFullName: this.repoFullName });
+        try {
+            const pages = JSON.parse(result.stdout);
+            return pages.flat().map((pr) => ({
+                number: pr.number,
+                branch: pr.head.ref,
+                headSha: pr.head.sha,
+                baseBranch: pr.base.ref,
+            }));
+        }
+        catch (error) {
+            throw new Error("GitHub returned malformed stack child PR data", { cause: error });
+        }
+    }
+    async setBaseBranch(prNumber, baseBranch) {
+        await exec("gh", [
+            "api", "--method", "PATCH",
+            `repos/${this.repoFullName}/pulls/${prNumber}`,
+            "-f", `base=${baseBranch}`,
+        ], { githubRepoFullName: this.repoFullName });
+    }
     async deleteBranch(prNumber) {
         const status = await this.getStatus(prNumber);
         await exec("gh", [

package/dist/interfaces.d.ts

@@ -57,8 +57,17 @@ export interface GitHubPRApi {
         headSha: string;
         baseBranch: string;
     }>>;
+    /** List every open PR whose current base is the given branch. */
+    listOpenPRsByBase(baseBranch: string): Promise<Array<{
+        number: number;
+        branch: string;
+        headSha: string;
+        baseBranch: string;
+    }>>;
     /** Find the open PR number for a branch, or null if none exists. */
     findPRByBranch(branch: string): Promise<number | null>;
+    /** Retarget a PR before deleting a branch used as its current base. */
+    setBaseBranch(prNumber: number, baseBranch: string): Promise<void>;
     /** Delete the PR's head branch from the remote (best-effort cleanup). */
     deleteBranch(prNumber: number): Promise<void>;
     /** List open PRs with a specific label (for startup scan). */

package/dist/reconciler-merge.js

@@ -418,15 +418,35 @@ 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;
+        let mergedStatus = null;
         try {
-            merged = (await ctx.github.getStatus(entry.prNumber)).merged;
+            const status = await ctx.github.getStatus(entry.prNumber);
+            if (status.merged)
+                mergedStatus = status;
         }
         catch {
             // Keep polling briefly. If GitHub is unavailable, branch cleanup is
             // cosmetic; preserving correct PR merge classification matters more.
         }
-        if (merged) {
+        if (mergedStatus) {
+            let children;
+            try {
+                children = await ctx.github.listOpenPRsByBase(mergedStatus.branch);
+                for (const child of children) {
+                    await ctx.github.setBaseBranch(child.number, ctx.baseBranch);
+                }
+            }
+            catch {
+                emit(ctx, entry, "pr_branch_cleanup_deferred", {
+                    detail: "preserving the merged PR branch because stacked children could not be safely retargeted",
+                });
+                return;
+            }
+            if (children.length > 0) {
+                emit(ctx, entry, "stack_children_retargeted", {
+                    detail: `retargeted child PR ${children.map((child) => `#${child.number}`).join(", ")} to ${ctx.baseBranch} before deleting ${mergedStatus.branch}`,
+                });
+            }
             try {
                 await ctx.github.deleteBranch(entry.prNumber);
             }

package/dist/types.d.ts

@@ -243,7 +243,7 @@ export interface QueueConfig {
     flakyRetries: number;
     pollIntervalMs: number;
 }
-export type ReconcileAction = "promoted" | "fetch_started" | "main_broken" | "branch_mismatch" | "candidate_selected" | "integration_build_started" | "integration_build_succeeded" | "integration_build_conflict" | "ci_triggered" | "ci_pending" | "ci_passed" | "ci_failed" | "ci_flaky_retry" | "merge_revalidating" | "head_candidate_landed" | "merge_succeeded" | "merge_rejected" | "merge_external" | "policy_changed" | "evicted" | "invalidated" | "retry_gated" | "budget_exhausted" | "merge_waiting_approval" | "open_pr_ancestry_blocked" | "stack_dependency_waiting" | "merge_waiting_recognition" | "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" | "queue_label_synced" | "branch_unreachable";
+export type ReconcileAction = "promoted" | "fetch_started" | "main_broken" | "branch_mismatch" | "candidate_selected" | "integration_build_started" | "integration_build_succeeded" | "integration_build_conflict" | "ci_triggered" | "ci_pending" | "ci_passed" | "ci_failed" | "ci_flaky_retry" | "merge_revalidating" | "head_candidate_landed" | "merge_succeeded" | "merge_rejected" | "merge_external" | "policy_changed" | "evicted" | "invalidated" | "retry_gated" | "budget_exhausted" | "merge_waiting_approval" | "open_pr_ancestry_blocked" | "stack_dependency_waiting" | "merge_waiting_recognition" | "merge_waiting_main" | "main_pending_bypassed" | "pr_branch_cleanup_deferred" | "pr_branch_cleanup_failed" | "stack_children_retargeted" | "sanitized_closed" | "sanitized_duplicate" | "post_merge_verification_started" | "post_merge_verification_completed" | "queue_label_synced" | "branch_unreachable";
 export interface ReconcileEvent {
     at: string;
     entryId: string;

package/package.json

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