skybridge 0.0.0-dev.9c54635 → 0.0.0-dev.9c6d6b4

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

@@ -1,5 +1,23 @@
 import { App } from "@modelcontextprotocol/ext-apps";
-/** @internal Singleton bridge over the `ext-apps` JSON-RPC App connection. Used by {@link McpAppAdaptor}. */
+import { ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
+import { dequal } from "dequal/lite";
+import * as z from "zod";
+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;
+        },
+    };
+}
+/** @internal Singleton bridge over the `ext-apps` JSON-RPC App connection. Used by `HostAdaptor`. */
 export class McpAppBridge {
     static instance = null;
     context = {
@@ -11,7 +29,10 @@ export class McpAppBridge {
     app;
     connectPromise;
     constructor(options) {
-        this.app = new App(options.appInfo);
+        this.app = new App(options.appInfo, { tools: { listChanged: true } });
+        this.app.setRequestHandler(ListToolsRequestSchema, async () => ({
+            tools: [],
+        }));
         this.app.ontoolinput = (params) => {
             this.updateContext({ toolInput: params.arguments ?? {} });
         };
@@ -45,10 +66,23 @@ export class McpAppBridge {
         await this.connectPromise;
         return this.app;
     }
+    registerViewTool(config, handler) {
+        const inputSchema = config.inputSchema
+            ? z.object(config.inputSchema)
+            : z.object({});
+        const registered = this.app.registerTool(config.name, {
+            ...(config.title !== undefined ? { title: config.title } : {}),
+            ...(config.description !== undefined
+                ? { description: config.description }
+                : {}),
+            inputSchema,
+            ...(config.annotations ? { annotations: config.annotations } : {}),
+        }, handler);
+        return () => {
+            registered.remove();
+        };
+    }
     static getInstance(options) {
-        if (window.skybridge.hostType !== "mcp-app") {
-            throw new Error("MCP App Bridge can only be used in the mcp-app runtime");
-        }
         if (McpAppBridge.instance && options) {
             console.warn("McpAppBridge.getInstance: options ignored, instance already exists");
         }
@@ -79,6 +113,35 @@ export class McpAppBridge {
     getSnapshot(key) {
         return this.context[key];
     }
+    createContextStores() {
+        return {
+            theme: createMcpStore(this, ["theme"], ({ theme }) => theme ?? "light"),
+            locale: createMcpStore(this, ["locale"], ({ locale }) => locale ?? "en-US"),
+            safeArea: createMcpStore(this, ["safeAreaInsets"], ({ safeAreaInsets }) => ({
+                insets: safeAreaInsets ?? { top: 0, right: 0, bottom: 0, left: 0 },
+            })),
+            displayMode: createMcpStore(this, ["displayMode"], ({ displayMode }) => displayMode ?? "inline"),
+            maxHeight: createMcpStore(this, ["containerDimensions"], ({ containerDimensions }) => {
+                if (containerDimensions && "maxHeight" in containerDimensions) {
+                    return containerDimensions.maxHeight;
+                }
+                return undefined;
+            }),
+            userAgent: createMcpStore(this, ["platform", "deviceCapabilities"], ({ platform, deviceCapabilities }) => ({
+                device: {
+                    type: platform === "web" ? "desktop" : (platform ?? "unknown"),
+                },
+                capabilities: {
+                    hover: true,
+                    touch: true,
+                    ...deviceCapabilities,
+                },
+            })),
+            toolInput: createMcpStore(this, ["toolInput"], ({ toolInput }) => toolInput ?? null),
+            toolOutput: createMcpStore(this, ["toolResult"], ({ toolResult }) => toolResult?.structuredContent ?? null),
+            toolResponseMetadata: createMcpStore(this, ["toolResult"], ({ toolResult }) => toolResult?._meta ?? null),
+        };
+    }
     cleanup = () => {
         this.listeners.clear();
     };

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

@@ -1 +1 @@
-{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../../../src/web/bridges/mcp-app/bridge.ts"],"names":[],"mappings":"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","sourcesContent":["import { App } from \"@modelcontextprotocol/ext-apps\";\nimport type { Implementation } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { Bridge, Subscribe } from \"../types.js\";\nimport type { McpAppContext, McpAppContextKey } from \"./types.js\";\n\n/** @internal Singleton bridge over the `ext-apps` JSON-RPC App connection. Used by {@link McpAppAdaptor}. */\nexport class McpAppBridge implements Bridge<McpAppContext> {\n  private static instance: McpAppBridge | null = null;\n  public context: McpAppContext = {\n    toolInput: null,\n    toolCancelled: null,\n    toolResult: null,\n  };\n  private listeners = new Map<McpAppContextKey, Set<() => void>>();\n  private app: App;\n  private connectPromise: Promise<void>;\n\n  constructor(options: { appInfo: Implementation }) {\n    this.app = new App(options.appInfo);\n\n    this.app.ontoolinput = (params) => {\n      this.updateContext({ toolInput: params.arguments ?? {} });\n    };\n\n    this.app.ontoolinputpartial = (params) => {\n      this.updateContext({ toolInput: params.arguments ?? {} });\n    };\n\n    this.app.ontoolresult = (params) => {\n      this.updateContext({ toolResult: params });\n    };\n\n    this.app.ontoolcancelled = (params) => {\n      this.updateContext({ toolCancelled: params });\n    };\n\n    this.app.onhostcontextchanged = (params) => {\n      this.updateContext(params);\n    };\n\n    this.connectPromise = this.connect();\n  }\n\n  private async connect() {\n    try {\n      await this.app.connect();\n      const hostContext = this.app.getHostContext();\n      if (hostContext) {\n        this.updateContext(hostContext);\n      }\n    } catch (err) {\n      console.error(err);\n    }\n  }\n\n  public async getApp(): Promise<App> {\n    await this.connectPromise;\n    return this.app;\n  }\n\n  public static getInstance(\n    options?: Partial<{ appInfo: Implementation }>,\n  ): McpAppBridge {\n    if (window.skybridge.hostType !== \"mcp-app\") {\n      throw new Error(\"MCP App Bridge can only be used in the mcp-app runtime\");\n    }\n    if (McpAppBridge.instance && options) {\n      console.warn(\n        \"McpAppBridge.getInstance: options ignored, instance already exists\",\n      );\n    }\n    if (!McpAppBridge.instance) {\n      const defaultOptions = {\n        appInfo: { name: \"skybridge-app\", version: \"0.0.1\" },\n      };\n      McpAppBridge.instance = new McpAppBridge({\n        ...defaultOptions,\n        ...options,\n      });\n    }\n    return McpAppBridge.instance;\n  }\n\n  public subscribe(key: McpAppContextKey): Subscribe;\n  public subscribe(keys: readonly McpAppContextKey[]): Subscribe;\n  public subscribe(\n    keyOrKeys: McpAppContextKey | readonly McpAppContextKey[],\n  ): Subscribe {\n    const keys = Array.isArray(keyOrKeys) ? keyOrKeys : [keyOrKeys];\n    return (onChange: () => void) => {\n      for (const key of keys) {\n        this.listeners.set(\n          key,\n          new Set([...(this.listeners.get(key) || []), onChange]),\n        );\n      }\n      return () => {\n        for (const key of keys) {\n          this.listeners.get(key)?.delete(onChange);\n        }\n      };\n    };\n  }\n\n  public getSnapshot<K extends keyof McpAppContext>(key: K): McpAppContext[K] {\n    return this.context[key];\n  }\n\n  public cleanup = () => {\n    this.listeners.clear();\n  };\n\n  public static resetInstance(): void {\n    if (McpAppBridge.instance) {\n      McpAppBridge.instance.cleanup();\n      McpAppBridge.instance = null;\n    }\n  }\n\n  private emit(key: McpAppContextKey) {\n    this.listeners.get(key)?.forEach((listener) => {\n      listener();\n    });\n  }\n\n  private updateContext(context: Partial<McpAppContext>) {\n    this.context = { ...this.context, ...context };\n    for (const key of Object.keys(context)) {\n      this.emit(key);\n    }\n  }\n}\n"]}
+{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../../../src/web/bridges/mcp-app/bridge.ts"],"names":[],"mappings":"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","sourcesContent":["import { App } from \"@modelcontextprotocol/ext-apps\";\nimport {\n  type Implementation,\n  ListToolsRequestSchema,\n} from \"@modelcontextprotocol/sdk/types.js\";\nimport { dequal } from \"dequal/lite\";\nimport * as z from \"zod\";\nimport type {\n  AnyViewToolHandler,\n  Bridge,\n  HostContextStore,\n  Subscribe,\n  ViewToolConfig,\n} from \"../types.js\";\nimport type { McpAppContext, McpAppContextKey } from \"./types.js\";\n\ntype PickContext<K extends readonly McpAppContextKey[]> = {\n  [P in K[number]]: McpAppContext[P];\n};\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/** @internal Singleton bridge over the `ext-apps` JSON-RPC App connection. Used by `HostAdaptor`. */\nexport class McpAppBridge implements Bridge<McpAppContext> {\n  private static instance: McpAppBridge | null = null;\n  public context: McpAppContext = {\n    toolInput: null,\n    toolCancelled: null,\n    toolResult: null,\n  };\n  private listeners = new Map<McpAppContextKey, Set<() => void>>();\n  private app: App;\n  private connectPromise: Promise<void>;\n\n  constructor(options: { appInfo: Implementation }) {\n    this.app = new App(options.appInfo, { tools: { listChanged: true } });\n\n    this.app.setRequestHandler(ListToolsRequestSchema, async () => ({\n      tools: [],\n    }));\n\n    this.app.ontoolinput = (params) => {\n      this.updateContext({ toolInput: params.arguments ?? {} });\n    };\n\n    this.app.ontoolinputpartial = (params) => {\n      this.updateContext({ toolInput: params.arguments ?? {} });\n    };\n\n    this.app.ontoolresult = (params) => {\n      this.updateContext({ toolResult: params });\n    };\n\n    this.app.ontoolcancelled = (params) => {\n      this.updateContext({ toolCancelled: params });\n    };\n\n    this.app.onhostcontextchanged = (params) => {\n      this.updateContext(params);\n    };\n\n    this.connectPromise = this.connect();\n  }\n\n  private async connect() {\n    try {\n      await this.app.connect();\n      const hostContext = this.app.getHostContext();\n      if (hostContext) {\n        this.updateContext(hostContext);\n      }\n    } catch (err) {\n      console.error(err);\n    }\n  }\n\n  public async getApp(): Promise<App> {\n    await this.connectPromise;\n    return this.app;\n  }\n\n  public registerViewTool(\n    config: ViewToolConfig,\n    handler: AnyViewToolHandler,\n  ): () => void {\n    const inputSchema = config.inputSchema\n      ? z.object(config.inputSchema)\n      : z.object({});\n\n    const registered = this.app.registerTool(\n      config.name,\n      {\n        ...(config.title !== undefined ? { title: config.title } : {}),\n        ...(config.description !== undefined\n          ? { description: config.description }\n          : {}),\n        inputSchema,\n        ...(config.annotations ? { annotations: config.annotations } : {}),\n      },\n      handler,\n    );\n\n    return () => {\n      registered.remove();\n    };\n  }\n\n  public static getInstance(\n    options?: Partial<{ appInfo: Implementation }>,\n  ): McpAppBridge {\n    if (McpAppBridge.instance && options) {\n      console.warn(\n        \"McpAppBridge.getInstance: options ignored, instance already exists\",\n      );\n    }\n    if (!McpAppBridge.instance) {\n      const defaultOptions = {\n        appInfo: { name: \"skybridge-app\", version: \"0.0.1\" },\n      };\n      McpAppBridge.instance = new McpAppBridge({\n        ...defaultOptions,\n        ...options,\n      });\n    }\n    return McpAppBridge.instance;\n  }\n\n  public subscribe(key: McpAppContextKey): Subscribe;\n  public subscribe(keys: readonly McpAppContextKey[]): Subscribe;\n  public subscribe(\n    keyOrKeys: McpAppContextKey | readonly McpAppContextKey[],\n  ): Subscribe {\n    const keys = Array.isArray(keyOrKeys) ? keyOrKeys : [keyOrKeys];\n    return (onChange: () => void) => {\n      for (const key of keys) {\n        this.listeners.set(\n          key,\n          new Set([...(this.listeners.get(key) || []), onChange]),\n        );\n      }\n      return () => {\n        for (const key of keys) {\n          this.listeners.get(key)?.delete(onChange);\n        }\n      };\n    };\n  }\n\n  public getSnapshot<K extends keyof McpAppContext>(key: K): McpAppContext[K] {\n    return this.context[key];\n  }\n\n  public createContextStores(): {\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(this, [\"theme\"], ({ theme }) => theme ?? \"light\"),\n      locale: createMcpStore(\n        this,\n        [\"locale\"],\n        ({ locale }) => locale ?? \"en-US\",\n      ),\n      safeArea: createMcpStore(\n        this,\n        [\"safeAreaInsets\"],\n        ({ safeAreaInsets }) => ({\n          insets: safeAreaInsets ?? { top: 0, right: 0, bottom: 0, left: 0 },\n        }),\n      ),\n      displayMode: createMcpStore(\n        this,\n        [\"displayMode\"],\n        ({ displayMode }) => displayMode ?? \"inline\",\n      ),\n      maxHeight: createMcpStore(\n        this,\n        [\"containerDimensions\"],\n        ({ containerDimensions }) => {\n          if (containerDimensions && \"maxHeight\" in containerDimensions) {\n            return containerDimensions.maxHeight;\n          }\n          return undefined;\n        },\n      ),\n      userAgent: createMcpStore(\n        this,\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        this,\n        [\"toolInput\"],\n        ({ toolInput }) => toolInput ?? null,\n      ),\n      toolOutput: createMcpStore(\n        this,\n        [\"toolResult\"],\n        ({ toolResult }) => toolResult?.structuredContent ?? null,\n      ),\n      toolResponseMetadata: createMcpStore(\n        this,\n        [\"toolResult\"],\n        ({ toolResult }) => toolResult?._meta ?? null,\n      ),\n    };\n  }\n\n  public cleanup = () => {\n    this.listeners.clear();\n  };\n\n  public static resetInstance(): void {\n    if (McpAppBridge.instance) {\n      McpAppBridge.instance.cleanup();\n      McpAppBridge.instance = null;\n    }\n  }\n\n  private emit(key: McpAppContextKey) {\n    this.listeners.get(key)?.forEach((listener) => {\n      listener();\n    });\n  }\n\n  private updateContext(context: Partial<McpAppContext>) {\n    this.context = { ...this.context, ...context };\n    for (const key of Object.keys(context)) {\n      this.emit(key);\n    }\n  }\n}\n"]}

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

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

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

@@ -0,0 +1,17 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { McpAppBridge } from "./bridge.js";
+describe("McpAppBridge.getInstance", () => {
+    beforeEach(() => {
+        McpAppBridge.resetInstance();
+        vi.stubGlobal("parent", { postMessage: vi.fn() });
+    });
+    afterEach(() => {
+        vi.unstubAllGlobals();
+        McpAppBridge.resetInstance();
+    });
+    it("instantiates regardless of injected hostType", () => {
+        vi.stubGlobal("skybridge", { hostType: "apps-sdk" });
+        expect(() => McpAppBridge.getInstance()).not.toThrow();
+    });
+});
+//# sourceMappingURL=bridge.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"bridge.test.js","sourceRoot":"","sources":["../../../../src/web/bridges/mcp-app/bridge.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,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,UAAU,CAAC,GAAG,EAAE;QACd,YAAY,CAAC,aAAa,EAAE,CAAC;QAC7B,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,YAAY,CAAC,aAAa,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QACrD,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import { afterEach, beforeEach, describe, expect, it, vi } from \"vitest\";\nimport { McpAppBridge } from \"./bridge.js\";\n\ndescribe(\"McpAppBridge.getInstance\", () => {\n  beforeEach(() => {\n    McpAppBridge.resetInstance();\n    vi.stubGlobal(\"parent\", { postMessage: vi.fn() });\n  });\n  afterEach(() => {\n    vi.unstubAllGlobals();\n    McpAppBridge.resetInstance();\n  });\n\n  it(\"instantiates regardless of injected hostType\", () => {\n    vi.stubGlobal(\"skybridge\", { hostType: \"apps-sdk\" });\n    expect(() => McpAppBridge.getInstance()).not.toThrow();\n  });\n});\n"]}

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

@@ -1,4 +1,3 @@
-export { McpAppAdaptor } from "./adaptor.js";
 export { McpAppBridge } from "./bridge.js";
 export type { McpAppContext, McpAppContextKey, McpToolState, } from "./types.js";
 export { useMcpAppContext } from "./use-mcp-app-context.js";

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

@@ -1,4 +1,3 @@
-export { McpAppAdaptor } from "./adaptor.js";
 export { McpAppBridge } from "./bridge.js";
 export { useMcpAppContext } from "./use-mcp-app-context.js";
 //# sourceMappingURL=index.js.map

package/dist/web/bridges/mcp-app/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/web/bridges/mcp-app/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC","sourcesContent":["export { McpAppAdaptor } from \"./adaptor.js\";\nexport { McpAppBridge } from \"./bridge.js\";\nexport type {\n  McpAppContext,\n  McpAppContextKey,\n  McpToolState,\n} from \"./types.js\";\nexport { useMcpAppContext } from \"./use-mcp-app-context.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/web/bridges/mcp-app/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC","sourcesContent":["export { McpAppBridge } from \"./bridge.js\";\nexport type {\n  McpAppContext,\n  McpAppContextKey,\n  McpToolState,\n} from \"./types.js\";\nexport { useMcpAppContext } from \"./use-mcp-app-context.js\";\n"]}

package/dist/web/bridges/mcp-app/view-tools.test.d.ts

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

package/dist/web/bridges/mcp-app/view-tools.test.js

@@ -0,0 +1,143 @@
+import { waitFor } from "@testing-library/react";
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import * as z from "zod";
+import { MockResizeObserver } from "../../hooks/test/utils.js";
+import { HostAdaptor } from "../adaptor.js";
+import { McpAppBridge } from "./bridge.js";
+const outgoing = [];
+/**
+ * Stand-in MCP Apps host: replies to `ui/initialize` and records every message
+ * the app posts so tests can assert on responses and notifications.
+ */
+function installHostMock() {
+    outgoing.length = 0;
+    const postMessage = vi.fn((message) => {
+        outgoing.push(message);
+        if (message.method === "ui/initialize" && message.id !== undefined) {
+            act(() => {
+                window.dispatchEvent(new MessageEvent("message", {
+                    source: window.parent,
+                    data: {
+                        jsonrpc: "2.0",
+                        id: message.id,
+                        result: {
+                            protocolVersion: "2025-06-18",
+                            hostInfo: { name: "test-host", version: "1.0.0" },
+                            hostCapabilities: {},
+                            hostContext: {},
+                        },
+                    },
+                }));
+            });
+        }
+    });
+    vi.stubGlobal("parent", { postMessage });
+}
+let nextId = 1000;
+/** Send a host → app JSON-RPC request and resolve with the full response (result or error). */
+async function callHost(method, params = {}) {
+    const id = ++nextId;
+    act(() => {
+        window.dispatchEvent(new MessageEvent("message", {
+            source: window.parent,
+            data: { jsonrpc: "2.0", id, method, params },
+        }));
+    });
+    await waitFor(() => {
+        expect(outgoing.some((m) => m.id === id)).toBe(true);
+    });
+    return outgoing.find((m) => m.id === id);
+}
+describe("McpApp view tools", () => {
+    beforeEach(() => {
+        vi.stubGlobal("skybridge", { hostType: "mcp-app" });
+        vi.stubGlobal("ResizeObserver", MockResizeObserver);
+        McpAppBridge.resetInstance();
+        installHostMock();
+    });
+    afterEach(() => {
+        vi.unstubAllGlobals();
+        vi.clearAllMocks();
+    });
+    it("advertises the tools capability during ui/initialize", async () => {
+        await McpAppBridge.getInstance().getApp();
+        const init = outgoing.find((m) => m.method === "ui/initialize");
+        expect(init?.params?.appCapabilities).toMatchObject({
+            tools: { listChanged: true },
+        });
+    });
+    it("lists a registered view tool with its input schema", async () => {
+        const adaptor = new HostAdaptor();
+        await McpAppBridge.getInstance().getApp();
+        adaptor.registerViewTool({
+            name: "chess_make_move",
+            description: "Play a move",
+            inputSchema: { san: z.string() },
+            annotations: { readOnlyHint: false },
+        }, () => ({ content: [{ type: "text", text: "ok" }] }));
+        const response = await callHost("tools/list");
+        const tools = response?.result?.tools;
+        expect(tools).toHaveLength(1);
+        const [tool] = tools;
+        expect(tool?.name).toBe("chess_make_move");
+        expect(tool?.description).toBe("Play a move");
+        expect(tool?.inputSchema.properties).toHaveProperty("san");
+        expect(tool?.annotations?.readOnlyHint).toBe(false);
+    });
+    it("invokes the handler with validated args and returns its result", async () => {
+        const adaptor = new HostAdaptor();
+        await McpAppBridge.getInstance().getApp();
+        const handler = vi.fn(({ san }) => ({
+            content: [{ type: "text", text: `played ${san}` }],
+            structuredContent: { lastMove: san },
+        }));
+        adaptor.registerViewTool({ name: "chess_make_move", inputSchema: { san: z.string() } }, handler);
+        const response = await callHost("tools/call", {
+            name: "chess_make_move",
+            arguments: { san: "e4" },
+        });
+        const result = response?.result;
+        // ext-apps invokes the callback as `(args, extra)`; assert on the args only.
+        expect(handler.mock.calls[0]?.[0]).toEqual({ san: "e4" });
+        expect(result?.structuredContent).toEqual({ lastMove: "e4" });
+        expect(result?.isError).toBeFalsy();
+        expect(result?.content).toEqual([{ type: "text", text: "played e4" }]);
+    });
+    it("rejects the call without invoking the handler when args are invalid", async () => {
+        const adaptor = new HostAdaptor();
+        await McpAppBridge.getInstance().getApp();
+        const handler = vi.fn(() => ({ content: [] }));
+        adaptor.registerViewTool({ name: "chess_make_move", inputSchema: { san: z.string() } }, handler);
+        // ext-apps validates input against the schema and rejects with a JSON-RPC
+        // error before the handler runs.
+        const response = await callHost("tools/call", {
+            name: "chess_make_move",
+            arguments: { san: 42 },
+        });
+        expect(handler).not.toHaveBeenCalled();
+        expect(response?.error).toBeDefined();
+    });
+    it("rejects a call to an unknown tool", async () => {
+        await McpAppBridge.getInstance().getApp();
+        const response = await callHost("tools/call", {
+            name: "nope",
+            arguments: {},
+        });
+        expect(response?.error).toBeDefined();
+    });
+    it("removes the tool and notifies the host when unregistered", async () => {
+        const adaptor = new HostAdaptor();
+        await McpAppBridge.getInstance().getApp();
+        const unregister = adaptor.registerViewTool({ name: "chess_reset" }, () => ({ content: [{ type: "text", text: "reset" }] }));
+        await waitFor(() => {
+            expect(outgoing.some((m) => m.method === "notifications/tools/list_changed")).toBe(true);
+        });
+        let listed = await callHost("tools/list");
+        expect(listed?.result?.tools).toHaveLength(1);
+        unregister();
+        listed = await callHost("tools/list");
+        expect(listed?.result?.tools).toHaveLength(0);
+    });
+});
+//# sourceMappingURL=view-tools.test.js.map

package/dist/web/bridges/mcp-app/view-tools.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"view-tools.test.js","sourceRoot":"","sources":["../../../../src/web/bridges/mcp-app/view-tools.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { waitFor } from \"@testing-library/react\";\nimport { act } from \"react\";\nimport { afterEach, beforeEach, describe, expect, it, vi } from \"vitest\";\nimport * as z from \"zod\";\nimport { MockResizeObserver } from \"../../hooks/test/utils.js\";\nimport { HostAdaptor } from \"../adaptor.js\";\nimport { McpAppBridge } from \"./bridge.js\";\n\ntype JsonRpcMessage = {\n  jsonrpc: \"2.0\";\n  id?: number;\n  method?: string;\n  params?: Record<string, unknown>;\n  result?: Record<string, unknown>;\n  error?: { message: string };\n};\n\nconst outgoing: JsonRpcMessage[] = [];\n\n/**\n * Stand-in MCP Apps host: replies to `ui/initialize` and records every message\n * the app posts so tests can assert on responses and notifications.\n */\nfunction installHostMock() {\n  outgoing.length = 0;\n  const postMessage = vi.fn((message: JsonRpcMessage) => {\n    outgoing.push(message);\n    if (message.method === \"ui/initialize\" && message.id !== undefined) {\n      act(() => {\n        window.dispatchEvent(\n          new MessageEvent(\"message\", {\n            source: window.parent,\n            data: {\n              jsonrpc: \"2.0\",\n              id: message.id,\n              result: {\n                protocolVersion: \"2025-06-18\",\n                hostInfo: { name: \"test-host\", version: \"1.0.0\" },\n                hostCapabilities: {},\n                hostContext: {},\n              },\n            },\n          }),\n        );\n      });\n    }\n  });\n  vi.stubGlobal(\"parent\", { postMessage });\n}\n\nlet nextId = 1000;\n\n/** Send a host → app JSON-RPC request and resolve with the full response (result or error). */\nasync function callHost(method: string, params: Record<string, unknown> = {}) {\n  const id = ++nextId;\n  act(() => {\n    window.dispatchEvent(\n      new MessageEvent(\"message\", {\n        source: window.parent,\n        data: { jsonrpc: \"2.0\", id, method, params },\n      }),\n    );\n  });\n  await waitFor(() => {\n    expect(outgoing.some((m) => m.id === id)).toBe(true);\n  });\n  return outgoing.find((m) => m.id === id);\n}\n\ndescribe(\"McpApp view tools\", () => {\n  beforeEach(() => {\n    vi.stubGlobal(\"skybridge\", { hostType: \"mcp-app\" });\n    vi.stubGlobal(\"ResizeObserver\", MockResizeObserver);\n    McpAppBridge.resetInstance();\n    installHostMock();\n  });\n\n  afterEach(() => {\n    vi.unstubAllGlobals();\n    vi.clearAllMocks();\n  });\n\n  it(\"advertises the tools capability during ui/initialize\", async () => {\n    await McpAppBridge.getInstance().getApp();\n    const init = outgoing.find((m) => m.method === \"ui/initialize\");\n    expect(init?.params?.appCapabilities).toMatchObject({\n      tools: { listChanged: true },\n    });\n  });\n\n  it(\"lists a registered view tool with its input schema\", async () => {\n    const adaptor = new HostAdaptor();\n    await McpAppBridge.getInstance().getApp();\n\n    adaptor.registerViewTool(\n      {\n        name: \"chess_make_move\",\n        description: \"Play a move\",\n        inputSchema: { san: z.string() },\n        annotations: { readOnlyHint: false },\n      },\n      () => ({ content: [{ type: \"text\", text: \"ok\" }] }),\n    );\n\n    const response = await callHost(\"tools/list\");\n    const tools = response?.result?.tools as Array<{\n      name: string;\n      description?: string;\n      inputSchema: { properties?: Record<string, unknown> };\n      annotations?: { readOnlyHint?: boolean };\n    }>;\n    expect(tools).toHaveLength(1);\n    const [tool] = tools;\n    expect(tool?.name).toBe(\"chess_make_move\");\n    expect(tool?.description).toBe(\"Play a move\");\n    expect(tool?.inputSchema.properties).toHaveProperty(\"san\");\n    expect(tool?.annotations?.readOnlyHint).toBe(false);\n  });\n\n  it(\"invokes the handler with validated args and returns its result\", async () => {\n    const adaptor = new HostAdaptor();\n    await McpAppBridge.getInstance().getApp();\n\n    const handler = vi.fn(({ san }: { san: string }) => ({\n      content: [{ type: \"text\" as const, text: `played ${san}` }],\n      structuredContent: { lastMove: san },\n    }));\n\n    adaptor.registerViewTool(\n      { name: \"chess_make_move\", inputSchema: { san: z.string() } },\n      handler as never,\n    );\n\n    const response = await callHost(\"tools/call\", {\n      name: \"chess_make_move\",\n      arguments: { san: \"e4\" },\n    });\n    const result = response?.result;\n\n    // ext-apps invokes the callback as `(args, extra)`; assert on the args only.\n    expect(handler.mock.calls[0]?.[0]).toEqual({ san: \"e4\" });\n    expect(result?.structuredContent).toEqual({ lastMove: \"e4\" });\n    expect(result?.isError).toBeFalsy();\n    expect(result?.content).toEqual([{ type: \"text\", text: \"played e4\" }]);\n  });\n\n  it(\"rejects the call without invoking the handler when args are invalid\", async () => {\n    const adaptor = new HostAdaptor();\n    await McpAppBridge.getInstance().getApp();\n\n    const handler = vi.fn(() => ({ content: [] }));\n    adaptor.registerViewTool(\n      { name: \"chess_make_move\", inputSchema: { san: z.string() } },\n      handler as never,\n    );\n\n    // ext-apps validates input against the schema and rejects with a JSON-RPC\n    // error before the handler runs.\n    const response = await callHost(\"tools/call\", {\n      name: \"chess_make_move\",\n      arguments: { san: 42 },\n    });\n\n    expect(handler).not.toHaveBeenCalled();\n    expect(response?.error).toBeDefined();\n  });\n\n  it(\"rejects a call to an unknown tool\", async () => {\n    await McpAppBridge.getInstance().getApp();\n    const response = await callHost(\"tools/call\", {\n      name: \"nope\",\n      arguments: {},\n    });\n    expect(response?.error).toBeDefined();\n  });\n\n  it(\"removes the tool and notifies the host when unregistered\", async () => {\n    const adaptor = new HostAdaptor();\n    await McpAppBridge.getInstance().getApp();\n\n    const unregister = adaptor.registerViewTool(\n      { name: \"chess_reset\" },\n      () => ({ content: [{ type: \"text\", text: \"reset\" }] }),\n    );\n\n    await waitFor(() => {\n      expect(\n        outgoing.some((m) => m.method === \"notifications/tools/list_changed\"),\n      ).toBe(true);\n    });\n\n    let listed = await callHost(\"tools/list\");\n    expect(listed?.result?.tools).toHaveLength(1);\n\n    unregister();\n    listed = await callHost(\"tools/list\");\n    expect(listed?.result?.tools).toHaveLength(0);\n  });\n});\n"]}

package/dist/web/bridges/types.d.ts

@@ -1,4 +1,5 @@
-import type { CallToolResult, EmbeddedResource, ResourceLink } from "@modelcontextprotocol/sdk/types.js";
+import type { SchemaOutput, ZodRawShapeCompat } from "@modelcontextprotocol/sdk/server/zod-compat.js";
+import type { CallToolResult, EmbeddedResource, ResourceLink, ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
 import type { useSyncExternalStore } from "react";
 import type { ViewHostType } from "../../server/index.js";
 /**
@@ -143,6 +144,37 @@ export type DownloadParams = {
 export type DownloadResult = {
     isError?: boolean;
 };
+/**
+ * Args passed to a {@link ViewToolHandler}, inferred from the tool's
+ * `inputSchema` (optionality preserved). Mirrors the server's `registerTool`.
+ */
+export type InferViewToolArgs<Shape extends ZodRawShapeCompat> = {
+    [K in keyof Shape as undefined extends SchemaOutput<Shape[K]> ? never : K]: SchemaOutput<Shape[K]>;
+} & {
+    [K in keyof Shape as undefined extends SchemaOutput<Shape[K]> ? K : never]?: SchemaOutput<Shape[K]>;
+};
+/**
+ * Declares a tool the view exposes to the host/model (the MCP Apps
+ * "app-provided tools" feature). Mirrors the server-side `registerTool` config.
+ * Namespace `name` (e.g. `chess_make_move`) to avoid clashing with server tools.
+ */
+export type ViewToolConfig<TInput extends ZodRawShapeCompat = ZodRawShapeCompat> = {
+    name: string;
+    title?: string;
+    description?: string;
+    inputSchema?: TInput;
+    annotations?: ToolAnnotations;
+};
+/**
+ * Value a {@link ViewToolHandler} returns — a standard MCP `CallToolResult`
+ * (`content` blocks plus optional `structuredContent` / `isError` / `_meta`),
+ * exactly as `ext-apps`' app tool callbacks return it.
+ */
+export type ViewToolResult = CallToolResult;
+/** Handler run when the host calls a view tool. Receives validated, typed args. */
+export type ViewToolHandler<TInput extends ZodRawShapeCompat = ZodRawShapeCompat> = (args: InferViewToolArgs<TInput>) => ViewToolResult | Promise<ViewToolResult>;
+/** @internal Untyped handler signature stored by the adaptor/bridge after type erasure. */
+export type AnyViewToolHandler = (args: Record<string, unknown>) => ViewToolResult | Promise<ViewToolResult>;
 /**
  * @internal
  * Low-level interface every host bridge implements. End-user code should use
@@ -168,4 +200,15 @@ export interface Adaptor {
     selectFiles(): Promise<FileMetadata[]>;
     openModal(options: RequestModalOptions): void;
     setOpenInAppUrl(href: string): Promise<void>;
+    closeModal(): void;
+    registerViewTool(config: ViewToolConfig, handler: AnyViewToolHandler): () => void;
+}
+/**
+ * Thrown when a host bridge method is called in a runtime that doesn't
+ * support it (e.g. `uploadFile` outside the Apps SDK runtime).
+ */
+export declare class NotSupportedError extends Error {
+    readonly method: string;
+    readonly reason?: string | undefined;
+    constructor(method: string, reason?: string | undefined);
 }

package/dist/web/bridges/types.js

@@ -1,2 +1,15 @@
-export {};
+/**
+ * Thrown when a host bridge method is called in a runtime that doesn't
+ * support it (e.g. `uploadFile` outside the Apps SDK runtime).
+ */
+export class NotSupportedError extends Error {
+    method;
+    reason;
+    constructor(method, reason) {
+        super(`${method} is not supported in this runtime${reason ? `: ${reason}` : ""}`);
+        this.method = method;
+        this.reason = reason;
+        this.name = "NotSupportedError";
+    }
+}
 //# sourceMappingURL=types.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/web/bridges/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  CallToolResult,\n  EmbeddedResource,\n  ResourceLink,\n} from \"@modelcontextprotocol/sdk/types.js\";\nimport type { useSyncExternalStore } from \"react\";\nimport type { ViewHostType } from \"../../server/index.js\";\n\n/**\n * Globals injected on `window.skybridge` by the host. Tells the view which\n * runtime it's running under and where to reach the MCP server.\n */\nexport type SkybridgeProperties = {\n  hostType: ViewHostType;\n  serverUrl: string;\n};\n\ndeclare global {\n  interface Window {\n    skybridge: SkybridgeProperties;\n  }\n}\n\n/** Arguments passed to a tool call. `null` for tools that take no input. */\nexport type CallToolArgs = Record<string, unknown> | null;\n\n/**\n * Result of a tool call as surfaced to the view: MCP `content` blocks plus\n * the typed `structuredContent` and optional `meta`. `isError` is set when\n * the server marks the call as failed.\n */\nexport type CallToolResponse = {\n  content: CallToolResult[\"content\"];\n  structuredContent: NonNullable<CallToolResult[\"structuredContent\"]>;\n  isError: NonNullable<CallToolResult[\"isError\"]>;\n  meta?: CallToolResult[\"_meta\"];\n};\n\n/**\n * How the view is laid out by the host. `\"modal\"` is host-driven (see\n * {@link useRequestModal}); `\"pip\"`, `\"inline\"`, and `\"fullscreen\"` are\n * requestable via {@link useDisplayMode}.\n */\nexport type DisplayMode = \"pip\" | \"inline\" | \"fullscreen\" | \"modal\";\n/** Subset of {@link DisplayMode} that the view can request from the host. */\nexport type RequestDisplayMode = Exclude<DisplayMode, \"modal\">;\n\n/** Host theme. Mirror this in your view's styling for a native feel. */\nexport type Theme = \"light\" | \"dark\";\n\n/** Coarse device class reported by the host. `\"unknown\"` when unavailable. */\nexport type DeviceType = \"mobile\" | \"tablet\" | \"desktop\" | \"unknown\";\n\n/** Pixel insets the view should keep clear of (notches, home indicators, etc.). */\nexport type SafeAreaInsets = {\n  top: number;\n  right: number;\n  bottom: number;\n  left: number;\n};\n\n/** Wrapper around {@link SafeAreaInsets} exposed via {@link useLayout}. */\nexport type SafeArea = {\n  insets: SafeAreaInsets;\n};\n\n/** Device and input-capability hints exposed via {@link useUser}. */\nexport type UserAgent = {\n  device: {\n    type: DeviceType;\n  };\n  capabilities: {\n    hover: boolean;\n    touch: boolean;\n  };\n};\n\n/**\n * Full snapshot of state the host exposes to the view. Most fields are\n * better accessed through their dedicated hooks (`useLayout`, `useUser`,\n * `useToolInfo`, etc.) — read this directly only for advanced cases.\n */\nexport interface HostContext {\n  theme: Theme;\n  locale: string;\n  displayMode: DisplayMode;\n  safeArea: SafeArea;\n  maxHeight: number | undefined;\n  userAgent: UserAgent;\n  toolInput: Record<string, unknown> | null;\n  toolOutput: Record<string, unknown> | null;\n  toolResponseMetadata: Record<string, unknown> | null;\n  display: {\n    mode: DisplayMode;\n    params?: Record<string, unknown>;\n  };\n  viewState: Record<string, unknown> | null;\n}\n\n/** @internal `useSyncExternalStore` subscribe signature, re-exported for bridge implementations. */\nexport type Subscribe = Parameters<typeof useSyncExternalStore>[0];\n\n/** @internal Bridge contract implemented by per-host bridge classes. */\nexport interface Bridge<Context> {\n  subscribe(key: keyof Context): Subscribe;\n  subscribe(keys: readonly (keyof Context)[]): Subscribe;\n  getSnapshot<K extends keyof Context>(key: K): Context[K] | undefined;\n}\n\n/** @internal Per-key snapshot store backing {@link useHostContext}. */\nexport type HostContextStore<K extends keyof HostContext> = {\n  subscribe: Subscribe;\n  getSnapshot: () => HostContext[K];\n};\n\n/** Persisted view state shape (a plain object). See {@link useViewState}. */\nexport type ViewState = Record<string, unknown>;\n\n/** Updater form accepted when writing to view state. */\nexport type SetViewStateAction =\n  | ViewState\n  | ((prevState: ViewState | null) => ViewState);\n\n/** Reference to a host-managed file (returned by {@link useFiles}). */\nexport type FileMetadata = {\n  fileId: string;\n  fileName?: string;\n  mimeType?: string;\n};\n\n/** Options for {@link useFiles}'s `upload`. `library: true` saves into the user's library when supported. */\nexport type UploadFileOptions = { library?: boolean };\n\n/** Options for {@link useRequestModal}'s `open` call. */\nexport type RequestModalOptions = {\n  title?: string;\n  params?: Record<string, unknown>;\n  template?: string;\n  anchor?: { top?: number; left?: number; width?: number; height?: number };\n};\n\n/**\n * Options for {@link useOpenExternal}. Set `redirectUrl: false` to tell the\n * host not to append its `?redirectUrl=…` tracking query parameter when\n * opening allowlisted targets.\n */\nexport type OpenExternalOptions = {\n  redirectUrl?: false;\n};\n\n/** Options for {@link useSendFollowUpMessage}. */\nexport type SendFollowUpMessageOptions = { scrollToBottom?: boolean };\n\n/** Options for {@link useRequestSize}. Omit a dimension to leave it unchanged. */\nexport type RequestSizeOptions = {\n  width?: number;\n  height?: number;\n};\n\nexport type DownloadParams = {\n  contents: (EmbeddedResource | ResourceLink)[];\n};\n\nexport type DownloadResult = {\n  isError?: boolean;\n};\n\n/**\n * @internal\n * Low-level interface every host bridge implements. End-user code should use\n * the React hooks (`useCallTool`, `useViewState`, `useFiles`, …) rather than\n * calling this directly.\n */\nexport interface Adaptor {\n  getHostContextStore<K extends keyof HostContext>(key: K): HostContextStore<K>;\n  callTool<\n    ToolArgs extends CallToolArgs = null,\n    ToolResponse extends CallToolResponse = CallToolResponse,\n  >(name: string, args: ToolArgs): Promise<ToolResponse>;\n  requestDisplayMode(mode: RequestDisplayMode): Promise<{\n    mode: RequestDisplayMode;\n  }>;\n  requestClose(): Promise<void>;\n  requestSize(size: RequestSizeOptions): Promise<void>;\n  sendFollowUpMessage(\n    prompt: string,\n    options?: SendFollowUpMessageOptions,\n  ): Promise<void>;\n  openExternal(href: string, options?: OpenExternalOptions): void;\n  download(params: DownloadParams): Promise<DownloadResult>;\n  setViewState(stateOrUpdater: SetViewStateAction): Promise<void>;\n  uploadFile(file: File, options?: UploadFileOptions): Promise<FileMetadata>;\n  getFileDownloadUrl(file: FileMetadata): Promise<{ downloadUrl: string }>;\n  selectFiles(): Promise<FileMetadata[]>;\n  openModal(options: RequestModalOptions): void;\n  setOpenInAppUrl(href: string): Promise<void>;\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/web/bridges/types.ts"],"names":[],"mappings":"AAgQA;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAExB;IACA;IAFlB,YACkB,MAAc,EACd,MAAe;QAE/B,KAAK,CACH,GAAG,MAAM,oCAAoC,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3E,CAAC;QALc,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAS;QAK/B,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF","sourcesContent":["import type {\n  SchemaOutput,\n  ZodRawShapeCompat,\n} from \"@modelcontextprotocol/sdk/server/zod-compat.js\";\nimport type {\n  CallToolResult,\n  EmbeddedResource,\n  ResourceLink,\n  ToolAnnotations,\n} from \"@modelcontextprotocol/sdk/types.js\";\nimport type { useSyncExternalStore } from \"react\";\nimport type { ViewHostType } from \"../../server/index.js\";\n\n/**\n * Globals injected on `window.skybridge` by the host. Tells the view which\n * runtime it's running under and where to reach the MCP server.\n */\nexport type SkybridgeProperties = {\n  hostType: ViewHostType;\n  serverUrl: string;\n};\n\ndeclare global {\n  interface Window {\n    skybridge: SkybridgeProperties;\n  }\n}\n\n/** Arguments passed to a tool call. `null` for tools that take no input. */\nexport type CallToolArgs = Record<string, unknown> | null;\n\n/**\n * Result of a tool call as surfaced to the view: MCP `content` blocks plus\n * the typed `structuredContent` and optional `meta`. `isError` is set when\n * the server marks the call as failed.\n */\nexport type CallToolResponse = {\n  content: CallToolResult[\"content\"];\n  structuredContent: NonNullable<CallToolResult[\"structuredContent\"]>;\n  isError: NonNullable<CallToolResult[\"isError\"]>;\n  meta?: CallToolResult[\"_meta\"];\n};\n\n/**\n * How the view is laid out by the host. `\"modal\"` is host-driven (see\n * {@link useRequestModal}); `\"pip\"`, `\"inline\"`, and `\"fullscreen\"` are\n * requestable via {@link useDisplayMode}.\n */\nexport type DisplayMode = \"pip\" | \"inline\" | \"fullscreen\" | \"modal\";\n/** Subset of {@link DisplayMode} that the view can request from the host. */\nexport type RequestDisplayMode = Exclude<DisplayMode, \"modal\">;\n\n/** Host theme. Mirror this in your view's styling for a native feel. */\nexport type Theme = \"light\" | \"dark\";\n\n/** Coarse device class reported by the host. `\"unknown\"` when unavailable. */\nexport type DeviceType = \"mobile\" | \"tablet\" | \"desktop\" | \"unknown\";\n\n/** Pixel insets the view should keep clear of (notches, home indicators, etc.). */\nexport type SafeAreaInsets = {\n  top: number;\n  right: number;\n  bottom: number;\n  left: number;\n};\n\n/** Wrapper around {@link SafeAreaInsets} exposed via {@link useLayout}. */\nexport type SafeArea = {\n  insets: SafeAreaInsets;\n};\n\n/** Device and input-capability hints exposed via {@link useUser}. */\nexport type UserAgent = {\n  device: {\n    type: DeviceType;\n  };\n  capabilities: {\n    hover: boolean;\n    touch: boolean;\n  };\n};\n\n/**\n * Full snapshot of state the host exposes to the view. Most fields are\n * better accessed through their dedicated hooks (`useLayout`, `useUser`,\n * `useToolInfo`, etc.) — read this directly only for advanced cases.\n */\nexport interface HostContext {\n  theme: Theme;\n  locale: string;\n  displayMode: DisplayMode;\n  safeArea: SafeArea;\n  maxHeight: number | undefined;\n  userAgent: UserAgent;\n  toolInput: Record<string, unknown> | null;\n  toolOutput: Record<string, unknown> | null;\n  toolResponseMetadata: Record<string, unknown> | null;\n  display: {\n    mode: DisplayMode;\n    params?: Record<string, unknown>;\n  };\n  viewState: Record<string, unknown> | null;\n}\n\n/** @internal `useSyncExternalStore` subscribe signature, re-exported for bridge implementations. */\nexport type Subscribe = Parameters<typeof useSyncExternalStore>[0];\n\n/** @internal Bridge contract implemented by per-host bridge classes. */\nexport interface Bridge<Context> {\n  subscribe(key: keyof Context): Subscribe;\n  subscribe(keys: readonly (keyof Context)[]): Subscribe;\n  getSnapshot<K extends keyof Context>(key: K): Context[K] | undefined;\n}\n\n/** @internal Per-key snapshot store backing {@link useHostContext}. */\nexport type HostContextStore<K extends keyof HostContext> = {\n  subscribe: Subscribe;\n  getSnapshot: () => HostContext[K];\n};\n\n/** Persisted view state shape (a plain object). See {@link useViewState}. */\nexport type ViewState = Record<string, unknown>;\n\n/** Updater form accepted when writing to view state. */\nexport type SetViewStateAction =\n  | ViewState\n  | ((prevState: ViewState | null) => ViewState);\n\n/** Reference to a host-managed file (returned by {@link useFiles}). */\nexport type FileMetadata = {\n  fileId: string;\n  fileName?: string;\n  mimeType?: string;\n};\n\n/** Options for {@link useFiles}'s `upload`. `library: true` saves into the user's library when supported. */\nexport type UploadFileOptions = { library?: boolean };\n\n/** Options for {@link useRequestModal}'s `open` call. */\nexport type RequestModalOptions = {\n  title?: string;\n  params?: Record<string, unknown>;\n  template?: string;\n  anchor?: { top?: number; left?: number; width?: number; height?: number };\n};\n\n/**\n * Options for {@link useOpenExternal}. Set `redirectUrl: false` to tell the\n * host not to append its `?redirectUrl=…` tracking query parameter when\n * opening allowlisted targets.\n */\nexport type OpenExternalOptions = {\n  redirectUrl?: false;\n};\n\n/** Options for {@link useSendFollowUpMessage}. */\nexport type SendFollowUpMessageOptions = { scrollToBottom?: boolean };\n\n/** Options for {@link useRequestSize}. Omit a dimension to leave it unchanged. */\nexport type RequestSizeOptions = {\n  width?: number;\n  height?: number;\n};\n\nexport type DownloadParams = {\n  contents: (EmbeddedResource | ResourceLink)[];\n};\n\nexport type DownloadResult = {\n  isError?: boolean;\n};\n\n/**\n * Args passed to a {@link ViewToolHandler}, inferred from the tool's\n * `inputSchema` (optionality preserved). Mirrors the server's `registerTool`.\n */\nexport type InferViewToolArgs<Shape extends ZodRawShapeCompat> = {\n  [K in keyof Shape as undefined extends SchemaOutput<Shape[K]>\n    ? never\n    : K]: SchemaOutput<Shape[K]>;\n} & {\n  [K in keyof Shape as undefined extends SchemaOutput<Shape[K]>\n    ? K\n    : never]?: SchemaOutput<Shape[K]>;\n};\n\n/**\n * Declares a tool the view exposes to the host/model (the MCP Apps\n * \"app-provided tools\" feature). Mirrors the server-side `registerTool` config.\n * Namespace `name` (e.g. `chess_make_move`) to avoid clashing with server tools.\n */\nexport type ViewToolConfig<\n  TInput extends ZodRawShapeCompat = ZodRawShapeCompat,\n> = {\n  name: string;\n  title?: string;\n  description?: string;\n  inputSchema?: TInput;\n  annotations?: ToolAnnotations;\n};\n\n/**\n * Value a {@link ViewToolHandler} returns — a standard MCP `CallToolResult`\n * (`content` blocks plus optional `structuredContent` / `isError` / `_meta`),\n * exactly as `ext-apps`' app tool callbacks return it.\n */\nexport type ViewToolResult = CallToolResult;\n\n/** Handler run when the host calls a view tool. Receives validated, typed args. */\nexport type ViewToolHandler<\n  TInput extends ZodRawShapeCompat = ZodRawShapeCompat,\n> = (\n  args: InferViewToolArgs<TInput>,\n) => ViewToolResult | Promise<ViewToolResult>;\n\n/** @internal Untyped handler signature stored by the adaptor/bridge after type erasure. */\nexport type AnyViewToolHandler = (\n  args: Record<string, unknown>,\n) => ViewToolResult | Promise<ViewToolResult>;\n\n/**\n * @internal\n * Low-level interface every host bridge implements. End-user code should use\n * the React hooks (`useCallTool`, `useViewState`, `useFiles`, …) rather than\n * calling this directly.\n */\nexport interface Adaptor {\n  getHostContextStore<K extends keyof HostContext>(key: K): HostContextStore<K>;\n  callTool<\n    ToolArgs extends CallToolArgs = null,\n    ToolResponse extends CallToolResponse = CallToolResponse,\n  >(name: string, args: ToolArgs): Promise<ToolResponse>;\n  requestDisplayMode(mode: RequestDisplayMode): Promise<{\n    mode: RequestDisplayMode;\n  }>;\n  requestClose(): Promise<void>;\n  requestSize(size: RequestSizeOptions): Promise<void>;\n  sendFollowUpMessage(\n    prompt: string,\n    options?: SendFollowUpMessageOptions,\n  ): Promise<void>;\n  openExternal(href: string, options?: OpenExternalOptions): void;\n  download(params: DownloadParams): Promise<DownloadResult>;\n  setViewState(stateOrUpdater: SetViewStateAction): Promise<void>;\n  uploadFile(file: File, options?: UploadFileOptions): Promise<FileMetadata>;\n  getFileDownloadUrl(file: FileMetadata): Promise<{ downloadUrl: string }>;\n  selectFiles(): Promise<FileMetadata[]>;\n  openModal(options: RequestModalOptions): void;\n  setOpenInAppUrl(href: string): Promise<void>;\n  closeModal(): void;\n  registerViewTool(\n    config: ViewToolConfig,\n    handler: AnyViewToolHandler,\n  ): () => void;\n}\n\n/**\n * Thrown when a host bridge method is called in a runtime that doesn't\n * support it (e.g. `uploadFile` outside the Apps SDK runtime).\n */\nexport class NotSupportedError extends Error {\n  constructor(\n    public readonly method: string,\n    public readonly reason?: string,\n  ) {\n    super(\n      `${method} is not supported in this runtime${reason ? `: ${reason}` : \"\"}`,\n    );\n    this.name = \"NotSupportedError\";\n  }\n}\n"]}

package/dist/web/bridges/types.test.d.ts

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

package/dist/web/bridges/types.test.js

@@ -0,0 +1,19 @@
+import { describe, expect, it } from "vitest";
+import { NotSupportedError } from "./types.js";
+describe("NotSupportedError", () => {
+    it("includes method name in message", () => {
+        const err = new NotSupportedError("uploadFile");
+        expect(err.message).toBe("uploadFile is not supported in this runtime");
+        expect(err.name).toBe("NotSupportedError");
+        expect(err.method).toBe("uploadFile");
+    });
+    it("includes reason when provided", () => {
+        const err = new NotSupportedError("callTool", "MCP transport unavailable");
+        expect(err.message).toBe("callTool is not supported in this runtime: MCP transport unavailable");
+        expect(err.reason).toBe("MCP transport unavailable");
+    });
+    it("is an instance of Error", () => {
+        expect(new NotSupportedError("x")).toBeInstanceOf(Error);
+    });
+});
+//# sourceMappingURL=types.test.js.map

package/dist/web/bridges/types.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.test.js","sourceRoot":"","sources":["../../../src/web/bridges/types.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,GAAG,GAAG,IAAI,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;QACxE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC3C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,GAAG,GAAG,IAAI,iBAAiB,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC;QAC3E,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CACtB,sEAAsE,CACvE,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,CAAC,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import { describe, expect, it } from \"vitest\";\nimport { NotSupportedError } from \"./types.js\";\n\ndescribe(\"NotSupportedError\", () => {\n  it(\"includes method name in message\", () => {\n    const err = new NotSupportedError(\"uploadFile\");\n    expect(err.message).toBe(\"uploadFile is not supported in this runtime\");\n    expect(err.name).toBe(\"NotSupportedError\");\n    expect(err.method).toBe(\"uploadFile\");\n  });\n\n  it(\"includes reason when provided\", () => {\n    const err = new NotSupportedError(\"callTool\", \"MCP transport unavailable\");\n    expect(err.message).toBe(\n      \"callTool is not supported in this runtime: MCP transport unavailable\",\n    );\n    expect(err.reason).toBe(\"MCP transport unavailable\");\n  });\n\n  it(\"is an instance of Error\", () => {\n    expect(new NotSupportedError(\"x\")).toBeInstanceOf(Error);\n  });\n});\n"]}

package/dist/web/components/modal-provider.d.ts

@@ -1,4 +1,4 @@
 import { type ReactNode } from "react";
 export declare function ModalProvider({ children }: {
     children: ReactNode;
-}): import("react/jsx-runtime").JSX.Element;
+}): import("react").JSX.Element;

package/dist/web/components/modal-provider.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useSyncExternalStore } from "react";
-import { McpAppAdaptor } from "../bridges/index.js";
+import { getAdaptor } from "../bridges/index.js";
 const modalStyles = `
 .sb-modal-backdrop {
   position: fixed;
@@ -20,8 +20,9 @@ const modalStyles = `
 }
 `;
 export function ModalProvider({ children }) {
-    const adaptor = McpAppAdaptor.getInstance();
-    const { mode } = useSyncExternalStore(adaptor.getHostContextStore("display").subscribe, adaptor.getHostContextStore("display").getSnapshot);
+    const adaptor = getAdaptor();
+    const displayStore = adaptor.getHostContextStore("display");
+    const { mode } = useSyncExternalStore(displayStore.subscribe, displayStore.getSnapshot);
     const isOpen = mode === "modal";
     const handleBackdropClick = (e) => {
         if (e.target === e.currentTarget) {

package/dist/web/components/modal-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"modal-provider.js","sourceRoot":"","sources":["../../../src/web/components/modal-provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAkB,SAAS,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;CAiBnB,CAAC;AAEF,MAAM,UAAU,aAAa,CAAC,EAAE,QAAQ,EAA2B;IACjE,MAAM,OAAO,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;IAE5C,MAAM,EAAE,IAAI,EAAE,GAAG,oBAAoB,CACnC,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,SAAS,EAChD,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,WAAW,CACnD,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC;IAEhC,MAAM,mBAAmB,GAAG,CAAC,CAAmB,EAAE,EAAE;QAClD,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;YACjC,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,CAAC;IACH,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,CAAC,CAAgB,EAAE,EAAE;YACnC,IAAI,CAAC,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACvB,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,CAAC;QACH,CAAC,CAAC;QACF,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAEtB,OAAO,CACL,8BACE,0BAAQ,WAAW,GAAS,EAC3B,MAAM,IAAI,CAET,cACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,mBAAmB,EAC7B,OAAO,EAAE,mBAAmB,GAC5B,CACH,EACD,cAAK,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,YACtD,QAAQ,GACL,IACL,CACJ,CAAC;AACJ,CAAC","sourcesContent":["import { type ReactNode, useEffect, useSyncExternalStore } from \"react\";\nimport { McpAppAdaptor } from \"../bridges/index.js\";\n\nconst modalStyles = `\n.sb-modal-backdrop {\n  position: fixed;\n  inset: 0;\n  background: rgba(0, 0, 0, 0.5);\n  z-index: 9998;\n}\n.sb-modal-container {\n  border-radius: 12px;\n  position: fixed;\n  inset: 0;\n  margin: auto;\n  width: fit-content;\n  height: fit-content;\n  background: white;\n  z-index: 9999;\n}\n`;\n\nexport function ModalProvider({ children }: { children: ReactNode }) {\n  const adaptor = McpAppAdaptor.getInstance();\n\n  const { mode } = useSyncExternalStore(\n    adaptor.getHostContextStore(\"display\").subscribe,\n    adaptor.getHostContextStore(\"display\").getSnapshot,\n  );\n  const isOpen = mode === \"modal\";\n\n  const handleBackdropClick = (e: React.MouseEvent) => {\n    if (e.target === e.currentTarget) {\n      adaptor.closeModal();\n    }\n  };\n\n  useEffect(() => {\n    if (!isOpen) {\n      return;\n    }\n    const handler = (e: KeyboardEvent) => {\n      if (e.key === \"Escape\") {\n        adaptor.closeModal();\n      }\n    };\n    document.addEventListener(\"keydown\", handler);\n    return () => document.removeEventListener(\"keydown\", handler);\n  }, [isOpen, adaptor]);\n\n  return (\n    <>\n      <style>{modalStyles}</style>\n      {isOpen && (\n        // biome-ignore lint/a11y/useKeyWithClickEvents: backdrop isn't focusable\n        <div\n          role=\"dialog\"\n          className=\"sb-modal-backdrop\"\n          onClick={handleBackdropClick}\n        />\n      )}\n      <div className={isOpen ? \"sb-modal-container\" : undefined}>\n        {children}\n      </div>\n    </>\n  );\n}\n"]}
+{"version":3,"file":"modal-provider.js","sourceRoot":"","sources":["../../../src/web/components/modal-provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAkB,SAAS,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;CAiBnB,CAAC;AAEF,MAAM,UAAU,aAAa,CAAC,EAAE,QAAQ,EAA2B;IACjE,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,oBAAoB,CACnC,YAAY,CAAC,SAAS,EACtB,YAAY,CAAC,WAAW,CACzB,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC;IAEhC,MAAM,mBAAmB,GAAG,CAAC,CAAmB,EAAE,EAAE;QAClD,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;YACjC,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,CAAC;IACH,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,CAAC,CAAgB,EAAE,EAAE;YACnC,IAAI,CAAC,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACvB,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,CAAC;QACH,CAAC,CAAC;QACF,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAEtB,OAAO,CACL,8BACE,0BAAQ,WAAW,GAAS,EAC3B,MAAM,IAAI,CAET,cACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,mBAAmB,EAC7B,OAAO,EAAE,mBAAmB,GAC5B,CACH,EACD,cAAK,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,YACtD,QAAQ,GACL,IACL,CACJ,CAAC;AACJ,CAAC","sourcesContent":["import { type ReactNode, useEffect, useSyncExternalStore } from \"react\";\nimport { getAdaptor } from \"../bridges/index.js\";\n\nconst modalStyles = `\n.sb-modal-backdrop {\n  position: fixed;\n  inset: 0;\n  background: rgba(0, 0, 0, 0.5);\n  z-index: 9998;\n}\n.sb-modal-container {\n  border-radius: 12px;\n  position: fixed;\n  inset: 0;\n  margin: auto;\n  width: fit-content;\n  height: fit-content;\n  background: white;\n  z-index: 9999;\n}\n`;\n\nexport function ModalProvider({ children }: { children: ReactNode }) {\n  const adaptor = getAdaptor();\n  const displayStore = adaptor.getHostContextStore(\"display\");\n  const { mode } = useSyncExternalStore(\n    displayStore.subscribe,\n    displayStore.getSnapshot,\n  );\n  const isOpen = mode === \"modal\";\n\n  const handleBackdropClick = (e: React.MouseEvent) => {\n    if (e.target === e.currentTarget) {\n      adaptor.closeModal();\n    }\n  };\n\n  useEffect(() => {\n    if (!isOpen) {\n      return;\n    }\n    const handler = (e: KeyboardEvent) => {\n      if (e.key === \"Escape\") {\n        adaptor.closeModal();\n      }\n    };\n    document.addEventListener(\"keydown\", handler);\n    return () => document.removeEventListener(\"keydown\", handler);\n  }, [isOpen, adaptor]);\n\n  return (\n    <>\n      <style>{modalStyles}</style>\n      {isOpen && (\n        // biome-ignore lint/a11y/useKeyWithClickEvents: backdrop isn't focusable\n        <div\n          role=\"dialog\"\n          className=\"sb-modal-backdrop\"\n          onClick={handleBackdropClick}\n        />\n      )}\n      <div className={isOpen ? \"sb-modal-container\" : undefined}>\n        {children}\n      </div>\n    </>\n  );\n}\n"]}

package/dist/web/create-store.test.js

@@ -1,12 +1,14 @@
 import { cleanup } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi, } from "vitest";
-import { McpAppAdaptor } from "./bridges/mcp-app/adaptor.js";
+import { HostAdaptor } from "./bridges/adaptor.js";
+import { getAdaptor } from "./bridges/get-adaptor.js";
 import { McpAppBridge } from "./bridges/mcp-app/bridge.js";
 import { createStore } from "./create-store.js";
 import { VIEW_CONTEXT_KEY } from "./data-llm.js";
 import { getMcpAppHostPostMessageMock, MockResizeObserver, } from "./hooks/test/utils.js";
 describe("createStore", () => {
     afterEach(() => {
+        HostAdaptor.resetInstance();
         vi.unstubAllGlobals();
         vi.resetAllMocks();
     });
@@ -78,16 +80,17 @@ describe("createStore", () => {
     });
     describe("mcp-app mode", () => {
         beforeEach(() => {
+            vi.stubGlobal("openai", undefined);
             vi.stubGlobal("skybridge", { hostType: "mcp-app" });
             vi.stubGlobal("ResizeObserver", MockResizeObserver);
         });
         afterEach(async () => {
             cleanup();
+            HostAdaptor.resetInstance();
             McpAppBridge.resetInstance();
-            McpAppAdaptor.resetInstance();
         });
         it("should initialize with null viewState", () => {
-            const adaptor = McpAppAdaptor.getInstance();
+            const adaptor = getAdaptor();
             const viewState = adaptor.getHostContextStore("viewState").getSnapshot();
             expect(viewState).toBeNull();
         });
@@ -99,7 +102,7 @@ describe("createStore", () => {
             expect(store.getState()).toEqual({ count: 0 });
         });
         it("should update in-memory state via setViewState", async () => {
-            const adaptor = McpAppAdaptor.getInstance();
+            const adaptor = getAdaptor();
             vi.spyOn(adaptor, "setViewState").mockResolvedValue(undefined);
             const storeCreator = (set) => ({
                 count: 0,
@@ -114,7 +117,7 @@ describe("createStore", () => {
         it("should notify listeners when view state changes", async () => {
             const postMessageMock = getMcpAppHostPostMessageMock();
             vi.stubGlobal("parent", { postMessage: postMessageMock });
-            const adaptor = McpAppAdaptor.getInstance();
+            const adaptor = getAdaptor();
             const listener = vi.fn();
             adaptor.getHostContextStore("viewState").subscribe(listener);
             await adaptor.setViewState({ count: 42 });