chore: reorganize to v1 module (#1094)

Internal reorg for now to allow for having schemas for multiple
versions.

Author: benbrandt

src/lib.rs

@@ -50,61 +50,6 @@
 //! For the complete protocol specification and documentation, visit:
 //! [https://agentclientprotocol.com](https://agentclientprotocol.com)
 
-mod agent;
-mod client;
-mod content;
-#[cfg(feature = "unstable_elicitation")]
-mod elicitation;
-mod error;
-mod ext;
-#[cfg(feature = "unstable_nes")]
-mod nes;
-mod plan;
-#[cfg(feature = "unstable_cancel_request")]
-mod protocol_level;
-mod rpc;
-mod serde_util;
-mod tool_call;
-mod version;
+pub mod v1;
 
-pub use agent::*;
-pub use client::*;
-pub use content::*;
-use derive_more::{Display, From};
-#[cfg(feature = "unstable_elicitation")]
-pub use elicitation::*;
-pub use error::*;
-pub use ext::*;
-#[cfg(feature = "unstable_nes")]
-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 serde_util::*;
-pub use tool_call::*;
-pub use version::*;
-
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-/// A unique identifier for a conversation session between a client and agent.
-///
-/// Sessions maintain their own context, conversation history, and state,
-/// allowing multiple independent interactions with the same agent.
-///
-/// See protocol docs: [Session ID](https://agentclientprotocol.com/protocol/session-setup#session-id)
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Hash, Display, From)]
-#[serde(transparent)]
-#[from(Arc<str>, String, &'static str)]
-#[non_exhaustive]
-pub struct SessionId(pub Arc<str>);
-
-impl SessionId {
-    #[must_use]
-    pub fn new(id: impl Into<Arc<str>>) -> Self {
-        Self(id.into())
-    }
-}
+pub use v1::*;

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

@@ -27,7 +27,7 @@ use crate::{
 };
 
 #[cfg(feature = "unstable_nes")]
-use crate::nes::{
+use crate::{
     DOCUMENT_DID_CHANGE_METHOD_NAME, DOCUMENT_DID_CLOSE_METHOD_NAME,
     DOCUMENT_DID_FOCUS_METHOD_NAME, DOCUMENT_DID_OPEN_METHOD_NAME, DOCUMENT_DID_SAVE_METHOD_NAME,
     NES_ACCEPT_METHOD_NAME, NES_CLOSE_METHOD_NAME, NES_REJECT_METHOD_NAME, NES_START_METHOD_NAME,

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

@@ -11,15 +11,15 @@ use serde::{Deserialize, Serialize};
 use serde_with::{DefaultOnError, VecSkipError, serde_as, skip_serializing_none};
 
 #[cfg(feature = "unstable_elicitation")]
-use crate::elicitation::{
+use crate::{
     CompleteElicitationNotification, CreateElicitationRequest, CreateElicitationResponse,
     ElicitationCapabilities,
 };
 use crate::{
-    ContentBlock, ExtNotification, ExtRequest, ExtResponse, IntoOption, Meta, Plan,
-    SessionConfigOption, SessionId, SessionModeId, SkipListener, ToolCall, ToolCallUpdate,
+    ContentBlock, ExtNotification, ExtRequest, ExtResponse, IntoMaybeUndefined, IntoOption,
+    MaybeUndefined, Meta, Plan, SessionConfigOption, SessionId, SessionModeId, SkipListener,
+    ToolCall, ToolCallUpdate,
 };
-use crate::{IntoMaybeUndefined, MaybeUndefined};
 
 #[cfg(feature = "unstable_nes")]
 use crate::{ClientNesCapabilities, PositionEncodingKind};

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

@@ -12,9 +12,10 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_with::{DefaultOnError, serde_as, skip_serializing_none};
 
-use crate::client::{ELICITATION_COMPLETE_NOTIFICATION, ELICITATION_CREATE_METHOD_NAME};
-use crate::tool_call::ToolCallId;
-use crate::{IntoOption, Meta, RequestId, SessionId};
+use crate::{
+    ELICITATION_COMPLETE_NOTIFICATION, ELICITATION_CREATE_METHOD_NAME, IntoOption, Meta, RequestId,
+    SessionId, ToolCallId,
+};
 
 /// **UNSTABLE**
 ///

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

@@ -0,0 +1,60 @@
+//! Agent Client Protocol version 1 types.
+
+mod agent;
+mod client;
+mod content;
+#[cfg(feature = "unstable_elicitation")]
+mod elicitation;
+mod error;
+mod ext;
+#[cfg(feature = "unstable_nes")]
+mod nes;
+mod plan;
+#[cfg(feature = "unstable_cancel_request")]
+mod protocol_level;
+mod rpc;
+mod serde_util;
+mod tool_call;
+mod version;
+
+pub use agent::*;
+pub use client::*;
+pub use content::*;
+use derive_more::{Display, From};
+#[cfg(feature = "unstable_elicitation")]
+pub use elicitation::*;
+pub use error::*;
+pub use ext::*;
+#[cfg(feature = "unstable_nes")]
+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 serde_util::*;
+pub use tool_call::*;
+pub use version::*;
+
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::sync::Arc;
+
+/// A unique identifier for a conversation session between a client and agent.
+///
+/// Sessions maintain their own context, conversation history, and state,
+/// allowing multiple independent interactions with the same agent.
+///
+/// See protocol docs: [Session ID](https://agentclientprotocol.com/protocol/session-setup#session-id)
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Hash, Display, From)]
+#[serde(transparent)]
+#[from(Arc<str>, String, &'static str)]
+#[non_exhaustive]
+pub struct SessionId(pub Arc<str>);
+
+impl SessionId {
+    #[must_use]
+    pub fn new(id: impl Into<Arc<str>>) -> Self {
+        Self(id.into())
+    }
+}