mcp-use 1.3.6__py3-none-any.whl → 1.3.8__py3-none-any.whl

mcp_use/connectors/stdio.py

@@ -8,6 +8,7 @@ through the standard input/output streams.
 import sys
 
 from mcp import ClientSession, StdioServerParameters
+from mcp.client.session import ElicitationFnT, SamplingFnT
 
 from ..logging import logger
 from ..task_managers import StdioConnectionManager
@@ -28,6 +29,8 @@ class StdioConnector(BaseConnector):
         args: list[str] | None = None,
         env: dict[str, str] | None = None,
         errlog=sys.stderr,
+        sampling_callback: SamplingFnT | None = None,
+        elicitation_callback: ElicitationFnT | None = None,
     ):
         """Initialize a new stdio connector.
 
@@ -36,8 +39,10 @@ class StdioConnector(BaseConnector):
             args: Optional command line arguments.
             env: Optional environment variables.
             errlog: Stream to write error output to.
+            sampling_callback: Optional callback to sample the client.
+            elicitation_callback: Optional callback to elicit the client.
         """
-        super().__init__()
+        super().__init__(sampling_callback=sampling_callback, elicitation_callback=elicitation_callback)
         self.command = command
         self.args = args or []  # Ensure args is never None
         self.env = env
@@ -59,7 +64,13 @@ class StdioConnector(BaseConnector):
             read_stream, write_stream = await self._connection_manager.start()
 
             # Create the client session
-            self.client_session = ClientSession(read_stream, write_stream, sampling_callback=None)
+            self.client_session = ClientSession(
+                read_stream,
+                write_stream,
+                sampling_callback=self.sampling_callback,
+                elicitation_callback=self.elicitation_callback,
+                client_info=self.client_info,
+            )
             await self.client_session.__aenter__()
 
             # Mark as connected

mcp_use/managers/__init__.py

@@ -6,16 +6,14 @@ from .tools import (
     ListServersTool,
     MCPServerTool,
     SearchToolsTool,
-    UseToolFromServerTool,
 )
 
 __all__ = [
     "ServerManager",
-    "ListServersTool",
+    "MCPServerTool",
     "ConnectServerTool",
-    "GetActiveServerTool",
     "DisconnectServerTool",
+    "GetActiveServerTool",
+    "ListServersTool",
     "SearchToolsTool",
-    "MCPServerTool",
-    "UseToolFromServerTool",
 ]

mcp_use/managers/server_manager.py

@@ -10,7 +10,6 @@ from .tools import (
     GetActiveServerTool,
     ListServersTool,
     SearchToolsTool,
-    UseToolFromServerTool,
 )
 
 
@@ -73,12 +72,21 @@ class ServerManager:
             except Exception as e:
                 logger.error(f"Error prefetching tools for server '{server_name}': {e}")
 
-    @property
-    def tools(self) -> list[BaseTool]:
-        """Get all server management tools.
+    def get_active_server_tools(self) -> list[BaseTool]:
+        """Get tools from the currently active server.
+
+        Returns:
+            List of tools from the active server, or empty list if no server is active
+        """
+        if self.active_server and self.active_server in self._server_tools:
+            return self._server_tools[self.active_server]
+        return []
+
+    def get_management_tools(self) -> list[BaseTool]:
+        """Get the server management tools.
 
         Returns:
-            list of LangChain tools for server management
+            List of server management tools
         """
         return [
             ListServersTool(self),
@@ -86,5 +94,36 @@ class ServerManager:
             GetActiveServerTool(self),
             DisconnectServerTool(self),
             SearchToolsTool(self),
-            UseToolFromServerTool(self),
         ]
+
+    def has_tool_changes(self, current_tool_names: set[str]) -> bool:
+        """Check if the available tools have changed.
+
+        Args:
+            current_tool_names: Set of currently known tool names
+
+        Returns:
+            True if tools have changed, False otherwise
+        """
+        new_tool_names = {tool.name for tool in self.tools}
+        return new_tool_names != current_tool_names
+
+    @property
+    def tools(self) -> list[BaseTool]:
+        """Get all server management tools and tools from the active server.
+
+        Returns:
+            list of LangChain tools for server management plus tools from active server
+        """
+        management_tools = self.get_management_tools()
+
+        # Add tools from the active server if available
+        if self.active_server and self.active_server in self._server_tools:
+            server_tools = self._server_tools[self.active_server]
+            logger.debug(f"Including {len(server_tools)} tools from active server '{self.active_server}'")
+            logger.debug(f"Server tools: {[tool.name for tool in server_tools]}")
+            return management_tools + server_tools
+        else:
+            logger.debug("No active server - returning only management tools")
+
+        return management_tools

mcp_use/managers/tools/__init__.py

@@ -4,14 +4,12 @@ from .disconnect_server import DisconnectServerTool
 from .get_active_server import GetActiveServerTool
 from .list_servers_tool import ListServersTool
 from .search_tools import SearchToolsTool
-from .use_tool import UseToolFromServerTool
 
 __all__ = [
     "MCPServerTool",
-    "ListServersTool",
     "ConnectServerTool",
-    "GetActiveServerTool",
     "DisconnectServerTool",
+    "GetActiveServerTool",
+    "ListServersTool",
     "SearchToolsTool",
-    "UseToolFromServerTool",
 ]

{mcp_use-1.3.6.dist-info → mcp_use-1.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-use
-Version: 1.3.6
+Version: 1.3.8
 Summary: MCP Library for LLMs
 Author-email: Pietro Zullo <pietro.zullo@gmail.com>
 License: MIT
@@ -17,7 +17,7 @@ Requires-Python: >=3.11
 Requires-Dist: aiohttp>=3.9.0
 Requires-Dist: jsonschema-pydantic>=0.1.0
 Requires-Dist: langchain>=0.1.0
-Requires-Dist: mcp>=1.9.3
+Requires-Dist: mcp>=1.10.0
 Requires-Dist: posthog>=4.8.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: python-dotenv>=1.0.0
@@ -28,7 +28,7 @@ Requires-Dist: langchain-anthropic; extra == 'anthropic'
 Provides-Extra: dev
 Requires-Dist: black>=23.9.0; extra == 'dev'
 Requires-Dist: fastapi; extra == 'dev'
-Requires-Dist: fastmcp==2.8.0; extra == 'dev'
+Requires-Dist: fastmcp==2.10.5; extra == 'dev'
 Requires-Dist: isort>=5.12.0; extra == 'dev'
 Requires-Dist: mypy>=1.5.0; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.21.0; extra == 'dev'
@@ -84,12 +84,16 @@ Description-Content-Type: text/markdown
 
 💡 Let developers easily connect any LLM to tools like web browsing, file operations, and more.
 
-- Visit the [mcp-use.com website](https://mcp-use.com/) to know how to build and deploy MCP agents.
+- If you want to get started quickly check out [mcp-use.com website](https://mcp-use.com/) to build and deploy agents with your favorite MCP servers.
 - Visit the [mcp-use docs](https://docs.mcp-use.com/) to get started with mcp-use library
+- For the TypeScript version, visit [mcp-use-ts](https://github.com/mcp-use/mcp-use-ts)
 
-💬 Get started quickly - chat with your servers on our <b>hosted version</b>! [Try mcp-use chat (beta)](https://chat.mcp-use.com).
+| Supports  | |
+| :--- | :--- |
+| **Primitives** | [![Tools](https://img.shields.io/github/actions/workflow/status/pietrozullo/mcp-use/tests.yml?job=primitive-tools&label=Tools&style=flat)](https://github.com/pietrozullo/mcp-use/actions/workflows/tests.yml) [![Resources](https://img.shields.io/github/actions/workflow/status/pietrozullo/mcp-use/tests.yml?job=primitive-resources&label=Resources&style=flat)](https://github.com/pietrozullo/mcp-use/actions/workflows/tests.yml) [![Prompts](https://img.shields.io/github/actions/workflow/status/pietrozullo/mcp-use/tests.yml?job=primitive-prompts&label=Prompts&style=flat)](https://github.com/pietrozullo/mcp-use/actions/workflows/tests.yml) [![Sampling](https://img.shields.io/github/actions/workflow/status/pietrozullo/mcp-use/tests.yml?job=primitive-sampling&label=Sampling&style=flat)](https://github.com/pietrozullo/mcp-use/actions/workflows/tests.yml) [![Elicitation](https://img.shields.io/github/actions/workflow/status/pietrozullo/mcp-use/tests.yml?job=primitive-elicitation&label=Elicitation&style=flat)](https://github.com/pietrozullo/mcp-use/actions/workflows/tests.yml) |
+| **Transports** | [![Stdio](https://img.shields.io/github/actions/workflow/status/pietrozullo/mcp-use/tests.yml?job=transport-stdio&label=Stdio&style=flat)](https://github.com/pietrozullo/mcp-use/actions/workflows/tests.yml) [![SSE](https://img.shields.io/github/actions/workflow/status/pietrozullo/mcp-use/tests.yml?job=transport-sse&label=SSE&style=flat)](https://github.com/pietrozullo/mcp-use/actions/workflows/tests.yml) [![Streamable HTTP](https://img.shields.io/github/actions/workflow/status/pietrozullo/mcp-use/tests.yml?job=transport-streamableHttp&label=Streamable%20HTTP&style=flat)](https://github.com/pietrozullo/mcp-use/actions/workflows/tests.yml) |
 
-# Features
+## Features
 
 <table>
   <tr>
@@ -807,45 +811,45 @@ Thanks to all our amazing contributors!
     <th width="400">Repository</th>
     <th>Stars</th>
   </tr>
+  <tr>
+    <td><img src="https://avatars.githubusercontent.com/u/38653995?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/patchy631/ai-engineering-hub"><strong>patchy631/ai-engineering-hub</strong></a></td>
+    <td>⭐ 15189</td>
+  </tr>
   <tr>
     <td><img src="https://avatars.githubusercontent.com/u/170207473?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/tavily-ai/meeting-prep-agent"><strong>tavily-ai/meeting-prep-agent</strong></a></td>
-    <td>⭐ 112</td>
+    <td>⭐ 129</td>
+  </tr>
+  <tr>
+    <td><img src="https://avatars.githubusercontent.com/u/187057607?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/hud-evals/hud-sdk"><strong>hud-evals/hud-sdk</strong></a></td>
+    <td>⭐ 75</td>
   </tr>
   <tr>
     <td><img src="https://avatars.githubusercontent.com/u/20041231?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/krishnaik06/MCP-CRASH-Course"><strong>krishnaik06/MCP-CRASH-Course</strong></a></td>
-    <td>⭐ 37</td>
+    <td>⭐ 58</td>
+  </tr>
+  <tr>
+    <td><img src="https://avatars.githubusercontent.com/u/54944174?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/larksuite/lark-samples"><strong>larksuite/lark-samples</strong></a></td>
+    <td>⭐ 31</td>
   </tr>
   <tr>
     <td><img src="https://avatars.githubusercontent.com/u/892404?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/truemagic-coder/solana-agent-app"><strong>truemagic-coder/solana-agent-app</strong></a></td>
-    <td>⭐ 29</td>
+    <td>⭐ 30</td>
   </tr>
   <tr>
     <td><img src="https://avatars.githubusercontent.com/u/8344498?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/schogini/techietalksai"><strong>schogini/techietalksai</strong></a></td>
-    <td>⭐ 21</td>
+    <td>⭐ 24</td>
   </tr>
   <tr>
     <td><img src="https://avatars.githubusercontent.com/u/201161342?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/autometa-dev/whatsapp-mcp-voice-agent"><strong>autometa-dev/whatsapp-mcp-voice-agent</strong></a></td>
-    <td>⭐ 18</td>
+    <td>⭐ 22</td>
   </tr>
   <tr>
     <td><img src="https://avatars.githubusercontent.com/u/100749943?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/Deniscartin/mcp-cli"><strong>Deniscartin/mcp-cli</strong></a></td>
-    <td>⭐ 17</td>
-  </tr>
-  <tr>
-    <td><img src="https://avatars.githubusercontent.com/u/6764390?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/elastic/genai-workshops"><strong>elastic/genai-workshops</strong></a></td>
-    <td>⭐ 9</td>
+    <td>⭐ 18</td>
   </tr>
   <tr>
     <td><img src="https://avatars.githubusercontent.com/u/6688805?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/innovaccer/Healthcare-MCP"><strong>innovaccer/Healthcare-MCP</strong></a></td>
-    <td>⭐ 6</td>
-  </tr>
-  <tr>
-    <td><img src="https://avatars.githubusercontent.com/u/205593730?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/Qingyon-AI/Revornix"><strong>Qingyon-AI/Revornix</strong></a></td>
-    <td>⭐ 5</td>
-  </tr>
-  <tr>
-    <td><img src="https://avatars.githubusercontent.com/u/68845761?s=40&v=4" width="20" height="20" style="vertical-align: middle; margin-right: 8px;"> <a href="https://github.com/entbappy/MCP-Tutorials"><strong>entbappy/MCP-Tutorials</strong></a></td>
-    <td>⭐ 5</td>
+    <td>⭐ 15</td>
   </tr>
 </table>
 

{mcp_use-1.3.6.dist-info → mcp_use-1.3.8.dist-info}/RECORD

@@ -1,34 +1,34 @@
 mcp_use/__init__.py,sha256=I3gFxw6Id45RksUBIZS1kxBW3ItjFXuAfoReJabpnW0,1055
-mcp_use/client.py,sha256=9u_GZxsyVoZY_g1dWGK8JiLmTatY6YvwGb4IM8idYZs,9391
-mcp_use/config.py,sha256=jRjTVNMxi7pkqFHMJhzSWpwukE4PbdYU8Pe_IZ33sYI,2433
+mcp_use/client.py,sha256=dziKHIZIclLk64ycF4keegiVp93YKqSyGok7Rv4j8bE,10958
+mcp_use/config.py,sha256=J3ebF9dlQxui3pSONTFtVYO035E7d0CP4HAvN0INgE4,3103
 mcp_use/logging.py,sha256=CRtkPwR-bkXK_kQ0QOL86RikMWOHzEOi7A8VRHkNsZw,4270
 mcp_use/session.py,sha256=4kwcB_IkTt_3FiBSTI1H17KhL1W_6N5oai3HTxFrTH4,2496
 mcp_use/utils.py,sha256=QavJcVq2WxUUUCCpPCUeOB5bqIS0FFmpK-RAZkGc6aA,720
 mcp_use/adapters/__init__.py,sha256=-xCrgPThuX7x0PHGFDdjb7M-mgw6QV3sKu5PM7ShnRg,275
 mcp_use/adapters/base.py,sha256=U1z_UzojC-bytb4ZuKTRpEgEp-2F_BVBgqEXbUqLYB4,6901
 mcp_use/adapters/langchain_adapter.py,sha256=LdlpRyLORhl8NZvtAmisgPelXkhEbBErSNdGHb8SF18,10860
-mcp_use/agents/__init__.py,sha256=N3eVYP2PxqNO2KcQv5fY8UMUX2W3eLTNkkzuFIJ1DUA,261
+mcp_use/agents/__init__.py,sha256=FzkntihbAqzixWdWe99zIrrcIfd4N3YWltNniutG9VA,267
 mcp_use/agents/base.py,sha256=EN-dRbwOi9vIqofFg3jmi5yT2VKlwEr9Cwi1DZgB3eE,1591
-mcp_use/agents/mcpagent.py,sha256=K3gKlPvqIPiniifi46Xs82_D2YKNO-Vn4BTTH55LPbI,35753
+mcp_use/agents/mcpagent.py,sha256=Vh4VOxxh-6sJwK1tTtJgUWZcp1bd3hb_JnATc7x9sKk,46698
+mcp_use/agents/remote.py,sha256=_8TKP-hfr8NsexbpaEz8bK4LU-opILJMnTL7TbQBiY4,10575
 mcp_use/agents/prompts/system_prompt_builder.py,sha256=E86STmxcl2Ic763_114awNqFB2RyLrQlbvgRmJajQjI,4116
-mcp_use/agents/prompts/templates.py,sha256=AZKrGWuI516C-PmyOPvxDBibNdqJtN24sOHTGR06bi4,1933
+mcp_use/agents/prompts/templates.py,sha256=acg2Q-_uQDL-3q5ZUwwwFrP7wqqf-SEyq0XWDDHt69s,1906
 mcp_use/connectors/__init__.py,sha256=cUF4yT0bNr8qeLkSzg28SHueiV5qDaHEB1l1GZ2K0dc,536
-mcp_use/connectors/base.py,sha256=GnI2WCrcxjOaB0R6Hj9pTpAZ0I1YRwkz1gGt-tvuZa0,12609
-mcp_use/connectors/http.py,sha256=oZbLLVDNwUaY6EwK2rVnjoZEKsBLf5-AXtPvGtbMmwc,7559
-mcp_use/connectors/sandbox.py,sha256=cnybcNW55k-S0hUtRR1M3KcGXwnaeDMVm8wDTsfF1Mk,10875
-mcp_use/connectors/stdio.py,sha256=rnJoLaHf1cIjk1KqfxfSsUs-iGTJ7KZonxgIc3kXeCM,2791
+mcp_use/connectors/base.py,sha256=bCPOrSb3xzuxQRFpcLf7tCG1UmMFtr9IVM7br8JlbzI,13878
+mcp_use/connectors/http.py,sha256=8LVzXtVtdLVQH9xMIqPzKfPEmaO_cxzMIu4g4oGIung,7912
+mcp_use/connectors/sandbox.py,sha256=RX8xssn0cIObW6CjOqY7ZrO_D9lTzCZKdRcJ5lQSmQg,11441
+mcp_use/connectors/stdio.py,sha256=jTNhrsHxkRgSI9uAnj4bbFsBwe6zooc-oNcMXV_s9Xk,3378
 mcp_use/connectors/utils.py,sha256=zQ8GdNQx0Twz3by90BoU1RsWPf9wODGof4K3-NxPXeA,366
 mcp_use/connectors/websocket.py,sha256=G7ZeLJNPVl9AG6kCmiNJz1N2Ing_QxT7pSswigTKi8Y,9650
-mcp_use/managers/__init__.py,sha256=rzsJbOhtlmxNQLGcdmtmHaiExEXmiQiUuzPrAgKhAJw,439
-mcp_use/managers/server_manager.py,sha256=Ag1EUSxkG6-UG004vcvaZarPoDnUUMMX7BUeKReUWRI,3704
-mcp_use/managers/tools/__init__.py,sha256=JrA5iTRdtbgwROJE8pQ7GH1sYnqBRcgj4NzFVADKbQ4,510
+mcp_use/managers/__init__.py,sha256=FRTuJw5kYtY1Eo7wN9Aeqeqo1euiR5slvrx5Fl_SGvk,383
+mcp_use/managers/server_manager.py,sha256=8F6jEwZOoAfR1y1O7zk-BSZ1LVYcLZTSQZLRClhSE2I,5278
+mcp_use/managers/tools/__init__.py,sha256=zcpm4HXsp8NUMRJeyT6DdB8cgIMDs46pBfoTD-odhGU,437
 mcp_use/managers/tools/base_tool.py,sha256=Jbbp7SwmHKDk8jT_6yVIv7iNsn6KaV_PljWuhhLcbXg,509
 mcp_use/managers/tools/connect_server.py,sha256=MGYQCl11q-w6gSIYuT44dDk7ILV3Oh7kGAJ4fsNXbso,2923
 mcp_use/managers/tools/disconnect_server.py,sha256=Y3kJN31efzsjfJwxUhpBxS-bgU21DCfGbn_LgEbzyvI,1586
 mcp_use/managers/tools/get_active_server.py,sha256=tCaib76gYU3L5G82tEOTq4Io2cuCXWjOjPselb-92i8,964
 mcp_use/managers/tools/list_servers_tool.py,sha256=OPDSMNe-VuAhlUyhDnR4CiuZFpoMhnhWpAablwO5S0k,1897
 mcp_use/managers/tools/search_tools.py,sha256=4vso7ln-AfG6lQAMq9FA_CyeVtSEDYEWlHtdHtfnLps,12911
-mcp_use/managers/tools/use_tool.py,sha256=gMNjgJrI9XDitPyJglcJcAvowbEWkO5z57yt4DT2Lpc,6626
 mcp_use/observability/__init__.py,sha256=kTUcP0d6L5_3ktfldhdAk-3AWckzVHs7ztG-R6cye64,186
 mcp_use/observability/laminar.py,sha256=WWjmVXP55yCfAlqlayeuJmym1gdrv8is7UyrIp4Tbn0,839
 mcp_use/observability/langfuse.py,sha256=9vgJgnGtVpv_CbCyJqyRkzq2ELqPfYFIUGnpSbm2RCo,1334
@@ -43,7 +43,7 @@ mcp_use/telemetry/events.py,sha256=K5xqbmkum30r4gM2PWtTiUWGF8oZzGZw2DYwco1RfOQ,3
 mcp_use/telemetry/telemetry.py,sha256=ck2MDFMtooafriR1W_zi41dWq-0O-ucF89pCkdkyc9E,11724
 mcp_use/telemetry/utils.py,sha256=kDVTqt2oSeWNJbnTOlXOehr2yFO0PMyx2UGkrWkfJiw,1769
 mcp_use/types/sandbox.py,sha256=opJ9r56F1FvaqVvPovfAj5jZbsOexgwYx5wLgSlN8_U,712
-mcp_use-1.3.6.dist-info/METADATA,sha256=Mm5tZfT6AQmckx_9d75uLPYwVaM2K_a4MG4L64DPblY,28534
-mcp_use-1.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mcp_use-1.3.6.dist-info/licenses/LICENSE,sha256=7Pw7dbwJSBw8zH-WE03JnR5uXvitRtaGTP9QWPcexcs,1068
-mcp_use-1.3.6.dist-info/RECORD,,
+mcp_use-1.3.8.dist-info/METADATA,sha256=nqKWqFTWM-XqfsPrXXyn5Q6opaMyWz_oe3qfSZEfM3M,30356
+mcp_use-1.3.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mcp_use-1.3.8.dist-info/licenses/LICENSE,sha256=7Pw7dbwJSBw8zH-WE03JnR5uXvitRtaGTP9QWPcexcs,1068
+mcp_use-1.3.8.dist-info/RECORD,,

mcp_use/managers/tools/use_tool.py

@@ -1,154 +0,0 @@
-import json
-from typing import Any, ClassVar
-
-from langchain_core.tools import BaseTool
-from pydantic import BaseModel, Field
-
-from mcp_use.logging import logger
-
-from .base_tool import MCPServerTool
-
-
-class UseToolInput(BaseModel):
-    """Input for using a tool from a specific server"""
-
-    server_name: str = Field(description="The name of the MCP server containing the tool")
-    tool_name: str = Field(description="The name of the tool to execute")
-    tool_input: dict[str, Any] | str = Field(
-        description="The input to pass to the tool. Can be a dictionary of parameters or a string"
-    )
-
-
-class UseToolFromServerTool(MCPServerTool):
-    """Tool for directly executing a tool from a specific server."""
-
-    name: ClassVar[str] = "use_tool_from_server"
-    description: ClassVar[str] = (
-        "Execute a specific tool on a specific server without first connecting to it. "
-        "This is a direct execution shortcut that combines connection and tool execution "
-        "into a single step. Specify the server name, tool name, and the input to the tool."
-    )
-    args_schema: ClassVar[type[BaseModel]] = UseToolInput
-
-    async def _arun(self, server_name: str, tool_name: str, tool_input: dict[str, Any] | str) -> str:
-        """Execute a tool from a specific server."""
-        # Check if server exists
-        servers = self.server_manager.client.get_server_names()
-        if server_name not in servers:
-            available = ", ".join(servers) if servers else "none"
-            return f"Server '{server_name}' not found. Available servers: {available}"
-
-        # Connect to the server if not already connected or not the active server
-        is_connected = server_name == self.server_manager.active_server
-
-        if not is_connected:
-            try:
-                # Create or get session for this server
-                try:
-                    session = self.server_manager.client.get_session(server_name)
-                    logger.debug(f"Using existing session for server '{server_name}'")
-                except ValueError:
-                    logger.debug(f"Creating new session for server '{server_name}' for tool use")
-                    session = await self.server_manager.client.create_session(server_name)
-
-                # Check if we have tools for this server, if not get them
-                if server_name not in self.server_manager._server_tools:
-                    connector = session.connector
-                    self.server_manager._server_tools[
-                        server_name
-                    ] = await self.server_manager.adapter._create_tools_from_connectors([connector])
-                    self.server_manager.initialized_servers[server_name] = True
-            except Exception as e:
-                logger.error(f"Error connecting to server '{server_name}' for tool use: {e}")
-                return f"Failed to connect to server '{server_name}': {str(e)}"
-
-        # Get tools for the server
-        server_tools = self.server_manager._server_tools.get(server_name, [])
-        if not server_tools:
-            return f"No tools found for server '{server_name}'"
-
-        # Find the requested tool
-        target_tool = None
-        for tool in server_tools:
-            if tool.name == tool_name:
-                target_tool = tool
-                break
-
-        if not target_tool:
-            tool_names = [t.name for t in server_tools]
-            return f"Tool '{tool_name}' not found on server '{server_name}'. Available tools: {', '.join(tool_names)}"
-
-        # Execute the tool with the provided input
-        try:
-            # Parse the input based on target tool's schema
-            structured_input = self._parse_tool_input(target_tool, tool_input)
-            if structured_input is None:
-                return f"Could not parse input for tool '{tool_name}'. Please check the input format and try again."
-
-            # Store the previous active server
-            previous_active = self.server_manager.active_server
-
-            # Temporarily set this server as active
-            self.server_manager.active_server = server_name
-
-            # Execute the tool
-            logger.info(f"Executing tool '{tool_name}' on server '{server_name}'with input: {{structured_input}}")
-            result = await target_tool._arun(**structured_input)
-
-            # Restore the previous active server
-            self.server_manager.active_server = previous_active
-
-            return result
-
-        except Exception as e:
-            logger.error(f"Error executing tool '{tool_name}' on server '{server_name}': {e}")
-            return (
-                f"Error executing tool '{tool_name}' on server '{server_name}': {str(e)}. "
-                f"Make sure the input format is correct for this tool."
-            )
-
-    def _parse_tool_input(self, tool: BaseTool, input_data: dict[str, Any] | str) -> dict[str, Any]:
-        """
-        Parse the input data according to the tool's schema.
-
-        Args:
-            tool: The target tool
-            input_data: The input data, either a dictionary or a string
-
-        Returns:
-            A dictionary with properly structured input for the tool
-        """
-        # If input is already a dict, use it directly
-        if isinstance(input_data, dict):
-            return input_data
-
-        # Try to parse as JSON first
-        if isinstance(input_data, str):
-            try:
-                return json.loads(input_data)
-            except json.JSONDecodeError:
-                pass
-
-            # For string input, we need to determine which parameter name to use
-            if hasattr(tool, "args_schema") and tool.args_schema:
-                schema_cls = tool.args_schema
-                field_names = list(schema_cls.__fields__.keys())
-
-                # If schema has only one field, use that
-                if len(field_names) == 1:
-                    return {field_names[0]: input_data}
-
-                # Look for common input field names
-                for name in field_names:
-                    if name.lower() in ["input", "query", "url", tool.name.lower()]:
-                        return {name: input_data}
-
-                # Default to first field if we can't determine
-                return {field_names[0]: input_data}
-
-        # If we get here something went wrong
-        return None
-
-    def _run(self, server_name: str, tool_name: str, tool_input: dict[str, Any] | str) -> str:
-        """Synchronous version that raises a NotImplementedError."""
-        raise NotImplementedError("UseToolFromServerTool requires async execution. Use _arun instead.")