Agent Zero AI framework
mcp nice loading
frdel01d1002dfbda
diff --git a/python/api/mcp_servers_apply.py b/python/api/mcp_servers_apply.pyindex 0b3b1f0d3..5f3f8d8c4 100644--- a/python/api/mcp_servers_apply.py+++ b/python/api/mcp_servers_apply.py@@ -1,9 +1,10 @@+import timefrom python.helpers.api import ApiHandlerfrom flask import Request, Responsefrom typing import Any-# from python.helpers.mcp_handler import MCPConfig+from python.helpers.mcp_handler import MCPConfigfrom python.helpers.settings import set_settings_delta@@ -14,6 +15,9 @@ class McpServersApply(ApiHandler):# MCPConfig.update(mcp_servers) # done in settings automaticallyset_settings_delta({"mcp_servers": "[]"}) # to force reinitializationset_settings_delta({"mcp_servers": mcp_servers})++ time.sleep(1) # wait at least a second+ MCPConfig.wait_for_lock() # wait until config lock is releasedexcept Exception as e:return {"success": False, "error": str(e)}diff --git a/python/helpers/mcp_handler.py b/python/helpers/mcp_handler.pyindex d7acb008e..8c36175fc 100644--- a/python/helpers/mcp_handler.py+++ b/python/helpers/mcp_handler.py@@ -377,6 +377,11 @@ class MCPConfig(BaseModel):cls.__instance = cls(servers_list=[])return cls.__instance+ @classmethod+ def wait_for_lock(cls):+ with cls.__lock:+ return+@classmethoddef update(cls, config_str: str) -> Any:with cls.__lock:diff --git a/webui/components/settings/mcp/client/mcp-servers-store.js b/webui/components/settings/mcp/client/mcp-servers-store.jsindex b3e112bdb..f7116f770 100644--- a/webui/components/settings/mcp/client/mcp-servers-store.js+++ b/webui/components/settings/mcp/client/mcp-servers-store.js@@ -6,7 +6,7 @@ import * as API from "/js/api.js";const model = {editor: null,servers: [],- loading: false,+ loading: true,statusCheck: false,serverLog: "",@@ -72,9 +72,14 @@ const model = {async startStatusCheck() {this.statusCheck = true;+ const firstLoad = true;while (this.statusCheck) {await this._statusCheck();+ if (firstLoad) {+ this.loading = false;+ firstLoad = false;+ }await sleep(3000);}},@@ -99,8 +104,9 @@ const model = {await API.callJsonApi("mcp_servers_apply", {mcp_servers: this.getEditorValue(),});- await sleep(5000); // just to prevent user from clicking apply multiple times- // scrollModal("mcp-servers-status");+ // await sleep(5000); // just to prevent user from clicking apply multiple times+ // api now waits for config locks automatically+ scrollModal("mcp-servers-status");} catch (error) {console.error("Failed to apply MCP servers:", error);alert("Failed to apply MCP servers: " + error.message);diff --git a/webui/components/settings/mcp/client/mcp-servers.html b/webui/components/settings/mcp/client/mcp-servers.htmlindex 7534fbcf9..0b415c44c 100644--- a/webui/components/settings/mcp/client/mcp-servers.html+++ b/webui/components/settings/mcp/client/mcp-servers.html@@ -14,7 +14,8 @@<div x-init="$store.mcpServersStore.initialize()" x-destroy="$store.mcpServersStore.onClose()"><h3>MCP Servers Configuration JSON- <button class="btn slim" style="margin-left: 0.5em;" onclick="openModal('settings/mcp/client/example.html')">Examples</button>+ <button class="btn slim" style="margin-left: 0.5em;"+ onclick="openModal('settings/mcp/client/example.html')">Examples</button><button class="btn slim" style="margin-left: 0.5em;"@click="$store.mcpServersStore.formatJson()">Reformat</button><button class="btn slim primary" :disabled="$store.mcpServersStore.loading"@@ -24,57 +25,64 @@<h3 id="mcp-servers-status">Servers status (refreshing automatically)</h3>- <div class="server-list">++ <div class="server-list" x-show="!$store.mcpServersStore.loading"><template x-for="server in $store.mcpServersStore.servers" :key="server.name"><div class="server-item"><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+ <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"+ : '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>-+ <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>+ <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></div></template>- <div x-show="$store.mcpServersStore.servers.length === 0" class="no-servers">+ <div x-show="$store.mcpServersStore.servers.length === 0" class="mcp-servers-loading">No servers</div></div>-+ <div x-show="$store.mcpServersStore.loading" class="mcp-servers-loading">+ Loading servers status...+ </div></div></template></div><style>++ .mcp-servers-loading {+ width: 100%;+ text-align: center;+ margin-top: 2rem;+ margin-bottom: 2rem;+ }#mcp-servers-config-json {width: 100%;height: 40em;@@ -90,8 +98,10 @@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 */+ 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;}@@ -102,7 +112,7 @@flex-direction: column;gap: 0.2em;}-+.server-main-row {display: flex;align-items: center;@@ -115,33 +125,33 @@align-items: center;justify-content: center;}-+.server-name {font-weight: 600;min-width: 12em;}-+.tool-count {color: var(--c-fg2);font-size: 0.9em;user-select: none;}-+.tool-count {cursor: default;}-+.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;@@ -149,11 +159,11 @@text-decoration: none;opacity: 0.85;}-+.log-btn:hover {opacity: 1;}-+.server-error-row {margin-left: 1.8em;margin-top: 0.1em;@@ -162,7 +172,7 @@opacity: 0.85;line-height: 1.2;}-+.no-servers {padding: 0.5em;color: var(--c-fg2);