skybridge 0.0.0-dev.b5f503d → 0.0.0-dev.b62a016

package/dist/{src/server → server}/widgetsDevServer.js

@@ -1,6 +1,8 @@
-import express, {} from "express";
-import cors from "cors";
+import { existsSync } from "node:fs";
 import path from "node:path";
+import cors from "cors";
+import express, {} from "express";
+import { assetBaseUrlTransformPlugin } from "./asset-base-url-transform-plugin.js";
 /**
  * Install Vite dev server
  * This router MUST be installed at the application root, like so:
@@ -11,14 +13,21 @@ import path from "node:path";
  *   app.use(await widgetsRouter());
  * }
  */
-export const widgetsDevServer = async () => {
+export const widgetsDevServer = async (httpServer) => {
     const router = express.Router();
     const { createServer, searchForWorkspaceRoot, loadConfigFromFile } = await import("vite");
-    const workspaceRoot = searchForWorkspaceRoot(process.cwd());
-    const webAppRoot = path.join(workspaceRoot, "web");
+    // 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);
-    // Remove build-specific options that don't apply to dev server
-    const { build, preview, ...devConfig } = configResult?.config || {};
+    const { build, preview, plugins: userPlugins = [], ...devConfig } = configResult?.config || {};
     const vite = await createServer({
         ...devConfig,
         configFile: false, // Keep this to prevent vite from trying to resolve path in the target config file
@@ -26,11 +35,15 @@ export const widgetsDevServer = async () => {
         server: {
             allowedHosts: true,
             middlewareMode: true,
+            hmr: {
+                server: httpServer,
+            },
         },
         root: webAppRoot,
         optimizeDeps: {
             include: ["react", "react-dom/client"],
         },
+        plugins: [...userPlugins, assetBaseUrlTransformPlugin()],
     });
     router.use(cors());
     router.use("/", vite.middlewares);

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;AAErC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,EAAE,EAAe,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAC;AAEnF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,UAAuB,EACN,EAAE;IACnB,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,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,MAAM,EAAE,UAAU;aACnB;SACF;QACD,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE;YACZ,OAAO,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC;SACvC;QACD,OAAO,EAAE,CAAC,GAAG,WAAW,EAAE,2BAA2B,EAAE,CAAC;KACzD,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/{src/test → test}/utils.d.ts

@@ -5,10 +5,10 @@ import { McpServer } from "../server/server.js";
  */
 export declare function createMockMcpServer(): {
     server: McpServer;
-    mockResource: MockInstance<McpServer["resource"]>;
+    mockRegisterResource: MockInstance<McpServer["registerResource"]>;
     mockRegisterTool: MockInstance<McpServer["registerTool"]>;
 };
-export declare function createTestServer(): McpServer<{
+export declare function createTestServer(): McpServer<Record<never, import("../server/server.js").ToolDef<unknown, unknown, unknown>> & {
     "search-voyage": import("../server/server.js").ToolDef<{
         destination: string;
         departureDate?: string | undefined;
@@ -20,7 +20,7 @@ export declare function createTestServer(): McpServer<{
             price: number;
         }[];
         totalCount: number;
-    }>;
+    }, unknown>;
 } & {
     "get-trip-details": import("../server/server.js").ToolDef<{
         tripId: string;
@@ -28,9 +28,9 @@ export declare function createTestServer(): McpServer<{
         name: string;
         description: string;
         images: string[];
-    }>;
+    }, unknown>;
 } & {
-    "no-input-widget": import("../server/server.js").ToolDef<{}, {}>;
+    "no-input-widget": import("../server/server.js").ToolDef<{}, {}, unknown>;
 } & {
     "inferred-output-widget": import("../server/server.js").ToolDef<{
         query: string;
@@ -40,7 +40,7 @@ export declare function createTestServer(): McpServer<{
             score: number;
         }[];
         inferredCount: number;
-    }>;
+    }, unknown>;
 } & {
     "calculate-price": import("../server/server.js").ToolDef<{
         tripId: string;
@@ -48,7 +48,7 @@ export declare function createTestServer(): McpServer<{
     }, {
         totalPrice: number;
         currency: string;
-    }>;
+    }, unknown>;
 } & {
     "inferred-tool": import("../server/server.js").ToolDef<{
         itemId: string;
@@ -58,22 +58,72 @@ export declare function createTestServer(): McpServer<{
             available: boolean;
         };
         fetchedAt: string;
+    }, unknown>;
+} & {
+    "widget-with-metadata": import("../server/server.js").ToolDef<{
+        resourceId: string;
+    }, {
+        data: {
+            id: string;
+            loaded: boolean;
+        };
+    }, {
+        requestId: string;
+        timestamp: number;
+        cached: boolean;
+    }>;
+} & {
+    "tool-with-metadata": import("../server/server.js").ToolDef<{
+        query: string;
+    }, {
+        results: string[];
+    }, {
+        executionTime: number;
+        source: string;
+    }>;
+} & {
+    "widget-with-mixed-returns": import("../server/server.js").ToolDef<{
+        shouldSucceed: boolean;
+    }, {
+        error: string;
+        data?: undefined;
+    } | {
+        data: string;
+        error?: undefined;
+    }, {
+        processedAt: number;
+        region: string;
     }>;
 }>;
-export declare function createMinimalTestServer(): McpServer<{
+export declare function createMinimalTestServer(): McpServer<Record<never, import("../server/server.js").ToolDef<unknown, unknown, unknown>> & {
     "search-voyage": import("../server/server.js").ToolDef<{
         destination: string;
     }, {
         results: {
             id: string;
         }[];
+    }, unknown>;
+}>;
+export declare function createInterfaceTestServer(): McpServer<Record<never, import("../server/server.js").ToolDef<unknown, unknown, unknown>> & {
+    "interface-widget": import("../server/server.js").ToolDef<{
+        id: string;
+    }, {
+        itemName: string;
+        quantity: number;
+    }, {
+        processedBy: string;
+        version: number;
     }>;
 }>;
 /**
  * Mock extra parameter for resource callback
  */
-export declare function createMockExtra(host: string): {
+export declare function createMockExtra(host: string, options?: {
+    headers?: Record<string, string | string[]>;
+    url?: URL | string;
+}): {
     requestInfo: {
+        url?: string | URL | undefined;
         headers: {
             host: string;
         };

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

@@ -1,6 +1,6 @@
 import { vi } from "vitest";
+import * as z from "zod";
 import { McpServer } from "../server/server.js";
-import { z } from "zod";
 /**
  * Creates a real McpServer instance for testing
  */
@@ -11,11 +11,11 @@ export function createMockMcpServer() {
         version: "0.0.1",
     }, { capabilities: {} });
     // Mock the underlying methods to track calls
-    const mockResource = vi.spyOn(server, "resource");
+    const mockRegisterResource = vi.spyOn(server, "registerResource");
     const mockRegisterTool = vi.spyOn(server, "registerTool");
     return {
         server,
-        mockResource,
+        mockRegisterResource,
         mockRegisterTool,
     };
 }
@@ -121,6 +121,64 @@ export function createTestServer() {
                 fetchedAt: "2024-01-01",
             },
         };
+    })
+        .registerWidget("widget-with-metadata", {}, {
+        description: "Widget that returns response metadata",
+        inputSchema: {
+            resourceId: z.string(),
+        },
+    }, async ({ resourceId }) => {
+        return {
+            content: [{ type: "text", text: `Resource: ${resourceId}` }],
+            structuredContent: {
+                data: { id: resourceId, loaded: true },
+            },
+            _meta: {
+                requestId: "req-123",
+                timestamp: 1704067200000,
+                cached: false,
+            },
+        };
+    })
+        .registerTool("tool-with-metadata", {
+        description: "Tool that returns response metadata",
+        inputSchema: {
+            query: z.string(),
+        },
+    }, async ({ query }) => {
+        return {
+            content: [{ type: "text", text: `Query: ${query}` }],
+            structuredContent: {
+                results: [query],
+            },
+            _meta: {
+                executionTime: 150,
+                source: "cache",
+            },
+        };
+    })
+        .registerWidget("widget-with-mixed-returns", {}, {
+        description: "Widget with mixed return paths (some with _meta, some without)",
+        inputSchema: {
+            shouldSucceed: z.boolean(),
+        },
+    }, async ({ shouldSucceed }) => {
+        if (!shouldSucceed) {
+            // Error path - no _meta
+            return {
+                content: [{ type: "text", text: "Error occurred" }],
+                structuredContent: { error: "Something went wrong" },
+            };
+        }
+        // Success path - has _meta
+        return {
+            content: [{ type: "text", text: "Success" }],
+            structuredContent: { data: "result" },
+            _meta: {
+                processedAt: 1704067200000,
+                region: "eu-west-1",
+            },
+        };
     });
 }
 export function createMinimalTestServer() {
@@ -139,13 +197,34 @@ export function createMinimalTestServer() {
         };
     });
 }
+export function createInterfaceTestServer() {
+    return new McpServer({ name: "interface-test-app", version: "1.0.0" }, {}).registerWidget("interface-widget", {}, {
+        description: "Widget with interface-typed output",
+        inputSchema: {
+            id: z.string(),
+        },
+    }, async ({ id }) => {
+        return {
+            content: [{ type: "text", text: `Item ${id}` }],
+            structuredContent: {
+                itemName: "Test Item",
+                quantity: 42,
+            },
+            _meta: {
+                processedBy: "test",
+                version: 1,
+            },
+        };
+    });
+}
 /**
  * Mock extra parameter for resource callback
  */
-export function createMockExtra(host) {
+export function createMockExtra(host, options) {
     return {
         requestInfo: {
-            headers: { host },
+            headers: { host, ...(options?.headers ?? {}) },
+            ...(options?.url ? { url: options.url } : {}),
         },
     };
 }

package/dist/test/utils.js.map

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

package/dist/test/widget.test.js

@@ -0,0 +1,334 @@
+import crypto from "node:crypto";
+import { afterEach, beforeEach, describe, expect, it, vi, } from "vitest";
+import { createMockExtra, createMockMcpServer, resetTestEnv, setTestEnv, } from "./utils.js";
+const mockManifest = {
+    "src/widgets/my-widget.tsx": { file: "my-widget.js" },
+    "src/widgets/folder-widget/index.tsx": { file: "folder-widget.js" },
+    "style.css": { file: "style.css" },
+};
+const actual = vi.hoisted(() => require("node:fs"));
+vi.mock("node:fs", () => {
+    const readFileSyncImpl = (path, ...args) => {
+        if (typeof path === "string" && path.includes("manifest.json")) {
+            return JSON.stringify(mockManifest);
+        }
+        return actual.readFileSync(path, ...args);
+    };
+    const readFileSync = vi.fn(readFileSyncImpl);
+    return {
+        readFileSync,
+        default: {
+            readFileSync,
+        },
+    };
+});
+describe("McpServer.registerWidget", () => {
+    let server;
+    let mockRegisterResource;
+    let mockRegisterTool;
+    beforeEach(() => {
+        ({ server, mockRegisterResource, mockRegisterTool } =
+            createMockMcpServer());
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+        resetTestEnv();
+    });
+    it("should generate correct HTML for development mode", async () => {
+        setTestEnv({ NODE_ENV: "development" });
+        const mockToolCallback = vi.fn();
+        const mockRegisterResourceConfig = { description: "Test widget" };
+        const mockToolConfig = { description: "Test tool" };
+        server.registerWidget("my-widget", mockRegisterResourceConfig, mockToolConfig, mockToolCallback);
+        // Get the resource callback function
+        const appsSdkResourceCallback = mockRegisterResource.mock
+            .calls[0]?.[3];
+        expect(appsSdkResourceCallback).toBeDefined();
+        const host = "localhost:3000";
+        const serverUrl = `http://${host}`;
+        const hmrUrl = `ws://${host}`;
+        const mockExtra = createMockExtra(host);
+        const result = await appsSdkResourceCallback(new URL("ui://widgets/apps-sdk/my-widget.html"), mockExtra);
+        expect(mockRegisterTool).toHaveBeenCalled();
+        expect(result).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, hmrUrl],
+                        },
+                        "openai/widgetDomain": serverUrl,
+                        "openai/widgetDescription": "Test widget",
+                    },
+                },
+            ],
+        });
+        // Check development-specific content
+        expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/@react-refresh`);
+        expect(result.contents[0]?.text).toContain(`${serverUrl}/@vite/client`);
+        expect(result.contents[0]?.text).toContain(`${serverUrl}/src/widgets/my-widget`);
+        expect(result.contents[0]?.text).not.toContain(`${serverUrl}/src/widgets/my-widget.tsx`);
+    });
+    it("should generate correct HTML for production mode", async () => {
+        setTestEnv({ NODE_ENV: "production" });
+        const mockToolCallback = vi.fn();
+        const mockRegisterResourceConfig = { description: "Test widget" };
+        const mockToolConfig = { description: "Test tool" };
+        server.registerWidget("my-widget", mockRegisterResourceConfig, mockToolConfig, mockToolCallback);
+        // Get the resource callback function
+        const appsSdkResourceCallback = mockRegisterResource.mock
+            .calls[0]?.[3];
+        expect(appsSdkResourceCallback).toBeDefined();
+        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: [
+                {
+                    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",
+                    },
+                },
+            ],
+        });
+        // Check production-specific content
+        expect(result.contents[0]?.text).not.toContain(`${serverUrl}/assets/@react-refresh`);
+        expect(result.contents[0]?.text).not.toContain(`${serverUrl}@vite/client`);
+        expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/my-widget.js`);
+        expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/style.css`);
+    });
+    it("should prefer x-alpic-forwarded-url when hashing Claude widget domains", async () => {
+        setTestEnv({ NODE_ENV: "production" });
+        const mockToolCallback = vi.fn();
+        server.registerWidget("my-widget", { description: "Test widget" }, { description: "Test tool" }, mockToolCallback);
+        const extAppsResourceCallback = mockRegisterResource.mock
+            .calls[1]?.[3];
+        expect(extAppsResourceCallback).toBeDefined();
+        const forwardedUrl = "https://everything-3a2c1264.staging.alpic.live/mcp?foo=bar";
+        const expectedDomain = `${crypto
+            .createHash("sha256")
+            .update(forwardedUrl)
+            .digest("hex")
+            .slice(0, 32)}.claudemcpcontent.com`;
+        const result = await extAppsResourceCallback(new URL("ui://widgets/ext-apps/my-widget.html"), createMockExtra("localhost:3000", {
+            headers: {
+                "user-agent": "Claude-User",
+                "x-alpic-forwarded-url": forwardedUrl,
+            },
+            url: "http://localhost:3000/mcp",
+        }));
+        expect(result.contents[0]?._meta).toEqual({
+            ui: {
+                csp: {
+                    resourceDomains: ["http://localhost:3000"],
+                    connectDomains: ["http://localhost:3000"],
+                },
+                domain: expectedDomain,
+            },
+        });
+    });
+    it("should resolve folder-based widgets (barrel files) in production mode", async () => {
+        setTestEnv({ NODE_ENV: "production" });
+        const mockToolCallback = vi.fn();
+        const mockRegisterResourceConfig = { description: "Folder widget" };
+        const mockToolConfig = { description: "Folder tool" };
+        server.registerWidget("folder-widget", mockRegisterResourceConfig, mockToolConfig, mockToolCallback);
+        const appsSdkResourceCallback = mockRegisterResource.mock
+            .calls[0]?.[3];
+        expect(appsSdkResourceCallback).toBeDefined();
+        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",
+            _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("localhost:3000"));
+        const host = "localhost:3000";
+        const serverUrl = `http://${host}`;
+        const hmrUrl = `ws://${host}`;
+        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, hmrUrl],
+                        },
+                        "openai/widgetDomain": serverUrl,
+                        "openai/widgetDescription": "Test widget",
+                        "openai/widgetPrefersBorder": true,
+                    },
+                },
+            ],
+        });
+        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();
+        const extAppsResult = await extAppsResourceCallback(new URL("ui://widgets/ext-apps/my-widget.html"), createMockExtra(host));
+        expect(extAppsResult).toEqual({
+            contents: [
+                {
+                    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, hmrUrl],
+                            },
+                            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 host = `localhost:3000`;
+        const serverUrl = `http://${host}`;
+        const hmrUrl = `ws://${host}`;
+        const result = await appsSdkCallback(new URL("ui://widgets/apps-sdk/override-test.html"), createMockExtra(host));
+        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, hmrUrl, "https://from-ui-csp.com"],
+            frame_domains: undefined,
+            redirect_domains: undefined,
+        });
+        // 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 inject viewUUID into _meta of tool callback results", async () => {
+        const mockToolCallback = vi.fn().mockResolvedValue({
+            content: [{ type: "text", text: "result" }],
+            structuredContent: { data: "test" },
+        });
+        server.registerWidget("my-widget", { description: "Test widget" }, { description: "Test tool" }, mockToolCallback);
+        // The registerTool should have been called with a wrapped callback
+        const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
+        expect(wrappedCallback).toBeDefined();
+        const result = await wrappedCallback({}, {});
+        expect(result._meta).toBeDefined();
+        expect(result._meta?.viewUUID).toBeDefined();
+        expect(typeof result._meta?.viewUUID).toBe("string");
+        // UUID v4 format
+        expect(result._meta?.viewUUID).toMatch(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/);
+    });
+    it("should preserve existing _meta when injecting viewUUID", async () => {
+        const mockToolCallback = vi.fn().mockResolvedValue({
+            content: [{ type: "text", text: "result" }],
+            structuredContent: { data: "test" },
+            _meta: { requestId: "req-123", cached: true },
+        });
+        server.registerWidget("my-widget", { description: "Test widget" }, { description: "Test tool" }, mockToolCallback);
+        const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
+        const result = await wrappedCallback({}, {});
+        expect(result._meta?.requestId).toBe("req-123");
+        expect(result._meta?.cached).toBe(true);
+        expect(result._meta?.viewUUID).toBeDefined();
+    });
+    it("should generate unique viewUUIDs across calls", async () => {
+        const mockToolCallback = vi.fn().mockResolvedValue({
+            content: [{ type: "text", text: "result" }],
+            structuredContent: {},
+        });
+        server.registerWidget("my-widget", { description: "Test widget" }, { description: "Test tool" }, mockToolCallback);
+        const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
+        const result1 = await wrappedCallback({}, {});
+        const result2 = await wrappedCallback({}, {});
+        expect(result1._meta?.viewUUID).not.toBe(result2._meta?.viewUUID);
+    });
+    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