fix: add namespace prefix to MCP tools to prevent conflicts with plugin tools

- Add namespace prefix format: mcp_<server_name>__<tool_name> to MCPTool
- Store original tool name in MCPTool.original_tool_name for display and calling
- Add backward compatibility in get_func() to support old persona tool references
- Update tool list API to include display_name field showing original name
- Update MCP server info to display original tool names without prefix
- Fixes issue where MCP tools and plugin tools with same name would conflict

Author: ChuwuYo

astrbot/core/agent/mcp_client.py

@@ -379,20 +379,28 @@ class MCPTool(FunctionTool, Generic[TContext]):
     def __init__(
         self, mcp_tool: mcp.Tool, mcp_client: MCPClient, mcp_server_name: str, **kwargs
     ) -> None:
+        # Add namespace prefix to avoid conflicts with plugin tools
+        # Format: mcp_<server_name>__<tool_name>
+        namespaced_name = f"mcp_{mcp_server_name}__{mcp_tool.name}"
+
         super().__init__(
-            name=mcp_tool.name,
+            name=namespaced_name,
             description=mcp_tool.description or "",
             parameters=mcp_tool.inputSchema,
         )
         self.mcp_tool = mcp_tool
         self.mcp_client = mcp_client
         self.mcp_server_name = mcp_server_name
+        self.original_tool_name = (
+            mcp_tool.name
+        )  # Store original name for display and calling
 
     async def call(
         self, context: ContextWrapper[TContext], **kwargs
     ) -> mcp.types.CallToolResult:
+        # Use original tool name when calling MCP server
         return await self.mcp_client.call_tool_with_reconnect(
-            tool_name=self.mcp_tool.name,
+            tool_name=self.original_tool_name,
             arguments=kwargs,
             read_timeout_seconds=timedelta(seconds=context.tool_call_timeout),
         )

astrbot/core/provider/func_tool_manager.py

@@ -311,10 +311,31 @@ def remove_func(self, name: str) -> None:
                 break
 
     def get_func(self, name) -> FuncTool | None:
+        # First try exact match
         for f in self.func_list:
             if f.name == name:
                 return f
 
+        # Fallback: try to find MCP tool by original name for backward compatibility
+        # This handles cases where personas reference tools by their original names
+        mcp_matches = []
+        for f in self.func_list:
+            if isinstance(f, MCPTool) and f.original_tool_name == name:
+                mcp_matches.append(f)
+
+        if len(mcp_matches) == 1:
+            return mcp_matches[0]
+        elif len(mcp_matches) > 1:
+            # Multiple MCP servers provide the same tool name
+            # Log warning and return the first one
+            logger.warning(
+                f"Multiple MCP tools found with original name '{name}': "
+                f"{[f.name for f in mcp_matches]}. Using {mcp_matches[0].name}"
+            )
+            return mcp_matches[0]
+
+        return None
+
     def get_full_tool_set(self) -> ToolSet:
         """获取完整工具集"""
         tool_set = ToolSet(self.func_list.copy())

astrbot/dashboard/routes/tools.py

@@ -104,7 +104,13 @@ async def get_mcp_servers(self):
                 for name_key, runtime in self.tool_mgr.mcp_server_runtime_view.items():
                     if name_key == name:
                         mcp_client = runtime.client
-                        server_info["tools"] = [tool.name for tool in mcp_client.tools]
+                        # Display original tool names without namespace prefix
+                        server_info["tools"] = [
+                            tool.name.split("__", 1)[1]
+                            if tool.name.startswith(f"mcp_{name}__")
+                            else tool.name
+                            for tool in mcp_client.tools
+                        ]
                         server_info["errlogs"] = mcp_client.server_errlogs
                         break
                 else:
@@ -434,18 +440,23 @@ async def get_tool_list(self):
                 if isinstance(tool, MCPTool):
                     origin = "mcp"
                     origin_name = tool.mcp_server_name
+                    # Add original tool name for MCP tools
+                    display_name = getattr(tool, "original_tool_name", tool.name)
                 elif tool.handler_module_path and star_map.get(
                     tool.handler_module_path
                 ):
                     star = star_map[tool.handler_module_path]
                     origin = "plugin"
                     origin_name = star.name
+                    display_name = tool.name
                 else:
                     origin = "unknown"
                     origin_name = "unknown"
+                    display_name = tool.name
 
                 tool_info = {
-                    "name": tool.name,
+                    "name": tool.name,  # Keep namespaced name for internal use
+                    "display_name": display_name,  # Original name for display
                     "description": tool.description,
                     "parameters": tool.parameters,
                     "active": tool.active,