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

Checkpoint

Browse source
This commit is contained in:
Antonio Scandurra 2025-08-07 16:33:42 +02:00
parent f0bf2e79d6
commit 6dda5b9d86
1 changed files with 42 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

76
crates/agent2/src/thread.rs
View file

@ -434,6 +434,21 @@ impl Thread {
event_stream: &AgentResponseEventStream, event_stream: &AgentResponseEventStream,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) -> Option<Task<LanguageModelToolResult>> { ) -> Option<Task<LanguageModelToolResult>> {
let Some(tool) = self.tools.get(tool_use.name.as_ref()).cloned() else {
if tool_use.is_input_complete {
let content = format!("No tool named {} exists", tool_use.name);
return Some(Task::ready(LanguageModelToolResult {
content: LanguageModelToolResultContent::Text(Arc::from(content)),
tool_use_id: tool_use.id,
tool_name: tool_use.name,
is_error: true,
output: None,
}));
} else {
return None;
}
};
cx.notify(); cx.notify();
self.pending_tool_uses self.pending_tool_uses
@ -454,7 +469,7 @@ impl Thread {
} }
}); });
if push_new_tool_use { if push_new_tool_use {
event_stream.send_tool_call(&tool_use); event_stream.send_tool_call(&tool_use, tool.kind());
last_message last_message
.content .content
.push(MessageContent::ToolUse(tool_use.clone())); .push(MessageContent::ToolUse(tool_use.clone()));
@ -472,37 +487,25 @@ impl Thread {
return None; return None;
} }
if let Some(tool) = self.tools.get(tool_use.name.as_ref()) { let tool_result = self.run_tool(tool, tool_use.clone(), event_stream.clone(), cx);
let tool_result = Some(cx.foreground_executor().spawn(async move {
self.run_tool(tool.clone(), tool_use.clone(), event_stream.clone(), cx); match tool_result.await {
Some(cx.foreground_executor().spawn(async move { Ok(tool_output) => LanguageModelToolResult {
match tool_result.await { tool_use_id: tool_use.id,
Ok(tool_output) => LanguageModelToolResult { tool_name: tool_use.name,
tool_use_id: tool_use.id, is_error: false,
tool_name: tool_use.name, content: LanguageModelToolResultContent::Text(Arc::from(tool_output)),
is_error: false, output: None,
content: LanguageModelToolResultContent::Text(Arc::from(tool_output)), },
output: None, Err(error) => LanguageModelToolResult {
}, tool_use_id: tool_use.id,
Err(error) => LanguageModelToolResult { tool_name: tool_use.name,
tool_use_id: tool_use.id, is_error: true,
tool_name: tool_use.name, content: LanguageModelToolResultContent::Text(Arc::from(error.to_string())),
is_error: true, output: None,
content: LanguageModelToolResultContent::Text(Arc::from(error.to_string())), },
output: None, }
}, }))
}
}))
} else {
let content = format!("No tool named {} exists", tool_use.name);
Some(Task::ready(LanguageModelToolResult {
content: LanguageModelToolResultContent::Text(Arc::from(content)),
tool_use_id: tool_use.id,
tool_name: tool_use.name,
is_error: true,
output: None,
}))
}
} }
fn run_tool( fn run_tool(
@ -704,6 +707,7 @@ pub struct Erased<T>(T);
pub trait AnyAgentTool { pub trait AnyAgentTool {
fn name(&self) -> SharedString; fn name(&self) -> SharedString;
fn description(&self, cx: &mut App) -> SharedString; fn description(&self, cx: &mut App) -> SharedString;
fn kind(&self) -> acp::ToolKind;
fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value>; fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value>;
fn needs_authorization(&self, input: serde_json::Value, cx: &mut App) -> Result<bool>; fn needs_authorization(&self, input: serde_json::Value, cx: &mut App) -> Result<bool>;
fn run( fn run(
@ -726,6 +730,10 @@ where
self.0.description(cx) self.0.description(cx)
} }
fn kind(&self) -> agent_client_protocol::ToolKind {
self.0.kind()
}
fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> { fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
Ok(serde_json::to_value(self.0.input_schema(format))?) Ok(serde_json::to_value(self.0.input_schema(format))?)
} }
@ -817,12 +825,12 @@ impl AgentResponseEventStream {
} }
} }
fn send_tool_call(&self, tool_use: &LanguageModelToolUse) { fn send_tool_call(&self, tool_use: &LanguageModelToolUse, kind: acp::ToolKind) {
self.0 self.0
.unbounded_send(Ok(AgentResponseEvent::ToolCall(acp::ToolCall { .unbounded_send(Ok(AgentResponseEvent::ToolCall(acp::ToolCall {
id: acp::ToolCallId(tool_use.id.to_string().into()), id: acp::ToolCallId(tool_use.id.to_string().into()),
title: tool_use.name.to_string(), title: tool_use.name.to_string(),
kind: acp::ToolKind::Other, kind,
status: acp::ToolCallStatus::Pending, status: acp::ToolCallStatus::Pending,
content: vec![], content: vec![],
locations: vec![], locations: vec![],