skybridge 0.0.0-dev.88cf4e1 → 0.0.0-dev.891b84f

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

@@ -2,8 +2,16 @@ 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" },
+    "skybridge:view:my-widget": {
+        file: "assets/my-widget-abc123.js",
+        name: "my-widget",
+        isEntry: true,
+    },
+    "skybridge:view:folder-widget": {
+        file: "assets/folder-widget-def456.js",
+        name: "folder-widget",
+        isEntry: true,
+    },
     "style.css": { file: "style.css" },
 };
 const actual = vi.hoisted(() => require("node:fs"));
@@ -22,7 +30,7 @@ vi.mock("node:fs", () => {
         },
     };
 });
-describe("McpServer.registerWidget", () => {
+describe("McpServer.registerTool (unified API)", () => {
     let server;
     let mockRegisterResource;
     let mockRegisterTool;
@@ -36,11 +44,14 @@ describe("McpServer.registerWidget", () => {
     });
     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
+        server.registerTool({
+            name: "my-widget",
+            description: "Test tool",
+            view: {
+                component: "my-widget",
+                description: "Test view",
+            },
+        }, vi.fn());
         const appsSdkResourceCallback = mockRegisterResource.mock
             .calls[0]?.[3];
         expect(appsSdkResourceCallback).toBeDefined();
@@ -62,24 +73,25 @@ describe("McpServer.registerWidget", () => {
                             connect_domains: [serverUrl, hmrUrl],
                         },
                         "openai/widgetDomain": serverUrl,
-                        "openai/widgetDescription": "Test widget",
+                        "openai/widgetDescription": "Test view",
                     },
                 },
             ],
         });
-        // 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`);
+        expect(result.contents[0]?.text).toContain(`${serverUrl}/_skybridge/view/my-widget`);
     });
     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
+        server.registerTool({
+            name: "my-widget",
+            description: "Test tool",
+            view: {
+                component: "my-widget",
+                description: "Test view",
+            },
+        }, vi.fn());
         const appsSdkResourceCallback = mockRegisterResource.mock
             .calls[0]?.[3];
         expect(appsSdkResourceCallback).toBeDefined();
@@ -99,21 +111,23 @@ describe("McpServer.registerWidget", () => {
                             connect_domains: [serverUrl],
                         },
                         "openai/widgetDomain": serverUrl,
-                        "openai/widgetDescription": "Test widget",
+                        "openai/widgetDescription": "Test view",
                     },
                 },
             ],
         });
-        // 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/assets/my-widget-abc123.js`);
         expect(result.contents[0]?.text).toContain(`${serverUrl}/assets/style.css`);
     });
-    it("should prefer x-alpic-forwarded-url when hashing Claude widget domains", async () => {
+    it("should prefer x-alpic-forwarded-url when hashing Claude view domains", async () => {
         setTestEnv({ NODE_ENV: "production" });
-        const mockToolCallback = vi.fn();
-        server.registerWidget("my-widget", { description: "Test widget" }, { description: "Test tool" }, mockToolCallback);
+        server.registerTool({
+            name: "my-widget",
+            description: "Test tool",
+            view: { component: "my-widget", description: "Test view" },
+        }, vi.fn());
         const extAppsResourceCallback = mockRegisterResource.mock
             .calls[1]?.[3];
         expect(extAppsResourceCallback).toBeDefined();
@@ -135,42 +149,30 @@ describe("McpServer.registerWidget", () => {
                 csp: {
                     resourceDomains: ["http://localhost:3000"],
                     connectDomains: ["http://localhost:3000"],
+                    baseUriDomains: ["http://localhost:3000"],
                 },
+                description: "Test view",
                 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);
+    it("should register resources with correct hostType for both apps-sdk and ext-apps", async () => {
+        server.registerTool({
+            name: "my-widget",
+            description: "Test tool",
+            view: {
+                component: "my-widget",
+                description: "Test view",
+                prefersBorder: true,
+            },
+        }, vi.fn());
         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}`;
+        const appsSdkResult = await appsSdkCallback(new URL("ui://widgets/apps-sdk/my-widget.html"), createMockExtra(host));
         expect(appsSdkResult).toEqual({
             contents: [
                 {
@@ -183,7 +185,7 @@ describe("McpServer.registerWidget", () => {
                             connect_domains: [serverUrl, hmrUrl],
                         },
                         "openai/widgetDomain": serverUrl,
-                        "openai/widgetDescription": "Test widget",
+                        "openai/widgetDescription": "Test view",
                         "openai/widgetPrefersBorder": true,
                     },
                 },
@@ -205,8 +207,11 @@ describe("McpServer.registerWidget", () => {
                             csp: {
                                 resourceDomains: [serverUrl],
                                 connectDomains: [serverUrl, hmrUrl],
+                                baseUriDomains: [serverUrl],
                             },
                             domain: serverUrl,
+                            description: "Test view",
+                            prefersBorder: true,
                         },
                     },
                 },
@@ -214,11 +219,12 @@ describe("McpServer.registerWidget", () => {
         });
         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);
+    it("should register tool with ui.resourceUri metadata", async () => {
+        server.registerTool({
+            name: "my-widget",
+            description: "Test tool",
+            view: { component: "my-widget", description: "Test view" },
+        }, vi.fn());
         expect(mockRegisterTool).toHaveBeenCalledTimes(1);
         const toolCallArgs = mockRegisterTool.mock.calls[0];
         const toolConfig = toolCallArgs?.[1];
@@ -227,51 +233,32 @@ describe("McpServer.registerWidget", () => {
             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,
+    it("should register tool with openai/outputTemplate when apps-sdk only", async () => {
+        server.registerTool({
+            name: "my-widget",
+            description: "Test tool",
+            view: {
+                component: "my-widget",
+                description: "Test view",
+                hosts: ["apps-sdk"],
             },
-        };
-        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");
+        }, 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://widgets/apps-sdk/my-widget.html");
     });
-    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);
+    it("should register tool with ui.resourceUri only when mcp-app only", async () => {
+        server.registerTool({
+            name: "my-widget",
+            description: "Test tool",
+            view: {
+                component: "my-widget",
+                description: "Test view",
+                hosts: ["mcp-app"],
+            },
+        }, vi.fn());
         expect(mockRegisterTool).toHaveBeenCalledTimes(1);
         const toolCallArgs = mockRegisterTool.mock.calls[0];
         const toolConfig = toolCallArgs?.[1];
@@ -279,22 +266,24 @@ describe("McpServer.registerWidget", () => {
         expect(toolConfig._meta?.ui).toEqual({
             resourceUri: "ui://widgets/ext-apps/my-widget.html",
         });
-        expect(toolConfig._meta?.["openai/outputTemplate"]).to.be.undefined;
+        expect(toolConfig._meta?.["openai/outputTemplate"]).toBeUndefined();
     });
     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
+        server.registerTool({
+            name: "my-widget",
+            description: "Test tool",
+            view: { component: "my-widget", description: "Test view" },
+        }, mockToolCallback);
         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 () => {
@@ -303,7 +292,11 @@ describe("McpServer.registerWidget", () => {
             structuredContent: { data: "test" },
             _meta: { requestId: "req-123", cached: true },
         });
-        server.registerWidget("my-widget", { description: "Test widget" }, { description: "Test tool" }, mockToolCallback);
+        server.registerTool({
+            name: "my-widget",
+            description: "Test tool",
+            view: { component: "my-widget", description: "Test view" },
+        }, mockToolCallback);
         const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
         const result = await wrappedCallback({}, {});
         expect(result._meta?.requestId).toBe("req-123");
@@ -315,20 +308,147 @@ describe("McpServer.registerWidget", () => {
             content: [{ type: "text", text: "result" }],
             structuredContent: {},
         });
-        server.registerWidget("my-widget", { description: "Test widget" }, { description: "Test tool" }, mockToolCallback);
+        server.registerTool({
+            name: "my-widget",
+            description: "Test tool",
+            view: { component: "my-widget", description: "Test view" },
+        }, 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);
+    it("should enforce one-tool-per-view constraint", () => {
+        server.registerTool({
+            name: "shake",
+            description: "First tool",
+            view: { component: "magic-8-ball" },
+        }, vi.fn());
+        expect(() => {
+            server.registerTool({
+                name: "shake-v2",
+                description: "Second tool",
+                view: { component: "magic-8-ball" },
+            }, vi.fn());
+        }).toThrow('skybridge: view "magic-8-ball" is already used by tool "shake"');
+    });
+    it("should normalize string content to ContentBlock array", async () => {
+        const mockToolCallback = vi.fn().mockResolvedValue({
+            content: "Hello world",
+            structuredContent: {},
+        });
+        server.registerTool({
+            name: "string-content",
+            description: "Test tool",
+            view: { component: "string-content" },
+        }, mockToolCallback);
+        const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
+        const result = await wrappedCallback({}, {});
+        expect(result.content).toEqual([{ type: "text", text: "Hello world" }]);
+    });
+    it("should normalize single ContentBlock to array", async () => {
+        const mockToolCallback = vi.fn().mockResolvedValue({
+            content: { type: "text", text: "Single block" },
+            structuredContent: {},
+        });
+        server.registerTool({
+            name: "single-block",
+            description: "Test tool",
+            view: { component: "single-block" },
+        }, mockToolCallback);
+        const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
+        const result = await wrappedCallback({}, {});
+        expect(result.content).toEqual([{ type: "text", text: "Single block" }]);
+    });
+    it("should pass through ContentBlock array unchanged", async () => {
+        const blocks = [
+            { type: "text", text: "A" },
+            { type: "text", text: "B" },
+        ];
+        const mockToolCallback = vi.fn().mockResolvedValue({
+            content: blocks,
+            structuredContent: {},
+        });
+        server.registerTool({
+            name: "array-content",
+            description: "Test tool",
+            view: { component: "array-content" },
+        }, mockToolCallback);
+        const wrappedCallback = mockRegisterTool.mock.calls[0]?.[2];
+        const result = await wrappedCallback({}, {});
+        expect(result.content).toEqual(blocks);
+    });
+    it("should register tool without view (no resource registration)", () => {
+        server.registerTool({
+            name: "plain-tool",
+            description: "No view",
+        }, vi.fn());
+        expect(mockRegisterResource).not.toHaveBeenCalled();
         expect(mockRegisterTool).toHaveBeenCalledTimes(1);
+    });
+    it("should apply view.csp fields to resource _meta", async () => {
+        server.registerTool({
+            name: "csp-tool",
+            description: "Test tool",
+            view: {
+                component: "csp-tool",
+                description: "Test view",
+                csp: {
+                    connectDomains: ["https://api.example.com"],
+                    resourceDomains: ["https://cdn.example.com"],
+                },
+            },
+        }, vi.fn());
+        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/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"],
+        });
+    });
+    it("should let view._meta override framework-computed keys", async () => {
+        server.registerTool({
+            name: "override-tool",
+            description: "Test tool",
+            view: {
+                component: "override-tool",
+                description: "Test view",
+                csp: { connectDomains: ["https://api.x.com"] },
+                _meta: {
+                    "openai/widgetCSP": {
+                        connect_domains: ["https://api.y.com"],
+                    },
+                },
+            },
+        }, 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 meta = result.contents[0]?._meta;
+        expect(meta["openai/widgetCSP"]).toEqual({
+            connect_domains: ["https://api.y.com"],
+        });
+    });
+    it("should pass user _meta keys through to tool config", () => {
+        server.registerTool({
+            name: "meta-tool",
+            description: "Test tool",
+            _meta: {
+                "openai/widgetAccessible": true,
+                "openai/toolInvocation/invoking": "Loading...",
+                "acme.com/category": "utility",
+            },
+        }, vi.fn());
         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");
+        expect(toolConfig._meta?.["openai/widgetAccessible"]).toBe(true);
+        expect(toolConfig._meta?.["openai/toolInvocation/invoking"]).toBe("Loading...");
+        expect(toolConfig._meta?.["acme.com/category"]).toBe("utility");
     });
 });
-//# sourceMappingURL=widget.test.js.map
+//# sourceMappingURL=view.test.js.map

package/dist/test/view.test.js.map

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

package/dist/web/bridges/apps-sdk/adaptor.d.ts

@@ -1,4 +1,4 @@
-import type { Adaptor, CallToolResponse, HostContext, HostContextStore, OpenExternalOptions, RequestDisplayMode, RequestModalOptions, SetWidgetStateAction } from "../types.js";
+import type { Adaptor, CallToolResponse, FileMetadata, HostContext, HostContextStore, OpenExternalOptions, RequestDisplayMode, RequestModalOptions, SetWidgetStateAction, UploadFileOptions } from "../types.js";
 export declare class AppsSdkAdaptor implements Adaptor {
     private static instance;
     static getInstance(): AppsSdkAdaptor;
@@ -11,12 +11,14 @@ export declare class AppsSdkAdaptor implements Adaptor {
     sendFollowUpMessage: (prompt: string) => Promise<void>;
     openExternal(href: string, options?: OpenExternalOptions): void;
     setWidgetState: (stateOrUpdater: SetWidgetStateAction) => Promise<void>;
-    uploadFile: (file: File) => Promise<import("../types.js").FileMetadata>;
+    uploadFile: (file: File, options?: UploadFileOptions) => Promise<FileMetadata>;
     getFileDownloadUrl: (file: {
         fileId: string;
     }) => Promise<{
         downloadUrl: string;
     }>;
+    selectFiles: () => Promise<FileMetadata[]>;
+    private trackFileIds;
     openModal(options: RequestModalOptions): Promise<void>;
     setOpenInAppUrl(href: string): Promise<void>;
 }

package/dist/web/bridges/apps-sdk/adaptor.js

@@ -45,22 +45,34 @@ export class AppsSdkAdaptor {
             modelContent,
         });
     };
-    uploadFile = (file) => {
-        return window.openai.uploadFile(file).then(async (metadata) => {
-            const state = window.openai.widgetState
-                ? { ...window.openai.widgetState }
-                : { modelContent: {}, privateContent: {} };
-            if (!state.imageIds) {
-                state.imageIds = [];
-            }
-            state.imageIds.push(metadata.fileId);
-            await window.openai.setWidgetState(state);
-            return metadata;
-        });
+    uploadFile = async (file, options) => {
+        const metadata = await window.openai.uploadFile(file, options);
+        await this.trackFileIds(metadata.fileId);
+        return metadata;
     };
     getFileDownloadUrl = (file) => {
         return window.openai.getFileDownloadUrl(file);
     };
+    selectFiles = async () => {
+        if (!window.openai.selectFiles) {
+            throw new Error("selectFiles is not supported by the current host version.");
+        }
+        const files = await window.openai.selectFiles();
+        if (files.length > 0) {
+            await this.trackFileIds(...files.map((f) => f.fileId));
+        }
+        return files;
+    };
+    async trackFileIds(...fileIds) {
+        const state = window.openai.widgetState
+            ? { ...window.openai.widgetState }
+            : { modelContent: {}, privateContent: {} };
+        if (!state.imageIds) {
+            state.imageIds = [];
+        }
+        state.imageIds.push(...fileIds);
+        await window.openai.setWidgetState(state);
+    }
     openModal(options) {
         return window.openai.requestModal(options);
     }

package/dist/web/bridges/apps-sdk/adaptor.js.map

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

package/dist/web/bridges/apps-sdk/types.d.ts

@@ -1,5 +1,5 @@
 import type { UnknownObject } from "../../types.js";
-import type { CallToolArgs, CallToolResponse, FileMetadata, RequestModalOptions } from "../types.js";
+import type { CallToolArgs, CallToolResponse, FileMetadata, RequestModalOptions, UploadFileOptions } from "../types.js";
 type DisplayMode = "pip" | "inline" | "fullscreen" | "modal";
 type RequestDisplayMode = Exclude<DisplayMode, "modal">;
 export type AppsSdkWidgetState = {
@@ -71,11 +71,16 @@ export type AppsSdkMethods<WS extends AppsSdkWidgetState = AppsSdkWidgetState> =
      * This ensures the modal is correctly displayed and not limited to the widget's area.
      */
     requestModal: (args: RequestModalOptions) => Promise<void>;
-    /** Uploads a new file to the host */
-    uploadFile: (file: File) => Promise<FileMetadata>;
+    /** Uploads a new file to the host. Pass `{ library: true }` to also save to the user's ChatGPT file library. */
+    uploadFile: (file: File, options?: UploadFileOptions) => Promise<FileMetadata>;
     /**
-     * Downloads a file from the host that was previously uploaded.
-     * Only files uploaded by the same connector instance can be downloaded.
+     * Opens ChatGPT's file library picker and returns app-authorized files.
+     * Feature-detect before using: this method may not be available on all host versions.
+     */
+    selectFiles?: () => Promise<FileMetadata[]>;
+    /**
+     * Downloads a file from the host. Works for files uploaded by the widget,
+     * files selected via selectFiles(), or files provided via tool/file params.
      */
     getFileDownloadUrl: (file: FileMetadata) => Promise<{
         downloadUrl: string;

package/dist/web/bridges/apps-sdk/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/web/bridges/apps-sdk/types.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,wBAAwB,GAAG,sBAAsB,CAAC;AAC/D,MAAM,OAAO,iBAAkB,SAAQ,WAErC;IACkB,IAAI,GAAG,wBAAwB,CAAC;CACnD;AA2FD,sDAAsD;AACtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AAC3D,MAAM,OAAO,eAAgB,SAAQ,WAEnC;IACkB,IAAI,GAAG,sBAAsB,CAAC;CACjD"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/web/bridges/apps-sdk/types.ts"],"names":[],"mappings":"AAkBA,MAAM,CAAC,MAAM,wBAAwB,GAAG,sBAAsB,CAAC;AAC/D,MAAM,OAAO,iBAAkB,SAAQ,WAErC;IACkB,IAAI,GAAG,wBAAwB,CAAC;CACnD;AAoGD,sDAAsD;AACtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AAC3D,MAAM,OAAO,eAAgB,SAAQ,WAEnC;IACkB,IAAI,GAAG,sBAAsB,CAAC;CACjD"}