From a76ab9510361ed1ac40cc40d51817006ed6eac8e Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 27 Apr 2026 12:56:29 -0400
Subject: [PATCH] fix(vscode): improve chat toolbar changes button

---
 .changeset/chat-toolbar-changes.md            |  5 +
 .../src/components/chat/ChatView.tsx          | 25 +++--
 .../webview-ui/src/styles/session-actions.css | 98 ++++++++++---------
 3 files changed, 68 insertions(+), 60 deletions(-)
 create mode 100644 .changeset/chat-toolbar-changes.md

diff --git a/.changeset/chat-toolbar-changes.md b/.changeset/chat-toolbar-changes.md
new file mode 100644
index 0000000000..2a9d574980
--- /dev/null
+++ b/.changeset/chat-toolbar-changes.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Improve the sidebar chat toolbar so the changes button collapses cleanly and keeps diff stats visible in its tooltip.
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 b25e566cc0..ba1523182b 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/ChatView.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/ChatView.tsx
@@ -172,17 +172,15 @@ export const ChatView: Component<ChatViewProps> = (props) => {
   const changesTooltip = () => {
     const stats = session.worktreeStats()
     if (!stats?.files) return language.t("sidebar.session.showChanges.tooltip.empty")
-    if (stats.files === 1) {
-      return language.t("sidebar.session.showChanges.tooltip.one", {
-        additions: stats.additions,
-        deletions: stats.deletions,
-      })
-    }
-    return language.t("sidebar.session.showChanges.tooltip.other", {
-      files: stats.files,
-      additions: stats.additions,
-      deletions: stats.deletions,
-    })
+    return (
+      <span class="session-changes-tooltip">
+        <span>{stats.files === 1 ? "1 file changed" : `${stats.files} files changed`}</span>
+        <span class="session-changes-tooltip-separator">·</span>
+        <span class="session-diff-add">+{stats.additions}</span>
+        <span class="session-diff-del">-{stats.deletions}</span>
+        <span>Open the changes view.</span>
+      </span>
+    )
   }
 
   const showAdvancedWorktree = () => vscode.postMessage({ type: "openAdvancedWorktree" })
@@ -260,7 +258,7 @@ export const ChatView: Component<ChatViewProps> = (props) => {
           </div>
         </Show>
         <Show when={hasChat && canContinueInWorktree() && server.gitInstalled()}>
-          <div class="session-move-group">
+          <>
             <Tooltip value={moveTooltip()} placement="top">
               <Button
                 variant="ghost"
@@ -294,10 +292,11 @@ export const ChatView: Component<ChatViewProps> = (props) => {
                 <Show when={session.worktreeStats()?.files}>
                   <span class="session-diff-add">+{session.worktreeStats()!.additions}</span>
                   <span class="session-diff-del">-{session.worktreeStats()!.deletions}</span>
+                  <span class="session-move-dot" aria-hidden="true" />
                 </Show>
               </Button>
             </Tooltip>
-          </div>
+          </>
         </Show>
       </div>
     </div>
diff --git a/packages/kilo-vscode/webview-ui/src/styles/session-actions.css b/packages/kilo-vscode/webview-ui/src/styles/session-actions.css
index 63080056b6..303de23864 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/session-actions.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/session-actions.css
@@ -20,7 +20,7 @@
   display: flex;
   gap: 4px;
   align-items: center;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
   min-height: 22px;
   justify-content: flex-start;
 }
@@ -188,56 +188,27 @@
   font-weight: 600;
 }
 
-.session-move-group {
-  display: flex;
-  flex: 0 0 auto;
-  align-items: center;
-  gap: 2px;
-  border-radius: var(--session-action-radius);
-  color: var(--vscode-descriptionForeground);
-  transition:
-    background-color 150ms ease,
-    color 150ms ease;
-}
-
-.session-move-group > [data-component="tooltip-trigger"] {
-  display: flex;
-  flex: 0 0 auto;
-}
-
-.session-move-group:hover,
-.session-move-group:has(.session-move-action:focus-visible),
-.session-move-group:has(.session-move-changes:focus-visible) {
-  color: var(--vscode-foreground);
-}
-
-.session-move-group:hover .session-move-action,
-.session-move-group:hover .session-move-changes,
-.session-move-group:has(.session-move-action:focus-visible) .session-move-action,
-.session-move-group:has(.session-move-action:focus-visible) .session-move-changes,
-.session-move-group:has(.session-move-changes:focus-visible) .session-move-action,
-.session-move-group:has(.session-move-changes:focus-visible) .session-move-changes {
-  background: var(--surface-interactive-hover, var(--vscode-list-hoverBackground));
-}
-
 .session-move-action {
   display: flex;
   flex: 0 0 auto;
   align-items: center;
   justify-content: center;
   gap: 5px;
-  border-radius: var(--session-action-radius) 0 0 var(--session-action-radius);
-  color: inherit;
+  border-radius: var(--session-action-radius);
+  color: var(--vscode-descriptionForeground);
   padding: 4px 6px !important;
   background: transparent;
   box-shadow: none;
+  transition:
+    background-color 150ms ease,
+    color 150ms ease;
 }
 
 .session-move-action:hover:not(:disabled),
 .session-move-action:focus-visible:not(:disabled),
 .session-move-action:active:not(:disabled) {
-  color: inherit;
-  background: inherit;
+  color: var(--vscode-foreground);
+  background: var(--surface-interactive-hover, var(--vscode-list-hoverBackground));
   box-shadow: none;
 }
 
@@ -258,18 +229,23 @@
   align-items: center;
   gap: 3px;
   flex: 0 0 auto;
-  border-radius: 0 var(--session-action-radius) var(--session-action-radius) 0;
-  color: inherit;
+  overflow: hidden;
+  position: relative;
+  border-radius: var(--session-action-radius);
+  color: var(--vscode-descriptionForeground);
   padding: 4px 6px !important;
   background: transparent;
   box-shadow: none;
+  transition:
+    background-color 150ms ease,
+    color 150ms ease;
 }
 
 .session-move-changes:hover:not(:disabled),
 .session-move-changes:focus-visible:not(:disabled),
 .session-move-changes:active:not(:disabled) {
-  color: inherit;
-  background: inherit;
+  color: var(--vscode-foreground);
+  background: var(--surface-interactive-hover, var(--vscode-list-hoverBackground));
   box-shadow: none;
 }
 
@@ -283,6 +259,17 @@
   opacity: 0.7;
 }
 
+.session-move-dot {
+  position: absolute;
+  top: 4px;
+  right: 5px;
+  width: 5px;
+  height: 5px;
+  border-radius: 999px;
+  background: #34d399;
+  opacity: 0;
+}
+
 /* Diff stats badge styles retained for the inline move button stats */
 .session-diff-badge {
   display: flex;
@@ -325,10 +312,23 @@
   color: #f87171;
 }
 
-/* Collapse diff stats to icon-only when truly narrow */
-@container (max-width: 300px) {
+.session-changes-tooltip {
+  display: inline-flex;
+  align-items: baseline;
+  flex-wrap: wrap;
+  column-gap: 4px;
+  row-gap: 2px;
+}
+
+.session-changes-tooltip-separator {
+  color: var(--vscode-descriptionForeground);
+}
+
+/* Collapse diff stats to icon-only before the row wraps. */
+@container (max-width: 420px) {
   .session-actions-row {
     gap: 4px;
+    flex-wrap: wrap;
   }
 
   .session-actions-row > *,
@@ -341,17 +341,21 @@
   }
 
   .session-move-changes {
-    gap: 2px;
+    gap: 0;
+    width: 26px;
+    min-width: 26px;
     padding-left: 5px !important;
     padding-right: 5px !important;
   }
 
   .session-diff-add,
   .session-diff-del {
-    position: relative;
+    width: 0;
+    opacity: 0;
+    overflow: hidden;
   }
 
-  .session-move-label {
-    max-width: 116px;
+  .session-move-dot {
+    opacity: 1;
   }
 }