Mcp enablement squashed (#1327)

Author: dingfeli

Cargo.lock

@@ -86,6 +86,7 @@ indicatif = "0.17.11"
 indoc = "2.0.6"
 insta = "1.42.2"
 libc = "0.2.171"
+mcp_client = { path = "crates/mcp_client" }
 mimalloc = "0.1.46"
 nix = { version = "0.29.0", features = [
     "feature",
@@ -123,6 +124,7 @@ reqwest = { version = "0.12.14", default-features = false, features = [
 ] }
 ring = "0.17.14"
 rusqlite = { version = "0.32.1", features = ["bundled", "serde_json"] }
+shellexpand = "3.0.0"
 shell-color = { path = "crates/shell-color" }
 semver = { version = "1.0.26", features = ["serde"] }
 serde = { version = "1.0.219", features = ["derive", "rc"] }

Cargo.toml

@@ -75,7 +75,7 @@ rfd = "0.15.1"
 semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-shellexpand = "3.1.1"
+shellexpand.workspace = true
 sysinfo.workspace = true
 tao = { version = "0.31.1", features = ["serde"] }
 tempfile.workspace = true

crates/fig_desktop/Cargo.toml

@@ -30,7 +30,7 @@ fig_util.workspace = true
 fnv = "1.0.7"
 serde.workspace = true
 serde_json.workspace = true
-shellexpand = "3.1.1"
+shellexpand.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
 tracing.workspace = true

crates/fig_desktop_api/Cargo.toml

@@ -53,6 +53,7 @@ pub struct LogArgs<T: AsRef<Path>> {
 pub struct LogGuard {
     _file_guard: Option<WorkerGuard>,
     _stdout_guard: Option<WorkerGuard>,
+    _mcp_file_guard: Option<WorkerGuard>,
 }
 
 /// Initialize our application level logging using the given LogArgs.
@@ -65,6 +66,7 @@ pub fn initialize_logging<T: AsRef<Path>>(args: LogArgs<T>) -> Result<LogGuard,
     let filter_layer = create_filter_layer();
     let (reloadable_filter_layer, reloadable_handle) = tracing_subscriber::reload::Layer::new(filter_layer);
     ENV_FILTER_RELOADABLE_HANDLE.lock().unwrap().replace(reloadable_handle);
+    let mut mcp_path = None;
 
     // First we construct the file logging layer if a file name was provided.
     let (file_layer, _file_guard) = match args.log_file_path {
@@ -73,6 +75,9 @@ pub fn initialize_logging<T: AsRef<Path>>(args: LogArgs<T>) -> Result<LogGuard,
 
             // Make the log path parent directory if it doesn't exist.
             if let Some(parent) = log_path.parent() {
+                if log_path.ends_with("chat.log") {
+                    mcp_path = Some(parent.to_path_buf());
+                }
                 std::fs::create_dir_all(parent)?;
             }
 
@@ -119,20 +124,63 @@ pub fn initialize_logging<T: AsRef<Path>>(args: LogArgs<T>) -> Result<LogGuard,
         (None, None)
     };
 
+    // Set up for mcp servers layer if we are in chat
+    let (mcp_server_layer, _mcp_file_guard) = if let Some(parent) = mcp_path {
+        let mcp_path = parent.join("mcp.log");
+        if args.delete_old_log_file {
+            std::fs::remove_file(&mcp_path).ok();
+        } else if mcp_path.exists() && std::fs::metadata(&mcp_path)?.len() > MAX_FILE_SIZE {
+            std::fs::remove_file(&mcp_path)?;
+        }
+        let file = if args.delete_old_log_file {
+            File::create(&mcp_path)?
+        } else {
+            File::options().append(true).create(true).open(&mcp_path)?
+        };
+        #[cfg(unix)]
+        {
+            use std::os::unix::fs::PermissionsExt;
+            if let Ok(metadata) = file.metadata() {
+                let mut permissions = metadata.permissions();
+                permissions.set_mode(0o600);
+                file.set_permissions(permissions).ok();
+            }
+        }
+        let (non_blocking, guard) = tracing_appender::non_blocking(file);
+        let file_layer = fmt::layer()
+            .with_line_number(true)
+            .with_writer(non_blocking)
+            .with_filter(EnvFilter::new("mcp=trace"));
+        (Some(file_layer), Some(guard))
+    } else {
+        (None, None)
+    };
+
     if let Some(level) = args.log_level {
         set_log_level(level)?;
     }
 
     // Finally, initialize our logging
-    tracing_subscriber::registry()
+    let subscriber = tracing_subscriber::registry()
         .with(reloadable_filter_layer)
         .with(file_layer)
-        .with(stdout_layer)
-        .init();
+        .with(stdout_layer);
+
+    if let Some(mcp_server_layer) = mcp_server_layer {
+        subscriber.with(mcp_server_layer).init();
+        return Ok(LogGuard {
+            _file_guard,
+            _stdout_guard,
+            _mcp_file_guard,
+        });
+    }
+
+    subscriber.init();
 
     Ok(LogGuard {
         _file_guard,
         _stdout_guard,
+        _mcp_file_guard,
     })
 }
 

crates/fig_log/src/lib.rs

@@ -55,7 +55,8 @@ semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 shell-color.workspace = true
-shellexpand = "3.1.1"
+shell-words = "1.1"
+shellexpand.workspace = true
 shlex.workspace = true
 sysinfo.workspace = true
 time.workspace = true

crates/figterm/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+name = "mcp_client"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+publish.workspace = true
+version.workspace = true
+license.workspace = true
+
+[lints]
+workspace = true
+
+[features]
+default = []
+
+[[bin]]
+name = "test_mcp_server"
+path = "test_mcp_server/test_server.rs"
+test = true
+doc = false
+
+[dependencies]
+tokio.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+async-trait.workspace = true
+tracing.workspace = true
+thiserror.workspace = true
+uuid.workspace = true
+nix.workspace = true