From 17684703da98c8090693563b3cc608c770ae0cfb Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Thu, 24 Jul 2025 12:14:50 +0200
Subject: [PATCH] Move mcp_server back to Claude

---
 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(-)
 rename crates/agent_servers/src/{ => claude}/mcp_server.rs (99%)

diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index 1e33e59c671e0408ab8c16a1257af3a754699db6..63d338fa198b62121b255d1f64cb8d4bb9f5259e 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/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;
 
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index f908487c88c744ab5ca9b10a2dc69c5b1c180496..a11419485cce3af57d7c7c477745a9e54a23b141 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/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 };
diff --git a/crates/agent_servers/src/mcp_server.rs b/crates/agent_servers/src/claude/mcp_server.rs
similarity index 99%
rename from crates/agent_servers/src/mcp_server.rs
rename to crates/agent_servers/src/claude/mcp_server.rs
index 66b58be1ab94b6f276fef84eeefa9b4c4cacb157..30fde3b9938bef0cbf1234248365270c2c139c15 100644
--- a/crates/agent_servers/src/mcp_server.rs
+++ b/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;