Skip to content

fix: Improve error messages for invalid tool calls #6483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamadeo merged 4 commits into from
Jan 14, 2026
Merged

fix: Improve error messages for invalid tool calls #6483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59cd390
fix: add descriptive error messages for tool not found errors
jasoncarr0 Jan 13, 2026
13195e8
fix: prevent double wrapping of ErrorData in agent dispatch
jasoncarr0 Jan 13, 2026
b82e6fb
Fix formatting
jasoncarr0 Jan 13, 2026
876917a
Remove a redundant clone
jasoncarr0 Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions crates/goose/src/agents/agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,11 +529,11 @@ impl Agent {
"tool_execution_failed",
&format!("{}: {}", tool_call.name, e),
);
ToolCallResult::from(Err(ErrorData::new(
ErrorCode::INTERNAL_ERROR,
e.to_string(),
None,
)))
// Try to downcast to ErrorData to avoid double wrapping
let error_data = e.downcast::<ErrorData>().unwrap_or_else(|e| {
ErrorData::new(ErrorCode::INTERNAL_ERROR, e.to_string(), None)
});
ToolCallResult::from(Err(error_data))
})
};

Expand Down
12 changes: 10 additions & 2 deletions crates/goose/src/agents/extension_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,11 @@ impl ExtensionManager {
self.get_client_for_tool(&tool_call.name)
.await
.ok_or_else(|| {
ErrorData::new(ErrorCode::RESOURCE_NOT_FOUND, tool_call.name.clone(), None)
ErrorData::new(
ErrorCode::RESOURCE_NOT_FOUND,
format!("Tool '{}' not found", tool_call.name),
None,
)
})?;

// rsplit returns the iterator in reverse, tool_name is then at 0
Expand All @@ -1095,7 +1099,11 @@ impl ExtensionManager {
.strip_prefix(client_name.as_str())
.and_then(|s| s.strip_prefix("__"))
.ok_or_else(|| {
ErrorData::new(ErrorCode::RESOURCE_NOT_FOUND, tool_call.name.clone(), None)
ErrorData::new(
ErrorCode::RESOURCE_NOT_FOUND,
format!("Invalid tool name format: '{}'", tool_call.name),
None,
)
})?
.to_string();

Expand Down