Skip to content

fix: wrap permission auto-reply in outcome object and select optionId dynamically #148

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

Closed
DrVictorChen wants to merge 1 commit into from
Closed

fix: wrap permission auto-reply in outcome object and select optionId dynamically #148

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
26 changes: 24 additions & 2 deletions src/acp/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,37 @@ impl AcpConnection {
debug!(line = line.trim(), "acp_recv");

// Auto-reply session/request_permission
// Dynamically pick the most permissive option from the request's
// options array instead of hardcoding an optionId. Different ACP
// agents use different ids (e.g. "allow_always" vs "allow-always",
// "bypassPermissions" for ExitPlanMode), so we select by `kind`.
if msg.method.as_deref() == Some("session/request_permission") {
if let Some(id) = msg.id {
let title = msg.params.as_ref()
.and_then(|p| p.get("toolCall"))
.and_then(|t| t.get("title"))
.and_then(|t| t.as_str())
.unwrap_or("?");
info!(title, "auto-allow permission");
let reply = JsonRpcResponse::new(id, json!({"optionId": "allow_always"}));

let options = msg.params.as_ref()
.and_then(|p| p.get("options"))
.and_then(|o| o.as_array());

let picked = options.and_then(|opts| {
opts.iter()
.find(|o| o.get("kind").and_then(|k| k.as_str()) == Some("allow_always"))
.or_else(|| opts.iter().find(|o| o.get("kind").and_then(|k| k.as_str()) == Some("allow_once")))
.or_else(|| opts.iter().find(|o| o.get("kind").and_then(|k| k.as_str()) != Some("reject_once")))
.and_then(|o| o.get("optionId").and_then(|v| v.as_str()))
}).unwrap_or("allow_always");

info!(title, picked, "auto-allow permission");
let reply = JsonRpcResponse::new(id, json!({
"outcome": {
"outcome": "selected",
"optionId": picked
}
}));
if let Ok(data) = serde_json::to_string(&reply) {
let mut w = stdin_clone.lock().await;
let _ = w.write_all(format!("{data}\n").as_bytes()).await;
Expand Down