@tanstack/ai 0.49.1 → 0.51.0

package/src/activities/chat/stream/processor.ts

@@ -19,6 +19,7 @@
  */
 import {
   aguiSnapshotMessageToUIMessage,
+  coerceCreatedAt,
   generateMessageId,
   uiMessageToModelMessages,
 } from '../messages.js'
@@ -211,6 +212,7 @@ export class StreamProcessor {
   private finishReason: string | null = null
   private hasError = false
   private isDone = false
+  private streamEndEmitted = false
 
   // Recording
   private recording: ChunkRecording | null = null
@@ -728,9 +730,26 @@ export class StreamProcessor {
         return id
       }
     }
+    // finalizeStream() clears activeMessageIds but keeps messageStates.
+    // Leftover reasoning after an early RUN_FINISHED must resume that
+    // assistant. A new user turn calls prepareAssistantMessage(), which
+    // clears messageStates first.
+    for (const [id, state] of [...this.messageStates].reverse()) {
+      if (state.role === 'assistant') {
+        return id
+      }
+    }
     return null
   }
 
+  private resumeAssistantState(id: string, state: MessageStreamState): void {
+    this.activeMessageIds.add(id)
+    if (state.isComplete || this.isDone) {
+      state.isComplete = false
+      this.isDone = false
+    }
+  }
+
   /**
    * Ensure an active assistant message exists, creating one if needed.
    * Used for backward compat when events arrive without prior TEXT_MESSAGE_START.
@@ -747,14 +766,20 @@ export class StreamProcessor {
     // Try to find state by preferred ID
     if (preferredId) {
       const state = this.getMessageState(preferredId)
-      if (state) return { messageId: preferredId, state }
+      if (state) {
+        this.resumeAssistantState(preferredId, state)
+        return { messageId: preferredId, state }
+      }
     }
 
     // Try active assistant message
     const activeId = this.getActiveAssistantMessageId()
     if (activeId) {
       const state = this.getMessageState(activeId)
-      if (state) return { messageId: activeId, state }
+      if (state) {
+        this.resumeAssistantState(activeId, state)
+        return { messageId: activeId, state }
+      }
     }
 
     // Check if a message with preferredId already exists (reconnect/resume case).
@@ -835,11 +860,10 @@ export class StreamProcessor {
           }
         : incomingRecord
     const metadata = mergeMetadata(message.metadata, toMerge)
-    const createdAtRaw = tanstackMetadata(incomingRecord)?.createdAt
-    const createdAt =
-      typeof createdAtRaw === 'string' ? new Date(createdAtRaw) : undefined
-    const createdAtValid =
-      createdAt !== undefined && !Number.isNaN(createdAt.getTime())
+    const createdAt = coerceCreatedAt(
+      tanstackMetadata(incomingRecord)?.createdAt,
+    )
+    const createdAtValid = createdAt !== undefined
     this.messages = this.messages.map((msg) =>
       msg.id === messageId
         ? {
@@ -900,9 +924,21 @@ export class StreamProcessor {
       }
 
       // Ensure state exists
-      if (!this.messageStates.has(messageId)) {
-        this.createMessageState(messageId, uiRole)
+      let pendingState = this.messageStates.get(messageId)
+      if (!pendingState) {
+        pendingState = this.createMessageState(messageId, uiRole)
         this.activeMessageIds.add(messageId)
+      } else if (pendingState.hasToolCallsSinceTextStart) {
+        // A tool call (e.g. TOOL_CALL_START with parentMessageId) marked
+        // this message before its "real" TEXT_MESSAGE_START arrived — same
+        // reset Case 2 performs, so the segment accumulator doesn't carry
+        // stale tool-call state into the text that follows.
+        if (pendingState.currentSegmentText !== pendingState.lastEmittedText) {
+          this.emitTextUpdateForMessage(messageId)
+        }
+        pendingState.currentSegmentText = ''
+        pendingState.lastEmittedText = ''
+        pendingState.hasToolCallsSinceTextStart = false
       }
 
       this.mergeMessageMetadata(messageId, chunk.metadata)
@@ -1050,8 +1086,10 @@ export class StreamProcessor {
       msg.parts.every((part) => part.type === 'thinking')
     const isToolResultOnly = (msg: UIMessage) =>
       msg.role === 'assistant' &&
-      msg.parts.length === 1 &&
-      msg.parts[0]?.type === 'tool-result'
+      msg.parts.some((part) => part.type === 'tool-result') &&
+      msg.parts.every(
+        (part) => part.type === 'tool-result' || part.type === 'ui-resource',
+      )
     const flushPending = () => {
       out.push(...pending)
       pending = []
@@ -1109,9 +1147,16 @@ export class StreamProcessor {
 
     const reconciled: Array<UIMessage> = []
     for (const msg of snapshot) {
+      const toolResultParts = msg.parts.filter(
+        (part): part is ToolResultPart => part.type === 'tool-result',
+      )
       const toolResultPart =
-        msg.role === 'assistant' && msg.parts.length === 1
-          ? msg.parts.find((p): p is ToolResultPart => p.type === 'tool-result')
+        msg.role === 'assistant' &&
+        toolResultParts.length === 1 &&
+        msg.parts.every(
+          (part) => part.type === 'tool-result' || part.type === 'ui-resource',
+        )
+          ? toolResultParts[0]
           : undefined
 
       if (!toolResultPart) {
@@ -1170,7 +1215,7 @@ export class StreamProcessor {
           )
         }
       }
-      parts.push(toolResultPart)
+      parts.push(...msg.parts)
       // Replace rather than push into `target.parts`: a snapshot message that
       // arrived already carrying `parts` (TanStack server echoing UIMessages)
       // shares its array with the incoming chunk, and mutating it in place
@@ -1638,8 +1683,14 @@ export class StreamProcessor {
     }
 
     if (this.activeRuns.size === 0) {
-      this.isDone = true
       this.completeAllToolCalls()
+      const isIntermediateToolTurn =
+        this.finishReason === 'tool_calls' &&
+        chunk.outcome?.type !== 'interrupt'
+      if (isIntermediateToolTurn) {
+        return
+      }
+      this.isDone = true
       this.finalizeStream()
     }
   }
@@ -2335,6 +2386,7 @@ export class StreamProcessor {
    * @see docs/chat-architecture.md#single-shot-text-response — Finalization step
    */
   finalizeStream(): void {
+    this.isDone = true
     let lastAssistantMessage: UIMessage | undefined
 
     // Finalize ALL active messages
@@ -2398,7 +2450,8 @@ export class StreamProcessor {
     }
 
     // Emit stream end for the last assistant message
-    if (lastAssistantMessage) {
+    if (lastAssistantMessage && !this.streamEndEmitted) {
+      this.streamEndEmitted = true
       this.events.onStreamEnd?.(lastAssistantMessage)
     }
   }
@@ -2517,6 +2570,7 @@ export class StreamProcessor {
     this.finishReason = null
     this.hasError = false
     this.isDone = false
+    this.streamEndEmitted = false
     this.chunkStrategy.reset?.()
   }
 

package/src/index.ts

@@ -104,6 +104,8 @@ export type {
 // MCP error classes (value exports — usable with instanceof)
 export { MCPDuplicateToolNameError } from './activities/chat/mcp/manager'
 export { DuplicateToolNameError } from './activities/chat/tools/unique-tool-names'
+export { SkillLimitError } from './utilities/errors'
+export type { SkillLimitErrorInit } from './utilities/errors'
 
 // Schema conversion (Standard JSON Schema compliant)
 export {

package/src/types.ts

@@ -372,6 +372,10 @@ export interface ModelMessage<
   toolCalls?: Array<ToolCall>
   toolCallId?: string
   thinking?: Array<{ content: string; signature?: string }>
+  /** Error reported by an AG-UI tool message. */
+  error?: string
+  /** Optional AG-UI message metadata. TanStack-owned fields live under `tanstack`. */
+  metadata?: Record<string, any>
   /**
    * Completed structured output represented by this assistant message.
    * `content` remains the provider-facing JSON text; this field preserves the
@@ -435,10 +439,14 @@ export interface ToolCallPart<TMetadata = unknown> {
 
 export interface ToolResultPart {
   type: 'tool-result'
+  id?: string
+  name?: string
   toolCallId: string
   content: string | Array<ContentPart>
   state: ToolResultState
   error?: string // Error message if state is "error"
+  metadata?: Record<string, unknown>
+  createdAt?: Date
 }
 
 export interface ThinkingPart {
@@ -524,9 +532,17 @@ export interface TanStackMessageMetadata {
   signature?: string
   /** Per-tool-call provider metadata keyed by tool call id (e.g. Gemini thoughtSignature). */
   toolCallMetadata?: Record<string, unknown>
+  toolResult?: {
+    id?: string
+    createdAt?: string
+    content?: Array<ContentPart>
+  }
   structuredOutput?: {
     status?: 'streaming' | 'complete' | 'error'
+    partial?: unknown
+    data?: unknown
     raw?: string
+    reasoning?: string
     errorMessage?: string
   }
   uiResources?: Array<UIResourcePart>
@@ -562,6 +578,8 @@ export interface UIMessage<TData = unknown> {
   role: 'system' | 'user' | 'assistant'
   parts: Array<MessagePart<TData>>
   createdAt?: Date
+  /** Optional AG-UI sender name. Converters preserve it across wire and persist. */
+  name?: string
   /**
    * Optional AG-UI metadata bag. TanStack writes the `tanstack` key.
    * User keys stay at the top.