Merge pull request microsoft#258221 from microsoft/tyriar/258095

Move terminal auto approve to chat.tools, add deprecation messages

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

@@ -9,7 +9,13 @@ import { localize } from '../../../../../nls.js';
 import { ConfigurationScope, type IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
 
 export const enum TerminalChatAgentToolsSettingId {
-	AutoApprove = 'chat.agent.terminal.autoApprove',
+	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',
 }
 
 export interface ITerminalChatAgentToolsConfiguration {
@@ -96,3 +102,16 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 		},
 	}
 };
+
+for (const id of [
+	TerminalChatAgentToolsSettingId.DeprecatedAutoApprove1,
+	TerminalChatAgentToolsSettingId.DeprecatedAutoApprove2,
+	TerminalChatAgentToolsSettingId.DeprecatedAutoApprove3,
+	TerminalChatAgentToolsSettingId.DeprecatedAutoApprove4,
+	TerminalChatAgentToolsSettingId.DeprecatedAutoApproveCompatible,
+]) {
+	terminalChatAgentToolsConfiguration[id] = {
+		deprecated: true,
+		markdownDeprecationMessage: localize('autoApprove.deprecated', 'Use {0} instead', `\`#${TerminalChatAgentToolsSettingId.AutoApprove}#\``)
+	};
+}