Support deprecated compatible autoApprove setting temporarily

Author: Tyriar

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandLineAutoApprover.ts

@@ -28,14 +28,31 @@ export class CommandLineAutoApprover extends Disposable {
 		super();
 		this.updateConfiguration();
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(TerminalChatAgentToolsSettingId.AutoApprove)) {
+			if (
+				e.affectsConfiguration(TerminalChatAgentToolsSettingId.AutoApprove) ||
+				e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAutoApproveCompatible)
+			) {
 				this.updateConfiguration();
 			}
 		}));
 	}
 
 	updateConfiguration() {
-		const { denyListRules, allowListRules, allowListCommandLineRules, denyListCommandLineRules } = this._mapAutoApproveConfigToRules(this._configurationService.getValue(TerminalChatAgentToolsSettingId.AutoApprove));
+		let configValue = this._configurationService.getValue(TerminalChatAgentToolsSettingId.AutoApprove);
+		const deprecatedValue = this._configurationService.getValue(TerminalChatAgentToolsSettingId.DeprecatedAutoApproveCompatible);
+		if (deprecatedValue && typeof deprecatedValue === 'object' && configValue && typeof configValue === 'object') {
+			configValue = {
+				...configValue,
+				...deprecatedValue
+			};
+		}
+
+		const {
+			denyListRules,
+			allowListRules,
+			allowListCommandLineRules,
+			denyListCommandLineRules
+		} = this._mapAutoApproveConfigToRules(configValue);
 		this._allowListRules = allowListRules;
 		this._denyListRules = denyListRules;
 		this._allowListCommandLineRules = allowListCommandLineRules;

src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.ts

@@ -11,11 +11,11 @@ import { ConfigurationScope, type IConfigurationPropertySchema } from '../../../
 export const enum TerminalChatAgentToolsSettingId {
 	AutoApprove = 'chat.tools.terminal.autoApprove',
 
+	DeprecatedAutoApproveCompatible = 'chat.agent.terminal.autoApprove',
 	DeprecatedAutoApprove1 = 'chat.agent.terminal.allowList',
 	DeprecatedAutoApprove2 = 'chat.agent.terminal.denyList',
 	DeprecatedAutoApprove3 = 'github.copilot.chat.agent.terminal.allowList',
 	DeprecatedAutoApprove4 = 'github.copilot.chat.agent.terminal.denyList',
-	DeprecatedAutoApprove5 = 'chat.agent.terminal.autoApprove',
 }
 
 export interface ITerminalChatAgentToolsConfiguration {
@@ -108,7 +108,7 @@ for (const id of [
 	TerminalChatAgentToolsSettingId.DeprecatedAutoApprove2,
 	TerminalChatAgentToolsSettingId.DeprecatedAutoApprove3,
 	TerminalChatAgentToolsSettingId.DeprecatedAutoApprove4,
-	TerminalChatAgentToolsSettingId.DeprecatedAutoApprove5,
+	TerminalChatAgentToolsSettingId.DeprecatedAutoApproveCompatible,
 ]) {
 	terminalChatAgentToolsConfiguration[id] = {
 		deprecated: true,