skybridge 0.0.0-dev.e4c9359 → 0.0.0-dev.e9705ff

package/README.md

@@ -103,6 +103,54 @@ Skybridge provides fully typed hooks that give you autocomplete for tool names a
 
 > **Tip:** For the best TypeScript experience, use typed hooks throughout your application. They provide autocomplete, type safety, and better IDE support.
 
+> **Important:** For `generateHelpers` to work correctly, your MCP server must be defined using method chaining (e.g., `server.widget(...).widget(...).registerTool(...)`). This ensures TypeScript can properly infer the tool registry type from the chained calls.
+
+**Examples:**
+
+✅ **Works** - Using method chaining:
+
+```ts
+import { McpServer } from "skybridge/server";
+import { z } from "zod";
+
+const server = new McpServer({ name: "my-app", version: "1.0" }, {})
+  .widget("search-voyage", {}, {
+    inputSchema: { destination: z.string() },
+  }, async ({ destination }) => {
+    return { content: [{ type: "text", text: `Found trips to ${destination}` }] };
+  })
+  .registerTool("calculate-price", {
+    inputSchema: { tripId: z.string() },
+  }, async ({ tripId }) => {
+    return { content: [{ type: "text", text: `Price for ${tripId}` }] };
+  });
+
+export type AppType = typeof server; // ✅ Type inference works correctly
+```
+
+❌ **Doesn't work** - Without method chaining:
+
+```ts
+import { McpServer } from "skybridge/server";
+import { z } from "zod";
+
+const server = new McpServer({ name: "my-app", version: "1.0" }, {});
+
+server.widget("search-voyage", {}, {
+  inputSchema: { destination: z.string() },
+}, async ({ destination }) => {
+  return { content: [{ type: "text", text: `Found trips to ${destination}` }] };
+});
+
+server.registerTool("calculate-price", {
+  inputSchema: { tripId: z.string() },
+}, async ({ tripId }) => {
+  return { content: [{ type: "text", text: `Price for ${tripId}` }] };
+});
+
+export type AppType = typeof server; // ❌ Type inference fails - tool registry is empty
+```
+
 _Server setup (server/src/index.ts)_
 
 ```ts
@@ -140,9 +188,9 @@ Create typed hooks once and export them for use across your app. This file acts
 
 ```ts
 import type { AppType } from "../server"; // type-only import
-import { createTypedHooks } from "skybridge/web";
+import { generateHelpers } from "skybridge/web";
 
-export const { useCallTool, useToolInfo } = createTypedHooks<AppType>();
+export const { useCallTool, useToolInfo } = generateHelpers<AppType>();
 ```
 
 _Usage in widgets (web/src/widgets/search.tsx)_
@@ -167,7 +215,7 @@ export function SearchWidget() {
         Search
       </button>
       {toolInfo.isSuccess && (
-        <div>Found {toolInfo.output.totalCount} results</div>
+        <div>Found {toolInfo.output.structuredContent.totalCount} results</div>
         //                      ^ typed output
       )}
     </div>
@@ -184,7 +232,7 @@ The `skybridge/web` package comes with a set of hooks to help you build your wid
 - `useToolResponseMetadata`: A hook to get the initial tool `meta` returned when rendering the widget for the first time. The data inside this hook is not updated when the tool is called again.
 - `useToolInfo`: A hook to get the tool input, output, and response metadata with type inference. Provides a discriminated union based on status (pending/success).
 - `useCallTool`: A @tanstack/react-query inspired hook to send make additional tool calls inside a widget.
-- `createTypedHooks`: A factory that creates typed versions of `useCallTool` and `useToolInfo` with full type inference from your server type.
+- `generateHelpers`: A factory that creates typed versions of `useCallTool` and `useToolInfo` with full type inference from your server type.
 
 _useOpenAiGlobal_
 
@@ -222,17 +270,17 @@ const toolInfo = useToolInfo<{
 }>();
 
 // toolInfo.input is typed based on the input type
-// toolInfo.output is typed based on the output type (undefined when pending)
+// toolInfo.output.structuredContent is typed based on the output type (undefined when pending)
 // toolInfo.status narrows correctly: "pending" | "success"
 
 if (toolInfo.isPending) {
-  // toolInfo.output is undefined here
+  // toolInfo.output is undefined here (pending state)
   console.log(toolInfo.input.query);
 }
 
 if (toolInfo.isSuccess) {
-  // toolInfo.output is typed here
-  console.log(toolInfo.output.results);
+  // toolInfo.output.structuredContent is typed here
+  console.log(toolInfo.output.structuredContent.results);
 }
 ```
 
@@ -245,10 +293,10 @@ export function SearchWidget() {
   const toolInfo = useToolInfo<"search-voyage">();
   //                              ^ autocomplete for widget names
   // toolInfo.input is typed as { destination: string; departureDate?: string; ... }
-  // toolInfo.output is typed as { results: Array<...>; totalCount: number; } | undefined
+  // toolInfo.output.structuredContent is typed as { results: Array<...>; totalCount: number; }
 
   if (toolInfo.isSuccess) {
-    return <div>Found {toolInfo.output.totalCount} results</div>;
+    return <div>Found {toolInfo.output.structuredContent.totalCount} results</div>;
   }
 
   return <div>Searching for {toolInfo.input.destination}...</div>;
@@ -305,6 +353,50 @@ export const TestTool: React.FunctionComponent = () => {
 };
 ```
 
+**State Management**
+
+The `skybridge/web` package provides `createStore` for creating Zustand stores with automatic persistence to `window.openai.widgetState`. This is useful when you need more advanced state management than what `useWidgetState` provides.
+
+_createStore_
+
+```ts
+import { createStore } from "skybridge/web";
+
+type CounterState = {
+  count: number;
+  increment: () => void;
+  decrement: () => void;
+};
+
+const useCounterStore = createStore<CounterState>(
+  (set) => ({
+    count: 0,
+    increment: () => set((state) => ({ count: state.count + 1 })),
+    decrement: () => set((state) => ({ count: state.count - 1 })),
+  }),
+  { count: 0 } // Optional default state
+);
+
+// Use in your component
+function CounterWidget() {
+  const { count, increment, decrement } = useCounterStore();
+
+  return (
+    <div>
+      <p>Count: {count}</p>
+      <button onClick={increment}>Increment</button>
+      <button onClick={decrement}>Decrement</button>
+    </div>
+  );
+}
+```
+
+The `createStore` function:
+
+- Automatically persists state to `window.openai.widgetState`
+- Syncs with external state changes from the host
+- Only serializes state data, not methods
+
 ## Migrate your existing MCP server to a ChatGPT app
 
 If you're already using the `@modelcontextprotocol/sdk` to build a MCP server, you can migrate to a ChatGPT app by following these steps:

package/dist/src/server/index.d.ts

@@ -1,4 +1,4 @@
 export { McpServer } from "./server.js";
 export { widgetsDevServer } from "./widgetsDevServer.js";
-export type { ToolDef } from "./server.js";
+export type { ToolDef, McpServerTypes } from "./server.js";
 export type { InferTools, AnyToolRegistry, ToolNames, ToolInput, ToolOutput, } from "./inferUtilityTypes.js";

package/dist/src/server/inferUtilityTypes.d.ts

@@ -1,4 +1,4 @@
-import type { McpServer, ToolDef } from "./server.js";
+import type { McpServerTypes, ToolDef } from "./server.js";
 /**
  * Any tool registry shape (includes both widgets and regular tools).
  * Used as a constraint for type parameters that accept tool registries.
@@ -8,14 +8,20 @@ export type AnyToolRegistry = Record<string, ToolDef>;
  * Extract the tool registry type from an McpServer instance.
  * This includes both widgets (registered via widget()) and regular tools (registered via registerTool()).
  *
+ * Uses the `$types` property pattern for cross-package type inference.
+ * This works across package boundaries because TypeScript uses structural typing
+ * on the shape of `$types`, rather than nominal typing on the McpServer class itself.
+ *
  * @example
  * ```ts
  * type MyTools = InferTools<MyServer>;
  * // { "search": ToolDef<...>, "calculate": ToolDef<...> }
  * ```
  */
-export type InferTools<T> = T extends McpServer<infer W> ? W : never;
-type ExtractTool<T, K extends ToolNames<T>> = InferTools<T>[K];
+export type InferTools<ServerType> = ServerType extends {
+    $types: McpServerTypes<infer W>;
+} ? W : never;
+type ExtractTool<ServerType, K extends ToolNames<ServerType>> = InferTools<ServerType>[K];
 /**
  * Get a union of all tool names from an McpServer instance.
  * This includes both widgets and regular tools.
@@ -26,7 +32,7 @@ type ExtractTool<T, K extends ToolNames<T>> = InferTools<T>[K];
  * // "search" | "calculate" | "details"
  * ```
  */
-export type ToolNames<T> = keyof InferTools<T> & string;
+export type ToolNames<ServerType> = keyof InferTools<ServerType> & string;
 /**
  * Get the input type for a specific tool (widget or regular tool).
  *
@@ -35,7 +41,7 @@ export type ToolNames<T> = keyof InferTools<T> & string;
  * type SearchInput = ToolInput<MyServer, "search">;
  * ```
  */
-export type ToolInput<T, K extends ToolNames<T>> = ExtractTool<T, K>["input"];
+export type ToolInput<ServerType, ToolName extends ToolNames<ServerType>> = ExtractTool<ServerType, ToolName>["input"];
 /**
  * Get the output type for a specific tool (widget or regular tool).
  *
@@ -44,5 +50,5 @@ export type ToolInput<T, K extends ToolNames<T>> = ExtractTool<T, K>["input"];
  * type SearchOutput = ToolOutput<MyServer, "search">;
  * ```
  */
-export type ToolOutput<T, K extends ToolNames<T>> = ExtractTool<T, K>["output"];
+export type ToolOutput<ServerType, ToolName extends ToolNames<ServerType>> = ExtractTool<ServerType, ToolName>["output"];
 export {};

package/dist/src/server/server.d.ts

@@ -10,7 +10,19 @@ type McpServerOriginalResourceConfig = Omit<Resource, "uri" | "name" | "mimeType
 type McpServerOriginalToolConfig = Omit<Parameters<McpServerBase["registerTool"]>[1], "inputSchema" | "outputSchema">;
 type ExtractStructuredContent<T> = T extends {
     structuredContent: infer SC;
-} ? SC : {};
+} ? SC : never;
+/**
+ * Type-level marker interface for cross-package type inference.
+ * This enables TypeScript to infer tool types across package boundaries
+ * using structural typing on the $types property, rather than relying on
+ * class generic inference which fails when McpServer comes from different
+ * package installations.
+ *
+ * Inspired by tRPC's _def pattern and Hono's type markers.
+ */
+export interface McpServerTypes<TTools extends Record<string, ToolDef> = {}> {
+    readonly tools: TTools;
+}
 type AddTool<TTools, TName extends string, TInput extends ZodRawShape, TOutput> = McpServer<TTools & {
     [K in TName]: ToolDef<Infer<ZodObject<TInput>>, TOutput>;
 }>;
@@ -24,6 +36,7 @@ type ToolConfig<TInput extends ZodRawShape> = {
 };
 type ToolHandler<TInput extends ZodRawShape, TReturn extends CallToolResult = CallToolResult> = (args: Infer<ZodObject<TInput>>, extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => TReturn | Promise<TReturn>;
 export declare class McpServer<TTools extends Record<string, ToolDef> = {}> extends McpServerBase {
+    readonly $types: McpServerTypes<TTools>;
     widget<TName extends string, TInput extends ZodRawShape, TReturn extends CallToolResult>(name: TName, resourceConfig: McpServerOriginalResourceConfig, toolConfig: McpServerOriginalToolConfig & {
         inputSchema?: TInput;
         outputSchema?: ZodRawShape;

package/dist/src/server/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,IAAI,aAAa,GAG3B,MAAM,yCAAyC,CAAC;AAUjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAqF7B,MAAM,OAAO,SAEX,SAAQ,aAAa;IACrB,MAAM,CAKJ,IAAW,EACX,cAA+C,EAC/C,UAGC,EACD,YAA0C;QAE1C,MAAM,GAAG,GAAG,gBAAgB,IAAI,OAAO,CAAC;QACxC,MAAM,gBAAgB,GAAiB;YACrC,GAAG,CAAC,cAAc,CAAC,KAAK,IAAI,EAAE,CAAC;SAChC,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACzC,gBAAgB,CAAC,0BAA0B,CAAC,GAAG,UAAU,CAAC,WAAW,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,QAAQ,CACX,IAAI,EACJ,GAAG,EACH;YACE,GAAG,cAAc;YACjB,KAAK,EAAE,gBAAgB;SACxB,EACD,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;YACpB,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,WACE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,kBAAkB,CAAC;oBACjD,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,IAC/B,EAAE;gBACJ,CAAC,CAAC,uBAAuB,CAAC;YAE9B,MAAM,IAAI,GACR,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC;oBAC9B,SAAS;oBACT,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,eAAe,IAAI,MAAM,CAAC;oBAC1D,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC;iBAC5C,CAAC;gBACJ,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC;oBAC/B,SAAS;oBACT,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;YAET,OAAO;gBACL,QAAQ,EAAE;oBACR;wBACE,GAAG;wBACH,QAAQ,EAAE,qBAAqB;wBAC/B,IAAI,EAAE,IAAI;qBACX;iBACF;aACF,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,MAAM,QAAQ,GAAa;YACzB,GAAG,UAAU,CAAC,KAAK;YACnB,uBAAuB,EAAE,GAAG;YAC5B,gBAAgB,EAAE,GAAG;SACtB,CAAC;QAEF,IAAI,CAAC,YAAY,CACf,IAAI,EACJ;YACE,GAAG,UAAU;YACb,KAAK,EAAE,QAAQ;SAChB,EACD,YAAY,CACb,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC;IAkBQ,YAAY,CACnB,IAAY,EACZ,MAA6B,EAC7B,EAA2B;QAE3B,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,cAAc,CAAC,GAAW;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CACzB,YAAY,CACV,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,EACpE,OAAO,CACR,CACF,CAAC;QAEF,OAAO,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC;IAC7B,CAAC;CACF"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,IAAI,aAAa,GAG3B,MAAM,yCAAyC,CAAC;AAUjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAkG7B,MAAM,OAAO,SAEX,SAAQ,aAAa;IAGrB,MAAM,CAKJ,IAAW,EACX,cAA+C,EAC/C,UAGC,EACD,YAA0C;QAE1C,MAAM,GAAG,GAAG,gBAAgB,IAAI,OAAO,CAAC;QACxC,MAAM,gBAAgB,GAAiB;YACrC,GAAG,CAAC,cAAc,CAAC,KAAK,IAAI,EAAE,CAAC;SAChC,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACzC,gBAAgB,CAAC,0BAA0B,CAAC,GAAG,UAAU,CAAC,WAAW,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,QAAQ,CACX,IAAI,EACJ,GAAG,EACH;YACE,GAAG,cAAc;YACjB,KAAK,EAAE,gBAAgB;SACxB,EACD,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;YACpB,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,WACE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,kBAAkB,CAAC;oBACjD,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,IAC/B,EAAE;gBACJ,CAAC,CAAC,uBAAuB,CAAC;YAE9B,MAAM,IAAI,GACR,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC;oBAC9B,SAAS;oBACT,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,eAAe,IAAI,MAAM,CAAC;oBAC1D,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC;iBAC5C,CAAC;gBACJ,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC;oBAC/B,SAAS;oBACT,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;YAET,OAAO;gBACL,QAAQ,EAAE;oBACR;wBACE,GAAG;wBACH,QAAQ,EAAE,qBAAqB;wBAC/B,IAAI,EAAE,IAAI;qBACX;iBACF;aACF,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,MAAM,QAAQ,GAAa;YACzB,GAAG,UAAU,CAAC,KAAK;YACnB,uBAAuB,EAAE,GAAG;YAC5B,gBAAgB,EAAE,GAAG;SACtB,CAAC;QAEF,IAAI,CAAC,YAAY,CACf,IAAI,EACJ;YACE,GAAG,UAAU;YACb,KAAK,EAAE,QAAQ;SAChB,EACD,YAAY,CACb,CAAC;QAEF,OAAO,IAAyE,CAAC;IACnF,CAAC;IAkBQ,YAAY,CACnB,IAAY,EACZ,MAA6B,EAC7B,EAA2B;QAE3B,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,cAAc,CAAC,GAAW;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CACzB,YAAY,CACV,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,EACpE,OAAO,CACR,CACF,CAAC;QAEF,OAAO,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC;IAC7B,CAAC;CACF"}

package/dist/src/web/create-store.d.ts

@@ -0,0 +1,3 @@
+import { type StateCreator } from "zustand";
+import type { UnknownObject } from "./types.js";
+export declare function createStore<State extends UnknownObject>(storeCreator: StateCreator<State, [], [], State>, defaultState?: State | (() => State)): import("zustand").UseBoundStore<import("zustand").StoreApi<State>>;

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

@@ -0,0 +1,25 @@
+import { create } from "zustand";
+import { getInitialState, injectWidgetContext, serializeState } from "./helpers/state.js";
+export function createStore(storeCreator, defaultState) {
+    const initialState = getInitialState(defaultState);
+    const store = create()((...args) => {
+        const baseStore = storeCreator(...args);
+        if (initialState !== null) {
+            return { ...baseStore, ...initialState };
+        }
+        return baseStore;
+    });
+    store.subscribe((state) => {
+        if (window.openai) {
+            const serializedState = serializeState(state);
+            if (serializedState !== null && serializedState !== undefined) {
+                const stateToPersist = injectWidgetContext(serializedState);
+                if (stateToPersist !== null) {
+                    window.openai.setWidgetState(stateToPersist);
+                }
+            }
+        }
+    });
+    return store;
+}
+//# sourceMappingURL=create-store.js.map

package/dist/src/web/create-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-store.js","sourceRoot":"","sources":["../../../src/web/create-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,MAAM,SAAS,CAAC;AACpD,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,cAAc,EACf,MAAM,oBAAoB,CAAC;AAG5B,MAAM,UAAU,WAAW,CACzB,YAAgD,EAChD,YAAoC;IAEpC,MAAM,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAEnD,MAAM,KAAK,GAAG,MAAM,EAAS,CAC3B,CAAC,GAAG,IAAoD,EAAE,EAAE;QAC1D,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;QAExC,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,OAAO,EAAE,GAAG,SAAS,EAAE,GAAG,YAAY,EAAE,CAAC;QAC3C,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CACF,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,CAAC,KAAY,EAAE,EAAE;QAC/B,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAC9C,IAAI,eAAe,KAAK,IAAI,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;gBAC9D,MAAM,cAAc,GAAG,mBAAmB,CAAC,eAAwB,CAAC,CAAC;gBACrE,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;oBAC5B,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;gBAC/C,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC"}

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

@@ -0,0 +1,70 @@
+import { describe, it, expect, vi, beforeEach, afterEach, } from "vitest";
+import { createStore } from "./create-store.js";
+import { WIDGET_CONTEXT_KEY } from "./data-llm.js";
+describe("createStore", () => {
+    let OpenaiMock;
+    beforeEach(() => {
+        OpenaiMock = {
+            widgetState: null,
+            setWidgetState: vi.fn().mockResolvedValue(undefined),
+        };
+        vi.stubGlobal("openai", OpenaiMock);
+    });
+    afterEach(() => {
+        vi.unstubAllGlobals();
+        vi.resetAllMocks();
+    });
+    it("should create a store without default state", () => {
+        const storeCreator = () => ({
+            count: 0,
+        });
+        const store = createStore(storeCreator);
+        expect(store.getState()).toEqual({ count: 0 });
+    });
+    it("should create a store with default state", () => {
+        const storeCreator = () => ({
+            count: 0,
+            name: "initial",
+        });
+        const defaultState = { count: 5, name: "default" };
+        const store = createStore(storeCreator, defaultState);
+        expect(store.getState()).toEqual({ count: 5, name: "default" });
+    });
+    it("should initialize from window.openai.widgetState when available", () => {
+        const storeCreator = () => ({
+            count: 0,
+            name: "initial",
+        });
+        const windowState = { count: 20, name: "window" };
+        OpenaiMock.widgetState = windowState;
+        const store = createStore(storeCreator);
+        expect(store.getState()).toEqual({ count: 20, name: "window" });
+    });
+    it("should persist state changes to window.openai.setWidgetState", async () => {
+        const storeCreator = (set) => ({
+            count: 0,
+            increment: () => set((state) => ({ count: state.count + 1 })),
+        });
+        const store = createStore(storeCreator);
+        store.getState().increment();
+        await vi.waitFor(() => {
+            expect(OpenaiMock.setWidgetState).toHaveBeenCalled();
+        });
+        const callArgs = OpenaiMock.setWidgetState.mock.calls[0]?.[0];
+        expect(callArgs).toEqual({ count: 1 });
+    });
+    it("should filter widget context from initial state", () => {
+        const storeCreator = () => ({
+            count: 0,
+        });
+        const windowState = {
+            count: 5,
+            [WIDGET_CONTEXT_KEY]: "context-value",
+        };
+        OpenaiMock.widgetState = windowState;
+        const store = createStore(storeCreator);
+        expect(store.getState()).toEqual({ count: 5 });
+        expect(store.getState()[WIDGET_CONTEXT_KEY]).toBeUndefined();
+    });
+});
+//# sourceMappingURL=create-store.test.js.map

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

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

package/dist/src/web/data-llm.d.ts

@@ -0,0 +1,14 @@
+import { type ReactNode } from "react";
+export type DataLLMContent = string;
+export interface DataLLMNode {
+    id: string;
+    parentId: string | null;
+    content: string | null;
+}
+export declare const WIDGET_CONTEXT_KEY: "__widget_context";
+interface DataLLMProps {
+    content: DataLLMContent | null | undefined;
+    children?: ReactNode;
+}
+export declare function DataLLM({ content, children }: DataLLMProps): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/src/web/data-llm.js

@@ -0,0 +1,68 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createContext, useContext, useEffect, useId, } from "react";
+export const WIDGET_CONTEXT_KEY = "__widget_context";
+const nodes = new Map();
+function setNode(node) {
+    nodes.set(node.id, node);
+    onChange();
+}
+function removeNode(id) {
+    nodes.delete(id);
+    onChange();
+}
+function onChange() {
+    const description = getLLMDescriptionString();
+    window.openai.setWidgetState({
+        ...window.openai.widgetState,
+        [WIDGET_CONTEXT_KEY]: description,
+    });
+}
+const ParentIdContext = createContext(null);
+export function DataLLM({ content, children }) {
+    const parentId = useContext(ParentIdContext);
+    const id = useId();
+    useEffect(() => {
+        if (content) {
+            setNode({
+                id,
+                parentId,
+                content,
+            });
+        }
+        else {
+            removeNode(id);
+        }
+        return () => {
+            removeNode(id);
+        };
+    }, [id, parentId, content]);
+    return (_jsx(ParentIdContext.Provider, { value: id, children: children }));
+}
+function getLLMDescriptionString() {
+    const byParent = new Map();
+    for (const node of Array.from(nodes.values())) {
+        const key = node.parentId ?? null;
+        if (!byParent.has(key))
+            byParent.set(key, []);
+        byParent.get(key).push(node);
+    }
+    for (const list of byParent.values()) {
+        list.sort((a, b) => a.id.localeCompare(b.id));
+    }
+    const lines = [];
+    function traverseTree(parentId, depth) {
+        const children = byParent.get(parentId);
+        if (!children)
+            return;
+        for (const child of children) {
+            if (child.content && child.content.trim()) {
+                const indent = "  ".repeat(depth);
+                lines.push(`${indent}- ${child.content.trim()}`);
+            }
+            traverseTree(child.id, depth + 1);
+        }
+    }
+    traverseTree(null, 0);
+    return lines.join("\n");
+}
+//# sourceMappingURL=data-llm.js.map

package/dist/src/web/data-llm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-llm.js","sourceRoot":"","sources":["../../../src/web/data-llm.tsx"],"names":[],"mappings":";AAAA,OAAO,EACL,aAAa,EACb,UAAU,EACV,SAAS,EACT,KAAK,GAEN,MAAM,OAAO,CAAC;AAUf,MAAM,CAAC,MAAM,kBAAkB,GAAG,kBAA2B,CAAC;AAE9D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;AAE7C,SAAS,OAAO,CAAC,IAAiB;IAChC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACzB,QAAQ,EAAE,CAAC;AACb,CAAC;AAED,SAAS,UAAU,CAAC,EAAU;IAC5B,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjB,QAAQ,EAAE,CAAC;AACb,CAAC;AAED,SAAS,QAAQ;IACf,MAAM,WAAW,GAAG,uBAAuB,EAAE,CAAC;IAC9C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;QAC3B,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW;QAC5B,CAAC,kBAAkB,CAAC,EAAE,WAAW;KAClC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,eAAe,GAAG,aAAa,CAAgB,IAAI,CAAC,CAAC;AAO3D,MAAM,UAAU,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAgB;IACzD,MAAM,QAAQ,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IAC7C,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;IAEnB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC;gBACN,EAAE;gBACF,QAAQ;gBACR,OAAO;aACR,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,EAAE,CAAC,CAAC;QACjB,CAAC;QAED,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,EAAE,CAAC,CAAC;QACjB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5B,OAAO,CACL,KAAC,eAAe,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,YAAG,QAAQ,GAA4B,CAC3E,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB;IAC9B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAgC,CAAC;IACzD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC9C,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,SAAS,YAAY,CAAC,QAAuB,EAAE,KAAa;QAC1D,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAClC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,KAAK,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACnD,CAAC;YACD,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAEtB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}

package/dist/src/web/data-llm.test.js

@@ -0,0 +1,76 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { render } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi, } from "vitest";
+import { DataLLM } from "./data-llm.js";
+describe("DataLLM", () => {
+    let OpenaiMock;
+    beforeEach(() => {
+        OpenaiMock = {
+            widgetState: {},
+            setWidgetState: vi.fn(),
+        };
+        // Use Object.defineProperty to ensure it persists
+        Object.defineProperty(globalThis, "openai", {
+            value: OpenaiMock,
+            writable: true,
+            configurable: true,
+        });
+        // Also set on window for browser-like environment
+        if (typeof window !== "undefined") {
+            Object.defineProperty(window, "openai", {
+                value: OpenaiMock,
+                writable: true,
+                configurable: true,
+            });
+        }
+        vi.stubGlobal("openai", OpenaiMock);
+    });
+    afterEach(() => {
+        vi.resetAllMocks();
+        // Keep the mock available for React cleanup, but reset it
+        if (typeof window !== "undefined" && window.openai) {
+            window.openai.setWidgetState = vi.fn();
+            window.openai.widgetState = {};
+        }
+    });
+    it("should register a node with content and call setWidgetState", () => {
+        render(_jsx(DataLLM, { content: "Test content", children: _jsx("div", { children: "Child" }) }));
+        expect(OpenaiMock.setWidgetState).toHaveBeenCalled();
+        const callArgs = OpenaiMock.setWidgetState.mock.calls[0]?.[0];
+        expect(callArgs).toHaveProperty("__widget_context");
+        expect(callArgs?.__widget_context).toContain("- Test content");
+    });
+    it("should preserve existing widgetState when updating context", () => {
+        OpenaiMock.widgetState = { existingKey: "existingValue" };
+        render(_jsx(DataLLM, { content: "Test content", children: _jsx("div", { children: "Child" }) }));
+        const callArgs = OpenaiMock.setWidgetState.mock.calls[0]?.[0];
+        expect(callArgs).toHaveProperty("existingKey", "existingValue");
+        expect(callArgs).toHaveProperty("__widget_context");
+    });
+    it("should handle deeply nested DataLLM components", () => {
+        render(_jsxs(DataLLM, { content: "Level 1", children: [_jsx(DataLLM, { content: "Level 2A" }), _jsx(DataLLM, { content: "Level 2B", children: _jsx(DataLLM, { content: "Level 3", children: _jsx("div", { children: "Content" }) }) })] }));
+        const callArgs = OpenaiMock.setWidgetState.mock.calls[OpenaiMock.setWidgetState.mock.calls.length - 1]?.[0];
+        const context = callArgs?.__widget_context;
+        expect(context).toContain("- Level 1");
+        expect(context).toContain("  - Level 2A");
+        expect(context).toContain("  - Level 2B");
+        expect(context).toContain("    - Level 3");
+    });
+    it("should update context when content changes", () => {
+        const { rerender } = render(_jsx(DataLLM, { content: "Initial content", children: _jsx("div", { children: "Child" }) }));
+        const initialCalls = OpenaiMock.setWidgetState.mock.calls.length;
+        rerender(_jsx(DataLLM, { content: "Updated content", children: _jsx("div", { children: "Child" }) }));
+        expect(OpenaiMock.setWidgetState.mock.calls.length).toBeGreaterThan(initialCalls);
+        const lastCallArgs = OpenaiMock.setWidgetState.mock.calls[OpenaiMock.setWidgetState.mock.calls.length - 1]?.[0];
+        expect(lastCallArgs?.__widget_context).toContain("- Updated content");
+    });
+    it("should remove node and update context when component unmounts", () => {
+        const { unmount } = render(_jsx(DataLLM, { content: "Content to remove", children: _jsx("div", { children: "Child" }) }));
+        const callsBeforeUnmount = OpenaiMock.setWidgetState.mock.calls.length;
+        unmount();
+        expect(OpenaiMock.setWidgetState.mock.calls.length).toBeGreaterThan(callsBeforeUnmount);
+        const lastCallArgs = OpenaiMock.setWidgetState.mock.calls[OpenaiMock.setWidgetState.mock.calls.length - 1]?.[0];
+        expect(lastCallArgs?.__widget_context).not.toContain("Content to remove");
+    });
+});
+//# sourceMappingURL=data-llm.test.js.map

package/dist/src/web/data-llm.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-llm.test.js","sourceRoot":"","sources":["../../../src/web/data-llm.test.tsx"],"names":[],"mappings":"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"}

package/dist/src/web/{typed-hooks.d.ts → generate-helpers.d.ts}

@@ -1,14 +1,13 @@
-import { type CallToolState } from "./hooks/use-call-tool.js";
+import { type CallToolState, type CallToolFn, type CallToolAsyncFn } from "./hooks/use-call-tool.js";
 import { type ToolState } from "./hooks/use-tool-info.js";
-import type { McpServer, InferTools, AnyToolRegistry, ToolInput, ToolOutput } from "../server/index.js";
+import type { InferTools, ToolInput, ToolOutput } from "../server/index.js";
 import type { CallToolResponse, Prettify, Objectify } from "./types.js";
-type TypedCallToolReturn<TInput, TOutput> = Prettify<CallToolState<CallToolResponse & {
+type TypedCallToolResponse<TOutput> = CallToolResponse & {
     structuredContent: TOutput;
-}> & {
-    callTool: (args: TInput) => void;
-    callToolAsync: (args: TInput) => Promise<CallToolResponse & {
-        structuredContent: TOutput;
-    }>;
+};
+type TypedCallToolReturn<TInput, TOutput> = Prettify<CallToolState<TypedCallToolResponse<TOutput>> & {
+    callTool: CallToolFn<TInput, TypedCallToolResponse<TOutput>>;
+    callToolAsync: CallToolAsyncFn<TInput, TypedCallToolResponse<TOutput>>;
 }>;
 type TypedToolInfoReturn<TInput, TOutput> = ToolState<Objectify<TInput>, Objectify<TOutput>, Objectify<{}>>;
 /**
@@ -18,7 +17,9 @@ type TypedToolInfoReturn<TInput, TOutput> = ToolState<Objectify<TInput>, Objecti
  * 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 T - 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
@@ -38,9 +39,9 @@ type TypedToolInfoReturn<TInput, TOutput> = ToolState<Objectify<TInput>, Objecti
  * ```typescript
  * // web/src/skybridge.ts (one-time setup)
  * import type { AppType } from "../server";
- * import { createTypedHooks } from "skybridge/web";
+ * import { generateHelpers } from "skybridge/web";
  *
- * export const { useCallTool, useToolInfo } = createTypedHooks<AppType>();
+ * export const { useCallTool, useToolInfo } = generateHelpers<AppType>();
  * ```
  *
  * @example
@@ -57,11 +58,11 @@ type TypedToolInfoReturn<TInput, TOutput> = ToolState<Objectify<TInput>, Objecti
  *   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
  * }
  * ```
  */
-export declare function createTypedHooks<T extends McpServer<AnyToolRegistry>>(): {
+export declare function generateHelpers<ServerType = never>(): {
     /**
      * Typed version of `useCallTool` that provides autocomplete for tool names
      * and type inference for inputs and outputs.
@@ -81,7 +82,7 @@ export declare function createTypedHooks<T extends McpServer<AnyToolRegistry>>()
      * }
      * ```
      */
-    useCallTool: <K extends keyof InferTools<T> & string>(name: K) => TypedCallToolReturn<InferTools<T>[K]["input"], InferTools<T>[K]["output"]>;
+    useCallTool: <ToolName extends keyof InferTools<ServerType> & string>(name: ToolName) => TypedCallToolReturn<ToolInput<ServerType, ToolName>, ToolOutput<ServerType, ToolName>>;
     /**
      * Typed version of `useToolInfo` that provides autocomplete for widget names
      * and type inference for inputs, outputs, and responseMetadata.
@@ -93,7 +94,7 @@ export declare function createTypedHooks<T extends McpServer<AnyToolRegistry>>()
      * ```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.status narrows correctly: "pending" | "success"
      *
      * if (toolInfo.isPending) {
@@ -107,6 +108,6 @@ export declare function createTypedHooks<T extends McpServer<AnyToolRegistry>>()
      * }
      * ```
      */
-    useToolInfo: <K extends keyof InferTools<T> & string>() => TypedToolInfoReturn<ToolInput<T, K>, ToolOutput<T, K>>;
+    useToolInfo: <ToolName extends keyof InferTools<ServerType> & string>() => TypedToolInfoReturn<ToolInput<ServerType, ToolName>, ToolOutput<ServerType, ToolName>>;
 };
 export {};