Shared RPC types

Author: benbrandt

src/lib.rs

@@ -38,6 +38,7 @@
 //! For the complete protocol specification and documentation, visit
 //! <https://agentclientprotocol.com>.
 
+pub mod rpc;
 mod serde_util;
 mod v1;
 #[cfg(feature = "unstable_protocol_v2")]

src/v1/rpc.rs src/rpc.rssrc/v1/rpc.rs renamed to src/rpc.rs

@@ -5,8 +5,6 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 
-use crate::{Error, Result};
-
 /// JSON RPC Request Id
 ///
 /// An identifier established by the Client that MUST contain a String, Number, or NULL value if included. If it is not included it is assumed to be a notification. The value SHOULD normally not be Null \[1\] and Numbers SHOULD NOT contain fractional parts \[2\]
@@ -63,14 +61,14 @@ pub struct Request<Params> {
 )]
 #[serde(untagged)]
 #[schemars(rename = "{Result}", extend("x-docs-ignore" = true))]
-pub enum Response<Result> {
+pub enum Response<Result, Error> {
     Result { id: RequestId, result: Result },
     Error { id: RequestId, error: Error },
 }
 
-impl<R> Response<R> {
+impl<R, E> Response<R, E> {
     #[must_use]
-    pub fn new(id: impl Into<RequestId>, result: Result<R>) -> Self {
+    pub fn new(id: impl Into<RequestId>, result: std::result::Result<R, E>) -> Self {
         match result {
             Ok(result) => Self::Result {
                 id: id.into(),

src/v1/mod.rs

@@ -12,9 +12,9 @@ mod nes;
 mod plan;
 #[cfg(feature = "unstable_cancel_request")]
 mod protocol_level;
-mod rpc;
 mod tool_call;
 
+pub use crate::rpc::{JsonRpcMessage, Notification, Request, RequestId};
 pub use agent::*;
 pub use client::*;
 pub use content::*;
@@ -28,10 +28,11 @@ pub use nes::*;
 pub use plan::*;
 #[cfg(feature = "unstable_cancel_request")]
 pub use protocol_level::*;
-pub use rpc::*;
 pub use serde_json::value::RawValue;
 pub use tool_call::*;
 
+pub type Response<Result> = crate::rpc::Response<Result, Error>;
+
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;

src/v2/conversion.rs

@@ -144,9 +144,28 @@ macro_rules! identity_conversion {
 }
 
 identity_conversion!(
-    bool, f32, f64, i16, i32, i64, i8, isize, String, u16, u32, u64, u8, usize,
-    &'static str, Arc<RawValue>, Arc<str>, PathBuf, ProtocolVersion,
-    serde_json::Map<String, serde_json::Value>, serde_json::Value,
+    bool,
+    f32,
+    f64,
+    i16,
+    i32,
+    i64,
+    i8,
+    isize,
+    String,
+    u16,
+    u32,
+    u64,
+    u8,
+    usize,
+    &'static str,
+    Arc<RawValue>,
+    Arc<str>,
+    PathBuf,
+    ProtocolVersion,
+    super::RequestId,
+    serde_json::Map<String, serde_json::Value>,
+    serde_json::Value,
 );
 
 impl<T> IntoV1 for Option<T>
@@ -9051,30 +9070,6 @@ impl IntoV2 for crate::v1::Role {
     }
 }
 
-impl IntoV1 for super::RequestId {
-    type Output = crate::v1::RequestId;
-
-    fn into_v1(self) -> Result<Self::Output> {
-        Ok(match self {
-            Self::Null => crate::v1::RequestId::Null,
-            Self::Number(value) => crate::v1::RequestId::Number(value.into_v1()?),
-            Self::Str(value) => crate::v1::RequestId::Str(value.into_v1()?),
-        })
-    }
-}
-
-impl IntoV2 for crate::v1::RequestId {
-    type Output = super::RequestId;
-
-    fn into_v2(self) -> Result<Self::Output> {
-        Ok(match self {
-            Self::Null => super::RequestId::Null,
-            Self::Number(value) => super::RequestId::Number(value.into_v2()?),
-            Self::Str(value) => super::RequestId::Str(value.into_v2()?),
-        })
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/v2/mod.rs

@@ -23,9 +23,9 @@ mod nes;
 mod plan;
 #[cfg(feature = "unstable_cancel_request")]
 mod protocol_level;
-mod rpc;
 mod tool_call;
 
+pub use crate::rpc::{JsonRpcMessage, Notification, Request, RequestId};
 pub use agent::*;
 pub use client::*;
 pub use content::*;
@@ -39,10 +39,11 @@ pub use nes::*;
 pub use plan::*;
 #[cfg(feature = "unstable_cancel_request")]
 pub use protocol_level::*;
-pub use rpc::*;
 pub use serde_json::value::RawValue;
 pub use tool_call::*;
 
+pub type Response<Result> = crate::rpc::Response<Result, Error>;
+
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;