feat: add CreateMessageResultWithTools to client return types

Author: jlowin

src/mcp/client/session.py

@@ -25,7 +25,7 @@ async def __call__(
         self,
         context: RequestContext["ClientSession", Any],
         params: types.CreateMessageRequestParams,
-    ) -> types.CreateMessageResult | types.ErrorData: ...  # pragma: no branch
+    ) -> types.CreateMessageResult | types.CreateMessageResultWithTools | types.ErrorData: ...  # pragma: no branch
 
 
 class ElicitationFnT(Protocol):
@@ -65,7 +65,7 @@ async def _default_message_handler(
 async def _default_sampling_callback(
     context: RequestContext["ClientSession", Any],
     params: types.CreateMessageRequestParams,
-) -> types.CreateMessageResult | types.ErrorData:
+) -> types.CreateMessageResult | types.CreateMessageResultWithTools | types.ErrorData:
     return types.ErrorData(
         code=types.INVALID_REQUEST,
         message="Sampling not supported",

src/mcp/types.py

@@ -1928,6 +1928,7 @@ class ElicitationRequiredErrorData(BaseModel):
 ClientResultType: TypeAlias = (
     EmptyResult
     | CreateMessageResult
+    | CreateMessageResultWithTools
     | ListRootsResult
     | ElicitResult
     | GetTaskResult