Merge pull request #73 from nikomatsakis/main

upgrades in prep for release

Author: nikomatsakis

Cargo.lock

@@ -13,14 +13,14 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-sacp = "10.0.0-alpha.3"
-sacp-tokio = "10.0.0-alpha.3"
-sacp-conductor = "10.0.0-alpha.3"
-sacp-rmcp = "10.0.0-alpha.3"
-sacp-tee = "10.0.0-alpha.3"
-sacp-test = "10.0.0-alpha.3"
-yopo = "10.0.0-alpha.3"
-elizacp = "10.0.0-alpha.3"
+sacp = "10.0.0-alpha.4"
+sacp-tokio = "10.0.0-alpha.4"
+sacp-conductor = "10.0.0-alpha.4"
+sacp-rmcp = "10.0.0-alpha.4"
+sacp-tee = "10.0.0-alpha.4"
+sacp-test = "10.0.0-alpha.4"
+yopo = "10.0.0-alpha.4"
+elizacp = "10.0.0-alpha.4"
 jsonrpcmsg = "0.1.2"
 
 # Core async runtime
@@ -48,7 +48,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 rmcp = { version = "0.12", features = ["server", "transport-io", "schemars"] }
 
 # Sparkle integration
-sparkle = { package = "sparkle-mcp", version = "0.4.0" }
+sparkle = { package = "sparkle-mcp", version = "0.4.1" }
 
 # CLI parsing
 clap = { version = "4.0", features = ["derive"] }

Cargo.toml

@@ -66,7 +66,8 @@ fn main() -> Result<()> {
     }
 
     // Determine what to install
-    let install_acp = args.all || args.acp;
+    // --zed implies --acp since Zed config points to ACP binaries
+    let install_acp = args.all || args.acp || args.zed;
     let install_vscode = args.all || args.vscode;
     let configure_zed = args.all || args.zed;
 

setup/src/main.rs

@@ -11,7 +11,8 @@ use sacp::{
     ProxyToConductor,
     mcp_server::{McpContext, McpServerBuilder},
     schema::{
-        RequestPermissionOutcome, RequestPermissionRequest, RequestPermissionResponse, StopReason,
+        RequestPermissionOutcome, RequestPermissionRequest, RequestPermissionResponse,
+        SelectedPermissionOutcome, StopReason,
     },
     util::MatchMessage,
 };
@@ -166,7 +167,8 @@ async fn run_research(
                         StopReason::MaxTokens
                         | StopReason::MaxTurnRequests
                         | StopReason::Refusal
-                        | StopReason::Cancelled => {
+                        | StopReason::Cancelled
+                        | _ => {
                             return Err(sacp::util::internal_error(format!(
                                 "researcher stopped early: {stop_reason:?}"
                             )));
@@ -192,15 +194,15 @@ fn approve_tool_request(
             sacp::schema::PermissionOptionKind::AllowOnce
             | sacp::schema::PermissionOptionKind::AllowAlways => true,
             sacp::schema::PermissionOptionKind::RejectOnce
-            | sacp::schema::PermissionOptionKind::RejectAlways => false,
+            | sacp::schema::PermissionOptionKind::RejectAlways
+            | _ => false,
         })
-        .map(|option| RequestPermissionOutcome::Selected {
-            option_id: option.id.clone(),
+        .map(|option| {
+            RequestPermissionOutcome::Selected(SelectedPermissionOutcome::new(
+                option.option_id.clone(),
+            ))
         })
         .unwrap_or(RequestPermissionOutcome::Cancelled);
 
-    request_cx.respond(RequestPermissionResponse {
-        outcome,
-        meta: None,
-    })
+    request_cx.respond(RequestPermissionResponse::new(outcome))
 }