From 198ca4cf9563500c6b00c6cd3beaa0ac67e45d7e Mon Sep 17 00:00:00 2001 From: Codex Date: Tue, 28 Apr 2026 20:19:28 +0000 Subject: [PATCH] Auto-sync MCP broker config from grants --- app/components/McpConfigurationPanel.tsx | 76 +++++++++++++++++++++--- tests/mcp-configuration-page-check.mjs | 4 ++ 2 files changed, 71 insertions(+), 9 deletions(-) diff --git a/app/components/McpConfigurationPanel.tsx b/app/components/McpConfigurationPanel.tsx index 3be00ac..c316ed7 100644 --- a/app/components/McpConfigurationPanel.tsx +++ b/app/components/McpConfigurationPanel.tsx @@ -134,8 +134,10 @@ export default function McpConfigurationPanel({ sandboxes = [] }: McpConfigurati setServers(Array.isArray(data.servers) ? data.servers : []) setConfig(data.config || { mcpServers: {} }) setMessage(success) + return true } catch (error) { setMessage(error instanceof Error ? error.message : "Failed to update MCP configuration") + return false } finally { setSaving(false) } @@ -150,12 +152,72 @@ export default function McpConfigurationPanel({ sandboxes = [] }: McpConfigurati current.delete(sandbox.id) current.delete(sandbox.name) if (allowed) current.add(sandbox.id) + const hasOtherMcpAccess = servers.some((candidate) => candidate.id !== server.id && sandboxAllowed(candidate, sandbox)) return postUpdate({ action: "update-access", serverId: server.id, accessMode: "allow_only", allowedSandboxIds: Array.from(current), - }, `${server.name} sandbox access updated.`) + }, `${server.name} sandbox access updated.`).then((updated) => { + if (!updated) return + return syncSandboxBrokerConfig(sandbox, allowed || hasOtherMcpAccess ? "sync" : "revoke") + }) + } + + async function syncSandboxBrokerConfig(sandbox: McpSandbox, action: "sync" | "revoke" = "sync") { + try { + setSaving(true) + const response = await fetch(`/api/sandbox/${encodeURIComponent(sandbox.id)}/mcp`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ sandboxName: sandbox.name, action }), + }) + const data = await response.json() + if (!response.ok) throw new Error(data.error || "Failed to sync MCP broker config") + setMessage(data.note || (action === "revoke" ? `${sandbox.name} MCP broker config revoked.` : `${sandbox.name} MCP broker config synced.`)) + } catch (error) { + setMessage(error instanceof Error ? error.message : "Failed to sync MCP broker config") + } finally { + setSaving(false) + } + } + + async function syncAccessModeChange(server: McpServerInstall, accessMode: string) { + const updated = await postUpdate({ + action: "update-access", + serverId: server.id, + accessMode, + }, `${server.name} availability updated.`) + if (!updated) return + + if (accessMode === "allow_all") { + await Promise.all(sandboxes.map((sandbox) => syncSandboxBrokerConfig(sandbox))) + return + } + + if (accessMode === "disabled") { + await Promise.all(sandboxes + .filter((sandbox) => sandboxAllowed(server, sandbox)) + .map((sandbox) => { + const hasOtherMcpAccess = servers.some((candidate) => candidate.id !== server.id && sandboxAllowed(candidate, sandbox)) + return syncSandboxBrokerConfig(sandbox, hasOtherMcpAccess ? "sync" : "revoke") + })) + } + } + + async function setServerEnabled(server: McpServerInstall, enabled: boolean) { + const updated = await postUpdate({ + action: "update-access", + serverId: server.id, + enabled, + }, `${server.name} ${enabled ? "enabled" : "disabled"}.`) + if (!updated) return + + const affectedSandboxes = sandboxes.filter((sandbox) => sandboxAllowed(server, sandbox)) + await Promise.all(affectedSandboxes.map((sandbox) => { + const hasOtherMcpAccess = servers.some((candidate) => candidate.id !== server.id && sandboxAllowed(candidate, sandbox)) + return syncSandboxBrokerConfig(sandbox, enabled || hasOtherMcpAccess ? "sync" : "revoke") + })) } function editableServerJson(server: McpServerInstall) { @@ -378,14 +440,14 @@ export default function McpConfigurationPanel({ sandboxes = [] }: McpConfigurati