1734 lines
54 KiB
Rust
1734 lines
54 KiB
Rust
mod connection;
|
|
mod old_acp_support;
|
|
pub use connection::*;
|
|
pub use old_acp_support::*;
|
|
|
|
use agent_client_protocol as acp;
|
|
use anyhow::{Context as _, Result};
|
|
use assistant_tool::ActionLog;
|
|
use buffer_diff::BufferDiff;
|
|
use editor::{Bias, MultiBuffer, PathKey};
|
|
use futures::{FutureExt, channel::oneshot, future::BoxFuture};
|
|
use gpui::{AppContext, Context, Entity, EventEmitter, SharedString, Task};
|
|
use itertools::Itertools;
|
|
use language::{
|
|
Anchor, Buffer, BufferSnapshot, Capability, LanguageRegistry, OffsetRangeExt as _, Point,
|
|
text_diff,
|
|
};
|
|
use markdown::Markdown;
|
|
use project::{AgentLocation, Project};
|
|
use std::collections::HashMap;
|
|
use std::error::Error;
|
|
use std::fmt::Formatter;
|
|
use std::rc::Rc;
|
|
use std::{
|
|
fmt::Display,
|
|
mem,
|
|
path::{Path, PathBuf},
|
|
sync::Arc,
|
|
};
|
|
use ui::App;
|
|
use util::ResultExt;
|
|
|
|
#[derive(Debug)]
|
|
pub struct UserMessage {
|
|
pub content: ContentBlock,
|
|
}
|
|
|
|
impl UserMessage {
|
|
pub fn from_acp(
|
|
message: impl IntoIterator<Item = acp::ContentBlock>,
|
|
language_registry: Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
let mut content = ContentBlock::Empty;
|
|
for chunk in message {
|
|
content.append(chunk, &language_registry, cx)
|
|
}
|
|
Self { content: content }
|
|
}
|
|
|
|
fn to_markdown(&self, cx: &App) -> String {
|
|
format!("## User\n\n{}\n\n", self.content.to_markdown(cx))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct MentionPath<'a>(&'a Path);
|
|
|
|
impl<'a> MentionPath<'a> {
|
|
const PREFIX: &'static str = "@file:";
|
|
|
|
pub fn new(path: &'a Path) -> Self {
|
|
MentionPath(path)
|
|
}
|
|
|
|
pub fn try_parse(url: &'a str) -> Option<Self> {
|
|
let path = url.strip_prefix(Self::PREFIX)?;
|
|
Some(MentionPath(Path::new(path)))
|
|
}
|
|
|
|
pub fn path(&self) -> &Path {
|
|
self.0
|
|
}
|
|
}
|
|
|
|
impl Display for MentionPath<'_> {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
write!(
|
|
f,
|
|
"[@{}]({}{})",
|
|
self.0.file_name().unwrap_or_default().display(),
|
|
Self::PREFIX,
|
|
self.0.display()
|
|
)
|
|
}
|
|
}
|
|
|
|
#[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 {
|
|
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 diffs(&self) -> impl Iterator<Item = &Diff> {
|
|
if let AgentThreadEntry::ToolCall(call) = self {
|
|
itertools::Either::Left(call.diffs())
|
|
} else {
|
|
itertools::Either::Right(std::iter::empty())
|
|
}
|
|
}
|
|
|
|
pub fn locations(&self) -> Option<&[acp::ToolCallLocation]> {
|
|
if let AgentThreadEntry::ToolCall(ToolCall { locations, .. }) = self {
|
|
Some(locations)
|
|
} 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 raw_input: Option<serde_json::Value>,
|
|
}
|
|
|
|
impl ToolCall {
|
|
fn from_acp(
|
|
tool_call: acp::ToolCall,
|
|
status: ToolCallStatus,
|
|
language_registry: Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
Self {
|
|
id: tool_call.id,
|
|
label: cx.new(|cx| {
|
|
Markdown::new(
|
|
tool_call.label.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,
|
|
status,
|
|
raw_input: tool_call.raw_input,
|
|
}
|
|
}
|
|
|
|
fn update(
|
|
&mut self,
|
|
fields: acp::ToolCallUpdateFields,
|
|
language_registry: Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) {
|
|
let acp::ToolCallUpdateFields {
|
|
kind,
|
|
status,
|
|
label,
|
|
content,
|
|
locations,
|
|
raw_input,
|
|
} = fields;
|
|
|
|
if let Some(kind) = kind {
|
|
self.kind = kind;
|
|
}
|
|
|
|
if let Some(status) = status {
|
|
self.status = ToolCallStatus::Allowed { status };
|
|
}
|
|
|
|
if let Some(label) = label {
|
|
self.label = cx.new(|cx| Markdown::new_text(label.into(), cx));
|
|
}
|
|
|
|
if let Some(content) = content {
|
|
self.content = content
|
|
.into_iter()
|
|
.map(|chunk| ToolCallContent::from_acp(chunk, language_registry.clone(), cx))
|
|
.collect();
|
|
}
|
|
|
|
if let Some(locations) = locations {
|
|
self.locations = locations;
|
|
}
|
|
|
|
if let Some(raw_input) = raw_input {
|
|
self.raw_input = Some(raw_input);
|
|
}
|
|
}
|
|
|
|
pub fn diffs(&self) -> impl Iterator<Item = &Diff> {
|
|
self.content.iter().filter_map(|content| match content {
|
|
ToolCallContent::ContentBlock { .. } => None,
|
|
ToolCallContent::Diff { diff } => Some(diff),
|
|
})
|
|
}
|
|
|
|
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
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub enum ToolCallStatus {
|
|
WaitingForConfirmation {
|
|
options: Vec<acp::PermissionOption>,
|
|
respond_tx: oneshot::Sender<acp::PermissionOptionId>,
|
|
},
|
|
Allowed {
|
|
status: acp::ToolCallStatus,
|
|
},
|
|
Rejected,
|
|
Canceled,
|
|
}
|
|
|
|
impl Display for ToolCallStatus {
|
|
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
|
write!(
|
|
f,
|
|
"{}",
|
|
match self {
|
|
ToolCallStatus::WaitingForConfirmation { .. } => "Waiting for confirmation",
|
|
ToolCallStatus::Allowed { status } => match status {
|
|
acp::ToolCallStatus::Pending => "Pending",
|
|
acp::ToolCallStatus::InProgress => "In Progress",
|
|
acp::ToolCallStatus::Completed => "Completed",
|
|
acp::ToolCallStatus::Failed => "Failed",
|
|
},
|
|
ToolCallStatus::Rejected => "Rejected",
|
|
ToolCallStatus::Canceled => "Canceled",
|
|
}
|
|
)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub enum ContentBlock {
|
|
Empty,
|
|
Markdown { markdown: Entity<Markdown> },
|
|
}
|
|
|
|
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,
|
|
) {
|
|
let new_content = match block {
|
|
acp::ContentBlock::Text(text_content) => text_content.text.clone(),
|
|
acp::ContentBlock::ResourceLink(resource_link) => {
|
|
if let Some(path) = resource_link.uri.strip_prefix("file://") {
|
|
format!("{}", MentionPath(path.as_ref()))
|
|
} else {
|
|
resource_link.uri.clone()
|
|
}
|
|
}
|
|
acp::ContentBlock::Image(_)
|
|
| acp::ContentBlock::Audio(_)
|
|
| acp::ContentBlock::Resource(_) => String::new(),
|
|
};
|
|
|
|
match self {
|
|
ContentBlock::Empty => {
|
|
*self = ContentBlock::Markdown {
|
|
markdown: cx.new(|cx| {
|
|
Markdown::new(
|
|
new_content.into(),
|
|
Some(language_registry.clone()),
|
|
None,
|
|
cx,
|
|
)
|
|
}),
|
|
};
|
|
}
|
|
ContentBlock::Markdown { markdown } => {
|
|
markdown.update(cx, |markdown, cx| markdown.append(&new_content, cx));
|
|
}
|
|
}
|
|
}
|
|
|
|
fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
|
|
match self {
|
|
ContentBlock::Empty => "",
|
|
ContentBlock::Markdown { markdown } => markdown.read(cx).source(),
|
|
}
|
|
}
|
|
|
|
pub fn markdown(&self) -> Option<&Entity<Markdown>> {
|
|
match self {
|
|
ContentBlock::Empty => None,
|
|
ContentBlock::Markdown { markdown } => Some(markdown),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub enum ToolCallContent {
|
|
ContentBlock { content: ContentBlock },
|
|
Diff { diff: Diff },
|
|
}
|
|
|
|
impl ToolCallContent {
|
|
pub fn from_acp(
|
|
content: acp::ToolCallContent,
|
|
language_registry: Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
match content {
|
|
acp::ToolCallContent::ContentBlock(content) => Self::ContentBlock {
|
|
content: ContentBlock::new(content, &language_registry, cx),
|
|
},
|
|
acp::ToolCallContent::Diff { diff } => Self::Diff {
|
|
diff: Diff::from_acp(diff, 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.to_markdown(cx),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Diff {
|
|
pub multibuffer: Entity<MultiBuffer>,
|
|
pub path: PathBuf,
|
|
pub new_buffer: Entity<Buffer>,
|
|
pub old_buffer: Entity<Buffer>,
|
|
_task: Task<Result<()>>,
|
|
}
|
|
|
|
impl Diff {
|
|
pub fn from_acp(
|
|
diff: acp::Diff,
|
|
language_registry: Arc<LanguageRegistry>,
|
|
cx: &mut App,
|
|
) -> Self {
|
|
let acp::Diff {
|
|
path,
|
|
old_text,
|
|
new_text,
|
|
} = diff;
|
|
|
|
let multibuffer = cx.new(|_cx| MultiBuffer::without_headers(Capability::ReadOnly));
|
|
|
|
let new_buffer = cx.new(|cx| Buffer::local(new_text, cx));
|
|
let old_buffer = cx.new(|cx| Buffer::local(old_text.unwrap_or("".into()), cx));
|
|
let new_buffer_snapshot = new_buffer.read(cx).text_snapshot();
|
|
let old_buffer_snapshot = old_buffer.read(cx).snapshot();
|
|
let buffer_diff = cx.new(|cx| BufferDiff::new(&new_buffer_snapshot, cx));
|
|
let diff_task = buffer_diff.update(cx, |diff, cx| {
|
|
diff.set_base_text(
|
|
old_buffer_snapshot,
|
|
Some(language_registry.clone()),
|
|
new_buffer_snapshot,
|
|
cx,
|
|
)
|
|
});
|
|
|
|
let task = cx.spawn({
|
|
let multibuffer = multibuffer.clone();
|
|
let path = path.clone();
|
|
let new_buffer = new_buffer.clone();
|
|
async move |cx| {
|
|
diff_task.await?;
|
|
|
|
multibuffer
|
|
.update(cx, |multibuffer, cx| {
|
|
let hunk_ranges = {
|
|
let buffer = new_buffer.read(cx);
|
|
let diff = buffer_diff.read(cx);
|
|
diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &buffer, cx)
|
|
.map(|diff_hunk| diff_hunk.buffer_range.to_point(&buffer))
|
|
.collect::<Vec<_>>()
|
|
};
|
|
|
|
multibuffer.set_excerpts_for_path(
|
|
PathKey::for_buffer(&new_buffer, cx),
|
|
new_buffer.clone(),
|
|
hunk_ranges,
|
|
editor::DEFAULT_MULTIBUFFER_CONTEXT,
|
|
cx,
|
|
);
|
|
multibuffer.add_diff(buffer_diff.clone(), cx);
|
|
})
|
|
.log_err();
|
|
|
|
if let Some(language) = language_registry
|
|
.language_for_file_path(&path)
|
|
.await
|
|
.log_err()
|
|
{
|
|
new_buffer.update(cx, |buffer, cx| buffer.set_language(Some(language), cx))?;
|
|
}
|
|
|
|
anyhow::Ok(())
|
|
}
|
|
});
|
|
|
|
Self {
|
|
multibuffer,
|
|
path,
|
|
new_buffer,
|
|
old_buffer,
|
|
_task: task,
|
|
}
|
|
}
|
|
|
|
fn to_markdown(&self, cx: &App) -> String {
|
|
let buffer_text = self
|
|
.multibuffer
|
|
.read(cx)
|
|
.all_buffers()
|
|
.iter()
|
|
.map(|buffer| buffer.read(cx).text())
|
|
.join("\n");
|
|
format!("Diff: {}\n```\n{}\n```\n", self.path.display(), buffer_text)
|
|
}
|
|
}
|
|
|
|
#[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_text(entry.content.into(), cx)),
|
|
priority: entry.priority,
|
|
status: entry.status,
|
|
}
|
|
}
|
|
}
|
|
|
|
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,
|
|
}
|
|
|
|
pub enum AcpThreadEvent {
|
|
NewEntry,
|
|
EntryUpdated(usize),
|
|
}
|
|
|
|
impl EventEmitter<AcpThreadEvent> for AcpThread {}
|
|
|
|
#[derive(PartialEq, Eq)]
|
|
pub enum ThreadStatus {
|
|
Idle,
|
|
WaitingForToolConfirmation,
|
|
Generating,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub enum LoadError {
|
|
Unsupported {
|
|
error_message: SharedString,
|
|
upgrade_message: SharedString,
|
|
upgrade_command: String,
|
|
},
|
|
Exited(i32),
|
|
Other(SharedString),
|
|
}
|
|
|
|
impl Display for LoadError {
|
|
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
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(
|
|
connection: Rc<dyn AgentConnection>,
|
|
project: Entity<Project>,
|
|
session_id: acp::SessionId,
|
|
cx: &mut Context<Self>,
|
|
) -> Self {
|
|
let action_log = cx.new(|_| ActionLog::new(project.clone()));
|
|
|
|
Self {
|
|
action_log,
|
|
shared_buffers: Default::default(),
|
|
entries: Default::default(),
|
|
plan: Default::default(),
|
|
title: connection.name().into(),
|
|
project,
|
|
send_task: None,
|
|
connection,
|
|
session_id,
|
|
}
|
|
}
|
|
|
|
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 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 has_pending_edit_tool_calls(&self) -> bool {
|
|
for entry in self.entries.iter().rev() {
|
|
match entry {
|
|
AgentThreadEntry::UserMessage(_) => return false,
|
|
AgentThreadEntry::ToolCall(call) if call.diffs().next().is_some() => return true,
|
|
AgentThreadEntry::ToolCall(_) | AgentThreadEntry::AssistantMessage(_) => {}
|
|
}
|
|
}
|
|
|
|
false
|
|
}
|
|
|
|
pub fn handle_session_update(
|
|
&mut self,
|
|
update: acp::SessionUpdate,
|
|
cx: &mut Context<Self>,
|
|
) -> Result<()> {
|
|
match update {
|
|
acp::SessionUpdate::UserMessage(content_block) => {
|
|
self.push_user_content_block(content_block, cx);
|
|
}
|
|
acp::SessionUpdate::AgentMessageChunk(content_block) => {
|
|
self.push_assistant_content_block(content_block, false, cx);
|
|
}
|
|
acp::SessionUpdate::AgentThoughtChunk(content_block) => {
|
|
self.push_assistant_content_block(content_block, 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, 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 { content }) = last_entry
|
|
{
|
|
content.append(chunk, &language_registry, cx);
|
|
cx.emit(AcpThreadEvent::EntryUpdated(entries_len - 1));
|
|
} else {
|
|
let content = ContentBlock::new(chunk, &language_registry, cx);
|
|
self.push_entry(AgentThreadEntry::UserMessage(UserMessage { content }), 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
|
|
{
|
|
cx.emit(AcpThreadEvent::EntryUpdated(entries_len - 1));
|
|
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 update_tool_call(
|
|
&mut self,
|
|
update: acp::ToolCallUpdate,
|
|
cx: &mut Context<Self>,
|
|
) -> Result<()> {
|
|
let languages = self.project.read(cx).languages().clone();
|
|
|
|
let (ix, current_call) = self
|
|
.tool_call_mut(&update.id)
|
|
.context("Tool call not found")?;
|
|
current_call.update(update.fields, languages, cx);
|
|
|
|
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>) {
|
|
let status = ToolCallStatus::Allowed {
|
|
status: tool_call.status,
|
|
};
|
|
self.upsert_tool_call_inner(tool_call, status, cx)
|
|
}
|
|
|
|
pub fn upsert_tool_call_inner(
|
|
&mut self,
|
|
tool_call: acp::ToolCall,
|
|
status: ToolCallStatus,
|
|
cx: &mut Context<Self>,
|
|
) {
|
|
let language_registry = self.project.read(cx).languages().clone();
|
|
let call = ToolCall::from_acp(tool_call, status, language_registry, cx);
|
|
|
|
let location = call.locations.last().cloned();
|
|
|
|
if let Some((ix, current_call)) = self.tool_call_mut(&call.id) {
|
|
*current_call = call;
|
|
|
|
cx.emit(AcpThreadEvent::EntryUpdated(ix));
|
|
} else {
|
|
self.push_entry(AgentThreadEntry::ToolCall(call), cx);
|
|
}
|
|
|
|
if let Some(location) = location {
|
|
self.set_project_location(location, cx)
|
|
}
|
|
}
|
|
|
|
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 set_project_location(&self, location: acp::ToolCallLocation, cx: &mut Context<Self>) {
|
|
self.project.update(cx, |project, cx| {
|
|
let Some(path) = project.project_path_for_absolute_path(&location.path, cx) else {
|
|
return;
|
|
};
|
|
let buffer = project.open_buffer(path, cx);
|
|
cx.spawn(async move |project, cx| {
|
|
let buffer = buffer.await?;
|
|
|
|
project.update(cx, |project, cx| {
|
|
let position = if let Some(line) = location.line {
|
|
let snapshot = buffer.read(cx).snapshot();
|
|
let point = snapshot.clip_point(Point::new(line, 0), Bias::Left);
|
|
snapshot.anchor_before(point)
|
|
} else {
|
|
Anchor::MIN
|
|
};
|
|
|
|
project.set_agent_location(
|
|
Some(AgentLocation {
|
|
buffer: buffer.downgrade(),
|
|
position,
|
|
}),
|
|
cx,
|
|
);
|
|
})
|
|
})
|
|
.detach_and_log_err(cx);
|
|
});
|
|
}
|
|
|
|
pub fn request_tool_call_permission(
|
|
&mut self,
|
|
tool_call: acp::ToolCall,
|
|
options: Vec<acp::PermissionOption>,
|
|
cx: &mut Context<Self>,
|
|
) -> oneshot::Receiver<acp::PermissionOptionId> {
|
|
let (tx, rx) = oneshot::channel();
|
|
|
|
let status = ToolCallStatus::WaitingForConfirmation {
|
|
options,
|
|
respond_tx: tx,
|
|
};
|
|
|
|
self.upsert_tool_call_inner(tool_call, status, cx);
|
|
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::Allowed {
|
|
status: acp::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::Allowed { .. }
|
|
| 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>) {
|
|
self.plan = Plan {
|
|
entries: request
|
|
.entries
|
|
.into_iter()
|
|
.map(|entry| PlanEntry::from_acp(entry, cx))
|
|
.collect(),
|
|
};
|
|
|
|
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();
|
|
}
|
|
|
|
pub fn authenticate(&self, cx: &mut App) -> impl use<> + Future<Output = Result<()>> {
|
|
self.connection.authenticate(cx)
|
|
}
|
|
|
|
#[cfg(any(test, feature = "test-support"))]
|
|
pub fn send_raw(
|
|
&mut self,
|
|
message: &str,
|
|
cx: &mut Context<Self>,
|
|
) -> BoxFuture<'static, Result<()>> {
|
|
self.send(
|
|
vec![acp::ContentBlock::Text(acp::TextContent {
|
|
text: message.to_string(),
|
|
annotations: None,
|
|
})],
|
|
cx,
|
|
)
|
|
}
|
|
|
|
pub fn send(
|
|
&mut self,
|
|
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,
|
|
);
|
|
self.push_entry(
|
|
AgentThreadEntry::UserMessage(UserMessage { content: block }),
|
|
cx,
|
|
);
|
|
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| {
|
|
async {
|
|
cancel_task.await;
|
|
|
|
let result = this
|
|
.update(cx, |this, cx| {
|
|
this.connection.prompt(
|
|
acp::PromptArguments {
|
|
prompt: message,
|
|
session_id: this.session_id.clone(),
|
|
},
|
|
cx,
|
|
)
|
|
})?
|
|
.await;
|
|
tx.send(result).log_err();
|
|
this.update(cx, |this, _cx| this.send_task.take())?;
|
|
anyhow::Ok(())
|
|
}
|
|
.await
|
|
.log_err();
|
|
}));
|
|
|
|
async move {
|
|
match rx.await {
|
|
Ok(Err(e)) => Err(e)?,
|
|
_ => 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::WaitingForConfirmation { .. }
|
|
| ToolCallStatus::Allowed {
|
|
status: acp::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)
|
|
}
|
|
|
|
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;
|
|
cx.update(|cx| {
|
|
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,
|
|
);
|
|
});
|
|
|
|
action_log.update(cx, |action_log, cx| {
|
|
action_log.buffer_read(buffer.clone(), cx);
|
|
});
|
|
buffer.update(cx, |buffer, cx| {
|
|
buffer.edit(edits, None, cx);
|
|
});
|
|
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()
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use agentic_coding_protocol as acp_old;
|
|
use anyhow::anyhow;
|
|
use async_pipe::{PipeReader, PipeWriter};
|
|
use futures::{channel::mpsc, future::LocalBoxFuture, select};
|
|
use gpui::{AsyncApp, TestAppContext};
|
|
use indoc::indoc;
|
|
use project::FakeFs;
|
|
use serde_json::json;
|
|
use settings::SettingsStore;
|
|
use smol::{future::BoxedLocal, stream::StreamExt as _};
|
|
use std::{cell::RefCell, rc::Rc, 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 (thread, _fake_server) = fake_acp_thread(project, cx);
|
|
|
|
// Test creating a new user message
|
|
thread.update(cx, |thread, cx| {
|
|
thread.push_user_content_block(
|
|
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.content.to_markdown(cx), "Hello, ");
|
|
} else {
|
|
panic!("Expected UserMessage");
|
|
}
|
|
});
|
|
|
|
// Test appending to existing user message
|
|
thread.update(cx, |thread, cx| {
|
|
thread.push_user_content_block(
|
|
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.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,
|
|
);
|
|
});
|
|
|
|
thread.update(cx, |thread, cx| {
|
|
thread.push_user_content_block(
|
|
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.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 (thread, fake_server) = fake_acp_thread(project, cx);
|
|
|
|
fake_server.update(cx, |fake_server, _| {
|
|
fake_server.on_user_message(move |_, server, mut cx| async move {
|
|
server
|
|
.update(&mut cx, |server, _| {
|
|
server.send_to_zed(acp_old::StreamAssistantMessageChunkParams {
|
|
chunk: acp_old::AssistantMessageChunk::Thought {
|
|
thought: "Thinking ".into(),
|
|
},
|
|
})
|
|
})?
|
|
.await
|
|
.unwrap();
|
|
server
|
|
.update(&mut cx, |server, _| {
|
|
server.send_to_zed(acp_old::StreamAssistantMessageChunkParams {
|
|
chunk: acp_old::AssistantMessageChunk::Thought {
|
|
thought: "hard!".into(),
|
|
},
|
|
})
|
|
})?
|
|
.await
|
|
.unwrap();
|
|
|
|
Ok(())
|
|
})
|
|
});
|
|
|
|
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 (thread, fake_server) = fake_acp_thread(project.clone(), cx);
|
|
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 (read_file_tx, read_file_rx) = oneshot::channel::<()>();
|
|
let read_file_tx = Rc::new(RefCell::new(Some(read_file_tx)));
|
|
|
|
fake_server.update(cx, |fake_server, _| {
|
|
fake_server.on_user_message(move |_, server, mut cx| {
|
|
let read_file_tx = read_file_tx.clone();
|
|
async move {
|
|
let content = server
|
|
.update(&mut cx, |server, _| {
|
|
server.send_to_zed(acp_old::ReadTextFileParams {
|
|
path: path!("/tmp/foo").into(),
|
|
line: None,
|
|
limit: None,
|
|
})
|
|
})?
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(content.content, "one\ntwo\nthree\n");
|
|
read_file_tx.take().unwrap().send(()).unwrap();
|
|
server
|
|
.update(&mut cx, |server, _| {
|
|
server.send_to_zed(acp_old::WriteTextFileParams {
|
|
path: path!("/tmp/foo").into(),
|
|
content: "one\ntwo\nthree\nfour\nfive\n".to_string(),
|
|
})
|
|
})?
|
|
.await
|
|
.unwrap();
|
|
Ok(())
|
|
}
|
|
})
|
|
});
|
|
|
|
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 (thread, fake_server) = fake_acp_thread(project, cx);
|
|
|
|
let (end_turn_tx, end_turn_rx) = oneshot::channel::<()>();
|
|
|
|
let tool_call_id = Rc::new(RefCell::new(None));
|
|
let end_turn_rx = Rc::new(RefCell::new(Some(end_turn_rx)));
|
|
fake_server.update(cx, |fake_server, _| {
|
|
let tool_call_id = tool_call_id.clone();
|
|
fake_server.on_user_message(move |_, server, mut cx| {
|
|
let end_turn_rx = end_turn_rx.clone();
|
|
let tool_call_id = tool_call_id.clone();
|
|
async move {
|
|
let tool_call_result = server
|
|
.update(&mut cx, |server, _| {
|
|
server.send_to_zed(acp_old::PushToolCallParams {
|
|
label: "Fetch".to_string(),
|
|
icon: acp_old::Icon::Globe,
|
|
content: None,
|
|
locations: vec![],
|
|
})
|
|
})?
|
|
.await
|
|
.unwrap();
|
|
*tool_call_id.clone().borrow_mut() = Some(tool_call_result.id);
|
|
end_turn_rx.take().unwrap().await.ok();
|
|
|
|
Ok(())
|
|
}
|
|
})
|
|
});
|
|
|
|
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::Allowed {
|
|
status: acp::ToolCallStatus::InProgress,
|
|
..
|
|
},
|
|
..
|
|
})
|
|
));
|
|
});
|
|
|
|
cx.run_until_parked();
|
|
|
|
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,
|
|
..
|
|
})
|
|
));
|
|
});
|
|
|
|
fake_server
|
|
.update(cx, |fake_server, _| {
|
|
fake_server.send_to_zed(acp_old::UpdateToolCallParams {
|
|
tool_call_id: tool_call_id.borrow().unwrap(),
|
|
status: acp_old::ToolCallStatus::Finished,
|
|
content: None,
|
|
})
|
|
})
|
|
.await
|
|
.unwrap();
|
|
|
|
drop(end_turn_tx);
|
|
assert!(request.await.unwrap_err().to_string().contains("canceled"));
|
|
|
|
thread.read_with(cx, |thread, _| {
|
|
assert!(matches!(
|
|
thread.entries[1],
|
|
AgentThreadEntry::ToolCall(ToolCall {
|
|
status: ToolCallStatus::Allowed {
|
|
status: acp::ToolCallStatus::Completed,
|
|
..
|
|
},
|
|
..
|
|
})
|
|
));
|
|
});
|
|
}
|
|
|
|
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()
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn fake_acp_thread(
|
|
project: Entity<Project>,
|
|
cx: &mut TestAppContext,
|
|
) -> (Entity<AcpThread>, Entity<FakeAcpServer>) {
|
|
let (stdin_tx, stdin_rx) = async_pipe::pipe();
|
|
let (stdout_tx, stdout_rx) = async_pipe::pipe();
|
|
|
|
let thread = cx.new(|cx| {
|
|
let foreground_executor = cx.foreground_executor().clone();
|
|
let thread_rc = Rc::new(RefCell::new(cx.entity().downgrade()));
|
|
|
|
let (connection, io_fut) = acp_old::AgentConnection::connect_to_agent(
|
|
OldAcpClientDelegate::new(thread_rc.clone(), cx.to_async()),
|
|
stdin_tx,
|
|
stdout_rx,
|
|
move |fut| {
|
|
foreground_executor.spawn(fut).detach();
|
|
},
|
|
);
|
|
|
|
let io_task = cx.background_spawn({
|
|
async move {
|
|
io_fut.await.log_err();
|
|
Ok(())
|
|
}
|
|
});
|
|
let connection = OldAcpAgentConnection {
|
|
name: "test",
|
|
connection,
|
|
child_status: io_task,
|
|
};
|
|
|
|
AcpThread::new(
|
|
Rc::new(connection),
|
|
project,
|
|
acp::SessionId("test".into()),
|
|
cx,
|
|
)
|
|
});
|
|
let agent = cx.update(|cx| cx.new(|cx| FakeAcpServer::new(stdin_rx, stdout_tx, cx)));
|
|
(thread, agent)
|
|
}
|
|
|
|
pub struct FakeAcpServer {
|
|
connection: acp_old::ClientConnection,
|
|
|
|
_io_task: Task<()>,
|
|
on_user_message: Option<
|
|
Rc<
|
|
dyn Fn(
|
|
acp_old::SendUserMessageParams,
|
|
Entity<FakeAcpServer>,
|
|
AsyncApp,
|
|
) -> LocalBoxFuture<'static, Result<(), acp_old::Error>>,
|
|
>,
|
|
>,
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
struct FakeAgent {
|
|
server: Entity<FakeAcpServer>,
|
|
cx: AsyncApp,
|
|
cancel_tx: Rc<RefCell<Option<oneshot::Sender<()>>>>,
|
|
}
|
|
|
|
impl acp_old::Agent for FakeAgent {
|
|
async fn initialize(
|
|
&self,
|
|
params: acp_old::InitializeParams,
|
|
) -> Result<acp_old::InitializeResponse, acp_old::Error> {
|
|
Ok(acp_old::InitializeResponse {
|
|
protocol_version: params.protocol_version,
|
|
is_authenticated: true,
|
|
})
|
|
}
|
|
|
|
async fn authenticate(&self) -> Result<(), acp_old::Error> {
|
|
Ok(())
|
|
}
|
|
|
|
async fn cancel_send_message(&self) -> Result<(), acp_old::Error> {
|
|
if let Some(cancel_tx) = self.cancel_tx.take() {
|
|
cancel_tx.send(()).log_err();
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
async fn send_user_message(
|
|
&self,
|
|
request: acp_old::SendUserMessageParams,
|
|
) -> Result<(), acp_old::Error> {
|
|
let (cancel_tx, cancel_rx) = oneshot::channel();
|
|
self.cancel_tx.replace(Some(cancel_tx));
|
|
|
|
let mut cx = self.cx.clone();
|
|
let handler = self
|
|
.server
|
|
.update(&mut cx, |server, _| server.on_user_message.clone())
|
|
.ok()
|
|
.flatten();
|
|
if let Some(handler) = handler {
|
|
select! {
|
|
_ = cancel_rx.fuse() => Err(anyhow::anyhow!("Message sending canceled").into()),
|
|
_ = handler(request, self.server.clone(), self.cx.clone()).fuse() => Ok(()),
|
|
}
|
|
} else {
|
|
Err(anyhow::anyhow!("No handler for on_user_message").into())
|
|
}
|
|
}
|
|
}
|
|
|
|
impl FakeAcpServer {
|
|
fn new(stdin: PipeReader, stdout: PipeWriter, cx: &Context<Self>) -> Self {
|
|
let agent = FakeAgent {
|
|
server: cx.entity(),
|
|
cx: cx.to_async(),
|
|
cancel_tx: Default::default(),
|
|
};
|
|
let foreground_executor = cx.foreground_executor().clone();
|
|
|
|
let (connection, io_fut) = acp_old::ClientConnection::connect_to_client(
|
|
agent.clone(),
|
|
stdout,
|
|
stdin,
|
|
move |fut| {
|
|
foreground_executor.spawn(fut).detach();
|
|
},
|
|
);
|
|
FakeAcpServer {
|
|
connection: connection,
|
|
on_user_message: None,
|
|
_io_task: cx.background_spawn(async move {
|
|
io_fut.await.log_err();
|
|
}),
|
|
}
|
|
}
|
|
|
|
fn on_user_message<F>(
|
|
&mut self,
|
|
handler: impl for<'a> Fn(
|
|
acp_old::SendUserMessageParams,
|
|
Entity<FakeAcpServer>,
|
|
AsyncApp,
|
|
) -> F
|
|
+ 'static,
|
|
) where
|
|
F: Future<Output = Result<(), acp_old::Error>> + 'static,
|
|
{
|
|
self.on_user_message
|
|
.replace(Rc::new(move |request, server, cx| {
|
|
handler(request, server, cx).boxed_local()
|
|
}));
|
|
}
|
|
|
|
fn send_to_zed<T: acp_old::ClientRequest + 'static>(
|
|
&self,
|
|
message: T,
|
|
) -> BoxedLocal<Result<T::Response>> {
|
|
self.connection
|
|
.request(message)
|
|
.map(|f| f.map_err(|err| anyhow!(err)))
|
|
.boxed_local()
|
|
}
|
|
}
|
|
}
|