Skip to content

In non-interactive mode, request alternative method on tool rejection #3256

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

In non-interactive mode, request alternative method on tool rejection #3256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 34 additions & 1 deletion crates/chat-cli/src/cli/chat/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,8 @@ impl ChatSession {
return Ok(());
},
(false, false) => {
// This should be unreachable now - tools are rejected in the permission loop
error!("Reached PromptUser with pending tools in non-interactive mode");
return Err(ChatError::NonInteractiveToolApproval);
},
_ => (),
Expand Down Expand Up @@ -2198,6 +2200,9 @@ impl ChatSession {
self.conversation.enter_tangent_mode();
}

// Initialize tool_results to collect errors for rejected tools
let mut tool_results: Vec<ToolUseResult> = vec![];

// Verify tools have permissions.
for i in 0..self.tool_uses.len() {
let tool = &mut self.tool_uses[i];
Expand Down Expand Up @@ -2283,6 +2288,30 @@ impl ChatSession {
continue;
}

// Handle non-interactive mode - reject tool and continue
if !self.interactive {
let error_message = format!(
"Tool '{}' requires approval but --no-interactive was specified. \
This tool is not trusted. Please try an alternative approach.",
tool.name
);

tool_results.push(ToolUseResult {
tool_use_id: tool.id.clone(),
content: vec![ToolUseResultBlock::Text(error_message)],
status: ToolResultStatus::Error,
});

self.tool_use_telemetry_events
.entry(tool.id.clone())
.and_modify(|ev| {
ev.is_trusted = false;
ev.is_accepted = false;
});

continue;
}

self.pending_tool_index = Some(i);

return Ok(ChatState::PromptUser {
Expand All @@ -2292,10 +2321,14 @@ impl ChatSession {

// All tools are allowed now
// Execute the requested tools.
let mut tool_results = vec![];
let mut image_blocks: Vec<RichImageBlock> = Vec::new();

for tool in &self.tool_uses {
// Skip tools that weren't accepted (already have error results)
if !tool.accepted {
continue;
}

let tool_start = std::time::Instant::now();
let mut tool_telemetry = self.tool_use_telemetry_events.entry(tool.id.clone());
tool_telemetry = tool_telemetry.and_modify(|ev| {
Expand Down