skybridge 0.0.0-dev.a664594 → 0.0.0-dev.a6e5f63

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 import { App } from "@modelcontextprotocol/ext-apps";
-import type { Implementation } from "@modelcontextprotocol/sdk/types.js";
-import type { Bridge, Subscribe } from "../types.js";
+import { type Implementation } from "@modelcontextprotocol/sdk/types.js";
+import type { AnyViewToolHandler, Bridge, HostContextStore, Subscribe, ViewToolConfig } from "../types.js";
 import type { McpAppContext, McpAppContextKey } from "./types.js";
 /** @internal Singleton bridge over the `ext-apps` JSON-RPC App connection. Used by `HostAdaptor`. */
 export declare class McpAppBridge implements Bridge<McpAppContext> {
@@ -14,12 +14,24 @@ export declare class McpAppBridge implements Bridge<McpAppContext> {
     });
     private connect;
     getApp(): Promise<App>;
+    registerViewTool(config: ViewToolConfig, handler: AnyViewToolHandler): () => void;
     static getInstance(options?: Partial<{
         appInfo: Implementation;
     }>): McpAppBridge;
     subscribe(key: McpAppContextKey): Subscribe;
     subscribe(keys: readonly McpAppContextKey[]): Subscribe;
     getSnapshot<K extends keyof McpAppContext>(key: K): McpAppContext[K];
+    createContextStores(): {
+        theme: HostContextStore<"theme">;
+        locale: HostContextStore<"locale">;
+        safeArea: HostContextStore<"safeArea">;
+        displayMode: HostContextStore<"displayMode">;
+        maxHeight: HostContextStore<"maxHeight">;
+        userAgent: HostContextStore<"userAgent">;
+        toolInput: HostContextStore<"toolInput">;
+        toolOutput: HostContextStore<"toolOutput">;
+        toolResponseMetadata: HostContextStore<"toolResponseMetadata">;
+    };
     cleanup: () => void;
     static resetInstance(): void;
     private emit;

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

@@ -1,4 +1,22 @@
 import { App } from "@modelcontextprotocol/ext-apps";
+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;
@@ -6,12 +24,16 @@ export class McpAppBridge {
         toolInput: null,
         toolCancelled: null,
         toolResult: null,
+        hostInfo: null,
     };
     listeners = new Map();
     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 ?? {} });
         };
@@ -33,9 +55,10 @@ export class McpAppBridge {
         try {
             await this.app.connect();
             const hostContext = this.app.getHostContext();
-            if (hostContext) {
-                this.updateContext(hostContext);
-            }
+            this.updateContext({
+                ...hostContext,
+                hostInfo: this.app.getHostVersion() ?? null,
+            });
         }
         catch (err) {
             console.error(err);
@@ -45,6 +68,22 @@ 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 (McpAppBridge.instance && options) {
             console.warn("McpAppBridge.getInstance: options ignored, instance already exists");
@@ -76,6 +115,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 `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);\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 (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    hostInfo: 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      this.updateContext({\n        ...hostContext,\n        hostInfo: this.app.getHostVersion() ?? null,\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.js

@@ -9,13 +9,9 @@ describe("McpAppBridge.getInstance", () => {
         vi.unstubAllGlobals();
         McpAppBridge.resetInstance();
     });
-    it("instantiates when hostType is apps-sdk", () => {
+    it("instantiates regardless of injected hostType", () => {
         vi.stubGlobal("skybridge", { hostType: "apps-sdk" });
         expect(() => McpAppBridge.getInstance()).not.toThrow();
     });
-    it("instantiates when hostType is mcp-app", () => {
-        vi.stubGlobal("skybridge", { hostType: "mcp-app" });
-        expect(() => McpAppBridge.getInstance()).not.toThrow();
-    });
 });
 //# sourceMappingURL=bridge.test.js.map

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

@@ -1 +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,wCAAwC,EAAE,GAAG,EAAE;QAChD,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;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;QACpD,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 when hostType is apps-sdk\", () => {\n    vi.stubGlobal(\"skybridge\", { hostType: \"apps-sdk\" });\n    expect(() => McpAppBridge.getInstance()).not.toThrow();\n  });\n\n  it(\"instantiates when hostType is mcp-app\", () => {\n    vi.stubGlobal(\"skybridge\", { hostType: \"mcp-app\" });\n    expect(() => McpAppBridge.getInstance()).not.toThrow();\n  });\n});\n"]}
+{"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/types.d.ts

@@ -1,8 +1,10 @@
 import type { McpUiHostContext, McpUiToolCancelledNotification, McpUiToolInputNotification, McpUiToolResultNotification } from "@modelcontextprotocol/ext-apps";
+import type { Implementation } from "@modelcontextprotocol/sdk/types.js";
 export type McpToolState = {
     toolInput: NonNullable<McpUiToolInputNotification["params"]["arguments"]> | null;
     toolResult: McpUiToolResultNotification["params"] | null;
     toolCancelled: McpUiToolCancelledNotification["params"] | null;
+    hostInfo: Implementation | null;
 };
 export type McpAppContext = McpUiHostContext & McpToolState;
 export type McpAppContextKey = keyof McpAppContext;

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/web/bridges/mcp-app/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  McpUiHostContext,\n  McpUiToolCancelledNotification,\n  McpUiToolInputNotification,\n  McpUiToolResultNotification,\n} from \"@modelcontextprotocol/ext-apps\";\n\nexport type McpToolState = {\n  toolInput: NonNullable<\n    McpUiToolInputNotification[\"params\"][\"arguments\"]\n  > | null;\n  toolResult: McpUiToolResultNotification[\"params\"] | null;\n  toolCancelled: McpUiToolCancelledNotification[\"params\"] | null;\n};\n\nexport type McpAppContext = McpUiHostContext & McpToolState;\n\nexport type McpAppContextKey = keyof McpAppContext;\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/web/bridges/mcp-app/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  McpUiHostContext,\n  McpUiToolCancelledNotification,\n  McpUiToolInputNotification,\n  McpUiToolResultNotification,\n} from \"@modelcontextprotocol/ext-apps\";\nimport type { Implementation } from \"@modelcontextprotocol/sdk/types.js\";\n\nexport type McpToolState = {\n  toolInput: NonNullable<\n    McpUiToolInputNotification[\"params\"][\"arguments\"]\n  > | null;\n  toolResult: McpUiToolResultNotification[\"params\"] | null;\n  toolCancelled: McpUiToolCancelledNotification[\"params\"] | null;\n  hostInfo: Implementation | null;\n};\n\nexport type McpAppContext = McpUiHostContext & McpToolState;\n\nexport type McpAppContextKey = keyof McpAppContext;\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,12 +200,8 @@ export interface Adaptor {
     selectFiles(): Promise<FileMetadata[]>;
     openModal(options: RequestModalOptions): void;
     setOpenInAppUrl(href: string): Promise<void>;
-    /**
-     * Close a modal opened via {@link Adaptor.openModal}. In the Apps SDK
-     * runtime this is a no-op (the host owns modal lifecycle). In the MCP App
-     * runtime it dismisses the in-iframe polyfill.
-     */
     closeModal(): void;
+    registerViewTool(config: ViewToolConfig, handler: AnyViewToolHandler): () => void;
 }
 /**
  * Thrown when a host bridge method is called in a runtime that doesn't