@tanstack/ai-react 0.9.0 → 0.11.0

package/README.md

@@ -49,10 +49,6 @@ A powerful, type-safe AI SDK for building AI-powered applications.
 
 ### <a href="https://tanstack.com/ai">Read the docs →</a>
 
-## Requirements
-
-- **Node.js v24+** is required to avoid compatibility issues with `isolated-vm`.
-
 ## Tree-Shakeable Adapters
 
 Import only the functionality you need for smaller bundle sizes:

package/dist/esm/types.d.ts

@@ -51,7 +51,7 @@ export type UseChatOptions<TTools extends ReadonlyArray<AnyClientTool> = any, TS
  * typed `partial` / `final` fields; when it is omitted (default), the return
  * is unchanged.
  */
-export type UseChatReturn<TTools extends ReadonlyArray<AnyClientTool> = any, TSchema extends SchemaInput | undefined = undefined> = BaseUseChatReturn<TTools> & (TSchema extends SchemaInput ? {
+export type UseChatReturn<TTools extends ReadonlyArray<AnyClientTool> = any, TSchema extends SchemaInput | undefined = undefined> = BaseUseChatReturn<TTools, TSchema extends SchemaInput ? InferSchemaType<TSchema> : unknown> & (TSchema extends SchemaInput ? {
     /**
      * Live, progressively-parsed structured output. Updated from
      * `TEXT_MESSAGE_CONTENT` deltas via `parsePartialJSON` while the stream
@@ -66,11 +66,13 @@ export type UseChatReturn<TTools extends ReadonlyArray<AnyClientTool> = any, TSc
      */
     final: InferSchemaType<TSchema> | null;
 } : Record<never, never>);
-interface BaseUseChatReturn<TTools extends ReadonlyArray<AnyClientTool> = any> {
+interface BaseUseChatReturn<TTools extends ReadonlyArray<AnyClientTool> = any, TData = unknown> {
     /**
-     * Current messages in the conversation
+     * Current messages in the conversation. When `outputSchema` is supplied,
+     * `messages[i].parts.find(p => p.type === 'structured-output')` is typed
+     * with the schema's inferred shape — `data: T`, `partial: DeepPartial<T>`.
      */
-    messages: Array<UIMessage<TTools>>;
+    messages: Array<UIMessage<TTools, TData>>;
     /**
      * Send a message and get a response.
      * Can be a simple string or multimodal content with images, audio, etc.
@@ -79,7 +81,7 @@ interface BaseUseChatReturn<TTools extends ReadonlyArray<AnyClientTool> = any> {
     /**
      * Append a message to the conversation
      */
-    append: (message: ModelMessage | UIMessage<TTools>) => Promise<void>;
+    append: (message: ModelMessage | UIMessage<TTools, TData>) => Promise<void>;
     /**
      * Add the result of a client-side tool execution
      */
@@ -135,7 +137,7 @@ interface BaseUseChatReturn<TTools extends ReadonlyArray<AnyClientTool> = any> {
     /**
      * Set messages manually
      */
-    setMessages: (messages: Array<UIMessage<TTools>>) => void;
+    setMessages: (messages: Array<UIMessage<TTools, TData>>) => void;
     /**
      * Clear all messages
      */

package/dist/esm/use-chat.js

@@ -1,5 +1,4 @@
 import { ChatClient } from "@tanstack/ai-client";
-import { parsePartialJSON } from "@tanstack/ai";
 import { useId, useState, useRef, useMemo, useEffect, useCallback } from "react";
 function useChat(options) {
   const hookId = useId();
@@ -13,9 +12,6 @@ function useChat(options) {
   const [isSubscribed, setIsSubscribed] = useState(false);
   const [connectionStatus, setConnectionStatus] = useState("disconnected");
   const [sessionGenerating, setSessionGenerating] = useState(false);
-  const [partial, setPartial] = useState({});
-  const [final, setFinal] = useState(null);
-  const rawJsonRef = useRef("");
   const messagesRef = useRef(
     options.initialMessages || []
   );
@@ -31,27 +27,9 @@ function useChat(options) {
       id: clientId,
       initialMessages: messagesToUse,
       body: optionsRef.current.body,
-      // Wrap every callback so the latest options are read at call time.
-      // Capturing the function reference directly would freeze it to whatever
-      // the parent passed on the first render.
+      forwardedProps: optionsRef.current.forwardedProps,
       onResponse: (response) => optionsRef.current.onResponse?.(response),
       onChunk: (chunk) => {
-        if (optionsRef.current.outputSchema !== void 0) {
-          if (chunk.type === "RUN_STARTED") {
-            rawJsonRef.current = "";
-            setPartial({});
-            setFinal(null);
-          } else if (chunk.type === "TEXT_MESSAGE_CONTENT" && chunk.delta) {
-            rawJsonRef.current += chunk.delta;
-            const progressive = parsePartialJSON(rawJsonRef.current);
-            if (progressive && typeof progressive === "object") {
-              setPartial(progressive);
-            }
-          } else if (chunk.type === "CUSTOM" && chunk.name === "structured-output.complete") {
-            const value = chunk.value;
-            setFinal(value.object);
-          }
-        }
         optionsRef.current.onChunk?.(chunk);
       },
       onFinish: (message) => {
@@ -87,8 +65,11 @@ function useChat(options) {
     });
   }, [clientId]);
   useEffect(() => {
-    client.updateOptions({ body: options.body });
-  }, [client, options.body]);
+    client.updateOptions({
+      body: options.body,
+      forwardedProps: options.forwardedProps
+    });
+  }, [client, options.body, options.forwardedProps]);
   useEffect(() => {
     if (options.initialMessages && options.initialMessages.length > 0) {
       if (messages.length === 0) {
@@ -151,6 +132,36 @@ function useChat(options) {
     },
     [client]
   );
+  const activeStructuredPart = useMemo(() => {
+    let lastUserIndex = -1;
+    for (let i = messages.length - 1; i >= 0; i--) {
+      if (messages[i].role === "user") {
+        lastUserIndex = i;
+        break;
+      }
+    }
+    if (lastUserIndex === -1) return null;
+    for (let i = messages.length - 1; i > lastUserIndex; i--) {
+      const m = messages[i];
+      if (m.role !== "assistant") continue;
+      const part = m.parts.find(
+        (p) => p.type === "structured-output"
+      );
+      if (part) return part;
+    }
+    return null;
+  }, [messages]);
+  const partial = useMemo(() => {
+    if (!activeStructuredPart) return {};
+    const v = activeStructuredPart.partial ?? activeStructuredPart.data;
+    return v ?? {};
+  }, [activeStructuredPart]);
+  const final = useMemo(() => {
+    if (!activeStructuredPart || activeStructuredPart.status !== "complete") {
+      return null;
+    }
+    return activeStructuredPart.data;
+  }, [activeStructuredPart]);
   return {
     messages,
     sendMessage,

package/dist/esm/use-chat.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-chat.js","sources":["../../src/use-chat.ts"],"sourcesContent":["import { ChatClient } from '@tanstack/ai-client'\nimport { parsePartialJSON } from '@tanstack/ai'\nimport { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react'\nimport type {\n  AnyClientTool,\n  InferSchemaType,\n  ModelMessage,\n  SchemaInput,\n  StreamChunk,\n} from '@tanstack/ai'\nimport type { ChatClientState, ConnectionStatus } from '@tanstack/ai-client'\n\nimport type {\n  DeepPartial,\n  MultimodalContent,\n  UIMessage,\n  UseChatOptions,\n  UseChatReturn,\n} from './types'\n\nexport function useChat<\n  TTools extends ReadonlyArray<AnyClientTool> = any,\n  TSchema extends SchemaInput | undefined = undefined,\n>(options: UseChatOptions<TTools, TSchema>): UseChatReturn<TTools, TSchema> {\n  const hookId = useId()\n  const clientId = options.id || hookId\n\n  const [messages, setMessages] = useState<Array<UIMessage<TTools>>>(\n    options.initialMessages || [],\n  )\n  const [isLoading, setIsLoading] = useState(false)\n  const [error, setError] = useState<Error | undefined>(undefined)\n  const [status, setStatus] = useState<ChatClientState>('ready')\n  const [isSubscribed, setIsSubscribed] = useState(false)\n  const [connectionStatus, setConnectionStatus] =\n    useState<ConnectionStatus>('disconnected')\n  const [sessionGenerating, setSessionGenerating] = useState(false)\n\n  // Structured-output state. Only meaningful when `outputSchema` is supplied;\n  // when it isn't, these stay at their initial values and are hidden from the\n  // return type by the conditional in UseChatReturn. Runtime always tracks\n  // them — the type system gates visibility, not the runtime.\n  type Partial = DeepPartial<InferSchemaType<NonNullable<TSchema>>>\n  type Final = InferSchemaType<NonNullable<TSchema>>\n  const [partial, setPartial] = useState<Partial>({} as Partial)\n  const [final, setFinal] = useState<Final | null>(null)\n  // Raw JSON accumulator for parsePartialJSON. Ref instead of state — partial\n  // JSON parsing happens synchronously inside the chunk handler; we don't want\n  // a re-render per delta solely to track the buffer.\n  const rawJsonRef = useRef('')\n\n  // Track current messages in a ref to preserve them when client is recreated\n  const messagesRef = useRef<Array<UIMessage<TTools>>>(\n    options.initialMessages || [],\n  )\n  const isFirstMountRef = useRef(true)\n\n  // Update ref synchronously during render so it's always current when useMemo runs.\n  // A useEffect here would be async and messagesRef could be stale on client recreation.\n  messagesRef.current = messages\n\n  // Track current options in a ref to avoid recreating client when options change\n  const optionsRef = useRef<UseChatOptions<TTools, TSchema>>(options)\n  optionsRef.current = options\n\n  // Create ChatClient instance with callbacks to sync state\n  // Note: Options are captured at client creation time.\n  // The connection adapter can use functions for dynamic values (url, headers, etc.)\n  // which are evaluated lazily on each request.\n  const client = useMemo(() => {\n    // On first mount, use initialMessages. On subsequent recreations, preserve existing messages.\n    const messagesToUse = isFirstMountRef.current\n      ? options.initialMessages || []\n      : messagesRef.current\n\n    isFirstMountRef.current = false\n\n    return new ChatClient({\n      connection: optionsRef.current.connection,\n      id: clientId,\n      initialMessages: messagesToUse,\n      body: optionsRef.current.body,\n      // Wrap every callback so the latest options are read at call time.\n      // Capturing the function reference directly would freeze it to whatever\n      // the parent passed on the first render.\n      onResponse: (response) => optionsRef.current.onResponse?.(response),\n      onChunk: (chunk: StreamChunk) => {\n        // Internal structured-output tracking — runs before the user callback\n        // so user code observes the same state the hook does. Only active when\n        // a schema is supplied; otherwise the branches are no-ops.\n        if (optionsRef.current.outputSchema !== undefined) {\n          if (chunk.type === 'RUN_STARTED') {\n            // New run — reset both views.\n            rawJsonRef.current = ''\n            setPartial({} as Partial)\n            setFinal(null)\n          } else if (chunk.type === 'TEXT_MESSAGE_CONTENT' && chunk.delta) {\n            rawJsonRef.current += chunk.delta\n            const progressive = parsePartialJSON(rawJsonRef.current)\n            if (progressive && typeof progressive === 'object') {\n              setPartial(progressive as Partial)\n            }\n          } else if (\n            chunk.type === 'CUSTOM' &&\n            chunk.name === 'structured-output.complete'\n          ) {\n            const value = chunk.value as { object: unknown }\n            setFinal(value.object as Final)\n          }\n        }\n        optionsRef.current.onChunk?.(chunk)\n      },\n      onFinish: (message: UIMessage<TTools>) => {\n        optionsRef.current.onFinish?.(message)\n      },\n      onError: (error: Error) => {\n        optionsRef.current.onError?.(error)\n      },\n      tools: optionsRef.current.tools,\n      onCustomEvent: (eventType, data, context) =>\n        optionsRef.current.onCustomEvent?.(eventType, data, context),\n      streamProcessor: options.streamProcessor,\n      onMessagesChange: (newMessages: Array<UIMessage<TTools>>) => {\n        setMessages(newMessages)\n      },\n      onLoadingChange: (newIsLoading: boolean) => {\n        setIsLoading(newIsLoading)\n      },\n      onErrorChange: (newError: Error | undefined) => {\n        setError(newError)\n      },\n      onStatusChange: (status: ChatClientState) => {\n        setStatus(status)\n      },\n      onSubscriptionChange: (nextIsSubscribed: boolean) => {\n        setIsSubscribed(nextIsSubscribed)\n      },\n      onConnectionStatusChange: (nextStatus: ConnectionStatus) => {\n        setConnectionStatus(nextStatus)\n      },\n      onSessionGeneratingChange: (isGenerating: boolean) => {\n        setSessionGenerating(isGenerating)\n      },\n    })\n  }, [clientId])\n\n  // Sync body changes to the client\n  // This allows dynamic body values (like model selection) to be updated without recreating the client\n  useEffect(() => {\n    client.updateOptions({ body: options.body })\n  }, [client, options.body])\n\n  // Sync initial messages on mount only\n  // Note: initialMessages are passed to ChatClient constructor, but we also\n  // set them here to ensure React state is in sync\n  useEffect(() => {\n    if (options.initialMessages && options.initialMessages.length > 0) {\n      // Only set if current messages are empty (initial state)\n      if (messages.length === 0) {\n        client.setMessagesManually(options.initialMessages)\n      }\n    }\n  }, []) // Only run on mount - initialMessages are handled by ChatClient constructor\n\n  // Keep connection lifecycle opt-in and explicit.\n  useEffect(() => {\n    if (options.live) {\n      client.subscribe()\n    } else {\n      client.unsubscribe()\n    }\n  }, [client, options.live])\n\n  // Cleanup on unmount: stop any in-flight requests\n  // Note: We only cleanup when client changes or component unmounts.\n  // DO NOT include isLoading in dependencies - that would cause the cleanup\n  // to run when isLoading changes, aborting continuation requests.\n  useEffect(() => {\n    return () => {\n      // live mode owns the connection lifecycle; non-live keeps request-only stop.\n      if (options.live) {\n        client.unsubscribe()\n      } else {\n        client.stop()\n      }\n    }\n  }, [client, options.live])\n\n  // All callback options are read through optionsRef at call time, so fresh\n  // closures from each render are picked up without recreating the client.\n\n  const sendMessage = useCallback(\n    async (content: string | MultimodalContent) => {\n      await client.sendMessage(content)\n    },\n    [client],\n  )\n\n  const append = useCallback(\n    async (message: ModelMessage | UIMessage) => {\n      await client.append(message)\n    },\n    [client],\n  )\n\n  const reload = useCallback(async () => {\n    await client.reload()\n  }, [client])\n\n  const stop = useCallback(() => {\n    client.stop()\n  }, [client])\n\n  const clear = useCallback(() => {\n    client.clear()\n  }, [client])\n\n  const setMessagesManually = useCallback(\n    (newMessages: Array<UIMessage<TTools>>) => {\n      client.setMessagesManually(newMessages)\n    },\n    [client],\n  )\n\n  const addToolResult = useCallback(\n    async (result: {\n      toolCallId: string\n      tool: string\n      output: any\n      state?: 'output-available' | 'output-error'\n      errorText?: string\n    }) => {\n      await client.addToolResult(result)\n    },\n    [client],\n  )\n\n  const addToolApprovalResponse = useCallback(\n    async (response: { id: string; approved: boolean }) => {\n      await client.addToolApprovalResponse(response)\n    },\n    [client],\n  )\n\n  // partial / final are runtime-tracked unconditionally; the conditional\n  // return type (UseChatReturn<TTools, TSchema>) hides them from callers that\n  // didn't supply `outputSchema`. The `as` cast is the seam between the\n  // unconditional runtime shape and the schema-discriminated public shape.\n  return {\n    messages,\n    sendMessage,\n    append,\n    reload,\n    stop,\n    isLoading,\n    error,\n    status,\n    isSubscribed,\n    connectionStatus,\n    sessionGenerating,\n    setMessages: setMessagesManually,\n    clear,\n    addToolResult,\n    addToolApprovalResponse,\n    partial,\n    final,\n  } as unknown as UseChatReturn<TTools, TSchema>\n}\n"],"names":["error","status"],"mappings":"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"}
+{"version":3,"file":"use-chat.js","sources":["../../src/use-chat.ts"],"sourcesContent":["import { ChatClient } from '@tanstack/ai-client'\nimport { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react'\nimport type {\n  AnyClientTool,\n  InferSchemaType,\n  ModelMessage,\n  SchemaInput,\n  StreamChunk,\n} from '@tanstack/ai'\nimport type {\n  ChatClientState,\n  ConnectionStatus,\n  StructuredOutputPart,\n} from '@tanstack/ai-client'\n\nimport type {\n  DeepPartial,\n  MultimodalContent,\n  UIMessage,\n  UseChatOptions,\n  UseChatReturn,\n} from './types'\n\nexport function useChat<\n  TTools extends ReadonlyArray<AnyClientTool> = any,\n  TSchema extends SchemaInput | undefined = undefined,\n>(options: UseChatOptions<TTools, TSchema>): UseChatReturn<TTools, TSchema> {\n  const hookId = useId()\n  const clientId = options.id || hookId\n\n  const [messages, setMessages] = useState<Array<UIMessage<TTools>>>(\n    options.initialMessages || [],\n  )\n  const [isLoading, setIsLoading] = useState(false)\n  const [error, setError] = useState<Error | undefined>(undefined)\n  const [status, setStatus] = useState<ChatClientState>('ready')\n  const [isSubscribed, setIsSubscribed] = useState(false)\n  const [connectionStatus, setConnectionStatus] =\n    useState<ConnectionStatus>('disconnected')\n  const [sessionGenerating, setSessionGenerating] = useState(false)\n\n  type Partial = DeepPartial<InferSchemaType<NonNullable<TSchema>>>\n  type Final = InferSchemaType<NonNullable<TSchema>>\n\n  // Track current messages in a ref to preserve them when client is recreated\n  const messagesRef = useRef<Array<UIMessage<TTools>>>(\n    options.initialMessages || [],\n  )\n  const isFirstMountRef = useRef(true)\n\n  // Update ref synchronously during render so it's always current when useMemo runs.\n  messagesRef.current = messages\n\n  // Track current options in a ref to avoid recreating client when options change\n  const optionsRef = useRef<UseChatOptions<TTools, TSchema>>(options)\n  optionsRef.current = options\n\n  // Create ChatClient instance with callbacks to sync state\n  const client = useMemo(() => {\n    const messagesToUse = isFirstMountRef.current\n      ? options.initialMessages || []\n      : messagesRef.current\n\n    isFirstMountRef.current = false\n\n    return new ChatClient({\n      connection: optionsRef.current.connection,\n      id: clientId,\n      initialMessages: messagesToUse,\n      body: optionsRef.current.body,\n      forwardedProps: optionsRef.current.forwardedProps,\n      onResponse: (response) => optionsRef.current.onResponse?.(response),\n      onChunk: (chunk: StreamChunk) => {\n        optionsRef.current.onChunk?.(chunk)\n      },\n      onFinish: (message: UIMessage<TTools>) => {\n        optionsRef.current.onFinish?.(message)\n      },\n      onError: (error: Error) => {\n        optionsRef.current.onError?.(error)\n      },\n      tools: optionsRef.current.tools,\n      onCustomEvent: (eventType, data, context) =>\n        optionsRef.current.onCustomEvent?.(eventType, data, context),\n      streamProcessor: options.streamProcessor,\n      onMessagesChange: (newMessages: Array<UIMessage<TTools>>) => {\n        setMessages(newMessages)\n      },\n      onLoadingChange: (newIsLoading: boolean) => {\n        setIsLoading(newIsLoading)\n      },\n      onErrorChange: (newError: Error | undefined) => {\n        setError(newError)\n      },\n      onStatusChange: (status: ChatClientState) => {\n        setStatus(status)\n      },\n      onSubscriptionChange: (nextIsSubscribed: boolean) => {\n        setIsSubscribed(nextIsSubscribed)\n      },\n      onConnectionStatusChange: (nextStatus: ConnectionStatus) => {\n        setConnectionStatus(nextStatus)\n      },\n      onSessionGeneratingChange: (isGenerating: boolean) => {\n        setSessionGenerating(isGenerating)\n      },\n    })\n  }, [clientId])\n\n  useEffect(() => {\n    client.updateOptions({\n      body: options.body,\n      forwardedProps: options.forwardedProps,\n    })\n  }, [client, options.body, options.forwardedProps])\n\n  useEffect(() => {\n    if (options.initialMessages && options.initialMessages.length > 0) {\n      if (messages.length === 0) {\n        client.setMessagesManually(options.initialMessages)\n      }\n    }\n  }, [])\n\n  useEffect(() => {\n    if (options.live) {\n      client.subscribe()\n    } else {\n      client.unsubscribe()\n    }\n  }, [client, options.live])\n\n  useEffect(() => {\n    return () => {\n      if (options.live) {\n        client.unsubscribe()\n      } else {\n        client.stop()\n      }\n    }\n  }, [client, options.live])\n\n  const sendMessage = useCallback(\n    async (content: string | MultimodalContent) => {\n      await client.sendMessage(content)\n    },\n    [client],\n  )\n\n  const append = useCallback(\n    async (message: ModelMessage | UIMessage) => {\n      await client.append(message)\n    },\n    [client],\n  )\n\n  const reload = useCallback(async () => {\n    await client.reload()\n  }, [client])\n\n  const stop = useCallback(() => {\n    client.stop()\n  }, [client])\n\n  const clear = useCallback(() => {\n    client.clear()\n  }, [client])\n\n  const setMessagesManually = useCallback(\n    (newMessages: Array<UIMessage<TTools>>) => {\n      client.setMessagesManually(newMessages)\n    },\n    [client],\n  )\n\n  const addToolResult = useCallback(\n    async (result: {\n      toolCallId: string\n      tool: string\n      output: any\n      state?: 'output-available' | 'output-error'\n      errorText?: string\n    }) => {\n      await client.addToolResult(result)\n    },\n    [client],\n  )\n\n  const addToolApprovalResponse = useCallback(\n    async (response: { id: string; approved: boolean }) => {\n      await client.addToolApprovalResponse(response)\n    },\n    [client],\n  )\n\n  // The \"active\" structured-output part is the one on the assistant message\n  // that follows the latest user message. No such message exists between\n  // sendMessage() and the first chunk, so partial/final naturally read as\n  // cleared. Historical parts on earlier assistant messages remain available\n  // via `messages` directly.\n  //\n  // When there is NO user message yet (e.g. `initialMessages` contains only\n  // a stale assistant turn or a system prompt) we deliberately return null\n  // rather than scanning historical assistants — otherwise a `final` from a\n  // previous session would leak into the hook value on first render.\n  const activeStructuredPart = useMemo<StructuredOutputPart | null>(() => {\n    let lastUserIndex = -1\n    for (let i = messages.length - 1; i >= 0; i--) {\n      if (messages[i]!.role === 'user') {\n        lastUserIndex = i\n        break\n      }\n    }\n    if (lastUserIndex === -1) return null\n    for (let i = messages.length - 1; i > lastUserIndex; i--) {\n      const m = messages[i]!\n      if (m.role !== 'assistant') continue\n      const part = m.parts.find(\n        (p): p is StructuredOutputPart => p.type === 'structured-output',\n      )\n      if (part) return part\n    }\n    return null\n  }, [messages])\n\n  const partial = useMemo<Partial>(() => {\n    if (!activeStructuredPart) return {} as Partial\n    const v = activeStructuredPart.partial ?? activeStructuredPart.data\n    return (v ?? {}) as Partial\n  }, [activeStructuredPart])\n\n  const final = useMemo<Final | null>(() => {\n    if (!activeStructuredPart || activeStructuredPart.status !== 'complete') {\n      return null\n    }\n    return activeStructuredPart.data as Final\n  }, [activeStructuredPart])\n\n  return {\n    messages,\n    sendMessage,\n    append,\n    reload,\n    stop,\n    isLoading,\n    error,\n    status,\n    isSubscribed,\n    connectionStatus,\n    sessionGenerating,\n    setMessages: setMessagesManually,\n    clear,\n    addToolResult,\n    addToolApprovalResponse,\n    partial,\n    final,\n  } as unknown as UseChatReturn<TTools, TSchema>\n}\n"],"names":["error","status"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/ai-react",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "React hooks for TanStack AI",
   "author": "",
   "license": "MIT",
@@ -31,12 +31,12 @@
     "streaming"
   ],
   "dependencies": {
-    "@tanstack/ai-client": "0.9.2"
+    "@tanstack/ai-client": "0.11.0"
   },
   "peerDependencies": {
     "@types/react": ">=18.0.0",
     "react": ">=18.0.0",
-    "@tanstack/ai": "^0.17.0"
+    "@tanstack/ai": "^0.19.0"
   },
   "devDependencies": {
     "@standard-schema/spec": "^1.1.0",
@@ -45,8 +45,8 @@
     "@vitest/coverage-v8": "4.0.14",
     "jsdom": "^27.2.0",
     "react": "^19.2.3",
-    "vite": "^7.2.7",
-    "@tanstack/ai": "0.17.0"
+    "vite": "^7.3.3",
+    "@tanstack/ai": "0.19.0"
   },
   "scripts": {
     "clean": "premove ./build ./dist",

package/src/types.ts

@@ -86,7 +86,10 @@ export type UseChatOptions<
 export type UseChatReturn<
   TTools extends ReadonlyArray<AnyClientTool> = any,
   TSchema extends SchemaInput | undefined = undefined,
-> = BaseUseChatReturn<TTools> &
+> = BaseUseChatReturn<
+  TTools,
+  TSchema extends SchemaInput ? InferSchemaType<TSchema> : unknown
+> &
   (TSchema extends SchemaInput
     ? {
         /**
@@ -105,11 +108,16 @@ export type UseChatReturn<
       }
     : Record<never, never>)
 
-interface BaseUseChatReturn<TTools extends ReadonlyArray<AnyClientTool> = any> {
+interface BaseUseChatReturn<
+  TTools extends ReadonlyArray<AnyClientTool> = any,
+  TData = unknown,
+> {
   /**
-   * Current messages in the conversation
+   * Current messages in the conversation. When `outputSchema` is supplied,
+   * `messages[i].parts.find(p => p.type === 'structured-output')` is typed
+   * with the schema's inferred shape — `data: T`, `partial: DeepPartial<T>`.
    */
-  messages: Array<UIMessage<TTools>>
+  messages: Array<UIMessage<TTools, TData>>
 
   /**
    * Send a message and get a response.
@@ -120,7 +128,7 @@ interface BaseUseChatReturn<TTools extends ReadonlyArray<AnyClientTool> = any> {
   /**
    * Append a message to the conversation
    */
-  append: (message: ModelMessage | UIMessage<TTools>) => Promise<void>
+  append: (message: ModelMessage | UIMessage<TTools, TData>) => Promise<void>
 
   /**
    * Add the result of a client-side tool execution
@@ -187,7 +195,7 @@ interface BaseUseChatReturn<TTools extends ReadonlyArray<AnyClientTool> = any> {
   /**
    * Set messages manually
    */
-  setMessages: (messages: Array<UIMessage<TTools>>) => void
+  setMessages: (messages: Array<UIMessage<TTools, TData>>) => void
 
   /**
    * Clear all messages

package/src/use-chat.ts

@@ -1,5 +1,4 @@
 import { ChatClient } from '@tanstack/ai-client'
-import { parsePartialJSON } from '@tanstack/ai'
 import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react'
 import type {
   AnyClientTool,
@@ -8,7 +7,11 @@ import type {
   SchemaInput,
   StreamChunk,
 } from '@tanstack/ai'
-import type { ChatClientState, ConnectionStatus } from '@tanstack/ai-client'
+import type {
+  ChatClientState,
+  ConnectionStatus,
+  StructuredOutputPart,
+} from '@tanstack/ai-client'
 
 import type {
   DeepPartial,
@@ -36,18 +39,8 @@ export function useChat<
     useState<ConnectionStatus>('disconnected')
   const [sessionGenerating, setSessionGenerating] = useState(false)
 
-  // Structured-output state. Only meaningful when `outputSchema` is supplied;
-  // when it isn't, these stay at their initial values and are hidden from the
-  // return type by the conditional in UseChatReturn. Runtime always tracks
-  // them — the type system gates visibility, not the runtime.
   type Partial = DeepPartial<InferSchemaType<NonNullable<TSchema>>>
   type Final = InferSchemaType<NonNullable<TSchema>>
-  const [partial, setPartial] = useState<Partial>({} as Partial)
-  const [final, setFinal] = useState<Final | null>(null)
-  // Raw JSON accumulator for parsePartialJSON. Ref instead of state — partial
-  // JSON parsing happens synchronously inside the chunk handler; we don't want
-  // a re-render per delta solely to track the buffer.
-  const rawJsonRef = useRef('')
 
   // Track current messages in a ref to preserve them when client is recreated
   const messagesRef = useRef<Array<UIMessage<TTools>>>(
@@ -56,7 +49,6 @@ export function useChat<
   const isFirstMountRef = useRef(true)
 
   // Update ref synchronously during render so it's always current when useMemo runs.
-  // A useEffect here would be async and messagesRef could be stale on client recreation.
   messagesRef.current = messages
 
   // Track current options in a ref to avoid recreating client when options change
@@ -64,11 +56,7 @@ export function useChat<
   optionsRef.current = options
 
   // Create ChatClient instance with callbacks to sync state
-  // Note: Options are captured at client creation time.
-  // The connection adapter can use functions for dynamic values (url, headers, etc.)
-  // which are evaluated lazily on each request.
   const client = useMemo(() => {
-    // On first mount, use initialMessages. On subsequent recreations, preserve existing messages.
     const messagesToUse = isFirstMountRef.current
       ? options.initialMessages || []
       : messagesRef.current
@@ -80,34 +68,9 @@ export function useChat<
       id: clientId,
       initialMessages: messagesToUse,
       body: optionsRef.current.body,
-      // Wrap every callback so the latest options are read at call time.
-      // Capturing the function reference directly would freeze it to whatever
-      // the parent passed on the first render.
+      forwardedProps: optionsRef.current.forwardedProps,
       onResponse: (response) => optionsRef.current.onResponse?.(response),
       onChunk: (chunk: StreamChunk) => {
-        // Internal structured-output tracking — runs before the user callback
-        // so user code observes the same state the hook does. Only active when
-        // a schema is supplied; otherwise the branches are no-ops.
-        if (optionsRef.current.outputSchema !== undefined) {
-          if (chunk.type === 'RUN_STARTED') {
-            // New run — reset both views.
-            rawJsonRef.current = ''
-            setPartial({} as Partial)
-            setFinal(null)
-          } else if (chunk.type === 'TEXT_MESSAGE_CONTENT' && chunk.delta) {
-            rawJsonRef.current += chunk.delta
-            const progressive = parsePartialJSON(rawJsonRef.current)
-            if (progressive && typeof progressive === 'object') {
-              setPartial(progressive as Partial)
-            }
-          } else if (
-            chunk.type === 'CUSTOM' &&
-            chunk.name === 'structured-output.complete'
-          ) {
-            const value = chunk.value as { object: unknown }
-            setFinal(value.object as Final)
-          }
-        }
         optionsRef.current.onChunk?.(chunk)
       },
       onFinish: (message: UIMessage<TTools>) => {
@@ -144,25 +107,21 @@ export function useChat<
     })
   }, [clientId])
 
-  // Sync body changes to the client
-  // This allows dynamic body values (like model selection) to be updated without recreating the client
   useEffect(() => {
-    client.updateOptions({ body: options.body })
-  }, [client, options.body])
+    client.updateOptions({
+      body: options.body,
+      forwardedProps: options.forwardedProps,
+    })
+  }, [client, options.body, options.forwardedProps])
 
-  // Sync initial messages on mount only
-  // Note: initialMessages are passed to ChatClient constructor, but we also
-  // set them here to ensure React state is in sync
   useEffect(() => {
     if (options.initialMessages && options.initialMessages.length > 0) {
-      // Only set if current messages are empty (initial state)
       if (messages.length === 0) {
         client.setMessagesManually(options.initialMessages)
       }
     }
-  }, []) // Only run on mount - initialMessages are handled by ChatClient constructor
+  }, [])
 
-  // Keep connection lifecycle opt-in and explicit.
   useEffect(() => {
     if (options.live) {
       client.subscribe()
@@ -171,13 +130,8 @@ export function useChat<
     }
   }, [client, options.live])
 
-  // Cleanup on unmount: stop any in-flight requests
-  // Note: We only cleanup when client changes or component unmounts.
-  // DO NOT include isLoading in dependencies - that would cause the cleanup
-  // to run when isLoading changes, aborting continuation requests.
   useEffect(() => {
     return () => {
-      // live mode owns the connection lifecycle; non-live keeps request-only stop.
       if (options.live) {
         client.unsubscribe()
       } else {
@@ -186,9 +140,6 @@ export function useChat<
     }
   }, [client, options.live])
 
-  // All callback options are read through optionsRef at call time, so fresh
-  // closures from each render are picked up without recreating the client.
-
   const sendMessage = useCallback(
     async (content: string | MultimodalContent) => {
       await client.sendMessage(content)
@@ -242,10 +193,49 @@ export function useChat<
     [client],
   )
 
-  // partial / final are runtime-tracked unconditionally; the conditional
-  // return type (UseChatReturn<TTools, TSchema>) hides them from callers that
-  // didn't supply `outputSchema`. The `as` cast is the seam between the
-  // unconditional runtime shape and the schema-discriminated public shape.
+  // The "active" structured-output part is the one on the assistant message
+  // that follows the latest user message. No such message exists between
+  // sendMessage() and the first chunk, so partial/final naturally read as
+  // cleared. Historical parts on earlier assistant messages remain available
+  // via `messages` directly.
+  //
+  // When there is NO user message yet (e.g. `initialMessages` contains only
+  // a stale assistant turn or a system prompt) we deliberately return null
+  // rather than scanning historical assistants — otherwise a `final` from a
+  // previous session would leak into the hook value on first render.
+  const activeStructuredPart = useMemo<StructuredOutputPart | null>(() => {
+    let lastUserIndex = -1
+    for (let i = messages.length - 1; i >= 0; i--) {
+      if (messages[i]!.role === 'user') {
+        lastUserIndex = i
+        break
+      }
+    }
+    if (lastUserIndex === -1) return null
+    for (let i = messages.length - 1; i > lastUserIndex; i--) {
+      const m = messages[i]!
+      if (m.role !== 'assistant') continue
+      const part = m.parts.find(
+        (p): p is StructuredOutputPart => p.type === 'structured-output',
+      )
+      if (part) return part
+    }
+    return null
+  }, [messages])
+
+  const partial = useMemo<Partial>(() => {
+    if (!activeStructuredPart) return {} as Partial
+    const v = activeStructuredPart.partial ?? activeStructuredPart.data
+    return (v ?? {}) as Partial
+  }, [activeStructuredPart])
+
+  const final = useMemo<Final | null>(() => {
+    if (!activeStructuredPart || activeStructuredPart.status !== 'complete') {
+      return null
+    }
+    return activeStructuredPart.data as Final
+  }, [activeStructuredPart])
+
   return {
     messages,
     sendMessage,