Skip to content

fix(mcp): mcp command expansion coupled with canonicalizing path #2940

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
evanliu048 merged 1 commit into from
Sep 19, 2025
Merged

fix(mcp): mcp command expansion coupled with canonicalizing path #2940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions crates/chat-cli/src/mcp_client/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,7 @@ use crate::cli::chat::tools::custom_tool::{
TransportType,
};
use crate::os::Os;
use crate::util::directories::{
DirectoryError,
canonicalizes_path,
};
use crate::util::directories::DirectoryError;

/// Fetches all pages of specified resources from a server
macro_rules! paginated_fetch {
Expand Down Expand Up @@ -153,6 +150,8 @@ pub enum McpClientError {
Auth(#[from] crate::auth::AuthError),
#[error("{0}")]
MalformedConfig(&'static str),
#[error(transparent)]
LookUp(#[from] shellexpand::LookupError<std::env::VarError>),
}

/// Decorates the method passed in with retry logic, but only if the [RunningService] has an
Expand Down Expand Up @@ -527,8 +526,11 @@ impl McpClientService {

match r#type {
TransportType::Stdio => {
let expanded_cmd = canonicalizes_path(os, command_as_str)?;
let command = Command::new(expanded_cmd).configure(|cmd| {
let context = |input: &str| Ok(os.env.get(input).ok());
let home_dir = || os.env.home().map(|p| p.to_string_lossy().to_string());
let expanded_cmd = shellexpand::full_with_context(command_as_str, home_dir, context)?;

let command = Command::new(expanded_cmd.as_ref() as &str).configure(|cmd| {
if let Some(envs) = config_envs {
process_env_vars(envs, &os.env);
cmd.envs(envs);
Expand Down
Loading