tkmind/tkmind_go
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

feat: add GOOSE_SHELL env var to configure preferred shell (#7909)

Browse Source 
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
This commit is contained in:
Vincenzo Palazzo
2026-03-20 18:53:58 +01:00
committed by GitHub
parent 80f3e50d0d
commit 1f7f234326
1 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/goose/src/agents/platform_extensions/developer/shell.rs
+35 -12
View File
@@ -1,3 +1,5 @@
#[cfg(windows)]
use std::path::Path;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Stdio; use std::process::Stdio;
use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::atomic::{AtomicUsize, Ordering};
@@ -53,11 +55,13 @@ pub struct ShellOutput {
/// source the user's profile and recover the full PATH. /// source the user's profile and recover the full PATH.
#[cfg(not(windows))] #[cfg(not(windows))]
fn resolve_login_shell_path() -> Option<String> { fn resolve_login_shell_path() -> Option<String> {
let shell = if PathBuf::from("/bin/bash").is_file() { let shell = std::env::var("GOOSE_SHELL").unwrap_or_else(|_| {
"/bin/bash".to_string() if PathBuf::from("/bin/bash").is_file() {
} else { "/bin/bash".to_string()
std::env::var("SHELL").unwrap_or_else(|_| "sh".to_string()) } else {
}; std::env::var("SHELL").unwrap_or_else(|_| "sh".to_string())
}
});
let mut child = std::process::Command::new(&shell) let mut child = std::process::Command::new(&shell)
.args(["-l", "-i", "-c", "echo $PATH"]) .args(["-l", "-i", "-c", "echo $PATH"])
@@ -360,18 +364,37 @@ async fn run_command(
fn build_shell_command(command_line: &str) -> tokio::process::Command { fn build_shell_command(command_line: &str) -> tokio::process::Command {
#[cfg(windows)] #[cfg(windows)]
let mut command = { let mut command = {
let mut command = tokio::process::Command::new("cmd"); let shell = std::env::var("GOOSE_SHELL").unwrap_or_else(|_| "cmd".to_string());
command.arg("/C").raw_arg(command_line); let shell_stem = Path::new(&shell)
.file_stem()
.and_then(|s| s.to_str())
.unwrap_or("cmd")
.to_lowercase();
let mut command = tokio::process::Command::new(&shell);
match shell_stem.as_str() {
"pwsh" | "powershell" => {
command.args(["-NoProfile", "-NonInteractive", "-Command", command_line]);
}
"cmd" => {
command.arg("/C").raw_arg(command_line);
}
// POSIX-like shells (bash, zsh, etc.) on Windows (e.g. Cygwin/MSYS2)
_ => {
command.args(["-c", command_line]);
}
}
command command
}; };
#[cfg(not(windows))] #[cfg(not(windows))]
let mut command = { let mut command = {
let shell = if PathBuf::from("/bin/bash").is_file() { let shell = std::env::var("GOOSE_SHELL").unwrap_or_else(|_| {
"/bin/bash".to_string() if PathBuf::from("/bin/bash").is_file() {
} else { "/bin/bash".to_string()
std::env::var("SHELL").unwrap_or_else(|_| "sh".to_string()) } else {
}; std::env::var("SHELL").unwrap_or_else(|_| "sh".to_string())
}
});
let mut command = tokio::process::Command::new(shell); let mut command = tokio::process::Command::new(shell);
command.arg("-c").arg(command_line); command.arg("-c").arg(command_line);
command command