From 148e9adec237633ba8193f7d7543d9eb0f906657 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Wed, 28 May 2025 15:25:53 +0200
Subject: [PATCH] Revert "agent: Namespace MCP server tools" (#31588)

Reverts zed-industries/zed#30600
---
 crates/agent/src/agent_configuration.rs             | 2 +-
 crates/agent/src/agent_configuration/tool_picker.rs | 4 ++--
 crates/agent/src/context_server_tool.rs             | 4 ----
 crates/assistant_tool/src/assistant_tool.rs         | 5 -----
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/crates/agent/src/agent_configuration.rs b/crates/agent/src/agent_configuration.rs
index be2d1da51b..8f7346c00b 100644
--- a/crates/agent/src/agent_configuration.rs
+++ b/crates/agent/src/agent_configuration.rs
@@ -637,7 +637,7 @@ impl AgentConfiguration {
                             .hover(|style| style.bg(cx.theme().colors().element_hover))
                             .rounded_sm()
                             .child(
-                                Label::new(tool.ui_name())
+                                Label::new(tool.name())
                                     .buffer_font(cx)
                                     .size(LabelSize::Small),
                             )
diff --git a/crates/agent/src/agent_configuration/tool_picker.rs b/crates/agent/src/agent_configuration/tool_picker.rs
index b14de9e447..5ac2d4496b 100644
--- a/crates/agent/src/agent_configuration/tool_picker.rs
+++ b/crates/agent/src/agent_configuration/tool_picker.rs
@@ -117,7 +117,7 @@ impl ToolPickerDelegate {
                 ToolSource::Native => {
                     if mode == ToolPickerMode::BuiltinTools {
                         items.extend(tools.into_iter().map(|tool| PickerItem::Tool {
-                            name: tool.ui_name().into(),
+                            name: tool.name().into(),
                             server_id: None,
                         }));
                     }
@@ -129,7 +129,7 @@ impl ToolPickerDelegate {
                             server_id: server_id.clone(),
                         });
                         items.extend(tools.into_iter().map(|tool| PickerItem::Tool {
-                            name: tool.ui_name().into(),
+                            name: tool.name().into(),
                             server_id: Some(server_id.clone()),
                         }));
                     }
diff --git a/crates/agent/src/context_server_tool.rs b/crates/agent/src/context_server_tool.rs
index af79983853..68ffefb126 100644
--- a/crates/agent/src/context_server_tool.rs
+++ b/crates/agent/src/context_server_tool.rs
@@ -30,10 +30,6 @@ impl ContextServerTool {
 
 impl Tool for ContextServerTool {
     fn name(&self) -> String {
-        format!("{}-{}", self.server_id, self.tool.name)
-    }
-
-    fn ui_name(&self) -> String {
         self.tool.name.clone()
     }
 
diff --git a/crates/assistant_tool/src/assistant_tool.rs b/crates/assistant_tool/src/assistant_tool.rs
index 3691ad10c3..ecda105f6d 100644
--- a/crates/assistant_tool/src/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -203,11 +203,6 @@ pub trait Tool: 'static + Send + Sync {
     /// Returns the name of the tool.
     fn name(&self) -> String;
 
-    /// Returns the name to be displayed in the UI for this tool.
-    fn ui_name(&self) -> String {
-        self.name()
-    }
-
     /// Returns the description of the tool.
     fn description(&self) -> String;