remove resumtion from call_tool API

Author: ihrpr

src/mcp/client/session.py

@@ -8,9 +8,6 @@
 import mcp.types as types
 from mcp.shared.context import RequestContext
 from mcp.shared.message import (
-    ClientMessageMetadata,
-    ResumptionToken,
-    ResumptionTokenUpdateCallback,
     SessionMessage,
 )
 from mcp.shared.session import BaseSession, RequestResponder
@@ -264,38 +261,8 @@ async def call_tool(
         name: str,
         arguments: dict[str, Any] | None = None,
         read_timeout_seconds: timedelta | None = None,
-        on_resumption_token_update: ResumptionTokenUpdateCallback | None = None,
-        resumption_token: ResumptionToken | None = None,
     ) -> types.CallToolResult:
-        """Send a tools/call request to invoke or resume a tool operation.
-
-        This method supports two modes of operation:
-
-        Initial Invocation:
-          - Tool is executed from the beginning
-          - If on_resumption_token_update is provided, it will receive resumption tokens
-            if transport supports resumable operations
-
-        Resumption:
-          - Requires a resumption_token from a previous execution
-          - Continues execution from the specified resumption token
-
-        Args:
-            name: Tool name to call
-            arguments: Optional arguments dictionary for the tool
-            read_timeout_seconds: request read timeout
-            on_resumption_token_update: Optional callback that receives
-                resumption tokens during execution, which can be
-                used later to resume an interrupted operation
-            resumption_token: Optional token to resume from a specific token
-                (supported by some transports)
-        """
-        metadata = None
-        if on_resumption_token_update or resumption_token:
-            metadata = ClientMessageMetadata(
-                on_resumption_token_update=on_resumption_token_update,
-                resumption_token=resumption_token,
-            )
+        """Send a tools/call request."""
 
         return await self.send_request(
             types.ClientRequest(
@@ -306,7 +273,6 @@ async def call_tool(
             ),
             types.CallToolResult,
             request_read_timeout_seconds=read_timeout_seconds,
-            metadata=metadata,
         )
 
     async def list_prompts(self) -> types.ListPromptsResult:

src/mcp/shared/session.py

@@ -242,7 +242,9 @@ async def send_request(
             # TODO: Support progress callbacks
 
             await self._write_stream.send(
-                SessionMessage(message=JSONRPCMessage(jsonrpc_request))
+                SessionMessage(
+                    message=JSONRPCMessage(jsonrpc_request), metadata=metadata
+                )
             )
 
             # request read timeout takes precedence over session read timeout

tests/shared/test_streamable_http.py

@@ -38,6 +38,12 @@
     StreamId,
 )
 from mcp.shared.exceptions import McpError
+from mcp.shared.message import (
+    ClientMessageMetadata,
+    ResumptionToken,
+    ResumptionTokenUpdateCallback,
+    SessionMessage,
+)
 from mcp.shared.session import RequestResponder
 from mcp.types import (
     InitializeResult,
@@ -1031,12 +1037,21 @@ async def on_resumption_token_update(token: str) -> None:
             async with anyio.create_task_group() as tg:
 
                 async def run_tool():
-                    # Call the special tool that sends periodic notifications
-                    await session.call_tool(
-                        "long_running_with_checkpoints",
-                        {},
+                    metadata = ClientMessageMetadata(
                         on_resumption_token_update=on_resumption_token_update,
                     )
+                    await session.send_request(
+                        types.ClientRequest(
+                            types.CallToolRequest(
+                                method="tools/call",
+                                params=types.CallToolRequestParams(
+                                    name="long_running_with_checkpoints", arguments={}
+                                ),
+                            )
+                        ),
+                        types.CallToolResult,
+                        metadata=metadata,
+                    )
 
                 tg.start_soon(run_tool)
 
@@ -1046,7 +1061,9 @@ async def run_tool():
                     await anyio.sleep(0.1)
                 tg.cancel_scope.cancel()
 
-    # Clear captured notifications
+    # Store pre notifications and clear the captured notifications
+    # for the post-resumption check
+    captured_notifications_pre = captured_notifications.copy()
     captured_notifications = []
 
     # Now resume the session with the same mcp-session-id
@@ -1067,11 +1084,22 @@ async def run_tool():
 
             # Resume the tool with the resumption token
             assert captured_resumption_token is not None
-            result = await session.call_tool(
-                "long_running_with_checkpoints",
-                {},
+
+            metadata = ClientMessageMetadata(
                 resumption_token=captured_resumption_token,
             )
+            result = await session.send_request(
+                types.ClientRequest(
+                    types.CallToolRequest(
+                        method="tools/call",
+                        params=types.CallToolRequestParams(
+                            name="long_running_with_checkpoints", arguments={}
+                        ),
+                    )
+                ),
+                types.CallToolResult,
+                metadata=metadata,
+            )
 
             # We should get a complete result
             assert len(result.content) == 1
@@ -1088,3 +1116,7 @@ async def run_tool():
                 and n.root.params.data == "Tool started"
                 for n in captured_notifications
             )
+            # there is no intersection between pre and post notifications
+            assert not any(
+                n in captured_notifications_pre for n in captured_notifications
+            )