@mcp-b/webmcp-local-relay 2.2.0 → 2.2.1

package/dist/{mcpRelayServer-rbay_DSr.js → mcpRelayServer-BL8kNwIK.mjs}

@@ -1,105 +1,16 @@
-import { execFile } from "node:child_process";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { CallToolRequestParamsSchema, CallToolResultSchema, ListToolsRequestSchema, ToolAnnotationsSchema, ToolSchema } from "@modelcontextprotocol/sdk/types.js";
-import { z } from "zod/v4";
 import { randomUUID } from "node:crypto";
 import { EventEmitter } from "node:events";
 import WebSocket, { WebSocketServer } from "ws";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
+import { CallToolRequestParamsSchema, CallToolResultSchema, ListToolsRequestSchema, ToolAnnotationsSchema, ToolSchema } from "@modelcontextprotocol/sdk/types.js";
+import { z } from "zod/v4";
+import { execFile } from "node:child_process";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { toJsonSchemaCompat } from "@modelcontextprotocol/sdk/server/zod-json-schema-compat.js";
 
-//#region src/cli-utils.ts
-/**
-* Parses supported CLI flags for relay startup.
-*/
-function parseCliOptions(argv) {
-	const options = {
-		host: "127.0.0.1",
-		port: 9333,
-		portExplicitlySet: false,
-		allowedOrigins: ["*"]
-	};
-	const readFlagValue = (flag, index) => {
-		const next = argv[index + 1];
-		if (!next || next.startsWith("-")) throw new Error(`Missing value for ${flag}`);
-		return next;
-	};
-	for (let i = 0; i < argv.length; i++) {
-		const token = argv[i];
-		if (!token) continue;
-		if (token === "--host" || token === "-H") {
-			options.host = readFlagValue(token, i);
-			i += 1;
-			continue;
-		}
-		if (token === "--port" || token === "-p") {
-			const raw = readFlagValue(token, i);
-			i += 1;
-			const value = Number.parseInt(raw, 10);
-			if (!Number.isFinite(value) || value <= 0 || value > 65535) throw new Error(`Invalid port "${raw}". Port must be a number between 1 and 65535.`);
-			options.port = value;
-			options.portExplicitlySet = true;
-			continue;
-		}
-		if (token === "--widget-origin" || token === "--allowed-origin" || token === "--ws-origin") {
-			const raw = readFlagValue(token, i);
-			i += 1;
-			const split = raw.split(",").map((part) => part.trim()).filter(Boolean);
-			if (split.length > 0) options.allowedOrigins = split;
-			continue;
-		}
-		if (token === "--label") {
-			options.label = readFlagValue(token, i);
-			i += 1;
-			continue;
-		}
-		if (token === "--workspace") {
-			options.workspace = readFlagValue(token, i);
-			i += 1;
-			continue;
-		}
-		if (token === "--relay-id") {
-			options.relayId = readFlagValue(token, i);
-			i += 1;
-			continue;
-		}
-		if (token === "--help" || token === "-h") {
-			printHelp();
-			process.exit(0);
-		}
-		if (token.startsWith("-")) process.stderr.write(`[webmcp-local-relay] warn: unrecognized argument "${token}"\n`);
-		else process.stderr.write(`[webmcp-local-relay] warn: unrecognized argument "${token}" (positional arguments are not supported)\n`);
-	}
-	return options;
-}
-/**
-* Prints CLI usage to stderr.
-*/
-function printHelp() {
-	process.stderr.write([
-		"webmcp-local-relay",
-		"",
-		"Usage:",
-		"  webmcp-local-relay [--host 127.0.0.1] [--port 9333] [--widget-origin https://myapp.example.com]",
-		"",
-		"Options:",
-		"  --host, -H               Bind host for local websocket relay (default: 127.0.0.1)",
-		"  --port, -p               Preferred root port for the local relay cluster (default: 9333)",
-		"  --widget-origin          Allowed host page origin(s), comma-separated (default: *)",
-		"  --allowed-origin         Alias for --widget-origin",
-		"  --ws-origin              Alias for --widget-origin",
-		"  --label                  Human-readable relay label reported during discovery",
-		"  --workspace              Optional workspace name reported during discovery",
-		"  --relay-id               Stable relay identifier reported during discovery",
-		"  --help, -h               Show help",
-		""
-	].join("\n"));
-}
-
-//#endregion
 //#region src/portStrategy.ts
 const DEFAULT_RELAY_PORT = 9333;
 const DEFAULT_RELAY_PORT_RANGE_END = 9348;
@@ -123,7 +34,7 @@ async function readPersistedPort(path = defaultRelayPortPersistPath(), options =
 		if (typeof parsed.port !== "number" || !Number.isInteger(parsed.port) || parsed.port < 1 || parsed.port > 65535) return null;
 		if (typeof parsed.host !== "string" || parsed.host.length === 0) return null;
 		if (options.expectedHost && parsed.host !== options.expectedHost) return null;
-		const maxAgeMs = options.maxAgeMs ?? RELAY_PORT_CACHE_MAX_AGE_MS;
+		const maxAgeMs = options.maxAgeMs ?? 864e5;
 		const now = options.now ?? Date.now();
 		const updatedAtMs = typeof parsed.updatedAt === "string" ? Date.parse(parsed.updatedAt) : NaN;
 		if (!Number.isFinite(updatedAtMs) || now - updatedAtMs > maxAgeMs) return null;
@@ -373,13 +284,13 @@ var RelayRegistry = class {
 		if (!providers || providers.length === 0) return null;
 		const rankedProviders = this.sortProvidersByRecency(providers);
 		if (options.sourceId) {
-			const byConnection = rankedProviders.find((provider$1) => provider$1.sourceId === options.sourceId);
+			const byConnection = rankedProviders.find((provider) => provider.sourceId === options.sourceId);
 			if (byConnection) return {
 				connectionId: byConnection.sourceId,
 				tool: byConnection.tool,
 				publicToolName: byConnection.publicToolName
 			};
-			const byTabId = rankedProviders.find((provider$1) => provider$1.tabId === options.sourceId);
+			const byTabId = rankedProviders.find((provider) => provider.tabId === options.sourceId);
 			if (byTabId) return {
 				connectionId: byTabId.sourceId,
 				tool: byTabId.tool,
@@ -388,7 +299,7 @@ var RelayRegistry = class {
 			return null;
 		}
 		if (options.requestTabId) {
-			const byRequestTab = rankedProviders.find((provider$1) => provider$1.tabId === options.requestTabId);
+			const byRequestTab = rankedProviders.find((provider) => provider.tabId === options.requestTabId);
 			if (!byRequestTab) return null;
 			return {
 				connectionId: byRequestTab.sourceId,
@@ -519,6 +430,20 @@ const BrowserToolResultMessageSchema = z.object({
 */
 const BrowserPongMessageSchema = z.object({ type: z.literal("pong") });
 /**
+* Schema for elicitation request forwarded from a browser tool handler.
+*
+* When a WebMCP tool handler calls `elicitInput()`, the embed script
+* intercepts the call and forwards the parameters to the relay via this
+* message type. The relay then sends `elicitation/create` to the MCP
+* client (e.g. Claude Code) and returns the result via an
+* `elicitation-response` message.
+*/
+const BrowserElicitationRequestSchema = z.object({
+	type: z.literal("elicitation-request"),
+	callId: z.string().min(1),
+	params: z.record(z.string(), z.unknown())
+});
+/**
 * Union schema for all browser-to-relay protocol messages.
 */
 const BrowserToRelayMessageSchema = z.discriminatedUnion("type", [
@@ -526,7 +451,8 @@ const BrowserToRelayMessageSchema = z.discriminatedUnion("type", [
 	BrowserToolsListMessageSchema,
 	BrowserToolsChangedMessageSchema,
 	BrowserToolResultMessageSchema,
-	BrowserPongMessageSchema
+	BrowserPongMessageSchema,
+	BrowserElicitationRequestSchema
 ]);
 /**
 * Shared relay identity used for discovery and attach verification.
@@ -549,6 +475,18 @@ const ServerHelloMessageSchema = z.object({
 	...RelayDescriptorSchema.shape
 });
 /**
+* Schema for acceptance of a browser source hello message.
+*/
+const RelayHelloAcceptedMessageSchema = z.object({ type: z.literal("hello/accepted") });
+/**
+* Schema for rejection of a browser source hello message.
+*/
+const RelayHelloRejectedMessageSchema = z.object({
+	type: z.literal("hello/rejected"),
+	reason: z.string().min(1),
+	message: z.string().min(1)
+});
+/**
 * Schema for relay invocation messages sent to browser sources.
 */
 const RelayInvokeMessageSchema = z.object({
@@ -566,13 +504,26 @@ const RelayPingMessageSchema = z.object({ type: z.literal("ping") });
 */
 const RelayReloadMessageSchema = z.object({ type: z.literal("reload") });
 /**
+* Schema for elicitation response sent from relay to browser.
+*
+* Contains the MCP client's response to an `elicitation/create` request.
+*/
+const RelayElicitationResponseSchema = z.object({
+	type: z.literal("elicitation-response"),
+	callId: z.string().min(1),
+	result: z.record(z.string(), z.unknown())
+});
+/**
 * Union schema for all relay-to-browser protocol messages.
 */
 const RelayToBrowserMessageSchema = z.discriminatedUnion("type", [
 	ServerHelloMessageSchema,
+	RelayHelloAcceptedMessageSchema,
+	RelayHelloRejectedMessageSchema,
 	RelayInvokeMessageSchema,
 	RelayPingMessageSchema,
-	RelayReloadMessageSchema
+	RelayReloadMessageSchema,
+	RelayElicitationResponseSchema
 ]);
 /**
 * Relay-to-relay protocol (client mode <-> server mode).
@@ -725,10 +676,10 @@ var RelayBridgeServer = class extends EventEmitter {
 		super();
 		this.registry = registry ?? new RelayRegistry();
 		this.host = options.host ?? "127.0.0.1";
-		this.preferredPort = options.port ?? DEFAULT_RELAY_PORT;
+		this.preferredPort = options.port ?? 9333;
 		this.desiredPort = this.preferredPort;
 		this.portExplicitlySet = options.portExplicitlySet ?? false;
-		this.portRangeEnd = options.portRangeEnd ?? Math.max(DEFAULT_RELAY_PORT_RANGE_END, this.preferredPort);
+		this.portRangeEnd = options.portRangeEnd ?? Math.max(9348, this.preferredPort);
 		this.persistPath = options.persistPath ?? defaultRelayPortPersistPath();
 		this.allowedOrigins = options.allowedOrigins ?? ["*"];
 		this.maxPayloadBytes = options.maxPayloadBytes ?? 1e6;
@@ -1039,12 +990,18 @@ var RelayBridgeServer = class extends EventEmitter {
 		switch (message.type) {
 			case "hello":
 				try {
+					const socket = this.socketByConnectionId.get(connectionId);
 					if (!this.isHostOriginAllowed(message.origin)) {
 						process.stderr.write(`[webmcp-local-relay] warn: rejecting source ${connectionId} with disallowed host origin: ${message.origin ?? "missing"}\n`);
-						this.socketByConnectionId.get(connectionId)?.close(1008, "Host origin not allowed");
+						if (socket) this.sendHelloRejected(socket, {
+							type: "hello/rejected",
+							reason: "host-origin-not-allowed",
+							message: "Host page origin is not allowed by this relay."
+						}, 1008, "Host origin not allowed");
 						break;
 					}
 					this.registry.upsertSource(connectionId, message);
+					if (socket) this.sendHelloAccepted(socket, { type: "hello/accepted" });
 					this.emit("stateChanged");
 				} catch (err) {
 					process.stderr.write(`[webmcp-local-relay] error: failed to process hello from connection ${connectionId}: ${err instanceof Error ? err.stack ?? err.message : String(err)}\n`);
@@ -1077,6 +1034,33 @@ var RelayBridgeServer = class extends EventEmitter {
 			case "pong":
 				this.lastPongByConnectionId.set(connectionId, Date.now());
 				break;
+			case "elicitation-request":
+				this.emit("elicitationRequest", {
+					callId: message.callId,
+					connectionId,
+					params: message.params
+				});
+				break;
+		}
+	}
+	/**
+	* Sends an elicitation response back to the browser source that requested it.
+	*/
+	sendElicitationResponse(connectionId, callId, result) {
+		const socket = this.socketByConnectionId.get(connectionId);
+		if (!socket || socket.readyState !== WebSocket.OPEN) {
+			process.stderr.write(`[webmcp-local-relay] warn: cannot send elicitation response — source ${connectionId} disconnected\n`);
+			return;
+		}
+		const message = {
+			type: "elicitation-response",
+			callId,
+			result
+		};
+		try {
+			socket.send(JSON.stringify(message));
+		} catch (err) {
+			process.stderr.write(`[webmcp-local-relay] warn: failed to send elicitation response: ${err instanceof Error ? err.message : String(err)}\n`);
 		}
 	}
 	/**
@@ -1439,13 +1423,33 @@ var RelayBridgeServer = class extends EventEmitter {
 	* Maps aggregated tools to the wire format used by the relay protocol.
 	*/
 	toWireTools(tools) {
-		return tools.map(({ originalName: _originalName, sources: _sources,...tool }) => tool);
+		return tools.map(({ originalName: _originalName, sources: _sources, ...tool }) => tool);
 	}
 	isHostOriginAllowed(origin) {
 		if (this.allowedOrigins.includes("*")) return true;
 		if (!origin) return false;
 		return this.allowedOrigins.includes(origin);
 	}
+	sendHelloAccepted(socket, message) {
+		try {
+			socket.send(JSON.stringify(message));
+		} catch (err) {
+			process.stderr.write(`[webmcp-local-relay] warn: failed to send hello acceptance: ${err instanceof Error ? err.message : String(err)}\n`);
+			socket.close(1011, "Failed to send hello acceptance");
+		}
+	}
+	sendHelloRejected(socket, message, closeCode, closeReason) {
+		try {
+			socket.send(JSON.stringify(message), () => {
+				try {
+					socket.close(closeCode, closeReason);
+				} catch {}
+			});
+		} catch (err) {
+			process.stderr.write(`[webmcp-local-relay] warn: failed to send hello rejection: ${err instanceof Error ? err.message : String(err)}\n`);
+			socket.close(closeCode, closeReason);
+		}
+	}
 	/**
 	* Validates browser tool results against CallToolResultSchema.
 	* Non-conforming payloads are wrapped as error results with diagnostic text.
@@ -1475,6 +1479,95 @@ var RelayBridgeServer = class extends EventEmitter {
 	}
 };
 
+//#endregion
+//#region src/cli-utils.ts
+/**
+* Parses supported CLI flags for relay startup.
+*/
+function parseCliOptions(argv) {
+	const options = {
+		host: "127.0.0.1",
+		port: 9333,
+		portExplicitlySet: false,
+		allowedOrigins: ["*"]
+	};
+	const readFlagValue = (flag, index) => {
+		const next = argv[index + 1];
+		if (!next || next.startsWith("-")) throw new Error(`Missing value for ${flag}`);
+		return next;
+	};
+	for (let i = 0; i < argv.length; i++) {
+		const token = argv[i];
+		if (!token) continue;
+		if (token === "--host" || token === "-H") {
+			options.host = readFlagValue(token, i);
+			i += 1;
+			continue;
+		}
+		if (token === "--port" || token === "-p") {
+			const raw = readFlagValue(token, i);
+			i += 1;
+			const value = Number.parseInt(raw, 10);
+			if (!Number.isFinite(value) || value <= 0 || value > 65535) throw new Error(`Invalid port "${raw}". Port must be a number between 1 and 65535.`);
+			options.port = value;
+			options.portExplicitlySet = true;
+			continue;
+		}
+		if (token === "--widget-origin" || token === "--allowed-origin" || token === "--ws-origin") {
+			const raw = readFlagValue(token, i);
+			i += 1;
+			const split = raw.split(",").map((part) => part.trim()).filter(Boolean);
+			if (split.length > 0) options.allowedOrigins = split;
+			continue;
+		}
+		if (token === "--label") {
+			options.label = readFlagValue(token, i);
+			i += 1;
+			continue;
+		}
+		if (token === "--workspace") {
+			options.workspace = readFlagValue(token, i);
+			i += 1;
+			continue;
+		}
+		if (token === "--relay-id") {
+			options.relayId = readFlagValue(token, i);
+			i += 1;
+			continue;
+		}
+		if (token === "--help" || token === "-h") {
+			printHelp();
+			process.exit(0);
+		}
+		if (token.startsWith("-")) process.stderr.write(`[webmcp-local-relay] warn: unrecognized argument "${token}"\n`);
+		else process.stderr.write(`[webmcp-local-relay] warn: unrecognized argument "${token}" (positional arguments are not supported)\n`);
+	}
+	return options;
+}
+/**
+* Prints CLI usage to stderr.
+*/
+function printHelp() {
+	process.stderr.write([
+		"webmcp-local-relay",
+		"",
+		"Usage:",
+		"  webmcp-local-relay [--host 127.0.0.1] [--port 9333] [--widget-origin https://myapp.example.com]",
+		"",
+		"Options:",
+		"  --host, -H               Bind host for local websocket relay (default: 127.0.0.1)",
+		"  --port, -p               Preferred root port for the local relay cluster (default: 9333)",
+		"  --widget-origin          Allowed host page origin(s), comma-separated (default: *)",
+		"  --allowed-origin         Alias for --widget-origin",
+		"  --ws-origin              Alias for --widget-origin",
+		"  --label                  Human-readable relay label reported during discovery",
+		"  --workspace              Optional workspace name reported during discovery",
+		"  --relay-id               Stable relay identifier reported during discovery",
+		"  --help, -h               Show help",
+		""
+	].join("\n"));
+}
+
 //#endregion
 //#region src/staticToolSchemas.ts
 const EMPTY_STATIC_TOOL_INPUT_SHAPE = {};
@@ -1538,6 +1631,22 @@ var LocalRelayMcpServer = class {
 				this.logSyncError(err);
 			});
 		});
+		this.bridge.on("elicitationRequest", (request) => {
+			(async () => {
+				try {
+					const result = await this.mcpServer.server.elicitInput(request.params);
+					this.bridge.sendElicitationResponse(request.connectionId, request.callId, result);
+				} catch (err) {
+					const message = err instanceof Error ? err.message : String(err);
+					process.stderr.write(`[webmcp-local-relay] warn: elicitation forwarding failed: ${message}\n`);
+					this.bridge.sendElicitationResponse(request.connectionId, request.callId, {
+						action: "decline",
+						content: null,
+						error: message
+					});
+				}
+			})();
+		});
 		this.registerStaticTools();
 		this.overrideListToolsHandler();
 	}
@@ -1557,6 +1666,9 @@ var LocalRelayMcpServer = class {
 		if (this.connected) throw new Error("MCP server transport already connected");
 		await this.mcpServer.connect(transport);
 		this.connected = true;
+		this.mcpServer.server.onerror = (error) => {
+			process.stderr.write(`[webmcp-local-relay] error: MCP protocol error: ${error instanceof Error ? error.stack ?? error.message : String(error)}\n`);
+		};
 	}
 	/**
 	* Convenience helper that connects the server over stdio transport.
@@ -1633,11 +1745,11 @@ var LocalRelayMcpServer = class {
 			},
 			handler: async () => {
 				if (this.bridge.mode === "client") {
-					const sources$1 = this.bridge.listSourcesFromRelay();
+					const sources = this.bridge.listSourcesFromRelay();
 					const info = {
 						mode: "client",
-						count: sources$1.length,
-						sources: sources$1
+						count: sources.length,
+						sources
 					};
 					return {
 						content: [{
@@ -2029,5 +2141,5 @@ var LocalRelayMcpServer = class {
 };
 
 //#endregion
-export { normalizeInboundTool as C, ToolSchema as S, printHelp as T, DEFAULT_TOOL_INPUT_SCHEMA as _, RelayDescriptorSchema as a, RelayInvokeArgsSchema as b, RelayToBrowserMessageSchema as c, RelayRegistry as d, buildPublicToolName as f, CallToolResultSchema as g, CallToolRequestParamsSchema as h, RelayClientToServerMessageSchema as i, ServerHelloMessageSchema as l, sanitizeName as m, RelayBridgeServer as n, RelayServerToClientMessageSchema as o, extractSanitizedDomain as p, BrowserToRelayMessageSchema as r, RelaySourceInfoSchema as s, LocalRelayMcpServer as t, HelloRequiredError as u, InboundToolSchema as v, parseCliOptions as w, ToolAnnotationsSchema as x, NormalizedToolSchema as y };
-//# sourceMappingURL=mcpRelayServer-rbay_DSr.js.map
+export { NormalizedToolSchema as C, normalizeInboundTool as D, ToolSchema as E, InboundToolSchema as S, ToolAnnotationsSchema as T, extractSanitizedDomain as _, BrowserToRelayMessageSchema as a, CallToolResultSchema as b, RelayHelloAcceptedMessageSchema as c, RelaySourceInfoSchema as d, RelayToBrowserMessageSchema as f, buildPublicToolName as g, RelayRegistry as h, RelayBridgeServer as i, RelayHelloRejectedMessageSchema as l, HelloRequiredError as m, parseCliOptions as n, RelayClientToServerMessageSchema as o, ServerHelloMessageSchema as p, printHelp as r, RelayDescriptorSchema as s, LocalRelayMcpServer as t, RelayServerToClientMessageSchema as u, sanitizeName as v, RelayInvokeArgsSchema as w, DEFAULT_TOOL_INPUT_SCHEMA as x, CallToolRequestParamsSchema as y };
+//# sourceMappingURL=mcpRelayServer-BL8kNwIK.mjs.map