Merge remote-tracking branch 'origin/main' into custom-tool-cards

Cargo.lock

@@ -4901,37 +4901,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "eval"
-version = "0.1.0"
-dependencies = [
- "agent",
- "anyhow",
- "assistant_tool",
- "assistant_tools",
- "client",
- "collections",
- "context_server",
- "dap",
- "env_logger 0.11.8",
- "fs",
- "gpui",
- "gpui_tokio",
- "language",
- "language_model",
- "language_models",
- "node_runtime",
- "project",
- "prompt_store",
- "release_channel",
- "reqwest_client",
- "serde",
- "settings",
- "smol",
- "toml 0.8.20",
- "workspace-hack",
-]
-
 [[package]]
 name = "evals"
 version = "0.1.0"
@@ -10981,9 +10950,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.14.0"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
 dependencies = [
  "cfg-if",
  "fnv",
@@ -10991,7 +10960,7 @@ dependencies = [
  "memchr",
  "parking_lot",
  "protobuf",
- "thiserror 2.0.12",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -11166,23 +11135,9 @@ dependencies = [
 
 [[package]]
 name = "protobuf"
-version = "3.7.2"
+version = "2.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4"
-dependencies = [
- "once_cell",
- "protobuf-support",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "protobuf-support"
-version = "3.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6"
-dependencies = [
- "thiserror 1.0.69",
-]
+checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
 
 [[package]]
 name = "psm"
@@ -13267,9 +13222,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 dependencies = [
  "serde",
 ]

Cargo.toml

@@ -47,7 +47,6 @@ members = [
     "crates/diagnostics",
     "crates/docs_preprocessor",
     "crates/editor",
-    "crates/eval",
     "crates/evals",
     "crates/extension",
     "crates/extension_api",

assets/keymaps/default-linux.json

@@ -644,6 +644,7 @@
   },
   {
     "context": "AgentPanel && prompt_editor",
+    "use_key_equivalents": true,
     "bindings": {
       "cmd-n": "agent::NewPromptEditor",
       "cmd-alt-t": "agent::NewThread"
@@ -659,6 +660,7 @@
   },
   {
     "context": "EditMessageEditor > Editor",
+    "use_key_equivalents": true,
     "bindings": {
       "escape": "menu::Cancel",
       "enter": "menu::Confirm",
@@ -667,6 +669,7 @@
   },
   {
     "context": "AgentFeedbackMessageEditor > Editor",
+    "use_key_equivalents": true,
     "bindings": {
       "escape": "menu::Cancel",
       "enter": "menu::Confirm",
@@ -798,6 +801,7 @@
   },
   {
     "context": "GitPanel",
+    "use_key_equivalents": true,
     "bindings": {
       "ctrl-g ctrl-g": "git::Fetch",
       "ctrl-g up": "git::Push",

assets/prompts/assistant_system_prompt.hbs

@@ -163,8 +163,3 @@ There are rules that apply to these root directories:
 {{/if}}
 {{/each}}
 {{/if}}
-
-<user_environment>
-Operating System: {{os}} ({{arch}})
-Shell: {{shell}}
-</user_environment>

assets/prompts/assistant_system_prompt_reminder.hbs

@@ -0,0 +1 @@
+In your response, make sure to remember and follow my instructions about how to format code blocks (and don't mention that you are remembering it, just follow the instructions).

assets/settings/default.json

@@ -656,8 +656,8 @@
         "name": "Write",
         "enable_all_context_servers": true,
         "tools": {
-          "terminal": true,
-          "code_actions": true,
+          "bash": true,
+          "batch_tool": true,
           "code_symbols": true,
           "copy_path": false,
           "create_file": true,
@@ -671,7 +671,6 @@
           "path_search": true,
           "read_file": true,
           "regex_search": true,
-          "rename": true,
           "symbol_info": true,
           "thinking": true
         }

crates/agent/src/active_thread.rs

@@ -1,3 +1,4 @@
+use crate::AssistantPanel;
 use crate::context::{AssistantContext, ContextId};
 use crate::context_picker::MentionLink;
 use crate::thread::{
@@ -7,7 +8,6 @@ use crate::thread::{
 use crate::thread_store::ThreadStore;
 use crate::tool_use::{PendingToolUseStatus, ToolUse, ToolUseStatus};
 use crate::ui::{AddedContext, AgentNotification, AgentNotificationEvent, ContextPill};
-use crate::{AssistantPanel, OpenActiveThreadAsMarkdown};
 use anyhow::Context as _;
 use assistant_settings::{AssistantSettings, NotifyWhenAgentWaiting};
 use collections::{HashMap, HashSet};
@@ -21,7 +21,7 @@ use gpui::{
     linear_color_stop, linear_gradient, list, percentage, pulsating_between,
 };
 use language::{Buffer, LanguageRegistry};
-use language_model::{LanguageModelRegistry, LanguageModelToolUseId, Role};
+use language_model::{ConfiguredModel, LanguageModelRegistry, LanguageModelToolUseId, Role};
 use markdown::parser::CodeBlockKind;
 use markdown::{Markdown, MarkdownElement, MarkdownStyle, ParsedMarkdown, without_fences};
 use project::ProjectItem as _;
@@ -57,7 +57,6 @@ pub struct ActiveThread {
     editing_message: Option<(MessageId, EditMessageState)>,
     expanded_tool_uses: HashMap<LanguageModelToolUseId, bool>,
     expanded_thinking_segments: HashMap<(MessageId, usize), bool>,
-    expanded_code_blocks: HashMap<(MessageId, usize), bool>,
     last_error: Option<ThreadError>,
     notifications: Vec<WindowHandle<AgentNotification>>,
     copied_code_block_ids: HashSet<(MessageId, usize)>,
@@ -298,7 +297,7 @@ fn render_markdown_code_block(
     codeblock_range: Range<usize>,
     active_thread: Entity<ActiveThread>,
     workspace: WeakEntity<Workspace>,
-    _window: &Window,
+    _window: &mut Window,
     cx: &App,
 ) -> Div {
     let label = match kind {
@@ -378,20 +377,16 @@ fn render_markdown_code_block(
                 .rounded_sm()
                 .hover(|item| item.bg(cx.theme().colors().element_hover.opacity(0.5)))
                 .tooltip(Tooltip::text("Jump to File"))
+                .children(
+                    file_icons::FileIcons::get_icon(&path_range.path, cx)
+                        .map(Icon::from_path)
+                        .map(|icon| icon.color(Color::Muted).size(IconSize::XSmall)),
+                )
+                .child(content)
                 .child(
-                    h_flex()
-                        .gap_0p5()
-                        .children(
-                            file_icons::FileIcons::get_icon(&path_range.path, cx)
-                                .map(Icon::from_path)
-                                .map(|icon| icon.color(Color::Muted).size(IconSize::XSmall)),
-                        )
-                        .child(content)
-                        .child(
-                            Icon::new(IconName::ArrowUpRight)
-                                .size(IconSize::XSmall)
-                                .color(Color::Ignored),
-                        ),
+                    Icon::new(IconName::ArrowUpRight)
+                        .size(IconSize::XSmall)
+                        .color(Color::Ignored),
                 )
                 .on_click({
                     let path_range = path_range.clone();
@@ -449,32 +444,16 @@ fn render_markdown_code_block(
         }),
     };
 
-    let codeblock_was_copied = active_thread
-        .read(cx)
-        .copied_code_block_ids
-        .contains(&(message_id, ix));
-
-    let is_expanded = active_thread
-        .read(cx)
-        .expanded_code_blocks
-        .get(&(message_id, ix))
-        .copied()
-        .unwrap_or(false);
-
     let codeblock_header_bg = cx
         .theme()
         .colors()
         .element_background
         .blend(cx.theme().colors().editor_foreground.opacity(0.01));
 
-    const CODE_FENCES_LINE_COUNT: usize = 2;
-    const MAX_COLLAPSED_LINES: usize = 5;
-
-    let line_count = parsed_markdown.source()[codeblock_range.clone()]
-        .bytes()
-        .filter(|c| *c == b'\n')
-        .count()
-        .saturating_sub(CODE_FENCES_LINE_COUNT - 1);
+    let codeblock_was_copied = active_thread
+        .read(cx)
+        .copied_code_block_ids
+        .contains(&(message_id, ix));
 
     let codeblock_header = h_flex()
         .group("codeblock_header")
@@ -487,104 +466,57 @@ fn render_markdown_code_block(
         .rounded_t_md()
         .children(label)
         .child(
-            h_flex()
-                .gap_1()
-                .child(
-                    div().visible_on_hover("codeblock_header").child(
-                        IconButton::new(
-                            ("copy-markdown-code", ix),
-                            if codeblock_was_copied {
-                                IconName::Check
-                            } else {
-                                IconName::Copy
-                            },
-                        )
-                        .icon_color(Color::Muted)
-                        .shape(ui::IconButtonShape::Square)
-                        .tooltip(Tooltip::text("Copy Code"))
-                        .on_click({
-                            let active_thread = active_thread.clone();
-                            let parsed_markdown = parsed_markdown.clone();
-                            move |_event, _window, cx| {
-                                active_thread.update(cx, |this, cx| {
-                                    this.copied_code_block_ids.insert((message_id, ix));
+            div().visible_on_hover("codeblock_header").child(
+                IconButton::new(
+                    ("copy-markdown-code", ix),
+                    if codeblock_was_copied {
+                        IconName::Check
+                    } else {
+                        IconName::Copy
+                    },
+                )
+                .icon_color(Color::Muted)
+                .shape(ui::IconButtonShape::Square)
+                .tooltip(Tooltip::text("Copy Code"))
+                .on_click({
+                    let active_thread = active_thread.clone();
+                    let parsed_markdown = parsed_markdown.clone();
+                    move |_event, _window, cx| {
+                        active_thread.update(cx, |this, cx| {
+                            this.copied_code_block_ids.insert((message_id, ix));
 
-                                    let code = without_fences(
-                                        &parsed_markdown.source()[codeblock_range.clone()],
-                                    )
+                            let code =
+                                without_fences(&parsed_markdown.source()[codeblock_range.clone()])
                                     .to_string();
 
-                                    cx.write_to_clipboard(ClipboardItem::new_string(code.clone()));
+                            cx.write_to_clipboard(ClipboardItem::new_string(code.clone()));
 
-                                    cx.spawn(async move |this, cx| {
-                                        cx.background_executor()
-                                            .timer(Duration::from_secs(2))
-                                            .await;
+                            cx.spawn(async move |this, cx| {
+                                cx.background_executor().timer(Duration::from_secs(2)).await;
 
-                                        cx.update(|cx| {
-                                            this.update(cx, |this, cx| {
-                                                this.copied_code_block_ids
-                                                    .remove(&(message_id, ix));
-                                                cx.notify();
-                                            })
-                                        })
-                                        .ok();
+                                cx.update(|cx| {
+                                    this.update(cx, |this, cx| {
+                                        this.copied_code_block_ids.remove(&(message_id, ix));
+                                        cx.notify();
                                     })
-                                    .detach();
-                                });
-                            }
-                        }),
-                    ),
-                )
-                .when(line_count > MAX_COLLAPSED_LINES, |header| {
-                    header.child(
-                        IconButton::new(
-                            ("expand-collapse-code", ix),
-                            if is_expanded {
-                                IconName::ChevronUp
-                            } else {
-                                IconName::ChevronDown
-                            },
-                        )
-                        .icon_color(Color::Muted)
-                        .shape(ui::IconButtonShape::Square)
-                        .tooltip(Tooltip::text(if is_expanded {
-                            "Collapse Code"
-                        } else {
-                            "Expand Code"
-                        }))
-                        .on_click({
-                            let active_thread = active_thread.clone();
-                            move |_event, _window, cx| {
-                                active_thread.update(cx, |this, cx| {
-                                    let is_expanded = this
-                                        .expanded_code_blocks
-                                        .entry((message_id, ix))
-                                        .or_insert(false);
-                                    *is_expanded = !*is_expanded;
-                                    cx.notify();
-                                });
-                            }
-                        }),
-                    )
+                                })
+                                .ok();
+                            })
+                            .detach();
+                        });
+                    }
                 }),
+            ),
         );
 
     v_flex()
-        .my_2()
+        .mb_2()
+        .relative()
         .overflow_hidden()
         .rounded_lg()
         .border_1()
         .border_color(cx.theme().colors().border_variant)
-        .bg(cx.theme().colors().editor_background)
         .child(codeblock_header)
-        .when(line_count > MAX_COLLAPSED_LINES, |this| {
-            if is_expanded {
-                this.h_full()
-            } else {
-                this.max_h_40()
-            }
-        })
 }
 
 fn open_markdown_link(
@@ -694,7 +626,6 @@ impl ActiveThread {
             rendered_tool_uses: HashMap::default(),
             expanded_tool_uses: HashMap::default(),
             expanded_thinking_segments: HashMap::default(),
-            expanded_code_blocks: HashMap::default(),
             list_state: list_state.clone(),
             scrollbar_state: ScrollbarState::new(list_state),
             show_scrollbar: false,
@@ -823,7 +754,7 @@ impl ActiveThread {
 
     fn handle_thread_event(
         &mut self,
-        thread: &Entity<Thread>,
+        _thread: &Entity<Thread>,
         event: &ThreadEvent,
         window: &mut Window,
         cx: &mut Context<Self>,
@@ -897,7 +828,11 @@ impl ActiveThread {
                 self.save_thread(cx);
                 cx.notify();
             }
-            ThreadEvent::UsePendingTools { tool_uses } => {
+            ThreadEvent::UsePendingTools => {
+                let tool_uses = self
+                    .thread
+                    .update(cx, |thread, cx| thread.use_pending_tools(cx));
+
                 for tool_use in tool_uses {
                     self.render_tool_use_markdown(
                         tool_use.id.clone(),
@@ -909,8 +844,11 @@ impl ActiveThread {
                 }
             }
             ThreadEvent::ToolFinished {
-                pending_tool_use, ..
+                pending_tool_use,
+                canceled,
+                ..
             } => {
+                let canceled = *canceled;
                 if let Some(tool_use) = pending_tool_use {
                     self.render_tool_use_markdown(
                         tool_use.id.clone(),
@@ -918,53 +856,26 @@ impl ActiveThread {
                         &tool_use.input,
                         self.thread
                             .read(cx)
-                            .tool_result(&tool_use.id)
-                            .map(|result| result.content.clone().into())
+                            .output_for_tool(&tool_use.id)
+                            .map(|output| output.clone().into())
                             .unwrap_or("".into()),
                         cx,
                     );
                 }
-            }
-            ThreadEvent::CheckpointChanged => cx.notify(),
-            ThreadEvent::StreamedFileChunk { path, chunk } => {
-                let project = thread.read(cx).project().clone();
 
-                if let Some(project_path) = project.update(cx, |project, cx| {
-                    project.find_project_path(path.as_ref(), cx)
-                }) {
-                    log::info!("Appending {}B chunk to {path}", chunk.len());
-
-                    let path = path.clone();
-                    let chunk = chunk.clone();
-
-                    cx.spawn(async move |_, cx| {
-                        match project.update(cx, |project, cx| {
-                            project.open_buffer(project_path.clone(), cx)
-                        }) {
-                            Ok(buffer_task) => {
-                                if let Ok(buffer) = buffer_task.await {
-                                    // Append the text to the buffer
-                                    if let Err(e) = cx.update(|cx| {
-                                        buffer.update(cx, |buffer, cx| {
-                                            let point = buffer.snapshot().len();
-                                            buffer.edit([(point..point, chunk.as_str())], None, cx)
-                                        })
-                                    }) {
-                                        log::warn!("Failed to edit buffer: {}", e);
-                                    } else {
-                                        log::info!("Successfully appended chunk to file: {path}",);
-                                    }
-                                }
+                if self.thread.read(cx).all_tools_finished() {
+                    let model_registry = LanguageModelRegistry::read_global(cx);
+                    if let Some(ConfiguredModel { model, .. }) = model_registry.default_model() {
+                        self.thread.update(cx, |thread, cx| {
+                            thread.attach_tool_results(cx);
+                            if !canceled {
+                                thread.send_to_model(model, RequestKind::Chat, cx);
                             }
-                            Err(_) => {
-                                let todo = (); // TODO record the error in the messages somehow.
-                                todo!();
-                            }
-                        }
-                    })
-                    .detach();
+                        });
+                    }
                 }
             }
+            ThreadEvent::CheckpointChanged => cx.notify(),
         }
     }
 
@@ -1403,16 +1314,8 @@ impl ActiveThread {
         let editor_bg_color = colors.editor_background;
         let bg_user_message_header = editor_bg_color.blend(active_color.opacity(0.25));
 
-        let open_as_markdown = IconButton::new("open-as-markdown", IconName::FileCode)
-            .shape(ui::IconButtonShape::Square)
-            .icon_size(IconSize::XSmall)
-            .icon_color(Color::Ignored)
-            .tooltip(Tooltip::text("Open Thread as Markdown"))
-            .on_click(|_event, window, cx| {
-                window.dispatch_action(Box::new(OpenActiveThreadAsMarkdown), cx)
-            });
-
         let feedback_container = h_flex().py_2().px_4().gap_1().justify_between();
+
         let feedback_items = match self.thread.read(cx).message_feedback(message_id) {
             Some(feedback) => feedback_container
                 .child(
@@ -1464,8 +1367,7 @@ impl ActiveThread {
                                         cx,
                                     );
                                 })),
-                        )
-                        .child(open_as_markdown),
+                        ),
                 )
                 .into_any_element(),
             None => feedback_container
@@ -1478,7 +1380,6 @@ impl ActiveThread {
                 )
                 .child(
                     h_flex()
-                        .pr_1()
                         .gap_1()
                         .child(
                             IconButton::new(("feedback-thumbs-up", ix), IconName::ThumbsUp)
@@ -1509,8 +1410,7 @@ impl ActiveThread {
                                         cx,
                                     );
                                 })),
-                        )
-                        .child(open_as_markdown),
+                        ),
                 )
                 .into_any_element(),
         };
@@ -1935,10 +1835,10 @@ impl ActiveThread {
                                     render: Arc::new({
                                         let workspace = workspace.clone();
                                         let active_thread = cx.entity();
-                                        move |kind, parsed_markdown, range, window, cx| {
+                                        move |id, kind, parsed_markdown, range, window, cx| {
                                             render_markdown_code_block(
                                                 message_id,
-                                                range.start,
+                                                id,
                                                 kind,
                                                 parsed_markdown,
                                                 range,
@@ -1949,44 +1849,6 @@ impl ActiveThread {
                                             )
                                         }
                                     }),
-                                    transform: Some(Arc::new({
-                                        let active_thread = cx.entity();
-                                        move |el, range, _, cx| {
-                                            let is_expanded = active_thread
-                                                .read(cx)
-                                                .expanded_code_blocks
-                                                .get(&(message_id, range.start))
-                                                .copied()
-                                                .unwrap_or(false);
-
-                                            if is_expanded {
-                                                return el;
-                                            }
-                                            el.child(
-                                                div()
-                                                    .absolute()
-                                                    .bottom_0()
-                                                    .left_0()
-                                                    .w_full()
-                                                    .h_1_4()
-                                                    .rounded_b_lg()
-                                                    .bg(gpui::linear_gradient(
-                                                        0.,
-                                                        gpui::linear_color_stop(
-                                                            cx.theme().colors().editor_background,
-                                                            0.,
-                                                        ),
-                                                        gpui::linear_color_stop(
-                                                            cx.theme()
-                                                                .colors()
-                                                                .editor_background
-                                                                .opacity(0.),
-                                                            1.,
-                                                        ),
-                                                    )),
-                                            )
-                                        }
-                                    })),
                                 })
                                 .on_url_click({
                                     let workspace = self.workspace.clone();
@@ -2340,18 +2202,23 @@ impl ActiveThread {
                                 .buffer_font(cx),
                         )
                         .child(div().w_full().text_ui_sm(cx).children(
-                            rendered_tool_use.as_ref().map(|rendered| {
-                                MarkdownElement::new(
-                                    rendered.output.clone(),
-                                    tool_use_markdown_style(window, cx),
-                                )
-                                .on_url_click({
-                                    let workspace = self.workspace.clone();
-                                    move |text, window, cx| {
-                                        open_markdown_link(text, workspace.clone(), window, cx);
-                                    }
+                            if let Some(card) = self.thread.read(cx).card_for_tool(&tool_use.id) {
+                                Some(card.clone().into_any_element())
+                            } else {
+                                rendered_tool_use.as_ref().map(|rendered| {
+                                    MarkdownElement::new(
+                                        rendered.output.clone(),
+                                        tool_use_markdown_style(window, cx),
+                                    )
+                                    .on_url_click({
+                                        let workspace = self.workspace.clone();
+                                        move |text, window, cx| {
+                                            open_markdown_link(text, workspace.clone(), window, cx);
+                                        }
+                                    })
+                                    .into_any_element()
                                 })
-                            }),
+                            },
                         )),
                 ),
                 ToolUseStatus::Running => container.child(
@@ -2393,10 +2260,11 @@ impl ActiveThread {
                                 .color(Color::Muted)
                                 .buffer_font(cx),
                         )
-                        .child(
-                            div()
-                                .text_ui_sm(cx)
-                                .children(rendered_tool_use.as_ref().map(|rendered| {
+                        .child(div().text_ui_sm(cx).children(
+                            if let Some(card) = self.thread.read(cx).card_for_tool(&tool_use.id) {
+                                Some(card.clone().into_any_element())
+                            } else {
+                                rendered_tool_use.as_ref().map(|rendered| {
                                     MarkdownElement::new(
                                         rendered.output.clone(),
                                         tool_use_markdown_style(window, cx),
@@ -2407,8 +2275,10 @@ impl ActiveThread {
                                             open_markdown_link(text, workspace.clone(), window, cx);
                                         }
                                     })
-                                })),
-                        ),
+                                    .into_any_element()
+                                })
+                            },
+                        )),
                 ),
                 ToolUseStatus::Pending => container,
                 ToolUseStatus::NeedsConfirmation => container.child(

crates/agent/src/assistant_panel.rs

@@ -863,11 +863,7 @@ impl AssistantPanel {
                         .truncate()
                         .into_any_element()
                 } else {
-                    div()
-                        .ml_2()
-                        .w_full()
-                        .child(change_title_editor.clone())
-                        .into_any_element()
+                    change_title_editor.clone().into_any_element()
                 }
             }
             ActiveView::PromptEditor => {

crates/agent/src/message_editor.rs

@@ -201,7 +201,7 @@ impl MessageEditor {
     }
 
     fn is_editor_empty(&self, cx: &App) -> bool {
-        self.editor.read(cx).text(cx).trim().is_empty()
+        self.editor.read(cx).text(cx).is_empty()
     }
 
     fn is_model_selected(&self, cx: &App) -> bool {

crates/agent/src/thread.rs

@@ -6,7 +6,7 @@ use std::sync::Arc;
 use agent_rules::load_worktree_rules_file;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_settings::AssistantSettings;
-use assistant_tool::{ActionLog, ResponseDest, Tool, ToolWorkingSet};
+use assistant_tool::{ActionLog, Tool, ToolResult, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::{BTreeMap, HashMap};
 use fs::Fs;
@@ -261,7 +261,6 @@ pub struct Thread {
     cumulative_token_usage: TokenUsage,
     feedback: Option<ThreadFeedback>,
     message_feedback: HashMap<MessageId, ThreadFeedback>,
-    response_dest: ResponseDest,
 }
 
 impl Thread {
@@ -301,7 +300,6 @@ impl Thread {
             cumulative_token_usage: TokenUsage::default(),
             feedback: None,
             message_feedback: HashMap::default(),
-            response_dest: ResponseDest::default(),
         }
     }
 
@@ -366,7 +364,6 @@ impl Thread {
             cumulative_token_usage: serialized.cumulative_token_usage,
             feedback: None,
             message_feedback: HashMap::default(),
-            response_dest: ResponseDest::default(),
         }
     }
 
@@ -461,10 +458,6 @@ impl Thread {
         !self.tool_use.pending_tool_uses().is_empty()
     }
 
-    pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> {
-        self.tool_use.pending_tool_uses()
-    }
-
     pub fn checkpoint_for_message(&self, id: MessageId) -> Option<ThreadCheckpoint> {
         self.checkpoints_by_message.get(&id).cloned()
     }
@@ -611,8 +604,12 @@ impl Thread {
         self.tool_use.tool_results_for_message(id)
     }
 
-    pub fn tool_result(&self, id: &LanguageModelToolUseId) -> Option<&LanguageModelToolResult> {
-        self.tool_use.tool_result(id)
+    pub fn output_for_tool(&self, id: &LanguageModelToolUseId) -> Option<&Arc<str>> {
+        Some(&self.tool_use.tool_result(id)?.content)
+    }
+
+    pub fn card_for_tool(&self, id: &LanguageModelToolUseId) -> Option<&gpui::AnyView> {
+        self.tool_use.tool_result_card(id)
     }
 
     pub fn message_has_tool_results(&self, message_id: MessageId) -> bool {
@@ -1007,6 +1004,20 @@ impl Thread {
 
         self.attached_tracked_files_state(&mut request.messages, cx);
 
+        // Add reminder to the last user message about code blocks
+        if let Some(last_user_message) = request
+            .messages
+            .iter_mut()
+            .rev()
+            .find(|msg| msg.role == Role::User)
+        {
+            last_user_message
+                .content
+                .push(MessageContent::Text(system_prompt_reminder(
+                    &self.prompt_builder,
+                )));
+        }
+
         request
     }
 
@@ -1098,20 +1109,6 @@ impl Thread {
                                 current_token_usage = token_usage;
                             }
                             LanguageModelCompletionEvent::Text(chunk) => {
-                                match &thread.response_dest {
-                                    ResponseDest::File { path } => {
-                                        log::info!(
-                                            "Emitting {}B StreamedFileChunk for {path}",
-                                            chunk.len()
-                                        );
-                                        cx.emit(ThreadEvent::StreamedFileChunk {
-                                            path: path.clone(),
-                                            chunk: chunk.clone(),
-                                        });
-                                    }
-                                    ResponseDest::TextOnly => {}
-                                }
-
                                 if let Some(last_message) = thread.messages.last_mut() {
                                     if last_message.role == Role::Assistant {
                                         last_message.push_text(&chunk);
@@ -1127,7 +1124,7 @@ impl Thread {
                                         // will result in duplicating the text of the chunk in the rendered Markdown.
                                         thread.insert_message(
                                             Role::Assistant,
-                                            vec![MessageSegment::Text(chunk)],
+                                            vec![MessageSegment::Text(chunk.to_string())],
                                             cx,
                                         );
                                     };
@@ -1202,8 +1199,7 @@ impl Thread {
                     match result.as_ref() {
                         Ok(stop_reason) => match stop_reason {
                             StopReason::ToolUse => {
-                                let tool_uses = thread.use_pending_tools(cx);
-                                cx.emit(ThreadEvent::UsePendingTools { tool_uses });
+                                cx.emit(ThreadEvent::UsePendingTools);
                             }
                             StopReason::EndTurn => {}
                             StopReason::MaxTokens => {}
@@ -1391,7 +1387,10 @@ impl Thread {
         )
     }
 
-    pub fn use_pending_tools(&mut self, cx: &mut Context<Self>) -> Vec<PendingToolUse> {
+    pub fn use_pending_tools(
+        &mut self,
+        cx: &mut Context<Self>,
+    ) -> impl IntoIterator<Item = PendingToolUse> + use<> {
         let request = self.to_completion_request(RequestKind::Chat, cx);
         let messages = Arc::new(request.messages);
         let pending_tool_uses = self
@@ -1455,8 +1454,11 @@ impl Thread {
     ) -> Task<()> {
         let tool_name: Arc<str> = tool.name().into();
 
-        let run_tool = if self.tools.is_disabled(&tool.source(), &tool_name) {
-            Task::ready(Err(anyhow!("tool is disabled: {tool_name}")))
+        let tool_result = if self.tools.is_disabled(&tool.source(), &tool_name) {
+            ToolResult {
+                output: Task::ready(Err(anyhow!("tool is disabled: {tool_name}"))),
+                card: None,
+            }
         } else {
             tool.run(
                 input,
@@ -1467,26 +1469,15 @@ impl Thread {
             )
         };
 
+        // Store the card separately if it exists
+        if let Some(card) = tool_result.card.clone() {
+            self.tool_use
+                .insert_tool_result_card(tool_use_id.clone(), card);
+        }
+
         cx.spawn({
             async move |thread: WeakEntity<Thread>, cx| {
-                let new_response_dest;
-                let output = match run_tool.await {
-                    Ok((response_dest, output)) => {
-                        new_response_dest = response_dest;
-
-                        Ok(output)
-                    }
-                    Err(err) => {
-                        new_response_dest = ResponseDest::default();
-                        Err(err)
-                    }
-                };
-
-                thread.upgrade().map(|thread| {
-                    thread.update(cx, |thread, _cx| {
-                        thread.response_dest = new_response_dest;
-                    })
-                });
+                let output = tool_result.output.await;
 
                 thread
                     .update(cx, |thread, cx| {
@@ -1496,36 +1487,18 @@ impl Thread {
                             output,
                             cx,
                         );
-                        thread.tool_finished(tool_use_id, pending_tool_use, false, cx);
+
+                        cx.emit(ThreadEvent::ToolFinished {
+                            tool_use_id,
+                            pending_tool_use,
+                            canceled: false,
+                        });
                     })
                     .ok();
             }
         })
     }
 
-    fn tool_finished(
-        &mut self,
-        tool_use_id: LanguageModelToolUseId,
-        pending_tool_use: Option<PendingToolUse>,
-        canceled: bool,
-        cx: &mut Context<Self>,
-    ) {
-        if self.all_tools_finished() {
-            let model_registry = LanguageModelRegistry::read_global(cx);
-            if let Some(ConfiguredModel { model, .. }) = model_registry.default_model() {
-                self.attach_tool_results(cx);
-                if !canceled {
-                    self.send_to_model(model, RequestKind::Chat, cx);
-                }
-            }
-        }
-
-        cx.emit(ThreadEvent::ToolFinished {
-            tool_use_id,
-            pending_tool_use,
-        });
-    }
-
     pub fn attach_tool_results(&mut self, cx: &mut Context<Self>) {
         // Insert a user message to contain the tool results.
         self.insert_user_message(
@@ -1549,12 +1522,11 @@ impl Thread {
             let mut canceled = false;
             for pending_tool_use in self.tool_use.cancel_pending() {
                 canceled = true;
-                self.tool_finished(
-                    pending_tool_use.id.clone(),
-                    Some(pending_tool_use),
-                    true,
-                    cx,
-                );
+                cx.emit(ThreadEvent::ToolFinished {
+                    tool_use_id: pending_tool_use.id.clone(),
+                    pending_tool_use: Some(pending_tool_use),
+                    canceled: true,
+                });
             }
             canceled
         };
@@ -1585,13 +1557,6 @@ impl Thread {
         let thread_id = self.id().clone();
         let client = self.project.read(cx).client();
 
-        let enabled_tool_names: Vec<String> = self
-            .tools()
-            .enabled_tools(cx)
-            .iter()
-            .map(|tool| tool.name().to_string())
-            .collect();
-
         self.message_feedback.insert(message_id, feedback);
 
         cx.notify();
@@ -1615,7 +1580,6 @@ impl Thread {
                 "Assistant Thread Rated",
                 rating,
                 thread_id,
-                enabled_tool_names,
                 message_id = message_id.0,
                 message_content,
                 thread_data,
@@ -1929,10 +1893,21 @@ impl Thread {
 
         self.tool_use
             .insert_tool_output(tool_use_id.clone(), tool_name, err, cx);
-        self.tool_finished(tool_use_id.clone(), None, true, cx);
+
+        cx.emit(ThreadEvent::ToolFinished {
+            tool_use_id,
+            pending_tool_use: None,
+            canceled: true,
+        });
     }
 }
 
+pub fn system_prompt_reminder(prompt_builder: &prompt_store::PromptBuilder) -> String {
+    prompt_builder
+        .generate_assistant_system_prompt_reminder()
+        .unwrap_or_default()
+}
+
 #[derive(Debug, Clone)]
 pub enum ThreadError {
     PaymentRequired,
@@ -1949,24 +1924,20 @@ pub enum ThreadEvent {
     StreamedCompletion,
     StreamedAssistantText(MessageId, String),
     StreamedAssistantThinking(MessageId, String),
-    StreamedFileChunk {
-        path: Arc<str>,
-        chunk: String,
-    },
     DoneStreaming,
     MessageAdded(MessageId),
     MessageEdited(MessageId),
     MessageDeleted(MessageId),
     SummaryGenerated,
     SummaryChanged,
-    UsePendingTools {
-        tool_uses: Vec<PendingToolUse>,
-    },
+    UsePendingTools,
     ToolFinished {
         #[allow(unused)]
         tool_use_id: LanguageModelToolUseId,
         /// The pending tool use that corresponds to this tool.
         pending_tool_use: Option<PendingToolUse>,
+        /// Whether the tool was canceled by the user.
+        canceled: bool,
     },
     CheckpointChanged,
     ToolConfirmationNeeded,
@@ -2006,7 +1977,7 @@ mod tests {
         )
         .await;
 
-        let (_workspace, _thread_store, thread, context_store) =
+        let (_workspace, _thread_store, thread, context_store, prompt_builder) =
             setup_test_environment(cx, project.clone()).await;
 
         add_file_to_context(&project, &context_store, "test/code.rs", cx)
@@ -2060,8 +2031,14 @@ fn main() {{
         });
 
         assert_eq!(request.messages.len(), 1);
-        let expected_full_message = format!("{}Please explain this code", expected_context);
-        assert_eq!(request.messages[0].string_contents(), expected_full_message);
+        let actual_message = request.messages[0].string_contents();
+        let expected_content = format!(
+            "{}Please explain this code{}",
+            expected_context,
+            system_prompt_reminder(&prompt_builder)
+        );
+
+        assert_eq!(actual_message, expected_content);
     }
 
     #[gpui::test]
@@ -2078,7 +2055,7 @@ fn main() {{
         )
         .await;
 
-        let (_, _thread_store, thread, context_store) =
+        let (_, _thread_store, thread, context_store, _prompt_builder) =
             setup_test_environment(cx, project.clone()).await;
 
         // Open files individually
@@ -2178,7 +2155,7 @@ fn main() {{
         )
         .await;
 
-        let (_, _thread_store, thread, _context_store) =
+        let (_, _thread_store, thread, _context_store, prompt_builder) =
             setup_test_environment(cx, project.clone()).await;
 
         // Insert user message without any context (empty context vector)
@@ -2204,11 +2181,14 @@ fn main() {{
         });
 
         assert_eq!(request.messages.len(), 1);
-        assert_eq!(
-            request.messages[0].string_contents(),
-            "What is the best way to learn Rust?"
+        let actual_message = request.messages[0].string_contents();
+        let expected_content = format!(
+            "What is the best way to learn Rust?{}",
+            system_prompt_reminder(&prompt_builder)
         );
 
+        assert_eq!(actual_message, expected_content);
+
         // Add second message, also without context
         let message2_id = thread.update(cx, |thread, cx| {
             thread.insert_user_message("Are there any good books?", vec![], None, cx)
@@ -2224,14 +2204,17 @@ fn main() {{
         });
 
         assert_eq!(request.messages.len(), 2);
-        assert_eq!(
-            request.messages[0].string_contents(),
-            "What is the best way to learn Rust?"
-        );
-        assert_eq!(
-            request.messages[1].string_contents(),
-            "Are there any good books?"
+        // First message should be the system prompt
+        assert_eq!(request.messages[0].role, Role::User);
+
+        // Second message should be the user message with prompt reminder
+        let actual_message = request.messages[1].string_contents();
+        let expected_content = format!(
+            "Are there any good books?{}",
+            system_prompt_reminder(&prompt_builder)
         );
+
+        assert_eq!(actual_message, expected_content);
     }
 
     #[gpui::test]
@@ -2244,7 +2227,7 @@ fn main() {{
         )
         .await;
 
-        let (_workspace, _thread_store, thread, context_store) =
+        let (_workspace, _thread_store, thread, context_store, prompt_builder) =
             setup_test_environment(cx, project.clone()).await;
 
         // Open buffer and add it to context
@@ -2304,11 +2287,14 @@ fn main() {{
         // The last message should be the stale buffer notification
         assert_eq!(last_message.role, Role::User);
 
-        // Check the exact content of the message
-        let expected_content = "These files changed since last read:\n- code.rs\n";
+        let actual_message = last_message.string_contents();
+        let expected_content = format!(
+            "These files changed since last read:\n- code.rs\n{}",
+            system_prompt_reminder(&prompt_builder)
+        );
+
         assert_eq!(
-            last_message.string_contents(),
-            expected_content,
+            actual_message, expected_content,
             "Last message should be exactly the stale buffer notification"
         );
     }
@@ -2346,24 +2332,27 @@ fn main() {{
         Entity<ThreadStore>,
         Entity<Thread>,
         Entity<ContextStore>,
+        Arc<PromptBuilder>,
     ) {
         let (workspace, cx) =
             cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
 
+        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+
         let thread_store = cx.update(|_, cx| {
-            ThreadStore::new(
-                project.clone(),
-                Arc::default(),
-                Arc::new(PromptBuilder::new(None).unwrap()),
-                cx,
-            )
-            .unwrap()
+            ThreadStore::new(project.clone(), Arc::default(), prompt_builder.clone(), cx).unwrap()
         });
 
         let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
         let context_store = cx.new(|_cx| ContextStore::new(project.downgrade(), None));
 
-        (workspace, thread_store, thread, context_store)
+        (
+            workspace,
+            thread_store,
+            thread,
+            context_store,
+            prompt_builder,
+        )
     }
 
     async fn add_file_to_context(

crates/agent/src/tool_use.rs

@@ -54,6 +54,7 @@ pub struct ToolUseState {
     tool_uses_by_user_message: HashMap<MessageId, Vec<LanguageModelToolUseId>>,
     tool_results: HashMap<LanguageModelToolUseId, LanguageModelToolResult>,
     pending_tool_uses_by_id: HashMap<LanguageModelToolUseId, PendingToolUse>,
+    tool_result_cards: HashMap<LanguageModelToolUseId, gpui::AnyView>,
 }
 
 pub const USING_TOOL_MARKER: &str = "<using_tool>";
@@ -66,6 +67,7 @@ impl ToolUseState {
             tool_uses_by_user_message: HashMap::default(),
             tool_results: HashMap::default(),
             pending_tool_uses_by_id: HashMap::default(),
+            tool_result_cards: HashMap::default(),
         }
     }
 
@@ -257,6 +259,18 @@ impl ToolUseState {
         self.tool_results.get(tool_use_id)
     }
 
+    pub fn tool_result_card(&self, tool_use_id: &LanguageModelToolUseId) -> Option<&gpui::AnyView> {
+        self.tool_result_cards.get(tool_use_id)
+    }
+
+    pub fn insert_tool_result_card(
+        &mut self,
+        tool_use_id: LanguageModelToolUseId,
+        card: gpui::AnyView,
+    ) {
+        self.tool_result_cards.insert(tool_use_id, card);
+    }
+
     pub fn request_tool_use(
         &mut self,
         assistant_message_id: MessageId,

crates/agent_eval/src/headless_assistant.rs

@@ -95,7 +95,11 @@ impl HeadlessAssistant {
                     self.done_tx.send_blocking(Ok(())).unwrap()
                 }
             }
-            ThreadEvent::UsePendingTools { .. } => {}
+            ThreadEvent::UsePendingTools => {
+                thread.update(cx, |thread, cx| {
+                    thread.use_pending_tools(cx);
+                });
+            }
             ThreadEvent::ToolConfirmationNeeded => {
                 // Automatically approve all tools that need confirmation in headless mode
                 println!("Tool confirmation needed - automatically approving in headless mode");
@@ -145,9 +149,22 @@ impl HeadlessAssistant {
                         .entry(pending_tool_use.name.clone())
                         .or_insert(0) += 1;
                 }
-                if let Some(tool_result) = thread.read(cx).tool_result(tool_use_id) {
+                if let Some(tool_result) = thread.read(cx).output_for_tool(tool_use_id) {
                     println!("Tool result: {:?}", tool_result);
                 }
+                if thread.read(cx).all_tools_finished() {
+                    let model_registry = LanguageModelRegistry::read_global(cx);
+                    if let Some(model) = model_registry.default_model() {
+                        thread.update(cx, |thread, cx| {
+                            thread.attach_tool_results(cx);
+                            thread.send_to_model(model.model, RequestKind::Chat, cx);
+                        });
+                    } else {
+                        println!(
+                            "Warning: No active language model available to continue conversation"
+                        );
+                    }
+                }
             }
             _ => {}
         }

crates/assistant_tool/src/assistant_tool.rs

@@ -8,7 +8,7 @@ use std::fmt::Formatter;
 use std::sync::Arc;
 
 use anyhow::Result;
-use gpui::{App, Entity, SharedString, Task};
+use gpui::{AnyView, App, Entity, SharedString, Task};
 use icons::IconName;
 use language_model::LanguageModelRequestMessage;
 use language_model::LanguageModelToolSchemaFormat;
@@ -18,24 +18,26 @@ pub use crate::action_log::*;
 pub use crate::tool_registry::*;
 pub use crate::tool_working_set::*;
 
-/// Where the streamed-in text should go.
-/// For example, the file creation tool streams it to a file.
-#[derive(Debug, Clone)]
-pub enum ResponseDest {
-    File { path: Arc<str> },
-    TextOnly,
-}
-
-impl Default for ResponseDest {
-    fn default() -> Self {
-        Self::TextOnly
-    }
-}
-
 pub fn init(cx: &mut App) {
     ToolRegistry::default_global(cx);
 }
 
+/// The result of running a tool, containing both the asynchronous output
+/// and an optional card view that can be rendered immediately.
+pub struct ToolResult {
+    /// The asynchronous task that will eventually resolve to the tool's output
+    pub output: Task<Result<String>>,
+    /// An optional view to present the output of the tool.
+    pub card: Option<AnyView>,
+}
+
+impl From<Task<Result<String>>> for ToolResult {
+    /// Convert from a task to a ToolResult with no card
+    fn from(output: Task<Result<String>>) -> Self {
+        Self { output, card: None }
+    }
+}
+
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
 pub enum ToolSource {
     /// A native tool built-in to Zed.
@@ -80,7 +82,7 @@ pub trait Tool: 'static + Send + Sync {
         project: Entity<Project>,
         action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>>;
+    ) -> ToolResult;
 }
 
 impl Debug for dyn Tool {

crates/assistant_tools/src/assistant_tools.rs

@@ -1,4 +1,5 @@
-mod code_action_tool;
+mod bash_tool;
+mod batch_tool;
 mod code_symbols_tool;
 mod copy_path_tool;
 mod create_directory_tool;
@@ -14,11 +15,9 @@ mod open_tool;
 mod path_search_tool;
 mod read_file_tool;
 mod regex_search_tool;
-mod rename_tool;
 mod replace;
 mod schema;
 mod symbol_info_tool;
-mod terminal_tool;
 mod thinking_tool;
 
 use std::sync::Arc;
@@ -29,7 +28,8 @@ use gpui::App;
 use http_client::HttpClientWithUrl;
 use move_path_tool::MovePathTool;
 
-use crate::code_action_tool::CodeActionTool;
+use crate::bash_tool::BashTool;
+use crate::batch_tool::BatchTool;
 use crate::code_symbols_tool::CodeSymbolsTool;
 use crate::create_directory_tool::CreateDirectoryTool;
 use crate::create_file_tool::CreateFileTool;
@@ -43,23 +43,21 @@ use crate::open_tool::OpenTool;
 use crate::path_search_tool::PathSearchTool;
 use crate::read_file_tool::ReadFileTool;
 use crate::regex_search_tool::RegexSearchTool;
-use crate::rename_tool::RenameTool;
 use crate::symbol_info_tool::SymbolInfoTool;
-use crate::terminal_tool::TerminalTool;
 use crate::thinking_tool::ThinkingTool;
 
 pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
     assistant_tool::init(cx);
 
     let registry = ToolRegistry::global(cx);
-    registry.register_tool(TerminalTool);
+    registry.register_tool(BashTool);
+    registry.register_tool(BatchTool);
     registry.register_tool(CreateDirectoryTool);
     registry.register_tool(CreateFileTool);
     registry.register_tool(CopyPathTool);
     registry.register_tool(DeletePathTool);
     registry.register_tool(FindReplaceFileTool);
     registry.register_tool(SymbolInfoTool);
-    registry.register_tool(CodeActionTool);
     registry.register_tool(MovePathTool);
     registry.register_tool(DiagnosticsTool);
     registry.register_tool(ListDirectoryTool);
@@ -69,7 +67,6 @@ pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
     registry.register_tool(PathSearchTool);
     registry.register_tool(ReadFileTool);
     registry.register_tool(RegexSearchTool);
-    registry.register_tool(RenameTool);
     registry.register_tool(ThinkingTool);
     registry.register_tool(FetchTool::new(http_client));
 }

crates/assistant_tools/src/bash_tool.rs

@@ -1,16 +1,13 @@
 use crate::schema::json_schema_for;
 use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use futures::io::BufReader;
-use futures::{AsyncBufReadExt, AsyncReadExt, FutureExt};
+use futures::{AsyncBufReadExt, AsyncReadExt};
 use gpui::{App, AppContext, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use std::future;
-use util::get_system_shell;
-
 use std::path::Path;
 use std::sync::Arc;
 use ui::IconName;
@@ -18,18 +15,18 @@ use util::command::new_smol_command;
 use util::markdown::MarkdownString;
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct TerminalToolInput {
-    /// The one-liner command to execute.
+pub struct BashToolInput {
+    /// The bash one-liner command to execute.
     command: String,
     /// Working directory for the command. This must be one of the root directories of the project.
     cd: String,
 }
 
-pub struct TerminalTool;
+pub struct BashTool;
 
-impl Tool for TerminalTool {
+impl Tool for BashTool {
     fn name(&self) -> String {
-        "terminal".to_string()
+        "bash".to_string()
     }
 
     fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
@@ -37,7 +34,7 @@ impl Tool for TerminalTool {
     }
 
     fn description(&self) -> String {
-        include_str!("./terminal_tool/description.md").to_string()
+        include_str!("./bash_tool/description.md").to_string()
     }
 
     fn icon(&self) -> IconName {
@@ -45,11 +42,11 @@ impl Tool for TerminalTool {
     }
 
     fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
-        json_schema_for::<TerminalToolInput>(format)
+        json_schema_for::<BashToolInput>(format)
     }
 
     fn ui_text(&self, input: &serde_json::Value) -> String {
-        match serde_json::from_value::<TerminalToolInput>(input.clone()) {
+        match serde_json::from_value::<BashToolInput>(input.clone()) {
             Ok(input) => {
                 let mut lines = input.command.lines();
                 let first_line = lines.next().unwrap_or_default();
@@ -68,7 +65,7 @@ impl Tool for TerminalTool {
                     }
                 }
             }
-            Err(_) => "Run terminal command".to_string(),
+            Err(_) => "Run bash command".to_string(),
         }
     }
 
@@ -79,10 +76,10 @@ impl Tool for TerminalTool {
         project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
-        let input: TerminalToolInput = match serde_json::from_value(input) {
+    ) -> ToolResult {
+        let input: BashToolInput = match serde_json::from_value(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
 
         let project = project.read(cx);
@@ -93,13 +90,15 @@ impl Tool for TerminalTool {
 
             let only_worktree = match worktrees.next() {
                 Some(worktree) => worktree,
-                None => return Task::ready(Err(anyhow!("No worktrees found in the project"))),
+                None => {
+                    return Task::ready(Err(anyhow!("No worktrees found in the project"))).into();
+                }
             };
 
             if worktrees.next().is_some() {
                 return Task::ready(Err(anyhow!(
                     "'.' is ambiguous in multi-root workspaces. Please specify a root directory explicitly."
-                )));
+                ))).into();
             }
 
             only_worktree.read(cx).abs_path()
@@ -111,7 +110,8 @@ impl Tool for TerminalTool {
             {
                 return Task::ready(Err(anyhow!(
                     "The absolute path must be within one of the project's worktrees"
-                )));
+                )))
+                .into();
             }
 
             input_path.into()
@@ -120,103 +120,82 @@ impl Tool for TerminalTool {
                 return Task::ready(Err(anyhow!(
                     "`cd` directory {} not found in the project",
                     &input.cd
-                )));
+                )))
+                .into();
             };
 
             worktree.read(cx).abs_path()
         };
 
         cx.background_spawn(run_command_limited(working_dir, input.command))
+            .into()
     }
 }
 
 const LIMIT: usize = 16 * 1024;
 
-async fn run_command_limited(
-    working_dir: Arc<Path>,
-    command: String,
-) -> Result<(ResponseDest, String)> {
-    let shell = get_system_shell();
+async fn run_command_limited(working_dir: Arc<Path>, command: String) -> Result<String> {
+    // Add 2>&1 to merge stderr into stdout for proper interleaving.
+    let command = format!("({}) 2>&1", command);
 
-    let mut cmd = new_smol_command(&shell)
+    let mut cmd = new_smol_command("bash")
         .arg("-c")
         .arg(&command)
         .current_dir(working_dir)
         .stdout(std::process::Stdio::piped())
-        .stderr(std::process::Stdio::piped())
         .spawn()
-        .context("Failed to execute terminal command")?;
+        .context("Failed to execute bash command")?;
 
-    let mut combined_buffer = String::with_capacity(LIMIT + 1);
+    // Capture stdout with a limit
+    let stdout = cmd.stdout.take().unwrap();
+    let mut reader = BufReader::new(stdout);
 
-    let mut out_reader = BufReader::new(cmd.stdout.take().context("Failed to get stdout")?);
-    let mut out_tmp_buffer = String::with_capacity(512);
-    let mut err_reader = BufReader::new(cmd.stderr.take().context("Failed to get stderr")?);
-    let mut err_tmp_buffer = String::with_capacity(512);
+    // Read one more byte to determine whether the output was truncated
+    let mut buffer = vec![0; LIMIT + 1];
+    let mut bytes_read = 0;
 
-    let mut out_line = Box::pin(
-        out_reader
-            .read_line(&mut out_tmp_buffer)
-            .left_future()
-            .fuse(),
-    );
-    let mut err_line = Box::pin(
-        err_reader
-            .read_line(&mut err_tmp_buffer)
-            .left_future()
-            .fuse(),
-    );
+    // Read until we reach the limit
+    loop {
+        let read = reader.read(&mut buffer[bytes_read..]).await?;
+        if read == 0 {
+            break;
+        }
 
-    let mut has_stdout = true;
-    let mut has_stderr = true;
-    while (has_stdout || has_stderr) && combined_buffer.len() < LIMIT + 1 {
-        futures::select_biased! {
-            read = out_line => {
-                drop(out_line);
-                combined_buffer.extend(out_tmp_buffer.drain(..));
-                if read? == 0 {
-                    out_line = Box::pin(future::pending().right_future().fuse());
-                    has_stdout = false;
-                } else {
-                    out_line = Box::pin(out_reader.read_line(&mut out_tmp_buffer).left_future().fuse());
-                }
-            }
-            read = err_line => {
-                drop(err_line);
-                combined_buffer.extend(err_tmp_buffer.drain(..));
-                if read? == 0 {
-                    err_line = Box::pin(future::pending().right_future().fuse());
-                    has_stderr = false;
-                } else {
-                    err_line = Box::pin(err_reader.read_line(&mut err_tmp_buffer).left_future().fuse());
-                }
-            }
-        };
+        bytes_read += read;
+        if bytes_read > LIMIT {
+            bytes_read = LIMIT + 1;
+            break;
+        }
     }
 
-    drop((out_line, err_line));
+    // Repeatedly fill the output reader's buffer without copying it.
+    loop {
+        let skipped_bytes = reader.fill_buf().await?;
+        if skipped_bytes.is_empty() {
+            break;
+        }
+        let skipped_bytes_len = skipped_bytes.len();
+        reader.consume_unpin(skipped_bytes_len);
+    }
 
-    let truncated = combined_buffer.len() > LIMIT;
-    combined_buffer.truncate(LIMIT);
-
-    consume_reader(out_reader, truncated).await?;
-    consume_reader(err_reader, truncated).await?;
+    let output_bytes = &buffer[..bytes_read.min(LIMIT)];
 
     let status = cmd.status().await.context("Failed to get command status")?;
 
-    let output_string = if truncated {
+    let output_string = if bytes_read > LIMIT {
         // Valid to find `\n` in UTF-8 since 0-127 ASCII characters are not used in
         // multi-byte characters.
-        let last_line_ix = combined_buffer.bytes().rposition(|b| b == b'\n');
-        let combined_buffer = &combined_buffer[..last_line_ix.unwrap_or(combined_buffer.len())];
+        let last_line_ix = output_bytes.iter().rposition(|b| *b == b'\n');
+        let until_last_line = &output_bytes[..last_line_ix.unwrap_or(output_bytes.len())];
+        let output_string = String::from_utf8_lossy(until_last_line);
 
         format!(
             "Command output too long. The first {} bytes:\n\n{}",
-            combined_buffer.len(),
-            output_block(&combined_buffer),
+            output_string.len(),
+            output_block(&output_string),
         )
     } else {
-        output_block(&combined_buffer)
+        output_block(&String::from_utf8_lossy(&output_bytes))
     };
 
     let output_with_status = if status.success() {
@@ -227,32 +206,13 @@ async fn run_command_limited(
         }
     } else {
         format!(
-            "Command failed with exit code {} (shell: {}).\n\n{}",
+            "Command failed with exit code {}\n\n{}",
             status.code().unwrap_or(-1),
-            shell,
             output_string,
         )
     };
 
-    Ok((ResponseDest::TextOnly, output_with_status))
-}
-
-async fn consume_reader<T: AsyncReadExt + Unpin>(
-    mut reader: BufReader<T>,
-    truncated: bool,
-) -> Result<(), std::io::Error> {
-    loop {
-        let skipped_bytes = reader.fill_buf().await?;
-        if skipped_bytes.is_empty() {
-            break;
-        }
-        let skipped_bytes_len = skipped_bytes.len();
-        reader.consume_unpin(skipped_bytes_len);
-
-        // Should only skip if we went over the limit
-        debug_assert!(truncated);
-    }
-    Ok(())
+    Ok(output_with_status)
 }
 
 fn output_block(output: &str) -> String {
@@ -270,7 +230,7 @@ mod tests {
 
     use super::*;
 
-    #[gpui::test(iterations = 10)]
+    #[gpui::test]
     async fn test_run_command_simple(cx: &mut TestAppContext) {
         cx.executor().allow_parking();
 
@@ -278,24 +238,25 @@ mod tests {
             run_command_limited(Path::new(".").into(), "echo 'Hello, World!'".to_string()).await;
 
         assert!(result.is_ok());
-        assert_eq!(result.unwrap().1, "```\nHello, World!\n```");
+        assert_eq!(result.unwrap(), "```\nHello, World!\n```");
     }
 
-    #[gpui::test(iterations = 10)]
+    #[gpui::test]
     async fn test_interleaved_stdout_stderr(cx: &mut TestAppContext) {
         cx.executor().allow_parking();
 
-        let command = "echo 'stdout 1' && sleep 0.01 && echo 'stderr 1' >&2 && sleep 0.01 && echo 'stdout 2' && sleep 0.01 && echo 'stderr 2' >&2";
+        let command =
+            "echo 'stdout 1' && echo 'stderr 1' >&2 && echo 'stdout 2' && echo 'stderr 2' >&2";
         let result = run_command_limited(Path::new(".").into(), command.to_string()).await;
 
         assert!(result.is_ok());
         assert_eq!(
-            result.unwrap().1,
+            result.unwrap(),
             "```\nstdout 1\nstderr 1\nstdout 2\nstderr 2\n```"
         );
     }
 
-    #[gpui::test(iterations = 10)]
+    #[gpui::test]
     async fn test_multiple_output_reads(cx: &mut TestAppContext) {
         cx.executor().allow_parking();
 
@@ -307,19 +268,19 @@ mod tests {
         .await;
 
         assert!(result.is_ok());
-        assert_eq!(result.unwrap().1, "```\n1\n2\n3\n```");
+        assert_eq!(result.unwrap(), "```\n1\n2\n3\n```");
     }
 
-    #[gpui::test(iterations = 10)]
+    #[gpui::test]
     async fn test_output_truncation_single_line(cx: &mut TestAppContext) {
         cx.executor().allow_parking();
 
-        let cmd = format!("echo '{}'; sleep 0.01;", "X".repeat(LIMIT * 2));
+        let cmd = format!("echo '{}';", "X".repeat(LIMIT * 2));
 
         let result = run_command_limited(Path::new(".").into(), cmd).await;
 
         assert!(result.is_ok());
-        let output = result.unwrap().1;
+        let output = result.unwrap();
 
         let content_start = output.find("```\n").map(|i| i + 4).unwrap_or(0);
         let content_end = output.rfind("\n```").unwrap_or(output.len());
@@ -329,7 +290,7 @@ mod tests {
         assert_eq!(content_length, LIMIT);
     }
 
-    #[gpui::test(iterations = 10)]
+    #[gpui::test]
     async fn test_output_truncation_multiline(cx: &mut TestAppContext) {
         cx.executor().allow_parking();
 
@@ -337,7 +298,7 @@ mod tests {
         let result = run_command_limited(Path::new(".").into(), cmd).await;
 
         assert!(result.is_ok());
-        let output = result.unwrap().1;
+        let output = result.unwrap();
 
         assert!(output.starts_with("Command output too long. The first 16334 bytes:\n\n"));
 
@@ -347,23 +308,4 @@ mod tests {
 
         assert!(content_length <= LIMIT);
     }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_command_failure(cx: &mut TestAppContext) {
-        cx.executor().allow_parking();
-
-        let result = run_command_limited(Path::new(".").into(), "exit 42".to_string()).await;
-
-        assert!(result.is_ok());
-        let output = result.unwrap().1;
-
-        // Extract the shell name from path for cleaner test output
-        let shell_path = std::env::var("SHELL").unwrap_or("bash".to_string());
-
-        let expected_output = format!(
-            "Command failed with exit code 42 (shell: {}).\n\n```\n\n```",
-            shell_path
-        );
-        assert_eq!(output, expected_output);
-    }
 }

crates/assistant_tools/src/bash_tool/description.md

@@ -0,0 +1,7 @@
+Executes a bash one-liner and returns the combined output.
+
+This tool spawns a bash process, combines stdout and stderr into one interleaved stream as they are produced (preserving the order of writes), and captures that stream into a string which is returned.
+
+Make sure you use the `cd` parameter to navigate to one of the root directories of the project. NEVER do it as part of the `command` itself, otherwise it will error.
+
+Remember that each invocation of this tool will spawn a new bash process, so you can't rely on any state from previous invocations.

crates/assistant_tools/src/batch_tool.rs

@@ -0,0 +1,310 @@
+use crate::schema::json_schema_for;
+use anyhow::anyhow;
+use assistant_tool::{ActionLog, Tool, ToolResult, ToolWorkingSet};
+use futures::future::join_all;
+use gpui::{App, AppContext, Entity, Task};
+use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use project::Project;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::sync::Arc;
+use ui::IconName;
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct ToolInvocation {
+    /// The name of the tool to invoke
+    pub name: String,
+
+    /// The input to the tool in JSON format
+    pub input: serde_json::Value,
+}
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct BatchToolInput {
+    /// The tool invocations to run as a batch. These tools will be run either sequentially
+    /// or concurrently depending on the `run_tools_concurrently` flag.
+    ///
+    /// <example>
+    /// Basic file operations (concurrent)
+    ///
+    /// ```json
+    /// {
+    ///   "invocations": [
+    ///     {
+    ///       "name": "read_file",
+    ///       "input": {
+    ///         "path": "src/main.rs"
+    ///       }
+    ///     },
+    ///     {
+    ///       "name": "list_directory",
+    ///       "input": {
+    ///         "path": "src/lib"
+    ///       }
+    ///     },
+    ///     {
+    ///       "name": "regex_search",
+    ///       "input": {
+    ///         "regex": "fn run\\("
+    ///       }
+    ///     }
+    ///   ],
+    ///   "run_tools_concurrently": true
+    /// }
+    /// ```
+    /// </example>
+    ///
+    /// <example>
+    /// Multiple find-replace operations on the same file (sequential)
+    ///
+    /// ```json
+    /// {
+    ///   "invocations": [
+    ///     {
+    ///       "name": "find_replace_file",
+    ///       "input": {
+    ///         "path": "src/config.rs",
+    ///         "display_description": "Update default timeout value",
+    ///         "find": "pub const DEFAULT_TIMEOUT: u64 = 30;\n\npub const MAX_RETRIES: u32 = 3;\n\npub const SERVER_URL: &str = \"https://api.example.com\";",
+    ///         "replace": "pub const DEFAULT_TIMEOUT: u64 = 60;\n\npub const MAX_RETRIES: u32 = 3;\n\npub const SERVER_URL: &str = \"https://api.example.com\";"
+    ///       }
+    ///     },
+    ///     {
+    ///       "name": "find_replace_file",
+    ///       "input": {
+    ///         "path": "src/config.rs",
+    ///         "display_description": "Update API endpoint URL",
+    ///         "find": "pub const MAX_RETRIES: u32 = 3;\n\npub const SERVER_URL: &str = \"https://api.example.com\";\n\npub const API_VERSION: &str = \"v1\";",
+    ///         "replace": "pub const MAX_RETRIES: u32 = 3;\n\npub const SERVER_URL: &str = \"https://api.newdomain.com\";\n\npub const API_VERSION: &str = \"v1\";"
+    ///       }
+    ///     }
+    ///   ],
+    ///   "run_tools_concurrently": false
+    /// }
+    /// ```
+    /// </example>
+    ///
+    /// <example>
+    /// Searching and analyzing code (concurrent)
+    ///
+    /// ```json
+    /// {
+    ///   "invocations": [
+    ///     {
+    ///       "name": "regex_search",
+    ///       "input": {
+    ///         "regex": "impl Database"
+    ///       }
+    ///     },
+    ///     {
+    ///       "name": "path_search",
+    ///       "input": {
+    ///         "glob": "**/*test*.rs"
+    ///       }
+    ///     }
+    ///   ],
+    ///   "run_tools_concurrently": true
+    /// }
+    /// ```
+    /// </example>
+    ///
+    /// <example>
+    /// Multi-file refactoring (concurrent)
+    ///
+    /// ```json
+    /// {
+    ///   "invocations": [
+    ///     {
+    ///       "name": "find_replace_file",
+    ///       "input": {
+    ///         "path": "src/models/user.rs",
+    ///         "display_description": "Add email field to User struct",
+    ///         "find": "pub struct User {\n    pub id: u64,\n    pub username: String,\n    pub created_at: DateTime<Utc>,\n}",
+    ///         "replace": "pub struct User {\n    pub id: u64,\n    pub username: String,\n    pub email: String,\n    pub created_at: DateTime<Utc>,\n}"
+    ///       }
+    ///     },
+    ///     {
+    ///       "name": "find_replace_file",
+    ///       "input": {
+    ///         "path": "src/db/queries.rs",
+    ///         "display_description": "Update user insertion query",
+    ///         "find": "pub async fn insert_user(conn: &mut Connection, user: &User) -> Result<(), DbError> {\n    conn.execute(\n        \"INSERT INTO users (id, username, created_at) VALUES ($1, $2, $3)\",\n        &[&user.id, &user.username, &user.created_at],\n    ).await?;\n    \n    Ok(())\n}",
+    ///         "replace": "pub async fn insert_user(conn: &mut Connection, user: &User) -> Result<(), DbError> {\n    conn.execute(\n        \"INSERT INTO users (id, username, email, created_at) VALUES ($1, $2, $3, $4)\",\n        &[&user.id, &user.username, &user.email, &user.created_at],\n    ).await?;\n    \n    Ok(())\n}"
+    ///       }
+    ///     }
+    ///   ],
+    ///   "run_tools_concurrently": true
+    /// }
+    /// ```
+    /// </example>
+    pub invocations: Vec<ToolInvocation>,
+
+    /// Whether to run the tools in this batch concurrently. If this is false (the default), the tools will run sequentially.
+    #[serde(default)]
+    pub run_tools_concurrently: bool,
+}
+
+pub struct BatchTool;
+
+impl Tool for BatchTool {
+    fn name(&self) -> String {
+        "batch_tool".into()
+    }
+
+    fn needs_confirmation(&self, input: &serde_json::Value, cx: &App) -> bool {
+        serde_json::from_value::<BatchToolInput>(input.clone())
+            .map(|input| {
+                let working_set = ToolWorkingSet::default();
+                input.invocations.iter().any(|invocation| {
+                    working_set
+                        .tool(&invocation.name, cx)
+                        .map_or(false, |tool| tool.needs_confirmation(&invocation.input, cx))
+                })
+            })
+            .unwrap_or(false)
+    }
+
+    fn description(&self) -> String {
+        include_str!("./batch_tool/description.md").into()
+    }
+
+    fn icon(&self) -> IconName {
+        IconName::Cog
+    }
+
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
+        json_schema_for::<BatchToolInput>(format)
+    }
+
+    fn ui_text(&self, input: &serde_json::Value) -> String {
+        match serde_json::from_value::<BatchToolInput>(input.clone()) {
+            Ok(input) => {
+                let count = input.invocations.len();
+                let mode = if input.run_tools_concurrently {
+                    "concurrently"
+                } else {
+                    "sequentially"
+                };
+
+                let first_tool_name = input
+                    .invocations
+                    .first()
+                    .map(|inv| inv.name.clone())
+                    .unwrap_or_default();
+
+                let all_same = input
+                    .invocations
+                    .iter()
+                    .all(|invocation| invocation.name == first_tool_name);
+
+                if all_same {
+                    format!(
+                        "Run `{}` {} times {}",
+                        first_tool_name,
+                        input.invocations.len(),
+                        mode
+                    )
+                } else {
+                    format!("Run {} tools {}", count, mode)
+                }
+            }
+            Err(_) => "Batch tools".to_string(),
+        }
+    }
+
+    fn run(
+        self: Arc<Self>,
+        input: serde_json::Value,
+        messages: &[LanguageModelRequestMessage],
+        project: Entity<Project>,
+        action_log: Entity<ActionLog>,
+        cx: &mut App,
+    ) -> ToolResult {
+        let input = match serde_json::from_value::<BatchToolInput>(input) {
+            Ok(input) => input,
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
+        };
+
+        if input.invocations.is_empty() {
+            return Task::ready(Err(anyhow!("No tool invocations provided"))).into();
+        }
+
+        let run_tools_concurrently = input.run_tools_concurrently;
+
+        let foreground_task = {
+            let working_set = ToolWorkingSet::default();
+            let invocations = input.invocations;
+            let messages = messages.to_vec();
+
+            cx.spawn(async move |cx| {
+                let mut tasks = Vec::new();
+                let mut tool_names = Vec::new();
+
+                for invocation in invocations {
+                    let tool_name = invocation.name.clone();
+                    tool_names.push(tool_name.clone());
+
+                    let tool = cx
+                        .update(|cx| working_set.tool(&tool_name, cx))
+                        .map_err(|err| {
+                            anyhow!("Failed to look up tool '{}': {}", tool_name, err)
+                        })?;
+
+                    let Some(tool) = tool else {
+                        return Err(anyhow!("Tool '{}' not found", tool_name));
+                    };
+
+                    let project = project.clone();
+                    let action_log = action_log.clone();
+                    let messages = messages.clone();
+                    let tool_result = cx
+                        .update(|cx| tool.run(invocation.input, &messages, project, action_log, cx))
+                        .map_err(|err| anyhow!("Failed to start tool '{}': {}", tool_name, err))?;
+
+                    tasks.push(tool_result.output);
+                }
+
+                Ok((tasks, tool_names))
+            })
+        };
+
+        cx.background_spawn(async move {
+            let (tasks, tool_names) = foreground_task.await?;
+            let mut results = Vec::with_capacity(tasks.len());
+
+            if run_tools_concurrently {
+                results.extend(join_all(tasks).await)
+            } else {
+                for task in tasks {
+                    results.push(task.await);
+                }
+            };
+
+            let mut formatted_results = String::new();
+            let mut error_occurred = false;
+
+            for (i, result) in results.into_iter().enumerate() {
+                let tool_name = &tool_names[i];
+
+                match result {
+                    Ok(output) => {
+                        formatted_results
+                            .push_str(&format!("Tool '{}' result:\n{}\n\n", tool_name, output));
+                    }
+                    Err(err) => {
+                        error_occurred = true;
+                        formatted_results
+                            .push_str(&format!("Tool '{}' error: {}\n\n", tool_name, err));
+                    }
+                }
+            }
+
+            if error_occurred {
+                formatted_results
+                    .push_str("Note: Some tool invocations failed. See individual results above.");
+            }
+
+            Ok(formatted_results.trim().to_string())
+        }).into()
+    }
+}

crates/assistant_tools/src/code_action_tool.rs

@@ -1,389 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
-use gpui::{App, Entity, Task};
-use language::{self, Anchor, Buffer, ToPointUtf16};
-use language_model::LanguageModelRequestMessage;
-use project::{self, LspAction, Project};
-use regex::Regex;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{ops::Range, sync::Arc};
-use ui::IconName;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct CodeActionToolInput {
-    /// The relative path to the file containing the text range.
-    ///
-    /// WARNING: you MUST start this path with one of the project's root directories.
-    pub path: String,
-
-    /// The specific code action to execute.
-    ///
-    /// If this field is provided, the tool will execute the specified action.
-    /// If omitted, the tool will list all available code actions for the text range.
-    ///
-    /// Here are some actions that are commonly supported (but may not be for this particular
-    /// text range; you can omit this field to list all the actions, if you want to know
-    /// what your options are, or you can just try an action and if it fails I'll tell you
-    /// what the available actions were instead):
-    /// - "quickfix.all" - applies all available quick fixes in the range
-    /// - "source.organizeImports" - sorts and cleans up import statements
-    /// - "source.fixAll" - applies all available auto fixes
-    /// - "refactor.extract" - extracts selected code into a new function or variable
-    /// - "refactor.inline" - inlines a variable by replacing references with its value
-    /// - "refactor.rewrite" - general code rewriting operations
-    /// - "source.addMissingImports" - adds imports for references that lack them
-    /// - "source.removeUnusedImports" - removes imports that aren't being used
-    /// - "source.implementInterface" - generates methods required by an interface/trait
-    /// - "source.generateAccessors" - creates getter/setter methods
-    /// - "source.convertToAsyncFunction" - converts callback-style code to async/await
-    ///
-    /// Also, there is a special case: if you specify exactly "textDocument/rename" as the action,
-    /// then this will rename the symbol to whatever string you specified for the `arguments` field.
-    pub action: Option<String>,
-
-    /// Optional arguments to pass to the code action.
-    ///
-    /// For rename operations (when action="textDocument/rename"), this should contain the new name.
-    /// For other code actions, these arguments may be passed to the language server.
-    pub arguments: Option<serde_json::Value>,
-
-    /// The text that comes immediately before the text range in the file.
-    pub context_before_range: String,
-
-    /// The text range. This text must appear in the file right between `context_before_range`
-    /// and `context_after_range`.
-    ///
-    /// The file must contain exactly one occurrence of `context_before_range` followed by
-    /// `text_range` followed by `context_after_range`. If the file contains zero occurrences,
-    /// or if it contains more than one occurrence, the tool will fail, so it is absolutely
-    /// critical that you verify ahead of time that the string is unique. You can search
-    /// the file's contents to verify this ahead of time.
-    ///
-    /// To make the string more likely to be unique, include a minimum of 1 line of context
-    /// before the text range, as well as a minimum of 1 line of context after the text range.
-    /// If these lines of context are not enough to obtain a string that appears only once
-    /// in the file, then double the number of context lines until the string becomes unique.
-    /// (Start with 1 line before and 1 line after though, because too much context is
-    /// needlessly costly.)
-    ///
-    /// Do not alter the context lines of code in any way, and make sure to preserve all
-    /// whitespace and indentation for all lines of code. The combined string must be exactly
-    /// as it appears in the file, or else this tool call will fail.
-    pub text_range: String,
-
-    /// The text that comes immediately after the text range in the file.
-    pub context_after_range: String,
-}
-
-pub struct CodeActionTool;
-
-impl Tool for CodeActionTool {
-    fn name(&self) -> String {
-        "code_actions".into()
-    }
-
-    fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
-        false
-    }
-
-    fn description(&self) -> String {
-        include_str!("./code_action_tool/description.md").into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Wand
-    }
-
-    fn input_schema(
-        &self,
-        _format: language_model::LanguageModelToolSchemaFormat,
-    ) -> serde_json::Value {
-        let schema = schemars::schema_for!(CodeActionToolInput);
-        serde_json::to_value(&schema).unwrap()
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        match serde_json::from_value::<CodeActionToolInput>(input.clone()) {
-            Ok(input) => {
-                if let Some(action) = &input.action {
-                    if action == "textDocument/rename" {
-                        let new_name = match &input.arguments {
-                            Some(serde_json::Value::String(new_name)) => new_name.clone(),
-                            Some(value) => {
-                                if let Ok(new_name) =
-                                    serde_json::from_value::<String>(value.clone())
-                                {
-                                    new_name
-                                } else {
-                                    "invalid name".to_string()
-                                }
-                            }
-                            None => "missing name".to_string(),
-                        };
-                        format!("Rename '{}' to '{}'", input.text_range, new_name)
-                    } else {
-                        format!(
-                            "Execute code action '{}' for '{}'",
-                            action, input.text_range
-                        )
-                    }
-                } else {
-                    format!("List available code actions for '{}'", input.text_range)
-                }
-            }
-            Err(_) => "Perform code action".to_string(),
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        action_log: Entity<ActionLog>,
-        cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
-        let input = match serde_json::from_value::<CodeActionToolInput>(input) {
-            Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
-        };
-
-        cx.spawn(async move |cx| {
-            let buffer = {
-                let project_path = project.read_with(cx, |project, cx| {
-                    project
-                        .find_project_path(&input.path, cx)
-                        .context("Path not found in project")
-                })??;
-
-                project.update(cx, |project, cx| project.open_buffer(project_path, cx))?.await?
-            };
-
-            action_log.update(cx, |action_log, cx| {
-                action_log.buffer_read(buffer.clone(), cx);
-            })?;
-
-            let range = {
-                let Some(range) = buffer.read_with(cx, |buffer, _cx| {
-                    find_text_range(&buffer, &input.context_before_range, &input.text_range, &input.context_after_range)
-                })? else {
-                    return Err(anyhow!(
-                        "Failed to locate the text specified by context_before_range, text_range, and context_after_range. Make sure context_before_range and context_after_range each match exactly once in the file."
-                    ));
-                };
-
-                range
-            };
-
-            if let Some(action_type) = &input.action {
-                // Special-case the `rename` operation
-                let response = if action_type == "textDocument/rename" {
-                    let Some(new_name) = input.arguments.and_then(|args| serde_json::from_value::<String>(args).ok()) else {
-                        return Err(anyhow!("For rename operations, 'arguments' must be a string containing the new name"));
-                    };
-
-                    let position = buffer.read_with(cx, |buffer, _| {
-                        range.start.to_point_utf16(&buffer.snapshot())
-                    })?;
-
-                    project
-                        .update(cx, |project, cx| {
-                            project.perform_rename(buffer.clone(), position, new_name.clone(), cx)
-                        })?
-                        .await?;
-
-                    format!("Renamed '{}' to '{}'", input.text_range, new_name)
-                } else {
-                    // Get code actions for the range
-                    let actions = project
-                        .update(cx, |project, cx| {
-                            project.code_actions(&buffer, range.clone(), None, cx)
-                        })?
-                        .await?;
-
-                    if actions.is_empty() {
-                        return Err(anyhow!("No code actions available for this range"));
-                    }
-
-                    // Find all matching actions
-                    let regex = match Regex::new(action_type) {
-                        Ok(regex) => regex,
-                        Err(err) => return Err(anyhow!("Invalid regex pattern: {}", err)),
-                    };
-                    let mut matching_actions = actions
-                        .into_iter()
-                        .filter(|action| { regex.is_match(action.lsp_action.title()) });
-
-                    let Some(action) = matching_actions.next() else {
-                        return Err(anyhow!("No code actions match the pattern: {}", action_type));
-                    };
-
-                    // There should have been exactly one matching action.
-                    if let Some(second) = matching_actions.next() {
-                        let mut all_matches = vec![action, second];
-
-                        all_matches.extend(matching_actions);
-
-                        return Err(anyhow!(
-                            "Pattern '{}' matches multiple code actions: {}",
-                            action_type,
-                            all_matches.into_iter().map(|action| action.lsp_action.title().to_string()).collect::<Vec<_>>().join(", ")
-                        ));
-                    }
-
-                    let title = action.lsp_action.title().to_string();
-
-                    project
-                        .update(cx, |project, cx| {
-                            project.apply_code_action(buffer.clone(), action, true, cx)
-                        })?
-                        .await?;
-
-                    format!("Completed code action: {}", title)
-                };
-
-                project
-                    .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
-                    .await?;
-
-                action_log.update(cx, |log, cx| {
-                    log.buffer_edited(buffer.clone(), cx)
-                })?;
-
-                Ok((ResponseDest::TextOnly, response))
-            } else {
-                // No action specified, so list the available ones.
-                let (position_start, position_end) = buffer.read_with(cx, |buffer, _| {
-                    let snapshot = buffer.snapshot();
-                    (
-                        range.start.to_point_utf16(&snapshot),
-                        range.end.to_point_utf16(&snapshot)
-                    )
-                })?;
-
-                // Convert position to display coordinates (1-based)
-                let position_start_display = language::Point {
-                    row: position_start.row + 1,
-                    column: position_start.column + 1,
-                };
-
-                let position_end_display = language::Point {
-                    row: position_end.row + 1,
-                    column: position_end.column + 1,
-                };
-
-                // Get code actions for the range
-                let actions = project
-                    .update(cx, |project, cx| {
-                        project.code_actions(&buffer, range.clone(), None, cx)
-                    })?
-                    .await?;
-
-                let mut response = format!(
-                    "Available code actions for text range '{}' at position {}:{} to {}:{} (UTF-16 coordinates):\n\n",
-                    input.text_range,
-                    position_start_display.row, position_start_display.column,
-                    position_end_display.row, position_end_display.column
-                );
-
-                if actions.is_empty() {
-                    response.push_str("No code actions available for this range.");
-                } else {
-                    for (i, action) in actions.iter().enumerate() {
-                        let title = match &action.lsp_action {
-                            LspAction::Action(code_action) => code_action.title.as_str(),
-                            LspAction::Command(command) => command.title.as_str(),
-                            LspAction::CodeLens(code_lens) => {
-                                if let Some(cmd) = &code_lens.command {
-                                    cmd.title.as_str()
-                                } else {
-                                    "Unknown code lens"
-                                }
-                            },
-                        };
-
-                        let kind = match &action.lsp_action {
-                            LspAction::Action(code_action) => {
-                                if let Some(kind) = &code_action.kind {
-                                    kind.as_str()
-                                } else {
-                                    "unknown"
-                                }
-                            },
-                            LspAction::Command(_) => "command",
-                            LspAction::CodeLens(_) => "code_lens",
-                        };
-
-                        response.push_str(&format!("{}. {title} ({kind})\n", i + 1));
-                    }
-                }
-
-                Ok((ResponseDest::TextOnly, response))
-            }
-        })
-    }
-}
-
-/// Finds the range of the text in the buffer, if it appears between context_before_range
-/// and context_after_range, and if that combined string has one unique result in the buffer.
-///
-/// If an exact match fails, it tries adding a newline to the end of context_before_range and
-/// to the beginning of context_after_range to accommodate line-based context matching.
-fn find_text_range(
-    buffer: &Buffer,
-    context_before_range: &str,
-    text_range: &str,
-    context_after_range: &str,
-) -> Option<Range<Anchor>> {
-    let snapshot = buffer.snapshot();
-    let text = snapshot.text();
-
-    // First try with exact match
-    let search_string = format!("{context_before_range}{text_range}{context_after_range}");
-    let mut positions = text.match_indices(&search_string);
-    let position_result = positions.next();
-
-    if let Some(position) = position_result {
-        // Check if the matched string is unique
-        if positions.next().is_none() {
-            let range_start = position.0 + context_before_range.len();
-            let range_end = range_start + text_range.len();
-            let range_start_anchor = snapshot.anchor_before(snapshot.offset_to_point(range_start));
-            let range_end_anchor = snapshot.anchor_before(snapshot.offset_to_point(range_end));
-
-            return Some(range_start_anchor..range_end_anchor);
-        }
-    }
-
-    // If exact match fails or is not unique, try with line-based context
-    // Add a newline to the end of before context and beginning of after context
-    let line_based_before = if context_before_range.ends_with('\n') {
-        context_before_range.to_string()
-    } else {
-        format!("{context_before_range}\n")
-    };
-
-    let line_based_after = if context_after_range.starts_with('\n') {
-        context_after_range.to_string()
-    } else {
-        format!("\n{context_after_range}")
-    };
-
-    let line_search_string = format!("{line_based_before}{text_range}{line_based_after}");
-    let mut line_positions = text.match_indices(&line_search_string);
-    let line_position = line_positions.next()?;
-
-    // The line-based search string must also appear exactly once
-    if line_positions.next().is_some() {
-        return None;
-    }
-
-    let line_range_start = line_position.0 + line_based_before.len();
-    let line_range_end = line_range_start + text_range.len();
-    let line_range_start_anchor =
-        snapshot.anchor_before(snapshot.offset_to_point(line_range_start));
-    let line_range_end_anchor = snapshot.anchor_before(snapshot.offset_to_point(line_range_end));
-
-    Some(line_range_start_anchor..line_range_end_anchor)
-}

crates/assistant_tools/src/code_action_tool/description.md

@@ -1,19 +0,0 @@
-A tool for applying code actions to specific sections of your code. It uses language servers to provide refactoring capabilities similar to what you'd find in an IDE.
-
-This tool can:
-- List all available code actions for a selected text range
-- Execute a specific code action on that range
-- Rename symbols across your codebase. This tool is the preferred way to rename things, and you should always prefer to rename code symbols using this tool rather than using textual find/replace when both are available.
-
-Use this tool when you want to:
-- Discover what code actions are available for a piece of code
-- Apply automatic fixes and code transformations
-- Rename variables, functions, or other symbols consistently throughout your project
-- Clean up imports, implement interfaces, or perform other language-specific operations
-
-- If unsure what actions are available, call the tool without specifying an action to get a list
-- For common operations, you can directly specify actions like "quickfix.all" or "source.organizeImports"
-- For renaming, use the special "textDocument/rename" action and provide the new name in the arguments field
-- Be specific with your text range and context to ensure the tool identifies the correct code location
-
-The tool will automatically save any changes it makes to your files.

crates/assistant_tools/src/code_symbols_tool.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use crate::schema::json_schema_for;
 use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use collections::IndexMap;
 use gpui::{App, AsyncApp, Entity, Task};
 use language::{OutlineItem, ParseStatus, Point};
@@ -129,10 +129,10 @@ impl Tool for CodeSymbolsTool {
         project: Entity<Project>,
         action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input = match serde_json::from_value::<CodeSymbolsInput>(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
 
         let regex = match input.regex {
@@ -141,20 +141,15 @@ impl Tool for CodeSymbolsTool {
                 .build()
             {
                 Ok(regex) => Some(regex),
-                Err(err) => return Task::ready(Err(anyhow!("Invalid regex: {err}"))),
+                Err(err) => return Task::ready(Err(anyhow!("Invalid regex: {err}"))).into(),
             },
             None => None,
         };
 
-        cx.spawn(async move |cx| {
-            match input.path {
-                Some(path) => {
-                    file_outline(project, path, action_log, regex, input.offset, cx).await
-                }
-                None => project_symbols(project, regex, input.offset, cx).await,
-            }
-            .map(|output| (ResponseDest::TextOnly, output))
-        })
+        cx.spawn(async move |cx| match input.path {
+            Some(path) => file_outline(project, path, action_log, regex, input.offset, cx).await,
+            None => project_symbols(project, regex, input.offset, cx).await,
+        }).into()
     }
 }
 

crates/assistant_tools/src/copy_path_tool.rs

@@ -1,7 +1,6 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::ResponseDest;
-use assistant_tool::{ActionLog, Tool};
+use anyhow::anyhow;
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AppContext, Entity, Task};
 use language_model::LanguageModelRequestMessage;
 use language_model::LanguageModelToolSchemaFormat;
@@ -78,10 +77,10 @@ impl Tool for CopyPathTool {
         project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input = match serde_json::from_value::<CopyPathToolInput>(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
         let copy_task = project.update(cx, |project, cx| {
             match project
@@ -106,9 +105,9 @@ impl Tool for CopyPathTool {
 
         cx.background_spawn(async move {
             match copy_task.await {
-                Ok(_) => Ok((
-                    ResponseDest::TextOnly,
-                    format!("Copied {} to {}", input.source_path, input.destination_path),
+                Ok(_) => Ok(format!(
+                    "Copied {} to {}",
+                    input.source_path, input.destination_path
                 )),
                 Err(err) => Err(anyhow!(
                     "Failed to copy {} to {}: {}",
@@ -117,6 +116,6 @@ impl Tool for CopyPathTool {
                     err
                 )),
             }
-        })
+        }).into()
     }
 }

crates/assistant_tools/src/create_directory_tool.rs

@@ -1,7 +1,6 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::ResponseDest;
-use assistant_tool::{ActionLog, Tool};
+use anyhow::anyhow;
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, Entity, Task};
 use language_model::LanguageModelRequestMessage;
 use language_model::LanguageModelToolSchemaFormat;
@@ -69,14 +68,14 @@ impl Tool for CreateDirectoryTool {
         project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input = match serde_json::from_value::<CreateDirectoryToolInput>(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
         let project_path = match project.read(cx).find_project_path(&input.path, cx) {
             Some(project_path) => project_path,
-            None => return Task::ready(Err(anyhow!("Path to create was outside the project"))),
+            None => return Task::ready(Err(anyhow!("Path to create was outside the project"))).into(),
         };
         let destination_path: Arc<str> = input.path.as_str().into();
 
@@ -88,10 +87,7 @@ impl Tool for CreateDirectoryTool {
                 .await
                 .map_err(|err| anyhow!("Unable to create directory {destination_path}: {err}"))?;
 
-            Ok((
-                ResponseDest::TextOnly,
-                format!("Created directory {destination_path}"),
-            ))
-        })
+            Ok(format!("Created directory {destination_path}"))
+        }).into()
     }
 }

crates/assistant_tools/src/create_file_tool.rs

@@ -1,7 +1,6 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::ResponseDest;
-use assistant_tool::{ActionLog, Tool};
+use anyhow::anyhow;
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, Entity, Task};
 use language_model::LanguageModelRequestMessage;
 use language_model::LanguageModelToolSchemaFormat;
@@ -25,6 +24,13 @@ pub struct CreateFileToolInput {
     /// You can create a new file by providing a path of "directory1/new_file.txt"
     /// </example>
     pub path: String,
+
+    /// The text contents of the file to create.
+    ///
+    /// <example>
+    /// To create a file with the text "Hello, World!", provide contents of "Hello, World!"
+    /// </example>
+    pub contents: String,
 }
 
 pub struct CreateFileTool;
@@ -67,15 +73,16 @@ impl Tool for CreateFileTool {
         project: Entity<Project>,
         action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input = match serde_json::from_value::<CreateFileToolInput>(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
         let project_path = match project.read(cx).find_project_path(&input.path, cx) {
             Some(project_path) => project_path,
-            None => return Task::ready(Err(anyhow!("Path to create was outside the project"))),
+            None => return Task::ready(Err(anyhow!("Path to create was outside the project"))).into(),
         };
+        let contents: Arc<str> = input.contents.as_str().into();
         let destination_path: Arc<str> = input.path.as_str().into();
 
         cx.spawn(async move |cx| {
@@ -86,6 +93,7 @@ impl Tool for CreateFileTool {
                 .await
                 .map_err(|err| anyhow!("Unable to open buffer for {destination_path}: {err}"))?;
             cx.update(|cx| {
+                buffer.update(cx, |buffer, cx| buffer.set_text(contents, cx));
                 action_log.update(cx, |action_log, cx| {
                     action_log.will_create_buffer(buffer.clone(), cx)
                 });
@@ -96,7 +104,7 @@ impl Tool for CreateFileTool {
                 .await
                 .map_err(|err| anyhow!("Unable to save buffer for {destination_path}: {err}"))?;
 
-            Ok((ResponseDest::File { path: destination_path.clone() }, format!("Created file {destination_path} - next, its exact contents will become your response:")))
-        })
+            Ok(format!("Created file {destination_path}"))
+        }).into()
     }
 }

crates/assistant_tools/src/create_file_tool/description.md

@@ -1,5 +1,3 @@
-Creates a new file at the specified path within the project. The entire message you respond with will then be streamed into the file.
+Creates a new file at the specified path within the project, containing the given text content. Returns confirmation that the file was created.
 
-This tool is the most efficient way to create new files within the project, so it should always be chosen whenever it's necessary to create a new file in the project with specific text content, or whenever a file in the project needs such a drastic change that you would prefer to replace the entire thing instead of making individual edits. This tool should not be used when making changes to parts of an existing file but not all of it.
-
-Note that *all* the text you respond with will be streamed into the file, so you must ONLY respond with the contents of the file.
+This tool is the most efficient way to create new files within the project, so it should always be chosen whenever it's necessary to create a new file in the project with specific text content, or whenever a file in the project needs such a drastic change that you would prefer to replace the entire thing instead of making individual edits. This tool should not be used when making changes to parts of an existing file but not all of it. In those cases, it's better to use another approach to edit the file.

crates/assistant_tools/src/delete_path_tool.rs

@@ -1,6 +1,6 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use anyhow::anyhow;
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use futures::{SinkExt, StreamExt, channel::mpsc};
 use gpui::{App, AppContext, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
@@ -63,15 +63,15 @@ impl Tool for DeletePathTool {
         project: Entity<Project>,
         action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let path_str = match serde_json::from_value::<DeletePathToolInput>(input) {
             Ok(input) => input.path,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
         let Some(project_path) = project.read(cx).find_project_path(&path_str, cx) else {
             return Task::ready(Err(anyhow!(
                 "Couldn't delete {path_str} because that path isn't in this project."
-            )));
+            ))).into();
         };
 
         let Some(worktree) = project
@@ -80,7 +80,7 @@ impl Tool for DeletePathTool {
         else {
             return Task::ready(Err(anyhow!(
                 "Couldn't delete {path_str} because that path isn't in this project."
-            )));
+            ))).into();
         };
 
         let worktree_snapshot = worktree.read(cx).snapshot();
@@ -124,13 +124,13 @@ impl Tool for DeletePathTool {
 
             match delete {
                 Some(deletion_task) => match deletion_task.await {
-                    Ok(()) => Ok((ResponseDest::TextOnly, format!("Deleted {path_str}"))),
+                    Ok(()) => Ok(format!("Deleted {path_str}")),
                     Err(err) => Err(anyhow!("Failed to delete {path_str}: {err}")),
                 },
                 None => Err(anyhow!(
                     "Couldn't delete {path_str} because that path isn't in this project."
                 )),
             }
-        })
+        }).into()
     }
 }

crates/assistant_tools/src/diagnostics_tool.rs

@@ -1,6 +1,6 @@
 use crate::schema::json_schema_for;
 use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, Entity, Task};
 use language::{DiagnosticSeverity, OffsetRangeExt};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
@@ -83,14 +83,14 @@ impl Tool for DiagnosticsTool {
         project: Entity<Project>,
         action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         match serde_json::from_value::<DiagnosticsToolInput>(input)
             .ok()
             .and_then(|input| input.path)
         {
             Some(path) if !path.is_empty() => {
                 let Some(project_path) = project.read(cx).find_project_path(&path, cx) else {
-                    return Task::ready(Err(anyhow!("Could not find path {path} in project",)));
+                    return Task::ready(Err(anyhow!("Could not find path {path} in project",))).into();
                 };
 
                 let buffer =
@@ -119,15 +119,12 @@ impl Tool for DiagnosticsTool {
                         )?;
                     }
 
-                    Ok((
-                        ResponseDest::TextOnly,
-                        if output.is_empty() {
-                            "File doesn't have errors or warnings!".to_string()
-                        } else {
-                            output
-                        },
-                    ))
-                })
+                    if output.is_empty() {
+                        Ok("File doesn't have errors or warnings!".to_string())
+                    } else {
+                        Ok(output)
+                    }
+                }).into()
             }
             _ => {
                 let project = project.read(cx);
@@ -157,14 +154,11 @@ impl Tool for DiagnosticsTool {
                     action_log.checked_project_diagnostics();
                 });
 
-                Task::ready(Ok((
-                    ResponseDest::TextOnly,
-                    if has_diagnostics {
-                        output
-                    } else {
-                        "No errors or warnings found in the project.".to_string()
-                    },
-                )))
+                if has_diagnostics {
+                    Task::ready(Ok(output)).into()
+                } else {
+                    Task::ready(Ok("No errors or warnings found in the project.".to_string())).into()
+                }
             }
         }
     }

crates/assistant_tools/src/fetch_tool.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use crate::schema::json_schema_for;
 use anyhow::{Context as _, Result, anyhow, bail};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use futures::AsyncReadExt as _;
 use gpui::{App, AppContext as _, Entity, Task};
 use html_to_markdown::{TagHandler, convert_html_to_markdown, markdown};
@@ -146,10 +146,10 @@ impl Tool for FetchTool {
         _project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input = match serde_json::from_value::<FetchToolInput>(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
 
         let text = cx.background_spawn({
@@ -164,7 +164,7 @@ impl Tool for FetchTool {
                 bail!("no textual content found");
             }
 
-            Ok((ResponseDest::TextOnly, text))
-        })
+            Ok(text)
+        }).into()
     }
 }

crates/assistant_tools/src/find_replace_file_tool.rs

@@ -1,6 +1,6 @@
 use crate::{replace::replace_with_flexible_indent, schema::json_schema_for};
-use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use anyhow::{Context as _, anyhow};
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AppContext, AsyncApp, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
@@ -63,16 +63,6 @@ pub struct FindReplaceFileToolInput {
     /// even one character in this string is different in any way from how it appears
     /// in the file, then the tool call will fail.
     ///
-    /// If you get an error that the `find` string was not found, this means that either
-    /// you made a mistake, or that the file has changed since you last looked at it.
-    /// Either way, when this happens, you should retry doing this tool call until it
-    /// succeeds, up to 3 times. Each time you retry, you should take another look at
-    /// the exact text of the file in question, to make sure that you are searching for
-    /// exactly the right string. Regardless of whether it was because you made a mistake
-    /// or because the file changed since you last looked at it, you should be extra
-    /// careful when retrying in this way. It's a bad experience for the user if
-    /// this `find` string isn't found, so be super careful to get it exactly right!
-    ///
     /// <example>
     /// If a file contains this code:
     ///
@@ -169,10 +159,10 @@ impl Tool for FindReplaceFileTool {
         project: Entity<Project>,
         action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input = match serde_json::from_value::<FindReplaceFileToolInput>(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
 
         cx.spawn(async move |cx: &mut AsyncApp| {
@@ -261,7 +251,8 @@ impl Tool for FindReplaceFileTool {
             }).await;
 
 
-            Ok((ResponseDest::TextOnly,format!("Edited {}:\n\n```diff\n{}\n```", input.path.display(), diff_str)))
-        })
+            Ok(format!("Edited {}:\n\n```diff\n{}\n```", input.path.display(), diff_str))
+
+        }).into()
     }
 }

crates/assistant_tools/src/find_replace_tool/description.md

@@ -1,10 +1,8 @@
 Find one unique part of a file in the project and replace that text with new text.
 
-This tool is the preferred way to make edits to files *except* when making a rename. When making a rename specifically, the rename tool must always be used instead.
+This tool is the preferred way to make edits to files. If you have multiple edits to make, including edits across multiple files, then make a plan to respond with a single message containing multiple calls to this tool - one call for each find/replace operation.
 
-If you have multiple edits to make, including edits across multiple files, then make a plan to respond with a single message containing a batch of calls to this tool - one call for each find/replace operation.
-
-You should only use this tool when you want to edit a subset of a file's contents, but not the entire file. You should not use this tool when you want to replace the entire contents of a file with completely different contents. You also should not use this tool when you want to move or rename a file. You absolutely must NEVER use this tool to create new files from scratch. If you ever consider using this tool to create a new file from scratch, for any reason, instead you must reconsider and choose a different approach.
+You should use this tool when you want to edit a subset of a file's contents, but not the entire file. You should not use this tool when you want to replace the entire contents of a file with completely different contents. You also should not use this tool when you want to move or rename a file. You absolutely must NEVER use this tool to create new files from scratch. If you ever consider using this tool to create a new file from scratch, for any reason, instead you must reconsider and choose a different approach.
 
 DO NOT call this tool until the code to be edited appears in the conversation! You must use another tool to read the file's contents into the conversation, or ask the user to add it to context first.
 

crates/assistant_tools/src/list_directory_tool.rs

@@ -1,6 +1,6 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use anyhow::anyhow;
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
@@ -77,10 +77,10 @@ impl Tool for ListDirectoryTool {
         project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input = match serde_json::from_value::<ListDirectoryToolInput>(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
 
         // Sometimes models will return these even though we tell it to give a path and not a glob.
@@ -101,26 +101,26 @@ impl Tool for ListDirectoryTool {
                 .collect::<Vec<_>>()
                 .join("\n");
 
-            return Task::ready(Ok((ResponseDest::TextOnly, output)));
+            return Task::ready(Ok(output)).into();
         }
 
         let Some(project_path) = project.read(cx).find_project_path(&input.path, cx) else {
-            return Task::ready(Err(anyhow!("Path {} not found in project", input.path)));
+            return Task::ready(Err(anyhow!("Path {} not found in project", input.path))).into();
         };
         let Some(worktree) = project
             .read(cx)
             .worktree_for_id(project_path.worktree_id, cx)
         else {
-            return Task::ready(Err(anyhow!("Worktree not found")));
+            return Task::ready(Err(anyhow!("Worktree not found"))).into();
         };
         let worktree = worktree.read(cx);
 
         let Some(entry) = worktree.entry_for_path(&project_path.path) else {
-            return Task::ready(Err(anyhow!("Path not found: {}", input.path)));
+            return Task::ready(Err(anyhow!("Path not found: {}", input.path))).into();
         };
 
         if !entry.is_dir() {
-            return Task::ready(Err(anyhow!("{} is not a directory.", input.path)));
+            return Task::ready(Err(anyhow!("{} is not a directory.", input.path))).into();
         }
 
         let mut output = String::new();
@@ -132,13 +132,9 @@ impl Tool for ListDirectoryTool {
             )
             .unwrap();
         }
-        Task::ready(Ok((
-            ResponseDest::TextOnly,
-            if output.is_empty() {
-                format!("{} is empty.", input.path)
-            } else {
-                output
-            },
-        )))
+        if output.is_empty() {
+            return Task::ready(Ok(format!("{} is empty.", input.path))).into();
+        }
+        Task::ready(Ok(output)).into()
     }
 }

crates/assistant_tools/src/move_path_tool.rs

@@ -1,6 +1,6 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use anyhow::anyhow;
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AppContext, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
@@ -90,10 +90,10 @@ impl Tool for MovePathTool {
         project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input = match serde_json::from_value::<MovePathToolInput>(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
         let rename_task = project.update(cx, |project, cx| {
             match project
@@ -116,9 +116,9 @@ impl Tool for MovePathTool {
 
         cx.background_spawn(async move {
             match rename_task.await {
-                Ok(_) => Ok((
-                    ResponseDest::TextOnly,
-                    format!("Moved {} to {}", input.source_path, input.destination_path),
+                Ok(_) => Ok(format!(
+                    "Moved {} to {}",
+                    input.source_path, input.destination_path
                 )),
                 Err(err) => Err(anyhow!(
                     "Failed to move {} to {}: {}",
@@ -127,6 +127,6 @@ impl Tool for MovePathTool {
                     err
                 )),
             }
-        })
+        }).into()
     }
 }

crates/assistant_tools/src/now_tool.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use anyhow::anyhow;
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use chrono::{Local, Utc};
 use gpui::{App, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
@@ -60,10 +60,10 @@ impl Tool for NowTool {
         _project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         _cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input: NowToolInput = match serde_json::from_value(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
 
         let now = match input.timezone {
@@ -72,6 +72,6 @@ impl Tool for NowTool {
         };
         let text = format!("The current datetime is {now}.");
 
-        Task::ready(Ok((ResponseDest::TextOnly, text)))
+        Task::ready(Ok(text)).into()
     }
 }

crates/assistant_tools/src/open_tool.rs

@@ -1,6 +1,6 @@
 use crate::schema::json_schema_for;
-use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use anyhow::{Context as _, anyhow};
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AppContext, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
@@ -53,19 +53,16 @@ impl Tool for OpenTool {
         _project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input: OpenToolInput = match serde_json::from_value(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
 
         cx.background_spawn(async move {
             open::that(&input.path_or_url).context("Failed to open URL or file path")?;
 
-            Ok((
-                ResponseDest::TextOnly,
-                format!("Successfully opened {}", input.path_or_url),
-            ))
-        })
+            Ok(format!("Successfully opened {}", input.path_or_url))
+        }).into()
     }
 }

crates/assistant_tools/src/path_search_tool.rs

@@ -1,6 +1,6 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use anyhow::anyhow;
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AppContext, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
@@ -71,10 +71,10 @@ impl Tool for PathSearchTool {
         project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let (offset, glob) = match serde_json::from_value::<PathSearchToolInput>(input) {
             Ok(input) => (input.offset, input.glob),
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
 
         let path_matcher = match PathMatcher::new([
@@ -82,7 +82,7 @@ impl Tool for PathSearchTool {
             if glob.is_empty() { "*" } else { &glob },
         ]) {
             Ok(matcher) => matcher,
-            Err(err) => return Task::ready(Err(anyhow!("Invalid glob: {err}"))),
+            Err(err) => return Task::ready(Err(anyhow!("Invalid glob: {err}"))).into(),
         };
         let snapshots: Vec<Snapshot> = project
             .read(cx)
@@ -109,35 +109,33 @@ impl Tool for PathSearchTool {
                 }
             }
 
-            Ok((ResponseDest::TextOnly,
-                if matches.is_empty() {
-                    format!("No paths in the project matched the glob {glob:?}")
+            if matches.is_empty() {
+                Ok(format!("No paths in the project matched the glob {glob:?}"))
+            } else {
+                // Sort to group entries in the same directory together.
+                matches.sort();
+
+                let total_matches = matches.len();
+                let response = if total_matches > RESULTS_PER_PAGE + offset as usize {
+                let paginated_matches: Vec<_> = matches
+                      .into_iter()
+                      .skip(offset as usize)
+                      .take(RESULTS_PER_PAGE)
+                      .collect();
+
+                    format!(
+                        "Found {} total matches. Showing results {}-{} (provide 'offset' parameter for more results):\n\n{}",
+                        total_matches,
+                        offset + 1,
+                        offset as usize + paginated_matches.len(),
+                        paginated_matches.join("\n")
+                    )
                 } else {
-                    // Sort to group entries in the same directory together.
-                    matches.sort();
+                    matches.join("\n")
+                };
 
-                    let total_matches = matches.len();
-                    let response = if total_matches > RESULTS_PER_PAGE + offset as usize {
-                    let paginated_matches: Vec<_> = matches
-                          .into_iter()
-                          .skip(offset as usize)
-                          .take(RESULTS_PER_PAGE)
-                          .collect();
-
-                        format!(
-                            "Found {} total matches. Showing results {}-{} (provide 'offset' parameter for more results):\n\n{}",
-                            total_matches,
-                            offset + 1,
-                            offset as usize + paginated_matches.len(),
-                            paginated_matches.join("\n")
-                        )
-                    } else {
-                        matches.join("\n")
-                    };
-
-                    response
-                }
-            ))
-          })
+                Ok(response)
+            }
+        }).into()
     }
 }

crates/assistant_tools/src/read_file_tool.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use crate::{code_symbols_tool::file_outline, schema::json_schema_for};
-use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use anyhow::anyhow;
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, Entity, Task};
 use itertools::Itertools;
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
@@ -88,14 +88,14 @@ impl Tool for ReadFileTool {
         project: Entity<Project>,
         action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input = match serde_json::from_value::<ReadFileToolInput>(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
 
         let Some(project_path) = project.read(cx).find_project_path(&input.path, cx) else {
-            return Task::ready(Err(anyhow!("Path {} not found in project", &input.path,)));
+            return Task::ready(Err(anyhow!("Path {} not found in project", &input.path,))).into();
         };
 
         let file_path = input.path.clone();
@@ -106,48 +106,46 @@ impl Tool for ReadFileTool {
                 })?
                 .await?;
 
-            Ok((ResponseDest::TextOnly,
-                // Check if specific line ranges are provided
-                if input.start_line.is_some() || input.end_line.is_some() {
-                    let answer = buffer.read_with(cx, |buffer, _cx| {
-                        let text = buffer.text();
-                        let start = input.start_line.unwrap_or(1);
-                        let lines = text.split('\n').skip(start - 1);
-                        if let Some(end) = input.end_line {
-                            let count = end.saturating_sub(start).max(1); // Ensure at least 1 line
-                            Itertools::intersperse(lines.take(count), "\n").collect()
-                        } else {
-                            Itertools::intersperse(lines, "\n").collect()
-                        }
-                    })?;
+            // Check if specific line ranges are provided
+            if input.start_line.is_some() || input.end_line.is_some() {
+                let result = buffer.read_with(cx, |buffer, _cx| {
+                    let text = buffer.text();
+                    let start = input.start_line.unwrap_or(1);
+                    let lines = text.split('\n').skip(start - 1);
+                    if let Some(end) = input.end_line {
+                        let count = end.saturating_sub(start).max(1); // Ensure at least 1 line
+                        Itertools::intersperse(lines.take(count), "\n").collect()
+                    } else {
+                        Itertools::intersperse(lines, "\n").collect()
+                    }
+                })?;
+
+                action_log.update(cx, |log, cx| {
+                    log.buffer_read(buffer, cx);
+                })?;
+
+                Ok(result)
+            } else {
+                // No line ranges specified, so check file size to see if it's too big.
+                let file_size = buffer.read_with(cx, |buffer, _cx| buffer.text().len())?;
+
+                if file_size <= MAX_FILE_SIZE_TO_READ {
+                    // File is small enough, so return its contents.
+                    let result = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
 
                     action_log.update(cx, |log, cx| {
                         log.buffer_read(buffer, cx);
                     })?;
 
-                    answer
+                    Ok(result)
                 } else {
-                    // No line ranges specified, so check file size to see if it's too big.
-                    let file_size = buffer.read_with(cx, |buffer, _cx| buffer.text().len())?;
+                    // File is too big, so return an error with the outline
+                    // and a suggestion to read again with line numbers.
+                    let outline = file_outline(project, file_path, action_log, None, 0, cx).await?;
 
-                    if file_size <= MAX_FILE_SIZE_TO_READ {
-                        // File is small enough, so return its contents.
-                        let answer = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
-
-                        action_log.update(cx, |log, cx| {
-                            log.buffer_read(buffer, cx);
-                        })?;
-
-                        answer
-                    } else {
-                        // File is too big, so return an error with the outline
-                        // and a suggestion to read again with line numbers.
-                        let outline = file_outline(project, file_path, action_log, None, 0, cx).await?;
-
-                        format!("This file was too big to read all at once. Here is an outline of its symbols:\n\n{outline}\n\nUsing the line numbers in this outline, you can call this tool again while specifying the start_line and end_line fields to see the implementations of symbols in the outline.")
-                    }
+                    Ok(format!("This file was too big to read all at once. Here is an outline of its symbols:\n\n{outline}\n\nUsing the line numbers in this outline, you can call this tool again while specifying the start_line and end_line fields to see the implementations of symbols in the outline."))
                 }
-            ))
-        })
+            }
+        }).into()
     }
 }

crates/assistant_tools/src/regex_search_tool.rs

@@ -1,6 +1,6 @@
 use crate::schema::json_schema_for;
 use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use futures::StreamExt;
 use gpui::{App, Entity, Task};
 use language::OffsetRangeExt;
@@ -92,13 +92,13 @@ impl Tool for RegexSearchTool {
         project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         const CONTEXT_LINES: u32 = 2;
 
         let (offset, regex, case_sensitive) =
             match serde_json::from_value::<RegexSearchToolInput>(input) {
                 Ok(input) => (input.offset, input.regex, input.case_sensitive),
-                Err(err) => return Task::ready(Err(anyhow!(err))),
+                Err(err) => return Task::ready(Err(anyhow!(err))).into(),
             };
 
         let query = match SearchQuery::regex(
@@ -112,12 +112,12 @@ impl Tool for RegexSearchTool {
             None,
         ) {
             Ok(query) => query,
-            Err(error) => return Task::ready(Err(error)),
+            Err(error) => return Task::ready(Err(error)).into(),
         };
 
         let results = project.update(cx, |project, cx| project.search(query, cx));
 
-        cx.spawn(async move|cx|  {
+        let output = cx.spawn(async move|cx|  {
             futures::pin_mut!(results);
 
             let mut output = String::new();
@@ -189,20 +189,19 @@ impl Tool for RegexSearchTool {
                 })??;
             }
 
-            Ok((ResponseDest::TextOnly,
-                if matches_found == 0 {
-                    "No matches found".to_string()
-                } else if has_more_matches {
-                    format!(
-                        "Showing matches {}-{} (there were more matches found; use offset: {} to see next page):\n{output}",
-                        offset + 1,
-                        offset + matches_found,
-                        offset + RESULTS_PER_PAGE,
-                    )
-                } else {
-                    format!("Found {matches_found} matches:\n{output}")
-                }
-            ))
-        })
+            if matches_found == 0 {
+                Ok("No matches found".to_string())
+            } else if has_more_matches {
+                Ok(format!(
+                    "Showing matches {}-{} (there were more matches found; use offset: {} to see next page):\n{output}",
+                    offset + 1,
+                    offset + matches_found,
+                    offset + RESULTS_PER_PAGE,
+                ))
+            } else {
+                Ok(format!("Found {matches_found} matches:\n{output}"))
+            }
+        });
+        output.into()
     }
 }

crates/assistant_tools/src/rename_tool.rs

@@ -1,205 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
-use gpui::{App, Entity, Task};
-use language::{self, Buffer, ToPointUtf16};
-use language_model::LanguageModelRequestMessage;
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-use ui::IconName;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct RenameToolInput {
-    /// The relative path to the file containing the symbol to rename.
-    ///
-    /// WARNING: you MUST start this path with one of the project's root directories.
-    pub path: String,
-
-    /// The new name to give to the symbol.
-    pub new_name: String,
-
-    /// The text that comes immediately before the symbol in the file.
-    pub context_before_symbol: String,
-
-    /// The symbol to rename. This text must appear in the file right between
-    /// `context_before_symbol` and `context_after_symbol`.
-    ///
-    /// The file must contain exactly one occurrence of `context_before_symbol` followed by
-    /// `symbol` followed by `context_after_symbol`. If the file contains zero occurrences,
-    /// or if it contains more than one occurrence, the tool will fail, so it is absolutely
-    /// critical that you verify ahead of time that the string is unique. You can search
-    /// the file's contents to verify this ahead of time.
-    ///
-    /// To make the string more likely to be unique, include a minimum of 1 line of context
-    /// before the symbol, as well as a minimum of 1 line of context after the symbol.
-    /// If these lines of context are not enough to obtain a string that appears only once
-    /// in the file, then double the number of context lines until the string becomes unique.
-    /// (Start with 1 line before and 1 line after though, because too much context is
-    /// needlessly costly.)
-    ///
-    /// Do not alter the context lines of code in any way, and make sure to preserve all
-    /// whitespace and indentation for all lines of code. The combined string must be exactly
-    /// as it appears in the file, or else this tool call will fail.
-    pub symbol: String,
-
-    /// The text that comes immediately after the symbol in the file.
-    pub context_after_symbol: String,
-}
-
-pub struct RenameTool;
-
-impl Tool for RenameTool {
-    fn name(&self) -> String {
-        "rename".into()
-    }
-
-    fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
-        false
-    }
-
-    fn description(&self) -> String {
-        include_str!("./rename_tool/description.md").into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Pencil
-    }
-
-    fn input_schema(
-        &self,
-        _format: language_model::LanguageModelToolSchemaFormat,
-    ) -> serde_json::Value {
-        let schema = schemars::schema_for!(RenameToolInput);
-        serde_json::to_value(&schema).unwrap()
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        match serde_json::from_value::<RenameToolInput>(input.clone()) {
-            Ok(input) => {
-                format!("Rename '{}' to '{}'", input.symbol, input.new_name)
-            }
-            Err(_) => "Rename symbol".to_string(),
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        action_log: Entity<ActionLog>,
-        cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
-        let input = match serde_json::from_value::<RenameToolInput>(input) {
-            Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
-        };
-
-        cx.spawn(async move |cx| {
-            let buffer = {
-                let project_path = project.read_with(cx, |project, cx| {
-                    project
-                        .find_project_path(&input.path, cx)
-                        .context("Path not found in project")
-                })??;
-
-                project.update(cx, |project, cx| project.open_buffer(project_path, cx))?.await?
-            };
-
-            action_log.update(cx, |action_log, cx| {
-                action_log.buffer_read(buffer.clone(), cx);
-            })?;
-
-            let position = {
-                let Some(position) = buffer.read_with(cx, |buffer, _cx| {
-                    find_symbol_position(&buffer, &input.context_before_symbol, &input.symbol, &input.context_after_symbol)
-                })? else {
-                    return Err(anyhow!(
-                        "Failed to locate the symbol specified by context_before_symbol, symbol, and context_after_symbol. Make sure context_before_symbol and context_after_symbol each match exactly once in the file."
-                    ));
-                };
-
-                buffer.read_with(cx, |buffer, _| {
-                    position.to_point_utf16(&buffer.snapshot())
-                })?
-            };
-
-            project
-                .update(cx, |project, cx| {
-                    project.perform_rename(buffer.clone(), position, input.new_name.clone(), cx)
-                })?
-                .await?;
-
-            project
-                .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
-                .await?;
-
-            action_log.update(cx, |log, cx| {
-                log.buffer_edited(buffer.clone(), cx)
-            })?;
-
-            Ok((ResponseDest::TextOnly, format!("Renamed '{}' to '{}'", input.symbol, input.new_name)))
-        })
-    }
-}
-
-/// Finds the position of the symbol in the buffer, if it appears between context_before_symbol
-/// and context_after_symbol, and if that combined string has one unique result in the buffer.
-///
-/// If an exact match fails, it tries adding a newline to the end of context_before_symbol and
-/// to the beginning of context_after_symbol to accommodate line-based context matching.
-fn find_symbol_position(
-    buffer: &Buffer,
-    context_before_symbol: &str,
-    symbol: &str,
-    context_after_symbol: &str,
-) -> Option<language::Anchor> {
-    let snapshot = buffer.snapshot();
-    let text = snapshot.text();
-
-    // First try with exact match
-    let search_string = format!("{context_before_symbol}{symbol}{context_after_symbol}");
-    let mut positions = text.match_indices(&search_string);
-    let position_result = positions.next();
-
-    if let Some(position) = position_result {
-        // Check if the matched string is unique
-        if positions.next().is_none() {
-            let symbol_start = position.0 + context_before_symbol.len();
-            let symbol_start_anchor =
-                snapshot.anchor_before(snapshot.offset_to_point(symbol_start));
-
-            return Some(symbol_start_anchor);
-        }
-    }
-
-    // If exact match fails or is not unique, try with line-based context
-    // Add a newline to the end of before context and beginning of after context
-    let line_based_before = if context_before_symbol.ends_with('\n') {
-        context_before_symbol.to_string()
-    } else {
-        format!("{context_before_symbol}\n")
-    };
-
-    let line_based_after = if context_after_symbol.starts_with('\n') {
-        context_after_symbol.to_string()
-    } else {
-        format!("\n{context_after_symbol}")
-    };
-
-    let line_search_string = format!("{line_based_before}{symbol}{line_based_after}");
-    let mut line_positions = text.match_indices(&line_search_string);
-    let line_position = line_positions.next()?;
-
-    // The line-based search string must also appear exactly once
-    if line_positions.next().is_some() {
-        return None;
-    }
-
-    let line_symbol_start = line_position.0 + line_based_before.len();
-    let line_symbol_start_anchor =
-        snapshot.anchor_before(snapshot.offset_to_point(line_symbol_start));
-
-    Some(line_symbol_start_anchor)
-}

crates/assistant_tools/src/rename_tool/description.md

@@ -1,15 +0,0 @@
-Renames a symbol across your codebase using the language server's semantic knowledge.
-
-This tool performs a rename refactoring operation on a specified symbol. It uses the project's language server to analyze the code and perform the rename correctly across all files where the symbol is referenced.
-
-Unlike a simple find and replace, this tool understands the semantic meaning of the code, so it only renames the specific symbol you specify and not unrelated text that happens to have the same name.
-
-Examples of symbols you can rename:
-- Variables
-- Functions
-- Classes/structs
-- Fields/properties
-- Methods
-- Interfaces/traits
-
-The language server handles updating all references to the renamed symbol throughout the codebase.

crates/assistant_tools/src/symbol_info_tool.rs

@@ -1,5 +1,5 @@
-use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use anyhow::{Context as _, anyhow};
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AsyncApp, Entity, Task};
 use language::{self, Anchor, Buffer, BufferSnapshot, Location, Point, ToPoint, ToPointUtf16};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
@@ -122,10 +122,10 @@ impl Tool for SymbolInfoTool {
         project: Entity<Project>,
         action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         let input = match serde_json::from_value::<SymbolInfoToolInput>(input) {
             Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
         };
 
         cx.spawn(async move |cx| {
@@ -203,9 +203,9 @@ impl Tool for SymbolInfoTool {
             if output.is_empty() {
                 Err(anyhow!("None found."))
             } else {
-                Ok((ResponseDest::TextOnly, output))
+                Ok(output)
             }
-        })
+        }).into()
     }
 }
 

crates/assistant_tools/src/terminal_tool/description.md

@@ -1,9 +0,0 @@
-Executes a shell one-liner and returns the combined output.
-
-This tool spawns a process using the user's current shell, combines stdout and stderr into one interleaved stream as they are produced (preserving the order of writes), and captures that stream into a string which is returned.
-
-Make sure you use the `cd` parameter to navigate to one of the root directories of the project. NEVER do it as part of the `command` itself, otherwise it will error.
-
-Do not use this tool for commands that run indefinitely, such as servers (e.g., `python -m http.server`) or file watchers that don't terminate on their own.
-
-Remember that each invocation of this tool will spawn a new shell process, so you can't rely on any state from previous invocations.

crates/assistant_tools/src/thinking_tool.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, ResponseDest, Tool};
+use anyhow::anyhow;
+use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
@@ -51,11 +51,11 @@ impl Tool for ThinkingTool {
         _project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         _cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         // This tool just "thinks out loud" and doesn't perform any actions.
         Task::ready(match serde_json::from_value::<ThinkingToolInput>(input) {
-            Ok(_input) => Ok((ResponseDest::TextOnly, "Finished thinking.".to_string())),
+            Ok(_input) => Ok("Finished thinking.".to_string()),
             Err(err) => Err(anyhow!(err)),
-        })
+        }).into()
     }
 }

crates/collab/Cargo.toml

@@ -44,7 +44,7 @@ log.workspace = true
 nanoid.workspace = true
 open_ai.workspace = true
 parking_lot.workspace = true
-prometheus = "0.14"
+prometheus = "0.13"
 prost.workspace = true
 rand.workspace = true
 reqwest = { version = "0.11", features = ["json"] }

crates/context_server/src/context_server_tool.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
-use anyhow::{Result, anyhow, bail};
-use assistant_tool::{ActionLog, ResponseDest, Tool, ToolSource};
+use anyhow::{anyhow, bail};
+use assistant_tool::{ActionLog, Tool, ToolResult, ToolSource};
 use gpui::{App, Entity, Task};
 use icons::IconName;
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
@@ -76,7 +76,7 @@ impl Tool for ContextServerTool {
         _project: Entity<Project>,
         _action_log: Entity<ActionLog>,
         cx: &mut App,
-    ) -> Task<Result<(ResponseDest, String)>> {
+    ) -> ToolResult {
         if let Some(server) = self.server_manager.read(cx).get_server(&self.server_id) {
             let tool_name = self.tool.name.clone();
             let server_clone = server.clone();
@@ -114,10 +114,10 @@ impl Tool for ContextServerTool {
                         }
                     }
                 }
-                Ok((ResponseDest::TextOnly, result))
-            })
+                Ok(result)
+            }).into()
         } else {
-            Task::ready(Err(anyhow!("Context server not found")))
+            Task::ready(Err(anyhow!("Context server not found"))).into()
         }
     }
 }

crates/editor/src/editor_tests.rs

@@ -7756,81 +7756,77 @@ async fn test_document_format_during_save(cx: &mut TestAppContext) {
     cx.executor().start_waiting();
     let fake_server = fake_servers.next().await.unwrap();
 
-    {
-        fake_server.set_request_handler::<lsp::request::Formatting, _, _>(
-            move |params, _| async move {
-                assert_eq!(
-                    params.text_document.uri,
-                    lsp::Url::from_file_path(path!("/file.rs")).unwrap()
-                );
-                assert_eq!(params.options.tab_size, 4);
-                Ok(Some(vec![lsp::TextEdit::new(
-                    lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(1, 0)),
-                    ", ".to_string(),
-                )]))
-            },
-        );
-        let save = editor
-            .update_in(cx, |editor, window, cx| {
-                editor.save(true, project.clone(), window, cx)
-            })
-            .unwrap();
-        cx.executor().start_waiting();
-        save.await;
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(true, project.clone(), window, cx)
+        })
+        .unwrap();
+    fake_server
+        .set_request_handler::<lsp::request::Formatting, _, _>(move |params, _| async move {
+            assert_eq!(
+                params.text_document.uri,
+                lsp::Url::from_file_path(path!("/file.rs")).unwrap()
+            );
+            assert_eq!(params.options.tab_size, 4);
+            Ok(Some(vec![lsp::TextEdit::new(
+                lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(1, 0)),
+                ", ".to_string(),
+            )]))
+        })
+        .next()
+        .await;
+    cx.executor().start_waiting();
+    save.await;
 
-        assert_eq!(
-            editor.update(cx, |editor, cx| editor.text(cx)),
-            "one, two\nthree\n"
-        );
-        assert!(!cx.read(|cx| editor.is_dirty(cx)));
-    }
+    assert_eq!(
+        editor.update(cx, |editor, cx| editor.text(cx)),
+        "one, two\nthree\n"
+    );
+    assert!(!cx.read(|cx| editor.is_dirty(cx)));
 
-    {
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("one\ntwo\nthree\n", window, cx)
-        });
-        assert!(cx.read(|cx| editor.is_dirty(cx)));
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("one\ntwo\nthree\n", window, cx)
+    });
+    assert!(cx.read(|cx| editor.is_dirty(cx)));
 
-        // Ensure we can still save even if formatting hangs.
-        fake_server.set_request_handler::<lsp::request::Formatting, _, _>(
-            move |params, _| async move {
-                assert_eq!(
-                    params.text_document.uri,
-                    lsp::Url::from_file_path(path!("/file.rs")).unwrap()
-                );
-                futures::future::pending::<()>().await;
-                unreachable!()
-            },
-        );
-        let save = editor
-            .update_in(cx, |editor, window, cx| {
-                editor.save(true, project.clone(), window, cx)
-            })
-            .unwrap();
-        cx.executor().advance_clock(super::FORMAT_TIMEOUT);
-        cx.executor().start_waiting();
-        save.await;
-        assert_eq!(
-            editor.update(cx, |editor, cx| editor.text(cx)),
-            "one\ntwo\nthree\n"
-        );
-    }
+    // Ensure we can still save even if formatting hangs.
+    fake_server.set_request_handler::<lsp::request::Formatting, _, _>(
+        move |params, _| async move {
+            assert_eq!(
+                params.text_document.uri,
+                lsp::Url::from_file_path(path!("/file.rs")).unwrap()
+            );
+            futures::future::pending::<()>().await;
+            unreachable!()
+        },
+    );
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(true, project.clone(), window, cx)
+        })
+        .unwrap();
+    cx.executor().advance_clock(super::FORMAT_TIMEOUT);
+    cx.executor().start_waiting();
+    save.await;
+    assert_eq!(
+        editor.update(cx, |editor, cx| editor.text(cx)),
+        "one\ntwo\nthree\n"
+    );
+    assert!(!cx.read(|cx| editor.is_dirty(cx)));
 
     // For non-dirty buffer, no formatting request should be sent
-    {
-        assert!(!cx.read(|cx| editor.is_dirty(cx)));
-
-        fake_server.set_request_handler::<lsp::request::Formatting, _, _>(move |_, _| async move {
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(true, project.clone(), window, cx)
+        })
+        .unwrap();
+    let _pending_format_request = fake_server
+        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |_, _| async move {
             panic!("Should not be invoked on non-dirty buffer");
-        });
-        let save = editor
-            .update_in(cx, |editor, window, cx| {
-                editor.save(true, project.clone(), window, cx)
-            })
-            .unwrap();
-        cx.executor().start_waiting();
-        save.await;
-    }
+        })
+        .next();
+    cx.executor().start_waiting();
+    save.await;
 
     // Set rust language override and assert overridden tabsize is sent to language server
     update_test_language_settings(cx, |settings| {
@@ -7843,28 +7839,28 @@ async fn test_document_format_during_save(cx: &mut TestAppContext) {
         );
     });
 
-    {
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("somehting_new\n", window, cx)
-        });
-        assert!(cx.read(|cx| editor.is_dirty(cx)));
-        let _formatting_request_signal = fake_server
-            .set_request_handler::<lsp::request::Formatting, _, _>(move |params, _| async move {
-                assert_eq!(
-                    params.text_document.uri,
-                    lsp::Url::from_file_path(path!("/file.rs")).unwrap()
-                );
-                assert_eq!(params.options.tab_size, 8);
-                Ok(Some(vec![]))
-            });
-        let save = editor
-            .update_in(cx, |editor, window, cx| {
-                editor.save(true, project.clone(), window, cx)
-            })
-            .unwrap();
-        cx.executor().start_waiting();
-        save.await;
-    }
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("somehting_new\n", window, cx)
+    });
+    assert!(cx.read(|cx| editor.is_dirty(cx)));
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(true, project.clone(), window, cx)
+        })
+        .unwrap();
+    fake_server
+        .set_request_handler::<lsp::request::Formatting, _, _>(move |params, _| async move {
+            assert_eq!(
+                params.text_document.uri,
+                lsp::Url::from_file_path(path!("/file.rs")).unwrap()
+            );
+            assert_eq!(params.options.tab_size, 8);
+            Ok(Some(vec![]))
+        })
+        .next()
+        .await;
+    cx.executor().start_waiting();
+    save.await;
 }
 
 #[gpui::test]
@@ -8346,272 +8342,6 @@ async fn test_document_format_manual_trigger(cx: &mut TestAppContext) {
     );
 }
 
-#[gpui::test]
-async fn test_multiple_formatters(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.remove_trailing_whitespace_on_save = Some(true);
-        settings.defaults.formatter =
-            Some(language_settings::SelectedFormatter::List(FormatterList(
-                vec![
-                    Formatter::LanguageServer { name: None },
-                    Formatter::CodeActions(
-                        [
-                            ("code-action-1".into(), true),
-                            ("code-action-2".into(), true),
-                        ]
-                        .into_iter()
-                        .collect(),
-                    ),
-                ]
-                .into(),
-            )))
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_file(path!("/file.rs"), "one  \ntwo   \nthree".into())
-        .await;
-
-    let project = Project::test(fs, [path!("/").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                document_formatting_provider: Some(lsp::OneOf::Left(true)),
-                execute_command_provider: Some(lsp::ExecuteCommandOptions {
-                    commands: vec!["the-command-for-code-action-1".into()],
-                    ..Default::default()
-                }),
-                code_action_provider: Some(lsp::CodeActionProviderCapability::Simple(true)),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/file.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        build_editor_with_project(project.clone(), buffer, window, cx)
-    });
-
-    cx.executor().start_waiting();
-
-    let fake_server = fake_servers.next().await.unwrap();
-    fake_server.set_request_handler::<lsp::request::Formatting, _, _>(
-        move |_params, _| async move {
-            Ok(Some(vec![lsp::TextEdit::new(
-                lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-                "applied-formatting\n".to_string(),
-            )]))
-        },
-    );
-    fake_server.set_request_handler::<lsp::request::CodeActionRequest, _, _>(
-        move |params, _| async move {
-            assert_eq!(
-                params.context.only,
-                Some(vec!["code-action-1".into(), "code-action-2".into()])
-            );
-            let uri = lsp::Url::from_file_path(path!("/file.rs")).unwrap();
-            Ok(Some(vec![
-                lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {
-                    kind: Some("code-action-1".into()),
-                    edit: Some(lsp::WorkspaceEdit::new(
-                        [(
-                            uri.clone(),
-                            vec![lsp::TextEdit::new(
-                                lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-                                "applied-code-action-1-edit\n".to_string(),
-                            )],
-                        )]
-                        .into_iter()
-                        .collect(),
-                    )),
-                    command: Some(lsp::Command {
-                        command: "the-command-for-code-action-1".into(),
-                        ..Default::default()
-                    }),
-                    ..Default::default()
-                }),
-                lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {
-                    kind: Some("code-action-2".into()),
-                    edit: Some(lsp::WorkspaceEdit::new(
-                        [(
-                            uri.clone(),
-                            vec![lsp::TextEdit::new(
-                                lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-                                "applied-code-action-2-edit\n".to_string(),
-                            )],
-                        )]
-                        .into_iter()
-                        .collect(),
-                    )),
-                    ..Default::default()
-                }),
-            ]))
-        },
-    );
-
-    fake_server.set_request_handler::<lsp::request::CodeActionResolveRequest, _, _>({
-        move |params, _| async move { Ok(params) }
-    });
-
-    let command_lock = Arc::new(futures::lock::Mutex::new(()));
-    fake_server.set_request_handler::<lsp::request::ExecuteCommand, _, _>({
-        let fake = fake_server.clone();
-        let lock = command_lock.clone();
-        move |params, _| {
-            assert_eq!(params.command, "the-command-for-code-action-1");
-            let fake = fake.clone();
-            let lock = lock.clone();
-            async move {
-                lock.lock().await;
-                fake.server
-                    .request::<lsp::request::ApplyWorkspaceEdit>(lsp::ApplyWorkspaceEditParams {
-                        label: None,
-                        edit: lsp::WorkspaceEdit {
-                            changes: Some(
-                                [(
-                                    lsp::Url::from_file_path(path!("/file.rs")).unwrap(),
-                                    vec![lsp::TextEdit {
-                                        range: lsp::Range::new(
-                                            lsp::Position::new(0, 0),
-                                            lsp::Position::new(0, 0),
-                                        ),
-                                        new_text: "applied-code-action-1-command\n".into(),
-                                    }],
-                                )]
-                                .into_iter()
-                                .collect(),
-                            ),
-                            ..Default::default()
-                        },
-                    })
-                    .await
-                    .unwrap();
-                Ok(Some(json!(null)))
-            }
-        }
-    });
-
-    cx.executor().start_waiting();
-    editor
-        .update_in(cx, |editor, window, cx| {
-            editor.perform_format(
-                project.clone(),
-                FormatTrigger::Manual,
-                FormatTarget::Buffers,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await;
-    editor.update(cx, |editor, cx| {
-        assert_eq!(
-            editor.text(cx),
-            r#"
-                applied-code-action-2-edit
-                applied-code-action-1-command
-                applied-code-action-1-edit
-                applied-formatting
-                one
-                two
-                three
-            "#
-            .unindent()
-        );
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.undo(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "one  \ntwo   \nthree");
-    });
-
-    // Perform a manual edit while waiting for an LSP command
-    // that's being run as part of a formatting code action.
-    let lock_guard = command_lock.lock().await;
-    let format = editor
-        .update_in(cx, |editor, window, cx| {
-            editor.perform_format(
-                project.clone(),
-                FormatTrigger::Manual,
-                FormatTarget::Buffers,
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-    cx.run_until_parked();
-    editor.update(cx, |editor, cx| {
-        assert_eq!(
-            editor.text(cx),
-            r#"
-                applied-code-action-1-edit
-                applied-formatting
-                one
-                two
-                three
-            "#
-            .unindent()
-        );
-
-        editor.buffer.update(cx, |buffer, cx| {
-            let ix = buffer.len(cx);
-            buffer.edit([(ix..ix, "edited\n")], None, cx);
-        });
-    });
-
-    // Allow the LSP command to proceed. Because the buffer was edited,
-    // the second code action will not be run.
-    drop(lock_guard);
-    format.await;
-    editor.update_in(cx, |editor, window, cx| {
-        assert_eq!(
-            editor.text(cx),
-            r#"
-                applied-code-action-1-command
-                applied-code-action-1-edit
-                applied-formatting
-                one
-                two
-                three
-                edited
-            "#
-            .unindent()
-        );
-
-        // The manual edit is undone first, because it is the last thing the user did
-        // (even though the command completed afterwards).
-        editor.undo(&Default::default(), window, cx);
-        assert_eq!(
-            editor.text(cx),
-            r#"
-                applied-code-action-1-command
-                applied-code-action-1-edit
-                applied-formatting
-                one
-                two
-                three
-            "#
-            .unindent()
-        );
-
-        // All the formatting (including the command, which completed after the manual edit)
-        // is undone together.
-        editor.undo(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "one  \ntwo   \nthree");
-    });
-}
-
 #[gpui::test]
 async fn test_organize_imports_manual_trigger(cx: &mut TestAppContext) {
     init_test(cx, |settings| {

crates/eval/Cargo.toml

@@ -1,39 +0,0 @@
-[package]
-name = "eval"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-
-[dependencies]
-agent.workspace = true
-anyhow.workspace = true
-assistant_tool.workspace = true
-assistant_tools.workspace = true
-client.workspace = true
-collections.workspace = true
-context_server.workspace = true
-dap.workspace = true
-env_logger.workspace = true
-fs.workspace = true
-gpui.workspace = true
-gpui_tokio.workspace = true
-language.workspace = true
-language_model.workspace = true
-language_models.workspace = true
-node_runtime.workspace = true
-project.workspace = true
-prompt_store.workspace = true
-release_channel.workspace = true
-reqwest_client.workspace = true
-serde.workspace = true
-settings.workspace = true
-smol.workspace = true
-toml.workspace = true
-workspace-hack.workspace = true
-
-[[bin]]
-name = "eval"
-path = "src/eval.rs"
-
-[lints]
-workspace = true

crates/eval/LICENSE-GPL

@@ -1 +0,0 @@
-../../LICENSE-GPL

crates/eval/README.md

@@ -1,7 +0,0 @@
-# Eval
-
-This eval assumes the working directory is the root of the repository. Run it with:
-
-```sh
-cargo run -p eval
-```

crates/eval/examples/find_and_replace_diff_card/base.toml

@@ -1,2 +0,0 @@
-path = "../zed_worktree"
-revision = "38fcadf9481d018543c65f36ac3bafeba190179b"

crates/eval/examples/find_and_replace_diff_card/prompt.md

@@ -1,3 +0,0 @@
-Look at the `find_replace_file_tool.rs`. I want to implement a card for it. The card should be a brand new `Entity` with a `Render` implementation.
-
-The card should show a diff. It should be a beautifully presented diff. The card "box" should look like what we show for markdown codeblocks (look at `MarkdownElement`). I want to see a red background for lines that were deleted and a green background for lines that were added. We should have a div per diff line.

crates/eval/src/agent.rs

@@ -1,229 +0,0 @@
-use ::agent::{RequestKind, Thread, ThreadEvent, ThreadStore};
-use anyhow::anyhow;
-use assistant_tool::ToolWorkingSet;
-use client::{Client, UserStore};
-use collections::HashMap;
-use dap::DapRegistry;
-use gpui::{App, Entity, SemanticVersion, Subscription, Task, prelude::*};
-use language::LanguageRegistry;
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelProviderId, LanguageModelRegistry,
-};
-use node_runtime::NodeRuntime;
-use project::{Project, RealFs};
-use prompt_store::PromptBuilder;
-use settings::SettingsStore;
-use smol::channel;
-use std::sync::Arc;
-
-/// Subset of `workspace::AppState` needed by `HeadlessAssistant`, with additional fields.
-pub struct AgentAppState {
-    pub languages: Arc<LanguageRegistry>,
-    pub client: Arc<Client>,
-    pub user_store: Entity<UserStore>,
-    pub fs: Arc<dyn fs::Fs>,
-    pub node_runtime: NodeRuntime,
-
-    // Additional fields not present in `workspace::AppState`.
-    pub prompt_builder: Arc<PromptBuilder>,
-}
-
-pub struct Agent {
-    // pub thread: Entity<Thread>,
-    // pub project: Entity<Project>,
-    #[allow(dead_code)]
-    pub thread_store: Entity<ThreadStore>,
-    pub tool_use_counts: HashMap<Arc<str>, u32>,
-    pub done_tx: channel::Sender<anyhow::Result<()>>,
-    _subscription: Subscription,
-}
-
-impl Agent {
-    pub fn new(
-        app_state: Arc<AgentAppState>,
-        cx: &mut App,
-    ) -> anyhow::Result<(Entity<Self>, channel::Receiver<anyhow::Result<()>>)> {
-        let env = None;
-        let project = Project::local(
-            app_state.client.clone(),
-            app_state.node_runtime.clone(),
-            app_state.user_store.clone(),
-            app_state.languages.clone(),
-            Arc::new(DapRegistry::default()),
-            app_state.fs.clone(),
-            env,
-            cx,
-        );
-
-        let tools = Arc::new(ToolWorkingSet::default());
-        let thread_store =
-            ThreadStore::new(project.clone(), tools, app_state.prompt_builder.clone(), cx)?;
-
-        let thread = thread_store.update(cx, |thread_store, cx| thread_store.create_thread(cx));
-
-        let (done_tx, done_rx) = channel::unbounded::<anyhow::Result<()>>();
-
-        let headless_thread = cx.new(move |cx| Self {
-            _subscription: cx.subscribe(&thread, Self::handle_thread_event),
-            // thread,
-            // project,
-            thread_store,
-            tool_use_counts: HashMap::default(),
-            done_tx,
-        });
-
-        Ok((headless_thread, done_rx))
-    }
-
-    fn handle_thread_event(
-        &mut self,
-        thread: Entity<Thread>,
-        event: &ThreadEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            ThreadEvent::ShowError(err) => self
-                .done_tx
-                .send_blocking(Err(anyhow!("{:?}", err)))
-                .unwrap(),
-            ThreadEvent::DoneStreaming => {
-                let thread = thread.read(cx);
-                if let Some(message) = thread.messages().last() {
-                    println!("Message: {}", message.to_string());
-                }
-                if thread.all_tools_finished() {
-                    self.done_tx.send_blocking(Ok(())).unwrap()
-                }
-            }
-            ThreadEvent::UsePendingTools { .. } => {}
-            ThreadEvent::ToolConfirmationNeeded => {
-                // Automatically approve all tools that need confirmation in headless mode
-                println!("Tool confirmation needed - automatically approving in headless mode");
-
-                // Get the tools needing confirmation
-                let tools_needing_confirmation: Vec<_> = thread
-                    .read(cx)
-                    .tools_needing_confirmation()
-                    .cloned()
-                    .collect();
-
-                // Run each tool that needs confirmation
-                for tool_use in tools_needing_confirmation {
-                    if let Some(tool) = thread.read(cx).tools().tool(&tool_use.name, cx) {
-                        thread.update(cx, |thread, cx| {
-                            println!("Auto-approving tool: {}", tool_use.name);
-
-                            // Create a request to send to the tool
-                            let request = thread.to_completion_request(RequestKind::Chat, cx);
-                            let messages = Arc::new(request.messages);
-
-                            // Run the tool
-                            thread.run_tool(
-                                tool_use.id.clone(),
-                                tool_use.ui_text.clone(),
-                                tool_use.input.clone(),
-                                &messages,
-                                tool,
-                                cx,
-                            );
-                        });
-                    }
-                }
-            }
-            ThreadEvent::ToolFinished {
-                tool_use_id,
-                pending_tool_use,
-                ..
-            } => {
-                if let Some(pending_tool_use) = pending_tool_use {
-                    println!(
-                        "Used tool {} with input: {}",
-                        pending_tool_use.name, pending_tool_use.input
-                    );
-                    *self
-                        .tool_use_counts
-                        .entry(pending_tool_use.name.clone())
-                        .or_insert(0) += 1;
-                }
-                if let Some(tool_result) = thread.read(cx).tool_result(tool_use_id) {
-                    println!("Tool result: {:?}", tool_result);
-                }
-            }
-            _ => {}
-        }
-    }
-}
-
-pub fn init(cx: &mut App) -> Arc<AgentAppState> {
-    release_channel::init(SemanticVersion::default(), cx);
-    gpui_tokio::init(cx);
-
-    let mut settings_store = SettingsStore::new(cx);
-    settings_store
-        .set_default_settings(settings::default_settings().as_ref(), cx)
-        .unwrap();
-    cx.set_global(settings_store);
-    client::init_settings(cx);
-    Project::init_settings(cx);
-
-    let client = Client::production(cx);
-    cx.set_http_client(client.http_client().clone());
-
-    let git_binary_path = None;
-    let fs = Arc::new(RealFs::new(
-        git_binary_path,
-        cx.background_executor().clone(),
-    ));
-
-    let languages = Arc::new(LanguageRegistry::new(cx.background_executor().clone()));
-
-    let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-
-    language::init(cx);
-    language_model::init(client.clone(), cx);
-    language_models::init(user_store.clone(), client.clone(), fs.clone(), cx);
-    assistant_tools::init(client.http_client().clone(), cx);
-    context_server::init(cx);
-    let stdout_is_a_pty = false;
-    let prompt_builder = PromptBuilder::load(fs.clone(), stdout_is_a_pty, cx);
-    agent::init(fs.clone(), client.clone(), prompt_builder.clone(), cx);
-
-    Arc::new(AgentAppState {
-        languages,
-        client,
-        user_store,
-        fs,
-        node_runtime: NodeRuntime::unavailable(),
-        prompt_builder,
-    })
-}
-
-pub fn find_model(model_name: &str, cx: &App) -> anyhow::Result<Arc<dyn LanguageModel>> {
-    let model_registry = LanguageModelRegistry::read_global(cx);
-    let model = model_registry
-        .available_models(cx)
-        .find(|model| model.id().0 == model_name);
-
-    let Some(model) = model else {
-        return Err(anyhow!(
-            "No language model named {} was available. Available models: {}",
-            model_name,
-            model_registry
-                .available_models(cx)
-                .map(|model| model.id().0.clone())
-                .collect::<Vec<_>>()
-                .join(", ")
-        ));
-    };
-
-    Ok(model)
-}
-
-pub fn authenticate_model_provider(
-    provider_id: LanguageModelProviderId,
-    cx: &mut App,
-) -> Task<std::result::Result<(), AuthenticateError>> {
-    let model_registry = LanguageModelRegistry::read_global(cx);
-    let model_provider = model_registry.provider(&provider_id).unwrap();
-    model_provider.authenticate(cx)
-}

crates/eval/src/eval.rs

@@ -1,101 +0,0 @@
-use agent::Agent;
-use anyhow::Result;
-use gpui::Application;
-use language_model::LanguageModelRegistry;
-use reqwest_client::ReqwestClient;
-use serde::Deserialize;
-use std::{
-    fs,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-mod agent;
-
-#[derive(Debug, Deserialize)]
-pub struct ExampleBase {
-    pub path: PathBuf,
-    pub revision: String,
-}
-
-#[derive(Debug)]
-pub struct Example {
-    pub base: ExampleBase,
-
-    /// Content of the prompt.md file
-    pub prompt: String,
-
-    /// Content of the rubric.md file
-    pub rubric: String,
-}
-
-impl Example {
-    /// Load an example from a directory containing base.toml, prompt.md, and rubric.md
-    pub fn load_from_directory<P: AsRef<Path>>(dir_path: P) -> Result<Self> {
-        let base_path = dir_path.as_ref().join("base.toml");
-        let prompt_path = dir_path.as_ref().join("prompt.md");
-        let rubric_path = dir_path.as_ref().join("rubric.md");
-
-        let mut base: ExampleBase = toml::from_str(&fs::read_to_string(&base_path)?)?;
-        base.path = base.path.canonicalize()?;
-
-        Ok(Example {
-            base,
-            prompt: fs::read_to_string(prompt_path)?,
-            rubric: fs::read_to_string(rubric_path)?,
-        })
-    }
-
-    /// Set up the example by checking out the specified Git revision
-    pub fn setup(&self) -> Result<()> {
-        use std::process::Command;
-
-        // Check if the directory exists
-        let path = Path::new(&self.base.path);
-        anyhow::ensure!(path.exists(), "Path does not exist: {:?}", self.base.path);
-
-        // Change to the project directory and checkout the specified revision
-        let output = Command::new("git")
-            .current_dir(&self.base.path)
-            .arg("checkout")
-            .arg(&self.base.revision)
-            .output()?;
-        anyhow::ensure!(
-            output.status.success(),
-            "Failed to checkout revision {}: {}",
-            self.base.revision,
-            String::from_utf8_lossy(&output.stderr),
-        );
-
-        Ok(())
-    }
-}
-
-fn main() {
-    env_logger::init();
-    let http_client = Arc::new(ReqwestClient::new());
-    let app = Application::headless().with_http_client(http_client.clone());
-
-    app.run(move |cx| {
-        let app_state = crate::agent::init(cx);
-        let _agent = Agent::new(app_state, cx);
-
-        let model = agent::find_model("claude-3-7-sonnet-thinking-latest", cx).unwrap();
-
-        LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-            registry.set_default_model(Some(model.clone()), cx);
-        });
-
-        let model_provider_id = model.provider_id();
-
-        let authenticate = agent::authenticate_model_provider(model_provider_id.clone(), cx);
-
-        cx.spawn(async move |_cx| {
-            authenticate.await.unwrap();
-        })
-        .detach();
-    });
-
-    // let example =
-    //     Example::load_from_directory("./crates/eval/examples/find_and_replace_diff_card")?;
-    // example.setup()?;
-}

crates/gpui/src/window.rs

@@ -845,7 +845,6 @@ impl Window {
                 handle
                     .update(&mut cx, |_, window, cx| {
                         window.active.set(active);
-                        window.modifiers = window.platform_window.modifiers();
                         window
                             .activation_observers
                             .clone()

crates/markdown/src/markdown.rs

@@ -88,21 +88,12 @@ struct Options {
 }
 
 pub enum CodeBlockRenderer {
-    Default {
-        copy_button: bool,
-    },
-    Custom {
-        render: CodeBlockRenderFn,
-        /// A function that can modify the parent container after the code block
-        /// content has been appended as a child element.
-        transform: Option<CodeBlockTransformFn>,
-    },
+    Default { copy_button: bool },
+    Custom { render: CodeBlockRenderFn },
 }
 
 pub type CodeBlockRenderFn =
-    Arc<dyn Fn(&CodeBlockKind, &ParsedMarkdown, Range<usize>, &mut Window, &App) -> Div>;
-
-pub type CodeBlockTransformFn = Arc<dyn Fn(AnyDiv, Range<usize>, &mut Window, &App) -> AnyDiv>;
+    Arc<dyn Fn(usize, &CodeBlockKind, &ParsedMarkdown, Range<usize>, &mut Window, &App) -> Div>;
 
 actions!(markdown, [Copy, CopyAsMarkdown]);
 
@@ -603,7 +594,7 @@ impl Element for MarkdownElement {
             0
         };
 
-        for (range, event) in parsed_markdown.events.iter() {
+        for (index, (range, event)) in parsed_markdown.events.iter().enumerate() {
             match event {
                 MarkdownEvent::Start(tag) => {
                     match tag {
@@ -685,9 +676,15 @@ impl Element for MarkdownElement {
                                     builder.push_code_block(language);
                                     builder.push_div(code_block, range, markdown_end);
                                 }
-                                (CodeBlockRenderer::Custom { render, .. }, _) => {
-                                    let parent_container =
-                                        render(kind, &parsed_markdown, range.clone(), window, cx);
+                                (CodeBlockRenderer::Custom { render }, _) => {
+                                    let parent_container = render(
+                                        index,
+                                        kind,
+                                        &parsed_markdown,
+                                        range.clone(),
+                                        window,
+                                        cx,
+                                    );
 
                                     builder.push_div(parent_container, range, markdown_end);
 
@@ -698,12 +695,9 @@ impl Element for MarkdownElement {
                                             if self.style.code_block_overflow_x_scroll {
                                                 code_block.style().restrict_scroll_to_axis =
                                                     Some(true);
-                                                code_block
-                                                    .flex()
-                                                    .overflow_x_scroll()
-                                                    .overflow_y_hidden()
+                                                code_block.flex().overflow_x_scroll()
                                             } else {
-                                                code_block.w_full().overflow_hidden()
+                                                code_block.w_full()
                                             }
                                         });
 
@@ -852,14 +846,6 @@ impl Element for MarkdownElement {
                             builder.pop_text_style();
                         }
 
-                        if let CodeBlockRenderer::Custom {
-                            transform: Some(modify),
-                            ..
-                        } = &self.code_block_renderer
-                        {
-                            builder.modify_current_div(|el| modify(el, range.clone(), window, cx));
-                        }
-
                         if matches!(
                             &self.code_block_renderer,
                             CodeBlockRenderer::Default { copy_button: true }
@@ -1063,7 +1049,7 @@ impl IntoElement for MarkdownElement {
     }
 }
 
-pub enum AnyDiv {
+enum AnyDiv {
     Div(Div),
     Stateful(Stateful<Div>),
 }

crates/migrator/src/migrations.rs

@@ -37,9 +37,3 @@ pub(crate) mod m_2025_03_29 {
 
     pub(crate) use settings::SETTINGS_PATTERNS;
 }
-
-pub(crate) mod m_2025_04_15 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}

crates/migrator/src/migrations/m_2025_04_15/settings.rs

@@ -1,29 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_ASSISTANT_TOOLS_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[(
-    SETTINGS_ASSISTANT_TOOLS_PATTERN,
-    replace_bash_with_terminal_in_profiles,
-)];
-
-fn replace_bash_with_terminal_in_profiles(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let tool_name_capture_ix = query.capture_index_for_name("tool_name")?;
-    let tool_name_range = mat
-        .nodes_for_capture_index(tool_name_capture_ix)
-        .next()?
-        .byte_range();
-    let tool_name = contents.get(tool_name_range.clone())?;
-
-    if tool_name != "bash" {
-        return None;
-    }
-
-    Some((tool_name_range, "terminal".to_string()))
-}

crates/migrator/src/migrator.rs

@@ -120,10 +120,6 @@ pub fn migrate_settings(text: &str) -> Result<Option<String>> {
             migrations::m_2025_03_29::SETTINGS_PATTERNS,
             &SETTINGS_QUERY_2025_03_29,
         ),
-        (
-            migrations::m_2025_04_15::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_04_15,
-        ),
     ];
     run_migrations(text, migrations)
 }
@@ -194,10 +190,6 @@ define_query!(
     SETTINGS_QUERY_2025_03_29,
     migrations::m_2025_03_29::SETTINGS_PATTERNS
 );
-define_query!(
-    SETTINGS_QUERY_2025_04_15,
-    migrations::m_2025_04_15::SETTINGS_PATTERNS
-);
 
 // custom query
 static EDIT_PREDICTION_SETTINGS_MIGRATION_QUERY: LazyLock<Query> = LazyLock::new(|| {
@@ -535,103 +527,4 @@ mod tests {
             ),
         )
     }
-
-    #[test]
-    fn test_replace_bash_with_terminal_in_profiles() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "assistant": {
-                        "profiles": {
-                            "custom": {
-                                "name": "Custom",
-                                "tools": {
-                                    "bash": true,
-                                    "diagnostics": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            Some(
-                r#"
-                {
-                    "assistant": {
-                        "profiles": {
-                            "custom": {
-                                "name": "Custom",
-                                "tools": {
-                                    "terminal": true,
-                                    "diagnostics": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_replace_bash_false_with_terminal_in_profiles() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "assistant": {
-                        "profiles": {
-                            "custom": {
-                                "name": "Custom",
-                                "tools": {
-                                    "bash": false,
-                                    "diagnostics": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            Some(
-                r#"
-                {
-                    "assistant": {
-                        "profiles": {
-                            "custom": {
-                                "name": "Custom",
-                                "tools": {
-                                    "terminal": false,
-                                    "diagnostics": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_no_bash_in_profiles() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "assistant": {
-                        "profiles": {
-                            "custom": {
-                                "name": "Custom",
-                                "tools": {
-                                    "diagnostics": true,
-                                    "path_search": true,
-                                    "read_file": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            None,
-        )
-    }
 }

crates/migrator/src/patterns.rs

@@ -7,6 +7,5 @@ pub(crate) use keymap::{
 };
 
 pub(crate) use settings::{
-    SETTINGS_ASSISTANT_TOOLS_PATTERN, SETTINGS_LANGUAGES_PATTERN,
-    SETTINGS_NESTED_KEY_VALUE_PATTERN, SETTINGS_ROOT_KEY_VALUE_PATTERN,
+    SETTINGS_LANGUAGES_PATTERN, SETTINGS_NESTED_KEY_VALUE_PATTERN, SETTINGS_ROOT_KEY_VALUE_PATTERN,
 };

crates/migrator/src/patterns/settings.rs

@@ -39,35 +39,3 @@ pub const SETTINGS_LANGUAGES_PATTERN: &str = r#"(document
     )
     (#eq? @languages "languages")
 )"#;
-
-pub const SETTINGS_ASSISTANT_TOOLS_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @assistant)
-            value: (object
-                (pair
-                    key: (string (string_content) @profiles)
-                    value: (object
-                        (pair
-                            key: (_)
-                            value: (object
-                                (pair
-                                    key: (string (string_content) @tools_key)
-                                    value: (object
-                                        (pair
-                                            key: (string (string_content) @tool_name)
-                                            value: (_) @tool_value
-                                        )
-                                    )
-                                )
-                            )
-                        )
-                    )
-                )
-            )
-        )
-    )
-    (#eq? @assistant "assistant")
-    (#eq? @profiles "profiles")
-    (#eq? @tools_key "tools")
-)"#;

crates/project/src/environment.rs

@@ -68,7 +68,7 @@ impl ProjectEnvironment {
         }
 
         if let Some(cli_environment) = self.get_cli_environment() {
-            log::debug!("using project environment variables from CLI");
+            log::info!("using project environment variables from CLI");
             return Task::ready(Some(cli_environment)).shared();
         }
 
@@ -94,7 +94,7 @@ impl ProjectEnvironment {
         }
 
         if let Some(cli_environment) = self.get_cli_environment() {
-            log::debug!("using project environment variables from CLI");
+            log::info!("using project environment variables from CLI");
             return Task::ready(Some(cli_environment)).shared();
         }
 
@@ -128,7 +128,7 @@ impl ProjectEnvironment {
         }
 
         if let Some(cli_environment) = self.get_cli_environment() {
-            log::debug!("using project environment variables from CLI");
+            log::info!("using project environment variables from CLI");
             return Task::ready(Some(cli_environment)).shared();
         }
 

crates/project/src/git_store.rs

@@ -2630,7 +2630,9 @@ impl RepositorySnapshot {
     }
 
     pub fn has_conflict(&self, repo_path: &RepoPath) -> bool {
-        self.merge_conflicts.contains(repo_path)
+        self.statuses_by_path
+            .get(&PathKey(repo_path.0.clone()), &())
+            .map_or(false, |entry| entry.status.is_conflicted())
     }
 
     /// This is the name that will be displayed in the repository selector for this repository.

crates/project_panel/src/project_panel_tests.rs

@@ -2736,7 +2736,6 @@ async fn test_multiple_marked_entries(cx: &mut gpui::TestAppContext) {
         shift: true,
         ..Default::default()
     };
-    cx.run_until_parked();
     cx.simulate_modifiers_change(modifiers_with_shift);
     cx.update(|window, cx| {
         panel.update(cx, |this, cx| {

crates/prompt_store/src/prompts.rs

@@ -14,15 +14,12 @@ use std::{
     time::Duration,
 };
 use text::LineEnding;
-use util::{ResultExt, get_system_shell};
+use util::ResultExt;
 
 #[derive(Serialize)]
 pub struct AssistantSystemPromptContext {
     pub worktrees: Vec<WorktreeInfoForSystemPrompt>,
     pub has_rules: bool,
-    pub os: String,
-    pub arch: String,
-    pub shell: String,
 }
 
 impl AssistantSystemPromptContext {
@@ -33,9 +30,6 @@ impl AssistantSystemPromptContext {
         Self {
             worktrees,
             has_rules,
-            os: std::env::consts::OS.to_string(),
-            arch: std::env::consts::ARCH.to_string(),
-            shell: get_system_shell(),
         }
     }
 }
@@ -267,6 +261,12 @@ impl PromptBuilder {
             .render("assistant_system_prompt", context)
     }
 
+    pub fn generate_assistant_system_prompt_reminder(&self) -> Result<String, RenderError> {
+        self.handlebars
+            .lock()
+            .render("assistant_system_prompt_reminder", &())
+    }
+
     pub fn generate_inline_transformation_prompt(
         &self,
         user_prompt: String,

crates/search/src/buffer_search.rs

@@ -987,16 +987,6 @@ impl BufferSearchBar {
         cx.notify();
     }
 
-    pub fn clear_search_within_ranges(
-        &mut self,
-        search_options: SearchOptions,
-        cx: &mut Context<Self>,
-    ) {
-        self.search_options = search_options;
-        self.adjust_query_regex_language(cx);
-        cx.notify();
-    }
-
     fn select_next_match(
         &mut self,
         _: &SelectNextMatch,

crates/task/src/lib.rs

@@ -467,7 +467,7 @@ impl ShellBuilder {
 
     // `alacritty_terminal` uses this as default on Windows. See:
     // https://github.com/alacritty/alacritty/blob/0d4ab7bca43213d96ddfe40048fc0f922543c6f8/alacritty_terminal/src/tty/windows/mod.rs#L130
-    // We could use `util::get_windows_system_shell()` here, but we are running tasks here, so leave it to `powershell.exe`
+    // We could use `util::retrieve_system_shell()` here, but we are running tasks here, so leave it to `powershell.exe`
     // should be okay.
     fn system_shell() -> String {
         "powershell.exe".to_string()

crates/terminal/src/terminal.rs

@@ -380,7 +380,7 @@ impl TerminalBuilder {
                     #[cfg(target_os = "windows")]
                     {
                         Some(alacritty_terminal::tty::Shell::new(
-                            util::get_windows_system_shell(),
+                            util::retrieve_system_shell(),
                             Vec::new(),
                         ))
                     }

crates/util/src/util.rs

@@ -477,7 +477,7 @@ pub fn iterate_expanded_and_wrapped_usize_range(
 }
 
 #[cfg(target_os = "windows")]
-pub fn get_windows_system_shell() -> String {
+pub fn retrieve_system_shell() -> String {
     use std::path::PathBuf;
 
     fn find_pwsh_in_programfiles(find_alternate: bool, find_preview: bool) -> Option<PathBuf> {
@@ -994,18 +994,6 @@ pub fn default<D: Default>() -> D {
     Default::default()
 }
 
-pub fn get_system_shell() -> String {
-    #[cfg(target_os = "windows")]
-    {
-        get_windows_system_shell()
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    {
-        std::env::var("SHELL").unwrap_or("/bin/sh".to_string())
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

crates/vim/src/normal/search.rs

@@ -4,7 +4,7 @@ use language::Point;
 use schemars::JsonSchema;
 use search::{BufferSearchBar, SearchOptions, buffer_search};
 use serde_derive::Deserialize;
-use std::{iter::Peekable, str::Chars};
+use std::{iter::Peekable, str::Chars, time::Duration};
 use util::serde::default_true;
 use workspace::{notifications::NotifyResultExt, searchable::Direction};
 
@@ -484,8 +484,16 @@ impl Vim {
                 search_bar.update_in(cx, |search_bar, window, cx| {
                     search_bar.select_last_match(window, cx);
                     search_bar.replace_all(&Default::default(), window, cx);
-                    editor.update(cx, |editor, cx| editor.clear_search_within_ranges(cx));
-                    let _ = search_bar.search(&search_bar.query(cx), None, window, cx);
+
+                    cx.spawn(async move |_, cx| {
+                        cx.background_executor()
+                            .timer(Duration::from_millis(200))
+                            .await;
+                        editor
+                            .update(cx, |editor, cx| editor.clear_search_within_ranges(cx))
+                            .ok();
+                    })
+                    .detach();
                     vim.update(cx, |vim, cx| {
                         vim.move_cursor(
                             Motion::StartOfLine {

docs/src/system-requirements.md

@@ -1,40 +1,13 @@
 # System Requirements
 
-## Apple
+## macOS
 
-### macOS
+Supported versions: Catalina (10.15) - Sequoia (15.x).
 
-Zed supports the follow macOS releases:
-
-| Version       | Codename | Apple Status   | Zed Status          |
-| ------------- | -------- | -------------- | ------------------- |
-| macOS 15.x    | Sequoia  | Supported      | Supported           |
-| macOS 14.x    | Ventura  | Supported      | Supported           |
-| macOS 13.x    | Sonoma   | Supported      | Supported           |
-| macOS 12.x    | Monterey | EOL 2024-09-16 | Supported           |
-| macOS 11.x    | Big Sur  | EOL 2023-09-26 | Partially Supported |
-| macOS 10.15.x | Catalina | EOL 2022-09-12 | Partially Supported |
-| macOS 10.14.x | Mojave   | EOL 2021-10-25 | Unsupported         |
-
-The macOS releases labelled "Partially Supported" (Big Sur and Catalina) do not support screen sharing via Zed Collaboration. These features use the [LiveKit SDK](https://livekit.io) which relies upon [ScreenCaptureKit.framework](https://developer.apple.com/documentation/screencapturekit/) only available on macOS 12 (Monterey) and newer.
-
-### Mac Hardware
-
-Zed supports machines with Intel (x86_64) or Apple (aarch64) processors that meet the above macOS requirements:
-
-- MacBook Pro (Early 2015 and newer)
-- MacBook Air (Early 2015 and newer)
-- MacBook (Early 2016 and newer)
-- Mac Mini (Late 2014 and newer)
-- Mac Pro (Late 2013 or newer)
-- iMac (Late 2015 and newer)
-- iMac Pro (all models)
-- Mac Studio (all models)
+> The implementation of our screen sharing feature makes use of [LiveKit](https://livekit.io). The LiveKit SDK requires macOS Catalina (10.15); consequently, in v0.62.4, we dropped support for earlier macOS versions that we were initially supporting.
 
 ## Linux
 
-Zed supports 64bit Intel/AMD (x86_64) and 64Bit ARM (aarch64) processors.
-
 Zed requires a Vulkan 1.3 driver, and the following desktop portals:
 
 - `org.freedesktop.portal.FileChooser`

script/bundle-mac

@@ -209,7 +209,7 @@ function prepare_binaries() {
     echo "Gzipping dSYMs for $architecture"
     gzip -f target/${architecture}/${target_dir}/Zed.dwarf
 
-    echo "Uploading dSYMs${architecture} for $architecture to by-uuid/${uuid}.dwarf.gz"
+    echo "Uploading dSYMs${architecture} for $architecture to by_uuid/${uuid}.dwarf.gz"
     upload_to_blob_store_public \
         "zed-debug-symbols" \
         target/${architecture}/${target_dir}/Zed.dwarf.gz \

script/symbolicate

@@ -59,10 +59,11 @@ else # ips file
         echo "You need to update your symbolicate: cargo install symbolicate"
         exit 1
     fi
+
     dsym="$uuid.dwarf"
     if [[ ! -f target/dsyms/$dsym ]]; then
         echo "Downloading $dsym..."
-        curl -f -o target/dsyms/$dsym.gz "https://zed-debug-symbols.nyc3.digitaloceanspaces.com/by-uuid/${uuid}.dwarf.gz" ||
+        curl -f -o target/dsyms/$dsym.gz "https://zed-debug-symbols.nyc3.digitaloceanspaces.com/by_uuid/${uuid}.dwarf.gz" ||
             curl -f -o target/dsyms/$dsym.gz "https://zed-debug-symbols.nyc3.digitaloceanspaces.com/$channel/Zed-$version-$arch.dwarf.gz"
         gunzip  target/dsyms/$dsym.gz
     fi

typos.toml

@@ -55,8 +55,6 @@ extend-ignore-re = [
     "protols",
     # x11rb SelectionNotifyEvent struct field
     "requestor",
-    # macOS version
-    "Big Sur",
     # Not an actual typo but an intentionally invalid color, in `color_extractor`
     "#fof"
 ]