diff --git a/api/routes.py b/api/routes.py
index 92109eecff..a95c04744c 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -2570,6 +2570,10 @@ def handle_get(handler, parsed) -> bool:
     if parsed.path == "/api/mcp/servers":
         return _handle_mcp_servers_list(handler)
 
+    # ── MCP Tools (GET) ──
+    if parsed.path == "/api/mcp/tools":
+        return _handle_mcp_tools_list(handler)
+
     # ── Checkpoints / Rollback (GET) ──
     if parsed.path == "/api/rollback/list":
         qs = parse_qs(parsed.query)
@@ -7133,33 +7137,291 @@ def _mask_secrets(obj):
     return masked
 
 
-def _server_summary(name, cfg):
+def _parse_mcp_enabled(value) -> bool:
+    """Parse Hermes MCP ``enabled`` values without raising on bad config."""
+    if value is None:
+        return True
+    if isinstance(value, bool):
+        return value
+    if isinstance(value, (int, float)):
+        return value != 0
+    if isinstance(value, str):
+        normalized = value.strip().lower()
+        if normalized in {"true", "1", "yes", "on"}:
+            return True
+        if normalized in {"false", "0", "no", "off"}:
+            return False
+    return True
+
+
+def _mcp_runtime_status_by_name() -> dict[str, dict]:
+    """Return already-known MCP runtime status without starting servers.
+
+    ``tools.mcp_tool.get_mcp_status()`` only reads the existing MCP registry and
+    configuration; it does not probe or spawn MCP subprocesses. If Hermes Agent
+    is unavailable, fall back to an empty map so the API remains safe.
+    """
+    try:
+        from tools.mcp_tool import get_mcp_status
+        statuses = get_mcp_status()
+    except Exception:
+        return {}
+    if not isinstance(statuses, list):
+        return {}
+    return {
+        str(entry.get("name")): entry
+        for entry in statuses
+        if isinstance(entry, dict) and entry.get("name")
+    }
+
+
+def _server_summary(name, cfg, runtime_status=None):
     """Return a safe summary of an MCP server config."""
+    runtime_status = runtime_status if isinstance(runtime_status, dict) else {}
     out = {"name": name}
+    if not isinstance(cfg, dict):
+        out.update({
+            "transport": "invalid",
+            "timeout": 120,
+            "connect_timeout": 60,
+            "enabled": False,
+            "active": False,
+            "status": "invalid_config",
+            "tool_count": None,
+        })
+        return out
+
+    enabled = _parse_mcp_enabled(cfg.get("enabled", True))
+    connected = bool(runtime_status.get("connected")) if enabled else False
     if "url" in cfg:
         out["transport"] = "http"
         # Mask auth headers
         if "headers" in cfg:
             out["headers"] = _mask_secrets(cfg["headers"])
         out["url"] = cfg["url"]
-    else:
+    elif "command" in cfg:
         out["transport"] = "stdio"
         out["command"] = cfg.get("command", "")
         out["args"] = cfg.get("args", [])
         if "env" in cfg:
             out["env"] = _mask_secrets(cfg["env"])
+    else:
+        out["transport"] = "invalid"
+        enabled = False
+        connected = False
+
     out["timeout"] = cfg.get("timeout", 120)
+    out["connect_timeout"] = cfg.get("connect_timeout", 60)
+    out["enabled"] = enabled
+    out["active"] = connected
+    if out["transport"] == "invalid":
+        out["status"] = "invalid_config"
+    elif not enabled:
+        out["status"] = "disabled"
+    elif connected:
+        out["status"] = "active"
+    else:
+        out["status"] = "configured"
+    out["tool_count"] = runtime_status.get("tools") if runtime_status else None
     return out
 
 
+def _mcp_safe_display_text(value, *, limit: int) -> str:
+    """Return redacted, bounded MCP text safe for WebUI inventory rows."""
+    if not isinstance(value, str):
+        value = "" if value is None else str(value)
+    value = _redact_text(value).strip()
+    value = re.sub(r"Authorization:\s*Bearer\s+\S+", "[REDACTED CREDENTIAL]", value, flags=re.I)
+    if len(value) > limit:
+        value = value[: max(0, limit - 1)].rstrip() + "…"
+    return value
+
+
+def _mcp_schema_type(schema) -> str:
+    """Return a compact, non-sensitive display type for a JSON schema node."""
+    if not isinstance(schema, dict):
+        return "unknown"
+    typ = schema.get("type")
+    if isinstance(typ, list):
+        typ = "/".join(str(t) for t in typ if t)
+    if isinstance(typ, str) and typ:
+        return typ
+    for composite in ("anyOf", "oneOf", "allOf"):
+        if isinstance(schema.get(composite), list) and schema[composite]:
+            return composite
+    if "enum" in schema:
+        return "enum"
+    return "unknown"
+
+
+def _mcp_schema_summary(schema, *, limit: int = 12) -> list[dict]:
+    """Summarize an MCP input schema without exposing raw defaults/examples.
+
+    The WebUI only needs searchable/displayable argument hints. Returning raw
+    JSON Schema can overexpose server-provided defaults, examples, enums, or
+    vendor extensions, so this strips each parameter down to name/type/required
+    and a redacted description.
+    """
+    if not isinstance(schema, dict):
+        return []
+    properties = schema.get("properties")
+    if not isinstance(properties, dict):
+        return []
+    required = schema.get("required")
+    required_names = set(required) if isinstance(required, list) else set()
+    out = []
+    for name, prop in properties.items():
+        if len(out) >= limit:
+            break
+        if not isinstance(name, str):
+            continue
+        prop = prop if isinstance(prop, dict) else {}
+        desc = prop.get("description", "")
+        if not isinstance(desc, str):
+            desc = ""
+        desc = _mcp_safe_display_text(desc, limit=180)
+        out.append({
+            "name": name,
+            "type": _mcp_schema_type(prop),
+            "required": name in required_names,
+            "description": desc,
+        })
+    return out
+
+
+def _mcp_tool_schema_from_payload(tool):
+    if not isinstance(tool, dict):
+        return {}
+    for key in ("parameters", "inputSchema", "input_schema", "schema"):
+        value = tool.get(key)
+        if isinstance(value, dict):
+            if key == "schema" and isinstance(value.get("parameters"), dict):
+                return value["parameters"]
+            return value
+    return {}
+
+
+def _mcp_tool_summary(name, tool, server_summary):
+    """Return a safe global inventory row for one MCP tool."""
+    server_summary = server_summary if isinstance(server_summary, dict) else {}
+    if isinstance(tool, str):
+        tool = {"name": tool}
+    elif not isinstance(tool, dict):
+        tool = {}
+    tool_name = str(tool.get("name") or name or "")
+    description = tool.get("description") or ""
+    if not isinstance(description, str):
+        description = str(description)
+    description = _mcp_safe_display_text(description, limit=360)
+    return {
+        "name": tool_name,
+        "server": str(server_summary.get("name") or ""),
+        "description": description,
+        "active": bool(server_summary.get("active")),
+        "enabled": bool(server_summary.get("enabled")),
+        "status": server_summary.get("status") or "unknown",
+        "schema_summary": _mcp_schema_summary(_mcp_tool_schema_from_payload(tool)),
+    }
+
+
+def _mcp_tools_from_runtime_status(runtime_by_name, server_summaries):
+    """Read detailed MCP tool payloads from runtime status when available."""
+    tools = []
+    if not isinstance(runtime_by_name, dict):
+        return tools
+    for server_name, runtime in runtime_by_name.items():
+        if not isinstance(runtime, dict):
+            continue
+        raw_tools = runtime.get("tools")
+        if not isinstance(raw_tools, list):
+            raw_tools = runtime.get("tool_schemas")
+        if not isinstance(raw_tools, list):
+            continue
+        server_summary = server_summaries.get(str(server_name), {"name": str(server_name)})
+        for index, tool in enumerate(raw_tools):
+            fallback_name = f"{server_name}:{index}"
+            summary = _mcp_tool_summary(fallback_name, tool, server_summary)
+            if summary["name"]:
+                tools.append(summary)
+    return tools
+
+
+def _mcp_tools_from_registry(server_summaries):
+    """Read already-registered MCP tool schemas without probing MCP servers."""
+    try:
+        from tools.registry import registry
+    except Exception:
+        return []
+    tools = []
+    try:
+        names = registry.get_all_tool_names()
+    except Exception:
+        return []
+    for tool_name in names:
+        try:
+            toolset = registry.get_toolset_for_tool(tool_name)
+        except Exception:
+            continue
+        if not isinstance(toolset, str) or not toolset.startswith("mcp-"):
+            continue
+        server_name = toolset[len("mcp-"):]
+        schema = registry.get_schema(tool_name) or {}
+        server_summary = server_summaries.get(server_name, {
+            "name": server_name,
+            "enabled": True,
+            "active": False,
+            "status": "configured",
+        })
+        tools.append(_mcp_tool_summary(tool_name, schema, server_summary))
+    return tools
+
+
+def _handle_mcp_tools_list(handler):
+    """List known MCP tools from already-available runtime inventory only."""
+    cfg = get_config()
+    servers = cfg.get("mcp_servers", {})
+    if not isinstance(servers, dict):
+        servers = {}
+    runtime = _mcp_runtime_status_by_name()
+    server_summaries = {
+        str(name): _server_summary(str(name), scfg, runtime.get(str(name)))
+        for name, scfg in servers.items()
+    }
+    tools = _mcp_tools_from_runtime_status(runtime, server_summaries)
+    source = "mcp_runtime_status"
+    if not tools:
+        tools = _mcp_tools_from_registry(server_summaries)
+        source = "tool_registry" if tools else "none"
+    tools.sort(key=lambda row: (row.get("server", ""), row.get("name", "")))
+    unavailable_servers = [
+        summary["name"] for summary in server_summaries.values()
+        if summary.get("enabled") and not summary.get("active")
+    ]
+    return j(handler, {
+        "tools": tools,
+        "total": len(tools),
+        "source": source,
+        "inventory_scope": "already_known_runtime_only",
+        "unavailable_servers": unavailable_servers,
+    })
+
+
 def _handle_mcp_servers_list(handler):
-    """List all configured MCP servers."""
+    """List configured MCP servers with safe, read-only runtime visibility."""
     cfg = get_config()
     servers = cfg.get("mcp_servers", {})
     if not isinstance(servers, dict):
         servers = {}
-    result = [_server_summary(name, scfg) for name, scfg in servers.items()]
-    return j(handler, {"servers": result})
+    runtime = _mcp_runtime_status_by_name()
+    result = [
+        _server_summary(name, scfg, runtime.get(str(name)))
+        for name, scfg in servers.items()
+    ]
+    return j(handler, {
+        "servers": result,
+        "toggle_supported": False,
+        "reload_required": True,
+    })
 
 
 def _handle_mcp_server_delete(handler, name):
diff --git a/docs/pr-media/696/mcp-servers-system-panel.png b/docs/pr-media/696/mcp-servers-system-panel.png
new file mode 100644
index 0000000000..32c8789ad5
Binary files /dev/null and b/docs/pr-media/696/mcp-servers-system-panel.png differ
diff --git a/docs/pr-media/697/mcp-tools-search-filter.png b/docs/pr-media/697/mcp-tools-search-filter.png
new file mode 100644
index 0000000000..3d681893f9
Binary files /dev/null and b/docs/pr-media/697/mcp-tools-search-filter.png differ
diff --git a/static/i18n.js b/static/i18n.js
index a13f7f6351..d39b4e48e0 100644
--- a/static/i18n.js
+++ b/static/i18n.js
@@ -46,7 +46,7 @@ const LOCALES = {
     parse_failed_note: 'parse failed',
     you: 'You',
     mcp_servers_title: 'MCP Servers',
-    mcp_servers_desc: 'Manage MCP servers configured in config.yaml.',
+    mcp_servers_desc: 'View MCP servers configured in config.yaml.',
     mcp_no_servers: 'No MCP servers configured.',
     mcp_add_server: '+ Add Server',
     mcp_field_name: 'Server Name',
@@ -67,6 +67,24 @@ const LOCALES = {
     mcp_deleted: 'MCP server deleted.',
     mcp_delete_failed: 'Failed to delete MCP server.',
     mcp_load_failed: 'Failed to load MCP servers.',
+    mcp_restart_hint: 'Server changes are read-only here for now. Edit config.yaml and restart Hermes for changes to take effect.',
+    mcp_toggle_followup: 'Enable/disable controls are intentionally deferred until MCP reload semantics are explicit.',
+    mcp_status_active: 'Active',
+    mcp_status_configured: 'Configured',
+    mcp_status_disabled: 'Disabled',
+    mcp_status_invalid_config: 'Invalid config',
+    mcp_status_unknown: 'Unknown',
+    mcp_tool_count: '{0} tools',
+    mcp_enabled_yes: 'Enabled',
+    mcp_enabled_no: 'Disabled',
+    mcp_tools_title: 'MCP Tools',
+    mcp_tools_desc: 'Search known tools across active MCP servers.',
+    mcp_tools_search_placeholder: 'Search tools by name, server, or description…',
+    mcp_tools_no_tools: 'No MCP tools are available from the active runtime inventory.',
+    mcp_tools_no_matches: 'No MCP tools match your search.',
+    mcp_tools_load_failed: 'Failed to load MCP tools.',
+    mcp_tools_schema_empty: 'No schema parameters.',
+    mcp_tools_runtime_note: 'Tool inventory only uses already-known active MCP runtime data; the WebUI does not start or probe servers.',
     // PDF preview (#480)
     pdf_loading: 'Loading PDF {0}…',
     pdf_too_large: 'PDF too large for inline preview',
@@ -969,6 +987,24 @@ const LOCALES = {
     mcp_deleted: 'MCPサーバーを削除しました。',
     mcp_delete_failed: 'MCPサーバーの削除に失敗しました。',
     mcp_load_failed: 'MCPサーバーの読み込みに失敗しました。',
+    mcp_restart_hint: 'Server changes are read-only here for now. Edit config.yaml and restart Hermes for changes to take effect.',
+    mcp_toggle_followup: 'Enable/disable controls are intentionally deferred until MCP reload semantics are explicit.',
+    mcp_status_active: 'Active',
+    mcp_status_configured: 'Configured',
+    mcp_status_disabled: 'Disabled',
+    mcp_status_invalid_config: 'Invalid config',
+    mcp_status_unknown: 'Unknown',
+    mcp_tool_count: '{0} tools',
+    mcp_enabled_yes: 'Enabled',
+    mcp_enabled_no: 'Disabled',
+    mcp_tools_title: 'MCP Tools',
+    mcp_tools_desc: 'Search known tools across active MCP servers.',
+    mcp_tools_search_placeholder: 'Search tools by name, server, or description…',
+    mcp_tools_no_tools: 'No MCP tools are available from the active runtime inventory.',
+    mcp_tools_no_matches: 'No MCP tools match your search.',
+    mcp_tools_load_failed: 'Failed to load MCP tools.',
+    mcp_tools_schema_empty: 'No schema parameters.',
+    mcp_tools_runtime_note: 'Tool inventory only uses already-known active MCP runtime data; the WebUI does not start or probe servers.',
     // PDF preview (#480)
     pdf_loading: 'PDF {0} を読み込み中…',
     pdf_too_large: 'PDF が大きすぎてインラインプレビューできません',
@@ -1868,6 +1904,24 @@ const LOCALES = {
     mcp_deleted: 'MCP 伺服器已刪除。',
     mcp_delete_failed: '刪除 MCP 伺服器失敗。',
     mcp_load_failed: '載入 MCP 伺服器失敗。',
+    mcp_restart_hint: 'Server changes are read-only here for now. Edit config.yaml and restart Hermes for changes to take effect.',
+    mcp_toggle_followup: 'Enable/disable controls are intentionally deferred until MCP reload semantics are explicit.',
+    mcp_status_active: 'Active',
+    mcp_status_configured: 'Configured',
+    mcp_status_disabled: 'Disabled',
+    mcp_status_invalid_config: 'Invalid config',
+    mcp_status_unknown: 'Unknown',
+    mcp_tool_count: '{0} tools',
+    mcp_enabled_yes: 'Enabled',
+    mcp_enabled_no: 'Disabled',
+    mcp_tools_title: 'MCP Tools',
+    mcp_tools_desc: 'Search known tools across active MCP servers.',
+    mcp_tools_search_placeholder: 'Search tools by name, server, or description…',
+    mcp_tools_no_tools: 'No MCP tools are available from the active runtime inventory.',
+    mcp_tools_no_matches: 'No MCP tools match your search.',
+    mcp_tools_load_failed: 'Failed to load MCP tools.',
+    mcp_tools_schema_empty: 'No schema parameters.',
+    mcp_tools_runtime_note: 'Tool inventory only uses already-known active MCP runtime data; the WebUI does not start or probe servers.',
     thinking: 'Думаю',
     expand_all: 'Развернуть всё',
     collapse_all: 'Свернуть всё',
@@ -2701,6 +2755,24 @@ const LOCALES = {
     mcp_deleted: 'MCP 服务器已删除。',
     mcp_delete_failed: '删除 MCP 服务器失败。',
     mcp_load_failed: '加载 MCP 服务器失败。',
+    mcp_restart_hint: 'Server changes are read-only here for now. Edit config.yaml and restart Hermes for changes to take effect.',
+    mcp_toggle_followup: 'Enable/disable controls are intentionally deferred until MCP reload semantics are explicit.',
+    mcp_status_active: 'Active',
+    mcp_status_configured: 'Configured',
+    mcp_status_disabled: 'Disabled',
+    mcp_status_invalid_config: 'Invalid config',
+    mcp_status_unknown: 'Unknown',
+    mcp_tool_count: '{0} tools',
+    mcp_enabled_yes: 'Enabled',
+    mcp_enabled_no: 'Disabled',
+    mcp_tools_title: 'MCP Tools',
+    mcp_tools_desc: 'Search known tools across active MCP servers.',
+    mcp_tools_search_placeholder: 'Search tools by name, server, or description…',
+    mcp_tools_no_tools: 'No MCP tools are available from the active runtime inventory.',
+    mcp_tools_no_matches: 'No MCP tools match your search.',
+    mcp_tools_load_failed: 'Failed to load MCP tools.',
+    mcp_tools_schema_empty: 'No schema parameters.',
+    mcp_tools_runtime_note: 'Tool inventory only uses already-known active MCP runtime data; the WebUI does not start or probe servers.',
     thinking: 'Pensando',
     expand_all: 'Expandir todo',
     collapse_all: 'Contraer todo',
@@ -3537,6 +3609,24 @@ const LOCALES = {
     mcp_deleted: 'MCP-Server gelöscht.',
     mcp_delete_failed: 'Fehler beim Löschen.',
     mcp_load_failed: 'Fehler beim Laden.',
+    mcp_restart_hint: 'Server changes are read-only here for now. Edit config.yaml and restart Hermes for changes to take effect.',
+    mcp_toggle_followup: 'Enable/disable controls are intentionally deferred until MCP reload semantics are explicit.',
+    mcp_status_active: 'Active',
+    mcp_status_configured: 'Configured',
+    mcp_status_disabled: 'Disabled',
+    mcp_status_invalid_config: 'Invalid config',
+    mcp_status_unknown: 'Unknown',
+    mcp_tool_count: '{0} tools',
+    mcp_enabled_yes: 'Enabled',
+    mcp_enabled_no: 'Disabled',
+    mcp_tools_title: 'MCP Tools',
+    mcp_tools_desc: 'Search known tools across active MCP servers.',
+    mcp_tools_search_placeholder: 'Search tools by name, server, or description…',
+    mcp_tools_no_tools: 'No MCP tools are available from the active runtime inventory.',
+    mcp_tools_no_matches: 'No MCP tools match your search.',
+    mcp_tools_load_failed: 'Failed to load MCP tools.',
+    mcp_tools_schema_empty: 'No schema parameters.',
+    mcp_tools_runtime_note: 'Tool inventory only uses already-known active MCP runtime data; the WebUI does not start or probe servers.',
     thinking: 'Nachdenken',
     expand_all: 'Alle ausklappen',
     collapse_all: 'Alle einklappen',
@@ -4377,6 +4467,24 @@ const LOCALES = {
     mcp_deleted: 'MCP 服务器已删除。',
     mcp_delete_failed: 'MCP 服务器删除失败。',
     mcp_load_failed: 'MCP 服务器加载失败。',
+    mcp_restart_hint: 'Server changes are read-only here for now. Edit config.yaml and restart Hermes for changes to take effect.',
+    mcp_toggle_followup: 'Enable/disable controls are intentionally deferred until MCP reload semantics are explicit.',
+    mcp_status_active: 'Active',
+    mcp_status_configured: 'Configured',
+    mcp_status_disabled: 'Disabled',
+    mcp_status_invalid_config: 'Invalid config',
+    mcp_status_unknown: 'Unknown',
+    mcp_tool_count: '{0} tools',
+    mcp_enabled_yes: 'Enabled',
+    mcp_enabled_no: 'Disabled',
+    mcp_tools_title: 'MCP Tools',
+    mcp_tools_desc: 'Search known tools across active MCP servers.',
+    mcp_tools_search_placeholder: 'Search tools by name, server, or description…',
+    mcp_tools_no_tools: 'No MCP tools are available from the active runtime inventory.',
+    mcp_tools_no_matches: 'No MCP tools match your search.',
+    mcp_tools_load_failed: 'Failed to load MCP tools.',
+    mcp_tools_schema_empty: 'No schema parameters.',
+    mcp_tools_runtime_note: 'Tool inventory only uses already-known active MCP runtime data; the WebUI does not start or probe servers.',
     thinking: '\u601d\u8003\u8fc7\u7a0b',
     expand_all: '\u5168\u90e8\u5c55\u5f00',
     collapse_all: '\u5168\u90e8\u6298\u53e0',
@@ -5212,6 +5320,24 @@ const LOCALES = {
     mcp_deleted: 'MCP 伺服器已刪除。',
     mcp_delete_failed: '刪除 MCP 伺服器失敗。',
     mcp_load_failed: '載入 MCP 伺服器失敗。',
+    mcp_restart_hint: 'Server changes are read-only here for now. Edit config.yaml and restart Hermes for changes to take effect.',
+    mcp_toggle_followup: 'Enable/disable controls are intentionally deferred until MCP reload semantics are explicit.',
+    mcp_status_active: 'Active',
+    mcp_status_configured: 'Configured',
+    mcp_status_disabled: 'Disabled',
+    mcp_status_invalid_config: 'Invalid config',
+    mcp_status_unknown: 'Unknown',
+    mcp_tool_count: '{0} tools',
+    mcp_enabled_yes: 'Enabled',
+    mcp_enabled_no: 'Disabled',
+    mcp_tools_title: 'MCP Tools',
+    mcp_tools_desc: 'Search known tools across active MCP servers.',
+    mcp_tools_search_placeholder: 'Search tools by name, server, or description…',
+    mcp_tools_no_tools: 'No MCP tools are available from the active runtime inventory.',
+    mcp_tools_no_matches: 'No MCP tools match your search.',
+    mcp_tools_load_failed: 'Failed to load MCP tools.',
+    mcp_tools_schema_empty: 'No schema parameters.',
+    mcp_tools_runtime_note: 'Tool inventory only uses already-known active MCP runtime data; the WebUI does not start or probe servers.',
     thinking: '\u601d\u8003\u904e\u7a0b',
     expand_all: '\u5168\u90e8\u5c55\u958b',
     collapse_all: '\u5168\u90e8\u6298\u758a',
@@ -6909,6 +7035,24 @@ const LOCALES = {
     mcp_deleted: 'MCP server deleted.',
     mcp_delete_failed: 'Failed to delete MCP server.',
     mcp_load_failed: 'Failed to load MCP servers.',
+    mcp_restart_hint: 'Server changes are read-only here for now. Edit config.yaml and restart Hermes for changes to take effect.',
+    mcp_toggle_followup: 'Enable/disable controls are intentionally deferred until MCP reload semantics are explicit.',
+    mcp_status_active: 'Active',
+    mcp_status_configured: 'Configured',
+    mcp_status_disabled: 'Disabled',
+    mcp_status_invalid_config: 'Invalid config',
+    mcp_status_unknown: 'Unknown',
+    mcp_tool_count: '{0} tools',
+    mcp_enabled_yes: 'Enabled',
+    mcp_enabled_no: 'Disabled',
+    mcp_tools_title: 'MCP Tools',
+    mcp_tools_desc: 'Search known tools across active MCP servers.',
+    mcp_tools_search_placeholder: 'Search tools by name, server, or description…',
+    mcp_tools_no_tools: 'No MCP tools are available from the active runtime inventory.',
+    mcp_tools_no_matches: 'No MCP tools match your search.',
+    mcp_tools_load_failed: 'Failed to load MCP tools.',
+    mcp_tools_schema_empty: 'No schema parameters.',
+    mcp_tools_runtime_note: 'Tool inventory only uses already-known active MCP runtime data; the WebUI does not start or probe servers.',
     thinking: '생각 중',
     expand_all: '모두 펼치기',
     collapse_all: '모두 접기',
diff --git a/static/index.html b/static/index.html
index 2906184421..6c0c7cea13 100644
--- a/static/index.html
+++ b/static/index.html
@@ -950,42 +950,17 @@ <h2 data-i18n="empty_title">What can I help with?</h2>
             <!-- MCP Servers Section -->
             <div class="settings-field" style="margin-top:18px;padding-top:16px;border-top:1px solid var(--border)">
               <label data-i18n="mcp_servers_title">MCP Servers</label>
-              <div style="font-size:11px;color:var(--muted);margin-bottom:8px" data-i18n="mcp_servers_desc">Manage Model Context Protocol servers configured in config.yaml.</div>
+              <div style="font-size:11px;color:var(--muted);margin-bottom:8px" data-i18n="mcp_servers_desc">View Model Context Protocol servers configured in config.yaml.</div>
               <div id="mcpServerList"></div>
-              <button class="sm-btn" onclick="showMcpAddForm()" style="margin-top:8px;width:100%;padding:7px;font-weight:600" data-i18n="mcp_add_server">+ Add Server</button>
+              <div class="mcp-restart-hint" data-i18n="mcp_restart_hint">Server changes are read-only here for now. Edit config.yaml and restart Hermes for changes to take effect.</div>
             </div>
-            <div id="mcpAddFormWrap" style="display:none;margin-top:10px">
-              <div class="settings-field">
-                <label data-i18n="mcp_field_name">Server Name</label>
-                <input type="text" id="mcpName" placeholder="my-server" style="width:100%;padding:8px;background:var(--code-bg);color:var(--text);border:1px solid var(--border2);border-radius:6px;font-size:13px">
-              </div>
-              <div class="settings-field">
-                <label data-i18n="mcp_transport_label">Transport Type</label>
-                <select id="mcpTransport" onchange="mcpTransportChanged()" style="width:100%;padding:8px;background:var(--code-bg);color:var(--text);border:1px solid var(--border2);border-radius:6px;font-size:13px">
-                  <option value="stdio">stdio (local command)</option>
-                  <option value="http">HTTP (remote URL)</option>
-                </select>
-              </div>
-              <div class="settings-field" id="mcpCommandField">
-                <label data-i18n="mcp_field_command">Command</label>
-                <input type="text" id="mcpCommand" placeholder="npx" style="width:100%;padding:8px;background:var(--code-bg);color:var(--text);border:1px solid var(--border2);border-radius:6px;font-size:13px">
-              </div>
-              <div class="settings-field" id="mcpArgsField">
-                <label data-i18n="mcp_field_args">Arguments (comma-separated)</label>
-                <input type="text" id="mcpArgs" placeholder="-y, @modelcontextprotocol/server-filesystem" style="width:100%;padding:8px;background:var(--code-bg);color:var(--text);border:1px solid var(--border2);border-radius:6px;font-size:13px">
-              </div>
-              <div class="settings-field" id="mcpUrlField" style="display:none">
-                <label data-i18n="mcp_field_url">URL</label>
-                <input type="text" id="mcpUrl" placeholder="https://my-mcp-server.example.com/mcp" style="width:100%;padding:8px;background:var(--code-bg);color:var(--text);border:1px solid var(--border2);border-radius:6px;font-size:13px">
-              </div>
-              <div class="settings-field" id="mcpTimeoutField">
-                <label data-i18n="mcp_field_timeout">Timeout (seconds)</label>
-                <input type="number" id="mcpTimeout" value="120" min="10" max="600" style="width:100%;padding:8px;background:var(--code-bg);color:var(--text);border:1px solid var(--border2);border-radius:6px;font-size:13px">
-              </div>
-              <div style="display:flex;gap:8px;margin-top:8px">
-                <button class="sm-btn" onclick="saveMcpServer()" style="flex:1;padding:7px;font-weight:600" data-i18n="mcp_save">Save</button>
-                <button class="sm-btn" onclick="hideMcpAddForm()" style="flex:1;padding:7px;color:var(--muted)" data-i18n="mcp_cancel">Cancel</button>
-              </div>
+            <!-- MCP Tools Section -->
+            <div class="settings-field" style="margin-top:18px;padding-top:16px;border-top:1px solid var(--border)">
+              <label data-i18n="mcp_tools_title">MCP Tools</label>
+              <div style="font-size:11px;color:var(--muted);margin-bottom:8px" data-i18n="mcp_tools_desc">Search known tools across active MCP servers.</div>
+              <input type="search" id="mcpToolSearch" class="mcp-tool-search" data-i18n-placeholder="mcp_tools_search_placeholder" placeholder="Search tools by name, server, or description…" oninput="filterMcpTools()" autocomplete="off">
+              <div id="mcpToolList"></div>
+              <div class="mcp-restart-hint" data-i18n="mcp_tools_runtime_note">Tool inventory only uses already-known active MCP runtime data; the WebUI does not start or probe servers.</div>
             </div>
             <button class="sm-btn" onclick="saveSettings()" style="margin-top:12px;width:100%;padding:8px;font-weight:600" data-i18n="settings_save_btn">Save Settings</button>
           </div>
diff --git a/static/panels.js b/static/panels.js
index a4f19bb51c..7adfb454f8 100644
--- a/static/panels.js
+++ b/static/panels.js
@@ -3875,93 +3875,104 @@ function dismissErrorBanner(){
 
 
 // ── MCP Server Management ──
+function _mcpStatusLabel(status){
+  const key={
+    active:'mcp_status_active',
+    configured:'mcp_status_configured',
+    disabled:'mcp_status_disabled',
+    invalid_config:'mcp_status_invalid_config',
+  }[status]||'mcp_status_unknown';
+  return t(key);
+}
 function loadMcpServers(){
   const list=$('mcpServerList');
   if(!list) return;
+  list.innerHTML=`<div style="color:var(--muted);font-size:12px;padding:6px 0">${esc(t('loading'))}</div>`;
   api('/api/mcp/servers').then(r=>{
-    if(!r||!r.servers) return;
+    if(!r||!Array.isArray(r.servers)) return;
     if(!r.servers.length){
-      list.innerHTML=`<div style="color:var(--muted);font-size:12px;padding:6px 0">${t('mcp_no_servers')}</div>`;
+      list.innerHTML=`<div class="mcp-empty-state" style="color:var(--muted);font-size:12px;padding:6px 0">${esc(t('mcp_no_servers'))}</div>`;
       return;
     }
+    const toggleNote=r.toggle_supported?'':'<div class="mcp-readonly-note">'+esc(t('mcp_toggle_followup'))+'</div>';
     list.innerHTML=r.servers.map(s=>{
-      const transportLabel=s.transport==='http'?'HTTP':s.transport==='stdio'?'stdio':(''+s.transport);
+      const transportLabel=s.transport==='http'?'HTTP':s.transport==='stdio'?'stdio':(''+(s.transport||'unknown'));
       const transportClass=s.transport==='http'?'mcp-http':s.transport==='stdio'?'mcp-stdio':'mcp-unknown';
-      const badge=`<span class="mcp-transport-badge ${transportClass}">${esc(transportLabel)}</span>`;
-      const detail=s.transport==='http'?s.url:`${s.command} ${s.args?s.args.join(' '):''}`;
+      const transportBadge=`<span class="mcp-transport-badge ${transportClass}">${esc(transportLabel)}</span>`;
+      const status=s.status||'configured';
+      const statusBadge=`<span class="mcp-status-badge mcp-status-${esc(status)}">${esc(_mcpStatusLabel(status))}</span>`;
+      const toolCount=s.tool_count===null||typeof s.tool_count==='undefined'?'—':String(s.tool_count);
+      const detail=s.transport==='http'
+        ? (s.url||'')
+        : (s.transport==='stdio'?`${s.command||''} ${Array.isArray(s.args)?s.args.join(' '):''}`:t('mcp_status_invalid_config'));
       const envInfo=s.env?Object.entries(s.env).map(([k,v])=>`${k}=${v}`).join(', '):'';
+      const headersInfo=s.headers?Object.entries(s.headers).map(([k,v])=>`${k}=${v}`).join(', '):'';
+      const secretInfo=[envInfo,headersInfo].filter(Boolean).join(' | ');
       return `<div class="mcp-server-row">
-        <div style="display:flex;align-items:center;gap:8px">
-          <span class="mcp-server-name">${esc(s.name)}</span>${badge}
+        <div class="mcp-server-row-head">
+          <span class="mcp-server-name">${esc(s.name)}</span>
+          ${transportBadge}
+          ${statusBadge}
         </div>
-        <div class="mcp-server-detail">${esc(detail)}${envInfo?' | '+esc(envInfo):''}</div>
-        <button class="mcp-delete-btn" data-mcp-name="${esc(s.name)}" title="Delete">&times;</button>
+        <div class="mcp-server-detail">${esc(detail)}${secretInfo?' | '+esc(secretInfo):''}</div>
+        <div class="mcp-server-meta"><span class="mcp-tool-count">${esc(t('mcp_tool_count',toolCount))}</span><span>${esc(t(s.enabled===false?'mcp_enabled_no':'mcp_enabled_yes'))}</span></div>
       </div>`;
-    }).join('');
-  }).catch(()=>{list.innerHTML=`<div style="color:#ef4444;font-size:12px;padding:6px 0">${t('mcp_load_failed')}</div>`});
-  // Delegate delete-button clicks — uses data-mcp-name to avoid inline onclick XSS
-  if(list&&!list._mcpDeleteBound){
-    list._mcpDeleteBound=true;
-    list.addEventListener('click',function(e){
-      const btn=e.target.closest('.mcp-delete-btn');
-      if(!btn) return;
-      const name=btn.getAttribute('data-mcp-name');
-      if(name) deleteMcpServer(name);
-    });
-  }
+    }).join('')+toggleNote;
+  }).catch(()=>{list.innerHTML=`<div class="mcp-error-state" style="color:#ef4444;font-size:12px;padding:6px 0">${esc(t('mcp_load_failed'))}</div>`});
+}
+let _mcpToolsCache=[];
+function _filterMcpToolsForSearch(tools, query){
+  const q=(query||'').trim().toLowerCase();
+  if(!q) return Array.isArray(tools)?tools:[];
+  return (Array.isArray(tools)?tools:[]).filter(tool=>{
+    const hay=[tool.name,tool.server,tool.description].map(v=>String(v||'').toLowerCase()).join(' ');
+    return hay.includes(q);
+  });
 }
-
-function showMcpAddForm(){
-  const wrap=$('mcpAddFormWrap');
-  if(wrap) wrap.style.display='block';
+function _mcpToolSchemaText(schemaSummary){
+  if(!Array.isArray(schemaSummary)||!schemaSummary.length) return t('mcp_tools_schema_empty');
+  return schemaSummary.map(p=>{
+    const req=p.required?'*':'';
+    const desc=p.description?` — ${p.description}`:'';
+    return `${p.name}${req}: ${p.type||'unknown'}${desc}`;
+  }).join('\n');
 }
-function hideMcpAddForm(){
-  const wrap=$('mcpAddFormWrap');
-  if(wrap) wrap.style.display='none';
-  ['mcpName','mcpCommand','mcpArgs','mcpUrl','mcpTimeout'].forEach(id=>{
-    const el=$(id);if(el)el.value=id==='mcpTimeout'?'120':'';
-  });
-  const tr=$('mcpTransport');if(tr)tr.value='stdio';
-  mcpTransportChanged();
-}
-function mcpTransportChanged(){
-  const tr=$('mcpTransport');
-  const isHttp=tr&&tr.value==='http';
-  const cmdF=$('mcpCommandField');if(cmdF)cmdF.style.display=isHttp?'none':'';
-  const argsF=$('mcpArgsField');if(argsF)argsF.style.display=isHttp?'none':'';
-  const urlF=$('mcpUrlField');if(urlF)urlF.style.display=isHttp?'block':'none';
-}
-function saveMcpServer(){
-  const name=($('mcpName')||{}).value||'';
-  if(!name.trim()){showToast(t('mcp_name_required'));return;}
-  const tr=($('mcpTransport')||{}).value||'stdio';
-  const timeout=parseInt(($('mcpTimeout')||{}).value)||120;
-  const body={timeout};
-  if(tr==='http'){
-    body.url=($('mcpUrl')||{}).value||'';
-    if(!body.url.trim()){showToast(t('mcp_url_required'));return;}
-  }else{
-    body.command=($('mcpCommand')||{}).value||'';
-    if(!body.command.trim()){showToast(t('mcp_command_required'));return;}
-    const argsStr=($('mcpArgs')||{}).value||'';
-    if(argsStr.trim()) body.args=argsStr.split(',').map(a=>a.trim()).filter(Boolean);
+function _renderMcpTools(tools, query){
+  const list=$('mcpToolList');
+  if(!list) return;
+  const filtered=_filterMcpToolsForSearch(tools, query);
+  if(!filtered.length){
+    const key=query?'mcp_tools_no_matches':'mcp_tools_no_tools';
+    list.innerHTML=`<div class="mcp-tool-empty-state" style="color:var(--muted);font-size:12px;padding:6px 0">${esc(t(key))}</div>`;
+    return;
   }
-  const encName=encodeURIComponent(name.trim());
-  api(`/api/mcp/servers/${encName}`,{method:'PUT',body:JSON.stringify(body)})
-    .then(r=>{
-      if(r&&r.ok){showToast(t('mcp_saved'));hideMcpAddForm();loadMcpServers();}
-      else{showToast((r&&r.error)||t('mcp_save_failed'));}
-    }).catch(()=>{showToast(t('mcp_save_failed'));});
-}
-async function deleteMcpServer(name){
-  const _ok=await showConfirmDialog({title:t('mcp_delete_confirm_title'),message:t('mcp_delete_confirm_message',name),confirmLabel:t('delete_title'),danger:true,focusCancel:true});
-  if(!_ok) return;
-  const encName=encodeURIComponent(name);
-  api(`/api/mcp/servers/${encName}`,{method:'DELETE'})
-    .then(r=>{
-      if(r&&r.ok){showToast(t('mcp_deleted'));loadMcpServers();}
-      else{showToast((r&&r.error)||t('mcp_delete_failed'));}
-    }).catch(()=>{showToast(t('mcp_delete_failed'));});
+  list.innerHTML=filtered.map(tool=>{
+    const status=tool.status||'unknown';
+    const statusBadge=`<span class="mcp-status-badge mcp-status-${esc(status)}">${esc(_mcpStatusLabel(status))}</span>`;
+    const schemaText=_mcpToolSchemaText(tool.schema_summary);
+    return `<div class="mcp-tool-row">
+      <div class="mcp-server-row-head">
+        <span class="mcp-tool-name">${esc(tool.name)}</span>
+        <span class="mcp-tool-server">${esc(tool.server||'unknown')}</span>
+        ${statusBadge}
+      </div>
+      <div class="mcp-server-detail">${esc(tool.description||'')}</div>
+      <pre class="mcp-tool-schema">${esc(schemaText)}</pre>
+    </div>`;
+  }).join('');
+}
+function filterMcpTools(){
+  const input=$('mcpToolSearch');
+  _renderMcpTools(_mcpToolsCache,input?input.value:'');
+}
+function loadMcpTools(){
+  const list=$('mcpToolList');
+  if(!list) return;
+  list.innerHTML=`<div style="color:var(--muted);font-size:12px;padding:6px 0">${esc(t('loading'))}</div>`;
+  api('/api/mcp/tools').then(r=>{
+    _mcpToolsCache=(r&&Array.isArray(r.tools))?r.tools:[];
+    filterMcpTools();
+  }).catch(()=>{list.innerHTML=`<div class="mcp-tool-error-state" style="color:#ef4444;font-size:12px;padding:6px 0">${esc(t('mcp_tools_load_failed'))}</div>`});
 }
 function loadGatewayStatus(){
   const card=$('gatewayStatusCard');
@@ -3989,7 +4000,7 @@ function loadGatewayStatus(){
 const _origSwitchSettings=switchSettingsSection;
 switchSettingsSection=function(name){
   _origSwitchSettings(name);
-  if(name==='system'){loadMcpServers();loadGatewayStatus();}
+  if(name==='system'){loadMcpServers();loadMcpTools();loadGatewayStatus();}
 };
 
 // ── Checkpoints / Rollback ──────────────────────────────────────────────────
diff --git a/static/style.css b/static/style.css
index e428982e90..9b2fe3b837 100644
--- a/static/style.css
+++ b/static/style.css
@@ -2271,16 +2271,28 @@ main.main.showing-profiles > #mainProfiles{display:flex;}
 #mainSettings #btnSignOut:hover{color:var(--accent-text)!important;border-color:var(--accent-bg-strong)!important;}
 
 /* MCP Server Management */
-.mcp-server-row{display:flex;align-items:center;gap:8px;padding:6px 8px;border:1px solid var(--border);border-radius:6px;margin-bottom:4px;position:relative;font-size:12px;}
+.mcp-server-row{display:flex;flex-direction:column;gap:4px;padding:8px 10px;border:1px solid var(--border);border-radius:8px;margin-bottom:6px;position:relative;font-size:12px;background:var(--surface);}
 .mcp-server-row:hover{background:var(--code-bg);}
+.mcp-server-row-head{display:flex;align-items:center;gap:8px;min-width:0;flex-wrap:wrap;}
 .mcp-server-name{font-weight:600;color:var(--text);}
-.mcp-server-detail{flex:1;color:var(--muted);font-size:11px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
-.mcp-transport-badge{font-size:9px;font-weight:700;text-transform:uppercase;letter-spacing:.04em;padding:2px 6px;border-radius:4px;flex-shrink:0;}
+.mcp-server-detail{color:var(--muted);font-size:11px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:100%;}
+.mcp-server-meta{display:flex;gap:10px;color:var(--muted);font-size:11px;}
+.mcp-transport-badge,.mcp-status-badge{font-size:9px;font-weight:700;text-transform:uppercase;letter-spacing:.04em;padding:2px 6px;border-radius:999px;flex-shrink:0;}
 .mcp-stdio{background:rgba(99,102,241,.12);color:#818cf8;}
 .mcp-unknown{background:rgba(161,161,170,.12);color:#a1a1aa;}
 .mcp-http{background:rgba(34,197,94,.12);color:#4ade80;}
-.mcp-delete-btn{background:none;border:none;color:var(--muted);font-size:16px;cursor:pointer;padding:2px 4px;border-radius:4px;flex-shrink:0;}
-.mcp-delete-btn:hover{color:#ef4444;background:rgba(239,68,68,.1);}
+.mcp-status-active{background:rgba(34,197,94,.12);color:#4ade80;}
+.mcp-status-configured{background:rgba(245,158,11,.12);color:#f59e0b;}
+.mcp-status-disabled{background:rgba(161,161,170,.12);color:#a1a1aa;}
+.mcp-status-invalid_config,.mcp-status-unknown{background:rgba(239,68,68,.12);color:#f87171;}
+.mcp-tool-count{color:var(--text);}
+.mcp-readonly-note,.mcp-restart-hint{margin-top:8px;color:var(--muted);font-size:11px;line-height:1.45;background:var(--code-bg);border:1px solid var(--border2);border-radius:6px;padding:8px 10px;}
+.mcp-tool-search{width:100%;margin:0 0 8px 0;padding:8px 10px;background:var(--code-bg);color:var(--text);border:1px solid var(--border2);border-radius:8px;font-size:12px;outline:none;}
+.mcp-tool-search:focus{border-color:var(--accent);box-shadow:0 0 0 2px var(--accent-bg-soft);}
+.mcp-tool-row{display:flex;flex-direction:column;gap:5px;padding:9px 10px;border:1px solid var(--border);border-radius:8px;margin-bottom:6px;font-size:12px;background:var(--surface);}
+.mcp-tool-name{font-weight:600;color:var(--text);overflow-wrap:anywhere;}
+.mcp-tool-server{font-size:10px;font-weight:700;text-transform:uppercase;letter-spacing:.04em;color:var(--muted);background:var(--code-bg);border:1px solid var(--border2);border-radius:999px;padding:2px 6px;}
+.mcp-tool-schema{margin:2px 0 0 0;padding:7px 8px;white-space:pre-wrap;max-height:140px;overflow:auto;background:var(--code-bg);border:1px solid var(--border2);border-radius:6px;color:var(--muted);font-size:11px;line-height:1.45;}
 
 /* Picker grids (theme / skin / font-size): make the card chrome use
    tokens so all skins flip correctly. */
diff --git a/tests/test_issue538_mcp_management.py b/tests/test_issue538_mcp_management.py
index 0a1c735cd0..758eff1a80 100644
--- a/tests/test_issue538_mcp_management.py
+++ b/tests/test_issue538_mcp_management.py
@@ -6,6 +6,7 @@
     _handle_mcp_server_update,
     _handle_mcp_server_delete,
     _mask_secrets,
+    _parse_mcp_enabled,
     _server_summary,
     _strip_masked_values,
 )
@@ -18,6 +19,11 @@ def _make_handler():
     return h
 
 
+def _json_payload(handler):
+    body = handler.wfile.write.call_args[0][0]
+    return json.loads(body.decode('utf-8'))
+
+
 SAMPLE_MCP = {
     "searxng": {
         "command": "mcp-searxng",
@@ -52,6 +58,43 @@ def test_empty_config(self, mock_cfg):
         assert h.send_response.called
         status = h.send_response.call_args[0][0]
         assert status == 200
+        payload = _json_payload(h)
+        assert payload['servers'] == []
+        assert payload['toggle_supported'] is False
+        assert payload['reload_required'] is True
+
+    @patch('api.routes._mcp_runtime_status_by_name')
+    @patch('api.routes.get_config')
+    def test_list_payload_includes_status_tool_counts_and_safe_invalid_config(self, mock_cfg, mock_runtime):
+        mock_cfg.return_value = {
+            'mcp_servers': {
+                'searxng': {'command': 'mcp-searxng', 'args': ['--port', '8888']},
+                'web-reader': {
+                    'url': 'http://localhost:3001/mcp',
+                    'headers': {'Authorization': 'Bearer secret123'},
+                },
+                'disabled': {'command': 'disabled-cmd', 'enabled': 0},
+                'broken': 'not-a-dict',
+            }
+        }
+        mock_runtime.return_value = {
+            'searxng': {'connected': True, 'tools': 3},
+            'web-reader': {'connected': False, 'tools': 0},
+        }
+        h = _make_handler()
+        _handle_mcp_servers_list(h)
+        payload = _json_payload(h)
+        by_name = {s['name']: s for s in payload['servers']}
+        assert by_name['searxng']['status'] == 'active'
+        assert by_name['searxng']['active'] is True
+        assert by_name['searxng']['tool_count'] == 3
+        assert by_name['web-reader']['status'] == 'configured'
+        assert '••••' in by_name['web-reader']['headers']['Authorization']
+        assert by_name['disabled']['enabled'] is False
+        assert by_name['disabled']['active'] is False
+        assert by_name['disabled']['status'] == 'disabled'
+        assert by_name['broken']['transport'] == 'invalid'
+        assert by_name['broken']['status'] == 'invalid_config'
 
     def test_secrets_are_masked(self):
         """_mask_secrets hides API keys in headers and env."""
@@ -75,6 +118,10 @@ def test_server_summary_default_timeout(self):
         summary = _server_summary('minimal', {'command': 'x'})
         assert summary['timeout'] == 120
 
+    def test_numeric_zero_enabled_flag_is_disabled(self):
+        """YAML numeric false-y values should not show a disabled server as enabled."""
+        assert _parse_mcp_enabled(0) is False
+
 
 class TestMcpSave:
     """PUT /api/mcp/servers/<name> — add or update."""
diff --git a/tests/test_issue696_mcp_visibility_panel.py b/tests/test_issue696_mcp_visibility_panel.py
new file mode 100644
index 0000000000..999192e5be
--- /dev/null
+++ b/tests/test_issue696_mcp_visibility_panel.py
@@ -0,0 +1,46 @@
+"""Regression tests for issue #696 — MCP server visibility panel MVP."""
+from pathlib import Path
+
+ROOT = Path(__file__).resolve().parents[1]
+
+
+def read(relpath: str) -> str:
+    return (ROOT / relpath).read_text(encoding="utf-8")
+
+
+def test_settings_system_panel_contains_readonly_mcp_visibility_section():
+    html = read("static/index.html")
+    assert 'data-i18n="mcp_servers_title"' in html
+    assert 'id="mcpServerList"' in html
+    assert 'class="mcp-restart-hint"' in html
+    assert 'id="mcpAddFormWrap"' not in html
+    assert 'onclick="showMcpAddForm()"' not in html
+
+
+def test_mcp_panel_renders_status_badges_tool_counts_and_empty_error_states():
+    js = read("static/panels.js")
+    assert "function _mcpStatusLabel" in js
+    assert "mcp-status-badge" in js
+    assert "mcp-tool-count" in js
+    assert "mcp-empty-state" in js
+    assert "mcp-error-state" in js
+    assert "mcp_toggle_followup" in js
+    assert "api('/api/mcp/servers')" in js
+    assert "mcp-delete-btn" not in js
+    assert "showMcpAddForm" not in js
+    assert "saveMcpServer" not in js
+
+
+def test_mcp_i18n_includes_visibility_status_labels():
+    i18n = read("static/i18n.js")
+    for key in [
+        "mcp_status_active",
+        "mcp_status_configured",
+        "mcp_status_disabled",
+        "mcp_status_invalid_config",
+        "mcp_tool_count",
+        "mcp_enabled_yes",
+        "mcp_enabled_no",
+        "mcp_toggle_followup",
+    ]:
+        assert key in i18n
diff --git a/tests/test_issue697_mcp_tool_inventory.py b/tests/test_issue697_mcp_tool_inventory.py
new file mode 100644
index 0000000000..4dfd4ba127
--- /dev/null
+++ b/tests/test_issue697_mcp_tool_inventory.py
@@ -0,0 +1,136 @@
+"""Regression tests for issue #697 — searchable global MCP tool inventory."""
+import json
+from unittest.mock import MagicMock, patch
+
+from api.routes import (
+    _handle_mcp_tools_list,
+    _mcp_schema_summary,
+    _mcp_tool_summary,
+)
+
+
+def _make_handler():
+    h = MagicMock()
+    h.path = "/api/mcp/tools"
+    h.command = "GET"
+    return h
+
+
+def _json_payload(handler):
+    body = handler.wfile.write.call_args[0][0]
+    return json.loads(body.decode("utf-8"))
+
+
+def _read(relative_path: str) -> str:
+    from pathlib import Path
+
+    return (Path(__file__).resolve().parents[1] / relative_path).read_text(encoding="utf-8")
+
+
+class TestMcpToolInventoryApi:
+    @patch("api.routes._mcp_runtime_status_by_name")
+    @patch("api.routes.get_config")
+    def test_endpoint_returns_sanitized_registered_mcp_tools(self, mock_cfg, mock_runtime):
+        mock_cfg.return_value = {
+            "mcp_servers": {
+                "web-reader": {"url": "http://localhost:3001/mcp", "headers": {"Authorization": "Bearer secret-token"}},
+                "disabled": {"command": "disabled-cmd", "enabled": False},
+            }
+        }
+        mock_runtime.return_value = {
+            "web-reader": {
+                "connected": True,
+                "tools": [
+                    {
+                        "name": "mcp_web_reader_fetch_page",
+                        "description": "Fetch a page without leaking Authorization: Bearer secret-token",
+                        "parameters": {
+                            "type": "object",
+                            "properties": {
+                                "url": {"type": "string", "description": "URL to fetch", "default": "https://token.example/?key=secret-token"},
+                                "limit": {"type": "integer", "description": "Maximum bytes"},
+                            },
+                            "required": ["url"],
+                        },
+                    }
+                ],
+            },
+            "disabled": {"connected": False, "tools": 0},
+        }
+        h = _make_handler()
+        _handle_mcp_tools_list(h)
+        payload = _json_payload(h)
+
+        assert payload["source"] == "mcp_runtime_status"
+        assert payload["total"] == 1
+        assert payload["tools"][0]["name"] == "mcp_web_reader_fetch_page"
+        assert payload["tools"][0]["server"] == "web-reader"
+        assert payload["tools"][0]["status"] == "active"
+        assert payload["tools"][0]["active"] is True
+        assert payload["tools"][0]["enabled"] is True
+        assert payload["tools"][0]["schema_summary"] == [
+            {"name": "url", "type": "string", "required": True, "description": "URL to fetch"},
+            {"name": "limit", "type": "integer", "required": False, "description": "Maximum bytes"},
+        ]
+        raw = json.dumps(payload)
+        assert "secret-token" not in raw
+        assert "default" not in raw
+        assert "Authorization" not in raw
+
+    def test_schema_summary_uses_parameter_names_types_required_and_descriptions_only(self):
+        schema = {
+            "type": "object",
+            "properties": {
+                "query": {"type": "string", "description": "Search text", "examples": ["secret"]},
+                "tags": {"type": "array", "items": {"type": "string"}, "description": "Tag filters"},
+            },
+            "required": ["query"],
+        }
+        assert _mcp_schema_summary(schema) == [
+            {"name": "query", "type": "string", "required": True, "description": "Search text"},
+            {"name": "tags", "type": "array", "required": False, "description": "Tag filters"},
+        ]
+
+    def test_tool_summary_rejects_non_dict_schema_and_redacts_description(self):
+        summary = _mcp_tool_summary(
+            "search",
+            {"description": "use API_KEY=super-secret", "parameters": "not-a-dict"},
+            {"name": "search", "status": "configured", "enabled": True, "active": False},
+        )
+        assert summary["description"] != "use API_KEY=super-secret"
+        assert "super-secret" not in summary["description"]
+        assert summary["schema_summary"] == []
+
+
+class TestMcpToolInventoryUi:
+    def test_system_settings_contains_searchable_global_mcp_tool_section(self):
+        html = _read("static/index.html")
+        assert 'data-i18n="mcp_tools_title"' in html
+        assert 'id="mcpToolSearch"' in html
+        assert 'id="mcpToolList"' in html
+        assert 'oninput="filterMcpTools()"' in html
+
+    def test_panels_js_loads_tools_and_filters_name_server_description(self):
+        js = _read("static/panels.js")
+        assert "function loadMcpTools" in js
+        assert "api('/api/mcp/tools')" in js
+        assert "function filterMcpTools" in js
+        assert "_filterMcpToolsForSearch" in js
+        assert "tool.name" in js
+        assert "tool.server" in js
+        assert "tool.description" in js
+        assert "mcp-tool-empty-state" in js
+        assert "mcp-tool-error-state" in js
+
+    def test_mcp_tool_i18n_keys_are_present(self):
+        i18n = _read("static/i18n.js")
+        for key in [
+            "mcp_tools_title",
+            "mcp_tools_desc",
+            "mcp_tools_search_placeholder",
+            "mcp_tools_no_tools",
+            "mcp_tools_no_matches",
+            "mcp_tools_load_failed",
+            "mcp_tools_schema_empty",
+        ]:
+            assert key in i18n