From c773c7ed390c47d765e4fe70373599e926807f5b Mon Sep 17 00:00:00 2001
From: Patrick Roza <contact@patrickroza.com>
Date: Sat, 25 Jul 2026 17:20:56 +0200
Subject: [PATCH] fix(fork-stack): allow node APIs in overlay composer

---
 scripts/compose-integration-overlays.ts |  2 ++
 scripts/rebase-pr-stack.ts              | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/scripts/compose-integration-overlays.ts b/scripts/compose-integration-overlays.ts
index 02c00e0865e..3e424606faa 100644
--- a/scripts/compose-integration-overlays.ts
+++ b/scripts/compose-integration-overlays.ts
@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+// @effect-diagnostics nodeBuiltinImport:off
+// @effect-diagnostics globalConsole:off
 
 import * as NodeChildProcess from "node:child_process";
 import * as NodeFS from "node:fs";
diff --git a/scripts/rebase-pr-stack.ts b/scripts/rebase-pr-stack.ts
index fb1f6f41a1c..65d7db4a4bf 100644
--- a/scripts/rebase-pr-stack.ts
+++ b/scripts/rebase-pr-stack.ts
@@ -1214,14 +1214,21 @@ export async function syncStack(options: StackRunOptions): Promise<StackRunResul
   if (options.push && (process.env.GH_TOKEN || process.env.GITHUB_TOKEN)) {
     const oldTip = result.snapshots[manifest.forkChangesBranch];
     const newTip = result.newTips[manifest.forkChangesBranch];
-    if (oldTip && newTip && oldTip !== newTip) {
+    if (oldTip && newTip) {
       try {
-        pushForkChangesBaseHistory(sourceRoot, [newTip, oldTip]);
+        // A normal PR merge advances fork/changes before this workflow starts, so
+        // snapshots already contain the new tip. Its first parent is the previous
+        // fork/changes base that open feature PRs still contain.
+        const firstParent = git(sourceRoot, ["rev-parse", `${newTip}^`], {
+          allowFailure: true,
+        });
+        const previousBase = oldTip !== newTip ? oldTip : firstParent;
+        pushForkChangesBaseHistory(sourceRoot, [newTip, previousBase, oldTip]);
         const featureResult = await rebaseOpenFeaturePullRequests({
           sourceRoot,
           manifest,
           push: true,
-          oldForkChangesTip: oldTip,
+          oldForkChangesTip: previousBase,
           newForkChangesTip: newTip,
         });
         appendFeatureRebaseSummary(featureResult);