yup more merge stuff

Author: jonathanlab

apps/cli/src/commands/merge.ts

@@ -107,7 +107,10 @@ export async function merge(flags: MergeFlags = {}): Promise<void> {
   );
   console.log();
 
-  for (const { pr, bookmarkName: bookmark, changeId: chgId } of prsToMerge) {
+  for (let i = 0; i < prsToMerge.length; i++) {
+    const { pr, bookmarkName: bookmark, changeId: chgId } = prsToMerge[i];
+    const nextPR = prsToMerge[i + 1];
+
     // SAFETY: Validate bookmark is not a protected branch
     const protectedBranches = [trunk, "main", "master", "develop"];
     if (protectedBranches.includes(bookmark)) {
@@ -122,29 +125,36 @@ export async function merge(flags: MergeFlags = {}): Promise<void> {
     console.log(`Merging PR #${cyan(String(pr.number))}: ${pr.title}`);
     console.log(dim(`  Branch: ${bookmark} → ${pr.baseRefName}`));
 
-    // Before merging, update the PR base to trunk if it's not already
-    // (since we're merging bottom-up, each PR should target trunk after its base is merged)
+    // CRITICAL: Before merging this PR, update the NEXT PR's base to trunk.
+    // When we merge this PR with deleteHead:true, this PR's head branch gets deleted.
+    // That branch is the next PR's base - if we don't update first, GitHub closes the next PR!
+    if (nextPR) {
+      console.log(dim(`  Rebasing PR #${nextPR.pr.number} onto ${trunk}...`));
+      await github.updatePR(nextPR.pr.number, { base: trunk });
+    }
+
+    // Update current PR's base to trunk if needed
     if (pr.baseRefName !== trunk) {
       await github.updatePR(pr.number, { base: trunk });
+    }
+
+    // Wait for GitHub to recalculate merge status after base changes
+    process.stdout.write(dim("  Waiting for GitHub..."));
+    const mergeableResult = unwrap(
+      await github.waitForMergeable(pr.number, {
+        timeoutMs: 60000,
+        pollIntervalMs: 2000,
+      }),
+    );
+    process.stdout.write(`\r${" ".repeat(30)}\r`);
 
-      // Wait for GitHub to recalculate merge status after base change
-      process.stdout.write(dim("  Waiting for GitHub..."));
-      const mergeableResult = unwrap(
-        await github.waitForMergeable(pr.number, {
-          timeoutMs: 60000,
-          pollIntervalMs: 2000,
-        }),
+    if (!mergeableResult.mergeable) {
+      console.error(
+        formatError(
+          `PR #${pr.number} is not mergeable: ${mergeableResult.reason}`,
+        ),
       );
-      process.stdout.write(`\r${" ".repeat(30)}\r`);
-
-      if (!mergeableResult.mergeable) {
-        console.error(
-          formatError(
-            `PR #${pr.number} is not mergeable: ${mergeableResult.reason}`,
-          ),
-        );
-        process.exit(1);
-      }
+      process.exit(1);
     }
 
     unwrap(