feat: add SEP-2322 MRTR model types

Author: DaleSeo

crates/rmcp/src/handler/client.rs

@@ -64,7 +64,9 @@ impl<H: ClientHandler> Service<RoleClient> for H {
             ServerNotification::PromptListChangedNotification(_notification_no_param) => {
                 self.on_prompt_list_changed(context).await
             }
-            ServerNotification::ElicitationCompletionNotification(notification) => {
+            ServerNotification::ElicitationCompletionNotification(notification) =>
+            {
+                #[allow(deprecated)]
                 self.on_url_elicitation_notification_complete(notification.params, context)
                     .await
             }
@@ -238,6 +240,10 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
         std::future::ready(())
     }
 
+    #[deprecated(
+        since = "1.8.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,

crates/rmcp/src/handler/server/router/tool.rs

@@ -667,6 +667,8 @@ mod tests {
                 name: Cow::Borrowed("requires_params"),
                 arguments: Some(Default::default()),
                 task: None,
+                input_responses: None,
+                request_state: None,
             },
             RequestContext::new(NumberOrString::Number(1), peer),
         );
@@ -706,6 +708,8 @@ mod tests {
                 name: Cow::Borrowed("test_tool"),
                 arguments: None,
                 task: None,
+                input_responses: None,
+                request_state: None,
             },
             RequestContext::new(NumberOrString::Number(1), peer),
         );

crates/rmcp/src/handler/server/tool.rs

@@ -46,6 +46,7 @@ impl<'s, S> ToolCallContext<'s, S> {
             name,
             arguments,
             task,
+            ..
         }: CallToolRequestParams,
         request_context: RequestContext<RoleServer>,
     ) -> Self {

crates/rmcp/src/model.rs

@@ -5,6 +5,7 @@ mod content;
 mod elicitation_schema;
 mod extension;
 mod meta;
+mod mrtr;
 mod prompt;
 mod resource;
 mod serde_impl;
@@ -16,6 +17,7 @@ pub use content::*;
 pub use elicitation_schema::*;
 pub use extension::*;
 pub use meta::*;
+pub use mrtr::*;
 pub use prompt::*;
 pub use resource::*;
 use serde::{Deserialize, Serialize, de::DeserializeOwned};
@@ -509,6 +511,10 @@ 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 = "1.8.0",
+        note = "URLElicitationRequiredError is removed by SEP-2322 (Multi Round-Trip Requests). Use InputRequiredResult instead."
+    )]
     pub const URL_ELICITATION_REQUIRED: Self = Self(-32042);
 }
 
@@ -565,6 +571,11 @@ 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 = "1.8.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>,
@@ -1212,6 +1223,13 @@ pub struct ReadResourceRequestParams {
     pub meta: Option<Meta>,
     /// The URI of the resource to read
     pub uri: String,
+    /// Client responses to server-initiated input requests from a previous
+    /// `InputRequiredResult` (SEP-2322 Multi Round-Trip Requests).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub input_responses: Option<InputResponses>,
+    /// Opaque request state echoed back from a previous `InputRequiredResult` (SEP-2322).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_state: Option<String>,
 }
 
 impl ReadResourceRequestParams {
@@ -1220,6 +1238,8 @@ impl ReadResourceRequestParams {
         Self {
             meta: None,
             uri: uri.into(),
+            input_responses: None,
+            request_state: None,
         }
     }
 
@@ -1228,6 +1248,18 @@ impl ReadResourceRequestParams {
         self.meta = Some(meta);
         self
     }
+
+    /// Sets the input responses for an MRTR retry (SEP-2322).
+    pub fn with_input_responses(mut self, input_responses: InputResponses) -> Self {
+        self.input_responses = Some(input_responses);
+        self
+    }
+
+    /// Sets the request state for an MRTR retry (SEP-2322).
+    pub fn with_request_state(mut self, request_state: impl Into<String>) -> Self {
+        self.request_state = Some(request_state.into());
+        self
+    }
 }
 
 impl RequestParamsMeta for ReadResourceRequestParams {
@@ -1395,6 +1427,13 @@ pub struct GetPromptRequestParams {
     pub name: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub arguments: Option<JsonObject>,
+    /// Client responses to server-initiated input requests from a previous
+    /// `InputRequiredResult` (SEP-2322 Multi Round-Trip Requests).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub input_responses: Option<InputResponses>,
+    /// Opaque request state echoed back from a previous `InputRequiredResult` (SEP-2322).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_state: Option<String>,
 }
 
 impl GetPromptRequestParams {
@@ -1404,6 +1443,8 @@ impl GetPromptRequestParams {
             meta: None,
             name: name.into(),
             arguments: None,
+            input_responses: None,
+            request_state: None,
         }
     }
 
@@ -1418,6 +1459,18 @@ impl GetPromptRequestParams {
         self.meta = Some(meta);
         self
     }
+
+    /// Sets the input responses for an MRTR retry (SEP-2322).
+    pub fn with_input_responses(mut self, input_responses: InputResponses) -> Self {
+        self.input_responses = Some(input_responses);
+        self
+    }
+
+    /// Sets the request state for an MRTR retry (SEP-2322).
+    pub fn with_request_state(mut self, request_state: impl Into<String>) -> Self {
+        self.request_state = Some(request_state.into());
+        self
+    }
 }
 
 impl RequestParamsMeta for GetPromptRequestParams {
@@ -3019,6 +3072,17 @@ pub struct CallToolRequestParams {
     /// Task metadata for async task management (SEP-1319)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub task: Option<JsonObject>,
+    /// Client responses to server-initiated input requests from a previous
+    /// `InputRequiredResult`. Present only when retrying after an incomplete result.
+    /// (SEP-2322 Multi Round-Trip Requests)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub input_responses: Option<InputResponses>,
+    /// Opaque request state echoed back from a previous `InputRequiredResult`.
+    /// Clients MUST return this value exactly as received. Present only when
+    /// retrying a request after receiving an incomplete result that included
+    /// a `requestState` field. (SEP-2322)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_state: Option<String>,
 }
 
 impl CallToolRequestParams {
@@ -3029,6 +3093,8 @@ impl CallToolRequestParams {
             name: name.into(),
             arguments: None,
             task: None,
+            input_responses: None,
+            request_state: None,
         }
     }
 
@@ -3043,6 +3109,18 @@ impl CallToolRequestParams {
         self.task = Some(task);
         self
     }
+
+    /// Sets the input responses for an MRTR retry (SEP-2322).
+    pub fn with_input_responses(mut self, input_responses: InputResponses) -> Self {
+        self.input_responses = Some(input_responses);
+        self
+    }
+
+    /// Sets the request state for an MRTR retry (SEP-2322).
+    pub fn with_request_state(mut self, request_state: impl Into<String>) -> Self {
+        self.request_state = Some(request_state.into());
+        self
+    }
 }
 
 impl RequestParamsMeta for CallToolRequestParams {
@@ -3431,6 +3509,7 @@ ts_union!(
     | GetTaskResult
     | CancelTaskResult
     | CallToolResult
+    | InputRequiredResult
     | GetTaskPayloadResult
     | EmptyResult
     | CustomResult