Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 107 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ smbcloud-gresiq-sdk = "0.4.7"
# The ACP crates (ed-mcp, ed-acp, ed-acp-tui, ed-acp-testkit) use these; ed-agent does not.
agent-client-protocol = "2.2"
rmcp = { version = "3.5", default-features = false }
reqwest = { version = "0.13", default-features = false, features = ["rustls", "json", "stream"] }
reqwest = { version = "0.13", default-features = false, features = ["json", "stream"] }
ratatui = { version = "0.30.2", default-features = false, features = ["crossterm", "layout-cache", "unstable-rendered-line-info"] }
crossterm = { version = "0.29", features = ["event-stream"] }
tokio-util = "0.7"
Expand Down
11 changes: 10 additions & 1 deletion crates/ed-acp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ async-trait.workspace = true
tokio = { workspace = true, features = ["full"] }
tokio-util.workspace = true
futures.workspace = true
reqwest.workspace = true
serde.workspace = true
serde_json.workspace = true
anyhow.workspace = true
Expand All @@ -34,6 +33,16 @@ uuid.workspace = true
directories.workspace = true
base64.workspace = true

# reqwest 0.13's `rustls` feature is the aws-lc provider, whose C code doesn't build for
# arm64_32 (`aws-lc-sys` takes it for a 64-bit limb target), and `ring` asserts 64-bit
# pointers on aarch64. watchOS uses `native-tls`, which is Security.framework and needs no
# rustls provider at all.
[target.'cfg(not(target_os = "watchos"))'.dependencies]
reqwest = { workspace = true, features = ["rustls"] }

[target.'cfg(target_os = "watchos")'.dependencies]
reqwest = { workspace = true, features = ["native-tls"] }

[dev-dependencies]
tokio = { version = "1", features = ["full"] }
# Turn the `local` feature on for this crate's own tests.
Expand Down
10 changes: 9 additions & 1 deletion crates/ed-mcp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,22 @@ agent-client-protocol = { workspace = true, optional = true }
ed-agent = { workspace = true, optional = true }
async-trait = { workspace = true, optional = true }
http = "1"
rmcp = { workspace = true, features = ["client", "transport-streamable-http-client-reqwest", "reqwest"] }
rmcp = { workspace = true, features = ["client", "transport-streamable-http-client-reqwest"] }
tokio = { workspace = true, features = ["sync", "time", "process", "macros", "io-std", "io-util", "rt"] }
tokio-util.workspace = true
futures.workspace = true
serde_json.workspace = true
anyhow.workspace = true
tracing.workspace = true

# rmcp's `reqwest` feature turns on reqwest's aws-lc provider, which doesn't build for
# arm64_32; watchOS takes `reqwest-native-tls` (Security.framework) instead.
[target.'cfg(not(target_os = "watchos"))'.dependencies]
rmcp = { workspace = true, features = ["reqwest"] }

[target.'cfg(target_os = "watchos")'.dependencies]
rmcp = { workspace = true, features = ["reqwest-native-tls"] }

# Spawning an MCP server as a child process needs `exec`, which Apple hides on tvOS and
# watchOS (`libc` has no `execv` there, so `nix` under `process-wrap` doesn't compile). The
# stdio transport is everywhere else.
Expand Down
11 changes: 10 additions & 1 deletion crates/ed-onde-account/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,20 @@ repository.workspace = true
homepage.workspace = true

[dependencies]
reqwest.workspace = true
serde.workspace = true
serde_json.workspace = true
thiserror.workspace = true

# reqwest 0.13's `rustls` feature is the aws-lc provider, whose C code doesn't build for
# arm64_32 (`aws-lc-sys` takes it for a 64-bit limb target), and `ring` asserts 64-bit
# pointers on aarch64. watchOS uses `native-tls`, which is Security.framework and needs no
# rustls provider at all.
[target.'cfg(not(target_os = "watchos"))'.dependencies]
reqwest = { workspace = true, features = ["rustls"] }

[target.'cfg(target_os = "watchos")'.dependencies]
reqwest = { workspace = true, features = ["native-tls"] }

[dev-dependencies]
axum = "0.8"
tokio = { workspace = true, features = ["macros", "net", "rt-multi-thread"] }
Loading