skybridge 0.0.0-dev.e4c9359 → 0.0.0-dev.e50416a

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

@@ -0,0 +1,146 @@
+import { type CallToolArgs, type CallToolResponse } from "../bridges/index.js";
+import type { HasRequiredKeys } from "../types.js";
+type CallToolIdleState = {
+    status: "idle";
+    isIdle: true;
+    isPending: false;
+    isSuccess: false;
+    isError: false;
+    data: undefined;
+    error: undefined;
+};
+type CallToolPendingState = {
+    status: "pending";
+    isIdle: false;
+    isPending: true;
+    isSuccess: false;
+    isError: false;
+    data: undefined;
+    error: undefined;
+};
+type CallToolSuccessState<TData extends CallToolResponse = CallToolResponse> = {
+    status: "success";
+    isIdle: false;
+    isPending: false;
+    isSuccess: true;
+    isError: false;
+    data: TData;
+    error: undefined;
+};
+type CallToolErrorState = {
+    status: "error";
+    isIdle: false;
+    isPending: false;
+    isSuccess: false;
+    isError: true;
+    data: undefined;
+    error: unknown;
+};
+/**
+ * State of a {@link useCallTool} invocation, discriminated by `status`.
+ * Use `isIdle` / `isPending` / `isSuccess` / `isError` for ergonomic conditional rendering.
+ */
+export type CallToolState<TData extends CallToolResponse = CallToolResponse> = CallToolIdleState | CallToolPendingState | CallToolSuccessState<TData> | CallToolErrorState;
+/**
+ * Optional callbacks fired around a {@link useCallTool} call.
+ * `onSettled` runs after success or error.
+ */
+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 IsArgsOptional<T> = [T] extends [null] ? true : HasRequiredKeys<T> extends false ? true : false;
+/**
+ * Fire-and-forget call function returned by {@link useCallTool}. Tracks state
+ * on the hook and supports optional {@link SideEffects} callbacks. Args are
+ * optional when the tool accepts none.
+ */
+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;
+};
+/**
+ * Promise-returning call function returned by {@link useCallTool}. Rejects
+ * if the tool errors; use `try/catch` for error handling.
+ */
+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">;
+/**
+ * Call a server tool from a view and track its execution state.
+ *
+ * Returns the current {@link CallToolState} plus two callers: `callTool`
+ * (fire-and-forget, with optional {@link SideEffects}) and `callToolAsync`
+ * (promise-returning). If the same instance is invoked again while a call is
+ * in flight, the older response is dropped from the rendered state (but any
+ * `onSuccess` / `onError` / `onSettled` callbacks attached to it still fire).
+ *
+ * Pair with {@link useToolInfo} to read the result of the tool invocation
+ * that produced the current view. For end-to-end type safety across tool
+ * inputs and outputs, prefer the typed helpers produced by {@link generateHelpers}
+ * over calling this hook directly.
+ *
+ * @typeParam ToolArgs - Shape of the tool's input args (`null` for no-arg tools).
+ * @typeParam ToolResponse - Shape of the tool's `structuredContent` / `meta`.
+ *
+ * @example
+ * ```tsx
+ * const { callTool, isPending, data } = useCallTool<{ query: string }>("search");
+ *
+ * <button onClick={() => callTool({ query: "skybridge" }, {
+ *   onSuccess: (res) => console.log(res.structuredContent),
+ * })} />
+ * ```
+ *
+ * @see https://docs.skybridge.tech/api-reference/use-call-tool
+ */
+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;
+    isPending: false;
+    isSuccess: false;
+    isError: false;
+    data: undefined;
+    error: undefined;
+} | {
+    callTool: CallToolFn<ToolArgs, CallToolResponse & ToolResponse>;
+    callToolAsync: CallToolAsyncFn<ToolArgs, CallToolResponse & ToolResponse>;
+    status: "pending";
+    isIdle: false;
+    isPending: true;
+    isSuccess: false;
+    isError: false;
+    data: undefined;
+    error: undefined;
+} | {
+    callTool: CallToolFn<ToolArgs, CallToolResponse & ToolResponse>;
+    callToolAsync: CallToolAsyncFn<ToolArgs, CallToolResponse & ToolResponse>;
+    status: "error";
+    isIdle: false;
+    isPending: false;
+    isSuccess: false;
+    isError: true;
+    data: undefined;
+    error: unknown;
+} | {
+    callTool: CallToolFn<ToolArgs, CallToolResponse & ToolResponse>;
+    callToolAsync: CallToolAsyncFn<ToolArgs, CallToolResponse & ToolResponse>;
+    status: "success";
+    isIdle: false;
+    isPending: false;
+    isSuccess: true;
+    isError: false;
+    data: CallToolResponse & ToolResponse;
+    error: undefined;
+};
+export {};

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

@@ -0,0 +1,96 @@
+import { useRef, useState } from "react";
+import { getAdaptor, } from "../bridges/index.js";
+/**
+ * Call a server tool from a view and track its execution state.
+ *
+ * Returns the current {@link CallToolState} plus two callers: `callTool`
+ * (fire-and-forget, with optional {@link SideEffects}) and `callToolAsync`
+ * (promise-returning). If the same instance is invoked again while a call is
+ * in flight, the older response is dropped from the rendered state (but any
+ * `onSuccess` / `onError` / `onSettled` callbacks attached to it still fire).
+ *
+ * Pair with {@link useToolInfo} to read the result of the tool invocation
+ * that produced the current view. For end-to-end type safety across tool
+ * inputs and outputs, prefer the typed helpers produced by {@link generateHelpers}
+ * over calling this hook directly.
+ *
+ * @typeParam ToolArgs - Shape of the tool's input args (`null` for no-arg tools).
+ * @typeParam ToolResponse - Shape of the tool's `structuredContent` / `meta`.
+ *
+ * @example
+ * ```tsx
+ * const { callTool, isPending, data } = useCallTool<{ query: string }>("search");
+ *
+ * <button onClick={() => callTool({ query: "skybridge" }, {
+ *   onSuccess: (res) => console.log(res.structuredContent),
+ * })} />
+ * ```
+ *
+ * @see https://docs.skybridge.tech/api-reference/use-call-tool
+ */
+export const useCallTool = (name) => {
+    const [{ status, data, error }, setCallToolState] = useState({ status: "idle", data: undefined, error: undefined });
+    const callIdRef = useRef(0);
+    const adaptor = getAdaptor();
+    const execute = async (toolArgs) => {
+        const callId = ++callIdRef.current;
+        setCallToolState({ status: "pending", data: undefined, error: undefined });
+        try {
+            const data = await adaptor.callTool(name, toolArgs);
+            if (callId === callIdRef.current) {
+                setCallToolState({ status: "success", data, error: undefined });
+            }
+            return data;
+        }
+        catch (error) {
+            if (callId === callIdRef.current) {
+                setCallToolState({ status: "error", data: undefined, error });
+            }
+            throw error;
+        }
+    };
+    const callToolAsync = ((toolArgs) => {
+        if (toolArgs === undefined) {
+            return execute(null);
+        }
+        return execute(toolArgs);
+    });
+    const callTool = ((firstArg, sideEffects) => {
+        let toolArgs;
+        if (firstArg &&
+            typeof firstArg === "object" &&
+            ("onSuccess" in firstArg ||
+                "onError" in firstArg ||
+                "onSettled" in firstArg)) {
+            toolArgs = null; // no toolArgs provided
+            sideEffects = firstArg;
+        }
+        else {
+            toolArgs = (firstArg === undefined ? null : firstArg);
+        }
+        execute(toolArgs)
+            .then((data) => {
+            sideEffects?.onSuccess?.(data, toolArgs);
+            sideEffects?.onSettled?.(data, undefined, toolArgs);
+        })
+            .catch((error) => {
+            sideEffects?.onError?.(error, toolArgs);
+            sideEffects?.onSettled?.(undefined, error, toolArgs);
+        });
+    });
+    const callToolState = {
+        status,
+        data,
+        error,
+        isIdle: status === "idle",
+        isPending: status === "pending",
+        isSuccess: status === "success",
+        isError: status === "error",
+    };
+    return {
+        ...callToolState,
+        callTool,
+        callToolAsync,
+    };
+};
+//# sourceMappingURL=use-call-tool.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"use-call-tool.js","sourceRoot":"","sources":["../../../src/web/hooks/use-call-tool.ts"],"names":[],"mappings":"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","sourcesContent":["import { useRef, useState } from \"react\";\n\nimport {\n  type CallToolArgs,\n  type CallToolResponse,\n  getAdaptor,\n} from \"../bridges/index.js\";\nimport type { HasRequiredKeys } from \"../types.js\";\n\ntype CallToolIdleState = {\n  status: \"idle\";\n  isIdle: true;\n  isPending: false;\n  isSuccess: false;\n  isError: false;\n  data: undefined;\n  error: undefined;\n};\n\ntype CallToolPendingState = {\n  status: \"pending\";\n  isIdle: false;\n  isPending: true;\n  isSuccess: false;\n  isError: false;\n  data: undefined;\n  error: undefined;\n};\n\ntype CallToolSuccessState<TData extends CallToolResponse = CallToolResponse> = {\n  status: \"success\";\n  isIdle: false;\n  isPending: false;\n  isSuccess: true;\n  isError: false;\n  data: TData;\n  error: undefined;\n};\n\ntype CallToolErrorState = {\n  status: \"error\";\n  isIdle: false;\n  isPending: false;\n  isSuccess: false;\n  isError: true;\n  data: undefined;\n  error: unknown;\n};\n\n/**\n * State of a {@link useCallTool} invocation, discriminated by `status`.\n * Use `isIdle` / `isPending` / `isSuccess` / `isError` for ergonomic conditional rendering.\n */\nexport type CallToolState<TData extends CallToolResponse = CallToolResponse> =\n  | CallToolIdleState\n  | CallToolPendingState\n  | CallToolSuccessState<TData>\n  | CallToolErrorState;\n\n/**\n * Optional callbacks fired around a {@link useCallTool} call.\n * `onSettled` runs after success or error.\n */\nexport type SideEffects<ToolArgs, ToolResponse> = {\n  onSuccess?: (data: ToolResponse, toolArgs: ToolArgs) => void;\n  onError?: (error: unknown, toolArgs: ToolArgs) => void;\n  onSettled?: (\n    data: ToolResponse | undefined,\n    error: unknown | undefined,\n    toolArgs: ToolArgs,\n  ) => void;\n};\n\ntype IsArgsOptional<T> = [T] extends [null]\n  ? true\n  : HasRequiredKeys<T> extends false\n    ? true\n    : false;\n\n/**\n * Fire-and-forget call function returned by {@link useCallTool}. Tracks state\n * on the hook and supports optional {@link SideEffects} callbacks. Args are\n * optional when the tool accepts none.\n */\nexport type CallToolFn<TArgs, TResponse> =\n  IsArgsOptional<TArgs> extends true\n    ? {\n        (): void;\n        (sideEffects: SideEffects<TArgs, TResponse>): void;\n        (args: TArgs): void;\n        (args: TArgs, sideEffects: SideEffects<TArgs, TResponse>): void;\n      }\n    : {\n        (args: TArgs): void;\n        (args: TArgs, sideEffects: SideEffects<TArgs, TResponse>): void;\n      };\n\n/**\n * Promise-returning call function returned by {@link useCallTool}. Rejects\n * if the tool errors; use `try/catch` for error handling.\n */\nexport type CallToolAsyncFn<TArgs, TResponse> =\n  IsArgsOptional<TArgs> extends true\n    ? {\n        (): Promise<TResponse>;\n        (args: TArgs): Promise<TResponse>;\n      }\n    : (args: TArgs) => Promise<TResponse>;\n\ntype ToolResponseSignature = Pick<\n  CallToolResponse,\n  \"structuredContent\" | \"meta\"\n>;\n\n/**\n * Call a server tool from a view and track its execution state.\n *\n * Returns the current {@link CallToolState} plus two callers: `callTool`\n * (fire-and-forget, with optional {@link SideEffects}) and `callToolAsync`\n * (promise-returning). If the same instance is invoked again while a call is\n * in flight, the older response is dropped from the rendered state (but any\n * `onSuccess` / `onError` / `onSettled` callbacks attached to it still fire).\n *\n * Pair with {@link useToolInfo} to read the result of the tool invocation\n * that produced the current view. For end-to-end type safety across tool\n * inputs and outputs, prefer the typed helpers produced by {@link generateHelpers}\n * over calling this hook directly.\n *\n * @typeParam ToolArgs - Shape of the tool's input args (`null` for no-arg tools).\n * @typeParam ToolResponse - Shape of the tool's `structuredContent` / `meta`.\n *\n * @example\n * ```tsx\n * const { callTool, isPending, data } = useCallTool<{ query: string }>(\"search\");\n *\n * <button onClick={() => callTool({ query: \"skybridge\" }, {\n *   onSuccess: (res) => console.log(res.structuredContent),\n * })} />\n * ```\n *\n * @see https://docs.skybridge.tech/api-reference/use-call-tool\n */\nexport const useCallTool = <\n  ToolArgs extends CallToolArgs = null,\n  ToolResponse extends Partial<ToolResponseSignature> = Record<string, never>,\n>(\n  name: string,\n) => {\n  type CombinedCallToolResponse = CallToolResponse & ToolResponse;\n\n  const [{ status, data, error }, setCallToolState] = useState<\n    Omit<\n      CallToolState<CombinedCallToolResponse>,\n      \"isIdle\" | \"isPending\" | \"isSuccess\" | \"isError\"\n    >\n  >({ status: \"idle\", data: undefined, error: undefined });\n\n  const callIdRef = useRef(0);\n  const adaptor = getAdaptor();\n\n  const execute = async (\n    toolArgs: ToolArgs,\n  ): Promise<CombinedCallToolResponse> => {\n    const callId = ++callIdRef.current;\n    setCallToolState({ status: \"pending\", data: undefined, error: undefined });\n\n    try {\n      const data = await adaptor.callTool<ToolArgs, CombinedCallToolResponse>(\n        name,\n        toolArgs,\n      );\n      if (callId === callIdRef.current) {\n        setCallToolState({ status: \"success\", data, error: undefined });\n      }\n\n      return data;\n    } catch (error) {\n      if (callId === callIdRef.current) {\n        setCallToolState({ status: \"error\", data: undefined, error });\n      }\n      throw error;\n    }\n  };\n\n  const callToolAsync = ((toolArgs?: ToolArgs) => {\n    if (toolArgs === undefined) {\n      return execute(null as ToolArgs);\n    }\n    return execute(toolArgs);\n  }) as CallToolAsyncFn<ToolArgs, CombinedCallToolResponse>;\n\n  const callTool = ((\n    firstArg?: ToolArgs | SideEffects<ToolArgs, CombinedCallToolResponse>,\n    sideEffects?: SideEffects<ToolArgs, CombinedCallToolResponse>,\n  ) => {\n    let toolArgs: ToolArgs;\n    if (\n      firstArg &&\n      typeof firstArg === \"object\" &&\n      (\"onSuccess\" in firstArg ||\n        \"onError\" in firstArg ||\n        \"onSettled\" in firstArg)\n    ) {\n      toolArgs = null as ToolArgs; // no toolArgs provided\n      sideEffects = firstArg;\n    } else {\n      toolArgs = (firstArg === undefined ? null : firstArg) as ToolArgs;\n    }\n\n    execute(toolArgs)\n      .then((data) => {\n        sideEffects?.onSuccess?.(data, toolArgs);\n        sideEffects?.onSettled?.(data, undefined, toolArgs);\n      })\n      .catch((error) => {\n        sideEffects?.onError?.(error, toolArgs);\n        sideEffects?.onSettled?.(undefined, error, toolArgs);\n      });\n  }) as CallToolFn<ToolArgs, CombinedCallToolResponse>;\n\n  const callToolState = {\n    status,\n    data,\n    error,\n    isIdle: status === \"idle\",\n    isPending: status === \"pending\",\n    isSuccess: status === \"success\",\n    isError: status === \"error\",\n  } as CallToolState<CombinedCallToolResponse>;\n\n  return {\n    ...callToolState,\n    callTool,\n    callToolAsync,\n  };\n};\n"]}

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

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

package/dist/web/hooks/use-call-tool.test-d.js

@@ -0,0 +1,104 @@
+import { expectTypeOf, test } from "vitest";
+import { useCallTool, } from "./use-call-tool.js";
+test("callTool can be called without args when ToolArgs is null", () => {
+    const { callTool, callToolAsync } = useCallTool("test-tool");
+    callTool();
+    callTool({ onSuccess: () => { } });
+    callToolAsync();
+});
+test("callTool requires args when ToolArgs has required properties", () => {
+    const { callTool, callToolAsync } = useCallTool("test-tool");
+    // @ts-expect-error - query is required
+    callTool();
+    callTool({ query: "test" });
+    callTool({ query: "test" }, { onSuccess: () => { } });
+    // @ts-expect-error - query is required
+    callToolAsync();
+    callToolAsync({ query: "test" });
+});
+test("callTool supports sideEffects with correct types", () => {
+    const { callTool } = useCallTool("test-tool");
+    callTool({ id: 1 }, {
+        onSuccess: (data, args) => {
+            expectTypeOf(data.structuredContent.result).toBeString();
+            expectTypeOf(args.id).toBeNumber();
+        },
+        onError: (error, args) => {
+            expectTypeOf(error).toBeUnknown();
+            expectTypeOf(args.id).toBeNumber();
+        },
+        onSettled: (data, error, args) => {
+            if (data) {
+                expectTypeOf(data.structuredContent.result).toBeString();
+            }
+            expectTypeOf(error).toEqualTypeOf();
+            expectTypeOf(args.id).toBeNumber();
+        },
+    });
+});
+test("callTool allows sideEffects as first arg when ToolArgs is null", () => {
+    const { callTool } = useCallTool("test-tool");
+    callTool({
+        onSuccess: (data) => {
+            expectTypeOf(data.structuredContent.value).toBeNumber();
+        },
+    });
+});
+test("callToolAsync returns correctly typed promise", () => {
+    const { callToolAsync } = useCallTool("test-tool");
+    const promise = callToolAsync({ name: "test" });
+    expectTypeOf(promise).resolves.toHaveProperty("structuredContent");
+    expectTypeOf(promise).resolves.toHaveProperty("meta");
+});
+test("state narrowing works correctly with status", () => {
+    const result = useCallTool("test-tool");
+    if (result.status === "idle") {
+        expectTypeOf(result.isIdle).toEqualTypeOf();
+        expectTypeOf(result.data).toEqualTypeOf();
+    }
+    if (result.status === "pending") {
+        expectTypeOf(result.isPending).toEqualTypeOf();
+        expectTypeOf(result.data).toEqualTypeOf();
+    }
+    if (result.status === "success") {
+        expectTypeOf(result.isSuccess).toEqualTypeOf();
+        expectTypeOf(result.data).not.toEqualTypeOf();
+        expectTypeOf(result.data.structuredContent.data).toBeString();
+    }
+    if (result.status === "error") {
+        expectTypeOf(result.isError).toEqualTypeOf();
+        expectTypeOf(result.error).toBeUnknown();
+    }
+});
+test("state narrowing works correctly with boolean flags", () => {
+    const result = useCallTool("test-tool");
+    if (result.isIdle) {
+        expectTypeOf(result.status).toEqualTypeOf();
+    }
+    if (result.isPending) {
+        expectTypeOf(result.status).toEqualTypeOf();
+    }
+    if (result.isSuccess) {
+        expectTypeOf(result.status).toEqualTypeOf();
+        expectTypeOf(result.data.structuredContent.items).toBeArray();
+    }
+    if (result.isError) {
+        expectTypeOf(result.status).toEqualTypeOf();
+    }
+});
+test("CallToolState type is correctly exported and usable", () => {
+    const state = {};
+    if (state.status === "success") {
+        expectTypeOf(state.data.structuredContent.foo).toBeString();
+    }
+});
+test("SideEffects type is correctly exported and usable", () => {
+    const sideEffects = {
+        onSuccess: (data, args) => {
+            expectTypeOf(data.structuredContent.y).toBeString();
+            expectTypeOf(args.x).toBeNumber();
+        },
+    };
+    expectTypeOf(sideEffects).toHaveProperty("onSuccess");
+});
+//# sourceMappingURL=use-call-tool.test-d.js.map

package/dist/web/hooks/use-call-tool.test-d.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-call-tool.test-d.js","sourceRoot":"","sources":["../../../src/web/hooks/use-call-tool.test-d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE5C,OAAO,EAGL,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAE5B,IAAI,CAAC,2DAA2D,EAAE,GAAG,EAAE;IACrE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,WAAW,CAAO,WAAW,CAAC,CAAC;IACnE,QAAQ,EAAE,CAAC;IACX,QAAQ,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC,CAAC;IAClC,aAAa,EAAE,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8DAA8D,EAAE,GAAG,EAAE;IAExE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,WAAW,CAAO,WAAW,CAAC,CAAC;IAEnE,uCAAuC;IACvC,QAAQ,EAAE,CAAC;IAEX,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5B,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC,CAAC;IAErD,uCAAuC;IACvC,aAAa,EAAE,CAAC;IAChB,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAI5D,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAiB,WAAW,CAAC,CAAC;IAE9D,QAAQ,CACN,EAAE,EAAE,EAAE,CAAC,EAAE,EACT;QACE,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACxB,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;YACzD,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC;QACrC,CAAC;QACD,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACvB,YAAY,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAClC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC;QACrC,CAAC;QACD,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,EAAE,CAAC;gBACT,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;YAC3D,CAAC;YACD,YAAY,CAAC,KAAK,CAAC,CAAC,aAAa,EAAuB,CAAC;YACzD,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC;QACrC,CAAC;KACF,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,GAAG,EAAE;IAE1E,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAiB,WAAW,CAAC,CAAC;IAE9D,QAAQ,CAAC;QACP,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAC;QAC1D,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+CAA+C,EAAE,GAAG,EAAE;IAOzD,MAAM,EAAE,aAAa,EAAE,GAAG,WAAW,CAAiB,WAAW,CAAC,CAAC;IAEnE,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAEhD,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;IACnE,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;AACxD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;IAEvD,MAAM,MAAM,GAAG,WAAW,CAAiB,WAAW,CAAC,CAAC;IAExD,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAC7B,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAQ,CAAC;QAClD,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,aAAa,EAAa,CAAC;IACvD,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAChC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,aAAa,EAAQ,CAAC;QACrD,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,aAAa,EAAa,CAAC;IACvD,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAChC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,aAAa,EAAQ,CAAC;QACrD,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,aAAa,EAAa,CAAC;QACzD,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;IAChE,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC9B,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,EAAQ,CAAC;QACnD,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IAC3C,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAE9D,MAAM,MAAM,GAAG,WAAW,CAAiB,WAAW,CAAC,CAAC;IAExD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAU,CAAC;IACtD,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAa,CAAC;IACzD,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAa,CAAC;QACvD,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;IAChE,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAW,CAAC;IACvD,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qDAAqD,EAAE,GAAG,EAAE;IAI/D,MAAM,KAAK,GAAY,EAAa,CAAC;IAErC,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC/B,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;IAC9D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAI7D,MAAM,WAAW,GAAgC;QAC/C,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACxB,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;YACpD,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;QACpC,CAAC;KACF,CAAC;IAEF,YAAY,CAAC,WAAW,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;AACxD,CAAC,CAAC,CAAC","sourcesContent":["import { expectTypeOf, test } from \"vitest\";\nimport type { CallToolResponse } from \"../bridges/types.js\";\nimport {\n  type CallToolState,\n  type SideEffects,\n  useCallTool,\n} from \"./use-call-tool.js\";\n\ntest(\"callTool can be called without args when ToolArgs is null\", () => {\n  const { callTool, callToolAsync } = useCallTool<null>(\"test-tool\");\n  callTool();\n  callTool({ onSuccess: () => {} });\n  callToolAsync();\n});\n\ntest(\"callTool requires args when ToolArgs has required properties\", () => {\n  type Args = { query: string };\n  const { callTool, callToolAsync } = useCallTool<Args>(\"test-tool\");\n\n  // @ts-expect-error - query is required\n  callTool();\n\n  callTool({ query: \"test\" });\n  callTool({ query: \"test\" }, { onSuccess: () => {} });\n\n  // @ts-expect-error - query is required\n  callToolAsync();\n  callToolAsync({ query: \"test\" });\n});\n\ntest(\"callTool supports sideEffects with correct types\", () => {\n  type Args = { id: number };\n  type Response = { structuredContent: { result: string } };\n\n  const { callTool } = useCallTool<Args, Response>(\"test-tool\");\n\n  callTool(\n    { id: 1 },\n    {\n      onSuccess: (data, args) => {\n        expectTypeOf(data.structuredContent.result).toBeString();\n        expectTypeOf(args.id).toBeNumber();\n      },\n      onError: (error, args) => {\n        expectTypeOf(error).toBeUnknown();\n        expectTypeOf(args.id).toBeNumber();\n      },\n      onSettled: (data, error, args) => {\n        if (data) {\n          expectTypeOf(data.structuredContent.result).toBeString();\n        }\n        expectTypeOf(error).toEqualTypeOf<unknown | undefined>();\n        expectTypeOf(args.id).toBeNumber();\n      },\n    },\n  );\n});\n\ntest(\"callTool allows sideEffects as first arg when ToolArgs is null\", () => {\n  type Response = { structuredContent: { value: number } };\n  const { callTool } = useCallTool<null, Response>(\"test-tool\");\n\n  callTool({\n    onSuccess: (data) => {\n      expectTypeOf(data.structuredContent.value).toBeNumber();\n    },\n  });\n});\n\ntest(\"callToolAsync returns correctly typed promise\", () => {\n  type Args = { name: string };\n  type Response = {\n    structuredContent: { greeting: string };\n    meta: { id: number };\n  };\n\n  const { callToolAsync } = useCallTool<Args, Response>(\"test-tool\");\n\n  const promise = callToolAsync({ name: \"test\" });\n\n  expectTypeOf(promise).resolves.toHaveProperty(\"structuredContent\");\n  expectTypeOf(promise).resolves.toHaveProperty(\"meta\");\n});\n\ntest(\"state narrowing works correctly with status\", () => {\n  type Response = { structuredContent: { data: string } };\n  const result = useCallTool<null, Response>(\"test-tool\");\n\n  if (result.status === \"idle\") {\n    expectTypeOf(result.isIdle).toEqualTypeOf<true>();\n    expectTypeOf(result.data).toEqualTypeOf<undefined>();\n  }\n\n  if (result.status === \"pending\") {\n    expectTypeOf(result.isPending).toEqualTypeOf<true>();\n    expectTypeOf(result.data).toEqualTypeOf<undefined>();\n  }\n\n  if (result.status === \"success\") {\n    expectTypeOf(result.isSuccess).toEqualTypeOf<true>();\n    expectTypeOf(result.data).not.toEqualTypeOf<undefined>();\n    expectTypeOf(result.data.structuredContent.data).toBeString();\n  }\n\n  if (result.status === \"error\") {\n    expectTypeOf(result.isError).toEqualTypeOf<true>();\n    expectTypeOf(result.error).toBeUnknown();\n  }\n});\n\ntest(\"state narrowing works correctly with boolean flags\", () => {\n  type Response = { structuredContent: { items: string[] } };\n  const result = useCallTool<null, Response>(\"test-tool\");\n\n  if (result.isIdle) {\n    expectTypeOf(result.status).toEqualTypeOf<\"idle\">();\n  }\n\n  if (result.isPending) {\n    expectTypeOf(result.status).toEqualTypeOf<\"pending\">();\n  }\n\n  if (result.isSuccess) {\n    expectTypeOf(result.status).toEqualTypeOf<\"success\">();\n    expectTypeOf(result.data.structuredContent.items).toBeArray();\n  }\n\n  if (result.isError) {\n    expectTypeOf(result.status).toEqualTypeOf<\"error\">();\n  }\n});\n\ntest(\"CallToolState type is correctly exported and usable\", () => {\n  type Response = { structuredContent: { foo: string } };\n  type MyState = CallToolState<CallToolResponse & Response>;\n\n  const state: MyState = {} as MyState;\n\n  if (state.status === \"success\") {\n    expectTypeOf(state.data.structuredContent.foo).toBeString();\n  }\n});\n\ntest(\"SideEffects type is correctly exported and usable\", () => {\n  type Args = { x: number };\n  type Response = CallToolResponse & { structuredContent: { y: string } };\n\n  const sideEffects: SideEffects<Args, Response> = {\n    onSuccess: (data, args) => {\n      expectTypeOf(data.structuredContent.y).toBeString();\n      expectTypeOf(args.x).toBeNumber();\n    },\n  };\n\n  expectTypeOf(sideEffects).toHaveProperty(\"onSuccess\");\n});\n"]}

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

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

package/dist/{src/web → web}/hooks/use-call-tool.test.js

@@ -1,17 +1,27 @@
 import { act, renderHook, waitFor } from "@testing-library/react";
-import { afterEach, beforeEach, describe, expect, it, vi, expectTypeOf, } from "vitest";
+import { afterEach, beforeEach, describe, expect, expectTypeOf, it, vi, } from "vitest";
+import { HostAdaptor } from "../bridges/adaptor.js";
+import { AppsSdkBridge } from "../bridges/apps-sdk/bridge.js";
+import { getAdaptor } from "../bridges/get-adaptor.js";
+import { McpAppBridge } from "../bridges/mcp-app/bridge.js";
 import { useCallTool } from "./use-call-tool.js";
 describe("useCallTool - onSuccess callback", () => {
-    let OpenaiMock;
+    let callToolMock;
     beforeEach(() => {
-        OpenaiMock = {
-            callTool: vi.fn(),
-        };
-        vi.stubGlobal("openai", OpenaiMock);
+        HostAdaptor.resetInstance();
+        McpAppBridge.resetInstance();
+        AppsSdkBridge.resetInstance();
+        vi.stubGlobal("parent", { postMessage: vi.fn() });
+        vi.stubGlobal("skybridge", { hostType: "apps-sdk" });
+        vi.stubGlobal("openai", { callTool: vi.fn() });
+        callToolMock = vi.spyOn(getAdaptor(), "callTool");
     });
     afterEach(() => {
         vi.unstubAllGlobals();
         vi.resetAllMocks();
+        HostAdaptor.resetInstance();
+        McpAppBridge.resetInstance();
+        AppsSdkBridge.resetInstance();
     });
     const toolName = "test-tool";
     const args = { input: "test input" };
@@ -19,21 +29,38 @@ describe("useCallTool - onSuccess callback", () => {
         content: [{ type: "text", text: "test result" }],
         structuredContent: { result: "test" },
         isError: false,
-        result: "test result",
         meta: {},
     };
     const error = new Error("test error");
-    it("should call window.openai.callTool with correct arguments", async () => {
+    it("should normalize _meta to meta when SDK returns _meta instead of meta", async () => {
+        const rawSdkResponse = {
+            content: [{ type: "text", text: "result" }],
+            structuredContent: { value: 1 },
+            isError: false,
+            meta: { secret: "only visible to widget" },
+        };
+        callToolMock.mockResolvedValueOnce(rawSdkResponse);
         const { result } = renderHook(() => useCallTool(toolName));
-        act(() => {
+        await act(async () => {
             result.current.callTool(args);
         });
-        expect(OpenaiMock.callTool).toHaveBeenCalledWith(toolName, args);
+        await waitFor(() => {
+            expect(result.current.data).toMatchObject({
+                meta: { secret: "only visible to widget" },
+            });
+        });
+    });
+    it("should call adaptor.callTool with correct arguments", async () => {
+        const { result } = renderHook(() => useCallTool(toolName));
+        await act(async () => {
+            result.current.callTool(args);
+        });
+        expect(callToolMock).toHaveBeenCalledWith(toolName, args);
     });
     it("should call onSuccess callback with correct data and toolArgs on successful execution", async () => {
         const onSuccess = vi.fn();
         const onError = vi.fn();
-        OpenaiMock.callTool.mockResolvedValueOnce(data);
+        callToolMock.mockResolvedValueOnce(data);
         const { result } = renderHook(() => useCallTool(toolName));
         act(() => {
             result.current.callTool(args, {
@@ -49,7 +76,7 @@ describe("useCallTool - onSuccess callback", () => {
     it("should call onError callback with error and toolArgs on failed execution", async () => {
         const onSuccess = vi.fn();
         const onError = vi.fn();
-        OpenaiMock.callTool.mockRejectedValueOnce(error);
+        callToolMock.mockRejectedValueOnce(error);
         const { result } = renderHook(() => useCallTool(toolName));
         act(() => {
             result.current.callTool(args, {
@@ -66,7 +93,7 @@ describe("useCallTool - onSuccess callback", () => {
         const onSuccess = vi.fn();
         const onError = vi.fn();
         const onSettled = vi.fn();
-        OpenaiMock.callTool.mockResolvedValueOnce(data);
+        callToolMock.mockResolvedValueOnce(data);
         const { result } = renderHook(() => useCallTool(toolName));
         act(() => {
             result.current.callTool(args, {
@@ -85,7 +112,7 @@ describe("useCallTool - onSuccess callback", () => {
         const onSuccess = vi.fn();
         const onError = vi.fn();
         const onSettled = vi.fn();
-        OpenaiMock.callTool.mockRejectedValueOnce(error);
+        callToolMock.mockRejectedValueOnce(error);
         const { result } = renderHook(() => useCallTool(toolName));
         act(() => {
             result.current.callTool(args, {
@@ -100,33 +127,67 @@ describe("useCallTool - onSuccess callback", () => {
             expect(onSuccess).not.toHaveBeenCalled();
         });
     });
+    it("should always return last call started state", async () => {
+        const { result } = renderHook(() => useCallTool(toolName));
+        const firstCallData = {
+            ...data,
+            structuredContent: { result: "first call result" },
+        };
+        const secondCallData = {
+            ...data,
+            structuredContent: { result: "second call result" },
+        };
+        const { promise: firstCallToolPromise, resolve: resolveFirstCallTool } = Promise.withResolvers();
+        const { promise: secondCallToolPromise, resolve: resolveSecondCallTool } = Promise.withResolvers();
+        callToolMock
+            .mockImplementationOnce(() => firstCallToolPromise)
+            .mockImplementationOnce(() => secondCallToolPromise);
+        await act(() => {
+            result.current.callTool(args);
+            result.current.callTool(args);
+            resolveFirstCallTool(firstCallData);
+            return firstCallToolPromise;
+        });
+        expect(result.current.status).toEqual("pending");
+        expect(result.current.data).toEqual(undefined);
+        resolveSecondCallTool(secondCallData);
+        await waitFor(() => {
+            expect(result.current.status).toEqual("success");
+            expect(result.current.data).toEqual(secondCallData);
+        });
+    });
 });
 describe("useCallTool - TypeScript typing", () => {
-    let OpenaiMock;
+    let callToolMock;
     beforeEach(() => {
-        OpenaiMock = {
-            callTool: vi.fn(),
-        };
-        vi.stubGlobal("openai", OpenaiMock);
+        HostAdaptor.resetInstance();
+        McpAppBridge.resetInstance();
+        AppsSdkBridge.resetInstance();
+        vi.stubGlobal("parent", { postMessage: vi.fn() });
+        vi.stubGlobal("skybridge", { hostType: "apps-sdk" });
+        vi.stubGlobal("openai", { callTool: vi.fn() });
+        callToolMock = vi.spyOn(getAdaptor(), "callTool");
     });
     afterEach(() => {
         vi.unstubAllGlobals();
         vi.resetAllMocks();
+        HostAdaptor.resetInstance();
+        McpAppBridge.resetInstance();
+        AppsSdkBridge.resetInstance();
     });
-    it("should have correct return types when ToolArgs is null and ToolResponse is specified", () => {
+    it("should have correct return types when ToolArgs is null and ToolResponse is specified", async () => {
         const { result } = renderHook(() => useCallTool("test-tool"));
         const data = {
             content: [{ type: "text", text: "test" }],
             structuredContent: { result: "test" },
             isError: false,
-            result: "test",
             meta: { id: 123 },
         };
-        OpenaiMock.callTool.mockResolvedValueOnce(data);
-        act(() => {
+        callToolMock.mockResolvedValueOnce(data);
+        await act(async () => {
             result.current.callTool();
         });
-        expect(OpenaiMock.callTool).toHaveBeenCalledWith("test-tool", null);
+        expect(callToolMock).toHaveBeenCalledWith("test-tool", null);
         expectTypeOf(result.current.data);
     });
     it("should correctly type callToolAsync return value", async () => {
@@ -136,14 +197,14 @@ describe("useCallTool - TypeScript typing", () => {
             content: [{ type: "text", text: "answer" }],
             structuredContent: { answer: "test answer" },
             isError: false,
-            result: "answer",
             meta: {},
         };
-        OpenaiMock.callTool.mockResolvedValueOnce(mockResponse);
-        const promise = result.current.callToolAsync(testArgs);
-        expectTypeOf(promise);
-        const resolvedValue = await promise;
-        expect(resolvedValue).toEqual(mockResponse);
+        callToolMock.mockResolvedValueOnce(mockResponse);
+        const returnedValue = await act(async () => {
+            return result.current.callToolAsync(testArgs);
+        });
+        expectTypeOf(returnedValue);
+        expect(returnedValue).toEqual(mockResponse);
     });
     it("should correctly type callToolAsync when ToolArgs is null", async () => {
         const { result } = renderHook(() => useCallTool("test-tool"));
@@ -151,13 +212,14 @@ describe("useCallTool - TypeScript typing", () => {
             content: [{ type: "text", text: "data" }],
             structuredContent: { data: "test data" },
             isError: false,
-            result: "data",
+            meta: {},
         };
-        OpenaiMock.callTool.mockResolvedValueOnce(mockResponse);
-        const promise = result.current.callToolAsync();
-        expectTypeOf(promise);
-        const resolvedValue = await promise;
-        expect(resolvedValue).toEqual(mockResponse);
+        callToolMock.mockResolvedValueOnce(mockResponse);
+        const returnedValue = await act(async () => {
+            return result.current.callToolAsync();
+        });
+        expectTypeOf(returnedValue);
+        expect(returnedValue).toEqual(mockResponse);
     });
 });
 //# sourceMappingURL=use-call-tool.test.js.map