Agent Zero AI framework
Polish MCP server removal flow
Alessandroda4fb47d0b8c
diff --git a/webui/components/settings/AGENTS.md b/webui/components/settings/AGENTS.mdindex 4fb443bb9..7ea29a6d0 100644--- a/webui/components/settings/AGENTS.md+++ b/webui/components/settings/AGENTS.md@@ -16,6 +16,7 @@- Do not store secrets in localStorage, URLs, or console output.- Preserve Store Gating and modal footer conventions in settings components.- MCP manager tool toggles write `disabled_tools` into the draft JSON and require Apply before changing the running MCP tool set.+- Confirmed MCP server removals apply immediately and refresh server status; other MCP manager draft edits still require Apply.## Work Guidancediff --git a/webui/components/settings/mcp/client/mcp-servers-store.js b/webui/components/settings/mcp/client/mcp-servers-store.jsindex b572ebe3a..0963438c0 100644--- a/webui/components/settings/mcp/client/mcp-servers-store.js+++ b/webui/components/settings/mcp/client/mcp-servers-store.js@@ -865,15 +865,33 @@ const model = {requestAnimationFrame(() => globalThis.scrollModal?.("mcp-add-server"));},- removeConfigServer(name) {+ async removeConfigServer(name) {try {const config = this.getConfigObject();+ const normalized = normalizeName(name);+ let removed = false;+if (Array.isArray(config.mcpServers)) {- config.mcpServers = config.mcpServers.filter((server) => normalizeName(server?.name || "") !== normalizeName(name));- } else {- delete config.mcpServers[name];+ const nextServers = config.mcpServers.filter((server) => normalizeName(server?.name || "") !== normalized);+ removed = nextServers.length !== config.mcpServers.length;+ config.mcpServers = nextServers;+ } else if (config.mcpServers && typeof config.mcpServers === "object") {+ const key = Object.keys(config.mcpServers).find((serverName) => normalizeName(serverName) === normalized);+ if (key) {+ delete config.mcpServers[key];+ removed = true;+ }}++ if (!removed) {+ void toastFrontendWarning("MCP server is no longer in this config.", "MCP Servers");+ await this.loadStatus({ silent: true });+ return;+ }+this.setEditorValue(stringifyConfig(config));+ if (normalizeName(this.serverForm.name) === normalized) this.resetForm();+ await this.applyNow({ successMessage: "MCP server removed" });} catch (error) {void toastFrontendError(`Failed to remove MCP server: ${error.message || error}`, "MCP Servers");}@@ -995,7 +1013,7 @@ const model = {this.statusCheck = false;},- async applyNow() {+ async applyNow(options = {}) {if (this.applying) return;try {const formatted = stringifyConfig(this.getConfigObject());@@ -1012,9 +1030,13 @@ const model = {this.setScopeConfigJson(resp.mcp_servers || this.getEditorValue());this.servers = resp.status || [];this.servers.sort((a, b) => String(a.name || "").localeCompare(String(b.name || "")));- void toastFrontendSuccess("MCP servers applied", "MCP Servers");+ if (options.successMessage !== false) {+ void toastFrontendSuccess(options.successMessage || "MCP servers applied", "MCP Servers");+ }await sleep(100);- if (globalThis.scrollModal) globalThis.scrollModal("mcp-servers-status");+ if (options.scrollToStatus !== false && globalThis.scrollModal) {+ globalThis.scrollModal("mcp-servers-status");+ }} catch (error) {console.error("Failed to apply MCP servers:", error);void toastFrontendError(`Failed to apply MCP servers: ${error.message || error}`, "MCP Servers");diff --git a/webui/components/settings/mcp/client/mcp-servers.html b/webui/components/settings/mcp/client/mcp-servers.htmlindex 4e7115edc..a9dc7db23 100644--- a/webui/components/settings/mcp/client/mcp-servers.html+++ b/webui/components/settings/mcp/client/mcp-servers.html@@ -94,7 +94,9 @@</label><span class="plugin-status-text" x-text="entry.config.disabled ? 'OFF' : 'ON'"></span></div>- <button type="button" class="mcp-icon-button danger" title="Remove" @click="$store.mcpServersStore.removeConfigServer(entry.name)">+ <button type="button" class="mcp-icon-button" title="Remove"+ :disabled="$store.mcpServersStore.applying"+ @click="$confirmClick($event, () => $store.mcpServersStore.removeConfigServer(entry.name))"><span class="material-symbols-outlined" aria-hidden="true">delete</span></button></div>@@ -704,8 +706,9 @@cursor: pointer;}- .mcp-icon-button.danger {- color: var(--color-error-text);+ .mcp-icon-button:disabled {+ opacity: 0.55;+ cursor: not-allowed;}.mcp-raw-toolbar {