@tanstack/ai-solid 0.21.1 → 0.24.0

package/dist/byok.d.ts

@@ -0,0 +1,2 @@
+import { ByokClient, ByokPrompt, ByokProvider, ByokProviderInit, ByokSnapshot, DefineByokOptions, EMPTY_BYOK_SNAPSHOT, KeyPreview, KeyStatus, Keyring, KeyringStorage, PasskeyStorageOptions, decryptKeyring, defaultByokStorage, defineByok, defineByokProvider, deriveAesKey, encryptKeyring, isPasskeyStorageSupported, memoryStorage, passkeyStorage } from "@tanstack/ai-client/byok";
+export { ByokClient, type ByokPrompt, type ByokProvider, type ByokProviderInit, type ByokSnapshot, type DefineByokOptions, EMPTY_BYOK_SNAPSHOT, type KeyPreview, type KeyStatus, type Keyring, type KeyringStorage, type PasskeyStorageOptions, decryptKeyring, defaultByokStorage, defineByok, defineByokProvider, deriveAesKey, encryptKeyring, isPasskeyStorageSupported, memoryStorage, passkeyStorage };

package/dist/byok.js

@@ -0,0 +1,3 @@
+import { ByokClient, EMPTY_BYOK_SNAPSHOT, decryptKeyring, defaultByokStorage, defineByok, defineByokProvider, deriveAesKey, encryptKeyring, isPasskeyStorageSupported, memoryStorage, passkeyStorage } from "@tanstack/ai-client/byok";
+
+export { ByokClient, EMPTY_BYOK_SNAPSHOT, decryptKeyring, defaultByokStorage, defineByok, defineByokProvider, deriveAesKey, encryptKeyring, isPasskeyStorageSupported, memoryStorage, passkeyStorage };

package/dist/index.d.ts

@@ -11,5 +11,5 @@ import { UseTranscriptionOptions, UseTranscriptionReturn, useTranscription } fro
 import { UseSummarizeOptions, UseSummarizeReturn, useSummarize } from "./use-summarize.js";
 import { UseGenerateVideoOptions, UseGenerateVideoReturn, useGenerateVideo } from "./use-generate-video.js";
 import { UseAudioRecorderOptions, UseAudioRecorderReturn, useAudioRecorder } from "./use-audio-recorder.js";
-import { AudioGenerateInput, ChatClientPersistence, ChatPersistedState, ChatPersistenceOption, ChatStorageAdapter, ConnectConnectionAdapter, ConnectionAdapter, FetchConnectionOptions, GenerationClientState, ImageGenerateInput, IndexedDBPersistenceOptions, InferChatMessages, RunAgentInputContext, SpeechGenerateInput, StorageUnavailableError, SubscribeConnectionAdapter, SummarizeGenerateInput, TranscriptionGenerateInput, VideoGenerateInput, VideoGenerateResult, VideoStatusInfo, WebSocketConnectionOptions, WebStoragePersistenceOptions, XhrConnectionOptions, createChatClientOptions, fetchHttpStream, fetchServerSentEvents, indexedDBPersistence, localStoragePersistence, rpcStream, sessionStoragePersistence, stream, webSocket, xhrHttpStream, xhrServerSentEvents } from "@tanstack/ai-client";
-export { type AudioGenerateInput, type ChatClientPersistence, type ChatPersistedState, type ChatPersistenceOption, type ChatRequestBody, type ChatStorageAdapter, type ConnectConnectionAdapter, type ConnectionAdapter, type DeepPartial, type FetchConnectionOptions, type GenerationClientState, type ImageGenerateInput, type IndexedDBPersistenceOptions, type InferChatMessages, type QueueConfig, type QueueOption, type QueueStrategy, type QueuedMessage, type RunAgentInputContext, type SendMessageOptions, type SpeechGenerateInput, StorageUnavailableError, type SubscribeConnectionAdapter, type SummarizeGenerateInput, type TranscriptionGenerateInput, type UIMessage, type UseAudioRecorderOptions, type UseAudioRecorderReturn, type UseChatOptions, type UseChatReturn, type UseGenerateAudioOptions, type UseGenerateAudioReturn, type UseGenerateImageOptions, type UseGenerateImageReturn, type UseGenerateSpeechOptions, type UseGenerateSpeechReturn, type UseGenerateVideoOptions, type UseGenerateVideoReturn, type UseGenerationOptions, type UseGenerationReturn, type UseSummarizeOptions, type UseSummarizeReturn, type UseTranscriptionOptions, type UseTranscriptionReturn, type UseWebMCPToolsOptions, type VideoGenerateInput, type VideoGenerateResult, type VideoStatusInfo, type WebSocketConnectionOptions, type WebStoragePersistenceOptions, type WhenBusy, type XhrConnectionOptions, createChatClientOptions, createChatHook, fetchHttpStream, fetchServerSentEvents, indexedDBPersistence, localStoragePersistence, rpcStream, sessionStoragePersistence, stream, useAudioRecorder, useByok, useChat, useGenerateAudio, useGenerateImage, useGenerateSpeech, useGenerateVideo, useGeneration, useSummarize, useTranscription, useWebMCPTools, webSocket, xhrHttpStream, xhrServerSentEvents };
+import { AudioGenerateInput, AudioRecorder, BatchStrategy, ChatClient, ChatClientPersistence, ChatPersistedState, ChatPersistenceOption, ChatStorageAdapter, CompositeStrategy, ConnectConnectionAdapter, ConnectionAdapter, CreateMcpAppBridgeOptions, DurableStreamIncompleteError, FetchConnectionOptions, GENERATION_EVENTS, GenerationClient, GenerationClientState, ImageGenerateInput, ImmediateStrategy, IndexedDBPersistenceOptions, InferChatMessages, InterruptManager, McpAppBridge, PartialJSONParser, PunctuationStrategy, RealtimeClient, RunAgentInputContext, SpeechGenerateInput, StorageUnavailableError, StreamProcessor, StreamReconnectLimitError, StreamTruncatedError, SubscribeConnectionAdapter, SummarizeGenerateInput, TranscriptionGenerateInput, UnsupportedResponseStreamError, VideoGenerateInput, VideoGenerateResult, VideoGenerationClient, VideoStatusInfo, WebSocketConnectionOptions, WebStoragePersistenceOptions, WordBoundaryStrategy, XhrConnectionOptions, clientTools, convertMessagesToModelMessages, createAIDevtoolsGenerationPreview, createChatClientOptions, createMcpAppBridge, defaultJSONParser, fetchHttpStream, fetchServerSentEvents, generateMessageId, indexedDBPersistence, localStoragePersistence, modelMessageToUIMessage, modelMessagesToUIMessages, normalizeToUIMessage, parsePartialJSON, reconstructAudioResult, reconstructImageResult, reconstructSpeechResult, reconstructSummarizeResult, reconstructTranscriptionResult, registerWebMCPTools, rpcStream, sessionStoragePersistence, stream, uiMessageToModelMessages, webSocket, xhrHttpStream, xhrServerSentEvents } from "@tanstack/ai-client";
+export { type AudioGenerateInput, AudioRecorder, BatchStrategy, ChatClient, type ChatClientPersistence, type ChatPersistedState, type ChatPersistenceOption, type ChatRequestBody, type ChatStorageAdapter, CompositeStrategy, type ConnectConnectionAdapter, type ConnectionAdapter, type CreateMcpAppBridgeOptions, type DeepPartial, DurableStreamIncompleteError, type FetchConnectionOptions, GENERATION_EVENTS, GenerationClient, type GenerationClientState, type ImageGenerateInput, ImmediateStrategy, type IndexedDBPersistenceOptions, type InferChatMessages, InterruptManager, type McpAppBridge, PartialJSONParser, PunctuationStrategy, type QueueConfig, type QueueOption, type QueueStrategy, type QueuedMessage, RealtimeClient, type RunAgentInputContext, type SendMessageOptions, type SpeechGenerateInput, StorageUnavailableError, StreamProcessor, StreamReconnectLimitError, StreamTruncatedError, type SubscribeConnectionAdapter, type SummarizeGenerateInput, type TranscriptionGenerateInput, type UIMessage, UnsupportedResponseStreamError, type UseAudioRecorderOptions, type UseAudioRecorderReturn, type UseChatOptions, type UseChatReturn, type UseGenerateAudioOptions, type UseGenerateAudioReturn, type UseGenerateImageOptions, type UseGenerateImageReturn, type UseGenerateSpeechOptions, type UseGenerateSpeechReturn, type UseGenerateVideoOptions, type UseGenerateVideoReturn, type UseGenerationOptions, type UseGenerationReturn, type UseSummarizeOptions, type UseSummarizeReturn, type UseTranscriptionOptions, type UseTranscriptionReturn, type UseWebMCPToolsOptions, type VideoGenerateInput, type VideoGenerateResult, VideoGenerationClient, type VideoStatusInfo, type WebSocketConnectionOptions, type WebStoragePersistenceOptions, type WhenBusy, WordBoundaryStrategy, type XhrConnectionOptions, clientTools, convertMessagesToModelMessages, createAIDevtoolsGenerationPreview, createChatClientOptions, createChatHook, createMcpAppBridge, defaultJSONParser, fetchHttpStream, fetchServerSentEvents, generateMessageId, indexedDBPersistence, localStoragePersistence, modelMessageToUIMessage, modelMessagesToUIMessages, normalizeToUIMessage, parsePartialJSON, reconstructAudioResult, reconstructImageResult, reconstructSpeechResult, reconstructSummarizeResult, reconstructTranscriptionResult, registerWebMCPTools, rpcStream, sessionStoragePersistence, stream, uiMessageToModelMessages, useAudioRecorder, useByok, useChat, useGenerateAudio, useGenerateImage, useGenerateSpeech, useGenerateVideo, useGeneration, useSummarize, useTranscription, useWebMCPTools, webSocket, xhrHttpStream, xhrServerSentEvents };

package/dist/index.js

@@ -10,6 +10,6 @@ import { useTranscription } from "./use-transcription.js";
 import { useSummarize } from "./use-summarize.js";
 import { useGenerateVideo } from "./use-generate-video.js";
 import { useAudioRecorder } from "./use-audio-recorder.js";
-import { StorageUnavailableError, createChatClientOptions, fetchHttpStream, fetchServerSentEvents, indexedDBPersistence, localStoragePersistence, rpcStream, sessionStoragePersistence, stream, webSocket, xhrHttpStream, xhrServerSentEvents } from "@tanstack/ai-client";
+import { AudioRecorder, BatchStrategy, ChatClient, CompositeStrategy, DurableStreamIncompleteError, GENERATION_EVENTS, GenerationClient, ImmediateStrategy, InterruptManager, PartialJSONParser, PunctuationStrategy, RealtimeClient, StorageUnavailableError, StreamProcessor, StreamReconnectLimitError, StreamTruncatedError, UnsupportedResponseStreamError, VideoGenerationClient, WordBoundaryStrategy, clientTools, convertMessagesToModelMessages, createAIDevtoolsGenerationPreview, createChatClientOptions, createMcpAppBridge, defaultJSONParser, fetchHttpStream, fetchServerSentEvents, generateMessageId, indexedDBPersistence, localStoragePersistence, modelMessageToUIMessage, modelMessagesToUIMessages, normalizeToUIMessage, parsePartialJSON, reconstructAudioResult, reconstructImageResult, reconstructSpeechResult, reconstructSummarizeResult, reconstructTranscriptionResult, registerWebMCPTools, rpcStream, sessionStoragePersistence, stream, uiMessageToModelMessages, webSocket, xhrHttpStream, xhrServerSentEvents } from "@tanstack/ai-client";
 
-export { StorageUnavailableError, createChatClientOptions, createChatHook, fetchHttpStream, fetchServerSentEvents, indexedDBPersistence, localStoragePersistence, rpcStream, sessionStoragePersistence, stream, useAudioRecorder, useByok, useChat, useGenerateAudio, useGenerateImage, useGenerateSpeech, useGenerateVideo, useGeneration, useSummarize, useTranscription, useWebMCPTools, webSocket, xhrHttpStream, xhrServerSentEvents };
+export { AudioRecorder, BatchStrategy, ChatClient, CompositeStrategy, DurableStreamIncompleteError, GENERATION_EVENTS, GenerationClient, ImmediateStrategy, InterruptManager, PartialJSONParser, PunctuationStrategy, RealtimeClient, StorageUnavailableError, StreamProcessor, StreamReconnectLimitError, StreamTruncatedError, UnsupportedResponseStreamError, VideoGenerationClient, WordBoundaryStrategy, clientTools, convertMessagesToModelMessages, createAIDevtoolsGenerationPreview, createChatClientOptions, createChatHook, createMcpAppBridge, defaultJSONParser, fetchHttpStream, fetchServerSentEvents, generateMessageId, indexedDBPersistence, localStoragePersistence, modelMessageToUIMessage, modelMessagesToUIMessages, normalizeToUIMessage, parsePartialJSON, reconstructAudioResult, reconstructImageResult, reconstructSpeechResult, reconstructSummarizeResult, reconstructTranscriptionResult, registerWebMCPTools, rpcStream, sessionStoragePersistence, stream, uiMessageToModelMessages, useAudioRecorder, useByok, useChat, useGenerateAudio, useGenerateImage, useGenerateSpeech, useGenerateVideo, useGeneration, useSummarize, useTranscription, useWebMCPTools, webSocket, xhrHttpStream, xhrServerSentEvents };

package/dist/types.d.ts

@@ -141,6 +141,14 @@ interface BaseUseChatReturn<TTools extends ReadonlyArray<AnyClientTool$1> = any,
    * Whether a response is currently being generated
    */
   isLoading: Accessor<boolean>;
+  /**
+   * True when the last hydrate or older-page response said more messages exist.
+   */
+  hasOlderMessages: Accessor<boolean>;
+  /**
+   * Fetch the next older window and put it in front of the painted messages.
+   */
+  loadOlderMessages: () => Promise<void>;
   /**
    * Current error, if any
    */

package/dist/use-chat.js

@@ -10,6 +10,7 @@ function useChat(options = {}) {
 	const clientId = options.threadId ?? hookId;
 	const [messages, setMessages] = createSignal(options.initialMessages || []);
 	const [isLoading, setIsLoading] = createSignal(false);
+	const [hasOlderMessages, setHasOlderMessages] = createSignal(false);
 	const [error, setError] = createSignal(void 0);
 	const [status, setStatus] = createSignal("ready");
 	const [isSubscribed, setIsSubscribed] = createSignal(false);
@@ -28,11 +29,15 @@ function useChat(options = {}) {
 		setInterruptState(client().getInterruptState());
 	};
 	const client = createMemo(() => {
-		return new ChatClient({
+		const instance = new ChatClient({
 			devtoolsBridgeFactory: createChatDevtoolsBridge,
 			...options.connection ? { connection: options.connection } : { fetcher: options.fetcher },
 			...options.initialMessages !== void 0 && { initialMessages: options.initialMessages },
-			...typeof options.threadId === "string" && options.persistence ? {
+			...typeof options.threadId === "string" && options.persistence === true ? {
+				persistence: true,
+				threadId: options.threadId,
+				...options.history !== void 0 && { history: options.history }
+			} : typeof options.threadId === "string" && options.persistence ? {
 				persistence: options.persistence,
 				threadId: options.threadId
 			} : { ...options.threadId !== void 0 && { threadId: options.threadId } },
@@ -64,6 +69,7 @@ function useChat(options = {}) {
 			...options.streamProcessor !== void 0 && { streamProcessor: options.streamProcessor },
 			onMessagesChange: (newMessages) => {
 				setMessages(newMessages);
+				setHasOlderMessages(instance.getHasOlderMessages());
 			},
 			onLoadingChange: (newIsLoading) => {
 				setIsLoading(newIsLoading);
@@ -103,8 +109,10 @@ function useChat(options = {}) {
 				options.onInterruptStateChange?.(nextInterruptState, context);
 			}
 		});
+		return instance;
 	}, [clientId]);
 	setMessages(client().getMessages());
+	setHasOlderMessages(client().getHasOlderMessages());
 	syncResumeState();
 	createEffect(() => {
 		client().updateOptions({
@@ -152,6 +160,10 @@ function useChat(options = {}) {
 			syncResumeState();
 		}
 	};
+	const loadOlderMessages = async () => {
+		await client().loadOlderMessages();
+		setHasOlderMessages(client().getHasOlderMessages());
+	};
 	const stop = () => {
 		client().stop();
 	};
@@ -214,6 +226,8 @@ function useChat(options = {}) {
 		reload,
 		stop,
 		isLoading,
+		hasOlderMessages,
+		loadOlderMessages,
 		error,
 		status,
 		isSubscribed,

package/dist/use-chat.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-chat.js","names":[],"sources":["../src/use-chat.ts"],"sourcesContent":["import {\n  createEffect,\n  createMemo,\n  createSignal,\n  createUniqueId,\n  onCleanup,\n  onMount,\n} from 'solid-js'\n\nimport { ChatClient } from '@tanstack/ai-client'\nimport { createChatDevtoolsBridge } from '@tanstack/ai-client/devtools'\nimport type {\n  ChatClientState,\n  ResolvableChatInterrupt,\n  ChatInterruptState,\n  ChatResumeState,\n  ConnectionStatus,\n  InferredClientContext,\n  QueuedMessage,\n  SendMessageOptions,\n  StructuredOutputPart,\n} from '@tanstack/ai-client'\nimport type {\n  AnyClientTool,\n  InterruptDefinition,\n  InferSchemaType,\n  ModelMessage,\n  RunAgentResumeItem,\n  SchemaInput,\n  StreamChunk,\n} from '@tanstack/ai'\nimport type {\n  DeepPartial,\n  MultimodalContent,\n  UIMessage,\n  UseChatOptions,\n  UseChatReturn,\n} from './types'\n\nconst EMPTY_INTERRUPTS = Object.freeze([])\nconst EMPTY_INTERRUPT_ERRORS = Object.freeze([])\n\nexport function useChat<\n  const TTools extends ReadonlyArray<AnyClientTool> = any,\n  TSchema extends SchemaInput | undefined = undefined,\n  TContext = InferredClientContext<TTools>,\n  const TInterrupts extends ReadonlyArray<\n    InterruptDefinition<any, any, any, any>\n  > = readonly [],\n>(\n  options: UseChatOptions<\n    TTools,\n    TSchema,\n    TContext,\n    TInterrupts\n  > = {} as UseChatOptions<TTools, TSchema, TContext, TInterrupts>,\n): UseChatReturn<TTools, TSchema, TInterrupts> {\n  // The hook's identity is its `threadId`. Reload with the same `threadId`\n  // restores the same conversation. `hookId` is only a recreation key when no\n  // `threadId` is given. It is never sent on the wire.\n  const hookId = createUniqueId()\n  const clientId = options.threadId ?? hookId\n\n  const [messages, setMessages] = createSignal<Array<UIMessage<TTools>>>(\n    options.initialMessages || [],\n  )\n  const [isLoading, setIsLoading] = createSignal(false)\n  const [error, setError] = createSignal<Error | undefined>(undefined)\n  const [status, setStatus] = createSignal<ChatClientState>('ready')\n  const [isSubscribed, setIsSubscribed] = createSignal(false)\n  const [connectionStatus, setConnectionStatus] =\n    createSignal<ConnectionStatus>('disconnected')\n  const [sessionGenerating, setSessionGenerating] = createSignal(false)\n  const [queue, setQueue] = createSignal<Array<QueuedMessage>>([])\n  const [runId, setRunId] = createSignal<string | null>(null)\n  const [interruptState, setInterruptState] = createSignal<\n    ChatInterruptState<TTools, TInterrupts>\n  >({\n    interrupts: EMPTY_INTERRUPTS,\n    pendingInterrupts: EMPTY_INTERRUPTS,\n    interruptErrors: EMPTY_INTERRUPT_ERRORS,\n    resuming: false,\n  })\n\n  const syncResumeState = () => {\n    setRunId(client().getCurrentRunId())\n    setInterruptState(client().getInterruptState())\n  }\n\n  // Structured-output `partial` / `final` are derived from `messages` —\n  // specifically from the structured-output part on the latest assistant\n  // message (the one after the most recent user message). Per-turn parts\n  // keep history coherent without a separate reset signal.\n  type Partial = DeepPartial<InferSchemaType<NonNullable<TSchema>>>\n  type Final = InferSchemaType<NonNullable<TSchema>>\n\n  // Create ChatClient instance with callbacks to sync state.\n  // Every user-provided callback is wrapped so the LATEST `options.xxx` value\n  // is read at call time. Direct assignment would freeze the callback to the\n  // reference we saw at creation; the wrapper lets reactive `options` or\n  // in-place mutations propagate. When the user clears a callback (sets it to\n  // undefined), `?.` no-ops.\n  const client = createMemo(() => {\n    // Build options with conditional spreads for fields whose source\n    // type is `T | undefined` but the ChatClient target uses a strict\n    // optional (`field?: T`) — `exactOptionalPropertyTypes` rejects\n    // assigning `undefined` to those, so we omit the key when absent.\n    const transport = options.connection\n      ? { connection: options.connection }\n      : { fetcher: options.fetcher }\n    return new ChatClient<TTools, TContext, TInterrupts>({\n      devtoolsBridgeFactory: createChatDevtoolsBridge,\n      ...transport,\n      ...(options.initialMessages !== undefined && {\n        initialMessages: options.initialMessages,\n      }),\n      ...(typeof options.threadId === 'string' && options.persistence\n        ? {\n            persistence: options.persistence,\n            threadId: options.threadId,\n          }\n        : {\n            ...(options.threadId !== undefined && {\n              threadId: options.threadId,\n            }),\n          }),\n      ...(options.initialResumeSnapshot !== undefined && {\n        initialResumeSnapshot: options.initialResumeSnapshot,\n      }),\n      body: options.body,\n      ...(options.forwardedProps !== undefined && {\n        forwardedProps: options.forwardedProps,\n      }),\n      ...(options.byok !== undefined && { byok: options.byok }),\n      byokProvider: () => options.byokProvider?.(),\n      ...(options.context !== undefined && { context: options.context }),\n      devtools: {\n        ...options.devtools,\n        framework: 'solid',\n        hookName: 'useChat',\n        outputKind: options.outputSchema ? 'structured' : 'chat',\n      },\n      onResponse: (response) => options.onResponse?.(response),\n      onChunk: (chunk: StreamChunk) => {\n        options.onChunk?.(chunk)\n      },\n      onFinish: (message) => {\n        options.onFinish?.(message)\n      },\n      onError: (err) => {\n        options.onError?.(err)\n      },\n      tools: options.tools,\n      ...(options.interrupts !== undefined && {\n        interrupts: options.interrupts,\n      }),\n      onCustomEvent: (eventType, data, context) =>\n        options.onCustomEvent?.(eventType, data, context),\n      ...(options.streamProcessor !== undefined && {\n        streamProcessor: options.streamProcessor,\n      }),\n      onMessagesChange: (newMessages: Array<UIMessage<TTools>>) => {\n        setMessages(newMessages)\n      },\n      onLoadingChange: (newIsLoading: boolean) => {\n        setIsLoading(newIsLoading)\n        syncResumeState()\n      },\n      onStatusChange: (newStatus: ChatClientState) => {\n        setStatus(newStatus)\n      },\n      onErrorChange: (newError: Error | undefined) => {\n        setError(newError)\n      },\n      onSubscriptionChange: (nextIsSubscribed: boolean) => {\n        setIsSubscribed(nextIsSubscribed)\n      },\n      onConnectionStatusChange: (nextStatus: ConnectionStatus) => {\n        setConnectionStatus(nextStatus)\n      },\n      onSessionGeneratingChange: (isGenerating: boolean) => {\n        setSessionGenerating(isGenerating)\n      },\n      ...(options.queue !== undefined && { queue: options.queue }),\n      onQueueChange: (nextQueue: Array<QueuedMessage>) => {\n        setQueue(nextQueue)\n      },\n      onRunIdChange: (nextRunId) => {\n        setRunId(nextRunId)\n      },\n      onResumeStateChange: (_nextResumeState, nextPendingInterrupts) => {\n        setInterruptState((current) => ({\n          ...current,\n          interrupts: nextPendingInterrupts,\n          pendingInterrupts: nextPendingInterrupts,\n        }))\n      },\n      onInterruptStateChange: (nextInterruptState, context) => {\n        setInterruptState(nextInterruptState)\n        options.onInterruptStateChange?.(nextInterruptState, context)\n      },\n    })\n    // Only recreate when clientId changes\n    // Connection and other options are captured at creation time\n  }, [clientId])\n\n  setMessages(client().getMessages())\n  syncResumeState()\n\n  // Sync body / forwardedProps changes to the client.\n  // Both populate the same wire payload; `forwardedProps` is preferred\n  // and `body` is deprecated but still supported.\n  createEffect(() => {\n    // Conditional spread: `updateOptions` declares strict-optional\n    // fields and rejects explicit `undefined` under EOPT.\n    client().updateOptions({\n      ...(options.body !== undefined && { body: options.body }),\n      ...(options.forwardedProps !== undefined && {\n        forwardedProps: options.forwardedProps,\n      }),\n      context: options.context,\n      ...(options.queue !== undefined && { queue: options.queue }),\n    })\n  })\n\n  // Apply initial live mode immediately on hook creation.\n  if (options.live) {\n    client().subscribe()\n  } else {\n    client().unsubscribe()\n  }\n\n  createEffect(() => {\n    if (options.live) {\n      client().subscribe()\n    } else {\n      client().unsubscribe()\n    }\n  })\n\n  onMount(() => {\n    // START TAILING HERE, not in the constructor. A client is idle until a view\n    // attaches it, so a client that gets built and thrown away never opens a\n    // connection — an unreachable stream would hold one of the browser's ~6\n    // connections per origin until the page reloaded.\n    client().attach()\n    client().mountDevtools()\n    // Delivery-durability resume is transparent: the resumable SSE connection\n    // adapter reattaches via the browser's native Last-Event-ID on reconnect.\n    // We only seed interrupt (state) resume from the client here.\n    syncResumeState()\n  })\n\n  // Cleanup on unmount: stop any in-flight requests.\n  onCleanup(() => {\n    // Release the connection first: `detach` is the counterpart of the `attach`\n    // above, and it keeps the transcript and resume pointer so a later mount can\n    // pick the run back up from the durable log.\n    client().detach()\n    if (options.live) {\n      client().unsubscribe()\n    } else {\n      client().stop()\n    }\n    client().dispose()\n  })\n\n  // Callback options are read through `options.xxx` at call time, so reactive\n  // or mutated options propagate without recreating the client.\n\n  const sendMessage = async (\n    content: string | MultimodalContent,\n    sendOptions?: SendMessageOptions,\n  ) => {\n    try {\n      await client().sendMessage(content, undefined, sendOptions)\n    } finally {\n      syncResumeState()\n    }\n  }\n\n  const append = async (message: ModelMessage | UIMessage<TTools>) => {\n    try {\n      await client().append(message)\n    } finally {\n      syncResumeState()\n    }\n  }\n\n  const reload = async () => {\n    try {\n      await client().reload()\n    } finally {\n      syncResumeState()\n    }\n  }\n\n  const stop = () => {\n    client().stop()\n  }\n\n  const clear = () => {\n    client().clear()\n    syncResumeState()\n  }\n\n  const setMessagesManually = (newMessages: Array<UIMessage<TTools>>) => {\n    client().setMessagesManually(newMessages)\n  }\n\n  const addToolResult = async (result: {\n    toolCallId: string\n    tool: string\n    output: any\n    state?: 'output-available' | 'output-error'\n    errorText?: string\n  }) => {\n    await client().addToolResult(result)\n  }\n\n  const addToolApprovalResponse = async (response: {\n    id: string\n    approved: boolean\n  }) => {\n    await client().addToolApprovalResponse(response)\n    syncResumeState()\n  }\n\n  const cancelQueued = (id: string) => client().cancelQueued(id)\n\n  const resumeInterrupts = async (\n    resumeItems: Array<RunAgentResumeItem>,\n    state?: ChatResumeState,\n  ) => {\n    const result = await client().resumeInterrupts(resumeItems, state)\n    syncResumeState()\n    return result\n  }\n\n  const resolveInterrupts = (\n    resolution:\n      | boolean\n      | ((\n          interrupt: ResolvableChatInterrupt<TTools, TInterrupts>,\n        ) => undefined),\n  ) => {\n    if (typeof resolution === 'boolean') {\n      client().resolveInterrupts(resolution)\n    } else {\n      client().resolveInterrupts(resolution)\n    }\n  }\n\n  const cancelInterrupts = () => {\n    client().cancelInterrupts()\n  }\n\n  const retryInterrupts = () => {\n    client().retryInterrupts()\n  }\n\n  const resumeInterruptsUnsafe = (\n    resumeItems: Array<RunAgentResumeItem>,\n    state?: ChatResumeState,\n  ) => client().resumeInterruptsUnsafe(resumeItems, state)\n\n  const interrupts = () => interruptState().interrupts\n  const pendingInterrupts = () => interruptState().pendingInterrupts\n  const interruptErrors = () => interruptState().interruptErrors\n  const resuming = () => interruptState().resuming\n\n  // The \"active\" structured-output part is on the assistant message after\n  // the latest user message. When no user message exists yet, return null\n  // rather than scanning history — otherwise a stale `final` from\n  // `initialMessages` would leak into the value on first render.\n  const activeStructuredPart = createMemo<StructuredOutputPart | null>(() => {\n    const list = messages()\n    let lastUserIndex = -1\n    for (let i = list.length - 1; i >= 0; i--) {\n      if (list[i]?.role === 'user') {\n        lastUserIndex = i\n        break\n      }\n    }\n    if (lastUserIndex === -1) return null\n    for (let i = list.length - 1; i > lastUserIndex; i--) {\n      const m = list[i]\n      if (m?.role !== 'assistant') continue\n      const part = m.parts.find(\n        (p): p is StructuredOutputPart => p.type === 'structured-output',\n      )\n      if (part) return part\n    }\n    return null\n  })\n\n  const partial = createMemo<Partial>(() => {\n    const part = activeStructuredPart()\n    if (!part) return {} as Partial\n    const v = part.partial ?? part.data\n    return (v ?? {}) as Partial\n  })\n\n  const final = createMemo<Final | null>(() => {\n    const part = activeStructuredPart()\n    if (!part || part.status !== 'complete') return null\n    return part.data as Final\n  })\n\n  // partial / final are runtime-tracked unconditionally; the conditional\n  // return type hides them when no `outputSchema` is supplied.\n  // oxlint-disable-next-line eslint-js/no-restricted-syntax -- primitive return shape diverges from generic UseChatReturn<TTools, TSchema>; TS can't structurally narrow the conditional partial/final fields\n  return {\n    messages,\n    queue,\n    sendMessage,\n    append,\n    reload,\n    stop,\n    isLoading,\n    error,\n    status,\n    isSubscribed,\n    connectionStatus,\n    sessionGenerating,\n    setMessages: setMessagesManually,\n    clear,\n    addToolResult,\n    addToolApprovalResponse,\n    cancelQueued,\n    runId,\n    interrupts,\n    pendingInterrupts,\n    interruptErrors,\n    resuming,\n    resolveInterrupts,\n    cancelInterrupts,\n    retryInterrupts,\n    resumeInterruptsUnsafe,\n    resumeInterrupts,\n    partial,\n    final,\n  } as unknown as UseChatReturn<TTools, TSchema, TInterrupts>\n}\n"],"mappings":";;;;;AAuCA,MAAM,mBAAmB,OAAO,OAAO,EAAE,CAAC;AAC1C,MAAM,yBAAyB,OAAO,OAAO,EAAE,CAAC;AAEhD,SAAgB,QAQd,UAKI,EAAE,EACuC;CAI7C,MAAM,SAAS,gBAAgB;CAC/B,MAAM,WAAW,QAAQ,YAAY;CAErC,MAAM,CAAC,UAAU,eAAe,aAC9B,QAAQ,mBAAmB,EAAE,CAC9B;CACD,MAAM,CAAC,WAAW,gBAAgB,aAAa,MAAM;CACrD,MAAM,CAAC,OAAO,YAAY,aAAgC,OAAU;CACpE,MAAM,CAAC,QAAQ,aAAa,aAA8B,QAAQ;CAClE,MAAM,CAAC,cAAc,mBAAmB,aAAa,MAAM;CAC3D,MAAM,CAAC,kBAAkB,uBACvB,aAA+B,eAAe;CAChD,MAAM,CAAC,mBAAmB,wBAAwB,aAAa,MAAM;CACrE,MAAM,CAAC,OAAO,YAAY,aAAmC,EAAE,CAAC;CAChE,MAAM,CAAC,OAAO,YAAY,aAA4B,KAAK;CAC3D,MAAM,CAAC,gBAAgB,qBAAqB,aAE1C;EACA,YAAY;EACZ,mBAAmB;EACnB,iBAAiB;EACjB,UAAU;EACX,CAAC;CAEF,MAAM,wBAAwB;AAC5B,WAAS,QAAQ,CAAC,iBAAiB,CAAC;AACpC,oBAAkB,QAAQ,CAAC,mBAAmB,CAAC;;CAgBjD,MAAM,SAAS,iBAAiB;AAQ9B,SAAO,IAAI,WAA0C;GACnD,uBAAuB;GACvB,GALgB,QAAQ,aACtB,EAAE,YAAY,QAAQ,YAAY,GAClC,EAAE,SAAS,QAAQ,SAAS;GAI9B,GAAI,QAAQ,oBAAoB,UAAa,EAC3C,iBAAiB,QAAQ,iBAC1B;GACD,GAAI,OAAO,QAAQ,aAAa,YAAY,QAAQ,cAChD;IACE,aAAa,QAAQ;IACrB,UAAU,QAAQ;IACnB,GACD,EACE,GAAI,QAAQ,aAAa,UAAa,EACpC,UAAU,QAAQ,UACnB,EACF;GACL,GAAI,QAAQ,0BAA0B,UAAa,EACjD,uBAAuB,QAAQ,uBAChC;GACD,MAAM,QAAQ;GACd,GAAI,QAAQ,mBAAmB,UAAa,EAC1C,gBAAgB,QAAQ,gBACzB;GACD,GAAI,QAAQ,SAAS,UAAa,EAAE,MAAM,QAAQ,MAAM;GACxD,oBAAoB,QAAQ,gBAAgB;GAC5C,GAAI,QAAQ,YAAY,UAAa,EAAE,SAAS,QAAQ,SAAS;GACjE,UAAU;IACR,GAAG,QAAQ;IACX,WAAW;IACX,UAAU;IACV,YAAY,QAAQ,eAAe,eAAe;IACnD;GACD,aAAa,aAAa,QAAQ,aAAa,SAAS;GACxD,UAAU,UAAuB;AAC/B,YAAQ,UAAU,MAAM;;GAE1B,WAAW,YAAY;AACrB,YAAQ,WAAW,QAAQ;;GAE7B,UAAU,QAAQ;AAChB,YAAQ,UAAU,IAAI;;GAExB,OAAO,QAAQ;GACf,GAAI,QAAQ,eAAe,UAAa,EACtC,YAAY,QAAQ,YACrB;GACD,gBAAgB,WAAW,MAAM,YAC/B,QAAQ,gBAAgB,WAAW,MAAM,QAAQ;GACnD,GAAI,QAAQ,oBAAoB,UAAa,EAC3C,iBAAiB,QAAQ,iBAC1B;GACD,mBAAmB,gBAA0C;AAC3D,gBAAY,YAAY;;GAE1B,kBAAkB,iBAA0B;AAC1C,iBAAa,aAAa;AAC1B,qBAAiB;;GAEnB,iBAAiB,cAA+B;AAC9C,cAAU,UAAU;;GAEtB,gBAAgB,aAAgC;AAC9C,aAAS,SAAS;;GAEpB,uBAAuB,qBAA8B;AACnD,oBAAgB,iBAAiB;;GAEnC,2BAA2B,eAAiC;AAC1D,wBAAoB,WAAW;;GAEjC,4BAA4B,iBAA0B;AACpD,yBAAqB,aAAa;;GAEpC,GAAI,QAAQ,UAAU,UAAa,EAAE,OAAO,QAAQ,OAAO;GAC3D,gBAAgB,cAAoC;AAClD,aAAS,UAAU;;GAErB,gBAAgB,cAAc;AAC5B,aAAS,UAAU;;GAErB,sBAAsB,kBAAkB,0BAA0B;AAChE,uBAAmB,aAAa;KAC9B,GAAG;KACH,YAAY;KACZ,mBAAmB;KACpB,EAAE;;GAEL,yBAAyB,oBAAoB,YAAY;AACvD,sBAAkB,mBAAmB;AACrC,YAAQ,yBAAyB,oBAAoB,QAAQ;;GAEhE,CAAC;IAGD,CAAC,SAAS,CAAC;AAEd,aAAY,QAAQ,CAAC,aAAa,CAAC;AACnC,kBAAiB;AAKjB,oBAAmB;AAGjB,UAAQ,CAAC,cAAc;GACrB,GAAI,QAAQ,SAAS,UAAa,EAAE,MAAM,QAAQ,MAAM;GACxD,GAAI,QAAQ,mBAAmB,UAAa,EAC1C,gBAAgB,QAAQ,gBACzB;GACD,SAAS,QAAQ;GACjB,GAAI,QAAQ,UAAU,UAAa,EAAE,OAAO,QAAQ,OAAO;GAC5D,CAAC;GACF;AAGF,KAAI,QAAQ,KACV,SAAQ,CAAC,WAAW;KAEpB,SAAQ,CAAC,aAAa;AAGxB,oBAAmB;AACjB,MAAI,QAAQ,KACV,SAAQ,CAAC,WAAW;MAEpB,SAAQ,CAAC,aAAa;GAExB;AAEF,eAAc;AAKZ,UAAQ,CAAC,QAAQ;AACjB,UAAQ,CAAC,eAAe;AAIxB,mBAAiB;GACjB;AAGF,iBAAgB;AAId,UAAQ,CAAC,QAAQ;AACjB,MAAI,QAAQ,KACV,SAAQ,CAAC,aAAa;MAEtB,SAAQ,CAAC,MAAM;AAEjB,UAAQ,CAAC,SAAS;GAClB;CAKF,MAAM,cAAc,OAClB,SACA,gBACG;AACH,MAAI;AACF,SAAM,QAAQ,CAAC,YAAY,SAAS,QAAW,YAAY;YACnD;AACR,oBAAiB;;;CAIrB,MAAM,SAAS,OAAO,YAA8C;AAClE,MAAI;AACF,SAAM,QAAQ,CAAC,OAAO,QAAQ;YACtB;AACR,oBAAiB;;;CAIrB,MAAM,SAAS,YAAY;AACzB,MAAI;AACF,SAAM,QAAQ,CAAC,QAAQ;YACf;AACR,oBAAiB;;;CAIrB,MAAM,aAAa;AACjB,UAAQ,CAAC,MAAM;;CAGjB,MAAM,cAAc;AAClB,UAAQ,CAAC,OAAO;AAChB,mBAAiB;;CAGnB,MAAM,uBAAuB,gBAA0C;AACrE,UAAQ,CAAC,oBAAoB,YAAY;;CAG3C,MAAM,gBAAgB,OAAO,WAMvB;AACJ,QAAM,QAAQ,CAAC,cAAc,OAAO;;CAGtC,MAAM,0BAA0B,OAAO,aAGjC;AACJ,QAAM,QAAQ,CAAC,wBAAwB,SAAS;AAChD,mBAAiB;;CAGnB,MAAM,gBAAgB,OAAe,QAAQ,CAAC,aAAa,GAAG;CAE9D,MAAM,mBAAmB,OACvB,aACA,UACG;EACH,MAAM,SAAS,MAAM,QAAQ,CAAC,iBAAiB,aAAa,MAAM;AAClE,mBAAiB;AACjB,SAAO;;CAGT,MAAM,qBACJ,eAKG;AACH,MAAI,OAAO,eAAe,UACxB,SAAQ,CAAC,kBAAkB,WAAW;MAEtC,SAAQ,CAAC,kBAAkB,WAAW;;CAI1C,MAAM,yBAAyB;AAC7B,UAAQ,CAAC,kBAAkB;;CAG7B,MAAM,wBAAwB;AAC5B,UAAQ,CAAC,iBAAiB;;CAG5B,MAAM,0BACJ,aACA,UACG,QAAQ,CAAC,uBAAuB,aAAa,MAAM;CAExD,MAAM,mBAAmB,gBAAgB,CAAC;CAC1C,MAAM,0BAA0B,gBAAgB,CAAC;CACjD,MAAM,wBAAwB,gBAAgB,CAAC;CAC/C,MAAM,iBAAiB,gBAAgB,CAAC;CAMxC,MAAM,uBAAuB,iBAA8C;EACzE,MAAM,OAAO,UAAU;EACvB,IAAI,gBAAgB;AACpB,OAAK,IAAI,IAAI,KAAK,SAAS,GAAG,KAAK,GAAG,IACpC,KAAI,KAAK,IAAI,SAAS,QAAQ;AAC5B,mBAAgB;AAChB;;AAGJ,MAAI,kBAAkB,GAAI,QAAO;AACjC,OAAK,IAAI,IAAI,KAAK,SAAS,GAAG,IAAI,eAAe,KAAK;GACpD,MAAM,IAAI,KAAK;AACf,OAAI,GAAG,SAAS,YAAa;GAC7B,MAAM,OAAO,EAAE,MAAM,MAClB,MAAiC,EAAE,SAAS,oBAC9C;AACD,OAAI,KAAM,QAAO;;AAEnB,SAAO;GACP;AAkBF,QAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,aAAa;EACb;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SA5Cc,iBAA0B;GACxC,MAAM,OAAO,sBAAsB;AACnC,OAAI,CAAC,KAAM,QAAO,EAAE;AAEpB,UADU,KAAK,WAAW,KAAK,QAClB,EAAE;IACf;EAwCA,OAtCY,iBAA+B;GAC3C,MAAM,OAAO,sBAAsB;AACnC,OAAI,CAAC,QAAQ,KAAK,WAAW,WAAY,QAAO;AAChD,UAAO,KAAK;IACZ;EAmCD"}
+{"version":3,"file":"use-chat.js","names":[],"sources":["../src/use-chat.ts"],"sourcesContent":["import {\n  createEffect,\n  createMemo,\n  createSignal,\n  createUniqueId,\n  onCleanup,\n  onMount,\n} from 'solid-js'\n\nimport { ChatClient } from '@tanstack/ai-client'\nimport { createChatDevtoolsBridge } from '@tanstack/ai-client/devtools'\nimport type {\n  ChatClientState,\n  ResolvableChatInterrupt,\n  ChatInterruptState,\n  ChatResumeState,\n  ConnectionStatus,\n  InferredClientContext,\n  QueuedMessage,\n  SendMessageOptions,\n  StructuredOutputPart,\n} from '@tanstack/ai-client'\nimport type {\n  AnyClientTool,\n  InterruptDefinition,\n  InferSchemaType,\n  ModelMessage,\n  RunAgentResumeItem,\n  SchemaInput,\n  StreamChunk,\n} from '@tanstack/ai'\nimport type {\n  DeepPartial,\n  MultimodalContent,\n  UIMessage,\n  UseChatOptions,\n  UseChatReturn,\n} from './types'\n\nconst EMPTY_INTERRUPTS = Object.freeze([])\nconst EMPTY_INTERRUPT_ERRORS = Object.freeze([])\n\nexport function useChat<\n  const TTools extends ReadonlyArray<AnyClientTool> = any,\n  TSchema extends SchemaInput | undefined = undefined,\n  TContext = InferredClientContext<TTools>,\n  const TInterrupts extends ReadonlyArray<\n    InterruptDefinition<any, any, any, any>\n  > = readonly [],\n>(\n  options: UseChatOptions<\n    TTools,\n    TSchema,\n    TContext,\n    TInterrupts\n  > = {} as UseChatOptions<TTools, TSchema, TContext, TInterrupts>,\n): UseChatReturn<TTools, TSchema, TInterrupts> {\n  // The hook's identity is its `threadId`. Reload with the same `threadId`\n  // restores the same conversation. `hookId` is only a recreation key when no\n  // `threadId` is given. It is never sent on the wire.\n  const hookId = createUniqueId()\n  const clientId = options.threadId ?? hookId\n\n  const [messages, setMessages] = createSignal<Array<UIMessage<TTools>>>(\n    options.initialMessages || [],\n  )\n  const [isLoading, setIsLoading] = createSignal(false)\n  const [hasOlderMessages, setHasOlderMessages] = createSignal(false)\n  const [error, setError] = createSignal<Error | undefined>(undefined)\n  const [status, setStatus] = createSignal<ChatClientState>('ready')\n  const [isSubscribed, setIsSubscribed] = createSignal(false)\n  const [connectionStatus, setConnectionStatus] =\n    createSignal<ConnectionStatus>('disconnected')\n  const [sessionGenerating, setSessionGenerating] = createSignal(false)\n  const [queue, setQueue] = createSignal<Array<QueuedMessage>>([])\n  const [runId, setRunId] = createSignal<string | null>(null)\n  const [interruptState, setInterruptState] = createSignal<\n    ChatInterruptState<TTools, TInterrupts>\n  >({\n    interrupts: EMPTY_INTERRUPTS,\n    pendingInterrupts: EMPTY_INTERRUPTS,\n    interruptErrors: EMPTY_INTERRUPT_ERRORS,\n    resuming: false,\n  })\n\n  const syncResumeState = () => {\n    setRunId(client().getCurrentRunId())\n    setInterruptState(client().getInterruptState())\n  }\n\n  // Structured-output `partial` / `final` are derived from `messages` —\n  // specifically from the structured-output part on the latest assistant\n  // message (the one after the most recent user message). Per-turn parts\n  // keep history coherent without a separate reset signal.\n  type Partial = DeepPartial<InferSchemaType<NonNullable<TSchema>>>\n  type Final = InferSchemaType<NonNullable<TSchema>>\n\n  // Create ChatClient instance with callbacks to sync state.\n  // Every user-provided callback is wrapped so the LATEST `options.xxx` value\n  // is read at call time. Direct assignment would freeze the callback to the\n  // reference we saw at creation; the wrapper lets reactive `options` or\n  // in-place mutations propagate. When the user clears a callback (sets it to\n  // undefined), `?.` no-ops.\n  const client = createMemo(() => {\n    // Build options with conditional spreads for fields whose source\n    // type is `T | undefined` but the ChatClient target uses a strict\n    // optional (`field?: T`) — `exactOptionalPropertyTypes` rejects\n    // assigning `undefined` to those, so we omit the key when absent.\n    const transport = options.connection\n      ? { connection: options.connection }\n      : { fetcher: options.fetcher }\n    const instance = new ChatClient<TTools, TContext, TInterrupts>({\n      devtoolsBridgeFactory: createChatDevtoolsBridge,\n      ...transport,\n      ...(options.initialMessages !== undefined && {\n        initialMessages: options.initialMessages,\n      }),\n      ...(typeof options.threadId === 'string' && options.persistence === true\n        ? {\n            persistence: true,\n            threadId: options.threadId,\n            ...(options.history !== undefined && {\n              history: options.history,\n            }),\n          }\n        : typeof options.threadId === 'string' && options.persistence\n          ? {\n              persistence: options.persistence,\n              threadId: options.threadId,\n            }\n          : {\n              ...(options.threadId !== undefined && {\n                threadId: options.threadId,\n              }),\n            }),\n      ...(options.initialResumeSnapshot !== undefined && {\n        initialResumeSnapshot: options.initialResumeSnapshot,\n      }),\n      body: options.body,\n      ...(options.forwardedProps !== undefined && {\n        forwardedProps: options.forwardedProps,\n      }),\n      ...(options.byok !== undefined && { byok: options.byok }),\n      byokProvider: () => options.byokProvider?.(),\n      ...(options.context !== undefined && { context: options.context }),\n      devtools: {\n        ...options.devtools,\n        framework: 'solid',\n        hookName: 'useChat',\n        outputKind: options.outputSchema ? 'structured' : 'chat',\n      },\n      onResponse: (response) => options.onResponse?.(response),\n      onChunk: (chunk: StreamChunk) => {\n        options.onChunk?.(chunk)\n      },\n      onFinish: (message) => {\n        options.onFinish?.(message)\n      },\n      onError: (err) => {\n        options.onError?.(err)\n      },\n      tools: options.tools,\n      ...(options.interrupts !== undefined && {\n        interrupts: options.interrupts,\n      }),\n      onCustomEvent: (eventType, data, context) =>\n        options.onCustomEvent?.(eventType, data, context),\n      ...(options.streamProcessor !== undefined && {\n        streamProcessor: options.streamProcessor,\n      }),\n      onMessagesChange: (newMessages: Array<UIMessage<TTools>>) => {\n        setMessages(newMessages)\n        setHasOlderMessages(instance.getHasOlderMessages())\n      },\n      onLoadingChange: (newIsLoading: boolean) => {\n        setIsLoading(newIsLoading)\n        syncResumeState()\n      },\n      onStatusChange: (newStatus: ChatClientState) => {\n        setStatus(newStatus)\n      },\n      onErrorChange: (newError: Error | undefined) => {\n        setError(newError)\n      },\n      onSubscriptionChange: (nextIsSubscribed: boolean) => {\n        setIsSubscribed(nextIsSubscribed)\n      },\n      onConnectionStatusChange: (nextStatus: ConnectionStatus) => {\n        setConnectionStatus(nextStatus)\n      },\n      onSessionGeneratingChange: (isGenerating: boolean) => {\n        setSessionGenerating(isGenerating)\n      },\n      ...(options.queue !== undefined && { queue: options.queue }),\n      onQueueChange: (nextQueue: Array<QueuedMessage>) => {\n        setQueue(nextQueue)\n      },\n      onRunIdChange: (nextRunId) => {\n        setRunId(nextRunId)\n      },\n      onResumeStateChange: (_nextResumeState, nextPendingInterrupts) => {\n        setInterruptState((current) => ({\n          ...current,\n          interrupts: nextPendingInterrupts,\n          pendingInterrupts: nextPendingInterrupts,\n        }))\n      },\n      onInterruptStateChange: (nextInterruptState, context) => {\n        setInterruptState(nextInterruptState)\n        options.onInterruptStateChange?.(nextInterruptState, context)\n      },\n    })\n    // Only recreate when clientId changes\n    // Connection and other options are captured at creation time\n    return instance\n  }, [clientId])\n\n  setMessages(client().getMessages())\n  setHasOlderMessages(client().getHasOlderMessages())\n  syncResumeState()\n\n  // Sync body / forwardedProps changes to the client.\n  // Both populate the same wire payload; `forwardedProps` is preferred\n  // and `body` is deprecated but still supported.\n  createEffect(() => {\n    // Conditional spread: `updateOptions` declares strict-optional\n    // fields and rejects explicit `undefined` under EOPT.\n    client().updateOptions({\n      ...(options.body !== undefined && { body: options.body }),\n      ...(options.forwardedProps !== undefined && {\n        forwardedProps: options.forwardedProps,\n      }),\n      context: options.context,\n      ...(options.queue !== undefined && { queue: options.queue }),\n    })\n  })\n\n  // Apply initial live mode immediately on hook creation.\n  if (options.live) {\n    client().subscribe()\n  } else {\n    client().unsubscribe()\n  }\n\n  createEffect(() => {\n    if (options.live) {\n      client().subscribe()\n    } else {\n      client().unsubscribe()\n    }\n  })\n\n  onMount(() => {\n    // START TAILING HERE, not in the constructor. A client is idle until a view\n    // attaches it, so a client that gets built and thrown away never opens a\n    // connection — an unreachable stream would hold one of the browser's ~6\n    // connections per origin until the page reloaded.\n    client().attach()\n    client().mountDevtools()\n    // Delivery-durability resume is transparent: the resumable SSE connection\n    // adapter reattaches via the browser's native Last-Event-ID on reconnect.\n    // We only seed interrupt (state) resume from the client here.\n    syncResumeState()\n  })\n\n  // Cleanup on unmount: stop any in-flight requests.\n  onCleanup(() => {\n    // Release the connection first: `detach` is the counterpart of the `attach`\n    // above, and it keeps the transcript and resume pointer so a later mount can\n    // pick the run back up from the durable log.\n    client().detach()\n    if (options.live) {\n      client().unsubscribe()\n    } else {\n      client().stop()\n    }\n    client().dispose()\n  })\n\n  // Callback options are read through `options.xxx` at call time, so reactive\n  // or mutated options propagate without recreating the client.\n\n  const sendMessage = async (\n    content: string | MultimodalContent,\n    sendOptions?: SendMessageOptions,\n  ) => {\n    try {\n      await client().sendMessage(content, undefined, sendOptions)\n    } finally {\n      syncResumeState()\n    }\n  }\n\n  const append = async (message: ModelMessage | UIMessage<TTools>) => {\n    try {\n      await client().append(message)\n    } finally {\n      syncResumeState()\n    }\n  }\n\n  const reload = async () => {\n    try {\n      await client().reload()\n    } finally {\n      syncResumeState()\n    }\n  }\n\n  const loadOlderMessages = async () => {\n    await client().loadOlderMessages()\n    setHasOlderMessages(client().getHasOlderMessages())\n  }\n\n  const stop = () => {\n    client().stop()\n  }\n\n  const clear = () => {\n    client().clear()\n    syncResumeState()\n  }\n\n  const setMessagesManually = (newMessages: Array<UIMessage<TTools>>) => {\n    client().setMessagesManually(newMessages)\n  }\n\n  const addToolResult = async (result: {\n    toolCallId: string\n    tool: string\n    output: any\n    state?: 'output-available' | 'output-error'\n    errorText?: string\n  }) => {\n    await client().addToolResult(result)\n  }\n\n  const addToolApprovalResponse = async (response: {\n    id: string\n    approved: boolean\n  }) => {\n    await client().addToolApprovalResponse(response)\n    syncResumeState()\n  }\n\n  const cancelQueued = (id: string) => client().cancelQueued(id)\n\n  const resumeInterrupts = async (\n    resumeItems: Array<RunAgentResumeItem>,\n    state?: ChatResumeState,\n  ) => {\n    const result = await client().resumeInterrupts(resumeItems, state)\n    syncResumeState()\n    return result\n  }\n\n  const resolveInterrupts = (\n    resolution:\n      | boolean\n      | ((\n          interrupt: ResolvableChatInterrupt<TTools, TInterrupts>,\n        ) => undefined),\n  ) => {\n    if (typeof resolution === 'boolean') {\n      client().resolveInterrupts(resolution)\n    } else {\n      client().resolveInterrupts(resolution)\n    }\n  }\n\n  const cancelInterrupts = () => {\n    client().cancelInterrupts()\n  }\n\n  const retryInterrupts = () => {\n    client().retryInterrupts()\n  }\n\n  const resumeInterruptsUnsafe = (\n    resumeItems: Array<RunAgentResumeItem>,\n    state?: ChatResumeState,\n  ) => client().resumeInterruptsUnsafe(resumeItems, state)\n\n  const interrupts = () => interruptState().interrupts\n  const pendingInterrupts = () => interruptState().pendingInterrupts\n  const interruptErrors = () => interruptState().interruptErrors\n  const resuming = () => interruptState().resuming\n\n  // The \"active\" structured-output part is on the assistant message after\n  // the latest user message. When no user message exists yet, return null\n  // rather than scanning history — otherwise a stale `final` from\n  // `initialMessages` would leak into the value on first render.\n  const activeStructuredPart = createMemo<StructuredOutputPart | null>(() => {\n    const list = messages()\n    let lastUserIndex = -1\n    for (let i = list.length - 1; i >= 0; i--) {\n      if (list[i]?.role === 'user') {\n        lastUserIndex = i\n        break\n      }\n    }\n    if (lastUserIndex === -1) return null\n    for (let i = list.length - 1; i > lastUserIndex; i--) {\n      const m = list[i]\n      if (m?.role !== 'assistant') continue\n      const part = m.parts.find(\n        (p): p is StructuredOutputPart => p.type === 'structured-output',\n      )\n      if (part) return part\n    }\n    return null\n  })\n\n  const partial = createMemo<Partial>(() => {\n    const part = activeStructuredPart()\n    if (!part) return {} as Partial\n    const v = part.partial ?? part.data\n    return (v ?? {}) as Partial\n  })\n\n  const final = createMemo<Final | null>(() => {\n    const part = activeStructuredPart()\n    if (!part || part.status !== 'complete') return null\n    return part.data as Final\n  })\n\n  // partial / final are runtime-tracked unconditionally; the conditional\n  // return type hides them when no `outputSchema` is supplied.\n  // oxlint-disable-next-line eslint-js/no-restricted-syntax -- primitive return shape diverges from generic UseChatReturn<TTools, TSchema>; TS can't structurally narrow the conditional partial/final fields\n  return {\n    messages,\n    queue,\n    sendMessage,\n    append,\n    reload,\n    stop,\n    isLoading,\n    hasOlderMessages,\n    loadOlderMessages,\n    error,\n    status,\n    isSubscribed,\n    connectionStatus,\n    sessionGenerating,\n    setMessages: setMessagesManually,\n    clear,\n    addToolResult,\n    addToolApprovalResponse,\n    cancelQueued,\n    runId,\n    interrupts,\n    pendingInterrupts,\n    interruptErrors,\n    resuming,\n    resolveInterrupts,\n    cancelInterrupts,\n    retryInterrupts,\n    resumeInterruptsUnsafe,\n    resumeInterrupts,\n    partial,\n    final,\n  } as unknown as UseChatReturn<TTools, TSchema, TInterrupts>\n}\n"],"mappings":";;;;;AAuCA,MAAM,mBAAmB,OAAO,OAAO,EAAE,CAAC;AAC1C,MAAM,yBAAyB,OAAO,OAAO,EAAE,CAAC;AAEhD,SAAgB,QAQd,UAKI,EAAE,EACuC;CAI7C,MAAM,SAAS,gBAAgB;CAC/B,MAAM,WAAW,QAAQ,YAAY;CAErC,MAAM,CAAC,UAAU,eAAe,aAC9B,QAAQ,mBAAmB,EAAE,CAC9B;CACD,MAAM,CAAC,WAAW,gBAAgB,aAAa,MAAM;CACrD,MAAM,CAAC,kBAAkB,uBAAuB,aAAa,MAAM;CACnE,MAAM,CAAC,OAAO,YAAY,aAAgC,OAAU;CACpE,MAAM,CAAC,QAAQ,aAAa,aAA8B,QAAQ;CAClE,MAAM,CAAC,cAAc,mBAAmB,aAAa,MAAM;CAC3D,MAAM,CAAC,kBAAkB,uBACvB,aAA+B,eAAe;CAChD,MAAM,CAAC,mBAAmB,wBAAwB,aAAa,MAAM;CACrE,MAAM,CAAC,OAAO,YAAY,aAAmC,EAAE,CAAC;CAChE,MAAM,CAAC,OAAO,YAAY,aAA4B,KAAK;CAC3D,MAAM,CAAC,gBAAgB,qBAAqB,aAE1C;EACA,YAAY;EACZ,mBAAmB;EACnB,iBAAiB;EACjB,UAAU;EACX,CAAC;CAEF,MAAM,wBAAwB;AAC5B,WAAS,QAAQ,CAAC,iBAAiB,CAAC;AACpC,oBAAkB,QAAQ,CAAC,mBAAmB,CAAC;;CAgBjD,MAAM,SAAS,iBAAiB;EAQ9B,MAAM,WAAW,IAAI,WAA0C;GAC7D,uBAAuB;GACvB,GALgB,QAAQ,aACtB,EAAE,YAAY,QAAQ,YAAY,GAClC,EAAE,SAAS,QAAQ,SAAS;GAI9B,GAAI,QAAQ,oBAAoB,UAAa,EAC3C,iBAAiB,QAAQ,iBAC1B;GACD,GAAI,OAAO,QAAQ,aAAa,YAAY,QAAQ,gBAAgB,OAChE;IACE,aAAa;IACb,UAAU,QAAQ;IAClB,GAAI,QAAQ,YAAY,UAAa,EACnC,SAAS,QAAQ,SAClB;IACF,GACD,OAAO,QAAQ,aAAa,YAAY,QAAQ,cAC9C;IACE,aAAa,QAAQ;IACrB,UAAU,QAAQ;IACnB,GACD,EACE,GAAI,QAAQ,aAAa,UAAa,EACpC,UAAU,QAAQ,UACnB,EACF;GACP,GAAI,QAAQ,0BAA0B,UAAa,EACjD,uBAAuB,QAAQ,uBAChC;GACD,MAAM,QAAQ;GACd,GAAI,QAAQ,mBAAmB,UAAa,EAC1C,gBAAgB,QAAQ,gBACzB;GACD,GAAI,QAAQ,SAAS,UAAa,EAAE,MAAM,QAAQ,MAAM;GACxD,oBAAoB,QAAQ,gBAAgB;GAC5C,GAAI,QAAQ,YAAY,UAAa,EAAE,SAAS,QAAQ,SAAS;GACjE,UAAU;IACR,GAAG,QAAQ;IACX,WAAW;IACX,UAAU;IACV,YAAY,QAAQ,eAAe,eAAe;IACnD;GACD,aAAa,aAAa,QAAQ,aAAa,SAAS;GACxD,UAAU,UAAuB;AAC/B,YAAQ,UAAU,MAAM;;GAE1B,WAAW,YAAY;AACrB,YAAQ,WAAW,QAAQ;;GAE7B,UAAU,QAAQ;AAChB,YAAQ,UAAU,IAAI;;GAExB,OAAO,QAAQ;GACf,GAAI,QAAQ,eAAe,UAAa,EACtC,YAAY,QAAQ,YACrB;GACD,gBAAgB,WAAW,MAAM,YAC/B,QAAQ,gBAAgB,WAAW,MAAM,QAAQ;GACnD,GAAI,QAAQ,oBAAoB,UAAa,EAC3C,iBAAiB,QAAQ,iBAC1B;GACD,mBAAmB,gBAA0C;AAC3D,gBAAY,YAAY;AACxB,wBAAoB,SAAS,qBAAqB,CAAC;;GAErD,kBAAkB,iBAA0B;AAC1C,iBAAa,aAAa;AAC1B,qBAAiB;;GAEnB,iBAAiB,cAA+B;AAC9C,cAAU,UAAU;;GAEtB,gBAAgB,aAAgC;AAC9C,aAAS,SAAS;;GAEpB,uBAAuB,qBAA8B;AACnD,oBAAgB,iBAAiB;;GAEnC,2BAA2B,eAAiC;AAC1D,wBAAoB,WAAW;;GAEjC,4BAA4B,iBAA0B;AACpD,yBAAqB,aAAa;;GAEpC,GAAI,QAAQ,UAAU,UAAa,EAAE,OAAO,QAAQ,OAAO;GAC3D,gBAAgB,cAAoC;AAClD,aAAS,UAAU;;GAErB,gBAAgB,cAAc;AAC5B,aAAS,UAAU;;GAErB,sBAAsB,kBAAkB,0BAA0B;AAChE,uBAAmB,aAAa;KAC9B,GAAG;KACH,YAAY;KACZ,mBAAmB;KACpB,EAAE;;GAEL,yBAAyB,oBAAoB,YAAY;AACvD,sBAAkB,mBAAmB;AACrC,YAAQ,yBAAyB,oBAAoB,QAAQ;;GAEhE,CAAC;AAGF,SAAO;IACN,CAAC,SAAS,CAAC;AAEd,aAAY,QAAQ,CAAC,aAAa,CAAC;AACnC,qBAAoB,QAAQ,CAAC,qBAAqB,CAAC;AACnD,kBAAiB;AAKjB,oBAAmB;AAGjB,UAAQ,CAAC,cAAc;GACrB,GAAI,QAAQ,SAAS,UAAa,EAAE,MAAM,QAAQ,MAAM;GACxD,GAAI,QAAQ,mBAAmB,UAAa,EAC1C,gBAAgB,QAAQ,gBACzB;GACD,SAAS,QAAQ;GACjB,GAAI,QAAQ,UAAU,UAAa,EAAE,OAAO,QAAQ,OAAO;GAC5D,CAAC;GACF;AAGF,KAAI,QAAQ,KACV,SAAQ,CAAC,WAAW;KAEpB,SAAQ,CAAC,aAAa;AAGxB,oBAAmB;AACjB,MAAI,QAAQ,KACV,SAAQ,CAAC,WAAW;MAEpB,SAAQ,CAAC,aAAa;GAExB;AAEF,eAAc;AAKZ,UAAQ,CAAC,QAAQ;AACjB,UAAQ,CAAC,eAAe;AAIxB,mBAAiB;GACjB;AAGF,iBAAgB;AAId,UAAQ,CAAC,QAAQ;AACjB,MAAI,QAAQ,KACV,SAAQ,CAAC,aAAa;MAEtB,SAAQ,CAAC,MAAM;AAEjB,UAAQ,CAAC,SAAS;GAClB;CAKF,MAAM,cAAc,OAClB,SACA,gBACG;AACH,MAAI;AACF,SAAM,QAAQ,CAAC,YAAY,SAAS,QAAW,YAAY;YACnD;AACR,oBAAiB;;;CAIrB,MAAM,SAAS,OAAO,YAA8C;AAClE,MAAI;AACF,SAAM,QAAQ,CAAC,OAAO,QAAQ;YACtB;AACR,oBAAiB;;;CAIrB,MAAM,SAAS,YAAY;AACzB,MAAI;AACF,SAAM,QAAQ,CAAC,QAAQ;YACf;AACR,oBAAiB;;;CAIrB,MAAM,oBAAoB,YAAY;AACpC,QAAM,QAAQ,CAAC,mBAAmB;AAClC,sBAAoB,QAAQ,CAAC,qBAAqB,CAAC;;CAGrD,MAAM,aAAa;AACjB,UAAQ,CAAC,MAAM;;CAGjB,MAAM,cAAc;AAClB,UAAQ,CAAC,OAAO;AAChB,mBAAiB;;CAGnB,MAAM,uBAAuB,gBAA0C;AACrE,UAAQ,CAAC,oBAAoB,YAAY;;CAG3C,MAAM,gBAAgB,OAAO,WAMvB;AACJ,QAAM,QAAQ,CAAC,cAAc,OAAO;;CAGtC,MAAM,0BAA0B,OAAO,aAGjC;AACJ,QAAM,QAAQ,CAAC,wBAAwB,SAAS;AAChD,mBAAiB;;CAGnB,MAAM,gBAAgB,OAAe,QAAQ,CAAC,aAAa,GAAG;CAE9D,MAAM,mBAAmB,OACvB,aACA,UACG;EACH,MAAM,SAAS,MAAM,QAAQ,CAAC,iBAAiB,aAAa,MAAM;AAClE,mBAAiB;AACjB,SAAO;;CAGT,MAAM,qBACJ,eAKG;AACH,MAAI,OAAO,eAAe,UACxB,SAAQ,CAAC,kBAAkB,WAAW;MAEtC,SAAQ,CAAC,kBAAkB,WAAW;;CAI1C,MAAM,yBAAyB;AAC7B,UAAQ,CAAC,kBAAkB;;CAG7B,MAAM,wBAAwB;AAC5B,UAAQ,CAAC,iBAAiB;;CAG5B,MAAM,0BACJ,aACA,UACG,QAAQ,CAAC,uBAAuB,aAAa,MAAM;CAExD,MAAM,mBAAmB,gBAAgB,CAAC;CAC1C,MAAM,0BAA0B,gBAAgB,CAAC;CACjD,MAAM,wBAAwB,gBAAgB,CAAC;CAC/C,MAAM,iBAAiB,gBAAgB,CAAC;CAMxC,MAAM,uBAAuB,iBAA8C;EACzE,MAAM,OAAO,UAAU;EACvB,IAAI,gBAAgB;AACpB,OAAK,IAAI,IAAI,KAAK,SAAS,GAAG,KAAK,GAAG,IACpC,KAAI,KAAK,IAAI,SAAS,QAAQ;AAC5B,mBAAgB;AAChB;;AAGJ,MAAI,kBAAkB,GAAI,QAAO;AACjC,OAAK,IAAI,IAAI,KAAK,SAAS,GAAG,IAAI,eAAe,KAAK;GACpD,MAAM,IAAI,KAAK;AACf,OAAI,GAAG,SAAS,YAAa;GAC7B,MAAM,OAAO,EAAE,MAAM,MAClB,MAAiC,EAAE,SAAS,oBAC9C;AACD,OAAI,KAAM,QAAO;;AAEnB,SAAO;GACP;AAkBF,QAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,aAAa;EACb;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SA9Cc,iBAA0B;GACxC,MAAM,OAAO,sBAAsB;AACnC,OAAI,CAAC,KAAM,QAAO,EAAE;AAEpB,UADU,KAAK,WAAW,KAAK,QAClB,EAAE;IACf;EA0CA,OAxCY,iBAA+B;GAC3C,MAAM,OAAO,sBAAsB;AACnC,OAAI,CAAC,QAAQ,KAAK,WAAW,WAAY,QAAO;AAChD,UAAO,KAAK;IACZ;EAqCD"}

package/dist/use-generate-video.d.ts

@@ -1,7 +1,7 @@
 import { Accessor } from "solid-js";
 import { AIDevtoolsDisplayOptions, ConnectConnectionAdapter, GenerationClientState, GenerationFetcher, GenerationPersistenceOptions, InferGenerationOutputFromReturn, VideoGenerateInput, VideoGenerateResult, VideoStatusInfo } from "@tanstack/ai-client";
-import { StreamChunk } from "@tanstack/ai";
 import { ByokClient } from "@tanstack/ai-client/byok";
+import { StreamChunk } from "@tanstack/ai";
 import { ProviderId } from "@tanstack/ai/byok";
 
 //#region src/use-generate-video.d.ts

package/dist/use-generation.d.ts

@@ -1,7 +1,7 @@
 import { Accessor } from "solid-js";
 import { AIDevtoolsDisplayOptions, ConnectConnectionAdapter, GenerationClientState, GenerationFetcher, GenerationPersistenceOptions, GenerationRestoredResult, InferGenerationOutputFromReturn } from "@tanstack/ai-client";
-import { StreamChunk } from "@tanstack/ai";
 import { ByokClient } from "@tanstack/ai-client/byok";
+import { StreamChunk } from "@tanstack/ai";
 import { ProviderId } from "@tanstack/ai/byok";
 
 //#region src/use-generation.d.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/ai-solid",
-  "version": "0.21.1",
+  "version": "0.24.0",
   "description": "Solid hooks for TanStack AI streaming chat, structured outputs, and media generation.",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -29,6 +29,10 @@
       "solid": "./src/ui.ts",
       "types": "./src/ui.ts",
       "import": "./src/ui.ts"
+    },
+    "./byok": {
+      "types": "./dist/byok.d.ts",
+      "import": "./dist/byok.js"
     }
   },
   "files": [
@@ -50,16 +54,12 @@
     "media-generation"
   ],
   "dependencies": {
-    "rehype-highlight": "^7.0.2",
-    "rehype-raw": "^7.0.0",
-    "rehype-sanitize": "^6.0.0",
-    "remark-gfm": "^4.0.1",
-    "solid-markdown": "^2.1.0",
-    "@tanstack/ai-client": "^0.31.1"
+    "@tanstack/markdown": "^0.0.13",
+    "@tanstack/ai-client": "^0.32.1"
   },
   "peerDependencies": {
     "solid-js": ">=1.9.10",
-    "@tanstack/ai": "^0.54.0"
+    "@tanstack/ai": "^0.55.0"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",
@@ -73,7 +73,7 @@
     "vite": "^8.2.1",
     "vite-plugin-solid": "^2.11.14",
     "vitest": "^4.1.10",
-    "@tanstack/ai": "0.54.0"
+    "@tanstack/ai": "0.55.0"
   },
   "scripts": {
     "clean": "premove ./build ./dist",

package/src/byok.ts

@@ -0,0 +1,25 @@
+export {
+  ByokClient,
+  EMPTY_BYOK_SNAPSHOT,
+  decryptKeyring,
+  defaultByokStorage,
+  defineByok,
+  defineByokProvider,
+  deriveAesKey,
+  encryptKeyring,
+  isPasskeyStorageSupported,
+  memoryStorage,
+  passkeyStorage,
+} from '@tanstack/ai-client/byok'
+export type {
+  ByokPrompt,
+  ByokProvider,
+  ByokProviderInit,
+  ByokSnapshot,
+  DefineByokOptions,
+  KeyPreview,
+  KeyStatus,
+  Keyring,
+  KeyringStorage,
+  PasskeyStorageOptions,
+} from '@tanstack/ai-client/byok'

package/src/chat-ui/text-part.tsx

@@ -1,7 +1,10 @@
-import { SolidMarkdown } from 'solid-markdown'
-import { resolveMarkdownPlugins } from './markdown-plugins'
-import type { SolidMarkdownComponents } from 'solid-markdown'
-import type { PluggableList } from './markdown-plugins'
+import { renderHtml } from '@tanstack/markdown/html'
+import { streamingMarkdownExtension } from '@tanstack/markdown/extensions/streaming'
+import type { CodeHighlighter, MarkdownExtension } from '@tanstack/markdown'
+
+const DEFAULT_EXTENSIONS: Array<MarkdownExtension> = [
+  streamingMarkdownExtension(),
+]
 
 export interface TextPartProps {
   /** The text content to render */
@@ -14,30 +17,30 @@ export interface TextPartProps {
   userClass?: string
   /** Additional class for assistant messages (also used for system messages) */
   assistantClass?: string
-  /** Additional remark plugins, appended after the defaults. */
-  remarkPlugins?: PluggableList
   /**
-   * Additional rehype plugins. Inserted before the trailing
-   * `rehypeSanitize` so sanitization always runs last.
+   * Additional TanStack Markdown extensions, appended after the built-in
+   * streaming extension.
    */
-  rehypePlugins?: PluggableList
-  /** solid-markdown `components` overrides. */
-  components?: SolidMarkdownComponents
+  extensions?: Array<MarkdownExtension>
   /**
-   * Drop the built-in plugin defaults entirely. Disables the XSS
-   * sanitizer; the caller becomes responsible for sanitization.
+   * Synchronous code highlighter. Its output is inserted as trusted HTML,
+   * so use only a highlighter that escapes source text (for example
+   * `createTanStackMarkdownHighlighter` from `@tanstack/highlight/markdown`).
    */
-  disableDefaultPlugins?: boolean
+  highlighter?: CodeHighlighter
 }
 
 /**
- * TextPart component - renders markdown text with syntax highlighting.
+ * TextPart component - renders markdown text with TanStack Markdown.
+ *
+ * Raw HTML is escaped and executable URLs are removed, so AI output can be
+ * rendered without a separate sanitizer.
  *
- * @example Add a markdown plugin (e.g. CJK bold/emphasis support)
+ * @example Syntax highlighting
  * ```tsx
- * import remarkCjkFriendly from 'remark-cjk-friendly'
+ * import { highlightMarkdownCode } from './markdown-highlighter'
  *
- * <TextPart content={content} remarkPlugins={[remarkCjkFriendly]} />
+ * <TextPart content={content} highlighter={highlightMarkdownCode} />
  * ```
  */
 export function TextPart(props: TextPartProps) {
@@ -50,22 +53,16 @@ export function TextPart(props: TextPartProps) {
   const combinedClass = () =>
     [props.class ?? '', roleClass()].filter(Boolean).join(' ')
 
-  const resolved = () =>
-    resolveMarkdownPlugins({
-      remarkPlugins: props.remarkPlugins,
-      rehypePlugins: props.rehypePlugins,
-      disableDefaultPlugins: props.disableDefaultPlugins,
+  // TanStack Markdown escapes this HTML string.
+  const html = () =>
+    renderHtml(props.content, {
+      extensions: props.extensions
+        ? [...DEFAULT_EXTENSIONS, ...props.extensions]
+        : DEFAULT_EXTENSIONS,
+      frontmatter: false,
+      headingIds: false,
+      highlighter: props.highlighter,
     })
 
-  return (
-    <div class={combinedClass() || undefined}>
-      <SolidMarkdown
-        remarkPlugins={resolved().remarkPlugins}
-        rehypePlugins={resolved().rehypePlugins}
-        components={props.components}
-      >
-        {props.content}
-      </SolidMarkdown>
-    </div>
-  )
+  return <div class={combinedClass() || undefined} innerHTML={html()} />
 }

package/src/index.ts

@@ -65,6 +65,43 @@ export type {
 
 // Re-export from ai-client for convenience
 export {
+  AudioRecorder,
+  ChatClient,
+  InterruptManager,
+  RealtimeClient,
+  GenerationClient,
+  VideoGenerationClient,
+  GENERATION_EVENTS,
+  reconstructImageResult,
+  reconstructAudioResult,
+  reconstructSpeechResult,
+  reconstructTranscriptionResult,
+  reconstructSummarizeResult,
+  UnsupportedResponseStreamError,
+  createAIDevtoolsGenerationPreview,
+  StreamTruncatedError,
+  DurableStreamIncompleteError,
+  StreamReconnectLimitError,
+  uiMessageToModelMessages,
+  modelMessageToUIMessage,
+  modelMessagesToUIMessages,
+  convertMessagesToModelMessages,
+  normalizeToUIMessage,
+  generateMessageId,
+  StreamProcessor,
+  ImmediateStrategy,
+  PunctuationStrategy,
+  BatchStrategy,
+  WordBoundaryStrategy,
+  CompositeStrategy,
+  parsePartialJSON,
+  PartialJSONParser,
+  defaultJSONParser,
+  registerWebMCPTools,
+  clientTools,
+  createMcpAppBridge,
+  type McpAppBridge,
+  type CreateMcpAppBridgeOptions,
   fetchServerSentEvents,
   localStoragePersistence,
   sessionStoragePersistence,

package/src/types.ts

@@ -251,6 +251,16 @@ interface BaseUseChatReturn<
    */
   isLoading: Accessor<boolean>
 
+  /**
+   * True when the last hydrate or older-page response said more messages exist.
+   */
+  hasOlderMessages: Accessor<boolean>
+
+  /**
+   * Fetch the next older window and put it in front of the painted messages.
+   */
+  loadOlderMessages: () => Promise<void>
+
   /**
    * Current error, if any
    */

package/src/use-chat.ts

@@ -65,6 +65,7 @@ export function useChat<
     options.initialMessages || [],
   )
   const [isLoading, setIsLoading] = createSignal(false)
+  const [hasOlderMessages, setHasOlderMessages] = createSignal(false)
   const [error, setError] = createSignal<Error | undefined>(undefined)
   const [status, setStatus] = createSignal<ChatClientState>('ready')
   const [isSubscribed, setIsSubscribed] = createSignal(false)
@@ -108,22 +109,30 @@ export function useChat<
     const transport = options.connection
       ? { connection: options.connection }
       : { fetcher: options.fetcher }
-    return new ChatClient<TTools, TContext, TInterrupts>({
+    const instance = new ChatClient<TTools, TContext, TInterrupts>({
       devtoolsBridgeFactory: createChatDevtoolsBridge,
       ...transport,
       ...(options.initialMessages !== undefined && {
         initialMessages: options.initialMessages,
       }),
-      ...(typeof options.threadId === 'string' && options.persistence
+      ...(typeof options.threadId === 'string' && options.persistence === true
         ? {
-            persistence: options.persistence,
+            persistence: true,
             threadId: options.threadId,
+            ...(options.history !== undefined && {
+              history: options.history,
+            }),
           }
-        : {
-            ...(options.threadId !== undefined && {
+        : typeof options.threadId === 'string' && options.persistence
+          ? {
+              persistence: options.persistence,
               threadId: options.threadId,
+            }
+          : {
+              ...(options.threadId !== undefined && {
+                threadId: options.threadId,
+              }),
             }),
-          }),
       ...(options.initialResumeSnapshot !== undefined && {
         initialResumeSnapshot: options.initialResumeSnapshot,
       }),
@@ -161,6 +170,7 @@ export function useChat<
       }),
       onMessagesChange: (newMessages: Array<UIMessage<TTools>>) => {
         setMessages(newMessages)
+        setHasOlderMessages(instance.getHasOlderMessages())
       },
       onLoadingChange: (newIsLoading: boolean) => {
         setIsLoading(newIsLoading)
@@ -202,9 +212,11 @@ export function useChat<
     })
     // Only recreate when clientId changes
     // Connection and other options are captured at creation time
+    return instance
   }, [clientId])
 
   setMessages(client().getMessages())
+  setHasOlderMessages(client().getHasOlderMessages())
   syncResumeState()
 
   // Sync body / forwardedProps changes to the client.
@@ -295,6 +307,11 @@ export function useChat<
     }
   }
 
+  const loadOlderMessages = async () => {
+    await client().loadOlderMessages()
+    setHasOlderMessages(client().getHasOlderMessages())
+  }
+
   const stop = () => {
     client().stop()
   }
@@ -418,6 +435,8 @@ export function useChat<
     reload,
     stop,
     isLoading,
+    hasOlderMessages,
+    loadOlderMessages,
     error,
     status,
     isSubscribed,

package/src/chat-ui/markdown-plugins.ts

@@ -1,48 +0,0 @@
-import remarkGfm from 'remark-gfm'
-import rehypeRaw from 'rehype-raw'
-import rehypeSanitize from 'rehype-sanitize'
-import rehypeHighlight from 'rehype-highlight'
-import type { SolidMarkdownOptions } from 'solid-markdown'
-
-export type PluggableList = SolidMarkdownOptions['remarkPlugins']
-
-export const DEFAULT_REMARK_PLUGINS: PluggableList = [remarkGfm]
-export const DEFAULT_REHYPE_PLUGINS_BEFORE_USER: PluggableList = [
-  rehypeRaw,
-  rehypeHighlight,
-]
-export const DEFAULT_REHYPE_PLUGINS_AFTER_USER: PluggableList = [rehypeSanitize]
-
-export interface ResolveMarkdownPluginsOptions {
-  remarkPlugins?: PluggableList
-  rehypePlugins?: PluggableList
-  disableDefaultPlugins?: boolean
-}
-
-export interface ResolvedMarkdownPlugins {
-  remarkPlugins: PluggableList
-  rehypePlugins: PluggableList
-}
-
-export function resolveMarkdownPlugins(
-  options: ResolveMarkdownPluginsOptions,
-): ResolvedMarkdownPlugins {
-  const userRemark = options.remarkPlugins ?? []
-  const userRehype = options.rehypePlugins ?? []
-
-  if (options.disableDefaultPlugins) {
-    return {
-      remarkPlugins: [...userRemark],
-      rehypePlugins: [...userRehype],
-    }
-  }
-
-  return {
-    remarkPlugins: [...DEFAULT_REMARK_PLUGINS, ...userRemark],
-    rehypePlugins: [
-      ...DEFAULT_REHYPE_PLUGINS_BEFORE_USER,
-      ...userRehype,
-      ...DEFAULT_REHYPE_PLUGINS_AFTER_USER,
-    ],
-  }
-}