Add configurable shell for shell_command tool via toolCall.shellCommand.path and toolCall.shellCommand.args.

Fixes #370

Author: ericdallo

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Bump plumcp to 0.2.0-beta5.
 - Fix auto-continue clobbering new prompt status and losing the stop button.
+- Add configurable shell for `shell_command` tool via `toolCall.shellCommand.path` and `toolCall.shellCommand.args`. #370
 
 ## 0.116.5
 

docs/config.json

@@ -840,6 +840,19 @@
           "markdownDescription": "Configuration for the shell_command tool.",
           "additionalProperties": false,
           "properties": {
+            "path": {
+              "type": "string",
+              "description": "Custom shell executable path. Overrides the default platform shell (bash on Linux/macOS, powershell on Windows).",
+              "markdownDescription": "Custom shell executable path. Overrides the default platform shell (`bash` on Linux/macOS, `powershell` on Windows)."
+            },
+            "args": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "description": "Arguments passed to the shell before the script argument. E.g. [\"-l\", \"-c\"] for bash.",
+              "markdownDescription": "Arguments passed to the shell before the script argument. E.g. `[\"-l\", \"-c\"]` for bash."
+            },
             "summaryMaxLength": {
               "type": "integer",
               "description": "Maximum length of shell command summary.",

src/eca/features/tools/shell.clj

@@ -19,40 +19,47 @@
   "Start a shell process, returning the process object for deref/management.
 
    Options:
-   - :cwd      Working directory (required)
-   - :script   Inline script string (mutually exclusive with :file)
-   - :file     Script file path (mutually exclusive with :script)
-   - :input    String to pass as stdin (optional)
+   - :cwd        Working directory (required)
+   - :script     Inline script string (mutually exclusive with :file)
+   - :file       Script file path (mutually exclusive with :script)
+   - :input      String to pass as stdin (optional)
+   - :shell-path Custom shell executable path (optional, overrides platform default)
+   - :shell-args Custom shell args placed before the script/file arg (optional)
 
    Returns: babashka.process process object (deref-able)"
-  [{:keys [cwd script file input]}]
+  [{:keys [cwd script file input shell-path shell-args]}]
   {:pre [(some? cwd)
          (or (some? script) (some? file))
          (not (and script file))]}
-  (let [win? (string/starts-with? (System/getProperty "os.name") "Windows")
-        cmd (cond
-              (and win? file)
-              ["powershell.exe" "-ExecutionPolicy" "Bypass" "-File" file]
+  (let [cmd (if shell-path
+              (into (vec (cons shell-path shell-args)) [(or script file)])
+              (let [win? (string/starts-with? (System/getProperty "os.name") "Windows")]
+                (cond
+                  (and win? file)
+                  ["powershell.exe" "-ExecutionPolicy" "Bypass" "-File" file]
 
-              (and win? script)
-              ["powershell.exe" "-NoProfile" "-Command" script]
+                  (and win? script)
+                  ["powershell.exe" "-NoProfile" "-Command" script]
 
-              file
-              ["bash" file]
+                  file
+                  ["bash" file]
 
-              :else
-              ["bash" "-c" script])]
+                  :else
+                  ["bash" "-c" script])))]
     (p/process (cond-> {:cmd cmd
                         :dir cwd
                         :out :string
                         :err :string
                         :continue true}
                  input (assoc :in input)))))
 
-(defn ^:private shell-command [arguments {:keys [db tool-call-id call-state-fn state-transition-fn]}]
+(defn ^:private shell-command [arguments {:keys [db config tool-call-id call-state-fn state-transition-fn]}]
   (let [command-args (get arguments "command")
         user-work-dir (get arguments "working_directory")
-        timeout (min (or (get arguments "timeout") default-timeout) max-timeout)]
+        timeout (min (or (get arguments "timeout") default-timeout) max-timeout)
+        shell-config (get-in config [:toolCall :shellCommand])
+        shell-path (get shell-config :path)
+        shell-args (get shell-config :args)]
     (or (tools.util/invalid-arguments arguments [["working_directory" #(or (nil? %)
                                                                            (fs/exists? %)) "working directory $working_directory does not exist"]])
         (let [work-dir (or (some-> user-work-dir fs/canonicalize str)
@@ -64,8 +71,10 @@
               _ (logger/debug logger-tag "Running command:" command-args)
               result (try
                        (if-let [proc (when-not (= :stopping (:status (call-state-fn)))
-                                       (start-shell-process! {:cwd work-dir
-                                                              :script command-args}))]
+                                       (start-shell-process! (cond-> {:cwd work-dir
+                                                                      :script command-args}
+                                                               shell-path (assoc :shell-path shell-path)
+                                                               shell-args (assoc :shell-args shell-args))))]
                          (do
                            (state-transition-fn :resources-created {:resources {:process proc}})
                            (try (deref proc