fix: update test patterns for regex-based denied commands

Olivier Mansour · Olivier Mansour · commit bf091405250d · 2025-08-13T11:41:24.000+02:00
- Change denied command patterns from 'rm' to 'rm .*' to match new regex format
- Remove leftover conflict marker
- All tests now passing
diff --git a/crates/chat-cli/src/cli/chat/tools/execute/mod.rs b/crates/chat-cli/src/cli/chat/tools/execute/mod.rs
@@ -537,7 +537,7 @@ mod tests {
             "toolsSettings": {
                 "execute_bash": {
                     "allowedCommands": ["ls"],
-                    "deniedCommands": ["rm"],
+                    "deniedCommands": ["rm .*"],
                     "allowReadOnly": false
                 }
             }
@@ -574,7 +574,7 @@ mod tests {
             "toolsSettings": {
                 "execute_bash": {
                     "allowedCommands": ["git status", "ls.*"],
-                    "deniedCommands": ["rm"],
+                    "deniedCommands": ["rm .*"],
                     "allowReadOnly": true
                 }
             }
@@ -671,6 +671,5 @@ mod tests {
 
         // Should ask when settings are invalid (falls back to safe behavior)
         assert_eq!(cmd.eval_perm(&agent), PermissionEvalResult::Ask);
->>>>>>> 20b287db (fix: enhance execute tool permission logic for fine-grained command control)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ mod tests {`
`537`	`537`	`"toolsSettings": {`
`538`	`538`	`"execute_bash": {`
`539`	`539`	`"allowedCommands": ["ls"],`
`540`		`- "deniedCommands": ["rm"],`
	`540`	`+ "deniedCommands": ["rm .*"],`
`541`	`541`	`"allowReadOnly": false`
`542`	`542`	`}`
`543`	`543`	`}`
`@@ -574,7 +574,7 @@ mod tests {`
`574`	`574`	`"toolsSettings": {`
`575`	`575`	`"execute_bash": {`
`576`	`576`	`"allowedCommands": ["git status", "ls.*"],`
`577`		`- "deniedCommands": ["rm"],`
	`577`	`+ "deniedCommands": ["rm .*"],`
`578`	`578`	`"allowReadOnly": true`
`579`	`579`	`}`
`580`	`580`	`}`
`@@ -671,6 +671,5 @@ mod tests {`
`671`	`671`
`672`	`672`	`// Should ask when settings are invalid (falls back to safe behavior)`
`673`	`673`	`assert_eq!(cmd.eval_perm(&agent), PermissionEvalResult::Ask);`
`674`		`->>>>>>> 20b287db (fix: enhance execute tool permission logic for fine-grained command control)`
`675`	`674`	`}`
`676`	`675`	`}`