diff --git a/Cargo.lock b/Cargo.lock index 7ba4f1f6e1..0a5a1a01fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,16 +264,18 @@ dependencies = [ [[package]] name = "agentic-coding-protocol" -version = "0.0.7" +version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75f520bcc049ebe40c8c99427aa61b48ad78a01bcc96a13b350b903dcfb9438" +checksum = "0e276b798eddd02562a339340a96919d90bbfcf78de118fdddc932524646fac7" dependencies = [ "anyhow", "chrono", + "derive_more 2.0.1", "futures 0.3.31", "log", "parking_lot", "schemars", + "semver", "serde", "serde_json", ] @@ -676,7 +678,7 @@ dependencies = [ "anyhow", "async-trait", "collections", - "derive_more", + "derive_more 0.99.19", "extension", "futures 0.3.31", "gpui", @@ -739,7 +741,7 @@ dependencies = [ "clock", "collections", "ctor", - "derive_more", + "derive_more 0.99.19", "futures 0.3.31", "gpui", "icons", @@ -775,7 +777,7 @@ dependencies = [ "clock", "collections", "component", - "derive_more", + "derive_more 0.99.19", "editor", "feature_flags", "fs", @@ -1232,7 +1234,7 @@ version = "0.1.0" dependencies = [ "anyhow", "collections", - "derive_more", + "derive_more 0.99.19", "gpui", "parking_lot", "rodio", @@ -2925,7 +2927,7 @@ dependencies = [ "cocoa 0.26.0", "collections", "credentials_provider", - "derive_more", + "derive_more 0.99.19", "feature_flags", "fs", "futures 0.3.31", @@ -3113,7 +3115,7 @@ dependencies = [ "dap_adapters", "dashmap 6.1.0", "debugger_ui", - "derive_more", + "derive_more 0.99.19", "editor", "envy", "extension", @@ -3318,7 +3320,7 @@ name = "command_palette_hooks" version = "0.1.0" dependencies = [ "collections", - "derive_more", + "derive_more 0.99.19", "gpui", "workspace-hack", ] @@ -4525,6 +4527,27 @@ dependencies = [ "syn 2.0.101", ] +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", + "unicode-xid", +] + [[package]] name = "derive_refineable" version = "0.1.0" @@ -6223,7 +6246,7 @@ dependencies = [ "askpass", "async-trait", "collections", - "derive_more", + "derive_more 0.99.19", "futures 0.3.31", "git2", "gpui", @@ -7240,7 +7263,7 @@ dependencies = [ "core-video", "cosmic-text", "ctor", - "derive_more", + "derive_more 0.99.19", "embed-resource", "env_logger 0.11.8", "etagere", @@ -7786,7 +7809,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bytes 1.10.1", - "derive_more", + "derive_more 0.99.19", "futures 0.3.31", "http 1.3.1", "log", @@ -8224,7 +8247,7 @@ dependencies = [ "async-trait", "cargo_metadata", "collections", - "derive_more", + "derive_more 0.99.19", "extension", "fs", "futures 0.3.31", @@ -14163,6 +14186,7 @@ dependencies = [ "indexmap", "ref-cast", "schemars_derive", + "semver", "serde", "serde_json", ] @@ -16124,7 +16148,7 @@ version = "0.1.0" dependencies = [ "anyhow", "collections", - "derive_more", + "derive_more 0.99.19", "fs", "futures 0.3.31", "gpui", diff --git a/Cargo.toml b/Cargo.toml index f96240531f..5403f279c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -404,7 +404,7 @@ zlog_settings = { path = "crates/zlog_settings" } # External crates # -agentic-coding-protocol = "0.0.7" +agentic-coding-protocol = { version = "0.0.9" } aho-corasick = "1.1" alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" } any_vec = "0.14" diff --git a/crates/acp/src/acp.rs b/crates/acp/src/acp.rs index f89eab2032..8351aeaee0 100644 --- a/crates/acp/src/acp.rs +++ b/crates/acp/src/acp.rs @@ -875,7 +875,7 @@ impl AcpThread { &self, ) -> impl use<> + Future> { let connection = self.connection.clone(); - async move { connection.request(acp::InitializeParams).await } + async move { connection.initialize().await } } pub fn authenticate(&self) -> impl use<> + Future> { @@ -1839,8 +1839,12 @@ mod tests { } impl acp::Agent for FakeAgent { - async fn initialize(&self) -> Result { + async fn initialize( + &self, + params: acp::InitializeParams, + ) -> Result { Ok(acp::InitializeResponse { + protocol_version: params.protocol_version, is_authenticated: true, }) } diff --git a/tooling/workspace-hack/Cargo.toml b/tooling/workspace-hack/Cargo.toml index 59f8449284..530c2cf925 100644 --- a/tooling/workspace-hack/Cargo.toml +++ b/tooling/workspace-hack/Cargo.toml @@ -107,7 +107,7 @@ rustc-hash = { version = "1" } rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", default-features = false, features = ["fs", "net", "std"] } rustls = { version = "0.23", features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } -schemars = { version = "1", features = ["chrono04", "indexmap2"] } +schemars = { version = "1", features = ["chrono04", "indexmap2", "semver1"] } sea-orm = { version = "1", features = ["runtime-tokio-rustls", "sqlx-postgres", "sqlx-sqlite"] } sea-query-binder = { version = "0.7", default-features = false, features = ["postgres-array", "sqlx-postgres", "sqlx-sqlite", "with-bigdecimal", "with-chrono", "with-json", "with-rust_decimal", "with-time", "with-uuid"] } semver = { version = "1", features = ["serde"] } @@ -240,7 +240,7 @@ rustc-hash = { version = "1" } rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", default-features = false, features = ["fs", "net", "std"] } rustls = { version = "0.23", features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } -schemars = { version = "1", features = ["chrono04", "indexmap2"] } +schemars = { version = "1", features = ["chrono04", "indexmap2", "semver1"] } sea-orm = { version = "1", features = ["runtime-tokio-rustls", "sqlx-postgres", "sqlx-sqlite"] } sea-query-binder = { version = "0.7", default-features = false, features = ["postgres-array", "sqlx-postgres", "sqlx-sqlite", "with-bigdecimal", "with-chrono", "with-json", "with-rust_decimal", "with-time", "with-uuid"] } semver = { version = "1", features = ["serde"] }