Merge pull request #1245 from AstrBotDevs/perf-mcpserver

perf: 适配 MCP 配置文件带 mcpServers 的情况(Cursor)

astrbot/core/provider/func_tool_manager.py

@@ -95,7 +95,10 @@ class MCPClient:
             mcp_server_config (dict): Configuration for the MCP server. See https://modelcontextprotocol.io/quickstart/server
         """
         cfg = mcp_server_config.copy()
-        cfg.pop("active", None)
+        if "mcpServers" in cfg and len(cfg["mcpServers"]) > 0:
+            key_0 = list(cfg["mcpServers"].keys())[0]
+            cfg = cfg["mcpServers"][key_0]
+        cfg.pop("active", None) # Remove active flag from config
         server_params = mcp.StdioServerParameters(
             **cfg,
         )
@@ -260,6 +263,11 @@ class FuncCall:
                     if data["name"] in self.mcp_client_event:
                         self.mcp_client_event[data["name"]].set()
                         self.mcp_client_event.pop(data["name"], None)
+                        self.func_list = [
+                            f
+                            for f in self.func_list
+                            if not (f.origin == "mcp" and f.mcp_server_name == data["name"])
+                        ]
                 else:
                     for name in self.mcp_client_dict.keys():
                         # await self._terminate_mcp_client(name)
@@ -267,6 +275,11 @@ class FuncCall:
                         if name in self.mcp_client_event:
                             self.mcp_client_event[name].set()
                             self.mcp_client_event.pop(name, None)
+                    self.func_list = [
+                        f
+                        for f in self.func_list
+                        if f.origin != "mcp"
+                    ]
 
     async def _init_mcp_client_task_wrapper(
         self, name: str, cfg: dict, event: asyncio.Event

astrbot/dashboard/routes/tools.py

@@ -106,7 +106,11 @@ class ToolsRoute(Route):
             # 复制所有配置字段
             for key, value in server_data.items():
                 if key not in ["name", "active", "tools"]:  # 排除特殊字段
-                    server_config[key] = value
+                    if key == "mcpServers":
+                        key_0 = list(server_data["mcpServers"].keys())[0] # 不考虑为空的情况
+                        server_config = server_data["mcpServers"][key_0]
+                    else:
+                        server_config[key] = value
                     has_valid_config = True
 
             if not has_valid_config:
@@ -163,7 +167,11 @@ class ToolsRoute(Route):
             # 复制所有配置字段
             for key, value in server_data.items():
                 if key not in ["name", "active", "tools"]:  # 排除特殊字段
-                    server_config[key] = value
+                    if key == "mcpServers":
+                        key_0 = list(server_data["mcpServers"].keys())[0] # 不考虑为空的情况
+                        server_config = server_data["mcpServers"][key_0]
+                    else:
+                        server_config[key] = value
                     only_update_active = False
 
             # 如果只更新活动状态，保留原始配置