Merge pull request #260609 from microsoft/tyriar/dupe_rules

Prevent duplicate rules showing in message

Author: Tyriar

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

@@ -262,10 +262,11 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 						break;
 					}
 					case 'subCommand': {
-						if (subCommandResults.length === 1) {
-							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}\`](settings_${e.rule!.sourceTarget})`).join(', '))}_`);
+						const uniqueRules = Array.from(new Set(subCommandResults.map(e => `[\`${e.rule!.sourceText}\`](settings_${e.rule!.sourceTarget})`)));
+						if (uniqueRules.length === 1) {
+							autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rule', 'Auto approved by rule {0}', uniqueRules[0])}_`);
+						} else if (uniqueRules.length > 1) {
+							autoApproveInfo = new MarkdownString(`_${localize('autoApprove.rules', 'Auto approved by rules {0}', uniqueRules.join(', '))}_`);
 						}
 						break;
 					}
@@ -280,10 +281,11 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 					}
 					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}\`](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}\`](settings_${e.rule!.sourceTarget})`).join(', '))}_`);
+						const uniqueRules = Array.from(new Set(deniedRules.map(e => `[\`${e.rule!.sourceText}\`](settings_${e.rule!.sourceTarget})`)));
+						if (uniqueRules.length === 1) {
+							autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rule', 'Auto approval denied by rule {0}', uniqueRules[0])}_`);
+						} else if (uniqueRules.length > 1) {
+							autoApproveInfo = new MarkdownString(`_${localize('autoApproveDenied.rules', 'Auto approval denied by rules {0}', uniqueRules.join(', '))}_`);
 						}
 						break;
 					}
@@ -879,7 +881,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		const canCreateAutoApproval = autoApproveResult.subCommandResults.some(e => e.result !== 'denied') || autoApproveResult.commandLineResult.result === 'denied';
 		if (canCreateAutoApproval) {
 			// Allow all sub-commands
-			const subCommandsFirstWordOnly = subCommands.map(command => command.split(' ')[0]);
+			const subCommandsFirstWordOnly = Array.from(new Set(subCommands.map(command => command.split(' ')[0])));
 			let subCommandLabel: string;
 			let subCommandTooltip: string;
 			if (subCommandsFirstWordOnly.length === 1) {

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

@@ -367,7 +367,7 @@ suite('RunInTerminalTool', () => {
 			const customActions = result!.confirmationMessages!.terminalCustomActions!;
 			strictEqual(customActions.length, 3, 'Expected 3 custom actions');
 
-			strictEqual(customActions[0].label, 'Always Allow Commands: npm, npm');
+			strictEqual(customActions[0].label, 'Always Allow Command: npm');
 			strictEqual(customActions[0].data.type, 'newRule');
 
 			strictEqual(customActions[1].label, 'Always Allow Full Command Line: npm install &&& npm run build');