@mcp-b/webmcp-ts-sdk 2.3.2 → 3.0.0

package/dist/index.js

@@ -5053,6 +5053,9 @@ function toStructuredContent(value) {
 	if (!isPlainObject$1(value) || !isJsonValue(value)) return;
 	return value;
 }
+function isPromiseLike(value) {
+	return Boolean(value) && (typeof value === "object" || typeof value === "function") && typeof value.then === "function";
+}
 function serializeTextContent(value) {
 	if (typeof value === "string") return value;
 	try {
@@ -5087,8 +5090,8 @@ function withDefaultTimeout(options) {
 * (resources, prompts, elicitation, sampling) via BaseMcpServer.
 *
 * Deprecated compatibility (kept for Chrome Beta 147 and existing wrappers,
-* removed in the next major): `unregisterTool(name)`, `provideContext()`,
-* `clearContext()`, and the `{ unregister }` handle returned from `registerTool`.
+* removed in the next major): `unregisterTool(name)` and the `{ unregister }`
+* handle returned from `registerTool`.
 *
 * When `native` is provided, tool operations are mirrored so that
 * navigator.modelContextTesting stays in sync.
@@ -5099,8 +5102,6 @@ var BrowserMcpServer = class extends McpServer {
 	_promptSchemas = /* @__PURE__ */ new Map();
 	_jsonValidator;
 	_publicMethodsBound = false;
-	_provideContextDeprecationWarned = false;
-	_clearContextDeprecationWarned = false;
 	_unregisterToolDeprecationWarned = false;
 	_nativeToolCleanups = /* @__PURE__ */ new Map();
 	_producerEventTarget = new EventTarget();
@@ -5128,8 +5129,6 @@ var BrowserMcpServer = class extends McpServer {
 		if (this._publicMethodsBound) return;
 		this.registerTool = this.registerTool.bind(this);
 		this.unregisterTool = this.unregisterTool.bind(this);
-		this.provideContext = this.provideContext.bind(this);
-		this.clearContext = this.clearContext.bind(this);
 		this.listTools = this.listTools.bind(this);
 		this.getTools = this.getTools.bind(this);
 		this.callTool = this.callTool.bind(this);
@@ -5229,9 +5228,10 @@ var BrowserMcpServer = class extends McpServer {
 		const nativeRegister = this.native.registerTool;
 		const nativeUnregisterTool = this.getNativeUnregisterTool();
 		const cleanup = Boolean(signal) || !nativeUnregisterTool ? this.createNativeToolCleanup(signal) : void 0;
+		let nativeRegisterResult;
 		try {
-			if (cleanup) nativeRegister.call(this.native, tool, cleanup.options);
-			else nativeRegister.call(this.native, tool);
+			if (cleanup) nativeRegisterResult = nativeRegister.call(this.native, tool, cleanup.options);
+			else nativeRegisterResult = nativeRegister.call(this.native, tool);
 		} catch (error) {
 			cleanup?.abort();
 			if (isPermissionsPolicySecurityError(error)) {
@@ -5246,6 +5246,15 @@ var BrowserMcpServer = class extends McpServer {
 			nativeSignalAccepted: nativeRegister.length >= 2 || !nativeUnregisterTool
 		};
 		this._nativeToolCleanups.set(tool.name, nativeToolCleanup);
+		if (isPromiseLike(nativeRegisterResult)) nativeRegisterResult.then(void 0, (error) => {
+			cleanup.abort();
+			if (this._nativeToolCleanups.get(tool.name) === nativeToolCleanup) this._nativeToolCleanups.delete(tool.name);
+			if (isPermissionsPolicySecurityError(error)) {
+				console.warn("[BrowserMcpServer] Native WebMCP tool mirror is blocked by permissions policy; continuing with WebMCP transport registration only.");
+				return;
+			}
+			console.warn("[BrowserMcpServer] Native WebMCP tool mirror registration rejected; continuing with WebMCP transport registration only.", error);
+		});
 		return nativeToolCleanup;
 	}
 	unregisterNativeToolMirror(name, options) {
@@ -5368,19 +5377,6 @@ var BrowserMcpServer = class extends McpServer {
 		if (this.native) this.unregisterNativeToolMirror(name);
 		if (existing) this.notifyProducerToolsChanged();
 	}
-	clearRegisteredTools() {
-		let changed = false;
-		for (const name of Object.keys(this._parentTools)) {
-			this._parentTools[name]?.remove();
-			changed = true;
-			if (this.native) try {
-				this.unregisterNativeToolMirror(name);
-			} catch (error) {
-				console.warn("[BrowserMcpServer] Native unregister during clear failed:", error);
-			}
-		}
-		if (changed) this.notifyProducerToolsChanged();
-	}
 	registerResource(descriptor) {
 		const registered = super.registerResource(descriptor.name, descriptor.uri, {
 			...descriptor.description !== void 0 && { description: descriptor.description },
@@ -5396,30 +5392,11 @@ var BrowserMcpServer = class extends McpServer {
 			registered.remove();
 		} };
 	}
-	provideContext(options) {
-		this.warnProvideContextDeprecationOnce();
-		this.clearRegisteredTools();
-		for (const tool of options?.tools ?? []) this.registerTool(tool);
-	}
-	clearContext() {
-		this.warnClearContextDeprecationOnce();
-		this.clearRegisteredTools();
-	}
 	resolveToolNameForUnregister(nameOrTool) {
 		if (typeof nameOrTool === "string") return nameOrTool;
 		if (isPlainObject$1(nameOrTool) && typeof nameOrTool.name === "string") return nameOrTool.name;
 		throw new TypeError("Failed to execute 'unregisterTool' on 'ModelContext': parameter 1 must be a string or an object with a string name.");
 	}
-	warnProvideContextDeprecationOnce() {
-		if (this._provideContextDeprecationWarned) return;
-		this._provideContextDeprecationWarned = true;
-		console.warn("[BrowserMcpServer] navigator.modelContext.provideContext() is deprecated and will be removed in the next major version. Register tools individually with registerTool() instead.");
-	}
-	warnClearContextDeprecationOnce() {
-		if (this._clearContextDeprecationWarned) return;
-		this._clearContextDeprecationWarned = true;
-		console.warn("[BrowserMcpServer] navigator.modelContext.clearContext() is deprecated and will be removed in the next major version. Unregister individual tools instead.");
-	}
 	warnUnregisterToolDeprecationOnce() {
 		if (this._unregisterToolDeprecationWarned) return;
 		this._unregisterToolDeprecationWarned = true;
@@ -5473,7 +5450,9 @@ var BrowserMcpServer = class extends McpServer {
 			return item;
 		});
 	}
-	getTools() {
+	async getTools() {
+		const origin = typeof globalThis.location === "object" && typeof globalThis.location?.origin === "string" ? globalThis.location.origin : "";
+		const currentWindow = typeof globalThis.window === "object" ? globalThis.window : void 0;
 		return this.listTools().map((tool) => {
 			let inputSchema;
 			try {
@@ -5483,8 +5462,11 @@ var BrowserMcpServer = class extends McpServer {
 			}
 			return {
 				name: tool.name,
+				title: typeof tool.annotations?.title === "string" ? tool.annotations.title : tool.description ?? "",
 				description: tool.description ?? "",
-				inputSchema
+				inputSchema,
+				origin,
+				window: currentWindow
 			};
 		});
 	}
@@ -5523,11 +5505,17 @@ var BrowserMcpServer = class extends McpServer {
 		if (!tool) throw new Error(`Tool not found: ${params.name}`);
 		return tool.handler(params.arguments ?? {}, {});
 	}
-	async executeTool(name, args = {}) {
-		return this.callTool({
-			name,
-			arguments: args
+	async executeTool(toolOrName, inputArgsJsonOrArgs = {}) {
+		if (typeof toolOrName === "string") return this.callTool({
+			name: toolOrName,
+			arguments: typeof inputArgsJsonOrArgs === "string" ? JSON.parse(inputArgsJsonOrArgs) : inputArgsJsonOrArgs
+		});
+		const result = await this.callTool({
+			name: toolOrName.name,
+			arguments: typeof inputArgsJsonOrArgs === "string" ? JSON.parse(inputArgsJsonOrArgs) : inputArgsJsonOrArgs
 		});
+		const serialized = JSON.stringify(result);
+		return serialized === void 0 ? null : serialized;
 	}
 	/**
 	* Override connect to initialize request handlers BEFORE the transport connection.