skybridge 0.0.0-dev.725d03d → 0.0.0-dev.72ef616

package/dist/src/web/generate-helpers.js

@@ -1,4 +1,4 @@
-import { useCallTool } from "./hooks/use-call-tool.js";
+import { useCallTool, } from "./hooks/use-call-tool.js";
 import { useToolInfo } from "./hooks/use-tool-info.js";
 /**
  * Creates typed versions of skybridge hooks with full type inference
@@ -7,7 +7,9 @@ import { useToolInfo } from "./hooks/use-tool-info.js";
  * This is the recommended way to use skybridge hooks in your widgets.
  * Set this up once in a dedicated file and export the typed hooks for use across your app.
  *
- * @typeParam ServerType - The type of your McpServer instance. Use `typeof server`.
+ * @typeParam ServerType - The type of your McpServer instance (use `typeof server`).
+ *                         Must be a server instance created with method chaining.
+ *                         TypeScript will validate that tools can be inferred from this type.
  *
  * @example
  * ```typescript
@@ -46,7 +48,7 @@ import { useToolInfo } from "./hooks/use-tool-info.js";
  *   const toolInfo = useToolInfo<"search-voyage">();
  *   //                              ^ autocomplete for widget names
  *   // toolInfo.input is typed based on widget input schema
- *   // toolInfo.output is typed based on widget output schema
+ *   // toolInfo.output.structuredContent is typed based on widget output schema
  * }
  * ```
  */
@@ -85,17 +87,19 @@ export function generateHelpers() {
          * ```typescript
          * const toolInfo = useToolInfo<"search-voyage">();
          * // toolInfo.input is typed as { destination: string; ... }
-         * // toolInfo.output is typed as { results: Array<...>; ... } | undefined
+         * // toolInfo.output is typed as { results: Array<...>; ... }
+         * // toolInfo.responseMetadata is typed based on _meta in callback return
          * // toolInfo.status narrows correctly: "pending" | "success"
          *
          * if (toolInfo.isPending) {
-         *   // TypeScript knows output is undefined here
+         *   // TypeScript knows output and responseMetadata are undefined here
          *   console.log(toolInfo.input.destination);
          * }
          *
          * if (toolInfo.isSuccess) {
-         *   // TypeScript knows output is defined here
+         *   // TypeScript knows output and responseMetadata are defined here
          *   console.log(toolInfo.output.results);
+         *   console.log(toolInfo.responseMetadata);
          * }
          * ```
          */

package/dist/src/web/generate-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-helpers.js","sourceRoot":"","sources":["../../../src/web/generate-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAsB,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAkB,MAAM,0BAA0B,CAAC;AAuBvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,MAAM,UAAU,eAAe;IAI7B,OAAO;QACL;;;;;;;;;;;;;;;;;;WAkBG;QACH,WAAW,EAAE,CACX,IAAc,EAC0E,EAAE;YAC1F,OAAO,WAAW,CAAC,IAAI,CAGtB,CAAC;QACJ,CAAC;QAED;;;;;;;;;;;;;;;;;;;;;;;;WAwBG;QACH,WAAW,EAAE,GAGX,EAAE;YACF,OAAO,WAAW,EAGjB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"generate-helpers.js","sourceRoot":"","sources":["../../../src/web/generate-helpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,WAAW,GACZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAkB,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAoBvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AACH,MAAM,UAAU,eAAe;IAI7B,OAAO;QACL;;;;;;;;;;;;;;;;;;WAkBG;QACH,WAAW,EAAE,CACX,IAAc,EAId,EAAE;YACF,OAAO,WAAW,CAAC,IAAI,CAGtB,CAAC;QACJ,CAAC;QAED;;;;;;;;;;;;;;;;;;;;;;;;;;WA0BG;QACH,WAAW,EAAE,GAIX,EAAE;YACF,OAAO,WAAW,EAIjB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/src/web/generate-helpers.test-d.js

@@ -1,7 +1,8 @@
 import { expectTypeOf, test } from "vitest";
+import { createInterfaceTestServer, createTestServer } from "../test/utils.js";
 import { generateHelpers } from "./generate-helpers.js";
-import { createTestServer } from "../test/utils.js";
 const server = createTestServer();
+const interfaceServer = createInterfaceTestServer();
 test("InferTools extracts the tool registry type (widgets + registerTool)", () => {
     expectTypeOf().toHaveProperty("search-voyage");
     expectTypeOf().toHaveProperty("get-trip-details");
@@ -9,6 +10,9 @@ test("InferTools extracts the tool registry type (widgets + registerTool)", () =
     expectTypeOf().toHaveProperty("calculate-price");
     expectTypeOf().toHaveProperty("inferred-output-widget");
     expectTypeOf().toHaveProperty("inferred-tool");
+    expectTypeOf().toHaveProperty("widget-with-metadata");
+    expectTypeOf().toHaveProperty("tool-with-metadata");
+    expectTypeOf().toHaveProperty("widget-with-mixed-returns");
 });
 test("ToolNames returns a union of tool name literals (widgets + registerTool)", () => {
     expectTypeOf().toEqualTypeOf();
@@ -36,6 +40,9 @@ test("generateHelpers provides autocomplete for tool names (widgets + registerTo
     useCallTool("calculate-price");
     useCallTool("inferred-output-widget");
     useCallTool("inferred-tool");
+    useCallTool("widget-with-metadata");
+    useCallTool("tool-with-metadata");
+    useCallTool("widget-with-mixed-returns");
     // @ts-expect-error - "invalid-name" is not a valid tool name
     useCallTool("invalid-name");
 });
@@ -48,6 +55,68 @@ test("useCallTool returns correctly typed callTool function", () => {
     const { callTool: calculateTool } = useCallTool("calculate-price");
     calculateTool({ tripId: "123", passengers: 2 });
 });
+test("callTool can be called without args for tools with no required inputs", () => {
+    const { useCallTool } = generateHelpers();
+    const { callTool, callToolAsync } = useCallTool("no-input-widget");
+    callTool();
+    callTool({});
+    callToolAsync();
+    callToolAsync({});
+});
+test("callTool requires args for tools with required inputs", () => {
+    const { useCallTool } = generateHelpers();
+    const { callTool } = useCallTool("search-voyage");
+    // @ts-expect-error - "destination" is required
+    callTool();
+    // @ts-expect-error - "destination" is required
+    callTool({});
+    // This should work
+    callTool({ destination: "Spain" });
+});
+test("callTool supports sideEffects for tools with required inputs", () => {
+    const { useCallTool } = generateHelpers();
+    const { callTool } = useCallTool("search-voyage");
+    callTool({ destination: "Spain" }, {
+        onSuccess: (response, args) => {
+            expectTypeOf(response.structuredContent.results).toBeArray();
+            expectTypeOf(args.destination).toBeString();
+        },
+        onError: (error, args) => {
+            expectTypeOf(error).toBeUnknown();
+            expectTypeOf(args.destination).toBeString();
+        },
+        onSettled: (response, error, args) => {
+            if (response) {
+                expectTypeOf(response.structuredContent.totalCount).toBeNumber();
+            }
+            expectTypeOf(error).toBeUnknown();
+            expectTypeOf(args.destination).toBeString();
+        },
+    });
+});
+test("callTool supports sideEffects for tools with no required inputs", () => {
+    const { useCallTool } = generateHelpers();
+    const { callTool } = useCallTool("no-input-widget");
+    callTool({
+        onSuccess: (response) => {
+            expectTypeOf(response).toHaveProperty("structuredContent");
+        },
+    });
+    callTool({}, {
+        onSuccess: (response) => {
+            expectTypeOf(response).toHaveProperty("structuredContent");
+        },
+    });
+});
+test("callToolAsync returns correctly typed promise", () => {
+    const { useCallTool } = generateHelpers();
+    const { callToolAsync: searchAsync } = useCallTool("search-voyage");
+    const searchPromise = searchAsync({ destination: "Spain" });
+    expectTypeOf(searchPromise).resolves.toHaveProperty("structuredContent");
+    const { callToolAsync: noInputAsync } = useCallTool("no-input-widget");
+    const noInputPromise = noInputAsync();
+    expectTypeOf(noInputPromise).resolves.toHaveProperty("structuredContent");
+});
 test("useCallTool returns correctly typed data", () => {
     const { useCallTool } = generateHelpers();
     const { data } = useCallTool("search-voyage");
@@ -76,15 +145,65 @@ test("generateHelpers provides autocomplete for tool names in useToolInfo (widge
     useToolInfo();
     useToolInfo();
     useToolInfo();
+    useToolInfo();
+    useToolInfo();
+    useToolInfo();
     // @ts-expect-error - "invalid-name" is not a valid tool name
     useToolInfo();
 });
 test("useToolInfo infers input and output types", () => {
     const { useToolInfo } = generateHelpers();
     const toolInfo = useToolInfo();
-    expectTypeOf(toolInfo.input).toExtend();
+    // Input is only available when not in idle state
+    if (!(toolInfo.status === "idle")) {
+        expectTypeOf(toolInfo.input).toExtend();
+    }
     if (toolInfo.status === "success") {
         expectTypeOf(toolInfo.output).toExtend();
+        expectTypeOf(toolInfo.output.results).toBeArray();
+        expectTypeOf(toolInfo.output.totalCount).toBeNumber();
+    }
+});
+test("ToolResponseMetadata extracts _meta type from callback", () => {
+    expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toBeUnknown();
+});
+test("useToolInfo infers responseMetadata type from generateHelpers", () => {
+    const { useToolInfo } = generateHelpers();
+    const toolInfo = useToolInfo();
+    if (toolInfo.isSuccess) {
+        expectTypeOf(toolInfo.responseMetadata.requestId).toBeString();
+        expectTypeOf(toolInfo.responseMetadata.timestamp).toBeNumber();
+        expectTypeOf(toolInfo.responseMetadata.cached).toBeBoolean();
+    }
+});
+test("ToolResponseMetadata extracts _meta from mixed return paths", () => {
+    expectTypeOf().toEqualTypeOf();
+});
+test("ToolOutput extracts correct type when using interface declaration", () => {
+    expectTypeOf().toHaveProperty("itemName");
+    expectTypeOf().toBeString();
+    expectTypeOf().toBeNumber();
+});
+test("ToolResponseMetadata extracts correct type when using interface declaration", () => {
+    expectTypeOf().toHaveProperty("processedBy");
+    expectTypeOf().toBeString();
+    expectTypeOf().toBeNumber();
+});
+test("generateHelpers works with interface-typed server", () => {
+    const { useCallTool, useToolInfo } = generateHelpers();
+    const { data } = useCallTool("interface-widget");
+    if (data) {
+        expectTypeOf(data.structuredContent.itemName).toBeString();
+        expectTypeOf(data.structuredContent.quantity).toBeNumber();
+    }
+    const toolInfo = useToolInfo();
+    if (toolInfo.isSuccess) {
+        expectTypeOf(toolInfo.output.itemName).toBeString();
+        expectTypeOf(toolInfo.output.quantity).toBeNumber();
+        expectTypeOf(toolInfo.responseMetadata.processedBy).toBeString();
+        expectTypeOf(toolInfo.responseMetadata.version).toBeNumber();
     }
 });
 //# sourceMappingURL=generate-helpers.test-d.js.map

package/dist/src/web/generate-helpers.test-d.js.map

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

package/dist/src/web/generate-helpers.test.js

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
-import { generateHelpers } from "./generate-helpers.js";
 import { createMinimalTestServer } from "../test/utils.js";
+import { generateHelpers } from "./generate-helpers.js";
 const server = createMinimalTestServer();
 describe("generateHelpers", () => {
     it("should return an object with useCallTool hook", () => {

package/dist/src/web/generate-helpers.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-helpers.test.js","sourceRoot":"","sources":["../../../src/web/generate-helpers.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,MAAM,GAAG,uBAAuB,EAAE,CAAC;AAGzC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,KAAK,GAAG,eAAe,EAAc,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,KAAK,GAAG,eAAe,EAAc,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"generate-helpers.test.js","sourceRoot":"","sources":["../../../src/web/generate-helpers.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,MAAM,GAAG,uBAAuB,EAAE,CAAC;AAGzC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,KAAK,GAAG,eAAe,EAAc,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,KAAK,GAAG,eAAe,EAAc,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/web/helpers/state.d.ts

@@ -0,0 +1,7 @@
+import { type SuperJSONResult } from "superjson";
+import type { UnknownObject } from "../types.js";
+export declare function filterWidgetContext<T extends UnknownObject>(state?: T | null): T | null;
+export declare function injectWidgetContext<T extends UnknownObject>(newState: T | null): T | null;
+export declare function serializeState(value: UnknownObject): unknown;
+export declare function deserializeState(value: SuperJSONResult): unknown;
+export declare function getInitialState<State extends UnknownObject>(defaultState?: State | (() => State)): State | null;

package/dist/src/web/helpers/state.js

@@ -0,0 +1,40 @@
+import superjson, {} from "superjson";
+import { WIDGET_CONTEXT_KEY } from "../data-llm.js";
+export function filterWidgetContext(state) {
+    if (state === null || state === undefined) {
+        return null;
+    }
+    const { [WIDGET_CONTEXT_KEY]: _, ...filteredState } = state;
+    return filteredState;
+}
+export function injectWidgetContext(newState) {
+    if (newState === null) {
+        return null;
+    }
+    const currentWindowState = window.openai?.widgetState;
+    if (currentWindowState !== null &&
+        currentWindowState !== undefined &&
+        WIDGET_CONTEXT_KEY in currentWindowState) {
+        return {
+            ...newState,
+            [WIDGET_CONTEXT_KEY]: currentWindowState[WIDGET_CONTEXT_KEY],
+        };
+    }
+    return newState;
+}
+export function serializeState(value) {
+    return superjson.parse(superjson.stringify(value)); // Strips functions
+}
+export function deserializeState(value) {
+    return superjson.deserialize(value);
+}
+export function getInitialState(defaultState) {
+    const widgetStateFromWindow = window.openai?.widgetState;
+    if (widgetStateFromWindow !== null && widgetStateFromWindow !== undefined) {
+        return filterWidgetContext(widgetStateFromWindow);
+    }
+    return typeof defaultState === "function"
+        ? defaultState()
+        : (defaultState ?? null);
+}
+//# sourceMappingURL=state.js.map

package/dist/src/web/helpers/state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/web/helpers/state.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,EAAE,EAAwB,MAAM,WAAW,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGpD,MAAM,UAAU,mBAAmB,CACjC,KAAgB;IAEhB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,KAErD,CAAC;IAEF,OAAO,aAAkB,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,QAAkB;IAElB,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,WAG7B,CAAC;IAEd,IACE,kBAAkB,KAAK,IAAI;QAC3B,kBAAkB,KAAK,SAAS;QAChC,kBAAkB,IAAI,kBAAkB,EACxC,CAAC;QACD,OAAO;YACL,GAAG,QAAQ;YACX,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;SACxD,CAAC;IACT,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAoB;IACjD,OAAO,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB;AACzE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAsB;IACrD,OAAO,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,YAAoC;IAEpC,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,WAGhC,CAAC;IAEd,IAAI,qBAAqB,KAAK,IAAI,IAAI,qBAAqB,KAAK,SAAS,EAAE,CAAC;QAC1E,OAAO,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;IACpD,CAAC;IAED,OAAO,OAAO,YAAY,KAAK,UAAU;QACvC,CAAC,CAAC,YAAY,EAAE;QAChB,CAAC,CAAC,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC;AAC7B,CAAC"}

package/dist/src/web/helpers/state.test.js

@@ -0,0 +1,53 @@
+import { describe, expect, it } from "vitest";
+import { WIDGET_CONTEXT_KEY } from "../data-llm.js";
+import { filterWidgetContext, serializeState } from "./state.js";
+describe("state helpers", () => {
+    describe("filterWidgetContext", () => {
+        it("should return null when state is null", () => {
+            expect(filterWidgetContext(null)).toBe(null);
+        });
+        it("should return null when state is undefined", () => {
+            expect(filterWidgetContext(undefined)).toBe(null);
+        });
+        it("should correctly filter WIDGET_CONTEXT_KEY and preserve other properties", () => {
+            const stateWithContextAndOthers = {
+                a: 1,
+                b: "two",
+                c: { nested: true },
+                [WIDGET_CONTEXT_KEY]: "context",
+            };
+            const filteredWithContextAndOthers = filterWidgetContext(stateWithContextAndOthers);
+            expect(filteredWithContextAndOthers).toEqual({
+                a: 1,
+                b: "two",
+                c: { nested: true },
+            });
+            const stateNoContext = { count: 5, name: "test" };
+            const filteredNoContext = filterWidgetContext(stateNoContext);
+            expect(filteredNoContext).toEqual(stateNoContext);
+        });
+    });
+    describe("serializeState", () => {
+        it("should serialize plain objects", () => {
+            const array = [1, "two", { three: 3 }];
+            const date = new Date("2023-01-01T00:00:00Z");
+            const object = {
+                a: 1,
+                b: "test",
+                c: true,
+                array,
+                date,
+                function: () => "test",
+            };
+            const result = serializeState(object);
+            expect(result).toEqual({
+                a: 1,
+                b: "test",
+                c: true,
+                array: [1, "two", { three: 3 }],
+                date: new Date("2023-01-01T00:00:00.000Z"),
+            });
+        });
+    });
+});
+//# sourceMappingURL=state.test.js.map

package/dist/src/web/helpers/state.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"state.test.js","sourceRoot":"","sources":["../../../../src/web/helpers/state.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjE,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YACpD,MAAM,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;YAClF,MAAM,yBAAyB,GAAG;gBAChC,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,KAAK;gBACR,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;gBACnB,CAAC,kBAAkB,CAAC,EAAE,SAAS;aAChC,CAAC;YACF,MAAM,4BAA4B,GAAG,mBAAmB,CACtD,yBAAyB,CAC1B,CAAC;YACF,MAAM,CAAC,4BAA4B,CAAC,CAAC,OAAO,CAAC;gBAC3C,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,KAAK;gBACR,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;aACpB,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAClD,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;YAC9D,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACxC,MAAM,KAAK,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YACvC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,sBAAsB,CAAC,CAAC;YAC9C,MAAM,MAAM,GAAG;gBACb,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,MAAM;gBACT,CAAC,EAAE,IAAI;gBACP,KAAK;gBACL,IAAI;gBACJ,QAAQ,EAAE,GAAG,EAAE,CAAC,MAAM;aACvB,CAAC;YACF,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;YAEtC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACrB,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,MAAM;gBACT,CAAC,EAAE,IAAI;gBACP,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;gBAC/B,IAAI,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC;aAC3C,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -1,14 +1,11 @@
-export { useCallTool } from "./use-call-tool.js";
+export { type CallToolAsyncFn, type CallToolFn, type CallToolState, type SideEffects, useCallTool, } from "./use-call-tool.js";
 export { useDisplayMode } from "./use-display-mode.js";
 export { useFiles } from "./use-files.js";
-export { useLocale } from "./use-locale.js";
-export { useOpenAiGlobal } from "./use-openai-global.js";
+export { type LayoutState, useLayout } from "./use-layout.js";
 export { useOpenExternal } from "./use-open-external.js";
+export { useOpenAiGlobal } from "./use-openai-global.js";
 export { useRequestModal } from "./use-request-modal.js";
 export { useSendFollowUpMessage } from "./use-send-follow-up-message.js";
-export { useTheme } from "./use-theme.js";
 export { useToolInfo } from "./use-tool-info.js";
-export { useToolOutput } from "./use-tool-output.js";
-export { useToolResponseMetadata } from "./use-tool-response-metadata.js";
-export { useUserAgent } from "./use-user-agent.js";
+export { type UserState, useUser } from "./use-user.js";
 export { useWidgetState } from "./use-widget-state.js";

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

@@ -1,15 +1,12 @@
-export { useCallTool } from "./use-call-tool.js";
+export { useCallTool, } from "./use-call-tool.js";
 export { useDisplayMode } from "./use-display-mode.js";
 export { useFiles } from "./use-files.js";
-export { useLocale } from "./use-locale.js";
-export { useOpenAiGlobal } from "./use-openai-global.js";
+export { useLayout } from "./use-layout.js";
 export { useOpenExternal } from "./use-open-external.js";
+export { useOpenAiGlobal } from "./use-openai-global.js";
 export { useRequestModal } from "./use-request-modal.js";
 export { useSendFollowUpMessage } from "./use-send-follow-up-message.js";
-export { useTheme } from "./use-theme.js";
 export { useToolInfo } from "./use-tool-info.js";
-export { useToolOutput } from "./use-tool-output.js";
-export { useToolResponseMetadata } from "./use-tool-response-metadata.js";
-export { useUserAgent } from "./use-user-agent.js";
+export { useUser } from "./use-user.js";
 export { useWidgetState } from "./use-widget-state.js";
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/web/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/web/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAoB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAkB,OAAO,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/src/web/hooks/test/utils.d.ts

@@ -0,0 +1,10 @@
+import type { McpUiInitializeRequest, McpUiToolResultNotification } from "@modelcontextprotocol/ext-apps";
+export declare const MCPAppHostPostMessageMock: import("vitest").Mock<(message: McpUiInitializeRequest & {
+    id: number;
+}) => void>;
+export declare const fireToolInputNotification: (args: Record<string, unknown>) => void;
+export declare const fireToolResultNotification: (params: {
+    content: McpUiToolResultNotification["params"]["content"];
+    structuredContent: Record<string, unknown>;
+    _meta?: Record<string, unknown>;
+}) => void;

package/dist/src/web/hooks/test/utils.js

@@ -0,0 +1,39 @@
+import { fireEvent } from "@testing-library/react";
+import { act } from "react";
+import { vi } from "vitest";
+const MOCK_HOST_INFO = {
+    protocolVersion: "2025-06-18",
+    hostInfo: { name: "test-host", version: "1.0.0" },
+    hostCapabilities: {},
+    hostContext: { theme: "light" },
+};
+export const MCPAppHostPostMessageMock = vi.fn((message) => {
+    act(() => fireEvent(window, new MessageEvent("message", {
+        data: {
+            jsonrpc: "2.0",
+            id: message.id,
+            result: MOCK_HOST_INFO,
+        },
+    })));
+});
+export const fireToolInputNotification = (args) => {
+    fireEvent(window, new MessageEvent("message", {
+        data: {
+            jsonrpc: "2.0",
+            method: "ui/notifications/tool-input",
+            params: {
+                arguments: args,
+            },
+        },
+    }));
+};
+export const fireToolResultNotification = (params) => {
+    fireEvent(window, new MessageEvent("message", {
+        data: {
+            jsonrpc: "2.0",
+            method: "ui/notifications/tool-result",
+            params,
+        },
+    }));
+};
+//# sourceMappingURL=utils.js.map

package/dist/src/web/hooks/test/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/web/hooks/test/utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE5B,MAAM,cAAc,GAA0B;IAC5C,eAAe,EAAE,YAAY;IAC7B,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE;IACjD,gBAAgB,EAAE,EAAE;IACpB,WAAW,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;CAChC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,CAAC,EAAE,CAC5C,CAAC,OAAgD,EAAE,EAAE;IACnD,GAAG,CAAC,GAAG,EAAE,CACP,SAAS,CACP,MAAM,EACN,IAAI,YAAY,CAIb,SAAS,EAAE;QACZ,IAAI,EAAE;YACJ,OAAO,EAAE,KAAK;YACd,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,MAAM,EAAE,cAAc;SACvB;KACF,CAAC,CACH,CACF,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,IAA6B,EAAE,EAAE;IACzE,SAAS,CACP,MAAM,EACN,IAAI,YAAY,CACd,SAAS,EACT;QACE,IAAI,EAAE;YACJ,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,6BAA6B;YACrC,MAAM,EAAE;gBACN,SAAS,EAAE,IAAI;aAChB;SACF;KACF,CACF,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,MAI1C,EAAE,EAAE;IACH,SAAS,CACP,MAAM,EACN,IAAI,YAAY,CACd,SAAS,EACT;QACE,IAAI,EAAE;YACJ,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,8BAA8B;YACtC,MAAM;SACP;KACF,CACF,CACF,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/web/hooks/use-call-tool.d.ts

@@ -1,4 +1,4 @@
-import type { CallToolArgs, CallToolResponse } from "../types.js";
+import type { CallToolArgs, CallToolResponse, HasRequiredKeys } from "../types.js";
 type CallToolIdleState = {
     status: "idle";
     isIdle: true;
@@ -36,18 +36,28 @@ type CallToolErrorState = {
     error: unknown;
 };
 export type CallToolState<TData extends CallToolResponse = CallToolResponse> = CallToolIdleState | CallToolPendingState | CallToolSuccessState<TData> | CallToolErrorState;
-type SideEffects<ToolArgs, ToolResponse> = {
+export type SideEffects<ToolArgs, ToolResponse> = {
     onSuccess?: (data: ToolResponse, toolArgs: ToolArgs) => void;
     onError?: (error: unknown, toolArgs: ToolArgs) => void;
     onSettled?: (data: ToolResponse | undefined, error: unknown | undefined, toolArgs: ToolArgs) => void;
 };
-type CallToolAsyncFn<ToolArgs, ToolResponse> = ToolArgs extends null ? () => Promise<ToolResponse> : (toolArgs: ToolArgs) => Promise<ToolResponse>;
+type IsArgsOptional<T> = [T] extends [null] ? true : HasRequiredKeys<T> extends false ? true : false;
+export type CallToolFn<TArgs, TResponse> = IsArgsOptional<TArgs> extends true ? {
+    (): void;
+    (sideEffects: SideEffects<TArgs, TResponse>): void;
+    (args: TArgs): void;
+    (args: TArgs, sideEffects: SideEffects<TArgs, TResponse>): void;
+} : {
+    (args: TArgs): void;
+    (args: TArgs, sideEffects: SideEffects<TArgs, TResponse>): void;
+};
+export type CallToolAsyncFn<TArgs, TResponse> = IsArgsOptional<TArgs> extends true ? {
+    (): Promise<TResponse>;
+    (args: TArgs): Promise<TResponse>;
+} : (args: TArgs) => Promise<TResponse>;
 type ToolResponseSignature = Pick<CallToolResponse, "structuredContent" | "meta">;
-export declare const useCallTool: <ToolArgs extends CallToolArgs = null, ToolResponse extends Partial<ToolResponseSignature> = {}>(name: string) => {
-    callTool: {
-        (sideEffects?: SideEffects<ToolArgs, CallToolResponse & ToolResponse>): void;
-        (toolArgs: ToolArgs, sideEffects?: SideEffects<ToolArgs, CallToolResponse & ToolResponse>): void;
-    };
+export declare const useCallTool: <ToolArgs extends CallToolArgs = null, ToolResponse extends Partial<ToolResponseSignature> = Record<string, never>>(name: string) => {
+    callTool: CallToolFn<ToolArgs, CallToolResponse & ToolResponse>;
     callToolAsync: CallToolAsyncFn<ToolArgs, CallToolResponse & ToolResponse>;
     status: "idle";
     isIdle: true;
@@ -57,10 +67,7 @@ export declare const useCallTool: <ToolArgs extends CallToolArgs = null, ToolRes
     data: undefined;
     error: undefined;
 } | {
-    callTool: {
-        (sideEffects?: SideEffects<ToolArgs, CallToolResponse & ToolResponse>): void;
-        (toolArgs: ToolArgs, sideEffects?: SideEffects<ToolArgs, CallToolResponse & ToolResponse>): void;
-    };
+    callTool: CallToolFn<ToolArgs, CallToolResponse & ToolResponse>;
     callToolAsync: CallToolAsyncFn<ToolArgs, CallToolResponse & ToolResponse>;
     status: "pending";
     isIdle: false;
@@ -70,10 +77,7 @@ export declare const useCallTool: <ToolArgs extends CallToolArgs = null, ToolRes
     data: undefined;
     error: undefined;
 } | {
-    callTool: {
-        (sideEffects?: SideEffects<ToolArgs, CallToolResponse & ToolResponse>): void;
-        (toolArgs: ToolArgs, sideEffects?: SideEffects<ToolArgs, CallToolResponse & ToolResponse>): void;
-    };
+    callTool: CallToolFn<ToolArgs, CallToolResponse & ToolResponse>;
     callToolAsync: CallToolAsyncFn<ToolArgs, CallToolResponse & ToolResponse>;
     status: "error";
     isIdle: false;
@@ -83,10 +87,7 @@ export declare const useCallTool: <ToolArgs extends CallToolArgs = null, ToolRes
     data: undefined;
     error: unknown;
 } | {
-    callTool: {
-        (sideEffects?: SideEffects<ToolArgs, CallToolResponse & ToolResponse>): void;
-        (toolArgs: ToolArgs, sideEffects?: SideEffects<ToolArgs, CallToolResponse & ToolResponse>): void;
-    };
+    callTool: CallToolFn<ToolArgs, CallToolResponse & ToolResponse>;
     callToolAsync: CallToolAsyncFn<ToolArgs, CallToolResponse & ToolResponse>;
     status: "success";
     isIdle: false;

package/dist/src/web/hooks/use-call-tool.js

@@ -1,25 +1,33 @@
-import { useState } from "react";
+import { useRef, useState } from "react";
+import { getBridgeMethods } from "../bridges/get-bridge-methods.js";
 export const useCallTool = (name) => {
     const [{ status, data, error }, setCallToolState] = useState({ status: "idle", data: undefined, error: undefined });
+    const callIdRef = useRef(0);
     const execute = async (toolArgs) => {
+        const callId = ++callIdRef.current;
         setCallToolState({ status: "pending", data: undefined, error: undefined });
+        const { callTool } = getBridgeMethods();
         try {
-            const data = await window.openai.callTool(name, toolArgs);
-            setCallToolState({ status: "success", data, error: undefined });
+            const data = await callTool(name, toolArgs);
+            if (callId === callIdRef.current) {
+                setCallToolState({ status: "success", data, error: undefined });
+            }
             return data;
         }
         catch (error) {
-            setCallToolState({ status: "error", data: undefined, error });
+            if (callId === callIdRef.current) {
+                setCallToolState({ status: "error", data: undefined, error });
+            }
             throw error;
         }
     };
-    const callToolAsync = (async (toolArgs) => {
+    const callToolAsync = ((toolArgs) => {
         if (toolArgs === undefined) {
             return execute(null);
         }
         return execute(toolArgs);
     });
-    function callTool(firstArg, sideEffects) {
+    const callTool = ((firstArg, sideEffects) => {
         let toolArgs;
         if (firstArg &&
             typeof firstArg === "object" &&
@@ -34,22 +42,14 @@ export const useCallTool = (name) => {
         }
         execute(toolArgs)
             .then((data) => {
-            if (sideEffects?.onSuccess) {
-                sideEffects.onSuccess(data, toolArgs);
-            }
-            if (sideEffects?.onSettled) {
-                sideEffects.onSettled(data, undefined, toolArgs);
-            }
+            sideEffects?.onSuccess?.(data, toolArgs);
+            sideEffects?.onSettled?.(data, undefined, toolArgs);
         })
             .catch((error) => {
-            if (sideEffects?.onError) {
-                sideEffects.onError(error, toolArgs);
-            }
-            if (sideEffects?.onSettled) {
-                sideEffects.onSettled(undefined, error, toolArgs);
-            }
+            sideEffects?.onError?.(error, toolArgs);
+            sideEffects?.onSettled?.(undefined, error, toolArgs);
         });
-    }
+    });
     const callToolState = {
         status,
         data,