ENG 526/Fix: Versioned Auto Approve settings (RooCodeInc#3014)

* added verisoning for autoApprove settings

* removed lines from source branch

* rebase

* changeset

* one small change

Author: canvrno

.changeset/tidy-points-learn.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fixes auto approve settings becoming unset

src/core/controller/index.ts

@@ -139,6 +139,14 @@ export class Controller {
 		await this.clearTask() // ensures that an existing task doesn't exist before starting a new one, although this shouldn't be possible since user must clear task before starting a new one
 		const { apiConfiguration, customInstructions, autoApprovalSettings, browserSettings, chatSettings } =
 			await getAllExtensionState(this.context)
+
+		if (autoApprovalSettings) {
+			const updatedAutoApprovalSettings = {
+				...autoApprovalSettings,
+				version: (autoApprovalSettings.version ?? 1) + 1,
+			}
+			await updateGlobalState(this.context, "autoApprovalSettings", updatedAutoApprovalSettings)
+		}
 		this.task = new Task(
 			this.context,
 			this.mcpHub,
@@ -288,11 +296,16 @@ export class Controller {
 				break
 			case "autoApprovalSettings":
 				if (message.autoApprovalSettings) {
-					await updateGlobalState(this.context, "autoApprovalSettings", message.autoApprovalSettings)
-					if (this.task) {
-						this.task.autoApprovalSettings = message.autoApprovalSettings
+					const currentSettings = (await getAllExtensionState(this.context)).autoApprovalSettings
+					const incomingVersion = message.autoApprovalSettings.version ?? 1
+					const currentVersion = currentSettings?.version ?? 1
+					if (incomingVersion > currentVersion) {
+						await updateGlobalState(this.context, "autoApprovalSettings", message.autoApprovalSettings)
+						if (this.task) {
+							this.task.autoApprovalSettings = message.autoApprovalSettings
+						}
+						await this.postStateToWebview()
 					}
-					await this.postStateToWebview()
 				}
 				break
 			case "browserSettings":

src/shared/AutoApprovalSettings.ts

@@ -1,4 +1,6 @@
 export interface AutoApprovalSettings {
+	// Version for race condition prevention (incremented on every change)
+	version: number
 	// Whether auto-approval is enabled
 	enabled: boolean
 	// Individual action permissions
@@ -18,6 +20,7 @@ export interface AutoApprovalSettings {
 }
 
 export const DEFAULT_AUTO_APPROVAL_SETTINGS: AutoApprovalSettings = {
+	version: 1,
 	enabled: false,
 	actions: {
 		readFiles: false,

webview-ui/src/components/chat/AutoApproveMenu.tsx

@@ -153,24 +153,30 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 		return enabledActionsCount > 0
 	}, [enabledActions, autoApprovalSettings.actions])
 
+	// Get the full extension state to ensure we have the most up-to-date settings
+	const extensionState = useExtensionState()
+
 	const updateEnabled = useCallback(
 		(enabled: boolean) => {
+			const currentSettings = extensionState.autoApprovalSettings
 			vscode.postMessage({
 				type: "autoApprovalSettings",
 				autoApprovalSettings: {
-					...autoApprovalSettings,
+					...currentSettings,
+					version: (currentSettings.version ?? 1) + 1,
 					enabled,
 				},
 			})
 		},
-		[autoApprovalSettings],
+		[extensionState.autoApprovalSettings],
 	)
 
 	const updateAction = useCallback(
 		(actionId: keyof AutoApprovalSettings["actions"], value: boolean) => {
+			const currentSettings = extensionState.autoApprovalSettings
 			// Calculate what the new actions state will be
 			const newActions = {
-				...autoApprovalSettings.actions,
+				...currentSettings.actions,
 				[actionId]: value,
 			}
 
@@ -180,40 +186,45 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 			vscode.postMessage({
 				type: "autoApprovalSettings",
 				autoApprovalSettings: {
-					...autoApprovalSettings,
+					...currentSettings,
+					version: (currentSettings.version ?? 1) + 1,
 					actions: newActions,
 					// If no actions will be enabled, ensure the main toggle is off
-					enabled: willHaveEnabledActions ? autoApprovalSettings.enabled : false,
+					enabled: willHaveEnabledActions ? currentSettings.enabled : false,
 				},
 			})
 		},
-		[autoApprovalSettings],
+		[extensionState.autoApprovalSettings],
 	)
 
 	const updateMaxRequests = useCallback(
 		(maxRequests: number) => {
+			const currentSettings = extensionState.autoApprovalSettings
 			vscode.postMessage({
 				type: "autoApprovalSettings",
 				autoApprovalSettings: {
-					...autoApprovalSettings,
+					...currentSettings,
+					version: (currentSettings.version ?? 1) + 1,
 					maxRequests,
 				},
 			})
 		},
-		[autoApprovalSettings],
+		[extensionState.autoApprovalSettings],
 	)
 
 	const updateNotifications = useCallback(
 		(enableNotifications: boolean) => {
+			const currentSettings = extensionState.autoApprovalSettings
 			vscode.postMessage({
 				type: "autoApprovalSettings",
 				autoApprovalSettings: {
-					...autoApprovalSettings,
+					...currentSettings,
+					version: (currentSettings.version ?? 1) + 1,
 					enableNotifications,
 				},
 			})
 		},
-		[autoApprovalSettings],
+		[extensionState.autoApprovalSettings],
 	)
 
 	return (

webview-ui/src/context/ExtensionStateContext.tsx

@@ -75,7 +75,19 @@ export const ExtensionStateContextProvider: React.FC<{
 		const message: ExtensionMessage = event.data
 		switch (message.type) {
 			case "state": {
-				setState(message.state!)
+				setState((prevState) => {
+					const incoming = message.state!
+					// Versioning logic for autoApprovalSettings
+					const incomingVersion = incoming.autoApprovalSettings?.version ?? 1
+					const currentVersion = prevState.autoApprovalSettings?.version ?? 1
+					const shouldUpdateAutoApproval = incomingVersion > currentVersion
+					return {
+						...incoming,
+						autoApprovalSettings: shouldUpdateAutoApproval
+							? incoming.autoApprovalSettings
+							: prevState.autoApprovalSettings,
+					}
+				})
 				const config = message.state?.apiConfiguration
 				const hasKey = config
 					? [