oh-my-codex 0.17.3 → 0.18.1

package/crates/omx-sparkshell/src/exec.rs

@@ -26,6 +26,84 @@ impl CommandOutput {
     }
 }
 
+pub fn resolve_shell_argv(script: &str) -> Vec<String> {
+    resolve_shell_argv_for_platform(script, current_platform(), command_exists_on_path)
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum ShellPlatform {
+    Windows,
+    Posix,
+}
+
+fn current_platform() -> ShellPlatform {
+    if cfg!(windows) {
+        ShellPlatform::Windows
+    } else {
+        ShellPlatform::Posix
+    }
+}
+
+fn resolve_shell_argv_for_platform(
+    script: &str,
+    platform: ShellPlatform,
+    exists: impl Fn(&str) -> bool,
+) -> Vec<String> {
+    match platform {
+        ShellPlatform::Posix => vec!["bash".to_string(), "-lc".to_string(), script.to_string()],
+        ShellPlatform::Windows => {
+            if exists("pwsh") {
+                return vec![
+                    "pwsh".to_string(),
+                    "-NoLogo".to_string(),
+                    "-NoProfile".to_string(),
+                    "-Command".to_string(),
+                    script.to_string(),
+                ];
+            }
+            if exists("powershell.exe") {
+                return vec![
+                    "powershell.exe".to_string(),
+                    "-NoLogo".to_string(),
+                    "-NoProfile".to_string(),
+                    "-Command".to_string(),
+                    script.to_string(),
+                ];
+            }
+            vec![
+                std::env::var("ComSpec").unwrap_or_else(|_| "cmd.exe".to_string()),
+                "/d".to_string(),
+                "/s".to_string(),
+                "/c".to_string(),
+                script.to_string(),
+            ]
+        }
+    }
+}
+
+fn command_exists_on_path(command: &str) -> bool {
+    if command.contains(std::path::MAIN_SEPARATOR)
+        || command.contains('/')
+        || command.contains('\\')
+    {
+        return std::path::Path::new(command).is_file();
+    }
+    let Some(path) = std::env::var_os("PATH") else {
+        return false;
+    };
+    std::env::split_paths(&path).any(|dir| {
+        let candidate = dir.join(command);
+        candidate.is_file()
+            || if cfg!(windows) && std::path::Path::new(command).extension().is_none() {
+                ["exe", "cmd", "bat", "com"]
+                    .iter()
+                    .any(|ext| dir.join(format!("{command}.{ext}")).is_file())
+            } else {
+                false
+            }
+    })
+}
+
 pub fn execute_command(argv: &[String]) -> Result<CommandOutput, SparkshellError> {
     if argv.is_empty() {
         return Err(SparkshellError::InvalidArgs(
@@ -102,7 +180,7 @@ fn build_windows_command(command_name: &str, args: &[String]) -> Command {
 
 #[cfg(test)]
 mod tests {
-    use super::execute_command;
+    use super::{execute_command, resolve_shell_argv_for_platform, ShellPlatform};
 
     #[test]
     fn rejects_missing_command() {
@@ -112,4 +190,52 @@ mod tests {
             "usage: omx-sparkshell <command> [args...]"
         );
     }
+
+    #[test]
+    fn posix_shell_mode_uses_bash_lc() {
+        assert_eq!(
+            resolve_shell_argv_for_platform("printf ok", ShellPlatform::Posix, |_| false),
+            ["bash", "-lc", "printf ok"]
+        );
+    }
+
+    #[test]
+    fn windows_shell_mode_prefers_pwsh() {
+        assert_eq!(
+            resolve_shell_argv_for_platform("Write-Output ok", ShellPlatform::Windows, |name| {
+                name == "pwsh"
+            }),
+            [
+                "pwsh",
+                "-NoLogo",
+                "-NoProfile",
+                "-Command",
+                "Write-Output ok"
+            ]
+        );
+    }
+
+    #[test]
+    fn windows_shell_mode_falls_back_to_windows_powershell() {
+        assert_eq!(
+            resolve_shell_argv_for_platform("Write-Output ok", ShellPlatform::Windows, |name| {
+                name == "powershell.exe"
+            }),
+            [
+                "powershell.exe",
+                "-NoLogo",
+                "-NoProfile",
+                "-Command",
+                "Write-Output ok"
+            ]
+        );
+    }
+
+    #[test]
+    fn windows_shell_mode_uses_minimal_cmd_fallback() {
+        assert_eq!(
+            resolve_shell_argv_for_platform("echo ok", ShellPlatform::Windows, |_| false),
+            ["cmd.exe", "/d", "/s", "/c", "echo ok"]
+        );
+    }
 }