refactored requires_acceptance to ensure correct ordering of safeguards and allowed commands

Author: ekang7

crates/chat-cli/src/cli/chat/tools/execute/mod.rs

@@ -89,20 +89,10 @@ impl ExecuteCommand {
         if !current_cmd.is_empty() {
             all_commands.push(current_cmd);
         }
-        let allowed_commands = allowed_commands.unwrap_or(&default_arr);
-
-        let has_regex_match = allowed_commands
-            .iter()
-            .map(|cmd| Regex::new(&format!(r"\A{}\z", cmd)))
-            .filter(Result::is_ok)
-            .flatten()
-            .any(|regex| regex.is_match(&self.command));
-        if has_regex_match {
-            return false;
-        }
+        
 
         // Check if each command in the pipe chain starts with a safe command
-        for cmd_args in all_commands {
+        for cmd_args in &all_commands {
             match cmd_args.first() {
                 // Special casing for `find` so that we support most cases while safeguarding
                 // against unwanted mutations
@@ -129,12 +119,29 @@ impl ExecuteCommand {
                     {
                         return true;
                     }
-                    let is_cmd_read_only = READONLY_COMMANDS.contains(&cmd.as_str());
-                    if !allow_read_only || !is_cmd_read_only {
-                        return true;
-                    }
                 },
-                None => return true,
+                None => {},
+            }
+        }
+
+        let allowed_commands = allowed_commands.unwrap_or(&default_arr);
+
+        let has_regex_match = allowed_commands
+            .iter()
+            .map(|cmd| Regex::new(&format!(r"\A{}\z", cmd)))
+            .filter(Result::is_ok)
+            .flatten()
+            .any(|regex| regex.is_match(&self.command));
+        if has_regex_match {
+            return false;
+        }
+
+        for cmd_args in all_commands {
+            if let Some(cmd) = cmd_args.first() {
+                let is_cmd_read_only = READONLY_COMMANDS.contains(&cmd.as_str());
+                if !allow_read_only || !is_cmd_read_only {
+                    return true;
+                }
             }
         }