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

agent: Fix "tool cancelled" status being overapplied to failed tool calls (#30021)

Browse source 
Release Notes:

- Agent Beta: Fixed a bug that caused past failed tool calls to
incorrectly display as cancelled by the user.
This commit is contained in:
Cole Miller 2025-05-06 13:53:00 -04:00 • committed by GitHub
parent 7a9165d5ce
commit b83d00d69b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/agent/src/tool_use.rs
View file

@ -110,20 +110,27 @@ impl ToolUseState {
} }
pub fn cancel_pending(&mut self) -> Vec<PendingToolUse> { pub fn cancel_pending(&mut self) -> Vec<PendingToolUse> {
let mut pending_tools = Vec::new(); let mut cancelled_tool_uses = Vec::new();
for (tool_use_id, tool_use) in self.pending_tool_uses_by_id.drain() { self.pending_tool_uses_by_id
self.tool_results.insert( .retain(|tool_use_id, tool_use| {
tool_use_id.clone(), if matches!(tool_use.status, PendingToolUseStatus::Error { .. }) {
LanguageModelToolResult { return true;
tool_use_id, }
tool_name: tool_use.name.clone(),
content: "Tool canceled by user".into(), let content = "Tool canceled by user".into();
is_error: true, self.tool_results.insert(
}, tool_use_id.clone(),
); LanguageModelToolResult {
pending_tools.push(tool_use.clone()); tool_use_id: tool_use_id.clone(),
} tool_name: tool_use.name.clone(),
pending_tools content,
is_error: true,
},
);
cancelled_tool_uses.push(tool_use.clone());
false
});
cancelled_tool_uses
} }
pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> { pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> {