Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions crates/loopal-acp/src/adapter/control_command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ pub(crate) fn parse_loopal_control(subtype: &str, p: &Value) -> Option<ControlCo
"loopal.goalReopen" => Some(C::GoalUserReopen),
"loopal.goalClear" => Some(C::GoalClear),
"set_model" => p["model"].as_str().map(|s| C::ModelSwitch(s.to_string())),
"set_permission_mode" => p["mode"]
.as_str()
.map(|s| C::PermissionModeSwitch(s.to_string())),
_ => None,
}
}
Expand Down Expand Up @@ -78,6 +81,10 @@ mod tests {
parse_loopal_control("loopal.mode", &json!({"mode":"plan"})),
Some(ControlCommand::ModeSwitch(AgentMode::Plan))
));
assert!(matches!(
parse_loopal_control("set_permission_mode", &json!({"mode":"ask_dangerous"})),
Some(ControlCommand::PermissionModeSwitch(m)) if m == "ask_dangerous"
));
}

#[test]
Expand Down Expand Up @@ -105,5 +112,6 @@ mod tests {
assert!(parse_loopal_control("loopal.bogus", &json!({})).is_none());
assert!(parse_loopal_control("loopal.bgTaskKill", &json!({})).is_none());
assert!(parse_loopal_control("loopal.mode", &json!({"mode":"bogus"})).is_none());
assert!(parse_loopal_control("set_permission_mode", &json!({})).is_none());
}
}
49 changes: 37 additions & 12 deletions crates/loopal-acp/src/adapter/lifecycle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,29 @@ use tracing::info;
use crate::adapter::AcpAdapter;
use crate::types::make_init_response;

/// `initialize` result + AgentsMesh extensions: `controlRequest` (runner routes
/// control-panel actions via `session/control_request`) and `permissionModes`
/// (AgentsMesh selector renders loopal's modes, not Claude Code's).
/// `permissionModes` must match `loopal_tool_api::PermissionMode` (SSOT).
fn init_response_with_extensions() -> Value {
let mut result = serde_json::to_value(make_init_response()).unwrap_or_default();
if let Some(obj) = result.as_object_mut() {
obj.insert(
"agentsmeshExtensions".into(),
serde_json::json!({
"controlRequest": true,
"permissionModes": ["bypass", "ask_dangerous", "ask_any_write"],
}),
);
}
result
}

impl AcpAdapter {
/// Handle `initialize` — return agent capabilities and info. Advertises
/// the AgentsMesh `controlRequest` extension so the runner routes Loopal
/// control-panel actions (bg-task kill / cron delete) via
/// `session/control_request`.
pub(crate) async fn handle_initialize(&self, id: i64, _params: Value) {
let mut result = serde_json::to_value(make_init_response()).unwrap_or_default();
if let Some(obj) = result.as_object_mut() {
obj.insert(
"agentsmeshExtensions".into(),
serde_json::json!({ "controlRequest": true }),
);
}
self.acp_out.respond(id, result).await;
self.acp_out
.respond(id, init_response_with_extensions())
.await;
info!("ACP initialized");
}

Expand All @@ -29,3 +38,19 @@ impl AcpAdapter {
self.acp_out.respond(id, serde_json::json!({})).await;
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn init_response_advertises_control_and_permission_modes() {
let resp = init_response_with_extensions();
let ext = &resp["agentsmeshExtensions"];
assert_eq!(ext["controlRequest"], serde_json::json!(true));
assert_eq!(
ext["permissionModes"],
serde_json::json!(["bypass", "ask_dangerous", "ask_any_write"])
);
}
}
Loading