Remove None as valid return type from join_call_tool, fix typo ImMemory -> InMemory

Author: davemssavage

src/mcp/client/session.py

@@ -329,7 +329,7 @@ async def join_call_tool(
         progress_callback: ProgressFnT | None = None,
         request_read_timeout_seconds: timedelta | None = None,
         done_on_timeout: bool = True,
-    ) -> types.CallToolResult | None:
+    ) -> types.CallToolResult:
         resume_token = self._request_state_manager.get_resume_token(request_id)
         metadata = ClientMessageMetadata(resumption_token=resume_token)
 

src/mcp/shared/session.py

@@ -194,7 +194,7 @@ async def close_request(self, request_id: RequestId) -> bool: ...
     async def close(self) -> None: ...
 
 
-class ImMemoryRequestStateManager(
+class InMemoryRequestStateManager(
     RequestStateManager[
         SendRequestT,
         SendResultT,
@@ -354,7 +354,7 @@ def __init__(
         self._session_read_timeout_seconds = read_timeout_seconds
         self._exit_stack = AsyncExitStack()
         self._in_flight = {}
-        self._request_state_manager = request_state_manager or ImMemoryRequestStateManager()
+        self._request_state_manager = request_state_manager or InMemoryRequestStateManager()
 
     async def __aenter__(self) -> Self:
         self._task_group = anyio.create_task_group()

tests/client/test_resource_cleanup.py

@@ -3,7 +3,7 @@
 import anyio
 import pytest
 
-from mcp.shared.session import BaseSession, ImMemoryRequestStateManager
+from mcp.shared.session import BaseSession, InMemoryRequestStateManager
 from mcp.types import (
     ClientRequest,
     EmptyResult,
@@ -28,7 +28,7 @@ async def _send_response(self, request_id, response):
     write_stream_send, write_stream_receive = anyio.create_memory_object_stream(1)
     read_stream_send, read_stream_receive = anyio.create_memory_object_stream(1)
 
-    request_io_manager = ImMemoryRequestStateManager()
+    request_io_manager = InMemoryRequestStateManager()
     # Create the session
     session = TestSession(
         read_stream_receive,

tests/client/test_session.py

@@ -10,7 +10,7 @@
 from mcp.shared.context import RequestContext
 from mcp.shared.exceptions import McpError
 from mcp.shared.message import SessionMessage
-from mcp.shared.session import ImMemoryRequestStateManager, RequestResponder
+from mcp.shared.session import InMemoryRequestStateManager, RequestResponder
 from mcp.shared.version import SUPPORTED_PROTOCOL_VERSIONS
 from mcp.types import (
     LATEST_PROTOCOL_VERSION,
@@ -973,8 +973,8 @@ async def message_handler(
         if isinstance(message, Exception):
             raise message
 
-    request_state_manager_1 = ImMemoryRequestStateManager()
-    request_state_manager_2 = ImMemoryRequestStateManager()
+    request_state_manager_1 = InMemoryRequestStateManager()
+    request_state_manager_2 = InMemoryRequestStateManager()
 
     async with (
         ClientSession(