From 7a03cfff36286120a10e42c4655025cb418848e9 Mon Sep 17 00:00:00 2001
From: xintaofei <itpkcn@gmail.com>
Date: Wed, 22 Apr 2026 22:56:36 +0800
Subject: [PATCH] fix(branch-picker): strip remote prefix when checking out
 remote branches

---
 .../chat/conversation-context-bar.tsx         | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/components/chat/conversation-context-bar.tsx b/src/components/chat/conversation-context-bar.tsx
index aece189..203caac 100644
--- a/src/components/chat/conversation-context-bar.tsx
+++ b/src/components/chat/conversation-context-bar.tsx
@@ -301,21 +301,28 @@ const BranchPicker = memo(function BranchPicker({
                       count: branchList.remote.length,
                     })}
                   >
-                    {branchList.remote.map((b) => (
-                      <CommandItem
-                        key={`remote-${b}`}
-                        value={`remote ${b}`}
-                        onSelect={() => {
-                          setOpen(false)
-                          void onCheckout(b)
-                        }}
-                      >
-                        <GitBranch className="h-4 w-4 opacity-60" />
-                        <span className="flex-1 truncate text-muted-foreground">
-                          {b}
-                        </span>
-                      </CommandItem>
-                    ))}
+                    {branchList.remote.map((b) => {
+                      const localName = b.replace(/^[^/]+\//, "")
+                      return (
+                        <CommandItem
+                          key={`remote-${b}`}
+                          value={`remote ${b}`}
+                          onSelect={() => {
+                            setOpen(false)
+                            if (localName !== currentBranch)
+                              void onCheckout(localName)
+                          }}
+                        >
+                          <GitBranch className="h-4 w-4 opacity-60" />
+                          <span className="flex-1 truncate text-muted-foreground">
+                            {b}
+                          </span>
+                          {localName === currentBranch && (
+                            <Check className="h-4 w-4 shrink-0" />
+                          )}
+                        </CommandItem>
+                      )
+                    })}
                   </CommandGroup>
                 )}
               </>