Move mcp_server back to Claude

Ben Brandt created 4 months ago

Change summary

crates/agent_servers/src/agent_servers.rs     | 1 -
crates/agent_servers/src/claude.rs            | 5 +++--
crates/agent_servers/src/claude/mcp_server.rs | 2 --
3 files changed, 3 insertions(+), 5 deletions(-)

Detailed changes

crates/agent_servers/src/agent_servers.rs

@@ -1,7 +1,6 @@
 mod claude;
 mod codex;
 mod gemini;
-mod mcp_server;
 mod settings;
 mod stdio_agent_server;
 

crates/agent_servers/src/claude.rs

@@ -1,3 +1,4 @@
+mod mcp_server;
 pub mod tools;
 
 use collections::HashMap;
@@ -25,8 +26,8 @@ use gpui::{App, AppContext, AsyncApp, Entity, Task, WeakEntity};
 use serde::{Deserialize, Serialize};
 use util::ResultExt;
 
+use crate::claude::mcp_server::{McpConfig, ZedMcpServer};
 use crate::claude::tools::ClaudeTool;
-use crate::mcp_server::{self, McpConfig, ZedMcpServer};
 use crate::{AgentServer, AgentServerCommand, AllAgentServersSettings};
 use acp_thread::{AcpThread, AgentConnection};
 
@@ -64,7 +65,7 @@ impl AgentServer for ClaudeCode {
 
             let mut mcp_servers = HashMap::default();
             mcp_servers.insert(
-                crate::mcp_server::SERVER_NAME.to_string(),
+                mcp_server::SERVER_NAME.to_string(),
                 permission_mcp_server.server_config()?,
             );
             let mcp_config = McpConfig { mcp_servers };

crates/agent_servers/src/mcp_server.rs → crates/agent_servers/src/claude/mcp_server.rs

@@ -1,5 +1,3 @@
-// todo! move this back to claude since, it won't share any of the tools with other agents
-
 use std::{cell::RefCell, path::PathBuf, rc::Rc};
 
 use acp_thread::AcpThread;