@tanstack/ai-client 0.9.2 → 0.11.0

package/dist/esm/connection-adapters.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-adapters.js","sources":["../../src/connection-adapters.ts"],"sourcesContent":["import { EventType } from '@tanstack/ai'\nimport type { ModelMessage, StreamChunk, UIMessage } from '@tanstack/ai'\n\n/**\n * Merge custom headers into request headers\n */\nfunction mergeHeaders(\n  customHeaders?: Record<string, string> | Headers,\n): Record<string, string> {\n  if (!customHeaders) {\n    return {}\n  }\n  if (customHeaders instanceof Headers) {\n    const result: Record<string, string> = {}\n    customHeaders.forEach((value, key) => {\n      result[key] = value\n    })\n    return result\n  }\n  return customHeaders\n}\n\n/**\n * Read lines from a stream (newline-delimited)\n */\nasync function* readStreamLines(\n  reader: ReadableStreamDefaultReader<Uint8Array>,\n  abortSignal?: AbortSignal,\n): AsyncGenerator<string> {\n  try {\n    const decoder = new TextDecoder()\n    let buffer = ''\n\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n    while (true) {\n      // Check if aborted before reading\n      if (abortSignal?.aborted) {\n        break\n      }\n\n      const { done, value } = await reader.read()\n      if (done) break\n\n      buffer += decoder.decode(value, { stream: true })\n      const lines = buffer.split('\\n')\n\n      // Keep the last incomplete line in the buffer\n      buffer = lines.pop() || ''\n\n      for (const line of lines) {\n        if (line.trim()) {\n          yield line\n        }\n      }\n    }\n\n    // Process any remaining data in the buffer\n    if (buffer.trim()) {\n      yield buffer\n    }\n  } finally {\n    reader.releaseLock()\n  }\n}\n\nexport interface ConnectConnectionAdapter {\n  /**\n   * Connect and return an async iterable of StreamChunks.\n   */\n  connect: (\n    messages: Array<UIMessage> | Array<ModelMessage>,\n    data?: Record<string, any>,\n    abortSignal?: AbortSignal,\n  ) => AsyncIterable<StreamChunk>\n}\n\nexport interface SubscribeConnectionAdapter {\n  /**\n   * Subscribe to stream chunks.\n   */\n  subscribe: (abortSignal?: AbortSignal) => AsyncIterable<StreamChunk>\n  /**\n   * Send a request; chunks arrive through subscribe().\n   */\n  send: (\n    messages: Array<UIMessage> | Array<ModelMessage>,\n    data?: Record<string, any>,\n    abortSignal?: AbortSignal,\n  ) => Promise<void>\n}\n\n/**\n * Connection adapter union.\n * Provide either `connect`, or `subscribe` + `send`.\n */\nexport type ConnectionAdapter =\n  | ConnectConnectionAdapter\n  | SubscribeConnectionAdapter\n\n/**\n * Normalize a ConnectionAdapter to subscribe/send operations.\n *\n * If a connection provides native subscribe/send, that mode is used.\n * Otherwise, connect() is wrapped using an async queue.\n */\nexport function normalizeConnectionAdapter(\n  connection: ConnectionAdapter | undefined,\n): SubscribeConnectionAdapter {\n  if (!connection) {\n    throw new Error('Connection adapter is required')\n  }\n\n  const hasConnect = 'connect' in connection\n  const hasSubscribe = 'subscribe' in connection\n  const hasSend = 'send' in connection\n\n  if (hasConnect && (hasSubscribe || hasSend)) {\n    throw new Error(\n      'Connection adapter must provide either connect or both subscribe and send, not both modes',\n    )\n  }\n\n  if (hasSubscribe && hasSend) {\n    return {\n      subscribe: connection.subscribe.bind(connection),\n      send: connection.send.bind(connection),\n    }\n  }\n\n  if (!hasConnect) {\n    throw new Error(\n      'Connection adapter must provide either connect or both subscribe and send',\n    )\n  }\n\n  // Legacy connect() wrapper\n  let activeBuffer: Array<StreamChunk> = []\n  let activeWaiters: Array<(chunk: StreamChunk | null) => void> = []\n\n  function push(chunk: StreamChunk): void {\n    const waiter = activeWaiters.shift()\n    if (waiter) {\n      waiter(chunk)\n    } else {\n      activeBuffer.push(chunk)\n    }\n  }\n\n  return {\n    subscribe(abortSignal?: AbortSignal): AsyncIterable<StreamChunk> {\n      // Transfer ownership to the latest subscriber so only one active\n      // subscribe() call receives chunks from the shared connect-wrapper queue.\n      const myBuffer: Array<StreamChunk> = activeBuffer.splice(0)\n      const myWaiters: Array<(chunk: StreamChunk | null) => void> = []\n      activeBuffer = myBuffer\n      activeWaiters = myWaiters\n\n      return (async function* () {\n        while (!abortSignal?.aborted) {\n          let chunk: StreamChunk | null\n          if (myBuffer.length > 0) {\n            chunk = myBuffer.shift()!\n          } else {\n            chunk = await new Promise<StreamChunk | null>((resolve) => {\n              const onAbort = () => resolve(null)\n              myWaiters.push((c) => {\n                abortSignal?.removeEventListener('abort', onAbort)\n                resolve(c)\n              })\n              abortSignal?.addEventListener('abort', onAbort, { once: true })\n            })\n          }\n          if (chunk !== null) yield chunk\n        }\n      })()\n    },\n    async send(messages, data, abortSignal) {\n      let hasTerminalEvent = false\n      try {\n        const stream = connection.connect(messages, data, abortSignal)\n        for await (const chunk of stream) {\n          if (chunk.type === 'RUN_FINISHED' || chunk.type === 'RUN_ERROR') {\n            hasTerminalEvent = true\n          }\n          push(chunk)\n        }\n\n        // If the connect stream ended cleanly without a terminal event,\n        // synthesize RUN_FINISHED so request-scoped consumers can complete.\n        if (!abortSignal?.aborted && !hasTerminalEvent) {\n          push({\n            type: EventType.RUN_FINISHED,\n            runId: `run-${Date.now()}`,\n            threadId: `thread-${Date.now()}`,\n            model: 'connect-wrapper',\n            timestamp: Date.now(),\n            finishReason: 'stop',\n          })\n        }\n      } catch (err) {\n        if (!abortSignal?.aborted && !hasTerminalEvent) {\n          push({\n            type: EventType.RUN_ERROR,\n            timestamp: Date.now(),\n            message:\n              err instanceof Error ? err.message : 'Unknown error in connect()',\n            error: {\n              message:\n                err instanceof Error\n                  ? err.message\n                  : 'Unknown error in connect()',\n            },\n          })\n        }\n        throw err\n      }\n    },\n  }\n}\n\n/**\n * Options for fetch-based connection adapters\n */\nexport interface FetchConnectionOptions {\n  headers?: Record<string, string> | Headers\n  credentials?: RequestCredentials\n  signal?: AbortSignal\n  body?: Record<string, any>\n  fetchClient?: typeof globalThis.fetch\n}\n\n/**\n * Create a Server-Sent Events connection adapter\n *\n * @param url - The API endpoint URL (or a function that returns the URL)\n * @param options - Fetch options (headers, credentials, body, etc.) or a function that returns options (can be async)\n * @returns A connection adapter for SSE streams\n *\n * @example\n * ```typescript\n * // Static URL\n * const connection = fetchServerSentEvents('/api/chat');\n *\n * // Dynamic URL\n * const connection = fetchServerSentEvents(() => `/api/chat?user=${userId}`);\n *\n * // With options\n * const connection = fetchServerSentEvents('/api/chat', {\n *   headers: { 'Authorization': 'Bearer token' }\n * });\n *\n * // With dynamic options\n * const connection = fetchServerSentEvents('/api/chat', () => ({\n *   headers: { 'Authorization': `Bearer ${getToken()}` }\n * }));\n *\n * // With additional body data\n * const connection = fetchServerSentEvents('/api/chat', async () => ({\n *   body: {\n *     provider: 'openai',\n *     model: 'gpt-4o',\n *   }\n * }));\n * ```\n */\nexport function fetchServerSentEvents(\n  url: string | (() => string),\n  options:\n    | FetchConnectionOptions\n    | (() => FetchConnectionOptions | Promise<FetchConnectionOptions>) = {},\n): ConnectConnectionAdapter {\n  return {\n    async *connect(messages, data, abortSignal) {\n      // Resolve URL and options if they are functions\n      const resolvedUrl = typeof url === 'function' ? url() : url\n      const resolvedOptions =\n        typeof options === 'function' ? await options() : options\n\n      const requestHeaders: Record<string, string> = {\n        'Content-Type': 'application/json',\n        ...mergeHeaders(resolvedOptions.headers),\n      }\n\n      // Send messages as-is (UIMessages with parts preserved)\n      // Server-side TextEngine handles conversion to ModelMessages\n      const requestBody = {\n        messages,\n        data,\n        ...resolvedOptions.body,\n      }\n\n      const fetchClient = resolvedOptions.fetchClient ?? fetch\n      const response = await fetchClient(resolvedUrl, {\n        method: 'POST',\n        headers: requestHeaders,\n        body: JSON.stringify(requestBody),\n        credentials: resolvedOptions.credentials || 'same-origin',\n        signal: abortSignal || resolvedOptions.signal,\n      })\n\n      if (!response.ok) {\n        throw new Error(\n          `HTTP error! status: ${response.status} ${response.statusText}`,\n        )\n      }\n\n      // Parse Server-Sent Events format\n      const reader = response.body?.getReader()\n      if (!reader) {\n        throw new Error('Response body is not readable')\n      }\n\n      for await (const line of readStreamLines(reader, abortSignal)) {\n        // Handle Server-Sent Events format\n        const data = line.startsWith('data: ') ? line.slice(6) : line\n\n        if (data === '[DONE]') {\n          console.warn(\n            '[@tanstack/ai-client] Received [DONE] sentinel. This is deprecated — upgrade your @tanstack/ai server package. RUN_FINISHED is the stream terminator.',\n          )\n          continue\n        }\n\n        try {\n          const parsed: StreamChunk = JSON.parse(data)\n          yield parsed\n        } catch (parseError) {\n          // Skip non-JSON lines or malformed chunks\n          console.warn('Failed to parse SSE chunk:', data)\n        }\n      }\n    },\n  }\n}\n\n/**\n * Create an HTTP streaming connection adapter (for raw streaming without SSE format)\n *\n * @param url - The API endpoint URL (or a function that returns the URL)\n * @param options - Fetch options (headers, credentials, body, etc.) or a function that returns options (can be async)\n * @returns A connection adapter for HTTP streams\n *\n * @example\n * ```typescript\n * // Static URL\n * const connection = fetchHttpStream('/api/chat');\n *\n * // Dynamic URL\n * const connection = fetchHttpStream(() => `/api/chat?user=${userId}`);\n *\n * // With options\n * const connection = fetchHttpStream('/api/chat', {\n *   headers: { 'Authorization': 'Bearer token' }\n * });\n *\n * // With dynamic options\n * const connection = fetchHttpStream('/api/chat', () => ({\n *   headers: { 'Authorization': `Bearer ${getToken()}` }\n * }));\n *\n * // With additional body data\n * const connection = fetchHttpStream('/api/chat', async () => ({\n *   body: {\n *     provider: 'openai',\n *     model: 'gpt-4o',\n *   }\n * }));\n * ```\n */\nexport function fetchHttpStream(\n  url: string | (() => string),\n  options:\n    | FetchConnectionOptions\n    | (() => FetchConnectionOptions | Promise<FetchConnectionOptions>) = {},\n): ConnectConnectionAdapter {\n  return {\n    async *connect(messages, data, abortSignal) {\n      // Resolve URL and options if they are functions\n      const resolvedUrl = typeof url === 'function' ? url() : url\n      const resolvedOptions =\n        typeof options === 'function' ? await options() : options\n\n      const requestHeaders: Record<string, string> = {\n        'Content-Type': 'application/json',\n        ...mergeHeaders(resolvedOptions.headers),\n      }\n\n      // Send messages as-is (UIMessages with parts preserved)\n      // Server-side TextEngine handles conversion to ModelMessages\n      const requestBody = {\n        messages,\n        data,\n        ...resolvedOptions.body,\n      }\n\n      const fetchClient = resolvedOptions.fetchClient ?? fetch\n      const response = await fetchClient(resolvedUrl, {\n        method: 'POST',\n        headers: requestHeaders,\n        body: JSON.stringify(requestBody),\n        credentials: resolvedOptions.credentials || 'same-origin',\n        signal: abortSignal || resolvedOptions.signal,\n      })\n\n      if (!response.ok) {\n        throw new Error(\n          `HTTP error! status: ${response.status} ${response.statusText}`,\n        )\n      }\n\n      // Parse raw HTTP stream (newline-delimited JSON)\n      const reader = response.body?.getReader()\n      if (!reader) {\n        throw new Error('Response body is not readable')\n      }\n\n      for await (const line of readStreamLines(reader, abortSignal)) {\n        try {\n          const parsed: StreamChunk = JSON.parse(line)\n          yield parsed\n        } catch (parseError) {\n          console.warn('Failed to parse HTTP stream chunk:', line)\n        }\n      }\n    },\n  }\n}\n\n/**\n * Create a direct stream connection adapter (for server functions or direct streams)\n *\n * @param streamFactory - A function that returns an async iterable of StreamChunks\n * @returns A connection adapter for direct streams\n *\n * @example\n * ```typescript\n * // With TanStack Start server function\n * const connection = stream(() => serverFunction({ messages }));\n *\n * const client = new ChatClient({ connection });\n * ```\n */\nexport function stream(\n  streamFactory: (\n    messages: Array<UIMessage> | Array<ModelMessage>,\n    data?: Record<string, any>,\n  ) => AsyncIterable<StreamChunk>,\n): ConnectConnectionAdapter {\n  return {\n    async *connect(messages, data) {\n      // Pass messages as-is (UIMessages with parts preserved)\n      // Server-side chat() handles conversion to ModelMessages\n      yield* streamFactory(messages, data)\n    },\n  }\n}\n\n/**\n * Create an RPC stream connection adapter (for RPC-based streaming like Cap'n Web RPC)\n *\n * @param rpcCall - A function that accepts messages and returns an async iterable of StreamChunks\n * @returns A connection adapter for RPC streams\n *\n * @example\n * ```typescript\n * // With Cap'n Web RPC\n * const connection = rpcStream((messages, data) =>\n *   api.streamMurfResponse(messages, data)\n * );\n *\n * const client = new ChatClient({ connection });\n * ```\n */\nexport function rpcStream(\n  rpcCall: (\n    messages: Array<UIMessage> | Array<ModelMessage>,\n    data?: Record<string, any>,\n  ) => AsyncIterable<StreamChunk>,\n): ConnectConnectionAdapter {\n  return {\n    async *connect(messages, data) {\n      // Pass messages as-is (UIMessages with parts preserved)\n      // Server-side chat() handles conversion to ModelMessages\n      yield* rpcCall(messages, data)\n    },\n  }\n}\n"],"names":["stream","data"],"mappings":"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"}
+{"version":3,"file":"connection-adapters.js","sources":["../../src/connection-adapters.ts"],"sourcesContent":["import { EventType, uiMessagesToWire } from '@tanstack/ai'\nimport type { ModelMessage, StreamChunk, UIMessage } from '@tanstack/ai'\n\nfunction generateRunId(prefix: string): string {\n  return `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`\n}\n\n/**\n * Merge custom headers into request headers\n */\nfunction mergeHeaders(\n  customHeaders?: Record<string, string> | Headers,\n): Record<string, string> {\n  if (!customHeaders) {\n    return {}\n  }\n  if (customHeaders instanceof Headers) {\n    const result: Record<string, string> = {}\n    customHeaders.forEach((value, key) => {\n      result[key] = value\n    })\n    return result\n  }\n  return customHeaders\n}\n\n/**\n * Read lines from a stream (newline-delimited)\n */\nasync function* readStreamLines(\n  reader: ReadableStreamDefaultReader<Uint8Array>,\n  abortSignal?: AbortSignal,\n): AsyncGenerator<string> {\n  try {\n    const decoder = new TextDecoder()\n    let buffer = ''\n\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n    while (true) {\n      // Check if aborted before reading\n      if (abortSignal?.aborted) {\n        break\n      }\n\n      const { done, value } = await reader.read()\n      if (done) break\n\n      buffer += decoder.decode(value, { stream: true })\n      const lines = buffer.split('\\n')\n\n      // Keep the last incomplete line in the buffer\n      buffer = lines.pop() || ''\n\n      for (const line of lines) {\n        if (line.trim()) {\n          yield line\n        }\n      }\n    }\n\n    // Process any remaining data in the buffer\n    if (buffer.trim()) {\n      yield buffer\n    }\n  } finally {\n    reader.releaseLock()\n  }\n}\n\n/**\n * Per-send context provided by the chat client to the connection adapter.\n * The adapter combines this with serialized messages to build a full\n * AG-UI `RunAgentInput` payload.\n */\nexport interface RunAgentInputContext {\n  threadId: string\n  runId: string\n  parentRunId?: string\n  /** Client-declared tools to advertise in the request payload. */\n  clientTools?: Array<{\n    name: string\n    description: string\n    parameters: unknown\n  }>\n  /** Arbitrary user-controlled passthrough data. */\n  forwardedProps?: Record<string, unknown>\n}\n\nexport interface ConnectConnectionAdapter {\n  /**\n   * Connect and return an async iterable of StreamChunks.\n   */\n  connect: (\n    messages: Array<UIMessage> | Array<ModelMessage>,\n    data?: Record<string, any>,\n    abortSignal?: AbortSignal,\n    runContext?: RunAgentInputContext,\n  ) => AsyncIterable<StreamChunk>\n}\n\nexport interface SubscribeConnectionAdapter {\n  /**\n   * Subscribe to stream chunks.\n   */\n  subscribe: (abortSignal?: AbortSignal) => AsyncIterable<StreamChunk>\n  /**\n   * Send a request; chunks arrive through subscribe().\n   */\n  send: (\n    messages: Array<UIMessage> | Array<ModelMessage>,\n    data?: Record<string, any>,\n    abortSignal?: AbortSignal,\n    runContext?: RunAgentInputContext,\n  ) => Promise<void>\n}\n\n/**\n * Connection adapter union.\n * Provide either `connect`, or `subscribe` + `send`.\n */\nexport type ConnectionAdapter =\n  | ConnectConnectionAdapter\n  | SubscribeConnectionAdapter\n\n/**\n * Normalize a ConnectionAdapter to subscribe/send operations.\n *\n * If a connection provides native subscribe/send, that mode is used.\n * Otherwise, connect() is wrapped using an async queue.\n */\nexport function normalizeConnectionAdapter(\n  connection: ConnectionAdapter | undefined,\n): SubscribeConnectionAdapter {\n  if (!connection) {\n    throw new Error('Connection adapter is required')\n  }\n\n  const hasConnect = 'connect' in connection\n  const hasSubscribe = 'subscribe' in connection\n  const hasSend = 'send' in connection\n\n  if (hasConnect && (hasSubscribe || hasSend)) {\n    throw new Error(\n      'Connection adapter must provide either connect or both subscribe and send, not both modes',\n    )\n  }\n\n  if (hasSubscribe && hasSend) {\n    return {\n      subscribe: connection.subscribe.bind(connection),\n      send: connection.send.bind(connection),\n    }\n  }\n\n  if (!hasConnect) {\n    throw new Error(\n      'Connection adapter must provide either connect or both subscribe and send',\n    )\n  }\n\n  // Legacy connect() wrapper\n  let activeBuffer: Array<StreamChunk> = []\n  let activeWaiters: Array<(chunk: StreamChunk | null) => void> = []\n\n  function push(chunk: StreamChunk): void {\n    const waiter = activeWaiters.shift()\n    if (waiter) {\n      waiter(chunk)\n    } else {\n      activeBuffer.push(chunk)\n    }\n  }\n\n  return {\n    subscribe(abortSignal?: AbortSignal): AsyncIterable<StreamChunk> {\n      // Transfer ownership to the latest subscriber so only one active\n      // subscribe() call receives chunks from the shared connect-wrapper queue.\n      const myBuffer: Array<StreamChunk> = activeBuffer.splice(0)\n      const myWaiters: Array<(chunk: StreamChunk | null) => void> = []\n      activeBuffer = myBuffer\n      activeWaiters = myWaiters\n\n      return (async function* () {\n        while (!abortSignal?.aborted) {\n          let chunk: StreamChunk | null\n          if (myBuffer.length > 0) {\n            chunk = myBuffer.shift()!\n          } else {\n            chunk = await new Promise<StreamChunk | null>((resolve) => {\n              const onAbort = () => resolve(null)\n              myWaiters.push((c) => {\n                abortSignal?.removeEventListener('abort', onAbort)\n                resolve(c)\n              })\n              abortSignal?.addEventListener('abort', onAbort, { once: true })\n            })\n          }\n          if (chunk !== null) yield chunk\n        }\n      })()\n    },\n    async send(messages, data, abortSignal, runContext) {\n      let hasTerminalEvent = false\n      try {\n        const stream = connection.connect(\n          messages,\n          data,\n          abortSignal,\n          runContext,\n        )\n        for await (const chunk of stream) {\n          if (chunk.type === 'RUN_FINISHED' || chunk.type === 'RUN_ERROR') {\n            hasTerminalEvent = true\n          }\n          push(chunk)\n        }\n\n        // If the connect stream ended cleanly without a terminal event,\n        // synthesize RUN_FINISHED so request-scoped consumers can complete.\n        // Reuse the caller's threadId/runId so client-side activeRunIds tracking matches.\n        if (!abortSignal?.aborted && !hasTerminalEvent) {\n          push({\n            type: EventType.RUN_FINISHED,\n            threadId: runContext?.threadId ?? `thread-${Date.now()}`,\n            runId: runContext?.runId ?? `run-${Date.now()}`,\n            model: 'connect-wrapper',\n            timestamp: Date.now(),\n            finishReason: 'stop',\n          })\n        }\n      } catch (err) {\n        if (!abortSignal?.aborted && !hasTerminalEvent) {\n          push({\n            type: EventType.RUN_ERROR,\n            threadId: runContext?.threadId ?? `thread-${Date.now()}`,\n            runId: runContext?.runId ?? `run-${Date.now()}`,\n            timestamp: Date.now(),\n            message:\n              err instanceof Error ? err.message : 'Unknown error in connect()',\n            error: {\n              message:\n                err instanceof Error\n                  ? err.message\n                  : 'Unknown error in connect()',\n            },\n          })\n        }\n        throw err\n      }\n    },\n  }\n}\n\n/**\n * Options for fetch-based connection adapters\n */\nexport interface FetchConnectionOptions {\n  headers?: Record<string, string> | Headers\n  credentials?: RequestCredentials\n  signal?: AbortSignal\n  body?: Record<string, any>\n  fetchClient?: typeof globalThis.fetch\n}\n\n/**\n * Create a Server-Sent Events connection adapter\n *\n * @param url - The API endpoint URL (or a function that returns the URL)\n * @param options - Fetch options (headers, credentials, body, etc.) or a function that returns options (can be async)\n * @returns A connection adapter for SSE streams\n *\n * @example\n * ```typescript\n * // Static URL\n * const connection = fetchServerSentEvents('/api/chat');\n *\n * // Dynamic URL\n * const connection = fetchServerSentEvents(() => `/api/chat?user=${userId}`);\n *\n * // With options\n * const connection = fetchServerSentEvents('/api/chat', {\n *   headers: { 'Authorization': 'Bearer token' }\n * });\n *\n * // With dynamic options\n * const connection = fetchServerSentEvents('/api/chat', () => ({\n *   headers: { 'Authorization': `Bearer ${getToken()}` }\n * }));\n *\n * // With additional body data\n * const connection = fetchServerSentEvents('/api/chat', async () => ({\n *   body: {\n *     provider: 'openai',\n *     model: 'gpt-4o',\n *   }\n * }));\n * ```\n */\nexport function fetchServerSentEvents(\n  url: string | (() => string),\n  options:\n    | FetchConnectionOptions\n    | (() => FetchConnectionOptions | Promise<FetchConnectionOptions>) = {},\n): ConnectConnectionAdapter {\n  return {\n    async *connect(messages, data, abortSignal, runContext) {\n      // Resolve URL and options if they are functions\n      const resolvedUrl = typeof url === 'function' ? url() : url\n      const resolvedOptions =\n        typeof options === 'function' ? await options() : options\n\n      const requestHeaders: Record<string, string> = {\n        'Content-Type': 'application/json',\n        ...mergeHeaders(resolvedOptions.headers),\n      }\n\n      // Build AG-UI RunAgentInput payload.\n      //\n      // Precedence (later spreads win): static adapter `body` is the base,\n      // overridden by `runContext.forwardedProps` (constructor body /\n      // forwardedProps options), overridden by per-message `data` passed\n      // to `connection.send`. Runtime values win over static config —\n      // this matches the documented \"forwardedProps wins\" semantic.\n      const wireMessages = uiMessagesToWire(messages as Array<UIMessage>)\n      const forwardedProps = {\n        ...resolvedOptions.body,\n        ...(runContext?.forwardedProps ?? {}),\n        ...data,\n      }\n      const requestBody = {\n        threadId: runContext?.threadId ?? generateRunId('thread'),\n        runId: runContext?.runId ?? generateRunId('run'),\n        ...(runContext?.parentRunId !== undefined && {\n          parentRunId: runContext.parentRunId,\n        }),\n        state: {},\n        messages: wireMessages,\n        tools: runContext?.clientTools ?? [],\n        context: [],\n        forwardedProps,\n        // Backward-compat mirror of `forwardedProps` under the legacy\n        // field name `data`. Server endpoints that have not migrated\n        // off the pre-AG-UI shape (`{ messages, data }`) keep working.\n        // AG-UI strict consumers strip this via `RunAgentInputSchema`\n        // (see `chatParamsFromRequestBody`). Will be removed when the\n        // legacy `body` client option is dropped.\n        // Shallow-cloned so that downstream mutation of `data` (e.g.\n        // by a logging interceptor or fetch wrapper) cannot corrupt\n        // `forwardedProps` and vice versa.\n        data: { ...forwardedProps },\n      }\n\n      const fetchClient = resolvedOptions.fetchClient ?? fetch\n      const response = await fetchClient(resolvedUrl, {\n        method: 'POST',\n        headers: requestHeaders,\n        body: JSON.stringify(requestBody),\n        credentials: resolvedOptions.credentials || 'same-origin',\n        signal: abortSignal || resolvedOptions.signal,\n      })\n\n      if (!response.ok) {\n        throw new Error(\n          `HTTP error! status: ${response.status} ${response.statusText}`,\n        )\n      }\n\n      // Parse Server-Sent Events format\n      const reader = response.body?.getReader()\n      if (!reader) {\n        throw new Error('Response body is not readable')\n      }\n\n      for await (const line of readStreamLines(reader, abortSignal)) {\n        // Handle Server-Sent Events format\n        const data = line.startsWith('data: ') ? line.slice(6) : line\n\n        if (data === '[DONE]') {\n          console.warn(\n            '[@tanstack/ai-client] Received [DONE] sentinel. This is deprecated — upgrade your @tanstack/ai server package. RUN_FINISHED is the stream terminator.',\n          )\n          continue\n        }\n\n        try {\n          const parsed: StreamChunk = JSON.parse(data)\n          yield parsed\n        } catch (parseError) {\n          // Skip non-JSON lines or malformed chunks\n          console.warn('Failed to parse SSE chunk:', data)\n        }\n      }\n    },\n  }\n}\n\n/**\n * Create an HTTP streaming connection adapter (for raw streaming without SSE format)\n *\n * @param url - The API endpoint URL (or a function that returns the URL)\n * @param options - Fetch options (headers, credentials, body, etc.) or a function that returns options (can be async)\n * @returns A connection adapter for HTTP streams\n *\n * @example\n * ```typescript\n * // Static URL\n * const connection = fetchHttpStream('/api/chat');\n *\n * // Dynamic URL\n * const connection = fetchHttpStream(() => `/api/chat?user=${userId}`);\n *\n * // With options\n * const connection = fetchHttpStream('/api/chat', {\n *   headers: { 'Authorization': 'Bearer token' }\n * });\n *\n * // With dynamic options\n * const connection = fetchHttpStream('/api/chat', () => ({\n *   headers: { 'Authorization': `Bearer ${getToken()}` }\n * }));\n *\n * // With additional body data\n * const connection = fetchHttpStream('/api/chat', async () => ({\n *   body: {\n *     provider: 'openai',\n *     model: 'gpt-4o',\n *   }\n * }));\n * ```\n */\nexport function fetchHttpStream(\n  url: string | (() => string),\n  options:\n    | FetchConnectionOptions\n    | (() => FetchConnectionOptions | Promise<FetchConnectionOptions>) = {},\n): ConnectConnectionAdapter {\n  return {\n    async *connect(messages, data, abortSignal, runContext) {\n      // Resolve URL and options if they are functions\n      const resolvedUrl = typeof url === 'function' ? url() : url\n      const resolvedOptions =\n        typeof options === 'function' ? await options() : options\n\n      const requestHeaders: Record<string, string> = {\n        'Content-Type': 'application/json',\n        ...mergeHeaders(resolvedOptions.headers),\n      }\n\n      // Build AG-UI RunAgentInput payload.\n      //\n      // Precedence (later spreads win): static adapter `body` is the base,\n      // overridden by `runContext.forwardedProps` (constructor body /\n      // forwardedProps options), overridden by per-message `data` passed\n      // to `connection.send`. Runtime values win over static config —\n      // this matches the documented \"forwardedProps wins\" semantic.\n      const wireMessages = uiMessagesToWire(messages as Array<UIMessage>)\n      const forwardedProps = {\n        ...resolvedOptions.body,\n        ...(runContext?.forwardedProps ?? {}),\n        ...data,\n      }\n      const requestBody = {\n        threadId: runContext?.threadId ?? generateRunId('thread'),\n        runId: runContext?.runId ?? generateRunId('run'),\n        ...(runContext?.parentRunId !== undefined && {\n          parentRunId: runContext.parentRunId,\n        }),\n        state: {},\n        messages: wireMessages,\n        tools: runContext?.clientTools ?? [],\n        context: [],\n        forwardedProps,\n        // Backward-compat mirror of `forwardedProps` under the legacy\n        // field name `data`. Server endpoints that have not migrated\n        // off the pre-AG-UI shape (`{ messages, data }`) keep working.\n        // AG-UI strict consumers strip this via `RunAgentInputSchema`\n        // (see `chatParamsFromRequestBody`). Will be removed when the\n        // legacy `body` client option is dropped.\n        // Shallow-cloned so that downstream mutation of `data` (e.g.\n        // by a logging interceptor or fetch wrapper) cannot corrupt\n        // `forwardedProps` and vice versa.\n        data: { ...forwardedProps },\n      }\n\n      const fetchClient = resolvedOptions.fetchClient ?? fetch\n      const response = await fetchClient(resolvedUrl, {\n        method: 'POST',\n        headers: requestHeaders,\n        body: JSON.stringify(requestBody),\n        credentials: resolvedOptions.credentials || 'same-origin',\n        signal: abortSignal || resolvedOptions.signal,\n      })\n\n      if (!response.ok) {\n        throw new Error(\n          `HTTP error! status: ${response.status} ${response.statusText}`,\n        )\n      }\n\n      // Parse raw HTTP stream (newline-delimited JSON)\n      const reader = response.body?.getReader()\n      if (!reader) {\n        throw new Error('Response body is not readable')\n      }\n\n      for await (const line of readStreamLines(reader, abortSignal)) {\n        try {\n          const parsed: StreamChunk = JSON.parse(line)\n          yield parsed\n        } catch (parseError) {\n          console.warn('Failed to parse HTTP stream chunk:', line)\n        }\n      }\n    },\n  }\n}\n\n/**\n * Create a direct stream connection adapter (for server functions or direct streams)\n *\n * @param streamFactory - A function that returns an async iterable of StreamChunks\n * @returns A connection adapter for direct streams\n *\n * @example\n * ```typescript\n * // With TanStack Start server function\n * const connection = stream(() => serverFunction({ messages }));\n *\n * const client = new ChatClient({ connection });\n * ```\n */\nexport function stream(\n  streamFactory: (\n    messages: Array<UIMessage> | Array<ModelMessage>,\n    data?: Record<string, any>,\n  ) => AsyncIterable<StreamChunk>,\n): ConnectConnectionAdapter {\n  return {\n    async *connect(messages, data, _abortSignal, _runContext) {\n      // Pass messages as-is (UIMessages with parts preserved)\n      // Server-side chat() handles conversion to ModelMessages\n      yield* streamFactory(messages, data)\n    },\n  }\n}\n\n/**\n * Create an RPC stream connection adapter (for RPC-based streaming like Cap'n Web RPC)\n *\n * @param rpcCall - A function that accepts messages and returns an async iterable of StreamChunks\n * @returns A connection adapter for RPC streams\n *\n * @example\n * ```typescript\n * // With Cap'n Web RPC\n * const connection = rpcStream((messages, data) =>\n *   api.streamMurfResponse(messages, data)\n * );\n *\n * const client = new ChatClient({ connection });\n * ```\n */\nexport function rpcStream(\n  rpcCall: (\n    messages: Array<UIMessage> | Array<ModelMessage>,\n    data?: Record<string, any>,\n  ) => AsyncIterable<StreamChunk>,\n): ConnectConnectionAdapter {\n  return {\n    async *connect(messages, data, _abortSignal, _runContext) {\n      // Pass messages as-is (UIMessages with parts preserved)\n      // Server-side chat() handles conversion to ModelMessages\n      yield* rpcCall(messages, data)\n    },\n  }\n}\n"],"names":["stream","data"],"mappings":"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"}

package/dist/esm/index.d.ts

@@ -2,7 +2,7 @@ export { ChatClient } from './chat-client.js';
 export { RealtimeClient } from './realtime-client.js';
 export { GenerationClient } from './generation-client.js';
 export { VideoGenerationClient } from './video-generation-client.js';
-export type { UIMessage, MessagePart, TextPart, ToolCallPart, ToolResultPart, ThinkingPart, ChatClientOptions, ChatRequestBody, InferChatMessages, ChatClientState, ConnectionStatus, MultimodalContent, } from './types.js';
+export type { UIMessage, MessagePart, TextPart, ToolCallPart, ToolResultPart, ThinkingPart, StructuredOutputPart, ChatClientOptions, ChatRequestBody, InferChatMessages, ChatClientState, ConnectionStatus, MultimodalContent, } from './types.js';
 export type { InferGenerationOutput, GenerationClientState, GenerationClientOptions, GenerationFetcher, GenerationFetcherOptions, GenerationTransport, VideoGenerationClientOptions, VideoStatusInfo, VideoGenerateResult, ImageGenerateInput, AudioGenerateInput, SpeechGenerateInput, TranscriptionGenerateInput, SummarizeGenerateInput, VideoGenerateInput, } from './generation-types.js';
 export { GENERATION_EVENTS } from './generation-types.js';
 export { clientTools, createChatClientOptions } from './types.js';

package/dist/esm/types.d.ts

@@ -1,5 +1,6 @@
-import { AnyClientTool, AudioPart, ChunkStrategy, ContentPart, DocumentPart, ImagePart, InferToolInput, InferToolOutput, ModelMessage, StreamChunk, VideoPart } from '@tanstack/ai';
+import { AnyClientTool, AudioPart, ChunkStrategy, ContentPart, DocumentPart, ImagePart, InferToolInput, InferToolOutput, ModelMessage, StreamChunk, StructuredOutputPart, VideoPart } from '@tanstack/ai';
 import { ConnectionAdapter } from './connection-adapters.js';
+export type { StructuredOutputPart } from '@tanstack/ai';
 /**
  * Tool call states - track the lifecycle of a tool call
  */
@@ -116,15 +117,23 @@ export interface ThinkingPart {
     type: 'thinking';
     content: string;
 }
-export type MessagePart<TTools extends ReadonlyArray<AnyClientTool> = any> = TextPart | ImagePart | AudioPart | VideoPart | DocumentPart | ToolCallPart<TTools> | ToolResultPart | ThinkingPart;
+export type MessagePart<TTools extends ReadonlyArray<AnyClientTool> = any, TData = unknown> = TextPart | ImagePart | AudioPart | VideoPart | DocumentPart | ToolCallPart<TTools> | ToolResultPart | ThinkingPart | StructuredOutputPart<TData>;
 /**
  * UIMessage - Domain-specific message format optimized for building chat UIs
- * Contains parts that can be text, tool calls, or tool results
+ * Contains parts that can be text, tool calls, or tool results.
+ *
+ * `TTools` narrows the tool-call/result part types based on the registered
+ * tools. `TData` is the schema-inferred type for any `structured-output` part
+ * on the message — defaulted to `unknown` so untyped consumers (the core
+ * stream processor, the wire converter) don't need to thread a schema generic
+ * everywhere; the hook layer (`useChat({ outputSchema })`) substitutes it on
+ * the public return so `m.parts.find(p => p.type === 'structured-output').data`
+ * is typed without manual casts.
  */
-export interface UIMessage<TTools extends ReadonlyArray<AnyClientTool> = any> {
+export interface UIMessage<TTools extends ReadonlyArray<AnyClientTool> = any, TData = unknown> {
     id: string;
     role: 'system' | 'user' | 'assistant';
-    parts: Array<MessagePart<TTools>>;
+    parts: Array<MessagePart<TTools, TData>>;
     createdAt?: Date;
 }
 export interface ChatClientOptions<TTools extends ReadonlyArray<AnyClientTool> = any> {
@@ -144,7 +153,26 @@ export interface ChatClientOptions<TTools extends ReadonlyArray<AnyClientTool> =
      */
     id?: string;
     /**
-     * Additional body parameters to send
+     * Thread ID to use for this chat session. Persists across sends within
+     * the session. If omitted, a unique thread ID is generated.
+     */
+    threadId?: string;
+    /**
+     * Arbitrary client-controlled JSON forwarded to the server in the
+     * AG-UI `RunAgentInput.forwardedProps` field. Use this for per-session
+     * options like provider/model selection or feature flags that the
+     * server endpoint should read.
+     *
+     * Replaces the legacy `body` option. If both are provided,
+     * `forwardedProps` wins on key collision.
+     */
+    forwardedProps?: Record<string, any>;
+    /**
+     * @deprecated Use `forwardedProps` instead. `body` continues to work
+     * unchanged — its values are merged into the AG-UI
+     * `RunAgentInput.forwardedProps` field on the wire and are also
+     * mirrored under the legacy `data` field for servers that have not
+     * migrated yet. Will be removed in a future major release.
      */
     body?: Record<string, any>;
     /**
@@ -275,4 +303,3 @@ export declare function createChatClientOptions<const TTools extends ReadonlyArr
  * ```
  */
 export type InferChatMessages<T> = T extends ChatClientOptions<infer TTools> ? Array<UIMessage<TTools>> : never;
-export {};

package/dist/esm/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sources":["../../src/types.ts"],"sourcesContent":["import type {\n  AnyClientTool,\n  AudioPart,\n  ChunkStrategy,\n  ContentPart,\n  DocumentPart,\n  ImagePart,\n  InferToolInput,\n  InferToolOutput,\n  ModelMessage,\n  StreamChunk,\n  VideoPart,\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 * Connection lifecycle state for the subscription loop.\n */\nexport type ConnectionStatus =\n  | 'disconnected'\n  | 'connecting'\n  | 'connected'\n  | 'error'\n\n/**\n * Multimodal content input for sending messages with rich media.\n * Allows sending text, images, audio, video, and documents to the LLM.\n *\n * @example\n * ```ts\n * // Send an image with a question\n * client.sendMessage({\n *   content: [\n *     { type: 'text', content: 'What is in this image?' },\n *     { type: 'image', source: { type: 'url', value: 'https://example.com/photo.jpg' } }\n *   ],\n *   id: 'custom-message-id' // optional\n * })\n * ```\n */\nexport interface MultimodalContent {\n  /**\n   * The content of the message.\n   * Can be a simple string or an array of content parts for multimodal messages.\n   */\n  content: string | Array<ContentPart>\n  /**\n   * Optional custom ID for the message.\n   * If not provided, a unique ID will be generated.\n   */\n  id?: string\n}\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  | ImagePart\n  | AudioPart\n  | VideoPart\n  | DocumentPart\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   * Supports mutually exclusive modes: request-response via `connect()`, or\n   * subscribe/send mode via `subscribe()` + `send()`.\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   * Callback when subscription lifecycle changes.\n   * This is independent from request lifecycle (`isLoading`, `status`).\n   */\n  onSubscriptionChange?: (isSubscribed: boolean) => void\n\n  /**\n   * Callback when connection lifecycle changes.\n   */\n  onConnectionStatusChange?: (status: ConnectionStatus) => void\n\n  /**\n   * Callback when session generation activity changes.\n   * Derived from stream run events (RUN_STARTED / RUN_FINISHED / RUN_ERROR).\n   * Unlike `onLoadingChange` (request-local), this reflects shared generation\n   * activity visible to all subscribers (e.g. across tabs/devices).\n   */\n  onSessionGeneratingChange?: (isGenerating: boolean) => void\n\n  /**\n   * Callback when a custom event is received from a server-side tool.\n   * Custom events are emitted by tools using `context.emitCustomEvent()` during execution.\n   *\n   * @param eventType - The name of the custom event\n   * @param data - The event payload data\n   * @param context - Additional context including the toolCallId that emitted the event\n   */\n  onCustomEvent?: (\n    eventType: string,\n    data: unknown,\n    context: { toolCallId?: string },\n  ) => 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":"AAmUO,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  AudioPart,\n  ChunkStrategy,\n  ContentPart,\n  DocumentPart,\n  ImagePart,\n  InferToolInput,\n  InferToolOutput,\n  ModelMessage,\n  StreamChunk,\n  StructuredOutputPart,\n  VideoPart,\n} from '@tanstack/ai'\nimport type { ConnectionAdapter } from './connection-adapters'\n\nexport type { StructuredOutputPart } from '@tanstack/ai'\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 * Connection lifecycle state for the subscription loop.\n */\nexport type ConnectionStatus =\n  | 'disconnected'\n  | 'connecting'\n  | 'connected'\n  | 'error'\n\n/**\n * Multimodal content input for sending messages with rich media.\n * Allows sending text, images, audio, video, and documents to the LLM.\n *\n * @example\n * ```ts\n * // Send an image with a question\n * client.sendMessage({\n *   content: [\n *     { type: 'text', content: 'What is in this image?' },\n *     { type: 'image', source: { type: 'url', value: 'https://example.com/photo.jpg' } }\n *   ],\n *   id: 'custom-message-id' // optional\n * })\n * ```\n */\nexport interface MultimodalContent {\n  /**\n   * The content of the message.\n   * Can be a simple string or an array of content parts for multimodal messages.\n   */\n  content: string | Array<ContentPart>\n  /**\n   * Optional custom ID for the message.\n   * If not provided, a unique ID will be generated.\n   */\n  id?: string\n}\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<\n  TTools extends ReadonlyArray<AnyClientTool> = any,\n  TData = unknown,\n> =\n  | TextPart\n  | ImagePart\n  | AudioPart\n  | VideoPart\n  | DocumentPart\n  | ToolCallPart<TTools>\n  | ToolResultPart\n  | ThinkingPart\n  | StructuredOutputPart<TData>\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 *\n * `TTools` narrows the tool-call/result part types based on the registered\n * tools. `TData` is the schema-inferred type for any `structured-output` part\n * on the message — defaulted to `unknown` so untyped consumers (the core\n * stream processor, the wire converter) don't need to thread a schema generic\n * everywhere; the hook layer (`useChat({ outputSchema })`) substitutes it on\n * the public return so `m.parts.find(p => p.type === 'structured-output').data`\n * is typed without manual casts.\n */\nexport interface UIMessage<\n  TTools extends ReadonlyArray<AnyClientTool> = any,\n  TData = unknown,\n> {\n  id: string\n  role: 'system' | 'user' | 'assistant'\n  parts: Array<MessagePart<TTools, TData>>\n  createdAt?: Date\n}\n\nexport interface ChatClientOptions<\n  TTools extends ReadonlyArray<AnyClientTool> = any,\n> {\n  /**\n   * Connection adapter for streaming.\n   * Supports mutually exclusive modes: request-response via `connect()`, or\n   * subscribe/send mode via `subscribe()` + `send()`.\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   * Thread ID to use for this chat session. Persists across sends within\n   * the session. If omitted, a unique thread ID is generated.\n   */\n  threadId?: string\n\n  /**\n   * Arbitrary client-controlled JSON forwarded to the server in the\n   * AG-UI `RunAgentInput.forwardedProps` field. Use this for per-session\n   * options like provider/model selection or feature flags that the\n   * server endpoint should read.\n   *\n   * Replaces the legacy `body` option. If both are provided,\n   * `forwardedProps` wins on key collision.\n   */\n  forwardedProps?: Record<string, any>\n\n  /**\n   * @deprecated Use `forwardedProps` instead. `body` continues to work\n   * unchanged — its values are merged into the AG-UI\n   * `RunAgentInput.forwardedProps` field on the wire and are also\n   * mirrored under the legacy `data` field for servers that have not\n   * migrated yet. Will be removed in a future major release.\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   * Callback when subscription lifecycle changes.\n   * This is independent from request lifecycle (`isLoading`, `status`).\n   */\n  onSubscriptionChange?: (isSubscribed: boolean) => void\n\n  /**\n   * Callback when connection lifecycle changes.\n   */\n  onConnectionStatusChange?: (status: ConnectionStatus) => void\n\n  /**\n   * Callback when session generation activity changes.\n   * Derived from stream run events (RUN_STARTED / RUN_FINISHED / RUN_ERROR).\n   * Unlike `onLoadingChange` (request-local), this reflects shared generation\n   * activity visible to all subscribers (e.g. across tabs/devices).\n   */\n  onSessionGeneratingChange?: (isGenerating: boolean) => void\n\n  /**\n   * Callback when a custom event is received from a server-side tool.\n   * Custom events are emitted by tools using `context.emitCustomEvent()` during execution.\n   *\n   * @param eventType - The name of the custom event\n   * @param data - The event payload data\n   * @param context - Additional context including the toolCallId that emitted the event\n   */\n  onCustomEvent?: (\n    eventType: string,\n    data: unknown,\n    context: { toolCallId?: string },\n  ) => 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":"AA0WO,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.9.2",
+  "version": "0.11.0",
   "description": "Framework-agnostic headless client for TanStack AI",
   "author": "",
   "license": "MIT",
@@ -31,13 +31,13 @@
     "src"
   ],
   "dependencies": {
-    "@tanstack/ai": "0.17.0",
-    "@tanstack/ai-event-client": "0.3.1"
+    "@tanstack/ai": "0.19.0",
+    "@tanstack/ai-event-client": "0.3.3"
   },
   "devDependencies": {
     "@standard-schema/spec": "^1.1.0",
     "@vitest/coverage-v8": "4.0.14",
-    "vite": "^7.2.7",
+    "vite": "^7.3.3",
     "zod": "^4.2.0"
   },
   "scripts": {

package/src/chat-client.ts

@@ -1,5 +1,6 @@
 import {
   StreamProcessor,
+  convertSchemaToJsonSchema,
   generateMessageId,
   normalizeToUIMessage,
 } from '@tanstack/ai'
@@ -30,7 +31,13 @@ export class ChatClient {
   private processor: StreamProcessor
   private connection: SubscribeConnectionAdapter
   private uniqueId: string
-  private body: Record<string, any> = {}
+  private threadId: string
+  // Track the legacy `body` option and the canonical `forwardedProps`
+  // option as separate slots so that `updateOptions({ forwardedProps })`
+  // doesn't wipe a previously-set `body` (and vice versa). They are
+  // merged on every send, with `forwardedProps` winning on key collision.
+  private bodyOption: Record<string, any> = {}
+  private forwardedPropsOption: Record<string, any> = {}
   private pendingMessageBody: Record<string, any> | undefined = undefined
   private isLoading = false
   private isSubscribed = false
@@ -81,7 +88,14 @@ export class ChatClient {
 
   constructor(options: ChatClientOptions) {
     this.uniqueId = options.id || this.generateUniqueId('chat')
-    this.body = options.body || {}
+    this.threadId = options.threadId || this.generateUniqueId('thread')
+    // Both `body` (deprecated) and `forwardedProps` populate the AG-UI
+    // `RunAgentInput.forwardedProps` wire field. They are stored
+    // separately so `updateOptions` can replace one without touching the
+    // other; the merge happens at send time, with `forwardedProps`
+    // winning on key collision.
+    this.bodyOption = options.body || {}
+    this.forwardedPropsOption = options.forwardedProps || {}
     this.connection = normalizeConnectionAdapter(options.connection)
     this.events = new DefaultChatClientEventEmitter(this.uniqueId)
 
@@ -154,11 +168,7 @@ export class ChatClient {
             this.events.textUpdated(this.currentStreamId, messageId, content)
           }
         },
-        onThinkingUpdate: (
-          messageId: string,
-          _stepId: string,
-          content: string,
-        ) => {
+        onThinkingUpdate: (messageId: string, content: string) => {
           // Emit thinking update to devtools
           if (this.currentStreamId) {
             this.events.thinkingUpdated(
@@ -401,7 +411,14 @@ export class ChatClient {
       // RUN_FINISHED / RUN_ERROR signal run completion — resolve processing
       // (redundant if onStreamEnd already resolved it, harmless)
       if (chunk.type === 'RUN_FINISHED' || chunk.type === 'RUN_ERROR') {
-        const runId = chunk.type === 'RUN_FINISHED' ? chunk.runId : undefined
+        // RUN_FINISHED has runId in its schema; RUN_ERROR carries it via the
+        // AG-UI passthrough so adapters can correlate per-run errors. Extract
+        // both so a RUN_ERROR with a runId only clears that run, not every
+        // active run in the session.
+        const runId =
+          chunk.type === 'RUN_FINISHED'
+            ? chunk.runId
+            : (chunk as { runId?: string }).runId
         if (runId) {
           this.activeRunIds.delete(runId)
         } else if (chunk.type === 'RUN_ERROR') {
@@ -596,12 +613,19 @@ export class ChatClient {
         return false
       }
 
-      // Merge body: base body + per-message body (per-message takes priority)
-      // Include conversationId for server-side event correlation
+      // Merge sources for the wire `forwardedProps` field, in priority
+      // order (later spreads win):
+      //   1. Legacy `body` option (deprecated).
+      //   2. Canonical `forwardedProps` option (wins over `body`).
+      //   3. Per-message `body` arg passed to `sendMessage` (highest).
+      // The AG-UI standard `threadId` is sent at the wire's top level for
+      // run/conversation correlation, so we no longer auto-emit a separate
+      // `conversationId` here — `chat({ threadId })` server-side covers the
+      // same role for devtools/observability.
       const mergedBody = {
-        ...this.body,
+        ...this.bodyOption,
+        ...this.forwardedPropsOption,
         ...this.pendingMessageBody,
-        conversationId: this.uniqueId,
       }
 
       // Clear the pending message body after use
@@ -622,8 +646,31 @@ export class ChatClient {
       // Set up promise that resolves when onStreamEnd fires
       const processingComplete = this.waitForProcessing()
 
+      // Build per-send run context for AG-UI compliance
+      // Note: mergedBody already contains the merged this.body + pendingMessageBody
+      // (pendingMessageBody was cleared above, so we use mergedBody as forwardedProps)
+      // Convert each client tool's `inputSchema` (a Standard Schema:
+      // Zod, ArkType, Valibot, etc.) to JSON Schema for the wire. Foreign
+      // AG-UI servers consuming `RunAgentInput.tools[].parameters` expect
+      // JSON Schema; sending a Standard Schema instance directly would
+      // serialize to an unusable shape.
+      const runContext = {
+        threadId: this.threadId,
+        runId: `run-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+        clientTools: Array.from(this.clientToolsRef.current.values()).map(
+          (t) => ({
+            name: t.name,
+            description: t.description,
+            parameters: t.inputSchema
+              ? convertSchemaToJsonSchema(t.inputSchema)
+              : { type: 'object' },
+          }),
+        ),
+        forwardedProps: { ...mergedBody },
+      }
+
       // Send through normalized connection (pushes chunks to subscription queue)
-      await this.connection.send(messages, mergedBody, signal)
+      await this.connection.send(messages, mergedBody, signal, runContext)
 
       // Wait for subscription loop to finish processing all chunks
       await processingComplete
@@ -982,7 +1029,9 @@ export class ChatClient {
    */
   updateOptions(options: {
     connection?: ConnectionAdapter
+    /** @deprecated Use `forwardedProps` instead. */
     body?: Record<string, any>
+    forwardedProps?: Record<string, any>
     tools?: ReadonlyArray<AnyClientTool>
     onResponse?: (response?: Response) => void | Promise<void>
     onChunk?: (chunk: StreamChunk) => void
@@ -1018,8 +1067,14 @@ export class ChatClient {
         this.subscribe()
       }
     }
+    // Replace each slot independently so callers can update one without
+    // wiping the other. (Passing `undefined` for either field is a "leave
+    // unchanged" signal — to clear a slot, pass an empty object `{}`.)
     if (options.body !== undefined) {
-      this.body = options.body
+      this.bodyOption = options.body
+    }
+    if (options.forwardedProps !== undefined) {
+      this.forwardedPropsOption = options.forwardedProps
     }
     if (options.tools !== undefined) {
       this.clientToolsRef.current = new Map()

package/src/connection-adapters.ts

@@ -1,6 +1,10 @@
-import { EventType } from '@tanstack/ai'
+import { EventType, uiMessagesToWire } from '@tanstack/ai'
 import type { ModelMessage, StreamChunk, UIMessage } from '@tanstack/ai'
 
+function generateRunId(prefix: string): string {
+  return `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`
+}
+
 /**
  * Merge custom headers into request headers
  */
@@ -63,6 +67,25 @@ async function* readStreamLines(
   }
 }
 
+/**
+ * Per-send context provided by the chat client to the connection adapter.
+ * The adapter combines this with serialized messages to build a full
+ * AG-UI `RunAgentInput` payload.
+ */
+export interface RunAgentInputContext {
+  threadId: string
+  runId: string
+  parentRunId?: string
+  /** Client-declared tools to advertise in the request payload. */
+  clientTools?: Array<{
+    name: string
+    description: string
+    parameters: unknown
+  }>
+  /** Arbitrary user-controlled passthrough data. */
+  forwardedProps?: Record<string, unknown>
+}
+
 export interface ConnectConnectionAdapter {
   /**
    * Connect and return an async iterable of StreamChunks.
@@ -71,6 +94,7 @@ export interface ConnectConnectionAdapter {
     messages: Array<UIMessage> | Array<ModelMessage>,
     data?: Record<string, any>,
     abortSignal?: AbortSignal,
+    runContext?: RunAgentInputContext,
   ) => AsyncIterable<StreamChunk>
 }
 
@@ -86,6 +110,7 @@ export interface SubscribeConnectionAdapter {
     messages: Array<UIMessage> | Array<ModelMessage>,
     data?: Record<string, any>,
     abortSignal?: AbortSignal,
+    runContext?: RunAgentInputContext,
   ) => Promise<void>
 }
 
@@ -174,10 +199,15 @@ export function normalizeConnectionAdapter(
         }
       })()
     },
-    async send(messages, data, abortSignal) {
+    async send(messages, data, abortSignal, runContext) {
       let hasTerminalEvent = false
       try {
-        const stream = connection.connect(messages, data, abortSignal)
+        const stream = connection.connect(
+          messages,
+          data,
+          abortSignal,
+          runContext,
+        )
         for await (const chunk of stream) {
           if (chunk.type === 'RUN_FINISHED' || chunk.type === 'RUN_ERROR') {
             hasTerminalEvent = true
@@ -187,11 +217,12 @@ export function normalizeConnectionAdapter(
 
         // If the connect stream ended cleanly without a terminal event,
         // synthesize RUN_FINISHED so request-scoped consumers can complete.
+        // Reuse the caller's threadId/runId so client-side activeRunIds tracking matches.
         if (!abortSignal?.aborted && !hasTerminalEvent) {
           push({
             type: EventType.RUN_FINISHED,
-            runId: `run-${Date.now()}`,
-            threadId: `thread-${Date.now()}`,
+            threadId: runContext?.threadId ?? `thread-${Date.now()}`,
+            runId: runContext?.runId ?? `run-${Date.now()}`,
             model: 'connect-wrapper',
             timestamp: Date.now(),
             finishReason: 'stop',
@@ -201,6 +232,8 @@ export function normalizeConnectionAdapter(
         if (!abortSignal?.aborted && !hasTerminalEvent) {
           push({
             type: EventType.RUN_ERROR,
+            threadId: runContext?.threadId ?? `thread-${Date.now()}`,
+            runId: runContext?.runId ?? `run-${Date.now()}`,
             timestamp: Date.now(),
             message:
               err instanceof Error ? err.message : 'Unknown error in connect()',
@@ -270,7 +303,7 @@ export function fetchServerSentEvents(
     | (() => FetchConnectionOptions | Promise<FetchConnectionOptions>) = {},
 ): ConnectConnectionAdapter {
   return {
-    async *connect(messages, data, abortSignal) {
+    async *connect(messages, data, abortSignal, runContext) {
       // Resolve URL and options if they are functions
       const resolvedUrl = typeof url === 'function' ? url() : url
       const resolvedOptions =
@@ -281,12 +314,40 @@ export function fetchServerSentEvents(
         ...mergeHeaders(resolvedOptions.headers),
       }
 
-      // Send messages as-is (UIMessages with parts preserved)
-      // Server-side TextEngine handles conversion to ModelMessages
-      const requestBody = {
-        messages,
-        data,
+      // Build AG-UI RunAgentInput payload.
+      //
+      // Precedence (later spreads win): static adapter `body` is the base,
+      // overridden by `runContext.forwardedProps` (constructor body /
+      // forwardedProps options), overridden by per-message `data` passed
+      // to `connection.send`. Runtime values win over static config —
+      // this matches the documented "forwardedProps wins" semantic.
+      const wireMessages = uiMessagesToWire(messages as Array<UIMessage>)
+      const forwardedProps = {
         ...resolvedOptions.body,
+        ...(runContext?.forwardedProps ?? {}),
+        ...data,
+      }
+      const requestBody = {
+        threadId: runContext?.threadId ?? generateRunId('thread'),
+        runId: runContext?.runId ?? generateRunId('run'),
+        ...(runContext?.parentRunId !== undefined && {
+          parentRunId: runContext.parentRunId,
+        }),
+        state: {},
+        messages: wireMessages,
+        tools: runContext?.clientTools ?? [],
+        context: [],
+        forwardedProps,
+        // Backward-compat mirror of `forwardedProps` under the legacy
+        // field name `data`. Server endpoints that have not migrated
+        // off the pre-AG-UI shape (`{ messages, data }`) keep working.
+        // AG-UI strict consumers strip this via `RunAgentInputSchema`
+        // (see `chatParamsFromRequestBody`). Will be removed when the
+        // legacy `body` client option is dropped.
+        // Shallow-cloned so that downstream mutation of `data` (e.g.
+        // by a logging interceptor or fetch wrapper) cannot corrupt
+        // `forwardedProps` and vice versa.
+        data: { ...forwardedProps },
       }
 
       const fetchClient = resolvedOptions.fetchClient ?? fetch
@@ -374,7 +435,7 @@ export function fetchHttpStream(
     | (() => FetchConnectionOptions | Promise<FetchConnectionOptions>) = {},
 ): ConnectConnectionAdapter {
   return {
-    async *connect(messages, data, abortSignal) {
+    async *connect(messages, data, abortSignal, runContext) {
       // Resolve URL and options if they are functions
       const resolvedUrl = typeof url === 'function' ? url() : url
       const resolvedOptions =
@@ -385,12 +446,40 @@ export function fetchHttpStream(
         ...mergeHeaders(resolvedOptions.headers),
       }
 
-      // Send messages as-is (UIMessages with parts preserved)
-      // Server-side TextEngine handles conversion to ModelMessages
-      const requestBody = {
-        messages,
-        data,
+      // Build AG-UI RunAgentInput payload.
+      //
+      // Precedence (later spreads win): static adapter `body` is the base,
+      // overridden by `runContext.forwardedProps` (constructor body /
+      // forwardedProps options), overridden by per-message `data` passed
+      // to `connection.send`. Runtime values win over static config —
+      // this matches the documented "forwardedProps wins" semantic.
+      const wireMessages = uiMessagesToWire(messages as Array<UIMessage>)
+      const forwardedProps = {
         ...resolvedOptions.body,
+        ...(runContext?.forwardedProps ?? {}),
+        ...data,
+      }
+      const requestBody = {
+        threadId: runContext?.threadId ?? generateRunId('thread'),
+        runId: runContext?.runId ?? generateRunId('run'),
+        ...(runContext?.parentRunId !== undefined && {
+          parentRunId: runContext.parentRunId,
+        }),
+        state: {},
+        messages: wireMessages,
+        tools: runContext?.clientTools ?? [],
+        context: [],
+        forwardedProps,
+        // Backward-compat mirror of `forwardedProps` under the legacy
+        // field name `data`. Server endpoints that have not migrated
+        // off the pre-AG-UI shape (`{ messages, data }`) keep working.
+        // AG-UI strict consumers strip this via `RunAgentInputSchema`
+        // (see `chatParamsFromRequestBody`). Will be removed when the
+        // legacy `body` client option is dropped.
+        // Shallow-cloned so that downstream mutation of `data` (e.g.
+        // by a logging interceptor or fetch wrapper) cannot corrupt
+        // `forwardedProps` and vice versa.
+        data: { ...forwardedProps },
       }
 
       const fetchClient = resolvedOptions.fetchClient ?? fetch
@@ -447,7 +536,7 @@ export function stream(
   ) => AsyncIterable<StreamChunk>,
 ): ConnectConnectionAdapter {
   return {
-    async *connect(messages, data) {
+    async *connect(messages, data, _abortSignal, _runContext) {
       // Pass messages as-is (UIMessages with parts preserved)
       // Server-side chat() handles conversion to ModelMessages
       yield* streamFactory(messages, data)
@@ -478,7 +567,7 @@ export function rpcStream(
   ) => AsyncIterable<StreamChunk>,
 ): ConnectConnectionAdapter {
   return {
-    async *connect(messages, data) {
+    async *connect(messages, data, _abortSignal, _runContext) {
       // Pass messages as-is (UIMessages with parts preserved)
       // Server-side chat() handles conversion to ModelMessages
       yield* rpcCall(messages, data)