Merge pull request microsoft#256754 from microsoft/tyriar/autoapprove_merge__regex_flags

Support regex flags and case insensitive remove-item in defaults

Author: Tyriar

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

@@ -90,8 +90,16 @@ export class CommandLineAutoApprover extends Disposable {
 
 	private _convertAutoApproveEntryToRegex(value: string): RegExp {
 		// If it's wrapped in `/`, it's in regex format and should be converted directly
-		if (value.match(/^\/.+\/$/)) {
-			return new RegExp(value.slice(1, -1));
+		// Support all standard JavaScript regex flags: d, g, i, m, s, u, v, y
+		const regexMatch = value.match(/^\/(?<pattern>.+)\/(?<flags>[dgimsuvy]*)$/);
+		const regexPattern = regexMatch?.groups?.pattern;
+		if (regexPattern) {
+			let flags = regexMatch.groups?.flags;
+			// Remove global flag as it can cause confusion
+			if (flags) {
+				flags = flags.replaceAll('g', '');
+			}
+			return new RegExp(regexPattern, flags || undefined);
 		}
 
 		// Escape regex special characters

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

@@ -27,7 +27,7 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 		default: true,
 	},
 	[TerminalChatAgentToolsSettingId.AutoApprove]: {
-		markdownDescription: localize('autoApprove', "A list of commands or regular expressions that control whether the run in terminal tool commands require explicit approval. These will be matched against the start of a command. A regular expression can be provided by wrapping the string in `/` characters.\n\nSet to `true` to automatically approve commands, `false` to always require explicit approval or `null` to unset the value.\n\nExamples:\n- `\"mkdir\": true` Will allow all command lines starting with `mkdir`\n- `\"npm run build\": true` Will allow all command lines starting with `npm run build`\n- `\"rm\": false` Will require explicit approval for all command lines starting with `rm`\n- `\"/^git (status|show\\b.*)$/\": true` will allow `git status` and all command lines starting with `git show`\n- `\"/.*/\": true` will allow all command lines\n- `\"rm\": null` will unset the default `false` value for `rm`\n\nNote that these commands and regular expressions are evaluated for every _sub-command_  within a single command line, so `foo && bar` for example will need both `foo` and `bar` to match a `true` entry and must not match a `false` entry in order to auto approve. Inline commands are also detected so `echo $(rm file)` will need both `echo $(rm file)` and `rm file` to pass."),
+		markdownDescription: localize('autoApprove', "A list of commands or regular expressions that control whether the run in terminal tool commands require explicit approval. These will be matched against the start of a command. A regular expression can be provided by wrapping the string in `/` characters followed by optional flags such as `i`.\n\nSet to `true` to automatically approve commands, `false` to always require explicit approval or `null` to unset the value.\n\nExamples:\n- `\"mkdir\": true` Will allow all command lines starting with `mkdir`\n- `\"npm run build\": true` Will allow all command lines starting with `npm run build`\n- `\"rm\": false` Will require explicit approval for all command lines starting with `rm`\n- `\"/^git (status|show\\b.*)$/\": true` will allow `git status` and all command lines starting with `git show`\n- `\"/^Get-ChildItem\\b/i\": true` will allow Get-ChildItem command regardless of casing\n- `\"/.*/\": true` will allow all command lines\n- `\"rm\": null` will unset the default `false` value for `rm`\n\nNote that these commands and regular expressions are evaluated for every _sub-command_  within a single command line, so `foo && bar` for example will need both `foo` and `bar` to match a `true` entry and must not match a `false` entry in order to auto approve. Inline commands are also detected so `echo $(rm file)` will need both `echo $(rm file)` and `rm file` to pass."),
 		type: 'object',
 		additionalProperties: {
 			anyOf: [
@@ -62,7 +62,7 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 			eval: false,
 			chmod: false,
 			chown: false,
-			'Remove-Item': false,
+			'/^Remove-Item\\b/i': false,
 		},
 	}
 };

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

@@ -184,6 +184,66 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isAutoApproved('del file'));
 			ok(!isAutoApproved('kill process'));
 		});
+
+		suite('flags', () => {
+			test('should handle case-insensitive regex patterns with i flag', () => {
+				setAutoApprove({
+					"/^echo/i": true,
+					"/^ls/i": true,
+					"/rm|del/i": false
+				});
+
+				ok(isAutoApproved('echo hello'));
+				ok(isAutoApproved('ECHO hello'));
+				ok(isAutoApproved('Echo hello'));
+				ok(isAutoApproved('ls -la'));
+				ok(isAutoApproved('LS -la'));
+				ok(isAutoApproved('Ls -la'));
+				ok(!isAutoApproved('rm file'));
+				ok(!isAutoApproved('RM file'));
+				ok(!isAutoApproved('del file'));
+				ok(!isAutoApproved('DEL file'));
+			});
+
+			test('should handle multiple regex flags', () => {
+				setAutoApprove({
+					"/^git\\s+/gim": true,
+					"/dangerous/gim": false
+				});
+
+				ok(isAutoApproved('git status'));
+				ok(isAutoApproved('GIT status'));
+				ok(isAutoApproved('Git status'));
+				ok(!isAutoApproved('dangerous command'));
+				ok(!isAutoApproved('DANGEROUS command'));
+			});
+
+			test('should handle various regex flags', () => {
+				setAutoApprove({
+					"/^echo.*/s": true,  // dotall flag
+					"/^git\\s+/i": true, // case-insensitive flag
+					"/rm|del/g": false   // global flag
+				});
+
+				ok(isAutoApproved('echo hello\nworld'));
+				ok(isAutoApproved('git status'));
+				ok(isAutoApproved('GIT status'));
+				ok(!isAutoApproved('rm file'));
+				ok(!isAutoApproved('del file'));
+			});
+
+			test('should handle regex patterns without flags', () => {
+				setAutoApprove({
+					"/^echo/": true,
+					"/rm|del/": false
+				});
+
+				ok(isAutoApproved('echo hello'));
+				ok(!isAutoApproved('ECHO hello'), 'Should be case-sensitive without i flag');
+				ok(!isAutoApproved('rm file'));
+				ok(!isAutoApproved('RM file'), 'Should be case-sensitive without i flag');
+			});
+		});
 	});
 
 	suite('edge cases', () => {