fix: improve MCP tool namespace handling and fix type errors

- Use URL encoding for MCP server name normalization to avoid collisions
- Add deterministic sorting for ambiguous MCP tool name resolution
- Add type assertion to fix Pylance type error
- Simplify MCP server tools display (use raw tool names directly)

Author: ChuwuYo

astrbot/core/agent/mcp_client.py

@@ -380,12 +380,10 @@ 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
-        # Normalize server name: remove spaces and special characters
-        normalized_server_name = mcp_server_name.replace(" ", "_").replace("-", "_")
-        # Remove any other special characters, keep only alphanumeric and underscore
-        normalized_server_name = "".join(
-            c for c in normalized_server_name if c.isalnum() or c == "_"
-        )
+        # URL-encode the server name to create a safe and unique identifier part
+        from urllib.parse import quote
+
+        normalized_server_name = quote(mcp_server_name, safe="")
         # Format: mcp_<normalized_server_name>__<tool_name>
         namespaced_name = f"mcp_{normalized_server_name}__{mcp_tool.name}"
 

astrbot/core/provider/func_tool_manager.py

@@ -327,7 +327,8 @@ def get_func(self, name) -> FuncTool | None:
             return mcp_matches[0]
         elif len(mcp_matches) > 1:
             # Multiple MCP servers provide the same tool name
-            # Log warning and return the first one
+            # Sort by namespaced name for deterministic selection
+            mcp_matches.sort(key=lambda f: f.name)
             logger.warning(
                 f"Multiple MCP tools found with original name '{name}': "
                 f"{[f.name for f in mcp_matches]}. Using {mcp_matches[0].name}"
@@ -525,6 +526,8 @@ async def lifecycle() -> None:
 
         lifecycle_task = asyncio.create_task(lifecycle(), name=f"mcp-client:{name}")
         async with self._runtime_lock:
+            # After successful initialization, mcp_client is guaranteed to be non-None
+            assert mcp_client is not None
             self._mcp_server_runtime[name] = _MCPServerRuntime(
                 name=name,
                 client=mcp_client,

astrbot/dashboard/routes/tools.py

@@ -100,17 +100,13 @@ async def get_mcp_servers(self):
                     if key != "active":  # active 已经处理
                         server_info[key] = value
 
-                # 如果MCP客户端已初始化，从客户端获取工具名称
+                # If MCP client is initialized, get tool names from client
+                # Note: mcp_client.tools contains raw MCP tools (mcp.Tool), not MCPTool
+                # So we use tool.name directly (no namespace prefix to strip)
                 for name_key, runtime in self.tool_mgr.mcp_server_runtime_view.items():
                     if name_key == name:
                         mcp_client = runtime.client
-                        # 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["tools"] = [tool.name for tool in mcp_client.tools]
                         server_info["errlogs"] = mcp_client.server_errlogs
                         break
                 else: