fix: show raw MCP tool names in server popup and harden MCP client init

- Expose original_tool_names alongside namespaced tools in
  /api/tools/mcp/servers so the MCP "available tools" popup can render
  human-friendly names while persona tool matching continues to use
  namespaced identifiers.
- Render the popup list from item.original_tool_names with a fallback to
  item.tools for forward compatibility.
- Replace `assert mcp_client is not None` in _start_mcp_server with an
  explicit RuntimeError so the post-init invariant still holds when
  running under `python -O`, which strips asserts.
- Tighten the _find_mcp_tool_by_original_name docstring to match the
  surrounding single-line style.

Author: ChuwuYo

astrbot/core/provider/func_tool_manager.py

@@ -321,13 +321,7 @@ def remove_func(self, name: str) -> None:
                 break
 
     def _find_mcp_tool_by_original_name(self, name: str) -> MCPTool | None:
-        """Best-effort lookup of an MCP tool by its original (pre-namespaced) name.
-
-        Prefers active tools to stay consistent with the active-first rule
-        applied for exact-name matches. When multiple candidates remain, the
-        one with the lexicographically smallest namespaced name is returned
-        for deterministic behavior, and a warning is logged.
-        """
+        """按原始（命名空间前）名查找 MCP 工具，active 优先。"""
         matches = [
             f
             for f in self.func_list
@@ -361,8 +355,7 @@ def get_func(self, name) -> FuncTool | None:
                 return f
 
         if isinstance(name, str):
-            # Fallback: look up MCP tool by original (pre-namespaced) name
-            # for backward compatibility with legacy persona configurations.
+            # 老 persona 配置按原始 MCP 名回查
             mcp_tool = self._find_mcp_tool_by_original_name(name)
             if mcp_tool is not None:
                 return mcp_tool
@@ -609,8 +602,13 @@ 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
+            # After successful initialization mcp_client is logically non-None;
+            # raise explicitly so this invariant still holds under `python -O`
+            # (which strips `assert`).
+            if mcp_client is None:
+                raise RuntimeError(
+                    f"MCP client {name} unexpectedly None after successful initialization"
+                )
             self._mcp_server_runtime[name] = _MCPServerRuntime(
                 name=name,
                 client=mcp_client,

astrbot/dashboard/routes/tools.py

@@ -101,17 +101,25 @@ async def get_mcp_servers(self):
                     if key != "active":  # active 已经处理
                         server_info[key] = value
 
-                # 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)
+                # tools 为 namespaced 名（与 personaForm.tools 匹配），
+                # original_tool_names 为原始名（给 UI 显示）
                 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]
+                        mcp_tools = [
+                            f
+                            for f in self.tool_mgr.func_list
+                            if isinstance(f, MCPTool) and f.mcp_server_name == name
+                        ]
+                        server_info["tools"] = [f.name for f in mcp_tools]
+                        server_info["original_tool_names"] = [
+                            f.original_tool_name for f in mcp_tools
+                        ]
                         server_info["errlogs"] = mcp_client.server_errlogs
                         break
                 else:
                     server_info["tools"] = []
+                    server_info["original_tool_names"] = []
 
                 servers.append(server_info)
 

dashboard/src/components/extension/McpServersSection.vue

@@ -52,7 +52,7 @@
                             </v-card-title>
                             <v-card-text>
                               <ul>
-                                <li v-for="(tool, idx) in item.tools" :key="idx" style="margin: 8px 0px;">{{ tool }}</li>
+                                <li v-for="(tool, idx) in (item.original_tool_names || item.tools)" :key="idx" style="margin: 8px 0px;">{{ tool }}</li>
                               </ul>
                             </v-card-text>
                             <v-card-actions class="d-flex justify-end">