{
@@ -5744,10 +5876,6 @@ impl AcpThreadView {
};
let connection = thread.read(cx).connection().clone();
- let err = AuthRequired {
- description: None,
- provider_id: None,
- };
this.clear_thread_error(cx);
if let Some(message) = this.in_flight_prompt.take() {
this.message_editor.update(cx, |editor, cx| {
@@ -5756,7 +5884,14 @@ impl AcpThreadView {
}
let this = cx.weak_entity();
window.defer(cx, |window, cx| {
- Self::handle_auth_required(this, err, agent, connection, window, cx);
+ Self::handle_auth_required(
+ this,
+ AuthRequired::new(),
+ agent,
+ connection,
+ window,
+ cx,
+ );
})
}
}))
@@ -5769,14 +5904,10 @@ impl AcpThreadView {
};
let connection = thread.read(cx).connection().clone();
- let err = AuthRequired {
- description: None,
- provider_id: None,
- };
self.clear_thread_error(cx);
let this = cx.weak_entity();
window.defer(cx, |window, cx| {
- Self::handle_auth_required(this, err, agent, connection, window, cx);
+ Self::handle_auth_required(this, AuthRequired::new(), agent, connection, window, cx);
})
}
@@ -5879,16 +6010,19 @@ impl Render for AcpThreadView {
configuration_view,
pending_auth_method,
..
- } => self
- .render_auth_required_state(
+ } => v_flex()
+ .flex_1()
+ .size_full()
+ .justify_end()
+ .child(self.render_auth_required_state(
connection,
description.as_ref(),
configuration_view.as_ref(),
pending_auth_method.as_ref(),
window,
cx,
- )
- .into_any(),
+ ))
+ .into_any_element(),
ThreadState::Loading { .. } => v_flex()
.flex_1()
.child(self.render_recent_history(cx))
@@ -5936,12 +6070,8 @@ impl Render for AcpThreadView {
_ => this,
})
.children(self.render_thread_retry_status_callout(window, cx))
- .children({
- if cfg!(windows) && self.project.read(cx).is_local() {
- self.render_codex_windows_warning(cx)
- } else {
- None
- }
+ .when(self.show_codex_windows_warning, |this| {
+ this.child(self.render_codex_windows_warning(cx))
})
.children(self.render_thread_error(window, cx))
.when_some(
@@ -6057,13 +6187,13 @@ fn default_markdown_style(
},
border_color: Some(colors.border_variant),
background: Some(colors.editor_background.into()),
- text: Some(TextStyleRefinement {
+ text: TextStyleRefinement {
font_family: Some(theme_settings.buffer_font.family.clone()),
font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
font_features: Some(theme_settings.buffer_font.features.clone()),
font_size: Some(buffer_font_size.into()),
..Default::default()
- }),
+ },
..Default::default()
},
inline_code: TextStyleRefinement {
@@ -6374,6 +6504,57 @@ pub(crate) mod tests {
);
}
+ #[gpui::test]
+ async fn test_notification_closed_when_thread_view_dropped(cx: &mut TestAppContext) {
+ init_test(cx);
+
+ let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
+
+ let weak_view = thread_view.downgrade();
+
+ let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
+ message_editor.update_in(cx, |editor, window, cx| {
+ editor.set_text("Hello", window, cx);
+ });
+
+ cx.deactivate_window();
+
+ thread_view.update_in(cx, |thread_view, window, cx| {
+ thread_view.send(window, cx);
+ });
+
+ cx.run_until_parked();
+
+ // Verify notification is shown
+ assert!(
+ cx.windows()
+ .iter()
+ .any(|window| window.downcast::
().is_some()),
+ "Expected notification to be shown"
+ );
+
+ // Drop the thread view (simulating navigation to a new thread)
+ drop(thread_view);
+ drop(message_editor);
+ // Trigger an update to flush effects, which will call release_dropped_entities
+ cx.update(|_window, _cx| {});
+ cx.run_until_parked();
+
+ // Verify the entity was actually released
+ assert!(
+ !weak_view.is_upgradable(),
+ "Thread view entity should be released after dropping"
+ );
+
+ // The notification should be automatically closed via on_release
+ assert!(
+ !cx.windows()
+ .iter()
+ .any(|window| window.downcast::().is_some()),
+ "Notification should be closed when thread view is dropped"
+ );
+ }
+
async fn setup_thread_view(
agent: impl AgentServer + 'static,
cx: &mut TestAppContext,
@@ -6398,6 +6579,7 @@ pub(crate) mod tests {
project,
history_store,
None,
+ false,
window,
cx,
)
@@ -6475,10 +6657,6 @@ pub(crate) mod tests {
where
C: 'static + AgentConnection + Send + Clone,
{
- fn telemetry_id(&self) -> &'static str {
- "test"
- }
-
fn logo(&self) -> ui::IconName {
ui::IconName::Ai
}
@@ -6505,8 +6683,8 @@ pub(crate) mod tests {
struct SaboteurAgentConnection;
impl AgentConnection for SaboteurAgentConnection {
- fn telemetry_id(&self) -> &'static str {
- "saboteur"
+ fn telemetry_id(&self) -> SharedString {
+ "saboteur".into()
}
fn new_thread(
@@ -6569,8 +6747,8 @@ pub(crate) mod tests {
struct RefusalAgentConnection;
impl AgentConnection for RefusalAgentConnection {
- fn telemetry_id(&self) -> &'static str {
- "refusal"
+ fn telemetry_id(&self) -> SharedString {
+ "refusal".into()
}
fn new_thread(
@@ -6671,6 +6849,7 @@ pub(crate) mod tests {
project.clone(),
history_store.clone(),
None,
+ false,
window,
cx,
)
@@ -6791,6 +6970,70 @@ pub(crate) mod tests {
});
}
+ #[gpui::test]
+ async fn test_scroll_to_most_recent_user_prompt(cx: &mut TestAppContext) {
+ init_test(cx);
+
+ let connection = StubAgentConnection::new();
+
+ // Each user prompt will result in a user message entry plus an agent message entry.
+ connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
+ acp::ContentChunk::new("Response 1".into()),
+ )]);
+
+ let (thread_view, cx) =
+ setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
+
+ let thread = thread_view
+ .read_with(cx, |view, _| view.thread().cloned())
+ .unwrap();
+
+ thread
+ .update(cx, |thread, cx| thread.send_raw("Prompt 1", cx))
+ .await
+ .unwrap();
+ cx.run_until_parked();
+
+ connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
+ acp::ContentChunk::new("Response 2".into()),
+ )]);
+
+ thread
+ .update(cx, |thread, cx| thread.send_raw("Prompt 2", cx))
+ .await
+ .unwrap();
+ cx.run_until_parked();
+
+ // Move somewhere else first so we're not trivially already on the last user prompt.
+ thread_view.update(cx, |view, cx| {
+ view.scroll_to_top(cx);
+ });
+ cx.run_until_parked();
+
+ thread_view.update(cx, |view, cx| {
+ view.scroll_to_most_recent_user_prompt(cx);
+ let scroll_top = view.list_state.logical_scroll_top();
+ // Entries layout is: [User1, Assistant1, User2, Assistant2]
+ assert_eq!(scroll_top.item_ix, 2);
+ });
+ }
+
+ #[gpui::test]
+ async fn test_scroll_to_most_recent_user_prompt_falls_back_to_bottom_without_user_messages(
+ cx: &mut TestAppContext,
+ ) {
+ init_test(cx);
+
+ let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
+
+ // With no entries, scrolling should be a no-op and must not panic.
+ thread_view.update(cx, |view, cx| {
+ view.scroll_to_most_recent_user_prompt(cx);
+ let scroll_top = view.list_state.logical_scroll_top();
+ assert_eq!(scroll_top.item_ix, 0);
+ });
+ }
+
#[gpui::test]
async fn test_message_editing_cancel(cx: &mut TestAppContext) {
init_test(cx);
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index aa4cbc8e5b261d1953a91fb090e7ecd28b4e3a31..24f019c605d1b167e62a6e68dfc1f3ed07c73f1c 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -34,9 +34,9 @@ use project::{
};
use settings::{Settings, SettingsStore, update_settings_file};
use ui::{
- Button, ButtonStyle, Chip, CommonAnimationExt, ContextMenu, ContextMenuEntry, Disclosure,
- Divider, DividerColor, ElevationIndex, IconName, IconPosition, IconSize, Indicator, LabelSize,
- PopoverMenu, Switch, Tooltip, WithScrollbar, prelude::*,
+ ButtonStyle, Chip, CommonAnimationExt, ContextMenu, ContextMenuEntry, Disclosure, Divider,
+ DividerColor, ElevationIndex, Indicator, LabelSize, PopoverMenu, Switch, Tooltip,
+ WithScrollbar, prelude::*,
};
use util::ResultExt as _;
use workspace::{Workspace, create_and_open_local_file};
@@ -975,9 +975,12 @@ impl AgentConfiguration {
let icon = if let Some(icon_path) = agent_server_store.agent_icon(&name) {
AgentIcon::Path(icon_path)
} else {
- AgentIcon::Name(IconName::Ai)
+ AgentIcon::Name(IconName::Sparkle)
};
- (name, icon)
+ let display_name = agent_server_store
+ .agent_display_name(&name)
+ .unwrap_or_else(|| name.0.clone());
+ (name, icon, display_name)
})
.collect();
@@ -1084,6 +1087,7 @@ impl AgentConfiguration {
.child(self.render_agent_server(
AgentIcon::Name(IconName::AiClaude),
"Claude Code",
+ "Claude Code",
false,
cx,
))
@@ -1091,6 +1095,7 @@ impl AgentConfiguration {
.child(self.render_agent_server(
AgentIcon::Name(IconName::AiOpenAi),
"Codex CLI",
+ "Codex CLI",
false,
cx,
))
@@ -1098,16 +1103,23 @@ impl AgentConfiguration {
.child(self.render_agent_server(
AgentIcon::Name(IconName::AiGemini),
"Gemini CLI",
+ "Gemini CLI",
false,
cx,
))
.map(|mut parent| {
- for (name, icon) in user_defined_agents {
+ for (name, icon, display_name) in user_defined_agents {
parent = parent
.child(
Divider::horizontal().color(DividerColor::BorderFaded),
)
- .child(self.render_agent_server(icon, name, true, cx));
+ .child(self.render_agent_server(
+ icon,
+ name,
+ display_name,
+ true,
+ cx,
+ ));
}
parent
}),
@@ -1118,11 +1130,14 @@ impl AgentConfiguration {
fn render_agent_server(
&self,
icon: AgentIcon,
- name: impl Into,
+ id: impl Into,
+ display_name: impl Into,
external: bool,
cx: &mut Context,
) -> impl IntoElement {
- let name = name.into();
+ let id = id.into();
+ let display_name = display_name.into();
+
let icon = match icon {
AgentIcon::Name(icon_name) => Icon::new(icon_name)
.size(IconSize::Small)
@@ -1132,12 +1147,15 @@ impl AgentConfiguration {
.color(Color::Muted),
};
- let tooltip_id = SharedString::new(format!("agent-source-{}", name));
- let tooltip_message = format!("The {} agent was installed from an extension.", name);
+ let tooltip_id = SharedString::new(format!("agent-source-{}", id));
+ let tooltip_message = format!(
+ "The {} agent was installed from an extension.",
+ display_name
+ );
- let agent_server_name = ExternalAgentServerName(name.clone());
+ let agent_server_name = ExternalAgentServerName(id.clone());
- let uninstall_btn_id = SharedString::from(format!("uninstall-{}", name));
+ let uninstall_btn_id = SharedString::from(format!("uninstall-{}", id));
let uninstall_button = IconButton::new(uninstall_btn_id, IconName::Trash)
.icon_color(Color::Muted)
.icon_size(IconSize::Small)
@@ -1161,7 +1179,7 @@ impl AgentConfiguration {
h_flex()
.gap_1p5()
.child(icon)
- .child(Label::new(name))
+ .child(Label::new(display_name))
.when(external, |this| {
this.child(
div()
diff --git a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
index 02269511bb9a4d9b95fe27b66e3ca0a9e5c498c5..e443df33b4ddcaeba32b9b2623c0fdca85fac51c 100644
--- a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
@@ -446,17 +446,17 @@ impl AddLlmProviderModal {
})
}
- fn on_tab(&mut self, _: &menu::SelectNext, window: &mut Window, _: &mut Context) {
- window.focus_next();
+ fn on_tab(&mut self, _: &menu::SelectNext, window: &mut Window, cx: &mut Context) {
+ window.focus_next(cx);
}
fn on_tab_prev(
&mut self,
_: &menu::SelectPrevious,
window: &mut Window,
- _: &mut Context,
+ cx: &mut Context,
) {
- window.focus_prev();
+ window.focus_prev(cx);
}
}
@@ -493,7 +493,7 @@ impl Render for AddLlmProviderModal {
.on_action(cx.listener(Self::on_tab))
.on_action(cx.listener(Self::on_tab_prev))
.capture_any_mouse_down(cx.listener(|this, _, window, cx| {
- this.focus_handle(cx).focus(window);
+ this.focus_handle(cx).focus(window, cx);
}))
.child(
Modal::new("configure-context-server", None)
diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
index a0f0be886a1bf5e1485a2d36440b9f91648ef0c6..b30f1494f0d4dcbf3ef63cc7f549d16374f4899b 100644
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -831,7 +831,7 @@ impl Render for ConfigureContextServerModal {
}),
)
.capture_any_mouse_down(cx.listener(|this, _, window, cx| {
- this.focus_handle(cx).focus(window);
+ this.focus_handle(cx).focus(window, cx);
}))
.child(
Modal::new("configure-context-server", None)
diff --git a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
index 2f17349c3d1da1cf68a3ab513ccad434a115087b..c7f395ebbd813cfd7c28f33a7e69ec32f6d90fca 100644
--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
@@ -8,6 +8,7 @@ use editor::Editor;
use fs::Fs;
use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Subscription, prelude::*};
use language_model::{LanguageModel, LanguageModelRegistry};
+use settings::SettingsStore;
use settings::{
LanguageModelProviderSetting, LanguageModelSelection, Settings as _, update_settings_file,
};
@@ -94,6 +95,7 @@ pub struct ViewProfileMode {
configure_default_model: NavigableEntry,
configure_tools: NavigableEntry,
configure_mcps: NavigableEntry,
+ delete_profile: NavigableEntry,
cancel_item: NavigableEntry,
}
@@ -109,6 +111,7 @@ pub struct ManageProfilesModal {
active_model: Option>,
focus_handle: FocusHandle,
mode: Mode,
+ _settings_subscription: Subscription,
}
impl ManageProfilesModal {
@@ -148,18 +151,29 @@ impl ManageProfilesModal {
) -> Self {
let focus_handle = cx.focus_handle();
+ // Keep this modal in sync with settings changes (including profile deletion).
+ let settings_subscription =
+ cx.observe_global_in::(window, |this, window, cx| {
+ if matches!(this.mode, Mode::ChooseProfile(_)) {
+ this.mode = Mode::choose_profile(window, cx);
+ this.focus_handle(cx).focus(window, cx);
+ cx.notify();
+ }
+ });
+
Self {
fs,
active_model,
context_server_registry,
focus_handle,
mode: Mode::choose_profile(window, cx),
+ _settings_subscription: settings_subscription,
}
}
fn choose_profile(&mut self, window: &mut Window, cx: &mut Context) {
self.mode = Mode::choose_profile(window, cx);
- self.focus_handle(cx).focus(window);
+ self.focus_handle(cx).focus(window, cx);
}
fn new_profile(
@@ -177,7 +191,7 @@ impl ManageProfilesModal {
name_editor,
base_profile_id,
});
- self.focus_handle(cx).focus(window);
+ self.focus_handle(cx).focus(window, cx);
}
pub fn view_profile(
@@ -192,9 +206,10 @@ impl ManageProfilesModal {
configure_default_model: NavigableEntry::focusable(cx),
configure_tools: NavigableEntry::focusable(cx),
configure_mcps: NavigableEntry::focusable(cx),
+ delete_profile: NavigableEntry::focusable(cx),
cancel_item: NavigableEntry::focusable(cx),
});
- self.focus_handle(cx).focus(window);
+ self.focus_handle(cx).focus(window, cx);
}
fn configure_default_model(
@@ -207,7 +222,6 @@ impl ManageProfilesModal {
let profile_id_for_closure = profile_id.clone();
let model_picker = cx.new(|cx| {
- let fs = fs.clone();
let profile_id = profile_id_for_closure.clone();
language_model_selector(
@@ -235,22 +249,36 @@ impl ManageProfilesModal {
})
}
},
- move |model, cx| {
- let provider = model.provider_id().0.to_string();
- let model_id = model.id().0.to_string();
- let profile_id = profile_id.clone();
+ {
+ let fs = fs.clone();
+ move |model, cx| {
+ let provider = model.provider_id().0.to_string();
+ let model_id = model.id().0.to_string();
+ let profile_id = profile_id.clone();
- update_settings_file(fs.clone(), cx, move |settings, _cx| {
- let agent_settings = settings.agent.get_or_insert_default();
- if let Some(profiles) = agent_settings.profiles.as_mut() {
- if let Some(profile) = profiles.get_mut(profile_id.0.as_ref()) {
- profile.default_model = Some(LanguageModelSelection {
- provider: LanguageModelProviderSetting(provider.clone()),
- model: model_id.clone(),
- });
+ update_settings_file(fs.clone(), cx, move |settings, _cx| {
+ let agent_settings = settings.agent.get_or_insert_default();
+ if let Some(profiles) = agent_settings.profiles.as_mut() {
+ if let Some(profile) = profiles.get_mut(profile_id.0.as_ref()) {
+ profile.default_model = Some(LanguageModelSelection {
+ provider: LanguageModelProviderSetting(provider.clone()),
+ model: model_id.clone(),
+ });
+ }
}
- }
- });
+ });
+ }
+ },
+ {
+ let fs = fs.clone();
+ move |model, should_be_favorite, cx| {
+ crate::favorite_models::toggle_in_settings(
+ model,
+ should_be_favorite,
+ fs.clone(),
+ cx,
+ );
+ }
},
false, // Do not use popover styles for the model picker
self.focus_handle.clone(),
@@ -272,7 +300,7 @@ impl ManageProfilesModal {
model_picker,
_subscription: dismiss_subscription,
};
- self.focus_handle(cx).focus(window);
+ self.focus_handle(cx).focus(window, cx);
}
fn configure_mcp_tools(
@@ -308,7 +336,7 @@ impl ManageProfilesModal {
tool_picker,
_subscription: dismiss_subscription,
};
- self.focus_handle(cx).focus(window);
+ self.focus_handle(cx).focus(window, cx);
}
fn configure_builtin_tools(
@@ -349,7 +377,7 @@ impl ManageProfilesModal {
tool_picker,
_subscription: dismiss_subscription,
};
- self.focus_handle(cx).focus(window);
+ self.focus_handle(cx).focus(window, cx);
}
fn confirm(&mut self, window: &mut Window, cx: &mut Context) {
@@ -369,6 +397,42 @@ impl ManageProfilesModal {
}
}
+ fn delete_profile(
+ &mut self,
+ profile_id: AgentProfileId,
+ window: &mut Window,
+ cx: &mut Context,
+ ) {
+ if builtin_profiles::is_builtin(&profile_id) {
+ self.view_profile(profile_id, window, cx);
+ return;
+ }
+
+ let fs = self.fs.clone();
+
+ update_settings_file(fs, cx, move |settings, _cx| {
+ let Some(agent_settings) = settings.agent.as_mut() else {
+ return;
+ };
+
+ let Some(profiles) = agent_settings.profiles.as_mut() else {
+ return;
+ };
+
+ profiles.shift_remove(profile_id.0.as_ref());
+
+ if agent_settings
+ .default_profile
+ .as_deref()
+ .is_some_and(|default_profile| default_profile == profile_id.0.as_ref())
+ {
+ agent_settings.default_profile = Some(AgentProfileId::default().0);
+ }
+ });
+
+ self.choose_profile(window, cx);
+ }
+
fn cancel(&mut self, window: &mut Window, cx: &mut Context) {
match &self.mode {
Mode::ChooseProfile { .. } => {
@@ -756,6 +820,40 @@ impl ManageProfilesModal {
}),
),
)
+ .child(
+ div()
+ .id("delete-profile")
+ .track_focus(&mode.delete_profile.focus_handle)
+ .on_action({
+ let profile_id = mode.profile_id.clone();
+ cx.listener(move |this, _: &menu::Confirm, window, cx| {
+ this.delete_profile(profile_id.clone(), window, cx);
+ })
+ })
+ .child(
+ ListItem::new("delete-profile")
+ .toggle_state(
+ mode.delete_profile
+ .focus_handle
+ .contains_focused(window, cx),
+ )
+ .inset(true)
+ .spacing(ListItemSpacing::Sparse)
+ .start_slot(
+ Icon::new(IconName::Trash)
+ .size(IconSize::Small)
+ .color(Color::Error),
+ )
+ .child(Label::new("Delete Profile").color(Color::Error))
+ .disabled(builtin_profiles::is_builtin(&mode.profile_id))
+ .on_click({
+ let profile_id = mode.profile_id.clone();
+ cx.listener(move |this, _, window, cx| {
+ this.delete_profile(profile_id.clone(), window, cx);
+ })
+ }),
+ ),
+ )
.child(ListSeparator)
.child(
div()
@@ -805,6 +903,7 @@ impl ManageProfilesModal {
.entry(mode.configure_default_model)
.entry(mode.configure_tools)
.entry(mode.configure_mcps)
+ .entry(mode.delete_profile)
.entry(mode.cancel_item)
}
}
@@ -852,7 +951,7 @@ impl Render for ManageProfilesModal {
.on_action(cx.listener(|this, _: &menu::Cancel, window, cx| this.cancel(window, cx)))
.on_action(cx.listener(|this, _: &menu::Confirm, window, cx| this.confirm(window, cx)))
.capture_any_mouse_down(cx.listener(|this, _, window, cx| {
- this.focus_handle(cx).focus(window);
+ this.focus_handle(cx).focus(window, cx);
}))
.on_mouse_down_out(cx.listener(|_this, _, _, cx| cx.emit(DismissEvent)))
.child(match &self.mode {
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 11acd649ef9df500edf99926e754228e4c41e7bc..91d345b7ebb9dae5225626d7a054d0de1882dfe0 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -130,7 +130,12 @@ impl AgentDiffPane {
.action_log()
.read(cx)
.changed_buffers(cx);
- let mut paths_to_delete = self.multibuffer.read(cx).paths().collect::>();
+ let mut paths_to_delete = self
+ .multibuffer
+ .read(cx)
+ .paths()
+ .cloned()
+ .collect::>();
for (buffer, diff_handle) in changed_buffers {
if buffer.read(cx).file().is_none() {
@@ -207,10 +212,10 @@ impl AgentDiffPane {
.focus_handle(cx)
.contains_focused(window, cx)
{
- self.focus_handle.focus(window);
+ self.focus_handle.focus(window, cx);
} else if self.focus_handle.is_focused(window) && !self.multibuffer.read(cx).is_empty() {
self.editor.update(cx, |editor, cx| {
- editor.focus_handle(cx).focus(window);
+ editor.focus_handle(cx).focus(window, cx);
});
}
}
@@ -869,12 +874,12 @@ impl AgentDiffToolbar {
match active_item {
AgentDiffToolbarItem::Pane(agent_diff) => {
if let Some(agent_diff) = agent_diff.upgrade() {
- agent_diff.focus_handle(cx).focus(window);
+ agent_diff.focus_handle(cx).focus(window, cx);
}
}
AgentDiffToolbarItem::Editor { editor, .. } => {
if let Some(editor) = editor.upgrade() {
- editor.read(cx).focus_handle(cx).focus(window);
+ editor.read(cx).focus_handle(cx).focus(window, cx);
}
}
}
diff --git a/crates/agent_ui/src/agent_model_selector.rs b/crates/agent_ui/src/agent_model_selector.rs
index 3840e40cf4d22db9d52e74ef0489c06ca8a15f26..ac57ed575d9d1b6de2c53d3e0e4a91b4bd16ab1a 100644
--- a/crates/agent_ui/src/agent_model_selector.rs
+++ b/crates/agent_ui/src/agent_model_selector.rs
@@ -29,26 +29,39 @@ impl AgentModelSelector {
Self {
selector: cx.new(move |cx| {
- let fs = fs.clone();
language_model_selector(
{
let model_context = model_usage_context.clone();
move |cx| model_context.configured_model(cx)
},
- move |model, cx| {
- let provider = model.provider_id().0.to_string();
- let model_id = model.id().0.to_string();
- match &model_usage_context {
- ModelUsageContext::InlineAssistant => {
- update_settings_file(fs.clone(), cx, move |settings, _cx| {
- settings
- .agent
- .get_or_insert_default()
- .set_inline_assistant_model(provider.clone(), model_id);
- });
+ {
+ let fs = fs.clone();
+ move |model, cx| {
+ let provider = model.provider_id().0.to_string();
+ let model_id = model.id().0.to_string();
+ match &model_usage_context {
+ ModelUsageContext::InlineAssistant => {
+ update_settings_file(fs.clone(), cx, move |settings, _cx| {
+ settings
+ .agent
+ .get_or_insert_default()
+ .set_inline_assistant_model(provider.clone(), model_id);
+ });
+ }
}
}
},
+ {
+ let fs = fs.clone();
+ move |model, should_be_favorite, cx| {
+ crate::favorite_models::toggle_in_settings(
+ model,
+ should_be_favorite,
+ fs.clone(),
+ cx,
+ );
+ }
+ },
true, // Use popover styles for picker
focus_handle_clone,
window,
@@ -63,6 +76,10 @@ impl AgentModelSelector {
pub fn toggle(&self, window: &mut Window, cx: &mut Context) {
self.menu_handle.toggle(window, cx);
}
+
+ pub fn active_model(&self, cx: &App) -> Option {
+ self.selector.read(cx).delegate.active_model(cx)
+ }
}
impl Render for AgentModelSelector {
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 18e8f1e731defa82e865dd45e66389634992037c..294cd8b4888950f6ea92d6bea1eba78c3d6d6de2 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2,6 +2,7 @@ use std::{ops::Range, path::Path, rc::Rc, sync::Arc, time::Duration};
use acp_thread::AcpThread;
use agent::{ContextServerRegistry, DbThreadMetadata, HistoryEntry, HistoryStore};
+use agent_servers::AgentServer;
use db::kvp::{Dismissable, KEY_VALUE_STORE};
use project::{
ExternalAgentServerName,
@@ -259,7 +260,7 @@ impl AgentType {
Self::Gemini => Some(IconName::AiGemini),
Self::ClaudeCode => Some(IconName::AiClaude),
Self::Codex => Some(IconName::AiOpenAi),
- Self::Custom { .. } => Some(IconName::Terminal),
+ Self::Custom { .. } => Some(IconName::Sparkle),
}
}
}
@@ -287,7 +288,7 @@ impl ActiveView {
}
}
- pub fn native_agent(
+ fn native_agent(
fs: Arc,
prompt_store: Option>,
history_store: Entity,
@@ -305,6 +306,7 @@ impl ActiveView {
project,
history_store,
prompt_store,
+ false,
window,
cx,
)
@@ -441,6 +443,7 @@ pub struct AgentPanel {
pending_serialization: Option>>,
onboarding: Entity,
selected_agent: AgentType,
+ show_trust_workspace_message: bool,
}
impl AgentPanel {
@@ -691,6 +694,7 @@ impl AgentPanel {
history_store,
selected_agent: AgentType::default(),
loading: false,
+ show_trust_workspace_message: false,
};
// Initial sync of agent servers from extensions
@@ -818,7 +822,7 @@ impl AgentPanel {
window,
cx,
);
- text_thread_editor.focus_handle(cx).focus(window);
+ text_thread_editor.focus_handle(cx).focus(window, cx);
}
fn external_thread(
@@ -884,39 +888,21 @@ impl AgentPanel {
};
let server = ext_agent.server(fs, history);
-
- if !loading {
- telemetry::event!("Agent Thread Started", agent = server.telemetry_id());
- }
-
- this.update_in(cx, |this, window, cx| {
- let selected_agent = ext_agent.into();
- if this.selected_agent != selected_agent {
- this.selected_agent = selected_agent;
- this.serialize(cx);
- }
-
- let thread_view = cx.new(|cx| {
- crate::acp::AcpThreadView::new(
- server,
- resume_thread,
- summarize_thread,
- workspace.clone(),
- project,
- this.history_store.clone(),
- this.prompt_store.clone(),
- window,
- cx,
- )
- });
-
- this.set_active_view(
- ActiveView::ExternalAgentThread { thread_view },
- !loading,
+ this.update_in(cx, |agent_panel, window, cx| {
+ agent_panel._external_thread(
+ server,
+ resume_thread,
+ summarize_thread,
+ workspace,
+ project,
+ loading,
+ ext_agent,
window,
cx,
);
- })
+ })?;
+
+ anyhow::Ok(())
})
.detach_and_log_err(cx);
}
@@ -949,7 +935,7 @@ impl AgentPanel {
if let Some(thread_view) = self.active_thread_view() {
thread_view.update(cx, |view, cx| {
view.expand_message_editor(&ExpandMessageEditor, window, cx);
- view.focus_handle(cx).focus(window);
+ view.focus_handle(cx).focus(window, cx);
});
}
}
@@ -1030,12 +1016,12 @@ impl AgentPanel {
match &self.active_view {
ActiveView::ExternalAgentThread { thread_view } => {
- thread_view.focus_handle(cx).focus(window);
+ thread_view.focus_handle(cx).focus(window, cx);
}
ActiveView::TextThread {
text_thread_editor, ..
} => {
- text_thread_editor.focus_handle(cx).focus(window);
+ text_thread_editor.focus_handle(cx).focus(window, cx);
}
ActiveView::History | ActiveView::Configuration => {}
}
@@ -1183,7 +1169,7 @@ impl AgentPanel {
Self::handle_agent_configuration_event,
));
- configuration.focus_handle(cx).focus(window);
+ configuration.focus_handle(cx).focus(window, cx);
}
}
@@ -1319,7 +1305,7 @@ impl AgentPanel {
}
if focus {
- self.focus_handle(cx).focus(window);
+ self.focus_handle(cx).focus(window, cx);
}
}
@@ -1479,6 +1465,47 @@ impl AgentPanel {
cx,
);
}
+
+ fn _external_thread(
+ &mut self,
+ server: Rc,
+ resume_thread: Option,
+ summarize_thread: Option,
+ workspace: WeakEntity,
+ project: Entity,
+ loading: bool,
+ ext_agent: ExternalAgent,
+ window: &mut Window,
+ cx: &mut Context,
+ ) {
+ let selected_agent = AgentType::from(ext_agent);
+ if self.selected_agent != selected_agent {
+ self.selected_agent = selected_agent;
+ self.serialize(cx);
+ }
+
+ let thread_view = cx.new(|cx| {
+ crate::acp::AcpThreadView::new(
+ server,
+ resume_thread,
+ summarize_thread,
+ workspace.clone(),
+ project,
+ self.history_store.clone(),
+ self.prompt_store.clone(),
+ !loading,
+ window,
+ cx,
+ )
+ });
+
+ self.set_active_view(
+ ActiveView::ExternalAgentThread { thread_view },
+ !loading,
+ window,
+ cx,
+ );
+ }
}
impl Focusable for AgentPanel {
@@ -1593,14 +1620,19 @@ impl AgentPanel {
let content = match &self.active_view {
ActiveView::ExternalAgentThread { thread_view } => {
+ let is_generating_title = thread_view
+ .read(cx)
+ .as_native_thread(cx)
+ .map_or(false, |t| t.read(cx).is_generating_title());
+
if let Some(title_editor) = thread_view.read(cx).title_editor() {
- div()
+ let container = div()
.w_full()
.on_action({
let thread_view = thread_view.downgrade();
move |_: &menu::Confirm, window, cx| {
if let Some(thread_view) = thread_view.upgrade() {
- thread_view.focus_handle(cx).focus(window);
+ thread_view.focus_handle(cx).focus(window, cx);
}
}
})
@@ -1608,12 +1640,25 @@ impl AgentPanel {
let thread_view = thread_view.downgrade();
move |_: &editor::actions::Cancel, window, cx| {
if let Some(thread_view) = thread_view.upgrade() {
- thread_view.focus_handle(cx).focus(window);
+ thread_view.focus_handle(cx).focus(window, cx);
}
}
})
- .child(title_editor)
- .into_any_element()
+ .child(title_editor);
+
+ if is_generating_title {
+ container
+ .with_animation(
+ "generating_title",
+ Animation::new(Duration::from_secs(2))
+ .repeat()
+ .with_easing(pulsating_between(0.4, 0.8)),
+ |div, delta| div.opacity(delta),
+ )
+ .into_any_element()
+ } else {
+ container.into_any_element()
+ }
} else {
Label::new(thread_view.read(cx).title(cx))
.color(Color::Muted)
@@ -1643,6 +1688,13 @@ impl AgentPanel {
Label::new(LOADING_SUMMARY_PLACEHOLDER)
.truncate()
.color(Color::Muted)
+ .with_animation(
+ "generating_title",
+ Animation::new(Duration::from_secs(2))
+ .repeat()
+ .with_easing(pulsating_between(0.4, 0.8)),
+ |label, delta| label.alpha(delta),
+ )
.into_any_element()
}
}
@@ -1686,6 +1738,25 @@ impl AgentPanel {
.into_any()
}
+ fn handle_regenerate_thread_title(thread_view: Entity, cx: &mut App) {
+ thread_view.update(cx, |thread_view, cx| {
+ if let Some(thread) = thread_view.as_native_thread(cx) {
+ thread.update(cx, |thread, cx| {
+ thread.generate_title(cx);
+ });
+ }
+ });
+ }
+
+ fn handle_regenerate_text_thread_title(
+ text_thread_editor: Entity,
+ cx: &mut App,
+ ) {
+ text_thread_editor.update(cx, |text_thread_editor, cx| {
+ text_thread_editor.regenerate_summary(cx);
+ });
+ }
+
fn render_panel_options_menu(
&self,
window: &mut Window,
@@ -1705,6 +1776,35 @@ impl AgentPanel {
let selected_agent = self.selected_agent.clone();
+ let text_thread_view = match &self.active_view {
+ ActiveView::TextThread {
+ text_thread_editor, ..
+ } => Some(text_thread_editor.clone()),
+ _ => None,
+ };
+ let text_thread_with_messages = match &self.active_view {
+ ActiveView::TextThread {
+ text_thread_editor, ..
+ } => text_thread_editor
+ .read(cx)
+ .text_thread()
+ .read(cx)
+ .messages(cx)
+ .any(|message| message.role == language_model::Role::Assistant),
+ _ => false,
+ };
+
+ let thread_view = match &self.active_view {
+ ActiveView::ExternalAgentThread { thread_view } => Some(thread_view.clone()),
+ _ => None,
+ };
+ let thread_with_messages = match &self.active_view {
+ ActiveView::ExternalAgentThread { thread_view } => {
+ thread_view.read(cx).has_user_submitted_prompt(cx)
+ }
+ _ => false,
+ };
+
PopoverMenu::new("agent-options-menu")
.trigger_with_tooltip(
IconButton::new("agent-options-menu", IconName::Ellipsis)
@@ -1727,6 +1827,7 @@ impl AgentPanel {
move |window, cx| {
Some(ContextMenu::build(window, cx, |mut menu, _window, _| {
menu = menu.context(focus_handle.clone());
+
if let Some(usage) = usage {
menu = menu
.header_with_link("Prompt Usage", "Manage", account_url.clone())
@@ -1764,6 +1865,38 @@ impl AgentPanel {
.separator()
}
+ if thread_with_messages | text_thread_with_messages {
+ menu = menu.header("Current Thread");
+
+ if let Some(text_thread_view) = text_thread_view.as_ref() {
+ menu = menu
+ .entry("Regenerate Thread Title", None, {
+ let text_thread_view = text_thread_view.clone();
+ move |_, cx| {
+ Self::handle_regenerate_text_thread_title(
+ text_thread_view.clone(),
+ cx,
+ );
+ }
+ })
+ .separator();
+ }
+
+ if let Some(thread_view) = thread_view.as_ref() {
+ menu = menu
+ .entry("Regenerate Thread Title", None, {
+ let thread_view = thread_view.clone();
+ move |_, cx| {
+ Self::handle_regenerate_thread_title(
+ thread_view.clone(),
+ cx,
+ );
+ }
+ })
+ .separator();
+ }
+ }
+
menu = menu
.header("MCP Servers")
.action(
@@ -1853,14 +1986,17 @@ impl AgentPanel {
let agent_server_store = self.project.read(cx).agent_server_store().clone();
let focus_handle = self.focus_handle(cx);
- // Get custom icon path for selected agent before building menu (to avoid borrow issues)
- let selected_agent_custom_icon =
+ let (selected_agent_custom_icon, selected_agent_label) =
if let AgentType::Custom { name, .. } = &self.selected_agent {
- agent_server_store
- .read(cx)
- .agent_icon(&ExternalAgentServerName(name.clone()))
+ let store = agent_server_store.read(cx);
+ let icon = store.agent_icon(&ExternalAgentServerName(name.clone()));
+
+ let label = store
+ .agent_display_name(&ExternalAgentServerName(name.clone()))
+ .unwrap_or_else(|| self.selected_agent.label());
+ (icon, label)
} else {
- None
+ (None, self.selected_agent.label())
};
let active_thread = match &self.active_view {
@@ -2083,13 +2219,16 @@ impl AgentPanel {
for agent_name in agent_names {
let icon_path = agent_server_store.agent_icon(&agent_name);
+ let display_name = agent_server_store
+ .agent_display_name(&agent_name)
+ .unwrap_or_else(|| agent_name.0.clone());
- let mut entry = ContextMenuEntry::new(agent_name.clone());
+ let mut entry = ContextMenuEntry::new(display_name);
if let Some(icon_path) = icon_path {
entry = entry.custom_icon_svg(icon_path);
} else {
- entry = entry.icon(IconName::Terminal);
+ entry = entry.icon(IconName::Sparkle);
}
entry = entry
.when(
@@ -2153,8 +2292,6 @@ impl AgentPanel {
}
});
- let selected_agent_label = self.selected_agent.label();
-
let is_thread_loading = self
.active_thread_view()
.map(|thread| thread.read(cx).is_loading())
@@ -2555,6 +2692,38 @@ impl AgentPanel {
}
}
+ fn render_workspace_trust_message(&self, cx: &Context) -> Option {
+ if !self.show_trust_workspace_message {
+ return None;
+ }
+
+ let description = "To protect your system, third-party code—like MCP servers—won't run until you mark this workspace as safe.";
+
+ Some(
+ Callout::new()
+ .icon(IconName::Warning)
+ .severity(Severity::Warning)
+ .border_position(ui::BorderPosition::Bottom)
+ .title("You're in Restricted Mode")
+ .description(description)
+ .actions_slot(
+ Button::new("open-trust-modal", "Configure Project Trust")
+ .label_size(LabelSize::Small)
+ .style(ButtonStyle::Outlined)
+ .on_click({
+ cx.listener(move |this, _, window, cx| {
+ this.workspace
+ .update(cx, |workspace, cx| {
+ workspace
+ .show_worktree_trust_security_modal(true, window, cx)
+ })
+ .log_err();
+ })
+ }),
+ ),
+ )
+ }
+
fn key_context(&self) -> KeyContext {
let mut key_context = KeyContext::new_with_defaults();
key_context.add("AgentPanel");
@@ -2607,6 +2776,7 @@ impl Render for AgentPanel {
}
}))
.child(self.render_toolbar(window, cx))
+ .children(self.render_workspace_trust_message(cx))
.children(self.render_onboarding(window, cx))
.map(|parent| match &self.active_view {
ActiveView::ExternalAgentThread { thread_view, .. } => parent
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index f7b07b7bd393b8d3efffc3757eaf6025d5c651cd..02cb7e59948b10274302bd8cd6f74f1accbd30a3 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -1,4 +1,4 @@
-mod acp;
+pub mod acp;
mod agent_configuration;
mod agent_diff;
mod agent_model_selector;
@@ -7,8 +7,7 @@ mod buffer_codegen;
mod completion_provider;
mod context;
mod context_server_configuration;
-#[cfg(test)]
-mod evals;
+mod favorite_models;
mod inline_assistant;
mod inline_prompt_editor;
mod language_model_selector;
@@ -28,7 +27,7 @@ use agent_settings::{AgentProfileId, AgentSettings};
use assistant_slash_command::SlashCommandRegistry;
use client::Client;
use command_palette_hooks::CommandPaletteFilter;
-use feature_flags::FeatureFlagAppExt as _;
+use feature_flags::{AgentV2FeatureFlag, FeatureFlagAppExt as _};
use fs::Fs;
use gpui::{Action, App, Entity, SharedString, actions};
use language::{
@@ -69,6 +68,8 @@ actions!(
ToggleProfileSelector,
/// Cycles through available session modes.
CycleModeSelector,
+ /// Cycles through favorited models in the ACP model selector.
+ CycleFavoriteModels,
/// Expands the message editor to full size.
ExpandMessageEditor,
/// Removes all thread history.
@@ -160,16 +161,6 @@ pub enum ExternalAgent {
}
impl ExternalAgent {
- pub fn parse_built_in(server: &dyn agent_servers::AgentServer) -> Option {
- match server.telemetry_id() {
- "gemini-cli" => Some(Self::Gemini),
- "claude-code" => Some(Self::ClaudeCode),
- "codex" => Some(Self::Codex),
- "zed" => Some(Self::NativeAgent),
- _ => None,
- }
- }
-
pub fn server(
&self,
fs: Arc,
@@ -226,7 +217,7 @@ pub fn init(
is_eval: bool,
cx: &mut App,
) {
- assistant_text_thread::init(client.clone(), cx);
+ assistant_text_thread::init(client, cx);
rules_library::init(cx);
if !is_eval {
// Initializing the language model from the user settings messes with the eval, so we only initialize them when
@@ -239,13 +230,8 @@ pub fn init(
TextThreadEditor::init(cx);
register_slash_commands(cx);
- inline_assistant::init(
- fs.clone(),
- prompt_builder.clone(),
- client.telemetry().clone(),
- cx,
- );
- terminal_inline_assistant::init(fs.clone(), prompt_builder, client.telemetry().clone(), cx);
+ inline_assistant::init(fs.clone(), prompt_builder.clone(), cx);
+ terminal_inline_assistant::init(fs.clone(), prompt_builder, cx);
cx.observe_new(move |workspace, window, cx| {
ConfigureContextServerModal::register(workspace, language_registry.clone(), window, cx)
})
@@ -261,23 +247,31 @@ pub fn init(
update_command_palette_filter(app_cx);
})
.detach();
+
+ cx.on_flags_ready(|_, cx| {
+ update_command_palette_filter(cx);
+ })
+ .detach();
}
fn update_command_palette_filter(cx: &mut App) {
let disable_ai = DisableAiSettings::get_global(cx).disable_ai;
let agent_enabled = AgentSettings::get_global(cx).enabled;
+ let agent_v2_enabled = cx.has_flag::();
let edit_prediction_provider = AllLanguageSettings::get_global(cx)
.edit_predictions
.provider;
CommandPaletteFilter::update_global(cx, |filter, _| {
use editor::actions::{
- AcceptEditPrediction, AcceptPartialEditPrediction, NextEditPrediction,
- PreviousEditPrediction, ShowEditPrediction, ToggleEditPrediction,
+ AcceptEditPrediction, AcceptNextLineEditPrediction, AcceptNextWordEditPrediction,
+ NextEditPrediction, PreviousEditPrediction, ShowEditPrediction, ToggleEditPrediction,
};
let edit_prediction_actions = [
TypeId::of::(),
- TypeId::of::(),
+ TypeId::of::(),
+ TypeId::of::(),
+ TypeId::of::(),
TypeId::of::(),
TypeId::of::(),
TypeId::of::(),
@@ -286,6 +280,7 @@ fn update_command_palette_filter(cx: &mut App) {
if disable_ai {
filter.hide_namespace("agent");
+ filter.hide_namespace("agents");
filter.hide_namespace("assistant");
filter.hide_namespace("copilot");
filter.hide_namespace("supermaven");
@@ -297,8 +292,10 @@ fn update_command_palette_filter(cx: &mut App) {
} else {
if agent_enabled {
filter.show_namespace("agent");
+ filter.show_namespace("agents");
} else {
filter.hide_namespace("agent");
+ filter.hide_namespace("agents");
}
filter.show_namespace("assistant");
@@ -334,6 +331,9 @@ fn update_command_palette_filter(cx: &mut App) {
filter.show_namespace("zed_predict_onboarding");
filter.show_action_types(&[TypeId::of::()]);
+ if !agent_v2_enabled {
+ filter.hide_action_types(&[TypeId::of::()]);
+ }
}
});
}
@@ -432,7 +432,7 @@ mod tests {
use gpui::{BorrowAppContext, TestAppContext, px};
use project::DisableAiSettings;
use settings::{
- DefaultAgentView, DockPosition, NotifyWhenAgentWaiting, Settings, SettingsStore,
+ DefaultAgentView, DockPosition, DockSide, NotifyWhenAgentWaiting, Settings, SettingsStore,
};
#[gpui::test]
@@ -451,13 +451,16 @@ mod tests {
enabled: true,
button: true,
dock: DockPosition::Right,
+ agents_panel_dock: DockSide::Left,
default_width: px(300.),
default_height: px(600.),
default_model: None,
inline_assistant_model: None,
+ inline_assistant_use_streaming_tools: false,
commit_message_model: None,
thread_summary_model: None,
inline_alternatives: vec![],
+ favorite_models: vec![],
default_profile: AgentProfileId::default(),
default_view: DefaultAgentView::Thread,
profiles: Default::default(),
diff --git a/crates/agent_ui/src/buffer_codegen.rs b/crates/agent_ui/src/buffer_codegen.rs
index f7e7884310458e97421768882df57934a19b4430..a296d4d20918fba6eb32bfcf7fcc657f9db2b3ac 100644
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -1,23 +1,26 @@
use crate::{context::LoadedContext, inline_prompt_editor::CodegenStatus};
use agent_settings::AgentSettings;
use anyhow::{Context as _, Result};
-use client::telemetry::Telemetry;
+use uuid::Uuid;
+
use cloud_llm_client::CompletionIntent;
use collections::HashSet;
use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
-use feature_flags::{FeatureFlagAppExt as _, InlineAssistantV2FeatureFlag};
+use feature_flags::{FeatureFlagAppExt as _, InlineAssistantUseToolFeatureFlag};
use futures::{
SinkExt, Stream, StreamExt, TryStreamExt as _,
channel::mpsc,
future::{LocalBoxFuture, Shared},
join,
+ stream::BoxStream,
};
use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task};
-use language::{Buffer, IndentKind, Point, TransactionId, line_diff};
+use language::{Buffer, IndentKind, LanguageName, Point, TransactionId, line_diff};
use language_model::{
- LanguageModel, LanguageModelCompletionError, LanguageModelRegistry, LanguageModelRequest,
- LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelTextStream, Role,
- report_assistant_event,
+ LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
+ LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
+ LanguageModelRequestTool, LanguageModelTextStream, LanguageModelToolChoice,
+ LanguageModelToolUse, Role, TokenUsage,
};
use multi_buffer::MultiBufferRow;
use parking_lot::Mutex;
@@ -25,6 +28,7 @@ use prompt_store::PromptBuilder;
use rope::Rope;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
+use settings::Settings as _;
use smol::future::FutureExt;
use std::{
cmp,
@@ -37,28 +41,24 @@ use std::{
time::Instant,
};
use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
-use ui::SharedString;
-/// Use this tool to provide a message to the user when you're unable to complete a task.
+/// Use this tool when you cannot or should not make a rewrite. This includes:
+/// - The user's request is unclear, ambiguous, or nonsensical
+/// - The requested change cannot be made by only editing the section
#[derive(Debug, Serialize, Deserialize, JsonSchema)]
pub struct FailureMessageInput {
/// A brief message to the user explaining why you're unable to fulfill the request or to ask a question about the request.
- ///
- /// The message may use markdown formatting if you wish.
+ #[serde(default)]
pub message: String,
}
/// Replaces text in tags with your replacement_text.
+/// Only use this tool when you are confident you understand the user's request and can fulfill it
+/// by editing the marked section.
#[derive(Debug, Serialize, Deserialize, JsonSchema)]
pub struct RewriteSectionInput {
- /// A brief description of the edit you have made.
- ///
- /// The description may use markdown formatting if you wish.
- /// This is optional - if the edit is simple or obvious, you should leave it empty.
- pub description: String,
-
/// The text to replace the section with.
+ #[serde(default)]
pub replacement_text: String,
}
@@ -70,17 +70,20 @@ pub struct BufferCodegen {
buffer: Entity,
range: Range,
initial_transaction_id: Option,
- telemetry: Arc