feat!: remove URLElicitationRequiredError (SEP-2322)

Author: DaleSeo

crates/rmcp/src/handler/client.rs

@@ -66,12 +66,6 @@ impl<H: ClientHandler> Service<RoleClient> for H {
             ServerNotification::PromptListChangedNotification(_notification_no_param) => {
                 self.on_prompt_list_changed(context).await
             }
-            ServerNotification::ElicitationCompleteNotification(notification) =>
-            {
-                #[allow(deprecated)]
-                self.on_url_elicitation_notification_complete(notification.params, context)
-                    .await
-            }
             ServerNotification::TaskStatusNotification(notification) => {
                 self.on_task_status(notification.params, context).await
             }
@@ -244,17 +238,6 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
         std::future::ready(())
     }
 
-    #[deprecated(
-        since = "2.0.0",
-        note = "URL elicitation is removed by SEP-2322 (Multi Round-Trip Requests). Use InputRequiredResult-based MRTR flow instead."
-    )]
-    fn on_url_elicitation_notification_complete(
-        &self,
-        params: ElicitationResponseNotificationParam,
-        context: NotificationContext<RoleClient>,
-    ) -> impl Future<Output = ()> + MaybeSendFuture + '_ {
-        std::future::ready(())
-    }
     fn on_task_status(
         &self,
         params: TaskStatusNotificationParam,

crates/rmcp/src/model.rs

@@ -518,11 +518,6 @@ impl ErrorCode {
     pub const INVALID_PARAMS: Self = Self(-32602);
     pub const INTERNAL_ERROR: Self = Self(-32603);
     pub const PARSE_ERROR: Self = Self(-32700);
-    #[deprecated(
-        since = "2.0.0",
-        note = "URLElicitationRequiredError is removed by SEP-2322 (Multi Round-Trip Requests). Use InputRequiredResult instead."
-    )]
-    pub const URL_ELICITATION_REQUIRED: Self = Self(-32042);
 }
 
 /// Error information for JSON-RPC error responses.
@@ -578,17 +573,6 @@ impl ErrorData {
     pub fn internal_error(message: impl Into<Cow<'static, str>>, data: Option<Value>) -> Self {
         Self::new(ErrorCode::INTERNAL_ERROR, message, data)
     }
-    #[deprecated(
-        since = "2.0.0",
-        note = "URLElicitationRequiredError is removed by SEP-2322 (Multi Round-Trip Requests). Use InputRequiredResult instead."
-    )]
-    #[allow(deprecated)]
-    pub fn url_elicitation_required(
-        message: impl Into<Cow<'static, str>>,
-        data: Option<Value>,
-    ) -> Self {
-        Self::new(ErrorCode::URL_ELICITATION_REQUIRED, message, data)
-    }
 }
 
 /// Represents any JSON-RPC message that can be sent or received.
@@ -2783,7 +2767,6 @@ pub type RootsListChangedNotification = NotificationNoParam<RootsListChangedNoti
 // Elicitation allows servers to request interactive input from users during tool execution.
 const_string!(ElicitationCreateRequestMethod = "elicitation/create");
 const_string!(ElicitationResponseNotificationMethod = "notifications/elicitation/response");
-const_string!(ElicitationCompletionNotificationMethod = "notifications/elicitation/complete");
 
 /// Represents the possible actions a user can take in response to an elicitation request.
 ///
@@ -3018,34 +3001,6 @@ pub type ElicitRequest = Request<ElicitationCreateRequestMethod, ElicitRequestPa
 #[deprecated(since = "2.0.0", note = "Renamed to ElicitRequest")]
 pub type CreateElicitationRequest = ElicitRequest;
 
-/// Notification parameters for an url elicitation completion notification.
-#[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq)]
-#[serde(rename_all = "camelCase")]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[non_exhaustive]
-pub struct ElicitationResponseNotificationParam {
-    pub elicitation_id: String,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<Meta>,
-}
-
-impl ElicitationResponseNotificationParam {
-    /// Create a new ElicitationResponseNotificationParam.
-    pub fn new(elicitation_id: impl Into<String>) -> Self {
-        Self {
-            elicitation_id: elicitation_id.into(),
-            meta: None,
-        }
-    }
-}
-
-/// Notification sent when an url elicitation process is completed.
-pub type ElicitationCompleteNotification =
-    Notification<ElicitationCompletionNotificationMethod, ElicitationResponseNotificationParam>;
-
-#[deprecated(since = "2.0.0", note = "Renamed to ElicitationCompleteNotification")]
-pub type ElicitationCompletionNotification = ElicitationCompleteNotification;
-
 // =============================================================================
 // TOOL EXECUTION RESULTS
 // =============================================================================
@@ -3828,7 +3783,6 @@ ts_union!(
     | ResourceListChangedNotification
     | ToolListChangedNotification
     | PromptListChangedNotification
-    | ElicitationCompleteNotification
     | TaskStatusNotification
     | CustomNotification;
 );

crates/rmcp/src/model/meta.rs

@@ -218,7 +218,6 @@ variant_extension! {
         ResourceListChangedNotification
         ToolListChangedNotification
         PromptListChangedNotification
-        ElicitationCompleteNotification
         TaskStatusNotification
         CustomNotification
     }

crates/rmcp/src/service/server.rs

@@ -10,10 +10,7 @@ use url::Url;
 
 use super::*;
 #[cfg(feature = "elicitation")]
-use crate::model::{
-    ElicitRequest, ElicitRequestParams, ElicitResult, ElicitationAction,
-    ElicitationCompleteNotification, ElicitationResponseNotificationParam,
-};
+use crate::model::{ElicitRequest, ElicitRequestParams, ElicitResult, ElicitationAction};
 use crate::{
     model::{
         CancelledNotification, CancelledNotificationParam, ClientInfo, ClientJsonRpcMessage,
@@ -474,14 +471,6 @@ impl Peer<RoleServer> {
     method!(peer_req create_elicitation ElicitRequest(ElicitRequestParams) => ElicitResult);
     #[cfg(feature = "elicitation")]
     method!(peer_req_with_timeout create_elicitation_with_timeout ElicitRequest(ElicitRequestParams) => ElicitResult);
-    #[cfg(feature = "elicitation")]
-    method!(
-        #[deprecated(
-            since = "2.0.0",
-            note = "URL elicitation is removed by SEP-2322 (Multi Round-Trip Requests). Use InputRequiredResult-based MRTR flow instead."
-        )]
-        peer_not notify_url_elicitation_completed ElicitationCompleteNotification(ElicitationResponseNotificationParam)
-    );
 
     method!(peer_not notify_cancelled CancelledNotification(CancelledNotificationParam));
     method!(peer_not notify_progress ProgressNotification(ProgressNotificationParam));

crates/rmcp/tests/test_elicitation.rs

@@ -1882,31 +1882,6 @@ async fn test_url_elicitation_json_rpc_protocol() {
     }
 }
 
-/// Test ElicitationCompleteNotification serialization/deserialization
-#[tokio::test]
-async fn test_elicitation_completion_notification() {
-    let notification_params = ElicitationResponseNotificationParam::new("elicit-789");
-
-    // Test serialization
-    let json = serde_json::to_value(&notification_params).unwrap();
-    let expected = json!({
-        "elicitationId": "elicit-789"
-    });
-    assert_eq!(json, expected);
-
-    // Test deserialization
-    let deserialized: ElicitationResponseNotificationParam =
-        serde_json::from_value(expected).unwrap();
-    assert_eq!(deserialized.elicitation_id, "elicit-789");
-
-    // Test complete notification structure
-    let notification = ElicitationCompleteNotification::new(notification_params);
-
-    let json = serde_json::to_value(&notification).unwrap();
-    assert_eq!(json["method"], "notifications/elicitation/complete");
-    assert_eq!(json["params"]["elicitationId"], "elicit-789");
-}
-
 /// Test UrlElicitationCapability structure and serialization
 #[tokio::test]
 async fn test_url_elicitation_capability() {
@@ -2020,40 +1995,6 @@ async fn test_elicitation_both_modes() {
     assert!(url_json.get("requestedSchema").is_none());
 }
 
-/// Test URL_ELICITATION_REQUIRED error code
-#[tokio::test]
-#[allow(deprecated)]
-async fn test_url_elicitation_required_error_code() {
-    // Test the error code constant
-    assert_eq!(ErrorCode::URL_ELICITATION_REQUIRED.0, -32042);
-
-    // Test creating error data with URL_ELICITATION_REQUIRED
-    let error_data = ErrorData::url_elicitation_required(
-        "URL elicitation is required for this operation",
-        Some(json!({
-            "url": "https://example.com/complete",
-            "elicitationId": "elicit-999"
-        })),
-    );
-
-    assert_eq!(error_data.code, ErrorCode::URL_ELICITATION_REQUIRED);
-    assert_eq!(
-        error_data.message,
-        "URL elicitation is required for this operation"
-    );
-    assert!(error_data.data.is_some());
-
-    // Test serialization
-    let json = serde_json::to_value(&error_data).unwrap();
-    assert_eq!(json["code"], -32042);
-    assert_eq!(
-        json["message"],
-        "URL elicitation is required for this operation"
-    );
-    assert_eq!(json["data"]["url"], "https://example.com/complete");
-    assert_eq!(json["data"]["elicitationId"], "elicit-999");
-}
-
 /// Test ClientCapabilities with different elicitation mode combinations
 #[tokio::test]
 async fn test_client_capabilities_elicitation_modes() {
@@ -2103,32 +2044,6 @@ async fn test_client_capabilities_elicitation_modes() {
     assert!(json["elicitation"]["url"].is_object());
 }
 
-/// Test ElicitationCompleteNotification in ServerNotification enum
-#[tokio::test]
-async fn test_elicitation_completion_in_server_notification() {
-    let notification_param = ElicitationResponseNotificationParam::new("notify-123");
-
-    let completion_notification = ElicitationCompleteNotification::new(notification_param.clone());
-
-    // Test that it's part of ServerNotification
-    let server_notification =
-        ServerNotification::ElicitationCompleteNotification(completion_notification);
-
-    // Test serialization
-    let json = serde_json::to_value(&server_notification).unwrap();
-    assert_eq!(json["method"], "notifications/elicitation/complete");
-    assert_eq!(json["params"]["elicitationId"], "notify-123");
-
-    // Test deserialization
-    let deserialized: ServerNotification = serde_json::from_value(json).unwrap();
-    match deserialized {
-        ServerNotification::ElicitationCompleteNotification(notif) => {
-            assert_eq!(notif.params.elicitation_id, "notify-123");
-        }
-        _ => panic!("Expected ElicitationCompleteNotification variant"),
-    }
-}
-
 /// Test ElicitationAction with URL elicitation workflow
 #[tokio::test]
 async fn test_url_elicitation_action_workflow() {
@@ -2162,10 +2077,4 @@ async fn test_elicitation_method_constants() {
         ElicitationResponseNotificationMethod::VALUE,
         "notifications/elicitation/response"
     );
-
-    // Test new completion notification method
-    assert_eq!(
-        ElicitationCompletionNotificationMethod::VALUE,
-        "notifications/elicitation/complete"
-    );
 }

crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema.json

@@ -770,35 +770,11 @@
         }
       ]
     },
-    "ElicitationCompletionNotificationMethod": {
-      "type": "string",
-      "format": "const",
-      "const": "notifications/elicitation/complete"
-    },
     "ElicitationCreateRequestMethod": {
       "type": "string",
       "format": "const",
       "const": "elicitation/create"
     },
-    "ElicitationResponseNotificationParam": {
-      "description": "Notification parameters for an url elicitation completion notification.",
-      "type": "object",
-      "properties": {
-        "_meta": {
-          "type": [
-            "object",
-            "null"
-          ],
-          "additionalProperties": true
-        },
-        "elicitationId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "elicitationId"
-      ]
-    },
     "ElicitationSchema": {
       "description": "Type-safe elicitation schema for requesting structured user input.\n\nThis enforces the MCP 2025-06-18 specification that elicitation schemas\nmust be objects with primitive-typed properties.\n\n# Example\n\n```rust\nuse rmcp::model::*;\n\nlet schema = ElicitationSchema::builder()\n    .required_email(\"email\")\n    .required_integer(\"age\", 0, 150)\n    .optional_bool(\"newsletter\", false)\n    .build();\n```",
       "type": "object",
@@ -1420,9 +1396,6 @@
         {
           "$ref": "#/definitions/Notification5"
         },
-        {
-          "$ref": "#/definitions/Notification6"
-        },
         {
           "$ref": "#/definitions/CustomNotification"
         }
@@ -1892,21 +1865,6 @@
       ]
     },
     "Notification5": {
-      "type": "object",
-      "properties": {
-        "method": {
-          "$ref": "#/definitions/ElicitationCompletionNotificationMethod"
-        },
-        "params": {
-          "$ref": "#/definitions/ElicitationResponseNotificationParam"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ]
-    },
-    "Notification6": {
       "type": "object",
       "properties": {
         "method": {

crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema_current.json

@@ -770,35 +770,11 @@
         }
       ]
     },
-    "ElicitationCompletionNotificationMethod": {
-      "type": "string",
-      "format": "const",
-      "const": "notifications/elicitation/complete"
-    },
     "ElicitationCreateRequestMethod": {
       "type": "string",
       "format": "const",
       "const": "elicitation/create"
     },
-    "ElicitationResponseNotificationParam": {
-      "description": "Notification parameters for an url elicitation completion notification.",
-      "type": "object",
-      "properties": {
-        "_meta": {
-          "type": [
-            "object",
-            "null"
-          ],
-          "additionalProperties": true
-        },
-        "elicitationId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "elicitationId"
-      ]
-    },
     "ElicitationSchema": {
       "description": "Type-safe elicitation schema for requesting structured user input.\n\nThis enforces the MCP 2025-06-18 specification that elicitation schemas\nmust be objects with primitive-typed properties.\n\n# Example\n\n```rust\nuse rmcp::model::*;\n\nlet schema = ElicitationSchema::builder()\n    .required_email(\"email\")\n    .required_integer(\"age\", 0, 150)\n    .optional_bool(\"newsletter\", false)\n    .build();\n```",
       "type": "object",
@@ -1420,9 +1396,6 @@
         {
           "$ref": "#/definitions/Notification5"
         },
-        {
-          "$ref": "#/definitions/Notification6"
-        },
         {
           "$ref": "#/definitions/CustomNotification"
         }
@@ -1892,21 +1865,6 @@
       ]
     },
     "Notification5": {
-      "type": "object",
-      "properties": {
-        "method": {
-          "$ref": "#/definitions/ElicitationCompletionNotificationMethod"
-        },
-        "params": {
-          "$ref": "#/definitions/ElicitationResponseNotificationParam"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ]
-    },
-    "Notification6": {
       "type": "object",
       "properties": {
         "method": {