From 33735b9da90bcc9f6603a7eb55574f7e458fcc58 Mon Sep 17 00:00:00 2001
From: Peter Hayman <peteyhayman@gmail.com>
Date: Mon, 26 May 2025 13:23:04 +1000
Subject: [PATCH] fix: generic ServerHandler

---
 crates/rmcp-macros/src/tool.rs        | 4 ++--
 crates/rmcp/tests/test_tool_macros.rs | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/rmcp-macros/src/tool.rs b/crates/rmcp-macros/src/tool.rs
index c17ef2f8..956ab320 100644
--- a/crates/rmcp-macros/src/tool.rs
+++ b/crates/rmcp-macros/src/tool.rs
@@ -258,7 +258,7 @@ pub(crate) fn tool_impl_item(attr: TokenStream, mut input: ItemImpl) -> syn::Res
                 input.items.push(parse_quote! {
                     async fn list_tools(
                         &self,
-                        request: rmcp::model::PaginatedRequestParam,
+                        request: Option<rmcp::model::PaginatedRequestParam>,
                         context: rmcp::service::RequestContext<rmcp::RoleServer>,
                     ) -> Result<rmcp::model::ListToolsResult, rmcp::Error> {
                         self.list_tools_inner(request, context).await
@@ -316,7 +316,7 @@ pub(crate) fn tool_impl_item(attr: TokenStream, mut input: ItemImpl) -> syn::Res
             input.items.push(parse_quote! {
                 async fn list_tools_inner(
                     &self,
-                    _: rmcp::model::PaginatedRequestParam,
+                    _: Option<rmcp::model::PaginatedRequestParam>,
                     _: rmcp::service::RequestContext<rmcp::RoleServer>,
                 ) -> Result<rmcp::model::ListToolsResult, rmcp::Error> {
                     Ok(rmcp::model::ListToolsResult {
diff --git a/crates/rmcp/tests/test_tool_macros.rs b/crates/rmcp/tests/test_tool_macros.rs
index 669839b8..84bcac93 100644
--- a/crates/rmcp/tests/test_tool_macros.rs
+++ b/crates/rmcp/tests/test_tool_macros.rs
@@ -83,6 +83,8 @@ impl<DS: DataService> GenericServer<DS> {
         self.data_service.get_data()
     }
 }
+#[tool(tool_box)]
+impl<DS: DataService> ServerHandler for GenericServer<DS> {}
 
 #[tokio::test]
 async fn test_tool_macros() {