skybridge 0.0.0-dev.84b5d57 → 0.0.0-dev.84c5e86

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":"AASA,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;AA8GD,sDAAsD;AACtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AAC3D,MAAM,OAAO,eAAgB,SAAQ,WAEnC;IACkB,IAAI,GAAG,sBAAsB,CAAC;CACjD","sourcesContent":["import type { UnknownObject } from \"../../types.js\";\nimport type {\n  CallToolArgs,\n  CallToolResponse,\n  FileMetadata,\n  RequestModalOptions,\n  UploadFileOptions,\n} from \"../types.js\";\n\ntype DisplayMode = \"pip\" | \"inline\" | \"fullscreen\" | \"modal\";\ntype RequestDisplayMode = Exclude<DisplayMode, \"modal\">;\n\nexport type AppsSdkWidgetState = {\n  modelContent: Record<string, unknown>;\n  privateContent: Record<string, unknown>;\n  imageIds?: string[];\n};\n\nexport const TOOL_RESPONSE_EVENT_TYPE = \"openai:tool_response\";\nexport class ToolResponseEvent extends CustomEvent<{\n  tool: { name: string; args: UnknownObject };\n}> {\n  override readonly type = TOOL_RESPONSE_EVENT_TYPE;\n}\n\ndeclare global {\n  interface Window {\n    openai: AppsSdkMethods & AppsSdkContext;\n  }\n\n  interface WindowEventMap {\n    [SET_GLOBALS_EVENT_TYPE]: SetGlobalsEvent;\n  }\n}\n\nexport type AppsSdkContext<\n  ToolInput extends UnknownObject = Record<never, unknown>,\n  ToolOutput extends UnknownObject = UnknownObject,\n  ToolResponseMetadata extends UnknownObject = UnknownObject,\n  WS extends AppsSdkWidgetState = AppsSdkWidgetState,\n> = {\n  theme: Theme;\n  userAgent: UserAgent;\n  locale: string;\n\n  // layout\n  maxHeight: number | undefined;\n  displayMode: DisplayMode;\n  safeArea: SafeArea;\n  view: View;\n\n  // state\n  toolInput: ToolInput;\n  toolOutput: ToolOutput | { text: string } | null;\n  toolResponseMetadata: ToolResponseMetadata | null;\n  widgetState: WS | null;\n};\n\nexport type AppsSdkMethods<WS extends AppsSdkWidgetState = AppsSdkWidgetState> =\n  {\n    /** Calls a tool on your MCP. Returns the full response. */\n    callTool: <\n      ToolArgs extends CallToolArgs = null,\n      ToolResponse extends CallToolResponse = CallToolResponse,\n    >(\n      name: string,\n      args: ToolArgs,\n    ) => Promise<ToolResponse>;\n\n    /**\n     * Triggers a followup turn in the ChatGPT conversation\n     * scrollToBottom is optional, defaults to true, and can be\n     * set to false to prevent auto-scroll.\n     */\n    sendFollowUpMessage: (args: {\n      prompt: string;\n      scrollToBottom?: boolean;\n    }) => Promise<void>;\n\n    /** Opens an external link, redirects web page or mobile app */\n    openExternal(args: { href: string; redirectUrl?: false }): void;\n\n    /** For transitioning an app from inline to fullscreen or pip */\n    requestDisplayMode: (args: { mode: RequestDisplayMode }) => Promise<{\n      /**\n       * The granted display mode. The host may reject the request.\n       * For mobile, PiP is always coerced to fullscreen.\n       */\n      mode: RequestDisplayMode;\n    }>;\n\n    /** Requests the host to close (dismiss) the widget. */\n    requestClose: () => Promise<void>;\n\n    /**\n     * Sets the widget state.\n     * This state is persisted across widget renders.\n     */\n    setWidgetState: (state: WS) => Promise<void>;\n\n    /**\n     * Opens a modal portaled outside of the widget iFrame.\n     * This ensures the modal is correctly displayed and not limited to the widget's area.\n     */\n    requestModal: (args: RequestModalOptions) => Promise<void>;\n\n    /** Uploads a new file to the host. Pass `{ library: true }` to also save to the user's ChatGPT file library. */\n    uploadFile: (\n      file: File,\n      options?: UploadFileOptions,\n    ) => Promise<FileMetadata>;\n\n    /**\n     * Opens ChatGPT's file library picker and returns app-authorized files.\n     * Feature-detect before using: this method may not be available on all host versions.\n     */\n    selectFiles?: () => Promise<FileMetadata[]>;\n\n    /**\n     * Downloads a file from the host. Works for files uploaded by the widget,\n     * files selected via selectFiles(), or files provided via tool/file params.\n     */\n    getFileDownloadUrl: (\n      file: FileMetadata,\n    ) => Promise<{ downloadUrl: string }>;\n\n    /**\n     * Sets the open in app URL.\n     * This URL will be opened in the app when the user clicks on the top right button in fullscreen mode.\n     */\n    setOpenInAppUrl: (args: { href: string }) => Promise<void>;\n  };\n\n// Dispatched when any global changes in the host page\nexport const SET_GLOBALS_EVENT_TYPE = \"openai:set_globals\";\nexport class SetGlobalsEvent extends CustomEvent<{\n  globals: Partial<AppsSdkContext>;\n}> {\n  override readonly type = SET_GLOBALS_EVENT_TYPE;\n}\n\ntype View = {\n  mode: DisplayMode;\n  params?: Record<string, unknown>;\n};\n\ntype Theme = \"light\" | \"dark\";\n\ntype SafeAreaInsets = {\n  top: number;\n  bottom: number;\n  left: number;\n  right: number;\n};\n\ntype SafeArea = {\n  insets: SafeAreaInsets;\n};\n\ntype DeviceType = \"mobile\" | \"tablet\" | \"desktop\" | \"unknown\";\n\ntype UserAgent = {\n  device: { type: DeviceType };\n  capabilities: {\n    hover: boolean;\n    touch: boolean;\n  };\n};\n"]}

package/dist/web/bridges/apps-sdk/use-apps-sdk-context.d.ts

@@ -1,2 +1,13 @@
 import type { AppsSdkContext } from "./types.js";
+/**
+ * Read a single key from the raw Apps SDK (`window.openai`) context.
+ *
+ * Advanced escape hatch — prefer the cross-host hooks (`useLayout`, `useUser`,
+ * `useToolInfo`, etc.) which work in both Apps SDK and MCP Apps. Reach for
+ * this when you need ChatGPT-only fields not surfaced by the public hooks.
+ *
+ * Throws if called outside the Apps SDK runtime.
+ *
+ * @see https://docs.skybridge.tech/api-reference/use-apps-sdk-context
+ */
 export declare function useAppsSdkContext<K extends keyof AppsSdkContext>(key: K): AppsSdkContext[K];

package/dist/web/bridges/apps-sdk/use-apps-sdk-context.js

@@ -1,5 +1,16 @@
 import { useSyncExternalStore } from "react";
 import { AppsSdkBridge } from "./bridge.js";
+/**
+ * Read a single key from the raw Apps SDK (`window.openai`) context.
+ *
+ * Advanced escape hatch — prefer the cross-host hooks (`useLayout`, `useUser`,
+ * `useToolInfo`, etc.) which work in both Apps SDK and MCP Apps. Reach for
+ * this when you need ChatGPT-only fields not surfaced by the public hooks.
+ *
+ * Throws if called outside the Apps SDK runtime.
+ *
+ * @see https://docs.skybridge.tech/api-reference/use-apps-sdk-context
+ */
 export function useAppsSdkContext(key) {
     const bridge = AppsSdkBridge.getInstance();
     return useSyncExternalStore(bridge.subscribe(key), () => bridge.getSnapshot(key));

package/dist/web/bridges/apps-sdk/use-apps-sdk-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-apps-sdk-context.js","sourceRoot":"","sources":["../../../../src/web/bridges/apps-sdk/use-apps-sdk-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,MAAM,UAAU,iBAAiB,CAC/B,GAAM;IAEN,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;IAC3C,OAAO,oBAAoB,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CACtD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CACxB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"use-apps-sdk-context.js","sourceRoot":"","sources":["../../../../src/web/bridges/apps-sdk/use-apps-sdk-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C;;;;;;;;;;GAUG;AACH,MAAM,UAAU,iBAAiB,CAC/B,GAAM;IAEN,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;IAC3C,OAAO,oBAAoB,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CACtD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CACxB,CAAC;AACJ,CAAC","sourcesContent":["import { useSyncExternalStore } from \"react\";\nimport { AppsSdkBridge } from \"./bridge.js\";\nimport type { AppsSdkContext } from \"./types.js\";\n\n/**\n * Read a single key from the raw Apps SDK (`window.openai`) context.\n *\n * Advanced escape hatch — prefer the cross-host hooks (`useLayout`, `useUser`,\n * `useToolInfo`, etc.) which work in both Apps SDK and MCP Apps. Reach for\n * this when you need ChatGPT-only fields not surfaced by the public hooks.\n *\n * Throws if called outside the Apps SDK runtime.\n *\n * @see https://docs.skybridge.tech/api-reference/use-apps-sdk-context\n */\nexport function useAppsSdkContext<K extends keyof AppsSdkContext>(\n  key: K,\n): AppsSdkContext[K] {\n  const bridge = AppsSdkBridge.getInstance();\n  return useSyncExternalStore(bridge.subscribe(key), () =>\n    bridge.getSnapshot(key),\n  );\n}\n"]}

package/dist/web/bridges/get-adaptor.d.ts

@@ -1,2 +1,11 @@
 import type { Adaptor } from "./types.js";
+/**
+ * @internal
+ * Resolve the single host {@link Adaptor} instance. Prefer the documented
+ * hooks (`useCallTool`, `useViewState`, etc.) over calling this directly;
+ * it's the escape hatch used by the hooks themselves and by advanced
+ * integrations.
+ */
 export declare const getAdaptor: () => Adaptor;
+/** @internal Test-only. */
+export declare const _resetAdaptor: () => void;

package/dist/web/bridges/get-adaptor.js

@@ -1,8 +1,29 @@
-import { AppsSdkAdaptor } from "./apps-sdk/adaptor.js";
-import { McpAppAdaptor } from "./mcp-app/adaptor.js";
+import { HostAdaptor } from "./adaptor.js";
+let cached = null;
+/**
+ * @internal
+ * Resolve the single host {@link Adaptor} instance. Prefer the documented
+ * hooks (`useCallTool`, `useViewState`, etc.) over calling this directly;
+ * it's the escape hatch used by the hooks themselves and by advanced
+ * integrations.
+ */
 export const getAdaptor = () => {
-    return window.skybridge.hostType === "apps-sdk"
-        ? AppsSdkAdaptor.getInstance()
-        : McpAppAdaptor.getInstance();
+    if (cached) {
+        return cached;
+    }
+    const hostType = window.skybridge?.hostType;
+    const hasOai = typeof window !== "undefined" && window.openai !== undefined;
+    if (hostType === "mcp-app" && hasOai) {
+        console.warn("[skybridge] hostType is 'mcp-app' but window.openai is present; trusting the probe.");
+    }
+    else if (hostType === "apps-sdk" && !hasOai) {
+        console.warn("[skybridge] hostType is 'apps-sdk' but window.openai is absent; trusting the probe.");
+    }
+    cached = new HostAdaptor();
+    return cached;
+};
+/** @internal Test-only. */
+export const _resetAdaptor = () => {
+    cached = null;
 };
 //# sourceMappingURL=get-adaptor.js.map

package/dist/web/bridges/get-adaptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-adaptor.js","sourceRoot":"","sources":["../../../src/web/bridges/get-adaptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,MAAM,CAAC,MAAM,UAAU,GAAG,GAAY,EAAE;IACtC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,KAAK,UAAU;QAC7C,CAAC,CAAC,cAAc,CAAC,WAAW,EAAE;QAC9B,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC,CAAC"}
+{"version":3,"file":"get-adaptor.js","sourceRoot":"","sources":["../../../src/web/bridges/get-adaptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3C,IAAI,MAAM,GAAuB,IAAI,CAAC;AAEtC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,GAAY,EAAE;IACtC,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC;IAC5C,MAAM,MAAM,GAAG,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC;IAE5E,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,EAAE,CAAC;QACrC,OAAO,CAAC,IAAI,CACV,qFAAqF,CACtF,CAAC;IACJ,CAAC;SAAM,IAAI,QAAQ,KAAK,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;QAC9C,OAAO,CAAC,IAAI,CACV,qFAAqF,CACtF,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;IAC3B,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,2BAA2B;AAC3B,MAAM,CAAC,MAAM,aAAa,GAAG,GAAS,EAAE;IACtC,MAAM,GAAG,IAAI,CAAC;AAChB,CAAC,CAAC","sourcesContent":["import { HostAdaptor } from \"./adaptor.js\";\nimport type { Adaptor } from \"./types.js\";\n\nlet cached: HostAdaptor | null = null;\n\n/**\n * @internal\n * Resolve the single host {@link Adaptor} instance. Prefer the documented\n * hooks (`useCallTool`, `useViewState`, etc.) over calling this directly;\n * it's the escape hatch used by the hooks themselves and by advanced\n * integrations.\n */\nexport const getAdaptor = (): Adaptor => {\n  if (cached) {\n    return cached;\n  }\n\n  const hostType = window.skybridge?.hostType;\n  const hasOai = typeof window !== \"undefined\" && window.openai !== undefined;\n\n  if (hostType === \"mcp-app\" && hasOai) {\n    console.warn(\n      \"[skybridge] hostType is 'mcp-app' but window.openai is present; trusting the probe.\",\n    );\n  } else if (hostType === \"apps-sdk\" && !hasOai) {\n    console.warn(\n      \"[skybridge] hostType is 'apps-sdk' but window.openai is absent; trusting the probe.\",\n    );\n  }\n\n  cached = new HostAdaptor();\n  return cached;\n};\n\n/** @internal Test-only. */\nexport const _resetAdaptor = (): void => {\n  cached = null;\n};\n"]}

package/dist/web/bridges/get-adaptor.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/web/bridges/get-adaptor.test.js

@@ -0,0 +1,48 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { HostAdaptor } from "./adaptor.js";
+import { AppsSdkBridge } from "./apps-sdk/bridge.js";
+import { _resetAdaptor, getAdaptor } from "./get-adaptor.js";
+import { McpAppBridge } from "./mcp-app/bridge.js";
+describe("getAdaptor", () => {
+    beforeEach(() => {
+        _resetAdaptor();
+        McpAppBridge.resetInstance();
+        AppsSdkBridge.resetInstance();
+        vi.stubGlobal("parent", { postMessage: vi.fn() });
+    });
+    afterEach(() => {
+        vi.unstubAllGlobals();
+        _resetAdaptor();
+        McpAppBridge.resetInstance();
+        AppsSdkBridge.resetInstance();
+    });
+    it("returns a HostAdaptor instance", () => {
+        vi.stubGlobal("skybridge", { hostType: "mcp-app" });
+        vi.stubGlobal("openai", undefined);
+        expect(getAdaptor()).toBeInstanceOf(HostAdaptor);
+    });
+    it("memoizes the instance", () => {
+        vi.stubGlobal("skybridge", { hostType: "mcp-app" });
+        vi.stubGlobal("openai", undefined);
+        const a = getAdaptor();
+        const b = getAdaptor();
+        expect(a).toBe(b);
+    });
+    it("logs a warning when hostType disagrees with probe", () => {
+        const warn = vi.spyOn(console, "warn").mockImplementation(() => { });
+        vi.stubGlobal("skybridge", { hostType: "mcp-app" });
+        vi.stubGlobal("openai", { view: { mode: "inline" } });
+        getAdaptor();
+        expect(warn).toHaveBeenCalledWith(expect.stringContaining("hostType"));
+        warn.mockRestore();
+    });
+    it("does not warn when hostType matches probe", () => {
+        const warn = vi.spyOn(console, "warn").mockImplementation(() => { });
+        vi.stubGlobal("skybridge", { hostType: "apps-sdk" });
+        vi.stubGlobal("openai", { view: { mode: "inline" } });
+        getAdaptor();
+        expect(warn).not.toHaveBeenCalled();
+        warn.mockRestore();
+    });
+});
+//# sourceMappingURL=get-adaptor.test.js.map

package/dist/web/bridges/get-adaptor.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-adaptor.test.js","sourceRoot":"","sources":["../../../src/web/bridges/get-adaptor.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,UAAU,CAAC,GAAG,EAAE;QACd,aAAa,EAAE,CAAC;QAChB,YAAY,CAAC,aAAa,EAAE,CAAC;QAC7B,aAAa,CAAC,aAAa,EAAE,CAAC;QAC9B,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,gBAAgB,EAAE,CAAC;QACtB,aAAa,EAAE,CAAC;QAChB,YAAY,CAAC,aAAa,EAAE,CAAC;QAC7B,aAAa,CAAC,aAAa,EAAE,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;QACpD,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACnC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;QACpD,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,UAAU,EAAE,CAAC;QACvB,MAAM,CAAC,GAAG,UAAU,EAAE,CAAC;QACvB,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACpE,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;QACpD,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACtD,UAAU,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACpE,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QACrD,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACtD,UAAU,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACpC,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import { afterEach, beforeEach, describe, expect, it, vi } from \"vitest\";\nimport { HostAdaptor } from \"./adaptor.js\";\nimport { AppsSdkBridge } from \"./apps-sdk/bridge.js\";\nimport { _resetAdaptor, getAdaptor } from \"./get-adaptor.js\";\nimport { McpAppBridge } from \"./mcp-app/bridge.js\";\n\ndescribe(\"getAdaptor\", () => {\n  beforeEach(() => {\n    _resetAdaptor();\n    McpAppBridge.resetInstance();\n    AppsSdkBridge.resetInstance();\n    vi.stubGlobal(\"parent\", { postMessage: vi.fn() });\n  });\n  afterEach(() => {\n    vi.unstubAllGlobals();\n    _resetAdaptor();\n    McpAppBridge.resetInstance();\n    AppsSdkBridge.resetInstance();\n  });\n\n  it(\"returns a HostAdaptor instance\", () => {\n    vi.stubGlobal(\"skybridge\", { hostType: \"mcp-app\" });\n    vi.stubGlobal(\"openai\", undefined);\n    expect(getAdaptor()).toBeInstanceOf(HostAdaptor);\n  });\n\n  it(\"memoizes the instance\", () => {\n    vi.stubGlobal(\"skybridge\", { hostType: \"mcp-app\" });\n    vi.stubGlobal(\"openai\", undefined);\n    const a = getAdaptor();\n    const b = getAdaptor();\n    expect(a).toBe(b);\n  });\n\n  it(\"logs a warning when hostType disagrees with probe\", () => {\n    const warn = vi.spyOn(console, \"warn\").mockImplementation(() => {});\n    vi.stubGlobal(\"skybridge\", { hostType: \"mcp-app\" });\n    vi.stubGlobal(\"openai\", { view: { mode: \"inline\" } });\n    getAdaptor();\n    expect(warn).toHaveBeenCalledWith(expect.stringContaining(\"hostType\"));\n    warn.mockRestore();\n  });\n\n  it(\"does not warn when hostType matches probe\", () => {\n    const warn = vi.spyOn(console, \"warn\").mockImplementation(() => {});\n    vi.stubGlobal(\"skybridge\", { hostType: \"apps-sdk\" });\n    vi.stubGlobal(\"openai\", { view: { mode: \"inline\" } });\n    getAdaptor();\n    expect(warn).not.toHaveBeenCalled();\n    warn.mockRestore();\n  });\n});\n"]}

package/dist/web/bridges/host-context-stores.d.ts

@@ -0,0 +1,27 @@
+import type { McpAppBridge } from "./mcp-app/bridge.js";
+import type { HostContextStore } from "./types.js";
+/**
+ * Build the host-context store map sourced from the MCP App bridge.
+ * `display` and `viewState` are *not* included here; those are handled
+ * by the adaptor itself because they have transport-specific overlays
+ * and additional state (polyfill modal state, localStorage hydration).
+ */
+export declare function buildMcpContextStores(bridge: McpAppBridge): {
+    theme: HostContextStore<"theme">;
+    locale: HostContextStore<"locale">;
+    safeArea: HostContextStore<"safeArea">;
+    displayMode: HostContextStore<"displayMode">;
+    maxHeight: HostContextStore<"maxHeight">;
+    userAgent: HostContextStore<"userAgent">;
+    toolInput: HostContextStore<"toolInput">;
+    toolOutput: HostContextStore<"toolOutput">;
+    toolResponseMetadata: HostContextStore<"toolResponseMetadata">;
+};
+/**
+ * Build the Apps-SDK-sourced overlay stores (`display`, `viewState`).
+ * Used by `HostAdaptor` only when `window.openai` is present.
+ */
+export declare function buildAppsSdkOverlayStores(bridge: import("./apps-sdk/bridge.js").AppsSdkBridge): {
+    display: HostContextStore<"display">;
+    viewState: HostContextStore<"viewState">;
+};

package/dist/web/bridges/host-context-stores.js

@@ -0,0 +1,73 @@
+import { dequal } from "dequal/lite";
+/**
+ * Build a memoized {@link HostContextStore} backed by one or more
+ * `McpAppBridge` context keys. Recomputed values are deep-compared via
+ * `dequal` so unchanged snapshots return the cached reference.
+ */
+function createMcpStore(bridge, keys, computeSnapshot) {
+    let cachedValue;
+    return {
+        subscribe: bridge.subscribe(keys),
+        getSnapshot: () => {
+            const context = Object.fromEntries(keys.map((k) => [k, bridge.getSnapshot(k)]));
+            const newValue = computeSnapshot(context);
+            if (cachedValue !== undefined && dequal(cachedValue, newValue)) {
+                return cachedValue;
+            }
+            cachedValue = newValue;
+            return newValue;
+        },
+    };
+}
+/**
+ * Build the host-context store map sourced from the MCP App bridge.
+ * `display` and `viewState` are *not* included here; those are handled
+ * by the adaptor itself because they have transport-specific overlays
+ * and additional state (polyfill modal state, localStorage hydration).
+ */
+export function buildMcpContextStores(bridge) {
+    return {
+        theme: createMcpStore(bridge, ["theme"], ({ theme }) => theme ?? "light"),
+        locale: createMcpStore(bridge, ["locale"], ({ locale }) => locale ?? "en-US"),
+        safeArea: createMcpStore(bridge, ["safeAreaInsets"], ({ safeAreaInsets }) => ({
+            insets: safeAreaInsets ?? { top: 0, right: 0, bottom: 0, left: 0 },
+        })),
+        displayMode: createMcpStore(bridge, ["displayMode"], ({ displayMode }) => displayMode ?? "inline"),
+        maxHeight: createMcpStore(bridge, ["containerDimensions"], ({ containerDimensions }) => {
+            if (containerDimensions && "maxHeight" in containerDimensions) {
+                return containerDimensions.maxHeight;
+            }
+            return undefined;
+        }),
+        userAgent: createMcpStore(bridge, ["platform", "deviceCapabilities"], ({ platform, deviceCapabilities }) => ({
+            device: {
+                type: platform === "web" ? "desktop" : (platform ?? "unknown"),
+            },
+            capabilities: {
+                hover: true,
+                touch: true,
+                ...deviceCapabilities,
+            },
+        })),
+        toolInput: createMcpStore(bridge, ["toolInput"], ({ toolInput }) => toolInput ?? null),
+        toolOutput: createMcpStore(bridge, ["toolResult"], ({ toolResult }) => toolResult?.structuredContent ?? null),
+        toolResponseMetadata: createMcpStore(bridge, ["toolResult"], ({ toolResult }) => toolResult?._meta ?? null),
+    };
+}
+/**
+ * Build the Apps-SDK-sourced overlay stores (`display`, `viewState`).
+ * Used by `HostAdaptor` only when `window.openai` is present.
+ */
+export function buildAppsSdkOverlayStores(bridge) {
+    return {
+        display: {
+            subscribe: bridge.subscribe("view"),
+            getSnapshot: () => bridge.getSnapshot("view"),
+        },
+        viewState: {
+            subscribe: bridge.subscribe("widgetState"),
+            getSnapshot: () => bridge.getSnapshot("widgetState")?.modelContent ?? null,
+        },
+    };
+}
+//# sourceMappingURL=host-context-stores.js.map

package/dist/web/bridges/host-context-stores.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"host-context-stores.js","sourceRoot":"","sources":["../../../src/web/bridges/host-context-stores.ts"],"names":[],"mappings":"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","sourcesContent":["import { dequal } from \"dequal/lite\";\nimport type { McpAppBridge } from \"./mcp-app/bridge.js\";\nimport type { McpAppContext, McpAppContextKey } from \"./mcp-app/types.js\";\nimport type { HostContextStore } from \"./types.js\";\n\ntype PickContext<K extends readonly McpAppContextKey[]> = {\n  [P in K[number]]: McpAppContext[P];\n};\n\n/**\n * Build a memoized {@link HostContextStore} backed by one or more\n * `McpAppBridge` context keys. Recomputed values are deep-compared via\n * `dequal` so unchanged snapshots return the cached reference.\n */\nfunction createMcpStore<const Keys extends readonly McpAppContextKey[], R>(\n  bridge: McpAppBridge,\n  keys: Keys,\n  computeSnapshot: (context: PickContext<Keys>) => R,\n) {\n  let cachedValue: R | undefined;\n  return {\n    subscribe: bridge.subscribe(keys),\n    getSnapshot: () => {\n      const context = Object.fromEntries(\n        keys.map((k) => [k, bridge.getSnapshot(k)]),\n      ) as PickContext<Keys>;\n      const newValue = computeSnapshot(context);\n      if (cachedValue !== undefined && dequal(cachedValue, newValue)) {\n        return cachedValue;\n      }\n      cachedValue = newValue;\n      return newValue;\n    },\n  };\n}\n\n/**\n * Build the host-context store map sourced from the MCP App bridge.\n * `display` and `viewState` are *not* included here; those are handled\n * by the adaptor itself because they have transport-specific overlays\n * and additional state (polyfill modal state, localStorage hydration).\n */\nexport function buildMcpContextStores(bridge: McpAppBridge): {\n  theme: HostContextStore<\"theme\">;\n  locale: HostContextStore<\"locale\">;\n  safeArea: HostContextStore<\"safeArea\">;\n  displayMode: HostContextStore<\"displayMode\">;\n  maxHeight: HostContextStore<\"maxHeight\">;\n  userAgent: HostContextStore<\"userAgent\">;\n  toolInput: HostContextStore<\"toolInput\">;\n  toolOutput: HostContextStore<\"toolOutput\">;\n  toolResponseMetadata: HostContextStore<\"toolResponseMetadata\">;\n} {\n  return {\n    theme: createMcpStore(bridge, [\"theme\"], ({ theme }) => theme ?? \"light\"),\n    locale: createMcpStore(\n      bridge,\n      [\"locale\"],\n      ({ locale }) => locale ?? \"en-US\",\n    ),\n    safeArea: createMcpStore(\n      bridge,\n      [\"safeAreaInsets\"],\n      ({ safeAreaInsets }) => ({\n        insets: safeAreaInsets ?? { top: 0, right: 0, bottom: 0, left: 0 },\n      }),\n    ),\n    displayMode: createMcpStore(\n      bridge,\n      [\"displayMode\"],\n      ({ displayMode }) => displayMode ?? \"inline\",\n    ),\n    maxHeight: createMcpStore(\n      bridge,\n      [\"containerDimensions\"],\n      ({ containerDimensions }) => {\n        if (containerDimensions && \"maxHeight\" in containerDimensions) {\n          return containerDimensions.maxHeight;\n        }\n        return undefined;\n      },\n    ),\n    userAgent: createMcpStore(\n      bridge,\n      [\"platform\", \"deviceCapabilities\"],\n      ({ platform, deviceCapabilities }) => ({\n        device: {\n          type: platform === \"web\" ? \"desktop\" : (platform ?? \"unknown\"),\n        },\n        capabilities: {\n          hover: true,\n          touch: true,\n          ...deviceCapabilities,\n        },\n      }),\n    ),\n    toolInput: createMcpStore(\n      bridge,\n      [\"toolInput\"],\n      ({ toolInput }) => toolInput ?? null,\n    ),\n    toolOutput: createMcpStore(\n      bridge,\n      [\"toolResult\"],\n      ({ toolResult }) => toolResult?.structuredContent ?? null,\n    ),\n    toolResponseMetadata: createMcpStore(\n      bridge,\n      [\"toolResult\"],\n      ({ toolResult }) => toolResult?._meta ?? null,\n    ),\n  };\n}\n\n/**\n * Build the Apps-SDK-sourced overlay stores (`display`, `viewState`).\n * Used by `HostAdaptor` only when `window.openai` is present.\n */\nexport function buildAppsSdkOverlayStores(\n  bridge: import(\"./apps-sdk/bridge.js\").AppsSdkBridge,\n): {\n  display: HostContextStore<\"display\">;\n  viewState: HostContextStore<\"viewState\">;\n} {\n  return {\n    display: {\n      subscribe: bridge.subscribe(\"view\"),\n      getSnapshot: () => bridge.getSnapshot(\"view\"),\n    },\n    viewState: {\n      subscribe: bridge.subscribe(\"widgetState\"),\n      getSnapshot: () =>\n        bridge.getSnapshot(\"widgetState\")?.modelContent ?? null,\n    },\n  };\n}\n"]}

package/dist/web/bridges/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/web/bridges/index.tsx"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/web/bridges/index.tsx"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC","sourcesContent":["export * from \"./apps-sdk/index.js\";\nexport { getAdaptor } from \"./get-adaptor.js\";\nexport * from \"./mcp-app/index.js\";\nexport * from \"./types.js\";\nexport { useHostContext } from \"./use-host-context.js\";\n"]}

package/dist/web/bridges/mcp-app/bridge.d.ts

@@ -1,43 +1,27 @@
-import type { McpUiHostContext, McpUiInitializeRequest } from "@modelcontextprotocol/ext-apps";
+import { App } from "@modelcontextprotocol/ext-apps";
+import type { Implementation } from "@modelcontextprotocol/sdk/types.js";
 import type { Bridge, Subscribe } from "../types.js";
 import type { McpAppContext, McpAppContextKey } from "./types.js";
-type McpAppInitializationOptions = Pick<McpUiInitializeRequest["params"], "appInfo">;
-export declare class McpAppBridge implements Bridge<McpUiHostContext> {
+/** @internal Singleton bridge over the `ext-apps` JSON-RPC App connection. Used by `HostAdaptor`. */
+export declare class McpAppBridge implements Bridge<McpAppContext> {
     private static instance;
     context: McpAppContext;
     private listeners;
-    private pendingRequests;
-    private nextId;
-    private initialized;
-    private appInitializationOptions;
-    private requestTimeout;
-    private cleanupSizeObserver;
-    constructor(options: McpAppInitializationOptions, requestTimeout?: number);
-    static getInstance(options?: Partial<McpAppInitializationOptions>, requestTimeout?: number): McpAppBridge;
+    private app;
+    private connectPromise;
+    constructor(options: {
+        appInfo: Implementation;
+    });
+    private connect;
+    getApp(): Promise<App>;
+    static getInstance(options?: Partial<{
+        appInfo: Implementation;
+    }>): McpAppBridge;
     subscribe(key: McpAppContextKey): Subscribe;
     subscribe(keys: readonly McpAppContextKey[]): Subscribe;
     getSnapshot<K extends keyof McpAppContext>(key: K): McpAppContext[K];
     cleanup: () => void;
     static resetInstance(): void;
-    request<R extends {
-        method: string;
-        params?: unknown;
-    }, T>({ method, params, }: R): Promise<T>;
     private emit;
     private updateContext;
-    private init;
-    private handleMessage;
-    private handleResponse;
-    private handleNotification;
-    private handleRequest;
-    private connect;
-    private notify;
-    private sendSizeChanged;
-    /**
-     * Set up automatic size change notifications using ResizeObserver.
-     * Based on @modelcontextprotocol/ext-apps App.setupSizeChangedNotifications
-     * @see https://github.com/modelcontextprotocol/ext-apps/blob/main/src/app.ts#L940-L989
-     */
-    private setupSizeChangedNotifications;
 }
-export {};

package/dist/web/bridges/mcp-app/bridge.js

@@ -1,12 +1,5 @@
-const LATEST_PROTOCOL_VERSION = "2025-11-21";
-var JsonRpcErrorCode;
-(function (JsonRpcErrorCode) {
-    JsonRpcErrorCode[JsonRpcErrorCode["ParseError"] = -32700] = "ParseError";
-    JsonRpcErrorCode[JsonRpcErrorCode["InvalidRequest"] = -32600] = "InvalidRequest";
-    JsonRpcErrorCode[JsonRpcErrorCode["MethodNotFound"] = -32601] = "MethodNotFound";
-    JsonRpcErrorCode[JsonRpcErrorCode["InvalidParams"] = -32602] = "InvalidParams";
-    JsonRpcErrorCode[JsonRpcErrorCode["InternalError"] = -32603] = "InternalError";
-})(JsonRpcErrorCode || (JsonRpcErrorCode = {}));
+import { App } from "@modelcontextprotocol/ext-apps";
+/** @internal Singleton bridge over the `ext-apps` JSON-RPC App connection. Used by `HostAdaptor`. */
 export class McpAppBridge {
     static instance = null;
     context = {
@@ -15,34 +8,55 @@ export class McpAppBridge {
         toolResult: null,
     };
     listeners = new Map();
-    pendingRequests = new Map();
-    nextId = 1;
-    initialized;
-    appInitializationOptions;
-    requestTimeout;
-    cleanupSizeObserver = null;
-    constructor(options, requestTimeout = 10_000) {
-        this.requestTimeout = requestTimeout;
-        this.initialized = false;
-        this.appInitializationOptions = {
-            appInfo: options.appInfo,
-            appCapabilities: {},
-            protocolVersion: LATEST_PROTOCOL_VERSION,
+    app;
+    connectPromise;
+    constructor(options) {
+        this.app = new App(options.appInfo);
+        this.app.ontoolinput = (params) => {
+            this.updateContext({ toolInput: params.arguments ?? {} });
         };
-        this.init();
+        this.app.ontoolinputpartial = (params) => {
+            this.updateContext({ toolInput: params.arguments ?? {} });
+        };
+        this.app.ontoolresult = (params) => {
+            this.updateContext({ toolResult: params });
+        };
+        this.app.ontoolcancelled = (params) => {
+            this.updateContext({ toolCancelled: params });
+        };
+        this.app.onhostcontextchanged = (params) => {
+            this.updateContext(params);
+        };
+        this.connectPromise = this.connect();
     }
-    static getInstance(options, requestTimeout) {
-        if (window.skybridge.hostType !== "mcp-app") {
-            throw new Error("MCP App Bridge can only be used in the mcp-app runtime");
+    async connect() {
+        try {
+            await this.app.connect();
+            const hostContext = this.app.getHostContext();
+            if (hostContext) {
+                this.updateContext(hostContext);
+            }
+        }
+        catch (err) {
+            console.error(err);
         }
-        if (McpAppBridge.instance && (options || requestTimeout)) {
-            console.warn("McpAppBridge.getInstance: options and requestTimeout ignored, instance already exists");
+    }
+    async getApp() {
+        await this.connectPromise;
+        return this.app;
+    }
+    static getInstance(options) {
+        if (McpAppBridge.instance && options) {
+            console.warn("McpAppBridge.getInstance: options ignored, instance already exists");
         }
         if (!McpAppBridge.instance) {
             const defaultOptions = {
                 appInfo: { name: "skybridge-app", version: "0.0.1" },
             };
-            McpAppBridge.instance = new McpAppBridge({ ...defaultOptions, ...options }, requestTimeout);
+            McpAppBridge.instance = new McpAppBridge({
+                ...defaultOptions,
+                ...options,
+            });
         }
         return McpAppBridge.instance;
     }
@@ -63,14 +77,7 @@ export class McpAppBridge {
         return this.context[key];
     }
     cleanup = () => {
-        window.removeEventListener("message", this.handleMessage);
-        this.pendingRequests.forEach((request) => {
-            clearTimeout(request.timeout);
-        });
-        this.pendingRequests.clear();
         this.listeners.clear();
-        this.cleanupSizeObserver?.();
-        this.cleanupSizeObserver = null;
     };
     static resetInstance() {
         if (McpAppBridge.instance) {
@@ -78,20 +85,6 @@ export class McpAppBridge {
             McpAppBridge.instance = null;
         }
     }
-    request({ method, params, }) {
-        const id = this.nextId++;
-        const { promise, resolve, reject } = Promise.withResolvers();
-        this.pendingRequests.set(id, {
-            resolve: resolve,
-            reject,
-            timeout: setTimeout(() => {
-                reject(new Error("Request timed out"));
-                this.pendingRequests.delete(id);
-            }, this.requestTimeout),
-        });
-        window.parent.postMessage({ jsonrpc: "2.0", id, method, params }, "*");
-        return promise;
-    }
     emit(key) {
         this.listeners.get(key)?.forEach((listener) => {
             listener();
@@ -103,153 +96,5 @@ export class McpAppBridge {
             this.emit(key);
         }
     }
-    init() {
-        if (this.initialized) {
-            return;
-        }
-        this.initialized = true;
-        if (typeof window === "undefined" || window.parent === window) {
-            return;
-        }
-        window.addEventListener("message", this.handleMessage);
-        this.connect();
-    }
-    handleMessage = (event) => {
-        const data = event.data;
-        if (data.jsonrpc !== "2.0") {
-            return;
-        }
-        if ("id" in data) {
-            if ("method" in data) {
-                this.handleRequest(data);
-                return;
-            }
-            this.handleResponse(data);
-            return;
-        }
-        this.handleNotification(data);
-    };
-    handleResponse(response) {
-        const request = this.pendingRequests.get(response.id);
-        if (request) {
-            clearTimeout(request.timeout);
-            this.pendingRequests.delete(response.id);
-            if ("error" in response) {
-                request.reject(new Error(response.error.message));
-                return;
-            }
-            request.resolve(response.result);
-        }
-    }
-    handleNotification = (notification) => {
-        switch (notification.method) {
-            case "ui/notifications/host-context-changed":
-                this.updateContext(notification.params);
-                return;
-            case "ui/notifications/tool-input":
-                this.updateContext({
-                    toolInput: notification.params.arguments ?? {},
-                });
-                return;
-            case "ui/notifications/tool-result":
-                this.updateContext({
-                    toolResult: notification.params,
-                });
-                return;
-            case "ui/notifications/tool-cancelled":
-                this.updateContext({
-                    toolCancelled: notification.params,
-                });
-                return;
-        }
-    };
-    handleRequest = (request) => {
-        switch (request.method) {
-            case "ui/resource-teardown":
-                this.cleanup();
-                window.parent.postMessage({
-                    jsonrpc: "2.0",
-                    id: request.id,
-                    result: {},
-                }, "*");
-                return;
-            default:
-                window.parent.postMessage({
-                    jsonrpc: "2.0",
-                    id: request.id,
-                    error: {
-                        code: JsonRpcErrorCode.MethodNotFound,
-                        message: "Unsupported Request",
-                    },
-                }, "*");
-        }
-    };
-    async connect() {
-        try {
-            const result = await this.request({
-                method: "ui/initialize",
-                params: this.appInitializationOptions,
-            });
-            this.updateContext(result.hostContext);
-            this.notify({ method: "ui/notifications/initialized" });
-            this.cleanupSizeObserver = this.setupSizeChangedNotifications();
-        }
-        catch (err) {
-            console.error(err);
-        }
-    }
-    notify(notification) {
-        window.parent.postMessage({ jsonrpc: "2.0", ...notification }, "*");
-    }
-    sendSizeChanged(params) {
-        this.notify({ method: "ui/notifications/size-changed", params });
-    }
-    /**
-     * Set up automatic size change notifications using ResizeObserver.
-     * Based on @modelcontextprotocol/ext-apps App.setupSizeChangedNotifications
-     * @see https://github.com/modelcontextprotocol/ext-apps/blob/main/src/app.ts#L940-L989
-     */
-    setupSizeChangedNotifications() {
-        let scheduled = false;
-        let lastWidth = 0;
-        let lastHeight = 0;
-        const sendBodySizeChanged = () => {
-            if (scheduled) {
-                return;
-            }
-            scheduled = true;
-            requestAnimationFrame(() => {
-                scheduled = false;
-                let width;
-                let height;
-                // In fullscreen mode, use viewport size since the widget should fill
-                // the entire available space provided by the host.
-                if (this.context.displayMode === "fullscreen") {
-                    width = window.innerWidth;
-                    height = window.innerHeight;
-                }
-                else {
-                    // Use scrollWidth/scrollHeight to measure actual rendered content size.
-                    // This works better than fit-content for viewport-based layouts (vw/vh)
-                    // and fluid elements like maps that want to fill available space.
-                    const body = document.body;
-                    width = Math.ceil(body.scrollWidth);
-                    height = Math.ceil(body.scrollHeight);
-                }
-                // Only send if size actually changed (prevents feedback loops from
-                // style changes)
-                if (width !== lastWidth || height !== lastHeight) {
-                    lastWidth = width;
-                    lastHeight = height;
-                    this.sendSizeChanged({ width, height });
-                }
-            });
-        };
-        sendBodySizeChanged();
-        const resizeObserver = new ResizeObserver(sendBodySizeChanged);
-        resizeObserver.observe(document.documentElement);
-        resizeObserver.observe(document.body);
-        return () => resizeObserver.disconnect();
-    }
 }
 //# sourceMappingURL=bridge.js.map