Unified · Split
| @@ -1,22 +1,38 @@ | ||
| 1 | 1 | import { ToolsView } from "../../../components/tools/tools-view"; |
| 2 | 2 | |
| 3 | +const normalizeOriginCandidate = (value: string | undefined): string | null => { | |
| 4 | + const trimmed = value?.trim(); | |
| 5 | + if (!trimmed) { | |
| 6 | + return null; | |
| 7 | + } | |
| 8 | + | |
| 9 | + const withProtocol = | |
| 10 | + trimmed.startsWith("http://") || trimmed.startsWith("https://") | |
| 11 | + ? trimmed | |
| 12 | + : `https://${trimmed}`; | |
| 13 | + | |
| 14 | + try { | |
| 15 | + return new URL(withProtocol).origin; | |
| 16 | + } catch { | |
| 17 | + return null; | |
| 18 | + } | |
| 19 | +}; | |
| 20 | + | |
| 3 | 21 | const resolveMcpBaseUrl = (): string | null => { |
| 4 | 22 | const candidates = [ |
| 5 | 23 | process.env.CONTROL_PLANE_UPSTREAM_URL, |
| 6 | 24 | process.env.CONTROL_PLANE_SERVER_BASE_URL, |
| 7 | 25 | process.env.NEXT_PUBLIC_CONTROL_PLANE_BASE_URL, |
| 26 | + process.env.EXECUTOR_PUBLIC_ORIGIN, | |
| 27 | + process.env.NEXT_PUBLIC_APP_ORIGIN, | |
| 28 | + process.env.VERCEL_PROJECT_PRODUCTION_URL, | |
| 29 | + process.env.VERCEL_URL, | |
| 8 | 30 | ]; |
| 9 | 31 | |
| 10 | 32 | for (const candidate of candidates) { |
| 11 | − const value = candidate?.trim(); | |
| 12 | − if (!value) { | |
| 13 | − continue; | |
| 14 | − } | |
| 15 | − | |
| 16 | − try { | |
| 17 | − return new URL(value).origin; | |
| 18 | − } catch { | |
| 19 | − // ignore invalid URL and continue | |
| 33 | + const origin = normalizeOriginCandidate(candidate); | |
| 34 | + if (origin) { | |
| 35 | + return origin; | |
| 20 | 36 | } |
| 21 | 37 | } |
| 22 | 38 | |
| @@ -68,6 +68,13 @@ type SourceGroup = { · 67 unmodified lines | ||
| 68 | 68 | const configuredControlPlaneBaseUrl = |
| 69 | 69 | process.env.NEXT_PUBLIC_CONTROL_PLANE_BASE_URL?.trim() ?? ""; |
| 70 | 70 | |
| 71 | +const isLocalHost = (hostname: string): boolean => | |
| 72 | + hostname === "localhost" | |
| 73 | + || hostname === "127.0.0.1" | |
| 74 | + || hostname === "0.0.0.0" | |
| 75 | + || hostname === "::1" | |
| 76 | + || hostname === "[::1]"; | |
| 77 | + | |
| 71 | 78 | // --------------------------------------------------------------------------- |
| 72 | 79 | // Search helpers (ported from old executor explorer-derived.ts) |
| 73 | 80 | // --------------------------------------------------------------------------- |
| @@ -410,7 +417,11 @@ export function ToolsView(props: { · 336 unmodified lines | ||
| 410 | 417 | return `http://127.0.0.1:8788/v1/mcp?workspaceId=${encodeURIComponent(workspaceId)}`; |
| 411 | 418 | } |
| 412 | 419 | |
| 413 | − const url = new URL("/v1/mcp", "http://127.0.0.1:8788"); | |
| 420 | + const baseOrigin = isLocalHost(window.location.hostname) | |
| 421 | + ? "http://127.0.0.1:8788" | |
| 422 | + : window.location.origin; | |
| 423 | + | |
| 424 | + const url = new URL("/v1/mcp", baseOrigin); | |
| 414 | 425 | url.searchParams.set("workspaceId", workspaceId); |
| 415 | 426 | return url.toString(); |
| 416 | 427 | }, [props.mcpBaseUrl, workspaceId]); |