skybridge 0.0.0-dev.f792261 → 0.0.0-dev.f7943e6

package/dist/test/utils.d.ts

@@ -91,7 +91,7 @@ export declare function createTestServer(): McpServer<Record<never, import("../s
         processedAt: number;
         region: string;
     }>;
-}>;
+}, import("../server/auth.js").ExtraClaims>;
 export declare function createMinimalTestServer(): McpServer<Record<never, import("../server/server.js").ToolDef<unknown, unknown, unknown>> & {
     "search-trip": import("../server/server.js").ToolDef<{
         destination: string;
@@ -100,7 +100,7 @@ export declare function createMinimalTestServer(): McpServer<Record<never, impor
             id: string;
         }[];
     }, unknown>;
-}>;
+}, import("../server/auth.js").ExtraClaims>;
 export declare function createInterfaceTestServer(): McpServer<Record<never, import("../server/server.js").ToolDef<unknown, unknown, unknown>> & {
     "interface-view": import("../server/server.js").ToolDef<{
         id: string;
@@ -111,7 +111,7 @@ export declare function createInterfaceTestServer(): McpServer<Record<never, imp
         processedBy: string;
         version: number;
     }>;
-}>;
+}, import("../server/auth.js").ExtraClaims>;
 export declare function createMockExtra(host: string, options?: {
     headers?: Record<string, string | string[]>;
     url?: URL | string;

package/dist/test/view.test.js

@@ -1,5 +1,9 @@
 import crypto from "node:crypto";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
 import { afterEach, beforeEach, describe, expect, it, vi, } from "vitest";
+import { TOOL_OUTPUT_WARNING_TOKENS } from "../context-warnings.js";
+import { McpServer as McpServerClass } from "../server/server.js";
 import { createMockExtra, createMockMcpServer, resetTestEnv, setTestEnv, } from "./utils.js";
 const mockManifest = {
     "skybridge:view:my-view": {
@@ -71,20 +75,24 @@ describe("McpServer.registerTool (unified API)", () => {
         const serverUrl = `http://${host}`;
         const hmrUrl = `ws://${host}`;
         const mockExtra = createMockExtra(host);
-        const result = await appsSdkResourceCallback(new URL("ui://views/apps-sdk/my-view.html"), mockExtra);
+        const result = await appsSdkResourceCallback(new URL("ui://views/ext-apps/my-view.html"), mockExtra);
         expect(mockRegisterTool).toHaveBeenCalled();
         expect(result).toEqual({
             contents: [
                 {
-                    uri: "ui://views/apps-sdk/my-view.html",
-                    mimeType: "text/html+skybridge",
+                    uri: "ui://views/ext-apps/my-view.html",
+                    mimeType: "text/html;profile=mcp-app",
                     text: expect.stringContaining('<div id="root"></div>'),
                     _meta: {
-                        "openai/widgetCSP": {
-                            resource_domains: [serverUrl],
-                            connect_domains: [serverUrl, hmrUrl],
+                        ui: {
+                            csp: {
+                                resourceDomains: [serverUrl],
+                                connectDomains: [serverUrl, hmrUrl],
+                                baseUriDomains: [serverUrl],
+                            },
+                            domain: serverUrl,
+                            description: "Test view",
                         },
-                        "openai/widgetDomain": serverUrl,
                         "openai/widgetDescription": "Test view",
                     },
                 },
@@ -110,20 +118,24 @@ describe("McpServer.registerTool (unified API)", () => {
         const host = "myapp.com";
         const serverUrl = `https://${host}`;
         const mockExtra = createMockExtra(host);
-        const versionedUri = `ui://views/apps-sdk/my-view.html${expectedVersionParam("assets/my-view-abc123.js", "style.css")}`;
+        const versionedUri = `ui://views/ext-apps/my-view.html${expectedVersionParam("assets/my-view-abc123.js", "style.css")}`;
         const result = await appsSdkResourceCallback(new URL(versionedUri), mockExtra);
         expect(result).toEqual({
             contents: [
                 {
                     uri: versionedUri,
-                    mimeType: "text/html+skybridge",
+                    mimeType: "text/html;profile=mcp-app",
                     text: expect.stringContaining('<div id="root"></div>'),
                     _meta: {
-                        "openai/widgetCSP": {
-                            resource_domains: [serverUrl],
-                            connect_domains: [serverUrl],
+                        ui: {
+                            csp: {
+                                resourceDomains: [serverUrl],
+                                connectDomains: [serverUrl],
+                                baseUriDomains: [serverUrl],
+                            },
+                            domain: serverUrl,
+                            description: "Test view",
                         },
-                        "openai/widgetDomain": serverUrl,
                         "openai/widgetDescription": "Test view",
                     },
                 },
@@ -142,7 +154,7 @@ describe("McpServer.registerTool (unified API)", () => {
             view: { component: "my-view", description: "Test view" },
         }, vi.fn());
         const extAppsResourceCallback = mockRegisterResource.mock
-            .calls[1]?.[3];
+            .calls[0]?.[3];
         expect(extAppsResourceCallback).toBeDefined();
         const forwardedUrl = "https://everything-3a2c1264.staging.alpic.live/mcp?foo=bar";
         const expectedDomain = `${crypto
@@ -167,9 +179,10 @@ describe("McpServer.registerTool (unified API)", () => {
                 description: "Test view",
                 domain: expectedDomain,
             },
+            "openai/widgetDescription": "Test view",
         });
     });
-    it("should register resources with correct hostType for both apps-sdk and ext-apps", async () => {
+    it("should register a single ext-apps resource", async () => {
         server.registerTool({
             name: "my-view",
             description: "Test tool",
@@ -179,37 +192,14 @@ describe("McpServer.registerTool (unified API)", () => {
                 prefersBorder: true,
             },
         }, vi.fn());
-        expect(mockRegisterResource).toHaveBeenCalledTimes(2);
-        const appsSdkCallback = mockRegisterResource.mock
+        expect(mockRegisterResource).toHaveBeenCalledTimes(1);
+        const resourceCallback = mockRegisterResource.mock
             .calls[0]?.[3];
         const host = "localhost:3000";
         const serverUrl = `http://${host}`;
         const hmrUrl = `ws://${host}`;
-        const appsSdkResult = await appsSdkCallback(new URL("ui://views/apps-sdk/my-view.html"), createMockExtra(host));
-        expect(appsSdkResult).toEqual({
-            contents: [
-                {
-                    uri: "ui://views/apps-sdk/my-view.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 view",
-                        "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://views/ext-apps/my-view.html"), createMockExtra(host));
-        expect(extAppsResult).toEqual({
+        const result = await resourceCallback(new URL("ui://views/ext-apps/my-view.html"), createMockExtra(host));
+        expect(result).toEqual({
             contents: [
                 {
                     uri: "ui://views/ext-apps/my-view.html",
@@ -226,27 +216,26 @@ describe("McpServer.registerTool (unified API)", () => {
                             description: "Test view",
                             prefersBorder: true,
                         },
+                        "openai/widgetDescription": "Test view",
                     },
                 },
             ],
         });
-        expect(extAppsResult.contents[0]?.text).toContain('window.skybridge = { hostType: "mcp-app", serverUrl: "http://localhost:3000" };');
+        expect(result.contents[0]?.text).toContain('window.skybridge = { hostType: "mcp-app", serverUrl: "http://localhost:3000" };');
     });
-    it("should register tool with ui.resourceUri metadata", async () => {
+    it("should advertise the single resource via ui.resourceUri only (no openai/outputTemplate)", async () => {
         server.registerTool({
             name: "my-view",
             description: "Test tool",
             view: { component: "my-view", description: "Test view" },
         }, vi.fn());
-        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://views/ext-apps/my-view.html",
-        });
+        const toolConfig = mockRegisterTool.mock.calls[0]?.[1];
+        const uri = "ui://views/ext-apps/my-view.html";
+        expect(toolConfig._meta?.ui?.resourceUri).toBe(uri);
+        expect(toolConfig._meta?.["ui/resourceUri"]).toBe(uri);
+        expect(toolConfig._meta?.["openai/outputTemplate"]).toBeUndefined();
     });
-    it("should register tool with openai/outputTemplate when apps-sdk only", async () => {
+    it("treats the deprecated hosts option as a no-op (always the single resource)", async () => {
         server.registerTool({
             name: "my-view",
             description: "Test tool",
@@ -256,11 +245,10 @@ describe("McpServer.registerTool (unified API)", () => {
                 hosts: ["apps-sdk"],
             },
         }, vi.fn());
-        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"]).toBe("ui://views/apps-sdk/my-view.html");
+        expect(mockRegisterResource).toHaveBeenCalledTimes(1);
+        const toolConfig = mockRegisterTool.mock.calls[0]?.[1];
+        expect(toolConfig._meta?.ui?.resourceUri).toBe("ui://views/ext-apps/my-view.html");
+        expect(toolConfig._meta?.["openai/outputTemplate"]).toBeUndefined();
     });
     it("should not version view URIs in development", () => {
         server.registerTool({
@@ -269,12 +257,11 @@ describe("McpServer.registerTool (unified API)", () => {
             view: { component: "my-view", description: "Test view" },
         }, vi.fn());
         const toolConfig = mockRegisterTool.mock.calls[0]?.[1];
-        expect(toolConfig._meta?.["openai/outputTemplate"]).toBe("ui://views/apps-sdk/my-view.html");
+        expect(toolConfig._meta?.["openai/outputTemplate"]).toBeUndefined();
         expect(toolConfig._meta?.ui?.resourceUri).toBe("ui://views/ext-apps/my-view.html");
-        // The URI registered with the resource handler must match the URI in
-        // outputTemplate exactly so the SDK can resolve `resources/read` requests.
-        expect(mockRegisterResource.mock.calls[0]?.[1]).toBe("ui://views/apps-sdk/my-view.html");
-        expect(mockRegisterResource.mock.calls[1]?.[1]).toBe("ui://views/ext-apps/my-view.html");
+        // The URI registered with the resource handler must match ui.resourceUri
+        // exactly so the SDK can resolve `resources/read` requests.
+        expect(mockRegisterResource.mock.calls[0]?.[1]).toBe("ui://views/ext-apps/my-view.html");
     });
     it("should append a stable content hash to view URIs in production", () => {
         setTestEnv({ NODE_ENV: "production" });
@@ -285,10 +272,9 @@ describe("McpServer.registerTool (unified API)", () => {
         }, vi.fn());
         const expected = expectedVersionParam("assets/my-view-abc123.js", "style.css");
         const toolConfig = mockRegisterTool.mock.calls[0]?.[1];
-        expect(toolConfig._meta?.["openai/outputTemplate"]).toBe(`ui://views/apps-sdk/my-view.html${expected}`);
+        expect(toolConfig._meta?.["openai/outputTemplate"]).toBeUndefined();
         expect(toolConfig._meta?.ui?.resourceUri).toBe(`ui://views/ext-apps/my-view.html${expected}`);
-        expect(mockRegisterResource.mock.calls[0]?.[1]).toBe(`ui://views/apps-sdk/my-view.html${expected}`);
-        expect(mockRegisterResource.mock.calls[1]?.[1]).toBe(`ui://views/ext-apps/my-view.html${expected}`);
+        expect(mockRegisterResource.mock.calls[0]?.[1]).toBe(`ui://views/ext-apps/my-view.html${expected}`);
     });
     it("should produce different version params for views with different bundles", () => {
         setTestEnv({ NODE_ENV: "production" });
@@ -302,8 +288,8 @@ describe("McpServer.registerTool (unified API)", () => {
             description: "Second tool",
             view: { component: "folder-view" },
         }, vi.fn());
-        const myviewTemplate = (mockRegisterTool.mock.calls[0]?.[1])._meta?.["openai/outputTemplate"];
-        const folderviewTemplate = (mockRegisterTool.mock.calls[1]?.[1])._meta?.["openai/outputTemplate"];
+        const myviewTemplate = mockRegisterTool.mock.calls[0][1]._meta?.ui?.resourceUri;
+        const folderviewTemplate = mockRegisterTool.mock.calls[1][1]._meta?.ui?.resourceUri;
         expect(myviewTemplate).not.toEqual(folderviewTemplate);
         expect(myviewTemplate).toMatch(/\?v=[0-9a-f]{8}$/);
         expect(folderviewTemplate).toMatch(/\?v=[0-9a-f]{8}$/);
@@ -316,26 +302,7 @@ describe("McpServer.registerTool (unified API)", () => {
             view: { component: "unknown-view" },
         }, vi.fn());
         const toolConfig = mockRegisterTool.mock.calls[0]?.[1];
-        expect(toolConfig._meta?.["openai/outputTemplate"]).toBe("ui://views/apps-sdk/unknown-view.html");
-    });
-    it("should register tool with ui.resourceUri only when mcp-app only", async () => {
-        server.registerTool({
-            name: "my-view",
-            description: "Test tool",
-            view: {
-                component: "my-view",
-                description: "Test view",
-                hosts: ["mcp-app"],
-            },
-        }, vi.fn());
-        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://views/ext-apps/my-view.html",
-        });
-        expect(toolConfig._meta?.["openai/outputTemplate"]).toBeUndefined();
+        expect(toolConfig._meta?.ui?.resourceUri).toBe("ui://views/ext-apps/unknown-view.html");
     });
     it("should inject viewUUID into _meta of tool callback results", async () => {
         const mockToolCallback = vi.fn().mockResolvedValue({
@@ -355,6 +322,21 @@ describe("McpServer.registerTool (unified API)", () => {
         expect(typeof result._meta?.viewUUID).toBe("string");
         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("warns when a tool callback returns large model-visible output", async () => {
+        const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => { });
+        server.registerTool({ name: "large-output", description: "Test tool" }, vi.fn().mockResolvedValue({
+            content: [
+                {
+                    type: "text",
+                    text: "x".repeat(TOOL_OUTPUT_WARNING_TOKENS * 4),
+                },
+            ],
+        }));
+        const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
+        await wrappedCallback({}, {});
+        expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('Tool "large-output" returned'));
+        warnSpy.mockRestore();
+    });
     it("should preserve existing _meta when injecting viewUUID", async () => {
         const mockToolCallback = vi.fn().mockResolvedValue({
             content: [{ type: "text", text: "result" }],
@@ -473,11 +455,12 @@ describe("McpServer.registerTool (unified API)", () => {
         const host = "localhost:3000";
         const serverUrl = `http://${host}`;
         const hmrUrl = `ws://${host}`;
-        const result = await appsSdkCallback(new URL("ui://views/apps-sdk/csp-tool.html"), createMockExtra(host));
+        const result = await appsSdkCallback(new URL("ui://views/ext-apps/csp-tool.html"), createMockExtra(host));
         const meta = result.contents[0]?._meta;
-        expect(meta["openai/widgetCSP"]).toEqual({
-            resource_domains: [serverUrl, "https://cdn.example.com"],
-            connect_domains: [serverUrl, hmrUrl, "https://api.example.com"],
+        expect(meta.ui?.csp).toEqual({
+            resourceDomains: [serverUrl, "https://cdn.example.com"],
+            connectDomains: [serverUrl, hmrUrl, "https://api.example.com"],
+            baseUriDomains: [serverUrl],
         });
     });
     it("should let view._meta override framework-computed keys", async () => {
@@ -489,18 +472,20 @@ describe("McpServer.registerTool (unified API)", () => {
                 description: "Test view",
                 csp: { connectDomains: ["https://api.x.com"] },
                 _meta: {
-                    "openai/widgetCSP": {
-                        connect_domains: ["https://api.y.com"],
+                    ui: {
+                        csp: {
+                            connectDomains: ["https://api.y.com"],
+                        },
                     },
                 },
             },
         }, vi.fn());
         const appsSdkCallback = mockRegisterResource.mock
             .calls[0]?.[3];
-        const result = await appsSdkCallback(new URL("ui://views/apps-sdk/override-tool.html"), createMockExtra("localhost:3000"));
+        const result = await appsSdkCallback(new URL("ui://views/ext-apps/override-tool.html"), createMockExtra("localhost:3000"));
         const meta = result.contents[0]?._meta;
-        expect(meta["openai/widgetCSP"]).toEqual({
-            connect_domains: ["https://api.y.com"],
+        expect(meta.ui?.csp).toEqual({
+            connectDomains: ["https://api.y.com"],
         });
     });
     it("should pass user _meta keys through to tool config", () => {
@@ -520,4 +505,48 @@ describe("McpServer.registerTool (unified API)", () => {
         expect(toolConfig._meta?.["acme.com/category"]).toBe("utility");
     });
 });
+describe("resources/list view _meta injection", () => {
+    afterEach(() => resetTestEnv());
+    it("attaches CSP, domain, and connectDomains _meta to view resources at list time", async () => {
+        setTestEnv({ NODE_ENV: "production" });
+        const server = new McpServerClass({ name: "test", version: "1.0.0" }, { capabilities: {} });
+        server.registerTool({
+            name: "start",
+            description: "Start",
+            view: {
+                component: "my-view",
+                description: "Onboarding deck",
+                domain: "skybridge.tech",
+                csp: {
+                    resourceDomains: ["https://fonts.googleapis.com"],
+                    redirectDomains: ["https://docs.skybridge.tech"],
+                },
+            },
+        }, vi.fn().mockResolvedValue({
+            content: [{ type: "text", text: "ok" }],
+            structuredContent: {},
+        }));
+        const client = new Client({ name: "test-client", version: "1.0.0" });
+        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+        await server.connect(serverTransport);
+        await client.connect(clientTransport);
+        const { resources } = await client.listResources();
+        await client.close();
+        await server.close();
+        const appsSdk = resources.find((r) => r.uri.includes("apps-sdk"));
+        const extApps = resources.find((r) => r.uri.includes("ext-apps"));
+        expect(appsSdk).toBeUndefined();
+        expect(extApps?._meta).toBeDefined();
+        const extUi = extApps._meta?.ui;
+        expect(extUi?.csp?.connectDomains?.length).toBeGreaterThan(0);
+        expect(extUi?.csp?.resourceDomains).toContain("https://fonts.googleapis.com");
+        expect(extUi?.domain).toBe("skybridge.tech");
+        const meta = extApps?._meta;
+        expect(meta["openai/widgetDescription"]).toBe("Onboarding deck");
+        expect(meta["openai/widgetCSP"]?.redirect_domains).toEqual([
+            "https://docs.skybridge.tech",
+        ]);
+        expect(meta.ui?.csp).not.toHaveProperty("redirectDomains");
+    });
+});
 //# sourceMappingURL=view.test.js.map