Supports python as command

Also make shell interpreter configurable

Author: xychen

README.md

@@ -66,6 +66,7 @@ For code completion on the `commands.yaml` file, [redhat.vscode-yaml](https://ma
       * `required`: Whether the argument is required (defaults to `false`).
       * `default`: The default value for the argument, if it is not required.
     * `command`: The command to run. Supports [Handlebars](https://handlebarsjs.com/guide/expressions.html) templating for arguments.
+    * `shell`: The shell used to execute the command. Defaults to "bash" on Unix-like systems and "powershell" on Windows. Also supports "python" for using Python script in the command.
 
 ## Built-in tools
 

src/manifest.rs

@@ -24,6 +24,11 @@ pub struct CommandSpec {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub args: Option<Vec<ArgumentSpec>>,
 
+    /// The shell used to execute the command. Defaults to "bash" on Unix-like
+    /// systems and "powershell" on Windows. Also supports "python" for using
+    /// Python script in the command.
+    pub shell: Option<String>,
+
     /// The command template
     pub command: String,
 }

src/manifest_executor.rs

@@ -2,6 +2,7 @@ use std::{
     io::{Read, pipe},
     path::PathBuf,
     process::Command,
+    str::FromStr,
 };
 
 use handlebars::Handlebars;
@@ -10,23 +11,6 @@ use serde_json::Value as JsonValue;
 
 use crate::manifest::CommandSpec;
 
-#[cfg(unix)]
-fn shell(command: &str) -> Command {
-    let mut cmd = Command::new("bash");
-    cmd.arg("-c").arg(command.replace("\r\n", "\n"));
-    cmd
-}
-
-#[cfg(windows)]
-fn shell(command: &str) -> Command {
-    let mut cmd = Command::new("powershell");
-    cmd.arg("-Command").arg(format!(
-        "[Console]::OutputEncoding = [System.Text.Encoding]::UTF8\r\n{}",
-        command.replace("\r\n", "\n").replace("\n", "\r\n")
-    ));
-    cmd
-}
-
 impl CommandSpec {
     pub fn execute(
         &self,
@@ -44,7 +28,13 @@ impl CommandSpec {
             McpError::internal_error(format!("Failed creating stdio pipes: {}", e), None)
         })?;
 
-        let mut proc = shell(&command)
+        let shell = match self.shell {
+            None => Shell::default(),
+            Some(ref s) => Shell::from_str(s)?,
+        };
+
+        let mut proc = shell
+            .to_command(&command)
             .current_dir(cwd)
             .stdout(writer.try_clone().map_err(|e| {
                 McpError::internal_error(
@@ -72,3 +62,69 @@ impl CommandSpec {
         Ok((command, output, exit_code))
     }
 }
+
+enum Shell {
+    Bash,
+    PowerShell,
+    Python,
+}
+
+impl Default for Shell {
+    fn default() -> Self {
+        if cfg!(windows) {
+            Shell::PowerShell
+        } else {
+            Shell::Bash
+        }
+    }
+}
+
+impl FromStr for Shell {
+    type Err = McpError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_lowercase().as_str() {
+            "bash" => Ok(Shell::Bash),
+            "powershell" => Ok(Shell::PowerShell),
+            "python" => Ok(Shell::Python),
+            _ => Err(McpError::invalid_params(
+                format!("Unsupported shell: {}", s),
+                None,
+            )),
+        }
+    }
+}
+
+impl Shell {
+    pub fn to_command(&self, command: &str) -> Command {
+        match self {
+            Shell::Bash => {
+                let mut cmd = Command::new("bash");
+                cmd.arg("-c").arg(normalize_newlines(command, false));
+                cmd
+            }
+            Shell::PowerShell => {
+                let mut cmd = Command::new("powershell");
+                cmd.arg("-Command").arg(format!(
+                    "[Console]::OutputEncoding = [System.Text.Encoding]::UTF8\r\n{}",
+                    normalize_newlines(command, true)
+                ));
+                cmd
+            }
+            Shell::Python => {
+                let mut cmd = Command::new("python");
+                cmd.arg("-c").arg(normalize_newlines(command, false));
+                cmd
+            }
+        }
+    }
+}
+
+fn normalize_newlines(command: &str, wants_cr_lf: bool) -> String {
+    let command = command.replace("\r\n", "\n");
+    if wants_cr_lf {
+        command.replace("\n", "\r\n")
+    } else {
+        command
+    }
+}