1use crate::{Keep, KeepAll, OpenAgentDiff, Reject, RejectAll};
2use acp_thread::{AcpThread, AcpThreadEvent};
3use action_log::ActionLog;
4use agent::{Thread, ThreadEvent, ThreadSummary};
5use agent_settings::AgentSettings;
6use anyhow::Result;
7use buffer_diff::DiffHunkStatus;
8use collections::{HashMap, HashSet};
9use editor::{
10 Direction, Editor, EditorEvent, EditorSettings, MultiBuffer, MultiBufferSnapshot,
11 SelectionEffects, ToPoint,
12 actions::{GoToHunk, GoToPreviousHunk},
13 scroll::Autoscroll,
14};
15use gpui::{
16 Action, Animation, AnimationExt, AnyElement, AnyView, App, AppContext, Empty, Entity,
17 EventEmitter, FocusHandle, Focusable, Global, SharedString, Subscription, Task, Transformation,
18 WeakEntity, Window, percentage, prelude::*,
19};
20
21use language::{Buffer, Capability, DiskState, OffsetRangeExt, Point};
22use language_model::StopReason;
23use multi_buffer::PathKey;
24use project::{Project, ProjectItem, ProjectPath};
25use settings::{Settings, SettingsStore};
26use std::{
27 any::{Any, TypeId},
28 collections::hash_map::Entry,
29 ops::Range,
30 sync::Arc,
31 time::Duration,
32};
33use ui::{IconButtonShape, KeyBinding, Tooltip, prelude::*, vertical_divider};
34use util::ResultExt;
35use workspace::{
36 Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
37 Workspace,
38 item::{BreadcrumbText, ItemEvent, SaveOptions, TabContentParams},
39 searchable::SearchableItemHandle,
40};
41use zed_actions::assistant::ToggleFocus;
42
43pub struct AgentDiffPane {
44 multibuffer: Entity<MultiBuffer>,
45 editor: Entity<Editor>,
46 thread: AgentDiffThread,
47 focus_handle: FocusHandle,
48 workspace: WeakEntity<Workspace>,
49 title: SharedString,
50 _subscriptions: Vec<Subscription>,
51}
52
53#[derive(PartialEq, Eq, Clone)]
54pub enum AgentDiffThread {
55 Native(Entity<Thread>),
56 AcpThread(Entity<AcpThread>),
57}
58
59impl AgentDiffThread {
60 fn project(&self, cx: &App) -> Entity<Project> {
61 match self {
62 AgentDiffThread::Native(thread) => thread.read(cx).project().clone(),
63 AgentDiffThread::AcpThread(thread) => thread.read(cx).project().clone(),
64 }
65 }
66 fn action_log(&self, cx: &App) -> Entity<ActionLog> {
67 match self {
68 AgentDiffThread::Native(thread) => thread.read(cx).action_log().clone(),
69 AgentDiffThread::AcpThread(thread) => thread.read(cx).action_log().clone(),
70 }
71 }
72
73 fn summary(&self, cx: &App) -> ThreadSummary {
74 match self {
75 AgentDiffThread::Native(thread) => thread.read(cx).summary().clone(),
76 AgentDiffThread::AcpThread(thread) => ThreadSummary::Ready(thread.read(cx).title()),
77 }
78 }
79
80 fn is_generating(&self, cx: &App) -> bool {
81 match self {
82 AgentDiffThread::Native(thread) => thread.read(cx).is_generating(),
83 AgentDiffThread::AcpThread(thread) => {
84 thread.read(cx).status() == acp_thread::ThreadStatus::Generating
85 }
86 }
87 }
88
89 fn has_pending_edit_tool_uses(&self, cx: &App) -> bool {
90 match self {
91 AgentDiffThread::Native(thread) => thread.read(cx).has_pending_edit_tool_uses(),
92 AgentDiffThread::AcpThread(thread) => thread.read(cx).has_pending_edit_tool_calls(),
93 }
94 }
95
96 fn downgrade(&self) -> WeakAgentDiffThread {
97 match self {
98 AgentDiffThread::Native(thread) => WeakAgentDiffThread::Native(thread.downgrade()),
99 AgentDiffThread::AcpThread(thread) => {
100 WeakAgentDiffThread::AcpThread(thread.downgrade())
101 }
102 }
103 }
104}
105
106impl From<Entity<Thread>> for AgentDiffThread {
107 fn from(entity: Entity<Thread>) -> Self {
108 AgentDiffThread::Native(entity)
109 }
110}
111
112impl From<Entity<AcpThread>> for AgentDiffThread {
113 fn from(entity: Entity<AcpThread>) -> Self {
114 AgentDiffThread::AcpThread(entity)
115 }
116}
117
118#[derive(PartialEq, Eq, Clone)]
119pub enum WeakAgentDiffThread {
120 Native(WeakEntity<Thread>),
121 AcpThread(WeakEntity<AcpThread>),
122}
123
124impl WeakAgentDiffThread {
125 pub fn upgrade(&self) -> Option<AgentDiffThread> {
126 match self {
127 WeakAgentDiffThread::Native(weak) => weak.upgrade().map(AgentDiffThread::Native),
128 WeakAgentDiffThread::AcpThread(weak) => weak.upgrade().map(AgentDiffThread::AcpThread),
129 }
130 }
131}
132
133impl From<WeakEntity<Thread>> for WeakAgentDiffThread {
134 fn from(entity: WeakEntity<Thread>) -> Self {
135 WeakAgentDiffThread::Native(entity)
136 }
137}
138
139impl From<WeakEntity<AcpThread>> for WeakAgentDiffThread {
140 fn from(entity: WeakEntity<AcpThread>) -> Self {
141 WeakAgentDiffThread::AcpThread(entity)
142 }
143}
144
145impl AgentDiffPane {
146 pub fn deploy(
147 thread: impl Into<AgentDiffThread>,
148 workspace: WeakEntity<Workspace>,
149 window: &mut Window,
150 cx: &mut App,
151 ) -> Result<Entity<Self>> {
152 workspace.update(cx, |workspace, cx| {
153 Self::deploy_in_workspace(thread, workspace, window, cx)
154 })
155 }
156
157 pub fn deploy_in_workspace(
158 thread: impl Into<AgentDiffThread>,
159 workspace: &mut Workspace,
160 window: &mut Window,
161 cx: &mut Context<Workspace>,
162 ) -> Entity<Self> {
163 let thread = thread.into();
164 let existing_diff = workspace
165 .items_of_type::<AgentDiffPane>(cx)
166 .find(|diff| diff.read(cx).thread == thread);
167
168 if let Some(existing_diff) = existing_diff {
169 workspace.activate_item(&existing_diff, true, true, window, cx);
170 existing_diff
171 } else {
172 let agent_diff = cx
173 .new(|cx| AgentDiffPane::new(thread.clone(), workspace.weak_handle(), window, cx));
174 workspace.add_item_to_center(Box::new(agent_diff.clone()), window, cx);
175 agent_diff
176 }
177 }
178
179 pub fn new(
180 thread: AgentDiffThread,
181 workspace: WeakEntity<Workspace>,
182 window: &mut Window,
183 cx: &mut Context<Self>,
184 ) -> Self {
185 let focus_handle = cx.focus_handle();
186 let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
187
188 let project = thread.project(cx).clone();
189 let editor = cx.new(|cx| {
190 let mut editor =
191 Editor::for_multibuffer(multibuffer.clone(), Some(project.clone()), window, cx);
192 editor.disable_inline_diagnostics();
193 editor.set_expand_all_diff_hunks(cx);
194 editor.set_render_diff_hunk_controls(diff_hunk_controls(&thread), cx);
195 editor.register_addon(AgentDiffAddon);
196 editor
197 });
198
199 let action_log = thread.action_log(cx).clone();
200
201 let mut this = Self {
202 _subscriptions: [
203 Some(
204 cx.observe_in(&action_log, window, |this, _action_log, window, cx| {
205 this.update_excerpts(window, cx)
206 }),
207 ),
208 match &thread {
209 AgentDiffThread::Native(thread) => {
210 Some(cx.subscribe(thread, |this, _thread, event, cx| {
211 this.handle_thread_event(event, cx)
212 }))
213 }
214 AgentDiffThread::AcpThread(_) => None,
215 },
216 ]
217 .into_iter()
218 .flatten()
219 .collect(),
220 title: SharedString::default(),
221 multibuffer,
222 editor,
223 thread,
224 focus_handle,
225 workspace,
226 };
227 this.update_excerpts(window, cx);
228 this.update_title(cx);
229 this
230 }
231
232 fn update_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
233 let changed_buffers = self.thread.action_log(cx).read(cx).changed_buffers(cx);
234 let mut paths_to_delete = self.multibuffer.read(cx).paths().collect::<HashSet<_>>();
235
236 for (buffer, diff_handle) in changed_buffers {
237 if buffer.read(cx).file().is_none() {
238 continue;
239 }
240
241 let path_key = PathKey::for_buffer(&buffer, cx);
242 paths_to_delete.remove(&path_key);
243
244 let snapshot = buffer.read(cx).snapshot();
245 let diff = diff_handle.read(cx);
246
247 let diff_hunk_ranges = diff
248 .hunks_intersecting_range(
249 language::Anchor::MIN..language::Anchor::MAX,
250 &snapshot,
251 cx,
252 )
253 .map(|diff_hunk| diff_hunk.buffer_range.to_point(&snapshot))
254 .collect::<Vec<_>>();
255
256 let (was_empty, is_excerpt_newly_added) =
257 self.multibuffer.update(cx, |multibuffer, cx| {
258 let was_empty = multibuffer.is_empty();
259 let (_, is_excerpt_newly_added) = multibuffer.set_excerpts_for_path(
260 path_key.clone(),
261 buffer.clone(),
262 diff_hunk_ranges,
263 editor::DEFAULT_MULTIBUFFER_CONTEXT,
264 cx,
265 );
266 multibuffer.add_diff(diff_handle, cx);
267 (was_empty, is_excerpt_newly_added)
268 });
269
270 self.editor.update(cx, |editor, cx| {
271 if was_empty {
272 let first_hunk = editor
273 .diff_hunks_in_ranges(
274 &[editor::Anchor::min()..editor::Anchor::max()],
275 &self.multibuffer.read(cx).read(cx),
276 )
277 .next();
278
279 if let Some(first_hunk) = first_hunk {
280 let first_hunk_start = first_hunk.multi_buffer_range().start;
281 editor.change_selections(Default::default(), window, cx, |selections| {
282 selections.select_anchor_ranges([first_hunk_start..first_hunk_start]);
283 })
284 }
285 }
286
287 if is_excerpt_newly_added
288 && buffer
289 .read(cx)
290 .file()
291 .map_or(false, |file| file.disk_state() == DiskState::Deleted)
292 {
293 editor.fold_buffer(snapshot.text.remote_id(), cx)
294 }
295 });
296 }
297
298 self.multibuffer.update(cx, |multibuffer, cx| {
299 for path in paths_to_delete {
300 multibuffer.remove_excerpts_for_path(path, cx);
301 }
302 });
303
304 if self.multibuffer.read(cx).is_empty()
305 && self
306 .editor
307 .read(cx)
308 .focus_handle(cx)
309 .contains_focused(window, cx)
310 {
311 self.focus_handle.focus(window);
312 } else if self.focus_handle.is_focused(window) && !self.multibuffer.read(cx).is_empty() {
313 self.editor.update(cx, |editor, cx| {
314 editor.focus_handle(cx).focus(window);
315 });
316 }
317 }
318
319 fn update_title(&mut self, cx: &mut Context<Self>) {
320 let new_title = self.thread.summary(cx).unwrap_or("Agent Changes");
321 if new_title != self.title {
322 self.title = new_title;
323 cx.emit(EditorEvent::TitleChanged);
324 }
325 }
326
327 fn handle_thread_event(&mut self, event: &ThreadEvent, cx: &mut Context<Self>) {
328 match event {
329 ThreadEvent::SummaryGenerated => self.update_title(cx),
330 _ => {}
331 }
332 }
333
334 pub fn move_to_path(&self, path_key: PathKey, window: &mut Window, cx: &mut App) {
335 if let Some(position) = self.multibuffer.read(cx).location_for_path(&path_key, cx) {
336 self.editor.update(cx, |editor, cx| {
337 let first_hunk = editor
338 .diff_hunks_in_ranges(
339 &[position..editor::Anchor::max()],
340 &self.multibuffer.read(cx).read(cx),
341 )
342 .next();
343
344 if let Some(first_hunk) = first_hunk {
345 let first_hunk_start = first_hunk.multi_buffer_range().start;
346 editor.change_selections(Default::default(), window, cx, |selections| {
347 selections.select_anchor_ranges([first_hunk_start..first_hunk_start]);
348 })
349 }
350 });
351 }
352 }
353
354 fn keep(&mut self, _: &Keep, window: &mut Window, cx: &mut Context<Self>) {
355 self.editor.update(cx, |editor, cx| {
356 let snapshot = editor.buffer().read(cx).snapshot(cx);
357 keep_edits_in_selection(editor, &snapshot, &self.thread, window, cx);
358 });
359 }
360
361 fn reject(&mut self, _: &Reject, window: &mut Window, cx: &mut Context<Self>) {
362 self.editor.update(cx, |editor, cx| {
363 let snapshot = editor.buffer().read(cx).snapshot(cx);
364 reject_edits_in_selection(editor, &snapshot, &self.thread, window, cx);
365 });
366 }
367
368 fn reject_all(&mut self, _: &RejectAll, window: &mut Window, cx: &mut Context<Self>) {
369 self.editor.update(cx, |editor, cx| {
370 let snapshot = editor.buffer().read(cx).snapshot(cx);
371 reject_edits_in_ranges(
372 editor,
373 &snapshot,
374 &self.thread,
375 vec![editor::Anchor::min()..editor::Anchor::max()],
376 window,
377 cx,
378 );
379 });
380 }
381
382 fn keep_all(&mut self, _: &KeepAll, _window: &mut Window, cx: &mut Context<Self>) {
383 self.thread
384 .action_log(cx)
385 .update(cx, |action_log, cx| action_log.keep_all_edits(cx))
386 }
387}
388
389fn keep_edits_in_selection(
390 editor: &mut Editor,
391 buffer_snapshot: &MultiBufferSnapshot,
392 thread: &AgentDiffThread,
393 window: &mut Window,
394 cx: &mut Context<Editor>,
395) {
396 let ranges = editor
397 .selections
398 .disjoint_anchor_ranges()
399 .collect::<Vec<_>>();
400
401 keep_edits_in_ranges(editor, buffer_snapshot, thread, ranges, window, cx)
402}
403
404fn reject_edits_in_selection(
405 editor: &mut Editor,
406 buffer_snapshot: &MultiBufferSnapshot,
407 thread: &AgentDiffThread,
408 window: &mut Window,
409 cx: &mut Context<Editor>,
410) {
411 let ranges = editor
412 .selections
413 .disjoint_anchor_ranges()
414 .collect::<Vec<_>>();
415 reject_edits_in_ranges(editor, buffer_snapshot, thread, ranges, window, cx)
416}
417
418fn keep_edits_in_ranges(
419 editor: &mut Editor,
420 buffer_snapshot: &MultiBufferSnapshot,
421 thread: &AgentDiffThread,
422 ranges: Vec<Range<editor::Anchor>>,
423 window: &mut Window,
424 cx: &mut Context<Editor>,
425) {
426 let diff_hunks_in_ranges = editor
427 .diff_hunks_in_ranges(&ranges, buffer_snapshot)
428 .collect::<Vec<_>>();
429
430 update_editor_selection(editor, buffer_snapshot, &diff_hunks_in_ranges, window, cx);
431
432 let multibuffer = editor.buffer().clone();
433 for hunk in &diff_hunks_in_ranges {
434 let buffer = multibuffer.read(cx).buffer(hunk.buffer_id);
435 if let Some(buffer) = buffer {
436 thread.action_log(cx).update(cx, |action_log, cx| {
437 action_log.keep_edits_in_range(buffer, hunk.buffer_range.clone(), cx)
438 });
439 }
440 }
441}
442
443fn reject_edits_in_ranges(
444 editor: &mut Editor,
445 buffer_snapshot: &MultiBufferSnapshot,
446 thread: &AgentDiffThread,
447 ranges: Vec<Range<editor::Anchor>>,
448 window: &mut Window,
449 cx: &mut Context<Editor>,
450) {
451 let diff_hunks_in_ranges = editor
452 .diff_hunks_in_ranges(&ranges, buffer_snapshot)
453 .collect::<Vec<_>>();
454
455 update_editor_selection(editor, buffer_snapshot, &diff_hunks_in_ranges, window, cx);
456
457 let multibuffer = editor.buffer().clone();
458
459 let mut ranges_by_buffer = HashMap::default();
460 for hunk in &diff_hunks_in_ranges {
461 let buffer = multibuffer.read(cx).buffer(hunk.buffer_id);
462 if let Some(buffer) = buffer {
463 ranges_by_buffer
464 .entry(buffer.clone())
465 .or_insert_with(Vec::new)
466 .push(hunk.buffer_range.clone());
467 }
468 }
469
470 for (buffer, ranges) in ranges_by_buffer {
471 thread
472 .action_log(cx)
473 .update(cx, |action_log, cx| {
474 action_log.reject_edits_in_ranges(buffer, ranges, cx)
475 })
476 .detach_and_log_err(cx);
477 }
478}
479
480fn update_editor_selection(
481 editor: &mut Editor,
482 buffer_snapshot: &MultiBufferSnapshot,
483 diff_hunks: &[multi_buffer::MultiBufferDiffHunk],
484 window: &mut Window,
485 cx: &mut Context<Editor>,
486) {
487 let newest_cursor = editor.selections.newest::<Point>(cx).head();
488
489 if !diff_hunks.iter().any(|hunk| {
490 hunk.row_range
491 .contains(&multi_buffer::MultiBufferRow(newest_cursor.row))
492 }) {
493 return;
494 }
495
496 let target_hunk = {
497 diff_hunks
498 .last()
499 .and_then(|last_kept_hunk| {
500 let last_kept_hunk_end = last_kept_hunk.multi_buffer_range().end;
501 editor
502 .diff_hunks_in_ranges(
503 &[last_kept_hunk_end..editor::Anchor::max()],
504 buffer_snapshot,
505 )
506 .nth(1)
507 })
508 .or_else(|| {
509 let first_kept_hunk = diff_hunks.first()?;
510 let first_kept_hunk_start = first_kept_hunk.multi_buffer_range().start;
511 editor
512 .diff_hunks_in_ranges(
513 &[editor::Anchor::min()..first_kept_hunk_start],
514 buffer_snapshot,
515 )
516 .next()
517 })
518 };
519
520 if let Some(target_hunk) = target_hunk {
521 editor.change_selections(Default::default(), window, cx, |selections| {
522 let next_hunk_start = target_hunk.multi_buffer_range().start;
523 selections.select_anchor_ranges([next_hunk_start..next_hunk_start]);
524 })
525 }
526}
527
528impl EventEmitter<EditorEvent> for AgentDiffPane {}
529
530impl Focusable for AgentDiffPane {
531 fn focus_handle(&self, cx: &App) -> FocusHandle {
532 if self.multibuffer.read(cx).is_empty() {
533 self.focus_handle.clone()
534 } else {
535 self.editor.focus_handle(cx)
536 }
537 }
538}
539
540impl Item for AgentDiffPane {
541 type Event = EditorEvent;
542
543 fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
544 Some(Icon::new(IconName::ZedAssistant).color(Color::Muted))
545 }
546
547 fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) {
548 Editor::to_item_events(event, f)
549 }
550
551 fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
552 self.editor
553 .update(cx, |editor, cx| editor.deactivated(window, cx));
554 }
555
556 fn navigate(
557 &mut self,
558 data: Box<dyn Any>,
559 window: &mut Window,
560 cx: &mut Context<Self>,
561 ) -> bool {
562 self.editor
563 .update(cx, |editor, cx| editor.navigate(data, window, cx))
564 }
565
566 fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
567 Some("Agent Diff".into())
568 }
569
570 fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
571 let summary = self.thread.summary(cx).unwrap_or("Agent Changes");
572 Label::new(format!("Review: {}", summary))
573 .color(if params.selected {
574 Color::Default
575 } else {
576 Color::Muted
577 })
578 .into_any_element()
579 }
580
581 fn telemetry_event_text(&self) -> Option<&'static str> {
582 Some("Assistant Diff Opened")
583 }
584
585 fn as_searchable(&self, _: &Entity<Self>) -> Option<Box<dyn SearchableItemHandle>> {
586 Some(Box::new(self.editor.clone()))
587 }
588
589 fn for_each_project_item(
590 &self,
591 cx: &App,
592 f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
593 ) {
594 self.editor.for_each_project_item(cx, f)
595 }
596
597 fn is_singleton(&self, _: &App) -> bool {
598 false
599 }
600
601 fn set_nav_history(
602 &mut self,
603 nav_history: ItemNavHistory,
604 _: &mut Window,
605 cx: &mut Context<Self>,
606 ) {
607 self.editor.update(cx, |editor, _| {
608 editor.set_nav_history(Some(nav_history));
609 });
610 }
611
612 fn clone_on_split(
613 &self,
614 _workspace_id: Option<workspace::WorkspaceId>,
615 window: &mut Window,
616 cx: &mut Context<Self>,
617 ) -> Option<Entity<Self>>
618 where
619 Self: Sized,
620 {
621 Some(cx.new(|cx| Self::new(self.thread.clone(), self.workspace.clone(), window, cx)))
622 }
623
624 fn is_dirty(&self, cx: &App) -> bool {
625 self.multibuffer.read(cx).is_dirty(cx)
626 }
627
628 fn has_conflict(&self, cx: &App) -> bool {
629 self.multibuffer.read(cx).has_conflict(cx)
630 }
631
632 fn can_save(&self, _: &App) -> bool {
633 true
634 }
635
636 fn save(
637 &mut self,
638 options: SaveOptions,
639 project: Entity<Project>,
640 window: &mut Window,
641 cx: &mut Context<Self>,
642 ) -> Task<Result<()>> {
643 self.editor.save(options, project, window, cx)
644 }
645
646 fn save_as(
647 &mut self,
648 _: Entity<Project>,
649 _: ProjectPath,
650 _window: &mut Window,
651 _: &mut Context<Self>,
652 ) -> Task<Result<()>> {
653 unreachable!()
654 }
655
656 fn reload(
657 &mut self,
658 project: Entity<Project>,
659 window: &mut Window,
660 cx: &mut Context<Self>,
661 ) -> Task<Result<()>> {
662 self.editor.reload(project, window, cx)
663 }
664
665 fn act_as_type<'a>(
666 &'a self,
667 type_id: TypeId,
668 self_handle: &'a Entity<Self>,
669 _: &'a App,
670 ) -> Option<AnyView> {
671 if type_id == TypeId::of::<Self>() {
672 Some(self_handle.to_any())
673 } else if type_id == TypeId::of::<Editor>() {
674 Some(self.editor.to_any())
675 } else {
676 None
677 }
678 }
679
680 fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
681 ToolbarItemLocation::PrimaryLeft
682 }
683
684 fn breadcrumbs(&self, theme: &theme::Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
685 self.editor.breadcrumbs(theme, cx)
686 }
687
688 fn added_to_workspace(
689 &mut self,
690 workspace: &mut Workspace,
691 window: &mut Window,
692 cx: &mut Context<Self>,
693 ) {
694 self.editor.update(cx, |editor, cx| {
695 editor.added_to_workspace(workspace, window, cx)
696 });
697 }
698
699 fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
700 "Agent Diff".into()
701 }
702}
703
704impl Render for AgentDiffPane {
705 fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
706 let is_empty = self.multibuffer.read(cx).is_empty();
707 let focus_handle = &self.focus_handle;
708
709 div()
710 .track_focus(focus_handle)
711 .key_context(if is_empty { "EmptyPane" } else { "AgentDiff" })
712 .on_action(cx.listener(Self::keep))
713 .on_action(cx.listener(Self::reject))
714 .on_action(cx.listener(Self::reject_all))
715 .on_action(cx.listener(Self::keep_all))
716 .bg(cx.theme().colors().editor_background)
717 .flex()
718 .items_center()
719 .justify_center()
720 .size_full()
721 .when(is_empty, |el| {
722 el.child(
723 v_flex()
724 .items_center()
725 .gap_2()
726 .child("No changes to review")
727 .child(
728 Button::new("continue-iterating", "Continue Iterating")
729 .style(ButtonStyle::Filled)
730 .icon(IconName::ForwardArrow)
731 .icon_position(IconPosition::Start)
732 .icon_size(IconSize::Small)
733 .icon_color(Color::Muted)
734 .full_width()
735 .key_binding(KeyBinding::for_action_in(
736 &ToggleFocus,
737 &focus_handle.clone(),
738 window,
739 cx,
740 ))
741 .on_click(|_event, window, cx| {
742 window.dispatch_action(ToggleFocus.boxed_clone(), cx)
743 }),
744 ),
745 )
746 })
747 .when(!is_empty, |el| el.child(self.editor.clone()))
748 }
749}
750
751fn diff_hunk_controls(thread: &AgentDiffThread) -> editor::RenderDiffHunkControlsFn {
752 let thread = thread.clone();
753
754 Arc::new(
755 move |row,
756 status: &DiffHunkStatus,
757 hunk_range,
758 is_created_file,
759 line_height,
760 editor: &Entity<Editor>,
761 window: &mut Window,
762 cx: &mut App| {
763 {
764 render_diff_hunk_controls(
765 row,
766 status,
767 hunk_range,
768 is_created_file,
769 line_height,
770 &thread,
771 editor,
772 window,
773 cx,
774 )
775 }
776 },
777 )
778}
779
780fn render_diff_hunk_controls(
781 row: u32,
782 _status: &DiffHunkStatus,
783 hunk_range: Range<editor::Anchor>,
784 is_created_file: bool,
785 line_height: Pixels,
786 thread: &AgentDiffThread,
787 editor: &Entity<Editor>,
788 window: &mut Window,
789 cx: &mut App,
790) -> AnyElement {
791 let editor = editor.clone();
792
793 h_flex()
794 .h(line_height)
795 .mr_0p5()
796 .gap_1()
797 .px_0p5()
798 .pb_1()
799 .border_x_1()
800 .border_b_1()
801 .border_color(cx.theme().colors().border)
802 .rounded_b_md()
803 .bg(cx.theme().colors().editor_background)
804 .gap_1()
805 .block_mouse_except_scroll()
806 .shadow_md()
807 .children(vec![
808 Button::new(("reject", row as u64), "Reject")
809 .disabled(is_created_file)
810 .key_binding(
811 KeyBinding::for_action_in(
812 &Reject,
813 &editor.read(cx).focus_handle(cx),
814 window,
815 cx,
816 )
817 .map(|kb| kb.size(rems_from_px(12.))),
818 )
819 .on_click({
820 let editor = editor.clone();
821 let thread = thread.clone();
822 move |_event, window, cx| {
823 editor.update(cx, |editor, cx| {
824 let snapshot = editor.buffer().read(cx).snapshot(cx);
825 reject_edits_in_ranges(
826 editor,
827 &snapshot,
828 &thread,
829 vec![hunk_range.start..hunk_range.start],
830 window,
831 cx,
832 );
833 })
834 }
835 }),
836 Button::new(("keep", row as u64), "Keep")
837 .key_binding(
838 KeyBinding::for_action_in(&Keep, &editor.read(cx).focus_handle(cx), window, cx)
839 .map(|kb| kb.size(rems_from_px(12.))),
840 )
841 .on_click({
842 let editor = editor.clone();
843 let thread = thread.clone();
844 move |_event, window, cx| {
845 editor.update(cx, |editor, cx| {
846 let snapshot = editor.buffer().read(cx).snapshot(cx);
847 keep_edits_in_ranges(
848 editor,
849 &snapshot,
850 &thread,
851 vec![hunk_range.start..hunk_range.start],
852 window,
853 cx,
854 );
855 });
856 }
857 }),
858 ])
859 .when(
860 !editor.read(cx).buffer().read(cx).all_diff_hunks_expanded(),
861 |el| {
862 el.child(
863 IconButton::new(("next-hunk", row as u64), IconName::ArrowDown)
864 .shape(IconButtonShape::Square)
865 .icon_size(IconSize::Small)
866 // .disabled(!has_multiple_hunks)
867 .tooltip({
868 let focus_handle = editor.focus_handle(cx);
869 move |window, cx| {
870 Tooltip::for_action_in(
871 "Next Hunk",
872 &GoToHunk,
873 &focus_handle,
874 window,
875 cx,
876 )
877 }
878 })
879 .on_click({
880 let editor = editor.clone();
881 move |_event, window, cx| {
882 editor.update(cx, |editor, cx| {
883 let snapshot = editor.snapshot(window, cx);
884 let position =
885 hunk_range.end.to_point(&snapshot.buffer_snapshot);
886 editor.go_to_hunk_before_or_after_position(
887 &snapshot,
888 position,
889 Direction::Next,
890 window,
891 cx,
892 );
893 editor.expand_selected_diff_hunks(cx);
894 });
895 }
896 }),
897 )
898 .child(
899 IconButton::new(("prev-hunk", row as u64), IconName::ArrowUp)
900 .shape(IconButtonShape::Square)
901 .icon_size(IconSize::Small)
902 // .disabled(!has_multiple_hunks)
903 .tooltip({
904 let focus_handle = editor.focus_handle(cx);
905 move |window, cx| {
906 Tooltip::for_action_in(
907 "Previous Hunk",
908 &GoToPreviousHunk,
909 &focus_handle,
910 window,
911 cx,
912 )
913 }
914 })
915 .on_click({
916 let editor = editor.clone();
917 move |_event, window, cx| {
918 editor.update(cx, |editor, cx| {
919 let snapshot = editor.snapshot(window, cx);
920 let point =
921 hunk_range.start.to_point(&snapshot.buffer_snapshot);
922 editor.go_to_hunk_before_or_after_position(
923 &snapshot,
924 point,
925 Direction::Prev,
926 window,
927 cx,
928 );
929 editor.expand_selected_diff_hunks(cx);
930 });
931 }
932 }),
933 )
934 },
935 )
936 .into_any_element()
937}
938
939struct AgentDiffAddon;
940
941impl editor::Addon for AgentDiffAddon {
942 fn to_any(&self) -> &dyn std::any::Any {
943 self
944 }
945
946 fn extend_key_context(&self, key_context: &mut gpui::KeyContext, _: &App) {
947 key_context.add("agent_diff");
948 }
949}
950
951pub struct AgentDiffToolbar {
952 active_item: Option<AgentDiffToolbarItem>,
953 _settings_subscription: Subscription,
954}
955
956pub enum AgentDiffToolbarItem {
957 Pane(WeakEntity<AgentDiffPane>),
958 Editor {
959 editor: WeakEntity<Editor>,
960 state: EditorState,
961 _diff_subscription: Subscription,
962 },
963}
964
965impl AgentDiffToolbar {
966 pub fn new(cx: &mut Context<Self>) -> Self {
967 Self {
968 active_item: None,
969 _settings_subscription: cx.observe_global::<SettingsStore>(Self::update_location),
970 }
971 }
972
973 fn dispatch_action(&self, action: &dyn Action, window: &mut Window, cx: &mut Context<Self>) {
974 let Some(active_item) = self.active_item.as_ref() else {
975 return;
976 };
977
978 match active_item {
979 AgentDiffToolbarItem::Pane(agent_diff) => {
980 if let Some(agent_diff) = agent_diff.upgrade() {
981 agent_diff.focus_handle(cx).focus(window);
982 }
983 }
984 AgentDiffToolbarItem::Editor { editor, .. } => {
985 if let Some(editor) = editor.upgrade() {
986 editor.read(cx).focus_handle(cx).focus(window);
987 }
988 }
989 }
990
991 let action = action.boxed_clone();
992 cx.defer(move |cx| {
993 cx.dispatch_action(action.as_ref());
994 })
995 }
996
997 fn handle_diff_notify(&mut self, agent_diff: Entity<AgentDiff>, cx: &mut Context<Self>) {
998 let Some(AgentDiffToolbarItem::Editor { editor, state, .. }) = self.active_item.as_mut()
999 else {
1000 return;
1001 };
1002
1003 *state = agent_diff.read(cx).editor_state(editor);
1004 self.update_location(cx);
1005 cx.notify();
1006 }
1007
1008 fn update_location(&mut self, cx: &mut Context<Self>) {
1009 let location = self.location(cx);
1010 cx.emit(ToolbarItemEvent::ChangeLocation(location));
1011 }
1012
1013 fn location(&self, cx: &App) -> ToolbarItemLocation {
1014 if !EditorSettings::get_global(cx).toolbar.agent_review {
1015 return ToolbarItemLocation::Hidden;
1016 }
1017
1018 match &self.active_item {
1019 None => ToolbarItemLocation::Hidden,
1020 Some(AgentDiffToolbarItem::Pane(_)) => ToolbarItemLocation::PrimaryRight,
1021 Some(AgentDiffToolbarItem::Editor { state, .. }) => match state {
1022 EditorState::Generating | EditorState::Reviewing => {
1023 ToolbarItemLocation::PrimaryRight
1024 }
1025 EditorState::Idle => ToolbarItemLocation::Hidden,
1026 },
1027 }
1028 }
1029}
1030
1031impl EventEmitter<ToolbarItemEvent> for AgentDiffToolbar {}
1032
1033impl ToolbarItemView for AgentDiffToolbar {
1034 fn set_active_pane_item(
1035 &mut self,
1036 active_pane_item: Option<&dyn ItemHandle>,
1037 _: &mut Window,
1038 cx: &mut Context<Self>,
1039 ) -> ToolbarItemLocation {
1040 if let Some(item) = active_pane_item {
1041 if let Some(pane) = item.act_as::<AgentDiffPane>(cx) {
1042 self.active_item = Some(AgentDiffToolbarItem::Pane(pane.downgrade()));
1043 return self.location(cx);
1044 }
1045
1046 if let Some(editor) = item.act_as::<Editor>(cx)
1047 && editor.read(cx).mode().is_full() {
1048 let agent_diff = AgentDiff::global(cx);
1049
1050 self.active_item = Some(AgentDiffToolbarItem::Editor {
1051 editor: editor.downgrade(),
1052 state: agent_diff.read(cx).editor_state(&editor.downgrade()),
1053 _diff_subscription: cx.observe(&agent_diff, Self::handle_diff_notify),
1054 });
1055
1056 return self.location(cx);
1057 }
1058 }
1059
1060 self.active_item = None;
1061 return self.location(cx);
1062 }
1063
1064 fn pane_focus_update(
1065 &mut self,
1066 _pane_focused: bool,
1067 _window: &mut Window,
1068 _cx: &mut Context<Self>,
1069 ) {
1070 }
1071}
1072
1073impl Render for AgentDiffToolbar {
1074 fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
1075 let spinner_icon = div()
1076 .px_0p5()
1077 .id("generating")
1078 .tooltip(Tooltip::text("Generating Changes…"))
1079 .child(
1080 Icon::new(IconName::LoadCircle)
1081 .size(IconSize::Small)
1082 .color(Color::Accent)
1083 .with_animation(
1084 "load_circle",
1085 Animation::new(Duration::from_secs(3)).repeat(),
1086 |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
1087 ),
1088 )
1089 .into_any();
1090
1091 let Some(active_item) = self.active_item.as_ref() else {
1092 return Empty.into_any();
1093 };
1094
1095 match active_item {
1096 AgentDiffToolbarItem::Editor { editor, state, .. } => {
1097 let Some(editor) = editor.upgrade() else {
1098 return Empty.into_any();
1099 };
1100
1101 let editor_focus_handle = editor.read(cx).focus_handle(cx);
1102
1103 let content = match state {
1104 EditorState::Idle => return Empty.into_any(),
1105 EditorState::Generating => vec![spinner_icon],
1106 EditorState::Reviewing => vec![
1107 h_flex()
1108 .child(
1109 IconButton::new("hunk-up", IconName::ArrowUp)
1110 .icon_size(IconSize::Small)
1111 .tooltip(Tooltip::for_action_title_in(
1112 "Previous Hunk",
1113 &GoToPreviousHunk,
1114 &editor_focus_handle,
1115 ))
1116 .on_click({
1117 let editor_focus_handle = editor_focus_handle.clone();
1118 move |_, window, cx| {
1119 editor_focus_handle.dispatch_action(
1120 &GoToPreviousHunk,
1121 window,
1122 cx,
1123 );
1124 }
1125 }),
1126 )
1127 .child(
1128 IconButton::new("hunk-down", IconName::ArrowDown)
1129 .icon_size(IconSize::Small)
1130 .tooltip(Tooltip::for_action_title_in(
1131 "Next Hunk",
1132 &GoToHunk,
1133 &editor_focus_handle,
1134 ))
1135 .on_click({
1136 let editor_focus_handle = editor_focus_handle.clone();
1137 move |_, window, cx| {
1138 editor_focus_handle
1139 .dispatch_action(&GoToHunk, window, cx);
1140 }
1141 }),
1142 )
1143 .into_any_element(),
1144 vertical_divider().into_any_element(),
1145 h_flex()
1146 .gap_0p5()
1147 .child(
1148 Button::new("reject-all", "Reject All")
1149 .key_binding({
1150 KeyBinding::for_action_in(
1151 &RejectAll,
1152 &editor_focus_handle,
1153 window,
1154 cx,
1155 )
1156 .map(|kb| kb.size(rems_from_px(12.)))
1157 })
1158 .on_click(cx.listener(|this, _, window, cx| {
1159 this.dispatch_action(&RejectAll, window, cx)
1160 })),
1161 )
1162 .child(
1163 Button::new("keep-all", "Keep All")
1164 .key_binding({
1165 KeyBinding::for_action_in(
1166 &KeepAll,
1167 &editor_focus_handle,
1168 window,
1169 cx,
1170 )
1171 .map(|kb| kb.size(rems_from_px(12.)))
1172 })
1173 .on_click(cx.listener(|this, _, window, cx| {
1174 this.dispatch_action(&KeepAll, window, cx)
1175 })),
1176 )
1177 .into_any_element(),
1178 ],
1179 };
1180
1181 h_flex()
1182 .track_focus(&editor_focus_handle)
1183 .size_full()
1184 .px_1()
1185 .mr_1()
1186 .gap_1()
1187 .children(content)
1188 .child(vertical_divider())
1189 .when_some(editor.read(cx).workspace(), |this, _workspace| {
1190 this.child(
1191 IconButton::new("review", IconName::ListTodo)
1192 .icon_size(IconSize::Small)
1193 .tooltip(Tooltip::for_action_title_in(
1194 "Review All Files",
1195 &OpenAgentDiff,
1196 &editor_focus_handle,
1197 ))
1198 .on_click({
1199 cx.listener(move |this, _, window, cx| {
1200 this.dispatch_action(&OpenAgentDiff, window, cx);
1201 })
1202 }),
1203 )
1204 })
1205 .child(vertical_divider())
1206 .on_action({
1207 let editor = editor.clone();
1208 move |_action: &OpenAgentDiff, window, cx| {
1209 AgentDiff::global(cx).update(cx, |agent_diff, cx| {
1210 agent_diff.deploy_pane_from_editor(&editor, window, cx);
1211 });
1212 }
1213 })
1214 .into_any()
1215 }
1216 AgentDiffToolbarItem::Pane(agent_diff) => {
1217 let Some(agent_diff) = agent_diff.upgrade() else {
1218 return Empty.into_any();
1219 };
1220
1221 let has_pending_edit_tool_use =
1222 agent_diff.read(cx).thread.has_pending_edit_tool_uses(cx);
1223
1224 if has_pending_edit_tool_use {
1225 return div().px_2().child(spinner_icon).into_any();
1226 }
1227
1228 let is_empty = agent_diff.read(cx).multibuffer.read(cx).is_empty();
1229 if is_empty {
1230 return Empty.into_any();
1231 }
1232
1233 let focus_handle = agent_diff.focus_handle(cx);
1234
1235 h_group_xl()
1236 .my_neg_1()
1237 .py_1()
1238 .items_center()
1239 .flex_wrap()
1240 .child(
1241 h_group_sm()
1242 .child(
1243 Button::new("reject-all", "Reject All")
1244 .key_binding({
1245 KeyBinding::for_action_in(
1246 &RejectAll,
1247 &focus_handle,
1248 window,
1249 cx,
1250 )
1251 .map(|kb| kb.size(rems_from_px(12.)))
1252 })
1253 .on_click(cx.listener(|this, _, window, cx| {
1254 this.dispatch_action(&RejectAll, window, cx)
1255 })),
1256 )
1257 .child(
1258 Button::new("keep-all", "Keep All")
1259 .key_binding({
1260 KeyBinding::for_action_in(
1261 &KeepAll,
1262 &focus_handle,
1263 window,
1264 cx,
1265 )
1266 .map(|kb| kb.size(rems_from_px(12.)))
1267 })
1268 .on_click(cx.listener(|this, _, window, cx| {
1269 this.dispatch_action(&KeepAll, window, cx)
1270 })),
1271 ),
1272 )
1273 .into_any()
1274 }
1275 }
1276 }
1277}
1278
1279#[derive(Default)]
1280pub struct AgentDiff {
1281 reviewing_editors: HashMap<WeakEntity<Editor>, EditorState>,
1282 workspace_threads: HashMap<WeakEntity<Workspace>, WorkspaceThread>,
1283}
1284
1285#[derive(Clone, Debug, PartialEq, Eq)]
1286pub enum EditorState {
1287 Idle,
1288 Reviewing,
1289 Generating,
1290}
1291
1292struct WorkspaceThread {
1293 thread: WeakAgentDiffThread,
1294 _thread_subscriptions: (Subscription, Subscription),
1295 singleton_editors: HashMap<WeakEntity<Buffer>, HashMap<WeakEntity<Editor>, Subscription>>,
1296 _settings_subscription: Subscription,
1297 _workspace_subscription: Option<Subscription>,
1298}
1299
1300struct AgentDiffGlobal(Entity<AgentDiff>);
1301
1302impl Global for AgentDiffGlobal {}
1303
1304impl AgentDiff {
1305 fn global(cx: &mut App) -> Entity<Self> {
1306 cx.try_global::<AgentDiffGlobal>()
1307 .map(|global| global.0.clone())
1308 .unwrap_or_else(|| {
1309 let entity = cx.new(|_cx| Self::default());
1310 let global = AgentDiffGlobal(entity.clone());
1311 cx.set_global(global);
1312 entity.clone()
1313 })
1314 }
1315
1316 pub fn set_active_thread(
1317 workspace: &WeakEntity<Workspace>,
1318 thread: impl Into<AgentDiffThread>,
1319 window: &mut Window,
1320 cx: &mut App,
1321 ) {
1322 Self::global(cx).update(cx, |this, cx| {
1323 this.register_active_thread_impl(workspace, thread.into(), window, cx);
1324 });
1325 }
1326
1327 fn register_active_thread_impl(
1328 &mut self,
1329 workspace: &WeakEntity<Workspace>,
1330 thread: AgentDiffThread,
1331 window: &mut Window,
1332 cx: &mut Context<Self>,
1333 ) {
1334 let action_log = thread.action_log(cx).clone();
1335
1336 let action_log_subscription = cx.observe_in(&action_log, window, {
1337 let workspace = workspace.clone();
1338 move |this, _action_log, window, cx| {
1339 this.update_reviewing_editors(&workspace, window, cx);
1340 }
1341 });
1342
1343 let thread_subscription = match &thread {
1344 AgentDiffThread::Native(thread) => cx.subscribe_in(thread, window, {
1345 let workspace = workspace.clone();
1346 move |this, _thread, event, window, cx| {
1347 this.handle_native_thread_event(&workspace, event, window, cx)
1348 }
1349 }),
1350 AgentDiffThread::AcpThread(thread) => cx.subscribe_in(thread, window, {
1351 let workspace = workspace.clone();
1352 move |this, thread, event, window, cx| {
1353 this.handle_acp_thread_event(&workspace, thread, event, window, cx)
1354 }
1355 }),
1356 };
1357
1358 if let Some(workspace_thread) = self.workspace_threads.get_mut(workspace) {
1359 // replace thread and action log subscription, but keep editors
1360 workspace_thread.thread = thread.downgrade();
1361 workspace_thread._thread_subscriptions = (action_log_subscription, thread_subscription);
1362 self.update_reviewing_editors(workspace, window, cx);
1363 return;
1364 }
1365
1366 let settings_subscription = cx.observe_global_in::<SettingsStore>(window, {
1367 let workspace = workspace.clone();
1368 let mut was_active = AgentSettings::get_global(cx).single_file_review;
1369 move |this, window, cx| {
1370 let is_active = AgentSettings::get_global(cx).single_file_review;
1371 if was_active != is_active {
1372 was_active = is_active;
1373 this.update_reviewing_editors(&workspace, window, cx);
1374 }
1375 }
1376 });
1377
1378 let workspace_subscription = workspace
1379 .upgrade()
1380 .map(|workspace| cx.subscribe_in(&workspace, window, Self::handle_workspace_event));
1381
1382 self.workspace_threads.insert(
1383 workspace.clone(),
1384 WorkspaceThread {
1385 thread: thread.downgrade(),
1386 _thread_subscriptions: (action_log_subscription, thread_subscription),
1387 singleton_editors: HashMap::default(),
1388 _settings_subscription: settings_subscription,
1389 _workspace_subscription: workspace_subscription,
1390 },
1391 );
1392
1393 let workspace = workspace.clone();
1394 cx.defer_in(window, move |this, window, cx| {
1395 if let Some(workspace) = workspace.upgrade() {
1396 this.register_workspace(workspace, window, cx);
1397 }
1398 });
1399 }
1400
1401 fn register_workspace(
1402 &mut self,
1403 workspace: Entity<Workspace>,
1404 window: &mut Window,
1405 cx: &mut Context<Self>,
1406 ) {
1407 let agent_diff = cx.entity();
1408
1409 let editors = workspace.update(cx, |workspace, cx| {
1410 let agent_diff = agent_diff.clone();
1411
1412 Self::register_review_action::<Keep>(workspace, Self::keep, &agent_diff);
1413 Self::register_review_action::<Reject>(workspace, Self::reject, &agent_diff);
1414 Self::register_review_action::<KeepAll>(workspace, Self::keep_all, &agent_diff);
1415 Self::register_review_action::<RejectAll>(workspace, Self::reject_all, &agent_diff);
1416
1417 workspace.items_of_type(cx).collect::<Vec<_>>()
1418 });
1419
1420 let weak_workspace = workspace.downgrade();
1421
1422 for editor in editors {
1423 if let Some(buffer) = Self::full_editor_buffer(editor.read(cx), cx) {
1424 self.register_editor(weak_workspace.clone(), buffer, editor, window, cx);
1425 };
1426 }
1427
1428 self.update_reviewing_editors(&weak_workspace, window, cx);
1429 }
1430
1431 fn register_review_action<T: Action>(
1432 workspace: &mut Workspace,
1433 review: impl Fn(&Entity<Editor>, &AgentDiffThread, &mut Window, &mut App) -> PostReviewState
1434 + 'static,
1435 this: &Entity<AgentDiff>,
1436 ) {
1437 let this = this.clone();
1438 workspace.register_action(move |workspace, _: &T, window, cx| {
1439 let review = &review;
1440 let task = this.update(cx, |this, cx| {
1441 this.review_in_active_editor(workspace, review, window, cx)
1442 });
1443
1444 if let Some(task) = task {
1445 task.detach_and_log_err(cx);
1446 } else {
1447 cx.propagate();
1448 }
1449 });
1450 }
1451
1452 fn handle_native_thread_event(
1453 &mut self,
1454 workspace: &WeakEntity<Workspace>,
1455 event: &ThreadEvent,
1456 window: &mut Window,
1457 cx: &mut Context<Self>,
1458 ) {
1459 match event {
1460 ThreadEvent::NewRequest
1461 | ThreadEvent::Stopped(Ok(StopReason::EndTurn))
1462 | ThreadEvent::Stopped(Ok(StopReason::MaxTokens))
1463 | ThreadEvent::Stopped(Ok(StopReason::Refusal))
1464 | ThreadEvent::Stopped(Err(_))
1465 | ThreadEvent::ShowError(_)
1466 | ThreadEvent::CompletionCanceled => {
1467 self.update_reviewing_editors(workspace, window, cx);
1468 }
1469 // intentionally being exhaustive in case we add a variant we should handle
1470 ThreadEvent::Stopped(Ok(StopReason::ToolUse))
1471 | ThreadEvent::StreamedCompletion
1472 | ThreadEvent::ReceivedTextChunk
1473 | ThreadEvent::StreamedAssistantText(_, _)
1474 | ThreadEvent::StreamedAssistantThinking(_, _)
1475 | ThreadEvent::StreamedToolUse { .. }
1476 | ThreadEvent::InvalidToolInput { .. }
1477 | ThreadEvent::MissingToolUse { .. }
1478 | ThreadEvent::MessageAdded(_)
1479 | ThreadEvent::MessageEdited(_)
1480 | ThreadEvent::MessageDeleted(_)
1481 | ThreadEvent::SummaryGenerated
1482 | ThreadEvent::SummaryChanged
1483 | ThreadEvent::UsePendingTools { .. }
1484 | ThreadEvent::ToolFinished { .. }
1485 | ThreadEvent::CheckpointChanged
1486 | ThreadEvent::ToolConfirmationNeeded
1487 | ThreadEvent::ToolUseLimitReached
1488 | ThreadEvent::CancelEditing
1489 | ThreadEvent::ProfileChanged => {}
1490 }
1491 }
1492
1493 fn handle_acp_thread_event(
1494 &mut self,
1495 workspace: &WeakEntity<Workspace>,
1496 thread: &Entity<AcpThread>,
1497 event: &AcpThreadEvent,
1498 window: &mut Window,
1499 cx: &mut Context<Self>,
1500 ) {
1501 match event {
1502 AcpThreadEvent::NewEntry => {
1503 if thread
1504 .read(cx)
1505 .entries()
1506 .last()
1507 .map_or(false, |entry| entry.diffs().next().is_some())
1508 {
1509 self.update_reviewing_editors(workspace, window, cx);
1510 }
1511 }
1512 AcpThreadEvent::EntryUpdated(ix) => {
1513 if thread
1514 .read(cx)
1515 .entries()
1516 .get(*ix)
1517 .map_or(false, |entry| entry.diffs().next().is_some())
1518 {
1519 self.update_reviewing_editors(workspace, window, cx);
1520 }
1521 }
1522 AcpThreadEvent::Stopped | AcpThreadEvent::Error | AcpThreadEvent::ServerExited(_) => {
1523 self.update_reviewing_editors(workspace, window, cx);
1524 }
1525 AcpThreadEvent::EntriesRemoved(_)
1526 | AcpThreadEvent::ToolAuthorizationRequired
1527 | AcpThreadEvent::Retry(_) => {}
1528 }
1529 }
1530
1531 fn handle_workspace_event(
1532 &mut self,
1533 workspace: &Entity<Workspace>,
1534 event: &workspace::Event,
1535 window: &mut Window,
1536 cx: &mut Context<Self>,
1537 ) {
1538 match event {
1539 workspace::Event::ItemAdded { item } => {
1540 if let Some(editor) = item.downcast::<Editor>()
1541 && let Some(buffer) = Self::full_editor_buffer(editor.read(cx), cx) {
1542 self.register_editor(
1543 workspace.downgrade(),
1544 buffer.clone(),
1545 editor,
1546 window,
1547 cx,
1548 );
1549 }
1550 }
1551 _ => {}
1552 }
1553 }
1554
1555 fn full_editor_buffer(editor: &Editor, cx: &App) -> Option<WeakEntity<Buffer>> {
1556 if editor.mode().is_full() {
1557 editor
1558 .buffer()
1559 .read(cx)
1560 .as_singleton()
1561 .map(|buffer| buffer.downgrade())
1562 } else {
1563 None
1564 }
1565 }
1566
1567 fn register_editor(
1568 &mut self,
1569 workspace: WeakEntity<Workspace>,
1570 buffer: WeakEntity<Buffer>,
1571 editor: Entity<Editor>,
1572 window: &mut Window,
1573 cx: &mut Context<Self>,
1574 ) {
1575 let Some(workspace_thread) = self.workspace_threads.get_mut(&workspace) else {
1576 return;
1577 };
1578
1579 let weak_editor = editor.downgrade();
1580
1581 workspace_thread
1582 .singleton_editors
1583 .entry(buffer.clone())
1584 .or_default()
1585 .entry(weak_editor.clone())
1586 .or_insert_with(|| {
1587 let workspace = workspace.clone();
1588 cx.observe_release(&editor, move |this, _, _cx| {
1589 let Some(active_thread) = this.workspace_threads.get_mut(&workspace) else {
1590 return;
1591 };
1592
1593 if let Entry::Occupied(mut entry) =
1594 active_thread.singleton_editors.entry(buffer)
1595 {
1596 let set = entry.get_mut();
1597 set.remove(&weak_editor);
1598
1599 if set.is_empty() {
1600 entry.remove();
1601 }
1602 }
1603 })
1604 });
1605
1606 self.update_reviewing_editors(&workspace, window, cx);
1607 }
1608
1609 fn update_reviewing_editors(
1610 &mut self,
1611 workspace: &WeakEntity<Workspace>,
1612 window: &mut Window,
1613 cx: &mut Context<Self>,
1614 ) {
1615 if !AgentSettings::get_global(cx).single_file_review {
1616 for (editor, _) in self.reviewing_editors.drain() {
1617 editor
1618 .update(cx, |editor, cx| {
1619 editor.end_temporary_diff_override(cx);
1620 editor.unregister_addon::<EditorAgentDiffAddon>();
1621 })
1622 .ok();
1623 }
1624 return;
1625 }
1626
1627 let Some(workspace_thread) = self.workspace_threads.get_mut(workspace) else {
1628 return;
1629 };
1630
1631 let Some(thread) = workspace_thread.thread.upgrade() else {
1632 return;
1633 };
1634
1635 let action_log = thread.action_log(cx);
1636 let changed_buffers = action_log.read(cx).changed_buffers(cx);
1637
1638 let mut unaffected = self.reviewing_editors.clone();
1639
1640 for (buffer, diff_handle) in changed_buffers {
1641 if buffer.read(cx).file().is_none() {
1642 continue;
1643 }
1644
1645 let Some(buffer_editors) = workspace_thread.singleton_editors.get(&buffer.downgrade())
1646 else {
1647 continue;
1648 };
1649
1650 for (weak_editor, _) in buffer_editors {
1651 let Some(editor) = weak_editor.upgrade() else {
1652 continue;
1653 };
1654
1655 let multibuffer = editor.read(cx).buffer().clone();
1656 multibuffer.update(cx, |multibuffer, cx| {
1657 multibuffer.add_diff(diff_handle.clone(), cx);
1658 });
1659
1660 let new_state = if thread.is_generating(cx) {
1661 EditorState::Generating
1662 } else {
1663 EditorState::Reviewing
1664 };
1665
1666 let previous_state = self
1667 .reviewing_editors
1668 .insert(weak_editor.clone(), new_state.clone());
1669
1670 if previous_state.is_none() {
1671 editor.update(cx, |editor, cx| {
1672 editor.start_temporary_diff_override();
1673 editor.set_render_diff_hunk_controls(diff_hunk_controls(&thread), cx);
1674 editor.set_expand_all_diff_hunks(cx);
1675 editor.register_addon(EditorAgentDiffAddon);
1676 });
1677 } else {
1678 unaffected.remove(weak_editor);
1679 }
1680
1681 if new_state == EditorState::Reviewing && previous_state != Some(new_state) {
1682 // Jump to first hunk when we enter review mode
1683 editor.update(cx, |editor, cx| {
1684 let snapshot = multibuffer.read(cx).snapshot(cx);
1685 if let Some(first_hunk) = snapshot.diff_hunks().next() {
1686 let first_hunk_start = first_hunk.multi_buffer_range().start;
1687
1688 editor.change_selections(
1689 SelectionEffects::scroll(Autoscroll::center()),
1690 window,
1691 cx,
1692 |selections| {
1693 selections.select_ranges([first_hunk_start..first_hunk_start])
1694 },
1695 );
1696 }
1697 });
1698 }
1699 }
1700 }
1701
1702 // Remove editors from this workspace that are no longer under review
1703 for (editor, _) in unaffected {
1704 // Note: We could avoid this check by storing `reviewing_editors` by Workspace,
1705 // but that would add another lookup in `AgentDiff::editor_state`
1706 // which gets called much more frequently.
1707 let in_workspace = editor
1708 .read_with(cx, |editor, _cx| editor.workspace())
1709 .ok()
1710 .flatten()
1711 .map_or(false, |editor_workspace| {
1712 editor_workspace.entity_id() == workspace.entity_id()
1713 });
1714
1715 if in_workspace {
1716 editor
1717 .update(cx, |editor, cx| {
1718 editor.end_temporary_diff_override(cx);
1719 editor.unregister_addon::<EditorAgentDiffAddon>();
1720 })
1721 .ok();
1722 self.reviewing_editors.remove(&editor);
1723 }
1724 }
1725
1726 cx.notify();
1727 }
1728
1729 fn editor_state(&self, editor: &WeakEntity<Editor>) -> EditorState {
1730 self.reviewing_editors
1731 .get(editor)
1732 .cloned()
1733 .unwrap_or(EditorState::Idle)
1734 }
1735
1736 fn deploy_pane_from_editor(&self, editor: &Entity<Editor>, window: &mut Window, cx: &mut App) {
1737 let Some(workspace) = editor.read(cx).workspace() else {
1738 return;
1739 };
1740
1741 let Some(WorkspaceThread { thread, .. }) =
1742 self.workspace_threads.get(&workspace.downgrade())
1743 else {
1744 return;
1745 };
1746
1747 let Some(thread) = thread.upgrade() else {
1748 return;
1749 };
1750
1751 AgentDiffPane::deploy(thread, workspace.downgrade(), window, cx).log_err();
1752 }
1753
1754 fn keep_all(
1755 editor: &Entity<Editor>,
1756 thread: &AgentDiffThread,
1757 window: &mut Window,
1758 cx: &mut App,
1759 ) -> PostReviewState {
1760 editor.update(cx, |editor, cx| {
1761 let snapshot = editor.buffer().read(cx).snapshot(cx);
1762 keep_edits_in_ranges(
1763 editor,
1764 &snapshot,
1765 thread,
1766 vec![editor::Anchor::min()..editor::Anchor::max()],
1767 window,
1768 cx,
1769 );
1770 });
1771 PostReviewState::AllReviewed
1772 }
1773
1774 fn reject_all(
1775 editor: &Entity<Editor>,
1776 thread: &AgentDiffThread,
1777 window: &mut Window,
1778 cx: &mut App,
1779 ) -> PostReviewState {
1780 editor.update(cx, |editor, cx| {
1781 let snapshot = editor.buffer().read(cx).snapshot(cx);
1782 reject_edits_in_ranges(
1783 editor,
1784 &snapshot,
1785 thread,
1786 vec![editor::Anchor::min()..editor::Anchor::max()],
1787 window,
1788 cx,
1789 );
1790 });
1791 PostReviewState::AllReviewed
1792 }
1793
1794 fn keep(
1795 editor: &Entity<Editor>,
1796 thread: &AgentDiffThread,
1797 window: &mut Window,
1798 cx: &mut App,
1799 ) -> PostReviewState {
1800 editor.update(cx, |editor, cx| {
1801 let snapshot = editor.buffer().read(cx).snapshot(cx);
1802 keep_edits_in_selection(editor, &snapshot, thread, window, cx);
1803 Self::post_review_state(&snapshot)
1804 })
1805 }
1806
1807 fn reject(
1808 editor: &Entity<Editor>,
1809 thread: &AgentDiffThread,
1810 window: &mut Window,
1811 cx: &mut App,
1812 ) -> PostReviewState {
1813 editor.update(cx, |editor, cx| {
1814 let snapshot = editor.buffer().read(cx).snapshot(cx);
1815 reject_edits_in_selection(editor, &snapshot, thread, window, cx);
1816 Self::post_review_state(&snapshot)
1817 })
1818 }
1819
1820 fn post_review_state(snapshot: &MultiBufferSnapshot) -> PostReviewState {
1821 for (i, _) in snapshot.diff_hunks().enumerate() {
1822 if i > 0 {
1823 return PostReviewState::Pending;
1824 }
1825 }
1826 PostReviewState::AllReviewed
1827 }
1828
1829 fn review_in_active_editor(
1830 &mut self,
1831 workspace: &mut Workspace,
1832 review: impl Fn(&Entity<Editor>, &AgentDiffThread, &mut Window, &mut App) -> PostReviewState,
1833 window: &mut Window,
1834 cx: &mut Context<Self>,
1835 ) -> Option<Task<Result<()>>> {
1836 let active_item = workspace.active_item(cx)?;
1837 let editor = active_item.act_as::<Editor>(cx)?;
1838
1839 if !matches!(
1840 self.editor_state(&editor.downgrade()),
1841 EditorState::Reviewing
1842 ) {
1843 return None;
1844 }
1845
1846 let WorkspaceThread { thread, .. } =
1847 self.workspace_threads.get(&workspace.weak_handle())?;
1848
1849 let thread = thread.upgrade()?;
1850
1851 if let PostReviewState::AllReviewed = review(&editor, &thread, window, cx)
1852 && let Some(curr_buffer) = editor.read(cx).buffer().read(cx).as_singleton() {
1853 let changed_buffers = thread.action_log(cx).read(cx).changed_buffers(cx);
1854
1855 let mut keys = changed_buffers.keys().cycle();
1856 keys.find(|k| *k == &curr_buffer);
1857 let next_project_path = keys
1858 .next()
1859 .filter(|k| *k != &curr_buffer)
1860 .and_then(|after| after.read(cx).project_path(cx));
1861
1862 if let Some(path) = next_project_path {
1863 let task = workspace.open_path(path, None, true, window, cx);
1864 let task = cx.spawn(async move |_, _cx| task.await.map(|_| ()));
1865 return Some(task);
1866 }
1867 }
1868
1869 return Some(Task::ready(Ok(())));
1870 }
1871}
1872
1873enum PostReviewState {
1874 AllReviewed,
1875 Pending,
1876}
1877
1878pub struct EditorAgentDiffAddon;
1879
1880impl editor::Addon for EditorAgentDiffAddon {
1881 fn to_any(&self) -> &dyn std::any::Any {
1882 self
1883 }
1884
1885 fn extend_key_context(&self, key_context: &mut gpui::KeyContext, _: &App) {
1886 key_context.add("agent_diff");
1887 key_context.add("editor_agent_diff");
1888 }
1889}
1890
1891#[cfg(test)]
1892mod tests {
1893 use super::*;
1894 use crate::Keep;
1895 use agent::thread_store::{self, ThreadStore};
1896 use agent_settings::AgentSettings;
1897 use assistant_tool::ToolWorkingSet;
1898 use editor::EditorSettings;
1899 use gpui::{TestAppContext, UpdateGlobal, VisualTestContext};
1900 use project::{FakeFs, Project};
1901 use prompt_store::PromptBuilder;
1902 use serde_json::json;
1903 use settings::{Settings, SettingsStore};
1904 use std::sync::Arc;
1905 use theme::ThemeSettings;
1906 use util::path;
1907
1908 #[gpui::test]
1909 async fn test_multibuffer_agent_diff(cx: &mut TestAppContext) {
1910 cx.update(|cx| {
1911 let settings_store = SettingsStore::test(cx);
1912 cx.set_global(settings_store);
1913 language::init(cx);
1914 Project::init_settings(cx);
1915 AgentSettings::register(cx);
1916 prompt_store::init(cx);
1917 thread_store::init(cx);
1918 workspace::init_settings(cx);
1919 ThemeSettings::register(cx);
1920 EditorSettings::register(cx);
1921 language_model::init_settings(cx);
1922 });
1923
1924 let fs = FakeFs::new(cx.executor());
1925 fs.insert_tree(
1926 path!("/test"),
1927 json!({"file1": "abc\ndef\nghi\njkl\nmno\npqr\nstu\nvwx\nyz"}),
1928 )
1929 .await;
1930 let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
1931 let buffer_path = project
1932 .read_with(cx, |project, cx| {
1933 project.find_project_path("test/file1", cx)
1934 })
1935 .unwrap();
1936
1937 let prompt_store = None;
1938 let thread_store = cx
1939 .update(|cx| {
1940 ThreadStore::load(
1941 project.clone(),
1942 cx.new(|_| ToolWorkingSet::default()),
1943 prompt_store,
1944 Arc::new(PromptBuilder::new(None).unwrap()),
1945 cx,
1946 )
1947 })
1948 .await
1949 .unwrap();
1950 let thread =
1951 AgentDiffThread::Native(thread_store.update(cx, |store, cx| store.create_thread(cx)));
1952 let action_log = cx.read(|cx| thread.action_log(cx));
1953
1954 let (workspace, cx) =
1955 cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
1956 let agent_diff = cx.new_window_entity(|window, cx| {
1957 AgentDiffPane::new(thread.clone(), workspace.downgrade(), window, cx)
1958 });
1959 let editor = agent_diff.read_with(cx, |diff, _cx| diff.editor.clone());
1960
1961 let buffer = project
1962 .update(cx, |project, cx| project.open_buffer(buffer_path, cx))
1963 .await
1964 .unwrap();
1965 cx.update(|_, cx| {
1966 action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
1967 buffer.update(cx, |buffer, cx| {
1968 buffer
1969 .edit(
1970 [
1971 (Point::new(1, 1)..Point::new(1, 2), "E"),
1972 (Point::new(3, 2)..Point::new(3, 3), "L"),
1973 (Point::new(5, 0)..Point::new(5, 1), "P"),
1974 (Point::new(7, 1)..Point::new(7, 2), "W"),
1975 ],
1976 None,
1977 cx,
1978 )
1979 .unwrap()
1980 });
1981 action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
1982 });
1983 cx.run_until_parked();
1984
1985 // When opening the assistant diff, the cursor is positioned on the first hunk.
1986 assert_eq!(
1987 editor.read_with(cx, |editor, cx| editor.text(cx)),
1988 "abc\ndef\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nvWx\nyz"
1989 );
1990 assert_eq!(
1991 editor
1992 .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
1993 .range(),
1994 Point::new(1, 0)..Point::new(1, 0)
1995 );
1996
1997 // After keeping a hunk, the cursor should be positioned on the second hunk.
1998 agent_diff.update_in(cx, |diff, window, cx| diff.keep(&Keep, window, cx));
1999 cx.run_until_parked();
2000 assert_eq!(
2001 editor.read_with(cx, |editor, cx| editor.text(cx)),
2002 "abc\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nvWx\nyz"
2003 );
2004 assert_eq!(
2005 editor
2006 .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
2007 .range(),
2008 Point::new(3, 0)..Point::new(3, 0)
2009 );
2010
2011 // Rejecting a hunk also moves the cursor to the next hunk, possibly cycling if it's at the end.
2012 editor.update_in(cx, |editor, window, cx| {
2013 editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
2014 selections.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
2015 });
2016 });
2017 agent_diff.update_in(cx, |diff, window, cx| {
2018 diff.reject(&crate::Reject, window, cx)
2019 });
2020 cx.run_until_parked();
2021 assert_eq!(
2022 editor.read_with(cx, |editor, cx| editor.text(cx)),
2023 "abc\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nyz"
2024 );
2025 assert_eq!(
2026 editor
2027 .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
2028 .range(),
2029 Point::new(3, 0)..Point::new(3, 0)
2030 );
2031
2032 // Keeping a range that doesn't intersect the current selection doesn't move it.
2033 agent_diff.update_in(cx, |_diff, window, cx| {
2034 let position = editor
2035 .read(cx)
2036 .buffer()
2037 .read(cx)
2038 .read(cx)
2039 .anchor_before(Point::new(7, 0));
2040 editor.update(cx, |editor, cx| {
2041 let snapshot = editor.buffer().read(cx).snapshot(cx);
2042 keep_edits_in_ranges(
2043 editor,
2044 &snapshot,
2045 &thread,
2046 vec![position..position],
2047 window,
2048 cx,
2049 )
2050 });
2051 });
2052 cx.run_until_parked();
2053 assert_eq!(
2054 editor.read_with(cx, |editor, cx| editor.text(cx)),
2055 "abc\ndEf\nghi\njkl\njkL\nmno\nPqr\nstu\nvwx\nyz"
2056 );
2057 assert_eq!(
2058 editor
2059 .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
2060 .range(),
2061 Point::new(3, 0)..Point::new(3, 0)
2062 );
2063 }
2064
2065 #[gpui::test]
2066 async fn test_singleton_agent_diff(cx: &mut TestAppContext) {
2067 cx.update(|cx| {
2068 let settings_store = SettingsStore::test(cx);
2069 cx.set_global(settings_store);
2070 language::init(cx);
2071 Project::init_settings(cx);
2072 AgentSettings::register(cx);
2073 prompt_store::init(cx);
2074 thread_store::init(cx);
2075 workspace::init_settings(cx);
2076 ThemeSettings::register(cx);
2077 EditorSettings::register(cx);
2078 language_model::init_settings(cx);
2079 workspace::register_project_item::<Editor>(cx);
2080 });
2081
2082 let fs = FakeFs::new(cx.executor());
2083 fs.insert_tree(
2084 path!("/test"),
2085 json!({"file1": "abc\ndef\nghi\njkl\nmno\npqr\nstu\nvwx\nyz"}),
2086 )
2087 .await;
2088 fs.insert_tree(path!("/test"), json!({"file2": "abc\ndef\nghi"}))
2089 .await;
2090
2091 let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
2092 let buffer_path1 = project
2093 .read_with(cx, |project, cx| {
2094 project.find_project_path("test/file1", cx)
2095 })
2096 .unwrap();
2097 let buffer_path2 = project
2098 .read_with(cx, |project, cx| {
2099 project.find_project_path("test/file2", cx)
2100 })
2101 .unwrap();
2102
2103 let prompt_store = None;
2104 let thread_store = cx
2105 .update(|cx| {
2106 ThreadStore::load(
2107 project.clone(),
2108 cx.new(|_| ToolWorkingSet::default()),
2109 prompt_store,
2110 Arc::new(PromptBuilder::new(None).unwrap()),
2111 cx,
2112 )
2113 })
2114 .await
2115 .unwrap();
2116 let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
2117 let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());
2118
2119 let (workspace, cx) =
2120 cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
2121
2122 // Add the diff toolbar to the active pane
2123 let diff_toolbar = cx.new_window_entity(|_, cx| AgentDiffToolbar::new(cx));
2124
2125 workspace.update_in(cx, {
2126 let diff_toolbar = diff_toolbar.clone();
2127
2128 move |workspace, window, cx| {
2129 workspace.active_pane().update(cx, |pane, cx| {
2130 pane.toolbar().update(cx, |toolbar, cx| {
2131 toolbar.add_item(diff_toolbar, window, cx);
2132 });
2133 })
2134 }
2135 });
2136
2137 // Set the active thread
2138 let thread = AgentDiffThread::Native(thread);
2139 cx.update(|window, cx| {
2140 AgentDiff::set_active_thread(&workspace.downgrade(), thread.clone(), window, cx)
2141 });
2142
2143 let buffer1 = project
2144 .update(cx, |project, cx| {
2145 project.open_buffer(buffer_path1.clone(), cx)
2146 })
2147 .await
2148 .unwrap();
2149 let buffer2 = project
2150 .update(cx, |project, cx| {
2151 project.open_buffer(buffer_path2.clone(), cx)
2152 })
2153 .await
2154 .unwrap();
2155
2156 // Open an editor for buffer1
2157 let editor1 = cx.new_window_entity(|window, cx| {
2158 Editor::for_buffer(buffer1.clone(), Some(project.clone()), window, cx)
2159 });
2160
2161 workspace.update_in(cx, |workspace, window, cx| {
2162 workspace.add_item_to_active_pane(Box::new(editor1.clone()), None, true, window, cx);
2163 });
2164 cx.run_until_parked();
2165
2166 // Toolbar knows about the current editor, but it's hidden since there are no changes yet
2167 assert!(diff_toolbar.read_with(cx, |toolbar, _cx| matches!(
2168 toolbar.active_item,
2169 Some(AgentDiffToolbarItem::Editor {
2170 state: EditorState::Idle,
2171 ..
2172 })
2173 )));
2174 assert_eq!(
2175 diff_toolbar.read_with(cx, |toolbar, cx| toolbar.location(cx)),
2176 ToolbarItemLocation::Hidden
2177 );
2178
2179 // Make changes
2180 cx.update(|_, cx| {
2181 action_log.update(cx, |log, cx| log.buffer_read(buffer1.clone(), cx));
2182 buffer1.update(cx, |buffer, cx| {
2183 buffer
2184 .edit(
2185 [
2186 (Point::new(1, 1)..Point::new(1, 2), "E"),
2187 (Point::new(3, 2)..Point::new(3, 3), "L"),
2188 (Point::new(5, 0)..Point::new(5, 1), "P"),
2189 (Point::new(7, 1)..Point::new(7, 2), "W"),
2190 ],
2191 None,
2192 cx,
2193 )
2194 .unwrap()
2195 });
2196 action_log.update(cx, |log, cx| log.buffer_edited(buffer1.clone(), cx));
2197
2198 action_log.update(cx, |log, cx| log.buffer_read(buffer2.clone(), cx));
2199 buffer2.update(cx, |buffer, cx| {
2200 buffer
2201 .edit(
2202 [
2203 (Point::new(0, 0)..Point::new(0, 1), "A"),
2204 (Point::new(2, 1)..Point::new(2, 2), "H"),
2205 ],
2206 None,
2207 cx,
2208 )
2209 .unwrap();
2210 });
2211 action_log.update(cx, |log, cx| log.buffer_edited(buffer2.clone(), cx));
2212 });
2213 cx.run_until_parked();
2214
2215 // The already opened editor displays the diff and the cursor is at the first hunk
2216 assert_eq!(
2217 editor1.read_with(cx, |editor, cx| editor.text(cx)),
2218 "abc\ndef\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nvWx\nyz"
2219 );
2220 assert_eq!(
2221 editor1
2222 .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
2223 .range(),
2224 Point::new(1, 0)..Point::new(1, 0)
2225 );
2226
2227 // The toolbar is displayed in the right state
2228 assert_eq!(
2229 diff_toolbar.read_with(cx, |toolbar, cx| toolbar.location(cx)),
2230 ToolbarItemLocation::PrimaryRight
2231 );
2232 assert!(diff_toolbar.read_with(cx, |toolbar, _cx| matches!(
2233 toolbar.active_item,
2234 Some(AgentDiffToolbarItem::Editor {
2235 state: EditorState::Reviewing,
2236 ..
2237 })
2238 )));
2239
2240 // The toolbar respects its setting
2241 override_toolbar_agent_review_setting(false, cx);
2242 assert_eq!(
2243 diff_toolbar.read_with(cx, |toolbar, cx| toolbar.location(cx)),
2244 ToolbarItemLocation::Hidden
2245 );
2246 override_toolbar_agent_review_setting(true, cx);
2247 assert_eq!(
2248 diff_toolbar.read_with(cx, |toolbar, cx| toolbar.location(cx)),
2249 ToolbarItemLocation::PrimaryRight
2250 );
2251
2252 // After keeping a hunk, the cursor should be positioned on the second hunk.
2253 workspace.update(cx, |_, cx| {
2254 cx.dispatch_action(&Keep);
2255 });
2256 cx.run_until_parked();
2257 assert_eq!(
2258 editor1.read_with(cx, |editor, cx| editor.text(cx)),
2259 "abc\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nvWx\nyz"
2260 );
2261 assert_eq!(
2262 editor1
2263 .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
2264 .range(),
2265 Point::new(3, 0)..Point::new(3, 0)
2266 );
2267
2268 // Rejecting a hunk also moves the cursor to the next hunk, possibly cycling if it's at the end.
2269 editor1.update_in(cx, |editor, window, cx| {
2270 editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
2271 selections.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
2272 });
2273 });
2274 workspace.update(cx, |_, cx| {
2275 cx.dispatch_action(&Reject);
2276 });
2277 cx.run_until_parked();
2278 assert_eq!(
2279 editor1.read_with(cx, |editor, cx| editor.text(cx)),
2280 "abc\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nyz"
2281 );
2282 assert_eq!(
2283 editor1
2284 .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
2285 .range(),
2286 Point::new(3, 0)..Point::new(3, 0)
2287 );
2288
2289 // Keeping a range that doesn't intersect the current selection doesn't move it.
2290 editor1.update_in(cx, |editor, window, cx| {
2291 let buffer = editor.buffer().read(cx);
2292 let position = buffer.read(cx).anchor_before(Point::new(7, 0));
2293 let snapshot = buffer.snapshot(cx);
2294 keep_edits_in_ranges(
2295 editor,
2296 &snapshot,
2297 &thread,
2298 vec![position..position],
2299 window,
2300 cx,
2301 )
2302 });
2303 cx.run_until_parked();
2304 assert_eq!(
2305 editor1.read_with(cx, |editor, cx| editor.text(cx)),
2306 "abc\ndEf\nghi\njkl\njkL\nmno\nPqr\nstu\nvwx\nyz"
2307 );
2308 assert_eq!(
2309 editor1
2310 .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
2311 .range(),
2312 Point::new(3, 0)..Point::new(3, 0)
2313 );
2314
2315 // Reviewing the last change opens the next changed buffer
2316 workspace
2317 .update_in(cx, |workspace, window, cx| {
2318 AgentDiff::global(cx).update(cx, |agent_diff, cx| {
2319 agent_diff.review_in_active_editor(workspace, AgentDiff::keep, window, cx)
2320 })
2321 })
2322 .unwrap()
2323 .await
2324 .unwrap();
2325
2326 cx.run_until_parked();
2327
2328 let editor2 = workspace.update(cx, |workspace, cx| {
2329 workspace.active_item_as::<Editor>(cx).unwrap()
2330 });
2331
2332 let editor2_path = editor2
2333 .read_with(cx, |editor, cx| editor.project_path(cx))
2334 .unwrap();
2335 assert_eq!(editor2_path, buffer_path2);
2336
2337 assert_eq!(
2338 editor2.read_with(cx, |editor, cx| editor.text(cx)),
2339 "abc\nAbc\ndef\nghi\ngHi"
2340 );
2341 assert_eq!(
2342 editor2
2343 .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
2344 .range(),
2345 Point::new(0, 0)..Point::new(0, 0)
2346 );
2347
2348 // Editor 1 toolbar is hidden since all changes have been reviewed
2349 workspace.update_in(cx, |workspace, window, cx| {
2350 workspace.activate_item(&editor1, true, true, window, cx)
2351 });
2352
2353 assert!(diff_toolbar.read_with(cx, |toolbar, _cx| matches!(
2354 toolbar.active_item,
2355 Some(AgentDiffToolbarItem::Editor {
2356 state: EditorState::Idle,
2357 ..
2358 })
2359 )));
2360 assert_eq!(
2361 diff_toolbar.read_with(cx, |toolbar, cx| toolbar.location(cx)),
2362 ToolbarItemLocation::Hidden
2363 );
2364 }
2365
2366 fn override_toolbar_agent_review_setting(active: bool, cx: &mut VisualTestContext) {
2367 cx.update(|_window, cx| {
2368 SettingsStore::update_global(cx, |store, _cx| {
2369 let mut editor_settings = store.get::<EditorSettings>(None).clone();
2370 editor_settings.toolbar.agent_review = active;
2371 store.override_global(editor_settings);
2372 })
2373 });
2374 cx.run_until_parked();
2375 }
2376}