Skip to content

feat(mcp): add --mcp-config-paths CLI argument #222

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

Closed
floralph wants to merge 2 commits into from
Closed

feat(mcp): add --mcp-config-paths CLI argument #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0ef7f4
feat(mcp): add --mcp-config-paths CLI argument
floralph Jun 10, 2025
6ea180e
fix: error on Windows build due to overload ambiguity
floralph Jun 13, 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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ book/
.env*

run-build.sh
# Ignore Amazon Q CLI context directory
crates/chat-cli/.amazonq/
11 changes: 10 additions & 1 deletion crates/chat-cli/src/cli/chat/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,13 @@ pub struct ChatArgs {
/// '--trust-tools=fs_read,fs_write', trust no tools: '--trust-tools='
#[arg(long, value_delimiter = ',', value_name = "TOOL_NAMES")]
pub trust_tools: Option<Vec<String>>,
/// Additional MCP configuration files (paths separated by OS path separator)
#[arg(
long,
value_delimiter = if cfg!(windows) { ';' } else { ':' },
value_name = "PATHS"
)]
pub mcp_config_paths: Option<Vec<String>>,
}

impl ChatArgs {
Expand Down Expand Up @@ -233,7 +240,9 @@ impl ChatArgs {
_ => StreamingClient::new(database).await?,
};

let mcp_server_configs = match McpServerConfig::load_config(&mut output).await {
let mcp_server_configs = match McpServerConfig::load_config(&ctx, &mut output, self.mcp_config_paths.as_deref())
.await
{
Ok(config) => {
if interactive && !database.settings.get_bool(Setting::McpLoadedBefore).unwrap_or(false) {
execute!(
Expand Down
Loading
Loading