diff --git a/app/api/mcp/broker/call/route.ts b/app/api/mcp/broker/call/route.ts index 643e44c..eddcb1f 100644 --- a/app/api/mcp/broker/call/route.ts +++ b/app/api/mcp/broker/call/route.ts @@ -5,16 +5,38 @@ import { verifySandboxMcpBrokerToken, } from "@/app/lib/mcpBrokerStore" import { callBrokerServerTool } from "@/app/lib/mcpBrokerClient" +import { + brokerMcpUnauthorizedError, + handleBrokerMcpJsonRpcBody, + isBrokerMcpJsonRpcBody, +} from "@/app/lib/mcpBrokerProtocol" + +function jsonRpcResponse(payload: unknown, status = 200) { + return NextResponse.json(payload, { + status, + headers: { "Cache-Control": "no-store" }, + }) +} export async function POST(request: Request) { try { + const body = await request.json().catch(() => ({})) const token = readBrokerToken(request) const session = token ? await verifySandboxMcpBrokerToken(token) : null + const isMcpJsonRpc = isBrokerMcpJsonRpcBody(body) if (!session) { + if (isMcpJsonRpc) return jsonRpcResponse(brokerMcpUnauthorizedError(), 401) return NextResponse.json({ ok: false, error: "MCP broker is unavailable for this sandbox." }, { status: 401 }) } - const body = await request.json().catch(() => ({})) + if (isMcpJsonRpc) { + const response = await handleBrokerMcpJsonRpcBody(session, body) + if (response.body === null) { + return new Response(null, { status: response.status, headers: { "Cache-Control": "no-store" } }) + } + return jsonRpcResponse(response.body, response.status) + } + const requestedServerId = typeof body?.serverId === "string" ? body.serverId : "" const toolName = typeof body?.toolName === "string" ? body.toolName : "" const toolArguments = body?.arguments && typeof body.arguments === "object" && !Array.isArray(body.arguments) diff --git a/app/api/mcp/broker/mcp/route.ts b/app/api/mcp/broker/mcp/route.ts new file mode 100644 index 0000000..1e0ad38 --- /dev/null +++ b/app/api/mcp/broker/mcp/route.ts @@ -0,0 +1,47 @@ +import { NextResponse } from "next/server" +import { + readBrokerToken, + verifySandboxMcpBrokerToken, +} from "@/app/lib/mcpBrokerStore" +import { + brokerMcpUnauthorizedError, + handleBrokerMcpJsonRpcBody, + MCP_PROTOCOL_VERSION, +} from "@/app/lib/mcpBrokerProtocol" + +function jsonRpcResponse(payload: unknown, status = 200) { + return NextResponse.json(payload, { + status, + headers: { "Cache-Control": "no-store" }, + }) +} + +export async function POST(request: Request) { + const parsedBody = await request.json().catch(() => null) + const token = readBrokerToken(request) + const session = token ? await verifySandboxMcpBrokerToken(token) : null + if (!session) { + return jsonRpcResponse(brokerMcpUnauthorizedError(), 401) + } + + const response = await handleBrokerMcpJsonRpcBody(session, parsedBody) + if (response.body === null) { + return new Response(null, { status: response.status, headers: { "Cache-Control": "no-store" } }) + } + + return jsonRpcResponse(response.body, response.status) +} + +export async function GET(request: Request) { + const token = readBrokerToken(request) + const session = token ? await verifySandboxMcpBrokerToken(token) : null + if (!session) { + return jsonRpcResponse(brokerMcpUnauthorizedError(), 401) + } + return jsonRpcResponse({ + ok: true, + endpoint: "mcp", + protocol: MCP_PROTOCOL_VERSION, + note: "POST MCP JSON-RPC messages to this endpoint.", + }) +} diff --git a/app/api/mcp/route.ts b/app/api/mcp/route.ts index 6443621..ffbfe55 100644 --- a/app/api/mcp/route.ts +++ b/app/api/mcp/route.ts @@ -6,6 +6,7 @@ import { updateMcpServerAccess, uninstallMcpServer, } from "@/app/lib/mcpServerStore" +import { autoSyncSandboxMcpAccess } from "@/app/lib/mcpSandboxAutoSync" export async function GET() { try { @@ -23,29 +24,44 @@ export async function POST(request: Request) { if (action === "uninstall") { const serverId = typeof body?.serverId === "string" ? body.serverId : "" - return NextResponse.json({ server: await uninstallMcpServer(serverId), ...(await listMcpServers()) }) + const before = await listMcpServers() + const server = await uninstallMcpServer(serverId) + const after = await listMcpServers() + const sandboxSync = await autoSyncSandboxMcpAccess(request, before.servers, after.servers, [server.id]) + return NextResponse.json({ server, ...after, sandboxSync }) } if (action === "enable" || action === "disable") { const serverId = typeof body?.serverId === "string" ? body.serverId : "" + const before = await listMcpServers() + const server = await setMcpServerEnabled(serverId, action === "enable") + const after = await listMcpServers() + const sandboxSync = await autoSyncSandboxMcpAccess(request, before.servers, after.servers, [server.id]) return NextResponse.json({ - server: await setMcpServerEnabled(serverId, action === "enable"), - ...(await listMcpServers()), + server, + ...after, + sandboxSync, }) } if (action === "update-access") { const serverId = typeof body?.serverId === "string" ? body.serverId : "" + const before = await listMcpServers() + const server = await updateMcpServerAccess(serverId, { + enabled: typeof body?.enabled === "boolean" ? body.enabled : undefined, + accessMode: body?.accessMode, + allowedSandboxIds: Array.isArray(body?.allowedSandboxIds) ? body.allowedSandboxIds : undefined, + }) + const after = await listMcpServers() + const sandboxSync = await autoSyncSandboxMcpAccess(request, before.servers, after.servers, [server.id]) return NextResponse.json({ - server: await updateMcpServerAccess(serverId, { - enabled: typeof body?.enabled === "boolean" ? body.enabled : undefined, - accessMode: body?.accessMode, - allowedSandboxIds: Array.isArray(body?.allowedSandboxIds) ? body.allowedSandboxIds : undefined, - }), - ...(await listMcpServers()), + server, + ...after, + sandboxSync, }) } + const before = await listMcpServers() const server = await installMcpServer({ id: body?.id, name: body?.name, @@ -61,8 +77,10 @@ export async function POST(request: Request) { accessMode: body?.accessMode, allowedSandboxIds: body?.allowedSandboxIds, }) + const after = await listMcpServers() + const sandboxSync = await autoSyncSandboxMcpAccess(request, before.servers, after.servers, [server.id]) - return NextResponse.json({ server, ...(await listMcpServers()) }) + return NextResponse.json({ server, ...after, sandboxSync }) } catch (error) { const message = error instanceof Error ? error.message : "Failed to update MCP servers" return NextResponse.json({ error: message }, { status: 400 }) diff --git a/app/api/sandbox/[sandboxId]/mcp/route.ts b/app/api/sandbox/[sandboxId]/mcp/route.ts index b01bce7..ad25ccc 100644 --- a/app/api/sandbox/[sandboxId]/mcp/route.ts +++ b/app/api/sandbox/[sandboxId]/mcp/route.ts @@ -28,9 +28,12 @@ export async function GET( "", "This preview omits the broker token. Use POST to issue and write a live broker config.", "", + `- MCP: \`${brokerUrl}/mcp\``, `- Capabilities: \`${brokerUrl}/capabilities\``, `- Call: \`${brokerUrl}/call\``, "", + "OpenClaw will receive an `openshell-control` MCP server entry that uses the MCP endpoint.", + "", ].join("\n"), }) } catch (error) { @@ -74,7 +77,7 @@ export async function POST( sandboxId, synced, network, - note: `Issued MCP broker config at ${synced.path}.`, + note: `Issued MCP broker config at ${synced.path} and ${synced.openClaw.path}.`, }) } catch (error) { const message = error instanceof Error ? error.message : "Failed to issue MCP broker config" diff --git a/app/components/McpConfigurationPanel.tsx b/app/components/McpConfigurationPanel.tsx index 31c6ae6..6283cdd 100644 --- a/app/components/McpConfigurationPanel.tsx +++ b/app/components/McpConfigurationPanel.tsx @@ -402,34 +402,12 @@ 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.`).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) - } + }, `${server.name} sandbox access updated.`) } async function syncAccessModeChange(server: McpServerInstall, accessMode: string) { @@ -439,20 +417,6 @@ export default function McpConfigurationPanel({ sandboxes = [] }: McpConfigurati 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) { @@ -462,12 +426,6 @@ export default function McpConfigurationPanel({ sandboxes = [] }: McpConfigurati 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) { diff --git a/app/components/SandboxList.tsx b/app/components/SandboxList.tsx index 8cc9b13..cbe1422 100644 --- a/app/components/SandboxList.tsx +++ b/app/components/SandboxList.tsx @@ -305,11 +305,10 @@ export default function SandboxList({ enabled: true, accessMode: server.accessMode === 'allow_all' ? 'allow_all' : 'allow_only', allowedSandboxIds: Array.from(current), - }, `${server.name} enabled for ${sandbox.name}.`).then(() => syncMcpManifest(sandbox)) + }, `${server.name} enabled for ${sandbox.name}.`) } const revokeMcpForSandbox = (sandbox: SandboxInventoryItem, server: McpServerAccess) => { - const hasOtherMcpAccess = mcpServers.some((candidate) => candidate.id !== server.id && sandboxCanAccessMcpServer(sandbox, candidate)) const current = new Set(server.allowedSandboxIds) current.delete(sandbox.id) current.delete(sandbox.name) @@ -321,7 +320,7 @@ export default function SandboxList({ return updateMcpServerAccess(server, { accessMode: 'allow_only', allowedSandboxIds: Array.from(current), - }, `${server.name} revoked from ${sandbox.name}.`).then(() => syncMcpManifest(sandbox, hasOtherMcpAccess ? 'sync' : 'revoke')) + }, `${server.name} revoked from ${sandbox.name}.`) } const resolvePermissionRequest = async (sandbox: SandboxInventoryItem, action: 'approve' | 'reject', chunkId: string) => { @@ -613,7 +612,7 @@ export default function SandboxList({

Sandbox Manifest

- Writes /sandbox/openshell_control_mcp.md with broker URL and sandbox token only. + Writes /sandbox/openshell_control_mcp.md and configures OpenClaw to use the broker MCP endpoint.