skybridge 0.0.0-dev.6cc3977 → 0.0.0-dev.6ccf150

package/dist/{src/server → server}/server.d.ts

@@ -1,14 +1,40 @@
+import type { McpUiResourceMeta } from "@modelcontextprotocol/ext-apps";
 import { McpServer as McpServerBase, type RegisteredTool } from "@modelcontextprotocol/sdk/server/mcp.js";
 import type { AnySchema, SchemaOutput, ZodRawShapeCompat } from "@modelcontextprotocol/sdk/server/zod-compat.js";
 import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
 import type { CallToolResult, Resource, ServerNotification, ServerRequest, ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
+import type { RequestHandler } from "express";
 export type ToolDef<TInput = unknown, TOutput = unknown, TResponseMetadata = unknown> = {
     input: TInput;
     output: TOutput;
     responseMetadata: TResponseMetadata;
 };
+/**
+ * Extended MCP Apps CSP with upcoming fields from ext-apps PR #158
+ * and Skybridge-specific fields for OpenAI compatibility
+ * @see https://github.com/modelcontextprotocol/ext-apps/pull/158
+ */
+type ExtendedMcpUiResourceCsp = McpUiResourceMeta["csp"] & {
+    /**
+     * Origins that can receive openExternal redirects without safe-link modal (OpenAI-specific)
+     * @see https://developers.openai.com/apps-sdk/reference#component-resource-_meta-fields
+     */
+    redirectDomains?: string[];
+};
+/** Extended MCP Apps resource metadata with upcoming CSP fields */
+type ExtendedMcpUiResourceMeta = Omit<McpUiResourceMeta, "csp"> & {
+    csp?: ExtendedMcpUiResourceCsp;
+};
+/** User-provided resource configuration with optional CSP override */
+export type WidgetResourceMeta = {
+    ui?: ExtendedMcpUiResourceMeta;
+} & Resource["_meta"];
 export type WidgetHostType = "apps-sdk" | "mcp-app";
-type McpServerOriginalResourceConfig = Omit<Resource, "uri" | "name" | "mimeType">;
+type McpServerOriginalResourceConfig = Omit<Resource, "uri" | "name" | "mimeType" | "_meta"> & {
+    _meta?: WidgetResourceMeta;
+    /** Restrict host types to a specific subset */
+    hosts?: WidgetHostType[];
+};
 type McpServerOriginalToolConfig = Omit<Parameters<typeof McpServerBase.prototype.registerTool<ZodRawShapeCompat, ZodRawShapeCompat>>[1], "inputSchema" | "outputSchema">;
 type Simplify<T> = {
     [K in keyof T]: T[K];
@@ -56,6 +82,11 @@ type ToolHandler<TInput extends ZodRawShapeCompat, TReturn extends {
 } = CallToolResult> = (args: ShapeOutput<TInput>, extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => TReturn | Promise<TReturn>;
 export declare class McpServer<TTools extends Record<string, ToolDef> = Record<never, ToolDef>> extends McpServerBase {
     readonly $types: McpServerTypes<TTools>;
+    private express?;
+    private customMiddleware;
+    use(...handlers: RequestHandler[]): this;
+    use(path: string, ...handlers: RequestHandler[]): this;
+    run(): Promise<void>;
     registerWidget<TName extends string, TInput extends ZodRawShapeCompat, TReturn extends {
         content: CallToolResult["content"];
     }>(name: TName, resourceConfig: McpServerOriginalResourceConfig, toolConfig: McpServerOriginalToolConfig & {

package/dist/server/server.js

@@ -0,0 +1,206 @@
+import crypto from "node:crypto";
+import { readFileSync } from "node:fs";
+import http from "node:http";
+import path from "node:path";
+import { McpServer as McpServerBase, } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { mergeWith, union } from "es-toolkit";
+import { DEFAULT_HMR_PORT } from "./const.js";
+import { createServer } from "./express.js";
+import { templateHelper } from "./templateHelper.js";
+const mergeWithUnion = (target, source) => {
+    return mergeWith(target, source, (targetVal, sourceVal) => {
+        if (Array.isArray(targetVal) && Array.isArray(sourceVal)) {
+            return union(targetVal, sourceVal);
+        }
+    });
+};
+export class McpServer extends McpServerBase {
+    express;
+    customMiddleware = [];
+    use(pathOrHandler, ...handlers) {
+        if (typeof pathOrHandler === "string") {
+            this.customMiddleware.push({
+                path: pathOrHandler,
+                handlers,
+            });
+        }
+        else {
+            this.customMiddleware.push({
+                handlers: [pathOrHandler, ...handlers],
+            });
+        }
+        return this;
+    }
+    async run() {
+        if (!this.express) {
+            this.express = await createServer({
+                server: this,
+                customMiddleware: this.customMiddleware,
+            });
+        }
+        const express = this.express;
+        return new Promise((resolve, reject) => {
+            const server = http.createServer(express);
+            server.on("error", (error) => {
+                console.error("Failed to start server:", error);
+                reject(error);
+            });
+            const port = parseInt(process.env.__PORT ?? "3000", 10);
+            server.listen(port, () => {
+                resolve();
+            });
+        });
+    }
+    registerWidget(name, resourceConfig, toolConfig, toolCallback) {
+        const userMeta = resourceConfig._meta;
+        const toolMeta = {
+            ...toolConfig._meta,
+        };
+        if (!resourceConfig.hosts || resourceConfig.hosts.includes("apps-sdk")) {
+            const widgetConfig = {
+                hostType: "apps-sdk",
+                uri: `ui://widgets/apps-sdk/${name}.html`,
+                mimeType: "text/html+skybridge",
+                buildContentMeta: ({ resourceDomains, connectDomains, domain }, overrides) => {
+                    const userUi = userMeta?.ui;
+                    const userCsp = userUi?.csp;
+                    const defaults = {
+                        "openai/widgetCSP": {
+                            resource_domains: resourceDomains,
+                            connect_domains: connectDomains,
+                        },
+                        "openai/widgetDomain": domain,
+                        "openai/widgetDescription": resourceConfig.description,
+                    };
+                    const fromUi = {
+                        "openai/widgetCSP": {
+                            resource_domains: userCsp?.resourceDomains,
+                            connect_domains: userCsp?.connectDomains,
+                            frame_domains: userCsp?.frameDomains,
+                            redirect_domains: userCsp?.redirectDomains,
+                        },
+                        "openai/widgetDomain": userUi?.domain,
+                        "openai/widgetPrefersBorder": userUi?.prefersBorder,
+                    };
+                    const directOpenaiKeys = Object.fromEntries(Object.entries(userMeta ?? {}).filter(([key]) => key.startsWith("openai/")));
+                    return mergeWithUnion(mergeWithUnion(mergeWithUnion(defaults, fromUi), directOpenaiKeys), { "openai/widgetDomain": overrides.domain });
+                },
+            };
+            this.registerWidgetResource({
+                name,
+                widgetConfig,
+                resourceConfig,
+            });
+            toolMeta["openai/outputTemplate"] = widgetConfig.uri;
+        }
+        if (!resourceConfig.hosts || resourceConfig.hosts.includes("mcp-app")) {
+            const widgetConfig = {
+                hostType: "mcp-app",
+                uri: `ui://widgets/ext-apps/${name}.html`,
+                mimeType: "text/html;profile=mcp-app",
+                buildContentMeta: ({ resourceDomains, connectDomains, domain }, overrides) => {
+                    const defaults = {
+                        ui: {
+                            csp: {
+                                resourceDomains,
+                                connectDomains,
+                            },
+                            domain,
+                        },
+                    };
+                    return mergeWithUnion(defaults, {
+                        ui: { ...userMeta?.ui, ...overrides },
+                    });
+                },
+            };
+            this.registerWidgetResource({
+                name,
+                widgetConfig,
+                resourceConfig,
+            });
+            // @ts-expect-error - For backwards compatibility with Claude current implementation of the specs
+            toolMeta["ui/resourceUri"] = widgetConfig.uri;
+            toolMeta.ui = { resourceUri: widgetConfig.uri };
+        }
+        this.registerTool(name, {
+            ...toolConfig,
+            _meta: toolMeta,
+        }, toolCallback);
+        return this;
+    }
+    registerTool(name, config, cb) {
+        super.registerTool(name, config, cb);
+        return this;
+    }
+    registerWidgetResource({ name, widgetConfig, resourceConfig, }) {
+        const { hostType, uri: widgetUri, mimeType, buildContentMeta, } = widgetConfig;
+        this.registerResource(name, widgetUri, { ...resourceConfig, _meta: resourceConfig._meta }, async (uri, extra) => {
+            const isProduction = process.env.NODE_ENV === "production";
+            const useForwardedHost = process.env.SKYBRIDGE_USE_FORWARDED_HOST === "true";
+            const isClaude = extra?.requestInfo?.headers?.["user-agent"] === "Claude-User";
+            const hostFromHeaders = extra?.requestInfo?.headers?.["x-forwarded-host"] ??
+                extra?.requestInfo?.headers?.host;
+            const useExternalHost = isProduction || useForwardedHost || isClaude;
+            const devPort = process.env.__PORT || "3000";
+            const serverUrl = useExternalHost
+                ? `https://${hostFromHeaders}`
+                : `http://localhost:${devPort}`;
+            const html = isProduction
+                ? templateHelper.renderProduction({
+                    hostType,
+                    serverUrl,
+                    widgetFile: this.lookupDistFileWithIndexFallback(`src/widgets/${name}`),
+                    styleFile: this.lookupDistFile("style.css"),
+                })
+                : templateHelper.renderDevelopment({
+                    hostType,
+                    serverUrl,
+                    useLocalNetworkAccess: !useExternalHost,
+                    widgetName: name,
+                });
+            const connectDomains = [serverUrl];
+            if (!isProduction) {
+                const hmrPort = process.env.__SKYBRIDGE_HMR_PORT ?? DEFAULT_HMR_PORT;
+                const VITE_HMR_WEBSOCKET_DEFAULT_URL = `ws://localhost:${hmrPort}`;
+                connectDomains.push(VITE_HMR_WEBSOCKET_DEFAULT_URL);
+            }
+            const pathname = extra?.requestInfo?.url?.pathname ?? "";
+            const url = `https://${hostFromHeaders}${pathname}`;
+            const hash = crypto
+                .createHash("sha256")
+                .update(url)
+                .digest("hex")
+                .slice(0, 32);
+            const contentMetaOverrides = isClaude
+                ? {
+                    domain: `${hash}.claudemcpcontent.com`,
+                }
+                : {};
+            const contentMeta = buildContentMeta({
+                resourceDomains: [serverUrl],
+                connectDomains,
+                domain: serverUrl,
+                baseUriDomains: [serverUrl],
+            }, contentMetaOverrides);
+            return {
+                contents: [
+                    { uri: uri.href, mimeType, text: html, _meta: contentMeta },
+                ],
+            };
+        });
+    }
+    lookupDistFile(key) {
+        const manifest = this.readManifest();
+        return manifest[key]?.file;
+    }
+    lookupDistFileWithIndexFallback(basePath) {
+        const manifest = this.readManifest();
+        const flatFileKey = `${basePath}.tsx`;
+        const indexFileKey = `${basePath}/index.tsx`;
+        return manifest[flatFileKey]?.file ?? manifest[indexFileKey]?.file;
+    }
+    readManifest() {
+        return JSON.parse(readFileSync(path.join(process.cwd(), "dist", "assets", ".vite", "manifest.json"), "utf-8"));
+    }
+}
+//# sourceMappingURL=server.js.map

package/dist/server/server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"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"}

package/dist/{src/server → server}/templateHelper.d.ts

@@ -11,6 +11,7 @@ declare class TemplateHelper {
     renderDevelopment(data: {
         hostType: WidgetHostType;
         serverUrl: string;
+        useLocalNetworkAccess: boolean;
         widgetName: string;
     }): string;
 }

package/dist/server/templateHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"templateHelper.js","sourceRoot":"","sources":["../../src/server/templateHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,UAAU,MAAM,YAAY,CAAC;AAGpC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,MAAM,cAAc;IACV,aAAa,GAAG,IAAI,GAAG,EAAsC,CAAC;IAE9D,YAAY,CAAC,YAAoB;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACpD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;QACzE,MAAM,cAAc,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAEpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC/C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,gBAAgB,CAAC,IAKhB;QACC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACjD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,iBAAiB,CAAC,IAKjB;QACC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAClD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}

package/dist/{src/server → server}/templates/development.hbs

@@ -1,5 +1,4 @@
-<base href="{{serverUrl}}" />
-<script type="module">window.skybridge = { hostType: "{{hostType}}" };</script>
+<script type="module">window.skybridge = { hostType: "{{hostType}}", serverUrl: "{{serverUrl}}" };</script>
 <script type="module">
   import { injectIntoGlobalHook } from "{{serverUrl}}/assets/@react-refresh";
   injectIntoGlobalHook(window); window.$RefreshReg$ = () => {};
@@ -7,6 +6,7 @@
   window.__vite_plugin_react_preamble_installed__ = true;
 </script>
 <script type="module" src="{{serverUrl}}/@vite/client"></script>
+{{#if useLocalNetworkAccess}}
 <script type="module">
   // Checks for browser support and shows error if local network access is denied
   (async () => {
@@ -14,6 +14,21 @@
       return;
     }
 
+    // Skip for non-http(s) protocols (file://, custom protocols in Electron, etc.)
+    const protocol = window.location.protocol;
+    const isNonHttpProtocol = protocol !== 'http:' && protocol !== 'https:'
+    if (isNonHttpProtocol) {
+      return;
+    }
+
+    const host = window.location.hostname;
+    const isLoopback = host === 'localhost'
+      || /^127\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.test(host)
+      || host === '::1';
+    if (isLoopback) {
+      return;
+    }
+    
     try {
       const status = await navigator.permissions.query({ name: "local-network-access" });
       if (status.state === "denied") {
@@ -45,6 +60,7 @@
     }
   })();
 </script>
+{{/if}}
 <div id="root"></div>
 <script type="module" id="dev-widget-entry">
   import('{{serverUrl}}/src/widgets/{{widgetName}}');

package/dist/{src/server → server}/templates/production.hbs

@@ -1,5 +1,4 @@
-<base href="{{serverUrl}}" />
-<script type="module">window.skybridge = { hostType: "{{hostType}}" };</script>
+<script type="module">window.skybridge = { hostType: "{{hostType}}", serverUrl: "{{serverUrl}}" };</script>
 <div id="root"></div>
 <script type="module">
   import('{{serverUrl}}/assets/{{widgetFile}}');

package/dist/{src/server → server}/widgetsDevServer.d.ts

@@ -1,4 +1,4 @@
-import { type RequestHandler } from "express";
+import { type Router } from "express";
 /**
  * Install Vite dev server
  * This router MUST be installed at the application root, like so:
@@ -9,4 +9,4 @@ import { type RequestHandler } from "express";
  *   app.use(await widgetsRouter());
  * }
  */
-export declare const widgetsDevServer: () => Promise<RequestHandler>;
+export declare const widgetsDevServer: () => Promise<Router>;

package/dist/server/widgetsDevServer.js

@@ -0,0 +1,63 @@
+import { existsSync } from "node:fs";
+import path from "node:path";
+import cors from "cors";
+import express, {} from "express";
+import { detectAvailablePort } from "../cli/detect-port.js";
+import { assetBaseUrlTransformPlugin } from "./asset-base-url-transform-plugin.js";
+import { DEFAULT_HMR_PORT } from "./const.js";
+/**
+ * Install Vite dev server
+ * This router MUST be installed at the application root, like so:
+ *
+ *  const app = express();
+ *
+ * if (env.NODE_ENV !== "production") {
+ *   app.use(await widgetsRouter());
+ * }
+ */
+export const widgetsDevServer = async () => {
+    const router = express.Router();
+    const { createServer, searchForWorkspaceRoot, loadConfigFromFile } = await import("vite");
+    // Since 0.16.0, the template is a single package that does not rely on workspace.
+    // It means that, when starting the server, the working dir is the template root
+    // hence we don't need to walk up the tree to find the workspace, which does not exist anymore.
+    let webAppRoot = path.join(process.cwd(), "web");
+    // fallback to the old behavior for backward compatibility
+    const hasWebAppRoot = existsSync(webAppRoot);
+    if (!hasWebAppRoot) {
+        const workspaceRoot = searchForWorkspaceRoot(process.cwd());
+        webAppRoot = path.join(workspaceRoot, "web");
+    }
+    const configResult = await loadConfigFromFile({ command: "serve", mode: "development" }, path.join(webAppRoot, "vite.config.ts"), webAppRoot);
+    const { build, preview, plugins: userPlugins = [], ...devConfig } = configResult?.config || {};
+    const hmrPort = await detectAvailablePort(DEFAULT_HMR_PORT, "localhost");
+    process.env.__SKYBRIDGE_HMR_PORT = String(hmrPort);
+    const vite = await createServer({
+        ...devConfig,
+        configFile: false, // Keep this to prevent vite from trying to resolve path in the target config file
+        appType: "custom",
+        server: {
+            allowedHosts: true,
+            middlewareMode: true,
+            hmr: {
+                protocol: "ws",
+                host: "localhost",
+                port: hmrPort,
+            },
+        },
+        root: webAppRoot,
+        optimizeDeps: {
+            include: ["react", "react-dom/client"],
+        },
+        plugins: [
+            ...userPlugins,
+            assetBaseUrlTransformPlugin({
+                devServerOrigin: `http://localhost:${process.env.__PORT ?? "3000"}`,
+            }),
+        ],
+    });
+    router.use(cors());
+    router.use("/", vite.middlewares);
+    return router;
+};
+//# sourceMappingURL=widgetsDevServer.js.map

package/dist/server/widgetsDevServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"widgetsDevServer.js","sourceRoot":"","sources":["../../src/server/widgetsDevServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,EAAE,EAAe,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAAqB,EAAE;IAC1D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAEhC,MAAM,EAAE,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,GAChE,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IAEvB,kFAAkF;IAClF,gFAAgF;IAChF,+FAA+F;IAC/F,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;IAEjD,0DAA0D;IAC1D,MAAM,aAAa,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAC7C,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,aAAa,GAAG,sBAAsB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5D,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EACzC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACvC,UAAU,CACX,CAAC;IAEF,MAAM,EACJ,KAAK,EACL,OAAO,EACP,OAAO,EAAE,WAAW,GAAG,EAAE,EACzB,GAAG,SAAS,EACb,GAAG,YAAY,EAAE,MAAM,IAAI,EAAE,CAAC;IAE/B,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;IACzE,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC;QAC9B,GAAG,SAAS;QACZ,UAAU,EAAE,KAAK,EAAE,kFAAkF;QACrG,OAAO,EAAE,QAAQ;QACjB,MAAM,EAAE;YACN,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAI;YACpB,GAAG,EAAE;gBACH,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,OAAO;aACd;SACF;QACD,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE;YACZ,OAAO,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC;SACvC;QACD,OAAO,EAAE;YACP,GAAG,WAAW;YACd,2BAA2B,CAAC;gBAC1B,eAAe,EAAE,oBAAoB,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,EAAE;aACpE,CAAC;SACH;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACnB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAElC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/dist/test/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD;;GAEG;AACH,MAAM,UAAU,mBAAmB;IAKjC,mCAAmC;IACnC,MAAM,MAAM,GAAG,IAAI,SAAS,CAC1B;QACE,IAAI,EAAE,kBAAkB;QACxB,OAAO,EAAE,OAAO;KACjB,EACD,EAAE,YAAY,EAAE,EAAE,EAAE,CACrB,CAAC;IAEF,6CAA6C;IAC7C,MAAM,oBAAoB,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAClE,MAAM,gBAAgB,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAE1D,OAAO;QACL,MAAM;QACN,oBAAoB;QACpB,gBAAgB;KACjB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;SAC7D,cAAc,CACb,eAAe,EACf,EAAE,EACF;QACE,WAAW,EAAE,oBAAoB;QACjC,WAAW,EAAE;YACX,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;YACvB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACpC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SAChC;QACD,YAAY,EAAE;YACZ,OAAO,EAAE,CAAC,CAAC,KAAK,CACd,CAAC,CAAC,MAAM,CAAC;gBACP,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;gBACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;gBAChB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;aAClB,CAAC,CACH;YACD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;SACvB;KACF,EACD,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;QACxB,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,WAAW,EAAE,EAAE,CAAC;YAClE,iBAAiB,EAAE;gBACjB,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBACjD,UAAU,EAAE,CAAC;aACd;SACF,CAAC;IACJ,CAAC,CACF;SACA,cAAc,CACb,kBAAkB,EAClB,EAAE,EACF;QACE,WAAW,EAAE,kBAAkB;QAC/B,WAAW,EAAE;YACX,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;SACnB;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;YACvB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SAC5B;KACF,EACD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACnB,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,MAAM,EAAE,EAAE,CAAC;YAC1D,iBAAiB,EAAE;gBACjB,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,cAAc;gBAC3B,MAAM,EAAE,CAAC,YAAY,CAAC;aACvB;SACF,CAAC;IACJ,CAAC,CACF;SACA,cAAc,CACb,iBAAiB,EACjB,EAAE,EACF;QACE,WAAW,EAAE,sBAAsB;QACnC,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;KACjB,EACD,KAAK,IAAI,EAAE;QACT,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;YACpD,iBAAiB,EAAE,EAAE;SACtB,CAAC;IACJ,CAAC,CACF;SACA,cAAc,CACb,wBAAwB,EACxB,EAAE,EACF;QACE,WAAW,EAAE,2CAA2C;QACxD,WAAW,EAAE;YACX,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;SAClB;KACF,EACD,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;QAClB,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,KAAK,EAAE,EAAE,CAAC;YACpD,iBAAiB,EAAE;gBACjB,eAAe,EAAE,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBACpD,aAAa,EAAE,CAAC;aACjB;SACF,CAAC;IACJ,CAAC,CACF;SACA,YAAY,CACX,iBAAiB,EACjB;QACE,WAAW,EAAE,sBAAsB;QACnC,WAAW,EAAE;YACX,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;YAClB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;SACvB;QACD,YAAY,EAAE;YACZ,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;YACtB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;SACrB;KACF,EACD,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QAC/B,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,MAAM,EAAE,EAAE,CAAC;YACxD,iBAAiB,EAAE;gBACjB,UAAU,EAAE,IAAI,GAAG,UAAU;gBAC7B,QAAQ,EAAE,KAAK;aAChB;SACF,CAAC;IACJ,CAAC,CACF;SACA,YAAY,CACX,eAAe,EACf;QACE,WAAW,EAAE,yCAAyC;QACtD,WAAW,EAAE;YACX,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;SACnB;KACF,EACD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACnB,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,CAAC;YACpD,iBAAiB,EAAE;gBACjB,WAAW,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE;gBACvD,SAAS,EAAE,YAAY;aACxB;SACF,CAAC;IACJ,CAAC,CACF;SACA,cAAc,CACb,sBAAsB,EACtB,EAAE,EACF;QACE,WAAW,EAAE,uCAAuC;QACpD,WAAW,EAAE;YACX,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;SACvB;KACF,EACD,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;QACvB,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,UAAU,EAAE,EAAE,CAAC;YAC5D,iBAAiB,EAAE;gBACjB,IAAI,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE;aACvC;YACD,KAAK,EAAE;gBACL,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,aAAa;gBACxB,MAAM,EAAE,KAAK;aACd;SACF,CAAC;IACJ,CAAC,CACF;SACA,YAAY,CACX,oBAAoB,EACpB;QACE,WAAW,EAAE,qCAAqC;QAClD,WAAW,EAAE;YACX,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;SAClB;KACF,EACD,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;QAClB,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,KAAK,EAAE,EAAE,CAAC;YACpD,iBAAiB,EAAE;gBACjB,OAAO,EAAE,CAAC,KAAK,CAAC;aACjB;YACD,KAAK,EAAE;gBACL,aAAa,EAAE,GAAG;gBAClB,MAAM,EAAE,OAAO;aAChB;SACF,CAAC;IACJ,CAAC,CACF;SACA,cAAc,CACb,2BAA2B,EAC3B,EAAE,EACF;QACE,WAAW,EACT,gEAAgE;QAClE,WAAW,EAAE;YACX,aAAa,EAAE,CAAC,CAAC,OAAO,EAAE;SAC3B;KACF,EACD,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;QAC1B,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,wBAAwB;YACxB,OAAO;gBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;gBACnD,iBAAiB,EAAE,EAAE,KAAK,EAAE,sBAAsB,EAAE;aACrD,CAAC;QACJ,CAAC;QACD,2BAA2B;QAC3B,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YAC5C,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACrC,KAAK,EAAE;gBACL,WAAW,EAAE,aAAa;gBAC1B,MAAM,EAAE,WAAW;aACpB;SACF,CAAC;IACJ,CAAC,CACF,CAAC;AACN,CAAC;AAED,MAAM,UAAU,uBAAuB;IACrC,OAAO,IAAI,SAAS,CAClB,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,EACtC,EAAE,CACH,CAAC,cAAc,CACd,eAAe,EACf,EAAE,EACF;QACE,WAAW,EAAE,oBAAoB;QACjC,WAAW,EAAE;YACX,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;SACxB;QACD,YAAY,EAAE;YACZ,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;SAC/C;KACF,EACD,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;QACxB,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,WAAW,EAAE,EAAE,CAAC;YAClE,iBAAiB,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE;SAC9C,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AAkBD,MAAM,UAAU,yBAAyB;IACvC,OAAO,IAAI,SAAS,CAClB,EAAE,IAAI,EAAE,oBAAoB,EAAE,OAAO,EAAE,OAAO,EAAE,EAChD,EAAE,CACH,CAAC,cAAc,CAKd,kBAAkB,EAClB,EAAE,EACF;QACE,WAAW,EAAE,oCAAoC;QACjD,WAAW,EAAE;YACX,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;SACf;KACF,EACD,KAAK,EAAE,EAAE,EAAE,EAAE,EAAgC,EAAE;QAC7C,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;YAC/C,iBAAiB,EAAE;gBACjB,QAAQ,EAAE,WAAW;gBACrB,QAAQ,EAAE,EAAE;aACb;YACD,KAAK,EAAE;gBACL,WAAW,EAAE,MAAM;gBACnB,OAAO,EAAE,CAAC;aACX;SACF,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO;QACL,WAAW,EAAE;YACX,OAAO,EAAE,EAAE,IAAI,EAAE;SAClB;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,GAA2B;IACpD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AAC9B,CAAC"}

package/dist/{src/test → test}/widget.test.js

@@ -53,6 +53,14 @@ describe("McpServer.registerWidget", () => {
                     uri: "ui://widgets/apps-sdk/my-widget.html",
                     mimeType: "text/html+skybridge",
                     text: expect.stringContaining('<div id="root"></div>'),
+                    _meta: {
+                        "openai/widgetCSP": {
+                            resource_domains: [serverUrl],
+                            connect_domains: [serverUrl, "ws://localhost:24678"],
+                        },
+                        "openai/widgetDomain": serverUrl,
+                        "openai/widgetDescription": "Test widget",
+                    },
                 },
             ],
         });
@@ -72,8 +80,9 @@ describe("McpServer.registerWidget", () => {
         const appsSdkResourceCallback = mockRegisterResource.mock
             .calls[0]?.[3];
         expect(appsSdkResourceCallback).toBeDefined();
-        const serverUrl = "https://myapp.com";
-        const mockExtra = createMockExtra(serverUrl);
+        const host = "myapp.com";
+        const serverUrl = `https://${host}`;
+        const mockExtra = createMockExtra(host);
         const result = await appsSdkResourceCallback(new URL("ui://widgets/apps-sdk/my-widget.html"), mockExtra);
         expect(result).toEqual({
             contents: [
@@ -81,6 +90,14 @@ describe("McpServer.registerWidget", () => {
                     uri: "ui://widgets/apps-sdk/my-widget.html",
                     mimeType: "text/html+skybridge",
                     text: expect.stringContaining('<div id="root"></div>'),
+                    _meta: {
+                        "openai/widgetCSP": {
+                            resource_domains: [serverUrl],
+                            connect_domains: [serverUrl],
+                        },
+                        "openai/widgetDomain": serverUrl,
+                        "openai/widgetDescription": "Test widget",
+                    },
                 },
             ],
         });
@@ -99,31 +116,45 @@ describe("McpServer.registerWidget", () => {
         const appsSdkResourceCallback = mockRegisterResource.mock
             .calls[0]?.[3];
         expect(appsSdkResourceCallback).toBeDefined();
-        const serverUrl = "https://myapp.com";
-        const mockExtra = createMockExtra(serverUrl);
+        const host = "myapp.com";
+        const serverUrl = `https://${host}`;
+        const mockExtra = createMockExtra(host);
         const result = await appsSdkResourceCallback(new URL("ui://widgets/apps-sdk/folder-widget.html"), mockExtra);
         // Should resolve to folder-widget.js from the manifest entry "src/widgets/folder-widget/index.tsx"
         expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/folder-widget.js`);
     });
     it("should register resources with correct hostType for both apps-sdk and ext-apps formats", async () => {
         const mockToolCallback = vi.fn();
-        const mockRegisterResourceConfig = { description: "Test widget" };
+        const mockRegisterResourceConfig = {
+            description: "Test widget",
+            _meta: { "openai/widgetPrefersBorder": true },
+        };
         const mockToolConfig = { description: "Test tool" };
         server.registerWidget("my-widget", mockRegisterResourceConfig, mockToolConfig, mockToolCallback);
         expect(mockRegisterResource).toHaveBeenCalledTimes(2);
         const appsSdkCallback = mockRegisterResource.mock
             .calls[0]?.[3];
         const appsSdkResult = await appsSdkCallback(new URL("ui://widgets/apps-sdk/my-widget.html"), createMockExtra("__not_used__"));
+        const serverUrl = "http://localhost:3000";
         expect(appsSdkResult).toEqual({
             contents: [
                 {
                     uri: "ui://widgets/apps-sdk/my-widget.html",
                     mimeType: "text/html+skybridge",
                     text: expect.stringContaining('<div id="root"></div>'),
+                    _meta: {
+                        "openai/widgetCSP": {
+                            resource_domains: [serverUrl],
+                            connect_domains: [serverUrl, "ws://localhost:24678"],
+                        },
+                        "openai/widgetDomain": serverUrl,
+                        "openai/widgetDescription": "Test widget",
+                        "openai/widgetPrefersBorder": true,
+                    },
                 },
             ],
         });
-        expect(appsSdkResult.contents[0]?.text).toContain('window.skybridge = { hostType: "apps-sdk" }');
+        expect(appsSdkResult.contents[0]?.text).toContain('window.skybridge = { hostType: "apps-sdk", serverUrl: "http://localhost:3000" };');
         const extAppsResourceCallback = mockRegisterResource.mock
             .calls[1]?.[3];
         expect(extAppsResourceCallback).toBeDefined();
@@ -134,10 +165,97 @@ describe("McpServer.registerWidget", () => {
                     uri: "ui://widgets/ext-apps/my-widget.html",
                     mimeType: "text/html;profile=mcp-app",
                     text: expect.stringContaining('<div id="root"></div>'),
+                    _meta: {
+                        ui: {
+                            csp: {
+                                resourceDomains: [serverUrl],
+                                connectDomains: [serverUrl, "ws://localhost:24678"],
+                            },
+                            domain: serverUrl,
+                        },
+                    },
+                },
+            ],
+        });
+        expect(extAppsResult.contents[0]?.text).toContain('window.skybridge = { hostType: "mcp-app", serverUrl: "http://localhost:3000" };');
+    });
+    it("should register tool with ui.resourceUri metadata (not deprecated ui/resourceUri)", async () => {
+        const mockToolCallback = vi.fn();
+        const mockRegisterResourceConfig = { description: "Test widget" };
+        const mockToolConfig = { description: "Test tool" };
+        server.registerWidget("my-widget", mockRegisterResourceConfig, mockToolConfig, mockToolCallback);
+        expect(mockRegisterTool).toHaveBeenCalledTimes(1);
+        const toolCallArgs = mockRegisterTool.mock.calls[0];
+        const toolConfig = toolCallArgs?.[1];
+        expect(toolConfig._meta).toHaveProperty("ui");
+        expect(toolConfig._meta?.ui).toEqual({
+            resourceUri: "ui://widgets/ext-apps/my-widget.html",
+        });
+    });
+    it("should apply meta overrides in correct priority: defaults < ui.* < direct openai/* keys", async () => {
+        const mockToolCallback = vi.fn();
+        const mockRegisterResourceConfig = {
+            description: "Test widget",
+            _meta: {
+                // ui.csp overrides (middle priority)
+                ui: {
+                    csp: {
+                        resourceDomains: ["https://from-ui-csp.com"],
+                        connectDomains: ["https://from-ui-csp.com"],
+                    },
+                    domain: "https://from-ui-domain.com",
+                    prefersBorder: false,
                 },
+                // Direct openai/* keys (highest priority) - should override ui.*
+                "openai/widgetDomain": "https://direct-override.com",
+                "openai/widgetPrefersBorder": true,
+            },
+        };
+        const mockToolConfig = { description: "Test tool" };
+        server.registerWidget("override-test", mockRegisterResourceConfig, mockToolConfig, mockToolCallback);
+        const appsSdkCallback = mockRegisterResource.mock
+            .calls[0]?.[3];
+        const serverUrl = "http://localhost:3000";
+        const result = await appsSdkCallback(new URL("ui://widgets/apps-sdk/override-test.html"), createMockExtra("__not_used__"));
+        const meta = result.contents[0]?._meta;
+        // CSP arrays are merged with union - all unique domains from defaults and user config are preserved
+        expect(meta["openai/widgetCSP"]).toEqual({
+            resource_domains: [serverUrl, "https://from-ui-csp.com"],
+            connect_domains: [
+                serverUrl,
+                "ws://localhost:24678",
+                "https://from-ui-csp.com",
             ],
+            frame_domains: undefined,
+            redirect_domains: undefined,
         });
-        expect(extAppsResult.contents[0]?.text).toContain('window.skybridge = { hostType: "mcp-app" }');
+        // Domain should be overridden by direct openai/* key (highest priority)
+        expect(meta["openai/widgetDomain"]).toBe("https://direct-override.com");
+        // PrefersBorder should be overridden by direct openai/* key (highest priority)
+        expect(meta["openai/widgetPrefersBorder"]).toBe(true);
+        // Description should be from defaults (toolConfig.description)
+        expect(meta["openai/widgetDescription"]).toBe("Test widget");
+    });
+    it("should register tool with ui.resourceUri metadata only", async () => {
+        const mockToolCallback = vi.fn();
+        server.registerWidget("my-widget", { description: "Test widget", hosts: ["mcp-app"] }, { description: "Test tool" }, mockToolCallback);
+        expect(mockRegisterTool).toHaveBeenCalledTimes(1);
+        const toolCallArgs = mockRegisterTool.mock.calls[0];
+        const toolConfig = toolCallArgs?.[1];
+        expect(toolConfig._meta).toHaveProperty("ui");
+        expect(toolConfig._meta?.ui).toEqual({
+            resourceUri: "ui://widgets/ext-apps/my-widget.html",
+        });
+        expect(toolConfig._meta?.["openai/outputTemplate"]).to.be.undefined;
+    });
+    it("should register tool with uopenai/outputTemplate metadata only", async () => {
+        const mockToolCallback = vi.fn();
+        server.registerWidget("my-widget", { description: "Test widget", hosts: ["apps-sdk"] }, { description: "Test tool" }, mockToolCallback);
+        expect(mockRegisterTool).toHaveBeenCalledTimes(1);
+        const toolCallArgs = mockRegisterTool.mock.calls[0];
+        const toolConfig = toolCallArgs?.[1];
+        expect(toolConfig._meta).not.toHaveProperty("ui");
+        expect(toolConfig._meta?.["openai/outputTemplate"]).to.eq("ui://widgets/apps-sdk/my-widget.html");
     });
 });
 //# sourceMappingURL=widget.test.js.map