From cfb2a458648062b0b39e7132c4c2b1a723202ddd Mon Sep 17 00:00:00 2001
From: Sankalp Gilda <23521054+astrogilda@users.noreply.github.com>
Date: Fri, 9 Oct 2026 03:47:10 -0400
Subject: [PATCH] fix: construct canonical MCP tools without deprecated wrapper

---
 src/google/adk/tools/mcp_tool/mcp_toolset.py       | 4 ++--
 tests/unittests/tools/mcp_tool/test_mcp_toolset.py | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/google/adk/tools/mcp_tool/mcp_toolset.py b/src/google/adk/tools/mcp_tool/mcp_toolset.py
index ed8d5217e6f..da2a742fbec 100644
--- a/src/google/adk/tools/mcp_tool/mcp_toolset.py
+++ b/src/google/adk/tools/mcp_tool/mcp_toolset.py
@@ -63,7 +63,7 @@
 from .mcp_session_manager import StreamableHTTPConnectionParams
 from .mcp_tool import _dump_mcp_model
 from .mcp_tool import _RESERVED_TOOL_NAMES
-from .mcp_tool import MCPTool
+from .mcp_tool import McpTool
 from .mcp_tool import ProgressCallbackFactory
 from .mcp_tool import ProgressFnT
 
@@ -535,7 +535,7 @@ async def get_tools(
         )
         continue
 
-      mcp_tool = MCPTool(
+      mcp_tool = McpTool(
           mcp_tool=tool,
           mcp_session_manager=self._mcp_session_manager,
           auth_scheme=self._auth_scheme,
diff --git a/tests/unittests/tools/mcp_tool/test_mcp_toolset.py b/tests/unittests/tools/mcp_tool/test_mcp_toolset.py
index 6dff7709716..6f8360d8062 100644
--- a/tests/unittests/tools/mcp_tool/test_mcp_toolset.py
+++ b/tests/unittests/tools/mcp_tool/test_mcp_toolset.py
@@ -23,6 +23,7 @@
 from unittest.mock import MagicMock
 from unittest.mock import Mock
 from unittest.mock import patch
+import warnings
 
 from fastapi.openapi.models import OAuth2
 from fastapi.openapi.models import OAuthFlowAuthorizationCode
@@ -44,7 +45,7 @@
 from google.adk.tools.mcp_tool.mcp_session_manager import SseConnectionParams
 from google.adk.tools.mcp_tool.mcp_session_manager import StdioConnectionParams
 from google.adk.tools.mcp_tool.mcp_session_manager import StreamableHTTPConnectionParams
-from google.adk.tools.mcp_tool.mcp_tool import MCPTool
+from google.adk.tools.mcp_tool.mcp_tool import McpTool
 from google.adk.tools.mcp_tool.mcp_toolset import McpToolset
 from google.adk.tools.mcp_tool.mcp_toolset import McpToolsetConfig
 from google.adk.tools.set_model_response_tool import SetModelResponseTool
@@ -370,11 +371,13 @@ async def test_get_tools_basic(self):
     )
     toolset._mcp_session_manager = self.mock_session_manager
 
-    tools = await toolset.get_tools()
+    with warnings.catch_warnings():
+      warnings.simplefilter("error", DeprecationWarning)
+      tools = await toolset.get_tools()
 
     assert len(tools) == 4
     for tool in tools[:3]:
-      assert isinstance(tool, MCPTool)
+      assert type(tool) is McpTool
     assert isinstance(tools[3], LoadMcpResourceTool)
     assert tools[0].name == "tool1"
     assert tools[1].name == "tool2"