From efa48c8cda9e81cdc1dccc841f1bd237976428c2 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Wed, 19 Aug 2026 16:32:39 +0200
Subject: [PATCH 1/3] fix(vscode): keep tool output actions visible

---
 .changeset/fix-tool-output-actions.md            | 5 +++++
 packages/kilo-ui/src/components/message-part.css | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/fix-tool-output-actions.md

diff --git a/.changeset/fix-tool-output-actions.md b/.changeset/fix-tool-output-actions.md
new file mode 100644
index 000000000000..e8a1b6662ca8
--- /dev/null
+++ b/.changeset/fix-tool-output-actions.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Keep tool-output action buttons visible above streamed output.
diff --git a/packages/kilo-ui/src/components/message-part.css b/packages/kilo-ui/src/components/message-part.css
index c7991e939220..af7f9c9bd937 100644
--- a/packages/kilo-ui/src/components/message-part.css
+++ b/packages/kilo-ui/src/components/message-part.css
@@ -291,10 +291,14 @@ html[data-theme="kilo-vscode"] [data-component="bash-output"] {
 [data-component="bash-output"] [data-slot="bash-section-actions"] {
   position: absolute;
   top: 4px;
-  right: 4px;
+  right: 16px;
+  z-index: 1;
   display: flex;
   align-items: center;
   gap: 2px;
+  padding: 2px;
+  border-radius: var(--radius-sm);
+  background: var(--surface-tool-output-base);
   opacity: 0;
   pointer-events: none;
   transition: opacity 0.15s ease;

From 01049be141f207927f3c5183342276d67fbc4dde Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Wed, 19 Aug 2026 16:58:02 +0200
Subject: [PATCH 2/3] fix(vscode): keep tool scrollbar at the edge

---
 packages/kilo-ui/src/components/message-part.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/kilo-ui/src/components/message-part.css b/packages/kilo-ui/src/components/message-part.css
index af7f9c9bd937..0940d322d272 100644
--- a/packages/kilo-ui/src/components/message-part.css
+++ b/packages/kilo-ui/src/components/message-part.css
@@ -286,12 +286,13 @@ html[data-theme="kilo-vscode"] [data-component="bash-output"] {
   overflow-y: auto;
   overflow-x: hidden;
   max-height: 240px;
+  scrollbar-gutter: stable;
 }
 
 [data-component="bash-output"] [data-slot="bash-section-actions"] {
   position: absolute;
   top: 4px;
-  right: 16px;
+  right: 20px;
   z-index: 1;
   display: flex;
   align-items: center;

From 515d40e90a733a93f6293ae8a8a55cbd33bdced0 Mon Sep 17 00:00:00 2001
From: marius-kilocode <marius@kilocode.ai>
Date: Wed, 19 Aug 2026 17:59:02 +0200
Subject: [PATCH 3/3] fix(vscode): remove extra tool output gutter

---
 packages/kilo-ui/src/components/message-part.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/kilo-ui/src/components/message-part.css b/packages/kilo-ui/src/components/message-part.css
index 0940d322d272..e00294fc7290 100644
--- a/packages/kilo-ui/src/components/message-part.css
+++ b/packages/kilo-ui/src/components/message-part.css
@@ -286,7 +286,6 @@ html[data-theme="kilo-vscode"] [data-component="bash-output"] {
   overflow-y: auto;
   overflow-x: hidden;
   max-height: 240px;
-  scrollbar-gutter: stable;
 }
 
 [data-component="bash-output"] [data-slot="bash-section-actions"] {