From bacf751b7b286859fd2a57120e3ed270008dd8b4 Mon Sep 17 00:00:00 2001
From: hannesrudolph <hrudolph@gmail.com>
Date: Mon, 14 Jul 2025 15:28:07 -0600
Subject: [PATCH] fix: correct toggle behavior for allow/deny command buttons

- Fixed mutual exclusivity logic in CommandExecution handlers
- When allowing a command, it now removes from deny list automatically
- When denying a command, it now removes from allow list automatically
- Simplified CommandPatternSelector to rely on handlers for state management
---
 .../src/components/chat/CommandExecution.tsx  | 60 ++++++++++++-------
 .../chat/CommandPatternSelector.tsx           | 14 +----
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/webview-ui/src/components/chat/CommandExecution.tsx b/webview-ui/src/components/chat/CommandExecution.tsx
index dca2a9d923..8dc2b6669d 100644
--- a/webview-ui/src/components/chat/CommandExecution.tsx
+++ b/webview-ui/src/components/chat/CommandExecution.tsx
@@ -247,23 +247,33 @@ export const CommandExecution = ({ executionId, text, icon, title }: CommandExec
 			if (!pattern) return
 
 			const isWhitelisted = allowedCommands.includes(pattern)
-			let updatedAllowedCommands: string[]
 
 			if (isWhitelisted) {
 				// Remove from whitelist
-				updatedAllowedCommands = allowedCommands.filter((p) => p !== pattern)
+				const updatedAllowedCommands = allowedCommands.filter((p) => p !== pattern)
+				vscode.postMessage({
+					type: "allowedCommands",
+					commands: updatedAllowedCommands,
+				})
 			} else {
 				// Add to whitelist
-				updatedAllowedCommands = [...allowedCommands, pattern]
-			}
+				const updatedAllowedCommands = [...allowedCommands, pattern]
+				vscode.postMessage({
+					type: "allowedCommands",
+					commands: updatedAllowedCommands,
+				})
 
-			// Use consistent message type for both add and remove operations
-			vscode.postMessage({
-				type: "allowedCommands",
-				commands: updatedAllowedCommands,
-			})
+				// If it's in the denied list, remove it
+				if (deniedCommands.includes(pattern)) {
+					const updatedDeniedCommands = deniedCommands.filter((p) => p !== pattern)
+					vscode.postMessage({
+						type: "deniedCommands",
+						commands: updatedDeniedCommands,
+					})
+				}
+			}
 		},
-		[allowedCommands],
+		[allowedCommands, deniedCommands],
 	)
 
 	const handleDenyPatternChange = useCallback(
@@ -271,23 +281,33 @@ export const CommandExecution = ({ executionId, text, icon, title }: CommandExec
 			if (!pattern) return
 
 			const isDenied = deniedCommands.includes(pattern)
-			let updatedDeniedCommands: string[]
 
 			if (isDenied) {
 				// Remove from deny list
-				updatedDeniedCommands = deniedCommands.filter((p) => p !== pattern)
+				const updatedDeniedCommands = deniedCommands.filter((p) => p !== pattern)
+				vscode.postMessage({
+					type: "deniedCommands",
+					commands: updatedDeniedCommands,
+				})
 			} else {
 				// Add to deny list
-				updatedDeniedCommands = [...deniedCommands, pattern]
-			}
+				const updatedDeniedCommands = [...deniedCommands, pattern]
+				vscode.postMessage({
+					type: "deniedCommands",
+					commands: updatedDeniedCommands,
+				})
 
-			// Send message to update denied commands
-			vscode.postMessage({
-				type: "deniedCommands",
-				commands: updatedDeniedCommands,
-			})
+				// If it's in the allowed list, remove it
+				if (allowedCommands.includes(pattern)) {
+					const updatedAllowedCommands = allowedCommands.filter((p) => p !== pattern)
+					vscode.postMessage({
+						type: "allowedCommands",
+						commands: updatedAllowedCommands,
+					})
+				}
+			}
 		},
-		[deniedCommands],
+		[deniedCommands, allowedCommands],
 	)
 
 	return (
diff --git a/webview-ui/src/components/chat/CommandPatternSelector.tsx b/webview-ui/src/components/chat/CommandPatternSelector.tsx
index 9c93ac6d21..5753758fd1 100644
--- a/webview-ui/src/components/chat/CommandPatternSelector.tsx
+++ b/webview-ui/src/components/chat/CommandPatternSelector.tsx
@@ -37,22 +37,12 @@ export const CommandPatternSelector = ({
 	}
 
 	const handleAllowClick = (pattern: string) => {
-		const status = getPatternStatus(pattern)
-		if (status === "denied") {
-			// Remove from denied list first
-			onDenyPatternChange(pattern)
-		}
-		// Toggle allow status
+		// The handler in CommandExecution will take care of mutual exclusivity
 		onAllowPatternChange(pattern)
 	}
 
 	const handleDenyClick = (pattern: string) => {
-		const status = getPatternStatus(pattern)
-		if (status === "allowed") {
-			// Remove from allowed list first
-			onAllowPatternChange(pattern)
-		}
-		// Toggle deny status
+		// The handler in CommandExecution will take care of mutual exclusivity
 		onDenyPatternChange(pattern)
 	}