feat!: add SEP-2322 MRTR model types

Author: DaleSeo

conformance/src/bin/server.rs

@@ -204,9 +204,8 @@ impl ServerHandler for ConformanceServer {
             ),
         ];
         Ok(ListToolsResult {
-            meta: None,
             tools,
-            next_cursor: None,
+            ..Default::default()
         })
     }
 
@@ -543,7 +542,6 @@ impl ServerHandler for ConformanceServer {
         _cx: RequestContext<RoleServer>,
     ) -> Result<ListResourcesResult, ErrorData> {
         Ok(ListResourcesResult {
-            meta: None,
             resources: vec![
                 RawResource {
                     uri: "test://static-text".into(),
@@ -568,7 +566,7 @@ impl ServerHandler for ConformanceServer {
                 }
                 .no_annotation(),
             ],
-            next_cursor: None,
+            ..Default::default()
         })
     }
 
@@ -628,7 +626,6 @@ impl ServerHandler for ConformanceServer {
         _cx: RequestContext<RoleServer>,
     ) -> Result<ListResourceTemplatesResult, ErrorData> {
         Ok(ListResourceTemplatesResult {
-            meta: None,
             resource_templates: vec![
                 RawResourceTemplate {
                     uri_template: "test://template/{id}/data".into(),
@@ -640,7 +637,7 @@ impl ServerHandler for ConformanceServer {
                 }
                 .no_annotation(),
             ],
-            next_cursor: None,
+            ..Default::default()
         })
     }
 
@@ -670,7 +667,6 @@ impl ServerHandler for ConformanceServer {
         _cx: RequestContext<RoleServer>,
     ) -> Result<ListPromptsResult, ErrorData> {
         Ok(ListPromptsResult {
-            meta: None,
             prompts: vec![
                 Prompt::new(
                     "test_simple_prompt",
@@ -700,7 +696,7 @@ impl ServerHandler for ConformanceServer {
                     None,
                 ),
             ],
-            next_cursor: None,
+            ..Default::default()
         })
     }
 

crates/rmcp-macros/src/prompt_handler.rs

@@ -61,6 +61,7 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
         ) -> Result<ListPromptsResult, rmcp::ErrorData> {
             let prompts = #router_expr.list_all();
             Ok(ListPromptsResult {
+                result_type: Default::default(),
                 prompts,
                 meta: #meta,
                 next_cursor: None,

crates/rmcp-macros/src/tool_handler.rs

@@ -69,6 +69,7 @@ pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
                 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
             ) -> Result<rmcp::model::ListToolsResult, rmcp::ErrorData> {
                 Ok(rmcp::model::ListToolsResult{
+                    result_type: Default::default(),
                     tools: #router.list_all(),
                     meta: #result_meta,
                     next_cursor: None,

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 = "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,

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

@@ -103,6 +103,7 @@ impl IntoGetPromptResult for GetPromptResult {
 impl IntoGetPromptResult for Vec<PromptMessage> {
     fn into_get_prompt_result(self) -> Result<GetPromptResult, crate::ErrorData> {
         Ok(GetPromptResult {
+            result_type: Default::default(),
             description: None,
             messages: self,
         })

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 {