fix: Add support for passing "args" to MCP configuration when using q mcp add (#262)

* add args

* remove json

* CI

* support more --agrs

* revert tip

* Remove mcp.json file

Author: evanliu048

crates/chat-cli/src/cli/chat/mod.rs

@@ -417,25 +417,35 @@ const SMALL_SCREEN_WELCOME_TEXT: &str = color_print::cstr! {"<em>Welcome to <cya
 const RESUME_TEXT: &str = color_print::cstr! {"<em>Picking up where we left off...</em>"};
 
 // Only show the model-related tip for now to make users aware of this feature.
-const ROTATING_TIPS: [&str; 3] = [
-    // color_print::cstr! {"You can resume the last conversation from your current directory by launching with
-    // <green!>q chat --resume</green!>"}, color_print::cstr! {"Get notified whenever Q CLI finishes responding.
-    // Just run <green!>q settings chat.enableNotifications true</green!>"}, color_print::cstr! {"You can use
-    // <green!>/editor</green!> to edit your prompt with a vim-like experience"}, color_print::cstr!
-    // {"<green!>/usage</green!> shows you a visual breakdown of your current context window usage"},
-    // color_print::cstr! {"Get notified whenever Q CLI finishes responding. Just run <green!>q settings
-    // chat.enableNotifications true</green!>"}, color_print::cstr! {"You can execute bash commands by typing
-    // <green!>!</green!> followed by the command"}, color_print::cstr! {"Q can use tools without asking for
-    // confirmation every time. Give <green!>/tools trust</green!> a try"}, color_print::cstr! {"You can
-    // programmatically inject context to your prompts by using hooks. Check out <green!>/context hooks
-    // help</green!>"}, color_print::cstr! {"You can use <green!>/compact</green!> to replace the conversation
-    // history with its summary to free up the context space"}, color_print::cstr! {"If you want to file an issue
-    // to the Q CLI team, just tell me, or run <green!>q issue</green!>"}, color_print::cstr! {"You can enable
-    // custom tools with <green!>MCP servers</green!>. Learn more with /help"}, color_print::cstr! {"You can
-    // specify wait time (in ms) for mcp server loading with <green!>q settings mcp.initTimeout {timeout in
-    // int}</green!>. Servers that takes longer than the specified time will continue to load in the background. Use
-    // /tools to see pending servers."}, color_print::cstr! {"You can see the server load status as well as any
-    // warnings or errors associated with <green!>/mcp</green!>"},
+const ROTATING_TIPS: [&str; 16] = [
+    color_print::cstr! {"You can resume the last conversation from your current directory by launching with
+    <green!>q chat --resume</green!>"},
+    color_print::cstr! {"Get notified whenever Q CLI finishes responding.
+    Just run <green!>q settings chat.enableNotifications true</green!>"},
+    color_print::cstr! {"You can use
+    <green!>/editor</green!> to edit your prompt with a vim-like experience"},
+    color_print::cstr! {"<green!>/usage</green!> shows you a visual breakdown of your current context window usage"},
+    color_print::cstr! {"Get notified whenever Q CLI finishes responding. Just run <green!>q settings
+    chat.enableNotifications true</green!>"},
+    color_print::cstr! {"You can execute bash commands by typing
+    <green!>!</green!> followed by the command"},
+    color_print::cstr! {"Q can use tools without asking for
+    confirmation every time. Give <green!>/tools trust</green!> a try"},
+    color_print::cstr! {"You can
+    programmatically inject context to your prompts by using hooks. Check out <green!>/context hooks
+    help</green!>"},
+    color_print::cstr! {"You can use <green!>/compact</green!> to replace the conversation
+    history with its summary to free up the context space"},
+    color_print::cstr! {"If you want to file an issue
+    to the Q CLI team, just tell me, or run <green!>q issue</green!>"},
+    color_print::cstr! {"You can enable
+    custom tools with <green!>MCP servers</green!>. Learn more with /help"},
+    color_print::cstr! {"You can
+    specify wait time (in ms) for mcp server loading with <green!>q settings mcp.initTimeout {timeout in
+    int}</green!>. Servers that takes longer than the specified time will continue to load in the background. Use
+    /tools to see pending servers."},
+    color_print::cstr! {"You can see the server load status as well as any
+    warnings or errors associated with <green!>/mcp</green!>"},
     color_print::cstr! {"Use <green!>/model</green!> to select the model to use for this conversation"},
     color_print::cstr! {"Set a default model by running <green!>q settings chat.defaultModel MODEL</green!>. Run <green!>/model</green!> to learn more."},
     color_print::cstr! {"Run <green!>/prompts</green!> to learn how to build & run repeatable workflows"},

crates/chat-cli/src/cli/mcp.rs

@@ -4,6 +4,7 @@ use std::path::PathBuf;
 use std::process::ExitCode;
 
 use clap::{
+    ArgAction,
     Args,
     ValueEnum,
 };
@@ -85,6 +86,9 @@ pub struct AddArgs {
     /// The command used to launch the server
     #[arg(long)]
     pub command: String,
+    /// Arguments to pass to the command
+    #[arg(long, action = ArgAction::Append, allow_hyphen_values = true, value_delimiter = ',')]
+    pub args: Vec<String>,
     /// Where to add the server to.
     #[arg(long, value_enum)]
     pub scope: Option<Scope>,
@@ -121,6 +125,7 @@ impl AddArgs {
         let merged_env = self.env.into_iter().flatten().collect::<HashMap<_, _>>();
         let tool: CustomToolConfig = serde_json::from_value(serde_json::json!({
             "command": self.command,
+            "args": self.args,
             "env": merged_env,
             "timeout": self.timeout.unwrap_or(default_timeout()),
             "disabled": self.disabled,
@@ -454,6 +459,11 @@ mod tests {
         AddArgs {
             name: "local".into(),
             command: "echo hi".into(),
+            args: vec![
+                "awslabs.eks-mcp-server".to_string(),
+                "--allow-write".to_string(),
+                "--allow-sensitive-data-access".to_string(),
+            ],
             env: vec![],
             timeout: None,
             scope: None,
@@ -492,12 +502,19 @@ mod tests {
                 "test_server",
                 "--command",
                 "test_command",
+                "--args",
+                "awslabs.eks-mcp-server,--allow-write,--allow-sensitive-data-access",
                 "--env",
                 "key1=value1,key2=value2"
             ],
             RootSubcommand::Mcp(McpSubcommand::Add(AddArgs {
                 name: "test_server".to_string(),
                 command: "test_command".to_string(),
+                args: vec![
+                    "awslabs.eks-mcp-server".to_string(),
+                    "--allow-write".to_string(),
+                    "--allow-sensitive-data-access".to_string(),
+                ],
                 scope: None,
                 env: vec![
                     [

crates/q_cli/src/cli/mod.rs

@@ -369,7 +369,7 @@ impl Cli {
                 },
                 CliRootCommands::Mcp { args } => {
                     if args.iter().any(|arg| ["--help", "-h"].contains(&arg.as_str())) {
-                        return Self::execute_chat("mcp", Some(vec!["--help".to_owned()]), false).await;
+                        return Self::execute_chat("mcp", Some(args), false).await;
                     }
 
                     Self::execute_chat("mcp", Some(args), true).await