Revision 2025-03-26 (without streamable http)

crates/rmcp-macros/src/tool.rs

@@ -349,6 +349,7 @@ pub(crate) fn tool_fn_item(attr: TokenStream, mut input_fn: ItemFn) -> syn::Resu
                     name: #name.into(),
                     description: Some(#description.into()),
                     input_schema: #schema.into(),
+                    annotations: None
                 }
             }
         }
@@ -413,10 +414,10 @@ pub(crate) fn tool_fn_item(attr: TokenStream, mut input_fn: ItemFn) -> syn::Resu
                     Some(line)
                 }
             });
-        let trivial_argrextraction_part = quote! {
+        let trivial_arg_extraction_part = quote! {
             #(#trivial_args)*
         };
-        let processed_argrextraction_part = match &mut tool_macro_attrs.params {
+        let processed_arg_extraction_part = match &mut tool_macro_attrs.params {
             ToolParams::Aggregated { rust_type } => {
                 let PatType { pat, ty, .. } = rust_type;
                 quote! {
@@ -487,8 +488,8 @@ pub(crate) fn tool_fn_item(attr: TokenStream, mut input_fn: ItemFn) -> syn::Resu
             #raw_fn_vis async fn #tool_call_fn_ident(context: rmcp::handler::server::tool::ToolCallContext<'_, Self>)
                 -> std::result::Result<rmcp::model::CallToolResult, rmcp::Error> {
                 use rmcp::handler::server::tool::*;
-                #trivial_argrextraction_part
-                #processed_argrextraction_part
+                #trivial_arg_extraction_part
+                #processed_arg_extraction_part
                 #call
             }
         }

crates/rmcp/src/handler/server.rs

@@ -141,21 +141,21 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
     }
     fn list_prompts(
         &self,
-        request: PaginatedRequestParam,
+        request: Option<PaginatedRequestParam>,
         context: RequestContext<RoleServer>,
     ) -> impl Future<Output = Result<ListPromptsResult, McpError>> + Send + '_ {
         std::future::ready(Ok(ListPromptsResult::default()))
     }
     fn list_resources(
         &self,
-        request: PaginatedRequestParam,
+        request: Option<PaginatedRequestParam>,
         context: RequestContext<RoleServer>,
     ) -> impl Future<Output = Result<ListResourcesResult, McpError>> + Send + '_ {
         std::future::ready(Ok(ListResourcesResult::default()))
     }
     fn list_resource_templates(
         &self,
-        request: PaginatedRequestParam,
+        request: Option<PaginatedRequestParam>,
         context: RequestContext<RoleServer>,
     ) -> impl Future<Output = Result<ListResourceTemplatesResult, McpError>> + Send + '_ {
         std::future::ready(Ok(ListResourceTemplatesResult::default()))
@@ -192,7 +192,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
     }
     fn list_tools(
         &self,
-        request: PaginatedRequestParam,
+        request: Option<PaginatedRequestParam>,
         context: RequestContext<RoleServer>,
     ) -> impl Future<Output = Result<ListToolsResult, McpError>> + Send + '_ {
         std::future::ready(Ok(ListToolsResult::default()))

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

@@ -453,7 +453,7 @@ macro_rules! tool_box {
     (@derive $tool_box:ident) => {
         async fn list_tools(
             &self,
-            _: $crate::model::PaginatedRequestParam,
+            _: Option<$crate::model::PaginatedRequestParam>,
             _: $crate::service::RequestContext<$crate::service::RoleServer>,
         ) -> Result<$crate::model::ListToolsResult, $crate::Error> {
             Ok($crate::model::ListToolsResult {