merge refactor changes, keep all in chat_cli

Author: evanliu048

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

@@ -11,30 +11,30 @@ use eyre::{
     Result,
     bail,
 };
-use fig_os_shim::Context;
-use fig_util::directories::chat_profiles_dir;
 use tokio::fs;
 use tracing::warn;
 
-use crate::cli::{
+use crate::cli::chat::cli::{
     Mcp,
     McpAdd,
     McpImport,
     McpList,
     McpRemove,
     Scope,
 };
-use crate::tool_manager::{
+use crate::cli::chat::tool_manager::{
     McpServerConfig,
     global_mcp_config_path,
     profile_mcp_config_path,
     workspace_mcp_config_path,
 };
-use crate::tools::custom_tool::{
+use crate::cli::chat::tools::custom_tool::{
     CustomToolConfig,
     default_timeout,
 };
-use crate::util::shared_writer::SharedWriter;
+use crate::cli::chat::util::shared_writer::SharedWriter;
+use crate::platform::Context;
+use crate::util::directories::chat_profiles_dir;
 
 pub async fn execute_mcp(args: Mcp) -> Result<ExitCode> {
     let ctx = Context::new();
@@ -367,7 +367,7 @@ mod tests {
 
     #[tokio::test]
     async fn add_then_remove_cycle() {
-        use crate::cli::{
+        use crate::cli::chat::cli::{
             McpAdd,
             McpRemove,
         };

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

@@ -22,20 +22,6 @@ use crossterm::{
     style,
     terminal,
 };
-use fig_api_client::model::{
-    ToolResult,
-    ToolResultContentBlock,
-    ToolResultStatus,
-};
-use fig_os_shim::{
-    Context,
-    EnvProvider,
-    FsProvider,
-};
-use fig_util::directories::{
-    chat_profiles_dir,
-    home_dir_ctx,
-};
 use futures::{
     StreamExt,
     stream,
@@ -76,27 +62,29 @@ use crate::mcp_client::{
     JsonRpcResponse,
     PromptGet,
 };
+use crate::platform::Context;
 use crate::telemetry::TelemetryThread;
+use crate::util::directories::{
+    chat_profiles_dir,
+    home_dir,
+};
 
 const NAMESPACE_DELIMITER: &str = "___";
 // This applies for both mcp server and tool name since in the end the tool name as seen by the
 // model is just {server_name}{NAMESPACE_DELIMITER}{tool_name}
 const VALID_TOOL_NAME: &str = "^[a-zA-Z][a-zA-Z0-9_]*$";
 const SPINNER_CHARS: [char; 10] = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 
-pub fn workspace_mcp_config_path<Ctx: EnvProvider>(ctx: &Ctx) -> eyre::Result<PathBuf> {
+pub fn workspace_mcp_config_path(ctx: &Context) -> eyre::Result<PathBuf> {
     Ok(ctx.env().current_dir()?.join(".amazonq").join("mcp.json"))
 }
 
-pub fn profile_mcp_config_path<Ctx: FsProvider + EnvProvider>(
-    ctx: &Ctx,
-    profile_name: impl AsRef<str>,
-) -> eyre::Result<PathBuf> {
+pub fn profile_mcp_config_path(ctx: &Context, profile_name: impl AsRef<str>) -> eyre::Result<PathBuf> {
     Ok(chat_profiles_dir(ctx)?.join(profile_name.as_ref()).join("mcp.json"))
 }
 
-pub fn global_mcp_config_path<Ctx: FsProvider + EnvProvider>(ctx: &Ctx) -> eyre::Result<PathBuf> {
-    Ok(home_dir_ctx(ctx)?.join(".aws").join("amazonq").join("mcp.json"))
+pub fn global_mcp_config_path(ctx: &Context) -> eyre::Result<PathBuf> {
+    Ok(home_dir(ctx)?.join(".aws").join("amazonq").join("mcp.json"))
 }
 
 #[derive(Debug, Error)]
@@ -191,14 +179,14 @@ impl McpServerConfig {
     }
 
     pub async fn load_from_file(ctx: &Context, path: impl AsRef<Path>) -> eyre::Result<Self> {
-        Ok(serde_json::from_str(&ctx.fs().read_to_string(path.as_ref()).await?)?)
+        let contents = ctx.fs().read_to_string(path.as_ref()).await?;
+        Ok(serde_json::from_str(&contents)?)
     }
 
     pub async fn save_to_file(&self, ctx: &Context, path: impl AsRef<Path>) -> eyre::Result<()> {
-        Ok(ctx
-            .fs()
-            .write(path.as_ref(), serde_json::to_string_pretty(self)?)
-            .await?)
+        let json = serde_json::to_string_pretty(self)?;
+        ctx.fs().write(path.as_ref(), json).await?;
+        Ok(())
     }
 
     fn from_slice(slice: &[u8], output: &mut impl Write, location: &str) -> eyre::Result<McpServerConfig> {

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

@@ -34,7 +34,8 @@ use tracing::{
     debug,
 };
 use user::UserSubcommand;
-
+use crate::cli::chat::mcp;
+use crate::cli::chat::cli::Mcp;
 use crate::logging::{
     LogArgs,
     initialize_logging,
@@ -104,6 +105,9 @@ pub enum CliRootCommands {
     /// AI assistant in your terminal
     #[command(alias("q"))]
     Chat(Chat),
+    /// Model Context Protocol (MCP)
+    #[command(subcommand)]
+    Mcp(Mcp),
 }
 
 impl CliRootCommands {
@@ -118,6 +122,7 @@ impl CliRootCommands {
             CliRootCommands::User(UserSubcommand::Profile) => "profile",
             CliRootCommands::Version { .. } => "version",
             CliRootCommands::Chat { .. } => "chat",
+            CliRootCommands::Mcp(_) => "mcp",
         }
     }
 }
@@ -206,6 +211,7 @@ impl Cli {
                 CliRootCommands::Issue(args) => args.execute().await,
                 CliRootCommands::Version { changelog } => Self::print_version(changelog),
                 CliRootCommands::Chat(args) => chat::launch_chat(&mut database, &telemetry, args).await,
+                CliRootCommands::Mcp(args) => mcp::execute_mcp(args).await,
             },
             // Root command
             None => chat::launch_chat(&mut database, &telemetry, chat::cli::Chat::default()).await,
@@ -308,6 +314,13 @@ impl Cli {
 
 #[cfg(test)]
 mod test {
+    use crate::cli::chat::cli::{
+        McpAdd,
+        McpImport,
+        McpList,
+        McpRemove,
+        Scope,
+    };
     use super::*;
 
     #[test]
@@ -490,4 +503,89 @@ mod test {
             })
         );
     }
+    #[test]
+    fn test_mcp_subcomman_add() {
+        assert_parse!(
+            [
+                "mcp",
+                "add",
+                "--name",
+                "test_server",
+                "--command",
+                "test_command",
+                "--profile",
+                "my_profile",
+                "--env",
+                "key1=value1,key2=value2"
+            ],
+            CliRootCommands::Mcp(Mcp::Add(McpAdd {
+                name: "test_server".to_string(),
+                command: "test_command".to_string(),
+                scope: None,
+                profile: Some("my_profile".to_string()),
+                env: vec![
+                    [
+                        ("key1".to_string(), "value1".to_string()),
+                        ("key2".to_string(), "value2".to_string())
+                    ]
+                    .into_iter()
+                    .collect()
+                ],
+                timeout: None,
+                force: false,
+            }))
+        );
+    }
+
+    #[test]
+    fn test_mcp_subcomman_remove_workspace() {
+        assert_parse!(
+            ["mcp", "remove", "--name", "old"],
+            CliRootCommands::Mcp(Mcp::Remove(McpRemove {
+                name: "old".into(),
+                scope: None,
+                profile: None,
+            }))
+        );
+    }
+    #[test]
+    fn test_mcp_subcomman_import_profile_force() {
+        assert_parse!(
+            [
+                "mcp",
+                "import",
+                "--file",
+                "servers.json",
+                "profile",
+                "--profile",
+                "qa",
+                "--force"
+            ],
+            CliRootCommands::Mcp(Mcp::Import(McpImport {
+                file: "servers.json".into(),
+                scope: Some(Scope::Profile),
+                profile: Some("qa".into()),
+                force: true,
+            }))
+        );
+    }
+
+    #[test]
+    fn test_mcp_subcommand_status_simple() {
+        assert_parse!(
+            ["mcp", "status", "--name", "aws"],
+            CliRootCommands::Mcp(Mcp::Status { name: "aws".into() })
+        );
+    }
+
+    #[test]
+    fn test_mcp_subcommand_list() {
+        assert_parse!(
+            ["mcp", "list", "global"],
+            CliRootCommands::Mcp(Mcp::List(McpList {
+                scope: Some(Scope::Global),
+                profile: None
+            }))
+        );
+    }
 }