Merge branch 'main' into mcp-over-acp-proxy

Author: benbrandt

.claude/settings.local.json

@@ -34,7 +34,7 @@ tokio = { version = "1.48", features = ["full"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 
 # Protocol
-agent-client-protocol-schema = { path = "../agent-client-protocol", features = ["tracing"] }
+agent-client-protocol-schema = { version = "=0.12.2", features = ["tracing"] }
 
 # Serialization
 serde = { version = "1.0", features = ["derive", "rc"] }
@@ -48,7 +48,6 @@ uuid = { version = "1.18", features = ["v4"] }
 anyhow = "1.0"
 thiserror = "2.0"
 tracing = "0.1"
-tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
 
 # MCP SDK
@@ -59,9 +58,6 @@ clap = { version = "4.5", features = ["derive"] }
 
 # HTTP
 axum = "0.8"
-hyper = "1.0"
-tower = "0.5"
-tower-http = { version = "0.6", features = ["fs"] }
 async-process = "2"
 async-stream = "0.3.6"
 blocking = "1"
@@ -76,7 +72,6 @@ strip-ansi-escapes = "0.2"
 
 
 # Proc macros
-proc-macro2 = "1"
 quote = "1"
 syn = { version = "2", features = ["full", "extra-traits"] }
 

Cargo.lock

@@ -18,8 +18,7 @@ path = "src/main.rs"
 test-support = []
 
 [dependencies]
-agent-client-protocol = { workspace = true }
-agent-client-protocol-schema.workspace = true
+agent-client-protocol.workspace = true
 agent-client-protocol-trace-viewer.workspace = true
 anyhow.workspace = true
 async-stream.workspace = true
@@ -28,18 +27,14 @@ chrono.workspace = true
 clap.workspace = true
 futures.workspace = true
 futures-concurrency.workspace = true
-hyper.workspace = true
 rustc-hash.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-shell-words.workspace = true
 strip-ansi-escapes.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
 tokio-util.workspace = true
-tower.workspace = true
 tracing.workspace = true
-tracing-appender.workspace = true
 tracing-subscriber.workspace = true
 uuid.workspace = true
 

Cargo.toml

@@ -11,14 +11,13 @@ keywords = ["acp", "agent", "proxy", "mcp", "cookbook"]
 categories = ["development-tools"]
 
 [dependencies]
-agent-client-protocol-conductor.workspace = true
+
+[dev-dependencies]
 agent-client-protocol.workspace = true
 agent-client-protocol-rmcp.workspace = true
 rmcp.workspace = true
 schemars.workspace = true
 serde.workspace = true
-serde_json.workspace = true
-tokio.workspace = true
 tracing.workspace = true
 
 [lints]

src/agent-client-protocol-conductor/Cargo.toml

@@ -12,7 +12,6 @@ description = "Derive macros for Agent Client Protocol JSON-RPC traits"
 proc-macro = true
 
 [dependencies]
-proc-macro2.workspace = true
 quote.workspace = true
 syn.workspace = true
 

src/agent-client-protocol-cookbook/Cargo.toml

@@ -12,7 +12,6 @@ categories = ["development-tools"]
 
 [dependencies]
 agent-client-protocol.workspace = true
-futures.workspace = true
 futures-concurrency.workspace = true
 rmcp.workspace = true
 tokio.workspace = true

src/agent-client-protocol-derive/Cargo.toml

@@ -19,9 +19,7 @@ path = "src/bin/testy.rs"
 
 [dependencies]
 agent-client-protocol.workspace = true
-yopo.workspace = true
 anyhow.workspace = true
-futures.workspace = true
 rmcp = { workspace = true, features = ["server", "client", "transport-child-process", "transport-streamable-http-client-reqwest"] }
 schemars.workspace = true
 serde.workspace = true

src/agent-client-protocol-rmcp/Cargo.toml

@@ -23,11 +23,8 @@ anyhow.workspace = true
 axum.workspace = true
 clap.workspace = true
 open.workspace = true
-serde.workspace = true
 serde_json.workspace = true
 tokio.workspace = true
-tower.workspace = true
-tower-http.workspace = true
 
 [lints]
 workspace = true

src/agent-client-protocol-test/Cargo.toml

@@ -36,19 +36,25 @@ pub struct TraceHandle {
 impl TraceHandle {
     /// Push a new event to the trace.
     pub fn push(&self, event: serde_json::Value) {
-        self.events.lock().unwrap().push(event);
+        self.events
+            .lock()
+            .expect("events mutex poisoned")
+            .push(event);
     }
 
     /// Get the current number of events.
     #[must_use]
     pub fn len(&self) -> usize {
-        self.events.lock().unwrap().len()
+        self.events.lock().expect("events mutex poisoned").len()
     }
 
     /// Check if empty.
     #[must_use]
     pub fn is_empty(&self) -> bool {
-        self.events.lock().unwrap().is_empty()
+        self.events
+            .lock()
+            .expect("events mutex poisoned")
+            .is_empty()
     }
 }
 
@@ -192,7 +198,7 @@ async fn serve_events_from_file(path: &PathBuf) -> Response {
 }
 
 fn serve_events_from_memory(events: &Arc<Mutex<Vec<serde_json::Value>>>) -> Response {
-    let events = events.lock().unwrap();
+    let events = events.lock().expect("events mutex poisoned");
     match serde_json::to_string(&*events) {
         Ok(json) => (StatusCode::OK, [("content-type", "application/json")], json).into_response(),
         Err(e) => (