Merge pull request #260594 from microsoft/tyriar/260573_2

Tyriar · web-flow · commit cd13a25dd057 · 2025-08-08T07:36:04.000-07:00
Add message about auto approve rule being added and add links
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from '../../../../../base/browser/dom.js';
-import { allowedMarkdownHtmlAttributes, MarkdownRendererMarkedOptions } from '../../../../../base/browser/markdownRenderer.js';
+import { allowedMarkdownHtmlAttributes, MarkdownRendererMarkedOptions, type MarkdownRenderOptions } from '../../../../../base/browser/markdownRenderer.js';
 import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
 import { HoverPosition } from '../../../../../base/browser/ui/hover/hoverWidget.js';
 import { DomScrollableElement } from '../../../../../base/browser/ui/scrollbar/scrollableElement.js';
@@ -86,6 +86,7 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 		fillInIncompleteTokens = false,
 		codeBlockStartIndex = 0,
 		renderer: MarkdownRenderer,
+		markdownRenderOptions: MarkdownRenderOptions | undefined,
 		currentWidth: number,
 		private readonly codeBlockModelCollection: CodeBlockModelCollection,
 		private readonly rendererOptions: IChatMarkdownContentPartOptions,
@@ -244,6 +245,7 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 				asyncRenderCallback: () => this._onDidChangeHeight.fire(),
 				markedOptions: markedOpts,
 				markedExtensions,
+				...markdownRenderOptions,
 			}, this.domNode));
 
 			const markdownDecorationsRenderer = instantiationService.createInstance(ChatMarkdownDecorationsRenderer);
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalMarkdownProgressPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalMarkdownProgressPart.ts
@@ -5,9 +5,13 @@
 
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { MarkdownRenderer } from '../../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { ConfigurationTarget } from '../../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IPreferencesService, type IOpenSettingsOptions } from '../../../../../services/preferences/common/preferences.js';
+import { TerminalContribSettingId } from '../../../../terminal/terminalContribExports.js';
 import { migrateLegacyTerminalToolSpecificData } from '../../../common/chat.js';
 import { IChatMarkdownContent, IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from '../../../common/chatService.js';
 import { CodeBlockModelCollection } from '../../../common/codeBlockModelCollection.js';
@@ -36,6 +40,7 @@ export class ChatTerminalMarkdownProgressPart extends BaseChatToolInvocationSubP
 		codeBlockStartIndex: number,
 		codeBlockModelCollection: CodeBlockModelCollection,
 		@IInstantiationService instantiationService: IInstantiationService,
+		@IPreferencesService preferencesService: IPreferencesService,
 	) {
 		super(toolInvocation);
 
@@ -61,7 +66,43 @@ export class ChatTerminalMarkdownProgressPart extends BaseChatToolInvocationSubP
 				wordWrap: 'on'
 			}
 		};
-		this.markdownPart = this._register(instantiationService.createInstance(ChatMarkdownContentPart, chatMarkdownContent, context, editorPool, false, codeBlockStartIndex, renderer, currentWidthDelegate(), codeBlockModelCollection, { codeBlockRenderOptions }));
+		this.markdownPart = this._register(instantiationService.createInstance(ChatMarkdownContentPart, chatMarkdownContent, context, editorPool, false, codeBlockStartIndex, renderer, {
+			actionHandler: {
+				callback: (content) => {
+					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;
+								}
+							}
+							break;
+						}
+					}
+				},
+				disposables: new DisposableStore(),
+			},
+		}, currentWidthDelegate(), codeBlockModelCollection, { codeBlockRenderOptions }));
 		this._register(this.markdownPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
 		const icon = !toolInvocation.isConfirmed ?
 			Codicon.error :
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolSubPart.ts
@@ -190,11 +190,15 @@ export class TerminalConfirmationWidgetSubPart extends BaseChatToolInvocationSub
 							throw new ErrorNoTelemetry(`Cannot add new rule, existing setting is unexpected format`);
 						}
 						await this.configurationService.updateValue(TerminalContribSettingId.AutoApprove, newValue);
+						if (newRules.length === 1) {
+							terminalData.autoApproveInfo = new MarkdownString(localize('newRule', 'Auto approve rule {0} added', `[\`${newRules[0].key}\`](settings_a)`));
+						} else if (newRules.length > 1) {
+							terminalData.autoApproveInfo = new MarkdownString(localize('newRule.plural', 'Auto approve rules {0} added', newRules.map(r => `[\`${r.key}\`](settings_a)`).join(', ')));
+						}
 						break;
 					}
 					case 'configure': {
 						this.preferencesService.openSettings({
-							jsonEditor: false,
 							target: ConfigurationTarget.USER,
 							query: `@id:${TerminalContribSettingId.AutoApprove}`,
 						});
@@ -233,6 +237,7 @@ export class TerminalConfirmationWidgetSubPart extends BaseChatToolInvocationSub
 			false,
 			this.codeBlockStartIndex,
 			this.renderer,
+			undefined,
 			this.currentWidthDelegate(),
 			this.codeBlockModelCollection,
 			{ codeBlockRenderOptions }
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
@@ -316,7 +316,7 @@ export class ToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
 	}
 
 	private _makeMarkdownPart(container: HTMLElement, message: string | IMarkdownString, codeBlockRenderOptions: ICodeBlockRenderOptions) {
-		const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, { kind: 'markdownContent', content: typeof message === 'string' ? new MarkdownString().appendText(message) : message }, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, this.currentWidthDelegate(), this.codeBlockModelCollection, { codeBlockRenderOptions }));
+		const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, { kind: 'markdownContent', content: typeof message === 'string' ? new MarkdownString().appendText(message) : message }, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, undefined, this.currentWidthDelegate(), this.codeBlockModelCollection, { codeBlockRenderOptions }));
 		renderFileWidgets(part.domNode, this.instantiationService, this.chatMarkdownAnchorService, this._store);
 		container.append(part.domNode);
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -1385,7 +1385,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		const element = context.element;
 		const fillInIncompleteTokens = isResponseVM(element) && (!element.isComplete || element.isCanceled || element.errorDetails?.responseIsFiltered || element.errorDetails?.responseIsIncomplete || !!element.renderData);
 		const codeBlockStartIndex = this.getCodeBlockStartIndex(context);
-		const markdownPart = templateData.instantiationService.createInstance(ChatMarkdownContentPart, markdown, context, this._editorPool, fillInIncompleteTokens, codeBlockStartIndex, this.renderer, this._currentLayoutWidth, this.codeBlockModelCollection, {});
+		const markdownPart = templateData.instantiationService.createInstance(ChatMarkdownContentPart, markdown, context, this._editorPool, fillInIncompleteTokens, codeBlockStartIndex, this.renderer, undefined, this._currentLayoutWidth, this.codeBlockModelCollection, {});
 		if (isRequestVM(element)) {
 			markdownPart.domNode.tabIndex = 0;
 			if (this.configService.getValue<string>('chat.editRequests') === 'inline' && this.rendererOptions.editable) {
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandLineAutoApprover.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandLineAutoApprover.ts
@@ -8,14 +8,15 @@ import type { OperatingSystem } from '../../../../../base/common/platform.js';
 import { escapeRegExpCharacters, regExpLeadsToEndlessLoop } from '../../../../../base/common/strings.js';
 import { isObject } from '../../../../../base/common/types.js';
 import { structuralEquals } from '../../../../../base/common/equals.js';
-import { IConfigurationService, type IConfigurationValue } from '../../../../../platform/configuration/common/configuration.js';
+import { ConfigurationTarget, IConfigurationService, type IConfigurationValue } from '../../../../../platform/configuration/common/configuration.js';
 import { TerminalChatAgentToolsSettingId } from '../common/terminalChatAgentToolsConfiguration.js';
 import { isPowerShell } from './runInTerminalHelpers.js';
 
 interface IAutoApproveRule {
 	regex: RegExp;
 	regexCaseInsensitive: RegExp;
 	sourceText: string;
+	sourceTarget: ConfigurationTarget;
 	isDefaultRule: boolean;
 }
 
@@ -199,13 +200,29 @@ export class CommandLineAutoApprover extends Disposable {
 				key in defaultValue &&
 				structuralEquals((defaultValue as Record<string, unknown>)[key], value)
 			);
+			function checkTarget(inspectValue: Readonly<unknown> | undefined): boolean {
+				return (
+					isObject(inspectValue) &&
+					key in inspectValue &&
+					structuralEquals((inspectValue as Record<string, unknown>)[key], value)
+				);
+			}
+			const sourceTarget = (
+				checkTarget(configInspectValue.workspaceFolder) ? ConfigurationTarget.WORKSPACE_FOLDER
+					: checkTarget(configInspectValue.workspaceValue) ? ConfigurationTarget.WORKSPACE
+						: checkTarget(configInspectValue.userRemoteValue) ? ConfigurationTarget.USER_REMOTE
+							: checkTarget(configInspectValue.userLocalValue) ? ConfigurationTarget.USER_LOCAL
+								: checkTarget(configInspectValue.userValue) ? ConfigurationTarget.USER
+									: checkTarget(configInspectValue.applicationValue) ? ConfigurationTarget.APPLICATION
+										: ConfigurationTarget.DEFAULT
+			);
 			if (typeof value === 'boolean') {
 				const { regex, regexCaseInsensitive } = this._convertAutoApproveEntryToRegex(key);
 				// IMPORTANT: Only true and false are used, null entries need to be ignored
 				if (value === true) {
-					allowListRules.push({ regex, regexCaseInsensitive, sourceText: key, isDefaultRule });
+					allowListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
 				} else if (value === false) {
-					denyListRules.push({ regex, regexCaseInsensitive, sourceText: key, isDefaultRule });
+					denyListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
 				}
 			} else if (typeof value === 'object' && value !== null) {
 				// Handle object format like { approve: true/false, matchCommandLine: true/false }
@@ -214,15 +231,15 @@ export class CommandLineAutoApprover extends Disposable {
 					const { regex, regexCaseInsensitive } = this._convertAutoApproveEntryToRegex(key);
 					if (objectValue.approve === true) {
 						if (objectValue.matchCommandLine === true) {
-							allowListCommandLineRules.push({ regex, regexCaseInsensitive, sourceText: key, isDefaultRule });
+							allowListCommandLineRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
 						} else {
-							allowListRules.push({ regex, regexCaseInsensitive, sourceText: key, isDefaultRule });
+							allowListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
 						}
 					} else if (objectValue.approve === false) {
 						if (objectValue.matchCommandLine === true) {
-							denyListCommandLineRules.push({ regex, regexCaseInsensitive, sourceText: key, isDefaultRule });
+							denyListCommandLineRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
 						} else {
-							denyListRules.push({ regex, regexCaseInsensitive, sourceText: key, isDefaultRule });
+							denyListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
 						}
 					}
 				}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts
@@ -257,15 +257,15 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				switch (autoApproveReason) {
 					case 'commandLine': {
 						if (commandLineResult.rule) {
-							autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rule', 'Auto approved by rule {0}', `\`${commandLineResult.rule.sourceText}\``)}_`);
+							autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rule', 'Auto approved by rule {0}', `[\`${commandLineResult.rule.sourceText}\`](settings_${commandLineResult.rule.sourceTarget})`)}_`);
 						}
 						break;
 					}
 					case 'subCommand': {
 						if (subCommandResults.length === 1) {
-							autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rule', 'Auto approved by rule {0}', subCommandResults.map(e => `\`${e.rule!.sourceText}\``).join(', '))}_`);
+							autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rule', 'Auto approved by rule {0}', subCommandResults.map(e => `[\`${e.rule!.sourceText}\`](settings_${e.rule!.sourceTarget})`).join(', '))}_`);
 						} else if (subCommandResults.length > 1) {
-							autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rules', 'Auto approved by rules {0}', subCommandResults.map(e => `\`${e.rule!.sourceText}\``).join(', '))}_`);
+							autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rules', 'Auto approved by rules {0}', subCommandResults.map(e => `[\`${e.rule!.sourceText}\`](settings_${e.rule!.sourceTarget})`).join(', '))}_`);
 						}
 						break;
 					}
@@ -274,16 +274,16 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				switch (autoApproveReason) {
 					case 'commandLine': {
 						if (commandLineResult.rule) {
-							autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rule', 'Auto approval denied by rule {0}', `\`${commandLineResult.rule.sourceText}\``)}_`);
+							autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rule', 'Auto approval denied by rule {0}', `[\`${commandLineResult.rule.sourceText}\`](settings_${commandLineResult.rule.sourceTarget})`)}_`);
 						}
 						break;
 					}
 					case 'subCommand': {
 						const deniedRules = subCommandResults.filter(e => e.result === 'denied');
 						if (deniedRules.length === 1) {
-							autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rule', 'Auto approval denied by rule {0}', deniedRules.map(e => `\`${e.rule!.sourceText}\``).join(', '))}_`);
+							autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rule', 'Auto approval denied by rule {0}', deniedRules.map(e => `[\`${e.rule!.sourceText}\`](settings_${e.rule!.sourceTarget})`).join(', '))}_`);
 						} else if (deniedRules.length > 1) {
-							autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rules', 'Auto approval denied by rules {0}', deniedRules.map(e => `\`${e.rule!.sourceText}\``).join(', '))}_`);
+							autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rules', 'Auto approval denied by rules {0}', deniedRules.map(e => `[\`${e.rule!.sourceText}\`](settings_${e.rule!.sourceTarget})`).join(', '))}_`);
 						}
 						break;
 					}

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ export class ToolConfirmationSubPart extends BaseChatToolInvocationSubPart {`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`private _makeMarkdownPart(container: HTMLElement, message: string \| IMarkdownString, codeBlockRenderOptions: ICodeBlockRenderOptions) {`
`319`		`- const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, { kind: 'markdownContent', content: typeof message === 'string' ? new MarkdownString().appendText(message) : message }, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, this.currentWidthDelegate(), this.codeBlockModelCollection, { codeBlockRenderOptions }));`
	`319`	`+ const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, { kind: 'markdownContent', content: typeof message === 'string' ? new MarkdownString().appendText(message) : message }, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, undefined, this.currentWidthDelegate(), this.codeBlockModelCollection, { codeBlockRenderOptions }));`
`320`	`320`	`renderFileWidgets(part.domNode, this.instantiationService, this.chatMarkdownAnchorService, this._store);`
`321`	`321`	`container.append(part.domNode);`
`322`	`322`
Original file line number	Diff line number	Diff line change
`@@ -257,15 +257,15 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {`
`257`	`257`	`switch (autoApproveReason) {`
`258`	`258`	`case 'commandLine': {`
`259`	`259`	`if (commandLineResult.rule) {`
`260`		- autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rule', 'Auto approved by rule {0}', `\`${commandLineResult.rule.sourceText}\``)}_`);
	`260`	+ autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rule', 'Auto approved by rule {0}', `[\`${commandLineResult.rule.sourceText}\`](settings_${commandLineResult.rule.sourceTarget})`)}_`);
`261`	`261`	`}`
`262`	`262`	`break;`
`263`	`263`	`}`
`264`	`264`	`case 'subCommand': {`
`265`	`265`	`if (subCommandResults.length === 1) {`
`266`		- autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rule', 'Auto approved by rule {0}', subCommandResults.map(e => `\`${e.rule!.sourceText}\``).join(', '))}_`);
	`266`	+ autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rule', 'Auto approved by rule {0}', subCommandResults.map(e => `[\`${e.rule!.sourceText}\`](settings_${e.rule!.sourceTarget})`).join(', '))}_`);
`267`	`267`	`} else if (subCommandResults.length > 1) {`
`268`		- autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rules', 'Auto approved by rules {0}', subCommandResults.map(e => `\`${e.rule!.sourceText}\``).join(', '))}_`);
	`268`	+ autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rules', 'Auto approved by rules {0}', subCommandResults.map(e => `[\`${e.rule!.sourceText}\`](settings_${e.rule!.sourceTarget})`).join(', '))}_`);
`269`	`269`	`}`
`270`	`270`	`break;`
`271`	`271`	`}`
`@@ -274,16 +274,16 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {`
`274`	`274`	`switch (autoApproveReason) {`
`275`	`275`	`case 'commandLine': {`
`276`	`276`	`if (commandLineResult.rule) {`
`277`		- autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rule', 'Auto approval denied by rule {0}', `\`${commandLineResult.rule.sourceText}\``)}_`);
	`277`	+ autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rule', 'Auto approval denied by rule {0}', `[\`${commandLineResult.rule.sourceText}\`](settings_${commandLineResult.rule.sourceTarget})`)}_`);
`278`	`278`	`}`
`279`	`279`	`break;`
`280`	`280`	`}`
`281`	`281`	`case 'subCommand': {`
`282`	`282`	`const deniedRules = subCommandResults.filter(e => e.result === 'denied');`
`283`	`283`	`if (deniedRules.length === 1) {`
`284`		- autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rule', 'Auto approval denied by rule {0}', deniedRules.map(e => `\`${e.rule!.sourceText}\``).join(', '))}_`);
	`284`	+ autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rule', 'Auto approval denied by rule {0}', deniedRules.map(e => `[\`${e.rule!.sourceText}\`](settings_${e.rule!.sourceTarget})`).join(', '))}_`);
`285`	`285`	`} else if (deniedRules.length > 1) {`
`286`		- autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rules', 'Auto approval denied by rules {0}', deniedRules.map(e => `\`${e.rule!.sourceText}\``).join(', '))}_`);
	`286`	+ autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rules', 'Auto approval denied by rules {0}', deniedRules.map(e => `[\`${e.rule!.sourceText}\`](settings_${e.rule!.sourceTarget})`).join(', '))}_`);
`287`	`287`	`}`
`288`	`288`	`break;`
`289`	`289`	`}`