feat!: add MRTR model types (SEP-2322) (#915)

* feat!: add SEP-2322 MRTR model types

* feat!: remove URLElicitationRequiredError (SEP-2322)

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()
         })
     }
 
@@ -540,7 +539,6 @@ impl ServerHandler for ConformanceServer {
         _cx: RequestContext<RoleServer>,
     ) -> Result<ListResourcesResult, ErrorData> {
         Ok(ListResourcesResult {
-            meta: None,
             resources: vec![
                 Resource::new("test://static-text", "Static Text Resource")
                     .with_description("A static text resource for testing")
@@ -549,7 +547,7 @@ impl ServerHandler for ConformanceServer {
                     .with_description("A static binary/blob resource for testing")
                     .with_mime_type("image/png"),
             ],
-            next_cursor: None,
+            ..Default::default()
         })
     }
 
@@ -609,13 +607,12 @@ impl ServerHandler for ConformanceServer {
         _cx: RequestContext<RoleServer>,
     ) -> Result<ListResourceTemplatesResult, ErrorData> {
         Ok(ListResourceTemplatesResult {
-            meta: None,
             resource_templates: vec![
                 ResourceTemplate::new("test://template/{id}/data", "Dynamic Resource")
                     .with_description("A dynamic resource with parameter substitution")
                     .with_mime_type("application/json"),
             ],
-            next_cursor: None,
+            ..Default::default()
         })
     }
 
@@ -645,7 +642,6 @@ impl ServerHandler for ConformanceServer {
         _cx: RequestContext<RoleServer>,
     ) -> Result<ListPromptsResult, ErrorData> {
         Ok(ListPromptsResult {
-            meta: None,
             prompts: vec![
                 Prompt::new(
                     "test_simple_prompt",
@@ -675,7 +671,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<rmcp::model::ListPromptsResult, rmcp::ErrorData> {
             let prompts = #router_expr.list_all();
             Ok(rmcp::model::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

@@ -66,10 +66,6 @@ impl<H: ClientHandler> Service<RoleClient> for H {
             ServerNotification::PromptListChangedNotification(_notification_no_param) => {
                 self.on_prompt_list_changed(context).await
             }
-            ServerNotification::ElicitationCompleteNotification(notification) => {
-                self.on_url_elicitation_notification_complete(notification.params, context)
-                    .await
-            }
             ServerNotification::TaskStatusNotification(notification) => {
                 self.on_task_status(notification.params, context).await
             }
@@ -242,13 +238,6 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
         std::future::ready(())
     }
 
-    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/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,
             meta: None,

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

@@ -669,6 +669,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),
         );
@@ -708,6 +710,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 {