chore: revert rust changes

Author: yordis

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "agent-client-protocol-schema"
 authors = ["Zed <hi@zed.dev>"]
-version = "0.10.6"
+version = "0.10.7"
 edition = "2024"
 license = "Apache-2.0"
 description = "A protocol for standardizing communication between code editors and AI coding agents"
@@ -16,7 +16,6 @@ include = ["/src/**/*.rs", "/README.md", "/LICENSE", "/Cargo.toml"]
 [features]
 unstable = [
     "unstable_cancel_request",
-    "unstable_elicitation",
     "unstable_session_config_options",
     "unstable_session_fork",
     "unstable_session_info_update",
@@ -25,7 +24,6 @@ unstable = [
     "unstable_session_resume",
 ]
 unstable_cancel_request = []
-unstable_elicitation = []
 unstable_session_config_options = []
 unstable_session_fork = []
 unstable_session_info_update = []
@@ -39,7 +37,6 @@ path = "src/bin/generate.rs"
 
 [dependencies]
 anyhow = "1"
-async-broadcast = "0.7"
 derive_more = { version = "2", features = ["from", "display"] }
 schemars = { version = "1" }
 serde = { version = "1", features = ["derive", "rc"] }

Cargo.toml

@@ -1566,9 +1566,12 @@ impl SessionConfigSelect {
 /// This is intended to help Clients distinguish broadly common selectors (e.g. model selector vs
 /// session mode selector vs thought/reasoning level) for UX purposes (keyboard shortcuts, icons,
 /// placement). It MUST NOT be required for correctness. Clients MUST handle missing or unknown
-/// categories gracefully (treat as `Other`).
+/// categories gracefully.
+///
+/// Category names beginning with `_` are free for custom use, like other ACP extension methods.
+/// Category names that do not begin with `_` are reserved for the ACP spec.
 #[cfg(feature = "unstable_session_config_options")]
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 #[non_exhaustive]
 pub enum SessionConfigOptionCategory {
@@ -1579,8 +1582,8 @@ pub enum SessionConfigOptionCategory {
     /// Thought/reasoning level selector.
     ThoughtLevel,
     /// Unknown / uncategorized selector.
-    #[serde(other)]
-    Other,
+    #[serde(untagged)]
+    Other(String),
 }
 
 /// **UNSTABLE**
@@ -2108,7 +2111,7 @@ impl PromptRequest {
 /// Response from processing a user prompt.
 ///
 /// See protocol docs: [Check for Completion](https://agentclientprotocol.com/protocol/prompt-turn#4-check-for-completion)
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
 #[schemars(extend("x-side" = "agent", "x-method" = SESSION_PROMPT_METHOD_NAME))]
 #[serde(rename_all = "camelCase")]
 #[non_exhaustive]
@@ -2170,15 +2173,6 @@ pub enum StopReason {
     /// Agents should catch these exceptions and return this semantically meaningful
     /// response to confirm successful cancellation.
     Cancelled,
-    /// **UNSTABLE**
-    ///
-    /// The turn ended because the agent is waiting for user input via elicitation.
-    /// The agent will send a separate `session/elicitation` request.
-    ///
-    /// This feature is unstable and may change.
-    #[serde(rename = "elicitation_requested")]
-    #[cfg(feature = "unstable_elicitation")]
-    ElicitationRequested,
 }
 
 // Model
@@ -2449,6 +2443,13 @@ impl AgentCapabilities {
         self
     }
 
+    /// Session capabilities supported by the agent.
+    #[must_use]
+    pub fn session_capabilities(mut self, session_capabilities: SessionCapabilities) -> Self {
+        self.session_capabilities = session_capabilities;
+        self
+    }
+
     /// The _meta property is reserved by ACP to allow clients and agents to attach additional
     /// metadata to their interactions. Implementations MUST NOT make assumptions about values at
     /// these keys.
@@ -2816,9 +2817,6 @@ pub struct AgentMethodNames {
     pub session_set_config_option: &'static str,
     /// Method for sending a prompt to the agent.
     pub session_prompt: &'static str,
-    /// Method for requesting elicitation (structured user input).
-    #[cfg(feature = "unstable_elicitation")]
-    pub session_elicitation: &'static str,
     /// Notification for cancelling operations.
     pub session_cancel: &'static str,
     /// Method for selecting a model for a given session.
@@ -2845,8 +2843,6 @@ pub const AGENT_METHOD_NAMES: AgentMethodNames = AgentMethodNames {
     #[cfg(feature = "unstable_session_config_options")]
     session_set_config_option: SESSION_SET_CONFIG_OPTION_METHOD_NAME,
     session_prompt: SESSION_PROMPT_METHOD_NAME,
-    #[cfg(feature = "unstable_elicitation")]
-    session_elicitation: SESSION_ELICITATION_METHOD_NAME,
     session_cancel: SESSION_CANCEL_METHOD_NAME,
     #[cfg(feature = "unstable_session_model")]
     session_set_model: SESSION_SET_MODEL_METHOD_NAME,
@@ -2873,9 +2869,6 @@ pub(crate) const SESSION_SET_MODE_METHOD_NAME: &str = "session/set_mode";
 pub(crate) const SESSION_SET_CONFIG_OPTION_METHOD_NAME: &str = "session/set_config_option";
 /// Method name for sending a prompt.
 pub(crate) const SESSION_PROMPT_METHOD_NAME: &str = "session/prompt";
-/// Method name for requesting elicitation (structured user input).
-#[cfg(feature = "unstable_elicitation")]
-pub(crate) const SESSION_ELICITATION_METHOD_NAME: &str = "session/elicitation";
 /// Method name for the cancel notification.
 pub(crate) const SESSION_CANCEL_METHOD_NAME: &str = "session/cancel";
 /// Method name for selecting a model for a given session.
@@ -3309,4 +3302,75 @@ mod test_serialization {
             _ => panic!("Expected Sse variant"),
         }
     }
+
+    #[test]
+    #[cfg(feature = "unstable_session_config_options")]
+    fn test_session_config_option_category_known_variants() {
+        // Test serialization of known variants
+        assert_eq!(
+            serde_json::to_value(&SessionConfigOptionCategory::Mode).unwrap(),
+            json!("mode")
+        );
+        assert_eq!(
+            serde_json::to_value(&SessionConfigOptionCategory::Model).unwrap(),
+            json!("model")
+        );
+        assert_eq!(
+            serde_json::to_value(&SessionConfigOptionCategory::ThoughtLevel).unwrap(),
+            json!("thought_level")
+        );
+
+        // Test deserialization of known variants
+        assert_eq!(
+            serde_json::from_str::<SessionConfigOptionCategory>("\"mode\"").unwrap(),
+            SessionConfigOptionCategory::Mode
+        );
+        assert_eq!(
+            serde_json::from_str::<SessionConfigOptionCategory>("\"model\"").unwrap(),
+            SessionConfigOptionCategory::Model
+        );
+        assert_eq!(
+            serde_json::from_str::<SessionConfigOptionCategory>("\"thought_level\"").unwrap(),
+            SessionConfigOptionCategory::ThoughtLevel
+        );
+    }
+
+    #[test]
+    #[cfg(feature = "unstable_session_config_options")]
+    fn test_session_config_option_category_unknown_variants() {
+        // Test that unknown strings are captured in Other variant
+        let unknown: SessionConfigOptionCategory =
+            serde_json::from_str("\"some_future_category\"").unwrap();
+        assert_eq!(
+            unknown,
+            SessionConfigOptionCategory::Other("some_future_category".to_string())
+        );
+
+        // Test round-trip of unknown category
+        let json = serde_json::to_value(&unknown).unwrap();
+        assert_eq!(json, json!("some_future_category"));
+    }
+
+    #[test]
+    #[cfg(feature = "unstable_session_config_options")]
+    fn test_session_config_option_category_custom_categories() {
+        // Category names beginning with `_` are free for custom use
+        let custom: SessionConfigOptionCategory =
+            serde_json::from_str("\"_my_custom_category\"").unwrap();
+        assert_eq!(
+            custom,
+            SessionConfigOptionCategory::Other("_my_custom_category".to_string())
+        );
+
+        // Test round-trip preserves the custom category name
+        let json = serde_json::to_value(&custom).unwrap();
+        assert_eq!(json, json!("_my_custom_category"));
+
+        // Deserialize back and verify
+        let deserialized: SessionConfigOptionCategory = serde_json::from_value(json).unwrap();
+        assert_eq!(
+            deserialized,
+            SessionConfigOptionCategory::Other("_my_custom_category".to_string())
+        );
+    }
 }

src/agent.rs

@@ -36,6 +36,7 @@ enum AcpTypes {
 
 fn main() {
     let mut settings = SchemaSettings::draft2020_12();
+    settings.untagged_enum_variant_titles = true;
     let mut bool_schemas = ReplaceBoolSchemas::default();
     bool_schemas.skip_additional_properties = true;
     settings = settings