Merge pull request #10340 from gitbutlerapp/fix-claude-mcp-configs

Add some tracing in bridge.rs

Author: Caleb-T-Owens

crates/but-claude/src/bridge.rs

@@ -23,7 +23,7 @@ use crate::{
     ClaudeMessage, ClaudeMessageContent, ClaudeUserParams, PermissionMode, ThinkingLevel,
     Transcript, UserInput,
     claude_config::fmt_claude_settings,
-    claude_mcp::ClaudeMcpConfig,
+    claude_mcp::{BUT_SECURITY_MCP, ClaudeMcpConfig},
     claude_settings::ClaudeSettings,
     db,
     rules::{create_claude_assignment_rule, list_claude_assignment_rules},
@@ -335,13 +335,17 @@ async fn spawn_command(
     let disabled_mcp_servers = user_params
         .disabled_mcp_servers
         .iter()
+        .filter(|f| *f != BUT_SECURITY_MCP)
         .map(String::as_str)
         .collect::<Vec<&str>>();
-    let mcp_config = serde_json::to_string(
-        &mcp_config
-            .mcp_servers_with_security()
-            .exclude(&disabled_mcp_servers),
-    )?;
+    let mcp_config = &mcp_config
+        .mcp_servers_with_security()
+        .exclude(&disabled_mcp_servers);
+    tracing::info!(
+        "spawn_command mcp_servers: {:?}",
+        mcp_config.mcp_servers.keys()
+    );
+    let mcp_config = serde_json::to_string(mcp_config)?;
     let mut command = Command::new(claude_executable);
 
     /// Don't create a terminal window on windows.
@@ -413,6 +417,7 @@ async fn spawn_command(
         &user_params.message,
         user_params.thinking_level,
     ));
+    tracing::info!("spawn_command: {:?}", command);
     Ok(command.spawn()?)
 }
 

crates/but-claude/src/claude_mcp.rs

@@ -29,14 +29,14 @@ struct Project {
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct McpConfig {
-    mcp_servers: McpServers,
+    pub mcp_servers: McpServers,
 }
 
 type McpServers = HashMap<String, McpServer>;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
-struct McpServer {
+pub struct McpServer {
     r#type: Option<String>,
     command: Option<String>,
     url: Option<String>,
@@ -52,6 +52,8 @@ pub struct ClaudeMcpConfig {
     mcp_json: Option<McpConfig>,
 }
 
+pub const BUT_SECURITY_MCP: &str = "but-security";
+
 impl ClaudeMcpConfig {
     pub async fn open(settings: &ClaudeSettings, project_path: &Path) -> Self {
         Self {
@@ -107,7 +109,7 @@ impl ClaudeMcpConfig {
     pub fn mcp_servers_with_security(&self) -> McpConfig {
         let mut out = self.mcp_servers();
         out.mcp_servers.insert(
-            "but-security".to_owned(),
+            BUT_SECURITY_MCP.to_owned(),
             McpServer {
                 r#type: Some("stdio".to_owned()),
                 command: Some("but".to_owned()),