1mod connection;
2mod diff;
3mod mention;
4mod terminal;
5
6use agent_settings::AgentSettings;
7
8/// Key used in ACP ToolCall meta to store the tool's programmatic name.
9/// This is a workaround since ACP's ToolCall doesn't have a dedicated name field.
10pub const TOOL_NAME_META_KEY: &str = "tool_name";
11
12/// The tool name for subagent spawning
13pub const SUBAGENT_TOOL_NAME: &str = "subagent";
14
15/// Helper to extract tool name from ACP meta
16pub fn tool_name_from_meta(meta: &Option<acp::Meta>) -> Option<SharedString> {
17 meta.as_ref()
18 .and_then(|m| m.get(TOOL_NAME_META_KEY))
19 .and_then(|v| v.as_str())
20 .map(|s| SharedString::from(s.to_owned()))
21}
22
23/// Helper to create meta with tool name
24pub fn meta_with_tool_name(tool_name: &str) -> acp::Meta {
25 acp::Meta::from_iter([(TOOL_NAME_META_KEY.into(), tool_name.into())])
26}
27use collections::HashSet;
28pub use connection::*;
29pub use diff::*;
30use language::language_settings::FormatOnSave;
31pub use mention::*;
32use project::lsp_store::{FormatTrigger, LspFormatTarget};
33use serde::{Deserialize, Serialize};
34use serde_json::to_string_pretty;
35use settings::Settings as _;
36use task::{Shell, ShellBuilder};
37pub use terminal::*;
38
39use action_log::{ActionLog, ActionLogTelemetry};
40use agent_client_protocol::{self as acp};
41use anyhow::{Context as _, Result, anyhow};
42use editor::Bias;
43use futures::{FutureExt, channel::oneshot, future::BoxFuture};
44use gpui::{AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task, WeakEntity};
45use itertools::Itertools;
46use language::{Anchor, Buffer, BufferSnapshot, LanguageRegistry, Point, ToPoint, text_diff};
47use markdown::Markdown;
48use project::{AgentLocation, Project, git_store::GitStoreCheckpoint};
49use std::collections::HashMap;
50use std::error::Error;
51use std::fmt::{Formatter, Write};
52use std::ops::Range;
53use std::process::ExitStatus;
54use std::rc::Rc;
55use std::time::{Duration, Instant};
56use std::{fmt::Display, mem, path::PathBuf, sync::Arc};
57use ui::App;
58use util::{ResultExt, get_default_system_shell_preferring_bash, paths::PathStyle};
59use uuid::Uuid;
60
61#[derive(Debug)]
62pub struct UserMessage {
63 pub id: Option<UserMessageId>,
64 pub content: ContentBlock,
65 pub chunks: Vec<acp::ContentBlock>,
66 pub checkpoint: Option<Checkpoint>,
67 pub indented: bool,
68}
69
70#[derive(Debug)]
71pub struct Checkpoint {
72 git_checkpoint: GitStoreCheckpoint,
73 pub show: bool,
74}
75
76impl UserMessage {
77 fn to_markdown(&self, cx: &App) -> String {
78 let mut markdown = String::new();
79 if self
80 .checkpoint
81 .as_ref()
82 .is_some_and(|checkpoint| checkpoint.show)
83 {
84 writeln!(markdown, "## User (checkpoint)").unwrap();
85 } else {
86 writeln!(markdown, "## User").unwrap();
87 }
88 writeln!(markdown).unwrap();
89 writeln!(markdown, "{}", self.content.to_markdown(cx)).unwrap();
90 writeln!(markdown).unwrap();
91 markdown
92 }
93}
94
95#[derive(Debug, PartialEq)]
96pub struct AssistantMessage {
97 pub chunks: Vec<AssistantMessageChunk>,
98 pub indented: bool,
99}
100
101impl AssistantMessage {
102 pub fn to_markdown(&self, cx: &App) -> String {
103 format!(
104 "## Assistant\n\n{}\n\n",
105 self.chunks
106 .iter()
107 .map(|chunk| chunk.to_markdown(cx))
108 .join("\n\n")
109 )
110 }
111}
112
113#[derive(Debug, PartialEq)]
114pub enum AssistantMessageChunk {
115 Message { block: ContentBlock },
116 Thought { block: ContentBlock },
117}
118
119impl AssistantMessageChunk {
120 pub fn from_str(
121 chunk: &str,
122 language_registry: &Arc<LanguageRegistry>,
123 path_style: PathStyle,
124 cx: &mut App,
125 ) -> Self {
126 Self::Message {
127 block: ContentBlock::new(chunk.into(), language_registry, path_style, cx),
128 }
129 }
130
131 fn to_markdown(&self, cx: &App) -> String {
132 match self {
133 Self::Message { block } => block.to_markdown(cx).to_string(),
134 Self::Thought { block } => {
135 format!("<thinking>\n{}\n</thinking>", block.to_markdown(cx))
136 }
137 }
138 }
139}
140
141#[derive(Debug)]
142pub enum AgentThreadEntry {
143 UserMessage(UserMessage),
144 AssistantMessage(AssistantMessage),
145 ToolCall(ToolCall),
146}
147
148impl AgentThreadEntry {
149 pub fn is_indented(&self) -> bool {
150 match self {
151 Self::UserMessage(message) => message.indented,
152 Self::AssistantMessage(message) => message.indented,
153 Self::ToolCall(_) => false,
154 }
155 }
156
157 pub fn to_markdown(&self, cx: &App) -> String {
158 match self {
159 Self::UserMessage(message) => message.to_markdown(cx),
160 Self::AssistantMessage(message) => message.to_markdown(cx),
161 Self::ToolCall(tool_call) => tool_call.to_markdown(cx),
162 }
163 }
164
165 pub fn user_message(&self) -> Option<&UserMessage> {
166 if let AgentThreadEntry::UserMessage(message) = self {
167 Some(message)
168 } else {
169 None
170 }
171 }
172
173 pub fn diffs(&self) -> impl Iterator<Item = &Entity<Diff>> {
174 if let AgentThreadEntry::ToolCall(call) = self {
175 itertools::Either::Left(call.diffs())
176 } else {
177 itertools::Either::Right(std::iter::empty())
178 }
179 }
180
181 pub fn terminals(&self) -> impl Iterator<Item = &Entity<Terminal>> {
182 if let AgentThreadEntry::ToolCall(call) = self {
183 itertools::Either::Left(call.terminals())
184 } else {
185 itertools::Either::Right(std::iter::empty())
186 }
187 }
188
189 pub fn location(&self, ix: usize) -> Option<(acp::ToolCallLocation, AgentLocation)> {
190 if let AgentThreadEntry::ToolCall(ToolCall {
191 locations,
192 resolved_locations,
193 ..
194 }) = self
195 {
196 Some((
197 locations.get(ix)?.clone(),
198 resolved_locations.get(ix)?.clone()?,
199 ))
200 } else {
201 None
202 }
203 }
204}
205
206#[derive(Debug)]
207pub struct ToolCall {
208 pub id: acp::ToolCallId,
209 pub label: Entity<Markdown>,
210 pub kind: acp::ToolKind,
211 pub content: Vec<ToolCallContent>,
212 pub status: ToolCallStatus,
213 pub locations: Vec<acp::ToolCallLocation>,
214 pub resolved_locations: Vec<Option<AgentLocation>>,
215 pub raw_input: Option<serde_json::Value>,
216 pub raw_input_markdown: Option<Entity<Markdown>>,
217 pub raw_output: Option<serde_json::Value>,
218 pub tool_name: Option<SharedString>,
219}
220
221impl ToolCall {
222 fn from_acp(
223 tool_call: acp::ToolCall,
224 status: ToolCallStatus,
225 language_registry: Arc<LanguageRegistry>,
226 path_style: PathStyle,
227 terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
228 cx: &mut App,
229 ) -> Result<Self> {
230 let title = if tool_call.kind == acp::ToolKind::Execute {
231 tool_call.title
232 } else if let Some((first_line, _)) = tool_call.title.split_once("\n") {
233 first_line.to_owned() + "…"
234 } else {
235 tool_call.title
236 };
237 let mut content = Vec::with_capacity(tool_call.content.len());
238 for item in tool_call.content {
239 if let Some(item) = ToolCallContent::from_acp(
240 item,
241 language_registry.clone(),
242 path_style,
243 terminals,
244 cx,
245 )? {
246 content.push(item);
247 }
248 }
249
250 let raw_input_markdown = tool_call
251 .raw_input
252 .as_ref()
253 .and_then(|input| markdown_for_raw_output(input, &language_registry, cx));
254
255 let tool_name = tool_name_from_meta(&tool_call.meta);
256
257 let result = Self {
258 id: tool_call.tool_call_id,
259 label: cx
260 .new(|cx| Markdown::new(title.into(), Some(language_registry.clone()), None, cx)),
261 kind: tool_call.kind,
262 content,
263 locations: tool_call.locations,
264 resolved_locations: Vec::default(),
265 status,
266 raw_input: tool_call.raw_input,
267 raw_input_markdown,
268 raw_output: tool_call.raw_output,
269 tool_name,
270 };
271 Ok(result)
272 }
273
274 fn update_fields(
275 &mut self,
276 fields: acp::ToolCallUpdateFields,
277 language_registry: Arc<LanguageRegistry>,
278 path_style: PathStyle,
279 terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
280 cx: &mut App,
281 ) -> Result<()> {
282 let acp::ToolCallUpdateFields {
283 kind,
284 status,
285 title,
286 content,
287 locations,
288 raw_input,
289 raw_output,
290 ..
291 } = fields;
292
293 if let Some(kind) = kind {
294 self.kind = kind;
295 }
296
297 if let Some(status) = status {
298 self.status = status.into();
299 }
300
301 if let Some(title) = title {
302 self.label.update(cx, |label, cx| {
303 if self.kind == acp::ToolKind::Execute {
304 label.replace(title, cx);
305 } else if let Some((first_line, _)) = title.split_once("\n") {
306 label.replace(first_line.to_owned() + "…", cx);
307 } else {
308 label.replace(title, cx);
309 }
310 });
311 }
312
313 if let Some(content) = content {
314 let mut new_content_len = content.len();
315 let mut content = content.into_iter();
316
317 // Reuse existing content if we can
318 for (old, new) in self.content.iter_mut().zip(content.by_ref()) {
319 let valid_content =
320 old.update_from_acp(new, language_registry.clone(), path_style, terminals, cx)?;
321 if !valid_content {
322 new_content_len -= 1;
323 }
324 }
325 for new in content {
326 if let Some(new) = ToolCallContent::from_acp(
327 new,
328 language_registry.clone(),
329 path_style,
330 terminals,
331 cx,
332 )? {
333 self.content.push(new);
334 } else {
335 new_content_len -= 1;
336 }
337 }
338 self.content.truncate(new_content_len);
339 }
340
341 if let Some(locations) = locations {
342 self.locations = locations;
343 }
344
345 if let Some(raw_input) = raw_input {
346 self.raw_input_markdown = markdown_for_raw_output(&raw_input, &language_registry, cx);
347 self.raw_input = Some(raw_input);
348 }
349
350 if let Some(raw_output) = raw_output {
351 if self.content.is_empty()
352 && let Some(markdown) = markdown_for_raw_output(&raw_output, &language_registry, cx)
353 {
354 self.content
355 .push(ToolCallContent::ContentBlock(ContentBlock::Markdown {
356 markdown,
357 }));
358 }
359 self.raw_output = Some(raw_output);
360 }
361 Ok(())
362 }
363
364 pub fn diffs(&self) -> impl Iterator<Item = &Entity<Diff>> {
365 self.content.iter().filter_map(|content| match content {
366 ToolCallContent::Diff(diff) => Some(diff),
367 ToolCallContent::ContentBlock(_) => None,
368 ToolCallContent::Terminal(_) => None,
369 ToolCallContent::SubagentThread(_) => None,
370 })
371 }
372
373 pub fn terminals(&self) -> impl Iterator<Item = &Entity<Terminal>> {
374 self.content.iter().filter_map(|content| match content {
375 ToolCallContent::Terminal(terminal) => Some(terminal),
376 ToolCallContent::ContentBlock(_) => None,
377 ToolCallContent::Diff(_) => None,
378 ToolCallContent::SubagentThread(_) => None,
379 })
380 }
381
382 pub fn subagent_thread(&self) -> Option<&Entity<AcpThread>> {
383 self.content.iter().find_map(|content| match content {
384 ToolCallContent::SubagentThread(thread) => Some(thread),
385 _ => None,
386 })
387 }
388
389 pub fn is_subagent(&self) -> bool {
390 matches!(self.kind, acp::ToolKind::Other)
391 && self
392 .tool_name
393 .as_ref()
394 .map(|n| n.as_ref() == SUBAGENT_TOOL_NAME)
395 .unwrap_or(false)
396 }
397
398 pub fn to_markdown(&self, cx: &App) -> String {
399 let mut markdown = format!(
400 "**Tool Call: {}**\nStatus: {}\n\n",
401 self.label.read(cx).source(),
402 self.status
403 );
404 for content in &self.content {
405 markdown.push_str(content.to_markdown(cx).as_str());
406 markdown.push_str("\n\n");
407 }
408 markdown
409 }
410
411 async fn resolve_location(
412 location: acp::ToolCallLocation,
413 project: WeakEntity<Project>,
414 cx: &mut AsyncApp,
415 ) -> Option<ResolvedLocation> {
416 let buffer = project
417 .update(cx, |project, cx| {
418 project
419 .project_path_for_absolute_path(&location.path, cx)
420 .map(|path| project.open_buffer(path, cx))
421 })
422 .ok()??;
423 let buffer = buffer.await.log_err()?;
424 let position = buffer.update(cx, |buffer, _| {
425 let snapshot = buffer.snapshot();
426 if let Some(row) = location.line {
427 let column = snapshot.indent_size_for_line(row).len;
428 let point = snapshot.clip_point(Point::new(row, column), Bias::Left);
429 snapshot.anchor_before(point)
430 } else {
431 Anchor::min_for_buffer(snapshot.remote_id())
432 }
433 });
434
435 Some(ResolvedLocation { buffer, position })
436 }
437
438 fn resolve_locations(
439 &self,
440 project: Entity<Project>,
441 cx: &mut App,
442 ) -> Task<Vec<Option<ResolvedLocation>>> {
443 let locations = self.locations.clone();
444 project.update(cx, |_, cx| {
445 cx.spawn(async move |project, cx| {
446 let mut new_locations = Vec::new();
447 for location in locations {
448 new_locations.push(Self::resolve_location(location, project.clone(), cx).await);
449 }
450 new_locations
451 })
452 })
453 }
454}
455
456// Separate so we can hold a strong reference to the buffer
457// for saving on the thread
458#[derive(Clone, Debug, PartialEq, Eq)]
459struct ResolvedLocation {
460 buffer: Entity<Buffer>,
461 position: Anchor,
462}
463
464impl From<&ResolvedLocation> for AgentLocation {
465 fn from(value: &ResolvedLocation) -> Self {
466 Self {
467 buffer: value.buffer.downgrade(),
468 position: value.position,
469 }
470 }
471}
472
473#[derive(Debug)]
474pub enum ToolCallStatus {
475 /// The tool call hasn't started running yet, but we start showing it to
476 /// the user.
477 Pending,
478 /// The tool call is waiting for confirmation from the user.
479 WaitingForConfirmation {
480 options: PermissionOptions,
481 respond_tx: oneshot::Sender<acp::PermissionOptionId>,
482 },
483 /// The tool call is currently running.
484 InProgress,
485 /// The tool call completed successfully.
486 Completed,
487 /// The tool call failed.
488 Failed,
489 /// The user rejected the tool call.
490 Rejected,
491 /// The user canceled generation so the tool call was canceled.
492 Canceled,
493}
494
495impl From<acp::ToolCallStatus> for ToolCallStatus {
496 fn from(status: acp::ToolCallStatus) -> Self {
497 match status {
498 acp::ToolCallStatus::Pending => Self::Pending,
499 acp::ToolCallStatus::InProgress => Self::InProgress,
500 acp::ToolCallStatus::Completed => Self::Completed,
501 acp::ToolCallStatus::Failed => Self::Failed,
502 _ => Self::Pending,
503 }
504 }
505}
506
507impl Display for ToolCallStatus {
508 fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
509 write!(
510 f,
511 "{}",
512 match self {
513 ToolCallStatus::Pending => "Pending",
514 ToolCallStatus::WaitingForConfirmation { .. } => "Waiting for confirmation",
515 ToolCallStatus::InProgress => "In Progress",
516 ToolCallStatus::Completed => "Completed",
517 ToolCallStatus::Failed => "Failed",
518 ToolCallStatus::Rejected => "Rejected",
519 ToolCallStatus::Canceled => "Canceled",
520 }
521 )
522 }
523}
524
525#[derive(Debug, PartialEq, Clone)]
526pub enum ContentBlock {
527 Empty,
528 Markdown { markdown: Entity<Markdown> },
529 ResourceLink { resource_link: acp::ResourceLink },
530 Image { image: Arc<gpui::Image> },
531}
532
533impl ContentBlock {
534 pub fn new(
535 block: acp::ContentBlock,
536 language_registry: &Arc<LanguageRegistry>,
537 path_style: PathStyle,
538 cx: &mut App,
539 ) -> Self {
540 let mut this = Self::Empty;
541 this.append(block, language_registry, path_style, cx);
542 this
543 }
544
545 pub fn new_combined(
546 blocks: impl IntoIterator<Item = acp::ContentBlock>,
547 language_registry: Arc<LanguageRegistry>,
548 path_style: PathStyle,
549 cx: &mut App,
550 ) -> Self {
551 let mut this = Self::Empty;
552 for block in blocks {
553 this.append(block, &language_registry, path_style, cx);
554 }
555 this
556 }
557
558 pub fn append(
559 &mut self,
560 block: acp::ContentBlock,
561 language_registry: &Arc<LanguageRegistry>,
562 path_style: PathStyle,
563 cx: &mut App,
564 ) {
565 match (&mut *self, &block) {
566 (ContentBlock::Empty, acp::ContentBlock::ResourceLink(resource_link)) => {
567 *self = ContentBlock::ResourceLink {
568 resource_link: resource_link.clone(),
569 };
570 }
571 (ContentBlock::Empty, acp::ContentBlock::Image(image_content)) => {
572 if let Some(image) = Self::decode_image(image_content) {
573 *self = ContentBlock::Image { image };
574 } else {
575 let new_content = Self::image_md(image_content);
576 *self = Self::create_markdown_block(new_content, language_registry, cx);
577 }
578 }
579 (ContentBlock::Empty, _) => {
580 let new_content = Self::block_string_contents(&block, path_style);
581 *self = Self::create_markdown_block(new_content, language_registry, cx);
582 }
583 (ContentBlock::Markdown { markdown }, _) => {
584 let new_content = Self::block_string_contents(&block, path_style);
585 markdown.update(cx, |markdown, cx| markdown.append(&new_content, cx));
586 }
587 (ContentBlock::ResourceLink { resource_link }, _) => {
588 let existing_content = Self::resource_link_md(&resource_link.uri, path_style);
589 let new_content = Self::block_string_contents(&block, path_style);
590 let combined = format!("{}\n{}", existing_content, new_content);
591 *self = Self::create_markdown_block(combined, language_registry, cx);
592 }
593 (ContentBlock::Image { .. }, _) => {
594 let new_content = Self::block_string_contents(&block, path_style);
595 let combined = format!("`Image`\n{}", new_content);
596 *self = Self::create_markdown_block(combined, language_registry, cx);
597 }
598 }
599 }
600
601 fn decode_image(image_content: &acp::ImageContent) -> Option<Arc<gpui::Image>> {
602 use base64::Engine as _;
603
604 let bytes = base64::engine::general_purpose::STANDARD
605 .decode(image_content.data.as_bytes())
606 .ok()?;
607 let format = gpui::ImageFormat::from_mime_type(&image_content.mime_type)?;
608 Some(Arc::new(gpui::Image::from_bytes(format, bytes)))
609 }
610
611 fn create_markdown_block(
612 content: String,
613 language_registry: &Arc<LanguageRegistry>,
614 cx: &mut App,
615 ) -> ContentBlock {
616 ContentBlock::Markdown {
617 markdown: cx
618 .new(|cx| Markdown::new(content.into(), Some(language_registry.clone()), None, cx)),
619 }
620 }
621
622 fn block_string_contents(block: &acp::ContentBlock, path_style: PathStyle) -> String {
623 match block {
624 acp::ContentBlock::Text(text_content) => text_content.text.clone(),
625 acp::ContentBlock::ResourceLink(resource_link) => {
626 Self::resource_link_md(&resource_link.uri, path_style)
627 }
628 acp::ContentBlock::Resource(acp::EmbeddedResource {
629 resource:
630 acp::EmbeddedResourceResource::TextResourceContents(acp::TextResourceContents {
631 uri,
632 ..
633 }),
634 ..
635 }) => Self::resource_link_md(uri, path_style),
636 acp::ContentBlock::Image(image) => Self::image_md(image),
637 _ => String::new(),
638 }
639 }
640
641 fn resource_link_md(uri: &str, path_style: PathStyle) -> String {
642 if let Some(uri) = MentionUri::parse(uri, path_style).log_err() {
643 uri.as_link().to_string()
644 } else {
645 uri.to_string()
646 }
647 }
648
649 fn image_md(_image: &acp::ImageContent) -> String {
650 "`Image`".into()
651 }
652
653 pub fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
654 match self {
655 ContentBlock::Empty => "",
656 ContentBlock::Markdown { markdown } => markdown.read(cx).source(),
657 ContentBlock::ResourceLink { resource_link } => &resource_link.uri,
658 ContentBlock::Image { .. } => "`Image`",
659 }
660 }
661
662 pub fn markdown(&self) -> Option<&Entity<Markdown>> {
663 match self {
664 ContentBlock::Empty => None,
665 ContentBlock::Markdown { markdown } => Some(markdown),
666 ContentBlock::ResourceLink { .. } => None,
667 ContentBlock::Image { .. } => None,
668 }
669 }
670
671 pub fn resource_link(&self) -> Option<&acp::ResourceLink> {
672 match self {
673 ContentBlock::ResourceLink { resource_link } => Some(resource_link),
674 _ => None,
675 }
676 }
677
678 pub fn image(&self) -> Option<&Arc<gpui::Image>> {
679 match self {
680 ContentBlock::Image { image } => Some(image),
681 _ => None,
682 }
683 }
684}
685
686#[derive(Debug)]
687pub enum ToolCallContent {
688 ContentBlock(ContentBlock),
689 Diff(Entity<Diff>),
690 Terminal(Entity<Terminal>),
691 SubagentThread(Entity<AcpThread>),
692}
693
694impl ToolCallContent {
695 pub fn from_acp(
696 content: acp::ToolCallContent,
697 language_registry: Arc<LanguageRegistry>,
698 path_style: PathStyle,
699 terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
700 cx: &mut App,
701 ) -> Result<Option<Self>> {
702 match content {
703 acp::ToolCallContent::Content(acp::Content { content, .. }) => {
704 Ok(Some(Self::ContentBlock(ContentBlock::new(
705 content,
706 &language_registry,
707 path_style,
708 cx,
709 ))))
710 }
711 acp::ToolCallContent::Diff(diff) => Ok(Some(Self::Diff(cx.new(|cx| {
712 Diff::finalized(
713 diff.path.to_string_lossy().into_owned(),
714 diff.old_text,
715 diff.new_text,
716 language_registry,
717 cx,
718 )
719 })))),
720 acp::ToolCallContent::Terminal(acp::Terminal { terminal_id, .. }) => terminals
721 .get(&terminal_id)
722 .cloned()
723 .map(|terminal| Some(Self::Terminal(terminal)))
724 .ok_or_else(|| anyhow::anyhow!("Terminal with id `{}` not found", terminal_id)),
725 _ => Ok(None),
726 }
727 }
728
729 pub fn update_from_acp(
730 &mut self,
731 new: acp::ToolCallContent,
732 language_registry: Arc<LanguageRegistry>,
733 path_style: PathStyle,
734 terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
735 cx: &mut App,
736 ) -> Result<bool> {
737 let needs_update = match (&self, &new) {
738 (Self::Diff(old_diff), acp::ToolCallContent::Diff(new_diff)) => {
739 old_diff.read(cx).needs_update(
740 new_diff.old_text.as_deref().unwrap_or(""),
741 &new_diff.new_text,
742 cx,
743 )
744 }
745 _ => true,
746 };
747
748 if let Some(update) = Self::from_acp(new, language_registry, path_style, terminals, cx)? {
749 if needs_update {
750 *self = update;
751 }
752 Ok(true)
753 } else {
754 Ok(false)
755 }
756 }
757
758 pub fn to_markdown(&self, cx: &App) -> String {
759 match self {
760 Self::ContentBlock(content) => content.to_markdown(cx).to_string(),
761 Self::Diff(diff) => diff.read(cx).to_markdown(cx),
762 Self::Terminal(terminal) => terminal.read(cx).to_markdown(cx),
763 Self::SubagentThread(thread) => thread.read(cx).to_markdown(cx),
764 }
765 }
766
767 pub fn image(&self) -> Option<&Arc<gpui::Image>> {
768 match self {
769 Self::ContentBlock(content) => content.image(),
770 _ => None,
771 }
772 }
773
774 pub fn subagent_thread(&self) -> Option<&Entity<AcpThread>> {
775 match self {
776 Self::SubagentThread(thread) => Some(thread),
777 _ => None,
778 }
779 }
780}
781
782#[derive(Debug, PartialEq)]
783pub enum ToolCallUpdate {
784 UpdateFields(acp::ToolCallUpdate),
785 UpdateDiff(ToolCallUpdateDiff),
786 UpdateTerminal(ToolCallUpdateTerminal),
787 UpdateSubagentThread(ToolCallUpdateSubagentThread),
788}
789
790impl ToolCallUpdate {
791 fn id(&self) -> &acp::ToolCallId {
792 match self {
793 Self::UpdateFields(update) => &update.tool_call_id,
794 Self::UpdateDiff(diff) => &diff.id,
795 Self::UpdateTerminal(terminal) => &terminal.id,
796 Self::UpdateSubagentThread(subagent) => &subagent.id,
797 }
798 }
799}
800
801impl From<acp::ToolCallUpdate> for ToolCallUpdate {
802 fn from(update: acp::ToolCallUpdate) -> Self {
803 Self::UpdateFields(update)
804 }
805}
806
807impl From<ToolCallUpdateDiff> for ToolCallUpdate {
808 fn from(diff: ToolCallUpdateDiff) -> Self {
809 Self::UpdateDiff(diff)
810 }
811}
812
813#[derive(Debug, PartialEq)]
814pub struct ToolCallUpdateDiff {
815 pub id: acp::ToolCallId,
816 pub diff: Entity<Diff>,
817}
818
819impl From<ToolCallUpdateTerminal> for ToolCallUpdate {
820 fn from(terminal: ToolCallUpdateTerminal) -> Self {
821 Self::UpdateTerminal(terminal)
822 }
823}
824
825#[derive(Debug, PartialEq)]
826pub struct ToolCallUpdateTerminal {
827 pub id: acp::ToolCallId,
828 pub terminal: Entity<Terminal>,
829}
830
831impl From<ToolCallUpdateSubagentThread> for ToolCallUpdate {
832 fn from(subagent: ToolCallUpdateSubagentThread) -> Self {
833 Self::UpdateSubagentThread(subagent)
834 }
835}
836
837#[derive(Debug, PartialEq)]
838pub struct ToolCallUpdateSubagentThread {
839 pub id: acp::ToolCallId,
840 pub thread: Entity<AcpThread>,
841}
842
843#[derive(Debug, Default)]
844pub struct Plan {
845 pub entries: Vec<PlanEntry>,
846}
847
848#[derive(Debug)]
849pub struct PlanStats<'a> {
850 pub in_progress_entry: Option<&'a PlanEntry>,
851 pub pending: u32,
852 pub completed: u32,
853}
854
855impl Plan {
856 pub fn is_empty(&self) -> bool {
857 self.entries.is_empty()
858 }
859
860 pub fn stats(&self) -> PlanStats<'_> {
861 let mut stats = PlanStats {
862 in_progress_entry: None,
863 pending: 0,
864 completed: 0,
865 };
866
867 for entry in &self.entries {
868 match &entry.status {
869 acp::PlanEntryStatus::Pending => {
870 stats.pending += 1;
871 }
872 acp::PlanEntryStatus::InProgress => {
873 stats.in_progress_entry = stats.in_progress_entry.or(Some(entry));
874 }
875 acp::PlanEntryStatus::Completed => {
876 stats.completed += 1;
877 }
878 _ => {}
879 }
880 }
881
882 stats
883 }
884}
885
886#[derive(Debug)]
887pub struct PlanEntry {
888 pub content: Entity<Markdown>,
889 pub priority: acp::PlanEntryPriority,
890 pub status: acp::PlanEntryStatus,
891}
892
893impl PlanEntry {
894 pub fn from_acp(entry: acp::PlanEntry, cx: &mut App) -> Self {
895 Self {
896 content: cx.new(|cx| Markdown::new(entry.content.into(), None, None, cx)),
897 priority: entry.priority,
898 status: entry.status,
899 }
900 }
901}
902
903#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
904pub struct TokenUsage {
905 pub max_tokens: u64,
906 pub used_tokens: u64,
907 pub input_tokens: u64,
908 pub output_tokens: u64,
909}
910
911impl TokenUsage {
912 pub fn ratio(&self) -> TokenUsageRatio {
913 #[cfg(debug_assertions)]
914 let warning_threshold: f32 = std::env::var("ZED_THREAD_WARNING_THRESHOLD")
915 .unwrap_or("0.8".to_string())
916 .parse()
917 .unwrap();
918 #[cfg(not(debug_assertions))]
919 let warning_threshold: f32 = 0.8;
920
921 // When the maximum is unknown because there is no selected model,
922 // avoid showing the token limit warning.
923 if self.max_tokens == 0 {
924 TokenUsageRatio::Normal
925 } else if self.used_tokens >= self.max_tokens {
926 TokenUsageRatio::Exceeded
927 } else if self.used_tokens as f32 / self.max_tokens as f32 >= warning_threshold {
928 TokenUsageRatio::Warning
929 } else {
930 TokenUsageRatio::Normal
931 }
932 }
933}
934
935#[derive(Debug, Clone, PartialEq, Eq)]
936pub enum TokenUsageRatio {
937 Normal,
938 Warning,
939 Exceeded,
940}
941
942#[derive(Debug, Clone)]
943pub struct RetryStatus {
944 pub last_error: SharedString,
945 pub attempt: usize,
946 pub max_attempts: usize,
947 pub started_at: Instant,
948 pub duration: Duration,
949}
950
951pub struct AcpThread {
952 title: SharedString,
953 entries: Vec<AgentThreadEntry>,
954 plan: Plan,
955 project: Entity<Project>,
956 action_log: Entity<ActionLog>,
957 shared_buffers: HashMap<Entity<Buffer>, BufferSnapshot>,
958 send_task: Option<Task<()>>,
959 connection: Rc<dyn AgentConnection>,
960 session_id: acp::SessionId,
961 token_usage: Option<TokenUsage>,
962 prompt_capabilities: acp::PromptCapabilities,
963 _observe_prompt_capabilities: Task<anyhow::Result<()>>,
964 terminals: HashMap<acp::TerminalId, Entity<Terminal>>,
965 pending_terminal_output: HashMap<acp::TerminalId, Vec<Vec<u8>>>,
966 pending_terminal_exit: HashMap<acp::TerminalId, acp::TerminalExitStatus>,
967}
968
969impl From<&AcpThread> for ActionLogTelemetry {
970 fn from(value: &AcpThread) -> Self {
971 Self {
972 agent_telemetry_id: value.connection().telemetry_id(),
973 session_id: value.session_id.0.clone(),
974 }
975 }
976}
977
978#[derive(Debug)]
979pub enum AcpThreadEvent {
980 NewEntry,
981 TitleUpdated,
982 TokenUsageUpdated,
983 EntryUpdated(usize),
984 EntriesRemoved(Range<usize>),
985 ToolAuthorizationRequired,
986 Retry(RetryStatus),
987 Stopped,
988 Error,
989 LoadError(LoadError),
990 PromptCapabilitiesUpdated,
991 Refusal,
992 AvailableCommandsUpdated(Vec<acp::AvailableCommand>),
993 ModeUpdated(acp::SessionModeId),
994 ConfigOptionsUpdated(Vec<acp::SessionConfigOption>),
995}
996
997impl EventEmitter<AcpThreadEvent> for AcpThread {}
998
999#[derive(Debug, Clone)]
1000pub enum TerminalProviderEvent {
1001 Created {
1002 terminal_id: acp::TerminalId,
1003 label: String,
1004 cwd: Option<PathBuf>,
1005 output_byte_limit: Option<u64>,
1006 terminal: Entity<::terminal::Terminal>,
1007 },
1008 Output {
1009 terminal_id: acp::TerminalId,
1010 data: Vec<u8>,
1011 },
1012 TitleChanged {
1013 terminal_id: acp::TerminalId,
1014 title: String,
1015 },
1016 Exit {
1017 terminal_id: acp::TerminalId,
1018 status: acp::TerminalExitStatus,
1019 },
1020}
1021
1022#[derive(Debug, Clone)]
1023pub enum TerminalProviderCommand {
1024 WriteInput {
1025 terminal_id: acp::TerminalId,
1026 bytes: Vec<u8>,
1027 },
1028 Resize {
1029 terminal_id: acp::TerminalId,
1030 cols: u16,
1031 rows: u16,
1032 },
1033 Close {
1034 terminal_id: acp::TerminalId,
1035 },
1036}
1037
1038impl AcpThread {
1039 pub fn on_terminal_provider_event(
1040 &mut self,
1041 event: TerminalProviderEvent,
1042 cx: &mut Context<Self>,
1043 ) {
1044 match event {
1045 TerminalProviderEvent::Created {
1046 terminal_id,
1047 label,
1048 cwd,
1049 output_byte_limit,
1050 terminal,
1051 } => {
1052 let entity = self.register_terminal_created(
1053 terminal_id.clone(),
1054 label,
1055 cwd,
1056 output_byte_limit,
1057 terminal,
1058 cx,
1059 );
1060
1061 if let Some(mut chunks) = self.pending_terminal_output.remove(&terminal_id) {
1062 for data in chunks.drain(..) {
1063 entity.update(cx, |term, cx| {
1064 term.inner().update(cx, |inner, cx| {
1065 inner.write_output(&data, cx);
1066 })
1067 });
1068 }
1069 }
1070
1071 if let Some(_status) = self.pending_terminal_exit.remove(&terminal_id) {
1072 entity.update(cx, |_term, cx| {
1073 cx.notify();
1074 });
1075 }
1076
1077 cx.notify();
1078 }
1079 TerminalProviderEvent::Output { terminal_id, data } => {
1080 if let Some(entity) = self.terminals.get(&terminal_id) {
1081 entity.update(cx, |term, cx| {
1082 term.inner().update(cx, |inner, cx| {
1083 inner.write_output(&data, cx);
1084 })
1085 });
1086 } else {
1087 self.pending_terminal_output
1088 .entry(terminal_id)
1089 .or_default()
1090 .push(data);
1091 }
1092 }
1093 TerminalProviderEvent::TitleChanged { terminal_id, title } => {
1094 if let Some(entity) = self.terminals.get(&terminal_id) {
1095 entity.update(cx, |term, cx| {
1096 term.inner().update(cx, |inner, cx| {
1097 inner.breadcrumb_text = title;
1098 cx.emit(::terminal::Event::BreadcrumbsChanged);
1099 })
1100 });
1101 }
1102 }
1103 TerminalProviderEvent::Exit {
1104 terminal_id,
1105 status,
1106 } => {
1107 if let Some(entity) = self.terminals.get(&terminal_id) {
1108 entity.update(cx, |_term, cx| {
1109 cx.notify();
1110 });
1111 } else {
1112 self.pending_terminal_exit.insert(terminal_id, status);
1113 }
1114 }
1115 }
1116 }
1117}
1118
1119#[derive(PartialEq, Eq, Debug)]
1120pub enum ThreadStatus {
1121 Idle,
1122 Generating,
1123}
1124
1125#[derive(Debug, Clone)]
1126pub enum LoadError {
1127 Unsupported {
1128 command: SharedString,
1129 current_version: SharedString,
1130 minimum_version: SharedString,
1131 },
1132 FailedToInstall(SharedString),
1133 Exited {
1134 status: ExitStatus,
1135 },
1136 Other(SharedString),
1137}
1138
1139impl Display for LoadError {
1140 fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
1141 match self {
1142 LoadError::Unsupported {
1143 command: path,
1144 current_version,
1145 minimum_version,
1146 } => {
1147 write!(
1148 f,
1149 "version {current_version} from {path} is not supported (need at least {minimum_version})"
1150 )
1151 }
1152 LoadError::FailedToInstall(msg) => write!(f, "Failed to install: {msg}"),
1153 LoadError::Exited { status } => write!(f, "Server exited with status {status}"),
1154 LoadError::Other(msg) => write!(f, "{msg}"),
1155 }
1156 }
1157}
1158
1159impl Error for LoadError {}
1160
1161impl AcpThread {
1162 pub fn new(
1163 title: impl Into<SharedString>,
1164 connection: Rc<dyn AgentConnection>,
1165 project: Entity<Project>,
1166 action_log: Entity<ActionLog>,
1167 session_id: acp::SessionId,
1168 mut prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
1169 cx: &mut Context<Self>,
1170 ) -> Self {
1171 let prompt_capabilities = prompt_capabilities_rx.borrow().clone();
1172 let task = cx.spawn::<_, anyhow::Result<()>>(async move |this, cx| {
1173 loop {
1174 let caps = prompt_capabilities_rx.recv().await?;
1175 this.update(cx, |this, cx| {
1176 this.prompt_capabilities = caps;
1177 cx.emit(AcpThreadEvent::PromptCapabilitiesUpdated);
1178 })?;
1179 }
1180 });
1181
1182 Self {
1183 action_log,
1184 shared_buffers: Default::default(),
1185 entries: Default::default(),
1186 plan: Default::default(),
1187 title: title.into(),
1188 project,
1189 send_task: None,
1190 connection,
1191 session_id,
1192 token_usage: None,
1193 prompt_capabilities,
1194 _observe_prompt_capabilities: task,
1195 terminals: HashMap::default(),
1196 pending_terminal_output: HashMap::default(),
1197 pending_terminal_exit: HashMap::default(),
1198 }
1199 }
1200
1201 pub fn prompt_capabilities(&self) -> acp::PromptCapabilities {
1202 self.prompt_capabilities.clone()
1203 }
1204
1205 pub fn connection(&self) -> &Rc<dyn AgentConnection> {
1206 &self.connection
1207 }
1208
1209 pub fn action_log(&self) -> &Entity<ActionLog> {
1210 &self.action_log
1211 }
1212
1213 pub fn project(&self) -> &Entity<Project> {
1214 &self.project
1215 }
1216
1217 pub fn title(&self) -> SharedString {
1218 self.title.clone()
1219 }
1220
1221 pub fn entries(&self) -> &[AgentThreadEntry] {
1222 &self.entries
1223 }
1224
1225 pub fn session_id(&self) -> &acp::SessionId {
1226 &self.session_id
1227 }
1228
1229 pub fn status(&self) -> ThreadStatus {
1230 if self.send_task.is_some() {
1231 ThreadStatus::Generating
1232 } else {
1233 ThreadStatus::Idle
1234 }
1235 }
1236
1237 pub fn token_usage(&self) -> Option<&TokenUsage> {
1238 self.token_usage.as_ref()
1239 }
1240
1241 pub fn has_pending_edit_tool_calls(&self) -> bool {
1242 for entry in self.entries.iter().rev() {
1243 match entry {
1244 AgentThreadEntry::UserMessage(_) => return false,
1245 AgentThreadEntry::ToolCall(
1246 call @ ToolCall {
1247 status: ToolCallStatus::InProgress | ToolCallStatus::Pending,
1248 ..
1249 },
1250 ) if call.diffs().next().is_some() => {
1251 return true;
1252 }
1253 AgentThreadEntry::ToolCall(_) | AgentThreadEntry::AssistantMessage(_) => {}
1254 }
1255 }
1256
1257 false
1258 }
1259
1260 pub fn has_in_progress_tool_calls(&self) -> bool {
1261 for entry in self.entries.iter().rev() {
1262 match entry {
1263 AgentThreadEntry::UserMessage(_) => return false,
1264 AgentThreadEntry::ToolCall(ToolCall {
1265 status: ToolCallStatus::InProgress | ToolCallStatus::Pending,
1266 ..
1267 }) => {
1268 return true;
1269 }
1270 AgentThreadEntry::ToolCall(_) | AgentThreadEntry::AssistantMessage(_) => {}
1271 }
1272 }
1273
1274 false
1275 }
1276
1277 pub fn used_tools_since_last_user_message(&self) -> bool {
1278 for entry in self.entries.iter().rev() {
1279 match entry {
1280 AgentThreadEntry::UserMessage(..) => return false,
1281 AgentThreadEntry::AssistantMessage(..) => continue,
1282 AgentThreadEntry::ToolCall(..) => return true,
1283 }
1284 }
1285
1286 false
1287 }
1288
1289 pub fn handle_session_update(
1290 &mut self,
1291 update: acp::SessionUpdate,
1292 cx: &mut Context<Self>,
1293 ) -> Result<(), acp::Error> {
1294 match update {
1295 acp::SessionUpdate::UserMessageChunk(acp::ContentChunk { content, .. }) => {
1296 self.push_user_content_block(None, content, cx);
1297 }
1298 acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk { content, .. }) => {
1299 self.push_assistant_content_block(content, false, cx);
1300 }
1301 acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk { content, .. }) => {
1302 self.push_assistant_content_block(content, true, cx);
1303 }
1304 acp::SessionUpdate::ToolCall(tool_call) => {
1305 self.upsert_tool_call(tool_call, cx)?;
1306 }
1307 acp::SessionUpdate::ToolCallUpdate(tool_call_update) => {
1308 self.update_tool_call(tool_call_update, cx)?;
1309 }
1310 acp::SessionUpdate::Plan(plan) => {
1311 self.update_plan(plan, cx);
1312 }
1313 acp::SessionUpdate::AvailableCommandsUpdate(acp::AvailableCommandsUpdate {
1314 available_commands,
1315 ..
1316 }) => cx.emit(AcpThreadEvent::AvailableCommandsUpdated(available_commands)),
1317 acp::SessionUpdate::CurrentModeUpdate(acp::CurrentModeUpdate {
1318 current_mode_id,
1319 ..
1320 }) => cx.emit(AcpThreadEvent::ModeUpdated(current_mode_id)),
1321 acp::SessionUpdate::ConfigOptionUpdate(acp::ConfigOptionUpdate {
1322 config_options,
1323 ..
1324 }) => cx.emit(AcpThreadEvent::ConfigOptionsUpdated(config_options)),
1325 _ => {}
1326 }
1327 Ok(())
1328 }
1329
1330 pub fn push_user_content_block(
1331 &mut self,
1332 message_id: Option<UserMessageId>,
1333 chunk: acp::ContentBlock,
1334 cx: &mut Context<Self>,
1335 ) {
1336 self.push_user_content_block_with_indent(message_id, chunk, false, cx)
1337 }
1338
1339 pub fn push_user_content_block_with_indent(
1340 &mut self,
1341 message_id: Option<UserMessageId>,
1342 chunk: acp::ContentBlock,
1343 indented: bool,
1344 cx: &mut Context<Self>,
1345 ) {
1346 let language_registry = self.project.read(cx).languages().clone();
1347 let path_style = self.project.read(cx).path_style(cx);
1348 let entries_len = self.entries.len();
1349
1350 if let Some(last_entry) = self.entries.last_mut()
1351 && let AgentThreadEntry::UserMessage(UserMessage {
1352 id,
1353 content,
1354 chunks,
1355 indented: existing_indented,
1356 ..
1357 }) = last_entry
1358 && *existing_indented == indented
1359 {
1360 *id = message_id.or(id.take());
1361 content.append(chunk.clone(), &language_registry, path_style, cx);
1362 chunks.push(chunk);
1363 let idx = entries_len - 1;
1364 cx.emit(AcpThreadEvent::EntryUpdated(idx));
1365 } else {
1366 let content = ContentBlock::new(chunk.clone(), &language_registry, path_style, cx);
1367 self.push_entry(
1368 AgentThreadEntry::UserMessage(UserMessage {
1369 id: message_id,
1370 content,
1371 chunks: vec![chunk],
1372 checkpoint: None,
1373 indented,
1374 }),
1375 cx,
1376 );
1377 }
1378 }
1379
1380 pub fn push_assistant_content_block(
1381 &mut self,
1382 chunk: acp::ContentBlock,
1383 is_thought: bool,
1384 cx: &mut Context<Self>,
1385 ) {
1386 self.push_assistant_content_block_with_indent(chunk, is_thought, false, cx)
1387 }
1388
1389 pub fn push_assistant_content_block_with_indent(
1390 &mut self,
1391 chunk: acp::ContentBlock,
1392 is_thought: bool,
1393 indented: bool,
1394 cx: &mut Context<Self>,
1395 ) {
1396 let language_registry = self.project.read(cx).languages().clone();
1397 let path_style = self.project.read(cx).path_style(cx);
1398 let entries_len = self.entries.len();
1399 if let Some(last_entry) = self.entries.last_mut()
1400 && let AgentThreadEntry::AssistantMessage(AssistantMessage {
1401 chunks,
1402 indented: existing_indented,
1403 }) = last_entry
1404 && *existing_indented == indented
1405 {
1406 let idx = entries_len - 1;
1407 cx.emit(AcpThreadEvent::EntryUpdated(idx));
1408 match (chunks.last_mut(), is_thought) {
1409 (Some(AssistantMessageChunk::Message { block }), false)
1410 | (Some(AssistantMessageChunk::Thought { block }), true) => {
1411 block.append(chunk, &language_registry, path_style, cx)
1412 }
1413 _ => {
1414 let block = ContentBlock::new(chunk, &language_registry, path_style, cx);
1415 if is_thought {
1416 chunks.push(AssistantMessageChunk::Thought { block })
1417 } else {
1418 chunks.push(AssistantMessageChunk::Message { block })
1419 }
1420 }
1421 }
1422 } else {
1423 let block = ContentBlock::new(chunk, &language_registry, path_style, cx);
1424 let chunk = if is_thought {
1425 AssistantMessageChunk::Thought { block }
1426 } else {
1427 AssistantMessageChunk::Message { block }
1428 };
1429
1430 self.push_entry(
1431 AgentThreadEntry::AssistantMessage(AssistantMessage {
1432 chunks: vec![chunk],
1433 indented,
1434 }),
1435 cx,
1436 );
1437 }
1438 }
1439
1440 fn push_entry(&mut self, entry: AgentThreadEntry, cx: &mut Context<Self>) {
1441 self.entries.push(entry);
1442 cx.emit(AcpThreadEvent::NewEntry);
1443 }
1444
1445 pub fn can_set_title(&mut self, cx: &mut Context<Self>) -> bool {
1446 self.connection.set_title(&self.session_id, cx).is_some()
1447 }
1448
1449 pub fn set_title(&mut self, title: SharedString, cx: &mut Context<Self>) -> Task<Result<()>> {
1450 if title != self.title {
1451 self.title = title.clone();
1452 cx.emit(AcpThreadEvent::TitleUpdated);
1453 if let Some(set_title) = self.connection.set_title(&self.session_id, cx) {
1454 return set_title.run(title, cx);
1455 }
1456 }
1457 Task::ready(Ok(()))
1458 }
1459
1460 pub fn update_token_usage(&mut self, usage: Option<TokenUsage>, cx: &mut Context<Self>) {
1461 self.token_usage = usage;
1462 cx.emit(AcpThreadEvent::TokenUsageUpdated);
1463 }
1464
1465 pub fn update_retry_status(&mut self, status: RetryStatus, cx: &mut Context<Self>) {
1466 cx.emit(AcpThreadEvent::Retry(status));
1467 }
1468
1469 pub fn update_tool_call(
1470 &mut self,
1471 update: impl Into<ToolCallUpdate>,
1472 cx: &mut Context<Self>,
1473 ) -> Result<()> {
1474 let update = update.into();
1475 let languages = self.project.read(cx).languages().clone();
1476 let path_style = self.project.read(cx).path_style(cx);
1477
1478 let ix = match self.index_for_tool_call(update.id()) {
1479 Some(ix) => ix,
1480 None => {
1481 // Tool call not found - create a failed tool call entry
1482 let failed_tool_call = ToolCall {
1483 id: update.id().clone(),
1484 label: cx.new(|cx| Markdown::new("Tool call not found".into(), None, None, cx)),
1485 kind: acp::ToolKind::Fetch,
1486 content: vec![ToolCallContent::ContentBlock(ContentBlock::new(
1487 "Tool call not found".into(),
1488 &languages,
1489 path_style,
1490 cx,
1491 ))],
1492 status: ToolCallStatus::Failed,
1493 locations: Vec::new(),
1494 resolved_locations: Vec::new(),
1495 raw_input: None,
1496 raw_input_markdown: None,
1497 raw_output: None,
1498 tool_name: None,
1499 };
1500 self.push_entry(AgentThreadEntry::ToolCall(failed_tool_call), cx);
1501 return Ok(());
1502 }
1503 };
1504 let AgentThreadEntry::ToolCall(call) = &mut self.entries[ix] else {
1505 unreachable!()
1506 };
1507
1508 match update {
1509 ToolCallUpdate::UpdateFields(update) => {
1510 let location_updated = update.fields.locations.is_some();
1511 call.update_fields(update.fields, languages, path_style, &self.terminals, cx)?;
1512 if location_updated {
1513 self.resolve_locations(update.tool_call_id, cx);
1514 }
1515 }
1516 ToolCallUpdate::UpdateDiff(update) => {
1517 call.content.clear();
1518 call.content.push(ToolCallContent::Diff(update.diff));
1519 }
1520 ToolCallUpdate::UpdateTerminal(update) => {
1521 call.content.clear();
1522 call.content
1523 .push(ToolCallContent::Terminal(update.terminal));
1524 }
1525 ToolCallUpdate::UpdateSubagentThread(update) => {
1526 debug_assert!(
1527 !call.content.iter().any(|c| {
1528 matches!(c, ToolCallContent::SubagentThread(existing) if existing == &update.thread)
1529 }),
1530 "Duplicate SubagentThread update for the same AcpThread entity"
1531 );
1532 call.content
1533 .push(ToolCallContent::SubagentThread(update.thread));
1534 }
1535 }
1536
1537 cx.emit(AcpThreadEvent::EntryUpdated(ix));
1538
1539 Ok(())
1540 }
1541
1542 /// Updates a tool call if id matches an existing entry, otherwise inserts a new one.
1543 pub fn upsert_tool_call(
1544 &mut self,
1545 tool_call: acp::ToolCall,
1546 cx: &mut Context<Self>,
1547 ) -> Result<(), acp::Error> {
1548 let status = tool_call.status.into();
1549 self.upsert_tool_call_inner(tool_call.into(), status, cx)
1550 }
1551
1552 /// Fails if id does not match an existing entry.
1553 pub fn upsert_tool_call_inner(
1554 &mut self,
1555 update: acp::ToolCallUpdate,
1556 status: ToolCallStatus,
1557 cx: &mut Context<Self>,
1558 ) -> Result<(), acp::Error> {
1559 let language_registry = self.project.read(cx).languages().clone();
1560 let path_style = self.project.read(cx).path_style(cx);
1561 let id = update.tool_call_id.clone();
1562
1563 let agent_telemetry_id = self.connection().telemetry_id();
1564 let session = self.session_id();
1565 if let ToolCallStatus::Completed | ToolCallStatus::Failed = status {
1566 let status = if matches!(status, ToolCallStatus::Completed) {
1567 "completed"
1568 } else {
1569 "failed"
1570 };
1571 telemetry::event!(
1572 "Agent Tool Call Completed",
1573 agent_telemetry_id,
1574 session,
1575 status
1576 );
1577 }
1578
1579 if let Some(ix) = self.index_for_tool_call(&id) {
1580 let AgentThreadEntry::ToolCall(call) = &mut self.entries[ix] else {
1581 unreachable!()
1582 };
1583
1584 call.update_fields(
1585 update.fields,
1586 language_registry,
1587 path_style,
1588 &self.terminals,
1589 cx,
1590 )?;
1591 call.status = status;
1592
1593 cx.emit(AcpThreadEvent::EntryUpdated(ix));
1594 } else {
1595 let call = ToolCall::from_acp(
1596 update.try_into()?,
1597 status,
1598 language_registry,
1599 self.project.read(cx).path_style(cx),
1600 &self.terminals,
1601 cx,
1602 )?;
1603 self.push_entry(AgentThreadEntry::ToolCall(call), cx);
1604 };
1605
1606 self.resolve_locations(id, cx);
1607 Ok(())
1608 }
1609
1610 fn index_for_tool_call(&self, id: &acp::ToolCallId) -> Option<usize> {
1611 self.entries
1612 .iter()
1613 .enumerate()
1614 .rev()
1615 .find_map(|(index, entry)| {
1616 if let AgentThreadEntry::ToolCall(tool_call) = entry
1617 && &tool_call.id == id
1618 {
1619 Some(index)
1620 } else {
1621 None
1622 }
1623 })
1624 }
1625
1626 fn tool_call_mut(&mut self, id: &acp::ToolCallId) -> Option<(usize, &mut ToolCall)> {
1627 // The tool call we are looking for is typically the last one, or very close to the end.
1628 // At the moment, it doesn't seem like a hashmap would be a good fit for this use case.
1629 self.entries
1630 .iter_mut()
1631 .enumerate()
1632 .rev()
1633 .find_map(|(index, tool_call)| {
1634 if let AgentThreadEntry::ToolCall(tool_call) = tool_call
1635 && &tool_call.id == id
1636 {
1637 Some((index, tool_call))
1638 } else {
1639 None
1640 }
1641 })
1642 }
1643
1644 pub fn tool_call(&mut self, id: &acp::ToolCallId) -> Option<(usize, &ToolCall)> {
1645 self.entries
1646 .iter()
1647 .enumerate()
1648 .rev()
1649 .find_map(|(index, tool_call)| {
1650 if let AgentThreadEntry::ToolCall(tool_call) = tool_call
1651 && &tool_call.id == id
1652 {
1653 Some((index, tool_call))
1654 } else {
1655 None
1656 }
1657 })
1658 }
1659
1660 pub fn resolve_locations(&mut self, id: acp::ToolCallId, cx: &mut Context<Self>) {
1661 let project = self.project.clone();
1662 let Some((_, tool_call)) = self.tool_call_mut(&id) else {
1663 return;
1664 };
1665 let task = tool_call.resolve_locations(project, cx);
1666 cx.spawn(async move |this, cx| {
1667 let resolved_locations = task.await;
1668
1669 this.update(cx, |this, cx| {
1670 let project = this.project.clone();
1671
1672 for location in resolved_locations.iter().flatten() {
1673 this.shared_buffers
1674 .insert(location.buffer.clone(), location.buffer.read(cx).snapshot());
1675 }
1676 let Some((ix, tool_call)) = this.tool_call_mut(&id) else {
1677 return;
1678 };
1679
1680 if let Some(Some(location)) = resolved_locations.last() {
1681 project.update(cx, |project, cx| {
1682 let should_ignore = if let Some(agent_location) = project
1683 .agent_location()
1684 .filter(|agent_location| agent_location.buffer == location.buffer)
1685 {
1686 let snapshot = location.buffer.read(cx).snapshot();
1687 let old_position = agent_location.position.to_point(&snapshot);
1688 let new_position = location.position.to_point(&snapshot);
1689
1690 // ignore this so that when we get updates from the edit tool
1691 // the position doesn't reset to the startof line
1692 old_position.row == new_position.row
1693 && old_position.column > new_position.column
1694 } else {
1695 false
1696 };
1697 if !should_ignore {
1698 project.set_agent_location(Some(location.into()), cx);
1699 }
1700 });
1701 }
1702
1703 let resolved_locations = resolved_locations
1704 .iter()
1705 .map(|l| l.as_ref().map(|l| AgentLocation::from(l)))
1706 .collect::<Vec<_>>();
1707
1708 if tool_call.resolved_locations != resolved_locations {
1709 tool_call.resolved_locations = resolved_locations;
1710 cx.emit(AcpThreadEvent::EntryUpdated(ix));
1711 }
1712 })
1713 })
1714 .detach();
1715 }
1716
1717 pub fn request_tool_call_authorization(
1718 &mut self,
1719 tool_call: acp::ToolCallUpdate,
1720 options: PermissionOptions,
1721 respect_always_allow_setting: bool,
1722 cx: &mut Context<Self>,
1723 ) -> Result<BoxFuture<'static, acp::RequestPermissionOutcome>> {
1724 let (tx, rx) = oneshot::channel();
1725
1726 if respect_always_allow_setting && AgentSettings::get_global(cx).always_allow_tool_actions {
1727 // Don't use AllowAlways, because then if you were to turn off always_allow_tool_actions,
1728 // some tools would (incorrectly) continue to auto-accept.
1729 if let Some(allow_once_option) = options.allow_once_option_id() {
1730 self.upsert_tool_call_inner(tool_call, ToolCallStatus::Pending, cx)?;
1731 return Ok(async {
1732 acp::RequestPermissionOutcome::Selected(acp::SelectedPermissionOutcome::new(
1733 allow_once_option,
1734 ))
1735 }
1736 .boxed());
1737 }
1738 }
1739
1740 let status = ToolCallStatus::WaitingForConfirmation {
1741 options,
1742 respond_tx: tx,
1743 };
1744
1745 self.upsert_tool_call_inner(tool_call, status, cx)?;
1746 cx.emit(AcpThreadEvent::ToolAuthorizationRequired);
1747
1748 let fut = async {
1749 match rx.await {
1750 Ok(option) => acp::RequestPermissionOutcome::Selected(
1751 acp::SelectedPermissionOutcome::new(option),
1752 ),
1753 Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
1754 }
1755 }
1756 .boxed();
1757
1758 Ok(fut)
1759 }
1760
1761 pub fn authorize_tool_call(
1762 &mut self,
1763 id: acp::ToolCallId,
1764 option_id: acp::PermissionOptionId,
1765 option_kind: acp::PermissionOptionKind,
1766 cx: &mut Context<Self>,
1767 ) {
1768 let Some((ix, call)) = self.tool_call_mut(&id) else {
1769 return;
1770 };
1771
1772 let new_status = match option_kind {
1773 acp::PermissionOptionKind::RejectOnce | acp::PermissionOptionKind::RejectAlways => {
1774 ToolCallStatus::Rejected
1775 }
1776 acp::PermissionOptionKind::AllowOnce | acp::PermissionOptionKind::AllowAlways => {
1777 ToolCallStatus::InProgress
1778 }
1779 _ => ToolCallStatus::InProgress,
1780 };
1781
1782 let curr_status = mem::replace(&mut call.status, new_status);
1783
1784 if let ToolCallStatus::WaitingForConfirmation { respond_tx, .. } = curr_status {
1785 respond_tx.send(option_id).log_err();
1786 } else if cfg!(debug_assertions) {
1787 panic!("tried to authorize an already authorized tool call");
1788 }
1789
1790 cx.emit(AcpThreadEvent::EntryUpdated(ix));
1791 }
1792
1793 pub fn first_tool_awaiting_confirmation(&self) -> Option<&ToolCall> {
1794 let mut first_tool_call = None;
1795
1796 for entry in self.entries.iter().rev() {
1797 match &entry {
1798 AgentThreadEntry::ToolCall(call) => {
1799 if let ToolCallStatus::WaitingForConfirmation { .. } = call.status {
1800 first_tool_call = Some(call);
1801 } else {
1802 continue;
1803 }
1804 }
1805 AgentThreadEntry::UserMessage(_) | AgentThreadEntry::AssistantMessage(_) => {
1806 // Reached the beginning of the turn.
1807 // If we had pending permission requests in the previous turn, they have been cancelled.
1808 break;
1809 }
1810 }
1811 }
1812
1813 first_tool_call
1814 }
1815
1816 pub fn plan(&self) -> &Plan {
1817 &self.plan
1818 }
1819
1820 pub fn update_plan(&mut self, request: acp::Plan, cx: &mut Context<Self>) {
1821 let new_entries_len = request.entries.len();
1822 let mut new_entries = request.entries.into_iter();
1823
1824 // Reuse existing markdown to prevent flickering
1825 for (old, new) in self.plan.entries.iter_mut().zip(new_entries.by_ref()) {
1826 let PlanEntry {
1827 content,
1828 priority,
1829 status,
1830 } = old;
1831 content.update(cx, |old, cx| {
1832 old.replace(new.content, cx);
1833 });
1834 *priority = new.priority;
1835 *status = new.status;
1836 }
1837 for new in new_entries {
1838 self.plan.entries.push(PlanEntry::from_acp(new, cx))
1839 }
1840 self.plan.entries.truncate(new_entries_len);
1841
1842 cx.notify();
1843 }
1844
1845 fn clear_completed_plan_entries(&mut self, cx: &mut Context<Self>) {
1846 self.plan
1847 .entries
1848 .retain(|entry| !matches!(entry.status, acp::PlanEntryStatus::Completed));
1849 cx.notify();
1850 }
1851
1852 #[cfg(any(test, feature = "test-support"))]
1853 pub fn send_raw(
1854 &mut self,
1855 message: &str,
1856 cx: &mut Context<Self>,
1857 ) -> BoxFuture<'static, Result<()>> {
1858 self.send(vec![message.into()], cx)
1859 }
1860
1861 pub fn send(
1862 &mut self,
1863 message: Vec<acp::ContentBlock>,
1864 cx: &mut Context<Self>,
1865 ) -> BoxFuture<'static, Result<()>> {
1866 let block = ContentBlock::new_combined(
1867 message.clone(),
1868 self.project.read(cx).languages().clone(),
1869 self.project.read(cx).path_style(cx),
1870 cx,
1871 );
1872 let request = acp::PromptRequest::new(self.session_id.clone(), message.clone());
1873 let git_store = self.project.read(cx).git_store().clone();
1874
1875 let message_id = if self.connection.truncate(&self.session_id, cx).is_some() {
1876 Some(UserMessageId::new())
1877 } else {
1878 None
1879 };
1880
1881 self.run_turn(cx, async move |this, cx| {
1882 this.update(cx, |this, cx| {
1883 this.push_entry(
1884 AgentThreadEntry::UserMessage(UserMessage {
1885 id: message_id.clone(),
1886 content: block,
1887 chunks: message,
1888 checkpoint: None,
1889 indented: false,
1890 }),
1891 cx,
1892 );
1893 })
1894 .ok();
1895
1896 let old_checkpoint = git_store
1897 .update(cx, |git, cx| git.checkpoint(cx))
1898 .await
1899 .context("failed to get old checkpoint")
1900 .log_err();
1901 this.update(cx, |this, cx| {
1902 if let Some((_ix, message)) = this.last_user_message() {
1903 message.checkpoint = old_checkpoint.map(|git_checkpoint| Checkpoint {
1904 git_checkpoint,
1905 show: false,
1906 });
1907 }
1908 this.connection.prompt(message_id, request, cx)
1909 })?
1910 .await
1911 })
1912 }
1913
1914 pub fn can_retry(&self, cx: &App) -> bool {
1915 self.connection.retry(&self.session_id, cx).is_some()
1916 }
1917
1918 pub fn retry(&mut self, cx: &mut Context<Self>) -> BoxFuture<'static, Result<()>> {
1919 self.run_turn(cx, async move |this, cx| {
1920 this.update(cx, |this, cx| {
1921 this.connection
1922 .retry(&this.session_id, cx)
1923 .map(|retry| retry.run(cx))
1924 })?
1925 .context("retrying a session is not supported")?
1926 .await
1927 })
1928 }
1929
1930 fn run_turn(
1931 &mut self,
1932 cx: &mut Context<Self>,
1933 f: impl 'static + AsyncFnOnce(WeakEntity<Self>, &mut AsyncApp) -> Result<acp::PromptResponse>,
1934 ) -> BoxFuture<'static, Result<()>> {
1935 self.clear_completed_plan_entries(cx);
1936
1937 let (tx, rx) = oneshot::channel();
1938 let cancel_task = self.cancel(cx);
1939
1940 self.send_task = Some(cx.spawn(async move |this, cx| {
1941 cancel_task.await;
1942 tx.send(f(this, cx).await).ok();
1943 }));
1944
1945 cx.spawn(async move |this, cx| {
1946 let response = rx.await;
1947
1948 this.update(cx, |this, cx| this.update_last_checkpoint(cx))?
1949 .await?;
1950
1951 this.update(cx, |this, cx| {
1952 this.project
1953 .update(cx, |project, cx| project.set_agent_location(None, cx));
1954 match response {
1955 Ok(Err(e)) => {
1956 this.send_task.take();
1957 cx.emit(AcpThreadEvent::Error);
1958 Err(e)
1959 }
1960 result => {
1961 let canceled = matches!(
1962 result,
1963 Ok(Ok(acp::PromptResponse {
1964 stop_reason: acp::StopReason::Cancelled,
1965 ..
1966 }))
1967 );
1968
1969 // We only take the task if the current prompt wasn't canceled.
1970 //
1971 // This prompt may have been canceled because another one was sent
1972 // while it was still generating. In these cases, dropping `send_task`
1973 // would cause the next generation to be canceled.
1974 if !canceled {
1975 this.send_task.take();
1976 }
1977
1978 // Handle refusal - distinguish between user prompt and tool call refusals
1979 if let Ok(Ok(acp::PromptResponse {
1980 stop_reason: acp::StopReason::Refusal,
1981 ..
1982 })) = result
1983 {
1984 if let Some((user_msg_ix, _)) = this.last_user_message() {
1985 // Check if there's a completed tool call with results after the last user message
1986 // This indicates the refusal is in response to tool output, not the user's prompt
1987 let has_completed_tool_call_after_user_msg =
1988 this.entries.iter().skip(user_msg_ix + 1).any(|entry| {
1989 if let AgentThreadEntry::ToolCall(tool_call) = entry {
1990 // Check if the tool call has completed and has output
1991 matches!(tool_call.status, ToolCallStatus::Completed)
1992 && tool_call.raw_output.is_some()
1993 } else {
1994 false
1995 }
1996 });
1997
1998 if has_completed_tool_call_after_user_msg {
1999 // Refusal is due to tool output - don't truncate, just notify
2000 // The model refused based on what the tool returned
2001 cx.emit(AcpThreadEvent::Refusal);
2002 } else {
2003 // User prompt was refused - truncate back to before the user message
2004 let range = user_msg_ix..this.entries.len();
2005 if range.start < range.end {
2006 this.entries.truncate(user_msg_ix);
2007 cx.emit(AcpThreadEvent::EntriesRemoved(range));
2008 }
2009 cx.emit(AcpThreadEvent::Refusal);
2010 }
2011 } else {
2012 // No user message found, treat as general refusal
2013 cx.emit(AcpThreadEvent::Refusal);
2014 }
2015 }
2016
2017 cx.emit(AcpThreadEvent::Stopped);
2018 Ok(())
2019 }
2020 }
2021 })?
2022 })
2023 .boxed()
2024 }
2025
2026 pub fn cancel(&mut self, cx: &mut Context<Self>) -> Task<()> {
2027 let Some(send_task) = self.send_task.take() else {
2028 return Task::ready(());
2029 };
2030
2031 for entry in self.entries.iter_mut() {
2032 if let AgentThreadEntry::ToolCall(call) = entry {
2033 let cancel = matches!(
2034 call.status,
2035 ToolCallStatus::Pending
2036 | ToolCallStatus::WaitingForConfirmation { .. }
2037 | ToolCallStatus::InProgress
2038 );
2039
2040 if cancel {
2041 call.status = ToolCallStatus::Canceled;
2042 }
2043 }
2044 }
2045
2046 self.connection.cancel(&self.session_id, cx);
2047
2048 // Wait for the send task to complete
2049 cx.foreground_executor().spawn(send_task)
2050 }
2051
2052 /// Restores the git working tree to the state at the given checkpoint (if one exists)
2053 pub fn restore_checkpoint(
2054 &mut self,
2055 id: UserMessageId,
2056 cx: &mut Context<Self>,
2057 ) -> Task<Result<()>> {
2058 let Some((_, message)) = self.user_message_mut(&id) else {
2059 return Task::ready(Err(anyhow!("message not found")));
2060 };
2061
2062 let checkpoint = message
2063 .checkpoint
2064 .as_ref()
2065 .map(|c| c.git_checkpoint.clone());
2066
2067 // Cancel any in-progress generation before restoring
2068 let cancel_task = self.cancel(cx);
2069 let rewind = self.rewind(id.clone(), cx);
2070 let git_store = self.project.read(cx).git_store().clone();
2071
2072 cx.spawn(async move |_, cx| {
2073 cancel_task.await;
2074 rewind.await?;
2075 if let Some(checkpoint) = checkpoint {
2076 git_store
2077 .update(cx, |git, cx| git.restore_checkpoint(checkpoint, cx))
2078 .await?;
2079 }
2080
2081 Ok(())
2082 })
2083 }
2084
2085 /// Rewinds this thread to before the entry at `index`, removing it and all
2086 /// subsequent entries while rejecting any action_log changes made from that point.
2087 /// Unlike `restore_checkpoint`, this method does not restore from git.
2088 pub fn rewind(&mut self, id: UserMessageId, cx: &mut Context<Self>) -> Task<Result<()>> {
2089 let Some(truncate) = self.connection.truncate(&self.session_id, cx) else {
2090 return Task::ready(Err(anyhow!("not supported")));
2091 };
2092
2093 let telemetry = ActionLogTelemetry::from(&*self);
2094 cx.spawn(async move |this, cx| {
2095 cx.update(|cx| truncate.run(id.clone(), cx)).await?;
2096 this.update(cx, |this, cx| {
2097 if let Some((ix, _)) = this.user_message_mut(&id) {
2098 // Collect all terminals from entries that will be removed
2099 let terminals_to_remove: Vec<acp::TerminalId> = this.entries[ix..]
2100 .iter()
2101 .flat_map(|entry| entry.terminals())
2102 .filter_map(|terminal| terminal.read(cx).id().clone().into())
2103 .collect();
2104
2105 let range = ix..this.entries.len();
2106 this.entries.truncate(ix);
2107 cx.emit(AcpThreadEvent::EntriesRemoved(range));
2108
2109 // Kill and remove the terminals
2110 for terminal_id in terminals_to_remove {
2111 if let Some(terminal) = this.terminals.remove(&terminal_id) {
2112 terminal.update(cx, |terminal, cx| {
2113 terminal.kill(cx);
2114 });
2115 }
2116 }
2117 }
2118 this.action_log().update(cx, |action_log, cx| {
2119 action_log.reject_all_edits(Some(telemetry), cx)
2120 })
2121 })?
2122 .await;
2123 Ok(())
2124 })
2125 }
2126
2127 fn update_last_checkpoint(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
2128 let git_store = self.project.read(cx).git_store().clone();
2129
2130 let Some((_, message)) = self.last_user_message() else {
2131 return Task::ready(Ok(()));
2132 };
2133 let Some(user_message_id) = message.id.clone() else {
2134 return Task::ready(Ok(()));
2135 };
2136 let Some(checkpoint) = message.checkpoint.as_ref() else {
2137 return Task::ready(Ok(()));
2138 };
2139 let old_checkpoint = checkpoint.git_checkpoint.clone();
2140
2141 let new_checkpoint = git_store.update(cx, |git, cx| git.checkpoint(cx));
2142 cx.spawn(async move |this, cx| {
2143 let Some(new_checkpoint) = new_checkpoint
2144 .await
2145 .context("failed to get new checkpoint")
2146 .log_err()
2147 else {
2148 return Ok(());
2149 };
2150
2151 let equal = git_store
2152 .update(cx, |git, cx| {
2153 git.compare_checkpoints(old_checkpoint.clone(), new_checkpoint, cx)
2154 })
2155 .await
2156 .unwrap_or(true);
2157
2158 this.update(cx, |this, cx| {
2159 if let Some((ix, message)) = this.user_message_mut(&user_message_id) {
2160 if let Some(checkpoint) = message.checkpoint.as_mut() {
2161 checkpoint.show = !equal;
2162 cx.emit(AcpThreadEvent::EntryUpdated(ix));
2163 }
2164 }
2165 })?;
2166
2167 Ok(())
2168 })
2169 }
2170
2171 fn last_user_message(&mut self) -> Option<(usize, &mut UserMessage)> {
2172 self.entries
2173 .iter_mut()
2174 .enumerate()
2175 .rev()
2176 .find_map(|(ix, entry)| {
2177 if let AgentThreadEntry::UserMessage(message) = entry {
2178 Some((ix, message))
2179 } else {
2180 None
2181 }
2182 })
2183 }
2184
2185 fn user_message_mut(&mut self, id: &UserMessageId) -> Option<(usize, &mut UserMessage)> {
2186 self.entries.iter_mut().enumerate().find_map(|(ix, entry)| {
2187 if let AgentThreadEntry::UserMessage(message) = entry {
2188 if message.id.as_ref() == Some(id) {
2189 Some((ix, message))
2190 } else {
2191 None
2192 }
2193 } else {
2194 None
2195 }
2196 })
2197 }
2198
2199 pub fn read_text_file(
2200 &self,
2201 path: PathBuf,
2202 line: Option<u32>,
2203 limit: Option<u32>,
2204 reuse_shared_snapshot: bool,
2205 cx: &mut Context<Self>,
2206 ) -> Task<Result<String, acp::Error>> {
2207 // Args are 1-based, move to 0-based
2208 let line = line.unwrap_or_default().saturating_sub(1);
2209 let limit = limit.unwrap_or(u32::MAX);
2210 let project = self.project.clone();
2211 let action_log = self.action_log.clone();
2212 cx.spawn(async move |this, cx| {
2213 let load = project.update(cx, |project, cx| {
2214 let path = project
2215 .project_path_for_absolute_path(&path, cx)
2216 .ok_or_else(|| {
2217 acp::Error::resource_not_found(Some(path.display().to_string()))
2218 })?;
2219 Ok::<_, acp::Error>(project.open_buffer(path, cx))
2220 })?;
2221
2222 let buffer = load.await?;
2223
2224 let snapshot = if reuse_shared_snapshot {
2225 this.read_with(cx, |this, _| {
2226 this.shared_buffers.get(&buffer.clone()).cloned()
2227 })
2228 .log_err()
2229 .flatten()
2230 } else {
2231 None
2232 };
2233
2234 let snapshot = if let Some(snapshot) = snapshot {
2235 snapshot
2236 } else {
2237 action_log.update(cx, |action_log, cx| {
2238 action_log.buffer_read(buffer.clone(), cx);
2239 });
2240
2241 let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
2242 this.update(cx, |this, _| {
2243 this.shared_buffers.insert(buffer.clone(), snapshot.clone());
2244 })?;
2245 snapshot
2246 };
2247
2248 let max_point = snapshot.max_point();
2249 let start_position = Point::new(line, 0);
2250
2251 if start_position > max_point {
2252 return Err(acp::Error::invalid_params().data(format!(
2253 "Attempting to read beyond the end of the file, line {}:{}",
2254 max_point.row + 1,
2255 max_point.column
2256 )));
2257 }
2258
2259 let start = snapshot.anchor_before(start_position);
2260 let end = snapshot.anchor_before(Point::new(line.saturating_add(limit), 0));
2261
2262 project.update(cx, |project, cx| {
2263 project.set_agent_location(
2264 Some(AgentLocation {
2265 buffer: buffer.downgrade(),
2266 position: start,
2267 }),
2268 cx,
2269 );
2270 });
2271
2272 Ok(snapshot.text_for_range(start..end).collect::<String>())
2273 })
2274 }
2275
2276 pub fn write_text_file(
2277 &self,
2278 path: PathBuf,
2279 content: String,
2280 cx: &mut Context<Self>,
2281 ) -> Task<Result<()>> {
2282 let project = self.project.clone();
2283 let action_log = self.action_log.clone();
2284 cx.spawn(async move |this, cx| {
2285 let load = project.update(cx, |project, cx| {
2286 let path = project
2287 .project_path_for_absolute_path(&path, cx)
2288 .context("invalid path")?;
2289 anyhow::Ok(project.open_buffer(path, cx))
2290 });
2291 let buffer = load?.await?;
2292 let snapshot = this.update(cx, |this, cx| {
2293 this.shared_buffers
2294 .get(&buffer)
2295 .cloned()
2296 .unwrap_or_else(|| buffer.read(cx).snapshot())
2297 })?;
2298 let edits = cx
2299 .background_executor()
2300 .spawn(async move {
2301 let old_text = snapshot.text();
2302 text_diff(old_text.as_str(), &content)
2303 .into_iter()
2304 .map(|(range, replacement)| {
2305 (
2306 snapshot.anchor_after(range.start)
2307 ..snapshot.anchor_before(range.end),
2308 replacement,
2309 )
2310 })
2311 .collect::<Vec<_>>()
2312 })
2313 .await;
2314
2315 project.update(cx, |project, cx| {
2316 project.set_agent_location(
2317 Some(AgentLocation {
2318 buffer: buffer.downgrade(),
2319 position: edits
2320 .last()
2321 .map(|(range, _)| range.end)
2322 .unwrap_or(Anchor::min_for_buffer(buffer.read(cx).remote_id())),
2323 }),
2324 cx,
2325 );
2326 });
2327
2328 let format_on_save = cx.update(|cx| {
2329 action_log.update(cx, |action_log, cx| {
2330 action_log.buffer_read(buffer.clone(), cx);
2331 });
2332
2333 let format_on_save = buffer.update(cx, |buffer, cx| {
2334 buffer.edit(edits, None, cx);
2335
2336 let settings =
2337 language::language_settings::LanguageSettings::for_buffer(buffer, cx);
2338
2339 settings.format_on_save != FormatOnSave::Off
2340 });
2341 action_log.update(cx, |action_log, cx| {
2342 action_log.buffer_edited(buffer.clone(), cx);
2343 });
2344 format_on_save
2345 });
2346
2347 if format_on_save {
2348 let format_task = project.update(cx, |project, cx| {
2349 project.format(
2350 HashSet::from_iter([buffer.clone()]),
2351 LspFormatTarget::Buffers,
2352 false,
2353 FormatTrigger::Save,
2354 cx,
2355 )
2356 });
2357 format_task.await.log_err();
2358
2359 action_log.update(cx, |action_log, cx| {
2360 action_log.buffer_edited(buffer.clone(), cx);
2361 });
2362 }
2363
2364 project
2365 .update(cx, |project, cx| project.save_buffer(buffer, cx))
2366 .await
2367 })
2368 }
2369
2370 pub fn create_terminal(
2371 &self,
2372 command: String,
2373 args: Vec<String>,
2374 extra_env: Vec<acp::EnvVariable>,
2375 cwd: Option<PathBuf>,
2376 output_byte_limit: Option<u64>,
2377 cx: &mut Context<Self>,
2378 ) -> Task<Result<Entity<Terminal>>> {
2379 let env = match &cwd {
2380 Some(dir) => self.project.update(cx, |project, cx| {
2381 project.environment().update(cx, |env, cx| {
2382 env.directory_environment(dir.as_path().into(), cx)
2383 })
2384 }),
2385 None => Task::ready(None).shared(),
2386 };
2387 let env = cx.spawn(async move |_, _| {
2388 let mut env = env.await.unwrap_or_default();
2389 // Disables paging for `git` and hopefully other commands
2390 env.insert("PAGER".into(), "".into());
2391 for var in extra_env {
2392 env.insert(var.name, var.value);
2393 }
2394 env
2395 });
2396
2397 let project = self.project.clone();
2398 let language_registry = project.read(cx).languages().clone();
2399 let is_windows = project.read(cx).path_style(cx).is_windows();
2400
2401 let terminal_id = acp::TerminalId::new(Uuid::new_v4().to_string());
2402 let terminal_task = cx.spawn({
2403 let terminal_id = terminal_id.clone();
2404 async move |_this, cx| {
2405 let env = env.await;
2406 let shell = project
2407 .update(cx, |project, cx| {
2408 project
2409 .remote_client()
2410 .and_then(|r| r.read(cx).default_system_shell())
2411 })
2412 .unwrap_or_else(|| get_default_system_shell_preferring_bash());
2413 let (task_command, task_args) =
2414 ShellBuilder::new(&Shell::Program(shell), is_windows)
2415 .redirect_stdin_to_dev_null()
2416 .build(Some(command.clone()), &args);
2417 let terminal = project
2418 .update(cx, |project, cx| {
2419 project.create_terminal_task(
2420 task::SpawnInTerminal {
2421 command: Some(task_command),
2422 args: task_args,
2423 cwd: cwd.clone(),
2424 env,
2425 ..Default::default()
2426 },
2427 cx,
2428 )
2429 })
2430 .await?;
2431
2432 anyhow::Ok(cx.new(|cx| {
2433 Terminal::new(
2434 terminal_id,
2435 &format!("{} {}", command, args.join(" ")),
2436 cwd,
2437 output_byte_limit.map(|l| l as usize),
2438 terminal,
2439 language_registry,
2440 cx,
2441 )
2442 }))
2443 }
2444 });
2445
2446 cx.spawn(async move |this, cx| {
2447 let terminal = terminal_task.await?;
2448 this.update(cx, |this, _cx| {
2449 this.terminals.insert(terminal_id, terminal.clone());
2450 terminal
2451 })
2452 })
2453 }
2454
2455 pub fn kill_terminal(
2456 &mut self,
2457 terminal_id: acp::TerminalId,
2458 cx: &mut Context<Self>,
2459 ) -> Result<()> {
2460 self.terminals
2461 .get(&terminal_id)
2462 .context("Terminal not found")?
2463 .update(cx, |terminal, cx| {
2464 terminal.kill(cx);
2465 });
2466
2467 Ok(())
2468 }
2469
2470 pub fn release_terminal(
2471 &mut self,
2472 terminal_id: acp::TerminalId,
2473 cx: &mut Context<Self>,
2474 ) -> Result<()> {
2475 self.terminals
2476 .remove(&terminal_id)
2477 .context("Terminal not found")?
2478 .update(cx, |terminal, cx| {
2479 terminal.kill(cx);
2480 });
2481
2482 Ok(())
2483 }
2484
2485 pub fn terminal(&self, terminal_id: acp::TerminalId) -> Result<Entity<Terminal>> {
2486 self.terminals
2487 .get(&terminal_id)
2488 .context("Terminal not found")
2489 .cloned()
2490 }
2491
2492 pub fn to_markdown(&self, cx: &App) -> String {
2493 self.entries.iter().map(|e| e.to_markdown(cx)).collect()
2494 }
2495
2496 pub fn emit_load_error(&mut self, error: LoadError, cx: &mut Context<Self>) {
2497 cx.emit(AcpThreadEvent::LoadError(error));
2498 }
2499
2500 pub fn register_terminal_created(
2501 &mut self,
2502 terminal_id: acp::TerminalId,
2503 command_label: String,
2504 working_dir: Option<PathBuf>,
2505 output_byte_limit: Option<u64>,
2506 terminal: Entity<::terminal::Terminal>,
2507 cx: &mut Context<Self>,
2508 ) -> Entity<Terminal> {
2509 let language_registry = self.project.read(cx).languages().clone();
2510
2511 let entity = cx.new(|cx| {
2512 Terminal::new(
2513 terminal_id.clone(),
2514 &command_label,
2515 working_dir.clone(),
2516 output_byte_limit.map(|l| l as usize),
2517 terminal,
2518 language_registry,
2519 cx,
2520 )
2521 });
2522 self.terminals.insert(terminal_id.clone(), entity.clone());
2523 entity
2524 }
2525}
2526
2527fn markdown_for_raw_output(
2528 raw_output: &serde_json::Value,
2529 language_registry: &Arc<LanguageRegistry>,
2530 cx: &mut App,
2531) -> Option<Entity<Markdown>> {
2532 match raw_output {
2533 serde_json::Value::Null => None,
2534 serde_json::Value::Bool(value) => Some(cx.new(|cx| {
2535 Markdown::new(
2536 value.to_string().into(),
2537 Some(language_registry.clone()),
2538 None,
2539 cx,
2540 )
2541 })),
2542 serde_json::Value::Number(value) => Some(cx.new(|cx| {
2543 Markdown::new(
2544 value.to_string().into(),
2545 Some(language_registry.clone()),
2546 None,
2547 cx,
2548 )
2549 })),
2550 serde_json::Value::String(value) => Some(cx.new(|cx| {
2551 Markdown::new(
2552 value.clone().into(),
2553 Some(language_registry.clone()),
2554 None,
2555 cx,
2556 )
2557 })),
2558 value => Some(cx.new(|cx| {
2559 let pretty_json = to_string_pretty(value).unwrap_or_else(|_| value.to_string());
2560
2561 Markdown::new(
2562 format!("```json\n{}\n```", pretty_json).into(),
2563 Some(language_registry.clone()),
2564 None,
2565 cx,
2566 )
2567 })),
2568 }
2569}
2570
2571#[cfg(test)]
2572mod tests {
2573 use super::*;
2574 use anyhow::anyhow;
2575 use futures::{channel::mpsc, future::LocalBoxFuture, select};
2576 use gpui::{App, AsyncApp, TestAppContext, WeakEntity};
2577 use indoc::indoc;
2578 use project::{FakeFs, Fs};
2579 use rand::{distr, prelude::*};
2580 use serde_json::json;
2581 use settings::SettingsStore;
2582 use smol::stream::StreamExt as _;
2583 use std::{
2584 any::Any,
2585 cell::RefCell,
2586 path::Path,
2587 rc::Rc,
2588 sync::atomic::{AtomicBool, AtomicUsize, Ordering::SeqCst},
2589 time::Duration,
2590 };
2591 use util::path;
2592
2593 fn init_test(cx: &mut TestAppContext) {
2594 env_logger::try_init().ok();
2595 cx.update(|cx| {
2596 let settings_store = SettingsStore::test(cx);
2597 cx.set_global(settings_store);
2598 });
2599 }
2600
2601 #[gpui::test]
2602 async fn test_terminal_output_buffered_before_created_renders(cx: &mut gpui::TestAppContext) {
2603 init_test(cx);
2604
2605 let fs = FakeFs::new(cx.executor());
2606 let project = Project::test(fs, [], cx).await;
2607 let connection = Rc::new(FakeAgentConnection::new());
2608 let thread = cx
2609 .update(|cx| connection.new_thread(project, std::path::Path::new(path!("/test")), cx))
2610 .await
2611 .unwrap();
2612
2613 let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
2614
2615 // Send Output BEFORE Created - should be buffered by acp_thread
2616 thread.update(cx, |thread, cx| {
2617 thread.on_terminal_provider_event(
2618 TerminalProviderEvent::Output {
2619 terminal_id: terminal_id.clone(),
2620 data: b"hello buffered".to_vec(),
2621 },
2622 cx,
2623 );
2624 });
2625
2626 // Create a display-only terminal and then send Created
2627 let lower = cx.new(|cx| {
2628 let builder = ::terminal::TerminalBuilder::new_display_only(
2629 ::terminal::terminal_settings::CursorShape::default(),
2630 ::terminal::terminal_settings::AlternateScroll::On,
2631 None,
2632 0,
2633 cx.background_executor(),
2634 )
2635 .unwrap();
2636 builder.subscribe(cx)
2637 });
2638
2639 thread.update(cx, |thread, cx| {
2640 thread.on_terminal_provider_event(
2641 TerminalProviderEvent::Created {
2642 terminal_id: terminal_id.clone(),
2643 label: "Buffered Test".to_string(),
2644 cwd: None,
2645 output_byte_limit: None,
2646 terminal: lower.clone(),
2647 },
2648 cx,
2649 );
2650 });
2651
2652 // After Created, buffered Output should have been flushed into the renderer
2653 let content = thread.read_with(cx, |thread, cx| {
2654 let term = thread.terminal(terminal_id.clone()).unwrap();
2655 term.read_with(cx, |t, cx| t.inner().read(cx).get_content())
2656 });
2657
2658 assert!(
2659 content.contains("hello buffered"),
2660 "expected buffered output to render, got: {content}"
2661 );
2662 }
2663
2664 #[gpui::test]
2665 async fn test_terminal_output_and_exit_buffered_before_created(cx: &mut gpui::TestAppContext) {
2666 init_test(cx);
2667
2668 let fs = FakeFs::new(cx.executor());
2669 let project = Project::test(fs, [], cx).await;
2670 let connection = Rc::new(FakeAgentConnection::new());
2671 let thread = cx
2672 .update(|cx| connection.new_thread(project, std::path::Path::new(path!("/test")), cx))
2673 .await
2674 .unwrap();
2675
2676 let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
2677
2678 // Send Output BEFORE Created
2679 thread.update(cx, |thread, cx| {
2680 thread.on_terminal_provider_event(
2681 TerminalProviderEvent::Output {
2682 terminal_id: terminal_id.clone(),
2683 data: b"pre-exit data".to_vec(),
2684 },
2685 cx,
2686 );
2687 });
2688
2689 // Send Exit BEFORE Created
2690 thread.update(cx, |thread, cx| {
2691 thread.on_terminal_provider_event(
2692 TerminalProviderEvent::Exit {
2693 terminal_id: terminal_id.clone(),
2694 status: acp::TerminalExitStatus::new().exit_code(0),
2695 },
2696 cx,
2697 );
2698 });
2699
2700 // Now create a display-only lower-level terminal and send Created
2701 let lower = cx.new(|cx| {
2702 let builder = ::terminal::TerminalBuilder::new_display_only(
2703 ::terminal::terminal_settings::CursorShape::default(),
2704 ::terminal::terminal_settings::AlternateScroll::On,
2705 None,
2706 0,
2707 cx.background_executor(),
2708 )
2709 .unwrap();
2710 builder.subscribe(cx)
2711 });
2712
2713 thread.update(cx, |thread, cx| {
2714 thread.on_terminal_provider_event(
2715 TerminalProviderEvent::Created {
2716 terminal_id: terminal_id.clone(),
2717 label: "Buffered Exit Test".to_string(),
2718 cwd: None,
2719 output_byte_limit: None,
2720 terminal: lower.clone(),
2721 },
2722 cx,
2723 );
2724 });
2725
2726 // Output should be present after Created (flushed from buffer)
2727 let content = thread.read_with(cx, |thread, cx| {
2728 let term = thread.terminal(terminal_id.clone()).unwrap();
2729 term.read_with(cx, |t, cx| t.inner().read(cx).get_content())
2730 });
2731
2732 assert!(
2733 content.contains("pre-exit data"),
2734 "expected pre-exit data to render, got: {content}"
2735 );
2736 }
2737
2738 /// Test that killing a terminal via Terminal::kill properly:
2739 /// 1. Causes wait_for_exit to complete (doesn't hang forever)
2740 /// 2. The underlying terminal still has the output that was written before the kill
2741 ///
2742 /// This test verifies that the fix to kill_active_task (which now also kills
2743 /// the shell process in addition to the foreground process) properly allows
2744 /// wait_for_exit to complete instead of hanging indefinitely.
2745 #[cfg(unix)]
2746 #[gpui::test]
2747 async fn test_terminal_kill_allows_wait_for_exit_to_complete(cx: &mut gpui::TestAppContext) {
2748 use std::collections::HashMap;
2749 use task::Shell;
2750 use util::shell_builder::ShellBuilder;
2751
2752 init_test(cx);
2753 cx.executor().allow_parking();
2754
2755 let fs = FakeFs::new(cx.executor());
2756 let project = Project::test(fs, [], cx).await;
2757 let connection = Rc::new(FakeAgentConnection::new());
2758 let thread = cx
2759 .update(|cx| connection.new_thread(project.clone(), Path::new(path!("/test")), cx))
2760 .await
2761 .unwrap();
2762
2763 let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
2764
2765 // Create a real PTY terminal that runs a command which prints output then sleeps
2766 // We use printf instead of echo and chain with && sleep to ensure proper execution
2767 let (completion_tx, _completion_rx) = smol::channel::unbounded();
2768 let (program, args) = ShellBuilder::new(&Shell::System, false).build(
2769 Some("printf 'output_before_kill\\n' && sleep 60".to_owned()),
2770 &[],
2771 );
2772
2773 let builder = cx
2774 .update(|cx| {
2775 ::terminal::TerminalBuilder::new(
2776 None,
2777 None,
2778 task::Shell::WithArguments {
2779 program,
2780 args,
2781 title_override: None,
2782 },
2783 HashMap::default(),
2784 ::terminal::terminal_settings::CursorShape::default(),
2785 ::terminal::terminal_settings::AlternateScroll::On,
2786 None,
2787 vec![],
2788 0,
2789 false,
2790 0,
2791 Some(completion_tx),
2792 cx,
2793 vec![],
2794 )
2795 })
2796 .await
2797 .unwrap();
2798
2799 let lower_terminal = cx.new(|cx| builder.subscribe(cx));
2800
2801 // Create the acp_thread Terminal wrapper
2802 thread.update(cx, |thread, cx| {
2803 thread.on_terminal_provider_event(
2804 TerminalProviderEvent::Created {
2805 terminal_id: terminal_id.clone(),
2806 label: "printf output_before_kill && sleep 60".to_string(),
2807 cwd: None,
2808 output_byte_limit: None,
2809 terminal: lower_terminal.clone(),
2810 },
2811 cx,
2812 );
2813 });
2814
2815 // Wait for the printf command to execute and produce output
2816 // Use real time since parking is enabled
2817 cx.executor().timer(Duration::from_millis(500)).await;
2818
2819 // Get the acp_thread Terminal and kill it
2820 let wait_for_exit = thread.update(cx, |thread, cx| {
2821 let term = thread.terminals.get(&terminal_id).unwrap();
2822 let wait_for_exit = term.read(cx).wait_for_exit();
2823 term.update(cx, |term, cx| {
2824 term.kill(cx);
2825 });
2826 wait_for_exit
2827 });
2828
2829 // KEY ASSERTION: wait_for_exit should complete within a reasonable time (not hang).
2830 // Before the fix to kill_active_task, this would hang forever because
2831 // only the foreground process was killed, not the shell, so the PTY
2832 // child never exited and wait_for_completed_task never completed.
2833 let exit_result = futures::select! {
2834 result = futures::FutureExt::fuse(wait_for_exit) => Some(result),
2835 _ = futures::FutureExt::fuse(cx.background_executor.timer(Duration::from_secs(5))) => None,
2836 };
2837
2838 assert!(
2839 exit_result.is_some(),
2840 "wait_for_exit should complete after kill, but it timed out. \
2841 This indicates kill_active_task is not properly killing the shell process."
2842 );
2843
2844 // Give the system a chance to process any pending updates
2845 cx.run_until_parked();
2846
2847 // Verify that the underlying terminal still has the output that was
2848 // written before the kill. This verifies that killing doesn't lose output.
2849 let inner_content = thread.read_with(cx, |thread, cx| {
2850 let term = thread.terminals.get(&terminal_id).unwrap();
2851 term.read(cx).inner().read(cx).get_content()
2852 });
2853
2854 assert!(
2855 inner_content.contains("output_before_kill"),
2856 "Underlying terminal should contain output from before kill, got: {}",
2857 inner_content
2858 );
2859 }
2860
2861 #[gpui::test]
2862 async fn test_push_user_content_block(cx: &mut gpui::TestAppContext) {
2863 init_test(cx);
2864
2865 let fs = FakeFs::new(cx.executor());
2866 let project = Project::test(fs, [], cx).await;
2867 let connection = Rc::new(FakeAgentConnection::new());
2868 let thread = cx
2869 .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
2870 .await
2871 .unwrap();
2872
2873 // Test creating a new user message
2874 thread.update(cx, |thread, cx| {
2875 thread.push_user_content_block(None, "Hello, ".into(), cx);
2876 });
2877
2878 thread.update(cx, |thread, cx| {
2879 assert_eq!(thread.entries.len(), 1);
2880 if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
2881 assert_eq!(user_msg.id, None);
2882 assert_eq!(user_msg.content.to_markdown(cx), "Hello, ");
2883 } else {
2884 panic!("Expected UserMessage");
2885 }
2886 });
2887
2888 // Test appending to existing user message
2889 let message_1_id = UserMessageId::new();
2890 thread.update(cx, |thread, cx| {
2891 thread.push_user_content_block(Some(message_1_id.clone()), "world!".into(), cx);
2892 });
2893
2894 thread.update(cx, |thread, cx| {
2895 assert_eq!(thread.entries.len(), 1);
2896 if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
2897 assert_eq!(user_msg.id, Some(message_1_id));
2898 assert_eq!(user_msg.content.to_markdown(cx), "Hello, world!");
2899 } else {
2900 panic!("Expected UserMessage");
2901 }
2902 });
2903
2904 // Test creating new user message after assistant message
2905 thread.update(cx, |thread, cx| {
2906 thread.push_assistant_content_block("Assistant response".into(), false, cx);
2907 });
2908
2909 let message_2_id = UserMessageId::new();
2910 thread.update(cx, |thread, cx| {
2911 thread.push_user_content_block(
2912 Some(message_2_id.clone()),
2913 "New user message".into(),
2914 cx,
2915 );
2916 });
2917
2918 thread.update(cx, |thread, cx| {
2919 assert_eq!(thread.entries.len(), 3);
2920 if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[2] {
2921 assert_eq!(user_msg.id, Some(message_2_id));
2922 assert_eq!(user_msg.content.to_markdown(cx), "New user message");
2923 } else {
2924 panic!("Expected UserMessage at index 2");
2925 }
2926 });
2927 }
2928
2929 #[gpui::test]
2930 async fn test_thinking_concatenation(cx: &mut gpui::TestAppContext) {
2931 init_test(cx);
2932
2933 let fs = FakeFs::new(cx.executor());
2934 let project = Project::test(fs, [], cx).await;
2935 let connection = Rc::new(FakeAgentConnection::new().on_user_message(
2936 |_, thread, mut cx| {
2937 async move {
2938 thread.update(&mut cx, |thread, cx| {
2939 thread
2940 .handle_session_update(
2941 acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk::new(
2942 "Thinking ".into(),
2943 )),
2944 cx,
2945 )
2946 .unwrap();
2947 thread
2948 .handle_session_update(
2949 acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk::new(
2950 "hard!".into(),
2951 )),
2952 cx,
2953 )
2954 .unwrap();
2955 })?;
2956 Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
2957 }
2958 .boxed_local()
2959 },
2960 ));
2961
2962 let thread = cx
2963 .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
2964 .await
2965 .unwrap();
2966
2967 thread
2968 .update(cx, |thread, cx| thread.send_raw("Hello from Zed!", cx))
2969 .await
2970 .unwrap();
2971
2972 let output = thread.read_with(cx, |thread, cx| thread.to_markdown(cx));
2973 assert_eq!(
2974 output,
2975 indoc! {r#"
2976 ## User
2977
2978 Hello from Zed!
2979
2980 ## Assistant
2981
2982 <thinking>
2983 Thinking hard!
2984 </thinking>
2985
2986 "#}
2987 );
2988 }
2989
2990 #[gpui::test]
2991 async fn test_edits_concurrently_to_user(cx: &mut TestAppContext) {
2992 init_test(cx);
2993
2994 let fs = FakeFs::new(cx.executor());
2995 fs.insert_tree(path!("/tmp"), json!({"foo": "one\ntwo\nthree\n"}))
2996 .await;
2997 let project = Project::test(fs.clone(), [], cx).await;
2998 let (read_file_tx, read_file_rx) = oneshot::channel::<()>();
2999 let read_file_tx = Rc::new(RefCell::new(Some(read_file_tx)));
3000 let connection = Rc::new(FakeAgentConnection::new().on_user_message(
3001 move |_, thread, mut cx| {
3002 let read_file_tx = read_file_tx.clone();
3003 async move {
3004 let content = thread
3005 .update(&mut cx, |thread, cx| {
3006 thread.read_text_file(path!("/tmp/foo").into(), None, None, false, cx)
3007 })
3008 .unwrap()
3009 .await
3010 .unwrap();
3011 assert_eq!(content, "one\ntwo\nthree\n");
3012 read_file_tx.take().unwrap().send(()).unwrap();
3013 thread
3014 .update(&mut cx, |thread, cx| {
3015 thread.write_text_file(
3016 path!("/tmp/foo").into(),
3017 "one\ntwo\nthree\nfour\nfive\n".to_string(),
3018 cx,
3019 )
3020 })
3021 .unwrap()
3022 .await
3023 .unwrap();
3024 Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
3025 }
3026 .boxed_local()
3027 },
3028 ));
3029
3030 let (worktree, pathbuf) = project
3031 .update(cx, |project, cx| {
3032 project.find_or_create_worktree(path!("/tmp/foo"), true, cx)
3033 })
3034 .await
3035 .unwrap();
3036 let buffer = project
3037 .update(cx, |project, cx| {
3038 project.open_buffer((worktree.read(cx).id(), pathbuf), cx)
3039 })
3040 .await
3041 .unwrap();
3042
3043 let thread = cx
3044 .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
3045 .await
3046 .unwrap();
3047
3048 let request = thread.update(cx, |thread, cx| {
3049 thread.send_raw("Extend the count in /tmp/foo", cx)
3050 });
3051 read_file_rx.await.ok();
3052 buffer.update(cx, |buffer, cx| {
3053 buffer.edit([(0..0, "zero\n".to_string())], None, cx);
3054 });
3055 cx.run_until_parked();
3056 assert_eq!(
3057 buffer.read_with(cx, |buffer, _| buffer.text()),
3058 "zero\none\ntwo\nthree\nfour\nfive\n"
3059 );
3060 assert_eq!(
3061 String::from_utf8(fs.read_file_sync(path!("/tmp/foo")).unwrap()).unwrap(),
3062 "zero\none\ntwo\nthree\nfour\nfive\n"
3063 );
3064 request.await.unwrap();
3065 }
3066
3067 #[gpui::test]
3068 async fn test_reading_from_line(cx: &mut TestAppContext) {
3069 init_test(cx);
3070
3071 let fs = FakeFs::new(cx.executor());
3072 fs.insert_tree(path!("/tmp"), json!({"foo": "one\ntwo\nthree\nfour\n"}))
3073 .await;
3074 let project = Project::test(fs.clone(), [], cx).await;
3075 project
3076 .update(cx, |project, cx| {
3077 project.find_or_create_worktree(path!("/tmp/foo"), true, cx)
3078 })
3079 .await
3080 .unwrap();
3081
3082 let connection = Rc::new(FakeAgentConnection::new());
3083
3084 let thread = cx
3085 .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
3086 .await
3087 .unwrap();
3088
3089 // Whole file
3090 let content = thread
3091 .update(cx, |thread, cx| {
3092 thread.read_text_file(path!("/tmp/foo").into(), None, None, false, cx)
3093 })
3094 .await
3095 .unwrap();
3096
3097 assert_eq!(content, "one\ntwo\nthree\nfour\n");
3098
3099 // Only start line
3100 let content = thread
3101 .update(cx, |thread, cx| {
3102 thread.read_text_file(path!("/tmp/foo").into(), Some(3), None, false, cx)
3103 })
3104 .await
3105 .unwrap();
3106
3107 assert_eq!(content, "three\nfour\n");
3108
3109 // Only limit
3110 let content = thread
3111 .update(cx, |thread, cx| {
3112 thread.read_text_file(path!("/tmp/foo").into(), None, Some(2), false, cx)
3113 })
3114 .await
3115 .unwrap();
3116
3117 assert_eq!(content, "one\ntwo\n");
3118
3119 // Range
3120 let content = thread
3121 .update(cx, |thread, cx| {
3122 thread.read_text_file(path!("/tmp/foo").into(), Some(2), Some(2), false, cx)
3123 })
3124 .await
3125 .unwrap();
3126
3127 assert_eq!(content, "two\nthree\n");
3128
3129 // Invalid
3130 let err = thread
3131 .update(cx, |thread, cx| {
3132 thread.read_text_file(path!("/tmp/foo").into(), Some(6), Some(2), false, cx)
3133 })
3134 .await
3135 .unwrap_err();
3136
3137 assert_eq!(
3138 err.to_string(),
3139 "Invalid params: \"Attempting to read beyond the end of the file, line 5:0\""
3140 );
3141 }
3142
3143 #[gpui::test]
3144 async fn test_reading_empty_file(cx: &mut TestAppContext) {
3145 init_test(cx);
3146
3147 let fs = FakeFs::new(cx.executor());
3148 fs.insert_tree(path!("/tmp"), json!({"foo": ""})).await;
3149 let project = Project::test(fs.clone(), [], cx).await;
3150 project
3151 .update(cx, |project, cx| {
3152 project.find_or_create_worktree(path!("/tmp/foo"), true, cx)
3153 })
3154 .await
3155 .unwrap();
3156
3157 let connection = Rc::new(FakeAgentConnection::new());
3158
3159 let thread = cx
3160 .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
3161 .await
3162 .unwrap();
3163
3164 // Whole file
3165 let content = thread
3166 .update(cx, |thread, cx| {
3167 thread.read_text_file(path!("/tmp/foo").into(), None, None, false, cx)
3168 })
3169 .await
3170 .unwrap();
3171
3172 assert_eq!(content, "");
3173
3174 // Only start line
3175 let content = thread
3176 .update(cx, |thread, cx| {
3177 thread.read_text_file(path!("/tmp/foo").into(), Some(1), None, false, cx)
3178 })
3179 .await
3180 .unwrap();
3181
3182 assert_eq!(content, "");
3183
3184 // Only limit
3185 let content = thread
3186 .update(cx, |thread, cx| {
3187 thread.read_text_file(path!("/tmp/foo").into(), None, Some(2), false, cx)
3188 })
3189 .await
3190 .unwrap();
3191
3192 assert_eq!(content, "");
3193
3194 // Range
3195 let content = thread
3196 .update(cx, |thread, cx| {
3197 thread.read_text_file(path!("/tmp/foo").into(), Some(1), Some(1), false, cx)
3198 })
3199 .await
3200 .unwrap();
3201
3202 assert_eq!(content, "");
3203
3204 // Invalid
3205 let err = thread
3206 .update(cx, |thread, cx| {
3207 thread.read_text_file(path!("/tmp/foo").into(), Some(5), Some(2), false, cx)
3208 })
3209 .await
3210 .unwrap_err();
3211
3212 assert_eq!(
3213 err.to_string(),
3214 "Invalid params: \"Attempting to read beyond the end of the file, line 1:0\""
3215 );
3216 }
3217 #[gpui::test]
3218 async fn test_reading_non_existing_file(cx: &mut TestAppContext) {
3219 init_test(cx);
3220
3221 let fs = FakeFs::new(cx.executor());
3222 fs.insert_tree(path!("/tmp"), json!({})).await;
3223 let project = Project::test(fs.clone(), [], cx).await;
3224 project
3225 .update(cx, |project, cx| {
3226 project.find_or_create_worktree(path!("/tmp"), true, cx)
3227 })
3228 .await
3229 .unwrap();
3230
3231 let connection = Rc::new(FakeAgentConnection::new());
3232
3233 let thread = cx
3234 .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
3235 .await
3236 .unwrap();
3237
3238 // Out of project file
3239 let err = thread
3240 .update(cx, |thread, cx| {
3241 thread.read_text_file(path!("/foo").into(), None, None, false, cx)
3242 })
3243 .await
3244 .unwrap_err();
3245
3246 assert_eq!(err.code, acp::ErrorCode::ResourceNotFound);
3247 }
3248
3249 #[gpui::test]
3250 async fn test_succeeding_canceled_toolcall(cx: &mut TestAppContext) {
3251 init_test(cx);
3252
3253 let fs = FakeFs::new(cx.executor());
3254 let project = Project::test(fs, [], cx).await;
3255 let id = acp::ToolCallId::new("test");
3256
3257 let connection = Rc::new(FakeAgentConnection::new().on_user_message({
3258 let id = id.clone();
3259 move |_, thread, mut cx| {
3260 let id = id.clone();
3261 async move {
3262 thread
3263 .update(&mut cx, |thread, cx| {
3264 thread.handle_session_update(
3265 acp::SessionUpdate::ToolCall(
3266 acp::ToolCall::new(id.clone(), "Label")
3267 .kind(acp::ToolKind::Fetch)
3268 .status(acp::ToolCallStatus::InProgress),
3269 ),
3270 cx,
3271 )
3272 })
3273 .unwrap()
3274 .unwrap();
3275 Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
3276 }
3277 .boxed_local()
3278 }
3279 }));
3280
3281 let thread = cx
3282 .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
3283 .await
3284 .unwrap();
3285
3286 let request = thread.update(cx, |thread, cx| {
3287 thread.send_raw("Fetch https://example.com", cx)
3288 });
3289
3290 run_until_first_tool_call(&thread, cx).await;
3291
3292 thread.read_with(cx, |thread, _| {
3293 assert!(matches!(
3294 thread.entries[1],
3295 AgentThreadEntry::ToolCall(ToolCall {
3296 status: ToolCallStatus::InProgress,
3297 ..
3298 })
3299 ));
3300 });
3301
3302 thread.update(cx, |thread, cx| thread.cancel(cx)).await;
3303
3304 thread.read_with(cx, |thread, _| {
3305 assert!(matches!(
3306 &thread.entries[1],
3307 AgentThreadEntry::ToolCall(ToolCall {
3308 status: ToolCallStatus::Canceled,
3309 ..
3310 })
3311 ));
3312 });
3313
3314 thread
3315 .update(cx, |thread, cx| {
3316 thread.handle_session_update(
3317 acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate::new(
3318 id,
3319 acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::Completed),
3320 )),
3321 cx,
3322 )
3323 })
3324 .unwrap();
3325
3326 request.await.unwrap();
3327
3328 thread.read_with(cx, |thread, _| {
3329 assert!(matches!(
3330 thread.entries[1],
3331 AgentThreadEntry::ToolCall(ToolCall {
3332 status: ToolCallStatus::Completed,
3333 ..
3334 })
3335 ));
3336 });
3337 }
3338
3339 #[gpui::test]
3340 async fn test_no_pending_edits_if_tool_calls_are_completed(cx: &mut TestAppContext) {
3341 init_test(cx);
3342 let fs = FakeFs::new(cx.background_executor.clone());
3343 fs.insert_tree(path!("/test"), json!({})).await;
3344 let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
3345
3346 let connection = Rc::new(FakeAgentConnection::new().on_user_message({
3347 move |_, thread, mut cx| {
3348 async move {
3349 thread
3350 .update(&mut cx, |thread, cx| {
3351 thread.handle_session_update(
3352 acp::SessionUpdate::ToolCall(
3353 acp::ToolCall::new("test", "Label")
3354 .kind(acp::ToolKind::Edit)
3355 .status(acp::ToolCallStatus::Completed)
3356 .content(vec![acp::ToolCallContent::Diff(acp::Diff::new(
3357 "/test/test.txt",
3358 "foo",
3359 ))]),
3360 ),
3361 cx,
3362 )
3363 })
3364 .unwrap()
3365 .unwrap();
3366 Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
3367 }
3368 .boxed_local()
3369 }
3370 }));
3371
3372 let thread = cx
3373 .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
3374 .await
3375 .unwrap();
3376
3377 cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["Hi".into()], cx)))
3378 .await
3379 .unwrap();
3380
3381 assert!(cx.read(|cx| !thread.read(cx).has_pending_edit_tool_calls()));
3382 }
3383
3384 #[gpui::test(iterations = 10)]
3385 async fn test_checkpoints(cx: &mut TestAppContext) {
3386 init_test(cx);
3387 let fs = FakeFs::new(cx.background_executor.clone());
3388 fs.insert_tree(
3389 path!("/test"),
3390 json!({
3391 ".git": {}
3392 }),
3393 )
3394 .await;
3395 let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
3396
3397 let simulate_changes = Arc::new(AtomicBool::new(true));
3398 let next_filename = Arc::new(AtomicUsize::new(0));
3399 let connection = Rc::new(FakeAgentConnection::new().on_user_message({
3400 let simulate_changes = simulate_changes.clone();
3401 let next_filename = next_filename.clone();
3402 let fs = fs.clone();
3403 move |request, thread, mut cx| {
3404 let fs = fs.clone();
3405 let simulate_changes = simulate_changes.clone();
3406 let next_filename = next_filename.clone();
3407 async move {
3408 if simulate_changes.load(SeqCst) {
3409 let filename = format!("/test/file-{}", next_filename.fetch_add(1, SeqCst));
3410 fs.write(Path::new(&filename), b"").await?;
3411 }
3412
3413 let acp::ContentBlock::Text(content) = &request.prompt[0] else {
3414 panic!("expected text content block");
3415 };
3416 thread.update(&mut cx, |thread, cx| {
3417 thread
3418 .handle_session_update(
3419 acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
3420 content.text.to_uppercase().into(),
3421 )),
3422 cx,
3423 )
3424 .unwrap();
3425 })?;
3426 Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
3427 }
3428 .boxed_local()
3429 }
3430 }));
3431 let thread = cx
3432 .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
3433 .await
3434 .unwrap();
3435
3436 cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["Lorem".into()], cx)))
3437 .await
3438 .unwrap();
3439 thread.read_with(cx, |thread, cx| {
3440 assert_eq!(
3441 thread.to_markdown(cx),
3442 indoc! {"
3443 ## User (checkpoint)
3444
3445 Lorem
3446
3447 ## Assistant
3448
3449 LOREM
3450
3451 "}
3452 );
3453 });
3454 assert_eq!(fs.files(), vec![Path::new(path!("/test/file-0"))]);
3455
3456 cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["ipsum".into()], cx)))
3457 .await
3458 .unwrap();
3459 thread.read_with(cx, |thread, cx| {
3460 assert_eq!(
3461 thread.to_markdown(cx),
3462 indoc! {"
3463 ## User (checkpoint)
3464
3465 Lorem
3466
3467 ## Assistant
3468
3469 LOREM
3470
3471 ## User (checkpoint)
3472
3473 ipsum
3474
3475 ## Assistant
3476
3477 IPSUM
3478
3479 "}
3480 );
3481 });
3482 assert_eq!(
3483 fs.files(),
3484 vec![
3485 Path::new(path!("/test/file-0")),
3486 Path::new(path!("/test/file-1"))
3487 ]
3488 );
3489
3490 // Checkpoint isn't stored when there are no changes.
3491 simulate_changes.store(false, SeqCst);
3492 cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["dolor".into()], cx)))
3493 .await
3494 .unwrap();
3495 thread.read_with(cx, |thread, cx| {
3496 assert_eq!(
3497 thread.to_markdown(cx),
3498 indoc! {"
3499 ## User (checkpoint)
3500
3501 Lorem
3502
3503 ## Assistant
3504
3505 LOREM
3506
3507 ## User (checkpoint)
3508
3509 ipsum
3510
3511 ## Assistant
3512
3513 IPSUM
3514
3515 ## User
3516
3517 dolor
3518
3519 ## Assistant
3520
3521 DOLOR
3522
3523 "}
3524 );
3525 });
3526 assert_eq!(
3527 fs.files(),
3528 vec![
3529 Path::new(path!("/test/file-0")),
3530 Path::new(path!("/test/file-1"))
3531 ]
3532 );
3533
3534 // Rewinding the conversation truncates the history and restores the checkpoint.
3535 thread
3536 .update(cx, |thread, cx| {
3537 let AgentThreadEntry::UserMessage(message) = &thread.entries[2] else {
3538 panic!("unexpected entries {:?}", thread.entries)
3539 };
3540 thread.restore_checkpoint(message.id.clone().unwrap(), cx)
3541 })
3542 .await
3543 .unwrap();
3544 thread.read_with(cx, |thread, cx| {
3545 assert_eq!(
3546 thread.to_markdown(cx),
3547 indoc! {"
3548 ## User (checkpoint)
3549
3550 Lorem
3551
3552 ## Assistant
3553
3554 LOREM
3555
3556 "}
3557 );
3558 });
3559 assert_eq!(fs.files(), vec![Path::new(path!("/test/file-0"))]);
3560 }
3561
3562 #[gpui::test]
3563 async fn test_tool_result_refusal(cx: &mut TestAppContext) {
3564 use std::sync::atomic::AtomicUsize;
3565 init_test(cx);
3566
3567 let fs = FakeFs::new(cx.executor());
3568 let project = Project::test(fs, None, cx).await;
3569
3570 // Create a connection that simulates refusal after tool result
3571 let prompt_count = Arc::new(AtomicUsize::new(0));
3572 let connection = Rc::new(FakeAgentConnection::new().on_user_message({
3573 let prompt_count = prompt_count.clone();
3574 move |_request, thread, mut cx| {
3575 let count = prompt_count.fetch_add(1, SeqCst);
3576 async move {
3577 if count == 0 {
3578 // First prompt: Generate a tool call with result
3579 thread.update(&mut cx, |thread, cx| {
3580 thread
3581 .handle_session_update(
3582 acp::SessionUpdate::ToolCall(
3583 acp::ToolCall::new("tool1", "Test Tool")
3584 .kind(acp::ToolKind::Fetch)
3585 .status(acp::ToolCallStatus::Completed)
3586 .raw_input(serde_json::json!({"query": "test"}))
3587 .raw_output(serde_json::json!({"result": "inappropriate content"})),
3588 ),
3589 cx,
3590 )
3591 .unwrap();
3592 })?;
3593
3594 // Now return refusal because of the tool result
3595 Ok(acp::PromptResponse::new(acp::StopReason::Refusal))
3596 } else {
3597 Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
3598 }
3599 }
3600 .boxed_local()
3601 }
3602 }));
3603
3604 let thread = cx
3605 .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
3606 .await
3607 .unwrap();
3608
3609 // Track if we see a Refusal event
3610 let saw_refusal_event = Arc::new(std::sync::Mutex::new(false));
3611 let saw_refusal_event_captured = saw_refusal_event.clone();
3612 thread.update(cx, |_thread, cx| {
3613 cx.subscribe(
3614 &thread,
3615 move |_thread, _event_thread, event: &AcpThreadEvent, _cx| {
3616 if matches!(event, AcpThreadEvent::Refusal) {
3617 *saw_refusal_event_captured.lock().unwrap() = true;
3618 }
3619 },
3620 )
3621 .detach();
3622 });
3623
3624 // Send a user message - this will trigger tool call and then refusal
3625 let send_task = thread.update(cx, |thread, cx| thread.send(vec!["Hello".into()], cx));
3626 cx.background_executor.spawn(send_task).detach();
3627 cx.run_until_parked();
3628
3629 // Verify that:
3630 // 1. A Refusal event WAS emitted (because it's a tool result refusal, not user prompt)
3631 // 2. The user message was NOT truncated
3632 assert!(
3633 *saw_refusal_event.lock().unwrap(),
3634 "Refusal event should be emitted for tool result refusals"
3635 );
3636
3637 thread.read_with(cx, |thread, _| {
3638 let entries = thread.entries();
3639 assert!(entries.len() >= 2, "Should have user message and tool call");
3640
3641 // Verify user message is still there
3642 assert!(
3643 matches!(entries[0], AgentThreadEntry::UserMessage(_)),
3644 "User message should not be truncated"
3645 );
3646
3647 // Verify tool call is there with result
3648 if let AgentThreadEntry::ToolCall(tool_call) = &entries[1] {
3649 assert!(
3650 tool_call.raw_output.is_some(),
3651 "Tool call should have output"
3652 );
3653 } else {
3654 panic!("Expected tool call at index 1");
3655 }
3656 });
3657 }
3658
3659 #[gpui::test]
3660 async fn test_user_prompt_refusal_emits_event(cx: &mut TestAppContext) {
3661 init_test(cx);
3662
3663 let fs = FakeFs::new(cx.executor());
3664 let project = Project::test(fs, None, cx).await;
3665
3666 let refuse_next = Arc::new(AtomicBool::new(false));
3667 let connection = Rc::new(FakeAgentConnection::new().on_user_message({
3668 let refuse_next = refuse_next.clone();
3669 move |_request, _thread, _cx| {
3670 if refuse_next.load(SeqCst) {
3671 async move { Ok(acp::PromptResponse::new(acp::StopReason::Refusal)) }
3672 .boxed_local()
3673 } else {
3674 async move { Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)) }
3675 .boxed_local()
3676 }
3677 }
3678 }));
3679
3680 let thread = cx
3681 .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
3682 .await
3683 .unwrap();
3684
3685 // Track if we see a Refusal event
3686 let saw_refusal_event = Arc::new(std::sync::Mutex::new(false));
3687 let saw_refusal_event_captured = saw_refusal_event.clone();
3688 thread.update(cx, |_thread, cx| {
3689 cx.subscribe(
3690 &thread,
3691 move |_thread, _event_thread, event: &AcpThreadEvent, _cx| {
3692 if matches!(event, AcpThreadEvent::Refusal) {
3693 *saw_refusal_event_captured.lock().unwrap() = true;
3694 }
3695 },
3696 )
3697 .detach();
3698 });
3699
3700 // Send a message that will be refused
3701 refuse_next.store(true, SeqCst);
3702 cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["hello".into()], cx)))
3703 .await
3704 .unwrap();
3705
3706 // Verify that a Refusal event WAS emitted for user prompt refusal
3707 assert!(
3708 *saw_refusal_event.lock().unwrap(),
3709 "Refusal event should be emitted for user prompt refusals"
3710 );
3711
3712 // Verify the message was truncated (user prompt refusal)
3713 thread.read_with(cx, |thread, cx| {
3714 assert_eq!(thread.to_markdown(cx), "");
3715 });
3716 }
3717
3718 #[gpui::test]
3719 async fn test_refusal(cx: &mut TestAppContext) {
3720 init_test(cx);
3721 let fs = FakeFs::new(cx.background_executor.clone());
3722 fs.insert_tree(path!("/"), json!({})).await;
3723 let project = Project::test(fs.clone(), [path!("/").as_ref()], cx).await;
3724
3725 let refuse_next = Arc::new(AtomicBool::new(false));
3726 let connection = Rc::new(FakeAgentConnection::new().on_user_message({
3727 let refuse_next = refuse_next.clone();
3728 move |request, thread, mut cx| {
3729 let refuse_next = refuse_next.clone();
3730 async move {
3731 if refuse_next.load(SeqCst) {
3732 return Ok(acp::PromptResponse::new(acp::StopReason::Refusal));
3733 }
3734
3735 let acp::ContentBlock::Text(content) = &request.prompt[0] else {
3736 panic!("expected text content block");
3737 };
3738 thread.update(&mut cx, |thread, cx| {
3739 thread
3740 .handle_session_update(
3741 acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
3742 content.text.to_uppercase().into(),
3743 )),
3744 cx,
3745 )
3746 .unwrap();
3747 })?;
3748 Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
3749 }
3750 .boxed_local()
3751 }
3752 }));
3753 let thread = cx
3754 .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
3755 .await
3756 .unwrap();
3757
3758 cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["hello".into()], cx)))
3759 .await
3760 .unwrap();
3761 thread.read_with(cx, |thread, cx| {
3762 assert_eq!(
3763 thread.to_markdown(cx),
3764 indoc! {"
3765 ## User
3766
3767 hello
3768
3769 ## Assistant
3770
3771 HELLO
3772
3773 "}
3774 );
3775 });
3776
3777 // Simulate refusing the second message. The message should be truncated
3778 // when a user prompt is refused.
3779 refuse_next.store(true, SeqCst);
3780 cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["world".into()], cx)))
3781 .await
3782 .unwrap();
3783 thread.read_with(cx, |thread, cx| {
3784 assert_eq!(
3785 thread.to_markdown(cx),
3786 indoc! {"
3787 ## User
3788
3789 hello
3790
3791 ## Assistant
3792
3793 HELLO
3794
3795 "}
3796 );
3797 });
3798 }
3799
3800 async fn run_until_first_tool_call(
3801 thread: &Entity<AcpThread>,
3802 cx: &mut TestAppContext,
3803 ) -> usize {
3804 let (mut tx, mut rx) = mpsc::channel::<usize>(1);
3805
3806 let subscription = cx.update(|cx| {
3807 cx.subscribe(thread, move |thread, _, cx| {
3808 for (ix, entry) in thread.read(cx).entries.iter().enumerate() {
3809 if matches!(entry, AgentThreadEntry::ToolCall(_)) {
3810 return tx.try_send(ix).unwrap();
3811 }
3812 }
3813 })
3814 });
3815
3816 select! {
3817 _ = futures::FutureExt::fuse(cx.background_executor.timer(Duration::from_secs(10))) => {
3818 panic!("Timeout waiting for tool call")
3819 }
3820 ix = rx.next().fuse() => {
3821 drop(subscription);
3822 ix.unwrap()
3823 }
3824 }
3825 }
3826
3827 #[derive(Clone, Default)]
3828 struct FakeAgentConnection {
3829 auth_methods: Vec<acp::AuthMethod>,
3830 sessions: Arc<parking_lot::Mutex<HashMap<acp::SessionId, WeakEntity<AcpThread>>>>,
3831 on_user_message: Option<
3832 Rc<
3833 dyn Fn(
3834 acp::PromptRequest,
3835 WeakEntity<AcpThread>,
3836 AsyncApp,
3837 ) -> LocalBoxFuture<'static, Result<acp::PromptResponse>>
3838 + 'static,
3839 >,
3840 >,
3841 }
3842
3843 impl FakeAgentConnection {
3844 fn new() -> Self {
3845 Self {
3846 auth_methods: Vec::new(),
3847 on_user_message: None,
3848 sessions: Arc::default(),
3849 }
3850 }
3851
3852 #[expect(unused)]
3853 fn with_auth_methods(mut self, auth_methods: Vec<acp::AuthMethod>) -> Self {
3854 self.auth_methods = auth_methods;
3855 self
3856 }
3857
3858 fn on_user_message(
3859 mut self,
3860 handler: impl Fn(
3861 acp::PromptRequest,
3862 WeakEntity<AcpThread>,
3863 AsyncApp,
3864 ) -> LocalBoxFuture<'static, Result<acp::PromptResponse>>
3865 + 'static,
3866 ) -> Self {
3867 self.on_user_message.replace(Rc::new(handler));
3868 self
3869 }
3870 }
3871
3872 impl AgentConnection for FakeAgentConnection {
3873 fn telemetry_id(&self) -> SharedString {
3874 "fake".into()
3875 }
3876
3877 fn auth_methods(&self) -> &[acp::AuthMethod] {
3878 &self.auth_methods
3879 }
3880
3881 fn new_thread(
3882 self: Rc<Self>,
3883 project: Entity<Project>,
3884 _cwd: &Path,
3885 cx: &mut App,
3886 ) -> Task<gpui::Result<Entity<AcpThread>>> {
3887 let session_id = acp::SessionId::new(
3888 rand::rng()
3889 .sample_iter(&distr::Alphanumeric)
3890 .take(7)
3891 .map(char::from)
3892 .collect::<String>(),
3893 );
3894 let action_log = cx.new(|_| ActionLog::new(project.clone()));
3895 let thread = cx.new(|cx| {
3896 AcpThread::new(
3897 "Test",
3898 self.clone(),
3899 project,
3900 action_log,
3901 session_id.clone(),
3902 watch::Receiver::constant(
3903 acp::PromptCapabilities::new()
3904 .image(true)
3905 .audio(true)
3906 .embedded_context(true),
3907 ),
3908 cx,
3909 )
3910 });
3911 self.sessions.lock().insert(session_id, thread.downgrade());
3912 Task::ready(Ok(thread))
3913 }
3914
3915 fn authenticate(&self, method: acp::AuthMethodId, _cx: &mut App) -> Task<gpui::Result<()>> {
3916 if self.auth_methods().iter().any(|m| m.id == method) {
3917 Task::ready(Ok(()))
3918 } else {
3919 Task::ready(Err(anyhow!("Invalid Auth Method")))
3920 }
3921 }
3922
3923 fn prompt(
3924 &self,
3925 _id: Option<UserMessageId>,
3926 params: acp::PromptRequest,
3927 cx: &mut App,
3928 ) -> Task<gpui::Result<acp::PromptResponse>> {
3929 let sessions = self.sessions.lock();
3930 let thread = sessions.get(¶ms.session_id).unwrap();
3931 if let Some(handler) = &self.on_user_message {
3932 let handler = handler.clone();
3933 let thread = thread.clone();
3934 cx.spawn(async move |cx| handler(params, thread, cx.clone()).await)
3935 } else {
3936 Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)))
3937 }
3938 }
3939
3940 fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
3941 let sessions = self.sessions.lock();
3942 let thread = sessions.get(session_id).unwrap().clone();
3943
3944 cx.spawn(async move |cx| {
3945 thread
3946 .update(cx, |thread, cx| thread.cancel(cx))
3947 .unwrap()
3948 .await
3949 })
3950 .detach();
3951 }
3952
3953 fn truncate(
3954 &self,
3955 session_id: &acp::SessionId,
3956 _cx: &App,
3957 ) -> Option<Rc<dyn AgentSessionTruncate>> {
3958 Some(Rc::new(FakeAgentSessionEditor {
3959 _session_id: session_id.clone(),
3960 }))
3961 }
3962
3963 fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
3964 self
3965 }
3966 }
3967
3968 struct FakeAgentSessionEditor {
3969 _session_id: acp::SessionId,
3970 }
3971
3972 impl AgentSessionTruncate for FakeAgentSessionEditor {
3973 fn run(&self, _message_id: UserMessageId, _cx: &mut App) -> Task<Result<()>> {
3974 Task::ready(Ok(()))
3975 }
3976 }
3977
3978 #[gpui::test]
3979 async fn test_tool_call_not_found_creates_failed_entry(cx: &mut TestAppContext) {
3980 init_test(cx);
3981
3982 let fs = FakeFs::new(cx.executor());
3983 let project = Project::test(fs, [], cx).await;
3984 let connection = Rc::new(FakeAgentConnection::new());
3985 let thread = cx
3986 .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
3987 .await
3988 .unwrap();
3989
3990 // Try to update a tool call that doesn't exist
3991 let nonexistent_id = acp::ToolCallId::new("nonexistent-tool-call");
3992 thread.update(cx, |thread, cx| {
3993 let result = thread.handle_session_update(
3994 acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate::new(
3995 nonexistent_id.clone(),
3996 acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::Completed),
3997 )),
3998 cx,
3999 );
4000
4001 // The update should succeed (not return an error)
4002 assert!(result.is_ok());
4003
4004 // There should now be exactly one entry in the thread
4005 assert_eq!(thread.entries.len(), 1);
4006
4007 // The entry should be a failed tool call
4008 if let AgentThreadEntry::ToolCall(tool_call) = &thread.entries[0] {
4009 assert_eq!(tool_call.id, nonexistent_id);
4010 assert!(matches!(tool_call.status, ToolCallStatus::Failed));
4011 assert_eq!(tool_call.kind, acp::ToolKind::Fetch);
4012
4013 // Check that the content contains the error message
4014 assert_eq!(tool_call.content.len(), 1);
4015 if let ToolCallContent::ContentBlock(content_block) = &tool_call.content[0] {
4016 match content_block {
4017 ContentBlock::Markdown { markdown } => {
4018 let markdown_text = markdown.read(cx).source();
4019 assert!(markdown_text.contains("Tool call not found"));
4020 }
4021 ContentBlock::Empty => panic!("Expected markdown content, got empty"),
4022 ContentBlock::ResourceLink { .. } => {
4023 panic!("Expected markdown content, got resource link")
4024 }
4025 ContentBlock::Image { .. } => {
4026 panic!("Expected markdown content, got image")
4027 }
4028 }
4029 } else {
4030 panic!("Expected ContentBlock, got: {:?}", tool_call.content[0]);
4031 }
4032 } else {
4033 panic!("Expected ToolCall entry, got: {:?}", thread.entries[0]);
4034 }
4035 });
4036 }
4037
4038 /// Tests that restoring a checkpoint properly cleans up terminals that were
4039 /// created after that checkpoint, and cancels any in-progress generation.
4040 ///
4041 /// Reproduces issue #35142: When a checkpoint is restored, any terminal processes
4042 /// that were started after that checkpoint should be terminated, and any in-progress
4043 /// AI generation should be canceled.
4044 #[gpui::test]
4045 async fn test_restore_checkpoint_kills_terminal(cx: &mut TestAppContext) {
4046 init_test(cx);
4047
4048 let fs = FakeFs::new(cx.executor());
4049 let project = Project::test(fs, [], cx).await;
4050 let connection = Rc::new(FakeAgentConnection::new());
4051 let thread = cx
4052 .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
4053 .await
4054 .unwrap();
4055
4056 // Send first user message to create a checkpoint
4057 cx.update(|cx| {
4058 thread.update(cx, |thread, cx| {
4059 thread.send(vec!["first message".into()], cx)
4060 })
4061 })
4062 .await
4063 .unwrap();
4064
4065 // Send second message (creates another checkpoint) - we'll restore to this one
4066 cx.update(|cx| {
4067 thread.update(cx, |thread, cx| {
4068 thread.send(vec!["second message".into()], cx)
4069 })
4070 })
4071 .await
4072 .unwrap();
4073
4074 // Create 2 terminals BEFORE the checkpoint that have completed running
4075 let terminal_id_1 = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
4076 let mock_terminal_1 = cx.new(|cx| {
4077 let builder = ::terminal::TerminalBuilder::new_display_only(
4078 ::terminal::terminal_settings::CursorShape::default(),
4079 ::terminal::terminal_settings::AlternateScroll::On,
4080 None,
4081 0,
4082 cx.background_executor(),
4083 )
4084 .unwrap();
4085 builder.subscribe(cx)
4086 });
4087
4088 thread.update(cx, |thread, cx| {
4089 thread.on_terminal_provider_event(
4090 TerminalProviderEvent::Created {
4091 terminal_id: terminal_id_1.clone(),
4092 label: "echo 'first'".to_string(),
4093 cwd: Some(PathBuf::from("/test")),
4094 output_byte_limit: None,
4095 terminal: mock_terminal_1.clone(),
4096 },
4097 cx,
4098 );
4099 });
4100
4101 thread.update(cx, |thread, cx| {
4102 thread.on_terminal_provider_event(
4103 TerminalProviderEvent::Output {
4104 terminal_id: terminal_id_1.clone(),
4105 data: b"first\n".to_vec(),
4106 },
4107 cx,
4108 );
4109 });
4110
4111 thread.update(cx, |thread, cx| {
4112 thread.on_terminal_provider_event(
4113 TerminalProviderEvent::Exit {
4114 terminal_id: terminal_id_1.clone(),
4115 status: acp::TerminalExitStatus::new().exit_code(0),
4116 },
4117 cx,
4118 );
4119 });
4120
4121 let terminal_id_2 = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
4122 let mock_terminal_2 = cx.new(|cx| {
4123 let builder = ::terminal::TerminalBuilder::new_display_only(
4124 ::terminal::terminal_settings::CursorShape::default(),
4125 ::terminal::terminal_settings::AlternateScroll::On,
4126 None,
4127 0,
4128 cx.background_executor(),
4129 )
4130 .unwrap();
4131 builder.subscribe(cx)
4132 });
4133
4134 thread.update(cx, |thread, cx| {
4135 thread.on_terminal_provider_event(
4136 TerminalProviderEvent::Created {
4137 terminal_id: terminal_id_2.clone(),
4138 label: "echo 'second'".to_string(),
4139 cwd: Some(PathBuf::from("/test")),
4140 output_byte_limit: None,
4141 terminal: mock_terminal_2.clone(),
4142 },
4143 cx,
4144 );
4145 });
4146
4147 thread.update(cx, |thread, cx| {
4148 thread.on_terminal_provider_event(
4149 TerminalProviderEvent::Output {
4150 terminal_id: terminal_id_2.clone(),
4151 data: b"second\n".to_vec(),
4152 },
4153 cx,
4154 );
4155 });
4156
4157 thread.update(cx, |thread, cx| {
4158 thread.on_terminal_provider_event(
4159 TerminalProviderEvent::Exit {
4160 terminal_id: terminal_id_2.clone(),
4161 status: acp::TerminalExitStatus::new().exit_code(0),
4162 },
4163 cx,
4164 );
4165 });
4166
4167 // Get the second message ID to restore to
4168 let second_message_id = thread.read_with(cx, |thread, _| {
4169 // At this point we have:
4170 // - Index 0: First user message (with checkpoint)
4171 // - Index 1: Second user message (with checkpoint)
4172 // No assistant responses because FakeAgentConnection just returns EndTurn
4173 let AgentThreadEntry::UserMessage(message) = &thread.entries[1] else {
4174 panic!("expected user message at index 1");
4175 };
4176 message.id.clone().unwrap()
4177 });
4178
4179 // Create a terminal AFTER the checkpoint we'll restore to.
4180 // This simulates the AI agent starting a long-running terminal command.
4181 let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
4182 let mock_terminal = cx.new(|cx| {
4183 let builder = ::terminal::TerminalBuilder::new_display_only(
4184 ::terminal::terminal_settings::CursorShape::default(),
4185 ::terminal::terminal_settings::AlternateScroll::On,
4186 None,
4187 0,
4188 cx.background_executor(),
4189 )
4190 .unwrap();
4191 builder.subscribe(cx)
4192 });
4193
4194 // Register the terminal as created
4195 thread.update(cx, |thread, cx| {
4196 thread.on_terminal_provider_event(
4197 TerminalProviderEvent::Created {
4198 terminal_id: terminal_id.clone(),
4199 label: "sleep 1000".to_string(),
4200 cwd: Some(PathBuf::from("/test")),
4201 output_byte_limit: None,
4202 terminal: mock_terminal.clone(),
4203 },
4204 cx,
4205 );
4206 });
4207
4208 // Simulate the terminal producing output (still running)
4209 thread.update(cx, |thread, cx| {
4210 thread.on_terminal_provider_event(
4211 TerminalProviderEvent::Output {
4212 terminal_id: terminal_id.clone(),
4213 data: b"terminal is running...\n".to_vec(),
4214 },
4215 cx,
4216 );
4217 });
4218
4219 // Create a tool call entry that references this terminal
4220 // This represents the agent requesting a terminal command
4221 thread.update(cx, |thread, cx| {
4222 thread
4223 .handle_session_update(
4224 acp::SessionUpdate::ToolCall(
4225 acp::ToolCall::new("terminal-tool-1", "Running command")
4226 .kind(acp::ToolKind::Execute)
4227 .status(acp::ToolCallStatus::InProgress)
4228 .content(vec![acp::ToolCallContent::Terminal(acp::Terminal::new(
4229 terminal_id.clone(),
4230 ))])
4231 .raw_input(serde_json::json!({"command": "sleep 1000", "cd": "/test"})),
4232 ),
4233 cx,
4234 )
4235 .unwrap();
4236 });
4237
4238 // Verify terminal exists and is in the thread
4239 let terminal_exists_before =
4240 thread.read_with(cx, |thread, _| thread.terminals.contains_key(&terminal_id));
4241 assert!(
4242 terminal_exists_before,
4243 "Terminal should exist before checkpoint restore"
4244 );
4245
4246 // Verify the terminal's underlying task is still running (not completed)
4247 let terminal_running_before = thread.read_with(cx, |thread, _cx| {
4248 let terminal_entity = thread.terminals.get(&terminal_id).unwrap();
4249 terminal_entity.read_with(cx, |term, _cx| {
4250 term.output().is_none() // output is None means it's still running
4251 })
4252 });
4253 assert!(
4254 terminal_running_before,
4255 "Terminal should be running before checkpoint restore"
4256 );
4257
4258 // Verify we have the expected entries before restore
4259 let entry_count_before = thread.read_with(cx, |thread, _| thread.entries.len());
4260 assert!(
4261 entry_count_before > 1,
4262 "Should have multiple entries before restore"
4263 );
4264
4265 // Restore the checkpoint to the second message.
4266 // This should:
4267 // 1. Cancel any in-progress generation (via the cancel() call)
4268 // 2. Remove the terminal that was created after that point
4269 thread
4270 .update(cx, |thread, cx| {
4271 thread.restore_checkpoint(second_message_id, cx)
4272 })
4273 .await
4274 .unwrap();
4275
4276 // Verify that no send_task is in progress after restore
4277 // (cancel() clears the send_task)
4278 let has_send_task_after = thread.read_with(cx, |thread, _| thread.send_task.is_some());
4279 assert!(
4280 !has_send_task_after,
4281 "Should not have a send_task after restore (cancel should have cleared it)"
4282 );
4283
4284 // Verify the entries were truncated (restoring to index 1 truncates at 1, keeping only index 0)
4285 let entry_count = thread.read_with(cx, |thread, _| thread.entries.len());
4286 assert_eq!(
4287 entry_count, 1,
4288 "Should have 1 entry after restore (only the first user message)"
4289 );
4290
4291 // Verify the 2 completed terminals from before the checkpoint still exist
4292 let terminal_1_exists = thread.read_with(cx, |thread, _| {
4293 thread.terminals.contains_key(&terminal_id_1)
4294 });
4295 assert!(
4296 terminal_1_exists,
4297 "Terminal 1 (from before checkpoint) should still exist"
4298 );
4299
4300 let terminal_2_exists = thread.read_with(cx, |thread, _| {
4301 thread.terminals.contains_key(&terminal_id_2)
4302 });
4303 assert!(
4304 terminal_2_exists,
4305 "Terminal 2 (from before checkpoint) should still exist"
4306 );
4307
4308 // Verify they're still in completed state
4309 let terminal_1_completed = thread.read_with(cx, |thread, _cx| {
4310 let terminal_entity = thread.terminals.get(&terminal_id_1).unwrap();
4311 terminal_entity.read_with(cx, |term, _cx| term.output().is_some())
4312 });
4313 assert!(terminal_1_completed, "Terminal 1 should still be completed");
4314
4315 let terminal_2_completed = thread.read_with(cx, |thread, _cx| {
4316 let terminal_entity = thread.terminals.get(&terminal_id_2).unwrap();
4317 terminal_entity.read_with(cx, |term, _cx| term.output().is_some())
4318 });
4319 assert!(terminal_2_completed, "Terminal 2 should still be completed");
4320
4321 // Verify the running terminal (created after checkpoint) was removed
4322 let terminal_3_exists =
4323 thread.read_with(cx, |thread, _| thread.terminals.contains_key(&terminal_id));
4324 assert!(
4325 !terminal_3_exists,
4326 "Terminal 3 (created after checkpoint) should have been removed"
4327 );
4328
4329 // Verify total count is 2 (the two from before the checkpoint)
4330 let terminal_count = thread.read_with(cx, |thread, _| thread.terminals.len());
4331 assert_eq!(
4332 terminal_count, 2,
4333 "Should have exactly 2 terminals (the completed ones from before checkpoint)"
4334 );
4335 }
4336
4337 /// Tests that update_last_checkpoint correctly updates the original message's checkpoint
4338 /// even when a new user message is added while the async checkpoint comparison is in progress.
4339 ///
4340 /// This is a regression test for a bug where update_last_checkpoint would fail with
4341 /// "no checkpoint" if a new user message (without a checkpoint) was added between when
4342 /// update_last_checkpoint started and when its async closure ran.
4343 #[gpui::test]
4344 async fn test_update_last_checkpoint_with_new_message_added(cx: &mut TestAppContext) {
4345 init_test(cx);
4346
4347 let fs = FakeFs::new(cx.executor());
4348 fs.insert_tree(path!("/test"), json!({".git": {}, "file.txt": "content"}))
4349 .await;
4350 let project = Project::test(fs.clone(), [Path::new(path!("/test"))], cx).await;
4351
4352 let handler_done = Arc::new(AtomicBool::new(false));
4353 let handler_done_clone = handler_done.clone();
4354 let connection = Rc::new(FakeAgentConnection::new().on_user_message(
4355 move |_, _thread, _cx| {
4356 handler_done_clone.store(true, SeqCst);
4357 async move { Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)) }.boxed_local()
4358 },
4359 ));
4360
4361 let thread = cx
4362 .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
4363 .await
4364 .unwrap();
4365
4366 let send_future = thread.update(cx, |thread, cx| thread.send_raw("First message", cx));
4367 let send_task = cx.background_executor.spawn(send_future);
4368
4369 // Tick until handler completes, then a few more to let update_last_checkpoint start
4370 while !handler_done.load(SeqCst) {
4371 cx.executor().tick();
4372 }
4373 for _ in 0..5 {
4374 cx.executor().tick();
4375 }
4376
4377 thread.update(cx, |thread, cx| {
4378 thread.push_entry(
4379 AgentThreadEntry::UserMessage(UserMessage {
4380 id: Some(UserMessageId::new()),
4381 content: ContentBlock::Empty,
4382 chunks: vec!["Injected message (no checkpoint)".into()],
4383 checkpoint: None,
4384 indented: false,
4385 }),
4386 cx,
4387 );
4388 });
4389
4390 cx.run_until_parked();
4391 let result = send_task.await;
4392
4393 assert!(
4394 result.is_ok(),
4395 "send should succeed even when new message added during update_last_checkpoint: {:?}",
4396 result.err()
4397 );
4398 }
4399}