feat: Add MCP CLI subcommands

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

@@ -1,4 +1,11 @@
-use clap::Parser;
+use std::collections::HashMap;
+
+use clap::{
+    Args,
+    Parser,
+    Subcommand,
+    ValueEnum,
+};
 
 #[derive(Debug, Clone, PartialEq, Eq, Default, Parser)]
 pub struct Chat {
@@ -23,3 +30,127 @@ pub struct Chat {
     #[arg(long, value_delimiter = ',', value_name = "TOOL_NAMES")]
     pub trust_tools: Option<Vec<String>>,
 }
+
+#[derive(Debug, Clone, PartialEq, Eq, Subcommand)]
+pub enum Mcp {
+    /// Add or replace a configured server
+    Add(McpAdd),
+    /// Remove a server from the MCP configuration
+    #[command(alias = "rm")]
+    Remove(McpRemove),
+    /// List configured servers
+    List(McpList),
+    /// Import a server configuration from another file
+    Import(McpImport),
+    /// Get the status of a configured server
+    Status {
+        #[arg(long)]
+        name: String,
+    },
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Args)]
+pub struct McpAdd {
+    /// Name for the server
+    #[arg(long)]
+    pub name: String,
+    /// The command used to launch the server
+    #[arg(long)]
+    pub command: String,
+    /// Where to add the server to. For profile scope, the name of the profile must specified with
+    /// --profile.
+    #[arg(long, value_enum)]
+    pub scope: Option<Scope>,
+    /// Name of the profile to add the server config to. Not compatible with workspace scope or
+    /// global scope.
+    #[arg(long)]
+    pub profile: Option<String>,
+    /// Environment variables to use when launching the server
+    #[arg(long, value_parser = parse_env_vars)]
+    pub env: Vec<HashMap<String, String>>,
+    /// Server launch timeout, in milliseconds
+    #[arg(long)]
+    pub timeout: Option<u64>,
+    /// Overwrite an existing server with the same name
+    #[arg(long, default_value_t = false)]
+    pub force: bool,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Args)]
+pub struct McpRemove {
+    #[arg(long)]
+    pub name: String,
+    #[arg(long, value_enum)]
+    pub scope: Option<Scope>,
+    #[arg(long)]
+    pub profile: Option<String>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Args)]
+pub struct McpList {
+    #[arg(value_enum)]
+    pub scope: Option<Scope>,
+    #[arg(long)]
+    pub profile: Option<String>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Args)]
+pub struct McpImport {
+    #[arg(long)]
+    pub file: String,
+    #[arg(value_enum)]
+    pub scope: Option<Scope>,
+    #[arg(long)]
+    pub profile: Option<String>,
+    /// Overwrite an existing server with the same name
+    #[arg(long, default_value_t = false)]
+    pub force: bool,
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, ValueEnum)]
+pub enum Scope {
+    Workspace,
+    Profile,
+    Global,
+}
+
+impl std::fmt::Display for Scope {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Scope::Workspace => write!(f, "workspace"),
+            Scope::Profile => write!(f, "profile"),
+            Scope::Global => write!(f, "global"),
+        }
+    }
+}
+
+#[derive(Debug)]
+struct EnvVarParseError(String);
+
+impl std::fmt::Display for EnvVarParseError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Failed to parse environment variables: {}", self.0)
+    }
+}
+
+impl std::error::Error for EnvVarParseError {}
+
+fn parse_env_vars(arg: &str) -> Result<HashMap<String, String>, EnvVarParseError> {
+    let mut vars = HashMap::new();
+
+    for pair in arg.split(",") {
+        match pair.split_once('=') {
+            Some((key, value)) => {
+                vars.insert(key.trim().to_string(), value.trim().to_string());
+            },
+            None => {
+                return Err(EnvVarParseError(format!(
+                    "Invalid environment variable '{}'. Expected 'name=value'",
+                    pair
+                )));
+            },
+        }
+    }
+
+    Ok(vars)
+}