Polish branch picker trigger, scroll fade, and list layout

[juliusmarminge]

Ports the branch-picker part of #2451 by @sandersonstabo, rebased onto current main.

• Branch selector trigger gets a properly-sized leading GitBranchIcon (matching the workspace selector next to it) and a consistent chevron
• Popup restructured with a stable scroll region; virtualized branch lists get a bottom gradient scroll hint driven by scroll position, and infinite loading now triggers from the virtualized list's own scroll events
• Rows use a flush truncate/right-edge layout (pe-2 items, list edge paddings)

Deviations per review feedback on #2451: the kind labels (current/remote/worktree/default) stay as plain muted text (Theo found the badge treatment too loud), and the separator between search and list is kept ("I liked the separator…").

Part of splitting #2451 into reviewable frontend-only pieces.

🤖 Generated with Claude Code

---

Note

Low Risk
Frontend-only combobox layout and scroll UX in one component; branch checkout/create behavior is unchanged aside from list plumbing.

Overview
Polishes the branch/ref picker in BranchToolbarBranchSelector: trigger styling, popup layout, and how the ref list scrolls and loads more pages.

The trigger adds a leading GitBranchIcon and a smaller chevron so it aligns with nearby workspace UI. The popup is a fixed flex column with a search row (leading SearchIcon, bottom border separator, unstyled input) above a dedicated scroll region.

The ref list always uses virtualization (Comboboxvirtualized + LegendList); the old non-virtualized ComboboxList path and the >40 item threshold are removed. Top/bottom scroll fade masks toggle from scroll position via LegendListonScroll / onLayout (same mask pattern as ModelPickerContent). Infinite load uses the list’s scroll node (getScrollableNode) and onEndReached, with maybeFetchNextBranchPage also on scroll/layout and when refs.length changes. Opening or changing the deferred search query scrolls the list to top; fades reset when the menu closes.

Row layout tweaks: tighter right padding on items and truncate-friendly ref name + muted kind labels (current/remote/worktree/default) unchanged in style per review.

^{Reviewed by Cursor Bugbot for commit a9cfbec. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Polish branch picker trigger, scroll fades, and list layout in BranchToolbarBranchSelector

• The branch list is now always virtualized via LegendList, removing the conditional shouldVirtualizeBranchList path.
• Top/bottom CSS mask fades are applied to the list container and updated on scroll, open, and query change; scroll position resets to top on open or query change.
• Infinite-scroll page fetches (maybeFetchNextBranchPage) are now triggered on list layout and scroll events in addition to onEndReached.
• The trigger button adds a GitBranchIcon and updates chevron size/opacity; the popup header gets a SearchIcon with unstyled ComboboxInput.

^{Macroscope summarized a9cfbec.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 79d02643-07f7-4f11-94c0-b752155da648

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch ui/branch-picker

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

🚀 Expo continuous deployment is ready!

• Project → t3-code
• Platforms → android, ios
• Scheme → t3code-preview

	🤖 Android	🍎 iOS
Fingerprint	ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e	313e506a7f15a9c3f15b01d787d68a12382432bf
Build Details	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update Details	Update Permalink Details Branch: pr-3024 Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Update Permalink Details Branch: pr-3024 Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update QR

[macroscopeapp]

Approvability

Verdict: Needs human review

An unresolved review comment identifies a medium-severity pagination bug where branch loading may get stuck after removing the initial scroll check. This functional concern warrants human review despite the otherwise straightforward UI polish nature of the changes.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate e23b876

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Stale scroll fade after reset
  • Added a requestAnimationFrame callback after the programmatic scrollToOffset reset to call syncBranchListScrollChrome, ensuring the bottom fade gradient is recalculated after the scroll position changes.

Or push these changes by commenting:

@cursor push ed2bfad791

Preview (ed2bfad791)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -511,8 +511,18 @@
} else {
branchListScrollElementRef.current?.scrollTo({ top: 0 });
}
- }, [deferredTrimmedBranchQuery, isBranchMenuOpen, shouldVirtualizeBranchList]);+ const frame = requestAnimationFrame(() => {+ syncBranchListScrollChrome(branchListScrollElementRef.current);+ });+ return () => cancelAnimationFrame(frame);+ }, [+ deferredTrimmedBranchQuery,+ isBranchMenuOpen,+ shouldVirtualizeBranchList,+ syncBranchListScrollChrome,+ ]);+
useEffect(() => {
const scrollElement = branchListScrollElementRef.current;
if (!scrollElement || !isBranchMenuOpen || shouldVirtualizeBranchList) {

_{You can send follow-ups to the cloud agent here.}

Dismissing prior approval to re-evaluate 5a9bcd2

[cursor]

Cursor Bugbot has reviewed your changes and found 2 potential issues.

Bugbot Autofix prepared fixes for both issues found in the latest run.

• ✅ Fixed: Pagination stuck without initial check
  • Added maybeFetchNextBranchPage() call in the LegendList onLayout handler so that when the list first renders with items that don't fill the viewport, pagination is triggered even if onEndReached doesn't fire.
• ✅ Fixed: Scroll fade stale after search
  • Added deferredTrimmedBranchQuery to the useLayoutEffect dependency array so scroll fades are remeasured whenever the search query changes, even when the filtered item count stays the same.

Or push these changes by commenting:

@cursor push 984fc7e65f

Preview (984fc7e65f)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -489,7 +489,12 @@
cancelAnimationFrame(frame);
cancelAnimationFrame(nestedFrame);
};
- }, [filteredBranchPickerItems.length, isBranchMenuOpen, updateBranchListScrollFades]);+ }, [+ deferredTrimmedBranchQuery,+ filteredBranchPickerItems.length,+ isBranchMenuOpen,+ updateBranchListScrollFades,+ ]);
useEffect(() => {
if (!isBranchMenuOpen) {
@@ -649,7 +654,10 @@
fetchNextBranchPage();
}
}}
- onLayout={updateBranchListScrollFades}+ onLayout={() => {+ updateBranchListScrollFades();+ maybeFetchNextBranchPage();+ }}
onScroll={() => {
updateBranchListScrollFades();
maybeFetchNextBranchPage();

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 5a9bcd2. Configure here.}

[juliusmarminge]

@cursor push 984fc7e

[juliusmarminge]

Ports the branch-picker part of #2451 by @sandersonstabo, rebased onto current main.

• Branch selector trigger gets a properly-sized leading GitBranchIcon (matching the workspace selector next to it) and a consistent chevron
• Popup restructured with a stable scroll region; virtualized branch lists get a bottom gradient scroll hint driven by scroll position, and infinite loading now triggers from the virtualized list's own scroll events
• Rows use a flush truncate/right-edge layout (pe-2 items, list edge paddings)

Deviations per review feedback on #2451: the kind labels (current/remote/worktree/default) stay as plain muted text (Theo found the badge treatment too loud), and the separator between search and list is kept ("I liked the separator…").

Part of splitting #2451 into reviewable frontend-only pieces.

🤖 Generated with Claude Code

---

Note

Low Risk
Frontend-only combobox layout and scroll UX in one component; branch checkout/create behavior is unchanged aside from list plumbing.

Overview
Polishes the branch/ref picker in BranchToolbarBranchSelector: trigger styling, popup layout, and how the ref list scrolls and loads more pages.

The trigger adds a leading GitBranchIcon and a smaller chevron so it aligns with nearby workspace UI. The popup is a fixed flex column with a search row (leading SearchIcon, bottom border separator, unstyled input) above a dedicated scroll region.

The ref list always uses virtualization (Comboboxvirtualized + LegendList); the old non-virtualized ComboboxList path and the >40 item threshold are removed. Top/bottom scroll fade masks toggle from scroll position via LegendListonScroll / onLayout (same mask pattern as ModelPickerContent). Infinite load uses the list’s scroll node (getScrollableNode) and onEndReached, with maybeFetchNextBranchPage also on scroll/layout and when refs.length changes. Opening or changing the deferred search query scrolls the list to top; fades reset when the menu closes.

Row layout tweaks: tighter right padding on items and truncate-friendly ref name + muted kind labels (current/remote/worktree/default) unchanged in style per review.

^{Reviewed by Cursor Bugbot for commit a9cfbec. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Polish branch picker trigger, scroll fades, and list layout in BranchToolbarBranchSelector

• The branch list is now always virtualized via LegendList, removing the conditional shouldVirtualizeBranchList path.
• Top/bottom CSS mask fades are applied to the list container and updated on scroll, open, and query change; scroll position resets to top on open or query change.
• Infinite-scroll page fetches (maybeFetchNextBranchPage) are now triggered on list layout and scroll events in addition to onEndReached.
• The trigger button adds a GitBranchIcon and updates chevron size/opacity; the popup header gets a SearchIcon with unstyled ComboboxInput.

^{Macroscope summarized a9cfbec.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 79d02643-07f7-4f11-94c0-b752155da648

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch ui/branch-picker

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

🚀 Expo continuous deployment is ready!

• Project → t3-code
• Platforms → android, ios
• Scheme → t3code-preview

	🤖 Android	🍎 iOS
Fingerprint	ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e	313e506a7f15a9c3f15b01d787d68a12382432bf
Build Details	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update Details	Update Permalink Details Branch: pr-3024 Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Update Permalink Details Branch: pr-3024 Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update QR

[macroscopeapp]

Approvability

Verdict: Needs human review

An unresolved review comment identifies a medium-severity pagination bug where branch loading may get stuck after removing the initial scroll check. This functional concern warrants human review despite the otherwise straightforward UI polish nature of the changes.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate e23b876

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Stale scroll fade after reset
  • Added a requestAnimationFrame callback after the programmatic scrollToOffset reset to call syncBranchListScrollChrome, ensuring the bottom fade gradient is recalculated after the scroll position changes.

Or push these changes by commenting:

@cursor push ed2bfad791

Preview (ed2bfad791)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -511,8 +511,18 @@
} else {
branchListScrollElementRef.current?.scrollTo({ top: 0 });
}
- }, [deferredTrimmedBranchQuery, isBranchMenuOpen, shouldVirtualizeBranchList]);+ const frame = requestAnimationFrame(() => {+ syncBranchListScrollChrome(branchListScrollElementRef.current);+ });+ return () => cancelAnimationFrame(frame);+ }, [+ deferredTrimmedBranchQuery,+ isBranchMenuOpen,+ shouldVirtualizeBranchList,+ syncBranchListScrollChrome,+ ]);+
useEffect(() => {
const scrollElement = branchListScrollElementRef.current;
if (!scrollElement || !isBranchMenuOpen || shouldVirtualizeBranchList) {

_{You can send follow-ups to the cloud agent here.}

Dismissing prior approval to re-evaluate 5a9bcd2

[cursor]

Cursor Bugbot has reviewed your changes and found 2 potential issues.

Bugbot Autofix prepared fixes for both issues found in the latest run.

• ✅ Fixed: Pagination stuck without initial check
  • Added maybeFetchNextBranchPage() call in the LegendList onLayout handler so that when the list first renders with items that don't fill the viewport, pagination is triggered even if onEndReached doesn't fire.
• ✅ Fixed: Scroll fade stale after search
  • Added deferredTrimmedBranchQuery to the useLayoutEffect dependency array so scroll fades are remeasured whenever the search query changes, even when the filtered item count stays the same.

Or push these changes by commenting:

@cursor push 984fc7e65f

Preview (984fc7e65f)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -489,7 +489,12 @@
cancelAnimationFrame(frame);
cancelAnimationFrame(nestedFrame);
};
- }, [filteredBranchPickerItems.length, isBranchMenuOpen, updateBranchListScrollFades]);+ }, [+ deferredTrimmedBranchQuery,+ filteredBranchPickerItems.length,+ isBranchMenuOpen,+ updateBranchListScrollFades,+ ]);
useEffect(() => {
if (!isBranchMenuOpen) {
@@ -649,7 +654,10 @@
fetchNextBranchPage();
}
}}
- onLayout={updateBranchListScrollFades}+ onLayout={() => {+ updateBranchListScrollFades();+ maybeFetchNextBranchPage();+ }}
onScroll={() => {
updateBranchListScrollFades();
maybeFetchNextBranchPage();

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 5a9bcd2. Configure here.}

[juliusmarminge]

@cursor push 984fc7e

[juliusmarminge]

Ports the branch-picker part of #2451 by @sandersonstabo, rebased onto current main.

• Branch selector trigger gets a properly-sized leading GitBranchIcon (matching the workspace selector next to it) and a consistent chevron
• Popup restructured with a stable scroll region; virtualized branch lists get a bottom gradient scroll hint driven by scroll position, and infinite loading now triggers from the virtualized list's own scroll events
• Rows use a flush truncate/right-edge layout (pe-2 items, list edge paddings)

Deviations per review feedback on #2451: the kind labels (current/remote/worktree/default) stay as plain muted text (Theo found the badge treatment too loud), and the separator between search and list is kept ("I liked the separator…").

Part of splitting #2451 into reviewable frontend-only pieces.

🤖 Generated with Claude Code

---

Note

Low Risk
Frontend-only combobox layout and scroll UX in one component; branch checkout/create behavior is unchanged aside from list plumbing.

Overview
Polishes the branch/ref picker in BranchToolbarBranchSelector: trigger styling, popup layout, and how the ref list scrolls and loads more pages.

The trigger adds a leading GitBranchIcon and a smaller chevron so it aligns with nearby workspace UI. The popup is a fixed flex column with a search row (leading SearchIcon, bottom border separator, unstyled input) above a dedicated scroll region.

The ref list always uses virtualization (Comboboxvirtualized + LegendList); the old non-virtualized ComboboxList path and the >40 item threshold are removed. Top/bottom scroll fade masks toggle from scroll position via LegendListonScroll / onLayout (same mask pattern as ModelPickerContent). Infinite load uses the list’s scroll node (getScrollableNode) and onEndReached, with maybeFetchNextBranchPage also on scroll/layout and when refs.length changes. Opening or changing the deferred search query scrolls the list to top; fades reset when the menu closes.

Row layout tweaks: tighter right padding on items and truncate-friendly ref name + muted kind labels (current/remote/worktree/default) unchanged in style per review.

^{Reviewed by Cursor Bugbot for commit a9cfbec. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Polish branch picker trigger, scroll fades, and list layout in BranchToolbarBranchSelector

• The branch list is now always virtualized via LegendList, removing the conditional shouldVirtualizeBranchList path.
• Top/bottom CSS mask fades are applied to the list container and updated on scroll, open, and query change; scroll position resets to top on open or query change.
• Infinite-scroll page fetches (maybeFetchNextBranchPage) are now triggered on list layout and scroll events in addition to onEndReached.
• The trigger button adds a GitBranchIcon and updates chevron size/opacity; the popup header gets a SearchIcon with unstyled ComboboxInput.

^{Macroscope summarized a9cfbec.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 79d02643-07f7-4f11-94c0-b752155da648

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch ui/branch-picker

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

🚀 Expo continuous deployment is ready!

• Project → t3-code
• Platforms → android, ios
• Scheme → t3code-preview

	🤖 Android	🍎 iOS
Fingerprint	ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e	313e506a7f15a9c3f15b01d787d68a12382432bf
Build Details	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update Details	Update Permalink Details Branch: pr-3024 Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Update Permalink Details Branch: pr-3024 Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update QR

[macroscopeapp]

Approvability

Verdict: Needs human review

An unresolved review comment identifies a medium-severity pagination bug where branch loading may get stuck after removing the initial scroll check. This functional concern warrants human review despite the otherwise straightforward UI polish nature of the changes.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate e23b876

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Stale scroll fade after reset
  • Added a requestAnimationFrame callback after the programmatic scrollToOffset reset to call syncBranchListScrollChrome, ensuring the bottom fade gradient is recalculated after the scroll position changes.

Or push these changes by commenting:

@cursor push ed2bfad791

Preview (ed2bfad791)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -511,8 +511,18 @@
} else {
branchListScrollElementRef.current?.scrollTo({ top: 0 });
}
- }, [deferredTrimmedBranchQuery, isBranchMenuOpen, shouldVirtualizeBranchList]);+ const frame = requestAnimationFrame(() => {+ syncBranchListScrollChrome(branchListScrollElementRef.current);+ });+ return () => cancelAnimationFrame(frame);+ }, [+ deferredTrimmedBranchQuery,+ isBranchMenuOpen,+ shouldVirtualizeBranchList,+ syncBranchListScrollChrome,+ ]);+
useEffect(() => {
const scrollElement = branchListScrollElementRef.current;
if (!scrollElement || !isBranchMenuOpen || shouldVirtualizeBranchList) {

_{You can send follow-ups to the cloud agent here.}

Dismissing prior approval to re-evaluate 5a9bcd2

[cursor]

Cursor Bugbot has reviewed your changes and found 2 potential issues.

Bugbot Autofix prepared fixes for both issues found in the latest run.

• ✅ Fixed: Pagination stuck without initial check
  • Added maybeFetchNextBranchPage() call in the LegendList onLayout handler so that when the list first renders with items that don't fill the viewport, pagination is triggered even if onEndReached doesn't fire.
• ✅ Fixed: Scroll fade stale after search
  • Added deferredTrimmedBranchQuery to the useLayoutEffect dependency array so scroll fades are remeasured whenever the search query changes, even when the filtered item count stays the same.

Or push these changes by commenting:

@cursor push 984fc7e65f

Preview (984fc7e65f)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -489,7 +489,12 @@
cancelAnimationFrame(frame);
cancelAnimationFrame(nestedFrame);
};
- }, [filteredBranchPickerItems.length, isBranchMenuOpen, updateBranchListScrollFades]);+ }, [+ deferredTrimmedBranchQuery,+ filteredBranchPickerItems.length,+ isBranchMenuOpen,+ updateBranchListScrollFades,+ ]);
useEffect(() => {
if (!isBranchMenuOpen) {
@@ -649,7 +654,10 @@
fetchNextBranchPage();
}
}}
- onLayout={updateBranchListScrollFades}+ onLayout={() => {+ updateBranchListScrollFades();+ maybeFetchNextBranchPage();+ }}
onScroll={() => {
updateBranchListScrollFades();
maybeFetchNextBranchPage();

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 5a9bcd2. Configure here.}

[juliusmarminge]

@cursor push 984fc7e

[juliusmarminge]

Ports the branch-picker part of #2451 by @sandersonstabo, rebased onto current main.

• Branch selector trigger gets a properly-sized leading GitBranchIcon (matching the workspace selector next to it) and a consistent chevron
• Popup restructured with a stable scroll region; virtualized branch lists get a bottom gradient scroll hint driven by scroll position, and infinite loading now triggers from the virtualized list's own scroll events
• Rows use a flush truncate/right-edge layout (pe-2 items, list edge paddings)

Deviations per review feedback on #2451: the kind labels (current/remote/worktree/default) stay as plain muted text (Theo found the badge treatment too loud), and the separator between search and list is kept ("I liked the separator…").

Part of splitting #2451 into reviewable frontend-only pieces.

🤖 Generated with Claude Code

---

Note

Low Risk
Frontend-only combobox layout and scroll UX in one component; branch checkout/create behavior is unchanged aside from list plumbing.

Overview
Polishes the branch/ref picker in BranchToolbarBranchSelector: trigger styling, popup layout, and how the ref list scrolls and loads more pages.

The trigger adds a leading GitBranchIcon and a smaller chevron so it aligns with nearby workspace UI. The popup is a fixed flex column with a search row (leading SearchIcon, bottom border separator, unstyled input) above a dedicated scroll region.

The ref list always uses virtualization (Comboboxvirtualized + LegendList); the old non-virtualized ComboboxList path and the >40 item threshold are removed. Top/bottom scroll fade masks toggle from scroll position via LegendListonScroll / onLayout (same mask pattern as ModelPickerContent). Infinite load uses the list’s scroll node (getScrollableNode) and onEndReached, with maybeFetchNextBranchPage also on scroll/layout and when refs.length changes. Opening or changing the deferred search query scrolls the list to top; fades reset when the menu closes.

Row layout tweaks: tighter right padding on items and truncate-friendly ref name + muted kind labels (current/remote/worktree/default) unchanged in style per review.

^{Reviewed by Cursor Bugbot for commit a9cfbec. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Polish branch picker trigger, scroll fades, and list layout in BranchToolbarBranchSelector

• The branch list is now always virtualized via LegendList, removing the conditional shouldVirtualizeBranchList path.
• Top/bottom CSS mask fades are applied to the list container and updated on scroll, open, and query change; scroll position resets to top on open or query change.
• Infinite-scroll page fetches (maybeFetchNextBranchPage) are now triggered on list layout and scroll events in addition to onEndReached.
• The trigger button adds a GitBranchIcon and updates chevron size/opacity; the popup header gets a SearchIcon with unstyled ComboboxInput.

^{Macroscope summarized a9cfbec.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 79d02643-07f7-4f11-94c0-b752155da648

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch ui/branch-picker

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

🚀 Expo continuous deployment is ready!

• Project → t3-code
• Platforms → android, ios
• Scheme → t3code-preview

	🤖 Android	🍎 iOS
Fingerprint	ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e	313e506a7f15a9c3f15b01d787d68a12382432bf
Build Details	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update Details	Update Permalink Details Branch: pr-3024 Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Update Permalink Details Branch: pr-3024 Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update QR

[macroscopeapp]

Approvability

Verdict: Needs human review

An unresolved review comment identifies a medium-severity pagination bug where branch loading may get stuck after removing the initial scroll check. This functional concern warrants human review despite the otherwise straightforward UI polish nature of the changes.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate e23b876

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Stale scroll fade after reset
  • Added a requestAnimationFrame callback after the programmatic scrollToOffset reset to call syncBranchListScrollChrome, ensuring the bottom fade gradient is recalculated after the scroll position changes.

Or push these changes by commenting:

@cursor push ed2bfad791

Preview (ed2bfad791)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -511,8 +511,18 @@
} else {
branchListScrollElementRef.current?.scrollTo({ top: 0 });
}
- }, [deferredTrimmedBranchQuery, isBranchMenuOpen, shouldVirtualizeBranchList]);+ const frame = requestAnimationFrame(() => {+ syncBranchListScrollChrome(branchListScrollElementRef.current);+ });+ return () => cancelAnimationFrame(frame);+ }, [+ deferredTrimmedBranchQuery,+ isBranchMenuOpen,+ shouldVirtualizeBranchList,+ syncBranchListScrollChrome,+ ]);+
useEffect(() => {
const scrollElement = branchListScrollElementRef.current;
if (!scrollElement || !isBranchMenuOpen || shouldVirtualizeBranchList) {

_{You can send follow-ups to the cloud agent here.}

Dismissing prior approval to re-evaluate 5a9bcd2

[cursor]

Cursor Bugbot has reviewed your changes and found 2 potential issues.

Bugbot Autofix prepared fixes for both issues found in the latest run.

• ✅ Fixed: Pagination stuck without initial check
  • Added maybeFetchNextBranchPage() call in the LegendList onLayout handler so that when the list first renders with items that don't fill the viewport, pagination is triggered even if onEndReached doesn't fire.
• ✅ Fixed: Scroll fade stale after search
  • Added deferredTrimmedBranchQuery to the useLayoutEffect dependency array so scroll fades are remeasured whenever the search query changes, even when the filtered item count stays the same.

Or push these changes by commenting:

@cursor push 984fc7e65f

Preview (984fc7e65f)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -489,7 +489,12 @@
cancelAnimationFrame(frame);
cancelAnimationFrame(nestedFrame);
};
- }, [filteredBranchPickerItems.length, isBranchMenuOpen, updateBranchListScrollFades]);+ }, [+ deferredTrimmedBranchQuery,+ filteredBranchPickerItems.length,+ isBranchMenuOpen,+ updateBranchListScrollFades,+ ]);
useEffect(() => {
if (!isBranchMenuOpen) {
@@ -649,7 +654,10 @@
fetchNextBranchPage();
}
}}
- onLayout={updateBranchListScrollFades}+ onLayout={() => {+ updateBranchListScrollFades();+ maybeFetchNextBranchPage();+ }}
onScroll={() => {
updateBranchListScrollFades();
maybeFetchNextBranchPage();

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 5a9bcd2. Configure here.}

[juliusmarminge]

@cursor push 984fc7e

[juliusmarminge]

Ports the branch-picker part of #2451 by @sandersonstabo, rebased onto current main.

• Branch selector trigger gets a properly-sized leading GitBranchIcon (matching the workspace selector next to it) and a consistent chevron
• Popup restructured with a stable scroll region; virtualized branch lists get a bottom gradient scroll hint driven by scroll position, and infinite loading now triggers from the virtualized list's own scroll events
• Rows use a flush truncate/right-edge layout (pe-2 items, list edge paddings)

Deviations per review feedback on #2451: the kind labels (current/remote/worktree/default) stay as plain muted text (Theo found the badge treatment too loud), and the separator between search and list is kept ("I liked the separator…").

Part of splitting #2451 into reviewable frontend-only pieces.

🤖 Generated with Claude Code

---

Note

Low Risk
Frontend-only combobox layout and scroll UX in one component; branch checkout/create behavior is unchanged aside from list plumbing.

Overview
Polishes the branch/ref picker in BranchToolbarBranchSelector: trigger styling, popup layout, and how the ref list scrolls and loads more pages.

The trigger adds a leading GitBranchIcon and a smaller chevron so it aligns with nearby workspace UI. The popup is a fixed flex column with a search row (leading SearchIcon, bottom border separator, unstyled input) above a dedicated scroll region.

The ref list always uses virtualization (Comboboxvirtualized + LegendList); the old non-virtualized ComboboxList path and the >40 item threshold are removed. Top/bottom scroll fade masks toggle from scroll position via LegendListonScroll / onLayout (same mask pattern as ModelPickerContent). Infinite load uses the list’s scroll node (getScrollableNode) and onEndReached, with maybeFetchNextBranchPage also on scroll/layout and when refs.length changes. Opening or changing the deferred search query scrolls the list to top; fades reset when the menu closes.

Row layout tweaks: tighter right padding on items and truncate-friendly ref name + muted kind labels (current/remote/worktree/default) unchanged in style per review.

^{Reviewed by Cursor Bugbot for commit a9cfbec. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Polish branch picker trigger, scroll fades, and list layout in BranchToolbarBranchSelector

• The branch list is now always virtualized via LegendList, removing the conditional shouldVirtualizeBranchList path.
• Top/bottom CSS mask fades are applied to the list container and updated on scroll, open, and query change; scroll position resets to top on open or query change.
• Infinite-scroll page fetches (maybeFetchNextBranchPage) are now triggered on list layout and scroll events in addition to onEndReached.
• The trigger button adds a GitBranchIcon and updates chevron size/opacity; the popup header gets a SearchIcon with unstyled ComboboxInput.

^{Macroscope summarized a9cfbec.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 79d02643-07f7-4f11-94c0-b752155da648

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch ui/branch-picker

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

🚀 Expo continuous deployment is ready!

• Project → t3-code
• Platforms → android, ios
• Scheme → t3code-preview

	🤖 Android	🍎 iOS
Fingerprint	ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e	313e506a7f15a9c3f15b01d787d68a12382432bf
Build Details	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update Details	Update Permalink Details Branch: pr-3024 Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Update Permalink Details Branch: pr-3024 Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update QR

[macroscopeapp]

Approvability

Verdict: Needs human review

An unresolved review comment identifies a medium-severity pagination bug where branch loading may get stuck after removing the initial scroll check. This functional concern warrants human review despite the otherwise straightforward UI polish nature of the changes.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate e23b876

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Stale scroll fade after reset
  • Added a requestAnimationFrame callback after the programmatic scrollToOffset reset to call syncBranchListScrollChrome, ensuring the bottom fade gradient is recalculated after the scroll position changes.

Or push these changes by commenting:

@cursor push ed2bfad791

Preview (ed2bfad791)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -511,8 +511,18 @@
} else {
branchListScrollElementRef.current?.scrollTo({ top: 0 });
}
- }, [deferredTrimmedBranchQuery, isBranchMenuOpen, shouldVirtualizeBranchList]);+ const frame = requestAnimationFrame(() => {+ syncBranchListScrollChrome(branchListScrollElementRef.current);+ });+ return () => cancelAnimationFrame(frame);+ }, [+ deferredTrimmedBranchQuery,+ isBranchMenuOpen,+ shouldVirtualizeBranchList,+ syncBranchListScrollChrome,+ ]);+
useEffect(() => {
const scrollElement = branchListScrollElementRef.current;
if (!scrollElement || !isBranchMenuOpen || shouldVirtualizeBranchList) {

_{You can send follow-ups to the cloud agent here.}

Dismissing prior approval to re-evaluate 5a9bcd2

[cursor]

Cursor Bugbot has reviewed your changes and found 2 potential issues.

Bugbot Autofix prepared fixes for both issues found in the latest run.

• ✅ Fixed: Pagination stuck without initial check
  • Added maybeFetchNextBranchPage() call in the LegendList onLayout handler so that when the list first renders with items that don't fill the viewport, pagination is triggered even if onEndReached doesn't fire.
• ✅ Fixed: Scroll fade stale after search
  • Added deferredTrimmedBranchQuery to the useLayoutEffect dependency array so scroll fades are remeasured whenever the search query changes, even when the filtered item count stays the same.

Or push these changes by commenting:

@cursor push 984fc7e65f

Preview (984fc7e65f)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -489,7 +489,12 @@
cancelAnimationFrame(frame);
cancelAnimationFrame(nestedFrame);
};
- }, [filteredBranchPickerItems.length, isBranchMenuOpen, updateBranchListScrollFades]);+ }, [+ deferredTrimmedBranchQuery,+ filteredBranchPickerItems.length,+ isBranchMenuOpen,+ updateBranchListScrollFades,+ ]);
useEffect(() => {
if (!isBranchMenuOpen) {
@@ -649,7 +654,10 @@
fetchNextBranchPage();
}
}}
- onLayout={updateBranchListScrollFades}+ onLayout={() => {+ updateBranchListScrollFades();+ maybeFetchNextBranchPage();+ }}
onScroll={() => {
updateBranchListScrollFades();
maybeFetchNextBranchPage();

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 5a9bcd2. Configure here.}

[juliusmarminge]

@cursor push 984fc7e

[juliusmarminge]

Ports the branch-picker part of #2451 by @sandersonstabo, rebased onto current main.

• Branch selector trigger gets a properly-sized leading GitBranchIcon (matching the workspace selector next to it) and a consistent chevron
• Popup restructured with a stable scroll region; virtualized branch lists get a bottom gradient scroll hint driven by scroll position, and infinite loading now triggers from the virtualized list's own scroll events
• Rows use a flush truncate/right-edge layout (pe-2 items, list edge paddings)

Deviations per review feedback on #2451: the kind labels (current/remote/worktree/default) stay as plain muted text (Theo found the badge treatment too loud), and the separator between search and list is kept ("I liked the separator…").

Part of splitting #2451 into reviewable frontend-only pieces.

🤖 Generated with Claude Code

---

Note

Low Risk
Frontend-only combobox layout and scroll UX in one component; branch checkout/create behavior is unchanged aside from list plumbing.

Overview
Polishes the branch/ref picker in BranchToolbarBranchSelector: trigger styling, popup layout, and how the ref list scrolls and loads more pages.

The trigger adds a leading GitBranchIcon and a smaller chevron so it aligns with nearby workspace UI. The popup is a fixed flex column with a search row (leading SearchIcon, bottom border separator, unstyled input) above a dedicated scroll region.

The ref list always uses virtualization (Comboboxvirtualized + LegendList); the old non-virtualized ComboboxList path and the >40 item threshold are removed. Top/bottom scroll fade masks toggle from scroll position via LegendListonScroll / onLayout (same mask pattern as ModelPickerContent). Infinite load uses the list’s scroll node (getScrollableNode) and onEndReached, with maybeFetchNextBranchPage also on scroll/layout and when refs.length changes. Opening or changing the deferred search query scrolls the list to top; fades reset when the menu closes.

Row layout tweaks: tighter right padding on items and truncate-friendly ref name + muted kind labels (current/remote/worktree/default) unchanged in style per review.

^{Reviewed by Cursor Bugbot for commit a9cfbec. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Polish branch picker trigger, scroll fades, and list layout in BranchToolbarBranchSelector

• The branch list is now always virtualized via LegendList, removing the conditional shouldVirtualizeBranchList path.
• Top/bottom CSS mask fades are applied to the list container and updated on scroll, open, and query change; scroll position resets to top on open or query change.
• Infinite-scroll page fetches (maybeFetchNextBranchPage) are now triggered on list layout and scroll events in addition to onEndReached.
• The trigger button adds a GitBranchIcon and updates chevron size/opacity; the popup header gets a SearchIcon with unstyled ComboboxInput.

^{Macroscope summarized a9cfbec.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 79d02643-07f7-4f11-94c0-b752155da648

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch ui/branch-picker

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

🚀 Expo continuous deployment is ready!

• Project → t3-code
• Platforms → android, ios
• Scheme → t3code-preview

	🤖 Android	🍎 iOS
Fingerprint	ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e	313e506a7f15a9c3f15b01d787d68a12382432bf
Build Details	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update Details	Update Permalink Details Branch: pr-3024 Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Update Permalink Details Branch: pr-3024 Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update QR

[macroscopeapp]

Approvability

Verdict: Needs human review

An unresolved review comment identifies a medium-severity pagination bug where branch loading may get stuck after removing the initial scroll check. This functional concern warrants human review despite the otherwise straightforward UI polish nature of the changes.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate e23b876

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Stale scroll fade after reset
  • Added a requestAnimationFrame callback after the programmatic scrollToOffset reset to call syncBranchListScrollChrome, ensuring the bottom fade gradient is recalculated after the scroll position changes.

Or push these changes by commenting:

@cursor push ed2bfad791

Preview (ed2bfad791)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -511,8 +511,18 @@
} else {
branchListScrollElementRef.current?.scrollTo({ top: 0 });
}
- }, [deferredTrimmedBranchQuery, isBranchMenuOpen, shouldVirtualizeBranchList]);+ const frame = requestAnimationFrame(() => {+ syncBranchListScrollChrome(branchListScrollElementRef.current);+ });+ return () => cancelAnimationFrame(frame);+ }, [+ deferredTrimmedBranchQuery,+ isBranchMenuOpen,+ shouldVirtualizeBranchList,+ syncBranchListScrollChrome,+ ]);+
useEffect(() => {
const scrollElement = branchListScrollElementRef.current;
if (!scrollElement || !isBranchMenuOpen || shouldVirtualizeBranchList) {

_{You can send follow-ups to the cloud agent here.}

Dismissing prior approval to re-evaluate 5a9bcd2

[cursor]

Cursor Bugbot has reviewed your changes and found 2 potential issues.

Bugbot Autofix prepared fixes for both issues found in the latest run.

• ✅ Fixed: Pagination stuck without initial check
  • Added maybeFetchNextBranchPage() call in the LegendList onLayout handler so that when the list first renders with items that don't fill the viewport, pagination is triggered even if onEndReached doesn't fire.
• ✅ Fixed: Scroll fade stale after search
  • Added deferredTrimmedBranchQuery to the useLayoutEffect dependency array so scroll fades are remeasured whenever the search query changes, even when the filtered item count stays the same.

Or push these changes by commenting:

@cursor push 984fc7e65f

Preview (984fc7e65f)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -489,7 +489,12 @@
cancelAnimationFrame(frame);
cancelAnimationFrame(nestedFrame);
};
- }, [filteredBranchPickerItems.length, isBranchMenuOpen, updateBranchListScrollFades]);+ }, [+ deferredTrimmedBranchQuery,+ filteredBranchPickerItems.length,+ isBranchMenuOpen,+ updateBranchListScrollFades,+ ]);
useEffect(() => {
if (!isBranchMenuOpen) {
@@ -649,7 +654,10 @@
fetchNextBranchPage();
}
}}
- onLayout={updateBranchListScrollFades}+ onLayout={() => {+ updateBranchListScrollFades();+ maybeFetchNextBranchPage();+ }}
onScroll={() => {
updateBranchListScrollFades();
maybeFetchNextBranchPage();

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 5a9bcd2. Configure here.}

[juliusmarminge]

@cursor push 984fc7e

[juliusmarminge]

Ports the branch-picker part of #2451 by @sandersonstabo, rebased onto current main.

• Branch selector trigger gets a properly-sized leading GitBranchIcon (matching the workspace selector next to it) and a consistent chevron
• Popup restructured with a stable scroll region; virtualized branch lists get a bottom gradient scroll hint driven by scroll position, and infinite loading now triggers from the virtualized list's own scroll events
• Rows use a flush truncate/right-edge layout (pe-2 items, list edge paddings)

Deviations per review feedback on #2451: the kind labels (current/remote/worktree/default) stay as plain muted text (Theo found the badge treatment too loud), and the separator between search and list is kept ("I liked the separator…").

Part of splitting #2451 into reviewable frontend-only pieces.

🤖 Generated with Claude Code

---

Note

Low Risk
Frontend-only combobox layout and scroll UX in one component; branch checkout/create behavior is unchanged aside from list plumbing.

Overview
Polishes the branch/ref picker in BranchToolbarBranchSelector: trigger styling, popup layout, and how the ref list scrolls and loads more pages.

The trigger adds a leading GitBranchIcon and a smaller chevron so it aligns with nearby workspace UI. The popup is a fixed flex column with a search row (leading SearchIcon, bottom border separator, unstyled input) above a dedicated scroll region.

The ref list always uses virtualization (Comboboxvirtualized + LegendList); the old non-virtualized ComboboxList path and the >40 item threshold are removed. Top/bottom scroll fade masks toggle from scroll position via LegendListonScroll / onLayout (same mask pattern as ModelPickerContent). Infinite load uses the list’s scroll node (getScrollableNode) and onEndReached, with maybeFetchNextBranchPage also on scroll/layout and when refs.length changes. Opening or changing the deferred search query scrolls the list to top; fades reset when the menu closes.

Row layout tweaks: tighter right padding on items and truncate-friendly ref name + muted kind labels (current/remote/worktree/default) unchanged in style per review.

^{Reviewed by Cursor Bugbot for commit a9cfbec. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Polish branch picker trigger, scroll fades, and list layout in BranchToolbarBranchSelector

• The branch list is now always virtualized via LegendList, removing the conditional shouldVirtualizeBranchList path.
• Top/bottom CSS mask fades are applied to the list container and updated on scroll, open, and query change; scroll position resets to top on open or query change.
• Infinite-scroll page fetches (maybeFetchNextBranchPage) are now triggered on list layout and scroll events in addition to onEndReached.
• The trigger button adds a GitBranchIcon and updates chevron size/opacity; the popup header gets a SearchIcon with unstyled ComboboxInput.

^{Macroscope summarized a9cfbec.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 79d02643-07f7-4f11-94c0-b752155da648

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch ui/branch-picker

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

🚀 Expo continuous deployment is ready!

• Project → t3-code
• Platforms → android, ios
• Scheme → t3code-preview

	🤖 Android	🍎 iOS
Fingerprint	ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e	313e506a7f15a9c3f15b01d787d68a12382432bf
Build Details	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update Details	Update Permalink Details Branch: pr-3024 Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Update Permalink Details Branch: pr-3024 Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update QR

[macroscopeapp]

Approvability

Verdict: Needs human review

An unresolved review comment identifies a medium-severity pagination bug where branch loading may get stuck after removing the initial scroll check. This functional concern warrants human review despite the otherwise straightforward UI polish nature of the changes.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate e23b876

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Stale scroll fade after reset
  • Added a requestAnimationFrame callback after the programmatic scrollToOffset reset to call syncBranchListScrollChrome, ensuring the bottom fade gradient is recalculated after the scroll position changes.

Or push these changes by commenting:

@cursor push ed2bfad791

Preview (ed2bfad791)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -511,8 +511,18 @@
} else {
branchListScrollElementRef.current?.scrollTo({ top: 0 });
}
- }, [deferredTrimmedBranchQuery, isBranchMenuOpen, shouldVirtualizeBranchList]);+ const frame = requestAnimationFrame(() => {+ syncBranchListScrollChrome(branchListScrollElementRef.current);+ });+ return () => cancelAnimationFrame(frame);+ }, [+ deferredTrimmedBranchQuery,+ isBranchMenuOpen,+ shouldVirtualizeBranchList,+ syncBranchListScrollChrome,+ ]);+
useEffect(() => {
const scrollElement = branchListScrollElementRef.current;
if (!scrollElement || !isBranchMenuOpen || shouldVirtualizeBranchList) {

_{You can send follow-ups to the cloud agent here.}

Dismissing prior approval to re-evaluate 5a9bcd2

[cursor]

Cursor Bugbot has reviewed your changes and found 2 potential issues.

Bugbot Autofix prepared fixes for both issues found in the latest run.

• ✅ Fixed: Pagination stuck without initial check
  • Added maybeFetchNextBranchPage() call in the LegendList onLayout handler so that when the list first renders with items that don't fill the viewport, pagination is triggered even if onEndReached doesn't fire.
• ✅ Fixed: Scroll fade stale after search
  • Added deferredTrimmedBranchQuery to the useLayoutEffect dependency array so scroll fades are remeasured whenever the search query changes, even when the filtered item count stays the same.

Or push these changes by commenting:

@cursor push 984fc7e65f

Preview (984fc7e65f)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -489,7 +489,12 @@
cancelAnimationFrame(frame);
cancelAnimationFrame(nestedFrame);
};
- }, [filteredBranchPickerItems.length, isBranchMenuOpen, updateBranchListScrollFades]);+ }, [+ deferredTrimmedBranchQuery,+ filteredBranchPickerItems.length,+ isBranchMenuOpen,+ updateBranchListScrollFades,+ ]);
useEffect(() => {
if (!isBranchMenuOpen) {
@@ -649,7 +654,10 @@
fetchNextBranchPage();
}
}}
- onLayout={updateBranchListScrollFades}+ onLayout={() => {+ updateBranchListScrollFades();+ maybeFetchNextBranchPage();+ }}
onScroll={() => {
updateBranchListScrollFades();
maybeFetchNextBranchPage();

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 5a9bcd2. Configure here.}

[juliusmarminge]

@cursor push 984fc7e

[juliusmarminge]

Ports the branch-picker part of #2451 by @sandersonstabo, rebased onto current main.

• Branch selector trigger gets a properly-sized leading GitBranchIcon (matching the workspace selector next to it) and a consistent chevron
• Popup restructured with a stable scroll region; virtualized branch lists get a bottom gradient scroll hint driven by scroll position, and infinite loading now triggers from the virtualized list's own scroll events
• Rows use a flush truncate/right-edge layout (pe-2 items, list edge paddings)

Deviations per review feedback on #2451: the kind labels (current/remote/worktree/default) stay as plain muted text (Theo found the badge treatment too loud), and the separator between search and list is kept ("I liked the separator…").

Part of splitting #2451 into reviewable frontend-only pieces.

🤖 Generated with Claude Code

---

Note

Low Risk
Frontend-only combobox layout and scroll UX in one component; branch checkout/create behavior is unchanged aside from list plumbing.

Overview
Polishes the branch/ref picker in BranchToolbarBranchSelector: trigger styling, popup layout, and how the ref list scrolls and loads more pages.

The trigger adds a leading GitBranchIcon and a smaller chevron so it aligns with nearby workspace UI. The popup is a fixed flex column with a search row (leading SearchIcon, bottom border separator, unstyled input) above a dedicated scroll region.

The ref list always uses virtualization (Comboboxvirtualized + LegendList); the old non-virtualized ComboboxList path and the >40 item threshold are removed. Top/bottom scroll fade masks toggle from scroll position via LegendListonScroll / onLayout (same mask pattern as ModelPickerContent). Infinite load uses the list’s scroll node (getScrollableNode) and onEndReached, with maybeFetchNextBranchPage also on scroll/layout and when refs.length changes. Opening or changing the deferred search query scrolls the list to top; fades reset when the menu closes.

Row layout tweaks: tighter right padding on items and truncate-friendly ref name + muted kind labels (current/remote/worktree/default) unchanged in style per review.

^{Reviewed by Cursor Bugbot for commit a9cfbec. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Polish branch picker trigger, scroll fades, and list layout in BranchToolbarBranchSelector

• The branch list is now always virtualized via LegendList, removing the conditional shouldVirtualizeBranchList path.
• Top/bottom CSS mask fades are applied to the list container and updated on scroll, open, and query change; scroll position resets to top on open or query change.
• Infinite-scroll page fetches (maybeFetchNextBranchPage) are now triggered on list layout and scroll events in addition to onEndReached.
• The trigger button adds a GitBranchIcon and updates chevron size/opacity; the popup header gets a SearchIcon with unstyled ComboboxInput.

^{Macroscope summarized a9cfbec.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 79d02643-07f7-4f11-94c0-b752155da648

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch ui/branch-picker

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

🚀 Expo continuous deployment is ready!

• Project → t3-code
• Platforms → android, ios
• Scheme → t3code-preview

	🤖 Android	🍎 iOS
Fingerprint	ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e	313e506a7f15a9c3f15b01d787d68a12382432bf
Build Details	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Build Permalink Details Distribution: INTERNAL Build profile: preview:dev Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf App version: 0.1.0 Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update Details	Update Permalink Details Branch: pr-3024 Runtime version: ae17d94b35f91f9c608a63dadbc3ddd9f4ba056e Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1	Update Permalink Details Branch: pr-3024 Runtime version: 313e506a7f15a9c3f15b01d787d68a12382432bf Git commit: 9974c500658ec2d2a2e1b45ff7c28fc73607d7d1
Update QR

[macroscopeapp]

Approvability

Verdict: Needs human review

An unresolved review comment identifies a medium-severity pagination bug where branch loading may get stuck after removing the initial scroll check. This functional concern warrants human review despite the otherwise straightforward UI polish nature of the changes.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate e23b876

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Stale scroll fade after reset
  • Added a requestAnimationFrame callback after the programmatic scrollToOffset reset to call syncBranchListScrollChrome, ensuring the bottom fade gradient is recalculated after the scroll position changes.

Or push these changes by commenting:

@cursor push ed2bfad791

Preview (ed2bfad791)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -511,8 +511,18 @@
} else {
branchListScrollElementRef.current?.scrollTo({ top: 0 });
}
- }, [deferredTrimmedBranchQuery, isBranchMenuOpen, shouldVirtualizeBranchList]);+ const frame = requestAnimationFrame(() => {+ syncBranchListScrollChrome(branchListScrollElementRef.current);+ });+ return () => cancelAnimationFrame(frame);+ }, [+ deferredTrimmedBranchQuery,+ isBranchMenuOpen,+ shouldVirtualizeBranchList,+ syncBranchListScrollChrome,+ ]);+
useEffect(() => {
const scrollElement = branchListScrollElementRef.current;
if (!scrollElement || !isBranchMenuOpen || shouldVirtualizeBranchList) {

_{You can send follow-ups to the cloud agent here.}

Dismissing prior approval to re-evaluate 5a9bcd2

[cursor]

Cursor Bugbot has reviewed your changes and found 2 potential issues.

Bugbot Autofix prepared fixes for both issues found in the latest run.

• ✅ Fixed: Pagination stuck without initial check
  • Added maybeFetchNextBranchPage() call in the LegendList onLayout handler so that when the list first renders with items that don't fill the viewport, pagination is triggered even if onEndReached doesn't fire.
• ✅ Fixed: Scroll fade stale after search
  • Added deferredTrimmedBranchQuery to the useLayoutEffect dependency array so scroll fades are remeasured whenever the search query changes, even when the filtered item count stays the same.

Or push these changes by commenting:

@cursor push 984fc7e65f

Preview (984fc7e65f)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -489,7 +489,12 @@
cancelAnimationFrame(frame);
cancelAnimationFrame(nestedFrame);
};
- }, [filteredBranchPickerItems.length, isBranchMenuOpen, updateBranchListScrollFades]);+ }, [+ deferredTrimmedBranchQuery,+ filteredBranchPickerItems.length,+ isBranchMenuOpen,+ updateBranchListScrollFades,+ ]);
useEffect(() => {
if (!isBranchMenuOpen) {
@@ -649,7 +654,10 @@
fetchNextBranchPage();
}
}}
- onLayout={updateBranchListScrollFades}+ onLayout={() => {+ updateBranchListScrollFades();+ maybeFetchNextBranchPage();+ }}
onScroll={() => {
updateBranchListScrollFades();
maybeFetchNextBranchPage();

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 5a9bcd2. Configure here.}

[juliusmarminge]

@cursor push 984fc7e