Skip to content

Commit ced3e88

Browse files
committed
Merge agent-client-protocol-tokio into agent-client-protocol
Replace direct tokio usage with smol-ecosystem crates: - Stdio: use blocking::Unblock instead of tokio::io::stdin/stdout - AcpAgent: use async-process instead of tokio::process - session.rs: use futures::channel::oneshot instead of tokio::sync::oneshot - Use futures::future::select instead of tokio::select! tokio/tokio-util remain as deps only for mcp_server/builder.rs where rmcp requires tokio AsyncRead/AsyncWrite types (rmcp pulls in tokio transitively regardless). Remove agent-client-protocol-tokio from workspace and update all consumers to import from agent-client-protocol directly.
1 parent 68569e6 commit ced3e88

31 files changed

Lines changed: 378 additions & 598 deletions

File tree

Cargo.lock

Lines changed: 179 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ members = [
66
"src/agent-client-protocol-derive",
77
"src/agent-client-protocol-rmcp",
88
"src/agent-client-protocol-test",
9-
"src/agent-client-protocol-tokio",
109
"src/agent-client-protocol-trace-viewer",
1110
"src/yopo",
1211
]
@@ -26,7 +25,6 @@ agent-client-protocol-conductor = { path = "src/agent-client-protocol-conductor"
2625
agent-client-protocol-derive = { path = "src/agent-client-protocol-derive", version = "0.11.0" }
2726
agent-client-protocol-rmcp = { path = "src/agent-client-protocol-rmcp", version = "0.11.1" }
2827
agent-client-protocol-test = { path = "src/agent-client-protocol-test" }
29-
agent-client-protocol-tokio = { path = "src/agent-client-protocol-tokio", version = "0.11.1" }
3028
agent-client-protocol-trace-viewer = { path = "src/agent-client-protocol-trace-viewer", version = "0.11.0" }
3129
yopo = { package = "agent-client-protocol-yopo", path = "src/yopo" }
3230

@@ -48,10 +46,6 @@ uuid = { version = "1.18", features = ["v4"] }
4846
# Error handling
4947
anyhow = "1.0"
5048
thiserror = "2.0"
51-
52-
# Logging
53-
env_logger = "0.11"
54-
log = "0.4"
5549
tracing = "0.1"
5650
tracing-appender = "0.2"
5751
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
@@ -67,16 +61,12 @@ axum = "0.8"
6761
hyper = "1.0"
6862
tower = "0.5"
6963
tower-http = { version = "0.6", features = ["fs"] }
70-
71-
# Other dependencies
72-
async-broadcast = "0.7"
64+
async-process = "2"
7365
async-stream = "0.3.6"
74-
async-trait = "0.1"
66+
blocking = "1"
7567
chrono = "0.4"
76-
derive_more = { version = "2", features = ["from"] }
7768
futures = "0.3.32"
7869
futures-concurrency = "7.6.3"
79-
fxhash = "0.2.1"
8070
jsonrpcmsg = "0.1.2"
8171
open = "5"
8272
rustc-hash = "2.1.1"
@@ -92,11 +82,6 @@ syn = { version = "2", features = ["full", "extra-traits"] }
9282
# Testing
9383
expect-test = "1.5"
9484
regex = "1.12.2"
95-
futures-util = { version = "0.3", features = ["io"] }
96-
piper = "0.2"
97-
pretty_assertions = "1"
98-
rustyline = "17"
99-
tokio-test = "0.4"
10085

10186
[workspace.lints.rust]
10287
future_incompatible = { level = "warn", priority = -1 }

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ test-support = []
2020
[dependencies]
2121
agent-client-protocol.workspace = true
2222
agent-client-protocol-schema.workspace = true
23-
agent-client-protocol-tokio.workspace = true
2423
agent-client-protocol-trace-viewer.workspace = true
2524
anyhow.workspace = true
2625
async-stream.workspace = true
@@ -46,7 +45,6 @@ uuid.workspace = true
4645

4746
[dev-dependencies]
4847
agent-client-protocol-test.workspace = true
49-
agent-client-protocol-tokio.workspace = true
5048
yopo.workspace = true
5149
expect-test.workspace = true
5250
regex.workspace = true

0 commit comments

Comments
 (0)