Skip to content

πŸš€ The fast, Pythonic way to build MCP servers and clients.

fix(server): pass typed list request messages to list middleware hooks (#5732)

ε“ˆεŸΊη±³a87b0e4f6467
diff --git a/fastmcp_slim/fastmcp/server/server.py b/fastmcp_slim/fastmcp/server/server.py
index 53d00d5a5..bb5c79f2a 100644
--- a/fastmcp_slim/fastmcp/server/server.py
+++ b/fastmcp_slim/fastmcp/server/server.py
@@ -976,7 +976,10 @@ class FastMCP(
async with fastmcp.server.context.Context(fastmcp=self) as ctx:
if run_middleware:
mw_context = MiddlewareContext(
- message={},
+ # Synthesized with only `method`: params stays None, so
+ # pagination state (e.g. the client's nextCursor) is not
+ # visible to list middleware hooks.
+ message=mcp_types.ListResourcesRequest(method="resources/list"),
source="client",
type="request",
method="resources/list",
@@ -1127,7 +1130,12 @@ class FastMCP(
async with fastmcp.server.context.Context(fastmcp=self) as ctx:
if run_middleware:
mw_context = MiddlewareContext(
- message={},
+ # Synthesized with only `method`: params stays None, so
+ # pagination state (e.g. the client's nextCursor) is not
+ # visible to list middleware hooks.
+ message=mcp_types.ListResourceTemplatesRequest(
+ method="resources/templates/list"
+ ),
source="client",
type="request",
method="resources/templates/list",
@@ -1267,7 +1275,10 @@ class FastMCP(
async with fastmcp.server.context.Context(fastmcp=self) as ctx:
if run_middleware:
mw_context = MiddlewareContext(
- message={},
+ # Synthesized with only `method`: params stays None, so
+ # pagination state (e.g. the client's nextCursor) is not
+ # visible to list middleware hooks.
+ message=mcp_types.ListPromptsRequest(method="prompts/list"),
source="client",
type="request",
method="prompts/list",
diff --git a/tests/server/middleware/test_middleware.py b/tests/server/middleware/test_middleware.py
index 715413017..cde871707 100644
--- a/tests/server/middleware/test_middleware.py
+++ b/tests/server/middleware/test_middleware.py
@@ -295,6 +295,35 @@ class TestMiddlewareHooks:
result = list_prompts_calls[0].result
assert isinstance(result, list)
+ async def test_list_hooks_receive_typed_request_messages(
+ self, mcp_server: FastMCP, recording_middleware: RecordingMiddleware
+ ):
+ async with Client(mcp_server) as client:
+ await client.list_tools()
+ await client.list_resources()
+ await client.list_resource_templates()
+ await client.list_prompts()
+
+ expected = [
+ ("on_list_tools", mcp_types.ListToolsRequest, "tools/list"),
+ ("on_list_resources", mcp_types.ListResourcesRequest, "resources/list"),
+ (
+ "on_list_resource_templates",
+ mcp_types.ListResourceTemplatesRequest,
+ "resources/templates/list",
+ ),
+ ("on_list_prompts", mcp_types.ListPromptsRequest, "prompts/list"),
+ ]
+ for hook, message_cls, method in expected:
+ calls = recording_middleware.get_calls(hook=hook)
+ assert len(calls) > 0
+ message = calls[0].context.message
+ assert isinstance(message, message_cls), (
+ f"{hook} received {type(message).__name__}, "
+ f"expected {message_cls.__name__}"
+ )
+ assert message.method == method
+
async def test_initialize(
self, mcp_server: FastMCP, recording_middleware: RecordingMiddleware
):