@tanstack/ai-client 0.2.2 → 0.4.0

package/dist/esm/events.js

@@ -15,13 +15,13 @@ class ChatClientEventEmitter {
    * Emit loading state changed event
    */
   loadingChanged(isLoading) {
-    this.emitEvent("client:loading-changed", { isLoading });
+    this.emitEvent("client:loading:changed", { isLoading });
   }
   /**
    * Emit error state changed event
    */
   errorChanged(error) {
-    this.emitEvent("client:error-changed", {
+    this.emitEvent("client:error:changed", {
       error
     });
   }
@@ -29,11 +29,8 @@ class ChatClientEventEmitter {
    * Emit text update events (combines processor and client events)
    */
   textUpdated(streamId, messageId, content) {
-    this.emitEvent("processor:text-updated", {
+    this.emitEvent("text:chunk:content", {
       streamId,
-      content
-    });
-    this.emitEvent("client:assistant-message-updated", {
       messageId,
       content
     });
@@ -42,14 +39,8 @@ class ChatClientEventEmitter {
    * Emit tool call state change events (combines processor and client events)
    */
   toolCallStateChanged(streamId, messageId, toolCallId, toolName, state, args) {
-    this.emitEvent("processor:tool-call-state-changed", {
+    this.emitEvent("tools:call:updated", {
       streamId,
-      toolCallId,
-      toolName,
-      state,
-      arguments: args
-    });
-    this.emitEvent("client:tool-call-updated", {
       messageId,
       toolCallId,
       toolName,
@@ -60,20 +51,11 @@ class ChatClientEventEmitter {
   /**
    * Emit tool result state change event
    */
-  toolResultStateChanged(streamId, toolCallId, content, state, error) {
-    this.emitEvent("processor:tool-result-state-changed", {
-      streamId,
-      toolCallId,
-      content,
-      state,
-      error
-    });
-  }
   /**
    * Emit thinking update event
    */
   thinkingUpdated(streamId, messageId, content, delta) {
-    this.emitEvent("stream:chunk:thinking", {
+    this.emitEvent("text:chunk:thinking", {
       streamId,
       messageId,
       content,
@@ -83,8 +65,9 @@ class ChatClientEventEmitter {
   /**
    * Emit approval requested event
    */
-  approvalRequested(messageId, toolCallId, toolName, input, approvalId) {
-    this.emitEvent("client:approval-requested", {
+  approvalRequested(streamId, messageId, toolCallId, toolName, input, approvalId) {
+    this.emitEvent("tools:approval:requested", {
+      streamId,
       messageId,
       toolCallId,
       toolName,
@@ -95,20 +78,28 @@ class ChatClientEventEmitter {
   /**
    * Emit message appended event
    */
-  messageAppended(uiMessage) {
-    const contentPreview = uiMessage.parts.filter((p) => p.type === "text").map((p) => p.content).join(" ").substring(0, 100);
-    this.emitEvent("client:message-appended", {
+  messageAppended(uiMessage, streamId) {
+    const content = uiMessage.parts.filter((part) => part.type === "text").map((part) => part.content).join(" ");
+    this.emitEvent("text:message:created", {
+      streamId,
       messageId: uiMessage.id,
       role: uiMessage.role,
-      contentPreview
+      content,
+      parts: uiMessage.parts
     });
   }
   /**
    * Emit message sent event
    */
   messageSent(messageId, content) {
-    this.emitEvent("client:message-sent", {
+    this.emitEvent("text:message:created", {
+      messageId,
+      role: "user",
+      content
+    });
+    this.emitEvent("text:message:user", {
       messageId,
+      role: "user",
       content
     });
   }
@@ -130,13 +121,13 @@ class ChatClientEventEmitter {
    * Emit messages cleared event
    */
   messagesCleared() {
-    this.emitEvent("client:messages-cleared");
+    this.emitEvent("client:messages:cleared");
   }
   /**
    * Emit tool result added event
    */
   toolResultAdded(toolCallId, toolName, output, state) {
-    this.emitEvent("tool:result-added", {
+    this.emitEvent("tools:result:added", {
       toolCallId,
       toolName,
       output,
@@ -147,7 +138,7 @@ class ChatClientEventEmitter {
    * Emit tool approval responded event
    */
   toolApprovalResponded(approvalId, toolCallId, approved) {
-    this.emitEvent("tool:approval-responded", {
+    this.emitEvent("tools:approval:responded", {
       approvalId,
       toolCallId,
       approved
@@ -159,10 +150,11 @@ class DefaultChatClientEventEmitter extends ChatClientEventEmitter {
    * Emit an event with automatic clientId and timestamp for client/tool events
    */
   emitEvent(eventName, data) {
-    if (eventName.startsWith("client:") || eventName.startsWith("tool:")) {
+    if (eventName.startsWith("client:") || eventName.startsWith("tools:") || eventName.startsWith("text:")) {
       aiEventClient.emit(eventName, {
         ...data,
         clientId: this.clientId,
+        source: "client",
         timestamp: Date.now()
       });
     } else {

package/dist/esm/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sources":["../../src/events.ts"],"sourcesContent":["import { aiEventClient } from '@tanstack/ai/event-client'\nimport type { UIMessage } from './types'\n\n/**\n * Abstract base class for ChatClient event emission\n */\nexport abstract class ChatClientEventEmitter {\n  protected clientId: string\n\n  constructor(clientId: string) {\n    this.clientId = clientId\n  }\n\n  /**\n   * Protected abstract method for emitting events\n   * Implementations should handle adding clientId and timestamp\n   */\n  protected abstract emitEvent(\n    eventName: string,\n    data?: Record<string, any>,\n  ): void\n\n  /**\n   * Emit client created event\n   */\n  clientCreated(initialMessageCount: number): void {\n    this.emitEvent('client:created', {\n      initialMessageCount,\n    })\n  }\n\n  /**\n   * Emit loading state changed event\n   */\n  loadingChanged(isLoading: boolean): void {\n    this.emitEvent('client:loading-changed', { isLoading })\n  }\n\n  /**\n   * Emit error state changed event\n   */\n  errorChanged(error: string | null): void {\n    this.emitEvent('client:error-changed', {\n      error,\n    })\n  }\n\n  /**\n   * Emit text update events (combines processor and client events)\n   */\n  textUpdated(streamId: string, messageId: string, content: string): void {\n    this.emitEvent('processor:text-updated', {\n      streamId,\n      content,\n    })\n\n    this.emitEvent('client:assistant-message-updated', {\n      messageId,\n      content,\n    })\n  }\n\n  /**\n   * Emit tool call state change events (combines processor and client events)\n   */\n  toolCallStateChanged(\n    streamId: string,\n    messageId: string,\n    toolCallId: string,\n    toolName: string,\n    state: string,\n    args: string,\n  ): void {\n    this.emitEvent('processor:tool-call-state-changed', {\n      streamId,\n      toolCallId,\n      toolName,\n      state,\n      arguments: args,\n    })\n\n    this.emitEvent('client:tool-call-updated', {\n      messageId,\n      toolCallId,\n      toolName,\n      state,\n      arguments: args,\n    })\n  }\n\n  /**\n   * Emit tool result state change event\n   */\n  toolResultStateChanged(\n    streamId: string,\n    toolCallId: string,\n    content: string,\n    state: string,\n    error?: string,\n  ): void {\n    this.emitEvent('processor:tool-result-state-changed', {\n      streamId,\n      toolCallId,\n      content,\n      state,\n      error,\n    })\n  }\n\n  /**\n   * Emit thinking update event\n   */\n  thinkingUpdated(\n    streamId: string,\n    messageId: string,\n    content: string,\n    delta?: string,\n  ): void {\n    this.emitEvent('stream:chunk:thinking', {\n      streamId,\n      messageId,\n      content,\n      delta,\n    })\n  }\n\n  /**\n   * Emit approval requested event\n   */\n  approvalRequested(\n    messageId: string,\n    toolCallId: string,\n    toolName: string,\n    input: any,\n    approvalId: string,\n  ): void {\n    this.emitEvent('client:approval-requested', {\n      messageId,\n      toolCallId,\n      toolName,\n      input,\n      approvalId,\n    })\n  }\n\n  /**\n   * Emit message appended event\n   */\n  messageAppended(uiMessage: UIMessage): void {\n    const contentPreview = uiMessage.parts\n      .filter((p) => p.type === 'text')\n      .map((p) => (p as any).content)\n      .join(' ')\n      .substring(0, 100)\n\n    this.emitEvent('client:message-appended', {\n      messageId: uiMessage.id,\n      role: uiMessage.role,\n      contentPreview,\n    })\n  }\n\n  /**\n   * Emit message sent event\n   */\n  messageSent(messageId: string, content: string): void {\n    this.emitEvent('client:message-sent', {\n      messageId,\n      content,\n    })\n  }\n\n  /**\n   * Emit reloaded event\n   */\n  reloaded(fromMessageIndex: number): void {\n    this.emitEvent('client:reloaded', {\n      fromMessageIndex,\n    })\n  }\n\n  /**\n   * Emit stopped event\n   */\n  stopped(): void {\n    this.emitEvent('client:stopped')\n  }\n\n  /**\n   * Emit messages cleared event\n   */\n  messagesCleared(): void {\n    this.emitEvent('client:messages-cleared')\n  }\n\n  /**\n   * Emit tool result added event\n   */\n  toolResultAdded(\n    toolCallId: string,\n    toolName: string,\n    output: any,\n    state: string,\n  ): void {\n    this.emitEvent('tool:result-added', {\n      toolCallId,\n      toolName,\n      output,\n      state,\n    })\n  }\n\n  /**\n   * Emit tool approval responded event\n   */\n  toolApprovalResponded(\n    approvalId: string,\n    toolCallId: string,\n    approved: boolean,\n  ): void {\n    this.emitEvent('tool:approval-responded', {\n      approvalId,\n      toolCallId,\n      approved,\n    })\n  }\n}\n\n/**\n * Default implementation of ChatClientEventEmitter\n */\nexport class DefaultChatClientEventEmitter extends ChatClientEventEmitter {\n  /**\n   * Emit an event with automatic clientId and timestamp for client/tool events\n   */\n  protected emitEvent(eventName: string, data?: Record<string, any>): void {\n    // For client:* and tool:* events, automatically add clientId and timestamp\n    if (eventName.startsWith('client:') || eventName.startsWith('tool:')) {\n      aiEventClient.emit(eventName as any, {\n        ...data,\n        clientId: this.clientId,\n        timestamp: Date.now(),\n      })\n    } else {\n      // For other events (e.g., processor:*), just add timestamp\n      aiEventClient.emit(eventName as any, {\n        ...data,\n        timestamp: Date.now(),\n      })\n    }\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"events.js","sources":["../../src/events.ts"],"sourcesContent":["import { aiEventClient } from '@tanstack/ai/event-client'\nimport type { UIMessage } from './types'\n\n/**\n * Abstract base class for ChatClient event emission\n */\nexport abstract class ChatClientEventEmitter {\n  protected clientId: string\n\n  constructor(clientId: string) {\n    this.clientId = clientId\n  }\n\n  /**\n   * Protected abstract method for emitting events\n   * Implementations should handle adding clientId and timestamp\n   */\n  protected abstract emitEvent(\n    eventName: string,\n    data?: Record<string, unknown>,\n  ): void\n\n  /**\n   * Emit client created event\n   */\n  clientCreated(initialMessageCount: number): void {\n    this.emitEvent('client:created', {\n      initialMessageCount,\n    })\n  }\n\n  /**\n   * Emit loading state changed event\n   */\n  loadingChanged(isLoading: boolean): void {\n    this.emitEvent('client:loading:changed', { isLoading })\n  }\n\n  /**\n   * Emit error state changed event\n   */\n  errorChanged(error: string | null): void {\n    this.emitEvent('client:error:changed', {\n      error,\n    })\n  }\n\n  /**\n   * Emit text update events (combines processor and client events)\n   */\n  textUpdated(streamId: string, messageId: string, content: string): void {\n    this.emitEvent('text:chunk:content', {\n      streamId,\n      messageId,\n      content,\n    })\n  }\n\n  /**\n   * Emit tool call state change events (combines processor and client events)\n   */\n  toolCallStateChanged(\n    streamId: string,\n    messageId: string,\n    toolCallId: string,\n    toolName: string,\n    state: string,\n    args: string,\n  ): void {\n    this.emitEvent('tools:call:updated', {\n      streamId,\n      messageId,\n      toolCallId,\n      toolName,\n      state,\n      arguments: args,\n    })\n  }\n\n  /**\n   * Emit tool result state change event\n   */\n  /**\n   * Emit thinking update event\n   */\n  thinkingUpdated(\n    streamId: string,\n    messageId: string,\n    content: string,\n    delta?: string,\n  ): void {\n    this.emitEvent('text:chunk:thinking', {\n      streamId,\n      messageId,\n      content,\n      delta,\n    })\n  }\n\n  /**\n   * Emit approval requested event\n   */\n  approvalRequested(\n    streamId: string,\n    messageId: string,\n    toolCallId: string,\n    toolName: string,\n    input: unknown,\n    approvalId: string,\n  ): void {\n    this.emitEvent('tools:approval:requested', {\n      streamId,\n      messageId,\n      toolCallId,\n      toolName,\n      input,\n      approvalId,\n    })\n  }\n\n  /**\n   * Emit message appended event\n   */\n  messageAppended(uiMessage: UIMessage, streamId?: string): void {\n    const content = uiMessage.parts\n      .filter((part) => part.type === 'text')\n      .map((part) => part.content)\n      .join(' ')\n\n    this.emitEvent('text:message:created', {\n      streamId,\n      messageId: uiMessage.id,\n      role: uiMessage.role,\n      content,\n      parts: uiMessage.parts,\n    })\n  }\n\n  /**\n   * Emit message sent event\n   */\n  messageSent(messageId: string, content: string): void {\n    this.emitEvent('text:message:created', {\n      messageId,\n      role: 'user',\n      content,\n    })\n\n    this.emitEvent('text:message:user', {\n      messageId,\n      role: 'user',\n      content,\n    })\n  }\n\n  /**\n   * Emit reloaded event\n   */\n  reloaded(fromMessageIndex: number): void {\n    this.emitEvent('client:reloaded', {\n      fromMessageIndex,\n    })\n  }\n\n  /**\n   * Emit stopped event\n   */\n  stopped(): void {\n    this.emitEvent('client:stopped')\n  }\n\n  /**\n   * Emit messages cleared event\n   */\n  messagesCleared(): void {\n    this.emitEvent('client:messages:cleared')\n  }\n\n  /**\n   * Emit tool result added event\n   */\n  toolResultAdded(\n    toolCallId: string,\n    toolName: string,\n    output: unknown,\n    state: string,\n  ): void {\n    this.emitEvent('tools:result:added', {\n      toolCallId,\n      toolName,\n      output,\n      state,\n    })\n  }\n\n  /**\n   * Emit tool approval responded event\n   */\n  toolApprovalResponded(\n    approvalId: string,\n    toolCallId: string,\n    approved: boolean,\n  ): void {\n    this.emitEvent('tools:approval:responded', {\n      approvalId,\n      toolCallId,\n      approved,\n    })\n  }\n}\n\n/**\n * Default implementation of ChatClientEventEmitter\n */\nexport class DefaultChatClientEventEmitter extends ChatClientEventEmitter {\n  /**\n   * Emit an event with automatic clientId and timestamp for client/tool events\n   */\n  protected emitEvent(eventName: string, data?: Record<string, any>): void {\n    // For client:* and tool:* events, automatically add clientId and timestamp\n    if (\n      eventName.startsWith('client:') ||\n      eventName.startsWith('tools:') ||\n      eventName.startsWith('text:')\n    ) {\n      aiEventClient.emit(eventName as any, {\n        ...data,\n        clientId: this.clientId,\n        source: 'client',\n        timestamp: Date.now(),\n      })\n    } else {\n      // For other events, just add timestamp\n      aiEventClient.emit(eventName as any, {\n        ...data,\n        timestamp: Date.now(),\n      })\n    }\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/index.d.ts

@@ -1,8 +1,8 @@
 export { ChatClient } from './chat-client.js';
-export type { UIMessage, MessagePart, TextPart, ToolCallPart, ToolResultPart, ThinkingPart, ChatClientOptions, ChatRequestBody, InferChatMessages, } from './types.js';
+export type { UIMessage, MessagePart, TextPart, ToolCallPart, ToolResultPart, ThinkingPart, ChatClientOptions, ChatRequestBody, InferChatMessages, ChatClientState, } from './types.js';
 export { clientTools, createChatClientOptions } from './types.js';
 export type { ExtractToolNames, ExtractToolInput, ExtractToolOutput, } from './tool-types.js';
 export type { AnyClientTool } from '@tanstack/ai';
 export { fetchServerSentEvents, fetchHttpStream, stream, rpcStream, type ConnectionAdapter, type FetchConnectionOptions, } from './connection-adapters.js';
 export { uiMessageToModelMessages, modelMessageToUIMessage, modelMessagesToUIMessages, convertMessagesToModelMessages, normalizeToUIMessage, generateMessageId, } from '@tanstack/ai';
-export { StreamProcessor, ImmediateStrategy, PunctuationStrategy, BatchStrategy, WordBoundaryStrategy, CompositeStrategy, parsePartialJSON, PartialJSONParser, defaultJSONParser, type ChunkStrategy, type StreamProcessorOptions, type StreamProcessorHandlers, type StreamProcessorEvents, type InternalToolCallState, type ToolCallState, type ToolResultState, type JSONParser, type ChunkRecording, type ProcessorResult, type ProcessorState, } from '@tanstack/ai';
+export { StreamProcessor, ImmediateStrategy, PunctuationStrategy, BatchStrategy, WordBoundaryStrategy, CompositeStrategy, parsePartialJSON, PartialJSONParser, defaultJSONParser, type ChunkStrategy, type StreamProcessorOptions, type StreamProcessorEvents, type InternalToolCallState, type ToolCallState, type ToolResultState, type JSONParser, type ChunkRecording, type ProcessorResult, type ProcessorState, } from '@tanstack/ai';

package/dist/esm/types.d.ts

@@ -8,6 +8,10 @@ export type ToolCallState = 'awaiting-input' | 'input-streaming' | 'input-comple
  * Tool result states - track the lifecycle of a tool result
  */
 export type ToolResultState = 'streaming' | 'complete' | 'error';
+/**
+ * ChatClient state - track the lifecycle of a chat
+ */
+export type ChatClientState = 'ready' | 'submitted' | 'streaming' | 'error';
 /**
  * Message parts - building blocks of UIMessage
  */
@@ -138,6 +142,10 @@ export interface ChatClientOptions<TTools extends ReadonlyArray<AnyClientTool> =
      * Callback when error state changes
      */
     onErrorChange?: (error: Error | undefined) => void;
+    /**
+     * Callback when chat status changes
+     */
+    onStatusChange?: (status: ChatClientState) => void;
     /**
      * Client-side tools with execution logic
      * When provided, tools with execute functions will be called automatically

package/dist/esm/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sources":["../../src/types.ts"],"sourcesContent":["import type {\n  AnyClientTool,\n  ChunkStrategy,\n  InferToolInput,\n  InferToolOutput,\n  ModelMessage,\n  StreamChunk,\n} from '@tanstack/ai'\nimport type { ConnectionAdapter } from './connection-adapters'\n\n/**\n * Tool call states - track the lifecycle of a tool call\n */\nexport type ToolCallState =\n  | 'awaiting-input' // Received start but no arguments yet\n  | 'input-streaming' // Partial arguments received\n  | 'input-complete' // All arguments received\n  | 'approval-requested' // Waiting for user approval\n  | 'approval-responded' // User has approved/denied\n\n/**\n * Tool result states - track the lifecycle of a tool result\n */\nexport type ToolResultState =\n  | 'streaming' // Placeholder for future streamed output\n  | 'complete' // Result is complete\n  | 'error' // Error occurred\n\n/**\n * Message parts - building blocks of UIMessage\n */\nexport interface TextPart {\n  type: 'text'\n  content: string\n}\n\n/**\n * Helper type that creates a tool-call part for a specific tool.\n * This is a conditional type to enable proper distribution over union types,\n * creating a discriminated union where `name` is the discriminant.\n */\ntype ToolCallPartForTool<T> = T extends AnyClientTool\n  ? {\n      type: 'tool-call'\n      id: string\n      name: T['name']\n      arguments: string // JSON string (may be incomplete)\n      /** Parsed tool input (typed from inputSchema) */\n      input?: InferToolInput<T>\n      state: ToolCallState\n      /** Approval metadata if tool requires user approval */\n      approval?: {\n        id: string // Unique approval ID\n        needsApproval: boolean // Always true if present\n        approved?: boolean // User's decision (undefined until responded)\n      }\n      /** Tool execution output (for client tools or after approval) */\n      output?: InferToolOutput<T>\n    }\n  : never\n\n/**\n * Fallback tool-call part type when tools are not typed\n */\ntype UntypedToolCallPart = {\n  type: 'tool-call'\n  id: string\n  name: string\n  arguments: string\n  input?: any\n  state: ToolCallState\n  approval?: {\n    id: string\n    needsApproval: boolean\n    approved?: boolean\n  }\n  output?: any\n}\n\n/**\n * Tool call part that creates a proper discriminated union.\n * When TTools is typed, checking `part.name === 'toolName'` will narrow\n * `part.output` to the correct type for that tool.\n *\n * The discriminant is `name`, so code like:\n * ```ts\n * if (part.name === 'recommendGuitar') {\n *   // part.output is now typed to the recommendGuitar tool's output\n * }\n * ```\n */\nexport type ToolCallPart<TTools extends ReadonlyArray<AnyClientTool> = any> =\n  // Check if we have a concrete tools array (not 'any' or 'never')\n  [TTools] extends [never]\n    ? UntypedToolCallPart\n    : unknown extends TTools\n      ? UntypedToolCallPart\n      : TTools extends ReadonlyArray<infer Tool>\n        ? Tool extends AnyClientTool\n          ? ToolCallPartForTool<Tool>\n          : UntypedToolCallPart\n        : UntypedToolCallPart\n\nexport interface ToolResultPart {\n  type: 'tool-result'\n  toolCallId: string\n  content: string\n  state: ToolResultState\n  error?: string // Error message if state is \"error\"\n}\n\nexport interface ThinkingPart {\n  type: 'thinking'\n  content: string\n}\n\nexport type MessagePart<TTools extends ReadonlyArray<AnyClientTool> = any> =\n  | TextPart\n  | ToolCallPart<TTools>\n  | ToolResultPart\n  | ThinkingPart\n\n/**\n * UIMessage - Domain-specific message format optimized for building chat UIs\n * Contains parts that can be text, tool calls, or tool results\n */\nexport interface UIMessage<TTools extends ReadonlyArray<AnyClientTool> = any> {\n  id: string\n  role: 'system' | 'user' | 'assistant'\n  parts: Array<MessagePart<TTools>>\n  createdAt?: Date\n}\n\nexport interface ChatClientOptions<\n  TTools extends ReadonlyArray<AnyClientTool> = any,\n> {\n  /**\n   * Connection adapter for streaming\n   * Use fetchServerSentEvents(), fetchHttpStream(), or stream() to create adapters\n   */\n  connection: ConnectionAdapter\n\n  /**\n   * Initial messages to populate the chat\n   */\n  initialMessages?: Array<UIMessage<TTools>>\n\n  /**\n   * Unique identifier for this chat instance\n   * Used for managing multiple chats\n   */\n  id?: string\n\n  /**\n   * Additional body parameters to send\n   */\n  body?: Record<string, any>\n\n  /**\n   * Callback when a response is received\n   */\n  onResponse?: (response?: Response) => void | Promise<void>\n\n  /**\n   * Callback when a stream chunk is received\n   */\n  onChunk?: (chunk: StreamChunk) => void\n\n  /**\n   * Callback when the response is finished\n   */\n  onFinish?: (message: UIMessage<TTools>) => void\n\n  /**\n   * Callback when an error occurs\n   */\n  onError?: (error: Error) => void\n\n  /**\n   * Callback when messages change\n   */\n  onMessagesChange?: (messages: Array<UIMessage<TTools>>) => void\n\n  /**\n   * Callback when loading state changes\n   */\n  onLoadingChange?: (isLoading: boolean) => void\n\n  /**\n   * Callback when error state changes\n   */\n  onErrorChange?: (error: Error | undefined) => void\n\n  /**\n   * Client-side tools with execution logic\n   * When provided, tools with execute functions will be called automatically\n   */\n  tools?: TTools\n\n  /**\n   * Stream processing options (optional)\n   * Configure chunking strategy\n   */\n  streamProcessor?: {\n    /**\n     * Strategy for when to emit text updates\n     * Defaults to ImmediateStrategy (every chunk)\n     */\n    chunkStrategy?: ChunkStrategy\n  }\n}\n\nexport interface ChatRequestBody {\n  messages: Array<ModelMessage>\n  data?: Record<string, any>\n}\n\n/**\n * Create a typed array of client tools with proper type inference.\n * This eliminates the need for `as const` when defining tool arrays.\n *\n * @example\n * ```ts\n * const tools = clientTools(\n *   myTool1.client(() => result1),\n *   myTool2.client(() => result2),\n * )\n *\n * // tools is now properly typed as a tuple with literal tool names\n * // This enables type narrowing when checking part.name === 'toolName'\n * ```\n */\nexport function clientTools<const T extends Array<AnyClientTool>>(\n  ...tools: T\n): T {\n  return tools\n}\n\n/**\n * Helper to create typed chat client options\n * Use this to get proper type inference for messages\n *\n * @example\n * ```ts\n * const tools = clientTools(myTool1, myTool2)\n *\n * const chatOptions = createChatClientOptions({\n *   connection: fetchServerSentEvents('/api/chat'),\n *   tools,\n * })\n *\n * type MyMessages = InferChatMessages<typeof chatOptions>\n * ```\n */\nexport function createChatClientOptions<\n  const TTools extends ReadonlyArray<AnyClientTool>,\n>(options: ChatClientOptions<TTools>): ChatClientOptions<TTools> {\n  return options\n}\n\n/**\n * Extract the message type from chat options\n *\n * @example\n * ```ts\n * const chatOptions = createChatClientOptions({\n *   connection: fetchServerSentEvents('/api/chat'),\n *   tools: [myTool1, myTool2],\n * })\n *\n * type MyMessages = InferChatMessages<typeof chatOptions>\n * // MyMessages is now Array<UIMessage<[typeof myTool1, typeof myTool2]>>\n * ```\n */\nexport type InferChatMessages<T> =\n  T extends ChatClientOptions<infer TTools> ? Array<UIMessage<TTools>> : never\n"],"names":[],"mappings":"AAwOO,SAAS,eACX,OACA;AACH,SAAO;AACT;AAkBO,SAAS,wBAEd,SAA+D;AAC/D,SAAO;AACT;"}
+{"version":3,"file":"types.js","sources":["../../src/types.ts"],"sourcesContent":["import type {\n  AnyClientTool,\n  ChunkStrategy,\n  InferToolInput,\n  InferToolOutput,\n  ModelMessage,\n  StreamChunk,\n} from '@tanstack/ai'\nimport type { ConnectionAdapter } from './connection-adapters'\n\n/**\n * Tool call states - track the lifecycle of a tool call\n */\nexport type ToolCallState =\n  | 'awaiting-input' // Received start but no arguments yet\n  | 'input-streaming' // Partial arguments received\n  | 'input-complete' // All arguments received\n  | 'approval-requested' // Waiting for user approval\n  | 'approval-responded' // User has approved/denied\n\n/**\n * Tool result states - track the lifecycle of a tool result\n */\nexport type ToolResultState =\n  | 'streaming' // Placeholder for future streamed output\n  | 'complete' // Result is complete\n  | 'error' // Error occurred\n\n/**\n * ChatClient state - track the lifecycle of a chat\n */\nexport type ChatClientState = 'ready' | 'submitted' | 'streaming' | 'error'\n\n/**\n * Message parts - building blocks of UIMessage\n */\nexport interface TextPart {\n  type: 'text'\n  content: string\n}\n\n/**\n * Helper type that creates a tool-call part for a specific tool.\n * This is a conditional type to enable proper distribution over union types,\n * creating a discriminated union where `name` is the discriminant.\n */\ntype ToolCallPartForTool<T> = T extends AnyClientTool\n  ? {\n      type: 'tool-call'\n      id: string\n      name: T['name']\n      arguments: string // JSON string (may be incomplete)\n      /** Parsed tool input (typed from inputSchema) */\n      input?: InferToolInput<T>\n      state: ToolCallState\n      /** Approval metadata if tool requires user approval */\n      approval?: {\n        id: string // Unique approval ID\n        needsApproval: boolean // Always true if present\n        approved?: boolean // User's decision (undefined until responded)\n      }\n      /** Tool execution output (for client tools or after approval) */\n      output?: InferToolOutput<T>\n    }\n  : never\n\n/**\n * Fallback tool-call part type when tools are not typed\n */\ntype UntypedToolCallPart = {\n  type: 'tool-call'\n  id: string\n  name: string\n  arguments: string\n  input?: any\n  state: ToolCallState\n  approval?: {\n    id: string\n    needsApproval: boolean\n    approved?: boolean\n  }\n  output?: any\n}\n\n/**\n * Tool call part that creates a proper discriminated union.\n * When TTools is typed, checking `part.name === 'toolName'` will narrow\n * `part.output` to the correct type for that tool.\n *\n * The discriminant is `name`, so code like:\n * ```ts\n * if (part.name === 'recommendGuitar') {\n *   // part.output is now typed to the recommendGuitar tool's output\n * }\n * ```\n */\nexport type ToolCallPart<TTools extends ReadonlyArray<AnyClientTool> = any> =\n  // Check if we have a concrete tools array (not 'any' or 'never')\n  [TTools] extends [never]\n    ? UntypedToolCallPart\n    : unknown extends TTools\n      ? UntypedToolCallPart\n      : TTools extends ReadonlyArray<infer Tool>\n        ? Tool extends AnyClientTool\n          ? ToolCallPartForTool<Tool>\n          : UntypedToolCallPart\n        : UntypedToolCallPart\n\nexport interface ToolResultPart {\n  type: 'tool-result'\n  toolCallId: string\n  content: string\n  state: ToolResultState\n  error?: string // Error message if state is \"error\"\n}\n\nexport interface ThinkingPart {\n  type: 'thinking'\n  content: string\n}\n\nexport type MessagePart<TTools extends ReadonlyArray<AnyClientTool> = any> =\n  | TextPart\n  | ToolCallPart<TTools>\n  | ToolResultPart\n  | ThinkingPart\n\n/**\n * UIMessage - Domain-specific message format optimized for building chat UIs\n * Contains parts that can be text, tool calls, or tool results\n */\nexport interface UIMessage<TTools extends ReadonlyArray<AnyClientTool> = any> {\n  id: string\n  role: 'system' | 'user' | 'assistant'\n  parts: Array<MessagePart<TTools>>\n  createdAt?: Date\n}\n\nexport interface ChatClientOptions<\n  TTools extends ReadonlyArray<AnyClientTool> = any,\n> {\n  /**\n   * Connection adapter for streaming\n   * Use fetchServerSentEvents(), fetchHttpStream(), or stream() to create adapters\n   */\n  connection: ConnectionAdapter\n\n  /**\n   * Initial messages to populate the chat\n   */\n  initialMessages?: Array<UIMessage<TTools>>\n\n  /**\n   * Unique identifier for this chat instance\n   * Used for managing multiple chats\n   */\n  id?: string\n\n  /**\n   * Additional body parameters to send\n   */\n  body?: Record<string, any>\n\n  /**\n   * Callback when a response is received\n   */\n  onResponse?: (response?: Response) => void | Promise<void>\n\n  /**\n   * Callback when a stream chunk is received\n   */\n  onChunk?: (chunk: StreamChunk) => void\n\n  /**\n   * Callback when the response is finished\n   */\n  onFinish?: (message: UIMessage<TTools>) => void\n\n  /**\n   * Callback when an error occurs\n   */\n  onError?: (error: Error) => void\n\n  /**\n   * Callback when messages change\n   */\n  onMessagesChange?: (messages: Array<UIMessage<TTools>>) => void\n\n  /**\n   * Callback when loading state changes\n   */\n  onLoadingChange?: (isLoading: boolean) => void\n\n  /**\n   * Callback when error state changes\n   */\n  onErrorChange?: (error: Error | undefined) => void\n\n  /**\n   * Callback when chat status changes\n   */\n  onStatusChange?: (status: ChatClientState) => void\n\n  /**\n   * Client-side tools with execution logic\n   * When provided, tools with execute functions will be called automatically\n   */\n  tools?: TTools\n\n  /**\n   * Stream processing options (optional)\n   * Configure chunking strategy\n   */\n  streamProcessor?: {\n    /**\n     * Strategy for when to emit text updates\n     * Defaults to ImmediateStrategy (every chunk)\n     */\n    chunkStrategy?: ChunkStrategy\n  }\n}\n\nexport interface ChatRequestBody {\n  messages: Array<ModelMessage>\n  data?: Record<string, any>\n}\n\n/**\n * Create a typed array of client tools with proper type inference.\n * This eliminates the need for `as const` when defining tool arrays.\n *\n * @example\n * ```ts\n * const tools = clientTools(\n *   myTool1.client(() => result1),\n *   myTool2.client(() => result2),\n * )\n *\n * // tools is now properly typed as a tuple with literal tool names\n * // This enables type narrowing when checking part.name === 'toolName'\n * ```\n */\nexport function clientTools<const T extends Array<AnyClientTool>>(\n  ...tools: T\n): T {\n  return tools\n}\n\n/**\n * Helper to create typed chat client options\n * Use this to get proper type inference for messages\n *\n * @example\n * ```ts\n * const tools = clientTools(myTool1, myTool2)\n *\n * const chatOptions = createChatClientOptions({\n *   connection: fetchServerSentEvents('/api/chat'),\n *   tools,\n * })\n *\n * type MyMessages = InferChatMessages<typeof chatOptions>\n * ```\n */\nexport function createChatClientOptions<\n  const TTools extends ReadonlyArray<AnyClientTool>,\n>(options: ChatClientOptions<TTools>): ChatClientOptions<TTools> {\n  return options\n}\n\n/**\n * Extract the message type from chat options\n *\n * @example\n * ```ts\n * const chatOptions = createChatClientOptions({\n *   connection: fetchServerSentEvents('/api/chat'),\n *   tools: [myTool1, myTool2],\n * })\n *\n * type MyMessages = InferChatMessages<typeof chatOptions>\n * // MyMessages is now Array<UIMessage<[typeof myTool1, typeof myTool2]>>\n * ```\n */\nexport type InferChatMessages<T> =\n  T extends ChatClientOptions<infer TTools> ? Array<UIMessage<TTools>> : never\n"],"names":[],"mappings":"AAkPO,SAAS,eACX,OACA;AACH,SAAO;AACT;AAkBO,SAAS,wBAEd,SAA+D;AAC/D,SAAO;AACT;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/ai-client",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "description": "Framework-agnostic headless client for TanStack AI",
   "author": "",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "src"
   ],
   "dependencies": {
-    "@tanstack/ai": "0.2.2"
+    "@tanstack/ai": "0.3.1"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "4.0.14",

package/src/chat-client.ts

@@ -4,15 +4,16 @@ import {
   normalizeToUIMessage,
 } from '@tanstack/ai'
 import { DefaultChatClientEventEmitter } from './events'
+import type { AnyClientTool, ModelMessage, StreamChunk } from '@tanstack/ai'
+import type { ConnectionAdapter } from './connection-adapters'
+import type { ChatClientEventEmitter } from './events'
 import type {
   ChatClientOptions,
+  ChatClientState,
   MessagePart,
   ToolCallPart,
   UIMessage,
 } from './types'
-import type { AnyClientTool, ModelMessage, StreamChunk } from '@tanstack/ai'
-import type { ConnectionAdapter } from './connection-adapters'
-import type { ChatClientEventEmitter } from './events'
 
 export class ChatClient {
   private processor: StreamProcessor
@@ -21,12 +22,17 @@ export class ChatClient {
   private body: Record<string, any> = {}
   private isLoading = false
   private error: Error | undefined = undefined
+  private status: ChatClientState = 'ready'
   private abortController: AbortController | null = null
   private events: ChatClientEventEmitter
   private clientToolsRef: { current: Map<string, AnyClientTool> }
   private currentStreamId: string | null = null
   private currentMessageId: string | null = null
   private postStreamActions: Array<() => Promise<void>> = []
+  // Track pending client tool executions to await them before stream finalization
+  private pendingToolExecutions: Map<string, Promise<void>> = new Map()
+  // Flag to deduplicate continuation checks during action draining
+  private continuationPending = false
 
   private callbacksRef: {
     current: {
@@ -37,6 +43,7 @@ export class ChatClient {
       onMessagesChange: (messages: Array<UIMessage>) => void
       onLoadingChange: (isLoading: boolean) => void
       onErrorChange: (error: Error | undefined) => void
+      onStatusChange: (status: ChatClientState) => void
     }
   }
 
@@ -63,6 +70,7 @@ export class ChatClient {
         onMessagesChange: options.onMessagesChange || (() => {}),
         onLoadingChange: options.onLoadingChange || (() => {}),
         onErrorChange: options.onErrorChange || (() => {}),
+        onStatusChange: options.onStatusChange || (() => {}),
       },
     }
 
@@ -75,13 +83,15 @@ export class ChatClient {
           this.callbacksRef.current.onMessagesChange(messages)
         },
         onStreamStart: () => {
-          // Stream started
+          this.setStatus('streaming')
         },
         onStreamEnd: (message: UIMessage) => {
           this.callbacksRef.current.onFinish(message)
+          this.setStatus('ready')
         },
         onError: (error: Error) => {
           this.setError(error)
+          this.setStatus('error')
           this.callbacksRef.current.onError(error)
         },
         onTextUpdate: (messageId: string, content: string) => {
@@ -127,31 +137,41 @@ export class ChatClient {
             )
           }
         },
-        onToolCall: async (args: {
+        onToolCall: (args: {
           toolCallId: string
           toolName: string
           input: any
         }) => {
           // Handle client-side tool execution automatically
           const clientTool = this.clientToolsRef.current.get(args.toolName)
-          if (clientTool?.execute) {
-            try {
-              const output = await clientTool.execute(args.input)
-              await this.addToolResult({
-                toolCallId: args.toolCallId,
-                tool: args.toolName,
-                output,
-                state: 'output-available',
-              })
-            } catch (error: any) {
-              await this.addToolResult({
-                toolCallId: args.toolCallId,
-                tool: args.toolName,
-                output: null,
-                state: 'output-error',
-                errorText: error.message,
-              })
-            }
+          const executeFunc = clientTool?.execute
+          if (executeFunc) {
+            // Create and track the execution promise
+            const executionPromise = (async () => {
+              try {
+                const output = await executeFunc(args.input)
+                await this.addToolResult({
+                  toolCallId: args.toolCallId,
+                  tool: args.toolName,
+                  output,
+                  state: 'output-available',
+                })
+              } catch (error: any) {
+                await this.addToolResult({
+                  toolCallId: args.toolCallId,
+                  tool: args.toolName,
+                  output: null,
+                  state: 'output-error',
+                  errorText: error.message,
+                })
+              } finally {
+                // Remove from pending when complete
+                this.pendingToolExecutions.delete(args.toolCallId)
+              }
+            })()
+
+            // Track the pending execution
+            this.pendingToolExecutions.set(args.toolCallId, executionPromise)
           }
         },
         onApprovalRequest: (args: {
@@ -160,13 +180,16 @@ export class ChatClient {
           input: any
           approvalId: string
         }) => {
-          this.events.approvalRequested(
-            this.currentMessageId || '',
-            args.toolCallId,
-            args.toolName,
-            args.input,
-            args.approvalId,
-          )
+          if (this.currentStreamId) {
+            this.events.approvalRequested(
+              this.currentStreamId,
+              this.currentMessageId || '',
+              args.toolCallId,
+              args.toolName,
+              args.input,
+              args.approvalId,
+            )
+          }
         },
       },
     })
@@ -184,6 +207,11 @@ export class ChatClient {
     this.events.loadingChanged(isLoading)
   }
 
+  private setStatus(status: ChatClientState): void {
+    this.status = status
+    this.callbacksRef.current.onStatusChange(status)
+  }
+
   private setError(error: Error | undefined): void {
     this.error = error
     this.callbacksRef.current.onErrorChange(error)
@@ -210,7 +238,10 @@ export class ChatClient {
       parts: [],
       createdAt: new Date(),
     }
-    this.events.messageAppended(assistantMessage)
+    this.events.messageAppended(
+      assistantMessage,
+      this.currentStreamId || undefined,
+    )
 
     // Process each chunk
     for await (const chunk of source) {
@@ -221,6 +252,12 @@ export class ChatClient {
       await new Promise((resolve) => setTimeout(resolve, 0))
     }
 
+    // Wait for all pending tool executions to complete before finalizing
+    // This ensures client tools finish before we check for continuation
+    if (this.pendingToolExecutions.size > 0) {
+      await Promise.all(this.pendingToolExecutions.values())
+    }
+
     // Finalize the stream
     this.processor.finalizeStream()
 
@@ -281,6 +318,12 @@ export class ChatClient {
     const messages = this.processor.getMessages()
     this.processor.setMessages([...messages, uiMessage])
 
+    // If stream is in progress, queue the response for after it ends
+    if (this.isLoading) {
+      this.queuePostStreamAction(() => this.streamResponse())
+      return
+    }
+
     await this.streamResponse()
   }
 
@@ -288,13 +331,22 @@ export class ChatClient {
    * Stream a response from the LLM
    */
   private async streamResponse(): Promise<void> {
+    // Guard against concurrent streams - if already loading, skip
+    if (this.isLoading) {
+      return
+    }
+
     this.setIsLoading(true)
+    this.setStatus('submitted')
     this.setError(undefined)
     this.abortController = new AbortController()
+    // Reset pending tool executions for the new stream
+    this.pendingToolExecutions.clear()
+    let streamCompletedSuccessfully = false
 
     try {
-      // Get model messages for the LLM
-      const modelMessages = this.processor.toModelMessages()
+      // Get UIMessages with parts (preserves approval state and client tool results)
+      const messages = this.processor.getMessages()
 
       // Call onResponse callback
       await this.callbacksRef.current.onResponse()
@@ -307,18 +359,20 @@ export class ChatClient {
 
       // Connect and stream
       const stream = this.connection.connect(
-        modelMessages,
+        messages,
         bodyWithConversationId,
         this.abortController.signal,
       )
 
       await this.processStream(stream)
+      streamCompletedSuccessfully = true
     } catch (err) {
       if (err instanceof Error) {
         if (err.name === 'AbortError') {
           return
         }
         this.setError(err)
+        this.setStatus('error')
         this.callbacksRef.current.onError(err)
       }
     } finally {
@@ -327,6 +381,20 @@ export class ChatClient {
 
       // Drain any actions that were queued while the stream was in progress
       await this.drainPostStreamActions()
+
+      // Continue conversation if the stream ended with a tool result (server tool completed)
+      if (streamCompletedSuccessfully) {
+        const messages = this.processor.getMessages()
+        const lastPart = messages.at(-1)?.parts.at(-1)
+
+        if (lastPart?.type === 'tool-result' && this.shouldAutoSend()) {
+          try {
+            await this.checkForContinuation()
+          } catch (error) {
+            console.error('Failed to continue flow after tool result:', error)
+          }
+        }
+      }
     }
   }
 
@@ -362,6 +430,7 @@ export class ChatClient {
       this.abortController = null
     }
     this.setIsLoading(false)
+    this.setStatus('ready')
     this.events.stopped()
   }
 
@@ -470,8 +539,18 @@ export class ChatClient {
    * Check if we should continue the flow and do so if needed
    */
   private async checkForContinuation(): Promise<void> {
+    // Prevent duplicate continuation attempts
+    if (this.continuationPending || this.isLoading) {
+      return
+    }
+
     if (this.shouldAutoSend()) {
-      await this.streamResponse()
+      this.continuationPending = true
+      try {
+        await this.streamResponse()
+      } finally {
+        this.continuationPending = false
+      }
     }
   }
 
@@ -496,6 +575,13 @@ export class ChatClient {
     return this.isLoading
   }
 
+  /**
+   * Get current status
+   */
+  getStatus(): ChatClientState {
+    return this.status
+  }
+
   /**
    * Get current error
    */