skybridge 0.0.0-dev.f391982 → 0.0.0-dev.f3dd6f0

package/dist/server/tunnel-proxy-router.test.js

@@ -0,0 +1,229 @@
+import { EventEmitter } from "node:events";
+import http from "node:http";
+import { Readable } from "node:stream";
+import express from "express";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { startTunnelControlServer } from "../cli/tunnel-control-server.js";
+import { createTunnelProxyRouter } from "./tunnel-proxy-router.js";
+function makeFakeChild() {
+    const child = new EventEmitter();
+    child.stdout = new Readable({ read() { } });
+    child.stderr = new Readable({ read() { } });
+    child.kill = vi.fn(() => true);
+    return child;
+}
+async function listen(handler) {
+    const server = http.createServer(handler);
+    await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const port = server.address().port;
+    return { port, server };
+}
+const cleanups = [];
+afterEach(async () => {
+    while (cleanups.length > 0) {
+        const cleanup = cleanups.pop();
+        if (cleanup) {
+            await cleanup();
+        }
+    }
+});
+async function startProxy(controlPort) {
+    const app = express();
+    app.use(createTunnelProxyRouter(controlPort));
+    const { port, server } = await listen(app);
+    cleanups.push(() => new Promise((resolve) => {
+        server.closeAllConnections?.();
+        server.close(() => resolve());
+    }));
+    return { port, server };
+}
+async function startControl() {
+    const child = makeFakeChild();
+    const control = await startTunnelControlServer(() => 3000, {
+        spawn: () => child,
+    });
+    cleanups.push(() => control.close());
+    return { control, child };
+}
+describe("createTunnelProxyRouter", () => {
+    describe("POST /__skybridge/tunnel", () => {
+        it("forwards to upstream and returns the upstream JSON", async () => {
+            const { control } = await startControl();
+            const { port } = await startProxy(control.port);
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            expect(res.status).toBe(200);
+            expect(res.headers.get("content-type")).toMatch(/application\/json/);
+            expect(await res.json()).toEqual({
+                status: "starting",
+                message: "Starting tunnel…",
+            });
+            expect(control.manager.getState().status).toBe("starting");
+        });
+        it("returns 502 when upstream is unavailable", async () => {
+            // Pick a port nothing is listening on by starting+stopping a server.
+            const probe = http.createServer();
+            await new Promise((resolve) => probe.listen(0, "127.0.0.1", resolve));
+            const deadPort = probe.address().port;
+            await new Promise((resolve) => probe.close(() => resolve()));
+            const { port } = await startProxy(deadPort);
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            expect(res.status).toBe(502);
+            const body = (await res.json());
+            expect(body.status).toBe("error");
+            expect(typeof body.message).toBe("string");
+        });
+    });
+    describe("DELETE /__skybridge/tunnel", () => {
+        it("forwards to upstream and returns the upstream JSON", async () => {
+            const { control, child } = await startControl();
+            const { port } = await startProxy(control.port);
+            // First start the tunnel so DELETE has something to stop.
+            await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "DELETE",
+            });
+            expect(res.status).toBe(200);
+            expect(await res.json()).toEqual({ status: "idle" });
+            expect(child.kill).toHaveBeenCalled();
+        });
+        it("returns 502 when upstream is unavailable", async () => {
+            const probe = http.createServer();
+            await new Promise((resolve) => probe.listen(0, "127.0.0.1", resolve));
+            const deadPort = probe.address().port;
+            await new Promise((resolve) => probe.close(() => resolve()));
+            const { port } = await startProxy(deadPort);
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "DELETE",
+            });
+            expect(res.status).toBe(502);
+        });
+    });
+    describe("GET /__skybridge/tunnel/events", () => {
+        it("pipes the upstream SSE stream through to the client", async () => {
+            const { control, child } = await startControl();
+            const { port } = await startProxy(control.port);
+            // Get the manager into a known state so the initial SSE frame is
+            // deterministic.
+            await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            child.stdout.emit("data", Buffer.from("Forwarding: https://abc.tunnel.example -> http://localhost:3000\n"));
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel/events`);
+            expect(res.status).toBe(200);
+            expect(res.headers.get("content-type")).toMatch(/text\/event-stream/);
+            expect(res.headers.get("cache-control")).toMatch(/no-cache/);
+            const body = res.body;
+            if (!body) {
+                throw new Error("expected response body");
+            }
+            const reader = body.getReader();
+            const { value } = await reader.read();
+            const chunk = new TextDecoder().decode(value);
+            expect(chunk).toContain("event: state");
+            expect(chunk).toContain('"status":"connected"');
+            expect(chunk).toContain('"url":"https://abc.tunnel.example"');
+            await reader.cancel();
+        });
+        it("forwards subsequent state changes through the SSE stream", async () => {
+            const { control, child } = await startControl();
+            const { port } = await startProxy(control.port);
+            await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel/events`);
+            const body = res.body;
+            if (!body) {
+                throw new Error("expected response body");
+            }
+            const reader = body.getReader();
+            const decoder = new TextDecoder();
+            // Drain the initial "starting" frame.
+            const first = await reader.read();
+            expect(decoder.decode(first.value)).toContain('"status":"starting"');
+            // Now drive a state change on the manager and read the next frame.
+            child.stdout.emit("data", Buffer.from("Forwarding: https://abc.tunnel.example -> http://localhost:3000\n"));
+            let combined = "";
+            // Reads may chunk arbitrarily, so accumulate until we see the connected
+            // event or hit a sane cap.
+            for (let i = 0; i < 5; i++) {
+                const { value, done } = await reader.read();
+                if (done) {
+                    break;
+                }
+                combined += decoder.decode(value);
+                if (combined.includes('"status":"connected"')) {
+                    break;
+                }
+            }
+            expect(combined).toContain('"status":"connected"');
+            expect(combined).toContain('"url":"https://abc.tunnel.example"');
+            await reader.cancel();
+        });
+        it("returns 502 when upstream is unavailable", async () => {
+            const probe = http.createServer();
+            await new Promise((resolve) => probe.listen(0, "127.0.0.1", resolve));
+            const deadPort = probe.address().port;
+            await new Promise((resolve) => probe.close(() => resolve()));
+            const { port } = await startProxy(deadPort);
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel/events`);
+            expect(res.status).toBe(502);
+            const body = (await res.json());
+            expect(body.status).toBe("error");
+        });
+        it("aborts the upstream connection when the proxy server is closed mid-stream", async () => {
+            const { control } = await startControl();
+            const { port, server } = await startProxy(control.port);
+            await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            // Snapshot the manager's listener counts before the SSE subscription so
+            // we can verify the proxy disconnected from upstream after shutdown.
+            const baseStateListeners = control.manager.listenerCount("state");
+            const baseActivityListeners = control.manager.listenerCount("activity");
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel/events`);
+            const body = res.body;
+            if (!body) {
+                throw new Error("expected response body");
+            }
+            const reader = body.getReader();
+            // Drain the first frame to confirm the stream is live and the upstream
+            // SSE handler has subscribed to the manager.
+            await reader.read();
+            expect(control.manager.listenerCount("state")).toBe(baseStateListeners + 1);
+            // Close the proxy server, destroying in-flight responses. The proxy's
+            // req.on("close", ...) should fire and abort the upstream fetch.
+            server.closeAllConnections?.();
+            await new Promise((resolve) => server.close(() => resolve()));
+            // The client-side stream is dead — drain or fail, either is acceptable.
+            try {
+                while (true) {
+                    const { done } = await reader.read();
+                    if (done) {
+                        break;
+                    }
+                }
+            }
+            catch {
+                // expected: socket terminated when proxy server was destroyed
+            }
+            // Wait briefly for the upstream's req.on("close") to fire, then assert
+            // the manager listeners were detached. This is the load-bearing
+            // verification: it proves the proxy's AbortController propagated and
+            // upstream cleaned up its SSE subscription.
+            const start = Date.now();
+            while (control.manager.listenerCount("state") > baseStateListeners &&
+                Date.now() - start < 1000) {
+                await new Promise((r) => setTimeout(r, 20));
+            }
+            expect(control.manager.listenerCount("state")).toBe(baseStateListeners);
+            expect(control.manager.listenerCount("activity")).toBe(baseActivityListeners);
+        });
+    });
+});
+//# sourceMappingURL=tunnel-proxy-router.test.js.map

package/dist/server/tunnel-proxy-router.test.js.map

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

package/dist/test/view.test.js

@@ -2,14 +2,14 @@ import crypto from "node:crypto";
 import { afterEach, beforeEach, describe, expect, it, vi, } from "vitest";
 import { createMockExtra, createMockMcpServer, resetTestEnv, setTestEnv, } from "./utils.js";
 const mockManifest = {
-    "skybridge:view:my-widget": {
-        file: "assets/my-widget-abc123.js",
-        name: "my-widget",
+    "skybridge:view:my-view": {
+        file: "assets/my-view-abc123.js",
+        name: "my-view",
         isEntry: true,
     },
-    "skybridge:view:folder-widget": {
-        file: "assets/folder-widget-def456.js",
-        name: "folder-widget",
+    "skybridge:view:folder-view": {
+        file: "assets/folder-view-def456.js",
+        name: "folder-view",
         isEntry: true,
     },
     "style.css": { file: "style.css" },
@@ -57,10 +57,10 @@ describe("McpServer.registerTool (unified API)", () => {
     it("should generate correct HTML for development mode", async () => {
         setTestEnv({ NODE_ENV: "development" });
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "Test tool",
             view: {
-                component: "my-widget",
+                component: "my-view",
                 description: "Test view",
             },
         }, vi.fn());
@@ -71,12 +71,12 @@ describe("McpServer.registerTool (unified API)", () => {
         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);
+        const result = await appsSdkResourceCallback(new URL("ui://views/apps-sdk/my-view.html"), mockExtra);
         expect(mockRegisterTool).toHaveBeenCalled();
         expect(result).toEqual({
             contents: [
                 {
-                    uri: "ui://widgets/apps-sdk/my-widget.html",
+                    uri: "ui://views/apps-sdk/my-view.html",
                     mimeType: "text/html+skybridge",
                     text: expect.stringContaining('<div id="root"></div>'),
                     _meta: {
@@ -92,15 +92,15 @@ describe("McpServer.registerTool (unified API)", () => {
         });
         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}/_skybridge/view/my-widget`);
+        expect(result.contents[0]?.text).toContain(`${serverUrl}/_skybridge/view/my-view`);
     });
     it("should generate correct HTML for production mode", async () => {
         setTestEnv({ NODE_ENV: "production" });
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "Test tool",
             view: {
-                component: "my-widget",
+                component: "my-view",
                 description: "Test view",
             },
         }, vi.fn());
@@ -110,7 +110,7 @@ describe("McpServer.registerTool (unified API)", () => {
         const host = "myapp.com";
         const serverUrl = `https://${host}`;
         const mockExtra = createMockExtra(host);
-        const versionedUri = `ui://widgets/apps-sdk/my-widget.html${expectedVersionParam("assets/my-widget-abc123.js", "style.css")}`;
+        const versionedUri = `ui://views/apps-sdk/my-view.html${expectedVersionParam("assets/my-view-abc123.js", "style.css")}`;
         const result = await appsSdkResourceCallback(new URL(versionedUri), mockExtra);
         expect(result).toEqual({
             contents: [
@@ -131,15 +131,15 @@ describe("McpServer.registerTool (unified API)", () => {
         });
         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/assets/my-widget-abc123.js`);
+        expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/assets/my-view-abc123.js`);
         expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/style.css`);
     });
     it("should prefer x-alpic-forwarded-url when hashing Claude view domains", async () => {
         setTestEnv({ NODE_ENV: "production" });
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "Test tool",
-            view: { component: "my-widget", description: "Test view" },
+            view: { component: "my-view", description: "Test view" },
         }, vi.fn());
         const extAppsResourceCallback = mockRegisterResource.mock
             .calls[1]?.[3];
@@ -150,7 +150,7 @@ describe("McpServer.registerTool (unified API)", () => {
             .update(forwardedUrl)
             .digest("hex")
             .slice(0, 32)}.claudemcpcontent.com`;
-        const result = await extAppsResourceCallback(new URL(`ui://widgets/ext-apps/my-widget.html${expectedVersionParam("assets/my-widget-abc123.js", "style.css")}`), createMockExtra("localhost:3000", {
+        const result = await extAppsResourceCallback(new URL(`ui://views/ext-apps/my-view.html${expectedVersionParam("assets/my-view-abc123.js", "style.css")}`), createMockExtra("localhost:3000", {
             headers: {
                 "user-agent": "Claude-User",
                 "x-alpic-forwarded-url": forwardedUrl,
@@ -171,10 +171,10 @@ describe("McpServer.registerTool (unified API)", () => {
     });
     it("should register resources with correct hostType for both apps-sdk and ext-apps", async () => {
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "Test tool",
             view: {
-                component: "my-widget",
+                component: "my-view",
                 description: "Test view",
                 prefersBorder: true,
             },
@@ -185,11 +185,11 @@ describe("McpServer.registerTool (unified API)", () => {
         const host = "localhost:3000";
         const serverUrl = `http://${host}`;
         const hmrUrl = `ws://${host}`;
-        const appsSdkResult = await appsSdkCallback(new URL("ui://widgets/apps-sdk/my-widget.html"), createMockExtra(host));
+        const appsSdkResult = await appsSdkCallback(new URL("ui://views/apps-sdk/my-view.html"), createMockExtra(host));
         expect(appsSdkResult).toEqual({
             contents: [
                 {
-                    uri: "ui://widgets/apps-sdk/my-widget.html",
+                    uri: "ui://views/apps-sdk/my-view.html",
                     mimeType: "text/html+skybridge",
                     text: expect.stringContaining('<div id="root"></div>'),
                     _meta: {
@@ -208,11 +208,11 @@ describe("McpServer.registerTool (unified API)", () => {
         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));
+        const extAppsResult = await extAppsResourceCallback(new URL("ui://views/ext-apps/my-view.html"), createMockExtra(host));
         expect(extAppsResult).toEqual({
             contents: [
                 {
-                    uri: "ui://widgets/ext-apps/my-widget.html",
+                    uri: "ui://views/ext-apps/my-view.html",
                     mimeType: "text/html;profile=mcp-app",
                     text: expect.stringContaining('<div id="root"></div>'),
                     _meta: {
@@ -234,24 +234,24 @@ describe("McpServer.registerTool (unified API)", () => {
     });
     it("should register tool with ui.resourceUri metadata", async () => {
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "Test tool",
-            view: { component: "my-widget", description: "Test view" },
+            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://widgets/ext-apps/my-widget.html",
+            resourceUri: "ui://views/ext-apps/my-view.html",
         });
     });
     it("should register tool with openai/outputTemplate when apps-sdk only", async () => {
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "Test tool",
             view: {
-                component: "my-widget",
+                component: "my-view",
                 description: "Test view",
                 hosts: ["apps-sdk"],
             },
@@ -260,70 +260,70 @@ describe("McpServer.registerTool (unified API)", () => {
         const toolCallArgs = mockRegisterTool.mock.calls[0];
         const toolConfig = toolCallArgs?.[1];
         expect(toolConfig._meta).not.toHaveProperty("ui");
-        expect(toolConfig._meta?.["openai/outputTemplate"]).toBe("ui://widgets/apps-sdk/my-widget.html");
+        expect(toolConfig._meta?.["openai/outputTemplate"]).toBe("ui://views/apps-sdk/my-view.html");
     });
     it("should not version view URIs in development", () => {
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "Test tool",
-            view: { component: "my-widget", description: "Test view" },
+            view: { component: "my-view", description: "Test view" },
         }, vi.fn());
         const toolConfig = mockRegisterTool.mock.calls[0]?.[1];
-        expect(toolConfig._meta?.["openai/outputTemplate"]).toBe("ui://widgets/apps-sdk/my-widget.html");
-        expect(toolConfig._meta?.ui?.resourceUri).toBe("ui://widgets/ext-apps/my-widget.html");
+        expect(toolConfig._meta?.["openai/outputTemplate"]).toBe("ui://views/apps-sdk/my-view.html");
+        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://widgets/apps-sdk/my-widget.html");
-        expect(mockRegisterResource.mock.calls[1]?.[1]).toBe("ui://widgets/ext-apps/my-widget.html");
+        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");
     });
     it("should append a stable content hash to view URIs in production", () => {
         setTestEnv({ NODE_ENV: "production" });
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "Test tool",
-            view: { component: "my-widget", description: "Test view" },
+            view: { component: "my-view", description: "Test view" },
         }, vi.fn());
-        const expected = expectedVersionParam("assets/my-widget-abc123.js", "style.css");
+        const expected = expectedVersionParam("assets/my-view-abc123.js", "style.css");
         const toolConfig = mockRegisterTool.mock.calls[0]?.[1];
-        expect(toolConfig._meta?.["openai/outputTemplate"]).toBe(`ui://widgets/apps-sdk/my-widget.html${expected}`);
-        expect(toolConfig._meta?.ui?.resourceUri).toBe(`ui://widgets/ext-apps/my-widget.html${expected}`);
-        expect(mockRegisterResource.mock.calls[0]?.[1]).toBe(`ui://widgets/apps-sdk/my-widget.html${expected}`);
-        expect(mockRegisterResource.mock.calls[1]?.[1]).toBe(`ui://widgets/ext-apps/my-widget.html${expected}`);
+        expect(toolConfig._meta?.["openai/outputTemplate"]).toBe(`ui://views/apps-sdk/my-view.html${expected}`);
+        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}`);
     });
     it("should produce different version params for views with different bundles", () => {
         setTestEnv({ NODE_ENV: "production" });
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "First tool",
-            view: { component: "my-widget" },
+            view: { component: "my-view" },
         }, vi.fn());
         server.registerTool({
-            name: "folder-widget",
+            name: "folder-view",
             description: "Second tool",
-            view: { component: "folder-widget" },
+            view: { component: "folder-view" },
         }, vi.fn());
-        const myWidgetTemplate = (mockRegisterTool.mock.calls[0]?.[1])._meta?.["openai/outputTemplate"];
-        const folderWidgetTemplate = (mockRegisterTool.mock.calls[1]?.[1])._meta?.["openai/outputTemplate"];
-        expect(myWidgetTemplate).not.toEqual(folderWidgetTemplate);
-        expect(myWidgetTemplate).toMatch(/\?v=[0-9a-f]{8}$/);
-        expect(folderWidgetTemplate).toMatch(/\?v=[0-9a-f]{8}$/);
+        const myviewTemplate = (mockRegisterTool.mock.calls[0]?.[1])._meta?.["openai/outputTemplate"];
+        const folderviewTemplate = (mockRegisterTool.mock.calls[1]?.[1])._meta?.["openai/outputTemplate"];
+        expect(myviewTemplate).not.toEqual(folderviewTemplate);
+        expect(myviewTemplate).toMatch(/\?v=[0-9a-f]{8}$/);
+        expect(folderviewTemplate).toMatch(/\?v=[0-9a-f]{8}$/);
     });
     it("should fall back to bare URI in production when manifest is missing", () => {
         setTestEnv({ NODE_ENV: "production" });
         server.registerTool({
-            name: "unknown-widget",
+            name: "unknown-view",
             description: "Test tool",
-            view: { component: "unknown-widget" },
+            view: { component: "unknown-view" },
         }, vi.fn());
         const toolConfig = mockRegisterTool.mock.calls[0]?.[1];
-        expect(toolConfig._meta?.["openai/outputTemplate"]).toBe("ui://widgets/apps-sdk/unknown-widget.html");
+        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-widget",
+            name: "my-view",
             description: "Test tool",
             view: {
-                component: "my-widget",
+                component: "my-view",
                 description: "Test view",
                 hosts: ["mcp-app"],
             },
@@ -333,7 +333,7 @@ describe("McpServer.registerTool (unified API)", () => {
         const toolConfig = toolCallArgs?.[1];
         expect(toolConfig._meta).toHaveProperty("ui");
         expect(toolConfig._meta?.ui).toEqual({
-            resourceUri: "ui://widgets/ext-apps/my-widget.html",
+            resourceUri: "ui://views/ext-apps/my-view.html",
         });
         expect(toolConfig._meta?.["openai/outputTemplate"]).toBeUndefined();
     });
@@ -343,9 +343,9 @@ describe("McpServer.registerTool (unified API)", () => {
             structuredContent: { data: "test" },
         });
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "Test tool",
-            view: { component: "my-widget", description: "Test view" },
+            view: { component: "my-view", description: "Test view" },
         }, mockToolCallback);
         const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
         expect(wrappedCallback).toBeDefined();
@@ -362,9 +362,9 @@ describe("McpServer.registerTool (unified API)", () => {
             _meta: { requestId: "req-123", cached: true },
         });
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "Test tool",
-            view: { component: "my-widget", description: "Test view" },
+            view: { component: "my-view", description: "Test view" },
         }, mockToolCallback);
         const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
         const result = await wrappedCallback({}, {});
@@ -378,9 +378,9 @@ describe("McpServer.registerTool (unified API)", () => {
             structuredContent: {},
         });
         server.registerTool({
-            name: "my-widget",
+            name: "my-view",
             description: "Test tool",
-            view: { component: "my-widget", description: "Test view" },
+            view: { component: "my-view", description: "Test view" },
         }, mockToolCallback);
         const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
         const result1 = await wrappedCallback({}, {});
@@ -473,7 +473,7 @@ describe("McpServer.registerTool (unified API)", () => {
         const host = "localhost:3000";
         const serverUrl = `http://${host}`;
         const hmrUrl = `ws://${host}`;
-        const result = await appsSdkCallback(new URL("ui://widgets/apps-sdk/csp-tool.html"), createMockExtra(host));
+        const result = await appsSdkCallback(new URL("ui://views/apps-sdk/csp-tool.html"), createMockExtra(host));
         const meta = result.contents[0]?._meta;
         expect(meta["openai/widgetCSP"]).toEqual({
             resource_domains: [serverUrl, "https://cdn.example.com"],
@@ -497,7 +497,7 @@ describe("McpServer.registerTool (unified API)", () => {
         }, vi.fn());
         const appsSdkCallback = mockRegisterResource.mock
             .calls[0]?.[3];
-        const result = await appsSdkCallback(new URL("ui://widgets/apps-sdk/override-tool.html"), createMockExtra("localhost:3000"));
+        const result = await appsSdkCallback(new URL("ui://views/apps-sdk/override-tool.html"), createMockExtra("localhost:3000"));
         const meta = result.contents[0]?._meta;
         expect(meta["openai/widgetCSP"]).toEqual({
             connect_domains: ["https://api.y.com"],