diff --git a/Cargo.lock b/Cargo.lock
index 4f1c3ccf7..937f67c79 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -540,9 +540,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "2.2.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13f780597b2c88ab83d02509bcc3e86366751f86fa12114005e35c55ed691763"
+checksum = "6e582d0a6aed50feeea4d4ed3c57919db2f614a5cec42cd7acd1717231fa4f2f"
 dependencies = [
  "agent-client-protocol-derive",
  "agent-client-protocol-schema",
@@ -564,9 +564,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol-derive"
-version = "2.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4893bfb11e0e193aa5a64611a126ee87567acb1879556519c902722899229de"
+checksum = "26b57a6a7fae5ebd4368712bfcd0a366a20e1370ac3f3fcd83379b37637501c9"
 dependencies = [
  "quote",
  "syn 3.0.6",
@@ -574,9 +574,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol-schema"
-version = "1.9.1"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d595a79e1665d02c91c7dd1bedd118501e75cc0a3d5b1651b5150ec4c5c1e0d"
+checksum = "7c3ffd489b0e2f96a134d7966c2f43d874d91299e951b66093b91b54b00b7f8f"
 dependencies = [
  "anyhow",
  "derive_more",
@@ -585,7 +585,6 @@ dependencies = [
  "serde_json",
  "serde_with",
  "strum",
- "tracing",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index e178e84e8..60987adc0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ tracing-subscriber = { version = "0.3.23", features = ["env-filter", "json"] }
 tracing-appender = "0.2"
 
 # ACP
-agent-client-protocol = { version = "=2.2.0", features = ["unstable_protocol_v2", "unstable_session_compaction"] }
+agent-client-protocol = { version = "=3.1.0", features = ["unstable_protocol_v2", "unstable_session_compaction"] }
 tokio-tungstenite = { version = "0.30.0", features = ["rustls-tls-webpki-roots"] }
 
 # MCP and API clients
diff --git a/crates/acp-utils/Cargo.toml b/crates/acp-utils/Cargo.toml
index b03b3674c..a9fcbbb05 100644
--- a/crates/acp-utils/Cargo.toml
+++ b/crates/acp-utils/Cargo.toml
@@ -34,7 +34,7 @@ name = "fake_agent_server"
 required-features = ["testing", "websocket"]
 
 [dependencies]
-agent-client-protocol = { workspace = true }
+agent-client-protocol = { workspace = true, features = ["schemars"] }
 clankerdiff-protocol = { workspace = true }
 futures = { workspace = true }
 tokio-util = { workspace = true }
diff --git a/crates/aether-cli/Cargo.toml b/crates/aether-cli/Cargo.toml
index 7bbbb73f2..3f05a8349 100644
--- a/crates/aether-cli/Cargo.toml
+++ b/crates/aether-cli/Cargo.toml
@@ -44,7 +44,7 @@ mcp-servers = { package = "aether-mcp-servers", path = "../mcp-servers", feature
 wisp = { package = "aether-wisp", path = "../wisp", version = "0.7.15" }
 ratatui = { workspace = true }
 acp_utils = { package = "aether-acp-utils", path = "../acp-utils", features = ["websocket"], version = "0.5.14" }
-agent-client-protocol = { workspace = true }
+agent-client-protocol = { workspace = true, features = ["stdio"] }
 clankerdiff-core = { workspace = true }
 clankerdiff-protocol = { workspace = true }
 clankerdiff-server = { workspace = true }
diff --git a/crates/wisp/Cargo.toml b/crates/wisp/Cargo.toml
index 215d3e916..eca81fb34 100644
--- a/crates/wisp/Cargo.toml
+++ b/crates/wisp/Cargo.toml
@@ -51,7 +51,7 @@ clankerdiff-ratatui = { workspace = true }
 clankerdiff-client = { workspace = true }
 utils = { package = "aether-utils", path = "../utils", version = "0.2.19" }
 acp_utils = { package = "aether-acp-utils", path = "../acp-utils", features = ["client"], version = "0.5.14" }
-agent-client-protocol = { workspace = true }
+agent-client-protocol = { workspace = true, features = ["process"] }
 ratatui = { workspace = true }
 crossterm = { workspace = true }
 futures = { workspace = true }