aljaz/goose
1
0
Fork 0
mirror of https://github.com/aljazceru/goose.git synced 2026-02-06 15:14:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix program crashes and allow cancelling tool calls (#2586)

Browse Source
This commit is contained in:
Best Codes
2025-05-22 09:52:46 -05:00
committed by GitHub
parent b3dc1289f4
commit e9c93834cc
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
crates/goose-cli/src/session/mod.rs
View File

@@ -706,15 +706,44 @@ impl Session {
let prompt = "Goose would like to call the above tool, do you allow?".to_string();
// Get confirmation from user
let permission = cliclack::select(prompt)
let permission_result = cliclack::select(prompt)
.item(Permission::AllowOnce, "Allow", "Allow the tool call once")
.item(Permission::AlwaysAllow, "Always Allow", "Always allow the tool call")
.item(Permission::DenyOnce, "Deny", "Deny the tool call")
.interact()?;
self.agent.handle_confirmation(confirmation.id.clone(), PermissionConfirmation {
principal_type: PrincipalType::Tool,
permission,
},).await;
.item(Permission::Cancel, "Cancel", "Cancel the AI response and tool call")
.interact();
let permission = match permission_result {
Ok(p) => p, // If Ok, use the selected permission
Err(e) => {
// Check if the error is an interruption (Ctrl+C/Cmd+C, Escape)
if e.kind() == std::io::ErrorKind::Interrupted {
Permission::Cancel // If interrupted, set permission to Cancel
} else {
return Err(e.into()); // Otherwise, convert and propagate the original error
}
}
};
if permission == Permission::Cancel {
output::render_text("Tool call cancelled. Returning to chat...", Some(Color::Yellow), true);
let mut response_message = Message::user();
response_message.content.push(MessageContent::tool_response(
confirmation.id.clone(),
Err(ToolError::ExecutionError("Tool call cancelled by user".to_string()))
));
self.messages.push(response_message);
session::persist_messages(&self.session_file, &self.messages, None).await?;
drop(stream);
break;
} else {
self.agent.handle_confirmation(confirmation.id.clone(), PermissionConfirmation {
principal_type: PrincipalType::Tool,
permission,
},).await;
}
} else if let Some(MessageContent::ContextLengthExceeded(_)) = message.content.first() {
output::hide_thinking();

1
crates/goose/src/permission/permission_confirmation.rs
View File

@@ -5,6 +5,7 @@ use utoipa::ToSchema;
pub enum Permission {
AlwaysAllow,
AllowOnce,
Cancel,
DenyOnce,
}