fix: add ReceiveResultT into Base Session

Author: huangjia2019

src/mcp/shared/context.py

@@ -6,7 +6,7 @@
 from mcp.shared.session import BaseSession
 from mcp.types import RequestId, RequestParams
 
-SessionT = TypeVar("SessionT", bound=BaseSession[Any, Any, Any, Any, Any])
+SessionT = TypeVar("SessionT", bound=BaseSession[Any, Any, Any, Any, Any, Any])
 LifespanContextT = TypeVar("LifespanContextT")
 RequestT = TypeVar("RequestT", default=Any)
 

src/mcp/shared/progress.py

@@ -13,6 +13,7 @@
     SendNotificationT,
     SendRequestT,
     SendResultT,
+    ReceiveResultT,
 )
 from mcp.types import ProgressToken
 
@@ -23,8 +24,8 @@ class Progress(BaseModel):
 
 
 @dataclass
-class ProgressContext(Generic[SendRequestT, SendNotificationT, SendResultT, ReceiveRequestT, ReceiveNotificationT]):
-    session: BaseSession[SendRequestT, SendNotificationT, SendResultT, ReceiveRequestT, ReceiveNotificationT]
+class ProgressContext(Generic[SendRequestT, SendNotificationT, SendResultT, ReceiveRequestT, ReceiveNotificationT, ReceiveResultT]):
+    session: BaseSession[SendRequestT, SendNotificationT, SendResultT, ReceiveRequestT, ReceiveResultT, ReceiveNotificationT]
     progress_token: ProgressToken
     total: float | None
     current: float = field(default=0.0, init=False)
@@ -40,12 +41,12 @@ async def progress(self, amount: float, message: str | None = None) -> None:
 @contextmanager
 def progress(
     ctx: RequestContext[
-        BaseSession[SendRequestT, SendNotificationT, SendResultT, ReceiveRequestT, ReceiveNotificationT],
+        BaseSession[SendRequestT, SendNotificationT, SendResultT, ReceiveRequestT, ReceiveResultT, ReceiveNotificationT],
         LifespanContextT,
     ],
     total: float | None = None,
 ) -> Generator[
-    ProgressContext[SendRequestT, SendNotificationT, SendResultT, ReceiveRequestT, ReceiveNotificationT],
+    ProgressContext[SendRequestT, SendNotificationT, SendResultT, ReceiveRequestT, ReceiveNotificationT, ReceiveResultT],
     None,
 ]:
     if ctx.meta is None or ctx.meta.progressToken is None:

tests/shared/test_progress_notifications.py

@@ -290,7 +290,7 @@ async def handle_client_message(
         # cast for type checker
         typed_context = cast(
             RequestContext[
-                BaseSession[Any, Any, Any, Any, Any],
+                BaseSession[Any, Any, Any, Any, Any, Any],
                 Any,
             ],
             request_context,