2735 lines
87 KiB
Rust
2735 lines
87 KiB
Rust
mod connection;
|
|
mod diff;
|
|
mod mention;
|
|
mod terminal;
|
|
|
|
use collections::HashSet;
|
|
pub use connection::*;
|
|
pub use diff::*;
|
|
use language::language_settings::FormatOnSave;
|
|
pub use mention::*;
|
|
use project::lsp_store::{FormatTrigger, LspFormatTarget};
|
|
use serde::{Deserialize, Serialize};
|
|
pub use terminal::*;
|
|
|
|
use action_log::ActionLog;
|
|
use agent_client_protocol as acp;
|
|
use anyhow::{Context as _, Result, anyhow};
|
|
use editor::Bias;
|
|
use futures::{FutureExt, channel::oneshot, future::BoxFuture};
|
|
use gpui::{AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task, WeakEntity};
|
|
use itertools::Itertools;
|
|
use language::{Anchor, Buffer, BufferSnapshot, LanguageRegistry, Point, ToPoint, text_diff};
|
|
use markdown::Markdown;
|
|
use project::{AgentLocation, Project, git_store::GitStoreCheckpoint};
|
|
use std::collections::HashMap;
|
|
use std::error::Error;
|
|
use std::fmt::{Formatter, Write};
|
|
use std::ops::Range;
|
|
use std::process::ExitStatus;
|
|
use std::rc::Rc;
|
|
use std::time::{Duration, Instant};
|
|
use std::{fmt::Display, mem, path::PathBuf, sync::Arc};
|
|
use ui::App;
|
|
use util::ResultExt;
|
|
use uuid::Uuid;
|
|
|
|
pub fn new_prompt_id() -> acp::PromptId {
|
|
acp::PromptId(Uuid::new_v4().to_string().into())
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct UserMessage {
|
|
pub prompt_id: Option<acp::PromptId>,
|
|
pub content: ContentBlock,
|
|
pub chunks: Vec<acp::ContentBlock>,
|
|
pub checkpoint: Option<Checkpoint>,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Checkpoint {
|
|
git_checkpoint: GitStoreCheckpoint,
|
|
pub show: bool,
|
|
}
|
|
|
|
impl UserMessage {
|
|
fn to_markdown(&self, cx: &App) -> String {
|
|
let mut markdown = String::new();
|
|
if self
|
|
.checkpoint
|
|
.as_ref()
|
|
.is_some_and(|checkpoint| checkpoint.show)
|
|
{
|
|
writeln!(markdown, "## User (checkpoint)").unwrap();
|
|
} else {
|
|
writeln!(markdown, "## User").unwrap();
|
|
}
|
|
writeln!(markdown).unwrap();
|
|
writeln!(markdown, "{}", self.content.to_markdown(cx)).unwrap();
|
|
writeln!(markdown).unwrap();
|
|
markdown
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub struct AssistantMessage {
|
|
pub chunks: Vec<AssistantMessageChunk>,
|
|
}
|
|
|
|
impl AssistantMessage {
|
|
pub fn to_markdown(&self, cx: &App) -> String {
|
|
format!(
|
|
"## Assistant\n\n{}\n\n",
|
|
self.chunks
|
|
.iter()
|
|
.map(|chunk| chunk.to_markdown(cx))
|
|
.join("\n\n")
|
|
)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub enum AssistantMessageChunk {
|
|
Message { block: ContentBlock },
|
|
Thought { block: ContentBlock },
|
|
}
|
|
|
|
impl AssistantMessageChunk {
|
|
pub fn from_str(chunk: &str, language_registry: &Arc<LanguageRegistry>, cx: &mut App) -> Self {
|
|
Self::Message {
|
|
block: ContentBlock::new(chunk.into(), language_registry, cx),
|
|
}
|
|
}
|
|
|
|
fn to_markdown(&self, cx: &App) -> String {
|
|
match self {
|
|
Self::Message { block } => block.to_markdown(cx).to_string(),
|
|
Self::Thought { block } => {
|
|
format!("<thinking>\n{}\n</thinking>", block.to_markdown(cx))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub enum AgentThreadEntry {
|
|
UserMessage(UserMessage),
|
|
AssistantMessage(AssistantMessage),
|
|
ToolCall(ToolCall),
|
|
}
|
|
|
|
impl AgentThreadEntry {
|
|
pub fn to_markdown(&self, cx: &App) -> String {
|
|
match self {
|
|
Self::UserMessage(message) => message.to_markdown(cx),
|
|
Self::AssistantMessage(message) => message.to_markdown(cx),
|
|
Self::ToolCall(tool_call) => tool_call.to_markdown(cx),
|
|
}
|
|
}
|
|
|
|
pub fn user_message(&self) -> Option<&UserMessage> {
|
|
if let AgentThreadEntry::UserMessage(message) = self {
|
|
Some(message)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
pub fn diffs(&self) -> impl Iterator<Item = &Entity<Diff>> {
|
|
if let AgentThreadEntry::ToolCall(call) = self {
|
|
itertools::Either::Left(call.diffs())
|
|
} else {
|
|
itertools::Either::Right(std::iter::empty())
|
|
}
|
|
}
|
|
|
|
pub fn terminals(&self) -> impl Iterator<Item = &Entity<Terminal>> {
|
|
if let AgentThreadEntry::ToolCall(call) = self {
|
|
itertools::Either::Left(call.terminals())
|
|
} else {
|
|
itertools::Either::Right(std::iter::empty())
|
|
}
|
|
}
|
|
|
|
pub fn location(&self, ix: usize) -> Option<(acp::ToolCallLocation, AgentLocation)> {
|
|
if let AgentThreadEntry::ToolCall(ToolCall {
|
|
locations,
|
|
resolved_locations,
|
|
..
|
|
}) = self
|
|
{
|
|
Some((
|
|
locations.get(ix)?.clone(),
|
|
resolved_locations.get(ix)?.clone()?,
|
|
))
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct ToolCall {
|
|
pub id: acp::ToolCallId,
|
|
pub label: Entity<Markdown>,
|
|
pub kind: acp::ToolKind,
|
|
pub content: Vec<ToolCallContent>,
|
|
pub status: ToolCallStatus,
|
|
pub locations: Vec<acp::ToolCallLocation>,
|
|
pub resolved_locations: Vec<Option<AgentLocation>>,
|
|
pub raw_input: Option<serde_json::Value>,
|
|
pub raw_output: Option<serde_json::Value>,
|
|
}
|
|
|
|
impl ToolCall {
|
|
fn from_acp(
|
|
tool_call: acp::ToolCall,
|
|
status: ToolCallStatus,
|
|
language_registry: Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
let title = if let Some((first_line, _)) = tool_call.title.split_once("\n") {
|
|
first_line.to_owned() + "…"
|
|
} else {
|
|
tool_call.title
|
|
};
|
|
Self {
|
|
id: tool_call.id,
|
|
label: cx
|
|
.new(|cx| Markdown::new(title.into(), Some(language_registry.clone()), None, cx)),
|
|
kind: tool_call.kind,
|
|
content: tool_call
|
|
.content
|
|
.into_iter()
|
|
.map(|content| ToolCallContent::from_acp(content, language_registry.clone(), cx))
|
|
.collect(),
|
|
locations: tool_call.locations,
|
|
resolved_locations: Vec::default(),
|
|
status,
|
|
raw_input: tool_call.raw_input,
|
|
raw_output: tool_call.raw_output,
|
|
}
|
|
}
|
|
|
|
fn update_fields(
|
|
&mut self,
|
|
fields: acp::ToolCallUpdateFields,
|
|
language_registry: Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) {
|
|
let acp::ToolCallUpdateFields {
|
|
kind,
|
|
status,
|
|
title,
|
|
content,
|
|
locations,
|
|
raw_input,
|
|
raw_output,
|
|
} = fields;
|
|
|
|
if let Some(kind) = kind {
|
|
self.kind = kind;
|
|
}
|
|
|
|
if let Some(status) = status {
|
|
self.status = status.into();
|
|
}
|
|
|
|
if let Some(title) = title {
|
|
self.label.update(cx, |label, cx| {
|
|
if let Some((first_line, _)) = title.split_once("\n") {
|
|
label.replace(first_line.to_owned() + "…", cx)
|
|
} else {
|
|
label.replace(title, cx);
|
|
}
|
|
});
|
|
}
|
|
|
|
if let Some(content) = content {
|
|
let new_content_len = content.len();
|
|
let mut content = content.into_iter();
|
|
|
|
// Reuse existing content if we can
|
|
for (old, new) in self.content.iter_mut().zip(content.by_ref()) {
|
|
old.update_from_acp(new, language_registry.clone(), cx);
|
|
}
|
|
for new in content {
|
|
self.content.push(ToolCallContent::from_acp(
|
|
new,
|
|
language_registry.clone(),
|
|
cx,
|
|
))
|
|
}
|
|
self.content.truncate(new_content_len);
|
|
}
|
|
|
|
if let Some(locations) = locations {
|
|
self.locations = locations;
|
|
}
|
|
|
|
if let Some(raw_input) = raw_input {
|
|
self.raw_input = Some(raw_input);
|
|
}
|
|
|
|
if let Some(raw_output) = raw_output {
|
|
if self.content.is_empty()
|
|
&& let Some(markdown) = markdown_for_raw_output(&raw_output, &language_registry, cx)
|
|
{
|
|
self.content
|
|
.push(ToolCallContent::ContentBlock(ContentBlock::Markdown {
|
|
markdown,
|
|
}));
|
|
}
|
|
self.raw_output = Some(raw_output);
|
|
}
|
|
}
|
|
|
|
pub fn diffs(&self) -> impl Iterator<Item = &Entity<Diff>> {
|
|
self.content.iter().filter_map(|content| match content {
|
|
ToolCallContent::Diff(diff) => Some(diff),
|
|
ToolCallContent::ContentBlock(_) => None,
|
|
ToolCallContent::Terminal(_) => None,
|
|
})
|
|
}
|
|
|
|
pub fn terminals(&self) -> impl Iterator<Item = &Entity<Terminal>> {
|
|
self.content.iter().filter_map(|content| match content {
|
|
ToolCallContent::Terminal(terminal) => Some(terminal),
|
|
ToolCallContent::ContentBlock(_) => None,
|
|
ToolCallContent::Diff(_) => None,
|
|
})
|
|
}
|
|
|
|
fn to_markdown(&self, cx: &App) -> String {
|
|
let mut markdown = format!(
|
|
"**Tool Call: {}**\nStatus: {}\n\n",
|
|
self.label.read(cx).source(),
|
|
self.status
|
|
);
|
|
for content in &self.content {
|
|
markdown.push_str(content.to_markdown(cx).as_str());
|
|
markdown.push_str("\n\n");
|
|
}
|
|
markdown
|
|
}
|
|
|
|
async fn resolve_location(
|
|
location: acp::ToolCallLocation,
|
|
project: WeakEntity<Project>,
|
|
cx: &mut AsyncApp,
|
|
) -> Option<AgentLocation> {
|
|
let buffer = project
|
|
.update(cx, |project, cx| {
|
|
project
|
|
.project_path_for_absolute_path(&location.path, cx)
|
|
.map(|path| project.open_buffer(path, cx))
|
|
})
|
|
.ok()??;
|
|
let buffer = buffer.await.log_err()?;
|
|
let position = buffer
|
|
.update(cx, |buffer, _| {
|
|
if let Some(row) = location.line {
|
|
let snapshot = buffer.snapshot();
|
|
let column = snapshot.indent_size_for_line(row).len;
|
|
let point = snapshot.clip_point(Point::new(row, column), Bias::Left);
|
|
snapshot.anchor_before(point)
|
|
} else {
|
|
Anchor::MIN
|
|
}
|
|
})
|
|
.ok()?;
|
|
|
|
Some(AgentLocation {
|
|
buffer: buffer.downgrade(),
|
|
position,
|
|
})
|
|
}
|
|
|
|
fn resolve_locations(
|
|
&self,
|
|
project: Entity<Project>,
|
|
cx: &mut App,
|
|
) -> Task<Vec<Option<AgentLocation>>> {
|
|
let locations = self.locations.clone();
|
|
project.update(cx, |_, cx| {
|
|
cx.spawn(async move |project, cx| {
|
|
let mut new_locations = Vec::new();
|
|
for location in locations {
|
|
new_locations.push(Self::resolve_location(location, project.clone(), cx).await);
|
|
}
|
|
new_locations
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub enum ToolCallStatus {
|
|
/// The tool call hasn't started running yet, but we start showing it to
|
|
/// the user.
|
|
Pending,
|
|
/// The tool call is waiting for confirmation from the user.
|
|
WaitingForConfirmation {
|
|
options: Vec<acp::PermissionOption>,
|
|
respond_tx: oneshot::Sender<acp::PermissionOptionId>,
|
|
},
|
|
/// The tool call is currently running.
|
|
InProgress,
|
|
/// The tool call completed successfully.
|
|
Completed,
|
|
/// The tool call failed.
|
|
Failed,
|
|
/// The user rejected the tool call.
|
|
Rejected,
|
|
/// The user canceled generation so the tool call was canceled.
|
|
Canceled,
|
|
}
|
|
|
|
impl From<acp::ToolCallStatus> for ToolCallStatus {
|
|
fn from(status: acp::ToolCallStatus) -> Self {
|
|
match status {
|
|
acp::ToolCallStatus::Pending => Self::Pending,
|
|
acp::ToolCallStatus::InProgress => Self::InProgress,
|
|
acp::ToolCallStatus::Completed => Self::Completed,
|
|
acp::ToolCallStatus::Failed => Self::Failed,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Display for ToolCallStatus {
|
|
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
|
write!(
|
|
f,
|
|
"{}",
|
|
match self {
|
|
ToolCallStatus::Pending => "Pending",
|
|
ToolCallStatus::WaitingForConfirmation { .. } => "Waiting for confirmation",
|
|
ToolCallStatus::InProgress => "In Progress",
|
|
ToolCallStatus::Completed => "Completed",
|
|
ToolCallStatus::Failed => "Failed",
|
|
ToolCallStatus::Rejected => "Rejected",
|
|
ToolCallStatus::Canceled => "Canceled",
|
|
}
|
|
)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub enum ContentBlock {
|
|
Empty,
|
|
Markdown { markdown: Entity<Markdown> },
|
|
ResourceLink { resource_link: acp::ResourceLink },
|
|
}
|
|
|
|
impl ContentBlock {
|
|
pub fn new(
|
|
block: acp::ContentBlock,
|
|
language_registry: &Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
let mut this = Self::Empty;
|
|
this.append(block, language_registry, cx);
|
|
this
|
|
}
|
|
|
|
pub fn new_combined(
|
|
blocks: impl IntoIterator<Item = acp::ContentBlock>,
|
|
language_registry: Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
let mut this = Self::Empty;
|
|
for block in blocks {
|
|
this.append(block, &language_registry, cx);
|
|
}
|
|
this
|
|
}
|
|
|
|
pub fn append(
|
|
&mut self,
|
|
block: acp::ContentBlock,
|
|
language_registry: &Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) {
|
|
if matches!(self, ContentBlock::Empty)
|
|
&& let acp::ContentBlock::ResourceLink(resource_link) = block
|
|
{
|
|
*self = ContentBlock::ResourceLink { resource_link };
|
|
return;
|
|
}
|
|
|
|
let new_content = self.block_string_contents(block);
|
|
|
|
match self {
|
|
ContentBlock::Empty => {
|
|
*self = Self::create_markdown_block(new_content, language_registry, cx);
|
|
}
|
|
ContentBlock::Markdown { markdown } => {
|
|
markdown.update(cx, |markdown, cx| markdown.append(&new_content, cx));
|
|
}
|
|
ContentBlock::ResourceLink { resource_link } => {
|
|
let existing_content = Self::resource_link_md(&resource_link.uri);
|
|
let combined = format!("{}\n{}", existing_content, new_content);
|
|
|
|
*self = Self::create_markdown_block(combined, language_registry, cx);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn create_markdown_block(
|
|
content: String,
|
|
language_registry: &Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) -> ContentBlock {
|
|
ContentBlock::Markdown {
|
|
markdown: cx
|
|
.new(|cx| Markdown::new(content.into(), Some(language_registry.clone()), None, cx)),
|
|
}
|
|
}
|
|
|
|
fn block_string_contents(&self, block: acp::ContentBlock) -> String {
|
|
match block {
|
|
acp::ContentBlock::Text(text_content) => text_content.text,
|
|
acp::ContentBlock::ResourceLink(resource_link) => {
|
|
Self::resource_link_md(&resource_link.uri)
|
|
}
|
|
acp::ContentBlock::Resource(acp::EmbeddedResource {
|
|
resource:
|
|
acp::EmbeddedResourceResource::TextResourceContents(acp::TextResourceContents {
|
|
uri,
|
|
..
|
|
}),
|
|
..
|
|
}) => Self::resource_link_md(&uri),
|
|
acp::ContentBlock::Image(image) => Self::image_md(&image),
|
|
acp::ContentBlock::Audio(_) | acp::ContentBlock::Resource(_) => String::new(),
|
|
}
|
|
}
|
|
|
|
fn resource_link_md(uri: &str) -> String {
|
|
if let Some(uri) = MentionUri::parse(uri).log_err() {
|
|
uri.as_link().to_string()
|
|
} else {
|
|
uri.to_string()
|
|
}
|
|
}
|
|
|
|
fn image_md(_image: &acp::ImageContent) -> String {
|
|
"`Image`".into()
|
|
}
|
|
|
|
pub fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
|
|
match self {
|
|
ContentBlock::Empty => "",
|
|
ContentBlock::Markdown { markdown } => markdown.read(cx).source(),
|
|
ContentBlock::ResourceLink { resource_link } => &resource_link.uri,
|
|
}
|
|
}
|
|
|
|
pub fn markdown(&self) -> Option<&Entity<Markdown>> {
|
|
match self {
|
|
ContentBlock::Empty => None,
|
|
ContentBlock::Markdown { markdown } => Some(markdown),
|
|
ContentBlock::ResourceLink { .. } => None,
|
|
}
|
|
}
|
|
|
|
pub fn resource_link(&self) -> Option<&acp::ResourceLink> {
|
|
match self {
|
|
ContentBlock::ResourceLink { resource_link } => Some(resource_link),
|
|
_ => None,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub enum ToolCallContent {
|
|
ContentBlock(ContentBlock),
|
|
Diff(Entity<Diff>),
|
|
Terminal(Entity<Terminal>),
|
|
}
|
|
|
|
impl ToolCallContent {
|
|
pub fn from_acp(
|
|
content: acp::ToolCallContent,
|
|
language_registry: Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
match content {
|
|
acp::ToolCallContent::Content { content } => {
|
|
Self::ContentBlock(ContentBlock::new(content, &language_registry, cx))
|
|
}
|
|
acp::ToolCallContent::Diff { diff } => Self::Diff(cx.new(|cx| {
|
|
Diff::finalized(
|
|
diff.path,
|
|
diff.old_text,
|
|
diff.new_text,
|
|
language_registry,
|
|
cx,
|
|
)
|
|
})),
|
|
}
|
|
}
|
|
|
|
pub fn update_from_acp(
|
|
&mut self,
|
|
new: acp::ToolCallContent,
|
|
language_registry: Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) {
|
|
let needs_update = match (&self, &new) {
|
|
(Self::Diff(old_diff), acp::ToolCallContent::Diff { diff: new_diff }) => {
|
|
old_diff.read(cx).needs_update(
|
|
new_diff.old_text.as_deref().unwrap_or(""),
|
|
&new_diff.new_text,
|
|
cx,
|
|
)
|
|
}
|
|
_ => true,
|
|
};
|
|
|
|
if needs_update {
|
|
*self = Self::from_acp(new, language_registry, cx);
|
|
}
|
|
}
|
|
|
|
pub fn to_markdown(&self, cx: &App) -> String {
|
|
match self {
|
|
Self::ContentBlock(content) => content.to_markdown(cx).to_string(),
|
|
Self::Diff(diff) => diff.read(cx).to_markdown(cx),
|
|
Self::Terminal(terminal) => terminal.read(cx).to_markdown(cx),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub enum ToolCallUpdate {
|
|
UpdateFields(acp::ToolCallUpdate),
|
|
UpdateDiff(ToolCallUpdateDiff),
|
|
UpdateTerminal(ToolCallUpdateTerminal),
|
|
}
|
|
|
|
impl ToolCallUpdate {
|
|
fn id(&self) -> &acp::ToolCallId {
|
|
match self {
|
|
Self::UpdateFields(update) => &update.id,
|
|
Self::UpdateDiff(diff) => &diff.id,
|
|
Self::UpdateTerminal(terminal) => &terminal.id,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<acp::ToolCallUpdate> for ToolCallUpdate {
|
|
fn from(update: acp::ToolCallUpdate) -> Self {
|
|
Self::UpdateFields(update)
|
|
}
|
|
}
|
|
|
|
impl From<ToolCallUpdateDiff> for ToolCallUpdate {
|
|
fn from(diff: ToolCallUpdateDiff) -> Self {
|
|
Self::UpdateDiff(diff)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub struct ToolCallUpdateDiff {
|
|
pub id: acp::ToolCallId,
|
|
pub diff: Entity<Diff>,
|
|
}
|
|
|
|
impl From<ToolCallUpdateTerminal> for ToolCallUpdate {
|
|
fn from(terminal: ToolCallUpdateTerminal) -> Self {
|
|
Self::UpdateTerminal(terminal)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub struct ToolCallUpdateTerminal {
|
|
pub id: acp::ToolCallId,
|
|
pub terminal: Entity<Terminal>,
|
|
}
|
|
|
|
#[derive(Debug, Default)]
|
|
pub struct Plan {
|
|
pub entries: Vec<PlanEntry>,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct PlanStats<'a> {
|
|
pub in_progress_entry: Option<&'a PlanEntry>,
|
|
pub pending: u32,
|
|
pub completed: u32,
|
|
}
|
|
|
|
impl Plan {
|
|
pub fn is_empty(&self) -> bool {
|
|
self.entries.is_empty()
|
|
}
|
|
|
|
pub fn stats(&self) -> PlanStats<'_> {
|
|
let mut stats = PlanStats {
|
|
in_progress_entry: None,
|
|
pending: 0,
|
|
completed: 0,
|
|
};
|
|
|
|
for entry in &self.entries {
|
|
match &entry.status {
|
|
acp::PlanEntryStatus::Pending => {
|
|
stats.pending += 1;
|
|
}
|
|
acp::PlanEntryStatus::InProgress => {
|
|
stats.in_progress_entry = stats.in_progress_entry.or(Some(entry));
|
|
}
|
|
acp::PlanEntryStatus::Completed => {
|
|
stats.completed += 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
stats
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct PlanEntry {
|
|
pub content: Entity<Markdown>,
|
|
pub priority: acp::PlanEntryPriority,
|
|
pub status: acp::PlanEntryStatus,
|
|
}
|
|
|
|
impl PlanEntry {
|
|
pub fn from_acp(entry: acp::PlanEntry, cx: &mut App) -> Self {
|
|
Self {
|
|
content: cx.new(|cx| Markdown::new(entry.content.into(), None, None, cx)),
|
|
priority: entry.priority,
|
|
status: entry.status,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
pub struct TokenUsage {
|
|
pub max_tokens: u64,
|
|
pub used_tokens: u64,
|
|
}
|
|
|
|
impl TokenUsage {
|
|
pub fn ratio(&self) -> TokenUsageRatio {
|
|
#[cfg(debug_assertions)]
|
|
let warning_threshold: f32 = std::env::var("ZED_THREAD_WARNING_THRESHOLD")
|
|
.unwrap_or("0.8".to_string())
|
|
.parse()
|
|
.unwrap();
|
|
#[cfg(not(debug_assertions))]
|
|
let warning_threshold: f32 = 0.8;
|
|
|
|
// When the maximum is unknown because there is no selected model,
|
|
// avoid showing the token limit warning.
|
|
if self.max_tokens == 0 {
|
|
TokenUsageRatio::Normal
|
|
} else if self.used_tokens >= self.max_tokens {
|
|
TokenUsageRatio::Exceeded
|
|
} else if self.used_tokens as f32 / self.max_tokens as f32 >= warning_threshold {
|
|
TokenUsageRatio::Warning
|
|
} else {
|
|
TokenUsageRatio::Normal
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub enum TokenUsageRatio {
|
|
Normal,
|
|
Warning,
|
|
Exceeded,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub struct RetryStatus {
|
|
pub last_error: SharedString,
|
|
pub attempt: usize,
|
|
pub max_attempts: usize,
|
|
pub started_at: Instant,
|
|
pub duration: Duration,
|
|
}
|
|
|
|
pub struct AcpThread {
|
|
title: SharedString,
|
|
entries: Vec<AgentThreadEntry>,
|
|
plan: Plan,
|
|
project: Entity<Project>,
|
|
action_log: Entity<ActionLog>,
|
|
shared_buffers: HashMap<Entity<Buffer>, BufferSnapshot>,
|
|
send_task: Option<Task<()>>,
|
|
connection: Rc<dyn AgentConnection>,
|
|
session_id: acp::SessionId,
|
|
token_usage: Option<TokenUsage>,
|
|
prompt_capabilities: acp::PromptCapabilities,
|
|
_observe_prompt_capabilities: Task<anyhow::Result<()>>,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub enum AcpThreadEvent {
|
|
NewEntry,
|
|
TitleUpdated,
|
|
TokenUsageUpdated,
|
|
EntryUpdated(usize),
|
|
EntriesRemoved(Range<usize>),
|
|
ToolAuthorizationRequired,
|
|
Retry(RetryStatus),
|
|
Stopped,
|
|
Error,
|
|
LoadError(LoadError),
|
|
PromptCapabilitiesUpdated,
|
|
}
|
|
|
|
impl EventEmitter<AcpThreadEvent> for AcpThread {}
|
|
|
|
#[derive(PartialEq, Eq, Debug)]
|
|
pub enum ThreadStatus {
|
|
Idle,
|
|
WaitingForToolConfirmation,
|
|
Generating,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub enum LoadError {
|
|
NotInstalled {
|
|
error_message: SharedString,
|
|
install_message: SharedString,
|
|
install_command: String,
|
|
},
|
|
Unsupported {
|
|
error_message: SharedString,
|
|
upgrade_message: SharedString,
|
|
upgrade_command: String,
|
|
},
|
|
Exited {
|
|
status: ExitStatus,
|
|
},
|
|
Other(SharedString),
|
|
}
|
|
|
|
impl Display for LoadError {
|
|
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
LoadError::NotInstalled { error_message, .. }
|
|
| LoadError::Unsupported { error_message, .. } => {
|
|
write!(f, "{error_message}")
|
|
}
|
|
LoadError::Exited { status } => write!(f, "Server exited with status {status}"),
|
|
LoadError::Other(msg) => write!(f, "{}", msg),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Error for LoadError {}
|
|
|
|
impl AcpThread {
|
|
pub fn new(
|
|
title: impl Into<SharedString>,
|
|
connection: Rc<dyn AgentConnection>,
|
|
project: Entity<Project>,
|
|
action_log: Entity<ActionLog>,
|
|
session_id: acp::SessionId,
|
|
mut prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
|
|
cx: &mut Context<Self>,
|
|
) -> Self {
|
|
let prompt_capabilities = *prompt_capabilities_rx.borrow();
|
|
let task = cx.spawn::<_, anyhow::Result<()>>(async move |this, cx| {
|
|
loop {
|
|
let caps = prompt_capabilities_rx.recv().await?;
|
|
this.update(cx, |this, cx| {
|
|
this.prompt_capabilities = caps;
|
|
cx.emit(AcpThreadEvent::PromptCapabilitiesUpdated);
|
|
})?;
|
|
}
|
|
});
|
|
|
|
Self {
|
|
action_log,
|
|
shared_buffers: Default::default(),
|
|
entries: Default::default(),
|
|
plan: Default::default(),
|
|
title: title.into(),
|
|
project,
|
|
send_task: None,
|
|
connection,
|
|
session_id,
|
|
token_usage: None,
|
|
prompt_capabilities,
|
|
_observe_prompt_capabilities: task,
|
|
}
|
|
}
|
|
|
|
pub fn prompt_capabilities(&self) -> acp::PromptCapabilities {
|
|
self.prompt_capabilities
|
|
}
|
|
|
|
pub fn connection(&self) -> &Rc<dyn AgentConnection> {
|
|
&self.connection
|
|
}
|
|
|
|
pub fn action_log(&self) -> &Entity<ActionLog> {
|
|
&self.action_log
|
|
}
|
|
|
|
pub fn project(&self) -> &Entity<Project> {
|
|
&self.project
|
|
}
|
|
|
|
pub fn title(&self) -> SharedString {
|
|
self.title.clone()
|
|
}
|
|
|
|
pub fn entries(&self) -> &[AgentThreadEntry] {
|
|
&self.entries
|
|
}
|
|
|
|
pub fn session_id(&self) -> &acp::SessionId {
|
|
&self.session_id
|
|
}
|
|
|
|
pub fn status(&self) -> ThreadStatus {
|
|
if self.send_task.is_some() {
|
|
if self.waiting_for_tool_confirmation() {
|
|
ThreadStatus::WaitingForToolConfirmation
|
|
} else {
|
|
ThreadStatus::Generating
|
|
}
|
|
} else {
|
|
ThreadStatus::Idle
|
|
}
|
|
}
|
|
|
|
pub fn token_usage(&self) -> Option<&TokenUsage> {
|
|
self.token_usage.as_ref()
|
|
}
|
|
|
|
pub fn has_pending_edit_tool_calls(&self) -> bool {
|
|
for entry in self.entries.iter().rev() {
|
|
match entry {
|
|
AgentThreadEntry::UserMessage(_) => return false,
|
|
AgentThreadEntry::ToolCall(
|
|
call @ ToolCall {
|
|
status: ToolCallStatus::InProgress | ToolCallStatus::Pending,
|
|
..
|
|
},
|
|
) if call.diffs().next().is_some() => {
|
|
return true;
|
|
}
|
|
AgentThreadEntry::ToolCall(_) | AgentThreadEntry::AssistantMessage(_) => {}
|
|
}
|
|
}
|
|
|
|
false
|
|
}
|
|
|
|
pub fn used_tools_since_last_user_message(&self) -> bool {
|
|
for entry in self.entries.iter().rev() {
|
|
match entry {
|
|
AgentThreadEntry::UserMessage(..) => return false,
|
|
AgentThreadEntry::AssistantMessage(..) => continue,
|
|
AgentThreadEntry::ToolCall(..) => return true,
|
|
}
|
|
}
|
|
|
|
false
|
|
}
|
|
|
|
pub fn handle_session_update(
|
|
&mut self,
|
|
update: acp::SessionUpdate,
|
|
cx: &mut Context<Self>,
|
|
) -> Result<(), acp::Error> {
|
|
match update {
|
|
acp::SessionUpdate::UserMessageChunk { content } => {
|
|
self.push_user_content_block(None, content, cx);
|
|
}
|
|
acp::SessionUpdate::AgentMessageChunk { content } => {
|
|
self.push_assistant_content_block(content, false, cx);
|
|
}
|
|
acp::SessionUpdate::AgentThoughtChunk { content } => {
|
|
self.push_assistant_content_block(content, true, cx);
|
|
}
|
|
acp::SessionUpdate::ToolCall(tool_call) => {
|
|
self.upsert_tool_call(tool_call, cx)?;
|
|
}
|
|
acp::SessionUpdate::ToolCallUpdate(tool_call_update) => {
|
|
self.update_tool_call(tool_call_update, cx)?;
|
|
}
|
|
acp::SessionUpdate::Plan(plan) => {
|
|
self.update_plan(plan, cx);
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
pub fn push_user_content_block(
|
|
&mut self,
|
|
prompt_id: Option<acp::PromptId>,
|
|
chunk: acp::ContentBlock,
|
|
cx: &mut Context<Self>,
|
|
) {
|
|
let language_registry = self.project.read(cx).languages().clone();
|
|
let entries_len = self.entries.len();
|
|
|
|
if let Some(last_entry) = self.entries.last_mut()
|
|
&& let AgentThreadEntry::UserMessage(UserMessage {
|
|
prompt_id: id,
|
|
content,
|
|
chunks,
|
|
..
|
|
}) = last_entry
|
|
{
|
|
*id = prompt_id.or(id.take());
|
|
content.append(chunk.clone(), &language_registry, cx);
|
|
chunks.push(chunk);
|
|
let idx = entries_len - 1;
|
|
cx.emit(AcpThreadEvent::EntryUpdated(idx));
|
|
} else {
|
|
let content = ContentBlock::new(chunk.clone(), &language_registry, cx);
|
|
self.push_entry(
|
|
AgentThreadEntry::UserMessage(UserMessage {
|
|
prompt_id,
|
|
content,
|
|
chunks: vec![chunk],
|
|
checkpoint: None,
|
|
}),
|
|
cx,
|
|
);
|
|
}
|
|
}
|
|
|
|
pub fn push_assistant_content_block(
|
|
&mut self,
|
|
chunk: acp::ContentBlock,
|
|
is_thought: bool,
|
|
cx: &mut Context<Self>,
|
|
) {
|
|
let language_registry = self.project.read(cx).languages().clone();
|
|
let entries_len = self.entries.len();
|
|
if let Some(last_entry) = self.entries.last_mut()
|
|
&& let AgentThreadEntry::AssistantMessage(AssistantMessage { chunks }) = last_entry
|
|
{
|
|
let idx = entries_len - 1;
|
|
cx.emit(AcpThreadEvent::EntryUpdated(idx));
|
|
match (chunks.last_mut(), is_thought) {
|
|
(Some(AssistantMessageChunk::Message { block }), false)
|
|
| (Some(AssistantMessageChunk::Thought { block }), true) => {
|
|
block.append(chunk, &language_registry, cx)
|
|
}
|
|
_ => {
|
|
let block = ContentBlock::new(chunk, &language_registry, cx);
|
|
if is_thought {
|
|
chunks.push(AssistantMessageChunk::Thought { block })
|
|
} else {
|
|
chunks.push(AssistantMessageChunk::Message { block })
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
let block = ContentBlock::new(chunk, &language_registry, cx);
|
|
let chunk = if is_thought {
|
|
AssistantMessageChunk::Thought { block }
|
|
} else {
|
|
AssistantMessageChunk::Message { block }
|
|
};
|
|
|
|
self.push_entry(
|
|
AgentThreadEntry::AssistantMessage(AssistantMessage {
|
|
chunks: vec![chunk],
|
|
}),
|
|
cx,
|
|
);
|
|
}
|
|
}
|
|
|
|
fn push_entry(&mut self, entry: AgentThreadEntry, cx: &mut Context<Self>) {
|
|
self.entries.push(entry);
|
|
cx.emit(AcpThreadEvent::NewEntry);
|
|
}
|
|
|
|
pub fn can_set_title(&mut self, cx: &mut Context<Self>) -> bool {
|
|
self.connection.set_title(&self.session_id, cx).is_some()
|
|
}
|
|
|
|
pub fn set_title(&mut self, title: SharedString, cx: &mut Context<Self>) -> Task<Result<()>> {
|
|
if title != self.title {
|
|
self.title = title.clone();
|
|
cx.emit(AcpThreadEvent::TitleUpdated);
|
|
if let Some(set_title) = self.connection.set_title(&self.session_id, cx) {
|
|
return set_title.run(title, cx);
|
|
}
|
|
}
|
|
Task::ready(Ok(()))
|
|
}
|
|
|
|
pub fn update_token_usage(&mut self, usage: Option<TokenUsage>, cx: &mut Context<Self>) {
|
|
self.token_usage = usage;
|
|
cx.emit(AcpThreadEvent::TokenUsageUpdated);
|
|
}
|
|
|
|
pub fn update_retry_status(&mut self, status: RetryStatus, cx: &mut Context<Self>) {
|
|
cx.emit(AcpThreadEvent::Retry(status));
|
|
}
|
|
|
|
pub fn update_tool_call(
|
|
&mut self,
|
|
update: impl Into<ToolCallUpdate>,
|
|
cx: &mut Context<Self>,
|
|
) -> Result<()> {
|
|
let update = update.into();
|
|
let languages = self.project.read(cx).languages().clone();
|
|
|
|
let (ix, current_call) = self
|
|
.tool_call_mut(update.id())
|
|
.context("Tool call not found")?;
|
|
match update {
|
|
ToolCallUpdate::UpdateFields(update) => {
|
|
let location_updated = update.fields.locations.is_some();
|
|
current_call.update_fields(update.fields, languages, cx);
|
|
if location_updated {
|
|
self.resolve_locations(update.id, cx);
|
|
}
|
|
}
|
|
ToolCallUpdate::UpdateDiff(update) => {
|
|
current_call.content.clear();
|
|
current_call
|
|
.content
|
|
.push(ToolCallContent::Diff(update.diff));
|
|
}
|
|
ToolCallUpdate::UpdateTerminal(update) => {
|
|
current_call.content.clear();
|
|
current_call
|
|
.content
|
|
.push(ToolCallContent::Terminal(update.terminal));
|
|
}
|
|
}
|
|
|
|
cx.emit(AcpThreadEvent::EntryUpdated(ix));
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Updates a tool call if id matches an existing entry, otherwise inserts a new one.
|
|
pub fn upsert_tool_call(
|
|
&mut self,
|
|
tool_call: acp::ToolCall,
|
|
cx: &mut Context<Self>,
|
|
) -> Result<(), acp::Error> {
|
|
let status = tool_call.status.into();
|
|
self.upsert_tool_call_inner(tool_call.into(), status, cx)
|
|
}
|
|
|
|
/// Fails if id does not match an existing entry.
|
|
pub fn upsert_tool_call_inner(
|
|
&mut self,
|
|
tool_call_update: acp::ToolCallUpdate,
|
|
status: ToolCallStatus,
|
|
cx: &mut Context<Self>,
|
|
) -> Result<(), acp::Error> {
|
|
let language_registry = self.project.read(cx).languages().clone();
|
|
let id = tool_call_update.id.clone();
|
|
|
|
if let Some((ix, current_call)) = self.tool_call_mut(&id) {
|
|
current_call.update_fields(tool_call_update.fields, language_registry, cx);
|
|
current_call.status = status;
|
|
|
|
cx.emit(AcpThreadEvent::EntryUpdated(ix));
|
|
} else {
|
|
let call =
|
|
ToolCall::from_acp(tool_call_update.try_into()?, status, language_registry, cx);
|
|
self.push_entry(AgentThreadEntry::ToolCall(call), cx);
|
|
};
|
|
|
|
self.resolve_locations(id, cx);
|
|
Ok(())
|
|
}
|
|
|
|
fn tool_call_mut(&mut self, id: &acp::ToolCallId) -> Option<(usize, &mut ToolCall)> {
|
|
// The tool call we are looking for is typically the last one, or very close to the end.
|
|
// At the moment, it doesn't seem like a hashmap would be a good fit for this use case.
|
|
self.entries
|
|
.iter_mut()
|
|
.enumerate()
|
|
.rev()
|
|
.find_map(|(index, tool_call)| {
|
|
if let AgentThreadEntry::ToolCall(tool_call) = tool_call
|
|
&& &tool_call.id == id
|
|
{
|
|
Some((index, tool_call))
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
}
|
|
|
|
pub fn tool_call(&mut self, id: &acp::ToolCallId) -> Option<(usize, &ToolCall)> {
|
|
self.entries
|
|
.iter()
|
|
.enumerate()
|
|
.rev()
|
|
.find_map(|(index, tool_call)| {
|
|
if let AgentThreadEntry::ToolCall(tool_call) = tool_call
|
|
&& &tool_call.id == id
|
|
{
|
|
Some((index, tool_call))
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
}
|
|
|
|
pub fn resolve_locations(&mut self, id: acp::ToolCallId, cx: &mut Context<Self>) {
|
|
let project = self.project.clone();
|
|
let Some((_, tool_call)) = self.tool_call_mut(&id) else {
|
|
return;
|
|
};
|
|
let task = tool_call.resolve_locations(project, cx);
|
|
cx.spawn(async move |this, cx| {
|
|
let resolved_locations = task.await;
|
|
this.update(cx, |this, cx| {
|
|
let project = this.project.clone();
|
|
let Some((ix, tool_call)) = this.tool_call_mut(&id) else {
|
|
return;
|
|
};
|
|
if let Some(Some(location)) = resolved_locations.last() {
|
|
project.update(cx, |project, cx| {
|
|
if let Some(agent_location) = project.agent_location() {
|
|
let should_ignore = agent_location.buffer == location.buffer
|
|
&& location
|
|
.buffer
|
|
.update(cx, |buffer, _| {
|
|
let snapshot = buffer.snapshot();
|
|
let old_position =
|
|
agent_location.position.to_point(&snapshot);
|
|
let new_position = location.position.to_point(&snapshot);
|
|
// ignore this so that when we get updates from the edit tool
|
|
// the position doesn't reset to the startof line
|
|
old_position.row == new_position.row
|
|
&& old_position.column > new_position.column
|
|
})
|
|
.ok()
|
|
.unwrap_or_default();
|
|
if !should_ignore {
|
|
project.set_agent_location(Some(location.clone()), cx);
|
|
}
|
|
}
|
|
});
|
|
}
|
|
if tool_call.resolved_locations != resolved_locations {
|
|
tool_call.resolved_locations = resolved_locations;
|
|
cx.emit(AcpThreadEvent::EntryUpdated(ix));
|
|
}
|
|
})
|
|
})
|
|
.detach();
|
|
}
|
|
|
|
pub fn request_tool_call_authorization(
|
|
&mut self,
|
|
tool_call: acp::ToolCallUpdate,
|
|
options: Vec<acp::PermissionOption>,
|
|
cx: &mut Context<Self>,
|
|
) -> Result<oneshot::Receiver<acp::PermissionOptionId>, acp::Error> {
|
|
let (tx, rx) = oneshot::channel();
|
|
|
|
let status = ToolCallStatus::WaitingForConfirmation {
|
|
options,
|
|
respond_tx: tx,
|
|
};
|
|
|
|
self.upsert_tool_call_inner(tool_call, status, cx)?;
|
|
cx.emit(AcpThreadEvent::ToolAuthorizationRequired);
|
|
Ok(rx)
|
|
}
|
|
|
|
pub fn authorize_tool_call(
|
|
&mut self,
|
|
id: acp::ToolCallId,
|
|
option_id: acp::PermissionOptionId,
|
|
option_kind: acp::PermissionOptionKind,
|
|
cx: &mut Context<Self>,
|
|
) {
|
|
let Some((ix, call)) = self.tool_call_mut(&id) else {
|
|
return;
|
|
};
|
|
|
|
let new_status = match option_kind {
|
|
acp::PermissionOptionKind::RejectOnce | acp::PermissionOptionKind::RejectAlways => {
|
|
ToolCallStatus::Rejected
|
|
}
|
|
acp::PermissionOptionKind::AllowOnce | acp::PermissionOptionKind::AllowAlways => {
|
|
ToolCallStatus::InProgress
|
|
}
|
|
};
|
|
|
|
let curr_status = mem::replace(&mut call.status, new_status);
|
|
|
|
if let ToolCallStatus::WaitingForConfirmation { respond_tx, .. } = curr_status {
|
|
respond_tx.send(option_id).log_err();
|
|
} else if cfg!(debug_assertions) {
|
|
panic!("tried to authorize an already authorized tool call");
|
|
}
|
|
|
|
cx.emit(AcpThreadEvent::EntryUpdated(ix));
|
|
}
|
|
|
|
/// Returns true if the last turn is awaiting tool authorization
|
|
pub fn waiting_for_tool_confirmation(&self) -> bool {
|
|
for entry in self.entries.iter().rev() {
|
|
match &entry {
|
|
AgentThreadEntry::ToolCall(call) => match call.status {
|
|
ToolCallStatus::WaitingForConfirmation { .. } => return true,
|
|
ToolCallStatus::Pending
|
|
| ToolCallStatus::InProgress
|
|
| ToolCallStatus::Completed
|
|
| ToolCallStatus::Failed
|
|
| ToolCallStatus::Rejected
|
|
| ToolCallStatus::Canceled => continue,
|
|
},
|
|
AgentThreadEntry::UserMessage(_) | AgentThreadEntry::AssistantMessage(_) => {
|
|
// Reached the beginning of the turn
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
false
|
|
}
|
|
|
|
pub fn plan(&self) -> &Plan {
|
|
&self.plan
|
|
}
|
|
|
|
pub fn update_plan(&mut self, request: acp::Plan, cx: &mut Context<Self>) {
|
|
let new_entries_len = request.entries.len();
|
|
let mut new_entries = request.entries.into_iter();
|
|
|
|
// Reuse existing markdown to prevent flickering
|
|
for (old, new) in self.plan.entries.iter_mut().zip(new_entries.by_ref()) {
|
|
let PlanEntry {
|
|
content,
|
|
priority,
|
|
status,
|
|
} = old;
|
|
content.update(cx, |old, cx| {
|
|
old.replace(new.content, cx);
|
|
});
|
|
*priority = new.priority;
|
|
*status = new.status;
|
|
}
|
|
for new in new_entries {
|
|
self.plan.entries.push(PlanEntry::from_acp(new, cx))
|
|
}
|
|
self.plan.entries.truncate(new_entries_len);
|
|
|
|
cx.notify();
|
|
}
|
|
|
|
fn clear_completed_plan_entries(&mut self, cx: &mut Context<Self>) {
|
|
self.plan
|
|
.entries
|
|
.retain(|entry| !matches!(entry.status, acp::PlanEntryStatus::Completed));
|
|
cx.notify();
|
|
}
|
|
|
|
#[cfg(any(test, feature = "test-support"))]
|
|
pub fn send_raw(
|
|
&mut self,
|
|
message: &str,
|
|
cx: &mut Context<Self>,
|
|
) -> BoxFuture<'static, Result<()>> {
|
|
self.send(
|
|
new_prompt_id(),
|
|
vec![acp::ContentBlock::Text(acp::TextContent {
|
|
text: message.to_string(),
|
|
annotations: None,
|
|
})],
|
|
cx,
|
|
)
|
|
}
|
|
|
|
pub fn send(
|
|
&mut self,
|
|
prompt_id: acp::PromptId,
|
|
message: Vec<acp::ContentBlock>,
|
|
cx: &mut Context<Self>,
|
|
) -> BoxFuture<'static, Result<()>> {
|
|
let block = ContentBlock::new_combined(
|
|
message.clone(),
|
|
self.project.read(cx).languages().clone(),
|
|
cx,
|
|
);
|
|
let request = acp::PromptRequest {
|
|
prompt_id: Some(prompt_id.clone()),
|
|
prompt: message.clone(),
|
|
session_id: self.session_id.clone(),
|
|
};
|
|
let git_store = self.project.read(cx).git_store().clone();
|
|
|
|
self.run_turn(cx, async move |this, cx| {
|
|
this.update(cx, |this, cx| {
|
|
this.push_entry(
|
|
AgentThreadEntry::UserMessage(UserMessage {
|
|
prompt_id: Some(prompt_id),
|
|
content: block,
|
|
chunks: message,
|
|
checkpoint: None,
|
|
}),
|
|
cx,
|
|
);
|
|
})
|
|
.ok();
|
|
|
|
let old_checkpoint = git_store
|
|
.update(cx, |git, cx| git.checkpoint(cx))?
|
|
.await
|
|
.context("failed to get old checkpoint")
|
|
.log_err();
|
|
this.update(cx, |this, cx| {
|
|
if let Some((_ix, message)) = this.last_user_message() {
|
|
message.checkpoint = old_checkpoint.map(|git_checkpoint| Checkpoint {
|
|
git_checkpoint,
|
|
show: false,
|
|
});
|
|
}
|
|
this.connection.prompt(request, cx)
|
|
})?
|
|
.await
|
|
})
|
|
}
|
|
|
|
pub fn can_resume(&self, cx: &App) -> bool {
|
|
self.connection.resume(&self.session_id, cx).is_some()
|
|
}
|
|
|
|
pub fn resume(&mut self, cx: &mut Context<Self>) -> BoxFuture<'static, Result<()>> {
|
|
self.run_turn(cx, async move |this, cx| {
|
|
this.update(cx, |this, cx| {
|
|
this.connection
|
|
.resume(&this.session_id, cx)
|
|
.map(|resume| resume.run(cx))
|
|
})?
|
|
.context("resuming a session is not supported")?
|
|
.await
|
|
})
|
|
}
|
|
|
|
fn run_turn(
|
|
&mut self,
|
|
cx: &mut Context<Self>,
|
|
f: impl 'static + AsyncFnOnce(WeakEntity<Self>, &mut AsyncApp) -> Result<acp::PromptResponse>,
|
|
) -> BoxFuture<'static, Result<()>> {
|
|
self.clear_completed_plan_entries(cx);
|
|
|
|
let (tx, rx) = oneshot::channel();
|
|
let cancel_task = self.cancel(cx);
|
|
|
|
self.send_task = Some(cx.spawn(async move |this, cx| {
|
|
cancel_task.await;
|
|
tx.send(f(this, cx).await).ok();
|
|
}));
|
|
|
|
cx.spawn(async move |this, cx| {
|
|
let response = rx.await;
|
|
|
|
this.update(cx, |this, cx| this.update_last_checkpoint(cx))?
|
|
.await?;
|
|
|
|
this.update(cx, |this, cx| {
|
|
this.project
|
|
.update(cx, |project, cx| project.set_agent_location(None, cx));
|
|
match response {
|
|
Ok(Err(e)) => {
|
|
this.send_task.take();
|
|
cx.emit(AcpThreadEvent::Error);
|
|
Err(e)
|
|
}
|
|
result => {
|
|
let canceled = matches!(
|
|
result,
|
|
Ok(Ok(acp::PromptResponse {
|
|
stop_reason: acp::StopReason::Cancelled
|
|
}))
|
|
);
|
|
|
|
// We only take the task if the current prompt wasn't canceled.
|
|
//
|
|
// This prompt may have been canceled because another one was sent
|
|
// while it was still generating. In these cases, dropping `send_task`
|
|
// would cause the next generation to be canceled.
|
|
if !canceled {
|
|
this.send_task.take();
|
|
}
|
|
|
|
// Truncate entries if the last prompt was refused.
|
|
if let Ok(Ok(acp::PromptResponse {
|
|
stop_reason: acp::StopReason::Refusal,
|
|
})) = result
|
|
&& let Some((ix, _)) = this.last_user_message()
|
|
{
|
|
let range = ix..this.entries.len();
|
|
this.entries.truncate(ix);
|
|
cx.emit(AcpThreadEvent::EntriesRemoved(range));
|
|
}
|
|
|
|
cx.emit(AcpThreadEvent::Stopped);
|
|
Ok(())
|
|
}
|
|
}
|
|
})?
|
|
})
|
|
.boxed()
|
|
}
|
|
|
|
pub fn cancel(&mut self, cx: &mut Context<Self>) -> Task<()> {
|
|
let Some(send_task) = self.send_task.take() else {
|
|
return Task::ready(());
|
|
};
|
|
|
|
for entry in self.entries.iter_mut() {
|
|
if let AgentThreadEntry::ToolCall(call) = entry {
|
|
let cancel = matches!(
|
|
call.status,
|
|
ToolCallStatus::Pending
|
|
| ToolCallStatus::WaitingForConfirmation { .. }
|
|
| ToolCallStatus::InProgress
|
|
);
|
|
|
|
if cancel {
|
|
call.status = ToolCallStatus::Canceled;
|
|
}
|
|
}
|
|
}
|
|
|
|
self.connection.cancel(&self.session_id, cx);
|
|
|
|
// Wait for the send task to complete
|
|
cx.foreground_executor().spawn(send_task)
|
|
}
|
|
|
|
/// Rewinds this thread to before the entry at `index`, removing it and all
|
|
/// subsequent entries while reverting any changes made from that point.
|
|
pub fn rewind(&mut self, id: acp::PromptId, cx: &mut Context<Self>) -> Task<Result<()>> {
|
|
let Some(rewind) = self.connection.rewind(&self.session_id, cx) else {
|
|
return Task::ready(Err(anyhow!("not supported")));
|
|
};
|
|
let Some(message) = self.user_message(&id) else {
|
|
return Task::ready(Err(anyhow!("message not found")));
|
|
};
|
|
|
|
let checkpoint = message
|
|
.checkpoint
|
|
.as_ref()
|
|
.map(|c| c.git_checkpoint.clone());
|
|
|
|
let git_store = self.project.read(cx).git_store().clone();
|
|
cx.spawn(async move |this, cx| {
|
|
if let Some(checkpoint) = checkpoint {
|
|
git_store
|
|
.update(cx, |git, cx| git.restore_checkpoint(checkpoint, cx))?
|
|
.await?;
|
|
}
|
|
|
|
cx.update(|cx| rewind.rewind(id.clone(), cx))?.await?;
|
|
this.update(cx, |this, cx| {
|
|
if let Some((ix, _)) = this.user_message_mut(&id) {
|
|
let range = ix..this.entries.len();
|
|
this.entries.truncate(ix);
|
|
cx.emit(AcpThreadEvent::EntriesRemoved(range));
|
|
}
|
|
})
|
|
})
|
|
}
|
|
|
|
fn update_last_checkpoint(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
|
|
let git_store = self.project.read(cx).git_store().clone();
|
|
|
|
let old_checkpoint = if let Some((_, message)) = self.last_user_message() {
|
|
if let Some(checkpoint) = message.checkpoint.as_ref() {
|
|
checkpoint.git_checkpoint.clone()
|
|
} else {
|
|
return Task::ready(Ok(()));
|
|
}
|
|
} else {
|
|
return Task::ready(Ok(()));
|
|
};
|
|
|
|
let new_checkpoint = git_store.update(cx, |git, cx| git.checkpoint(cx));
|
|
cx.spawn(async move |this, cx| {
|
|
let new_checkpoint = new_checkpoint
|
|
.await
|
|
.context("failed to get new checkpoint")
|
|
.log_err();
|
|
if let Some(new_checkpoint) = new_checkpoint {
|
|
let equal = git_store
|
|
.update(cx, |git, cx| {
|
|
git.compare_checkpoints(old_checkpoint.clone(), new_checkpoint, cx)
|
|
})?
|
|
.await
|
|
.unwrap_or(true);
|
|
this.update(cx, |this, cx| {
|
|
let (ix, message) = this.last_user_message().context("no user message")?;
|
|
let checkpoint = message.checkpoint.as_mut().context("no checkpoint")?;
|
|
checkpoint.show = !equal;
|
|
cx.emit(AcpThreadEvent::EntryUpdated(ix));
|
|
anyhow::Ok(())
|
|
})??;
|
|
}
|
|
|
|
Ok(())
|
|
})
|
|
}
|
|
|
|
fn last_user_message(&mut self) -> Option<(usize, &mut UserMessage)> {
|
|
self.entries
|
|
.iter_mut()
|
|
.enumerate()
|
|
.rev()
|
|
.find_map(|(ix, entry)| {
|
|
if let AgentThreadEntry::UserMessage(message) = entry {
|
|
Some((ix, message))
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
}
|
|
|
|
fn user_message(&self, id: &acp::PromptId) -> Option<&UserMessage> {
|
|
self.entries.iter().find_map(|entry| {
|
|
if let AgentThreadEntry::UserMessage(message) = entry {
|
|
if message.prompt_id.as_ref() == Some(id) {
|
|
Some(message)
|
|
} else {
|
|
None
|
|
}
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
}
|
|
|
|
fn user_message_mut(&mut self, id: &acp::PromptId) -> Option<(usize, &mut UserMessage)> {
|
|
self.entries.iter_mut().enumerate().find_map(|(ix, entry)| {
|
|
if let AgentThreadEntry::UserMessage(message) = entry {
|
|
if message.prompt_id.as_ref() == Some(id) {
|
|
Some((ix, message))
|
|
} else {
|
|
None
|
|
}
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
}
|
|
|
|
pub fn read_text_file(
|
|
&self,
|
|
path: PathBuf,
|
|
line: Option<u32>,
|
|
limit: Option<u32>,
|
|
reuse_shared_snapshot: bool,
|
|
cx: &mut Context<Self>,
|
|
) -> Task<Result<String>> {
|
|
let project = self.project.clone();
|
|
let action_log = self.action_log.clone();
|
|
cx.spawn(async move |this, cx| {
|
|
let load = project.update(cx, |project, cx| {
|
|
let path = project
|
|
.project_path_for_absolute_path(&path, cx)
|
|
.context("invalid path")?;
|
|
anyhow::Ok(project.open_buffer(path, cx))
|
|
});
|
|
let buffer = load??.await?;
|
|
|
|
let snapshot = if reuse_shared_snapshot {
|
|
this.read_with(cx, |this, _| {
|
|
this.shared_buffers.get(&buffer.clone()).cloned()
|
|
})
|
|
.log_err()
|
|
.flatten()
|
|
} else {
|
|
None
|
|
};
|
|
|
|
let snapshot = if let Some(snapshot) = snapshot {
|
|
snapshot
|
|
} else {
|
|
action_log.update(cx, |action_log, cx| {
|
|
action_log.buffer_read(buffer.clone(), cx);
|
|
})?;
|
|
project.update(cx, |project, cx| {
|
|
let position = buffer
|
|
.read(cx)
|
|
.snapshot()
|
|
.anchor_before(Point::new(line.unwrap_or_default(), 0));
|
|
project.set_agent_location(
|
|
Some(AgentLocation {
|
|
buffer: buffer.downgrade(),
|
|
position,
|
|
}),
|
|
cx,
|
|
);
|
|
})?;
|
|
|
|
buffer.update(cx, |buffer, _| buffer.snapshot())?
|
|
};
|
|
|
|
this.update(cx, |this, _| {
|
|
let text = snapshot.text();
|
|
this.shared_buffers.insert(buffer.clone(), snapshot);
|
|
if line.is_none() && limit.is_none() {
|
|
return Ok(text);
|
|
}
|
|
let limit = limit.unwrap_or(u32::MAX) as usize;
|
|
let Some(line) = line else {
|
|
return Ok(text.lines().take(limit).collect::<String>());
|
|
};
|
|
|
|
let count = text.lines().count();
|
|
if count < line as usize {
|
|
anyhow::bail!("There are only {} lines", count);
|
|
}
|
|
Ok(text
|
|
.lines()
|
|
.skip(line as usize + 1)
|
|
.take(limit)
|
|
.collect::<String>())
|
|
})?
|
|
})
|
|
}
|
|
|
|
pub fn write_text_file(
|
|
&self,
|
|
path: PathBuf,
|
|
content: String,
|
|
cx: &mut Context<Self>,
|
|
) -> Task<Result<()>> {
|
|
let project = self.project.clone();
|
|
let action_log = self.action_log.clone();
|
|
cx.spawn(async move |this, cx| {
|
|
let load = project.update(cx, |project, cx| {
|
|
let path = project
|
|
.project_path_for_absolute_path(&path, cx)
|
|
.context("invalid path")?;
|
|
anyhow::Ok(project.open_buffer(path, cx))
|
|
});
|
|
let buffer = load??.await?;
|
|
let snapshot = this.update(cx, |this, cx| {
|
|
this.shared_buffers
|
|
.get(&buffer)
|
|
.cloned()
|
|
.unwrap_or_else(|| buffer.read(cx).snapshot())
|
|
})?;
|
|
let edits = cx
|
|
.background_executor()
|
|
.spawn(async move {
|
|
let old_text = snapshot.text();
|
|
text_diff(old_text.as_str(), &content)
|
|
.into_iter()
|
|
.map(|(range, replacement)| {
|
|
(
|
|
snapshot.anchor_after(range.start)
|
|
..snapshot.anchor_before(range.end),
|
|
replacement,
|
|
)
|
|
})
|
|
.collect::<Vec<_>>()
|
|
})
|
|
.await;
|
|
|
|
project.update(cx, |project, cx| {
|
|
project.set_agent_location(
|
|
Some(AgentLocation {
|
|
buffer: buffer.downgrade(),
|
|
position: edits
|
|
.last()
|
|
.map(|(range, _)| range.end)
|
|
.unwrap_or(Anchor::MIN),
|
|
}),
|
|
cx,
|
|
);
|
|
})?;
|
|
|
|
let format_on_save = cx.update(|cx| {
|
|
action_log.update(cx, |action_log, cx| {
|
|
action_log.buffer_read(buffer.clone(), cx);
|
|
});
|
|
|
|
let format_on_save = buffer.update(cx, |buffer, cx| {
|
|
buffer.edit(edits, None, cx);
|
|
|
|
let settings = language::language_settings::language_settings(
|
|
buffer.language().map(|l| l.name()),
|
|
buffer.file(),
|
|
cx,
|
|
);
|
|
|
|
settings.format_on_save != FormatOnSave::Off
|
|
});
|
|
action_log.update(cx, |action_log, cx| {
|
|
action_log.buffer_edited(buffer.clone(), cx);
|
|
});
|
|
format_on_save
|
|
})?;
|
|
|
|
if format_on_save {
|
|
let format_task = project.update(cx, |project, cx| {
|
|
project.format(
|
|
HashSet::from_iter([buffer.clone()]),
|
|
LspFormatTarget::Buffers,
|
|
false,
|
|
FormatTrigger::Save,
|
|
cx,
|
|
)
|
|
})?;
|
|
format_task.await.log_err();
|
|
|
|
action_log.update(cx, |action_log, cx| {
|
|
action_log.buffer_edited(buffer.clone(), cx);
|
|
})?;
|
|
}
|
|
|
|
project
|
|
.update(cx, |project, cx| project.save_buffer(buffer, cx))?
|
|
.await
|
|
})
|
|
}
|
|
|
|
pub fn to_markdown(&self, cx: &App) -> String {
|
|
self.entries.iter().map(|e| e.to_markdown(cx)).collect()
|
|
}
|
|
|
|
pub fn emit_load_error(&mut self, error: LoadError, cx: &mut Context<Self>) {
|
|
cx.emit(AcpThreadEvent::LoadError(error));
|
|
}
|
|
}
|
|
|
|
fn markdown_for_raw_output(
|
|
raw_output: &serde_json::Value,
|
|
language_registry: &Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) -> Option<Entity<Markdown>> {
|
|
match raw_output {
|
|
serde_json::Value::Null => None,
|
|
serde_json::Value::Bool(value) => Some(cx.new(|cx| {
|
|
Markdown::new(
|
|
value.to_string().into(),
|
|
Some(language_registry.clone()),
|
|
None,
|
|
cx,
|
|
)
|
|
})),
|
|
serde_json::Value::Number(value) => Some(cx.new(|cx| {
|
|
Markdown::new(
|
|
value.to_string().into(),
|
|
Some(language_registry.clone()),
|
|
None,
|
|
cx,
|
|
)
|
|
})),
|
|
serde_json::Value::String(value) => Some(cx.new(|cx| {
|
|
Markdown::new(
|
|
value.clone().into(),
|
|
Some(language_registry.clone()),
|
|
None,
|
|
cx,
|
|
)
|
|
})),
|
|
value => Some(cx.new(|cx| {
|
|
Markdown::new(
|
|
format!("```json\n{}\n```", value).into(),
|
|
Some(language_registry.clone()),
|
|
None,
|
|
cx,
|
|
)
|
|
})),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use anyhow::anyhow;
|
|
use futures::{channel::mpsc, future::LocalBoxFuture, select};
|
|
use gpui::{App, AsyncApp, TestAppContext, WeakEntity};
|
|
use indoc::indoc;
|
|
use project::{FakeFs, Fs};
|
|
use rand::Rng as _;
|
|
use serde_json::json;
|
|
use settings::SettingsStore;
|
|
use smol::stream::StreamExt as _;
|
|
use std::{
|
|
any::Any,
|
|
cell::RefCell,
|
|
path::Path,
|
|
rc::Rc,
|
|
sync::atomic::{AtomicBool, AtomicUsize, Ordering::SeqCst},
|
|
time::Duration,
|
|
};
|
|
use util::path;
|
|
|
|
fn init_test(cx: &mut TestAppContext) {
|
|
env_logger::try_init().ok();
|
|
cx.update(|cx| {
|
|
let settings_store = SettingsStore::test(cx);
|
|
cx.set_global(settings_store);
|
|
Project::init_settings(cx);
|
|
language::init(cx);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_push_user_content_block(cx: &mut gpui::TestAppContext) {
|
|
init_test(cx);
|
|
|
|
let fs = FakeFs::new(cx.executor());
|
|
let project = Project::test(fs, [], cx).await;
|
|
let connection = Rc::new(FakeAgentConnection::new());
|
|
let thread = cx
|
|
.update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
|
|
.await
|
|
.unwrap();
|
|
|
|
// Test creating a new user message
|
|
thread.update(cx, |thread, cx| {
|
|
thread.push_user_content_block(
|
|
None,
|
|
acp::ContentBlock::Text(acp::TextContent {
|
|
annotations: None,
|
|
text: "Hello, ".to_string(),
|
|
}),
|
|
cx,
|
|
);
|
|
});
|
|
|
|
thread.update(cx, |thread, cx| {
|
|
assert_eq!(thread.entries.len(), 1);
|
|
if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
|
|
assert_eq!(user_msg.prompt_id, None);
|
|
assert_eq!(user_msg.content.to_markdown(cx), "Hello, ");
|
|
} else {
|
|
panic!("Expected UserMessage");
|
|
}
|
|
});
|
|
|
|
// Test appending to existing user message
|
|
let message_1_id = new_prompt_id();
|
|
thread.update(cx, |thread, cx| {
|
|
thread.push_user_content_block(
|
|
Some(message_1_id.clone()),
|
|
acp::ContentBlock::Text(acp::TextContent {
|
|
annotations: None,
|
|
text: "world!".to_string(),
|
|
}),
|
|
cx,
|
|
);
|
|
});
|
|
|
|
thread.update(cx, |thread, cx| {
|
|
assert_eq!(thread.entries.len(), 1);
|
|
if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
|
|
assert_eq!(user_msg.prompt_id, Some(message_1_id));
|
|
assert_eq!(user_msg.content.to_markdown(cx), "Hello, world!");
|
|
} else {
|
|
panic!("Expected UserMessage");
|
|
}
|
|
});
|
|
|
|
// Test creating new user message after assistant message
|
|
thread.update(cx, |thread, cx| {
|
|
thread.push_assistant_content_block(
|
|
acp::ContentBlock::Text(acp::TextContent {
|
|
annotations: None,
|
|
text: "Assistant response".to_string(),
|
|
}),
|
|
false,
|
|
cx,
|
|
);
|
|
});
|
|
|
|
let message_2_id = new_prompt_id();
|
|
thread.update(cx, |thread, cx| {
|
|
thread.push_user_content_block(
|
|
Some(message_2_id.clone()),
|
|
acp::ContentBlock::Text(acp::TextContent {
|
|
annotations: None,
|
|
text: "New user message".to_string(),
|
|
}),
|
|
cx,
|
|
);
|
|
});
|
|
|
|
thread.update(cx, |thread, cx| {
|
|
assert_eq!(thread.entries.len(), 3);
|
|
if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[2] {
|
|
assert_eq!(user_msg.prompt_id, Some(message_2_id));
|
|
assert_eq!(user_msg.content.to_markdown(cx), "New user message");
|
|
} else {
|
|
panic!("Expected UserMessage at index 2");
|
|
}
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_thinking_concatenation(cx: &mut gpui::TestAppContext) {
|
|
init_test(cx);
|
|
|
|
let fs = FakeFs::new(cx.executor());
|
|
let project = Project::test(fs, [], cx).await;
|
|
let connection = Rc::new(FakeAgentConnection::new().on_user_message(
|
|
|_, thread, mut cx| {
|
|
async move {
|
|
thread.update(&mut cx, |thread, cx| {
|
|
thread
|
|
.handle_session_update(
|
|
acp::SessionUpdate::AgentThoughtChunk {
|
|
content: "Thinking ".into(),
|
|
},
|
|
cx,
|
|
)
|
|
.unwrap();
|
|
thread
|
|
.handle_session_update(
|
|
acp::SessionUpdate::AgentThoughtChunk {
|
|
content: "hard!".into(),
|
|
},
|
|
cx,
|
|
)
|
|
.unwrap();
|
|
})?;
|
|
Ok(acp::PromptResponse {
|
|
stop_reason: acp::StopReason::EndTurn,
|
|
})
|
|
}
|
|
.boxed_local()
|
|
},
|
|
));
|
|
|
|
let thread = cx
|
|
.update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
|
|
.await
|
|
.unwrap();
|
|
|
|
thread
|
|
.update(cx, |thread, cx| thread.send_raw("Hello from Zed!", cx))
|
|
.await
|
|
.unwrap();
|
|
|
|
let output = thread.read_with(cx, |thread, cx| thread.to_markdown(cx));
|
|
assert_eq!(
|
|
output,
|
|
indoc! {r#"
|
|
## User
|
|
|
|
Hello from Zed!
|
|
|
|
## Assistant
|
|
|
|
<thinking>
|
|
Thinking hard!
|
|
</thinking>
|
|
|
|
"#}
|
|
);
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_edits_concurrently_to_user(cx: &mut TestAppContext) {
|
|
init_test(cx);
|
|
|
|
let fs = FakeFs::new(cx.executor());
|
|
fs.insert_tree(path!("/tmp"), json!({"foo": "one\ntwo\nthree\n"}))
|
|
.await;
|
|
let project = Project::test(fs.clone(), [], cx).await;
|
|
let (read_file_tx, read_file_rx) = oneshot::channel::<()>();
|
|
let read_file_tx = Rc::new(RefCell::new(Some(read_file_tx)));
|
|
let connection = Rc::new(FakeAgentConnection::new().on_user_message(
|
|
move |_, thread, mut cx| {
|
|
let read_file_tx = read_file_tx.clone();
|
|
async move {
|
|
let content = thread
|
|
.update(&mut cx, |thread, cx| {
|
|
thread.read_text_file(path!("/tmp/foo").into(), None, None, false, cx)
|
|
})
|
|
.unwrap()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(content, "one\ntwo\nthree\n");
|
|
read_file_tx.take().unwrap().send(()).unwrap();
|
|
thread
|
|
.update(&mut cx, |thread, cx| {
|
|
thread.write_text_file(
|
|
path!("/tmp/foo").into(),
|
|
"one\ntwo\nthree\nfour\nfive\n".to_string(),
|
|
cx,
|
|
)
|
|
})
|
|
.unwrap()
|
|
.await
|
|
.unwrap();
|
|
Ok(acp::PromptResponse {
|
|
stop_reason: acp::StopReason::EndTurn,
|
|
})
|
|
}
|
|
.boxed_local()
|
|
},
|
|
));
|
|
|
|
let (worktree, pathbuf) = project
|
|
.update(cx, |project, cx| {
|
|
project.find_or_create_worktree(path!("/tmp/foo"), true, cx)
|
|
})
|
|
.await
|
|
.unwrap();
|
|
let buffer = project
|
|
.update(cx, |project, cx| {
|
|
project.open_buffer((worktree.read(cx).id(), pathbuf), cx)
|
|
})
|
|
.await
|
|
.unwrap();
|
|
|
|
let thread = cx
|
|
.update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
|
|
.await
|
|
.unwrap();
|
|
|
|
let request = thread.update(cx, |thread, cx| {
|
|
thread.send_raw("Extend the count in /tmp/foo", cx)
|
|
});
|
|
read_file_rx.await.ok();
|
|
buffer.update(cx, |buffer, cx| {
|
|
buffer.edit([(0..0, "zero\n".to_string())], None, cx);
|
|
});
|
|
cx.run_until_parked();
|
|
assert_eq!(
|
|
buffer.read_with(cx, |buffer, _| buffer.text()),
|
|
"zero\none\ntwo\nthree\nfour\nfive\n"
|
|
);
|
|
assert_eq!(
|
|
String::from_utf8(fs.read_file_sync(path!("/tmp/foo")).unwrap()).unwrap(),
|
|
"zero\none\ntwo\nthree\nfour\nfive\n"
|
|
);
|
|
request.await.unwrap();
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_succeeding_canceled_toolcall(cx: &mut TestAppContext) {
|
|
init_test(cx);
|
|
|
|
let fs = FakeFs::new(cx.executor());
|
|
let project = Project::test(fs, [], cx).await;
|
|
let id = acp::ToolCallId("test".into());
|
|
|
|
let connection = Rc::new(FakeAgentConnection::new().on_user_message({
|
|
let id = id.clone();
|
|
move |_, thread, mut cx| {
|
|
let id = id.clone();
|
|
async move {
|
|
thread
|
|
.update(&mut cx, |thread, cx| {
|
|
thread.handle_session_update(
|
|
acp::SessionUpdate::ToolCall(acp::ToolCall {
|
|
id: id.clone(),
|
|
title: "Label".into(),
|
|
kind: acp::ToolKind::Fetch,
|
|
status: acp::ToolCallStatus::InProgress,
|
|
content: vec![],
|
|
locations: vec![],
|
|
raw_input: None,
|
|
raw_output: None,
|
|
}),
|
|
cx,
|
|
)
|
|
})
|
|
.unwrap()
|
|
.unwrap();
|
|
Ok(acp::PromptResponse {
|
|
stop_reason: acp::StopReason::EndTurn,
|
|
})
|
|
}
|
|
.boxed_local()
|
|
}
|
|
}));
|
|
|
|
let thread = cx
|
|
.update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
|
|
.await
|
|
.unwrap();
|
|
|
|
let request = thread.update(cx, |thread, cx| {
|
|
thread.send_raw("Fetch https://example.com", cx)
|
|
});
|
|
|
|
run_until_first_tool_call(&thread, cx).await;
|
|
|
|
thread.read_with(cx, |thread, _| {
|
|
assert!(matches!(
|
|
thread.entries[1],
|
|
AgentThreadEntry::ToolCall(ToolCall {
|
|
status: ToolCallStatus::InProgress,
|
|
..
|
|
})
|
|
));
|
|
});
|
|
|
|
thread.update(cx, |thread, cx| thread.cancel(cx)).await;
|
|
|
|
thread.read_with(cx, |thread, _| {
|
|
assert!(matches!(
|
|
&thread.entries[1],
|
|
AgentThreadEntry::ToolCall(ToolCall {
|
|
status: ToolCallStatus::Canceled,
|
|
..
|
|
})
|
|
));
|
|
});
|
|
|
|
thread
|
|
.update(cx, |thread, cx| {
|
|
thread.handle_session_update(
|
|
acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate {
|
|
id,
|
|
fields: acp::ToolCallUpdateFields {
|
|
status: Some(acp::ToolCallStatus::Completed),
|
|
..Default::default()
|
|
},
|
|
}),
|
|
cx,
|
|
)
|
|
})
|
|
.unwrap();
|
|
|
|
request.await.unwrap();
|
|
|
|
thread.read_with(cx, |thread, _| {
|
|
assert!(matches!(
|
|
thread.entries[1],
|
|
AgentThreadEntry::ToolCall(ToolCall {
|
|
status: ToolCallStatus::Completed,
|
|
..
|
|
})
|
|
));
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_no_pending_edits_if_tool_calls_are_completed(cx: &mut TestAppContext) {
|
|
init_test(cx);
|
|
let fs = FakeFs::new(cx.background_executor.clone());
|
|
fs.insert_tree(path!("/test"), json!({})).await;
|
|
let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
|
|
|
|
let connection = Rc::new(FakeAgentConnection::new().on_user_message({
|
|
move |_, thread, mut cx| {
|
|
async move {
|
|
thread
|
|
.update(&mut cx, |thread, cx| {
|
|
thread.handle_session_update(
|
|
acp::SessionUpdate::ToolCall(acp::ToolCall {
|
|
id: acp::ToolCallId("test".into()),
|
|
title: "Label".into(),
|
|
kind: acp::ToolKind::Edit,
|
|
status: acp::ToolCallStatus::Completed,
|
|
content: vec![acp::ToolCallContent::Diff {
|
|
diff: acp::Diff {
|
|
path: "/test/test.txt".into(),
|
|
old_text: None,
|
|
new_text: "foo".into(),
|
|
},
|
|
}],
|
|
locations: vec![],
|
|
raw_input: None,
|
|
raw_output: None,
|
|
}),
|
|
cx,
|
|
)
|
|
})
|
|
.unwrap()
|
|
.unwrap();
|
|
Ok(acp::PromptResponse {
|
|
stop_reason: acp::StopReason::EndTurn,
|
|
})
|
|
}
|
|
.boxed_local()
|
|
}
|
|
}));
|
|
|
|
let thread = cx
|
|
.update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
|
|
.await
|
|
.unwrap();
|
|
|
|
cx.update(|cx| {
|
|
thread.update(cx, |thread, cx| {
|
|
thread.send(new_prompt_id(), vec!["Hi".into()], cx)
|
|
})
|
|
})
|
|
.await
|
|
.unwrap();
|
|
|
|
assert!(cx.read(|cx| !thread.read(cx).has_pending_edit_tool_calls()));
|
|
}
|
|
|
|
#[gpui::test(iterations = 10)]
|
|
async fn test_checkpoints(cx: &mut TestAppContext) {
|
|
init_test(cx);
|
|
let fs = FakeFs::new(cx.background_executor.clone());
|
|
fs.insert_tree(
|
|
path!("/test"),
|
|
json!({
|
|
".git": {}
|
|
}),
|
|
)
|
|
.await;
|
|
let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
|
|
|
|
let simulate_changes = Arc::new(AtomicBool::new(true));
|
|
let next_filename = Arc::new(AtomicUsize::new(0));
|
|
let connection = Rc::new(FakeAgentConnection::new().on_user_message({
|
|
let simulate_changes = simulate_changes.clone();
|
|
let next_filename = next_filename.clone();
|
|
let fs = fs.clone();
|
|
move |request, thread, mut cx| {
|
|
let fs = fs.clone();
|
|
let simulate_changes = simulate_changes.clone();
|
|
let next_filename = next_filename.clone();
|
|
async move {
|
|
if simulate_changes.load(SeqCst) {
|
|
let filename = format!("/test/file-{}", next_filename.fetch_add(1, SeqCst));
|
|
fs.write(Path::new(&filename), b"").await?;
|
|
}
|
|
|
|
let acp::ContentBlock::Text(content) = &request.prompt[0] else {
|
|
panic!("expected text content block");
|
|
};
|
|
thread.update(&mut cx, |thread, cx| {
|
|
thread
|
|
.handle_session_update(
|
|
acp::SessionUpdate::AgentMessageChunk {
|
|
content: content.text.to_uppercase().into(),
|
|
},
|
|
cx,
|
|
)
|
|
.unwrap();
|
|
})?;
|
|
Ok(acp::PromptResponse {
|
|
stop_reason: acp::StopReason::EndTurn,
|
|
})
|
|
}
|
|
.boxed_local()
|
|
}
|
|
}));
|
|
let thread = cx
|
|
.update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
|
|
.await
|
|
.unwrap();
|
|
|
|
cx.update(|cx| {
|
|
thread.update(cx, |thread, cx| {
|
|
thread.send(new_prompt_id(), vec!["Lorem".into()], cx)
|
|
})
|
|
})
|
|
.await
|
|
.unwrap();
|
|
thread.read_with(cx, |thread, cx| {
|
|
assert_eq!(
|
|
thread.to_markdown(cx),
|
|
indoc! {"
|
|
## User (checkpoint)
|
|
|
|
Lorem
|
|
|
|
## Assistant
|
|
|
|
LOREM
|
|
|
|
"}
|
|
);
|
|
});
|
|
assert_eq!(fs.files(), vec![Path::new(path!("/test/file-0"))]);
|
|
|
|
cx.update(|cx| {
|
|
thread.update(cx, |thread, cx| {
|
|
thread.send(new_prompt_id(), vec!["ipsum".into()], cx)
|
|
})
|
|
})
|
|
.await
|
|
.unwrap();
|
|
thread.read_with(cx, |thread, cx| {
|
|
assert_eq!(
|
|
thread.to_markdown(cx),
|
|
indoc! {"
|
|
## User (checkpoint)
|
|
|
|
Lorem
|
|
|
|
## Assistant
|
|
|
|
LOREM
|
|
|
|
## User (checkpoint)
|
|
|
|
ipsum
|
|
|
|
## Assistant
|
|
|
|
IPSUM
|
|
|
|
"}
|
|
);
|
|
});
|
|
assert_eq!(
|
|
fs.files(),
|
|
vec![
|
|
Path::new(path!("/test/file-0")),
|
|
Path::new(path!("/test/file-1"))
|
|
]
|
|
);
|
|
|
|
// Checkpoint isn't stored when there are no changes.
|
|
simulate_changes.store(false, SeqCst);
|
|
cx.update(|cx| {
|
|
thread.update(cx, |thread, cx| {
|
|
thread.send(new_prompt_id(), vec!["dolor".into()], cx)
|
|
})
|
|
})
|
|
.await
|
|
.unwrap();
|
|
thread.read_with(cx, |thread, cx| {
|
|
assert_eq!(
|
|
thread.to_markdown(cx),
|
|
indoc! {"
|
|
## User (checkpoint)
|
|
|
|
Lorem
|
|
|
|
## Assistant
|
|
|
|
LOREM
|
|
|
|
## User (checkpoint)
|
|
|
|
ipsum
|
|
|
|
## Assistant
|
|
|
|
IPSUM
|
|
|
|
## User
|
|
|
|
dolor
|
|
|
|
## Assistant
|
|
|
|
DOLOR
|
|
|
|
"}
|
|
);
|
|
});
|
|
assert_eq!(
|
|
fs.files(),
|
|
vec![
|
|
Path::new(path!("/test/file-0")),
|
|
Path::new(path!("/test/file-1"))
|
|
]
|
|
);
|
|
|
|
// Rewinding the conversation truncates the history and restores the checkpoint.
|
|
thread
|
|
.update(cx, |thread, cx| {
|
|
let AgentThreadEntry::UserMessage(message) = &thread.entries[2] else {
|
|
panic!("unexpected entries {:?}", thread.entries)
|
|
};
|
|
thread.rewind(message.prompt_id.clone().unwrap(), cx)
|
|
})
|
|
.await
|
|
.unwrap();
|
|
thread.read_with(cx, |thread, cx| {
|
|
assert_eq!(
|
|
thread.to_markdown(cx),
|
|
indoc! {"
|
|
## User (checkpoint)
|
|
|
|
Lorem
|
|
|
|
## Assistant
|
|
|
|
LOREM
|
|
|
|
"}
|
|
);
|
|
});
|
|
assert_eq!(fs.files(), vec![Path::new(path!("/test/file-0"))]);
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_refusal(cx: &mut TestAppContext) {
|
|
init_test(cx);
|
|
let fs = FakeFs::new(cx.background_executor.clone());
|
|
fs.insert_tree(path!("/"), json!({})).await;
|
|
let project = Project::test(fs.clone(), [path!("/").as_ref()], cx).await;
|
|
|
|
let refuse_next = Arc::new(AtomicBool::new(false));
|
|
let connection = Rc::new(FakeAgentConnection::new().on_user_message({
|
|
let refuse_next = refuse_next.clone();
|
|
move |request, thread, mut cx| {
|
|
let refuse_next = refuse_next.clone();
|
|
async move {
|
|
if refuse_next.load(SeqCst) {
|
|
return Ok(acp::PromptResponse {
|
|
stop_reason: acp::StopReason::Refusal,
|
|
});
|
|
}
|
|
|
|
let acp::ContentBlock::Text(content) = &request.prompt[0] else {
|
|
panic!("expected text content block");
|
|
};
|
|
thread.update(&mut cx, |thread, cx| {
|
|
thread
|
|
.handle_session_update(
|
|
acp::SessionUpdate::AgentMessageChunk {
|
|
content: content.text.to_uppercase().into(),
|
|
},
|
|
cx,
|
|
)
|
|
.unwrap();
|
|
})?;
|
|
Ok(acp::PromptResponse {
|
|
stop_reason: acp::StopReason::EndTurn,
|
|
})
|
|
}
|
|
.boxed_local()
|
|
}
|
|
}));
|
|
let thread = cx
|
|
.update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
|
|
.await
|
|
.unwrap();
|
|
|
|
cx.update(|cx| {
|
|
thread.update(cx, |thread, cx| {
|
|
thread.send(new_prompt_id(), vec!["hello".into()], cx)
|
|
})
|
|
})
|
|
.await
|
|
.unwrap();
|
|
thread.read_with(cx, |thread, cx| {
|
|
assert_eq!(
|
|
thread.to_markdown(cx),
|
|
indoc! {"
|
|
## User
|
|
|
|
hello
|
|
|
|
## Assistant
|
|
|
|
HELLO
|
|
|
|
"}
|
|
);
|
|
});
|
|
|
|
// Simulate refusing the second message, ensuring the conversation gets
|
|
// truncated to before sending it.
|
|
refuse_next.store(true, SeqCst);
|
|
cx.update(|cx| {
|
|
thread.update(cx, |thread, cx| {
|
|
thread.send(new_prompt_id(), vec!["world".into()], cx)
|
|
})
|
|
})
|
|
.await
|
|
.unwrap();
|
|
thread.read_with(cx, |thread, cx| {
|
|
assert_eq!(
|
|
thread.to_markdown(cx),
|
|
indoc! {"
|
|
## User
|
|
|
|
hello
|
|
|
|
## Assistant
|
|
|
|
HELLO
|
|
|
|
"}
|
|
);
|
|
});
|
|
}
|
|
|
|
async fn run_until_first_tool_call(
|
|
thread: &Entity<AcpThread>,
|
|
cx: &mut TestAppContext,
|
|
) -> usize {
|
|
let (mut tx, mut rx) = mpsc::channel::<usize>(1);
|
|
|
|
let subscription = cx.update(|cx| {
|
|
cx.subscribe(thread, move |thread, _, cx| {
|
|
for (ix, entry) in thread.read(cx).entries.iter().enumerate() {
|
|
if matches!(entry, AgentThreadEntry::ToolCall(_)) {
|
|
return tx.try_send(ix).unwrap();
|
|
}
|
|
}
|
|
})
|
|
});
|
|
|
|
select! {
|
|
_ = futures::FutureExt::fuse(smol::Timer::after(Duration::from_secs(10))) => {
|
|
panic!("Timeout waiting for tool call")
|
|
}
|
|
ix = rx.next().fuse() => {
|
|
drop(subscription);
|
|
ix.unwrap()
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Default)]
|
|
struct FakeAgentConnection {
|
|
auth_methods: Vec<acp::AuthMethod>,
|
|
sessions: Arc<parking_lot::Mutex<HashMap<acp::SessionId, WeakEntity<AcpThread>>>>,
|
|
on_user_message: Option<
|
|
Rc<
|
|
dyn Fn(
|
|
acp::PromptRequest,
|
|
WeakEntity<AcpThread>,
|
|
AsyncApp,
|
|
) -> LocalBoxFuture<'static, Result<acp::PromptResponse>>
|
|
+ 'static,
|
|
>,
|
|
>,
|
|
}
|
|
|
|
impl FakeAgentConnection {
|
|
fn new() -> Self {
|
|
Self {
|
|
auth_methods: Vec::new(),
|
|
on_user_message: None,
|
|
sessions: Arc::default(),
|
|
}
|
|
}
|
|
|
|
#[expect(unused)]
|
|
fn with_auth_methods(mut self, auth_methods: Vec<acp::AuthMethod>) -> Self {
|
|
self.auth_methods = auth_methods;
|
|
self
|
|
}
|
|
|
|
fn on_user_message(
|
|
mut self,
|
|
handler: impl Fn(
|
|
acp::PromptRequest,
|
|
WeakEntity<AcpThread>,
|
|
AsyncApp,
|
|
) -> LocalBoxFuture<'static, Result<acp::PromptResponse>>
|
|
+ 'static,
|
|
) -> Self {
|
|
self.on_user_message.replace(Rc::new(handler));
|
|
self
|
|
}
|
|
}
|
|
|
|
impl AgentConnection for FakeAgentConnection {
|
|
fn auth_methods(&self) -> &[acp::AuthMethod] {
|
|
&self.auth_methods
|
|
}
|
|
|
|
fn new_thread(
|
|
self: Rc<Self>,
|
|
project: Entity<Project>,
|
|
_cwd: &Path,
|
|
cx: &mut App,
|
|
) -> Task<gpui::Result<Entity<AcpThread>>> {
|
|
let session_id = acp::SessionId(
|
|
rand::thread_rng()
|
|
.sample_iter(&rand::distributions::Alphanumeric)
|
|
.take(7)
|
|
.map(char::from)
|
|
.collect::<String>()
|
|
.into(),
|
|
);
|
|
let action_log = cx.new(|_| ActionLog::new(project.clone()));
|
|
let thread = cx.new(|cx| {
|
|
AcpThread::new(
|
|
"Test",
|
|
self.clone(),
|
|
project,
|
|
action_log,
|
|
session_id.clone(),
|
|
watch::Receiver::constant(acp::PromptCapabilities {
|
|
image: true,
|
|
audio: true,
|
|
embedded_context: true,
|
|
}),
|
|
cx,
|
|
)
|
|
});
|
|
self.sessions.lock().insert(session_id, thread.downgrade());
|
|
Task::ready(Ok(thread))
|
|
}
|
|
|
|
fn authenticate(&self, method: acp::AuthMethodId, _cx: &mut App) -> Task<gpui::Result<()>> {
|
|
if self.auth_methods().iter().any(|m| m.id == method) {
|
|
Task::ready(Ok(()))
|
|
} else {
|
|
Task::ready(Err(anyhow!("Invalid Auth Method")))
|
|
}
|
|
}
|
|
|
|
fn prompt(
|
|
&self,
|
|
params: acp::PromptRequest,
|
|
cx: &mut App,
|
|
) -> Task<gpui::Result<acp::PromptResponse>> {
|
|
let sessions = self.sessions.lock();
|
|
let thread = sessions.get(¶ms.session_id).unwrap();
|
|
if let Some(handler) = &self.on_user_message {
|
|
let handler = handler.clone();
|
|
let thread = thread.clone();
|
|
cx.spawn(async move |cx| handler(params, thread, cx.clone()).await)
|
|
} else {
|
|
Task::ready(Ok(acp::PromptResponse {
|
|
stop_reason: acp::StopReason::EndTurn,
|
|
}))
|
|
}
|
|
}
|
|
|
|
fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
|
|
let sessions = self.sessions.lock();
|
|
let thread = sessions.get(session_id).unwrap().clone();
|
|
|
|
cx.spawn(async move |cx| {
|
|
thread
|
|
.update(cx, |thread, cx| thread.cancel(cx))
|
|
.unwrap()
|
|
.await
|
|
})
|
|
.detach();
|
|
}
|
|
|
|
fn rewind(
|
|
&self,
|
|
session_id: &acp::SessionId,
|
|
_cx: &App,
|
|
) -> Option<Rc<dyn AgentSessionRewind>> {
|
|
Some(Rc::new(FakeAgentSessionEditor {
|
|
_session_id: session_id.clone(),
|
|
}))
|
|
}
|
|
|
|
fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
|
|
self
|
|
}
|
|
}
|
|
|
|
struct FakeAgentSessionEditor {
|
|
_session_id: acp::SessionId,
|
|
}
|
|
|
|
impl AgentSessionRewind for FakeAgentSessionEditor {
|
|
fn rewind(&self, _message_id: acp::PromptId, _cx: &mut App) -> Task<Result<()>> {
|
|
Task::ready(Ok(()))
|
|
}
|
|
}
|
|
}
|