skybridge 0.35.21 → 0.36.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (134) hide show
  1. package/README.md +8 -8
  2. package/dist/cli/header.js +1 -1
  3. package/dist/cli/header.js.map +1 -1
  4. package/dist/cli/use-nodemon.js +2 -2
  5. package/dist/cli/use-nodemon.js.map +1 -1
  6. package/dist/cli/use-tunnel.d.ts +12 -5
  7. package/dist/cli/use-tunnel.js +34 -29
  8. package/dist/cli/use-tunnel.js.map +1 -1
  9. package/dist/cli/use-typescript-check.d.ts +1 -0
  10. package/dist/cli/use-typescript-check.js +41 -6
  11. package/dist/cli/use-typescript-check.js.map +1 -1
  12. package/dist/commands/build.js +28 -7
  13. package/dist/commands/build.js.map +1 -1
  14. package/dist/commands/dev.d.ts +1 -0
  15. package/dist/commands/dev.js +7 -2
  16. package/dist/commands/dev.js.map +1 -1
  17. package/dist/commands/start.js +7 -10
  18. package/dist/commands/start.js.map +1 -1
  19. package/dist/server/asset-base-url-transform-plugin.js +1 -1
  20. package/dist/server/asset-base-url-transform-plugin.js.map +1 -1
  21. package/dist/server/asset-base-url-transform-plugin.test.js +29 -0
  22. package/dist/server/asset-base-url-transform-plugin.test.js.map +1 -1
  23. package/dist/server/content-helpers.d.ts +27 -0
  24. package/dist/server/content-helpers.js +46 -0
  25. package/dist/server/content-helpers.js.map +1 -0
  26. package/dist/server/content-helpers.test.js +70 -0
  27. package/dist/server/content-helpers.test.js.map +1 -0
  28. package/dist/server/express.js +3 -3
  29. package/dist/server/express.js.map +1 -1
  30. package/dist/server/express.test.js +39 -2
  31. package/dist/server/express.test.js.map +1 -1
  32. package/dist/server/index.d.ts +4 -3
  33. package/dist/server/index.js +3 -2
  34. package/dist/server/index.js.map +1 -1
  35. package/dist/server/inferUtilityTypes.d.ts +6 -6
  36. package/dist/server/middleware.test.js +12 -9
  37. package/dist/server/middleware.test.js.map +1 -1
  38. package/dist/server/server.d.ts +95 -72
  39. package/dist/server/server.js +204 -73
  40. package/dist/server/server.js.map +1 -1
  41. package/dist/server/templateHelper.d.ts +5 -5
  42. package/dist/server/templates/development.hbs +2 -2
  43. package/dist/server/templates/production.hbs +1 -1
  44. package/dist/server/viewsDevServer.d.ts +14 -0
  45. package/dist/server/viewsDevServer.js +45 -0
  46. package/dist/server/viewsDevServer.js.map +1 -0
  47. package/dist/test/utils.d.ts +8 -20
  48. package/dist/test/utils.js +39 -35
  49. package/dist/test/utils.js.map +1 -1
  50. package/dist/test/view.test.js +523 -0
  51. package/dist/test/view.test.js.map +1 -0
  52. package/dist/web/bridges/apps-sdk/adaptor.d.ts +2 -2
  53. package/dist/web/bridges/apps-sdk/adaptor.js +8 -2
  54. package/dist/web/bridges/apps-sdk/adaptor.js.map +1 -1
  55. package/dist/web/bridges/mcp-app/adaptor.d.ts +6 -6
  56. package/dist/web/bridges/mcp-app/adaptor.js +24 -24
  57. package/dist/web/bridges/mcp-app/adaptor.js.map +1 -1
  58. package/dist/web/bridges/types.d.ts +7 -7
  59. package/dist/web/components/modal-provider.js +1 -1
  60. package/dist/web/components/modal-provider.js.map +1 -1
  61. package/dist/web/create-store.js +9 -9
  62. package/dist/web/create-store.js.map +1 -1
  63. package/dist/web/create-store.test.js +14 -16
  64. package/dist/web/create-store.test.js.map +1 -1
  65. package/dist/web/data-llm.d.ts +1 -1
  66. package/dist/web/data-llm.js +3 -3
  67. package/dist/web/data-llm.js.map +1 -1
  68. package/dist/web/data-llm.test.js +22 -22
  69. package/dist/web/data-llm.test.js.map +1 -1
  70. package/dist/web/generate-helpers.d.ts +20 -18
  71. package/dist/web/generate-helpers.js +20 -18
  72. package/dist/web/generate-helpers.js.map +1 -1
  73. package/dist/web/generate-helpers.test-d.js +26 -26
  74. package/dist/web/generate-helpers.test-d.js.map +1 -1
  75. package/dist/web/helpers/state.d.ts +2 -2
  76. package/dist/web/helpers/state.js +11 -11
  77. package/dist/web/helpers/state.js.map +1 -1
  78. package/dist/web/helpers/state.test.js +9 -9
  79. package/dist/web/helpers/state.test.js.map +1 -1
  80. package/dist/web/hooks/index.d.ts +1 -1
  81. package/dist/web/hooks/index.js +1 -1
  82. package/dist/web/hooks/index.js.map +1 -1
  83. package/dist/web/hooks/use-request-modal.d.ts +1 -1
  84. package/dist/web/hooks/use-request-modal.js +4 -4
  85. package/dist/web/hooks/use-request-modal.js.map +1 -1
  86. package/dist/web/hooks/use-request-modal.test.js +1 -1
  87. package/dist/web/hooks/use-request-modal.test.js.map +1 -1
  88. package/dist/web/hooks/use-view-state.d.ts +4 -0
  89. package/dist/web/hooks/use-view-state.js +32 -0
  90. package/dist/web/hooks/use-view-state.js.map +1 -0
  91. package/dist/web/hooks/{use-widget-state.test.js → use-view-state.test.js} +17 -17
  92. package/dist/web/hooks/use-view-state.test.js.map +1 -0
  93. package/dist/web/index.d.ts +1 -2
  94. package/dist/web/index.js +1 -2
  95. package/dist/web/index.js.map +1 -1
  96. package/dist/web/mount-view.d.ts +1 -0
  97. package/dist/web/{mount-widget.js → mount-view.js} +2 -2
  98. package/dist/web/mount-view.js.map +1 -0
  99. package/dist/web/plugin/plugin.d.ts +4 -1
  100. package/dist/web/plugin/plugin.js +134 -25
  101. package/dist/web/plugin/plugin.js.map +1 -1
  102. package/dist/web/plugin/scan-views.d.ts +16 -0
  103. package/dist/web/plugin/scan-views.js +88 -0
  104. package/dist/web/plugin/scan-views.js.map +1 -0
  105. package/dist/web/plugin/scan-views.test.d.ts +1 -0
  106. package/dist/web/plugin/scan-views.test.js +99 -0
  107. package/dist/web/plugin/scan-views.test.js.map +1 -0
  108. package/dist/web/plugin/validate-view.d.ts +1 -0
  109. package/dist/web/plugin/validate-view.js +9 -0
  110. package/dist/web/plugin/validate-view.js.map +1 -0
  111. package/dist/web/plugin/validate-view.test.d.ts +1 -0
  112. package/dist/web/plugin/validate-view.test.js +24 -0
  113. package/dist/web/plugin/validate-view.test.js.map +1 -0
  114. package/package.json +8 -1
  115. package/tsconfig.base.json +2 -0
  116. package/dist/server/widgetsDevServer.d.ts +0 -13
  117. package/dist/server/widgetsDevServer.js +0 -52
  118. package/dist/server/widgetsDevServer.js.map +0 -1
  119. package/dist/test/widget.test.js +0 -334
  120. package/dist/test/widget.test.js.map +0 -1
  121. package/dist/web/hooks/use-widget-state.d.ts +0 -4
  122. package/dist/web/hooks/use-widget-state.js +0 -32
  123. package/dist/web/hooks/use-widget-state.js.map +0 -1
  124. package/dist/web/hooks/use-widget-state.test.js.map +0 -1
  125. package/dist/web/mount-widget.d.ts +0 -1
  126. package/dist/web/mount-widget.js.map +0 -1
  127. package/dist/web/plugin/validate-widget.d.ts +0 -5
  128. package/dist/web/plugin/validate-widget.js +0 -27
  129. package/dist/web/plugin/validate-widget.js.map +0 -1
  130. package/dist/web/plugin/validate-widget.test.js +0 -42
  131. package/dist/web/plugin/validate-widget.test.js.map +0 -1
  132. /package/dist/{test/widget.test.d.ts → server/content-helpers.test.d.ts} +0 -0
  133. /package/dist/{web/hooks/use-widget-state.test.d.ts → test/view.test.d.ts} +0 -0
  134. /package/dist/web/{plugin/validate-widget.test.d.ts → hooks/use-view-state.test.d.ts} +0 -0
@@ -0,0 +1,523 @@
1
+ import crypto from "node:crypto";
2
+ import { afterEach, beforeEach, describe, expect, it, vi, } from "vitest";
3
+ import { createMockExtra, createMockMcpServer, resetTestEnv, setTestEnv, } from "./utils.js";
4
+ const mockManifest = {
5
+ "skybridge:view:my-view": {
6
+ file: "assets/my-view-abc123.js",
7
+ name: "my-view",
8
+ isEntry: true,
9
+ },
10
+ "skybridge:view:folder-view": {
11
+ file: "assets/folder-view-def456.js",
12
+ name: "folder-view",
13
+ isEntry: true,
14
+ },
15
+ "style.css": { file: "style.css" },
16
+ };
17
+ // Mirrors `McpServer.computeViewVersionParam`. Tests recompute the expected
18
+ // hash from the mocked manifest so they don't hardcode digest output.
19
+ function expectedVersionParam(viewFile, styleFile) {
20
+ const hash = crypto
21
+ .createHash("sha256")
22
+ .update(viewFile)
23
+ .update("\0")
24
+ .update(styleFile)
25
+ .digest("hex")
26
+ .slice(0, 8);
27
+ return `?v=${hash}`;
28
+ }
29
+ const actual = vi.hoisted(() => require("node:fs"));
30
+ vi.mock("node:fs", () => {
31
+ const readFileSyncImpl = (path, ...args) => {
32
+ if (typeof path === "string" && path.includes("manifest.json")) {
33
+ return JSON.stringify(mockManifest);
34
+ }
35
+ return actual.readFileSync(path, ...args);
36
+ };
37
+ const readFileSync = vi.fn(readFileSyncImpl);
38
+ return {
39
+ readFileSync,
40
+ default: {
41
+ readFileSync,
42
+ },
43
+ };
44
+ });
45
+ describe("McpServer.registerTool (unified API)", () => {
46
+ let server;
47
+ let mockRegisterResource;
48
+ let mockRegisterTool;
49
+ beforeEach(() => {
50
+ ({ server, mockRegisterResource, mockRegisterTool } =
51
+ createMockMcpServer());
52
+ });
53
+ afterEach(() => {
54
+ vi.clearAllMocks();
55
+ resetTestEnv();
56
+ });
57
+ it("should generate correct HTML for development mode", async () => {
58
+ setTestEnv({ NODE_ENV: "development" });
59
+ server.registerTool({
60
+ name: "my-view",
61
+ description: "Test tool",
62
+ view: {
63
+ component: "my-view",
64
+ description: "Test view",
65
+ },
66
+ }, vi.fn());
67
+ const appsSdkResourceCallback = mockRegisterResource.mock
68
+ .calls[0]?.[3];
69
+ expect(appsSdkResourceCallback).toBeDefined();
70
+ const host = "localhost:3000";
71
+ const serverUrl = `http://${host}`;
72
+ const hmrUrl = `ws://${host}`;
73
+ const mockExtra = createMockExtra(host);
74
+ const result = await appsSdkResourceCallback(new URL("ui://views/apps-sdk/my-view.html"), mockExtra);
75
+ expect(mockRegisterTool).toHaveBeenCalled();
76
+ expect(result).toEqual({
77
+ contents: [
78
+ {
79
+ uri: "ui://views/apps-sdk/my-view.html",
80
+ mimeType: "text/html+skybridge",
81
+ text: expect.stringContaining('<div id="root"></div>'),
82
+ _meta: {
83
+ "openai/widgetCSP": {
84
+ resource_domains: [serverUrl],
85
+ connect_domains: [serverUrl, hmrUrl],
86
+ },
87
+ "openai/widgetDomain": serverUrl,
88
+ "openai/widgetDescription": "Test view",
89
+ },
90
+ },
91
+ ],
92
+ });
93
+ expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/@react-refresh`);
94
+ expect(result.contents[0]?.text).toContain(`${serverUrl}/@vite/client`);
95
+ expect(result.contents[0]?.text).toContain(`${serverUrl}/_skybridge/view/my-view`);
96
+ });
97
+ it("should generate correct HTML for production mode", async () => {
98
+ setTestEnv({ NODE_ENV: "production" });
99
+ server.registerTool({
100
+ name: "my-view",
101
+ description: "Test tool",
102
+ view: {
103
+ component: "my-view",
104
+ description: "Test view",
105
+ },
106
+ }, vi.fn());
107
+ const appsSdkResourceCallback = mockRegisterResource.mock
108
+ .calls[0]?.[3];
109
+ expect(appsSdkResourceCallback).toBeDefined();
110
+ const host = "myapp.com";
111
+ const serverUrl = `https://${host}`;
112
+ const mockExtra = createMockExtra(host);
113
+ const versionedUri = `ui://views/apps-sdk/my-view.html${expectedVersionParam("assets/my-view-abc123.js", "style.css")}`;
114
+ const result = await appsSdkResourceCallback(new URL(versionedUri), mockExtra);
115
+ expect(result).toEqual({
116
+ contents: [
117
+ {
118
+ uri: versionedUri,
119
+ mimeType: "text/html+skybridge",
120
+ text: expect.stringContaining('<div id="root"></div>'),
121
+ _meta: {
122
+ "openai/widgetCSP": {
123
+ resource_domains: [serverUrl],
124
+ connect_domains: [serverUrl],
125
+ },
126
+ "openai/widgetDomain": serverUrl,
127
+ "openai/widgetDescription": "Test view",
128
+ },
129
+ },
130
+ ],
131
+ });
132
+ expect(result.contents[0]?.text).not.toContain(`${serverUrl}/assets/@react-refresh`);
133
+ expect(result.contents[0]?.text).not.toContain(`${serverUrl}@vite/client`);
134
+ expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/assets/my-view-abc123.js`);
135
+ expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/style.css`);
136
+ });
137
+ it("should prefer x-alpic-forwarded-url when hashing Claude view domains", async () => {
138
+ setTestEnv({ NODE_ENV: "production" });
139
+ server.registerTool({
140
+ name: "my-view",
141
+ description: "Test tool",
142
+ view: { component: "my-view", description: "Test view" },
143
+ }, vi.fn());
144
+ const extAppsResourceCallback = mockRegisterResource.mock
145
+ .calls[1]?.[3];
146
+ expect(extAppsResourceCallback).toBeDefined();
147
+ const forwardedUrl = "https://everything-3a2c1264.staging.alpic.live/mcp?foo=bar";
148
+ const expectedDomain = `${crypto
149
+ .createHash("sha256")
150
+ .update(forwardedUrl)
151
+ .digest("hex")
152
+ .slice(0, 32)}.claudemcpcontent.com`;
153
+ const result = await extAppsResourceCallback(new URL(`ui://views/ext-apps/my-view.html${expectedVersionParam("assets/my-view-abc123.js", "style.css")}`), createMockExtra("localhost:3000", {
154
+ headers: {
155
+ "user-agent": "Claude-User",
156
+ "x-alpic-forwarded-url": forwardedUrl,
157
+ },
158
+ url: "http://localhost:3000/mcp",
159
+ }));
160
+ expect(result.contents[0]?._meta).toEqual({
161
+ ui: {
162
+ csp: {
163
+ resourceDomains: ["http://localhost:3000"],
164
+ connectDomains: ["http://localhost:3000"],
165
+ baseUriDomains: ["http://localhost:3000"],
166
+ },
167
+ description: "Test view",
168
+ domain: expectedDomain,
169
+ },
170
+ });
171
+ });
172
+ it("should register resources with correct hostType for both apps-sdk and ext-apps", async () => {
173
+ server.registerTool({
174
+ name: "my-view",
175
+ description: "Test tool",
176
+ view: {
177
+ component: "my-view",
178
+ description: "Test view",
179
+ prefersBorder: true,
180
+ },
181
+ }, vi.fn());
182
+ expect(mockRegisterResource).toHaveBeenCalledTimes(2);
183
+ const appsSdkCallback = mockRegisterResource.mock
184
+ .calls[0]?.[3];
185
+ const host = "localhost:3000";
186
+ const serverUrl = `http://${host}`;
187
+ const hmrUrl = `ws://${host}`;
188
+ const appsSdkResult = await appsSdkCallback(new URL("ui://views/apps-sdk/my-view.html"), createMockExtra(host));
189
+ expect(appsSdkResult).toEqual({
190
+ contents: [
191
+ {
192
+ uri: "ui://views/apps-sdk/my-view.html",
193
+ mimeType: "text/html+skybridge",
194
+ text: expect.stringContaining('<div id="root"></div>'),
195
+ _meta: {
196
+ "openai/widgetCSP": {
197
+ resource_domains: [serverUrl],
198
+ connect_domains: [serverUrl, hmrUrl],
199
+ },
200
+ "openai/widgetDomain": serverUrl,
201
+ "openai/widgetDescription": "Test view",
202
+ "openai/widgetPrefersBorder": true,
203
+ },
204
+ },
205
+ ],
206
+ });
207
+ expect(appsSdkResult.contents[0]?.text).toContain('window.skybridge = { hostType: "apps-sdk", serverUrl: "http://localhost:3000" };');
208
+ const extAppsResourceCallback = mockRegisterResource.mock
209
+ .calls[1]?.[3];
210
+ expect(extAppsResourceCallback).toBeDefined();
211
+ const extAppsResult = await extAppsResourceCallback(new URL("ui://views/ext-apps/my-view.html"), createMockExtra(host));
212
+ expect(extAppsResult).toEqual({
213
+ contents: [
214
+ {
215
+ uri: "ui://views/ext-apps/my-view.html",
216
+ mimeType: "text/html;profile=mcp-app",
217
+ text: expect.stringContaining('<div id="root"></div>'),
218
+ _meta: {
219
+ ui: {
220
+ csp: {
221
+ resourceDomains: [serverUrl],
222
+ connectDomains: [serverUrl, hmrUrl],
223
+ baseUriDomains: [serverUrl],
224
+ },
225
+ domain: serverUrl,
226
+ description: "Test view",
227
+ prefersBorder: true,
228
+ },
229
+ },
230
+ },
231
+ ],
232
+ });
233
+ expect(extAppsResult.contents[0]?.text).toContain('window.skybridge = { hostType: "mcp-app", serverUrl: "http://localhost:3000" };');
234
+ });
235
+ it("should register tool with ui.resourceUri metadata", async () => {
236
+ server.registerTool({
237
+ name: "my-view",
238
+ description: "Test tool",
239
+ view: { component: "my-view", description: "Test view" },
240
+ }, vi.fn());
241
+ expect(mockRegisterTool).toHaveBeenCalledTimes(1);
242
+ const toolCallArgs = mockRegisterTool.mock.calls[0];
243
+ const toolConfig = toolCallArgs?.[1];
244
+ expect(toolConfig._meta).toHaveProperty("ui");
245
+ expect(toolConfig._meta?.ui).toEqual({
246
+ resourceUri: "ui://views/ext-apps/my-view.html",
247
+ });
248
+ });
249
+ it("should register tool with openai/outputTemplate when apps-sdk only", async () => {
250
+ server.registerTool({
251
+ name: "my-view",
252
+ description: "Test tool",
253
+ view: {
254
+ component: "my-view",
255
+ description: "Test view",
256
+ hosts: ["apps-sdk"],
257
+ },
258
+ }, vi.fn());
259
+ expect(mockRegisterTool).toHaveBeenCalledTimes(1);
260
+ const toolCallArgs = mockRegisterTool.mock.calls[0];
261
+ const toolConfig = toolCallArgs?.[1];
262
+ expect(toolConfig._meta).not.toHaveProperty("ui");
263
+ expect(toolConfig._meta?.["openai/outputTemplate"]).toBe("ui://views/apps-sdk/my-view.html");
264
+ });
265
+ it("should not version view URIs in development", () => {
266
+ server.registerTool({
267
+ name: "my-view",
268
+ description: "Test tool",
269
+ view: { component: "my-view", description: "Test view" },
270
+ }, vi.fn());
271
+ const toolConfig = mockRegisterTool.mock.calls[0]?.[1];
272
+ expect(toolConfig._meta?.["openai/outputTemplate"]).toBe("ui://views/apps-sdk/my-view.html");
273
+ expect(toolConfig._meta?.ui?.resourceUri).toBe("ui://views/ext-apps/my-view.html");
274
+ // The URI registered with the resource handler must match the URI in
275
+ // outputTemplate exactly so the SDK can resolve `resources/read` requests.
276
+ expect(mockRegisterResource.mock.calls[0]?.[1]).toBe("ui://views/apps-sdk/my-view.html");
277
+ expect(mockRegisterResource.mock.calls[1]?.[1]).toBe("ui://views/ext-apps/my-view.html");
278
+ });
279
+ it("should append a stable content hash to view URIs in production", () => {
280
+ setTestEnv({ NODE_ENV: "production" });
281
+ server.registerTool({
282
+ name: "my-view",
283
+ description: "Test tool",
284
+ view: { component: "my-view", description: "Test view" },
285
+ }, vi.fn());
286
+ const expected = expectedVersionParam("assets/my-view-abc123.js", "style.css");
287
+ const toolConfig = mockRegisterTool.mock.calls[0]?.[1];
288
+ expect(toolConfig._meta?.["openai/outputTemplate"]).toBe(`ui://views/apps-sdk/my-view.html${expected}`);
289
+ expect(toolConfig._meta?.ui?.resourceUri).toBe(`ui://views/ext-apps/my-view.html${expected}`);
290
+ expect(mockRegisterResource.mock.calls[0]?.[1]).toBe(`ui://views/apps-sdk/my-view.html${expected}`);
291
+ expect(mockRegisterResource.mock.calls[1]?.[1]).toBe(`ui://views/ext-apps/my-view.html${expected}`);
292
+ });
293
+ it("should produce different version params for views with different bundles", () => {
294
+ setTestEnv({ NODE_ENV: "production" });
295
+ server.registerTool({
296
+ name: "my-view",
297
+ description: "First tool",
298
+ view: { component: "my-view" },
299
+ }, vi.fn());
300
+ server.registerTool({
301
+ name: "folder-view",
302
+ description: "Second tool",
303
+ view: { component: "folder-view" },
304
+ }, vi.fn());
305
+ const myviewTemplate = (mockRegisterTool.mock.calls[0]?.[1])._meta?.["openai/outputTemplate"];
306
+ const folderviewTemplate = (mockRegisterTool.mock.calls[1]?.[1])._meta?.["openai/outputTemplate"];
307
+ expect(myviewTemplate).not.toEqual(folderviewTemplate);
308
+ expect(myviewTemplate).toMatch(/\?v=[0-9a-f]{8}$/);
309
+ expect(folderviewTemplate).toMatch(/\?v=[0-9a-f]{8}$/);
310
+ });
311
+ it("should fall back to bare URI in production when manifest is missing", () => {
312
+ setTestEnv({ NODE_ENV: "production" });
313
+ server.registerTool({
314
+ name: "unknown-view",
315
+ description: "Test tool",
316
+ view: { component: "unknown-view" },
317
+ }, vi.fn());
318
+ const toolConfig = mockRegisterTool.mock.calls[0]?.[1];
319
+ expect(toolConfig._meta?.["openai/outputTemplate"]).toBe("ui://views/apps-sdk/unknown-view.html");
320
+ });
321
+ it("should register tool with ui.resourceUri only when mcp-app only", async () => {
322
+ server.registerTool({
323
+ name: "my-view",
324
+ description: "Test tool",
325
+ view: {
326
+ component: "my-view",
327
+ description: "Test view",
328
+ hosts: ["mcp-app"],
329
+ },
330
+ }, vi.fn());
331
+ expect(mockRegisterTool).toHaveBeenCalledTimes(1);
332
+ const toolCallArgs = mockRegisterTool.mock.calls[0];
333
+ const toolConfig = toolCallArgs?.[1];
334
+ expect(toolConfig._meta).toHaveProperty("ui");
335
+ expect(toolConfig._meta?.ui).toEqual({
336
+ resourceUri: "ui://views/ext-apps/my-view.html",
337
+ });
338
+ expect(toolConfig._meta?.["openai/outputTemplate"]).toBeUndefined();
339
+ });
340
+ it("should inject viewUUID into _meta of tool callback results", async () => {
341
+ const mockToolCallback = vi.fn().mockResolvedValue({
342
+ content: [{ type: "text", text: "result" }],
343
+ structuredContent: { data: "test" },
344
+ });
345
+ server.registerTool({
346
+ name: "my-view",
347
+ description: "Test tool",
348
+ view: { component: "my-view", description: "Test view" },
349
+ }, mockToolCallback);
350
+ const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
351
+ expect(wrappedCallback).toBeDefined();
352
+ const result = await wrappedCallback({}, {});
353
+ expect(result._meta).toBeDefined();
354
+ expect(result._meta?.viewUUID).toBeDefined();
355
+ expect(typeof result._meta?.viewUUID).toBe("string");
356
+ 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}$/);
357
+ });
358
+ it("should preserve existing _meta when injecting viewUUID", async () => {
359
+ const mockToolCallback = vi.fn().mockResolvedValue({
360
+ content: [{ type: "text", text: "result" }],
361
+ structuredContent: { data: "test" },
362
+ _meta: { requestId: "req-123", cached: true },
363
+ });
364
+ server.registerTool({
365
+ name: "my-view",
366
+ description: "Test tool",
367
+ view: { component: "my-view", description: "Test view" },
368
+ }, mockToolCallback);
369
+ const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
370
+ const result = await wrappedCallback({}, {});
371
+ expect(result._meta?.requestId).toBe("req-123");
372
+ expect(result._meta?.cached).toBe(true);
373
+ expect(result._meta?.viewUUID).toBeDefined();
374
+ });
375
+ it("should generate unique viewUUIDs across calls", async () => {
376
+ const mockToolCallback = vi.fn().mockResolvedValue({
377
+ content: [{ type: "text", text: "result" }],
378
+ structuredContent: {},
379
+ });
380
+ server.registerTool({
381
+ name: "my-view",
382
+ description: "Test tool",
383
+ view: { component: "my-view", description: "Test view" },
384
+ }, mockToolCallback);
385
+ const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
386
+ const result1 = await wrappedCallback({}, {});
387
+ const result2 = await wrappedCallback({}, {});
388
+ expect(result1._meta?.viewUUID).not.toBe(result2._meta?.viewUUID);
389
+ });
390
+ it("should enforce one-tool-per-view constraint", () => {
391
+ server.registerTool({
392
+ name: "shake",
393
+ description: "First tool",
394
+ view: { component: "magic-8-ball" },
395
+ }, vi.fn());
396
+ expect(() => {
397
+ server.registerTool({
398
+ name: "shake-v2",
399
+ description: "Second tool",
400
+ view: { component: "magic-8-ball" },
401
+ }, vi.fn());
402
+ }).toThrow('skybridge: view "magic-8-ball" is already used by tool "shake"');
403
+ });
404
+ it("should normalize string content to ContentBlock array", async () => {
405
+ const mockToolCallback = vi.fn().mockResolvedValue({
406
+ content: "Hello world",
407
+ structuredContent: {},
408
+ });
409
+ server.registerTool({
410
+ name: "string-content",
411
+ description: "Test tool",
412
+ view: { component: "string-content" },
413
+ }, mockToolCallback);
414
+ const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
415
+ const result = await wrappedCallback({}, {});
416
+ expect(result.content).toEqual([{ type: "text", text: "Hello world" }]);
417
+ });
418
+ it("should normalize single ContentBlock to array", async () => {
419
+ const mockToolCallback = vi.fn().mockResolvedValue({
420
+ content: { type: "text", text: "Single block" },
421
+ structuredContent: {},
422
+ });
423
+ server.registerTool({
424
+ name: "single-block",
425
+ description: "Test tool",
426
+ view: { component: "single-block" },
427
+ }, mockToolCallback);
428
+ const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
429
+ const result = await wrappedCallback({}, {});
430
+ expect(result.content).toEqual([{ type: "text", text: "Single block" }]);
431
+ });
432
+ it("should pass through ContentBlock array unchanged", async () => {
433
+ const blocks = [
434
+ { type: "text", text: "A" },
435
+ { type: "text", text: "B" },
436
+ ];
437
+ const mockToolCallback = vi.fn().mockResolvedValue({
438
+ content: blocks,
439
+ structuredContent: {},
440
+ });
441
+ server.registerTool({
442
+ name: "array-content",
443
+ description: "Test tool",
444
+ view: { component: "array-content" },
445
+ }, mockToolCallback);
446
+ const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
447
+ const result = await wrappedCallback({}, {});
448
+ expect(result.content).toEqual(blocks);
449
+ });
450
+ it("should register tool without view (no resource registration)", () => {
451
+ server.registerTool({
452
+ name: "plain-tool",
453
+ description: "No view",
454
+ }, vi.fn());
455
+ expect(mockRegisterResource).not.toHaveBeenCalled();
456
+ expect(mockRegisterTool).toHaveBeenCalledTimes(1);
457
+ });
458
+ it("should apply view.csp fields to resource _meta", async () => {
459
+ server.registerTool({
460
+ name: "csp-tool",
461
+ description: "Test tool",
462
+ view: {
463
+ component: "csp-tool",
464
+ description: "Test view",
465
+ csp: {
466
+ connectDomains: ["https://api.example.com"],
467
+ resourceDomains: ["https://cdn.example.com"],
468
+ },
469
+ },
470
+ }, vi.fn());
471
+ const appsSdkCallback = mockRegisterResource.mock
472
+ .calls[0]?.[3];
473
+ const host = "localhost:3000";
474
+ const serverUrl = `http://${host}`;
475
+ const hmrUrl = `ws://${host}`;
476
+ const result = await appsSdkCallback(new URL("ui://views/apps-sdk/csp-tool.html"), createMockExtra(host));
477
+ const meta = result.contents[0]?._meta;
478
+ expect(meta["openai/widgetCSP"]).toEqual({
479
+ resource_domains: [serverUrl, "https://cdn.example.com"],
480
+ connect_domains: [serverUrl, hmrUrl, "https://api.example.com"],
481
+ });
482
+ });
483
+ it("should let view._meta override framework-computed keys", async () => {
484
+ server.registerTool({
485
+ name: "override-tool",
486
+ description: "Test tool",
487
+ view: {
488
+ component: "override-tool",
489
+ description: "Test view",
490
+ csp: { connectDomains: ["https://api.x.com"] },
491
+ _meta: {
492
+ "openai/widgetCSP": {
493
+ connect_domains: ["https://api.y.com"],
494
+ },
495
+ },
496
+ },
497
+ }, vi.fn());
498
+ const appsSdkCallback = mockRegisterResource.mock
499
+ .calls[0]?.[3];
500
+ const result = await appsSdkCallback(new URL("ui://views/apps-sdk/override-tool.html"), createMockExtra("localhost:3000"));
501
+ const meta = result.contents[0]?._meta;
502
+ expect(meta["openai/widgetCSP"]).toEqual({
503
+ connect_domains: ["https://api.y.com"],
504
+ });
505
+ });
506
+ it("should pass user _meta keys through to tool config", () => {
507
+ server.registerTool({
508
+ name: "meta-tool",
509
+ description: "Test tool",
510
+ _meta: {
511
+ "openai/widgetAccessible": true,
512
+ "openai/toolInvocation/invoking": "Loading...",
513
+ "acme.com/category": "utility",
514
+ },
515
+ }, vi.fn());
516
+ const toolCallArgs = mockRegisterTool.mock.calls[0];
517
+ const toolConfig = toolCallArgs?.[1];
518
+ expect(toolConfig._meta?.["openai/widgetAccessible"]).toBe(true);
519
+ expect(toolConfig._meta?.["openai/toolInvocation/invoking"]).toBe("Loading...");
520
+ expect(toolConfig._meta?.["acme.com/category"]).toBe("utility");
521
+ });
522
+ });
523
+ //# sourceMappingURL=view.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"view.test.js","sourceRoot":"","sources":["../../src/test/view.test.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { Adaptor, CallToolResponse, FileMetadata, HostContext, HostContextStore, OpenExternalOptions, RequestDisplayMode, RequestModalOptions, SetWidgetStateAction, UploadFileOptions } from "../types.js";
1
+ import type { Adaptor, CallToolResponse, FileMetadata, HostContext, HostContextStore, OpenExternalOptions, RequestDisplayMode, RequestModalOptions, SetViewStateAction, UploadFileOptions } from "../types.js";
2
2
  export declare class AppsSdkAdaptor implements Adaptor {
3
3
  private static instance;
4
4
  static getInstance(): AppsSdkAdaptor;
@@ -10,7 +10,7 @@ export declare class AppsSdkAdaptor implements Adaptor {
10
10
  }>;
11
11
  sendFollowUpMessage: (prompt: string) => Promise<void>;
12
12
  openExternal(href: string, options?: OpenExternalOptions): void;
13
- setWidgetState: (stateOrUpdater: SetWidgetStateAction) => Promise<void>;
13
+ setViewState: (stateOrUpdater: SetViewStateAction) => Promise<void>;
14
14
  uploadFile: (file: File, options?: UploadFileOptions) => Promise<FileMetadata>;
15
15
  getFileDownloadUrl: (file: {
16
16
  fileId: string;
@@ -12,12 +12,18 @@ export class AppsSdkAdaptor {
12
12
  }
13
13
  getHostContextStore(key) {
14
14
  const bridge = AppsSdkBridge.getInstance();
15
- if (key === "widgetState") {
15
+ if (key === "viewState") {
16
16
  return {
17
17
  subscribe: bridge.subscribe("widgetState"),
18
18
  getSnapshot: () => bridge.getSnapshot("widgetState")?.modelContent ?? null,
19
19
  };
20
20
  }
21
+ if (key === "display") {
22
+ return {
23
+ subscribe: bridge.subscribe("view"),
24
+ getSnapshot: () => bridge.getSnapshot("view"),
25
+ };
26
+ }
21
27
  return {
22
28
  subscribe: bridge.subscribe(key),
23
29
  getSnapshot: () => bridge.getSnapshot(key),
@@ -35,7 +41,7 @@ export class AppsSdkAdaptor {
35
41
  openExternal(href, options = {}) {
36
42
  window.openai.openExternal({ href, ...options });
37
43
  }
38
- setWidgetState = (stateOrUpdater) => {
44
+ setViewState = (stateOrUpdater) => {
39
45
  const modelContent = typeof stateOrUpdater === "function"
40
46
  ? stateOrUpdater(window.openai.widgetState?.modelContent ?? null)
41
47
  : stateOrUpdater;
@@ -1 +1 @@
1
- {"version":3,"file":"adaptor.js","sourceRoot":"","sources":["../../../../src/web/bridges/apps-sdk/adaptor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adaptor.js","sourceRoot":"","sources":["../../../../src/web/bridges/apps-sdk/adaptor.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,12 @@
1
- import type { Adaptor, CallToolResponse, HostContext, HostContextStore, OpenExternalOptions, RequestDisplayMode, RequestModalOptions, SetWidgetStateAction } from "../types.js";
1
+ import type { Adaptor, CallToolResponse, HostContext, HostContextStore, OpenExternalOptions, RequestDisplayMode, RequestModalOptions, SetViewStateAction } from "../types.js";
2
2
  export declare class McpAppAdaptor implements Adaptor {
3
3
  private static instance;
4
4
  private stores;
5
- private _widgetState;
6
- private widgetStateListeners;
7
- private _viewUUID;
8
5
  private _viewState;
9
- private viewListeners;
6
+ private viewStateListeners;
7
+ private _viewUUID;
8
+ private _displayState;
9
+ private displayListeners;
10
10
  private constructor();
11
11
  static getInstance(): McpAppAdaptor;
12
12
  static resetInstance(): void;
@@ -19,7 +19,7 @@ export declare class McpAppAdaptor implements Adaptor {
19
19
  sendFollowUpMessage: (prompt: string) => Promise<void>;
20
20
  openExternal(href: string, options?: OpenExternalOptions): void;
21
21
  private initializeStores;
22
- setWidgetState: (stateOrUpdater: SetWidgetStateAction) => Promise<void>;
22
+ setViewState: (stateOrUpdater: SetViewStateAction) => Promise<void>;
23
23
  /**
24
24
  * @throws File upload is not supported in MCP App.
25
25
  */