fix: address PR review comments on migration docs and type hints

- Fix all migration.md examples to use ServerRequestContext instead of RequestContext
- Fix all imports to use 'from mcp.server import Server, ServerRequestContext'
- Apply ruff formatting to code examples
- Add Server constructor calls to examples that were missing them
- Re-export ServerRequestContext from mcp.server.__init__
- Add type hints to TaskResultHandler docstring example

Author: maxisbey

docs/migration.md

@@ -363,12 +363,12 @@ async def handle_tool(name: str, arguments: dict) -> list[TextContent]:
         await ctx.session.send_progress_notification(ctx.meta.progress_token, 0.5, 100)
 
 # After (v2)
-async def handle_call_tool(
-    ctx: RequestContext, params: CallToolRequestParams
-) -> CallToolResult:
+async def handle_call_tool(ctx: ServerRequestContext, params: CallToolRequestParams) -> CallToolResult:
     if ctx.meta and "progress_token" in ctx.meta:
         await ctx.session.send_progress_notification(ctx.meta["progress_token"], 0.5, 100)
     ...
+
+server = Server("my-server", on_call_tool=handle_call_tool)
 ```
 
 ### `RequestContext` and `ProgressContext` type parameters simplified
@@ -493,8 +493,7 @@ async def handle_call_tool(name: str, arguments: dict):
 **After (v2):**
 
 ```python
-from mcp.server.lowlevel import Server
-from mcp.shared.context import RequestContext
+from mcp.server import Server, ServerRequestContext
 from mcp.types import (
     CallToolRequestParams,
     CallToolResult,
@@ -504,16 +503,11 @@ from mcp.types import (
     Tool,
 )
 
-async def handle_list_tools(
-    ctx: RequestContext, params: PaginatedRequestParams | None
-) -> ListToolsResult:
-    return ListToolsResult(tools=[
-        Tool(name="my_tool", description="A tool", inputSchema={})
-    ])
+async def handle_list_tools(ctx: ServerRequestContext, params: PaginatedRequestParams | None) -> ListToolsResult:
+    return ListToolsResult(tools=[Tool(name="my_tool", description="A tool", inputSchema={})])
+
 
-async def handle_call_tool(
-    ctx: RequestContext, params: CallToolRequestParams
-) -> CallToolResult:
+async def handle_call_tool(ctx: ServerRequestContext, params: CallToolRequestParams) -> CallToolResult:
     return CallToolResult(
         content=[TextContent(type="text", text=f"Called {params.name}")],
         is_error=False,
@@ -535,13 +529,11 @@ server = Server(
 **Notification handlers:**
 
 ```python
-from mcp.server.lowlevel import Server
-from mcp.shared.context import RequestContext
+from mcp.server import Server, ServerRequestContext
 from mcp.types import ProgressNotificationParams
 
-async def handle_progress(
-    ctx: RequestContext, params: ProgressNotificationParams
-) -> None:
+
+async def handle_progress(ctx: ServerRequestContext, params: ProgressNotificationParams) -> None:
     print(f"Progress: {params.progress}/{params.total}")
 
 server = Server(
@@ -569,12 +561,11 @@ async def handle_call_tool(name: str, arguments: dict):
 **After (v2):**
 
 ```python
-from mcp.shared.context import RequestContext
+from mcp.server import ServerRequestContext
 from mcp.types import CallToolRequestParams, CallToolResult, TextContent
 
-async def handle_call_tool(
-    ctx: RequestContext, params: CallToolRequestParams
-) -> CallToolResult:
+
+async def handle_call_tool(ctx: ServerRequestContext, params: CallToolRequestParams) -> CallToolResult:
     await ctx.session.send_log_message(level="info", data="Processing...")
     return CallToolResult(
         content=[TextContent(type="text", text="Done")],
@@ -587,7 +578,7 @@ async def handle_call_tool(
 The `RequestContext` class now uses optional fields for request-specific data (`request_id`, `meta`, etc.) so it can be used for both request and notification handlers. In notification handlers, these fields are `None`.
 
 ```python
-from mcp.shared.context import RequestContext
+from mcp.server import ServerRequestContext
 
 # request_id, meta, etc. are available in request handlers
 # but None in notification handlers
@@ -657,15 +648,14 @@ params = CallToolRequestParams(
 The `streamable_http_app()` method is now available directly on the lowlevel `Server` class, not just `MCPServer`. This allows using the streamable HTTP transport without the MCPServer wrapper.
 
 ```python
-from mcp.server.lowlevel import Server
-from mcp.shared.context import RequestContext
+from mcp.server import Server, ServerRequestContext
 from mcp.types import ListToolsResult, PaginatedRequestParams
 
-async def handle_list_tools(
-    ctx: RequestContext, params: PaginatedRequestParams | None
-) -> ListToolsResult:
+
+async def handle_list_tools(ctx: ServerRequestContext, params: PaginatedRequestParams | None) -> ListToolsResult:
     return ListToolsResult(tools=[...])
 
+
 server = Server(
     "my-server",
     on_list_tools=handle_list_tools,

src/mcp/server/__init__.py

@@ -1,5 +1,6 @@
+from .context import ServerRequestContext
 from .lowlevel import NotificationOptions, Server
 from .mcpserver import MCPServer
 from .models import InitializationOptions
 
-__all__ = ["Server", "MCPServer", "NotificationOptions", "InitializationOptions"]
+__all__ = ["Server", "ServerRequestContext", "MCPServer", "NotificationOptions", "InitializationOptions"]

src/mcp/server/experimental/task_result_handler.py

@@ -44,15 +44,17 @@ class TaskResultHandler:
     5. Returns the final result
 
     Usage:
-        # Create handler with store and queue
         handler = TaskResultHandler(task_store, message_queue)
 
-        # Register as a handler with the lowlevel server
-        async def handle_task_result(ctx, params):
+        async def handle_task_result(
+            ctx: ServerRequestContext, params: GetTaskPayloadRequestParams
+        ) -> GetTaskPayloadResult:
+            assert ctx.request_id is not None
             return await handler.handle(
                 GetTaskPayloadRequest(params=params), ctx.session, ctx.request_id
             )
-        server = Server(on_call_tool=..., on_list_tools=...)
+
+        server._add_request_handler("tasks/result", handle_task_result)
     """
 
     def __init__(

src/mcp/server/lowlevel/experimental.py

@@ -47,9 +47,7 @@ class ExperimentalHandlers:
 
     def __init__(
         self,
-        add_request_handler: Callable[
-            [str, Callable[[ServerRequestContext[Any, Any], Any], Awaitable[Any]]], None
-        ],
+        add_request_handler: Callable[[str, Callable[[ServerRequestContext[Any, Any], Any], Awaitable[Any]]], None],
         has_handler: Callable[[str], bool],
     ) -> None:
         self._add_request_handler = add_request_handler