Skip to content

Fix multi tool calling #5855

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
DOsinga merged 7 commits into from
Nov 24, 2025
Merged

Fix multi tool calling #5855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
306fdc0
Fix multi toolcalling
Nov 24, 2025
8244c7a
Cleanup1
Nov 24, 2025
3383b64
remove
Nov 24, 2025
6179946
Move around
Nov 24, 2025
d1c2fec
Scenario testing
Nov 24, 2025
a02f0df
Small clean up
Nov 24, 2025
17e718c
Clippy
Nov 24, 2025
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
736 changes: 370 additions & 366 deletions crates/goose-cli/src/scenario_tests/recordings/anthropic/weather_tool.json
View file
Open in desktop

Large diffs are not rendered by default.

620 changes: 314 additions & 306 deletions crates/goose-cli/src/scenario_tests/recordings/azure_openai/weather_tool.json
View file
Open in desktop

Large diffs are not rendered by default.

620 changes: 314 additions & 306 deletions crates/goose-cli/src/scenario_tests/recordings/groq/weather_tool.json
View file
Open in desktop

Large diffs are not rendered by default.

614 changes: 311 additions & 303 deletions crates/goose-cli/src/scenario_tests/recordings/openai/weather_tool.json
View file
Open in desktop

Large diffs are not rendered by default.

611 changes: 317 additions & 294 deletions crates/goose/src/agents/agent.rs
View file
Open in desktop

Large diffs are not rendered by default.

129 changes: 65 additions & 64 deletions crates/goose/src/agents/tool_execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::collections::HashMap;
use std::future::Future;
use std::sync::Arc;

Expand Down Expand Up @@ -52,97 +53,98 @@ impl Agent {
&'a self,
tool_requests: &'a [ToolRequest],
tool_futures: Arc<Mutex<Vec<(String, ToolStream)>>>,
message_tool_response: Arc<Mutex<Message>>,
request_to_response_map: &'a HashMap<String, Arc<Mutex<Message>>>,
cancellation_token: Option<CancellationToken>,
session: &'a Session,
inspection_results: &'a [crate::tool_inspection::InspectionResult],
) -> BoxStream<'a, anyhow::Result<Message>> {
try_stream! {
for request in tool_requests.iter() {
if let Ok(tool_call) = request.tool_call.clone() {
// Find the corresponding inspection result for this tool request
let security_message = inspection_results.iter()
.find(|result| result.tool_request_id == request.id)
.and_then(|result| {
if let crate::tool_inspection::InspectionAction::RequireApproval(Some(message)) = &result.action {
Some(message.clone())
} else {
None
}
});
for request in tool_requests.iter() {
if let Ok(tool_call) = request.tool_call.clone() {
// Find the corresponding inspection result for this tool request
let security_message = inspection_results.iter()
.find(|result| result.tool_request_id == request.id)
.and_then(|result| {
if let crate::tool_inspection::InspectionAction::RequireApproval(Some(message)) = &result.action {
Some(message.clone())
} else {
None
}
});

let confirmation = Message::assistant()
.with_tool_confirmation_request(
request.id.clone(),
tool_call.name.to_string().clone(),
tool_call.arguments.clone().unwrap_or_default(),
security_message,
)
.user_only();
yield confirmation;
let confirmation = Message::assistant()
.with_tool_confirmation_request(
request.id.clone(),
tool_call.name.to_string().clone(),
tool_call.arguments.clone().unwrap_or_default(),
security_message,
)
.user_only();
yield confirmation;

let mut rx = self.confirmation_rx.lock().await;
while let Some((req_id, confirmation)) = rx.recv().await {
if req_id == request.id {
// Log user decision if this was a security alert
if let Some(finding_id) = get_security_finding_id_from_results(&request.id, inspection_results) {
tracing::info!(
counter.goose.prompt_injection_user_decisions = 1,
decision = ?confirmation.permission,
finding_id = %finding_id,
"User security decision"
);
}
let mut rx = self.confirmation_rx.lock().await;
while let Some((req_id, confirmation)) = rx.recv().await {
if req_id == request.id {
// Log user decision if this was a security alert
if let Some(finding_id) = get_security_finding_id_from_results(&request.id, inspection_results) {
tracing::info!(
counter.goose.prompt_injection_user_decisions = 1,
decision = ?confirmation.permission,
finding_id = %finding_id,
"User security decision"
);
}

if confirmation.permission == Permission::AllowOnce || confirmation.permission == Permission::AlwaysAllow {
let (req_id, tool_result) = self.dispatch_tool_call(tool_call.clone(), request.id.clone(), cancellation_token.clone(), session).await;
let mut futures = tool_futures.lock().await;
if confirmation.permission == Permission::AllowOnce || confirmation.permission == Permission::AlwaysAllow {
let (req_id, tool_result) = self.dispatch_tool_call(tool_call.clone(), request.id.clone(), cancellation_token.clone(), session).await;
let mut futures = tool_futures.lock().await;

futures.push((req_id, match tool_result {
Ok(result) => tool_stream(
result.notification_stream.unwrap_or_else(|| Box::new(stream::empty())),
result.result,
),
Err(e) => tool_stream(
Box::new(stream::empty()),
futures::future::ready(Err(e)),
),
}));
futures.push((req_id, match tool_result {
Ok(result) => tool_stream(
result.notification_stream.unwrap_or_else(|| Box::new(stream::empty())),
result.result,
),
Err(e) => tool_stream(
Box::new(stream::empty()),
futures::future::ready(Err(e)),
),
}));

// Update the shared permission manager when user selects "Always Allow"
if confirmation.permission == Permission::AlwaysAllow {
self.tool_inspection_manager
.update_permission_manager(&tool_call.name, PermissionLevel::AlwaysAllow)
.await;
}
} else {
// User declined - add declined response
let mut response = message_tool_response.lock().await;
// Update the shared permission manager when user selects "Always Allow"
if confirmation.permission == Permission::AlwaysAllow {
self.tool_inspection_manager
.update_permission_manager(&tool_call.name, PermissionLevel::AlwaysAllow)
.await;
}
} else {
// User declined - update the specific response message for this request
if let Some(response_msg) = request_to_response_map.get(&request.id) {
let mut response = response_msg.lock().await;
*response = response.clone().with_tool_response(
request.id.clone(),
Ok(vec![Content::text(DECLINED_RESPONSE)]),
);
}
break; // Exit the loop once the matching `req_id` is found
}
break; // Exit the loop once the matching `req_id` is found
}
}
}
}.boxed()
}
}.boxed()
}

pub(crate) fn handle_frontend_tool_requests<'a>(
pub(crate) fn handle_frontend_tool_request<'a>(
&'a self,
tool_requests: &'a [ToolRequest],
tool_request: &'a ToolRequest,
message_tool_response: Arc<Mutex<Message>>,
) -> BoxStream<'a, anyhow::Result<Message>> {
try_stream! {
for request in tool_requests {
if let Ok(tool_call) = request.tool_call.clone() {
if let Ok(tool_call) = tool_request.tool_call.clone() {
if self.is_frontend_tool(&tool_call.name).await {
// Send frontend tool request and wait for response
yield Message::assistant().with_frontend_tool_request(
request.id.clone(),
tool_request.id.clone(),
Ok(tool_call.clone())
);

Expand All @@ -151,7 +153,6 @@ impl Agent {
*response = response.clone().with_tool_response(id, result);
}
}
}
}
}
.boxed()
Expand Down
Loading