skybridge 0.0.0-dev.d1820df → 0.0.0-dev.d18cef3

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

@@ -1,22 +1,44 @@
-import { useBridge } from "../bridges/index.js";
-function deriveStatus(input, output, responseMetadata) {
-    if (input === null) {
-        return "idle";
-    }
+import { useHostContext } from "../bridges/index.js";
+function deriveStatus(output, responseMetadata) {
     if (output === null && responseMetadata === null) {
         return "pending";
     }
     return "success";
 }
+/**
+ * Access the tool invocation that produced the current view: its `input`,
+ * resulting `output`, and `responseMetadata`. The shape evolves as the tool
+ * runs (pending → success), exposed through {@link ToolState}.
+ *
+ * For full input/output typing per tool name, prefer the typed `useToolInfo`
+ * returned by {@link generateHelpers} over the generic form.
+ *
+ * @typeParam TS - Optional partial shape `{ input, output, responseMetadata }`
+ * to refine each field's type. When omitted, each typed field resolves to
+ * `never` — pass an explicit shape or use the typed helper from
+ * {@link generateHelpers} to get usable types.
+ *
+ * @example
+ * ```tsx
+ * const { isSuccess, input, output } = useToolInfo<{
+ *   input: { query: string };
+ *   output: { results: Result[] };
+ * }>();
+ *
+ * if (!isSuccess || !output) return <Skeleton />;
+ * return <Results items={output.results} />;
+ * ```
+ *
+ * @see https://docs.skybridge.tech/api-reference/use-tool-info
+ */
 export function useToolInfo() {
-    const input = useBridge("toolInput");
-    const output = useBridge("toolOutput");
-    const responseMetadata = useBridge("toolResponseMetadata");
-    const status = deriveStatus(input, output, responseMetadata);
+    const input = useHostContext("toolInput");
+    const output = useHostContext("toolOutput");
+    const responseMetadata = useHostContext("toolResponseMetadata");
+    const status = deriveStatus(output, responseMetadata);
     return {
-        input,
+        input: input ?? undefined,
         status,
-        isIdle: status === "idle",
         isPending: status === "pending",
         isSuccess: status === "success",
         output,

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

@@ -1 +1 @@
-{"version":3,"file":"use-tool-info.js","sourceRoot":"","sources":["../../../src/web/hooks/use-tool-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAoDhD,SAAS,YAAY,CACnB,KAAqC,EACrC,MAAsC,EACtC,gBAAgD;IAEhD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,MAAM,KAAK,IAAI,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;QACjD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,WAAW;IAGzB,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IACvC,MAAM,gBAAgB,GAAG,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAM7D,OAAO;QACL,KAAK;QACL,MAAM;QACN,MAAM,EAAE,MAAM,KAAK,MAAM;QACzB,SAAS,EAAE,MAAM,KAAK,SAAS;QAC/B,SAAS,EAAE,MAAM,KAAK,SAAS;QAC/B,MAAM;QACN,gBAAgB;KACqB,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"use-tool-info.js","sourceRoot":"","sources":["../../../src/web/hooks/use-tool-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAwDrD,SAAS,YAAY,CACnB,MAAsC,EACtC,gBAAgD;IAEhD,IAAI,MAAM,KAAK,IAAI,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;QACjD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,WAAW;IAGzB,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,gBAAgB,GAAG,cAAc,CAAC,sBAAsB,CAAC,CAAC;IAEhE,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAMtD,OAAO;QACL,KAAK,EAAE,KAAK,IAAI,SAAS;QACzB,MAAM;QACN,SAAS,EAAE,MAAM,KAAK,SAAS;QAC/B,SAAS,EAAE,MAAM,KAAK,SAAS;QAC/B,MAAM;QACN,gBAAgB;KACqB,CAAC;AAC1C,CAAC","sourcesContent":["import { useHostContext } from \"../bridges/index.js\";\nimport type { UnknownObject } from \"../types.js\";\n\n/**\n * {@link useToolInfo} state while the tool is executing — `output` is not yet\n * available.\n *\n * `input` is optional: the host may render the view before delivering the\n * tool arguments.\n */\nexport type ToolPendingState<ToolInput extends UnknownObject> = {\n  status: \"pending\";\n  isPending: true;\n  isSuccess: false;\n  input: ToolInput | undefined;\n  output: undefined;\n  responseMetadata: undefined;\n};\n\n/**\n * {@link useToolInfo} state once the tool returned — `output` is available.\n *\n * `input` is optional: the host may not have surfaced the tool arguments by\n * the time `output` arrives.\n */\nexport type ToolSuccessState<\n  ToolInput extends UnknownObject,\n  ToolOutput extends UnknownObject,\n  ToolResponseMetadata extends UnknownObject,\n> = {\n  status: \"success\";\n  isPending: false;\n  isSuccess: true;\n  input: ToolInput | undefined;\n  output: ToolOutput;\n  responseMetadata: ToolResponseMetadata;\n};\n\n/**\n * Discriminated union describing the tool invocation that triggered the\n * current view render. Use `isPending` / `isSuccess` to narrow.\n */\nexport type ToolState<\n  ToolInput extends UnknownObject,\n  ToolOutput extends UnknownObject,\n  ToolResponseMetadata extends UnknownObject,\n> =\n  | ToolPendingState<ToolInput>\n  | ToolSuccessState<ToolInput, ToolOutput, ToolResponseMetadata>;\n\ntype ToolSignature = {\n  input: UnknownObject;\n  output: UnknownObject;\n  responseMetadata: UnknownObject;\n};\n\nfunction deriveStatus(\n  output: Record<string, unknown> | null,\n  responseMetadata: Record<string, unknown> | null,\n): \"pending\" | \"success\" {\n  if (output === null && responseMetadata === null) {\n    return \"pending\";\n  }\n  return \"success\";\n}\n\n/**\n * Access the tool invocation that produced the current view: its `input`,\n * resulting `output`, and `responseMetadata`. The shape evolves as the tool\n * runs (pending → success), exposed through {@link ToolState}.\n *\n * For full input/output typing per tool name, prefer the typed `useToolInfo`\n * returned by {@link generateHelpers} over the generic form.\n *\n * @typeParam TS - Optional partial shape `{ input, output, responseMetadata }`\n * to refine each field's type. When omitted, each typed field resolves to\n * `never` — pass an explicit shape or use the typed helper from\n * {@link generateHelpers} to get usable types.\n *\n * @example\n * ```tsx\n * const { isSuccess, input, output } = useToolInfo<{\n *   input: { query: string };\n *   output: { results: Result[] };\n * }>();\n *\n * if (!isSuccess || !output) return <Skeleton />;\n * return <Results items={output.results} />;\n * ```\n *\n * @see https://docs.skybridge.tech/api-reference/use-tool-info\n */\nexport function useToolInfo<\n  TS extends Partial<ToolSignature> = Record<string, never>,\n>() {\n  const input = useHostContext(\"toolInput\");\n  const output = useHostContext(\"toolOutput\");\n  const responseMetadata = useHostContext(\"toolResponseMetadata\");\n\n  const status = deriveStatus(output, responseMetadata);\n\n  type Input = UnknownObject & TS[\"input\"];\n  type Output = UnknownObject & TS[\"output\"];\n  type Metadata = UnknownObject & TS[\"responseMetadata\"];\n\n  return {\n    input: input ?? undefined,\n    status,\n    isPending: status === \"pending\",\n    isSuccess: status === \"success\",\n    output,\n    responseMetadata,\n  } as ToolState<Input, Output, Metadata>;\n}\n"]}

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

@@ -6,24 +6,19 @@ test("useToolInfo - TypeScript typing", () => {
         expectTypeOf(result.status);
         expectTypeOf(result.isPending);
         expectTypeOf(result.isSuccess);
-        expectTypeOf(result.isIdle);
         expectTypeOf(result.input);
     });
     test("should correctly type input, output, and responseMetadata with explicit ToolSignature", () => {
         const result = useToolInfo();
-        // When idle, input should be undefined
-        if (result.status === "idle") {
-            expectTypeOf(result.input);
-            expectTypeOf(result.output);
-            expectTypeOf(result.responseMetadata);
-        }
-        // When pending, output and responseMetadata should be undefined
+        // When pending, input may be undefined (host hasn't delivered args yet,
+        // or the tool has no input schema)
         if (result.status === "pending") {
             expectTypeOf(result.input);
             expectTypeOf(result.output);
             expectTypeOf(result.responseMetadata);
         }
-        // When success, output and responseMetadata should be defined
+        // When success, output and responseMetadata are defined; input may still
+        // be undefined if the host hasn't surfaced the tool arguments
         if (result.status === "success") {
             expectTypeOf(result.input);
             expectTypeOf(result.output);
@@ -32,35 +27,17 @@ test("useToolInfo - TypeScript typing", () => {
     });
     test("should correctly narrow types based on status discriminated union", () => {
         const result = useToolInfo();
-        // Test type narrowing for idle
-        if (result.isIdle) {
-            expectTypeOf(result.status);
-            expectTypeOf(result.isIdle);
-            expectTypeOf(result.isPending);
-            expectTypeOf(result.isSuccess);
-            expectTypeOf(result.input);
-            expectTypeOf(result.output);
-            expectTypeOf(result.responseMetadata);
-        }
         // Test type narrowing for pending
         if (result.isPending) {
             expectTypeOf(result.status);
-            expectTypeOf(result.isIdle);
             expectTypeOf(result.isPending);
             expectTypeOf(result.isSuccess);
+            expectTypeOf(result.input);
             expectTypeOf(result.output);
             expectTypeOf(result.responseMetadata);
         }
         if (result.isSuccess) {
             expectTypeOf(result.status);
-            expectTypeOf(result.isIdle);
-            expectTypeOf(result.isPending);
-            expectTypeOf(result.isSuccess);
-            expectTypeOf(result.output);
-            expectTypeOf(result.responseMetadata);
-        }
-        if (result.status === "idle") {
-            expectTypeOf(result.isIdle);
             expectTypeOf(result.isPending);
             expectTypeOf(result.isSuccess);
             expectTypeOf(result.input);
@@ -69,7 +46,6 @@ test("useToolInfo - TypeScript typing", () => {
         }
         if (result.status === "pending") {
             expectTypeOf(result.input);
-            expectTypeOf(result.isIdle);
             expectTypeOf(result.isPending);
             expectTypeOf(result.isSuccess);
             expectTypeOf(result.output);
@@ -77,7 +53,6 @@ test("useToolInfo - TypeScript typing", () => {
         }
         if (result.status === "success") {
             expectTypeOf(result.input);
-            expectTypeOf(result.isIdle);
             expectTypeOf(result.isPending);
             expectTypeOf(result.isSuccess);
             expectTypeOf(result.output);
@@ -86,22 +61,24 @@ test("useToolInfo - TypeScript typing", () => {
     });
     test("should handle partial ToolSignature with only input specified", () => {
         const result = useToolInfo();
-        // Input can be TestInput or undefined (when idle)
-        if (result.status === "pending" || result.status === "success") {
+        // Input is optional in both states — undefined while args haven't arrived
+        // (pending) and for no-input tools (success).
+        if (result.status === "pending") {
             expectTypeOf(result.input);
         }
         if (result.status === "success") {
+            expectTypeOf(result.input);
             expectTypeOf(result.output);
             expectTypeOf(result.responseMetadata);
         }
     });
     test("should handle ToolSignature with only output specified", () => {
         const result = useToolInfo();
-        // Input can be Record<string, unknown> or undefined (when idle)
-        if (result.status === "pending" || result.status === "success") {
+        if (result.status === "pending") {
             expectTypeOf(result.input);
         }
         if (result.status === "success") {
+            expectTypeOf(result.input);
             expectTypeOf(result.output);
         }
     });

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

@@ -1 +1 @@
-{"version":3,"file":"use-tool-info.test-d.js","sourceRoot":"","sources":["../../../src/web/hooks/use-tool-info.test-d.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-tool-info.test-d.js","sourceRoot":"","sources":["../../../src/web/hooks/use-tool-info.test-d.ts"],"names":[],"mappings":"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","sourcesContent":["import { expectTypeOf, test } from \"vitest\";\nimport { useToolInfo } from \"./use-tool-info.js\";\n\ntest(\"useToolInfo - TypeScript typing\", () => {\n  test(\"should have correct types when no generic parameter is provided\", () => {\n    const result = useToolInfo();\n\n    expectTypeOf<\"pending\" | \"success\">(result.status);\n    expectTypeOf<boolean>(result.isPending);\n    expectTypeOf<boolean>(result.isSuccess);\n    expectTypeOf<Record<string, unknown> | undefined>(result.input);\n  });\n\n  test(\"should correctly type input, output, and responseMetadata with explicit ToolSignature\", () => {\n    type TestInput = { name: string; args: { name: string } };\n    type TestOutput = { name: string; color: string };\n    type TestMetadata = { id: number };\n\n    const result = useToolInfo<{\n      input: TestInput;\n      output: TestOutput;\n      responseMetadata: TestMetadata;\n    }>();\n\n    // When pending, input may be undefined (host hasn't delivered args yet,\n    // or the tool has no input schema)\n    if (result.status === \"pending\") {\n      expectTypeOf<TestInput | undefined>(result.input);\n      expectTypeOf<undefined>(result.output);\n      expectTypeOf<undefined>(result.responseMetadata);\n    }\n\n    // When success, output and responseMetadata are defined; input may still\n    // be undefined if the host hasn't surfaced the tool arguments\n    if (result.status === \"success\") {\n      expectTypeOf<TestInput | undefined>(result.input);\n      expectTypeOf<TestOutput>(result.output);\n      expectTypeOf<TestMetadata>(result.responseMetadata);\n    }\n  });\n\n  test(\"should correctly narrow types based on status discriminated union\", () => {\n    type TestInput = { query: string };\n    type TestOutput = { result: string };\n    type TestMetadata = { timestamp: number };\n\n    const result = useToolInfo<{\n      input: TestInput;\n      output: TestOutput;\n      responseMetadata: TestMetadata;\n    }>();\n\n    // Test type narrowing for pending\n    if (result.isPending) {\n      expectTypeOf<\"pending\">(result.status);\n      expectTypeOf<true>(result.isPending);\n      expectTypeOf<false>(result.isSuccess);\n      expectTypeOf<TestInput | undefined>(result.input);\n      expectTypeOf<undefined>(result.output);\n      expectTypeOf<undefined>(result.responseMetadata);\n    }\n\n    if (result.isSuccess) {\n      expectTypeOf<\"success\">(result.status);\n      expectTypeOf<false>(result.isPending);\n      expectTypeOf<true>(result.isSuccess);\n      expectTypeOf<TestInput | undefined>(result.input);\n      expectTypeOf<TestOutput>(result.output);\n      expectTypeOf<TestMetadata>(result.responseMetadata);\n    }\n\n    if (result.status === \"pending\") {\n      expectTypeOf<TestInput | undefined>(result.input);\n      expectTypeOf<true>(result.isPending);\n      expectTypeOf<false>(result.isSuccess);\n      expectTypeOf<undefined>(result.output);\n      expectTypeOf<undefined>(result.responseMetadata);\n    }\n\n    if (result.status === \"success\") {\n      expectTypeOf<TestInput | undefined>(result.input);\n      expectTypeOf<false>(result.isPending);\n      expectTypeOf<true>(result.isSuccess);\n      expectTypeOf<TestOutput>(result.output);\n      expectTypeOf<TestMetadata>(result.responseMetadata);\n    }\n  });\n\n  test(\"should handle partial ToolSignature with only input specified\", () => {\n    type TestInput = { id: number };\n\n    const result = useToolInfo<{\n      input: TestInput;\n    }>();\n\n    // Input is optional in both states — undefined while args haven't arrived\n    // (pending) and for no-input tools (success).\n    if (result.status === \"pending\") {\n      expectTypeOf<TestInput | undefined>(result.input);\n    }\n\n    if (result.status === \"success\") {\n      expectTypeOf<TestInput | undefined>(result.input);\n      expectTypeOf<Record<string, unknown>>(result.output);\n      expectTypeOf<Record<string, unknown>>(result.responseMetadata);\n    }\n  });\n\n  test(\"should handle ToolSignature with only output specified\", () => {\n    type TestOutput = { data: string[] };\n\n    const result = useToolInfo<{\n      output: TestOutput;\n    }>();\n\n    if (result.status === \"pending\") {\n      expectTypeOf<Record<string, unknown> | undefined>(result.input);\n    }\n\n    if (result.status === \"success\") {\n      expectTypeOf<Record<string, unknown> | undefined>(result.input);\n      expectTypeOf<TestOutput>(result.output);\n    }\n  });\n});\n"]}

package/dist/web/hooks/use-tool-info.test.js

@@ -1,37 +1,45 @@
-import { act, fireEvent, renderHook, waitFor } from "@testing-library/react";
+import { act, renderHook, waitFor } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { McpAppAdaptor } from "../bridges/adaptors/mcp-app-adaptor.js";
-import { McpAppBridge } from "../bridges/mcp-app-bridge.js";
-import { SET_GLOBALS_EVENT_TYPE, SetGlobalsEvent, } from "../types.js";
-import { fireToolInputNotification, fireToolResultNotification, getMcpAppHostPostMessageMock, } from "./test/utils.js";
+import { HostAdaptor } from "../bridges/adaptor.js";
+import { McpAppBridge } from "../bridges/mcp-app/index.js";
+import { fireToolInputNotification, fireToolResultNotification, getMcpAppHostPostMessageMock, MockResizeObserver, } from "./test/utils.js";
 import { useToolInfo } from "./use-tool-info.js";
 describe("useToolInfo", () => {
     describe("apps-sdk host", () => {
-        let OpenaiMock;
         beforeEach(() => {
-            OpenaiMock = {
-                toolInput: { name: "pokemon", args: { name: "pikachu" } },
+            vi.stubGlobal("parent", { postMessage: getMcpAppHostPostMessageMock() });
+            vi.stubGlobal("openai", {
+                toolInput: null,
                 toolOutput: null,
                 toolResponseMetadata: null,
-            };
-            vi.stubGlobal("openai", OpenaiMock);
-            vi.stubGlobal("skybridge", { hostType: "apps-sdk" });
+            });
+            vi.stubGlobal("skybridge", {});
+            vi.stubGlobal("ResizeObserver", MockResizeObserver);
         });
         afterEach(() => {
+            HostAdaptor.resetInstance();
             vi.unstubAllGlobals();
             vi.resetAllMocks();
+            McpAppBridge.resetInstance();
         });
-        it("should return toolInput on initial mount window.openai", () => {
+        it("should return pending state with tool input from tool-input notification", async () => {
             const { result } = renderHook(() => useToolInfo());
-            expect(result.current).toMatchObject({
-                input: { name: "pokemon", args: { name: "pikachu" } },
-                status: "pending",
-                isIdle: false,
-                isPending: true,
-                isSuccess: false,
+            act(() => {
+                fireToolInputNotification({
+                    name: "pokemon",
+                    args: { name: "pikachu" },
+                });
+            });
+            await waitFor(() => {
+                expect(result.current).toMatchObject({
+                    input: { name: "pokemon", args: { name: "pikachu" } },
+                    status: "pending",
+                    isPending: true,
+                    isSuccess: false,
+                });
             });
         });
-        it("should eventually return tool output and response metadata once tool call completes", async () => {
+        it("should return success state once tool-result notification arrives", async () => {
             const toolOutput = {
                 name: "pikachu",
                 color: "yellow",
@@ -40,21 +48,19 @@ describe("useToolInfo", () => {
             const toolResponseMetadata = { id: 12 };
             const { result } = renderHook(() => useToolInfo());
             act(() => {
-                OpenaiMock.toolOutput = toolOutput;
-                OpenaiMock.toolResponseMetadata = toolResponseMetadata;
-                fireEvent(window, new SetGlobalsEvent(SET_GLOBALS_EVENT_TYPE, {
-                    detail: {
-                        globals: {
-                            toolOutput,
-                            toolResponseMetadata,
-                        },
-                    },
-                }));
+                fireToolInputNotification({
+                    name: "pokemon",
+                    args: { name: "pikachu" },
+                });
+                fireToolResultNotification({
+                    content: [{ type: "text", text: JSON.stringify(toolOutput) }],
+                    structuredContent: toolOutput,
+                    _meta: toolResponseMetadata,
+                });
             });
             await waitFor(() => {
                 expect(result.current).toMatchObject({
                     status: "success",
-                    isIdle: false,
                     isPending: false,
                     isSuccess: true,
                     output: toolOutput,
@@ -66,23 +72,24 @@ describe("useToolInfo", () => {
     describe("mcp-app host", () => {
         beforeEach(() => {
             vi.stubGlobal("parent", { postMessage: getMcpAppHostPostMessageMock() });
-            vi.stubGlobal("skybridge", { hostType: "mcp-app" });
+            vi.stubGlobal("skybridge", {});
+            vi.stubGlobal("openai", undefined);
+            vi.stubGlobal("ResizeObserver", MockResizeObserver);
         });
-        afterEach(() => {
+        afterEach(async () => {
+            HostAdaptor.resetInstance();
             vi.unstubAllGlobals();
             vi.resetAllMocks();
             McpAppBridge.resetInstance();
-            McpAppAdaptor.resetInstance();
         });
-        it("should return idle state initially when tool input is not yet set", async () => {
+        it("should return pending state with undefined input before tool-input notification arrives", async () => {
             const { result } = renderHook(() => useToolInfo());
             await waitFor(() => {
                 expect(result.current).toMatchObject({
-                    status: "idle",
-                    isIdle: true,
-                    isPending: false,
+                    status: "pending",
+                    isPending: true,
                     isSuccess: false,
-                    input: null,
+                    input: undefined,
                     output: null,
                     responseMetadata: null,
                 });
@@ -96,7 +103,6 @@ describe("useToolInfo", () => {
             await waitFor(() => {
                 expect(result.current).toMatchObject({
                     status: "pending",
-                    isIdle: false,
                     isPending: true,
                     isSuccess: false,
                     input: { name: "pokemon", query: "pikachu" },
@@ -116,7 +122,6 @@ describe("useToolInfo", () => {
             await waitFor(() => {
                 expect(result.current).toMatchObject({
                     status: "success",
-                    isIdle: false,
                     isPending: false,
                     isSuccess: true,
                     input: { name: "pokemon", query: "pikachu" },

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

@@ -1 +1 @@
-{"version":3,"file":"use-tool-info.test.js","sourceRoot":"","sources":["../../../src/web/hooks/use-tool-info.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-tool-info.test.js","sourceRoot":"","sources":["../../../src/web/hooks/use-tool-info.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { act, renderHook, waitFor } from \"@testing-library/react\";\nimport { afterEach, beforeEach, describe, expect, it, vi } from \"vitest\";\nimport { HostAdaptor } from \"../bridges/adaptor.js\";\nimport { McpAppBridge } from \"../bridges/mcp-app/index.js\";\nimport {\n  fireToolInputNotification,\n  fireToolResultNotification,\n  getMcpAppHostPostMessageMock,\n  MockResizeObserver,\n} from \"./test/utils.js\";\nimport { useToolInfo } from \"./use-tool-info.js\";\n\ndescribe(\"useToolInfo\", () => {\n  describe(\"apps-sdk host\", () => {\n    beforeEach(() => {\n      vi.stubGlobal(\"parent\", { postMessage: getMcpAppHostPostMessageMock() });\n      vi.stubGlobal(\"openai\", {\n        toolInput: null,\n        toolOutput: null,\n        toolResponseMetadata: null,\n      });\n      vi.stubGlobal(\"skybridge\", {});\n      vi.stubGlobal(\"ResizeObserver\", MockResizeObserver);\n    });\n\n    afterEach(() => {\n      HostAdaptor.resetInstance();\n      vi.unstubAllGlobals();\n      vi.resetAllMocks();\n      McpAppBridge.resetInstance();\n    });\n\n    it(\"should return pending state with tool input from tool-input notification\", async () => {\n      const { result } = renderHook(() => useToolInfo());\n\n      act(() => {\n        fireToolInputNotification({\n          name: \"pokemon\",\n          args: { name: \"pikachu\" },\n        });\n      });\n\n      await waitFor(() => {\n        expect(result.current).toMatchObject({\n          input: { name: \"pokemon\", args: { name: \"pikachu\" } },\n          status: \"pending\",\n          isPending: true,\n          isSuccess: false,\n        });\n      });\n    });\n\n    it(\"should return success state once tool-result notification arrives\", async () => {\n      const toolOutput = {\n        name: \"pikachu\",\n        color: \"yellow\",\n        description:\n          \"When several of these POKéMON gather, their\\felectricity could build and cause lightning storms.\",\n      };\n      const toolResponseMetadata = { id: 12 };\n      const { result } = renderHook(() => useToolInfo());\n\n      act(() => {\n        fireToolInputNotification({\n          name: \"pokemon\",\n          args: { name: \"pikachu\" },\n        });\n        fireToolResultNotification({\n          content: [{ type: \"text\", text: JSON.stringify(toolOutput) }],\n          structuredContent: toolOutput,\n          _meta: toolResponseMetadata,\n        });\n      });\n\n      await waitFor(() => {\n        expect(result.current).toMatchObject({\n          status: \"success\",\n          isPending: false,\n          isSuccess: true,\n          output: toolOutput,\n          responseMetadata: toolResponseMetadata,\n        });\n      });\n    });\n  });\n\n  describe(\"mcp-app host\", () => {\n    beforeEach(() => {\n      vi.stubGlobal(\"parent\", { postMessage: getMcpAppHostPostMessageMock() });\n      vi.stubGlobal(\"skybridge\", {});\n      vi.stubGlobal(\"openai\", undefined);\n      vi.stubGlobal(\"ResizeObserver\", MockResizeObserver);\n    });\n\n    afterEach(async () => {\n      HostAdaptor.resetInstance();\n      vi.unstubAllGlobals();\n      vi.resetAllMocks();\n      McpAppBridge.resetInstance();\n    });\n\n    it(\"should return pending state with undefined input before tool-input notification arrives\", async () => {\n      const { result } = renderHook(() => useToolInfo());\n\n      await waitFor(() => {\n        expect(result.current).toMatchObject({\n          status: \"pending\",\n          isPending: true,\n          isSuccess: false,\n          input: undefined,\n          output: null,\n          responseMetadata: null,\n        });\n      });\n    });\n\n    it(\"should return pending state with tool input from tool-input notification\", async () => {\n      const { result } = renderHook(() => useToolInfo());\n\n      act(() => {\n        fireToolInputNotification({ name: \"pokemon\", query: \"pikachu\" });\n      });\n\n      await waitFor(() => {\n        expect(result.current).toMatchObject({\n          status: \"pending\",\n          isPending: true,\n          isSuccess: false,\n          input: { name: \"pokemon\", query: \"pikachu\" },\n        });\n      });\n    });\n\n    it(\"should return success state with output from tool-result notification\", async () => {\n      const { result } = renderHook(() => useToolInfo());\n\n      act(() => {\n        fireToolInputNotification({ name: \"pokemon\", query: \"pikachu\" });\n        fireToolResultNotification({\n          content: [{ type: \"text\", text: \"Pikachu data\" }],\n          structuredContent: { name: \"pikachu\", color: \"yellow\" },\n          _meta: { requestId: \"123\" },\n        });\n      });\n\n      await waitFor(() => {\n        expect(result.current).toMatchObject({\n          status: \"success\",\n          isPending: false,\n          isSuccess: true,\n          input: { name: \"pokemon\", query: \"pikachu\" },\n          output: { name: \"pikachu\", color: \"yellow\" },\n          responseMetadata: { requestId: \"123\" },\n        });\n      });\n    });\n  });\n});\n"]}

package/dist/web/hooks/use-user.d.ts

@@ -1,6 +1,7 @@
-import type { UserAgent } from "../types.js";
+import { type Theme, type UserAgent } from "../bridges/index.js";
 export type UserState = {
     locale: string;
+    theme: Theme;
     userAgent: UserAgent;
 };
 /**
@@ -9,10 +10,12 @@ export type UserState = {
  *
  * @example
  * ```tsx
- * const { locale, userAgent } = useUser();
+ * const { locale, theme, userAgent } = useUser();
  *
  * // Access device type
  * const isMobile = userAgent.device.type === "mobile";
  * ```
+ *
+ * @see https://docs.skybridge.tech/api-reference/use-user
  */
 export declare function useUser(): UserState;

package/dist/web/hooks/use-user.js

@@ -1,19 +1,38 @@
-import { useBridge } from "../bridges/index.js";
+import { useHostContext, } from "../bridges/index.js";
+const DEFAULT_LOCALE = "en-US";
+/**
+ * Normalizes a locale string to canonical BCP 47 format using {@link Intl.Locale}.
+ *
+ * Handles underscored identifiers returned by the ChatGPT mobile app (e.g. "fr_FR" → "fr-FR"),
+ * incorrect casing (e.g. "en-us" → "en-US"), and complex subtags (e.g. "zh_Hans_CN" → "zh-Hans-CN").
+ * Falls back to "en-US" if the locale is invalid.
+ */
+function normalizeLocale(locale) {
+    try {
+        return new Intl.Locale(locale.replace(/_/g, "-")).toString();
+    }
+    catch {
+        return DEFAULT_LOCALE;
+    }
+}
 /**
  * Hook for accessing session-stable user information.
  * These values are set once at initialization and do not change during the session.
  *
  * @example
  * ```tsx
- * const { locale, userAgent } = useUser();
+ * const { locale, theme, userAgent } = useUser();
  *
  * // Access device type
  * const isMobile = userAgent.device.type === "mobile";
  * ```
+ *
+ * @see https://docs.skybridge.tech/api-reference/use-user
  */
 export function useUser() {
-    const locale = useBridge("locale");
-    const userAgent = useBridge("userAgent");
-    return { locale, userAgent };
+    const rawLocale = useHostContext("locale");
+    const theme = useHostContext("theme");
+    const userAgent = useHostContext("userAgent");
+    return { locale: normalizeLocale(rawLocale), theme, userAgent };
 }
 //# sourceMappingURL=use-user.js.map

package/dist/web/hooks/use-user.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-user.js","sourceRoot":"","sources":["../../../src/web/hooks/use-user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAQhD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,OAAO;IACrB,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IAEzC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"use-user.js","sourceRoot":"","sources":["../../../src/web/hooks/use-user.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,cAAc,GACf,MAAM,qBAAqB,CAAC;AAQ7B,MAAM,cAAc,GAAG,OAAO,CAAC;AAE/B;;;;;;GAMG;AACH,SAAS,eAAe,CAAC,MAAc;IACrC,IAAI,CAAC;QACH,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,cAAc,CAAC;IACxB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,OAAO;IACrB,MAAM,SAAS,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;IAE9C,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAClE,CAAC","sourcesContent":["import {\n  type Theme,\n  type UserAgent,\n  useHostContext,\n} from \"../bridges/index.js\";\n\nexport type UserState = {\n  locale: string;\n  theme: Theme;\n  userAgent: UserAgent;\n};\n\nconst DEFAULT_LOCALE = \"en-US\";\n\n/**\n * Normalizes a locale string to canonical BCP 47 format using {@link Intl.Locale}.\n *\n * Handles underscored identifiers returned by the ChatGPT mobile app (e.g. \"fr_FR\" → \"fr-FR\"),\n * incorrect casing (e.g. \"en-us\" → \"en-US\"), and complex subtags (e.g. \"zh_Hans_CN\" → \"zh-Hans-CN\").\n * Falls back to \"en-US\" if the locale is invalid.\n */\nfunction normalizeLocale(locale: string): string {\n  try {\n    return new Intl.Locale(locale.replace(/_/g, \"-\")).toString();\n  } catch {\n    return DEFAULT_LOCALE;\n  }\n}\n\n/**\n * Hook for accessing session-stable user information.\n * These values are set once at initialization and do not change during the session.\n *\n * @example\n * ```tsx\n * const { locale, theme, userAgent } = useUser();\n *\n * // Access device type\n * const isMobile = userAgent.device.type === \"mobile\";\n * ```\n *\n * @see https://docs.skybridge.tech/api-reference/use-user\n */\nexport function useUser(): UserState {\n  const rawLocale = useHostContext(\"locale\");\n  const theme = useHostContext(\"theme\");\n  const userAgent = useHostContext(\"userAgent\");\n\n  return { locale: normalizeLocale(rawLocale), theme, userAgent };\n}\n"]}