Update to agent-client-protocol-schema 0.5 (#8)

* Update to agent-client-protocol-schema 0.5

This moves several of the RPC types down into the schema crate and adapts to the new types.

* Prep v0.6.0

Author: benbrandt

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.6.0 (2025-10-23)
+
+- Provide missing `_meta` fields on certain enum variants.
+- More consistent enum usage. Enums are always either newtype or struct variants within a single enum, not mixed.
+
 ## 0.5.0 (2025-10-20)
 
 - Export necessary RPC types. Fixes an issue where certain fields weren't public enough.

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "agent-client-protocol"
 authors = ["Zed <[email protected]>"]
-version = "0.5.0"
+version = "0.6.0"
 edition = "2024"
 license = "Apache-2.0"
 description = "A protocol for standardizing communication between code editors and AI coding agents"
@@ -17,7 +17,7 @@ include = ["/src/**/*.rs", "/README.md", "/LICENSE", "/Cargo.toml"]
 unstable = ["agent-client-protocol-schema/unstable"]
 
 [dependencies]
-agent-client-protocol-schema = { version = "0.4.11" }
+agent-client-protocol-schema = { version = "0.5.0" }
 anyhow = "1"
 async-broadcast = "0.7"
 async-trait = "0.1"

Cargo.toml

@@ -98,7 +98,10 @@ impl acp::Agent for ExampleAgent {
                 .send((
                     acp::SessionNotification {
                         session_id: arguments.session_id.clone(),
-                        update: acp::SessionUpdate::AgentMessageChunk { content },
+                        update: acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk {
+                            content,
+                            meta: None,
+                        }),
                         meta: None,
                     },
                     tx,

examples/agent.rs

@@ -80,7 +80,7 @@ impl acp::Client for ExampleClient {
         args: acp::SessionNotification,
     ) -> acp::Result<(), acp::Error> {
         match args.update {
-            acp::SessionUpdate::AgentMessageChunk { content } => {
+            acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk { content, .. }) => {
                 let text = match content {
                     acp::ContentBlock::Text(text_content) => text_content.text,
                     acp::ContentBlock::Image(_) => "<image>".into(),

examples/client.rs

@@ -8,8 +8,9 @@ use std::{
     },
 };
 
-use agent_client_protocol_schema::{Error, Result};
-use derive_more::Display;
+use agent_client_protocol_schema::{
+    Error, JsonRpcMessage, OutgoingMessage, RequestId, ResponseResult, Result, Side,
+};
 use futures::{
     AsyncBufReadExt as _, AsyncRead, AsyncWrite, AsyncWriteExt as _, FutureExt as _,
     StreamExt as _,
@@ -22,7 +23,7 @@ use futures::{
     select_biased,
 };
 use parking_lot::Mutex;
-use serde::{Deserialize, Serialize, de::DeserializeOwned};
+use serde::{Deserialize, de::DeserializeOwned};
 use serde_json::value::RawValue;
 
 use super::stream_broadcast::{StreamBroadcast, StreamReceiver, StreamSender};
@@ -298,17 +299,6 @@ where
     }
 }
 
-/// JSON RPC Request Id
-#[derive(Debug, PartialEq, Clone, Hash, Eq, Deserialize, Serialize, PartialOrd, Ord, Display)]
-#[serde(deny_unknown_fields)]
-#[serde(untagged)]
-pub enum RequestId {
-    #[display("null")]
-    Null,
-    Number(i64),
-    Str(String),
-}
-
 #[derive(Deserialize)]
 pub struct RawIncomingMessage<'a> {
     id: Option<RequestId>,
@@ -328,82 +318,6 @@ pub enum IncomingMessage<Local: Side> {
     },
 }
 
-#[derive(Serialize, Deserialize, Clone)]
-#[serde(untagged)]
-pub enum OutgoingMessage<Local: Side, Remote: Side> {
-    Request {
-        id: RequestId,
-        method: Arc<str>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        params: Option<Remote::InRequest>,
-    },
-    Response {
-        id: RequestId,
-        #[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>> for ResponseResult<T> {
-    fn from(result: Result<T>) -> 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>;
-
-    fn decode_notification(method: &str, params: Option<&RawValue>)
-    -> Result<Self::InNotification>;
-}
-
 pub trait MessageHandler<Local: Side> {
     fn handle_request(
         &self,
@@ -415,57 +329,3 @@ pub trait MessageHandler<Local: Side> {
         notification: Local::InNotification,
     ) -> impl Future<Output = Result<()>>;
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use serde_json::{Number, Value};
-
-    #[test]
-    fn id_deserialization() {
-        let id = serde_json::from_value::<RequestId>(Value::Null).unwrap();
-        assert_eq!(id, RequestId::Null);
-
-        let id = serde_json::from_value::<RequestId>(Value::Number(Number::from_u128(1).unwrap()))
-            .unwrap();
-        assert_eq!(id, RequestId::Number(1));
-
-        let id = serde_json::from_value::<RequestId>(Value::Number(Number::from_i128(-1).unwrap()))
-            .unwrap();
-        assert_eq!(id, RequestId::Number(-1));
-
-        let id = serde_json::from_value::<RequestId>(Value::String("id".to_owned())).unwrap();
-        assert_eq!(id, RequestId::Str("id".to_owned()));
-    }
-
-    #[test]
-    fn id_serialization() {
-        let id = serde_json::to_value(RequestId::Null).unwrap();
-        assert_eq!(id, Value::Null);
-
-        let id = serde_json::to_value(RequestId::Number(1)).unwrap();
-        assert_eq!(id, Value::Number(Number::from_u128(1).unwrap()));
-
-        let id = serde_json::to_value(RequestId::Number(-1)).unwrap();
-        assert_eq!(id, Value::Number(Number::from_i128(-1).unwrap()));
-
-        let id = serde_json::to_value(RequestId::Str("id".to_owned())).unwrap();
-        assert_eq!(id, Value::String("id".to_owned()));
-    }
-
-    #[test]
-    fn id_display() {
-        let id = RequestId::Null;
-        assert_eq!(id.to_string(), "null");
-
-        let id = RequestId::Number(1);
-        assert_eq!(id.to_string(), "1");
-
-        let id = RequestId::Number(-1);
-        assert_eq!(id.to_string(), "-1");
-
-        let id = RequestId::Str("id".to_owned());
-        assert_eq!(id.to_string(), "id");
-    }
-}