From 932c084d3169eb477dcb22d533d0062cdd9574f6 Mon Sep 17 00:00:00 2001
From: Benjamin Shafii <benjamin.shafii@gmail.com>
Date: Sun, 15 Feb 2026 19:25:16 -0800
Subject: [PATCH 1/4] fix(ci): keep a stable fork-sync branch

---
 .github/workflows/fork-sync-upstream.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/fork-sync-upstream.yml b/.github/workflows/fork-sync-upstream.yml
index cca603eac293..776c95c4f250 100644
--- a/.github/workflows/fork-sync-upstream.yml
+++ b/.github/workflows/fork-sync-upstream.yml
@@ -67,9 +67,10 @@ jobs:
         id: prep
         run: |
           set -euo pipefail
-          stamp="$(date -u +%Y%m%d-%H%M%S)"
           upstream_sha="$(git rev-parse --short "upstream/${UPSTREAM_BRANCH}")"
-          sync_branch="sync/${UPSTREAM_BRANCH}-${stamp}-${upstream_sha}"
+          safe_patch="$(echo "${PATCH_BRANCH}" | tr '/' '-')"
+          safe_upstream="$(echo "${UPSTREAM_BRANCH}" | tr '/' '-')"
+          sync_branch="sync/${safe_patch}-onto-${safe_upstream}"
           git checkout -B "$sync_branch" "origin/${PATCH_BRANCH}"
           echo "sync_branch=$sync_branch" >> "$GITHUB_OUTPUT"
           echo "upstream_sha=$upstream_sha" >> "$GITHUB_OUTPUT"

From c1749cf5ade8524059241befb952521f94bde7ef Mon Sep 17 00:00:00 2001
From: Benjamin Shafii <benjamin.shafii@gmail.com>
Date: Sun, 15 Feb 2026 19:32:23 -0800
Subject: [PATCH 2/4] fix(ci): pin Bun 1.3.9 in fork CLI release

---
 .github/workflows/release-cli-fork.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-cli-fork.yml b/.github/workflows/release-cli-fork.yml
index 17752ce94bc5..29433fa77dd0 100644
--- a/.github/workflows/release-cli-fork.yml
+++ b/.github/workflows/release-cli-fork.yml
@@ -28,7 +28,12 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Bun
-        uses: ./.github/actions/setup-bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: "1.3.9"
+
+      - name: Install dependencies
+        run: bun install
 
       - name: Resolve tag and version
         id: meta

From 59b0481901fe7eb8d9d6af1ec7ed480447474928 Mon Sep 17 00:00:00 2001
From: Benjamin Shafii <benjamin.shafii@gmail.com>
Date: Sun, 15 Feb 2026 20:27:58 -0800
Subject: [PATCH 3/4] fix(ci): let fork sync vars drive manual dispatch

---
 .github/workflows/fork-janitor.yml       | 2 --
 .github/workflows/fork-sync-upstream.yml | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/.github/workflows/fork-janitor.yml b/.github/workflows/fork-janitor.yml
index b7d5b0b4bfdb..68bd55769f66 100644
--- a/.github/workflows/fork-janitor.yml
+++ b/.github/workflows/fork-janitor.yml
@@ -14,11 +14,9 @@ on:
       upstream_branch:
         description: "Upstream branch to rebase onto"
         required: false
-        default: "dev"
       base_branch:
         description: "Fork base branch for sync PRs"
         required: false
-        default: "dev"
 
 permissions:
   contents: write
diff --git a/.github/workflows/fork-sync-upstream.yml b/.github/workflows/fork-sync-upstream.yml
index 776c95c4f250..f7b18449f13c 100644
--- a/.github/workflows/fork-sync-upstream.yml
+++ b/.github/workflows/fork-sync-upstream.yml
@@ -8,15 +8,12 @@ on:
       upstream_branch:
         description: "Upstream branch to sync from"
         required: false
-        default: "dev"
       patch_branch:
         description: "Fork patch branch to preserve"
         required: false
-        default: "feat/hot-reload-smooth"
       base_branch:
         description: "Fork base branch to open PR into"
         required: false
-        default: "dev"
 
 permissions:
   contents: write

From 521638521e3544f02832430c067c4d8f57366bd4 Mon Sep 17 00:00:00 2001
From: Benjamin Shafii <benjamin.shafii@gmail.com>
Date: Sun, 15 Feb 2026 20:36:15 -0800
Subject: [PATCH 4/4] fix(ci): avoid shell interpolation in janitor comment

---
 .github/workflows/fork-janitor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/fork-janitor.yml b/.github/workflows/fork-janitor.yml
index 68bd55769f66..dfada95d6f32 100644
--- a/.github/workflows/fork-janitor.yml
+++ b/.github/workflows/fork-janitor.yml
@@ -257,4 +257,4 @@ jobs:
 
           gh pr edit "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --remove-label sync-conflict 2>/dev/null || true
           gh pr edit "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --remove-label janitor-needed 2>/dev/null || true
-          gh pr comment "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --body "Janitor repair pass completed and pushed updates to `${{ steps.target.outputs.head_branch }}`."
+          gh pr comment "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --body "Janitor repair pass completed and pushed updates to ${{ steps.target.outputs.head_branch }}."