From b63844bc856498e6ae8c3cfbb47013557999781d Mon Sep 17 00:00:00 2001
From: Ewan <ewanjordaan07@gmail.com>
Date: Fri, 13 Mar 2026 14:20:17 +0200
Subject: [PATCH 1/9] fix(windows): windows branch switch ui broken

(cherry picked from commit 72366909d92601619a2e4d54fbd63cd1a3fe71f4)
---
 apps/web/src/components/BranchToolbarBranchSelector.tsx | 1 -
 apps/web/src/components/ui/autocomplete.tsx             | 2 +-
 apps/web/src/components/ui/combobox.tsx                 | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index b41ea0a6e1..c1a43adc90 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -397,7 +397,6 @@ export function BranchToolbarBranchSelector({
         key={itemValue}
         index={index}
         value={itemValue}
-        className={itemValue === resolvedActiveBranch ? "bg-accent text-foreground" : undefined}
         style={style}
         onClick={() => selectBranch(branch)}
       >
diff --git a/apps/web/src/components/ui/autocomplete.tsx b/apps/web/src/components/ui/autocomplete.tsx
index 98ad1e431a..89cfcd375f 100644
--- a/apps/web/src/components/ui/autocomplete.tsx
+++ b/apps/web/src/components/ui/autocomplete.tsx
@@ -125,7 +125,7 @@ function AutocompleteItem({ className, children, ...props }: AutocompletePrimiti
   return (
     <AutocompletePrimitive.Item
       className={cn(
-        "flex min-h-8 cursor-default select-none items-center rounded-sm px-2 py-1 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm",
+        "flex min-h-8 cursor-default select-none items-center rounded-sm px-2 py-1 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm",
         className,
       )}
       data-slot="autocomplete-item"
diff --git a/apps/web/src/components/ui/combobox.tsx b/apps/web/src/components/ui/combobox.tsx
index b092789821..a6d45c88cc 100644
--- a/apps/web/src/components/ui/combobox.tsx
+++ b/apps/web/src/components/ui/combobox.tsx
@@ -195,7 +195,7 @@ function ComboboxItem({
   return (
     <ComboboxPrimitive.Item
       className={cn(
-        "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+        "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
         className,
       )}
       data-slot="combobox-item"

From b649b4b58ac72954dbfb8f2f1a0c18e5894932bf Mon Sep 17 00:00:00 2001
From: Ewan <ewanjordaan07@gmail.com>
Date: Fri, 13 Mar 2026 22:37:56 +0200
Subject: [PATCH 2/9] Unify branch selector item highlight styling

- Apply shared hover/selected/highlight class to all branch combobox items
- Keep branch action rows and branch rows visually consistent in the selector

(cherry picked from commit 7fb763fdf06c66fdcf96e0d8a70d32fd15cfe79c)
---
 apps/web/src/components/BranchToolbarBranchSelector.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index c1a43adc90..70fc38b414 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -336,11 +336,14 @@ export function BranchToolbarBranchSelector({
     effectiveEnvMode,
     resolvedActiveBranch,
   });
+  const branchSelectorHighlightClassName =
+    "hover:bg-[#242424] hover:text-white data-selected:bg-[#242424] data-selected:text-white data-highlighted:bg-[#242424] data-highlighted:text-white";
 
   function renderPickerItem(itemValue: string, index: number, style?: CSSProperties) {
     if (checkoutPullRequestItemValue && itemValue === checkoutPullRequestItemValue) {
       return (
         <ComboboxItem
+          className={branchSelectorHighlightClassName}
           hideIndicator
           key={itemValue}
           index={index}
@@ -366,6 +369,7 @@ export function BranchToolbarBranchSelector({
     if (createBranchItemValue && itemValue === createBranchItemValue) {
       return (
         <ComboboxItem
+          className={branchSelectorHighlightClassName}
           hideIndicator
           key={itemValue}
           index={index}
@@ -393,6 +397,7 @@ export function BranchToolbarBranchSelector({
             : null;
     return (
       <ComboboxItem
+        className={branchSelectorHighlightClassName}
         hideIndicator
         key={itemValue}
         index={index}

From 65ced9aaa4fa72c9f8850690dcf4aa2c83eb7a3c Mon Sep 17 00:00:00 2001
From: Ewan <ewanjordaan07@gmail.com>
Date: Sat, 28 Mar 2026 00:07:22 +0200
Subject: [PATCH 3/9] fix(web): restore themed branch selector states

(cherry picked from commit 364a61f0384949dfee780673188edda553b37186)
---
 apps/web/src/components/BranchToolbarBranchSelector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index 70fc38b414..25bb021c9b 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -337,7 +337,7 @@ export function BranchToolbarBranchSelector({
     resolvedActiveBranch,
   });
   const branchSelectorHighlightClassName =
-    "hover:bg-[#242424] hover:text-white data-selected:bg-[#242424] data-selected:text-white data-highlighted:bg-[#242424] data-highlighted:text-white";
+    "hover:bg-accent hover:text-accent-foreground data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground";
 
   function renderPickerItem(itemValue: string, index: number, style?: CSSProperties) {
     if (checkoutPullRequestItemValue && itemValue === checkoutPullRequestItemValue) {

From 6de4a2ed68a2156be4d0ea0e651f7edaa3ff00c9 Mon Sep 17 00:00:00 2001
From: Ewan <ewanjordaan07@gmail.com>
Date: Sat, 28 Mar 2026 00:33:51 +0200
Subject: [PATCH 4/9] fix(web): tune selected branch row surface

(cherry picked from commit 377f62cb9060c726874d291f5b42ca5de5d87abf)
---
 apps/web/src/components/BranchToolbarBranchSelector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index 25bb021c9b..d30d10330f 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -337,7 +337,7 @@ export function BranchToolbarBranchSelector({
     resolvedActiveBranch,
   });
   const branchSelectorHighlightClassName =
-    "hover:bg-accent hover:text-accent-foreground data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground";
+    "hover:bg-accent hover:text-accent-foreground data-selected:bg-accent/50 dark:data-selected:bg-input/64 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground";
 
   function renderPickerItem(itemValue: string, index: number, style?: CSSProperties) {
     if (checkoutPullRequestItemValue && itemValue === checkoutPullRequestItemValue) {

From 55a4fd87e3a2bb0bf374cb27940efe9c49b89486 Mon Sep 17 00:00:00 2001
From: Ewan <ewanjordaan07@gmail.com>
Date: Sat, 28 Mar 2026 00:41:19 +0200
Subject: [PATCH 5/9] fix(web): align branch selector hover surface

(cherry picked from commit a449e613cc8ae432352a713ad37b7e81e4a624a9)
---
 apps/web/src/components/BranchToolbarBranchSelector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index d30d10330f..d4ad490a25 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -337,7 +337,7 @@ export function BranchToolbarBranchSelector({
     resolvedActiveBranch,
   });
   const branchSelectorHighlightClassName =
-    "hover:bg-accent hover:text-accent-foreground data-selected:bg-accent/50 dark:data-selected:bg-input/64 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground";
+    "hover:bg-accent dark:hover:bg-input/64 hover:text-accent-foreground data-selected:bg-accent/50 dark:data-selected:bg-input/64 data-selected:text-foreground data-highlighted:bg-accent dark:data-highlighted:bg-input/64 data-highlighted:text-accent-foreground";
 
   function renderPickerItem(itemValue: string, index: number, style?: CSSProperties) {
     if (checkoutPullRequestItemValue && itemValue === checkoutPullRequestItemValue) {

From 471976009c91f5a11b0f58af6e7704a3b0f45010 Mon Sep 17 00:00:00 2001
From: Ewan <ewanjordaan07@gmail.com>
Date: Sat, 28 Mar 2026 00:45:13 +0200
Subject: [PATCH 6/9] fix(web): use consistent branch selector highlight tone

(cherry picked from commit ef1bdc73ec0cd0b58623d67e35cec214bd87688a)
---
 apps/web/src/components/BranchToolbarBranchSelector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index d4ad490a25..b9e294456b 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -337,7 +337,7 @@ export function BranchToolbarBranchSelector({
     resolvedActiveBranch,
   });
   const branchSelectorHighlightClassName =
-    "hover:bg-accent dark:hover:bg-input/64 hover:text-accent-foreground data-selected:bg-accent/50 dark:data-selected:bg-input/64 data-selected:text-foreground data-highlighted:bg-accent dark:data-highlighted:bg-input/64 data-highlighted:text-accent-foreground";
+    "hover:bg-accent/50 hover:text-foreground data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent/50 data-highlighted:text-foreground";
 
   function renderPickerItem(itemValue: string, index: number, style?: CSSProperties) {
     if (checkoutPullRequestItemValue && itemValue === checkoutPullRequestItemValue) {

From 5e8b92ccb9b59ee6d3c1e1ffc36d32340df0f1e2 Mon Sep 17 00:00:00 2001
From: Ewan <ewanjordaan07@gmail.com>
Date: Sat, 28 Mar 2026 00:47:24 +0200
Subject: [PATCH 7/9] fix(web): use hover tone for selected branch rows

(cherry picked from commit 8b038844a68225d32209783e1a9bba111f88ec14)
---
 apps/web/src/components/BranchToolbarBranchSelector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index b9e294456b..6c2277e7fa 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -337,7 +337,7 @@ export function BranchToolbarBranchSelector({
     resolvedActiveBranch,
   });
   const branchSelectorHighlightClassName =
-    "hover:bg-accent/50 hover:text-foreground data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent/50 data-highlighted:text-foreground";
+    "hover:bg-accent hover:text-accent-foreground data-selected:bg-accent data-selected:text-accent-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground";
 
   function renderPickerItem(itemValue: string, index: number, style?: CSSProperties) {
     if (checkoutPullRequestItemValue && itemValue === checkoutPullRequestItemValue) {

From 03782998126282a2ae650758968c9c00290ad304 Mon Sep 17 00:00:00 2001
From: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Date: Mon, 30 Mar 2026 04:22:11 +0530
Subject: [PATCH 8/9] fix(web): keep branch selection distinct from hover

---
 apps/web/src/components/BranchToolbarBranchSelector.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index 6c2277e7fa..c1a43adc90 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -336,14 +336,11 @@ export function BranchToolbarBranchSelector({
     effectiveEnvMode,
     resolvedActiveBranch,
   });
-  const branchSelectorHighlightClassName =
-    "hover:bg-accent hover:text-accent-foreground data-selected:bg-accent data-selected:text-accent-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground";
 
   function renderPickerItem(itemValue: string, index: number, style?: CSSProperties) {
     if (checkoutPullRequestItemValue && itemValue === checkoutPullRequestItemValue) {
       return (
         <ComboboxItem
-          className={branchSelectorHighlightClassName}
           hideIndicator
           key={itemValue}
           index={index}
@@ -369,7 +366,6 @@ export function BranchToolbarBranchSelector({
     if (createBranchItemValue && itemValue === createBranchItemValue) {
       return (
         <ComboboxItem
-          className={branchSelectorHighlightClassName}
           hideIndicator
           key={itemValue}
           index={index}
@@ -397,7 +393,6 @@ export function BranchToolbarBranchSelector({
             : null;
     return (
       <ComboboxItem
-        className={branchSelectorHighlightClassName}
         hideIndicator
         key={itemValue}
         index={index}

From acfedc1859b62c871b8b0f25c534fc2c05a49145 Mon Sep 17 00:00:00 2001
From: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Date: Mon, 30 Mar 2026 04:36:56 +0530
Subject: [PATCH 9/9] fix(web): keep highlighted state stronger than selected

---
 apps/web/src/components/ui/autocomplete.tsx | 2 +-
 apps/web/src/components/ui/combobox.tsx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/ui/autocomplete.tsx b/apps/web/src/components/ui/autocomplete.tsx
index 89cfcd375f..676db613ae 100644
--- a/apps/web/src/components/ui/autocomplete.tsx
+++ b/apps/web/src/components/ui/autocomplete.tsx
@@ -125,7 +125,7 @@ function AutocompleteItem({ className, children, ...props }: AutocompletePrimiti
   return (
     <AutocompletePrimitive.Item
       className={cn(
-        "flex min-h-8 cursor-default select-none items-center rounded-sm px-2 py-1 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm",
+        "flex min-h-8 cursor-default select-none items-center rounded-sm px-2 py-1 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-accent [&[data-highlighted][data-selected]]:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm",
         className,
       )}
       data-slot="autocomplete-item"
diff --git a/apps/web/src/components/ui/combobox.tsx b/apps/web/src/components/ui/combobox.tsx
index a6d45c88cc..8348d4c2fc 100644
--- a/apps/web/src/components/ui/combobox.tsx
+++ b/apps/web/src/components/ui/combobox.tsx
@@ -195,7 +195,7 @@ function ComboboxItem({
   return (
     <ComboboxPrimitive.Item
       className={cn(
-        "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+        "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-accent [&[data-highlighted][data-selected]]:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
         className,
       )}
       data-slot="combobox-item"