Merge branch 'main' into main

Author: SoldierSacha

src/mcp/client/session.py

@@ -151,7 +151,6 @@ async def initialize(self) -> types.InitializeResult:
         result = await self.send_request(
             types.ClientRequest(
                 types.InitializeRequest(
-                    method="initialize",
                     params=types.InitializeRequestParams(
                         protocolVersion=types.LATEST_PROTOCOL_VERSION,
                         capabilities=types.ClientCapabilities(
@@ -170,20 +169,14 @@ async def initialize(self) -> types.InitializeResult:
         if result.protocolVersion not in SUPPORTED_PROTOCOL_VERSIONS:
             raise RuntimeError(f"Unsupported protocol version from the server: {result.protocolVersion}")
 
-        await self.send_notification(
-            types.ClientNotification(types.InitializedNotification(method="notifications/initialized"))
-        )
+        await self.send_notification(types.ClientNotification(types.InitializedNotification()))
 
         return result
 
     async def send_ping(self) -> types.EmptyResult:
         """Send a ping request."""
         return await self.send_request(
-            types.ClientRequest(
-                types.PingRequest(
-                    method="ping",
-                )
-            ),
+            types.ClientRequest(types.PingRequest()),
             types.EmptyResult,
         )
 
@@ -198,7 +191,6 @@ async def send_progress_notification(
         await self.send_notification(
             types.ClientNotification(
                 types.ProgressNotification(
-                    method="notifications/progress",
                     params=types.ProgressNotificationParams(
                         progressToken=progress_token,
                         progress=progress,
@@ -214,7 +206,6 @@ async def set_logging_level(self, level: types.LoggingLevel) -> types.EmptyResul
         return await self.send_request(
             types.ClientRequest(
                 types.SetLevelRequest(
-                    method="logging/setLevel",
                     params=types.SetLevelRequestParams(level=level),
                 )
             ),
@@ -226,7 +217,6 @@ async def list_resources(self, cursor: str | None = None) -> types.ListResources
         return await self.send_request(
             types.ClientRequest(
                 types.ListResourcesRequest(
-                    method="resources/list",
                     params=types.PaginatedRequestParams(cursor=cursor) if cursor is not None else None,
                 )
             ),
@@ -238,7 +228,6 @@ async def list_resource_templates(self, cursor: str | None = None) -> types.List
         return await self.send_request(
             types.ClientRequest(
                 types.ListResourceTemplatesRequest(
-                    method="resources/templates/list",
                     params=types.PaginatedRequestParams(cursor=cursor) if cursor is not None else None,
                 )
             ),
@@ -250,7 +239,6 @@ async def read_resource(self, uri: AnyUrl) -> types.ReadResourceResult:
         return await self.send_request(
             types.ClientRequest(
                 types.ReadResourceRequest(
-                    method="resources/read",
                     params=types.ReadResourceRequestParams(uri=uri),
                 )
             ),
@@ -262,7 +250,6 @@ async def subscribe_resource(self, uri: AnyUrl) -> types.EmptyResult:
         return await self.send_request(
             types.ClientRequest(
                 types.SubscribeRequest(
-                    method="resources/subscribe",
                     params=types.SubscribeRequestParams(uri=uri),
                 )
             ),
@@ -274,7 +261,6 @@ async def unsubscribe_resource(self, uri: AnyUrl) -> types.EmptyResult:
         return await self.send_request(
             types.ClientRequest(
                 types.UnsubscribeRequest(
-                    method="resources/unsubscribe",
                     params=types.UnsubscribeRequestParams(uri=uri),
                 )
             ),
@@ -293,7 +279,6 @@ async def call_tool(
         result = await self.send_request(
             types.ClientRequest(
                 types.CallToolRequest(
-                    method="tools/call",
                     params=types.CallToolRequestParams(
                         name=name,
                         arguments=arguments,
@@ -337,7 +322,6 @@ async def list_prompts(self, cursor: str | None = None) -> types.ListPromptsResu
         return await self.send_request(
             types.ClientRequest(
                 types.ListPromptsRequest(
-                    method="prompts/list",
                     params=types.PaginatedRequestParams(cursor=cursor) if cursor is not None else None,
                 )
             ),
@@ -349,7 +333,6 @@ async def get_prompt(self, name: str, arguments: dict[str, str] | None = None) -
         return await self.send_request(
             types.ClientRequest(
                 types.GetPromptRequest(
-                    method="prompts/get",
                     params=types.GetPromptRequestParams(name=name, arguments=arguments),
                 )
             ),
@@ -370,7 +353,6 @@ async def complete(
         return await self.send_request(
             types.ClientRequest(
                 types.CompleteRequest(
-                    method="completion/complete",
                     params=types.CompleteRequestParams(
                         ref=ref,
                         argument=types.CompletionArgument(**argument),
@@ -386,7 +368,6 @@ async def list_tools(self, cursor: str | None = None) -> types.ListToolsResult:
         result = await self.send_request(
             types.ClientRequest(
                 types.ListToolsRequest(
-                    method="tools/list",
                     params=types.PaginatedRequestParams(cursor=cursor) if cursor is not None else None,
                 )
             ),
@@ -402,13 +383,7 @@ async def list_tools(self, cursor: str | None = None) -> types.ListToolsResult:
 
     async def send_roots_list_changed(self) -> None:
         """Send a roots/list_changed notification."""
-        await self.send_notification(
-            types.ClientNotification(
-                types.RootsListChangedNotification(
-                    method="notifications/roots/list_changed",
-                )
-            )
-        )
+        await self.send_notification(types.ClientNotification(types.RootsListChangedNotification()))
 
     async def _received_request(self, responder: RequestResponder[types.ServerRequest, types.ClientResult]) -> None:
         ctx = RequestContext[ClientSession, Any](

src/mcp/client/stdio/__init__.py

@@ -32,6 +32,7 @@
         "HOMEPATH",
         "LOCALAPPDATA",
         "PATH",
+        "PATHEXT",
         "PROCESSOR_ARCHITECTURE",
         "SYSTEMDRIVE",
         "SYSTEMROOT",

src/mcp/client/streamable_http.py

@@ -281,17 +281,19 @@ async def _handle_post_request(self, ctx: RequestContext) -> None:
             if is_initialization:
                 self._maybe_extract_session_id_from_response(response)
 
-            content_type = response.headers.get(CONTENT_TYPE, "").lower()
-
-            if content_type.startswith(JSON):
-                await self._handle_json_response(response, ctx.read_stream_writer, is_initialization)
-            elif content_type.startswith(SSE):
-                await self._handle_sse_response(response, ctx, is_initialization)
-            else:
-                await self._handle_unexpected_content_type(
-                    content_type,
-                    ctx.read_stream_writer,
-                )
+            # Per https://modelcontextprotocol.io/specification/2025-06-18/basic#notifications:
+            # The server MUST NOT send a response to notifications.
+            if isinstance(message.root, JSONRPCRequest):
+                content_type = response.headers.get(CONTENT_TYPE, "").lower()
+                if content_type.startswith(JSON):
+                    await self._handle_json_response(response, ctx.read_stream_writer, is_initialization)
+                elif content_type.startswith(SSE):
+                    await self._handle_sse_response(response, ctx, is_initialization)
+                else:
+                    await self._handle_unexpected_content_type(
+                        content_type,
+                        ctx.read_stream_writer,
+                    )
 
     async def _handle_json_response(
         self,

src/mcp/server/auth/provider.py

@@ -300,7 +300,7 @@ async def revoke_token(
 
 def construct_redirect_uri(redirect_uri_base: str, **params: str | None) -> str:
     parsed_uri = urlparse(redirect_uri_base)
-    query_params = [(k, v) for k, vs in parse_qs(parsed_uri.query) for v in vs]
+    query_params = [(k, v) for k, vs in parse_qs(parsed_uri.query).items() for v in vs]
     for k, v in params.items():
         if v is not None:
             query_params.append((k, v))

src/mcp/server/fastmcp/__init__.py

@@ -3,7 +3,7 @@
 from importlib.metadata import version
 
 from .server import Context, FastMCP
-from .utilities.types import Image
+from .utilities.types import Audio, Image
 
 __version__ = version("mcp")
-__all__ = ["FastMCP", "Context", "Image"]
+__all__ = ["FastMCP", "Context", "Image", "Audio"]

src/mcp/server/fastmcp/utilities/func_metadata.py

@@ -21,7 +21,7 @@
 
 from mcp.server.fastmcp.exceptions import InvalidSignature
 from mcp.server.fastmcp.utilities.logging import get_logger
-from mcp.server.fastmcp.utilities.types import Image
+from mcp.server.fastmcp.utilities.types import Audio, Image
 from mcp.types import ContentBlock, TextContent
 
 logger = get_logger(__name__)
@@ -506,6 +506,9 @@ def _convert_to_content(
     if isinstance(result, Image):
         return [result.to_image_content()]
 
+    if isinstance(result, Audio):
+        return [result.to_audio_content()]
+
     if isinstance(result, list | tuple):
         return list(
             chain.from_iterable(

src/mcp/server/fastmcp/utilities/types.py

@@ -3,7 +3,7 @@
 import base64
 from pathlib import Path
 
-from mcp.types import ImageContent
+from mcp.types import AudioContent, ImageContent
 
 
 class Image:
@@ -52,3 +52,50 @@ def to_image_content(self) -> ImageContent:
             raise ValueError("No image data available")
 
         return ImageContent(type="image", data=data, mimeType=self._mime_type)
+
+
+class Audio:
+    """Helper class for returning audio from tools."""
+
+    def __init__(
+        self,
+        path: str | Path | None = None,
+        data: bytes | None = None,
+        format: str | None = None,
+    ):
+        if not bool(path) ^ bool(data):
+            raise ValueError("Either path or data can be provided")
+
+        self.path = Path(path) if path else None
+        self.data = data
+        self._format = format
+        self._mime_type = self._get_mime_type()
+
+    def _get_mime_type(self) -> str:
+        """Get MIME type from format or guess from file extension."""
+        if self._format:
+            return f"audio/{self._format.lower()}"
+
+        if self.path:
+            suffix = self.path.suffix.lower()
+            return {
+                ".wav": "audio/wav",
+                ".mp3": "audio/mpeg",
+                ".ogg": "audio/ogg",
+                ".flac": "audio/flac",
+                ".aac": "audio/aac",
+                ".m4a": "audio/mp4",
+            }.get(suffix, "application/octet-stream")
+        return "audio/wav"  # default for raw binary data
+
+    def to_audio_content(self) -> AudioContent:
+        """Convert to MCP AudioContent."""
+        if self.path:
+            with open(self.path, "rb") as f:
+                data = base64.b64encode(f.read()).decode()
+        elif self.data is not None:
+            data = base64.b64encode(self.data).decode()
+        else:
+            raise ValueError("No audio data available")
+
+        return AudioContent(type="audio", data=data, mimeType=self._mime_type)

src/mcp/server/session.py

@@ -186,7 +186,6 @@ async def send_log_message(
         await self.send_notification(
             types.ServerNotification(
                 types.LoggingMessageNotification(
-                    method="notifications/message",
                     params=types.LoggingMessageNotificationParams(
                         level=level,
                         data=data,
@@ -202,7 +201,6 @@ async def send_resource_updated(self, uri: AnyUrl) -> None:
         await self.send_notification(
             types.ServerNotification(
                 types.ResourceUpdatedNotification(
-                    method="notifications/resources/updated",
                     params=types.ResourceUpdatedNotificationParams(uri=uri),
                 )
             )
@@ -225,7 +223,6 @@ async def create_message(
         return await self.send_request(
             request=types.ServerRequest(
                 types.CreateMessageRequest(
-                    method="sampling/createMessage",
                     params=types.CreateMessageRequestParams(
                         messages=messages,
                         systemPrompt=system_prompt,
@@ -247,11 +244,7 @@ async def create_message(
     async def list_roots(self) -> types.ListRootsResult:
         """Send a roots/list request."""
         return await self.send_request(
-            types.ServerRequest(
-                types.ListRootsRequest(
-                    method="roots/list",
-                )
-            ),
+            types.ServerRequest(types.ListRootsRequest()),
             types.ListRootsResult,
         )
 
@@ -273,7 +266,6 @@ async def elicit(
         return await self.send_request(
             types.ServerRequest(
                 types.ElicitRequest(
-                    method="elicitation/create",
                     params=types.ElicitRequestParams(
                         message=message,
                         requestedSchema=requestedSchema,
@@ -287,11 +279,7 @@ async def elicit(
     async def send_ping(self) -> types.EmptyResult:
         """Send a ping request."""
         return await self.send_request(
-            types.ServerRequest(
-                types.PingRequest(
-                    method="ping",
-                )
-            ),
+            types.ServerRequest(types.PingRequest()),
             types.EmptyResult,
         )
 
@@ -307,7 +295,6 @@ async def send_progress_notification(
         await self.send_notification(
             types.ServerNotification(
                 types.ProgressNotification(
-                    method="notifications/progress",
                     params=types.ProgressNotificationParams(
                         progressToken=progress_token,
                         progress=progress,
@@ -321,33 +308,15 @@ async def send_progress_notification(
 
     async def send_resource_list_changed(self) -> None:
         """Send a resource list changed notification."""
-        await self.send_notification(
-            types.ServerNotification(
-                types.ResourceListChangedNotification(
-                    method="notifications/resources/list_changed",
-                )
-            )
-        )
+        await self.send_notification(types.ServerNotification(types.ResourceListChangedNotification()))
 
     async def send_tool_list_changed(self) -> None:
         """Send a tool list changed notification."""
-        await self.send_notification(
-            types.ServerNotification(
-                types.ToolListChangedNotification(
-                    method="notifications/tools/list_changed",
-                )
-            )
-        )
+        await self.send_notification(types.ServerNotification(types.ToolListChangedNotification()))
 
     async def send_prompt_list_changed(self) -> None:
         """Send a prompt list changed notification."""
-        await self.send_notification(
-            types.ServerNotification(
-                types.PromptListChangedNotification(
-                    method="notifications/prompts/list_changed",
-                )
-            )
-        )
+        await self.send_notification(types.ServerNotification(types.PromptListChangedNotification()))
 
     async def _handle_incoming(self, req: ServerRequestResponder) -> None:
         await self._incoming_message_stream_writer.send(req)