Merge pull request microsoft#261321 from microsoft/copilot/fix-261319

Add auto-approval messages for global chat.tools.autoApprove setting

Author: Tyriar

src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts

@@ -72,28 +72,34 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart
 					const [type, scopeRaw] = content.split('_');
 					switch (type) {
 						case 'settings': {
-							const scope = parseInt(scopeRaw);
-							const target = !isNaN(scope) ? scope as ConfigurationTarget : undefined;
-							const options: IOpenSettingsOptions = {
-								jsonEditor: true,
-								revealSetting: {
-									key: TerminalContribSettingId.AutoApprove
-								}
-							};
-							switch (target) {
-								case ConfigurationTarget.APPLICATION: preferencesService.openApplicationSettings(options); break;
-								case ConfigurationTarget.USER:
-								case ConfigurationTarget.USER_LOCAL: preferencesService.openUserSettings(options); break;
-								case ConfigurationTarget.USER_REMOTE: preferencesService.openRemoteSettings(options); break;
-								case ConfigurationTarget.WORKSPACE:
-								case ConfigurationTarget.WORKSPACE_FOLDER: preferencesService.openWorkspaceSettings(options); break;
-								default: {
-									// Fallback if something goes wrong
-									preferencesService.openSettings({
-										target: ConfigurationTarget.USER,
-										query: `@id:${TerminalContribSettingId.AutoApprove}`,
-									});
-									break;
+							if (scopeRaw === 'global') {
+								preferencesService.openSettings({
+									query: `@id:chat.tools.autoApprove`
+								});
+							} else {
+								const scope = parseInt(scopeRaw);
+								const target = !isNaN(scope) ? scope as ConfigurationTarget : undefined;
+								const options: IOpenSettingsOptions = {
+									jsonEditor: true,
+									revealSetting: {
+										key: TerminalContribSettingId.AutoApprove
+									}
+								};
+								switch (target) {
+									case ConfigurationTarget.APPLICATION: preferencesService.openApplicationSettings(options); break;
+									case ConfigurationTarget.USER:
+									case ConfigurationTarget.USER_LOCAL: preferencesService.openUserSettings(options); break;
+									case ConfigurationTarget.USER_REMOTE: preferencesService.openRemoteSettings(options); break;
+									case ConfigurationTarget.WORKSPACE:
+									case ConfigurationTarget.WORKSPACE_FOLDER: preferencesService.openWorkspaceSettings(options); break;
+									default: {
+										// Fallback if something goes wrong
+										preferencesService.openSettings({
+											target: ConfigurationTarget.USER,
+											query: `@id:${TerminalContribSettingId.AutoApprove}`,
+										});
+										break;
+									}
 								}
 							}
 							break;

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts

@@ -43,6 +43,7 @@ import type { TerminalNewAutoApproveButtonData } from '../../../../chat/browser/
 import { basename } from '../../../../../../base/common/path.js';
 import type { SingleOrMany } from '../../../../../../base/common/types.js';
 import { asArray } from '../../../../../../base/common/arrays.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 
 const TERMINAL_SESSION_STORAGE_KEY = 'chat.terminalSessions';
 
@@ -156,6 +157,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ILanguageModelToolsService private readonly _languageModelToolsService: ILanguageModelToolsService,
 		@IStorageService private readonly _storageService: IStorageService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
@@ -265,7 +267,12 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 					return `[\`${e.rule!.sourceText}\`](settings_${e.rule!.sourceTarget} "${localize('ruleTooltip', 'View rule in settings')}")`;
 				}).join(', ');
 			}
-			if (isAutoApproved) {
+
+			const config = this._configurationService.inspect<boolean | Record<string, boolean>>('chat.tools.autoApprove');
+			const isGlobalAutoApproved = config?.value ?? config.defaultValue;
+			if (isGlobalAutoApproved) {
+				autoApproveInfo = new MarkdownString(`_${localize('autoApprove.global', 'Auto approved by setting {0}', `[\`chat.tools.autoApprove\`](settings_global "${localize('ruleTooltip.global', 'View settings')}")`)}_`);
+			} else if (isAutoApproved) {
 				switch (autoApproveReason) {
 					case 'commandLine': {
 						if (commandLineResult.rule) {
@@ -585,7 +592,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			}
 
 			return {
-				toolResultMessage: new MarkdownString(toolResultMessage),
+				toolResultMessage: toolResultMessage ? new MarkdownString(toolResultMessage) : undefined,
 				content: [{
 					kind: 'text',
 					value: resultText.join(''),