From a110b58a514d9acf71ae3434c3f7025c592931b9 Mon Sep 17 00:00:00 2001
From: FuQuan233 <i@fuquan.moe>
Date: Sat, 1 Nov 2025 23:23:23 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E4=BF=AE=E6=94=B9=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E5=90=8D=E7=A7=B0=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96OneBot=E5=92=8CMCP=E5=B7=A5=E5=85=B7=E7=9A=84=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=BC=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nonebot_plugin_llmchat/mcpclient.py | 54 ++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/nonebot_plugin_llmchat/mcpclient.py b/nonebot_plugin_llmchat/mcpclient.py
index 929caca..4d38f0a 100644
--- a/nonebot_plugin_llmchat/mcpclient.py
+++ b/nonebot_plugin_llmchat/mcpclient.py
@@ -132,7 +132,7 @@ class MCPClient:
                     {
                         "type": "function",
                         "function": {
-                            "name": f"{server_name}___{tool.name}",
+                            "name": f"mcp__{server_name}__{tool.name}",
                             "description": tool.description,
                             "parameters": tool.inputSchema,
                         },
@@ -148,35 +148,55 @@ class MCPClient:
 
     async def call_tool(self, tool_name: str, tool_args: dict, group_id: int | None = None, bot_id: str | None = None):
         """按需连接调用工具，调用后立即断开"""
-        # 检查是否是QQ工具
+        # 检查是否是OneBot内置工具
         if tool_name.startswith("ob__"):
             if group_id is None or bot_id is None:
                 return "QQ工具需要提供group_id和bot_id参数"
             logger.info(f"调用OneBot工具[{tool_name}]")
             return await self.onebot_tools.call_tool(tool_name, tool_args, group_id, bot_id)
 
-        # MCP工具处理
-        server_name, real_tool_name = tool_name.split("___")
-        logger.info(f"按需连接到服务器[{server_name}]调用工具[{real_tool_name}]")
+        # 检查是否是MCP工具
+        if tool_name.startswith("mcp__"):
+            # MCP工具处理：mcp__server_name__tool_name
+            parts = tool_name.split("__")
+            if len(parts) != 3 or parts[0] != "mcp":
+                return f"MCP工具名称格式错误: {tool_name}"
 
-        async with self._create_session_context(server_name) as session:
-            try:
-                response = await asyncio.wait_for(session.call_tool(real_tool_name, tool_args), timeout=30)
-                logger.debug(f"工具[{real_tool_name}]调用完成，响应: {response}")
-                return response.content
-            except asyncio.TimeoutError:
-                logger.error(f"调用工具[{real_tool_name}]超时")
-                return f"调用工具[{real_tool_name}]超时"
+            server_name = parts[1]
+            real_tool_name = parts[2]
+            logger.info(f"按需连接到服务器[{server_name}]调用工具[{real_tool_name}]")
+
+            async with self._create_session_context(server_name) as session:
+                try:
+                    response = await asyncio.wait_for(session.call_tool(real_tool_name, tool_args), timeout=30)
+                    logger.debug(f"工具[{real_tool_name}]调用完成，响应: {response}")
+                    return response.content
+                except asyncio.TimeoutError:
+                    logger.error(f"调用工具[{real_tool_name}]超时")
+                    return f"调用工具[{real_tool_name}]超时"
+
+        # 未知工具类型
+        return f"未知的工具类型: {tool_name}"
 
     def get_friendly_name(self, tool_name: str):
         logger.debug(tool_name)
-        # 检查是否是OneBot工具
+        # 检查是否是OneBot内置工具
         if tool_name.startswith("ob__"):
             return self.onebot_tools.get_friendly_name(tool_name)
 
-        # MCP工具处理
-        server_name, real_tool_name = tool_name.split("___")
-        return (self.server_config[server_name].friendly_name or server_name) + " - " + real_tool_name
+        # 检查是否是MCP工具
+        if tool_name.startswith("mcp__"):
+            # MCP工具处理：mcp__server_name__tool_name
+            parts = tool_name.split("__")
+            if len(parts) != 3 or parts[0] != "mcp":
+                return tool_name  # 格式错误时返回原名称
+
+            server_name = parts[1]
+            real_tool_name = parts[2]
+            return (self.server_config[server_name].friendly_name or server_name) + " - " + real_tool_name
+
+        # 未知工具类型，返回原名称
+        return tool_name
 
     def clear_tools_cache(self):
         """清除工具列表缓存"""