From ee9040ad6e2fff3104fbde810747ea34a6def737 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 8 May 2025 14:11:24 +0200
Subject: [PATCH] agent: Tweak wording when configuring profiles (#30027)

cc @danilo-leal

Release Notes:

- N/A

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 .../manage_profiles_modal.rs                  | 36 +++++++++++--------
 .../assistant_configuration/tool_picker.rs    |  2 +-
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/crates/agent/src/assistant_configuration/manage_profiles_modal.rs b/crates/agent/src/assistant_configuration/manage_profiles_modal.rs
index 6e4bafc154..a1e85ec7f9 100644
--- a/crates/agent/src/assistant_configuration/manage_profiles_modal.rs
+++ b/crates/agent/src/assistant_configuration/manage_profiles_modal.rs
@@ -124,7 +124,7 @@ impl ManageProfilesModal {
                     let mut this = Self::new(fs, tools, thread_store, window, cx);
 
                     if let Some(profile_id) = action.customize_tools.clone() {
-                        this.configure_tools(profile_id, window, cx);
+                        this.configure_builtin_tools(profile_id, window, cx);
                     }
 
                     this
@@ -190,7 +190,7 @@ impl ManageProfilesModal {
         self.focus_handle(cx).focus(window);
     }
 
-    fn configure_mcps(
+    fn configure_mcp_tools(
         &mut self,
         profile_id: AgentProfileId,
         window: &mut Window,
@@ -228,7 +228,7 @@ impl ManageProfilesModal {
         self.focus_handle(cx).focus(window);
     }
 
-    fn configure_tools(
+    fn configure_builtin_tools(
         &mut self,
         profile_id: AgentProfileId,
         window: &mut Window,
@@ -581,16 +581,20 @@ impl ManageProfilesModal {
                         )
                         .child(
                             div()
-                                .id("configure-tools")
+                                .id("configure-builtin-tools")
                                 .track_focus(&mode.configure_tools.focus_handle)
                                 .on_action({
                                     let profile_id = mode.profile_id.clone();
                                     cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.configure_tools(profile_id.clone(), window, cx);
+                                        this.configure_builtin_tools(
+                                            profile_id.clone(),
+                                            window,
+                                            cx,
+                                        );
                                     })
                                 })
                                 .child(
-                                    ListItem::new("configure-tools")
+                                    ListItem::new("configure-builtin-tools-item")
                                         .toggle_state(
                                             mode.configure_tools
                                                 .focus_handle
@@ -603,11 +607,11 @@ impl ManageProfilesModal {
                                                 .size(IconSize::Small)
                                                 .color(Color::Muted),
                                         )
-                                        .child(Label::new("Configure Tools"))
+                                        .child(Label::new("Configure Built-in Tools"))
                                         .on_click({
                                             let profile_id = mode.profile_id.clone();
                                             cx.listener(move |this, _, window, cx| {
-                                                this.configure_tools(
+                                                this.configure_builtin_tools(
                                                     profile_id.clone(),
                                                     window,
                                                     cx,
@@ -623,11 +627,11 @@ impl ManageProfilesModal {
                                 .on_action({
                                     let profile_id = mode.profile_id.clone();
                                     cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.configure_mcps(profile_id.clone(), window, cx);
+                                        this.configure_mcp_tools(profile_id.clone(), window, cx);
                                     })
                                 })
                                 .child(
-                                    ListItem::new("configure-mcps")
+                                    ListItem::new("configure-mcp-tools")
                                         .toggle_state(
                                             mode.configure_mcps
                                                 .focus_handle
@@ -640,11 +644,15 @@ impl ManageProfilesModal {
                                                 .size(IconSize::Small)
                                                 .color(Color::Muted),
                                         )
-                                        .child(Label::new("Configure MCP Servers"))
+                                        .child(Label::new("Configure MCP Tools"))
                                         .on_click({
                                             let profile_id = mode.profile_id.clone();
                                             cx.listener(move |this, _, window, cx| {
-                                                this.configure_mcps(profile_id.clone(), window, cx);
+                                                this.configure_mcp_tools(
+                                                    profile_id.clone(),
+                                                    window,
+                                                    cx,
+                                                );
                                             })
                                         }),
                                 ),
@@ -777,7 +785,7 @@ impl Render for ManageProfilesModal {
                     v_flex()
                         .pb_1()
                         .child(ProfileModalHeader::new(
-                            format!("{profile_name} — Configure Tools"),
+                            format!("{profile_name} — Configure Built-in Tools"),
                             Some(IconName::Cog),
                         ))
                         .child(ListSeparator)
@@ -800,7 +808,7 @@ impl Render for ManageProfilesModal {
                     v_flex()
                         .pb_1()
                         .child(ProfileModalHeader::new(
-                            format!("{profile_name} — Configure MCP Servers"),
+                            format!("{profile_name} — Configure MCP Tools"),
                             Some(IconName::Hammer),
                         ))
                         .child(ListSeparator)
diff --git a/crates/agent/src/assistant_configuration/tool_picker.rs b/crates/agent/src/assistant_configuration/tool_picker.rs
index bc6fd80019..66068031ad 100644
--- a/crates/agent/src/assistant_configuration/tool_picker.rs
+++ b/crates/agent/src/assistant_configuration/tool_picker.rs
@@ -176,7 +176,7 @@ impl PickerDelegate for ToolPickerDelegate {
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         match self.mode {
             ToolPickerMode::BuiltinTools => "Search built-in tools…",
-            ToolPickerMode::McpTools => "Search MCP servers…",
+            ToolPickerMode::McpTools => "Search MCP tools…",
         }
         .into()
     }