From e3c540e9c130b447093b8cd522a8bacaa4571e5b Mon Sep 17 00:00:00 2001
From: Bohdan Triapitsyn <artmore@protonmail.com>
Date: Tue, 2 Jun 2026 16:54:52 +0300
Subject: [PATCH] fix: clean up draft branch dropdown

Avoids repeating the project root branch under Worktrees
Adjusts the dropdown width for empty worktree lists
---
 packages/ui/src/components/chat/ChatInput.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/components/chat/ChatInput.tsx b/packages/ui/src/components/chat/ChatInput.tsx
index ee0f63fb..a2b7cace 100644
--- a/packages/ui/src/components/chat/ChatInput.tsx
+++ b/packages/ui/src/components/chat/ChatInput.tsx
@@ -3693,7 +3693,7 @@ const ChatInputComponent: React.FC<ChatInputProps> = ({ onOpenSettings, scrollTo
             rootBranch: selectedDraftProjectCurrentBranch,
             worktrees,
             pendingBootstrapDirectory: newSessionDraft?.bootstrapPendingDirectory ?? null,
-        });
+        }).filter((option) => option.kind === 'worktree');
     }, [availableWorktreesByProject, newSessionDraft?.bootstrapPendingDirectory, selectedDraftProject, selectedDraftProjectCurrentBranch, selectedDraftProjectPath]);
 
     const selectedDraftDirectory = React.useMemo(
@@ -4170,7 +4170,7 @@ const ChatInputComponent: React.FC<ChatInputProps> = ({ onOpenSettings, scrollTo
                                         {selectedDraftBranchLabel ?? t('chat.chatInput.branch')}
                                     </SelectValue>
                                 </SelectTrigger>
-                                <SelectContent fitContent>
+                                <SelectContent className="w-max min-w-48">
                                     {projectRootBranchOption ? (
                                         <SelectGroup>
                                             <SelectLabel>{t('chat.chatInput.projectRoot')}</SelectLabel>