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

thread view: Fix some design papercuts (#36893)

Browse source 
Release Notes:

- N/A

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
Co-authored-by: Matt Miller <mattrx@gmail.com>
This commit is contained in:
Danilo Leal 2025-08-25 16:07:30 -03:00 • committed by GitHub
parent 79e74b880b
commit 949398cb93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 152 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/agent2/src/tools/find_path_tool.rs
View file

@ -165,16 +165,17 @@ fn search_paths(glob: &str, project: Entity<Project>, cx: &mut App) -> Task<Resu
.collect(); .collect();
cx.background_spawn(async move { cx.background_spawn(async move {
Ok(snapshots let mut results = Vec::new();
.iter() for snapshot in snapshots {
.flat_map(|snapshot| { for entry in snapshot.entries(false, 0) {
let root_name = PathBuf::from(snapshot.root_name()); let root_name = PathBuf::from(snapshot.root_name());
snapshot if path_matcher.is_match(root_name.join(&entry.path)) {
.entries(false, 0) results.push(snapshot.abs_path().join(entry.path.as_ref()));
.map(move |entry| root_name.join(&entry.path)) }
.filter(|path| path_matcher.is_match(&path)) }
}) }
.collect())
Ok(results)
}) })
} }
@ -215,8 +216,8 @@ mod test {
assert_eq!( assert_eq!(
matches, matches,
&[ &[
PathBuf::from("root/apple/banana/carrot"), PathBuf::from(path!("/root/apple/banana/carrot")),
PathBuf::from("root/apple/bandana/carbonara") PathBuf::from(path!("/root/apple/bandana/carbonara"))
] ]
); );
@ -227,8 +228,8 @@ mod test {
assert_eq!( assert_eq!(
matches, matches,
&[ &[
PathBuf::from("root/apple/banana/carrot"), PathBuf::from(path!("/root/apple/banana/carrot")),
PathBuf::from("root/apple/bandana/carbonara") PathBuf::from(path!("/root/apple/bandana/carbonara"))
] ]
); );
} }

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

@ -462,7 +462,7 @@ impl AcpThreadHistory {
cx.notify(); cx.notify();
})) }))
.end_slot::<IconButton>(if hovered || selected { .end_slot::<IconButton>(if hovered {
Some( Some(
IconButton::new("delete", IconName::Trash) IconButton::new("delete", IconName::Trash)
.shape(IconButtonShape::Square) .shape(IconButtonShape::Square)

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

@ -35,6 +35,7 @@ use prompt_store::{PromptId, PromptStore};
use rope::Point; use rope::Point;
use settings::{Settings as _, SettingsStore}; use settings::{Settings as _, SettingsStore};
use std::cell::Cell; use std::cell::Cell;
use std::path::Path;
use std::sync::Arc; use std::sync::Arc;
use std::time::Instant; use std::time::Instant;
use std::{collections::BTreeMap, rc::Rc, time::Duration}; use std::{collections::BTreeMap, rc::Rc, time::Duration};
@ -1551,12 +1552,11 @@ impl AcpThreadView {
return primary; return primary;
}; };
let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating); let primary = if entry_ix == total_entries - 1 {
let primary = if entry_ix == total_entries - 1 && !is_generating {
v_flex() v_flex()
.w_full() .w_full()
.child(primary) .child(primary)
.child(self.render_thread_controls(cx)) .child(self.render_thread_controls(&thread, cx))
.when_some( .when_some(
self.thread_feedback.comments_editor.clone(), self.thread_feedback.comments_editor.clone(),
|this, editor| this.child(Self::render_feedback_feedback_editor(editor, cx)), |this, editor| this.child(Self::render_feedback_feedback_editor(editor, cx)),
@ -1698,15 +1698,16 @@ impl AcpThreadView {
.into_any_element() .into_any_element()
} }
fn render_tool_call_icon( fn render_tool_call(
&self, &self,
group_name: SharedString,
entry_ix: usize, entry_ix: usize,
is_collapsible: bool,
is_open: bool,
tool_call: &ToolCall, tool_call: &ToolCall,
window: &Window,
cx: &Context<Self>, cx: &Context<Self>,
) -> Div { ) -> Div {
let header_id = SharedString::from(format!("outer-tool-call-header-{}", entry_ix));
let card_header_id = SharedString::from("inner-tool-call-header");
let tool_icon = let tool_icon =
if tool_call.kind == acp::ToolKind::Edit && tool_call.locations.len() == 1 { if tool_call.kind == acp::ToolKind::Edit && tool_call.locations.len() == 1 {
FileIcons::get_icon(&tool_call.locations[0].path, cx) FileIcons::get_icon(&tool_call.locations[0].path, cx)
@ -1714,7 +1715,7 @@ impl AcpThreadView {
.unwrap_or(Icon::new(IconName::ToolPencil)) .unwrap_or(Icon::new(IconName::ToolPencil))
} else { } else {
Icon::new(match tool_call.kind { Icon::new(match tool_call.kind {
acp::ToolKind::Read => IconName::ToolRead, acp::ToolKind::Read => IconName::ToolSearch,
acp::ToolKind::Edit => IconName::ToolPencil, acp::ToolKind::Edit => IconName::ToolPencil,
acp::ToolKind::Delete => IconName::ToolDeleteFile, acp::ToolKind::Delete => IconName::ToolDeleteFile,
acp::ToolKind::Move => IconName::ArrowRightLeft, acp::ToolKind::Move => IconName::ArrowRightLeft,
@ -1728,59 +1729,6 @@ impl AcpThreadView {
.size(IconSize::Small) .size(IconSize::Small)
.color(Color::Muted); .color(Color::Muted);
let base_container = h_flex().flex_shrink_0().size_4().justify_center();
if is_collapsible {
base_container
.child(
div()
.group_hover(&group_name, |s| s.invisible().w_0())
.child(tool_icon),
)
.child(
h_flex()
.absolute()
.inset_0()
.invisible()
.justify_center()
.group_hover(&group_name, |s| s.visible())
.child(
Disclosure::new(("expand", entry_ix), is_open)
.opened_icon(IconName::ChevronUp)
.closed_icon(IconName::ChevronRight)
.on_click(cx.listener({
let id = tool_call.id.clone();
move |this: &mut Self, _, _, cx: &mut Context<Self>| {
if is_open {
this.expanded_tool_calls.remove(&id);
} else {
this.expanded_tool_calls.insert(id.clone());
}
cx.notify();
}
})),
),
)
} else {
base_container.child(tool_icon)
}
}
fn render_tool_call(
&self,
entry_ix: usize,
tool_call: &ToolCall,
window: &Window,
cx: &Context<Self>,
) -> Div {
let header_id = SharedString::from(format!("outer-tool-call-header-{}", entry_ix));
let card_header_id = SharedString::from("inner-tool-call-header");
let in_progress = match &tool_call.status {
ToolCallStatus::InProgress => true,
_ => false,
};
let failed_or_canceled = match &tool_call.status { let failed_or_canceled = match &tool_call.status {
ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => true, ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => true,
_ => false, _ => false,
@ -1880,6 +1828,7 @@ impl AcpThreadView {
.child( .child(
h_flex() h_flex()
.id(header_id) .id(header_id)
.group(&card_header_id)
.relative() .relative()
.w_full() .w_full()
.max_w_full() .max_w_full()
@ -1897,19 +1846,11 @@ impl AcpThreadView {
}) })
.child( .child(
h_flex() h_flex()
.group(&card_header_id)
.relative() .relative()
.w_full() .w_full()
.h(window.line_height() - px(2.)) .h(window.line_height() - px(2.))
.text_size(self.tool_name_font_size()) .text_size(self.tool_name_font_size())
.child(self.render_tool_call_icon( .child(tool_icon)
card_header_id,
entry_ix,
is_collapsible,
is_open,
tool_call,
cx,
))
.child(if tool_call.locations.len() == 1 { .child(if tool_call.locations.len() == 1 {
let name = tool_call.locations[0] let name = tool_call.locations[0]
.path .path
@ -1937,13 +1878,13 @@ impl AcpThreadView {
}) })
.child(name) .child(name)
.tooltip(Tooltip::text("Jump to File")) .tooltip(Tooltip::text("Jump to File"))
.cursor(gpui::CursorStyle::PointingHand)
.on_click(cx.listener(move |this, _, window, cx| { .on_click(cx.listener(move |this, _, window, cx| {
this.open_tool_call_location(entry_ix, 0, window, cx); this.open_tool_call_location(entry_ix, 0, window, cx);
})) }))
.into_any_element() .into_any_element()
} else { } else {
h_flex() h_flex()
.id("non-card-label-container")
.relative() .relative()
.w_full() .w_full()
.max_w_full() .max_w_full()
@ -1954,47 +1895,39 @@ impl AcpThreadView {
default_markdown_style(false, true, window, cx), default_markdown_style(false, true, window, cx),
))) )))
.child(gradient_overlay(gradient_color)) .child(gradient_overlay(gradient_color))
.on_click(cx.listener({
let id = tool_call.id.clone();
move |this: &mut Self, _, _, cx: &mut Context<Self>| {
if is_open {
this.expanded_tool_calls.remove(&id);
} else {
this.expanded_tool_calls.insert(id.clone());
}
cx.notify();
}
}))
.into_any() .into_any()
}), }),
) )
.when(in_progress && use_card_layout && !is_open, |this| { .child(
this.child( h_flex()
div().absolute().right_2().child( .gap_px()
Icon::new(IconName::ArrowCircle) .when(is_collapsible, |this| {
.color(Color::Muted) this.child(
.size(IconSize::Small) Disclosure::new(("expand", entry_ix), is_open)
.with_animation( .opened_icon(IconName::ChevronUp)
"running", .closed_icon(IconName::ChevronDown)
Animation::new(Duration::from_secs(3)).repeat(), .visible_on_hover(&card_header_id)
|icon, delta| { .on_click(cx.listener({
icon.transform(Transformation::rotate(percentage( let id = tool_call.id.clone();
delta, move |this: &mut Self, _, _, cx: &mut Context<Self>| {
))) if is_open {
}, this.expanded_tool_calls.remove(&id);
), } else {
), this.expanded_tool_calls.insert(id.clone());
) }
}) cx.notify();
.when(failed_or_canceled, |this| { }
this.child( })),
div().absolute().right_2().child( )
Icon::new(IconName::Close) })
.color(Color::Error) .when(failed_or_canceled, |this| {
.size(IconSize::Small), this.child(
), Icon::new(IconName::Close)
) .color(Color::Error)
}), .size(IconSize::Small),
)
}),
),
) )
.children(tool_output_display) .children(tool_output_display)
} }
@ -2064,9 +1997,27 @@ impl AcpThreadView {
cx: &Context<Self>, cx: &Context<Self>,
) -> AnyElement { ) -> AnyElement {
let uri: SharedString = resource_link.uri.clone().into(); let uri: SharedString = resource_link.uri.clone().into();
let is_file = resource_link.uri.strip_prefix("file://");
let label: SharedString = if let Some(path) = resource_link.uri.strip_prefix("file://") { let label: SharedString = if let Some(abs_path) = is_file {
path.to_string().into() if let Some(project_path) = self
.project
.read(cx)
.project_path_for_absolute_path(&Path::new(abs_path), cx)
&& let Some(worktree) = self
.project
.read(cx)
.worktree_for_id(project_path.worktree_id, cx)
{
worktree
.read(cx)
.full_path(&project_path.path)
.to_string_lossy()
.to_string()
.into()
} else {
abs_path.to_string().into()
}
} else { } else {
uri.clone() uri.clone()
}; };
@ -2083,10 +2034,12 @@ impl AcpThreadView {
Button::new(button_id, label) Button::new(button_id, label)
.label_size(LabelSize::Small) .label_size(LabelSize::Small)
.color(Color::Muted) .color(Color::Muted)
.icon(IconName::ArrowUpRight)
.icon_size(IconSize::XSmall)
.icon_color(Color::Muted)
.truncate(true) .truncate(true)
.when(is_file.is_none(), |this| {
this.icon(IconName::ArrowUpRight)
.icon_size(IconSize::XSmall)
.icon_color(Color::Muted)
})
.on_click(cx.listener({ .on_click(cx.listener({
let workspace = self.workspace.clone(); let workspace = self.workspace.clone();
move |_, _, window, cx: &mut Context<Self>| { move |_, _, window, cx: &mut Context<Self>| {
@ -3727,16 +3680,19 @@ impl AcpThreadView {
fn toggle_following(&mut self, window: &mut Window, cx: &mut Context<Self>) { fn toggle_following(&mut self, window: &mut Window, cx: &mut Context<Self>) {
let following = self.is_following(cx); let following = self.is_following(cx);
self.should_be_following = !following; self.should_be_following = !following;
self.workspace if self.thread().map(|thread| thread.read(cx).status()) == Some(ThreadStatus::Generating) {
.update(cx, |workspace, cx| { self.workspace
if following { .update(cx, |workspace, cx| {
workspace.unfollow(CollaboratorId::Agent, window, cx); if following {
} else { workspace.unfollow(CollaboratorId::Agent, window, cx);
workspace.follow(CollaboratorId::Agent, window, cx); } else {
} workspace.follow(CollaboratorId::Agent, window, cx);
}) }
.ok(); })
.ok();
}
telemetry::event!("Follow Agent Selected", following = !following); telemetry::event!("Follow Agent Selected", following = !following);
} }
@ -3744,6 +3700,20 @@ impl AcpThreadView {
fn render_follow_toggle(&self, cx: &mut Context<Self>) -> impl IntoElement { fn render_follow_toggle(&self, cx: &mut Context<Self>) -> impl IntoElement {
let following = self.is_following(cx); let following = self.is_following(cx);
let tooltip_label = if following {
if self.agent.name() == "Zed Agent" {
format!("Stop Following the {}", self.agent.name())
} else {
format!("Stop Following {}", self.agent.name())
}
} else {
if self.agent.name() == "Zed Agent" {
format!("Follow the {}", self.agent.name())
} else {
format!("Follow {}", self.agent.name())
}
};
IconButton::new("follow-agent", IconName::Crosshair) IconButton::new("follow-agent", IconName::Crosshair)
.icon_size(IconSize::Small) .icon_size(IconSize::Small)
.icon_color(Color::Muted) .icon_color(Color::Muted)
@ -3751,10 +3721,10 @@ impl AcpThreadView {
.selected_icon_color(Some(Color::Custom(cx.theme().players().agent().cursor))) .selected_icon_color(Some(Color::Custom(cx.theme().players().agent().cursor)))
.tooltip(move |window, cx| { .tooltip(move |window, cx| {
if following { if following {
Tooltip::for_action("Stop Following Agent", &Follow, window, cx) Tooltip::for_action(tooltip_label.clone(), &Follow, window, cx)
} else { } else {
Tooltip::with_meta( Tooltip::with_meta(
"Follow Agent", tooltip_label.clone(),
Some(&Follow), Some(&Follow),
"Track the agent's location as it reads and edits files.", "Track the agent's location as it reads and edits files.",
window, window,
@ -4175,7 +4145,20 @@ impl AcpThreadView {
} }
} }
fn render_thread_controls(&self, cx: &Context<Self>) -> impl IntoElement { fn render_thread_controls(
&self,
thread: &Entity<AcpThread>,
cx: &Context<Self>,
) -> impl IntoElement {
let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating);
if is_generating {
return h_flex().id("thread-controls-container").ml_1().child(
div()
.py_2()
.px(rems_from_px(22.))
.child(SpinnerLabel::new().size(LabelSize::Small)),
);
}
let open_as_markdown = IconButton::new("open-as-markdown", IconName::FileMarkdown) let open_as_markdown = IconButton::new("open-as-markdown", IconName::FileMarkdown)
.shape(ui::IconButtonShape::Square) .shape(ui::IconButtonShape::Square)
.icon_size(IconSize::Small) .icon_size(IconSize::Small)
@ -4899,45 +4882,30 @@ impl Render for AcpThreadView {
.items_center() .items_center()
.justify_end() .justify_end()
.child(self.render_load_error(e, cx)), .child(self.render_load_error(e, cx)),
ThreadState::Ready { thread, .. } => { ThreadState::Ready { .. } => v_flex().flex_1().map(|this| {
let thread_clone = thread.clone(); if has_messages {
this.child(
v_flex().flex_1().map(|this| { list(
if has_messages { self.list_state.clone(),
this.child( cx.processor(|this, index: usize, window, cx| {
list( let Some((entry, len)) = this.thread().and_then(|thread| {
self.list_state.clone(), let entries = &thread.read(cx).entries();
cx.processor(|this, index: usize, window, cx| { Some((entries.get(index)?, entries.len()))
let Some((entry, len)) = this.thread().and_then(|thread| { }) else {
let entries = &thread.read(cx).entries(); return Empty.into_any();
Some((entries.get(index)?, entries.len())) };
}) else { this.render_entry(index, len, entry, window, cx)
return Empty.into_any(); }),
};
this.render_entry(index, len, entry, window, cx)
}),
)
.with_sizing_behavior(gpui::ListSizingBehavior::Auto)
.flex_grow()
.into_any(),
) )
.child(self.render_vertical_scrollbar(cx)) .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
.children( .flex_grow()
match thread_clone.read(cx).status() { .into_any(),
ThreadStatus::Idle )
| ThreadStatus::WaitingForToolConfirmation => None, .child(self.render_vertical_scrollbar(cx))
ThreadStatus::Generating => div() } else {
.py_2() this.child(self.render_recent_history(window, cx))
.px(rems_from_px(22.)) }
.child(SpinnerLabel::new().size(LabelSize::Small)) }),
.into(),
},
)
} else {
this.child(self.render_recent_history(window, cx))
}
})
}
}) })
// The activity bar is intentionally rendered outside of the ThreadState::Ready match // The activity bar is intentionally rendered outside of the ThreadState::Ready match
// above so that the scrollbar doesn't render behind it. The current setup allows // above so that the scrollbar doesn't render behind it. The current setup allows

8
crates/assistant_tools/src/find_path_tool.rs
View file

@ -435,8 +435,8 @@ mod test {
assert_eq!( assert_eq!(
matches, matches,
&[ &[
PathBuf::from("root/apple/banana/carrot"), PathBuf::from(path!("root/apple/banana/carrot")),
PathBuf::from("root/apple/bandana/carbonara") PathBuf::from(path!("root/apple/bandana/carbonara"))
] ]
); );
@ -447,8 +447,8 @@ mod test {
assert_eq!( assert_eq!(
matches, matches,
&[ &[
PathBuf::from("root/apple/banana/carrot"), PathBuf::from(path!("root/apple/banana/carrot")),
PathBuf::from("root/apple/bandana/carbonara") PathBuf::from(path!("root/apple/bandana/carbonara"))
] ]
); );
} }

2
crates/assistant_tools/src/read_file_tool.rs
View file

@ -68,7 +68,7 @@ impl Tool for ReadFileTool {
} }
fn icon(&self) -> IconName { fn icon(&self) -> IconName {
IconName::ToolRead IconName::ToolSearch
} }
fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> { fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {