skybridge 0.0.0-dev.cb16b5e → 0.0.0-dev.cbadf52

package/dist/src/server/templates/development.hbs

@@ -1,5 +1,5 @@
 <base href="{{serverUrl}}" />
-<script> window.skybridge = { hostType: "{{hostType}}" }; </script>
+<script type="module">window.skybridge = { hostType: "{{hostType}}" };</script>
 <script type="module">
   import { injectIntoGlobalHook } from "{{serverUrl}}/@react-refresh";
   injectIntoGlobalHook(window); window.$RefreshReg$ = () => {};

package/dist/src/server/templates/production.hbs

@@ -1,5 +1,5 @@
 <base href="{{serverUrl}}" />
-<script> window.skybridge = { hostType: "{{hostType}}" }; </script>
+<script type="module">window.skybridge = { hostType: "{{hostType}}" };</script>
 <div id="root"></div>
 <script type="module">
   import('{{serverUrl}}/assets/{{widgetFile}}');

package/dist/src/web/bridges/apps-sdk-adapter.d.ts

@@ -1,2 +1,13 @@
-import type { Methods } from "./types";
-export declare const requestDisplayMode: Methods["requestDisplayMode"];
+import type { Adapter, BridgeInterface, CallToolResponse, DisplayMode, ExternalStore, Methods } from "./types.js";
+export declare class AppsSdkAdapter implements Adapter {
+    private static instance;
+    static getInstance(): AppsSdkAdapter;
+    static resetInstance(): void;
+    getExternalStore<K extends keyof BridgeInterface>(key: K): ExternalStore<K>;
+    callTool: <ToolArgs extends Record<string, unknown> | null = null, ToolResponse extends CallToolResponse = CallToolResponse>(name: string, args: ToolArgs) => Promise<ToolResponse>;
+    requestDisplayMode: (mode: DisplayMode) => Promise<{
+        mode: DisplayMode;
+    }>;
+    sendFollowUpMessage: (prompt: string) => Promise<void>;
+    getMethod<K extends keyof Methods>(key: K): this[K];
+}

package/dist/src/web/bridges/apps-sdk-adapter.js

@@ -1,4 +1,33 @@
-export const requestDisplayMode = ({ mode }) => {
-    return window.openai.requestDisplayMode({ mode });
-};
+import { AppsSdkBridge } from "./apps-sdk-bridge.js";
+export class AppsSdkAdapter {
+    static instance = null;
+    static getInstance() {
+        if (!AppsSdkAdapter.instance) {
+            AppsSdkAdapter.instance = new AppsSdkAdapter();
+        }
+        return AppsSdkAdapter.instance;
+    }
+    static resetInstance() {
+        AppsSdkAdapter.instance = null;
+    }
+    getExternalStore(key) {
+        const bridge = AppsSdkBridge.getInstance();
+        return {
+            subscribe: bridge.subscribe(key),
+            getSnapshot: () => bridge.getSnapshot(key),
+        };
+    }
+    callTool = async (name, args) => {
+        return window.openai.callTool(name, args);
+    };
+    requestDisplayMode = (mode) => {
+        return window.openai.requestDisplayMode({ mode });
+    };
+    sendFollowUpMessage = (prompt) => {
+        return window.openai.sendFollowUpMessage({ prompt });
+    };
+    getMethod(key) {
+        return this[key];
+    }
+}
 //# sourceMappingURL=apps-sdk-adapter.js.map

package/dist/src/web/bridges/apps-sdk-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"apps-sdk-adapter.js","sourceRoot":"","sources":["../../../../src/web/bridges/apps-sdk-adapter.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kBAAkB,GAAkC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC5E,OAAO,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;AACpD,CAAC,CAAC"}
+{"version":3,"file":"apps-sdk-adapter.js","sourceRoot":"","sources":["../../../../src/web/bridges/apps-sdk-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAUrD,MAAM,OAAO,cAAc;IACjB,MAAM,CAAC,QAAQ,GAA0B,IAAI,CAAC;IAE/C,MAAM,CAAC,WAAW;QACvB,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC7B,cAAc,CAAC,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;QACjD,CAAC;QACD,OAAO,cAAc,CAAC,QAAQ,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,aAAa;QACzB,cAAc,CAAC,QAAQ,GAAG,IAAI,CAAC;IACjC,CAAC;IAEM,gBAAgB,CACrB,GAAM;QAEN,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;QAC3C,OAAO;YACL,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC;YAChC,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC;SAC3C,CAAC;IACJ,CAAC;IAEM,QAAQ,GAAG,KAAK,EAIrB,IAAY,EACZ,IAAc,EACS,EAAE;QACzB,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAyB,IAAI,EAAE,IAAI,CAAC,CAAC;IACpE,CAAC,CAAC;IAEK,kBAAkB,GAAG,CAC1B,IAAiB,EACe,EAAE;QAClC,OAAO,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC;IAEK,mBAAmB,GAAG,CAAC,MAAc,EAAiB,EAAE;QAC7D,OAAO,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC;IAEK,SAAS,CAA0B,GAAM;QAC9C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC"}

package/dist/src/web/bridges/apps-sdk-bridge.d.ts

@@ -1,8 +1,10 @@
 import { type OpenAiProperties } from "../types.js";
-export declare class AppsSdkBridge {
+import type { Bridge, Subscribe } from "./types.js";
+export declare class AppsSdkBridge implements Bridge<OpenAiProperties> {
     private static instance;
     static getInstance(): AppsSdkBridge;
     static resetInstance(): void;
-    subscribe: (key: keyof OpenAiProperties) => (onChange: () => void) => () => void;
+    subscribe(key: keyof OpenAiProperties): Subscribe;
+    subscribe(keys: readonly (keyof OpenAiProperties)[]): Subscribe;
     getSnapshot: <K extends keyof OpenAiProperties>(key: K) => (import("../types.js").OpenAiMethods<import("../types.js").UnknownObject> & OpenAiProperties<Record<never, unknown>, import("../types.js").UnknownObject, import("../types.js").UnknownObject, import("../types.js").UnknownObject>)[K];
 }

package/dist/src/web/bridges/apps-sdk-bridge.js

@@ -16,21 +16,26 @@ export class AppsSdkBridge {
             AppsSdkBridge.instance = null;
         }
     }
-    subscribe = (key) => (onChange) => {
-        const handleSetGlobal = (event) => {
-            const value = event.detail.globals[key];
-            if (value === undefined) {
-                return;
-            }
-            onChange();
+    subscribe(keyOrKeys) {
+        const keys = Array.isArray(keyOrKeys)
+            ? keyOrKeys
+            : [keyOrKeys];
+        return (onChange) => {
+            const handleSetGlobal = (event) => {
+                const hasRelevantChange = keys.some((key) => event.detail.globals[key] !== undefined);
+                if (!hasRelevantChange) {
+                    return;
+                }
+                onChange();
+            };
+            window.addEventListener(SET_GLOBALS_EVENT_TYPE, handleSetGlobal, {
+                passive: true,
+            });
+            return () => {
+                window.removeEventListener(SET_GLOBALS_EVENT_TYPE, handleSetGlobal);
+            };
         };
-        window.addEventListener(SET_GLOBALS_EVENT_TYPE, handleSetGlobal, {
-            passive: true,
-        });
-        return () => {
-            window.removeEventListener(SET_GLOBALS_EVENT_TYPE, handleSetGlobal);
-        };
-    };
+    }
     getSnapshot = (key) => {
         if (window.openai === undefined) {
             throw new Error(`window.openai is not available. Make sure you're calling the hook requiring ${key} within the OpenAI iFrame skybridge runtime.`);

package/dist/src/web/bridges/apps-sdk-bridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"apps-sdk-bridge.js","sourceRoot":"","sources":["../../../../src/web/bridges/apps-sdk-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,GAEvB,MAAM,aAAa,CAAC;AAErB,MAAM,OAAO,aAAa;IAChB,MAAM,CAAC,QAAQ,GAAyB,IAAI,CAAC;IAE9C,MAAM,CAAC,WAAW;QACvB,IACE,MAAM,CAAC,SAAS,CAAC,QAAQ,KAAK,UAAU;YACxC,MAAM,CAAC,MAAM,KAAK,SAAS,EAC3B,CAAC;YACD,MAAM,IAAI,KAAK,CACb,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QACD,IAAI,aAAa,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YACpC,aAAa,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,aAAa,CAAC,QAAQ,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,aAAa;QACzB,IAAI,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC3B,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;QAChC,CAAC;IACH,CAAC;IAEM,SAAS,GACd,CAAC,GAA2B,EAAE,EAAE,CAAC,CAAC,QAAoB,EAAE,EAAE;QACxD,MAAM,eAAe,GAAG,CAAC,KAAsB,EAAE,EAAE;YACjD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,OAAO;YACT,CAAC;YAED,QAAQ,EAAE,CAAC;QACb,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,eAAe,EAAE;YAC/D,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,eAAe,CAAC,CAAC;QACtE,CAAC,CAAC;IACJ,CAAC,CAAC;IACG,WAAW,GAAG,CAAmC,GAAM,EAAE,EAAE;QAChE,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CACb,+EAA+E,GAAG,8CAA8C,CACjI,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC"}
+{"version":3,"file":"apps-sdk-bridge.js","sourceRoot":"","sources":["../../../../src/web/bridges/apps-sdk-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,GAEvB,MAAM,aAAa,CAAC;AAGrB,MAAM,OAAO,aAAa;IAChB,MAAM,CAAC,QAAQ,GAAyB,IAAI,CAAC;IAE9C,MAAM,CAAC,WAAW;QACvB,IACE,MAAM,CAAC,SAAS,CAAC,QAAQ,KAAK,UAAU;YACxC,MAAM,CAAC,MAAM,KAAK,SAAS,EAC3B,CAAC;YACD,MAAM,IAAI,KAAK,CACb,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QACD,IAAI,aAAa,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YACpC,aAAa,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,aAAa,CAAC,QAAQ,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,aAAa;QACzB,IAAI,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC3B,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;QAChC,CAAC;IACH,CAAC;IAIM,SAAS,CACd,SAAuE;QAEvE,MAAM,IAAI,GAAwC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;YACxE,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChB,OAAO,CAAC,QAAoB,EAAE,EAAE;YAC9B,MAAM,eAAe,GAAG,CAAC,KAAsB,EAAE,EAAE;gBACjD,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,CACjD,CAAC;gBACF,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACvB,OAAO;gBACT,CAAC;gBACD,QAAQ,EAAE,CAAC;YACb,CAAC,CAAC;YAEF,MAAM,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,eAAe,EAAE;gBAC/D,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;YAEH,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,eAAe,CAAC,CAAC;YACtE,CAAC,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;IAEM,WAAW,GAAG,CAAmC,GAAM,EAAE,EAAE;QAChE,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CACb,+EAA+E,GAAG,8CAA8C,CACjI,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC"}

package/dist/src/web/bridges/get-bridge-method.d.ts

@@ -0,0 +1,2 @@
+import type { Methods } from "./types.js";
+export declare const getBridgeMethod: <K extends keyof Methods>(key: K) => Methods[K];

package/dist/src/web/bridges/get-bridge-method.js

@@ -0,0 +1,9 @@
+import { AppsSdkAdapter } from "./apps-sdk-adapter.js";
+import { McpAppAdapter } from "./mcp-app-adapter.js";
+export const getBridgeMethod = (key) => {
+    const adapter = window.skybridge.hostType === "apps-sdk"
+        ? AppsSdkAdapter.getInstance()
+        : McpAppAdapter.getInstance();
+    return adapter.getMethod(key);
+};
+//# sourceMappingURL=get-bridge-method.js.map

package/dist/src/web/bridges/get-bridge-method.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-bridge-method.js","sourceRoot":"","sources":["../../../../src/web/bridges/get-bridge-method.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,GAAM,EACM,EAAE;IACd,MAAM,OAAO,GACX,MAAM,CAAC,SAAS,CAAC,QAAQ,KAAK,UAAU;QACtC,CAAC,CAAC,cAAc,CAAC,WAAW,EAAE;QAC9B,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC;IAElC,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC,CAAC"}

package/dist/src/web/bridges/hooks/use-bridge.d.ts

@@ -1,2 +1,2 @@
-import type { BridgeInterface } from "../types";
-export declare const useBridge: <K extends keyof BridgeInterface>(key: K, defaultValue?: BridgeInterface[K]) => BridgeInterface[K];
+import type { BridgeInterface } from "../types.js";
+export declare const useBridge: <K extends keyof BridgeInterface>(key: K) => BridgeInterface[K];

package/dist/src/web/bridges/hooks/use-bridge.js

@@ -1,93 +1,15 @@
 import { useSyncExternalStore } from "react";
-import { AppsSdkBridge } from "../apps-sdk-bridge";
-import { McpAppBridge } from "../mcp-app-bridge";
-const DEFAULT_VALUE_FOR_MCP_APP_BRIDGE = {
-    theme: "light",
-    locale: "en-US",
-    displayMode: "inline",
-    safeArea: {
-        insets: {
-            top: 0,
-            right: 0,
-            bottom: 0,
-            left: 0,
-        },
-    },
-    maxHeight: window.innerHeight,
-    userAgent: {
-        device: {
-            type: "unknown",
-        },
-        capabilities: {
-            hover: false,
-            touch: false,
-        },
-    },
-};
-const getExternalStore = (key, defaultValue = DEFAULT_VALUE_FOR_MCP_APP_BRIDGE[key]) => {
+import { AppsSdkAdapter } from "../apps-sdk-adapter.js";
+import { McpAppAdapter } from "../mcp-app-adapter.js";
+const getExternalStore = (key) => {
     const hostType = window.skybridge.hostType;
     if (hostType === "apps-sdk") {
-        const bridge = AppsSdkBridge.getInstance();
-        return {
-            subscribe: bridge.subscribe(key),
-            getSnapshot: () => bridge.getSnapshot(key),
-        };
-    }
-    const bridge = McpAppBridge.getInstance();
-    if (key === "safeArea") {
-        return {
-            subscribe: bridge.subscribe("safeAreaInsets"),
-            getSnapshot: () => {
-                const safeArea = bridge.getSnapshot("safeAreaInsets");
-                return safeArea
-                    ? { insets: safeArea }
-                    : defaultValue;
-            },
-        };
-    }
-    if (key === "maxHeight") {
-        return {
-            subscribe: bridge.subscribe("viewport"),
-            getSnapshot: () => {
-                const viewport = bridge.getSnapshot("viewport");
-                return (viewport?.maxHeight ?? defaultValue);
-            },
-        };
-    }
-    if (key === "userAgent") {
-        return {
-            subscribe: (onChange) => () => {
-                bridge.subscribe("deviceCapabilities")(onChange);
-                bridge.subscribe("platform")(onChange);
-            },
-            getSnapshot: () => {
-                const userAgentDefaultValue = defaultValue;
-                const capabilities = {
-                    ...userAgentDefaultValue.capabilities,
-                    ...(bridge.getSnapshot("deviceCapabilities") ?? {}),
-                };
-                const mcpAppPlatform = bridge.getSnapshot("platform");
-                const deviceType = mcpAppPlatform
-                    ? mcpAppPlatform === "web"
-                        ? "desktop"
-                        : mcpAppPlatform
-                    : userAgentDefaultValue.device.type;
-                return {
-                    device: {
-                        type: deviceType,
-                    },
-                    capabilities,
-                };
-            },
-        };
+        return AppsSdkAdapter.getInstance().getExternalStore(key);
     }
-    return {
-        subscribe: bridge.subscribe(key),
-        getSnapshot: () => (bridge.getSnapshot(key) ?? defaultValue),
-    };
+    return McpAppAdapter.getInstance().getExternalStore(key);
 };
-export const useBridge = (key, defaultValue = DEFAULT_VALUE_FOR_MCP_APP_BRIDGE[key]) => {
-    const externalStore = getExternalStore(key, defaultValue);
+export const useBridge = (key) => {
+    const externalStore = getExternalStore(key);
     return useSyncExternalStore(externalStore.subscribe, externalStore.getSnapshot);
 };
 //# sourceMappingURL=use-bridge.js.map

package/dist/src/web/bridges/hooks/use-bridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-bridge.js","sourceRoot":"","sources":["../../../../../src/web/bridges/hooks/use-bridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-bridge.js","sourceRoot":"","sources":["../../../../../src/web/bridges/hooks/use-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,MAAM,gBAAgB,GAAG,CACvB,GAAM,EACY,EAAE;IACpB,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;IAC3C,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;QAC5B,OAAO,cAAc,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,aAAa,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,GAAM,EACc,EAAE;IACtB,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAE5C,OAAO,oBAAoB,CACzB,aAAa,CAAC,SAAS,EACvB,aAAa,CAAC,WAAW,CAC1B,CAAC;AACJ,CAAC,CAAC"}

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

@@ -1,4 +1,5 @@
-import type { McpUiHostContext, McpUiInitializeRequest } from "@modelcontextprotocol/ext-apps";
+import type { McpUiInitializeRequest } from "@modelcontextprotocol/ext-apps";
+import { type McpAppBridgeContext } from "../mcp-app-bridge.js";
 type McpAppInitializationOptions = Pick<McpUiInitializeRequest["params"], "appInfo">;
-export declare function useMcpAppBridge<K extends keyof McpUiHostContext>(key: K, options?: Partial<McpAppInitializationOptions>, requestTimeout?: number): McpUiHostContext[K];
+export declare function useMcpAppBridge<K extends keyof McpAppBridgeContext>(key: K, options?: Partial<McpAppInitializationOptions>, requestTimeout?: number): McpAppBridgeContext[K];
 export {};

package/dist/src/web/bridges/hooks/use-mcp-app-bridge.js

@@ -1,5 +1,5 @@
 import { useSyncExternalStore } from "react";
-import { McpAppBridge } from "../mcp-app-bridge";
+import { McpAppBridge } from "../mcp-app-bridge.js";
 export function useMcpAppBridge(key, options, requestTimeout) {
     const bridge = McpAppBridge.getInstance(options, requestTimeout);
     return useSyncExternalStore(bridge.subscribe(key), () => bridge.getSnapshot(key));

package/dist/src/web/bridges/hooks/use-mcp-app-bridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-mcp-app-bridge.js","sourceRoot":"","sources":["../../../../../src/web/bridges/hooks/use-mcp-app-bridge.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAOjD,MAAM,UAAU,eAAe,CAC7B,GAAM,EACN,OAA8C,EAC9C,cAAuB;IAEvB,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACjE,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-mcp-app-bridge.js","sourceRoot":"","sources":["../../../../../src/web/bridges/hooks/use-mcp-app-bridge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,YAAY,EAA4B,MAAM,sBAAsB,CAAC;AAO9E,MAAM,UAAU,eAAe,CAC7B,GAAM,EACN,OAA8C,EAC9C,cAAuB;IAEvB,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACjE,OAAO,oBAAoB,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CACtD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CACxB,CAAC;AACJ,CAAC"}

package/dist/src/web/bridges/hooks/use-mcp-app-bridge.test.js

@@ -1,52 +1,36 @@
 import { act, renderHook, waitFor } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { fireHostContextChangedNotification, MCPAppHostPostMessageMock, } from "../../hooks/test/utils.js";
 import { McpAppBridge } from "../mcp-app-bridge.js";
 import { useMcpAppBridge } from "./use-mcp-app-bridge.js";
 describe("useMcpAppBridge", () => {
-    let mockPostMessage;
     beforeEach(async () => {
-        mockPostMessage = vi.fn();
-        Object.defineProperty(window, "parent", {
-            value: { postMessage: mockPostMessage },
-            writable: true,
-            configurable: true,
-        });
+        vi.stubGlobal("parent", { postMessage: MCPAppHostPostMessageMock });
         vi.stubGlobal("skybridge", { hostType: "mcp-app" });
         McpAppBridge.resetInstance();
     });
     afterEach(() => {
         vi.clearAllMocks();
     });
-    it("should return the theme value from host context", async () => {
+    it("should return the theme value from host context and update on notification", async () => {
         const { result } = renderHook(() => useMcpAppBridge("theme"));
-        const initCall = mockPostMessage.mock.calls.find((call) => call[0].method === "ui/initialize");
-        if (initCall) {
-            act(() => {
-                window.dispatchEvent(new MessageEvent("message", {
-                    data: {
-                        jsonrpc: "2.0",
-                        id: initCall[0].id,
-                        result: {
-                            protocolVersion: "2025-06-18",
-                            hostInfo: { name: "test-host", version: "1.0.0" },
-                            hostCapabilities: {},
-                            hostContext: { theme: "light" },
-                        },
-                    },
-                }));
-            });
-        }
         await waitFor(() => {
             expect(result.current).toBe("light");
         });
+        fireHostContextChangedNotification({ theme: "dark" });
+        await waitFor(() => {
+            expect(result.current).toBe("dark");
+        });
     });
     it("should reject the request after timeout", async () => {
         vi.useFakeTimers();
         const consoleErrorSpy = vi
             .spyOn(console, "error")
             .mockImplementation(() => { });
+        const nonRespondingMock = vi.fn();
+        vi.stubGlobal("parent", { postMessage: nonRespondingMock });
         renderHook(() => useMcpAppBridge("theme", undefined, 100));
-        expect(mockPostMessage).toHaveBeenCalledWith(expect.objectContaining({ method: "ui/initialize" }), "*");
+        expect(nonRespondingMock).toHaveBeenCalledWith(expect.objectContaining({ method: "ui/initialize" }), "*");
         await act(async () => {
             await vi.advanceTimersByTimeAsync(100);
         });

package/dist/src/web/bridges/hooks/use-mcp-app-bridge.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-mcp-app-bridge.test.js","sourceRoot":"","sources":["../../../../../src/web/bridges/hooks/use-mcp-app-bridge.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-mcp-app-bridge.test.js","sourceRoot":"","sources":["../../../../../src/web/bridges/hooks/use-mcp-app-bridge.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EACL,kCAAkC,EAClC,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC,CAAC;QACpE,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;QACpD,YAAY,CAAC,aAAa,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;QAC1F,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;QAE9D,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,kCAAkC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAEtD,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,eAAe,GAAG,EAAE;aACvB,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC;aACvB,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAEhC,MAAM,iBAAiB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAE5D,UAAU,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;QAE3D,MAAM,CAAC,iBAAiB,CAAC,CAAC,oBAAoB,CAC5C,MAAM,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,EACpD,GAAG,CACJ,CAAC;QAEF,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC1C,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAC/B,CAAC;QAEF,eAAe,CAAC,WAAW,EAAE,CAAC;QAC9B,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/web/bridges/index.d.ts

@@ -1,4 +1,4 @@
-export { getBridgeMethods } from "./get-bridge-methods.js";
+export { getBridgeMethod } from "./get-bridge-method.js";
 export { useAppsSdkBridge } from "./hooks/use-apps-sdk-bridge.js";
 export { useBridge } from "./hooks/use-bridge.js";
 export { useMcpAppBridge } from "./hooks/use-mcp-app-bridge.js";

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

@@ -1,4 +1,4 @@
-export { getBridgeMethods } from "./get-bridge-methods.js";
+export { getBridgeMethod } from "./get-bridge-method.js";
 export { useAppsSdkBridge } from "./hooks/use-apps-sdk-bridge.js";
 export { useBridge } from "./hooks/use-bridge.js";
 export { useMcpAppBridge } from "./hooks/use-mcp-app-bridge.js";

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/web/bridges/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/web/bridges/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC"}

package/dist/src/web/bridges/mcp-app-adapter.d.ts

@@ -1,2 +1,16 @@
-import type { Methods } from "./types";
-export declare const requestDisplayMode: Methods["requestDisplayMode"];
+import type { McpUiRequestDisplayModeResult } from "@modelcontextprotocol/ext-apps";
+import type { Adapter, BridgeInterface, CallToolResponse, DisplayMode, ExternalStore, Methods } from "./types.js";
+export declare class McpAppAdapter implements Adapter {
+    private static instance;
+    private stores;
+    private constructor();
+    static getInstance(): McpAppAdapter;
+    static resetInstance(): void;
+    getExternalStore<K extends keyof BridgeInterface>(key: K): ExternalStore<K>;
+    getMethod<K extends keyof Methods>(key: K): this[K];
+    callTool: <ToolArgs extends Record<string, unknown> | null = null, ToolResponse extends CallToolResponse = CallToolResponse>(name: string, args: ToolArgs) => Promise<ToolResponse>;
+    requestDisplayMode: (mode: DisplayMode) => Promise<McpUiRequestDisplayModeResult>;
+    sendFollowUpMessage: (prompt: string) => Promise<void>;
+    private initializeStores;
+    private createExternalStore;
+}

package/dist/src/web/bridges/mcp-app-adapter.js

@@ -1,12 +1,111 @@
-import { McpAppBridge } from "./mcp-app-bridge";
-export const requestDisplayMode = ({ mode }) => {
-    const bridge = McpAppBridge.getInstance();
-    if (mode !== "modal") {
-        return bridge.request({
-            method: "ui/request-display-mode",
-            params: { mode },
+import { dequal } from "dequal/lite";
+import { McpAppBridge, } from "./mcp-app-bridge.js";
+export class McpAppAdapter {
+    static instance = null;
+    stores;
+    constructor() {
+        this.stores = this.initializeStores();
+    }
+    static getInstance() {
+        if (!McpAppAdapter.instance) {
+            McpAppAdapter.instance = new McpAppAdapter();
+        }
+        return McpAppAdapter.instance;
+    }
+    static resetInstance() {
+        McpAppAdapter.instance = null;
+    }
+    getExternalStore(key) {
+        return this.stores[key];
+    }
+    getMethod(key) {
+        return this[key];
+    }
+    callTool = async (name, args) => {
+        const bridge = McpAppBridge.getInstance();
+        const response = await bridge.request({
+            method: "tools/call",
+            params: {
+                name,
+                arguments: args ?? undefined,
+            },
+        });
+        const result = response.content
+            .filter((content) => content.type === "text")
+            .map(({ text }) => text)
+            .join("\n");
+        return {
+            content: response.content,
+            structuredContent: response.structuredContent ?? {},
+            isError: response.isError ?? false,
+            result,
+            meta: response._meta ?? {},
+        };
+    };
+    requestDisplayMode = (mode) => {
+        const bridge = McpAppBridge.getInstance();
+        if (mode !== "modal") {
+            return bridge.request({
+                method: "ui/request-display-mode",
+                params: { mode },
+            });
+        }
+        throw new Error("Modal display mode is not accessible in MCP App.");
+    };
+    sendFollowUpMessage = async (prompt) => {
+        const bridge = McpAppBridge.getInstance();
+        await bridge.request({
+            method: "ui/message",
+            params: {
+                role: "user",
+                content: [
+                    {
+                        type: "text",
+                        text: prompt,
+                    },
+                ],
+            },
         });
+    };
+    initializeStores() {
+        return {
+            theme: this.createExternalStore(["theme"], ({ theme }) => theme ?? "light"),
+            locale: this.createExternalStore(["locale"], ({ locale }) => locale ?? "en-US"),
+            safeArea: this.createExternalStore(["safeAreaInsets"], ({ safeAreaInsets }) => ({
+                insets: safeAreaInsets ?? { top: 0, right: 0, bottom: 0, left: 0 },
+            })),
+            displayMode: this.createExternalStore(["displayMode"], ({ displayMode }) => displayMode ?? "inline"),
+            maxHeight: this.createExternalStore(["viewport"], ({ viewport }) => viewport?.maxHeight ?? window.innerHeight),
+            userAgent: this.createExternalStore(["platform", "deviceCapabilities"], ({ platform, deviceCapabilities }) => ({
+                device: {
+                    type: platform === "web" ? "desktop" : (platform ?? "unknown"),
+                },
+                capabilities: {
+                    hover: true,
+                    touch: true,
+                    ...deviceCapabilities,
+                },
+            })),
+            toolInput: this.createExternalStore(["toolInput"], ({ toolInput }) => toolInput ?? null),
+            toolOutput: this.createExternalStore(["toolResult"], ({ toolResult }) => toolResult?.structuredContent ?? null),
+            toolResponseMetadata: this.createExternalStore(["toolResult"], ({ toolResult }) => toolResult?._meta ?? null),
+        };
+    }
+    createExternalStore(keys, computeSnapshot) {
+        const bridge = McpAppBridge.getInstance();
+        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;
+            },
+        };
     }
-    throw new Error("Modal display mode is not accessible in MCP App.");
-};
+}
 //# sourceMappingURL=mcp-app-adapter.js.map

package/dist/src/web/bridges/mcp-app-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-app-adapter.js","sourceRoot":"","sources":["../../../../src/web/bridges/mcp-app-adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,MAAM,CAAC,MAAM,kBAAkB,GAAkC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC5E,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC,OAAO,CAGnB;YACA,MAAM,EAAE,yBAAyB;YACjC,MAAM,EAAE,EAAE,IAAI,EAAE;SACjB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;AACtE,CAAC,CAAC"}
+{"version":3,"file":"mcp-app-adapter.js","sourceRoot":"","sources":["../../../../src/web/bridges/mcp-app-adapter.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EACL,YAAY,GAGb,MAAM,qBAAqB,CAAC;AAc7B,MAAM,OAAO,aAAa;IAChB,MAAM,CAAC,QAAQ,GAAyB,IAAI,CAAC;IAC7C,MAAM,CAEZ;IACF;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,WAAW;QACvB,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,aAAa,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,aAAa,CAAC,QAAQ,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,aAAa;QACzB,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;IAChC,CAAC;IAEM,gBAAgB,CACrB,GAAM;QAEN,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAEM,SAAS,CAA0B,GAAM;QAC9C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAEM,QAAQ,GAAG,KAAK,EAIrB,IAAY,EACZ,IAAc,EACS,EAAE;QACzB,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAkC;YACrE,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE;gBACN,IAAI;gBACJ,SAAS,EAAE,IAAI,IAAI,SAAS;aAC7B;SACF,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO;aAC5B,MAAM,CACL,CAAC,OAAO,EAA6C,EAAE,CACrD,OAAO,CAAC,IAAI,KAAK,MAAM,CAC1B;aACA,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;aACvB,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,OAAO;YACL,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB,IAAI,EAAE;YACnD,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,KAAK;YAClC,MAAM;YACN,IAAI,EAAE,QAAQ,CAAC,KAAK,IAAI,EAAE;SACX,CAAC;IACpB,CAAC,CAAC;IAEK,kBAAkB,GAAG,CAAC,IAAiB,EAAE,EAAE;QAChD,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC,OAAO,CAGnB;gBACA,MAAM,EAAE,yBAAyB;gBACjC,MAAM,EAAE,EAAE,IAAI,EAAE;aACjB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC,CAAC;IAEK,mBAAmB,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;QACpD,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,MAAM,CAAC,OAAO,CAA0C;YAC5D,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE;gBACN,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,MAAM;qBACb;iBACF;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC;IAEM,gBAAgB;QAGtB,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,mBAAmB,CAC7B,CAAC,OAAO,CAAC,EACT,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,IAAI,OAAO,CAChC;YACD,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAC9B,CAAC,QAAQ,CAAC,EACV,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,IAAI,OAAO,CAClC;YACD,QAAQ,EAAE,IAAI,CAAC,mBAAmB,CAChC,CAAC,gBAAgB,CAAC,EAClB,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;gBACvB,MAAM,EAAE,cAAc,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE;aACnE,CAAC,CACH;YACD,WAAW,EAAE,IAAI,CAAC,mBAAmB,CACnC,CAAC,aAAa,CAAC,EACf,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,IAAI,QAAQ,CAC7C;YACD,SAAS,EAAE,IAAI,CAAC,mBAAmB,CACjC,CAAC,UAAU,CAAC,EACZ,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,SAAS,IAAI,MAAM,CAAC,WAAW,CAC5D;YACD,SAAS,EAAE,IAAI,CAAC,mBAAmB,CACjC,CAAC,UAAU,EAAE,oBAAoB,CAAC,EAClC,CAAC,EAAE,QAAQ,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAC,CAAC;gBACrC,MAAM,EAAE;oBACN,IAAI,EAAE,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,SAAS,CAAC;iBAC/D;gBACD,YAAY,EAAE;oBACZ,KAAK,EAAE,IAAI;oBACX,KAAK,EAAE,IAAI;oBACX,GAAG,kBAAkB;iBACtB;aACF,CAAC,CACH;YACD,SAAS,EAAE,IAAI,CAAC,mBAAmB,CACjC,CAAC,WAAW,CAAC,EACb,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,IAAI,IAAI,CACrC;YACD,UAAU,EAAE,IAAI,CAAC,mBAAmB,CAClC,CAAC,YAAY,CAAC,EACd,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,iBAAiB,IAAI,IAAI,CAC1D;YACD,oBAAoB,EAAE,IAAI,CAAC,mBAAmB,CAC5C,CAAC,YAAY,CAAC,EACd,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,KAAK,IAAI,IAAI,CAC9C;SACF,CAAC;IACJ,CAAC;IAEO,mBAAmB,CACzB,IAAU,EACV,eAAkD;QAElD,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,WAA0B,CAAC;QAE/B,OAAO;YACL,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YACjC,WAAW,EAAE,GAAG,EAAE;gBAChB,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAChC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CACvB,CAAC;gBACvB,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;gBAE1C,IAAI,WAAW,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;oBAC/D,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,WAAW,GAAG,QAAQ,CAAC;gBACvB,OAAO,QAAQ,CAAC;YAClB,CAAC;SACF,CAAC;IACJ,CAAC"}

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

@@ -1,8 +1,16 @@
-import type { McpUiHostContext, McpUiInitializeRequest } from "@modelcontextprotocol/ext-apps";
+import type { McpUiHostContext, McpUiInitializeRequest, McpUiToolCancelledNotification, McpUiToolInputNotification, McpUiToolResultNotification } from "@modelcontextprotocol/ext-apps";
+import type { Bridge, Subscribe } from "./types.js";
 type McpAppInitializationOptions = Pick<McpUiInitializeRequest["params"], "appInfo">;
-export declare class McpAppBridge {
+export type McpToolState = {
+    toolInput: NonNullable<McpUiToolInputNotification["params"]["arguments"]> | null;
+    toolResult: McpUiToolResultNotification["params"] | null;
+    toolCancelled: McpUiToolCancelledNotification["params"] | null;
+};
+export type McpAppBridgeContext = McpUiHostContext & McpToolState;
+export type McpAppBridgeKey = keyof McpAppBridgeContext;
+export declare class McpAppBridge implements Bridge<McpUiHostContext> {
     private static instance;
-    context: McpUiHostContext | null;
+    context: McpAppBridgeContext;
     private listeners;
     private pendingRequests;
     private nextId;
@@ -11,8 +19,9 @@ export declare class McpAppBridge {
     private requestTimeout;
     constructor(options: McpAppInitializationOptions, requestTimeout?: number);
     static getInstance(options?: Partial<McpAppInitializationOptions>, requestTimeout?: number): McpAppBridge;
-    subscribe: (key: keyof McpUiHostContext) => (onChange: () => void) => () => boolean | undefined;
-    getSnapshot: <K extends keyof McpUiHostContext>(key: K) => McpUiHostContext[K] | undefined;
+    subscribe(key: McpAppBridgeKey): Subscribe;
+    subscribe(keys: readonly McpAppBridgeKey[]): Subscribe;
+    getSnapshot<K extends keyof McpAppBridgeContext>(key: K): McpAppBridgeContext[K];
     cleanup: () => void;
     static resetInstance(): void;
     request<R extends {
@@ -20,7 +29,7 @@ export declare class McpAppBridge {
         params?: unknown;
     }, T>({ method, params, }: R): Promise<T>;
     private emit;
-    private setContext;
+    private updateContext;
     private init;
     private handleMessage;
     private connect;