Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

History, is history

Browse source
This commit is contained in:
Conrad Irwin 2025-08-13 13:44:39 -06:00
parent 0d71351b02
commit d36304963e
8 changed files with 13 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/keymaps/default-linux.json
View file

@ -331,8 +331,6 @@
"use_key_equivalents": true, "use_key_equivalents": true,
"bindings": { "bindings": {
"enter": "agent::Chat", "enter": "agent::Chat",
"up": "agent::PreviousHistoryMessage",
"down": "agent::NextHistoryMessage",
"shift-ctrl-r": "agent::OpenAgentDiff", "shift-ctrl-r": "agent::OpenAgentDiff",
"ctrl-shift-y": "agent::KeepAll", "ctrl-shift-y": "agent::KeepAll",
"ctrl-shift-n": "agent::RejectAll" "ctrl-shift-n": "agent::RejectAll"

2
assets/keymaps/default-macos.json
View file

@ -383,8 +383,6 @@
"use_key_equivalents": true, "use_key_equivalents": true,
"bindings": { "bindings": {
"enter": "agent::Chat", "enter": "agent::Chat",
"up": "agent::PreviousHistoryMessage",
"down": "agent::NextHistoryMessage",
"shift-ctrl-r": "agent::OpenAgentDiff", "shift-ctrl-r": "agent::OpenAgentDiff",
"cmd-shift-y": "agent::KeepAll", "cmd-shift-y": "agent::KeepAll",
"cmd-shift-n": "agent::RejectAll" "cmd-shift-n": "agent::RejectAll"

2
crates/agent_ui/src/acp.rs
View file

@ -1,11 +1,9 @@
mod completion_provider; mod completion_provider;
mod message_editor; mod message_editor;
mod message_history;
mod model_selector; mod model_selector;
mod model_selector_popover; mod model_selector_popover;
mod thread_view; mod thread_view;
pub use message_history::MessageHistory;
pub use model_selector::AcpModelSelector; pub use model_selector::AcpModelSelector;
pub use model_selector_popover::AcpModelSelectorPopover; pub use model_selector_popover::AcpModelSelectorPopover;
pub use thread_view::AcpThreadView; pub use thread_view::AcpThreadView;

219
crates/agent_ui/src/acp/message_editor.rs
View file

@ -1,5 +1,5 @@
use crate::acp::completion_provider::ContextPickerCompletionProvider; use crate::acp::completion_provider::ContextPickerCompletionProvider;
use crate::acp::{MessageHistory, completion_provider::MentionSet}; use crate::acp::completion_provider::MentionSet;
use acp_thread::MentionUri; use acp_thread::MentionUri;
use agent_client_protocol as acp; use agent_client_protocol as acp;
use anyhow::Result; use anyhow::Result;
@ -10,8 +10,7 @@ use editor::{
}; };
use file_icons::FileIcons; use file_icons::FileIcons;
use gpui::{ use gpui::{
AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, Subscription, Task, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, Task, TextStyle, WeakEntity,
TextStyle, WeakEntity,
}; };
use language::Language; use language::Language;
use language::{Buffer, BufferSnapshot}; use language::{Buffer, BufferSnapshot};
@ -20,7 +19,7 @@ use project::{CompletionIntent, Project};
use settings::Settings; use settings::Settings;
use std::path::Path; use std::path::Path;
use std::rc::Rc; use std::rc::Rc;
use std::{cell::RefCell, sync::Arc}; use std::sync::Arc;
use theme::ThemeSettings; use theme::ThemeSettings;
use ui::{ use ui::{
ActiveTheme, App, IconName, InteractiveElement, IntoElement, ParentElement, Render, ActiveTheme, App, IconName, InteractiveElement, IntoElement, ParentElement, Render,
@ -28,7 +27,7 @@ use ui::{
}; };
use util::ResultExt; use util::ResultExt;
use workspace::Workspace; use workspace::Workspace;
use zed_actions::agent::{Chat, NextHistoryMessage, PreviousHistoryMessage}; use zed_actions::agent::Chat;
pub const MIN_EDITOR_LINES: usize = 4; pub const MIN_EDITOR_LINES: usize = 4;
pub const MAX_EDITOR_LINES: usize = 8; pub const MAX_EDITOR_LINES: usize = 8;
@ -37,9 +36,6 @@ pub struct MessageEditor {
editor: Entity<Editor>, editor: Entity<Editor>,
project: Entity<Project>, project: Entity<Project>,
mention_set: Arc<Mutex<MentionSet>>, mention_set: Arc<Mutex<MentionSet>>,
history: Rc<RefCell<MessageHistory<Vec<acp::ContentBlock>>>>,
message_set_from_history: Option<BufferSnapshot>,
_subscription: Subscription,
} }
pub enum MessageEditorEvent { pub enum MessageEditorEvent {
@ -52,7 +48,6 @@ impl MessageEditor {
pub fn new( pub fn new(
workspace: WeakEntity<Workspace>, workspace: WeakEntity<Workspace>,
project: Entity<Project>, project: Entity<Project>,
history: Rc<RefCell<MessageHistory<Vec<acp::ContentBlock>>>>,
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) -> Self { ) -> Self {
@ -95,35 +90,11 @@ impl MessageEditor {
}); });
editor editor
}); });
let message_editor_subscription = cx.subscribe(&editor, |this, editor, event, cx| {
if let editor::EditorEvent::BufferEdited = &event {
let buffer = editor
.read(cx)
.buffer()
.read(cx)
.as_singleton()
.unwrap()
.read(cx)
.snapshot();
if let Some(message) = this.message_set_from_history.clone()
&& message.version() != buffer.version()
{
this.message_set_from_history = None;
}
if this.message_set_from_history.is_none() {
this.history.borrow_mut().reset_position();
}
}
});
Self { Self {
editor, editor,
project, project,
mention_set, mention_set,
history,
message_set_from_history: None,
_subscription: message_editor_subscription,
} }
} }
@ -266,69 +237,7 @@ impl MessageEditor {
}); });
} }
fn previous_history_message( #[allow(unused)]
&mut self,
_: &PreviousHistoryMessage,
window: &mut Window,
cx: &mut Context<Self>,
) {
if self.message_set_from_history.is_none() && !self.editor.read(cx).is_empty(cx) {
self.editor.update(cx, |editor, cx| {
editor.move_up(&Default::default(), window, cx);
});
return;
}
self.message_set_from_history = Self::set_draft_message(
self.editor.clone(),
self.mention_set.clone(),
self.project.clone(),
self.history
.borrow_mut()
.prev()
.map(|blocks| blocks.as_slice()),
window,
cx,
);
}
fn next_history_message(
&mut self,
_: &NextHistoryMessage,
window: &mut Window,
cx: &mut Context<Self>,
) {
if self.message_set_from_history.is_none() {
self.editor.update(cx, |editor, cx| {
editor.move_down(&Default::default(), window, cx);
});
return;
}
let mut history = self.history.borrow_mut();
let next_history = history.next();
let set_draft_message = Self::set_draft_message(
self.editor.clone(),
self.mention_set.clone(),
self.project.clone(),
Some(
next_history
.map(|blocks| blocks.as_slice())
.unwrap_or_else(|| &[]),
),
window,
cx,
);
// If we reset the text to an empty string because we ran out of history,
// we don't want to mark it as coming from the history
self.message_set_from_history = if next_history.is_some() {
set_draft_message
} else {
None
};
}
fn set_draft_message( fn set_draft_message(
message_editor: Entity<Editor>, message_editor: Entity<Editor>,
mention_set: Arc<Mutex<MentionSet>>, mention_set: Arc<Mutex<MentionSet>>,
@ -437,8 +346,6 @@ impl Render for MessageEditor {
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement { fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
div() div()
.key_context("MessageEditor") .key_context("MessageEditor")
.on_action(cx.listener(Self::previous_history_message))
.on_action(cx.listener(Self::next_history_message))
.on_action(cx.listener(Self::chat)) .on_action(cx.listener(Self::chat))
.flex_1() .flex_1()
.child({ .child({
@ -474,125 +381,23 @@ impl Render for MessageEditor {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::{cell::RefCell, path::Path, rc::Rc}; use std::path::Path;
use agent_client_protocol as acp; use agent_client_protocol as acp;
use fs::FakeFs; use fs::FakeFs;
use gpui::{AppContext, TestAppContext}; use gpui::{AppContext, TestAppContext};
use lsp::{CompletionContext, CompletionTriggerKind}; use lsp::{CompletionContext, CompletionTriggerKind};
use pretty_assertions::assert_matches;
use project::{CompletionIntent, Project}; use project::{CompletionIntent, Project};
use serde_json::json; use serde_json::json;
use util::path; use util::path;
use workspace::Workspace; use workspace::Workspace;
use crate::acp::{ use crate::acp::{message_editor::MessageEditor, thread_view::tests::init_test};
MessageHistory, message_editor::MessageEditor, thread_view::tests::init_test,
};
#[gpui::test]
async fn test_at_mention_history(cx: &mut TestAppContext) {
init_test(cx);
let history = Rc::new(RefCell::new(MessageHistory::default()));
let fs = FakeFs::new(cx.executor());
fs.insert_tree("/project", json!({"file": ""})).await;
let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
let (workspace, cx) =
cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
let message_editor = cx.update(|window, cx| {
cx.new(|cx| {
MessageEditor::new(
workspace.downgrade(),
project.clone(),
history.clone(),
window,
cx,
)
})
});
let editor = message_editor.update(cx, |message_editor, _| message_editor.editor.clone());
cx.run_until_parked();
let excerpt_id = editor.update(cx, |editor, cx| {
editor
.buffer()
.read(cx)
.excerpt_ids()
.into_iter()
.next()
.unwrap()
});
let completions = editor.update_in(cx, |editor, window, cx| {
editor.set_text("Hello @", window, cx);
let buffer = editor.buffer().read(cx).as_singleton().unwrap();
let completion_provider = editor.completion_provider().unwrap();
completion_provider.completions(
excerpt_id,
&buffer,
text::Anchor::MAX,
CompletionContext {
trigger_kind: CompletionTriggerKind::TRIGGER_CHARACTER,
trigger_character: Some("@".into()),
},
window,
cx,
)
});
let [_, completion]: [_; 2] = completions
.await
.unwrap()
.into_iter()
.flat_map(|response| response.completions)
.collect::<Vec<_>>()
.try_into()
.unwrap();
editor.update_in(cx, |editor, window, cx| {
let snapshot = editor.buffer().read(cx).snapshot(cx);
let start = snapshot
.anchor_in_excerpt(excerpt_id, completion.replace_range.start)
.unwrap();
let end = snapshot
.anchor_in_excerpt(excerpt_id, completion.replace_range.end)
.unwrap();
editor.edit([(start..end, completion.new_text)], cx);
(completion.confirm.unwrap())(CompletionIntent::Complete, window, cx);
});
cx.run_until_parked();
let content = message_editor
.update(cx, |message_editor, cx| message_editor.contents(cx))
.await
.unwrap();
assert_eq!(content.len(), 2);
assert_matches!(&content[0], &acp::ContentBlock::Text(_));
assert_matches!(&content[1], &acp::ContentBlock::Resource(_));
history.borrow_mut().push(content);
message_editor.update_in(cx, |message_editor, window, cx| {
message_editor.clear(window, cx);
message_editor.previous_history_message(&Default::default(), window, cx);
});
let content = message_editor
.update(cx, |message_editor, cx| message_editor.contents(cx))
.await
.unwrap();
assert_eq!(content.len(), 2);
assert_matches!(&content[0], &acp::ContentBlock::Text(_));
assert_matches!(&content[1], &acp::ContentBlock::Resource(_));
}
#[gpui::test] #[gpui::test]
async fn test_at_mention_removal(cx: &mut TestAppContext) { async fn test_at_mention_removal(cx: &mut TestAppContext) {
init_test(cx); init_test(cx);
let history = Rc::new(RefCell::new(MessageHistory::default()));
let fs = FakeFs::new(cx.executor()); let fs = FakeFs::new(cx.executor());
fs.insert_tree("/project", json!({"file": ""})).await; fs.insert_tree("/project", json!({"file": ""})).await;
let project = Project::test(fs, [Path::new(path!("/project"))], cx).await; let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
@ -601,15 +406,7 @@ mod tests {
cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx)); cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
let message_editor = cx.update(|window, cx| { let message_editor = cx.update(|window, cx| {
cx.new(|cx| { cx.new(|cx| MessageEditor::new(workspace.downgrade(), project.clone(), window, cx))
MessageEditor::new(
workspace.downgrade(),
project.clone(),
history.clone(),
window,
cx,
)
})
}); });
let editor = message_editor.update(cx, |message_editor, _| message_editor.editor.clone()); let editor = message_editor.update(cx, |message_editor, _| message_editor.editor.clone());

87
crates/agent_ui/src/acp/message_history.rs
View file

@ -1,87 +0,0 @@
pub struct MessageHistory<T> {
items: Vec<T>,
current: Option<usize>,
}
impl<T> Default for MessageHistory<T> {
fn default() -> Self {
MessageHistory {
items: Vec::new(),
current: None,
}
}
}
impl<T> MessageHistory<T> {
pub fn push(&mut self, message: T) {
self.current.take();
self.items.push(message);
}
pub fn reset_position(&mut self) {
self.current.take();
}
pub fn prev(&mut self) -> Option<&T> {
if self.items.is_empty() {
return None;
}
let new_ix = self
.current
.get_or_insert(self.items.len())
.saturating_sub(1);
self.current = Some(new_ix);
self.items.get(new_ix)
}
pub fn next(&mut self) -> Option<&T> {
let current = self.current.as_mut()?;
*current += 1;
self.items.get(*current).or_else(|| {
self.current.take();
None
})
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_prev_next() {
let mut history = MessageHistory::default();
// Test empty history
assert_eq!(history.prev(), None);
assert_eq!(history.next(), None);
// Add some messages
history.push("first");
history.push("second");
history.push("third");
// Test prev navigation
assert_eq!(history.prev(), Some(&"third"));
assert_eq!(history.prev(), Some(&"second"));
assert_eq!(history.prev(), Some(&"first"));
assert_eq!(history.prev(), Some(&"first"));
assert_eq!(history.next(), Some(&"second"));
// Test mixed navigation
history.push("fourth");
assert_eq!(history.prev(), Some(&"fourth"));
assert_eq!(history.prev(), Some(&"third"));
assert_eq!(history.next(), Some(&"fourth"));
assert_eq!(history.next(), None);
// Test that push resets navigation
history.prev();
history.prev();
history.push("fifth");
assert_eq!(history.prev(), Some(&"fifth"));
}
}

27
crates/agent_ui/src/acp/thread_view.rs
View file

@ -25,7 +25,7 @@ use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
use project::Project; use project::Project;
use rope::Point; use rope::Point;
use settings::{Settings as _, SettingsStore}; use settings::{Settings as _, SettingsStore};
use std::{cell::RefCell, collections::BTreeMap, process::ExitStatus, rc::Rc, time::Duration}; use std::{collections::BTreeMap, process::ExitStatus, rc::Rc, time::Duration};
use terminal_view::TerminalView; use terminal_view::TerminalView;
use text::Anchor; use text::Anchor;
use theme::ThemeSettings; use theme::ThemeSettings;
@ -39,7 +39,6 @@ use zed_actions::agent::{Chat, ToggleModelSelector};
use crate::acp::AcpModelSelectorPopover; use crate::acp::AcpModelSelectorPopover;
use crate::acp::message_editor::{MessageEditor, MessageEditorEvent}; use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
use crate::acp::message_history::MessageHistory;
use crate::agent_diff::AgentDiff; use crate::agent_diff::AgentDiff;
use crate::ui::{AgentNotification, AgentNotificationEvent}; use crate::ui::{AgentNotification, AgentNotificationEvent};
use crate::{ use crate::{
@ -69,7 +68,6 @@ pub struct AcpThreadView {
plan_expanded: bool, plan_expanded: bool,
editor_expanded: bool, editor_expanded: bool,
terminal_expanded: bool, terminal_expanded: bool,
message_history: Rc<RefCell<MessageHistory<Vec<acp::ContentBlock>>>>,
_cancel_task: Option<Task<()>>, _cancel_task: Option<Task<()>>,
_subscriptions: [Subscription; 2], _subscriptions: [Subscription; 2],
} }
@ -96,19 +94,11 @@ impl AcpThreadView {
agent: Rc<dyn AgentServer>, agent: Rc<dyn AgentServer>,
workspace: WeakEntity<Workspace>, workspace: WeakEntity<Workspace>,
project: Entity<Project>, project: Entity<Project>,
message_history: Rc<RefCell<MessageHistory<Vec<acp::ContentBlock>>>>,
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) -> Self { ) -> Self {
let message_editor = cx.new(|cx| { let message_editor =
MessageEditor::new( cx.new(|cx| MessageEditor::new(workspace.clone(), project.clone(), window, cx));
workspace.clone(),
project.clone(),
message_history.clone(),
window,
cx,
)
});
let list_state = ListState::new(0, gpui::ListAlignment::Bottom, px(2048.0)); let list_state = ListState::new(0, gpui::ListAlignment::Bottom, px(2048.0));
@ -138,7 +128,6 @@ impl AcpThreadView {
plan_expanded: false, plan_expanded: false,
editor_expanded: false, editor_expanded: false,
terminal_expanded: true, terminal_expanded: true,
message_history,
_subscriptions: subscriptions, _subscriptions: subscriptions,
_cancel_task: None, _cancel_task: None,
} }
@ -348,7 +337,6 @@ impl AcpThreadView {
this.message_editor.update(cx, |message_editor, cx| { this.message_editor.update(cx, |message_editor, cx| {
message_editor.clear(window, cx); message_editor.clear(window, cx);
}); });
this.message_history.borrow_mut().push(contents.clone());
})?; })?;
let send = thread.update(cx, |thread, cx| thread.send(contents, cx))?; let send = thread.update(cx, |thread, cx| thread.send(contents, cx))?;
send.await send.await
@ -3212,14 +3200,7 @@ pub(crate) mod tests {
let thread_view = cx.update(|window, cx| { let thread_view = cx.update(|window, cx| {
cx.new(|cx| { cx.new(|cx| {
AcpThreadView::new( AcpThreadView::new(Rc::new(agent), workspace.downgrade(), project, window, cx)
Rc::new(agent),
workspace.downgrade(),
project,
Rc::new(RefCell::new(MessageHistory::default())),
window,
cx,
)
}) })
}); });
cx.run_until_parked(); cx.run_until_parked();

16
crates/agent_ui/src/agent_panel.rs
View file

@ -1,4 +1,3 @@
use std::cell::RefCell;
use std::ops::{Not, Range}; use std::ops::{Not, Range};
use std::path::Path; use std::path::Path;
use std::rc::Rc; use std::rc::Rc;
@ -476,8 +475,6 @@ pub struct AgentPanel {
configuration_subscription: Option<Subscription>, configuration_subscription: Option<Subscription>,
local_timezone: UtcOffset, local_timezone: UtcOffset,
active_view: ActiveView, active_view: ActiveView,
acp_message_history:
Rc<RefCell<crate::acp::MessageHistory<Vec<agent_client_protocol::ContentBlock>>>>,
previous_view: Option<ActiveView>, previous_view: Option<ActiveView>,
history_store: Entity<HistoryStore>, history_store: Entity<HistoryStore>,
history: Entity<ThreadHistory>, history: Entity<ThreadHistory>,
@ -765,7 +762,6 @@ impl AgentPanel {
.unwrap(), .unwrap(),
inline_assist_context_store, inline_assist_context_store,
previous_view: None, previous_view: None,
acp_message_history: Default::default(),
history_store: history_store.clone(), history_store: history_store.clone(),
history: cx.new(|cx| ThreadHistory::new(weak_self, history_store, window, cx)), history: cx.new(|cx| ThreadHistory::new(weak_self, history_store, window, cx)),
hovered_recent_history_item: None, hovered_recent_history_item: None,
@ -962,7 +958,6 @@ impl AgentPanel {
) { ) {
let workspace = self.workspace.clone(); let workspace = self.workspace.clone();
let project = self.project.clone(); let project = self.project.clone();
let message_history = self.acp_message_history.clone();
let fs = self.fs.clone(); let fs = self.fs.clone();
const LAST_USED_EXTERNAL_AGENT_KEY: &str = "agent_panel__last_used_external_agent"; const LAST_USED_EXTERNAL_AGENT_KEY: &str = "agent_panel__last_used_external_agent";
@ -1006,14 +1001,7 @@ impl AgentPanel {
this.update_in(cx, |this, window, cx| { this.update_in(cx, |this, window, cx| {
let thread_view = cx.new(|cx| { let thread_view = cx.new(|cx| {
crate::acp::AcpThreadView::new( crate::acp::AcpThreadView::new(server, workspace.clone(), project, window, cx)
server,
workspace.clone(),
project,
message_history,
window,
cx,
)
}); });
this.set_active_view(ActiveView::ExternalAgentThread { thread_view }, window, cx); this.set_active_view(ActiveView::ExternalAgentThread { thread_view }, window, cx);
@ -1567,8 +1555,6 @@ impl AgentPanel {
self.active_view = new_view; self.active_view = new_view;
} }
self.acp_message_history.borrow_mut().reset_position();
self.focus_handle(cx).focus(window); self.focus_handle(cx).focus(window);
} }

4
crates/zed_actions/src/lib.rs
View file

@ -285,10 +285,6 @@ pub mod agent {
ResetOnboarding, ResetOnboarding,
/// Starts a chat conversation with the agent. /// Starts a chat conversation with the agent.
Chat, Chat,
/// Displays the previous message in the history.
PreviousHistoryMessage,
/// Displays the next message in the history.
NextHistoryMessage,
/// Toggles the language model selector dropdown. /// Toggles the language model selector dropdown.
#[action(deprecated_aliases = ["assistant::ToggleModelSelector", "assistant2::ToggleModelSelector"])] #[action(deprecated_aliases = ["assistant::ToggleModelSelector", "assistant2::ToggleModelSelector"])]
ToggleModelSelector ToggleModelSelector