Merge pull request #259673 from microsoft/copilot/fix-259672

Make terminal auto approve more aware of paths

Author: Tyriar

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

@@ -5,7 +5,7 @@
 
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import type { OperatingSystem } from '../../../../../base/common/platform.js';
-import { regExpLeadsToEndlessLoop } from '../../../../../base/common/strings.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';
@@ -281,8 +281,22 @@ export class CommandLineAutoApprover extends Disposable {
 			return neverMatchRegex;
 		}
 
-		// Escape regex special characters
-		const sanitizedValue = value.replace(/[\\^$.*+?()[\]{}|]/g, '\\$&');
+		let sanitizedValue: string;
+
+		// Match both path separators it if looks like a path
+		if (value.includes('/') || value.includes('\\')) {
+			// Replace path separators with placeholders first, apply standard sanitization, then
+			// apply special path handling
+			let pattern = value.replace(/[/\\]/g, '%%PATH_SEP%%');
+			pattern = escapeRegExpCharacters(pattern);
+			pattern = pattern.replace(/%%PATH_SEP%%*/g, '[/\\\\]');
+			sanitizedValue = `^(?:\\.[/\\\\])?${pattern}`;
+		}
+
+		// Escape regex special characters for non-path strings
+		else {
+			sanitizedValue = escapeRegExpCharacters(value);
+		}
 
 		// Regular strings should match the start of the command line and be a word boundary
 		return new RegExp(`^${sanitizedValue}\\b`);

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

@@ -48,6 +48,7 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 				'|---|---|',
 				'| `\"mkdir\": true` | ' + localize('autoApprove.description.examples.mkdir', "Allow all commands starting with {0}", '`mkdir`'),
 				'| `\"npm run build\": true` | ' + localize('autoApprove.description.examples.npmRunBuild', "Allow all commands starting with {0}", '`npm run build`'),
+				'| `\"bin/test.sh\": true` | ' + localize('autoApprove.description.examples.binTest', "Allow all commands that match the path {0} ({1}, {2}, etc.)", '`bin/test.sh`', '`bin\\test.sh`', '`./bin/test.sh`'),
 				'| `\"/^git (status\\|show\\b.*)$/\": true` | ' + localize('autoApprove.description.examples.regexGit', "Allow {0} and all commands starting with {1}", '`git status`', '`git show`'),
 				'| `\"/^Get-ChildItem\\b/i\": true` | ' + localize('autoApprove.description.examples.regexCase', "will allow {0} commands regardless of casing", '`Get-ChildItem`'),
 				'| `\"/.*/\": true` | ' + localize('autoApprove.description.examples.regexAll', "Allow all commands (denied commands still require approval)"),

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

@@ -378,6 +378,124 @@ suite('CommandLineAutoApprover', () => {
 		});
 	});
 
+	suite('path-aware auto approval', () => {
+		test('should handle path variations with forward slashes', () => {
+			setAutoApprove({
+				"bin/foo": true
+			});
+
+			// Should approve the exact match
+			ok(isAutoApproved('bin/foo'));
+			ok(isAutoApproved('bin/foo --arg'));
+
+			// Should approve with Windows backslashes
+			ok(isAutoApproved('bin\\foo'));
+			ok(isAutoApproved('bin\\foo --arg'));
+
+			// Should approve with current directory prefixes
+			ok(isAutoApproved('./bin/foo'));
+			ok(isAutoApproved('.\\bin/foo'));
+			ok(isAutoApproved('./bin\\foo'));
+			ok(isAutoApproved('.\\bin\\foo'));
+
+			// Should not approve partial matches
+			ok(!isAutoApproved('bin/foobar'));
+			ok(!isAutoApproved('notbin/foo'));
+		});
+
+		test('should handle path variations with backslashes', () => {
+			setAutoApprove({
+				"bin\\script.bat": true
+			});
+
+			// Should approve the exact match
+			ok(isAutoApproved('bin\\script.bat'));
+			ok(isAutoApproved('bin\\script.bat --help'));
+
+			// Should approve with forward slashes
+			ok(isAutoApproved('bin/script.bat'));
+			ok(isAutoApproved('bin/script.bat --help'));
+
+			// Should approve with current directory prefixes
+			ok(isAutoApproved('./bin\\script.bat'));
+			ok(isAutoApproved('.\\bin\\script.bat'));
+			ok(isAutoApproved('./bin/script.bat'));
+			ok(isAutoApproved('.\\bin/script.bat'));
+		});
+
+		test('should handle deep paths', () => {
+			setAutoApprove({
+				"src/utils/helper.js": true
+			});
+
+			ok(isAutoApproved('src/utils/helper.js'));
+			ok(isAutoApproved('src\\utils\\helper.js'));
+			ok(isAutoApproved('src/utils\\helper.js'));
+			ok(isAutoApproved('src\\utils/helper.js'));
+			ok(isAutoApproved('./src/utils/helper.js'));
+			ok(isAutoApproved('.\\src\\utils\\helper.js'));
+		});
+
+		test('should not treat non-paths as paths', () => {
+			setAutoApprove({
+				"echo": true,  // Not a path
+				"ls": true,    // Not a path
+				"git": true    // Not a path
+			});
+
+			// These should work as normal command matching, not path matching
+			ok(isAutoApproved('echo'));
+			ok(isAutoApproved('ls'));
+			ok(isAutoApproved('git'));
+
+			// Should not be treated as paths, so these prefixes shouldn't work
+			ok(!isAutoApproved('./echo'));
+			ok(!isAutoApproved('.\\ls'));
+		});
+
+		test('should handle paths with mixed separators in config', () => {
+			setAutoApprove({
+				"bin/foo\\bar": true  // Mixed separators in config
+			});
+
+			ok(isAutoApproved('bin/foo\\bar'));
+			ok(isAutoApproved('bin\\foo/bar'));
+			ok(isAutoApproved('bin/foo/bar'));
+			ok(isAutoApproved('bin\\foo\\bar'));
+			ok(isAutoApproved('./bin/foo\\bar'));
+			ok(isAutoApproved('.\\bin\\foo\\bar'));
+		});
+
+		test('should work with command line auto approval for paths', () => {
+			setAutoApproveWithCommandLine({
+				"bin/deploy": { approve: true, matchCommandLine: true }
+			});
+
+			ok(isCommandLineAutoApproved('bin/deploy --prod'));
+			ok(isCommandLineAutoApproved('bin\\deploy --prod'));
+			ok(isCommandLineAutoApproved('./bin/deploy --prod'));
+			ok(isCommandLineAutoApproved('.\\bin\\deploy --prod'));
+		});
+
+		test('should handle special characters in paths', () => {
+			setAutoApprove({
+				"bin/my-script.sh": true,
+				"scripts/build_all.py": true,
+				"tools/run (debug).exe": true
+			});
+
+			ok(isAutoApproved('bin/my-script.sh'));
+			ok(isAutoApproved('bin\\my-script.sh'));
+			ok(isAutoApproved('./bin/my-script.sh'));
+
+			ok(isAutoApproved('scripts/build_all.py'));
+			ok(isAutoApproved('scripts\\build_all.py'));
+
+			ok(isAutoApproved('tools/run (debug).exe'));
+			ok(isAutoApproved('tools\\run (debug).exe'));
+		});
+	});
+
 	suite('PowerShell-specific commands', () => {
 		setup(() => {
 			shell = 'pwsh';