From db939fa639ab7b80450c4d6d48e9ea43ea7a8de4 Mon Sep 17 00:00:00 2001
From: daniel-lxs <ricciodaniel98@gmail.com>
Date: Tue, 13 Jan 2026 17:12:02 -0500
Subject: [PATCH] fix: clear approval buttons when API request starts

Previously, approval buttons (Save/Deny) would persist after a tool ask
when a new API request started. The api_req_started handler was only
clearing button state when secondLastMessage?.ask === 'command_output'.

Now the handler always clears button state when a new API request starts,
ensuring buttons don't persist incorrectly.

Fixes ROO-526
---
 webview-ui/src/components/chat/ChatView.tsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index 89c4209b96d..8f34de2cda3 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -402,12 +402,14 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 							setSendingDisabled(true)
 							break
 						case "api_req_started":
-							if (secondLastMessage?.ask === "command_output") {
-								setSendingDisabled(true)
-								setSelectedImages([])
-								setClineAsk(undefined)
-								setEnableButtons(false)
-							}
+							// Clear button state when a new API request starts
+							// This fixes buttons persisting when the task continues
+							setSendingDisabled(true)
+							setSelectedImages([])
+							setClineAsk(undefined)
+							setEnableButtons(false)
+							setPrimaryButtonText(undefined)
+							setSecondaryButtonText(undefined)
 							break
 						case "api_req_finished":
 						case "error":