From 236d09f33410cc6f4a12bfd8326fc34ef4406837 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Fri, 24 Apr 2026 16:14:09 -0400
Subject: [PATCH] fix(vscode): address sidebar worktree review feedback

---
 .../kilo-vscode/src/agent-manager/AgentManagerProvider.ts     | 3 +++
 .../kilo-vscode/webview-ui/src/components/chat/ChatView.tsx   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
index 5437543cb1a..788248d17db 100644
--- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
+++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
@@ -1539,6 +1539,9 @@ export class AgentManagerProvider implements Disposable {
 
   public async createFromSidebar(baseBranch?: string, branchName?: string): Promise<void> {
     this.openPanel()
+    const panel = this.panel
+    if (!panel) return
+    await panel.waitForReady()
     await this.waitForStateReady("createFromSidebar")
     await this.onCreateWorktree(baseBranch, branchName)
   }
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/ChatView.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/ChatView.tsx
index 79878380506..3aff744b269 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/ChatView.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/ChatView.tsx
@@ -143,7 +143,7 @@ export const ChatView: Component<ChatViewProps> = (props) => {
   const startWorktree = () => vscode.postMessage({ type: "agentManager.createWorktree" })
 
   const startWorktreeFromBranch = () =>
-    vscode.postMessage({ type: "agentManager.createWorktree", baseBranch: repoBranch() || undefined })
+    vscode.postMessage({ type: "agentManager.createWorktree", baseBranch: repoBranch()! })
 
   const openAgentManager = () => vscode.postMessage({ type: "openAgentManager" })
 
@@ -238,7 +238,7 @@ export const ChatView: Component<ChatViewProps> = (props) => {
               </Tooltip>
               <DropdownMenu.Portal>
                 <DropdownMenu.Content class="session-worktree-split-menu">
-                  <DropdownMenu.Item onSelect={startWorktreeFromBranch}>
+                  <DropdownMenu.Item disabled={!repoBranch()} onSelect={startWorktreeFromBranch}>
                     <span class="session-worktree-menu-gap" aria-hidden="true" />
                     <DropdownMenu.ItemLabel class="session-worktree-menu-label">
                       <span>{language.t("sidebar.session.newWorktree.from")}</span>