Skip to content

Configurable search paths #5356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamadeo merged 7 commits into from
Oct 29, 2025
Merged

Configurable search paths #5356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
12c4f58
Set a PATH from config
jamadeo Oct 24, 2025
464189c
rm unused
jamadeo Oct 24, 2025
3d48fca
no need to make a String
jamadeo Oct 24, 2025
908fcf9
config keys
jamadeo Oct 24, 2025
9045161
Not just for extensions potentially
jamadeo Oct 24, 2025
d8b4e51
Prepend
jamadeo Oct 24, 2025
c6a75f3
expand tilde
jamadeo Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions crates/goose/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ sys-info = "0.9"
oauth2 = "5.0.0"
schemars = { version = "1.0.4", default-features = false, features = ["derive"] }
insta = "1.43.2"
paste = "1.0.0"
shellexpand = "3.1.1"


[target.'cfg(target_os = "windows")'.dependencies]
Expand Down
7 changes: 7 additions & 0 deletions crates/goose/src/agents/extension_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use super::tool_execution::ToolCallResult;
use crate::agents::extension::{Envs, ProcessExit};
use crate::agents::extension_malware_check;
use crate::agents::mcp_client::{McpClient, McpClientTrait};
use crate::config::search_path::search_path_var;
use crate::config::{get_all_extensions, Config};
use crate::oauth::oauth_flow;
use crate::prompt_template;
Expand Down Expand Up @@ -182,6 +183,12 @@ async fn child_process_client(
command.process_group(0);
#[cfg(windows)]
command.creation_flags(CREATE_NO_WINDOW_FLAG);

command.env(
Copy link
Collaborator

@michaelneale michaelneale Oct 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this overrides the main $PATH right? so user would need to know to set everything they need as not appending? (can the config include $PATH as an auto expanding var?)

Copy link
Collaborator Author

@jamadeo jamadeo Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

command.env overrides, but the search_path_var() function will do the appending

Copy link
Collaborator

@michaelneale michaelneale Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah ok, nice.

"PATH",
search_path_var().map_err(|e| ExtensionError::ConfigError(format!("{}", e)))?,
);

let (transport, mut stderr) = TokioChildProcess::builder(command)
.stderr(Stdio::piped())
.spawn()?;
Expand Down
12 changes: 12 additions & 0 deletions crates/goose/src/config/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,16 @@ impl Default for Config {
}
}

macro_rules! declare_param {
($param_name:ident, $param_type:ty) => {
paste::paste! {
pub fn [<get_ $param_name:lower>](&self) -> Result<$param_type, ConfigError> {
self.get_param(stringify!($param_name))
}
}
};
}

impl Config {
/// Get the global configuration instance.
///
Expand Down Expand Up @@ -730,6 +740,8 @@ impl Config {
};
Ok(())
}

declare_param!(GOOSE_SEARCH_PATHS, Vec<String>);
}

/// Load init-config.yaml from workspace root if it exists.
Expand Down
1 change: 1 addition & 0 deletions crates/goose/src/config/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ mod experiments;
pub mod extensions;
pub mod paths;
pub mod permission;
pub mod search_path;
pub mod signup_openrouter;
pub mod signup_tetrate;

Expand Down
25 changes: 25 additions & 0 deletions crates/goose/src/config/search_path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
use std::{env, ffi::OsString, path::PathBuf};

use crate::config::{Config, ConfigError};

pub fn search_path_var() -> Result<OsString, ConfigError> {
let paths = Config::global()
.get_goose_search_paths()
.or_else(|err| match err {
ConfigError::NotFound(_) => Ok(vec![]),
err => Err(err),
})?
.into_iter()
.map(|s| PathBuf::from(shellexpand::tilde(&s).as_ref()));

env::join_paths(
paths.chain(
env::var_os("PATH")
.as_ref()
.map(env::split_paths)
.into_iter()
.flatten(),
),
)
.map_err(|e| ConfigError::DeserializeError(format!("{}", e)))
}
Loading