Revert "Revert "Overhaul shell detection and centralize command generation for unified exec"" (#6607)

Reverts #6606

Author: pakrym-oai

codex-rs/core/src/bash.rs

@@ -1,8 +1,13 @@
+use std::path::PathBuf;
+
 use tree_sitter::Node;
 use tree_sitter::Parser;
 use tree_sitter::Tree;
 use tree_sitter_bash::LANGUAGE as BASH;
 
+use crate::shell::ShellType;
+use crate::shell::detect_shell_type;
+
 /// Parse the provided bash source using tree-sitter-bash, returning a Tree on
 /// success or None if parsing failed.
 pub fn try_parse_shell(shell_lc_arg: &str) -> Option<Tree> {
@@ -88,23 +93,16 @@ pub fn try_parse_word_only_commands_sequence(tree: &Tree, src: &str) -> Option<V
     Some(commands)
 }
 
-pub fn is_well_known_sh_shell(shell: &str) -> bool {
-    if shell == "bash" || shell == "zsh" {
-        return true;
-    }
-
-    let shell_name = std::path::Path::new(shell)
-        .file_name()
-        .and_then(|s| s.to_str())
-        .unwrap_or(shell);
-    matches!(shell_name, "bash" | "zsh")
-}
-
 pub fn extract_bash_command(command: &[String]) -> Option<(&str, &str)> {
     let [shell, flag, script] = command else {
         return None;
     };
-    if !matches!(flag.as_str(), "-lc" | "-c") || !is_well_known_sh_shell(shell) {
+    if !matches!(flag.as_str(), "-lc" | "-c")
+        || !matches!(
+            detect_shell_type(&PathBuf::from(shell)),
+            Some(ShellType::Zsh) | Some(ShellType::Bash)
+        )
+    {
         return None;
     }
     Some((shell, script))

codex-rs/core/src/command_safety/is_safe_command.rs

@@ -1,4 +1,5 @@
 use crate::bash::parse_shell_lc_plain_commands;
+use crate::command_safety::windows_safe_commands::is_safe_command_windows;
 
 pub fn is_known_safe_command(command: &[String]) -> bool {
     let command: Vec<String> = command
@@ -11,12 +12,9 @@ pub fn is_known_safe_command(command: &[String]) -> bool {
             }
         })
         .collect();
-    #[cfg(target_os = "windows")]
-    {
-        use super::windows_safe_commands::is_safe_command_windows;
-        if is_safe_command_windows(&command) {
-            return true;
-        }
+
+    if is_safe_command_windows(&command) {
+        return true;
     }
 
     if is_safe_to_call_with_exec(&command) {

codex-rs/core/src/command_safety/mod.rs

@@ -1,4 +1,3 @@
 pub mod is_dangerous_command;
 pub mod is_safe_command;
-#[cfg(target_os = "windows")]
 pub mod windows_safe_commands;

codex-rs/core/src/environment_context.rs

@@ -329,7 +329,6 @@ mod tests {
             Some(workspace_write_policy(vec!["/repo"], false)),
             Some(Shell::Bash(BashShell {
                 shell_path: "/bin/bash".into(),
-                bashrc_path: "/home/user/.bashrc".into(),
             })),
         );
         let context2 = EnvironmentContext::new(
@@ -338,7 +337,6 @@ mod tests {
             Some(workspace_write_policy(vec!["/repo"], false)),
             Some(Shell::Zsh(ZshShell {
                 shell_path: "/bin/zsh".into(),
-                zshrc_path: "/home/user/.zshrc".into(),
             })),
         );