diff --git a/Cargo.lock b/Cargo.lock
index 1dadf550..a63b5f95 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3,99 +3,13 @@
 version = 4
 
 [[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
-[[package]]
-name = "agent-client-protocol"
+name = "agent-client-protocol-schema"
 version = "0.4.6"
 dependencies = [
  "anyhow",
- "async-broadcast",
- "async-trait",
- "env_logger",
- "futures",
- "futures-util",
- "log",
- "parking_lot",
- "piper",
- "pretty_assertions",
- "rustyline",
  "schemars",
  "serde",
  "serde_json",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
-dependencies = [
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
-dependencies = [
- "anstyle",
- "once_cell_polyfill",
- "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -104,523 +18,24 @@ version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
-[[package]]
-name = "async-broadcast"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
-dependencies = [
- "event-listener",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
-[[package]]
-name = "autocfg"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-
-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "bitflags"
-version = "2.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
-
-[[package]]
-name = "bytes"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
-[[package]]
-name = "clipboard-win"
-version = "5.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
-dependencies = [
- "error-code",
-]
-
-[[package]]
-name = "colorchoice"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
-
-[[package]]
-name = "concurrent-queue"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
-[[package]]
-name = "endian-type"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
-
-[[package]]
-name = "env_filter"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "jiff",
- "log",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
-dependencies = [
- "libc",
- "windows-sys 0.61.0",
-]
-
-[[package]]
-name = "error-code"
-version = "3.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
-
-[[package]]
-name = "event-listener"
-version = "5.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
-dependencies = [
- "event-listener",
- "pin-project-lite",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
-[[package]]
-name = "fd-lock"
-version = "4.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78"
-dependencies = [
- "cfg-if",
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
-
-[[package]]
-name = "futures-task"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
-
-[[package]]
-name = "futures-util"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
-[[package]]
-name = "home"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "io-uring"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
 [[package]]
 name = "itoa"
 version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
-[[package]]
-name = "jiff"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
-dependencies = [
- "jiff-static",
- "log",
- "portable-atomic",
- "portable-atomic-util",
- "serde",
-]
-
-[[package]]
-name = "jiff-static"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.175"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
-
-[[package]]
-name = "lock_api"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
-
 [[package]]
 name = "memchr"
 version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-dependencies = [
- "adler2",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
-dependencies = [
- "libc",
- "wasi",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "nibble_vec"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "nix"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
-dependencies = [
- "bitflags",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
-
-[[package]]
-name = "parking"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "piper"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
-dependencies = [
- "atomic-waker",
- "fastrand",
- "futures-io",
-]
-
-[[package]]
-name = "portable-atomic"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
-
-[[package]]
-name = "portable-atomic-util"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
-dependencies = [
- "portable-atomic",
-]
-
-[[package]]
-name = "pretty_assertions"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
-dependencies = [
- "diff",
- "yansi",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.101"
@@ -639,25 +54,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "radix_trie"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
-dependencies = [
- "endian-type",
- "nibble_vec",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "ref-cast"
 version = "1.0.24"
@@ -678,76 +74,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "regex"
-version = "1.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
-
-[[package]]
-name = "rustix"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
-dependencies = [
- "bitflags",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.61.0",
-]
-
-[[package]]
-name = "rustyline"
-version = "17.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6614df0b6d4cfb20d1d5e295332921793ce499af3ebc011bf1e393380e1e492"
-dependencies = [
- "bitflags",
- "cfg-if",
- "clipboard-win",
- "fd-lock",
- "home",
- "libc",
- "log",
- "memchr",
- "nix",
- "radix_trie",
- "unicode-segmentation",
- "unicode-width",
- "utf8parse",
- "windows-sys 0.60.2",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.20"
@@ -779,12 +105,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
 [[package]]
 name = "serde"
 version = "1.0.226"
@@ -839,37 +159,6 @@ dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
-
-[[package]]
-name = "smallvec"
-version = "1.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
-
-[[package]]
-name = "socket2"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.106"
@@ -881,250 +170,8 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "tokio"
-version = "1.47.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
-dependencies = [
- "backtrace",
- "bytes",
- "io-uring",
- "libc",
- "mio",
- "pin-project-lite",
- "signal-hook-registry",
- "slab",
- "socket2",
- "tokio-macros",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-io",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
-[[package]]
-name = "unicode-width"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
-
-[[package]]
-name = "windows-link"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-link"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.3",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.61.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
-dependencies = [
- "windows-link 0.2.0",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
-dependencies = [
- "windows-link 0.1.3",
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-
-[[package]]
-name = "yansi"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
diff --git a/Cargo.toml b/Cargo.toml
index 7f03c72a..c9a8ad50 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "agent-client-protocol"
+name = "agent-client-protocol-schema"
 authors = ["Zed <hi@zed.dev>"]
 version = "0.4.6"
 edition = "2024"
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/agent-client-protocol"
 readme = "README.md"
 keywords = ["agent", "client", "protocol", "ai", "editor"]
 categories = ["development-tools", "api-bindings"]
-include = ["/rust/**/*.rs", "/README.md", "/LICENSE-APACHE", "/Cargo.toml"]
+include = ["/rust/**/*.rs", "/README.md", "/LICENSE", "/Cargo.toml"]
 
 [features]
 unstable = []
@@ -20,43 +20,8 @@ unstable = []
 path = "rust/acp.rs"
 doctest = false
 
-[[bin]]
-name = "generate"
-path = "rust/bin/generate.rs"
-
-[[example]]
-name = "agent"
-path = "rust/examples/agent.rs"
-
-[[example]]
-name = "client"
-path = "rust/examples/client.rs"
-
 [dependencies]
 anyhow = "1"
-async-broadcast = "0.7"
-async-trait = "0.1"
-futures = { version = "0.3" }
-log = "0.4"
-parking_lot = "0.12"
 schemars = { version = "1" }
 serde = { version = "1", features = ["derive", "rc"] }
 serde_json = { version = "1", features = ["raw_value"] }
-
-[dev-dependencies]
-env_logger = "0.11"
-futures-util = { version = "0.3", features = ["io"] }
-piper = "0.2"
-pretty_assertions = "1"
-rustyline = "17"
-tokio = { version = "1", features = [
-    "macros",
-    "rt",
-    "time",
-    "io-std",
-    "io-util",
-    "net",
-    "process",
-    "sync",
-] }
-tokio-util = { version = "0.7", features = ["compat"] }
diff --git a/LICENSE-APACHE b/LICENSE
similarity index 100%
rename from LICENSE-APACHE
rename to LICENSE
diff --git a/README.md b/README.md
index 2123383a..8a17ea58 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Learn more at [agentclientprotocol.com](https://agentclientprotocol.com/).
 
 - **JSON Schema**: [`schema.json`](./schema/schema.json)
 - **Kotlin**: [`acp-kotlin`](https://github.com/agentclientprotocol/kotlin-sdk) – supports JVM, other targets are in progress
-- **Rust**: [`agent-client-protocol`](https://crates.io/crates/agent-client-protocol) - See [examples/agent.rs](./rust/examples/agent.rs) and [examples/client.rs](./rust/examples/client.rs)
+- **Rust**: [`agent-client-protocol`](https://crates.io/crates/agent-client-protocol) - See [examples/agent.rs](https://github.com/agentclientprotocol/rust-sdk/blob/main/examples/agent.rs) and [examples/client.rs](https://github.com/agentclientprotocol/rust-sdk/blob/main/examples/client.rs)
 - **TypeScript**: [`@agentclientprotocol/sdk`](https://www.npmjs.com/package/@agentclientprotocol/sdk) - See [examples/](https://github.com/agentclientprotocol/typescript-sdk/tree/main/src/examples)
 
 ### From the Community
diff --git a/docs/libraries/rust.mdx b/docs/libraries/rust.mdx
index 88341898..3c9a4366 100644
--- a/docs/libraries/rust.mdx
+++ b/docs/libraries/rust.mdx
@@ -21,9 +21,9 @@ trait or the
 trait to define the interaction with the ACP counterpart.
 
 The
-[agent](https://github.com/agentclientprotocol/agent-client-protocol/blob/main/rust/examples/agent.rs)
+[agent](https://github.com/agentclientprotocol/rust-sdk/blob/main/examples/agent.rs)
 and
-[client](https://github.com/agentclientprotocol/agent-client-protocol/blob/main/rust/examples/client.rs)
+[client](https://github.com/agentclientprotocol/rust-sdk/blob/main/examples/client.rs)
 example binaries provide runnable examples of how to do this, which you can use
 as a starting point.
 
diff --git a/package.json b/package.json
index 01c1a6db..07e531e7 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   "author": "Zed Industries",
   "files": [
     "schema/schema.json",
-    "LICENSE-APACHE"
+    "LICENSE"
   ],
   "type": "module",
   "scripts": {
diff --git a/rust/acp.rs b/rust/acp.rs
index a3e4e832..1cf1204b 100644
--- a/rust/acp.rs
+++ b/rust/acp.rs
@@ -27,9 +27,9 @@
 //! which define the core methods and capabilities of each side of the connection.
 //!
 //! To see working examples of these traits in action, check out the
-//! [agent](https://github.com/agentclientprotocol/agent-client-protocol/blob/main/rust/examples/agent.rs)
+//! [agent](https://github.com/agentclientprotocol/rust-sdk/blob/main/examples/agent.rs)
 //! and
-//! [client](https://github.com/agentclientprotocol/agent-client-protocol/blob/main/rust/examples/client.rs)
+//! [client](https://github.com/agentclientprotocol/rust-sdk/blob/main/examples/client.rs)
 //! example binaries included with this crate.
 //!
 //! ### Implementation Pattern
@@ -56,7 +56,6 @@ mod content;
 mod error;
 mod ext;
 mod plan;
-mod sdk;
 mod tool_call;
 mod version;
 
@@ -66,7 +65,6 @@ pub use content::*;
 pub use error::*;
 pub use ext::*;
 pub use plan::*;
-pub use sdk::*;
 pub use serde_json::value::RawValue;
 pub use tool_call::*;
 pub use version::*;
diff --git a/rust/examples/agent.rs b/rust/examples/agent.rs
deleted file mode 100644
index 5bd012f1..00000000
--- a/rust/examples/agent.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-//! A simple ACP agent server for educational purposes.
-//!
-//! The agent communicates with clients over stdio. To run it with logging:
-//!
-//! ```bash
-//! RUST_LOG=info cargo run --example agent
-//! ```
-//!
-//! To connect it to the example client from this crate:
-//!
-//! ```bash
-//! cargo build --example agent && cargo run --example client -- target/debug/examples/agent
-//! ```
-
-use std::cell::Cell;
-
-use agent_client_protocol::{
-    self as acp, AuthenticateResponse, Client, ExtNotification, ExtRequest, ExtResponse,
-    SessionNotification, SetSessionModeResponse,
-};
-use serde_json::json;
-use tokio::sync::{mpsc, oneshot};
-use tokio_util::compat::{TokioAsyncReadCompatExt as _, TokioAsyncWriteCompatExt as _};
-
-struct ExampleAgent {
-    session_update_tx: mpsc::UnboundedSender<(acp::SessionNotification, oneshot::Sender<()>)>,
-    next_session_id: Cell<u64>,
-}
-
-impl ExampleAgent {
-    fn new(
-        session_update_tx: mpsc::UnboundedSender<(acp::SessionNotification, oneshot::Sender<()>)>,
-    ) -> Self {
-        Self {
-            session_update_tx,
-            next_session_id: Cell::new(0),
-        }
-    }
-}
-
-#[async_trait::async_trait(?Send)]
-impl acp::Agent for ExampleAgent {
-    async fn initialize(
-        &self,
-        arguments: acp::InitializeRequest,
-    ) -> Result<acp::InitializeResponse, acp::Error> {
-        log::info!("Received initialize request {arguments:?}");
-        Ok(acp::InitializeResponse {
-            protocol_version: acp::V1,
-            agent_capabilities: acp::AgentCapabilities::default(),
-            auth_methods: Vec::new(),
-            meta: None,
-        })
-    }
-
-    async fn authenticate(
-        &self,
-        arguments: acp::AuthenticateRequest,
-    ) -> Result<AuthenticateResponse, acp::Error> {
-        log::info!("Received authenticate request {arguments:?}");
-        Ok(AuthenticateResponse::default())
-    }
-
-    async fn new_session(
-        &self,
-        arguments: acp::NewSessionRequest,
-    ) -> Result<acp::NewSessionResponse, acp::Error> {
-        log::info!("Received new session request {arguments:?}");
-        let session_id = self.next_session_id.get();
-        self.next_session_id.set(session_id + 1);
-        Ok(acp::NewSessionResponse {
-            session_id: acp::SessionId(session_id.to_string().into()),
-            modes: None,
-            #[cfg(feature = "unstable")]
-            models: None,
-            meta: None,
-        })
-    }
-
-    async fn load_session(
-        &self,
-        arguments: acp::LoadSessionRequest,
-    ) -> Result<acp::LoadSessionResponse, acp::Error> {
-        log::info!("Received load session request {arguments:?}");
-        Ok(acp::LoadSessionResponse {
-            modes: None,
-            #[cfg(feature = "unstable")]
-            models: None,
-            meta: None,
-        })
-    }
-
-    async fn prompt(
-        &self,
-        arguments: acp::PromptRequest,
-    ) -> Result<acp::PromptResponse, acp::Error> {
-        log::info!("Received prompt request {arguments:?}");
-        for content in ["Client sent: ".into()].into_iter().chain(arguments.prompt) {
-            let (tx, rx) = oneshot::channel();
-            self.session_update_tx
-                .send((
-                    SessionNotification {
-                        session_id: arguments.session_id.clone(),
-                        update: acp::SessionUpdate::AgentMessageChunk { content },
-                        meta: None,
-                    },
-                    tx,
-                ))
-                .map_err(|_| acp::Error::internal_error())?;
-            rx.await.map_err(|_| acp::Error::internal_error())?;
-        }
-        Ok(acp::PromptResponse {
-            stop_reason: acp::StopReason::EndTurn,
-            meta: None,
-        })
-    }
-
-    async fn cancel(&self, args: acp::CancelNotification) -> Result<(), acp::Error> {
-        log::info!("Received cancel request {args:?}");
-        Ok(())
-    }
-
-    async fn set_session_mode(
-        &self,
-        args: acp::SetSessionModeRequest,
-    ) -> Result<acp::SetSessionModeResponse, acp::Error> {
-        log::info!("Received set session mode request {args:?}");
-        Ok(SetSessionModeResponse::default())
-    }
-
-    #[cfg(feature = "unstable")]
-    async fn set_session_model(
-        &self,
-        args: acp::SetSessionModelRequest,
-    ) -> Result<acp::SetSessionModelResponse, acp::Error> {
-        log::info!("Received select model request {args:?}");
-        Ok(acp::SetSessionModelResponse::default())
-    }
-
-    async fn ext_method(&self, args: ExtRequest) -> Result<ExtResponse, acp::Error> {
-        log::info!(
-            "Received extension method call: method={}, params={:?}",
-            args.method,
-            args.params
-        );
-        Ok(serde_json::value::to_raw_value(&json!({"example": "response"}))?.into())
-    }
-
-    async fn ext_notification(&self, args: ExtNotification) -> Result<(), acp::Error> {
-        log::info!(
-            "Received extension notification: method={}, params={:?}",
-            args.method,
-            args.params
-        );
-        Ok(())
-    }
-}
-
-#[tokio::main(flavor = "current_thread")]
-async fn main() -> anyhow::Result<()> {
-    env_logger::init();
-
-    let outgoing = tokio::io::stdout().compat_write();
-    let incoming = tokio::io::stdin().compat();
-
-    // The AgentSideConnection will spawn futures onto our Tokio runtime.
-    // LocalSet and spawn_local are used because the futures from the
-    // agent-client-protocol crate are not Send.
-    let local_set = tokio::task::LocalSet::new();
-    local_set
-        .run_until(async move {
-            let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
-            // Start up the ExampleAgent connected to stdio.
-            let (conn, handle_io) =
-                acp::AgentSideConnection::new(ExampleAgent::new(tx), outgoing, incoming, |fut| {
-                    tokio::task::spawn_local(fut);
-                });
-            // Kick off a background task to send the ExampleAgent's session notifications to the client.
-            tokio::task::spawn_local(async move {
-                while let Some((session_notification, tx)) = rx.recv().await {
-                    let result = conn.session_notification(session_notification).await;
-                    if let Err(e) = result {
-                        log::error!("{e}");
-                        break;
-                    }
-                    tx.send(()).ok();
-                }
-            });
-            // Run until stdin/stdout are closed.
-            handle_io.await
-        })
-        .await
-}
diff --git a/rust/examples/client.rs b/rust/examples/client.rs
deleted file mode 100644
index 80603675..00000000
--- a/rust/examples/client.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-//! A simple ACP client for educational purposes.
-//!
-//! The client starts an agent as a subprocess and communicates with it over stdio. Run the client like this:
-//!
-//! ```bash
-//! cargo run --example client -- path/to/agent --agent-arg
-//! ```
-//!
-//! To connect it to the example agent from this crate:
-//!
-//! ```bash
-//! cargo build --example agent && cargo run --example client -- target/debug/examples/agent
-//! ```
-
-use agent_client_protocol::{
-    self as acp, Agent, ExtNotification, ExtRequest, ExtResponse, KillTerminalCommandResponse,
-};
-use anyhow::bail;
-use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
-
-struct ExampleClient {}
-
-#[async_trait::async_trait(?Send)]
-impl acp::Client for ExampleClient {
-    async fn request_permission(
-        &self,
-        _args: acp::RequestPermissionRequest,
-    ) -> anyhow::Result<acp::RequestPermissionResponse, acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-
-    async fn write_text_file(
-        &self,
-        _args: acp::WriteTextFileRequest,
-    ) -> anyhow::Result<acp::WriteTextFileResponse, acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-
-    async fn read_text_file(
-        &self,
-        _args: acp::ReadTextFileRequest,
-    ) -> anyhow::Result<acp::ReadTextFileResponse, acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-
-    async fn create_terminal(
-        &self,
-        _args: acp::CreateTerminalRequest,
-    ) -> Result<acp::CreateTerminalResponse, acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-
-    async fn terminal_output(
-        &self,
-        _args: acp::TerminalOutputRequest,
-    ) -> anyhow::Result<acp::TerminalOutputResponse, acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-
-    async fn release_terminal(
-        &self,
-        _args: acp::ReleaseTerminalRequest,
-    ) -> anyhow::Result<acp::ReleaseTerminalResponse, acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-
-    async fn wait_for_terminal_exit(
-        &self,
-        _args: acp::WaitForTerminalExitRequest,
-    ) -> anyhow::Result<acp::WaitForTerminalExitResponse, acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-
-    async fn kill_terminal_command(
-        &self,
-        _args: acp::KillTerminalCommandRequest,
-    ) -> anyhow::Result<KillTerminalCommandResponse, acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-
-    async fn session_notification(
-        &self,
-        args: acp::SessionNotification,
-    ) -> anyhow::Result<(), acp::Error> {
-        match args.update {
-            acp::SessionUpdate::AgentMessageChunk { content } => {
-                let text = match content {
-                    acp::ContentBlock::Text(text_content) => text_content.text,
-                    acp::ContentBlock::Image(_) => "<image>".into(),
-                    acp::ContentBlock::Audio(_) => "<audio>".into(),
-                    acp::ContentBlock::ResourceLink(resource_link) => resource_link.uri,
-                    acp::ContentBlock::Resource(_) => "<resource>".into(),
-                };
-                println!("| Agent: {text}");
-            }
-            acp::SessionUpdate::UserMessageChunk { .. }
-            | acp::SessionUpdate::AgentThoughtChunk { .. }
-            | acp::SessionUpdate::ToolCall(_)
-            | acp::SessionUpdate::ToolCallUpdate(_)
-            | acp::SessionUpdate::Plan(_)
-            | acp::SessionUpdate::CurrentModeUpdate { .. }
-            | acp::SessionUpdate::AvailableCommandsUpdate { .. } => {}
-        }
-        Ok(())
-    }
-
-    async fn ext_method(&self, _args: ExtRequest) -> Result<ExtResponse, acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-
-    async fn ext_notification(&self, _args: ExtNotification) -> Result<(), acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-}
-
-#[tokio::main(flavor = "current_thread")]
-async fn main() -> anyhow::Result<()> {
-    env_logger::init();
-
-    let command = std::env::args().collect::<Vec<_>>();
-    let (outgoing, incoming, child) = match command.as_slice() {
-        [_, program, args @ ..] => {
-            let mut child = tokio::process::Command::new(program)
-                .args(args.iter())
-                .stdin(std::process::Stdio::piped())
-                .stdout(std::process::Stdio::piped())
-                .kill_on_drop(true)
-                .spawn()?;
-            (
-                child.stdin.take().unwrap().compat_write(),
-                child.stdout.take().unwrap().compat(),
-                child,
-            )
-        }
-        _ => bail!("Usage: client AGENT_PROGRAM AGENT_ARG..."),
-    };
-
-    // The ClientSideConnection will spawn futures onto our Tokio runtime.
-    // LocalSet and spawn_local are used because the futures from the
-    // agent-client-protocol crate are not Send.
-    let local_set = tokio::task::LocalSet::new();
-    local_set
-        .run_until(async move {
-            // Set up the ExampleClient connected to the agent's stdio.
-            let (conn, handle_io) =
-                acp::ClientSideConnection::new(ExampleClient {}, outgoing, incoming, |fut| {
-                    tokio::task::spawn_local(fut);
-                });
-
-            // Handle I/O in the background.
-            tokio::task::spawn_local(handle_io);
-
-            // Connect to the agent and set up a session.
-            conn.initialize(acp::InitializeRequest {
-                protocol_version: acp::V1,
-                client_capabilities: acp::ClientCapabilities::default(),
-                meta: None,
-            })
-            .await?;
-            let response = conn
-                .new_session(acp::NewSessionRequest {
-                    mcp_servers: Vec::new(),
-                    cwd: std::env::current_dir()?,
-                    meta: None,
-                })
-                .await?;
-
-            // Send prompts to the agent until stdin is closed.
-            let mut rl = rustyline::DefaultEditor::new()?;
-            while let Ok(line) = rl.readline("> ") {
-                let result = conn
-                    .prompt(acp::PromptRequest {
-                        session_id: response.session_id.clone(),
-                        prompt: vec![line.into()],
-                        meta: None,
-                    })
-                    .await;
-                if let Err(e) = result {
-                    log::error!("{e}");
-                }
-            }
-
-            drop(child);
-            Ok(())
-        })
-        .await
-}
diff --git a/rust/sdk/agent.rs b/rust/sdk/agent.rs
deleted file mode 100644
index 7aebe8ea..00000000
--- a/rust/sdk/agent.rs
+++ /dev/null
@@ -1,231 +0,0 @@
-use std::{rc::Rc, sync::Arc};
-
-use serde_json::value::RawValue;
-
-use crate::{
-    AuthenticateRequest, AuthenticateResponse, CancelNotification, Error, ExtNotification,
-    ExtRequest, ExtResponse, InitializeRequest, InitializeResponse, LoadSessionRequest,
-    LoadSessionResponse, NewSessionRequest, NewSessionResponse, PromptRequest, PromptResponse,
-    SetSessionModeRequest, SetSessionModeResponse,
-};
-#[cfg(feature = "unstable")]
-use crate::{SetSessionModelRequest, SetSessionModelResponse};
-
-/// Defines the interface that all ACP-compliant agents must implement.
-///
-/// Agents are programs that use generative AI to autonomously modify code. They handle
-/// requests from clients and execute tasks using language models and tools.
-#[async_trait::async_trait(?Send)]
-pub trait Agent {
-    /// Establishes the connection with a client and negotiates protocol capabilities.
-    ///
-    /// This method is called once at the beginning of the connection to:
-    /// - Negotiate the protocol version to use
-    /// - Exchange capability information between client and agent
-    /// - Determine available authentication methods
-    ///
-    /// The agent should respond with its supported protocol version and capabilities.
-    ///
-    /// See protocol docs: [Initialization](https://agentclientprotocol.com/protocol/initialization)
-    async fn initialize(&self, args: InitializeRequest) -> Result<InitializeResponse, Error>;
-
-    /// Authenticates the client using the specified authentication method.
-    ///
-    /// Called when the agent requires authentication before allowing session creation.
-    /// The client provides the authentication method ID that was advertised during initialization.
-    ///
-    /// After successful authentication, the client can proceed to create sessions with
-    /// `new_session` without receiving an `auth_required` error.
-    ///
-    /// See protocol docs: [Initialization](https://agentclientprotocol.com/protocol/initialization)
-    async fn authenticate(&self, args: AuthenticateRequest) -> Result<AuthenticateResponse, Error>;
-
-    /// Creates a new conversation session with the agent.
-    ///
-    /// Sessions represent independent conversation contexts with their own history and state.
-    ///
-    /// The agent should:
-    /// - Create a new session context
-    /// - Connect to any specified MCP servers
-    /// - Return a unique session ID for future requests
-    ///
-    /// May return an `auth_required` error if the agent requires authentication.
-    ///
-    /// See protocol docs: [Session Setup](https://agentclientprotocol.com/protocol/session-setup)
-    async fn new_session(&self, args: NewSessionRequest) -> Result<NewSessionResponse, Error>;
-
-    /// Processes a user prompt within a session.
-    ///
-    /// This method handles the whole lifecycle of a prompt:
-    /// - Receives user messages with optional context (files, images, etc.)
-    /// - Processes the prompt using language models
-    /// - Reports language model content and tool calls to the Clients
-    /// - Requests permission to run tools
-    /// - Executes any requested tool calls
-    /// - Returns when the turn is complete with a stop reason
-    ///
-    /// See protocol docs: [Prompt Turn](https://agentclientprotocol.com/protocol/prompt-turn)
-    async fn prompt(&self, args: PromptRequest) -> Result<PromptResponse, Error>;
-
-    /// Cancels ongoing operations for a session.
-    ///
-    /// This is a notification sent by the client to cancel an ongoing prompt turn.
-    ///
-    /// Upon receiving this notification, the Agent SHOULD:
-    /// - Stop all language model requests as soon as possible
-    /// - Abort all tool call invocations in progress
-    /// - Send any pending `session/update` notifications
-    /// - Respond to the original `session/prompt` request with `StopReason::Cancelled`
-    ///
-    /// See protocol docs: [Cancellation](https://agentclientprotocol.com/protocol/prompt-turn#cancellation)
-    async fn cancel(&self, args: CancelNotification) -> Result<(), Error>;
-
-    /// Loads an existing session to resume a previous conversation.
-    ///
-    /// This method is only available if the agent advertises the `loadSession` capability.
-    ///
-    /// The agent should:
-    /// - Restore the session context and conversation history
-    /// - Connect to the specified MCP servers
-    /// - Stream the entire conversation history back to the client via notifications
-    ///
-    /// See protocol docs: [Loading Sessions](https://agentclientprotocol.com/protocol/session-setup#loading-sessions)
-    async fn load_session(&self, _args: LoadSessionRequest) -> Result<LoadSessionResponse, Error> {
-        Err(Error::method_not_found())
-    }
-
-    /// Sets the current mode for a session.
-    ///
-    /// Allows switching between different agent modes (e.g., "ask", "architect", "code")
-    /// that affect system prompts, tool availability, and permission behaviors.
-    ///
-    /// The mode must be one of the modes advertised in `availableModes` during session
-    /// creation or loading. Agents may also change modes autonomously and notify the
-    /// client via `current_mode_update` notifications.
-    ///
-    /// This method can be called at any time during a session, whether the Agent is
-    /// idle or actively generating a response.
-    ///
-    /// See protocol docs: [Session Modes](https://agentclientprotocol.com/protocol/session-modes)
-    async fn set_session_mode(
-        &self,
-        _args: SetSessionModeRequest,
-    ) -> Result<SetSessionModeResponse, Error> {
-        Err(Error::method_not_found())
-    }
-
-    /// **UNSTABLE**
-    ///
-    /// This capability is not part of the spec yet, and may be removed or changed at any point.
-    ///
-    /// Select a model for a given session.
-    #[cfg(feature = "unstable")]
-    async fn set_session_model(
-        &self,
-        _args: SetSessionModelRequest,
-    ) -> Result<SetSessionModelResponse, Error> {
-        Err(Error::method_not_found())
-    }
-
-    /// Handles extension method requests from the client.
-    ///
-    /// Extension methods provide a way to add custom functionality while maintaining
-    /// protocol compatibility.
-    ///
-    /// See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)
-    async fn ext_method(&self, _args: ExtRequest) -> Result<ExtResponse, Error> {
-        Ok(RawValue::NULL.to_owned().into())
-    }
-
-    /// Handles extension notifications from the client.
-    ///
-    /// Extension notifications provide a way to send one-way messages for custom functionality
-    /// while maintaining protocol compatibility.
-    ///
-    /// See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)
-    async fn ext_notification(&self, _args: ExtNotification) -> Result<(), Error> {
-        Ok(())
-    }
-}
-
-#[async_trait::async_trait(?Send)]
-impl<T: Agent> Agent for Rc<T> {
-    async fn initialize(&self, args: InitializeRequest) -> Result<InitializeResponse, Error> {
-        self.as_ref().initialize(args).await
-    }
-    async fn authenticate(&self, args: AuthenticateRequest) -> Result<AuthenticateResponse, Error> {
-        self.as_ref().authenticate(args).await
-    }
-    async fn new_session(&self, args: NewSessionRequest) -> Result<NewSessionResponse, Error> {
-        self.as_ref().new_session(args).await
-    }
-    async fn load_session(&self, args: LoadSessionRequest) -> Result<LoadSessionResponse, Error> {
-        self.as_ref().load_session(args).await
-    }
-    async fn set_session_mode(
-        &self,
-        args: SetSessionModeRequest,
-    ) -> Result<SetSessionModeResponse, Error> {
-        self.as_ref().set_session_mode(args).await
-    }
-    async fn prompt(&self, args: PromptRequest) -> Result<PromptResponse, Error> {
-        self.as_ref().prompt(args).await
-    }
-    async fn cancel(&self, args: CancelNotification) -> Result<(), Error> {
-        self.as_ref().cancel(args).await
-    }
-    #[cfg(feature = "unstable")]
-    async fn set_session_model(
-        &self,
-        args: SetSessionModelRequest,
-    ) -> Result<SetSessionModelResponse, Error> {
-        self.as_ref().set_session_model(args).await
-    }
-    async fn ext_method(&self, args: ExtRequest) -> Result<ExtResponse, Error> {
-        self.as_ref().ext_method(args).await
-    }
-    async fn ext_notification(&self, args: ExtNotification) -> Result<(), Error> {
-        self.as_ref().ext_notification(args).await
-    }
-}
-
-#[async_trait::async_trait(?Send)]
-impl<T: Agent> Agent for Arc<T> {
-    async fn initialize(&self, args: InitializeRequest) -> Result<InitializeResponse, Error> {
-        self.as_ref().initialize(args).await
-    }
-    async fn authenticate(&self, args: AuthenticateRequest) -> Result<AuthenticateResponse, Error> {
-        self.as_ref().authenticate(args).await
-    }
-    async fn new_session(&self, args: NewSessionRequest) -> Result<NewSessionResponse, Error> {
-        self.as_ref().new_session(args).await
-    }
-    async fn load_session(&self, args: LoadSessionRequest) -> Result<LoadSessionResponse, Error> {
-        self.as_ref().load_session(args).await
-    }
-    async fn set_session_mode(
-        &self,
-        args: SetSessionModeRequest,
-    ) -> Result<SetSessionModeResponse, Error> {
-        self.as_ref().set_session_mode(args).await
-    }
-    async fn prompt(&self, args: PromptRequest) -> Result<PromptResponse, Error> {
-        self.as_ref().prompt(args).await
-    }
-    async fn cancel(&self, args: CancelNotification) -> Result<(), Error> {
-        self.as_ref().cancel(args).await
-    }
-    #[cfg(feature = "unstable")]
-    async fn set_session_model(
-        &self,
-        args: SetSessionModelRequest,
-    ) -> Result<SetSessionModelResponse, Error> {
-        self.as_ref().set_session_model(args).await
-    }
-    async fn ext_method(&self, args: ExtRequest) -> Result<ExtResponse, Error> {
-        self.as_ref().ext_method(args).await
-    }
-    async fn ext_notification(&self, args: ExtNotification) -> Result<(), Error> {
-        self.as_ref().ext_notification(args).await
-    }
-}
diff --git a/rust/sdk/client.rs b/rust/sdk/client.rs
deleted file mode 100644
index d88b4ebc..00000000
--- a/rust/sdk/client.rs
+++ /dev/null
@@ -1,300 +0,0 @@
-use std::{rc::Rc, sync::Arc};
-
-use serde_json::value::RawValue;
-
-use crate::{
-    CreateTerminalRequest, CreateTerminalResponse, Error, ExtNotification, ExtRequest, ExtResponse,
-    KillTerminalCommandRequest, KillTerminalCommandResponse, ReadTextFileRequest,
-    ReadTextFileResponse, ReleaseTerminalRequest, ReleaseTerminalResponse,
-    RequestPermissionRequest, RequestPermissionResponse, SessionNotification,
-    TerminalOutputRequest, TerminalOutputResponse, WaitForTerminalExitRequest,
-    WaitForTerminalExitResponse, WriteTextFileRequest, WriteTextFileResponse,
-};
-
-/// Defines the interface that ACP-compliant clients must implement.
-///
-/// Clients are typically code editors (IDEs, text editors) that provide the interface
-/// between users and AI agents. They manage the environment, handle user interactions,
-/// and control access to resources.
-#[async_trait::async_trait(?Send)]
-pub trait Client {
-    /// Requests permission from the user for a tool call operation.
-    ///
-    /// Called by the agent when it needs user authorization before executing
-    /// a potentially sensitive operation. The client should present the options
-    /// to the user and return their decision.
-    ///
-    /// If the client cancels the prompt turn via `session/cancel`, it MUST
-    /// respond to this request with `RequestPermissionOutcome::Cancelled`.
-    ///
-    /// See protocol docs: [Requesting Permission](https://agentclientprotocol.com/protocol/tool-calls#requesting-permission)
-    async fn request_permission(
-        &self,
-        args: RequestPermissionRequest,
-    ) -> Result<RequestPermissionResponse, Error>;
-
-    /// Handles session update notifications from the agent.
-    ///
-    /// This is a notification endpoint (no response expected) that receives
-    /// real-time updates about session progress, including message chunks,
-    /// tool calls, and execution plans.
-    ///
-    /// Note: Clients SHOULD continue accepting tool call updates even after
-    /// sending a `session/cancel` notification, as the agent may send final
-    /// updates before responding with the cancelled stop reason.
-    ///
-    /// See protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protocol/prompt-turn#3-agent-reports-output)
-    async fn session_notification(&self, args: SessionNotification) -> Result<(), Error>;
-
-    /// Writes content to a text file in the client's file system.
-    ///
-    /// Only available if the client advertises the `fs.writeTextFile` capability.
-    /// Allows the agent to create or modify files within the client's environment.
-    ///
-    /// See protocol docs: [Client](https://agentclientprotocol.com/protocol/overview#client)
-    async fn write_text_file(
-        &self,
-        _args: WriteTextFileRequest,
-    ) -> Result<WriteTextFileResponse, Error> {
-        Err(Error::method_not_found())
-    }
-
-    /// Reads content from a text file in the client's file system.
-    ///
-    /// Only available if the client advertises the `fs.readTextFile` capability.
-    /// Allows the agent to access file contents within the client's environment.
-    ///
-    /// See protocol docs: [Client](https://agentclientprotocol.com/protocol/overview#client)
-    async fn read_text_file(
-        &self,
-        _args: ReadTextFileRequest,
-    ) -> Result<ReadTextFileResponse, Error> {
-        Err(Error::method_not_found())
-    }
-
-    /// Executes a command in a new terminal
-    ///
-    /// Only available if the `terminal` Client capability is set to `true`.
-    ///
-    /// Returns a `TerminalId` that can be used with other terminal methods
-    /// to get the current output, wait for exit, and kill the command.
-    ///
-    /// The `TerminalId` can also be used to embed the terminal in a tool call
-    /// by using the `ToolCallContent::Terminal` variant.
-    ///
-    /// The Agent is responsible for releasing the terminal by using the `terminal/release`
-    /// method.
-    ///
-    /// See protocol docs: [Terminals](https://agentclientprotocol.com/protocol/terminals)
-    async fn create_terminal(
-        &self,
-        _args: CreateTerminalRequest,
-    ) -> Result<CreateTerminalResponse, Error> {
-        Err(Error::method_not_found())
-    }
-
-    /// Gets the terminal output and exit status
-    ///
-    /// Returns the current content in the terminal without waiting for the command to exit.
-    /// If the command has already exited, the exit status is included.
-    ///
-    /// See protocol docs: [Terminals](https://agentclientprotocol.com/protocol/terminals)
-    async fn terminal_output(
-        &self,
-        _args: TerminalOutputRequest,
-    ) -> Result<TerminalOutputResponse, Error> {
-        Err(Error::method_not_found())
-    }
-
-    /// Releases a terminal
-    ///
-    /// The command is killed if it hasn't exited yet. Use `terminal/wait_for_exit`
-    /// to wait for the command to exit before releasing the terminal.
-    ///
-    /// After release, the `TerminalId` can no longer be used with other `terminal/*` methods,
-    /// but tool calls that already contain it, continue to display its output.
-    ///
-    /// The `terminal/kill` method can be used to terminate the command without releasing
-    /// the terminal, allowing the Agent to call `terminal/output` and other methods.
-    ///
-    /// See protocol docs: [Terminals](https://agentclientprotocol.com/protocol/terminals)
-    async fn release_terminal(
-        &self,
-        _args: ReleaseTerminalRequest,
-    ) -> Result<ReleaseTerminalResponse, Error> {
-        Err(Error::method_not_found())
-    }
-
-    /// Waits for the terminal command to exit and return its exit status
-    ///
-    /// See protocol docs: [Terminals](https://agentclientprotocol.com/protocol/terminals)
-    async fn wait_for_terminal_exit(
-        &self,
-        _args: WaitForTerminalExitRequest,
-    ) -> Result<WaitForTerminalExitResponse, Error> {
-        Err(Error::method_not_found())
-    }
-
-    /// Kills the terminal command without releasing the terminal
-    ///
-    /// While `terminal/release` will also kill the command, this method will keep
-    /// the `TerminalId` valid so it can be used with other methods.
-    ///
-    /// This method can be helpful when implementing command timeouts which terminate
-    /// the command as soon as elapsed, and then get the final output so it can be sent
-    /// to the model.
-    ///
-    /// Note: `terminal/release` when `TerminalId` is no longer needed.
-    ///
-    /// See protocol docs: [Terminals](https://agentclientprotocol.com/protocol/terminals)
-    async fn kill_terminal_command(
-        &self,
-        _args: KillTerminalCommandRequest,
-    ) -> Result<KillTerminalCommandResponse, Error> {
-        Err(Error::method_not_found())
-    }
-
-    /// Handles extension method requests from the agent.
-    ///
-    /// Allows the Agent to send an arbitrary request that is not part of the ACP spec.
-    /// Extension methods provide a way to add custom functionality while maintaining
-    /// protocol compatibility.
-    ///
-    /// See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)
-    async fn ext_method(&self, _args: ExtRequest) -> Result<ExtResponse, Error> {
-        Ok(RawValue::NULL.to_owned().into())
-    }
-
-    /// Handles extension notifications from the agent.
-    ///
-    /// Allows the Agent to send an arbitrary notification that is not part of the ACP spec.
-    /// Extension notifications provide a way to send one-way messages for custom functionality
-    /// while maintaining protocol compatibility.
-    ///
-    /// See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/extensibility)
-    async fn ext_notification(&self, _args: ExtNotification) -> Result<(), Error> {
-        Ok(())
-    }
-}
-
-#[async_trait::async_trait(?Send)]
-impl<T: Client> Client for Rc<T> {
-    async fn request_permission(
-        &self,
-        args: RequestPermissionRequest,
-    ) -> Result<RequestPermissionResponse, Error> {
-        self.as_ref().request_permission(args).await
-    }
-    async fn write_text_file(
-        &self,
-        args: WriteTextFileRequest,
-    ) -> Result<WriteTextFileResponse, Error> {
-        self.as_ref().write_text_file(args).await
-    }
-    async fn read_text_file(
-        &self,
-        args: ReadTextFileRequest,
-    ) -> Result<ReadTextFileResponse, Error> {
-        self.as_ref().read_text_file(args).await
-    }
-    async fn session_notification(&self, args: SessionNotification) -> Result<(), Error> {
-        self.as_ref().session_notification(args).await
-    }
-    async fn create_terminal(
-        &self,
-        args: CreateTerminalRequest,
-    ) -> Result<CreateTerminalResponse, Error> {
-        self.as_ref().create_terminal(args).await
-    }
-    async fn terminal_output(
-        &self,
-        args: TerminalOutputRequest,
-    ) -> Result<TerminalOutputResponse, Error> {
-        self.as_ref().terminal_output(args).await
-    }
-    async fn release_terminal(
-        &self,
-        args: ReleaseTerminalRequest,
-    ) -> Result<ReleaseTerminalResponse, Error> {
-        self.as_ref().release_terminal(args).await
-    }
-    async fn wait_for_terminal_exit(
-        &self,
-        args: WaitForTerminalExitRequest,
-    ) -> Result<WaitForTerminalExitResponse, Error> {
-        self.as_ref().wait_for_terminal_exit(args).await
-    }
-    async fn kill_terminal_command(
-        &self,
-        args: KillTerminalCommandRequest,
-    ) -> Result<KillTerminalCommandResponse, Error> {
-        self.as_ref().kill_terminal_command(args).await
-    }
-    async fn ext_method(&self, args: ExtRequest) -> Result<ExtResponse, Error> {
-        self.as_ref().ext_method(args).await
-    }
-    async fn ext_notification(&self, args: ExtNotification) -> Result<(), Error> {
-        self.as_ref().ext_notification(args).await
-    }
-}
-
-#[async_trait::async_trait(?Send)]
-impl<T: Client> Client for Arc<T> {
-    async fn request_permission(
-        &self,
-        args: RequestPermissionRequest,
-    ) -> Result<RequestPermissionResponse, Error> {
-        self.as_ref().request_permission(args).await
-    }
-    async fn write_text_file(
-        &self,
-        args: WriteTextFileRequest,
-    ) -> Result<WriteTextFileResponse, Error> {
-        self.as_ref().write_text_file(args).await
-    }
-    async fn read_text_file(
-        &self,
-        args: ReadTextFileRequest,
-    ) -> Result<ReadTextFileResponse, Error> {
-        self.as_ref().read_text_file(args).await
-    }
-    async fn session_notification(&self, args: SessionNotification) -> Result<(), Error> {
-        self.as_ref().session_notification(args).await
-    }
-    async fn create_terminal(
-        &self,
-        args: CreateTerminalRequest,
-    ) -> Result<CreateTerminalResponse, Error> {
-        self.as_ref().create_terminal(args).await
-    }
-    async fn terminal_output(
-        &self,
-        args: TerminalOutputRequest,
-    ) -> Result<TerminalOutputResponse, Error> {
-        self.as_ref().terminal_output(args).await
-    }
-    async fn release_terminal(
-        &self,
-        args: ReleaseTerminalRequest,
-    ) -> Result<ReleaseTerminalResponse, Error> {
-        self.as_ref().release_terminal(args).await
-    }
-    async fn wait_for_terminal_exit(
-        &self,
-        args: WaitForTerminalExitRequest,
-    ) -> Result<WaitForTerminalExitResponse, Error> {
-        self.as_ref().wait_for_terminal_exit(args).await
-    }
-    async fn kill_terminal_command(
-        &self,
-        args: KillTerminalCommandRequest,
-    ) -> Result<KillTerminalCommandResponse, Error> {
-        self.as_ref().kill_terminal_command(args).await
-    }
-    async fn ext_method(&self, args: ExtRequest) -> Result<ExtResponse, Error> {
-        self.as_ref().ext_method(args).await
-    }
-    async fn ext_notification(&self, args: ExtNotification) -> Result<(), Error> {
-        self.as_ref().ext_notification(args).await
-    }
-}
diff --git a/rust/sdk/mod.rs b/rust/sdk/mod.rs
deleted file mode 100644
index 79f3bdd9..00000000
--- a/rust/sdk/mod.rs
+++ /dev/null
@@ -1,620 +0,0 @@
-use anyhow::Result;
-use futures::{AsyncRead, AsyncWrite, future::LocalBoxFuture};
-
-use crate::{
-    sdk::rpc::{MessageHandler, RpcConnection, Side},
-    *,
-};
-
-mod agent;
-mod client;
-mod rpc;
-#[cfg(test)]
-mod rpc_tests;
-mod stream_broadcast;
-
-pub use agent::*;
-pub use client::*;
-pub use stream_broadcast::{
-    StreamMessage, StreamMessageContent, StreamMessageDirection, StreamReceiver,
-};
-
-// Client to Agent
-
-/// A client-side connection to an agent.
-///
-/// This struct provides the client's view of an ACP connection, allowing
-/// clients (such as code editors) to communicate with agents. It implements
-/// the [`Agent`] trait to provide methods for initializing sessions, sending
-/// prompts, and managing the agent lifecycle.
-///
-/// See protocol docs: [Client](https://agentclientprotocol.com/protocol/overview#client)
-pub struct ClientSideConnection {
-    conn: RpcConnection<ClientSide, AgentSide>,
-}
-
-impl ClientSideConnection {
-    /// Creates a new client-side connection to an agent.
-    ///
-    /// This establishes the communication channel between a client and agent
-    /// following the ACP specification.
-    ///
-    /// # Arguments
-    ///
-    /// * `client` - A handler that implements the [`Client`] trait to process incoming agent requests
-    /// * `outgoing_bytes` - The stream for sending data to the agent (typically stdout)
-    /// * `incoming_bytes` - The stream for receiving data from the agent (typically stdin)
-    /// * `spawn` - A function to spawn async tasks (e.g., `tokio::spawn`)
-    ///
-    /// # Returns
-    ///
-    /// Returns a tuple containing:
-    /// - The connection instance for making requests to the agent
-    /// - An I/O future that must be spawned to handle the underlying communication
-    ///
-    /// See protocol docs: [Communication Model](https://agentclientprotocol.com/protocol/overview#communication-model)
-    pub fn new(
-        client: impl MessageHandler<ClientSide> + 'static,
-        outgoing_bytes: impl Unpin + AsyncWrite,
-        incoming_bytes: impl Unpin + AsyncRead,
-        spawn: impl Fn(LocalBoxFuture<'static, ()>) + 'static,
-    ) -> (Self, impl Future<Output = Result<()>>) {
-        let (conn, io_task) = RpcConnection::new(client, outgoing_bytes, incoming_bytes, spawn);
-        (Self { conn }, io_task)
-    }
-
-    /// Subscribe to receive stream updates from the agent.
-    ///
-    /// This allows the client to receive real-time notifications about
-    /// agent activities, such as tool calls, content updates, and progress reports.
-    ///
-    /// # Returns
-    ///
-    /// A [`StreamReceiver`] that can be used to receive stream messages.
-    pub fn subscribe(&self) -> StreamReceiver {
-        self.conn.subscribe()
-    }
-}
-
-#[async_trait::async_trait(?Send)]
-impl Agent for ClientSideConnection {
-    async fn initialize(&self, args: InitializeRequest) -> Result<InitializeResponse, Error> {
-        self.conn
-            .request(
-                INITIALIZE_METHOD_NAME,
-                Some(ClientRequest::InitializeRequest(args)),
-            )
-            .await
-    }
-
-    async fn authenticate(&self, args: AuthenticateRequest) -> Result<AuthenticateResponse, Error> {
-        self.conn
-            .request::<Option<_>>(
-                AUTHENTICATE_METHOD_NAME,
-                Some(ClientRequest::AuthenticateRequest(args)),
-            )
-            .await
-            .map(Option::unwrap_or_default)
-    }
-
-    async fn new_session(&self, args: NewSessionRequest) -> Result<NewSessionResponse, Error> {
-        self.conn
-            .request(
-                SESSION_NEW_METHOD_NAME,
-                Some(ClientRequest::NewSessionRequest(args)),
-            )
-            .await
-    }
-
-    async fn load_session(&self, args: LoadSessionRequest) -> Result<LoadSessionResponse, Error> {
-        self.conn
-            .request::<Option<_>>(
-                SESSION_LOAD_METHOD_NAME,
-                Some(ClientRequest::LoadSessionRequest(args)),
-            )
-            .await
-            .map(Option::unwrap_or_default)
-    }
-
-    async fn set_session_mode(
-        &self,
-        args: SetSessionModeRequest,
-    ) -> Result<SetSessionModeResponse, Error> {
-        self.conn
-            .request(
-                SESSION_SET_MODE_METHOD_NAME,
-                Some(ClientRequest::SetSessionModeRequest(args)),
-            )
-            .await
-    }
-
-    async fn prompt(&self, args: PromptRequest) -> Result<PromptResponse, Error> {
-        self.conn
-            .request(
-                SESSION_PROMPT_METHOD_NAME,
-                Some(ClientRequest::PromptRequest(args)),
-            )
-            .await
-    }
-
-    async fn cancel(&self, args: CancelNotification) -> Result<(), Error> {
-        self.conn.notify(
-            SESSION_CANCEL_METHOD_NAME,
-            Some(ClientNotification::CancelNotification(args)),
-        )
-    }
-
-    #[cfg(feature = "unstable")]
-    async fn set_session_model(
-        &self,
-        args: SetSessionModelRequest,
-    ) -> Result<SetSessionModelResponse, Error> {
-        self.conn
-            .request(
-                SESSION_SET_MODEL_METHOD_NAME,
-                Some(ClientRequest::SetSessionModelRequest(args)),
-            )
-            .await
-    }
-
-    async fn ext_method(&self, args: ExtRequest) -> Result<ExtResponse, Error> {
-        self.conn
-            .request(
-                format!("_{}", args.method),
-                Some(ClientRequest::ExtMethodRequest(args)),
-            )
-            .await
-    }
-
-    async fn ext_notification(&self, args: ExtNotification) -> Result<(), Error> {
-        self.conn.notify(
-            format!("_{}", args.method),
-            Some(ClientNotification::ExtNotification(args)),
-        )
-    }
-}
-
-/// Marker type representing the client side of an ACP connection.
-///
-/// This type is used by the RPC layer to determine which messages
-/// are incoming vs outgoing from the client's perspective.
-///
-/// See protocol docs: [Communication Model](https://agentclientprotocol.com/protocol/overview#communication-model)
-#[derive(Clone)]
-pub struct ClientSide;
-
-impl Side for ClientSide {
-    type InNotification = AgentNotification;
-    type InRequest = AgentRequest;
-    type OutResponse = ClientResponse;
-
-    fn decode_request(method: &str, params: Option<&RawValue>) -> Result<AgentRequest, Error> {
-        let params = params.ok_or_else(Error::invalid_params)?;
-
-        match method {
-            SESSION_REQUEST_PERMISSION_METHOD_NAME => serde_json::from_str(params.get())
-                .map(AgentRequest::RequestPermissionRequest)
-                .map_err(Into::into),
-            FS_WRITE_TEXT_FILE_METHOD_NAME => serde_json::from_str(params.get())
-                .map(AgentRequest::WriteTextFileRequest)
-                .map_err(Into::into),
-            FS_READ_TEXT_FILE_METHOD_NAME => serde_json::from_str(params.get())
-                .map(AgentRequest::ReadTextFileRequest)
-                .map_err(Into::into),
-            TERMINAL_CREATE_METHOD_NAME => serde_json::from_str(params.get())
-                .map(AgentRequest::CreateTerminalRequest)
-                .map_err(Into::into),
-            TERMINAL_OUTPUT_METHOD_NAME => serde_json::from_str(params.get())
-                .map(AgentRequest::TerminalOutputRequest)
-                .map_err(Into::into),
-            TERMINAL_KILL_METHOD_NAME => serde_json::from_str(params.get())
-                .map(AgentRequest::KillTerminalCommandRequest)
-                .map_err(Into::into),
-            TERMINAL_RELEASE_METHOD_NAME => serde_json::from_str(params.get())
-                .map(AgentRequest::ReleaseTerminalRequest)
-                .map_err(Into::into),
-            TERMINAL_WAIT_FOR_EXIT_METHOD_NAME => serde_json::from_str(params.get())
-                .map(AgentRequest::WaitForTerminalExitRequest)
-                .map_err(Into::into),
-            _ => {
-                if let Some(custom_method) = method.strip_prefix('_') {
-                    Ok(AgentRequest::ExtMethodRequest(ExtRequest {
-                        method: custom_method.into(),
-                        params: RawValue::from_string(params.get().to_string())?.into(),
-                    }))
-                } else {
-                    Err(Error::method_not_found())
-                }
-            }
-        }
-    }
-
-    fn decode_notification(
-        method: &str,
-        params: Option<&RawValue>,
-    ) -> Result<AgentNotification, Error> {
-        let params = params.ok_or_else(Error::invalid_params)?;
-
-        match method {
-            SESSION_UPDATE_NOTIFICATION => serde_json::from_str(params.get())
-                .map(AgentNotification::SessionNotification)
-                .map_err(Into::into),
-            _ => {
-                if let Some(custom_method) = method.strip_prefix('_') {
-                    Ok(AgentNotification::ExtNotification(ExtNotification {
-                        method: custom_method.into(),
-                        params: RawValue::from_string(params.get().to_string())?.into(),
-                    }))
-                } else {
-                    Err(Error::method_not_found())
-                }
-            }
-        }
-    }
-}
-
-impl<T: Client> MessageHandler<ClientSide> for T {
-    async fn handle_request(&self, request: AgentRequest) -> Result<ClientResponse, Error> {
-        match request {
-            AgentRequest::RequestPermissionRequest(args) => {
-                let response = self.request_permission(args).await?;
-                Ok(ClientResponse::RequestPermissionResponse(response))
-            }
-            AgentRequest::WriteTextFileRequest(args) => {
-                let response = self.write_text_file(args).await?;
-                Ok(ClientResponse::WriteTextFileResponse(response))
-            }
-            AgentRequest::ReadTextFileRequest(args) => {
-                let response = self.read_text_file(args).await?;
-                Ok(ClientResponse::ReadTextFileResponse(response))
-            }
-            AgentRequest::CreateTerminalRequest(args) => {
-                let response = self.create_terminal(args).await?;
-                Ok(ClientResponse::CreateTerminalResponse(response))
-            }
-            AgentRequest::TerminalOutputRequest(args) => {
-                let response = self.terminal_output(args).await?;
-                Ok(ClientResponse::TerminalOutputResponse(response))
-            }
-            AgentRequest::ReleaseTerminalRequest(args) => {
-                let response = self.release_terminal(args).await?;
-                Ok(ClientResponse::ReleaseTerminalResponse(response))
-            }
-            AgentRequest::WaitForTerminalExitRequest(args) => {
-                let response = self.wait_for_terminal_exit(args).await?;
-                Ok(ClientResponse::WaitForTerminalExitResponse(response))
-            }
-            AgentRequest::KillTerminalCommandRequest(args) => {
-                let response = self.kill_terminal_command(args).await?;
-                Ok(ClientResponse::KillTerminalResponse(response))
-            }
-            AgentRequest::ExtMethodRequest(args) => {
-                let response = self.ext_method(args).await?;
-                Ok(ClientResponse::ExtMethodResponse(response))
-            }
-        }
-    }
-
-    async fn handle_notification(&self, notification: AgentNotification) -> Result<(), Error> {
-        match notification {
-            AgentNotification::SessionNotification(args) => {
-                self.session_notification(args).await?;
-            }
-            AgentNotification::ExtNotification(args) => {
-                self.ext_notification(args).await?;
-            }
-        }
-        Ok(())
-    }
-}
-
-// Agent to Client
-
-/// An agent-side connection to a client.
-///
-/// This struct provides the agent's view of an ACP connection, allowing
-/// agents to communicate with clients. It implements the [`Client`] trait
-/// to provide methods for requesting permissions, accessing the file system,
-/// and sending session updates.
-///
-/// See protocol docs: [Agent](https://agentclientprotocol.com/protocol/overview#agent)
-pub struct AgentSideConnection {
-    conn: RpcConnection<AgentSide, ClientSide>,
-}
-
-impl AgentSideConnection {
-    /// Creates a new agent-side connection to a client.
-    ///
-    /// This establishes the communication channel from the agent's perspective
-    /// following the ACP specification.
-    ///
-    /// # Arguments
-    ///
-    /// * `agent` - A handler that implements the [`Agent`] trait to process incoming client requests
-    /// * `outgoing_bytes` - The stream for sending data to the client (typically stdout)
-    /// * `incoming_bytes` - The stream for receiving data from the client (typically stdin)
-    /// * `spawn` - A function to spawn async tasks (e.g., `tokio::spawn`)
-    ///
-    /// # Returns
-    ///
-    /// Returns a tuple containing:
-    /// - The connection instance for making requests to the client
-    /// - An I/O future that must be spawned to handle the underlying communication
-    ///
-    /// See protocol docs: [Communication Model](https://agentclientprotocol.com/protocol/overview#communication-model)
-    pub fn new(
-        agent: impl MessageHandler<AgentSide> + 'static,
-        outgoing_bytes: impl Unpin + AsyncWrite,
-        incoming_bytes: impl Unpin + AsyncRead,
-        spawn: impl Fn(LocalBoxFuture<'static, ()>) + 'static,
-    ) -> (Self, impl Future<Output = Result<()>>) {
-        let (conn, io_task) = RpcConnection::new(agent, outgoing_bytes, incoming_bytes, spawn);
-        (Self { conn }, io_task)
-    }
-
-    /// Subscribe to receive stream updates from the client.
-    ///
-    /// This allows the agent to receive real-time notifications about
-    /// client activities and cancellation requests.
-    ///
-    /// # Returns
-    ///
-    /// A [`StreamReceiver`] that can be used to receive stream messages.
-    pub fn subscribe(&self) -> StreamReceiver {
-        self.conn.subscribe()
-    }
-}
-
-#[async_trait::async_trait(?Send)]
-impl Client for AgentSideConnection {
-    async fn request_permission(
-        &self,
-        args: RequestPermissionRequest,
-    ) -> Result<RequestPermissionResponse, Error> {
-        self.conn
-            .request(
-                SESSION_REQUEST_PERMISSION_METHOD_NAME,
-                Some(AgentRequest::RequestPermissionRequest(args)),
-            )
-            .await
-    }
-
-    async fn write_text_file(
-        &self,
-        args: WriteTextFileRequest,
-    ) -> Result<WriteTextFileResponse, Error> {
-        self.conn
-            .request::<Option<_>>(
-                FS_WRITE_TEXT_FILE_METHOD_NAME,
-                Some(AgentRequest::WriteTextFileRequest(args)),
-            )
-            .await
-            .map(Option::unwrap_or_default)
-    }
-
-    async fn read_text_file(
-        &self,
-        args: ReadTextFileRequest,
-    ) -> Result<ReadTextFileResponse, Error> {
-        self.conn
-            .request(
-                FS_READ_TEXT_FILE_METHOD_NAME,
-                Some(AgentRequest::ReadTextFileRequest(args)),
-            )
-            .await
-    }
-
-    async fn create_terminal(
-        &self,
-        args: CreateTerminalRequest,
-    ) -> Result<CreateTerminalResponse, Error> {
-        self.conn
-            .request(
-                TERMINAL_CREATE_METHOD_NAME,
-                Some(AgentRequest::CreateTerminalRequest(args)),
-            )
-            .await
-    }
-
-    async fn terminal_output(
-        &self,
-        args: TerminalOutputRequest,
-    ) -> Result<TerminalOutputResponse, Error> {
-        self.conn
-            .request(
-                TERMINAL_OUTPUT_METHOD_NAME,
-                Some(AgentRequest::TerminalOutputRequest(args)),
-            )
-            .await
-    }
-
-    async fn release_terminal(
-        &self,
-        args: ReleaseTerminalRequest,
-    ) -> Result<ReleaseTerminalResponse, Error> {
-        self.conn
-            .request::<Option<_>>(
-                TERMINAL_RELEASE_METHOD_NAME,
-                Some(AgentRequest::ReleaseTerminalRequest(args)),
-            )
-            .await
-            .map(Option::unwrap_or_default)
-    }
-
-    async fn wait_for_terminal_exit(
-        &self,
-        args: WaitForTerminalExitRequest,
-    ) -> Result<WaitForTerminalExitResponse, Error> {
-        self.conn
-            .request(
-                TERMINAL_WAIT_FOR_EXIT_METHOD_NAME,
-                Some(AgentRequest::WaitForTerminalExitRequest(args)),
-            )
-            .await
-    }
-
-    async fn kill_terminal_command(
-        &self,
-        args: KillTerminalCommandRequest,
-    ) -> Result<KillTerminalCommandResponse, Error> {
-        self.conn
-            .request::<Option<_>>(
-                TERMINAL_KILL_METHOD_NAME,
-                Some(AgentRequest::KillTerminalCommandRequest(args)),
-            )
-            .await
-            .map(Option::unwrap_or_default)
-    }
-
-    async fn session_notification(&self, args: SessionNotification) -> Result<(), Error> {
-        self.conn.notify(
-            SESSION_UPDATE_NOTIFICATION,
-            Some(AgentNotification::SessionNotification(args)),
-        )
-    }
-
-    async fn ext_method(&self, args: ExtRequest) -> Result<ExtResponse, Error> {
-        self.conn
-            .request(
-                format!("_{}", args.method),
-                Some(AgentRequest::ExtMethodRequest(args)),
-            )
-            .await
-    }
-
-    async fn ext_notification(&self, args: ExtNotification) -> Result<(), Error> {
-        self.conn.notify(
-            format!("_{}", args.method),
-            Some(AgentNotification::ExtNotification(args)),
-        )
-    }
-}
-
-/// Marker type representing the agent side of an ACP connection.
-///
-/// This type is used by the RPC layer to determine which messages
-/// are incoming vs outgoing from the agent's perspective.
-///
-/// See protocol docs: [Communication Model](https://agentclientprotocol.com/protocol/overview#communication-model)
-#[derive(Clone)]
-pub struct AgentSide;
-
-impl Side for AgentSide {
-    type InRequest = ClientRequest;
-    type InNotification = ClientNotification;
-    type OutResponse = AgentResponse;
-
-    fn decode_request(method: &str, params: Option<&RawValue>) -> Result<ClientRequest, Error> {
-        let params = params.ok_or_else(Error::invalid_params)?;
-
-        match method {
-            INITIALIZE_METHOD_NAME => serde_json::from_str(params.get())
-                .map(ClientRequest::InitializeRequest)
-                .map_err(Into::into),
-            AUTHENTICATE_METHOD_NAME => serde_json::from_str(params.get())
-                .map(ClientRequest::AuthenticateRequest)
-                .map_err(Into::into),
-            SESSION_NEW_METHOD_NAME => serde_json::from_str(params.get())
-                .map(ClientRequest::NewSessionRequest)
-                .map_err(Into::into),
-            SESSION_LOAD_METHOD_NAME => serde_json::from_str(params.get())
-                .map(ClientRequest::LoadSessionRequest)
-                .map_err(Into::into),
-            SESSION_SET_MODE_METHOD_NAME => serde_json::from_str(params.get())
-                .map(ClientRequest::SetSessionModeRequest)
-                .map_err(Into::into),
-            #[cfg(feature = "unstable")]
-            SESSION_SET_MODEL_METHOD_NAME => serde_json::from_str(params.get())
-                .map(ClientRequest::SetSessionModelRequest)
-                .map_err(Into::into),
-            SESSION_PROMPT_METHOD_NAME => serde_json::from_str(params.get())
-                .map(ClientRequest::PromptRequest)
-                .map_err(Into::into),
-            _ => {
-                if let Some(custom_method) = method.strip_prefix('_') {
-                    Ok(ClientRequest::ExtMethodRequest(ExtRequest {
-                        method: custom_method.into(),
-                        params: RawValue::from_string(params.get().to_string())?.into(),
-                    }))
-                } else {
-                    Err(Error::method_not_found())
-                }
-            }
-        }
-    }
-
-    fn decode_notification(
-        method: &str,
-        params: Option<&RawValue>,
-    ) -> Result<ClientNotification, Error> {
-        let params = params.ok_or_else(Error::invalid_params)?;
-
-        match method {
-            SESSION_CANCEL_METHOD_NAME => serde_json::from_str(params.get())
-                .map(ClientNotification::CancelNotification)
-                .map_err(Into::into),
-            _ => {
-                if let Some(custom_method) = method.strip_prefix('_') {
-                    Ok(ClientNotification::ExtNotification(ExtNotification {
-                        method: custom_method.into(),
-                        params: RawValue::from_string(params.get().to_string())?.into(),
-                    }))
-                } else {
-                    Err(Error::method_not_found())
-                }
-            }
-        }
-    }
-}
-
-impl<T: Agent> MessageHandler<AgentSide> for T {
-    async fn handle_request(&self, request: ClientRequest) -> Result<AgentResponse, Error> {
-        match request {
-            ClientRequest::InitializeRequest(args) => {
-                let response = self.initialize(args).await?;
-                Ok(AgentResponse::InitializeResponse(response))
-            }
-            ClientRequest::AuthenticateRequest(args) => {
-                let response = self.authenticate(args).await?;
-                Ok(AgentResponse::AuthenticateResponse(response))
-            }
-            ClientRequest::NewSessionRequest(args) => {
-                let response = self.new_session(args).await?;
-                Ok(AgentResponse::NewSessionResponse(response))
-            }
-            ClientRequest::LoadSessionRequest(args) => {
-                let response = self.load_session(args).await?;
-                Ok(AgentResponse::LoadSessionResponse(response))
-            }
-            ClientRequest::PromptRequest(args) => {
-                let response = self.prompt(args).await?;
-                Ok(AgentResponse::PromptResponse(response))
-            }
-            ClientRequest::SetSessionModeRequest(args) => {
-                let response = self.set_session_mode(args).await?;
-                Ok(AgentResponse::SetSessionModeResponse(response))
-            }
-            #[cfg(feature = "unstable")]
-            ClientRequest::SetSessionModelRequest(args) => {
-                let response = self.set_session_model(args).await?;
-                Ok(AgentResponse::SetSessionModelResponse(response))
-            }
-            ClientRequest::ExtMethodRequest(args) => {
-                let response = self.ext_method(args).await?;
-                Ok(AgentResponse::ExtMethodResponse(response))
-            }
-        }
-    }
-
-    async fn handle_notification(&self, notification: ClientNotification) -> Result<(), Error> {
-        match notification {
-            ClientNotification::CancelNotification(args) => {
-                self.cancel(args).await?;
-            }
-            ClientNotification::ExtNotification(args) => {
-                self.ext_notification(args).await?;
-            }
-        }
-        Ok(())
-    }
-}
diff --git a/rust/sdk/rpc.rs b/rust/sdk/rpc.rs
deleted file mode 100644
index eab7c716..00000000
--- a/rust/sdk/rpc.rs
+++ /dev/null
@@ -1,452 +0,0 @@
-use std::{
-    any::Any,
-    collections::HashMap,
-    rc::Rc,
-    sync::{
-        Arc,
-        atomic::{AtomicI64, Ordering},
-    },
-};
-
-use anyhow::Result;
-use futures::{
-    AsyncBufReadExt as _, AsyncRead, AsyncWrite, AsyncWriteExt as _, FutureExt as _,
-    StreamExt as _,
-    channel::{
-        mpsc::{self, UnboundedReceiver, UnboundedSender},
-        oneshot,
-    },
-    future::LocalBoxFuture,
-    io::BufReader,
-    select_biased,
-};
-use parking_lot::Mutex;
-use serde::{Deserialize, Serialize, de::DeserializeOwned};
-use serde_json::value::RawValue;
-
-use super::stream_broadcast::{StreamBroadcast, StreamReceiver, StreamSender};
-use crate::Error;
-
-pub struct RpcConnection<Local: Side, Remote: Side> {
-    outgoing_tx: UnboundedSender<OutgoingMessage<Local, Remote>>,
-    pending_responses: Arc<Mutex<HashMap<Id, PendingResponse>>>,
-    next_id: AtomicI64,
-    broadcast: StreamBroadcast,
-}
-
-struct PendingResponse {
-    deserialize: fn(&serde_json::value::RawValue) -> Result<Box<dyn Any + Send>, Error>,
-    respond: oneshot::Sender<Result<Box<dyn Any + Send>, Error>>,
-}
-
-impl<Local, Remote> RpcConnection<Local, Remote>
-where
-    Local: Side + 'static,
-    Remote: Side + 'static,
-{
-    pub fn new<Handler>(
-        handler: Handler,
-        outgoing_bytes: impl Unpin + AsyncWrite,
-        incoming_bytes: impl Unpin + AsyncRead,
-        spawn: impl Fn(LocalBoxFuture<'static, ()>) + 'static,
-    ) -> (Self, impl futures::Future<Output = Result<()>>)
-    where
-        Handler: MessageHandler<Local> + 'static,
-    {
-        let (incoming_tx, incoming_rx) = mpsc::unbounded();
-        let (outgoing_tx, outgoing_rx) = mpsc::unbounded();
-
-        let pending_responses = Arc::new(Mutex::new(HashMap::default()));
-        let (broadcast_tx, broadcast) = StreamBroadcast::new();
-
-        let io_task = {
-            let pending_responses = pending_responses.clone();
-            async move {
-                let result = Self::handle_io(
-                    incoming_tx,
-                    outgoing_rx,
-                    outgoing_bytes,
-                    incoming_bytes,
-                    pending_responses.clone(),
-                    broadcast_tx,
-                )
-                .await;
-                pending_responses.lock().clear();
-                result
-            }
-        };
-
-        Self::handle_incoming(outgoing_tx.clone(), incoming_rx, handler, spawn);
-
-        let this = Self {
-            outgoing_tx,
-            pending_responses,
-            next_id: AtomicI64::new(0),
-            broadcast,
-        };
-
-        (this, io_task)
-    }
-
-    pub fn subscribe(&self) -> StreamReceiver {
-        self.broadcast.receiver()
-    }
-
-    pub fn notify(
-        &self,
-        method: impl Into<Arc<str>>,
-        params: Option<Remote::InNotification>,
-    ) -> Result<(), Error> {
-        self.outgoing_tx
-            .unbounded_send(OutgoingMessage::Notification {
-                method: method.into(),
-                params,
-            })
-            .map_err(|_| Error::internal_error().with_data("failed to send notification"))
-    }
-
-    pub fn request<Out: DeserializeOwned + Send + 'static>(
-        &self,
-        method: impl Into<Arc<str>>,
-        params: Option<Remote::InRequest>,
-    ) -> impl Future<Output = Result<Out, Error>> {
-        let (tx, rx) = oneshot::channel();
-        let id = self.next_id.fetch_add(1, Ordering::SeqCst);
-        let id = Id::Number(id);
-        self.pending_responses.lock().insert(
-            id.clone(),
-            PendingResponse {
-                deserialize: |value| {
-                    serde_json::from_str::<Out>(value.get())
-                        .map(|out| Box::new(out) as _)
-                        .map_err(|_| {
-                            Error::internal_error().with_data("failed to deserialize response")
-                        })
-                },
-                respond: tx,
-            },
-        );
-
-        if self
-            .outgoing_tx
-            .unbounded_send(OutgoingMessage::Request {
-                id: id.clone(),
-                method: method.into(),
-                params,
-            })
-            .is_err()
-        {
-            self.pending_responses.lock().remove(&id);
-        }
-        async move {
-            let result = rx
-                .await
-                .map_err(|_| Error::internal_error().with_data("server shut down unexpectedly"))??
-                .downcast::<Out>()
-                .map_err(|_| Error::internal_error().with_data("failed to deserialize response"))?;
-
-            Ok(*result)
-        }
-    }
-
-    async fn handle_io(
-        incoming_tx: UnboundedSender<IncomingMessage<Local>>,
-        mut outgoing_rx: UnboundedReceiver<OutgoingMessage<Local, Remote>>,
-        mut outgoing_bytes: impl Unpin + AsyncWrite,
-        incoming_bytes: impl Unpin + AsyncRead,
-        pending_responses: Arc<Mutex<HashMap<Id, PendingResponse>>>,
-        broadcast: StreamSender,
-    ) -> Result<()> {
-        // TODO: Create nicer abstraction for broadcast
-        let mut input_reader = BufReader::new(incoming_bytes);
-        let mut outgoing_line = Vec::new();
-        let mut incoming_line = String::new();
-        loop {
-            select_biased! {
-                message = outgoing_rx.next() => {
-                    if let Some(message) = message {
-                        outgoing_line.clear();
-                        serde_json::to_writer(&mut outgoing_line, &JsonRpcMessage::wrap(&message)).map_err(Error::into_internal_error)?;
-                        log::trace!("send: {}", String::from_utf8_lossy(&outgoing_line));
-                        outgoing_line.push(b'\n');
-                        outgoing_bytes.write_all(&outgoing_line).await.ok();
-                        broadcast.outgoing(&message);
-                    } else {
-                        break;
-                    }
-                }
-                bytes_read = input_reader.read_line(&mut incoming_line).fuse() => {
-                    if bytes_read.map_err(Error::into_internal_error)? == 0 {
-                        break
-                    }
-                    log::trace!("recv: {}", &incoming_line);
-
-                    match serde_json::from_str::<RawIncomingMessage>(&incoming_line) {
-                        Ok(message) => {
-                            if let Some(id) = message.id {
-                                if let Some(method) = message.method {
-                                    // Request
-                                    match Local::decode_request(method, message.params) {
-                                        Ok(request) => {
-                                            broadcast.incoming_request(id.clone(), method, &request);
-                                            incoming_tx.unbounded_send(IncomingMessage::Request { id, request }).ok();
-                                        }
-                                        Err(err) => {
-                                            outgoing_line.clear();
-                                            let error_response = OutgoingMessage::<Local, Remote>::Response {
-                                                id,
-                                                result: ResponseResult::Error(err),
-                                            };
-
-                                            serde_json::to_writer(&mut outgoing_line, &JsonRpcMessage::wrap(&error_response))?;
-                                            log::trace!("send: {}", String::from_utf8_lossy(&outgoing_line));
-                                            outgoing_line.push(b'\n');
-                                            outgoing_bytes.write_all(&outgoing_line).await.ok();
-                                            broadcast.outgoing(&error_response);
-                                        }
-                                    }
-                                } else if let Some(pending_response) = pending_responses.lock().remove(&id) {
-                                    // Response
-                                    if let Some(result_value) = message.result {
-                                        broadcast.incoming_response(id, Ok(Some(result_value)));
-
-                                        let result = (pending_response.deserialize)(result_value);
-                                        pending_response.respond.send(result).ok();
-                                    } else if let Some(error) = message.error {
-                                        broadcast.incoming_response(id, Err(&error));
-
-                                        pending_response.respond.send(Err(error)).ok();
-                                    } else {
-                                        broadcast.incoming_response(id, Ok(None));
-
-                                        let result = (pending_response.deserialize)(&RawValue::from_string("null".into()).unwrap());
-                                        pending_response.respond.send(result).ok();
-                                    }
-                                } else {
-                                    log::error!("received response for unknown request id: {id:?}");
-                                }
-                            } else if let Some(method) = message.method {
-                                // Notification
-                                match Local::decode_notification(method, message.params) {
-                                    Ok(notification) => {
-                                        broadcast.incoming_notification(method, &notification);
-                                        incoming_tx.unbounded_send(IncomingMessage::Notification { notification }).ok();
-                                    }
-                                    Err(err) => {
-                                        log::error!("failed to decode {:?}: {err}", message.params);
-                                    }
-                                }
-                            } else {
-                                log::error!("received message with neither id nor method");
-                            }
-                        }
-                        Err(error) => {
-                            log::error!("failed to parse incoming message: {error}. Raw: {incoming_line}");
-                        }
-                    }
-                    incoming_line.clear();
-                }
-            }
-        }
-        Ok(())
-    }
-
-    fn handle_incoming<Handler: MessageHandler<Local> + 'static>(
-        outgoing_tx: UnboundedSender<OutgoingMessage<Local, Remote>>,
-        mut incoming_rx: UnboundedReceiver<IncomingMessage<Local>>,
-        handler: Handler,
-        spawn: impl Fn(LocalBoxFuture<'static, ()>) + 'static,
-    ) {
-        let spawn = Rc::new(spawn);
-        let handler = Rc::new(handler);
-        spawn({
-            let spawn = spawn.clone();
-            async move {
-                while let Some(message) = incoming_rx.next().await {
-                    match message {
-                        IncomingMessage::Request { id, request } => {
-                            let outgoing_tx = outgoing_tx.clone();
-                            let handler = handler.clone();
-                            spawn(
-                                async move {
-                                    let result = handler.handle_request(request).await.into();
-                                    outgoing_tx
-                                        .unbounded_send(OutgoingMessage::Response { id, result })
-                                        .ok();
-                                }
-                                .boxed_local(),
-                            );
-                        }
-                        IncomingMessage::Notification { notification } => {
-                            let handler = handler.clone();
-                            spawn(
-                                async move {
-                                    if let Err(err) =
-                                        handler.handle_notification(notification).await
-                                    {
-                                        log::error!("failed to handle notification: {err:?}");
-                                    }
-                                }
-                                .boxed_local(),
-                            );
-                        }
-                    }
-                }
-            }
-            .boxed_local()
-        });
-    }
-}
-
-/// JSON RPC Request Id
-#[derive(Debug, PartialEq, Clone, Hash, Eq, Deserialize, Serialize, PartialOrd, Ord)]
-#[serde(deny_unknown_fields)]
-#[serde(untagged)]
-pub enum Id {
-    Null,
-    Number(i64),
-    Str(String),
-}
-
-#[derive(Deserialize)]
-struct RawIncomingMessage<'a> {
-    id: Option<Id>,
-    method: Option<&'a str>,
-    params: Option<&'a RawValue>,
-    result: Option<&'a RawValue>,
-    error: Option<Error>,
-}
-
-enum IncomingMessage<Local: Side> {
-    Request { id: Id, request: Local::InRequest },
-    Notification { notification: Local::InNotification },
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-#[serde(untagged)]
-pub enum OutgoingMessage<Local: Side, Remote: Side> {
-    Request {
-        id: Id,
-        method: Arc<str>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        params: Option<Remote::InRequest>,
-    },
-    Response {
-        id: Id,
-        #[serde(flatten)]
-        result: ResponseResult<Local::OutResponse>,
-    },
-    Notification {
-        method: Arc<str>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        params: Option<Remote::InNotification>,
-    },
-}
-
-/// Either [`OutgoingMessage`] or [`IncomingMessage`] with `"jsonrpc": "2.0"` specified as
-/// [required by JSON-RPC 2.0 Specification][1].
-///
-/// [1]: https://www.jsonrpc.org/specification#compatibility
-#[derive(Debug, Serialize, Deserialize)]
-pub struct JsonRpcMessage<M> {
-    jsonrpc: &'static str,
-    #[serde(flatten)]
-    message: M,
-}
-
-impl<M> JsonRpcMessage<M> {
-    /// Used version of [JSON-RPC protocol].
-    ///
-    /// [JSON-RPC]: https://www.jsonrpc.org
-    pub const VERSION: &'static str = "2.0";
-
-    /// Wraps the provided [`OutgoingMessage`] or [`IncomingMessage`] into a versioned
-    /// [`JsonRpcMessage`].
-    #[must_use]
-    pub fn wrap(message: M) -> Self {
-        Self {
-            jsonrpc: Self::VERSION,
-            message,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum ResponseResult<Res> {
-    Result(Res),
-    Error(Error),
-}
-
-impl<T> From<Result<T, Error>> for ResponseResult<T> {
-    fn from(result: Result<T, Error>) -> Self {
-        match result {
-            Ok(value) => ResponseResult::Result(value),
-            Err(error) => ResponseResult::Error(error),
-        }
-    }
-}
-
-pub trait Side: Clone {
-    type InRequest: Clone + Serialize + DeserializeOwned + 'static;
-    type OutResponse: Clone + Serialize + DeserializeOwned + 'static;
-    type InNotification: Clone + Serialize + DeserializeOwned + 'static;
-
-    fn decode_request(method: &str, params: Option<&RawValue>) -> Result<Self::InRequest, Error>;
-
-    fn decode_notification(
-        method: &str,
-        params: Option<&RawValue>,
-    ) -> Result<Self::InNotification, Error>;
-}
-
-pub trait MessageHandler<Local: Side> {
-    fn handle_request(
-        &self,
-        request: Local::InRequest,
-    ) -> impl Future<Output = Result<Local::OutResponse, Error>>;
-
-    fn handle_notification(
-        &self,
-        notification: Local::InNotification,
-    ) -> impl Future<Output = Result<(), Error>>;
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use serde_json::{Number, Value};
-
-    #[test]
-    fn id_deserialization() {
-        let id = serde_json::from_value::<Id>(Value::Null).unwrap();
-        assert_eq!(id, Id::Null);
-
-        let id =
-            serde_json::from_value::<Id>(Value::Number(Number::from_u128(1).unwrap())).unwrap();
-        assert_eq!(id, Id::Number(1));
-
-        let id =
-            serde_json::from_value::<Id>(Value::Number(Number::from_i128(-1).unwrap())).unwrap();
-        assert_eq!(id, Id::Number(-1));
-
-        let id = serde_json::from_value::<Id>(Value::String("id".to_owned())).unwrap();
-        assert_eq!(id, Id::Str("id".to_owned()));
-    }
-
-    #[test]
-    fn id_serialization() {
-        let id = serde_json::to_value(Id::Null).unwrap();
-        assert_eq!(id, Value::Null);
-
-        let id = serde_json::to_value(Id::Number(1)).unwrap();
-        assert_eq!(id, Value::Number(Number::from_u128(1).unwrap()));
-
-        let id = serde_json::to_value(Id::Number(-1)).unwrap();
-        assert_eq!(id, Value::Number(Number::from_i128(-1).unwrap()));
-
-        let id = serde_json::to_value(Id::Str("id".to_owned())).unwrap();
-        assert_eq!(id, Value::String("id".to_owned()));
-    }
-}
diff --git a/rust/sdk/rpc_tests.rs b/rust/sdk/rpc_tests.rs
deleted file mode 100644
index ad1c9429..00000000
--- a/rust/sdk/rpc_tests.rs
+++ /dev/null
@@ -1,897 +0,0 @@
-use anyhow::Result;
-use serde_json::json;
-use std::sync::{Arc, Mutex};
-
-use crate::*;
-
-#[derive(Clone)]
-struct TestClient {
-    permission_responses: Arc<Mutex<Vec<RequestPermissionOutcome>>>,
-    file_contents: Arc<Mutex<std::collections::HashMap<std::path::PathBuf, String>>>,
-    written_files: Arc<Mutex<Vec<(std::path::PathBuf, String)>>>,
-    session_notifications: Arc<Mutex<Vec<SessionNotification>>>,
-    extension_notifications: Arc<Mutex<Vec<(String, ExtNotification)>>>,
-}
-
-impl TestClient {
-    fn new() -> Self {
-        Self {
-            permission_responses: Arc::new(Mutex::new(Vec::new())),
-            file_contents: Arc::new(Mutex::new(std::collections::HashMap::new())),
-            written_files: Arc::new(Mutex::new(Vec::new())),
-            session_notifications: Arc::new(Mutex::new(Vec::new())),
-            extension_notifications: Arc::new(Mutex::new(Vec::new())),
-        }
-    }
-
-    fn add_permission_response(&self, outcome: RequestPermissionOutcome) {
-        self.permission_responses.lock().unwrap().push(outcome);
-    }
-
-    fn add_file_content(&self, path: std::path::PathBuf, content: String) {
-        self.file_contents.lock().unwrap().insert(path, content);
-    }
-}
-
-macro_rules! raw_json {
-    ($($json:tt)+) => {{
-        let response = serde_json::json!($($json)+);
-        serde_json::value::to_raw_value(&response).unwrap().into()
-    }};
-}
-
-#[async_trait::async_trait(?Send)]
-impl Client for TestClient {
-    async fn request_permission(
-        &self,
-        _arguments: RequestPermissionRequest,
-    ) -> Result<RequestPermissionResponse, Error> {
-        let responses = self.permission_responses.clone();
-        let mut responses = responses.lock().unwrap();
-        let outcome = responses
-            .pop()
-            .unwrap_or(RequestPermissionOutcome::Cancelled);
-        Ok(RequestPermissionResponse {
-            outcome,
-            meta: None,
-        })
-    }
-
-    async fn write_text_file(
-        &self,
-        arguments: WriteTextFileRequest,
-    ) -> Result<WriteTextFileResponse, Error> {
-        self.written_files
-            .lock()
-            .unwrap()
-            .push((arguments.path, arguments.content));
-        Ok(WriteTextFileResponse::default())
-    }
-
-    async fn read_text_file(
-        &self,
-        arguments: ReadTextFileRequest,
-    ) -> Result<ReadTextFileResponse, Error> {
-        let contents = self.file_contents.lock().unwrap();
-        let content = contents
-            .get(&arguments.path)
-            .cloned()
-            .unwrap_or_else(|| "default content".to_string());
-        Ok(ReadTextFileResponse {
-            content,
-            meta: None,
-        })
-    }
-
-    async fn session_notification(&self, args: SessionNotification) -> Result<(), Error> {
-        self.session_notifications.lock().unwrap().push(args);
-        Ok(())
-    }
-
-    async fn create_terminal(
-        &self,
-        _args: CreateTerminalRequest,
-    ) -> Result<CreateTerminalResponse, Error> {
-        unimplemented!()
-    }
-
-    async fn terminal_output(
-        &self,
-        _args: TerminalOutputRequest,
-    ) -> Result<TerminalOutputResponse, Error> {
-        unimplemented!()
-    }
-
-    async fn kill_terminal_command(
-        &self,
-        _args: KillTerminalCommandRequest,
-    ) -> Result<KillTerminalCommandResponse, Error> {
-        unimplemented!()
-    }
-
-    async fn release_terminal(
-        &self,
-        _args: ReleaseTerminalRequest,
-    ) -> Result<ReleaseTerminalResponse, Error> {
-        unimplemented!()
-    }
-
-    async fn wait_for_terminal_exit(
-        &self,
-        _args: WaitForTerminalExitRequest,
-    ) -> Result<WaitForTerminalExitResponse, Error> {
-        unimplemented!()
-    }
-
-    async fn ext_method(&self, args: ExtRequest) -> Result<ExtResponse, Error> {
-        match dbg!(args.method.as_ref()) {
-            "example.com/ping" => Ok(raw_json!({
-                "response": "pong",
-                "params": args.params
-            })),
-            _ => Err(Error::method_not_found()),
-        }
-    }
-
-    async fn ext_notification(&self, args: ExtNotification) -> Result<(), Error> {
-        self.extension_notifications
-            .lock()
-            .unwrap()
-            .push((args.method.to_string(), args));
-        Ok(())
-    }
-}
-
-#[derive(Clone)]
-struct TestAgent {
-    sessions: Arc<Mutex<std::collections::HashSet<SessionId>>>,
-    prompts_received: Arc<Mutex<Vec<PromptReceived>>>,
-    cancellations_received: Arc<Mutex<Vec<SessionId>>>,
-    extension_notifications: Arc<Mutex<Vec<(String, ExtNotification)>>>,
-}
-
-type PromptReceived = (SessionId, Vec<ContentBlock>);
-
-impl TestAgent {
-    fn new() -> Self {
-        Self {
-            sessions: Arc::new(Mutex::new(std::collections::HashSet::new())),
-            prompts_received: Arc::new(Mutex::new(Vec::new())),
-            cancellations_received: Arc::new(Mutex::new(Vec::new())),
-            extension_notifications: Arc::new(Mutex::new(Vec::new())),
-        }
-    }
-}
-
-#[async_trait::async_trait(?Send)]
-impl Agent for TestAgent {
-    async fn initialize(&self, arguments: InitializeRequest) -> Result<InitializeResponse, Error> {
-        Ok(InitializeResponse {
-            protocol_version: arguments.protocol_version,
-            agent_capabilities: AgentCapabilities::default(),
-            auth_methods: vec![],
-            meta: None,
-        })
-    }
-
-    async fn authenticate(
-        &self,
-        _arguments: AuthenticateRequest,
-    ) -> Result<AuthenticateResponse, Error> {
-        Ok(AuthenticateResponse::default())
-    }
-
-    async fn new_session(
-        &self,
-        _arguments: NewSessionRequest,
-    ) -> Result<NewSessionResponse, Error> {
-        let session_id = SessionId(Arc::from("test-session-123"));
-        self.sessions.lock().unwrap().insert(session_id.clone());
-        Ok(NewSessionResponse {
-            session_id,
-            modes: None,
-            #[cfg(feature = "unstable")]
-            models: None,
-            meta: None,
-        })
-    }
-
-    async fn load_session(&self, _: LoadSessionRequest) -> Result<LoadSessionResponse, Error> {
-        Ok(LoadSessionResponse {
-            modes: None,
-            #[cfg(feature = "unstable")]
-            models: None,
-            meta: None,
-        })
-    }
-
-    async fn set_session_mode(
-        &self,
-        _arguments: SetSessionModeRequest,
-    ) -> Result<SetSessionModeResponse, Error> {
-        Ok(SetSessionModeResponse { meta: None })
-    }
-
-    async fn prompt(&self, arguments: PromptRequest) -> Result<PromptResponse, Error> {
-        self.prompts_received
-            .lock()
-            .unwrap()
-            .push((arguments.session_id, arguments.prompt));
-        Ok(PromptResponse {
-            stop_reason: StopReason::EndTurn,
-            meta: None,
-        })
-    }
-
-    async fn cancel(&self, args: CancelNotification) -> Result<(), Error> {
-        self.cancellations_received
-            .lock()
-            .unwrap()
-            .push(args.session_id);
-        Ok(())
-    }
-
-    #[cfg(feature = "unstable")]
-    async fn set_session_model(
-        &self,
-        args: SetSessionModelRequest,
-    ) -> Result<SetSessionModelResponse, Error> {
-        log::info!("Received select model request {args:?}");
-        Ok(SetSessionModelResponse::default())
-    }
-
-    async fn ext_method(&self, args: ExtRequest) -> Result<ExtResponse, Error> {
-        dbg!();
-        match dbg!(args.method.as_ref()) {
-            "example.com/echo" => {
-                let response = serde_json::json!({
-                    "echo": args.params
-                });
-                Ok(serde_json::value::to_raw_value(&response)?.into())
-            }
-            _ => Err(Error::method_not_found()),
-        }
-    }
-
-    async fn ext_notification(&self, args: ExtNotification) -> Result<(), Error> {
-        self.extension_notifications
-            .lock()
-            .unwrap()
-            .push((args.method.to_string(), args));
-        Ok(())
-    }
-}
-
-// Helper function to create a bidirectional connection
-fn create_connection_pair(
-    client: &TestClient,
-    agent: &TestAgent,
-) -> (ClientSideConnection, AgentSideConnection) {
-    let (client_to_agent_rx, client_to_agent_tx) = piper::pipe(1024);
-    let (agent_to_client_rx, agent_to_client_tx) = piper::pipe(1024);
-
-    let (agent_conn, agent_io_task) = ClientSideConnection::new(
-        client.clone(),
-        client_to_agent_tx,
-        agent_to_client_rx,
-        |fut| {
-            tokio::task::spawn_local(fut);
-        },
-    );
-
-    let (client_conn, client_io_task) = AgentSideConnection::new(
-        agent.clone(),
-        agent_to_client_tx,
-        client_to_agent_rx,
-        |fut| {
-            tokio::task::spawn_local(fut);
-        },
-    );
-
-    // Spawn the IO tasks
-    tokio::task::spawn_local(agent_io_task);
-    tokio::task::spawn_local(client_io_task);
-
-    (agent_conn, client_conn)
-}
-
-#[tokio::test]
-async fn test_initialize() {
-    let local_set = tokio::task::LocalSet::new();
-    local_set
-        .run_until(async {
-            let client = TestClient::new();
-            let agent = TestAgent::new();
-
-            let (agent_conn, _client_conn) = create_connection_pair(&client, &agent);
-
-            let result = agent_conn
-                .initialize(InitializeRequest {
-                    protocol_version: VERSION,
-                    client_capabilities: ClientCapabilities::default(),
-                    meta: None,
-                })
-                .await;
-
-            assert!(result.is_ok());
-            let response = result.unwrap();
-            assert_eq!(response.protocol_version, VERSION);
-        })
-        .await;
-}
-
-#[tokio::test]
-async fn test_basic_session_creation() {
-    let local_set = tokio::task::LocalSet::new();
-    local_set
-        .run_until(async {
-            let client = TestClient::new();
-            let agent = TestAgent::new();
-
-            let (agent_conn, _client_conn) = create_connection_pair(&client, &agent);
-
-            agent_conn
-                .new_session(NewSessionRequest {
-                    mcp_servers: vec![],
-                    cwd: std::path::PathBuf::from("/test"),
-                    meta: None,
-                })
-                .await
-                .expect("new_session failed");
-        })
-        .await;
-}
-
-#[tokio::test]
-async fn test_bidirectional_file_operations() {
-    let local_set = tokio::task::LocalSet::new();
-    local_set
-        .run_until(async {
-            let client = TestClient::new();
-            let agent = TestAgent::new();
-
-            // Add test file content
-            let test_path = std::path::PathBuf::from("/test/file.txt");
-            client.add_file_content(test_path.clone(), "Hello, World!".to_string());
-
-            let (_agent_conn, client_conn) = create_connection_pair(&client, &agent);
-
-            // Test reading a file
-            let session_id = SessionId(Arc::from("test-session"));
-            let read_result = client_conn
-                .read_text_file(ReadTextFileRequest {
-                    session_id: session_id.clone(),
-                    path: test_path.clone(),
-                    line: None,
-                    limit: None,
-                    meta: None,
-                })
-                .await
-                .expect("read_text_file failed");
-
-            assert_eq!(read_result.content, "Hello, World!");
-
-            // Test writing a file
-            let write_result = client_conn
-                .write_text_file(WriteTextFileRequest {
-                    session_id: session_id.clone(),
-                    path: test_path.clone(),
-                    content: "Updated content".to_string(),
-                    meta: None,
-                })
-                .await;
-
-            assert!(write_result.is_ok());
-        })
-        .await;
-}
-
-#[tokio::test]
-async fn test_session_notifications() {
-    let local_set = tokio::task::LocalSet::new();
-    local_set
-        .run_until(async {
-            let client = TestClient::new();
-            let agent = TestAgent::new();
-
-            let (_agent_conn, client_conn) = create_connection_pair(&client, &agent);
-
-            let session_id = SessionId(Arc::from("test-session"));
-            // Send various session updates
-            client_conn
-                .session_notification(SessionNotification {
-                    session_id: session_id.clone(),
-                    update: SessionUpdate::UserMessageChunk {
-                        content: ContentBlock::Text(TextContent {
-                            annotations: None,
-                            text: "Hello from user".to_string(),
-                            meta: None,
-                        }),
-                    },
-                    meta: None,
-                })
-                .await
-                .expect("session_notification failed");
-
-            client_conn
-                .session_notification(SessionNotification {
-                    session_id: session_id.clone(),
-                    update: SessionUpdate::AgentMessageChunk {
-                        content: ContentBlock::Text(TextContent {
-                            annotations: None,
-                            text: "Hello from agent".to_string(),
-                            meta: None,
-                        }),
-                    },
-                    meta: None,
-                })
-                .await
-                .expect("session_notification failed");
-
-            tokio::task::yield_now().await;
-
-            let notifications = client.session_notifications.lock().unwrap();
-            assert_eq!(notifications.len(), 2);
-            assert_eq!(notifications[0].session_id, session_id);
-            assert_eq!(notifications[1].session_id, session_id);
-        })
-        .await;
-}
-
-#[tokio::test]
-async fn test_cancel_notification() {
-    let local_set = tokio::task::LocalSet::new();
-    local_set
-        .run_until(async {
-            let client = TestClient::new();
-            let agent = TestAgent::new();
-
-            let (agent_conn, _client_conn) = create_connection_pair(&client, &agent);
-
-            let session_id = SessionId(Arc::from("test-session"));
-            // Send cancel notification
-            agent_conn
-                .cancel(CancelNotification {
-                    session_id: session_id.clone(),
-                    meta: None,
-                })
-                .await
-                .expect("cancel failed");
-
-            tokio::task::yield_now().await;
-
-            let cancelled = agent.cancellations_received.lock().unwrap();
-            assert_eq!(cancelled.len(), 1);
-            assert_eq!(cancelled[0], session_id);
-        })
-        .await;
-}
-
-#[tokio::test]
-async fn test_concurrent_operations() {
-    let local_set = tokio::task::LocalSet::new();
-    local_set
-        .run_until(async {
-            let client = TestClient::new();
-            let agent = TestAgent::new();
-
-            // Add multiple file contents
-            for i in 0..5 {
-                let path = std::path::PathBuf::from(format!("/test/file{i}.txt"));
-                client.add_file_content(path, format!("Content {i}"));
-            }
-
-            let (_agent_conn, client_conn) = create_connection_pair(&client, &agent);
-
-            let session_id = SessionId(Arc::from("test-session"));
-
-            // Launch multiple concurrent read operations
-            let mut read_futures = vec![];
-            for i in 0..5 {
-                let path = std::path::PathBuf::from(format!("/test/file{i}.txt"));
-                let future = client_conn.read_text_file(ReadTextFileRequest {
-                    session_id: session_id.clone(),
-                    path,
-                    line: None,
-                    limit: None,
-                    meta: None,
-                });
-                read_futures.push(future);
-            }
-
-            // Wait for all reads to complete
-            let results = futures::future::join_all(read_futures).await;
-
-            // Verify all reads succeeded
-            for (i, result) in results.into_iter().enumerate() {
-                let output = result.expect("read failed");
-                assert_eq!(output.content, format!("Content {i}"));
-            }
-        })
-        .await;
-}
-
-#[tokio::test]
-async fn test_full_conversation_flow() {
-    let local_set = tokio::task::LocalSet::new();
-    local_set
-        .run_until(async {
-            let client = TestClient::new();
-            let agent = TestAgent::new();
-
-            // Set up permission to approve the tool call
-            client.add_permission_response(RequestPermissionOutcome::Selected {
-                option_id: PermissionOptionId(Arc::from("allow-once")),
-            });
-
-            let (agent_conn, client_conn) = create_connection_pair(&client, &agent);
-            // 1. Start new session
-            let new_session_result = agent_conn
-                .new_session(NewSessionRequest {
-                    mcp_servers: vec![],
-                    cwd: std::path::PathBuf::from("/test"),
-                    meta: None,
-                })
-                .await
-                .expect("new_session failed");
-
-            let session_id = new_session_result.session_id;
-
-            // 2. Send user message
-            let user_prompt = vec![ContentBlock::Text(TextContent {
-                annotations: None,
-                text: "Please analyze the file and summarize it".to_string(),
-                meta: None,
-            })];
-
-            agent_conn
-                .prompt(PromptRequest {
-                    session_id: session_id.clone(),
-                    prompt: user_prompt,
-                    meta: None,
-                })
-                .await
-                .expect("prompt failed");
-
-            // 3. Agent starts responding
-            client_conn
-                .session_notification(SessionNotification {
-                    session_id: session_id.clone(),
-                    update: SessionUpdate::AgentMessageChunk {
-                        content: ContentBlock::Text(TextContent {
-                            annotations: None,
-                            text: "I'll analyze the file for you. ".to_string(),
-                            meta: None,
-                        }),
-                    },
-                    meta: None,
-                })
-                .await
-                .expect("session_notification failed");
-
-            // 4. Agent creates a tool call
-            let tool_call_id = ToolCallId(Arc::from("read-file-001"));
-            client_conn
-                .session_notification(SessionNotification {
-                    session_id: session_id.clone(),
-                    update: SessionUpdate::ToolCall(ToolCall {
-                        id: tool_call_id.clone(),
-                        title: "Reading file".to_string(),
-                        kind: ToolKind::Read,
-                        status: ToolCallStatus::Pending,
-                        content: vec![],
-                        locations: vec![ToolCallLocation {
-                            path: std::path::PathBuf::from("/test/data.txt"),
-                            line: None,
-                            meta: None,
-                        }],
-                        raw_input: None,
-                        raw_output: None,
-                        meta: None,
-                    }),
-                    meta: None,
-                })
-                .await
-                .expect("session_notification failed");
-
-            // 5. Agent requests permission for the tool call
-            let permission_result = client_conn
-                .request_permission(RequestPermissionRequest {
-                    session_id: session_id.clone(),
-                    tool_call: ToolCallUpdate {
-                        id: tool_call_id.clone(),
-                        fields: ToolCallUpdateFields {
-                            title: Some("Read /test/data.txt".to_string()),
-                            locations: Some(vec![ToolCallLocation {
-                                path: std::path::PathBuf::from("/test/data.txt"),
-                                line: None,
-                                meta: None,
-                            }]),
-                            ..Default::default()
-                        },
-                        meta: None,
-                    },
-                    options: vec![
-                        PermissionOption {
-                            id: PermissionOptionId(Arc::from("allow-once")),
-                            name: "Allow once".to_string(),
-                            kind: PermissionOptionKind::AllowOnce,
-                            meta: None,
-                        },
-                        PermissionOption {
-                            id: PermissionOptionId(Arc::from("reject-once")),
-                            name: "Reject".to_string(),
-                            kind: PermissionOptionKind::RejectOnce,
-                            meta: None,
-                        },
-                    ],
-                    meta: None,
-                })
-                .await
-                .expect("request_permission failed");
-
-            // Verify permission was granted
-            match permission_result.outcome {
-                RequestPermissionOutcome::Selected { option_id } => {
-                    assert_eq!(option_id.0.as_ref(), "allow-once");
-                }
-                RequestPermissionOutcome::Cancelled => panic!("Expected permission to be granted"),
-            }
-
-            // 6. Update tool call status
-            client_conn
-                .session_notification(SessionNotification {
-                    session_id: session_id.clone(),
-                    update: SessionUpdate::ToolCallUpdate(ToolCallUpdate {
-                        id: tool_call_id.clone(),
-                        fields: ToolCallUpdateFields {
-                            status: Some(ToolCallStatus::InProgress),
-                            ..Default::default()
-                        },
-                        meta: None,
-                    }),
-                    meta: None,
-                })
-                .await
-                .expect("session_notification failed");
-
-            // 7. Tool call completes with content
-            client_conn
-                .session_notification(SessionNotification {
-                    session_id: session_id.clone(),
-                    update: SessionUpdate::ToolCallUpdate(ToolCallUpdate {
-                        id: tool_call_id.clone(),
-                        fields: ToolCallUpdateFields {
-                            status: Some(ToolCallStatus::Completed),
-                            content: Some(vec![ToolCallContent::Content {
-                                content: ContentBlock::Text(TextContent {
-                                    annotations: None,
-                                    text: "File contents: Lorem ipsum dolor sit amet".to_string(),
-                                    meta: None,
-                                }),
-                            }]),
-                            ..Default::default()
-                        },
-                        meta: None,
-                    }),
-                    meta: None,
-                })
-                .await
-                .expect("session_notification failed");
-
-            // 8. Agent sends more text after tool completion
-            client_conn
-                .session_notification(SessionNotification {
-                    session_id: session_id.clone(),
-                    update: SessionUpdate::AgentMessageChunk {
-                        content: ContentBlock::Text(TextContent {
-                            annotations: None,
-                            text: "Based on the file contents, here's my summary: The file contains placeholder text commonly used in the printing industry.".to_string(),
-                            meta: None,
-                        }),
-                    },
-                    meta: None,
-                })
-                .await
-                .expect("session_notification failed");
-
-            for _ in 0..10 {
-                tokio::task::yield_now().await;
-            }
-
-            // Verify we received all the updates
-            let updates = client.session_notifications.lock().unwrap();
-            assert!(updates.len() >= 5); // At least 5 updates sent
-
-            // Verify the sequence of updates
-            let mut found_agent_message = false;
-            let mut found_tool_call = false;
-            let mut found_tool_update = false;
-            let mut found_final_message = false;
-
-            for notification in updates.iter() {
-                match &notification.update {
-                    SessionUpdate::AgentMessageChunk { content : ContentBlock::Text(text)} => {
-                        if text.text.contains("I'll analyze") {
-                            found_agent_message = true;
-                        } else if text.text.contains("Based on the file") {
-                            found_final_message = true;
-                        }
-                    }
-                    SessionUpdate::ToolCall(_) => {
-                        found_tool_call = true;
-                    }
-                    SessionUpdate::ToolCallUpdate(update) => {
-                        if let Some(ToolCallStatus::Completed) = update.fields.status {
-                            found_tool_update = true;
-                        }
-                    }
-                    _ => {}
-                }
-            }
-
-            assert!(found_agent_message, "Should have initial agent message");
-            assert!(found_tool_call, "Should have tool call");
-            assert!(found_tool_update, "Should have tool call completion");
-            assert!(found_final_message, "Should have final agent message");
-        })
-        .await;
-}
-
-#[tokio::test]
-async fn test_notification_wire_format() {
-    use super::rpc::{JsonRpcMessage, OutgoingMessage};
-    use crate::{
-        AgentNotification, AgentSide, CancelNotification, ClientNotification, ClientSide,
-        ContentBlock, SessionNotification, SessionUpdate, TextContent,
-    };
-    use serde_json::{Value, json};
-
-    // Test client -> agent notification wire format
-    let outgoing_msg =
-        JsonRpcMessage::wrap(OutgoingMessage::<ClientSide, AgentSide>::Notification {
-            method: "cancel".into(),
-            params: Some(ClientNotification::CancelNotification(CancelNotification {
-                session_id: SessionId("test-123".into()),
-                meta: None,
-            })),
-        });
-
-    let serialized: Value = serde_json::to_value(&outgoing_msg).unwrap();
-    assert_eq!(
-        serialized,
-        json!({
-            "jsonrpc": "2.0",
-            "method": "cancel",
-            "params": {
-                "sessionId": "test-123"
-            },
-        })
-    );
-
-    // Test agent -> client notification wire format
-    let outgoing_msg =
-        JsonRpcMessage::wrap(OutgoingMessage::<AgentSide, ClientSide>::Notification {
-            method: "sessionUpdate".into(),
-            params: Some(AgentNotification::SessionNotification(
-                SessionNotification {
-                    session_id: SessionId("test-456".into()),
-                    update: SessionUpdate::AgentMessageChunk {
-                        content: ContentBlock::Text(TextContent {
-                            annotations: None,
-                            text: "Hello".to_string(),
-                            meta: None,
-                        }),
-                    },
-                    meta: None,
-                },
-            )),
-        });
-
-    let serialized: Value = serde_json::to_value(&outgoing_msg).unwrap();
-    assert_eq!(
-        serialized,
-        json!({
-            "jsonrpc": "2.0",
-            "method": "sessionUpdate",
-            "params": {
-                "sessionId": "test-456",
-                "update": {
-                    "sessionUpdate": "agent_message_chunk",
-                    "content": {
-                        "type": "text",
-                        "text": "Hello"
-                    }
-                }
-            }
-        })
-    );
-}
-
-#[tokio::test]
-async fn test_extension_methods_and_notifications() {
-    let local_set = tokio::task::LocalSet::new();
-    local_set
-        .run_until(async {
-            let client = TestClient::new();
-            let agent = TestAgent::new();
-
-            // Store references to the client and agent to check notifications later
-            let client_ref = client.clone();
-            let agent_ref = agent.clone();
-
-            let (client_conn, agent_conn) = create_connection_pair(&client, &agent);
-
-            // Test agent calling client extension method
-            let client_response = agent_conn
-                .ext_method(ExtRequest {
-                    method: "example.com/ping".into(),
-                    params: raw_json!({"data": "test"}),
-                })
-                .await
-                .unwrap();
-
-            assert_eq!(
-                serde_json::to_value(client_response).unwrap(),
-                serde_json::json!({
-                    "response": "pong",
-                    "params": {"data": "test"}
-                })
-            );
-
-            // Test client calling agent extension method
-            let agent_response = client_conn
-                .ext_method(ExtRequest {
-                    method: "example.com/echo".into(),
-                    params: raw_json!({"message": "hello"}),
-                })
-                .await
-                .unwrap();
-
-            assert_eq!(
-                serde_json::to_value(agent_response).unwrap(),
-                serde_json::json!({
-                    "echo": {"message": "hello"}
-                })
-            );
-
-            // Test extension notifications
-            agent_conn
-                .ext_notification(ExtNotification {
-                    method: "example.com/client/notify".into(),
-                    params: raw_json!({"info": "client notification"}),
-                })
-                .await
-                .unwrap();
-
-            client_conn
-                .ext_notification(ExtNotification {
-                    method: "example.com/agent/notify".into(),
-                    params: raw_json!({"info": "agent notification"}),
-                })
-                .await
-                .unwrap();
-
-            // Yield to allow notifications to be processed
-            tokio::task::yield_now().await;
-
-            // Verify client received the notification
-            let client_notifications = client_ref.extension_notifications.lock().unwrap();
-            assert_eq!(client_notifications.len(), 1);
-            assert_eq!(client_notifications[0].0, "example.com/client/notify");
-            assert_eq!(
-                serde_json::to_value(&client_notifications[0].1).unwrap(),
-                serde_json::json!({"info": "client notification"})
-            );
-
-            // Verify agent received the notification
-            let agent_notifications = agent_ref.extension_notifications.lock().unwrap();
-            assert_eq!(agent_notifications.len(), 1);
-            assert_eq!(agent_notifications[0].0, "example.com/agent/notify");
-            assert_eq!(
-                serde_json::to_value(&agent_notifications[0].1).unwrap(),
-                serde_json::json!({"info": "agent notification"})
-            );
-        })
-        .await;
-}
diff --git a/rust/sdk/stream_broadcast.rs b/rust/sdk/stream_broadcast.rs
deleted file mode 100644
index 248c00c1..00000000
--- a/rust/sdk/stream_broadcast.rs
+++ /dev/null
@@ -1,276 +0,0 @@
-//! JSON-RPC Stream broadcasting for debugging and monitoring communication.
-//!
-//! This module provides functionality to observe the JSON-RPC message stream between
-//! clients and agents. It's primarily used for debugging, logging, and building
-//! development tools that need to monitor the protocol communication.
-
-use std::sync::Arc;
-
-use anyhow::Result;
-use serde::Serialize;
-use serde_json::value::RawValue;
-
-use super::rpc::{Id, OutgoingMessage, ResponseResult, Side};
-use crate::Error;
-
-/// A message that flows through the RPC stream.
-///
-/// This represents any JSON-RPC message (request, response, or notification)
-/// along with its direction (incoming or outgoing).
-///
-/// Stream messages are used for observing and debugging the protocol communication
-/// without interfering with the actual message handling.
-#[derive(Debug, Clone)]
-pub struct StreamMessage {
-    /// The direction of the message relative to this side of the connection.
-    pub direction: StreamMessageDirection,
-    /// The actual content of the message.
-    pub message: StreamMessageContent,
-}
-
-/// The direction of a message in the RPC stream.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum StreamMessageDirection {
-    /// A message received from the other side of the connection.
-    Incoming,
-    /// A message sent to the other side of the connection.
-    Outgoing,
-}
-
-/// The content of a stream message.
-///
-/// This enum represents the three types of JSON-RPC messages:
-/// - Requests: Method calls that expect a response
-/// - Responses: Replies to previous requests
-/// - Notifications: One-way messages that don't expect a response
-#[derive(Debug, Clone)]
-pub enum StreamMessageContent {
-    /// A JSON-RPC request message.
-    Request {
-        /// The unique identifier for this request.
-        id: Id,
-        /// The name of the method being called.
-        method: Arc<str>,
-        /// Optional parameters for the method.
-        params: Option<serde_json::Value>,
-    },
-    /// A JSON-RPC response message.
-    Response {
-        /// The ID of the request this response is for.
-        id: Id,
-        /// The result of the request (success or error).
-        result: Result<Option<serde_json::Value>, Error>,
-    },
-    /// A JSON-RPC notification message.
-    Notification {
-        /// The name of the notification method.
-        method: Arc<str>,
-        /// Optional parameters for the notification.
-        params: Option<serde_json::Value>,
-    },
-}
-
-/// A receiver for observing the message stream.
-///
-/// This allows you to receive copies of all messages flowing through the connection,
-/// useful for debugging, logging, or building development tools.
-///
-/// # Example
-///
-/// ```no_run
-/// use agent_client_protocol::{StreamReceiver, StreamMessageDirection};
-///
-/// async fn monitor_messages(mut receiver: StreamReceiver) {
-///     while let Ok(message) = receiver.recv().await {
-///         match message.direction {
-///             StreamMessageDirection::Incoming => println!("← Received: {:?}", message.message),
-///             StreamMessageDirection::Outgoing => println!("→ Sent: {:?}", message.message),
-///         }
-///     }
-/// }
-/// ```
-pub struct StreamReceiver(async_broadcast::Receiver<StreamMessage>);
-
-impl StreamReceiver {
-    /// Receives the next message from the stream.
-    ///
-    /// This method will wait until a message is available or the sender is dropped.
-    ///
-    /// # Returns
-    ///
-    /// - `Ok(StreamMessage)` when a message is received
-    /// - `Err` when the sender is dropped or the receiver is lagged
-    pub async fn recv(&mut self) -> Result<StreamMessage> {
-        Ok(self.0.recv().await?)
-    }
-}
-
-/// Internal sender for broadcasting stream messages.
-///
-/// This is used internally by the RPC system to broadcast messages to all receivers.
-/// You typically won't interact with this directly.
-pub(crate) struct StreamSender(async_broadcast::Sender<StreamMessage>);
-
-impl StreamSender {
-    /// Broadcasts an outgoing message to all receivers.
-    pub(crate) fn outgoing<L: Side, R: Side>(&self, message: &OutgoingMessage<L, R>) {
-        if self.0.receiver_count() == 0 {
-            return;
-        }
-
-        let message = StreamMessage {
-            direction: StreamMessageDirection::Outgoing,
-            message: match message {
-                OutgoingMessage::Request { id, method, params } => StreamMessageContent::Request {
-                    id: id.clone(),
-                    method: method.clone(),
-                    params: serde_json::to_value(params).ok(),
-                },
-                OutgoingMessage::Response { id, result } => StreamMessageContent::Response {
-                    id: id.clone(),
-                    result: match result {
-                        ResponseResult::Result(value) => Ok(serde_json::to_value(value).ok()),
-                        ResponseResult::Error(error) => Err(error.clone()),
-                    },
-                },
-                OutgoingMessage::Notification { method, params } => {
-                    StreamMessageContent::Notification {
-                        method: method.clone(),
-                        params: serde_json::to_value(params).ok(),
-                    }
-                }
-            },
-        };
-
-        self.0.try_broadcast(message).ok();
-    }
-
-    /// Broadcasts an incoming request to all receivers.
-    pub(crate) fn incoming_request(
-        &self,
-        id: Id,
-        method: impl Into<Arc<str>>,
-        params: &impl Serialize,
-    ) {
-        if self.0.receiver_count() == 0 {
-            return;
-        }
-
-        let message = StreamMessage {
-            direction: StreamMessageDirection::Incoming,
-            message: StreamMessageContent::Request {
-                id,
-                method: method.into(),
-                params: serde_json::to_value(params).ok(),
-            },
-        };
-
-        self.0.try_broadcast(message).ok();
-    }
-
-    /// Broadcasts an incoming response to all receivers.
-    pub(crate) fn incoming_response(&self, id: Id, result: Result<Option<&RawValue>, &Error>) {
-        if self.0.receiver_count() == 0 {
-            return;
-        }
-
-        let result = match result {
-            Ok(Some(value)) => Ok(serde_json::from_str(value.get()).ok()),
-            Ok(None) => Ok(None),
-            Err(err) => Err(err.clone()),
-        };
-
-        let message = StreamMessage {
-            direction: StreamMessageDirection::Incoming,
-            message: StreamMessageContent::Response { id, result },
-        };
-
-        self.0.try_broadcast(message).ok();
-    }
-
-    /// Broadcasts an incoming notification to all receivers.
-    pub(crate) fn incoming_notification(
-        &self,
-        method: impl Into<Arc<str>>,
-        params: &impl Serialize,
-    ) {
-        if self.0.receiver_count() == 0 {
-            return;
-        }
-
-        let message = StreamMessage {
-            direction: StreamMessageDirection::Incoming,
-            message: StreamMessageContent::Notification {
-                method: method.into(),
-                params: serde_json::to_value(params).ok(),
-            },
-        };
-
-        self.0.try_broadcast(message).ok();
-    }
-}
-
-/// A broadcast for observing RPC message streams.
-///
-/// This is used internally by the RPC connection to allow multiple receivers
-/// to observe the message stream.
-pub(crate) struct StreamBroadcast {
-    receiver: async_broadcast::InactiveReceiver<StreamMessage>,
-}
-
-impl StreamBroadcast {
-    /// Creates a new broadcast.
-    ///
-    /// Returns a sender for broadcasting messages and the broadcast instance
-    /// for creating receivers.
-    pub(crate) fn new() -> (StreamSender, Self) {
-        let (sender, receiver) = async_broadcast::broadcast(1);
-        (
-            StreamSender(sender),
-            Self {
-                receiver: receiver.deactivate(),
-            },
-        )
-    }
-
-    /// Creates a new receiver for observing the message stream.
-    ///
-    /// Each receiver will get its own copy of every message.
-    pub(crate) fn receiver(&self) -> StreamReceiver {
-        let was_empty = self.receiver.receiver_count() == 0;
-        let mut new_receiver = self.receiver.activate_cloned();
-        if was_empty {
-            // Grow capacity once we actually have a receiver
-            new_receiver.set_capacity(64);
-        }
-        StreamReceiver(new_receiver)
-    }
-}
-
-impl<Local: Side, Remote: Side> From<OutgoingMessage<Local, Remote>> for StreamMessage {
-    fn from(message: OutgoingMessage<Local, Remote>) -> Self {
-        Self {
-            direction: StreamMessageDirection::Outgoing,
-            message: match message {
-                OutgoingMessage::Request { id, method, params } => StreamMessageContent::Request {
-                    id,
-                    method,
-                    params: serde_json::to_value(params).ok(),
-                },
-                OutgoingMessage::Response { id, result } => StreamMessageContent::Response {
-                    id,
-                    result: match result {
-                        ResponseResult::Result(value) => Ok(serde_json::to_value(value).ok()),
-                        ResponseResult::Error(error) => Err(error),
-                    },
-                },
-                OutgoingMessage::Notification { method, params } => {
-                    StreamMessageContent::Notification {
-                        method,
-                        params: serde_json::to_value(params).ok(),
-                    }
-                }
-            },
-        }
-    }
-}