skybridge 0.0.0-dev.e386f86 → 0.0.0-dev.e4c9359

package/README.md

@@ -97,6 +97,84 @@ export default defineConfig({
 });
 ```
 
+**Typed Hooks**
+
+Skybridge provides fully typed hooks that give you autocomplete for tool names and type inference for inputs/outputs - similar to tRPC. This is opt-in and requires exporting your server type.
+
+> **Tip:** For the best TypeScript experience, use typed hooks throughout your application. They provide autocomplete, type safety, and better IDE support.
+
+_Server setup (server/src/index.ts)_
+
+```ts
+import { McpServer } from "skybridge/server";
+import { z } from "zod";
+
+const server = new McpServer({ name: "my-app", version: "1.0" }, {})
+  .widget("search-voyage", {}, {
+    description: "Search for trips",
+    inputSchema: {
+      destination: z.string(),
+      departureDate: z.string().optional(),
+    },
+    outputSchema: {
+      results: z.array(z.object({ id: z.string(), name: z.string() })),
+      totalCount: z.number(),
+    },
+  }, async ({ destination }) => {
+    // Your tool logic here...
+    return { content: [{ type: "text", text: `Found trips to ${destination}` }] };
+  })
+  .widget("get-details", {}, {
+    inputSchema: { tripId: z.string() },
+  }, async ({ tripId }) => {
+    return { content: [{ type: "text", text: `Details for ${tripId}` }] };
+  });
+
+// Export the server type for the client
+export type AppType = typeof server;
+```
+
+_One-time setup (web/src/skybridge.ts)_
+
+Create typed hooks once and export them for use across your app. This file acts as a bridge between your server types and your widgets:
+
+```ts
+import type { AppType } from "../server"; // type-only import
+import { createTypedHooks } from "skybridge/web";
+
+export const { useCallTool, useToolInfo } = createTypedHooks<AppType>();
+```
+
+_Usage in widgets (web/src/widgets/search.tsx)_
+
+```tsx
+import { useCallTool, useToolInfo } from "../skybridge"; // import typed hooks
+
+export function SearchWidget() {
+  const { callTool, data, isPending } = useCallTool("search-voyage");
+  //                                                 ^ autocomplete for tool names
+  const toolInfo = useToolInfo<"search-voyage">();
+  //                              ^ autocomplete for widget names
+
+  const handleSearch = () => {
+    callTool({ destination: "Spain" });
+    //         ^ autocomplete for input fields
+  };
+
+  return (
+    <div>
+      <button onClick={handleSearch} disabled={isPending}>
+        Search
+      </button>
+      {toolInfo.isSuccess && (
+        <div>Found {toolInfo.output.totalCount} results</div>
+        //                      ^ typed output
+      )}
+    </div>
+  );
+}
+```
+
 **Hooks**
 
 The `skybridge/web` package comes with a set of hooks to help you build your widgets :
@@ -104,7 +182,9 @@ The `skybridge/web` package comes with a set of hooks to help you build your wid
 - `useOpenAiGlobal`: A generic hook to get any global data from the OpenAI iFrame skybridge runtime (in `window.openai`).
 - `useToolOutput`: A hook to get the initial tool `structuredContent` returned when rendering the widget for the first time. The data inside this hook is not updated when the tool is called again.
 - `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.
 
 _useOpenAiGlobal_
 
@@ -130,6 +210,51 @@ import { useToolResponseMetadata } from "skybridge/web";
 const toolResponseMetadata = useToolResponseMetadata();
 ```
 
+_useToolInfo_
+
+```ts
+import { useToolInfo } from "skybridge/web";
+
+const toolInfo = useToolInfo<{
+  input: { query: string };
+  output: { results: string[] };
+  responseMetadata: { id: number };
+}>();
+
+// toolInfo.input is typed based on the input type
+// toolInfo.output is typed based on the output type (undefined when pending)
+// toolInfo.status narrows correctly: "pending" | "success"
+
+if (toolInfo.isPending) {
+  // toolInfo.output is undefined here
+  console.log(toolInfo.input.query);
+}
+
+if (toolInfo.isSuccess) {
+  // toolInfo.output is typed here
+  console.log(toolInfo.output.results);
+}
+```
+
+_useToolInfo_ with typed hooks (recommended)
+
+```tsx
+import { useToolInfo } from "../skybridge"; // import typed hooks
+
+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
+
+  if (toolInfo.isSuccess) {
+    return <div>Found {toolInfo.output.totalCount} results</div>;
+  }
+
+  return <div>Searching for {toolInfo.input.destination}...</div>;
+}
+```
+
 _useCallTool_ in synchronous mode
 
 ```ts

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

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

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

@@ -0,0 +1,48 @@
+import type { McpServer, 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.
+ */
+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()).
+ *
+ * @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];
+/**
+ * Get a union of all tool names from an McpServer instance.
+ * This includes both widgets and regular tools.
+ *
+ * @example
+ * ```ts
+ * type Names = ToolNames<MyServer>;
+ * // "search" | "calculate" | "details"
+ * ```
+ */
+export type ToolNames<T> = keyof InferTools<T> & string;
+/**
+ * Get the input type for a specific tool (widget or regular tool).
+ *
+ * @example
+ * ```ts
+ * type SearchInput = ToolInput<MyServer, "search">;
+ * ```
+ */
+export type ToolInput<T, K extends ToolNames<T>> = ExtractTool<T, K>["input"];
+/**
+ * Get the output type for a specific tool (widget or regular tool).
+ *
+ * @example
+ * ```ts
+ * type SearchOutput = ToolOutput<MyServer, "search">;
+ * ```
+ */
+export type ToolOutput<T, K extends ToolNames<T>> = ExtractTool<T, K>["output"];
+export {};

package/dist/src/server/inferUtilityTypes.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=inferUtilityTypes.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"inferUtilityTypes.js","sourceRoot":"","sources":["../../../src/server/inferUtilityTypes.ts"],"names":[],"mappings":""}

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

@@ -1,13 +1,35 @@
-import { McpServer as McpServerBase, type ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { Resource } from "@modelcontextprotocol/sdk/types.js";
-import type { ZodRawShape } from "zod";
+import { McpServer as McpServerBase, type RegisteredTool } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { Resource, ToolAnnotations, CallToolResult, ServerRequest, ServerNotification } from "@modelcontextprotocol/sdk/types.js";
+import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
+import type { ZodRawShape, ZodObject, infer as Infer } from "zod";
+export type ToolDef<TInput = unknown, TOutput = unknown> = {
+    input: TInput;
+    output: TOutput;
+};
 type McpServerOriginalResourceConfig = Omit<Resource, "uri" | "name" | "mimeType">;
-type McpServerOriginalToolConfig = Omit<Parameters<McpServer["registerTool"]>[1], "inputSchema" | "outputSchema">;
-export declare class McpServer extends McpServerBase {
-    widget<InputArgs extends ZodRawShape, OutputArgs extends ZodRawShape>(name: string, resourceConfig: McpServerOriginalResourceConfig, toolConfig: McpServerOriginalToolConfig & {
-        inputSchema?: InputArgs;
-        outputSchema?: OutputArgs;
-    }, toolCallback: ToolCallback<InputArgs>): void;
+type McpServerOriginalToolConfig = Omit<Parameters<McpServerBase["registerTool"]>[1], "inputSchema" | "outputSchema">;
+type ExtractStructuredContent<T> = T extends {
+    structuredContent: infer SC;
+} ? SC : {};
+type AddTool<TTools, TName extends string, TInput extends ZodRawShape, TOutput> = McpServer<TTools & {
+    [K in TName]: ToolDef<Infer<ZodObject<TInput>>, TOutput>;
+}>;
+type ToolConfig<TInput extends ZodRawShape> = {
+    title?: string;
+    description?: string;
+    inputSchema?: TInput;
+    outputSchema?: ZodRawShape;
+    annotations?: ToolAnnotations;
+    _meta?: Record<string, unknown>;
+};
+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 {
+    widget<TName extends string, TInput extends ZodRawShape, TReturn extends CallToolResult>(name: TName, resourceConfig: McpServerOriginalResourceConfig, toolConfig: McpServerOriginalToolConfig & {
+        inputSchema?: TInput;
+        outputSchema?: ZodRawShape;
+    }, toolCallback: ToolHandler<TInput, TReturn>): AddTool<TTools, TName, TInput, ExtractStructuredContent<TReturn>>;
+    registerTool<TName extends string, InputArgs extends ZodRawShape, TReturn extends CallToolResult>(name: TName, config: ToolConfig<InputArgs>, cb: ToolHandler<InputArgs, TReturn>): AddTool<TTools, TName, InputArgs, ExtractStructuredContent<TReturn>>;
+    registerTool<InputArgs extends ZodRawShape>(name: string, config: ToolConfig<InputArgs>, cb: ToolHandler<InputArgs>): RegisteredTool;
     private lookupDistFile;
 }
 export {};

package/dist/src/server/server.js

@@ -48,6 +48,11 @@ export class McpServer extends McpServerBase {
             ...toolConfig,
             _meta: toolMeta,
         }, toolCallback);
+        return this;
+    }
+    registerTool(name, config, cb) {
+        super.registerTool(name, config, cb);
+        return this;
     }
     lookupDistFile(key) {
         const manifest = JSON.parse(readFileSync(path.join(process.cwd(), "dist", "assets", ".vite", "manifest.json"), "utf-8"));

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,GAE3B,MAAM,yCAAyC,CAAC;AAGjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AA+C7B,MAAM,OAAO,SAAU,SAAQ,aAAa;IAC1C,MAAM,CACJ,IAAY,EACZ,cAA+C,EAC/C,UAGC,EACD,YAAqC;QAErC,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;IACJ,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;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"}

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

@@ -8,6 +8,67 @@ export declare function createMockMcpServer(): {
     mockResource: MockInstance<McpServer["resource"]>;
     mockRegisterTool: MockInstance<McpServer["registerTool"]>;
 };
+export declare function createTestServer(): McpServer<{
+    "search-voyage": import("../server/server.js").ToolDef<{
+        destination: string;
+        departureDate?: string | undefined;
+        maxPrice?: number | undefined;
+    }, {
+        results: {
+            id: string;
+            name: string;
+            price: number;
+        }[];
+        totalCount: number;
+    }>;
+} & {
+    "get-trip-details": import("../server/server.js").ToolDef<{
+        tripId: string;
+    }, {
+        name: string;
+        description: string;
+        images: string[];
+    }>;
+} & {
+    "no-input-widget": import("../server/server.js").ToolDef<{}, {}>;
+} & {
+    "inferred-output-widget": import("../server/server.js").ToolDef<{
+        query: string;
+    }, {
+        inferredResults: {
+            id: string;
+            score: number;
+        }[];
+        inferredCount: number;
+    }>;
+} & {
+    "calculate-price": import("../server/server.js").ToolDef<{
+        tripId: string;
+        passengers: number;
+    }, {
+        totalPrice: number;
+        currency: string;
+    }>;
+} & {
+    "inferred-tool": import("../server/server.js").ToolDef<{
+        itemId: string;
+    }, {
+        itemDetails: {
+            name: string;
+            available: boolean;
+        };
+        fetchedAt: string;
+    }>;
+}>;
+export declare function createMinimalTestServer(): McpServer<{
+    "search-voyage": import("../server/server.js").ToolDef<{
+        destination: string;
+    }, {
+        results: {
+            id: string;
+        }[];
+    }>;
+}>;
 /**
  * Mock extra parameter for resource callback
  */

package/dist/src/test/utils.js

@@ -1,5 +1,6 @@
 import { vi } from "vitest";
-import { McpServer, McpServer as McpServerBase } from "../server/server.js";
+import { McpServer } from "../server/server.js";
+import { z } from "zod";
 /**
  * Creates a real McpServer instance for testing
  */
@@ -18,6 +19,126 @@ export function createMockMcpServer() {
         mockRegisterTool,
     };
 }
+export function createTestServer() {
+    return new McpServer({ name: "test-app", version: "1.0.0" }, {})
+        .widget("search-voyage", {}, {
+        description: "Search for voyages",
+        inputSchema: {
+            destination: z.string(),
+            departureDate: z.string().optional(),
+            maxPrice: z.number().optional(),
+        },
+        outputSchema: {
+            results: z.array(z.object({
+                id: z.string(),
+                name: z.string(),
+                price: z.number(),
+            })),
+            totalCount: z.number(),
+        },
+    }, async ({ destination }) => {
+        return {
+            content: [{ type: "text", text: `Found trips to ${destination}` }],
+            structuredContent: {
+                results: [{ id: "1", name: "Trip", price: 1000 }],
+                totalCount: 1,
+            },
+        };
+    })
+        .widget("get-trip-details", {}, {
+        description: "Get trip details",
+        inputSchema: {
+            tripId: z.string(),
+        },
+        outputSchema: {
+            name: z.string(),
+            description: z.string(),
+            images: z.array(z.string()),
+        },
+    }, async ({ tripId }) => {
+        return {
+            content: [{ type: "text", text: `Details for ${tripId}` }],
+            structuredContent: {
+                name: "Trip",
+                description: "A great trip",
+                images: ["image1.jpg"],
+            },
+        };
+    })
+        .widget("no-input-widget", {}, {
+        description: "Widget with no input",
+        inputSchema: {},
+        outputSchema: {},
+    }, async () => {
+        return {
+            content: [{ type: "text", text: "No input needed" }],
+            structuredContent: {},
+        };
+    })
+        .widget("inferred-output-widget", {}, {
+        description: "Widget with output inferred from callback",
+        inputSchema: {
+            query: z.string(),
+        },
+    }, async ({ query }) => {
+        return {
+            content: [{ type: "text", text: `Query: ${query}` }],
+            structuredContent: {
+                inferredResults: [{ id: "inferred-1", score: 0.95 }],
+                inferredCount: 1,
+            },
+        };
+    })
+        .registerTool("calculate-price", {
+        description: "Calculate trip price",
+        inputSchema: {
+            tripId: z.string(),
+            passengers: z.number(),
+        },
+        outputSchema: {
+            totalPrice: z.number(),
+            currency: z.string(),
+        },
+    }, async ({ tripId, passengers }) => {
+        return {
+            content: [{ type: "text", text: `Price for ${tripId}` }],
+            structuredContent: {
+                totalPrice: 1000 * passengers,
+                currency: "USD",
+            },
+        };
+    })
+        .registerTool("inferred-tool", {
+        description: "Tool with output inferred from callback",
+        inputSchema: {
+            itemId: z.string(),
+        },
+    }, async ({ itemId }) => {
+        return {
+            content: [{ type: "text", text: `Item: ${itemId}` }],
+            structuredContent: {
+                itemDetails: { name: "Inferred Item", available: true },
+                fetchedAt: "2024-01-01",
+            },
+        };
+    });
+}
+export function createMinimalTestServer() {
+    return new McpServer({ name: "test-app", version: "1.0.0" }, {}).widget("search-voyage", {}, {
+        description: "Search for voyages",
+        inputSchema: {
+            destination: z.string(),
+        },
+        outputSchema: {
+            results: z.array(z.object({ id: z.string() })),
+        },
+    }, async ({ destination }) => {
+        return {
+            content: [{ type: "text", text: `Found trips to ${destination}` }],
+            structuredContent: { results: [{ id: "1" }] },
+        };
+    });
+}
 /**
  * Mock extra parameter for resource callback
  */

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/test/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAqB,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE5E;;GAEG;AACH,MAAM,UAAU,mBAAmB;IAKjC,mCAAmC;IACnC,MAAM,MAAM,GAAG,IAAI,SAAS,CAC1B;QACE,IAAI,EAAE,kBAAkB;QACxB,OAAO,EAAE,OAAO;KACjB,EACD,EAAE,YAAY,EAAE,EAAE,EAAE,CACrB,CAAC;IAEF,6CAA6C;IAC7C,MAAM,YAAY,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAClD,MAAM,gBAAgB,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAE1D,OAAO;QACL,MAAM;QACN,YAAY;QACZ,gBAAgB;KACjB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO;QACL,WAAW,EAAE;YACX,OAAO,EAAE,EAAE,IAAI,EAAE;SAClB;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,GAA2B;IACpD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/test/utils.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,41 @@
 import type { CallToolArgs, CallToolResponse } 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;
+};
+export type CallToolState<TData extends CallToolResponse = CallToolResponse> = CallToolIdleState | CallToolPendingState | CallToolSuccessState<TData> | CallToolErrorState;
 type SideEffects<ToolArgs, ToolResponse> = {
     onSuccess?: (data: ToolResponse, toolArgs: ToolArgs) => void;
     onError?: (error: unknown, toolArgs: ToolArgs) => void;

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

@@ -1,5 +1,5 @@
 import type { UnknownObject } from "../types.js";
-type ToolPendingState<ToolInput extends UnknownObject> = {
+export type ToolPendingState<ToolInput extends UnknownObject> = {
     status: "pending";
     isPending: true;
     isSuccess: false;
@@ -7,7 +7,7 @@ type ToolPendingState<ToolInput extends UnknownObject> = {
     output: undefined;
     responseMetadata: undefined;
 };
-type ToolSuccessState<ToolInput extends UnknownObject, ToolOutput extends UnknownObject, ToolResponseMetadata extends UnknownObject> = {
+export type ToolSuccessState<ToolInput extends UnknownObject, ToolOutput extends UnknownObject, ToolResponseMetadata extends UnknownObject> = {
     status: "success";
     isPending: false;
     isSuccess: true;
@@ -15,7 +15,7 @@ type ToolSuccessState<ToolInput extends UnknownObject, ToolOutput extends Unknow
     output: ToolOutput;
     responseMetadata: ToolResponseMetadata;
 };
-type ToolState<ToolInput extends UnknownObject, ToolOutput extends UnknownObject, ToolResponseMetadata extends UnknownObject> = ToolPendingState<ToolInput> | ToolSuccessState<ToolInput, ToolOutput, ToolResponseMetadata>;
+export type ToolState<ToolInput extends UnknownObject, ToolOutput extends UnknownObject, ToolResponseMetadata extends UnknownObject> = ToolPendingState<ToolInput> | ToolSuccessState<ToolInput, ToolOutput, ToolResponseMetadata>;
 type ToolSignature = {
     input: UnknownObject;
     output: UnknownObject;

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

@@ -2,3 +2,4 @@ export * from "./types.js";
 export { mountWidget } from "./mount-widget.js";
 export { skybridge } from "./plugin.js";
 export * from "./hooks/index.js";
+export { createTypedHooks } from "./typed-hooks.js";

package/dist/src/web/index.js

@@ -2,4 +2,5 @@ export * from "./types.js";
 export { mountWidget } from "./mount-widget.js";
 export { skybridge } from "./plugin.js";
 export * from "./hooks/index.js";
+export { createTypedHooks } from "./typed-hooks.js";
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/web/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/web/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/src/web/typed-hooks.d.ts

@@ -0,0 +1,112 @@
+import { type CallToolState } 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 { CallToolResponse, Prettify, Objectify } from "./types.js";
+type TypedCallToolReturn<TInput, TOutput> = Prettify<CallToolState<CallToolResponse & {
+    structuredContent: TOutput;
+}> & {
+    callTool: (args: TInput) => void;
+    callToolAsync: (args: TInput) => Promise<CallToolResponse & {
+        structuredContent: TOutput;
+    }>;
+}>;
+type TypedToolInfoReturn<TInput, TOutput> = ToolState<Objectify<TInput>, Objectify<TOutput>, Objectify<{}>>;
+/**
+ * Creates typed versions of skybridge hooks with full type inference
+ * for tool names, inputs, and outputs.
+ *
+ * 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`.
+ *
+ * @example
+ * ```typescript
+ * // server/src/index.ts
+ * const server = new McpServer({ name: "my-app", version: "1.0" }, {})
+ *   .widget("search-voyage", {}, {
+ *     inputSchema: { destination: z.string() },
+ *     outputSchema: { results: z.array(z.string()) },
+ *   }, async ({ destination }) => {
+ *     return { content: [{ type: "text", text: `Found trips to ${destination}` }] };
+ *   });
+ *
+ * export type AppType = typeof server;
+ * ```
+ *
+ * @example
+ * ```typescript
+ * // web/src/skybridge.ts (one-time setup)
+ * import type { AppType } from "../server";
+ * import { createTypedHooks } from "skybridge/web";
+ *
+ * export const { useCallTool, useToolInfo } = createTypedHooks<AppType>();
+ * ```
+ *
+ * @example
+ * ```typescript
+ * // web/src/widgets/search.tsx (usage)
+ * import { useCallTool, useToolInfo } from "../skybridge";
+ *
+ * export function SearchWidget() {
+ *   const { callTool, data } = useCallTool("search-voyage");
+ *   //                                      ^ autocomplete for tool names
+ *   callTool({ destination: "Spain" });
+ *   //         ^ autocomplete for input fields
+ *
+ *   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
+ * }
+ * ```
+ */
+export declare function createTypedHooks<T extends McpServer<AnyToolRegistry>>(): {
+    /**
+     * Typed version of `useCallTool` that provides autocomplete for tool names
+     * and type inference for inputs and outputs.
+     *
+     * @param name - The name of the widget to call. Autocompletes based on your server's widget registry.
+     * @returns A hook with typed `callTool` function and `data` property.
+     *
+     * @example
+     * ```typescript
+     * const { callTool, data, isPending } = useCallTool("search-voyage");
+     * // TypeScript knows callTool expects { destination: string }
+     * callTool({ destination: "Spain" });
+     *
+     * // data.structuredContent is typed based on your outputSchema
+     * if (data) {
+     *   console.log(data.structuredContent.results);
+     * }
+     * ```
+     */
+    useCallTool: <K extends keyof InferTools<T> & string>(name: K) => TypedCallToolReturn<InferTools<T>[K]["input"], InferTools<T>[K]["output"]>;
+    /**
+     * Typed version of `useToolInfo` that provides autocomplete for widget names
+     * and type inference for inputs, outputs, and responseMetadata.
+     *
+     * @typeParam K - The name of the widget. Autocompletes based on your server's widget registry.
+     * @returns A discriminated union with `status: "pending" | "success"` that narrows correctly.
+     *
+     * @example
+     * ```typescript
+     * const toolInfo = useToolInfo<"search-voyage">();
+     * // toolInfo.input is typed as { destination: string; ... }
+     * // toolInfo.output is typed as { results: Array<...>; ... } | undefined
+     * // toolInfo.status narrows correctly: "pending" | "success"
+     *
+     * if (toolInfo.isPending) {
+     *   // TypeScript knows output is undefined here
+     *   console.log(toolInfo.input.destination);
+     * }
+     *
+     * if (toolInfo.isSuccess) {
+     *   // TypeScript knows output is defined here
+     *   console.log(toolInfo.output.results);
+     * }
+     * ```
+     */
+    useToolInfo: <K extends keyof InferTools<T> & string>() => TypedToolInfoReturn<ToolInput<T, K>, ToolOutput<T, K>>;
+};
+export {};

package/dist/src/web/typed-hooks.js

@@ -0,0 +1,107 @@
+import { useCallTool } from "./hooks/use-call-tool.js";
+import { useToolInfo } from "./hooks/use-tool-info.js";
+/**
+ * Creates typed versions of skybridge hooks with full type inference
+ * for tool names, inputs, and outputs.
+ *
+ * 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`.
+ *
+ * @example
+ * ```typescript
+ * // server/src/index.ts
+ * const server = new McpServer({ name: "my-app", version: "1.0" }, {})
+ *   .widget("search-voyage", {}, {
+ *     inputSchema: { destination: z.string() },
+ *     outputSchema: { results: z.array(z.string()) },
+ *   }, async ({ destination }) => {
+ *     return { content: [{ type: "text", text: `Found trips to ${destination}` }] };
+ *   });
+ *
+ * export type AppType = typeof server;
+ * ```
+ *
+ * @example
+ * ```typescript
+ * // web/src/skybridge.ts (one-time setup)
+ * import type { AppType } from "../server";
+ * import { createTypedHooks } from "skybridge/web";
+ *
+ * export const { useCallTool, useToolInfo } = createTypedHooks<AppType>();
+ * ```
+ *
+ * @example
+ * ```typescript
+ * // web/src/widgets/search.tsx (usage)
+ * import { useCallTool, useToolInfo } from "../skybridge";
+ *
+ * export function SearchWidget() {
+ *   const { callTool, data } = useCallTool("search-voyage");
+ *   //                                      ^ autocomplete for tool names
+ *   callTool({ destination: "Spain" });
+ *   //         ^ autocomplete for input fields
+ *
+ *   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
+ * }
+ * ```
+ */
+export function createTypedHooks() {
+    return {
+        /**
+         * Typed version of `useCallTool` that provides autocomplete for tool names
+         * and type inference for inputs and outputs.
+         *
+         * @param name - The name of the widget to call. Autocompletes based on your server's widget registry.
+         * @returns A hook with typed `callTool` function and `data` property.
+         *
+         * @example
+         * ```typescript
+         * const { callTool, data, isPending } = useCallTool("search-voyage");
+         * // TypeScript knows callTool expects { destination: string }
+         * callTool({ destination: "Spain" });
+         *
+         * // data.structuredContent is typed based on your outputSchema
+         * if (data) {
+         *   console.log(data.structuredContent.results);
+         * }
+         * ```
+         */
+        useCallTool: (name) => {
+            return useCallTool(name);
+        },
+        /**
+         * Typed version of `useToolInfo` that provides autocomplete for widget names
+         * and type inference for inputs, outputs, and responseMetadata.
+         *
+         * @typeParam K - The name of the widget. Autocompletes based on your server's widget registry.
+         * @returns A discriminated union with `status: "pending" | "success"` that narrows correctly.
+         *
+         * @example
+         * ```typescript
+         * const toolInfo = useToolInfo<"search-voyage">();
+         * // toolInfo.input is typed as { destination: string; ... }
+         * // toolInfo.output is typed as { results: Array<...>; ... } | undefined
+         * // toolInfo.status narrows correctly: "pending" | "success"
+         *
+         * if (toolInfo.isPending) {
+         *   // TypeScript knows output is undefined here
+         *   console.log(toolInfo.input.destination);
+         * }
+         *
+         * if (toolInfo.isSuccess) {
+         *   // TypeScript knows output is defined here
+         *   console.log(toolInfo.output.results);
+         * }
+         * ```
+         */
+        useToolInfo: () => {
+            return useToolInfo();
+        },
+    };
+}
+//# sourceMappingURL=typed-hooks.js.map

package/dist/src/web/typed-hooks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"typed-hooks.js","sourceRoot":"","sources":["../../../src/web/typed-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAsB,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAkB,MAAM,0BAA0B,CAAC;AAuBvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,MAAM,UAAU,gBAAgB;IAI9B,OAAO;QACL;;;;;;;;;;;;;;;;;;WAkBG;QACH,WAAW,EAAE,CACX,IAAO,EACqD,EAAE;YAC9D,OAAO,WAAW,CAAC,IAAI,CAGtB,CAAC;QACJ,CAAC;QAED;;;;;;;;;;;;;;;;;;;;;;;;WAwBG;QACH,WAAW,EAAE,GAGX,EAAE;YACF,OAAO,WAAW,EAGjB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/src/web/typed-hooks.test-d.d.ts

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

package/dist/src/web/typed-hooks.test-d.js

@@ -0,0 +1,90 @@
+import { expectTypeOf, test } from "vitest";
+import { createTypedHooks } from "./typed-hooks.js";
+import { createTestServer } from "../test/utils.js";
+const server = createTestServer();
+test("InferTools extracts the tool registry type (widgets + registerTool)", () => {
+    expectTypeOf().toHaveProperty("search-voyage");
+    expectTypeOf().toHaveProperty("get-trip-details");
+    expectTypeOf().toHaveProperty("no-input-widget");
+    expectTypeOf().toHaveProperty("calculate-price");
+    expectTypeOf().toHaveProperty("inferred-output-widget");
+    expectTypeOf().toHaveProperty("inferred-tool");
+});
+test("ToolNames returns a union of tool name literals (widgets + registerTool)", () => {
+    expectTypeOf().toEqualTypeOf();
+});
+test("ToolInput extracts the correct input type from Zod schema", () => {
+    expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toEqualTypeOf();
+});
+test("ToolOutput extracts the correct output type from callback's structuredContent", () => {
+    expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toEqualTypeOf();
+});
+test("ToolOutput extracts the correct output type from callback (inferred)", () => {
+    expectTypeOf().toEqualTypeOf();
+    expectTypeOf().toEqualTypeOf();
+});
+test("createTypedHooks provides autocomplete for tool names (widgets + registerTool)", () => {
+    const { useCallTool } = createTypedHooks();
+    useCallTool("search-voyage");
+    useCallTool("get-trip-details");
+    useCallTool("no-input-widget");
+    useCallTool("calculate-price");
+    useCallTool("inferred-output-widget");
+    useCallTool("inferred-tool");
+    // @ts-expect-error - "invalid-name" is not a valid tool name
+    useCallTool("invalid-name");
+});
+test("useCallTool returns correctly typed callTool function", () => {
+    const { useCallTool } = createTypedHooks();
+    const { callTool } = useCallTool("search-voyage");
+    callTool({ destination: "Spain" });
+    callTool({ destination: "France", departureDate: "2024-06-01" });
+    callTool({ destination: "Italy", maxPrice: 1000 });
+    const { callTool: calculateTool } = useCallTool("calculate-price");
+    calculateTool({ tripId: "123", passengers: 2 });
+});
+test("useCallTool returns correctly typed data", () => {
+    const { useCallTool } = createTypedHooks();
+    const { data } = useCallTool("search-voyage");
+    if (data) {
+        expectTypeOf(data.structuredContent).toExtend();
+        expectTypeOf(data.structuredContent.results).toBeArray();
+        expectTypeOf(data.structuredContent.totalCount).toBeNumber();
+    }
+});
+test("useCallTool returns correctly typed data for callback-inferred outputs", () => {
+    const { useCallTool } = createTypedHooks();
+    const { data: widgetData } = useCallTool("inferred-output-widget");
+    if (widgetData) {
+        expectTypeOf(widgetData.structuredContent).toExtend();
+    }
+    const { data: toolData } = useCallTool("inferred-tool");
+    if (toolData) {
+        expectTypeOf(toolData.structuredContent).toExtend();
+    }
+});
+test("createTypedHooks provides autocomplete for tool names in useToolInfo (widgets + registerTool)", () => {
+    const { useToolInfo } = createTypedHooks();
+    useToolInfo();
+    useToolInfo();
+    useToolInfo();
+    useToolInfo();
+    useToolInfo();
+    useToolInfo();
+    // @ts-expect-error - "invalid-name" is not a valid tool name
+    useToolInfo();
+});
+test("useToolInfo infers input and output types", () => {
+    const { useToolInfo } = createTypedHooks();
+    const toolInfo = useToolInfo();
+    expectTypeOf(toolInfo.input).toExtend();
+    if (toolInfo.status === "success") {
+        expectTypeOf(toolInfo.output).toExtend();
+    }
+});
+//# sourceMappingURL=typed-hooks.test-d.js.map

package/dist/src/web/typed-hooks.test-d.js.map

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

package/dist/src/web/typed-hooks.test.d.ts

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

package/dist/src/web/typed-hooks.test.js

@@ -0,0 +1,17 @@
+import { describe, expect, it } from "vitest";
+import { createTypedHooks } from "./typed-hooks.js";
+import { createMinimalTestServer } from "../test/utils.js";
+const server = createMinimalTestServer();
+describe("createTypedHooks", () => {
+    it("should return an object with useCallTool hook", () => {
+        const hooks = createTypedHooks();
+        expect(hooks).toHaveProperty("useCallTool");
+        expect(typeof hooks.useCallTool).toBe("function");
+    });
+    it("should return an object with useToolInfo hook", () => {
+        const hooks = createTypedHooks();
+        expect(hooks).toHaveProperty("useToolInfo");
+        expect(typeof hooks.useToolInfo).toBe("function");
+    });
+});
+//# sourceMappingURL=typed-hooks.test.js.map

package/dist/src/web/typed-hooks.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"typed-hooks.test.js","sourceRoot":"","sources":["../../../src/web/typed-hooks.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,MAAM,GAAG,uBAAuB,EAAE,CAAC;AAGzC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,KAAK,GAAG,gBAAgB,EAAc,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,KAAK,GAAG,gBAAgB,EAAc,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/web/types.d.ts

@@ -1,4 +1,8 @@
 export type UnknownObject = Record<string, unknown>;
+export type Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};
+export type Objectify<T> = T & UnknownObject;
 type WidgetState = UnknownObject;
 type FileMetadata = {
     fileId: string;

package/dist/src/web/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/web/types.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,wBAAwB,GAAG,sBAAsB,CAAC;AAC/D,MAAM,OAAO,iBAAkB,SAAQ,WAErC;IACkB,IAAI,GAAG,wBAAwB,CAAC;CACnD;AA8FD,sDAAsD;AACtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AAC3D,MAAM,OAAO,eAAgB,SAAQ,WAEnC;IACkB,IAAI,GAAG,sBAAsB,CAAC;CACjD"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/web/types.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,wBAAwB,GAAG,sBAAsB,CAAC;AAC/D,MAAM,OAAO,iBAAkB,SAAQ,WAErC;IACkB,IAAI,GAAG,wBAAwB,CAAC;CACnD;AA8FD,sDAAsD;AACtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AAC3D,MAAM,OAAO,eAAgB,SAAQ,WAEnC;IACkB,IAAI,GAAG,sBAAsB,CAAC;CACjD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skybridge",
-  "version": "0.0.0-dev.e386f86",
+  "version": "0.0.0-dev.e4c9359",
   "description": "Skybridge is a framework for building ChatGPT apps",
   "type": "module",
   "files": [