Agent Zero AI framework
mcp polishing
frdel08f69c10126f
diff --git a/docker/run/fs/ins/post_install.sh b/docker/run/fs/ins/post_install.shindex c77f188e2..410ff19a7 100644--- a/docker/run/fs/ins/post_install.sh+++ b/docker/run/fs/ins/post_install.sh@@ -2,4 +2,4 @@# Cleanup package listrm -rf /var/lib/apt/lists/*-# apt-get clean\ No newline at end of file+apt-get clean\ No newline at end of filediff --git a/python/api/mcp_server_get_detail.py b/python/api/mcp_server_get_detail.pynew file mode 100644index 000000000..e5e385aac--- /dev/null+++ b/python/api/mcp_server_get_detail.py@@ -0,0 +1,20 @@+from math import log+from python.helpers.api import ApiHandler+from flask import Request, Response++from typing import Any++from python.helpers.mcp_handler import MCPConfig+++class McpServerGetDetail(ApiHandler):+ async def process(self, input: dict[Any, Any], request: Request) -> dict[Any, Any] | Response:++ # try:+ server_name = input.get("server_name")+ if not server_name:+ return {"success": False, "error": "Missing server_name"}+ detail = MCPConfig.get_instance().get_server_detail(server_name)+ return {"success": True, "detail": detail}+ # except Exception as e:+ # return {"success": False, "error": str(e)}diff --git a/python/helpers/mcp_handler.py b/python/helpers/mcp_handler.pyindex c0b5c7f1e..d7acb008e 100644--- a/python/helpers/mcp_handler.py+++ b/python/helpers/mcp_handler.py@@ -5,6 +5,7 @@ from typing import (Dict,Optional,Any,+ TextIO,Union,Literal,Annotated,@@ -623,6 +624,8 @@ class MCPConfig(BaseModel):connected = True # tool_count > 0# get error message if anyerror = server.get_error()+ # get log bool+ has_log = server.get_log() != ""# add server status to resultresult.append(@@ -631,6 +634,7 @@ class MCPConfig(BaseModel):"connected": connected,"error": error,"tool_count": tool_count,+ "has_log": has_log,})@@ -642,11 +646,27 @@ class MCPConfig(BaseModel):"connected": False,"error": disconnected["error"],"tool_count": 0,+ "has_log": False,})return result+ def get_server_detail(self, server_name: str) -> dict[str, Any]:+ with self.__lock:+ for server in self.servers:+ if server.name == server_name:+ try:+ tools = server.get_tools()+ except Exception as e:+ tools = []+ return {+ "name": server.name,+ "description": server.description,+ "tools": tools,+ }+ return {}+def is_initialized(self) -> bool:"""Check if the client is initialized"""with self.__lock:@@ -677,13 +697,16 @@ class MCPConfig(BaseModel):for server in self.servers:if server.name in server_names:server_name = server.name+ prompt += f"### {server_name}\n"+ prompt += f"{server.description}\n\n"+for tool in server.get_tools():prompt += (f"### {server_name}.{tool['name']}:\n"f"{tool['description']}\n\n"- f"#### Categories:\n"- f"* kind: MCP Server Tool\n"- f'* server: "{server_name}" ({server.description})\n\n'+ # f"#### Categories:\n"+ # f"* kind: MCP Server Tool\n"+ # f'* server: "{server_name}" ({server.description})\n\n'f"#### Arguments:\n")@@ -783,6 +806,7 @@ class MCPClientBase(ABC):self.tools: List[dict[str, Any]] = [] # Tools are cached on the client instanceself.error: str = ""self.log: List[str] = []+ self.log_file: Optional[TextIO] = None# Protected method@abstractmethod@@ -946,8 +970,6 @@ class MCPClientBase(ABC):f"MCPClientBase::Failed to call tool '{tool_name}' on server '{self.server.name}'. Original error: {type(e).__name__}: {e}")--class MCPClientLocal(MCPClientBase):def get_log(self):# read and return lines from self.log_file, do not close itif not hasattr(self, 'log_file') or self.log_file is None:@@ -959,6 +981,8 @@ class MCPClientLocal(MCPClientBase):log = ""return log++class MCPClientLocal(MCPClientBase):def __del__(self):# close the log file if it existsif hasattr(self, 'log_file') and self.log_file is not None:@@ -1006,9 +1030,6 @@ class MCPClientLocal(MCPClientBase):class MCPClientRemote(MCPClientBase):- def get_log(self):- return "Logging not implemented for remote servers yet"-async def _create_stdio_transport(self, current_exit_stack: AsyncExitStack) -> tuple[diff --git a/run_ui.py b/run_ui.pyindex 6353453a3..0c9932d48 100644--- a/run_ui.py+++ b/run_ui.py@@ -186,8 +186,9 @@ def run():PrintStyle().error(f"Failed to start Cloudflare tunnel: {e}")PrintStyle().print("Continuing without tunnel...")- # initialize contexts from persisted chats- persist_chat.load_tmp_chats()+ # # initialize contexts from persisted chats - moved to async task+ # persist_chat.load_tmp_chats()+# # reload scheduler# scheduler = TaskScheduler.get()# asyncio.run(scheduler.reload())@@ -301,12 +302,20 @@ def run():process.set_server(server)server.log_startup()++ # Start init_a0 in a background thread when server starts+ import threading+ threading.Thread(target=init_a0, daemon=True).start()+server.serve_forever()finally:# Clean up tunnel if it was startedif tunnel:tunnel.stop()+def init_a0():+ # initialize contexts from persisted chats+ persist_chat.load_tmp_chats()# run the internal serverif __name__ == "__main__":diff --git a/webui/components/settings/mcp/client/mcp-server-descripton.html b/webui/components/settings/mcp/client/mcp-server-descripton.htmlnew file mode 100644index 000000000..087d45a69--- /dev/null+++ b/webui/components/settings/mcp/client/mcp-server-descripton.html@@ -0,0 +1,24 @@+<html>++<head>+ <title>MCP Server Detail</title>++ <script type="module">+ import { store } from "/components/settings/mcp/client/mcp-servers-store.js";+ </script>+</head>++<body>+ <div x-data>+ <template x-if="$store.mcpServersStore">+ <h3 x-text="$store.mcpServersStore.serverDetail.name"></h3>+ <p x-text="$store.mcpServersStore.serverDetail.description"></p>+ </template>+ </div>++ <style>+ </style>++</body>++</html>\ No newline at end of filediff --git a/webui/components/settings/mcp/client/mcp-server-tools.html b/webui/components/settings/mcp/client/mcp-server-tools.htmlnew file mode 100644index 000000000..8ecabd988--- /dev/null+++ b/webui/components/settings/mcp/client/mcp-server-tools.html@@ -0,0 +1,113 @@+<html>++<head>+ <title>MCP Server Detail</title>++ <script type="module">+ import { store } from "/components/settings/mcp/client/mcp-servers-store.js";+ </script>+</head>++<body>+ <div x-data>+ <template x-if="$store.mcpServersStore">+ <div>+ <h3 x-text="$store.mcpServersStore.serverDetail.name"></h3>+ <p x-text="$store.mcpServersStore.serverDetail.description"></p>++ <div class="tools-container">+ <template x-for="tool in $store.mcpServersStore.serverDetail.tools" :key="tool.name">+ <div class="tool-item">+ <h4 x-text="tool.name"></h4>+ <p class="tool-description" x-text="tool.description"></p>++ <template x-if="tool.input_schema?.properties">+ <div class="tool-properties">+ <p class="properties-title">Properties:</p>+ <ul>+ <template x-for="(prop, propName) in tool.input_schema.properties"+ :key="propName">+ <li>+ <span class="prop-name" x-text="propName"></span>:+ <span class="prop-type" x-text="prop.type || 'any'"></span>+ <template x-if="prop.description">+ <span class="prop-desc" x-text="' - ' + prop.description"></span>+ </template>+ </li>+ </template>+ </ul>+ </div>+ </template>+ </div>+ </template>+ </div>+ </div>+ </template>+ </div>++ <style>+ .tools-container {+ margin-top: 1.5em;+ display: flex;+ flex-direction: column;+ gap: 1.2em;+ }++ .tool-item {+ padding: 1em;+ border: 1px solid rgba(192, 192, 192, 0.16);+ border-radius: 4px;+ }++ .tool-item h4 {+ margin-top: 0;+ margin-bottom: 0.5em;+ font-size: 1.1em;+ }++ .tool-description {+ margin-bottom: 1em;+ color: var(--c-fg);+ line-height: 1.4;+ }++ .tool-properties {+ margin-top: 0.8em;+ padding: 0.8em;+ background-color: rgba(0, 0, 0, 0.04);+ border-radius: 3px;+ }++ .properties-title {+ font-weight: 600;+ margin-top: 0;+ margin-bottom: 0.5em;+ }++ .tool-properties ul {+ margin: 0;+ padding-left: 1.5em;+ }++ .tool-properties li {+ margin-bottom: 0.3em;+ }++ .prop-name {+ font-weight: 600;+ color: var(--c-accent);+ }++ .prop-type {+ color: var(--c-fg2);+ font-style: italic;+ }++ .prop-desc {+ color: var(--c-fg);+ }+ </style>++</body>++</html>\ No newline at end of filediff --git a/webui/components/settings/mcp/client/mcp-servers-store.js b/webui/components/settings/mcp/client/mcp-servers-store.jsindex 11e1a4d1d..b3e112bdb 100644--- a/webui/components/settings/mcp/client/mcp-servers-store.js+++ b/webui/components/settings/mcp/client/mcp-servers-store.js@@ -115,7 +115,27 @@ const model = {});if (resp.success) {this.serverLog = resp.log;- openModal("settings/mcp/client/mcp-servers-log.html")+ openModal("settings/mcp/client/mcp-servers-log.html");+ }+ },++ async onServerClick(serverName) {+ const resp = await API.callJsonApi("mcp_server_get_detail", {+ server_name: serverName,+ });+ if (resp.success) {+ this.serverDetail = resp.detail;+ openModal("settings/mcp/client/mcp-server-description.html");+ }+ },++ async onToolCountClick(serverName) {+ const resp = await API.callJsonApi("mcp_server_get_detail", {+ server_name: serverName,+ });+ if (resp.success) {+ this.serverDetail = resp.detail;+ openModal("settings/mcp/client/mcp-server-tools.html");}},};diff --git a/webui/components/settings/mcp/client/mcp-servers.html b/webui/components/settings/mcp/client/mcp-servers.htmlindex 1c6fbc36c..7534fbcf9 100644--- a/webui/components/settings/mcp/client/mcp-servers.html+++ b/webui/components/settings/mcp/client/mcp-servers.html@@ -27,24 +27,41 @@<div class="server-list"><template x-for="server in $store.mcpServersStore.servers" :key="server.name"><div class="server-item">- <div class="status-icon" style="margin-right: 0.5em;"- x-data="{ connected: server.connected }">- <svg viewBox="0 0 30 30">- <!-- Connected State (filled circle, green or orange) -->- <circle x-bind:class="server.error ? 'disconnected-circle' : 'connected-circle'" cx="15" cy="15" r="8" x-bind:fill="server.connected- ? (server.error ? '#e40138' : (server.tool_count === 0 ? '#e40138' : '#00c340'))- : 'none'" x-bind:opacity="server.connected ? 1 : 0" />-- <!-- Disconnected State (outline circle) -->- <circle x-bind:class="server.error ? 'disconnected-circle' : 'connected-circle'" cx="15" cy="15" r="9" fill="none"- stroke="#e40138" stroke-width="3" x-bind:opacity="server.connected ? 0 : 1" />- </svg>+ <div class="server-main-row">+ <!-- Status indicator -->+ <div class="status-dot" x-data="{ connected: server.connected }">+ <svg viewBox="0 0 16 16" width="12" height="12">+ <circle cx="8" cy="8" r="6"+ x-bind:fill="server.connected+ ? (server.error ? '#e40138' : (server.tool_count > 0 ? '#00c340' : '#e40138'))+ : 'none'"+ x-bind:opacity="server.connected ? 1 : 0" />+ <circle cx="8" cy="8" r="6" fill="none"+ stroke="#e40138" stroke-width="2"+ x-bind:opacity="server.connected ? 0 : 1" />+ </svg>+ </div>++ <!-- Server name -->+ <span class="server-name" x-text="server.name"></span>++ <!-- Tool count (clickable if > 0, only for connected servers without errors) -->+ <span class="tool-count"+ x-show="server.tool_count > 0"+ @click="$store.mcpServersStore.onToolCountClick && $store.mcpServersStore.onToolCountClick(server.name)"+ x-text="server.tool_count + ' tools'"></span>++ <!-- Disabled in config message -->+ <span class="config-status" x-show="server.disabled_in_config">Disabled in config</span>++ <!-- Log button (only shown if has_log is true) -->+ <span class="log-btn" x-show="server.has_log" @click="$store.mcpServersStore.getServerLog(server.name)">Log</span>+ </div>++ <!-- Error message (if any) -->+ <div class="server-error-row" x-show="server.error">+ <span class="server-error" x-text="server.error"></span></div>- <span class="server-name" x-text="server.name"></span>- <span class="server-tools"- x-text="'- ' + (server.tool_count ? server.tool_count : 0) + ' tools'"></span>- <span class="server-error" x-show="server.error" x-text="server.error"></span>- <span class="server-links"><a href="#" @click="$store.mcpServersStore.getServerLog(server.name)">View Log</a></span></div></template><div x-show="$store.mcpServersStore.servers.length === 0" class="no-servers">@@ -70,56 +87,86 @@.server-item {display: flex;- align-items: center;- flex-wrap: wrap;- padding: 0.5em;- border-bottom: 1px solid var(--c-border);+ flex-direction: column;+ padding: 0.5em 0.7em;+ margin-bottom: 0.4em;+ min-height: 2.2em; /* Ensure consistent height even without errors */+ border: 1px solid rgba(192, 192, 192, 0.161); /* Silver with 30% opacity */+ border-radius: 4px;}- .server-item:last-child {- border-bottom: none;- }-- .status-indicator {- display: inline-block;- width: 0.8em;- height: 0.8em;- border-radius: 50%;- margin-right: 0.8em;+ .server-list {+ margin-top: 0.5em;+ margin-bottom: 1em;+ display: flex;+ flex-direction: column;+ gap: 0.2em;}-- .status-indicator.connected {- background-color: #4CAF50;++ .server-main-row {+ display: flex;+ align-items: center;+ gap: 0.8em;+ width: 100%;}- .status-indicator.disconnected {- background-color: #F44336;+ .status-dot {+ display: flex;+ align-items: center;+ justify-content: center;}-+.server-name {- font-weight: 500;- margin-right: 0.5em;+ font-weight: 600;+ min-width: 12em;}-- .server-tools {++ .tool-count {color: var(--c-fg2);font-size: 0.9em;+ user-select: none;}-- .no-servers {- padding: 1em;- color: var(--c-fg2);- font-style: italic;++ .tool-count {+ cursor: default;}-- .server-error {- color: #F44336;++ .tool-count:hover {+ opacity: 0.8;+ cursor: pointer;+ }++ .config-status {+ color: #e40138;+ font-size: 0.85em;+ opacity: 0.8;+ }++ .log-btn {+ margin-left: auto;font-size: 0.9em;- margin-left: 0.8em;+ cursor: pointer;+ text-decoration: none;+ opacity: 0.85;}-- .server-links {- margin-left: 0.8em;++ .log-btn:hover {+ opacity: 1;+ }++ .server-error-row {+ margin-left: 1.8em;+ margin-top: 0.1em;+ font-size: 0.8em;+ color: #F44336;+ opacity: 0.85;+ line-height: 1.2;+ }++ .no-servers {+ padding: 0.5em;+ color: var(--c-fg2);+ font-style: italic;}</style>