@runtypelabs/persona 4.28.0 → 4.28.1

package/src/webmcp-runtime-entry.ts

@@ -121,7 +121,7 @@ export class WebMcpBridge {
 
     let infos: ModelContextToolInfo[];
     try {
-      infos = await mc.getTools();
+      infos = (await mc.getTools()).filter(isLocalTool);
     } catch (err) {
       log.warn("getTools() threw: shipping an empty WebMCP snapshot.", err);
       return [];
@@ -162,7 +162,7 @@ export class WebMcpBridge {
    *   - tool not in registry (e.g. unmounted between snapshot and call)
    *   - tool excluded by the client allowlist
    *   - user declined the confirm gate
-   *   - `execute()` threw or failed schema validation
+   *   - `execute()` threw or returned a non-serializable result
    *   - `execute()` exceeded the 30s timeout
    *   - `signal` fired (session-level `cancel()`)
    *
@@ -204,7 +204,7 @@ export class WebMcpBridge {
 
     let infos: ModelContextToolInfo[];
     try {
-      infos = await mc.getTools();
+      infos = (await mc.getTools()).filter(isLocalTool);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       return errorResult(`Failed to read WebMCP registry: ${message}`);
@@ -275,7 +275,7 @@ export class WebMcpBridge {
     }
 
     try {
-      const raw = await mc.executeTool(info, safeStringifyArgs(args), {
+      const raw = await mc.executeTool(info, createCompatibleToolInput(args), {
         signal: controller.signal,
       });
       return normalizeSerializedResult(raw);
@@ -329,7 +329,8 @@ export class WebMcpBridge {
       const mod = await this.#deps.loadPolyfill();
       // Idempotent: no-ops if `document.modelContext` already exists (native or
       // a prior install by the host page).
-      mod.initializeWebMCPPolyfill();
+      if ("initializeWebMCPPolyfill" in mod) mod.initializeWebMCPPolyfill();
+      else mod.installWebMCP();
       this.#installed = true;
     } catch (err) {
       log.warn(
@@ -516,6 +517,28 @@ const normalizeSerializedResult = (raw: string | null): WebMcpToolResult => {
   return { content: [{ type: "text", text }] };
 };
 
+/**
+ * One invocation works with both contracts: v5/native previews coerce input to
+ * JSON text, whereas v6 serializes the object. Keep the coercion hook off the
+ * JSON payload and clone first so we never mutate caller-owned arguments.
+ * Do not probe by executing/retrying: page tools may have irreversible effects.
+ */
+const createCompatibleToolInput = (args: unknown): object => {
+  let json: string;
+  try {
+    json = JSON.stringify(args) ?? "{}";
+  } catch {
+    // Preserve the historical fallback for non-serializable arguments.
+    json = "{}";
+  }
+  const input: unknown = JSON.parse(json);
+  if (input === null || typeof input !== "object") {
+    throw new TypeError("WebMCP tool arguments must be an object or array.");
+  }
+  Object.defineProperty(input, Symbol.toPrimitive, { value: () => json });
+  return input;
+};
+
 const errorResult = (message: string): WebMcpToolResult => ({
   isError: true,
   content: [{ type: "text", text: message }],
@@ -549,20 +572,12 @@ const previewArgs = (args: unknown): string => {
   }
 };
 
-/**
- * Stringify tool args for `executeTool(toolInfo, inputArgsJson)`. Falls back to
- * `{}` for `undefined`/non-serializable args so the polyfill always receives a
- * valid JSON object string to validate against the tool schema.
- */
-const safeStringifyArgs = (args: unknown): string => {
-  if (args === undefined) return "{}";
-  try {
-    const json = JSON.stringify(args);
-    return json === undefined ? "{}" : json;
-  } catch {
-    return "{}";
-  }
-};
+/** Keep name-only dispatch scoped to this document, not related frames. */
+const isLocalTool = (info: ModelContextToolInfo): boolean =>
+  (info.window === undefined ||
+    (typeof window !== "undefined" && info.window === window)) &&
+  (info.origin === undefined ||
+    (typeof location !== "undefined" && info.origin === location.origin));
 
 /**
  * `JSON.stringify` that tolerates circular references and non-serializable

package/dist/chunk-AALCT54S.js

@@ -1 +0,0 @@
-var t="4.28.0";var n=t;export{n as a};

package/dist/webmcp-runtime-V6ZWW3PI.js

@@ -1,6 +0,0 @@
-var h="webmcp:",T=t=>t.startsWith(h)?t.slice(h.length):t,u={warn(t,...e){typeof console<"u"&&typeof console.warn=="function"&&console.warn(`[Persona/WebMCP] ${t}`,...e)}},b=class{constructor(e,n){this.config=e;this.#e=n,this.#o=e.onConfirm??null,this.#r=3e4}#o;#r;#t=!1;#i=null;#l=!1;#e;setConfirmHandler(e){this.#o=e}isOperational(){return this.config.enabled!==!0||!this.#t?!1:this.#n()!==null}async snapshotForDispatch(){if(await this.#s(),this.config.enabled!==!0)return[];let e=this.#n();if(!e)return[];let n;try{n=await e.getTools()}catch(i){return u.warn("getTools() threw: shipping an empty WebMCP snapshot.",i),[]}this.#e.recordToolDisplayTitles(n);let o=typeof location<"u"?location.origin:"";return n.filter(i=>this.#c(i.name)).map(i=>{let l=W(i.annotations);return{name:i.name,description:i.description,parametersSchema:P(i.inputSchema),origin:"webmcp",...o?{pageOrigin:o}:{},...l?{annotations:l}:{},...l?.untrustedContentHint===!0?{untrustedContentHint:!0}:{}}})}async executeToolCall(e,n,o){if(await this.#s(),this.config.enabled!==!0)return s("WebMCP is not enabled on this widget.");let i=this.#n();if(!i){let r=typeof document<"u"&&!!document.modelContext;return s(r?"WebMCP is not operational: document.modelContext is present but does not expose the strict getTools()/executeTool() surface (likely a different or older WebMCP polyfill).":"WebMCP bridge is not operational on this page (document.modelContext not available).")}let l=T(e),c;try{c=await i.getTools()}catch(r){let p=r instanceof Error?r.message:String(r);return s(`Failed to read WebMCP registry: ${p}`)}this.#e.recordToolDisplayTitles(c);let f=c.find(r=>r.name===l);if(!f)return s(`WebMCP tool not registered on this page: ${l}`);if(!this.#c(l))return s(`WebMCP tool not allowed by client allowlist: ${l}`);if(o?.aborted)return s("Aborted by cancel()");let m=this.#e.getToolDisplayTitle(l),C={toolName:l,args:n,description:f.description,...m?{title:m}:{},reason:"gate"};if(!await this.#u(C))return s("User declined the tool call.");if(o?.aborted)return s("Aborted by cancel()");let a=new AbortController,y=!1,M=setTimeout(()=>{y=!0,a.abort()},this.#r),g=()=>a.abort();o&&(o.aborted?a.abort():o.addEventListener("abort",g,{once:!0}));try{let r=await i.executeTool(f,k(n),{signal:a.signal});return w(r)}catch(r){if(y)return s(`WebMCP tool '${l}' timed out after ${this.#r}ms`);if(o?.aborted)return s("Aborted by cancel()");let p=r instanceof Error?r.message:String(r);return s(p)}finally{clearTimeout(M),o&&o.removeEventListener("abort",g)}}#s(){return this.config.enabled!==!0?Promise.resolve():(this.#i||(this.#i=this.#a()),this.#i)}async#a(){try{if(this.#n()){this.#t=!0;return}(await this.#e.loadPolyfill()).initializeWebMCPPolyfill(),this.#t=!0}catch(e){u.warn("Failed to load @mcp-b/webmcp-polyfill: WebMCP consumption disabled.",e),this.#t=!1}}#n(){if(typeof document>"u")return null;let e=document.modelContext;if(!e||typeof e!="object")return null;let n=e;return typeof n.getTools!="function"||typeof n.executeTool!="function"?(this.#l||(this.#l=!0,u.warn("document.modelContext is present but does not expose getTools()/executeTool(): WebMCP consumption is disabled. Another (incompatible or older) WebMCP polyfill likely installed document.modelContext before Persona. Remove it, or use a polyfill implementing the strict standard surface (e.g. @mcp-b/webmcp-polyfill).")),null):e}async#u(e){let n=this.#o??A;try{return await n(e)}catch(o){return u.warn(`Confirm handler threw for WebMCP tool '${e.toolName}'; declining.`,o),!1}}#c(e){let n=this.config.allowlist;return!n||n.length===0?!0:n.some(o=>x(e,o))}},x=(t,e)=>{if(e==="*")return!0;let n=e.replace(/[.+?^${}()|[\]\\]/g,"\\$&");return new RegExp("^"+n.replace(/\*/g,".*")+"$").test(t)},d={type:"object",properties:{}},W=t=>{if(!t||typeof t!="object")return;let e={...typeof t.readOnlyHint=="boolean"?{readOnlyHint:t.readOnlyHint}:{},...typeof t.untrustedContentHint=="boolean"?{untrustedContentHint:t.untrustedContentHint}:{}};return Object.keys(e).length>0?e:void 0},P=t=>{if(t===void 0||t==="")return{...d};if(typeof t=="object")return t!==null&&!Array.isArray(t)?t:{...d};try{let e=JSON.parse(t);return e!==null&&typeof e=="object"&&!Array.isArray(e)?e:{...d}}catch{return{...d}}},w=t=>{if(t==null)return{content:[{type:"text",text:""}]};let e;try{e=JSON.parse(t)}catch{return{content:[{type:"text",text:t}]}}return e!==null&&typeof e=="object"&&Array.isArray(e.content)?e:{content:[{type:"text",text:typeof e=="string"?e:D(e)}]}},s=t=>({isError:!0,content:[{type:"text",text:t}]}),A=async t=>{if(typeof window>"u"||typeof window.confirm!="function")return!1;let e=O(t.args),n=`Allow the AI to call ${t.toolName}`+(e?`
-
-Arguments:
-${e}`:"")+(t.description?`
-
-${t.description}`:"");return window.confirm(n)},O=t=>{if(t==null)return"";try{let e=JSON.stringify(t,null,2);return e.length>500?e.slice(0,500)+"\u2026":e}catch{return String(t)}},k=t=>{if(t===void 0)return"{}";try{let e=JSON.stringify(t);return e===void 0?"{}":e}catch{return"{}"}},D=t=>{if(t===void 0)return"";try{return JSON.stringify(t)}catch{return String(t)}};export{b as WebMcpBridge};