changeset

.changeset/famous-snakes-deliver.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix auto approve state out of sync

.changeset/red-worms-turn.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix tool toggle auto approve

src/services/mcp/McpHub.ts

@@ -627,7 +627,12 @@ export class McpHub {
 
 			// Update the tools list to reflect the change
 			const connection = this.connections.find((conn) => conn.server.name === serverName)
-			if (connection) {
+			if (connection && connection.server.tools) {
+				// Update the autoApprove property of each tool in the in-memory server object
+				connection.server.tools = connection.server.tools.map((tool) => ({
+					...tool,
+					autoApprove: autoApprove.includes(tool.name),
+				}))
 				await this.notifyWebviewOfServerChanges()
 			}
 		} catch (error) {

webview-ui/src/components/mcp/configuration/tabs/installed/server-row/McpToolRow.tsx

@@ -14,7 +14,10 @@ const McpToolRow = ({ tool, serverName }: McpToolRowProps) => {
 	// Accept the event object
 	const handleAutoApproveChange = (event: any) => {
 		// Only proceed if the event was triggered by a direct user interaction
-		if (!serverName || !event.isTrusted) return
+
+		if (!serverName) {
+			return
+		}
 
 		vscode.postMessage({
 			type: "toggleToolAutoApprove",