@tanstack/ai-client 0.2.2 → 0.4.0

package/src/connection-adapters.ts

@@ -1,4 +1,3 @@
-import { convertMessagesToModelMessages } from '@tanstack/ai'
 import type { ModelMessage, StreamChunk, UIMessage } from '@tanstack/ai'
 
 /**
@@ -138,16 +137,15 @@ export function fetchServerSentEvents(
       const resolvedOptions =
         typeof options === 'function' ? await options() : options
 
-      const modelMessages = convertMessagesToModelMessages(messages)
-
       const requestHeaders: Record<string, string> = {
         'Content-Type': 'application/json',
         ...mergeHeaders(resolvedOptions.headers),
       }
 
-      // Merge body from options with messages and data
+      // Send messages as-is (UIMessages with parts preserved)
+      // Server-side TextEngine handles conversion to ModelMessages
       const requestBody = {
-        messages: modelMessages,
+        messages,
         data,
         ...resolvedOptions.body,
       }
@@ -238,17 +236,15 @@ export function fetchHttpStream(
       const resolvedOptions =
         typeof options === 'function' ? await options() : options
 
-      // Convert UIMessages to ModelMessages if needed
-      const modelMessages = convertMessagesToModelMessages(messages)
-
       const requestHeaders: Record<string, string> = {
         'Content-Type': 'application/json',
         ...mergeHeaders(resolvedOptions.headers),
       }
 
-      // Merge body from options with messages and data
+      // Send messages as-is (UIMessages with parts preserved)
+      // Server-side TextEngine handles conversion to ModelMessages
       const requestBody = {
-        messages: modelMessages,
+        messages,
         data,
         ...resolvedOptions.body,
       }
@@ -302,14 +298,15 @@ export function fetchHttpStream(
  */
 export function stream(
   streamFactory: (
-    messages: Array<ModelMessage>,
+    messages: Array<UIMessage> | Array<ModelMessage>,
     data?: Record<string, any>,
   ) => AsyncIterable<StreamChunk>,
 ): ConnectionAdapter {
   return {
     async *connect(messages, data) {
-      const modelMessages = convertMessagesToModelMessages(messages)
-      yield* streamFactory(modelMessages, data)
+      // Pass messages as-is (UIMessages with parts preserved)
+      // Server-side chat() handles conversion to ModelMessages
+      yield* streamFactory(messages, data)
     },
   }
 }
@@ -332,16 +329,15 @@ export function stream(
  */
 export function rpcStream(
   rpcCall: (
-    messages: Array<ModelMessage>,
+    messages: Array<UIMessage> | Array<ModelMessage>,
     data?: Record<string, any>,
   ) => AsyncIterable<StreamChunk>,
 ): ConnectionAdapter {
   return {
     async *connect(messages, data) {
-      const modelMessages = convertMessagesToModelMessages(messages)
-      // Simply yield from the RPC call
-      // The RPC layer handles WebSocket transport
-      yield* rpcCall(modelMessages, data)
+      // Pass messages as-is (UIMessages with parts preserved)
+      // Server-side chat() handles conversion to ModelMessages
+      yield* rpcCall(messages, data)
     },
   }
 }

package/src/events.ts

@@ -17,7 +17,7 @@ export abstract class ChatClientEventEmitter {
    */
   protected abstract emitEvent(
     eventName: string,
-    data?: Record<string, any>,
+    data?: Record<string, unknown>,
   ): void
 
   /**
@@ -33,14 +33,14 @@ export abstract class ChatClientEventEmitter {
    * Emit loading state changed event
    */
   loadingChanged(isLoading: boolean): void {
-    this.emitEvent('client:loading-changed', { isLoading })
+    this.emitEvent('client:loading:changed', { isLoading })
   }
 
   /**
    * Emit error state changed event
    */
   errorChanged(error: string | null): void {
-    this.emitEvent('client:error-changed', {
+    this.emitEvent('client:error:changed', {
       error,
     })
   }
@@ -49,12 +49,8 @@ export abstract class ChatClientEventEmitter {
    * Emit text update events (combines processor and client events)
    */
   textUpdated(streamId: string, messageId: string, content: string): void {
-    this.emitEvent('processor:text-updated', {
+    this.emitEvent('text:chunk:content', {
       streamId,
-      content,
-    })
-
-    this.emitEvent('client:assistant-message-updated', {
       messageId,
       content,
     })
@@ -71,15 +67,8 @@ export abstract class ChatClientEventEmitter {
     state: string,
     args: string,
   ): void {
-    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,
@@ -91,22 +80,6 @@ export abstract class ChatClientEventEmitter {
   /**
    * Emit tool result state change event
    */
-  toolResultStateChanged(
-    streamId: string,
-    toolCallId: string,
-    content: string,
-    state: string,
-    error?: string,
-  ): void {
-    this.emitEvent('processor:tool-result-state-changed', {
-      streamId,
-      toolCallId,
-      content,
-      state,
-      error,
-    })
-  }
-
   /**
    * Emit thinking update event
    */
@@ -116,7 +89,7 @@ export abstract class ChatClientEventEmitter {
     content: string,
     delta?: string,
   ): void {
-    this.emitEvent('stream:chunk:thinking', {
+    this.emitEvent('text:chunk:thinking', {
       streamId,
       messageId,
       content,
@@ -128,13 +101,15 @@ export abstract class ChatClientEventEmitter {
    * Emit approval requested event
    */
   approvalRequested(
+    streamId: string,
     messageId: string,
     toolCallId: string,
     toolName: string,
-    input: any,
+    input: unknown,
     approvalId: string,
   ): void {
-    this.emitEvent('client:approval-requested', {
+    this.emitEvent('tools:approval:requested', {
+      streamId,
       messageId,
       toolCallId,
       toolName,
@@ -146,17 +121,18 @@ export abstract class ChatClientEventEmitter {
   /**
    * Emit message appended event
    */
-  messageAppended(uiMessage: UIMessage): void {
-    const contentPreview = uiMessage.parts
-      .filter((p) => p.type === 'text')
-      .map((p) => (p as any).content)
+  messageAppended(uiMessage: UIMessage, streamId?: string): void {
+    const content = uiMessage.parts
+      .filter((part) => part.type === 'text')
+      .map((part) => part.content)
       .join(' ')
-      .substring(0, 100)
 
-    this.emitEvent('client:message-appended', {
+    this.emitEvent('text:message:created', {
+      streamId,
       messageId: uiMessage.id,
       role: uiMessage.role,
-      contentPreview,
+      content,
+      parts: uiMessage.parts,
     })
   }
 
@@ -164,8 +140,15 @@ export abstract class ChatClientEventEmitter {
    * Emit message sent event
    */
   messageSent(messageId: string, content: string): void {
-    this.emitEvent('client:message-sent', {
+    this.emitEvent('text:message:created', {
+      messageId,
+      role: 'user',
+      content,
+    })
+
+    this.emitEvent('text:message:user', {
       messageId,
+      role: 'user',
       content,
     })
   }
@@ -190,7 +173,7 @@ export abstract class ChatClientEventEmitter {
    * Emit messages cleared event
    */
   messagesCleared(): void {
-    this.emitEvent('client:messages-cleared')
+    this.emitEvent('client:messages:cleared')
   }
 
   /**
@@ -199,10 +182,10 @@ export abstract class ChatClientEventEmitter {
   toolResultAdded(
     toolCallId: string,
     toolName: string,
-    output: any,
+    output: unknown,
     state: string,
   ): void {
-    this.emitEvent('tool:result-added', {
+    this.emitEvent('tools:result:added', {
       toolCallId,
       toolName,
       output,
@@ -218,7 +201,7 @@ export abstract class ChatClientEventEmitter {
     toolCallId: string,
     approved: boolean,
   ): void {
-    this.emitEvent('tool:approval-responded', {
+    this.emitEvent('tools:approval:responded', {
       approvalId,
       toolCallId,
       approved,
@@ -235,14 +218,19 @@ export class DefaultChatClientEventEmitter extends ChatClientEventEmitter {
    */
   protected emitEvent(eventName: string, data?: Record<string, any>): void {
     // For client:* and tool:* events, automatically add clientId and timestamp
-    if (eventName.startsWith('client:') || eventName.startsWith('tool:')) {
+    if (
+      eventName.startsWith('client:') ||
+      eventName.startsWith('tools:') ||
+      eventName.startsWith('text:')
+    ) {
       aiEventClient.emit(eventName as any, {
         ...data,
         clientId: this.clientId,
+        source: 'client',
         timestamp: Date.now(),
       })
     } else {
-      // For other events (e.g., processor:*), just add timestamp
+      // For other events, just add timestamp
       aiEventClient.emit(eventName as any, {
         ...data,
         timestamp: Date.now(),

package/src/index.ts

@@ -11,6 +11,7 @@ export type {
   ChatClientOptions,
   ChatRequestBody,
   InferChatMessages,
+  ChatClientState,
 } from './types'
 export { clientTools, createChatClientOptions } from './types'
 export type {
@@ -51,7 +52,6 @@ export {
   defaultJSONParser,
   type ChunkStrategy,
   type StreamProcessorOptions,
-  type StreamProcessorHandlers,
   type StreamProcessorEvents,
   type InternalToolCallState,
   type ToolCallState,

package/src/types.ts

@@ -26,6 +26,11 @@ export type ToolResultState =
   | 'complete' // Result is complete
   | 'error' // Error occurred
 
+/**
+ * ChatClient state - track the lifecycle of a chat
+ */
+export type ChatClientState = 'ready' | 'submitted' | 'streaming' | 'error'
+
 /**
  * Message parts - building blocks of UIMessage
  */
@@ -191,6 +196,11 @@ export interface ChatClientOptions<
    */
   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