Draft MCP v2

docs/decisions/0033-feature-usage-bitmask-user-agent.md

@@ -22,6 +22,13 @@ The detailed mechanism is in [SPEC-004](../specs/004-feature-usage-telemetry.md)
 the per-language bit tables are in
 [feature-usage-bit-registry.md](../specs/feature-usage-bit-registry.md).
 
+### Amendment: MCP WebSocket transport
+
+As of the MCP Python SDK v2 migration, `MCPWebsocketTool` is a deprecated
+compatibility symbol because upstream removed WebSocket transport. The examples
+below record the public surface considered when this ADR was accepted; the
+currently supported MCP transports are stdio and Streamable HTTP.
+
 ## Decision Drivers
 
 - **Transparency** — openly documented, human-decodable, user-controllable. No

python/PACKAGE_STATUS.md

@@ -129,10 +129,6 @@ listed below.
 - `agent-framework-core`: experimental harness APIs for background agents, file access, looping,
   memory, and file-backed todo storage under `agent_framework/_harness/`
 
-#### `MCP_LONG_RUNNING_TASKS`
-
-- `agent-framework-core`: `MCPTaskOptions` from `agent_framework/_mcp.py`
-
 #### `MCP_SKILLS`
 
 - `agent-framework-core`: `MCPSkillResource`, `MCPSkill`, and `MCPSkillsSource` from

python/packages/core/agent_framework/__init__.py

@@ -168,7 +168,6 @@
     "._mcp": (
         "MCPStdioTool",
         "MCPStreamableHTTPTool",
-        "MCPTaskOptions",
         "MCPWebsocketTool",
         "SamplingApprovalCallback",
     ),
@@ -559,7 +558,6 @@
     "MCPSkillsSource",
     "MCPStdioTool",
     "MCPStreamableHTTPTool",
-    "MCPTaskOptions",
     "MCPWebsocketTool",
     "MemoryContextProvider",
     "MemoryFileStore",

python/packages/core/agent_framework/__init__.pyi

@@ -127,7 +127,6 @@ from ._in_memory import InMemoryCollection, InMemoryStore
 from ._mcp import (
     MCPStdioTool,
     MCPStreamableHTTPTool,
-    MCPTaskOptions,
     MCPWebsocketTool,
     SamplingApprovalCallback,
 )
@@ -514,7 +513,6 @@ __all__ = [
     "MCPSkillsSource",
     "MCPStdioTool",
     "MCPStreamableHTTPTool",
-    "MCPTaskOptions",
     "MCPWebsocketTool",
     "MemoryContextProvider",
     "MemoryFileStore",

python/packages/core/agent_framework/_agents.py

@@ -1881,8 +1881,9 @@ def as_mcp_server(
         """
         try:
             from mcp import types
+            from mcp.server import ServerRequestContext
             from mcp.server.lowlevel import Server
-            from mcp.shared.exceptions import McpError
+            from mcp.shared.exceptions import MCPError
         except ModuleNotFoundError as exc:
             raise ModuleNotFoundError(
                 "`mcp` is required to use `Agent.as_mcp_server()`. Please install `mcp`."
@@ -1891,55 +1892,51 @@ def as_mcp_server(
 
         server_args: dict[str, Any] = {
             "name": server_name,
-            "version": version,
             "instructions": instructions,
         }
+
+        if version is not None:
+            server_args["version"] = version
+
         if lifespan:
             server_args["lifespan"] = lifespan
         if kwargs:
             server_args.update(kwargs)
 
-        server: Server[Any] = Server(**server_args)
-
         agent_tool = self.as_tool(name=self._get_agent_name())
 
-        async def _log(level: types.LoggingLevel, data: Any) -> None:
-            """Log a message to the server and logger."""
+        def _log(level: types.LoggingLevel, data: Any) -> None:
+            """Log a message to logger."""
             # Log to the local logger
             logger.log(LOG_LEVEL_MAPPING[level], data)
-            if server and server.request_context and server.request_context.session:
-                try:
-                    await server.request_context.session.send_log_message(level=level, data=data)
-                except Exception as e:
-                    logger.error("Failed to send log message to server: %s", e)
-
-        @server.list_tools()
-        async def _list_tools() -> list[types.Tool]:
+
+        async def _list_tools(  # ruff:ignore[unused-async]
+            _ctx: ServerRequestContext[dict[str, Any]], _params: types.PaginatedRequestParams | None
+        ) -> types.ListToolsResult:
             """List all tools in the agent."""
             schema = agent_tool.parameters()
 
             tool = types.Tool(
                 name=agent_tool.name,
                 description=agent_tool.description,
-                inputSchema=schema,
+                input_schema=schema,
             )
 
-            await _log(level="debug", data=f"Agent tool: {agent_tool}")
-            return [tool]
+            _log(level="debug", data=f"Agent tool: {agent_tool}")
+            return types.ListToolsResult(tools=[tool])
 
-        @server.call_tool()
         async def _call_tool(
-            name: str, arguments: dict[str, Any]
-        ) -> Sequence[types.TextContent | types.ImageContent | types.AudioContent | types.EmbeddedResource]:
+            _ctx: ServerRequestContext[dict[str, Any]], params: types.CallToolRequestParams
+        ) -> types.CallToolResult:
             """Call a tool in the agent."""
-            await _log(level="debug", data=f"Calling tool with args: {arguments}")
+            arguments = params.arguments or {}
+            name = params.name
+            _log(level="debug", data=f"Calling tool with args: {arguments}")
 
             if name != agent_tool.name:
-                raise McpError(
-                    error=types.ErrorData(
-                        code=types.INTERNAL_ERROR,
-                        message=f"Tool {name} not found",
-                    ),
+                raise MCPError(
+                    code=types.INTERNAL_ERROR,
+                    message=f"Tool {name} not found",
                 )
 
             # Create an instance of the input model with the arguments
@@ -1949,17 +1946,15 @@ async def _call_tool(
                 )
                 result = await agent_tool.invoke(arguments=args_instance)
             except Exception as e:
-                raise McpError(
-                    error=types.ErrorData(
-                        code=types.INTERNAL_ERROR,
-                        message=f"Error calling tool {name}: {e}",
-                    ),
+                raise MCPError(
+                    code=types.INTERNAL_ERROR,
+                    message=f"Error calling tool {name}: {e}",
                 ) from e
 
             # Convert result to MCP content.
             # Currently only text items are forwarded over MCP; rich content
             # (images, audio) is not yet supported in the MCP server path.
-            mcp_content: list[types.TextContent | types.ImageContent | types.EmbeddedResource] = []
+            mcp_content: list[types.ContentBlock] = []
             for c in result:
                 if c.type == "text" and c.text:
                     mcp_content.append(types.TextContent(type="text", text=c.text))
@@ -1968,15 +1963,9 @@ async def _call_tool(
                         "MCP server does not yet forward rich content (images, audio) "
                         "in tool results. Rich content items will be omitted."
                     )
-            return mcp_content or [types.TextContent(type="text", text="")]
-
-        @server.set_logging_level()
-        async def _set_logging_level(level: types.LoggingLevel) -> None:
-            """Set the logging level for the server."""
-            logger.setLevel(LOG_LEVEL_MAPPING[level])
-            # emit this log with the new minimum level
-            await _log(level=level, data=f"Log level set to {level}")
+            return types.CallToolResult(content=mcp_content)
 
+        server: Server[Any] = Server(**server_args, on_list_tools=_list_tools, on_call_tool=_call_tool)
         return server
 
     def _get_agent_name(self) -> str:

python/packages/core/agent_framework/_feature_stage.py

@@ -60,7 +60,6 @@ class ExperimentalFeature(str, Enum):
     FOUNDRY_PREVIEW_TOOLS = "FOUNDRY_PREVIEW_TOOLS"
     FUNCTIONAL_WORKFLOWS = "FUNCTIONAL_WORKFLOWS"
     HARNESS = "HARNESS"
-    MCP_LONG_RUNNING_TASKS = "MCP_LONG_RUNNING_TASKS"
     MCP_SKILLS = "MCP_SKILLS"
     PROGRESSIVE_TOOLS = "PROGRESSIVE_TOOLS"
     SESSION_STORE = "SESSION_STORE"