From 564a50a95679380ca412fbf27bfafb706af1b4d2 Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Wed, 4 Feb 2026 12:21:54 -0800
Subject: [PATCH 1/4] feat: add shared ai-chat package

Add packages/ai-chat with:
- Stream client and materialization layer (durable-streams)
- useChatSession and useCollectionData hooks
- ChatInput and PresenceBar shared components
- Type definitions for AI chat messages and sessions
- Shared constants for streams URL
---
 packages/ai-chat/package.json                 |  37 ++
 .../src/components/ChatInput/ChatInput.tsx    | 137 ++++++
 .../ai-chat/src/components/ChatInput/index.ts |   1 +
 .../components/PresenceBar/PresenceBar.tsx    |  82 ++++
 .../src/components/PresenceBar/index.ts       |   1 +
 packages/ai-chat/src/components/index.ts      |   2 +
 packages/ai-chat/src/index.ts                 |   3 +
 packages/ai-chat/src/stream/actions.ts        | 129 ++++++
 packages/ai-chat/src/stream/client.ts         | 410 ++++++++++++++++++
 packages/ai-chat/src/stream/index.ts          |  42 ++
 packages/ai-chat/src/stream/materialize.ts    | 338 +++++++++++++++
 packages/ai-chat/src/stream/schema.ts         |  79 ++++
 packages/ai-chat/src/stream/useChatSession.ts | 310 +++++++++++++
 .../ai-chat/src/stream/useCollectionData.ts   | 104 +++++
 packages/ai-chat/src/types.ts                 | 112 +++++
 packages/ai-chat/tsconfig.json                |  12 +
 packages/shared/src/constants.ts              |   2 +
 17 files changed, 1801 insertions(+)
 create mode 100644 packages/ai-chat/package.json
 create mode 100644 packages/ai-chat/src/components/ChatInput/ChatInput.tsx
 create mode 100644 packages/ai-chat/src/components/ChatInput/index.ts
 create mode 100644 packages/ai-chat/src/components/PresenceBar/PresenceBar.tsx
 create mode 100644 packages/ai-chat/src/components/PresenceBar/index.ts
 create mode 100644 packages/ai-chat/src/components/index.ts
 create mode 100644 packages/ai-chat/src/index.ts
 create mode 100644 packages/ai-chat/src/stream/actions.ts
 create mode 100644 packages/ai-chat/src/stream/client.ts
 create mode 100644 packages/ai-chat/src/stream/index.ts
 create mode 100644 packages/ai-chat/src/stream/materialize.ts
 create mode 100644 packages/ai-chat/src/stream/schema.ts
 create mode 100644 packages/ai-chat/src/stream/useChatSession.ts
 create mode 100644 packages/ai-chat/src/stream/useCollectionData.ts
 create mode 100644 packages/ai-chat/src/types.ts
 create mode 100644 packages/ai-chat/tsconfig.json

diff --git a/packages/ai-chat/package.json b/packages/ai-chat/package.json
new file mode 100644
index 00000000000..687051bd84e
--- /dev/null
+++ b/packages/ai-chat/package.json
@@ -0,0 +1,37 @@
+{
+	"name": "@superset/ai-chat",
+	"version": "0.0.1",
+	"description": "Shared AI chat hooks and utilities",
+	"type": "module",
+	"main": "./src/index.ts",
+	"exports": {
+		".": "./src/index.ts",
+		"./hooks": "./src/hooks/index.ts",
+		"./components": "./src/components/index.ts",
+		"./stream": "./src/stream/index.ts"
+	},
+	"scripts": {
+		"typecheck": "tsc --noEmit --emitDeclarationOnly false"
+	},
+	"dependencies": {
+		"@anthropic-ai/claude-agent-sdk": "^0.2.19",
+		"@anthropic-ai/sdk": "^0.71.2",
+		"@durable-streams/client": "^0.2.0",
+		"@durable-streams/state": "^0.2.0",
+		"@superset/ui": "workspace:*",
+		"@tanstack/db": "^0.5.24",
+		"@tanstack/react-db": "^0.1.68",
+		"lucide-react": "^0.560.0",
+		"react": "19.1.0",
+		"zod": "^4.3.5"
+	},
+	"devDependencies": {
+		"@superset/typescript": "workspace:*",
+		"@types/node": "^24.9.1",
+		"@types/react": "~19.1.0",
+		"typescript": "^5.9.3"
+	},
+	"peerDependencies": {
+		"react": "^18.0.0 || ^19.0.0"
+	}
+}
diff --git a/packages/ai-chat/src/components/ChatInput/ChatInput.tsx b/packages/ai-chat/src/components/ChatInput/ChatInput.tsx
new file mode 100644
index 00000000000..bc893e83a0b
--- /dev/null
+++ b/packages/ai-chat/src/components/ChatInput/ChatInput.tsx
@@ -0,0 +1,137 @@
+/**
+ * Chat input component with send button
+ */
+
+import { Button } from "@superset/ui/button";
+import { Textarea } from "@superset/ui/textarea";
+import { cn } from "@superset/ui/utils";
+import { Send } from "lucide-react";
+import { type KeyboardEvent, useCallback, useRef, useState } from "react";
+
+export interface ChatInputProps {
+	onSend: (content: string) => void;
+	onTypingChange?: (isTyping: boolean) => void;
+	disabled?: boolean;
+	placeholder?: string;
+	className?: string;
+	/** Button style: "icon" shows Send icon, "text" shows "Send" label */
+	buttonVariant?: "icon" | "text";
+	/** Auto-resize textarea as content grows (default: true) */
+	autoResize?: boolean;
+	/** Controlled value (optional - if provided, component is controlled) */
+	value?: string;
+	/** Controlled onChange (optional - required if value is provided) */
+	onChange?: (value: string) => void;
+}
+
+export function ChatInput({
+	onSend,
+	onTypingChange,
+	disabled = false,
+	placeholder = "Type a message...",
+	className,
+	buttonVariant = "icon",
+	autoResize = true,
+	value: controlledValue,
+	onChange: controlledOnChange,
+}: ChatInputProps) {
+	const [internalValue, setInternalValue] = useState("");
+	const textareaRef = useRef<HTMLTextAreaElement>(null);
+	const typingTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+	// Support both controlled and uncontrolled modes
+	const isControlled = controlledValue !== undefined;
+	const value = isControlled ? controlledValue : internalValue;
+	const setValue = isControlled
+		? (v: string) => controlledOnChange?.(v)
+		: setInternalValue;
+
+	const handleSubmit = useCallback(() => {
+		const trimmed = value.trim();
+		if (!trimmed || disabled) return;
+
+		onSend(trimmed);
+		setValue("");
+		onTypingChange?.(false);
+
+		// Reset textarea height and focus
+		if (textareaRef.current) {
+			if (autoResize) {
+				textareaRef.current.style.height = "auto";
+			}
+			textareaRef.current.focus();
+		}
+	}, [value, disabled, onSend, onTypingChange, autoResize, setValue]);
+
+	const handleKeyDown = useCallback(
+		(e: KeyboardEvent<HTMLTextAreaElement>) => {
+			if (e.key === "Enter" && !e.shiftKey) {
+				e.preventDefault();
+				handleSubmit();
+			}
+		},
+		[handleSubmit],
+	);
+
+	const handleChange = useCallback(
+		(e: React.ChangeEvent<HTMLTextAreaElement>) => {
+			const newValue = e.target.value;
+			setValue(newValue);
+
+			// Auto-resize textarea
+			if (autoResize) {
+				const textarea = e.target;
+				textarea.style.height = "auto";
+				textarea.style.height = `${Math.min(textarea.scrollHeight, 200)}px`;
+			}
+
+			// Typing indicator with debounce
+			if (typingTimeoutRef.current) {
+				clearTimeout(typingTimeoutRef.current);
+			}
+
+			if (newValue.trim()) {
+				onTypingChange?.(true);
+				typingTimeoutRef.current = setTimeout(() => {
+					onTypingChange?.(false);
+				}, 2000);
+			} else {
+				onTypingChange?.(false);
+			}
+		},
+		[onTypingChange, autoResize, setValue],
+	);
+
+	return (
+		<div className={cn("flex gap-2 items-end", className)}>
+			<Textarea
+				ref={textareaRef}
+				value={value}
+				onChange={handleChange}
+				onKeyDown={handleKeyDown}
+				placeholder={placeholder}
+				disabled={disabled}
+				rows={1}
+				className="min-h-[40px] max-h-[200px] resize-none"
+			/>
+			{buttonVariant === "icon" ? (
+				<Button
+					size="icon"
+					onClick={handleSubmit}
+					disabled={disabled || !value.trim()}
+					className="shrink-0"
+				>
+					<Send className="h-4 w-4" />
+				</Button>
+			) : (
+				<Button
+					onClick={handleSubmit}
+					disabled={disabled || !value.trim()}
+					size="default"
+				>
+					Send
+				</Button>
+			)}
+		</div>
+	);
+}
diff --git a/packages/ai-chat/src/components/ChatInput/index.ts b/packages/ai-chat/src/components/ChatInput/index.ts
new file mode 100644
index 00000000000..eabdf78c145
--- /dev/null
+++ b/packages/ai-chat/src/components/ChatInput/index.ts
@@ -0,0 +1 @@
+export { ChatInput, type ChatInputProps } from "./ChatInput";
diff --git a/packages/ai-chat/src/components/PresenceBar/PresenceBar.tsx b/packages/ai-chat/src/components/PresenceBar/PresenceBar.tsx
new file mode 100644
index 00000000000..b43af801c96
--- /dev/null
+++ b/packages/ai-chat/src/components/PresenceBar/PresenceBar.tsx
@@ -0,0 +1,82 @@
+/**
+ * Presence bar showing viewers and typing indicators
+ */
+
+import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/avatar";
+import { cn } from "@superset/ui/utils";
+import type { PresenceUser } from "../../types";
+
+export interface PresenceBarProps {
+	viewers: PresenceUser[];
+	typingUsers: PresenceUser[];
+	className?: string;
+}
+
+function getInitials(name: string): string {
+	return name
+		.split(" ")
+		.map((n) => n[0])
+		.join("")
+		.toUpperCase()
+		.slice(0, 2);
+}
+
+export function PresenceBar({
+	viewers,
+	typingUsers,
+	className,
+}: PresenceBarProps) {
+	if (viewers.length === 0 && typingUsers.length === 0) {
+		return null;
+	}
+
+	return (
+		<div
+			className={cn(
+				"flex items-center gap-2 px-4 py-2 border-b border-border bg-muted/50",
+				className,
+			)}
+		>
+			{/* Viewers */}
+			{viewers.length > 0 && (
+				<div className="flex items-center gap-1">
+					<div className="flex -space-x-2">
+						{viewers.slice(0, 5).map((user) => (
+							<Avatar
+								key={user.userId}
+								className="h-6 w-6 border-2 border-background"
+							>
+								{user.image && <AvatarImage src={user.image} />}
+								<AvatarFallback className="text-xs">
+									{getInitials(user.name)}
+								</AvatarFallback>
+							</Avatar>
+						))}
+					</div>
+					{viewers.length > 5 && (
+						<span className="text-xs text-muted-foreground">
+							+{viewers.length - 5}
+						</span>
+					)}
+					<span className="text-xs text-muted-foreground ml-1">viewing</span>
+				</div>
+			)}
+
+			{/* Typing indicator */}
+			{typingUsers.length > 0 && (
+				<div className="flex items-center gap-1 ml-auto">
+					<span className="text-xs text-muted-foreground">
+						{typingUsers.length === 1
+							? `${typingUsers[0]?.name} is typing`
+							: `${typingUsers.length} people typing`}
+					</span>
+					<span className="flex gap-0.5">
+						<span className="h-1.5 w-1.5 rounded-full bg-primary animate-bounce [animation-delay:-0.3s]" />
+						<span className="h-1.5 w-1.5 rounded-full bg-primary animate-bounce [animation-delay:-0.15s]" />
+						<span className="h-1.5 w-1.5 rounded-full bg-primary animate-bounce" />
+					</span>
+				</div>
+			)}
+		</div>
+	);
+}
diff --git a/packages/ai-chat/src/components/PresenceBar/index.ts b/packages/ai-chat/src/components/PresenceBar/index.ts
new file mode 100644
index 00000000000..accc01d8d92
--- /dev/null
+++ b/packages/ai-chat/src/components/PresenceBar/index.ts
@@ -0,0 +1 @@
+export { PresenceBar, type PresenceBarProps } from "./PresenceBar";
diff --git a/packages/ai-chat/src/components/index.ts b/packages/ai-chat/src/components/index.ts
new file mode 100644
index 00000000000..134ece8df83
--- /dev/null
+++ b/packages/ai-chat/src/components/index.ts
@@ -0,0 +1,2 @@
+export { ChatInput, type ChatInputProps } from "./ChatInput";
+export { PresenceBar, type PresenceBarProps } from "./PresenceBar";
diff --git a/packages/ai-chat/src/index.ts b/packages/ai-chat/src/index.ts
new file mode 100644
index 00000000000..a44ec03885c
--- /dev/null
+++ b/packages/ai-chat/src/index.ts
@@ -0,0 +1,3 @@
+export * from "./components";
+export * from "./stream";
+export * from "./types";
diff --git a/packages/ai-chat/src/stream/actions.ts b/packages/ai-chat/src/stream/actions.ts
new file mode 100644
index 00000000000..9ed5719aedb
--- /dev/null
+++ b/packages/ai-chat/src/stream/actions.ts
@@ -0,0 +1,129 @@
+/**
+ * Stream Actions
+ *
+ * Simple async functions for writing to the durable stream.
+ * Follows the Electric SQL pattern of plain functions over complex hooks.
+ */
+
+export interface SessionUser {
+	userId: string;
+	name: string;
+}
+
+/**
+ * Create a new stream (PUT request)
+ * Returns true if created, false if already exists
+ */
+export async function createStream(
+	baseUrl: string,
+	sessionId: string,
+): Promise<boolean> {
+	const response = await fetch(`${baseUrl}/streams/${sessionId}`, {
+		method: "PUT",
+		headers: { "Content-Type": "application/json" },
+	});
+
+	// 201 = created, 200 = already exists
+	return response.status === 201;
+}
+
+/**
+ * Helper to POST events to the stream with correct content-type
+ */
+async function appendToStream(url: string, events: unknown[]): Promise<void> {
+	const response = await fetch(url, {
+		method: "POST",
+		headers: { "Content-Type": "application/json" },
+		body: JSON.stringify(events),
+	});
+
+	if (!response.ok) {
+		throw new Error(`Failed to append to stream: ${response.status}`);
+	}
+}
+
+export interface SessionActions {
+	/** Announce presence when joining */
+	join: () => Promise<void>;
+	/** Remove presence when leaving */
+	leave: () => Promise<void>;
+	/** Update draft content (empty content = delete draft) */
+	updateDraft: (content: string) => Promise<void>;
+}
+
+/**
+ * Creates action functions for a chat session
+ *
+ * @example
+ * ```ts
+ * const actions = createSessionActions({
+ *   baseUrl: "http://localhost:8080",
+ *   sessionId: "abc123",
+ *   user: { userId: "user-1", name: "Alice" }
+ * });
+ *
+ * await actions.join();
+ * await actions.updateDraft("Hello...");
+ * await actions.leave();
+ * ```
+ */
+export function createSessionActions({
+	baseUrl,
+	sessionId,
+	user,
+}: {
+	baseUrl: string;
+	sessionId: string;
+	user: SessionUser;
+}): SessionActions {
+	const streamUrl = `${baseUrl}/streams/${sessionId}`;
+
+	return {
+		join: async () => {
+			await appendToStream(streamUrl, [
+				{
+					type: "presence",
+					key: user.userId,
+					value: {
+						userId: user.userId,
+						userName: user.name,
+						joinedAt: new Date().toISOString(),
+					},
+					headers: { operation: "upsert" },
+				},
+			]);
+		},
+
+		leave: async () => {
+			// Delete presence and draft on leave
+			await appendToStream(streamUrl, [
+				{
+					type: "presence",
+					key: user.userId,
+					headers: { operation: "delete" },
+				},
+				{
+					type: "draft",
+					key: user.userId,
+					headers: { operation: "delete" },
+				},
+			]);
+		},
+
+		updateDraft: async (content: string) => {
+			await appendToStream(streamUrl, [
+				{
+					type: "draft",
+					key: user.userId,
+					value: {
+						userId: user.userId,
+						userName: user.name,
+						content,
+						updatedAt: new Date().toISOString(),
+					},
+					headers: { operation: content ? "upsert" : "delete" },
+				},
+			]);
+		},
+	};
+}
diff --git a/packages/ai-chat/src/stream/client.ts b/packages/ai-chat/src/stream/client.ts
new file mode 100644
index 00000000000..0da066d8ead
--- /dev/null
+++ b/packages/ai-chat/src/stream/client.ts
@@ -0,0 +1,410 @@
+/**
+ * DurableChatClient - Chat session client adapted from Electric SQL.
+ *
+ * Follows the same patterns as @electric-sql/durable-session:
+ * - Synchronous construction (collections available immediately)
+ * - Async connection via connect()
+ * - Proper dispose lifecycle
+ *
+ * Simplified for our schema: chunks, presence, drafts (no agents, tool calls, etc.)
+ */
+
+import { createStreamDB, type StreamDB } from "@durable-streams/state";
+import type { Collection } from "@tanstack/db";
+import type { SessionUser } from "./actions";
+import {
+	type SessionStateSchema,
+	type StreamChunk,
+	type StreamDraft,
+	type StreamPresence,
+	sessionStateSchema,
+} from "./schema";
+
+// ============================================================================
+// Helpers
+// ============================================================================
+
+/** UUID generator with fallback for environments without crypto.randomUUID (React Native). */
+function generateUUID(): string {
+	if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+		return crypto.randomUUID();
+	}
+	return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+		const r = (Math.random() * 16) | 0;
+		const v = c === "x" ? r : (r & 0x3) | 0x8;
+		return v.toString(16);
+	});
+}
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export type ConnectionStatus =
+	| "disconnected"
+	| "connecting"
+	| "connected"
+	| "error";
+
+export interface DurableChatClientOptions {
+	sessionId: string;
+	proxyUrl: string;
+	actorId?: string;
+	user?: SessionUser | null;
+	onError?: (error: Error) => void;
+	onStatusChange?: (status: ConnectionStatus) => void;
+}
+
+/**
+ * Collections map with correct row types.
+ *
+ * stream-db injects the primary key field at runtime, so our types
+ * include the `id` field for chunks.
+ */
+export interface SessionCollections {
+	chunks: Collection<StreamChunk & { id: string }, string>;
+	presence: Collection<StreamPresence, string>;
+	drafts: Collection<StreamDraft, string>;
+}
+
+// ============================================================================
+// DurableChatClient
+// ============================================================================
+
+/**
+ * DurableChatClient - Adapted from @electric-sql/durable-session.
+ *
+ * Provides a simple chat interface backed by Durable Streams.
+ * All collections are available immediately after construction.
+ *
+ * @example
+ * ```typescript
+ * const client = new DurableChatClient({
+ *   sessionId: 'my-session',
+ *   proxyUrl: 'http://localhost:8080',
+ * })
+ *
+ * // Collections available immediately
+ * const chunks = client.collections.chunks
+ *
+ * // Connect to start syncing
+ * await client.connect()
+ *
+ * // Send messages
+ * await client.sendMessage('Hello!')
+ *
+ * // Cleanup
+ * client.dispose()
+ * ```
+ */
+export class DurableChatClient {
+	readonly sessionId: string;
+	readonly actorId: string;
+
+	private readonly options: DurableChatClientOptions;
+
+	// Stream-db instance (created synchronously in constructor)
+	private readonly _db: StreamDB<SessionStateSchema>;
+
+	// Collections are always available after construction
+	private readonly _collections: SessionCollections;
+
+	private _isConnected = false;
+	private _isDisposed = false;
+	private _connectionStatus: ConnectionStatus = "disconnected";
+	private _error: Error | undefined;
+
+	// AbortController for canceling stream sync
+	private readonly _abortController: AbortController;
+
+	// =========================================================================
+	// Constructor
+	// =========================================================================
+
+	constructor(options: DurableChatClientOptions) {
+		this.options = options;
+		this.sessionId = options.sessionId;
+		this.actorId =
+			options.actorId ?? options.user?.userId ?? generateUUID();
+
+		// Create abort controller before anything else
+		this._abortController = new AbortController();
+
+		// Create stream-db synchronously (connection happens on preload)
+		this._db = createStreamDB({
+			streamOptions: {
+				url: `${options.proxyUrl}/streams/${options.sessionId}`,
+				signal: this._abortController.signal,
+			},
+			state: sessionStateSchema,
+		});
+
+		// Collections are available immediately
+		this._collections = this._db.collections as unknown as SessionCollections;
+	}
+
+	// =========================================================================
+	// Getters
+	// =========================================================================
+
+	/**
+	 * Get all collections for direct access.
+	 * Collections are available immediately after construction.
+	 */
+	get collections(): SessionCollections {
+		return this._collections;
+	}
+
+	/**
+	 * Get current connection status.
+	 */
+	get connectionStatus(): ConnectionStatus {
+		return this._connectionStatus;
+	}
+
+	/**
+	 * Check if the client has been disposed.
+	 */
+	get isDisposed(): boolean {
+		return this._isDisposed;
+	}
+
+	/**
+	 * Get the current error, if any.
+	 */
+	get error(): Error | undefined {
+		return this._error;
+	}
+
+	// =========================================================================
+	// Status Management
+	// =========================================================================
+
+	private _setConnectionStatus(status: ConnectionStatus): void {
+		if (this._connectionStatus === status) return;
+		this._connectionStatus = status;
+		this.options.onStatusChange?.(status);
+	}
+
+	// =========================================================================
+	// Lifecycle
+	// =========================================================================
+
+	/**
+	 * Connect to the durable stream and start syncing.
+	 *
+	 * This method handles network operations only - collections are already
+	 * created synchronously in the constructor and are immediately available.
+	 */
+	async connect(): Promise<void> {
+		if (this._isConnected) return;
+		if (this._isDisposed) {
+			throw new Error("Cannot connect disposed client");
+		}
+
+		try {
+			this._setConnectionStatus("connecting");
+			console.log(`[ai-chat/client] connect() sessionId=${this.sessionId} url=${this.options.proxyUrl}`);
+
+			// Preload stream data
+			await this._db.preload();
+
+			this._isConnected = true;
+			this._setConnectionStatus("connected");
+			console.log(`[ai-chat/client] connected, preload complete`);
+
+			// Announce presence if we have a user
+			if (this.options.user) {
+				await this._announcePresence();
+			}
+		} catch (error) {
+			this._error = error instanceof Error ? error : new Error(String(error));
+			this._setConnectionStatus("error");
+			this.options.onError?.(this._error);
+			throw error;
+		}
+	}
+
+	/**
+	 * Disconnect from the stream.
+	 */
+	disconnect(): void {
+		// Remove presence before disconnecting
+		if (this.options.user && this._isConnected) {
+			this._removePresence().catch(() => {});
+		}
+
+		this._db.close();
+		this._abortController.abort();
+		this._isConnected = false;
+		this._setConnectionStatus("disconnected");
+	}
+
+	/**
+	 * Dispose the client and clean up resources.
+	 *
+	 * Note: We only disconnect here - we don't manually cleanup collections.
+	 * TanStack DB will GC collections automatically when they have no subscribers.
+	 */
+	dispose(): void {
+		if (this._isDisposed) return;
+		this._isDisposed = true;
+		this.disconnect();
+	}
+
+	// =========================================================================
+	// Actions
+	// =========================================================================
+
+	/**
+	 * Send a user message.
+	 */
+	async sendMessage(content: string): Promise<void> {
+		if (!this._isConnected) {
+			throw new Error("Client not connected. Call connect() first.");
+		}
+
+		const user = this.options.user;
+		if (!user) {
+			throw new Error("Cannot send message without user");
+		}
+
+		const uuid = generateUUID();
+		console.log(`[ai-chat/client] sendMessage uuid=${uuid} content="${content.slice(0, 50)}"`);
+
+		await this._appendToStream([
+			{
+				type: "chunk",
+				key: uuid,
+				value: {
+					type: "user_input",
+					content,
+					actorId: user.userId,
+					createdAt: new Date().toISOString(),
+				},
+				headers: { operation: "insert" },
+			},
+		]);
+		console.log(`[ai-chat/client] sendMessage POST complete`);
+	}
+
+	/**
+	 * Update the user's draft.
+	 */
+	async updateDraft(content: string): Promise<void> {
+		const user = this.options.user;
+		if (!user) return;
+
+		const now = new Date().toISOString();
+
+		await this._appendToStream([
+			{
+				type: "draft",
+				key: user.userId,
+				value: {
+					userId: user.userId,
+					userName: user.name,
+					content,
+					updatedAt: now,
+				},
+				headers: { operation: content ? "upsert" : "delete" },
+			},
+		]);
+	}
+
+	/**
+	 * Update the user associated with this client.
+	 * Useful for late binding when user auth completes after client creation.
+	 */
+	setUser(user: SessionUser | null): void {
+		const previousUser = this.options.user;
+		(this.options as { user: SessionUser | null }).user = user;
+
+		// If connected, update presence
+		if (this._isConnected) {
+			if (previousUser && !user) {
+				// User logged out - remove presence
+				this._removePresence().catch(this.options.onError ?? console.error);
+			} else if (user && !previousUser) {
+				// User logged in - announce presence
+				this._announcePresence().catch(this.options.onError ?? console.error);
+			} else if (user && previousUser && user.userId !== previousUser.userId) {
+				// User changed - update presence
+				this._removePresence()
+					.then(() => this._announcePresence())
+					.catch(this.options.onError ?? console.error);
+			}
+		}
+	}
+
+	// =========================================================================
+	// Private Helpers
+	// =========================================================================
+
+	private async _announcePresence(): Promise<void> {
+		const user = this.options.user;
+		if (!user) return;
+
+		await this._appendToStream([
+			{
+				type: "presence",
+				key: user.userId,
+				value: {
+					userId: user.userId,
+					userName: user.name,
+					joinedAt: new Date().toISOString(),
+				},
+				headers: { operation: "upsert" },
+			},
+		]);
+	}
+
+	private async _removePresence(): Promise<void> {
+		const user = this.options.user;
+		if (!user) return;
+
+		await this._appendToStream([
+			{
+				type: "presence",
+				key: user.userId,
+				headers: { operation: "delete" },
+			},
+			{
+				type: "draft",
+				key: user.userId,
+				headers: { operation: "delete" },
+			},
+		]);
+	}
+
+	private async _appendToStream(events: unknown[]): Promise<void> {
+		const response = await fetch(
+			`${this.options.proxyUrl}/streams/${this.sessionId}`,
+			{
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				body: JSON.stringify(events),
+			},
+		);
+
+		if (!response.ok) {
+			throw new Error(`Failed to append to stream: ${response.status}`);
+		}
+	}
+}
+
+// ============================================================================
+// Factory Function
+// ============================================================================
+
+/**
+ * Create a new DurableChatClient instance.
+ *
+ * @param options - Client options
+ * @returns New client instance
+ */
+export function createDurableChatClient(
+	options: DurableChatClientOptions,
+): DurableChatClient {
+	return new DurableChatClient(options);
+}
diff --git a/packages/ai-chat/src/stream/index.ts b/packages/ai-chat/src/stream/index.ts
new file mode 100644
index 00000000000..e7273a9682e
--- /dev/null
+++ b/packages/ai-chat/src/stream/index.ts
@@ -0,0 +1,42 @@
+/**
+ * Stream module exports
+ */
+
+export type {
+	BetaContentBlock,
+	BetaToolUseBlock,
+} from "@anthropic-ai/sdk/resources/beta/messages/messages";
+export {
+	createSessionActions,
+	createStream,
+	type SessionActions,
+	type SessionUser,
+} from "./actions";
+export {
+	type ConnectionStatus,
+	createDurableChatClient,
+	DurableChatClient,
+	type DurableChatClientOptions,
+	type SessionCollections,
+} from "./client";
+export {
+	type ChunkRow,
+	type MessageRole,
+	type MessageRow,
+	materializeMessages,
+	type ToolResult,
+} from "./materialize";
+export {
+	type SessionStateSchema,
+	type StreamChunk,
+	type StreamDraft,
+	type StreamPresence,
+	sessionStateSchema,
+} from "./schema";
+export {
+	type ChatUser,
+	type UseChatSessionOptions,
+	type UseChatSessionReturn,
+	useChatSession,
+} from "./useChatSession";
+export { useCollectionData } from "./useCollectionData";
diff --git a/packages/ai-chat/src/stream/materialize.ts b/packages/ai-chat/src/stream/materialize.ts
new file mode 100644
index 00000000000..7b1fb3c8368
--- /dev/null
+++ b/packages/ai-chat/src/stream/materialize.ts
@@ -0,0 +1,338 @@
+/**
+ * Message Materialization (SDK-Native, Zero Envelope)
+ *
+ * Processes raw SDK messages and user input chunks from the durable stream
+ * in collection order. Turn boundaries are detected from SDK message type
+ * transitions (stream_event after user = new turn).
+ *
+ * No envelope fields (messageId, seq, role, actorId) — SDK messages are
+ * stored as-is, user input uses { type: "user_input", content, actorId }.
+ */
+
+import type {
+	SDKAssistantMessage,
+	SDKMessage,
+	SDKPartialAssistantMessage,
+	SDKUserMessage,
+} from "@anthropic-ai/claude-agent-sdk";
+import type {
+	BetaContentBlock,
+	BetaRawContentBlockDeltaEvent,
+	BetaRawContentBlockStartEvent,
+	BetaTextBlock,
+	BetaToolUseBlock,
+} from "@anthropic-ai/sdk/resources/beta/messages/messages";
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export type MessageRole = "user" | "assistant" | "system";
+
+/** Pre-merged tool result — SDK has no joined tool_use + tool_result concept */
+export interface ToolResult {
+	output: string;
+	isError: boolean;
+}
+
+/** Materialized UI state from durable stream chunks */
+export interface MessageRow {
+	id: string;
+	role: MessageRole;
+	content: string;
+	contentBlocks: BetaContentBlock[];
+	toolResults: Map<string, ToolResult>;
+	actorId: string;
+	isComplete: boolean;
+	isStreaming: boolean;
+	createdAt: Date;
+}
+
+/** Raw chunk row from the durable stream collection */
+export type ChunkRow = Record<string, unknown> & { id: string };
+
+// ============================================================================
+// Materialize All Messages
+// ============================================================================
+
+/**
+ * Materialize all messages from raw chunk rows.
+ *
+ * Chunks are sorted by createdAt + _seq before processing to ensure
+ * correct ordering regardless of collection insertion order (which
+ * may not match stream append order after Electric SQL sync/reconnect).
+ *
+ * User input chunks become user messages. SDK message chunks are grouped
+ * into assistant turns with automatic boundary detection.
+ */
+export function materializeMessages(chunks: ChunkRow[]): MessageRow[] {
+	if (chunks.length === 0) return [];
+
+	// Sort by createdAt, then _seq as tiebreaker for same-millisecond chunks
+	const sorted = [...chunks].sort((a, b) => {
+		const aTime = a.createdAt ? new Date(String(a.createdAt)).getTime() : 0;
+		const bTime = b.createdAt ? new Date(String(b.createdAt)).getTime() : 0;
+		if (aTime !== bTime) return aTime - bTime;
+		const aSeq = typeof a._seq === "number" ? a._seq : 0;
+		const bSeq = typeof b._seq === "number" ? b._seq : 0;
+		return aSeq - bSeq;
+	});
+
+	console.log(`[ai-chat/materialize] processing ${sorted.length} sorted chunks, types: ${sorted.map(c => c.type).join(", ")}`);
+
+	const messages: MessageRow[] = [];
+	let currentTurnChunks: ChunkRow[] = [];
+	let lastRenderingType: string | null = null;
+
+	for (const chunk of sorted) {
+		const chunkType = chunk.type as string | undefined;
+
+		// User input from client
+		if (chunkType === "user_input") {
+			// Flush current assistant turn
+			if (currentTurnChunks.length > 0) {
+				messages.push(materializeTurn(currentTurnChunks));
+				currentTurnChunks = [];
+				lastRenderingType = null;
+			}
+			messages.push({
+				id: chunk.id,
+				role: "user",
+				content: String(chunk.content ?? ""),
+				contentBlocks: [],
+				toolResults: new Map(),
+				actorId: String(chunk.actorId ?? ""),
+				isComplete: true,
+				isStreaming: false,
+				createdAt: new Date(
+					String(chunk.createdAt ?? new Date().toISOString()),
+				),
+			});
+			continue;
+		}
+
+		// SDK message — only process rendering-relevant types for turns
+		// Note: "result" is excluded — materializeTurn doesn't handle it,
+		// and including it creates ghost streaming messages from lone result
+		// chunks. It also masks the user→stream_event turn boundary.
+		const isRenderingType =
+			chunkType === "stream_event" ||
+			chunkType === "assistant" ||
+			chunkType === "user";
+
+		if (!isRenderingType) continue;
+
+		// Turn boundary: stream_event after user (tool result) = new turn
+		if (chunkType === "stream_event" && lastRenderingType === "user") {
+			if (currentTurnChunks.length > 0) {
+				messages.push(materializeTurn(currentTurnChunks));
+				currentTurnChunks = [];
+			}
+		}
+
+		currentTurnChunks.push(chunk);
+		lastRenderingType = chunkType;
+	}
+
+	// Flush remaining turn
+	if (currentTurnChunks.length > 0) {
+		messages.push(materializeTurn(currentTurnChunks));
+	}
+
+	return messages;
+}
+
+// ============================================================================
+// Turn Materialization
+// ============================================================================
+
+/**
+ * Materialize a single assistant turn from its SDK message chunks.
+ */
+function materializeTurn(chunks: ChunkRow[]): MessageRow {
+	const firstChunk = chunks[0]!;
+
+	console.log(
+		`[ai-chat/materialize] materializeTurn: ${chunks.length} chunks, types: ${chunks.map((c) => c.type).join(", ")}`,
+	);
+
+	let assistantMsg: SDKAssistantMessage | null = null;
+	const streamEvents: SDKPartialAssistantMessage[] = [];
+	const userMsgs: SDKUserMessage[] = [];
+	for (const chunk of chunks) {
+		const msg = chunk as unknown as SDKMessage;
+		switch (msg.type) {
+			case "assistant":
+				assistantMsg = msg;
+				break;
+			case "stream_event":
+				streamEvents.push(msg);
+				break;
+			case "user":
+				userMsgs.push(msg);
+				break;
+		}
+	}
+
+	// Build content blocks: prefer authoritative assistant message
+	let contentBlocks: BetaContentBlock[];
+	let isStreaming: boolean;
+
+	if (assistantMsg) {
+		contentBlocks = assistantMsg.message.content;
+		isStreaming = false;
+	} else {
+		contentBlocks = buildBlocksFromStreamEvents(streamEvents);
+		isStreaming = true;
+	}
+
+	// Build tool results from user messages (tool_result blocks)
+	const toolResults = buildToolResults(userMsgs);
+
+	// Join text blocks for backward-compat content field
+	const content = contentBlocks
+		.filter((b): b is BetaTextBlock => b.type === "text")
+		.map((b) => b.text)
+		.join("");
+
+	console.log(
+		`[ai-chat/materialize] turn result: id=${firstChunk.id.slice(0, 8)} hasAssistant=${!!assistantMsg} streamEvents=${streamEvents.length} userMsgs=${userMsgs.length} blocks=${contentBlocks.length} contentLen=${content.length} isComplete=${assistantMsg !== null} isStreaming=${isStreaming}`,
+	);
+
+	return {
+		id: firstChunk.id,
+		role: "assistant",
+		content,
+		contentBlocks,
+		toolResults,
+		actorId: "claude",
+		isComplete: assistantMsg !== null,
+		isStreaming,
+		createdAt: firstChunk.createdAt
+			? new Date(String(firstChunk.createdAt))
+			: new Date(),
+	};
+}
+
+// ============================================================================
+// Tool Result Extraction
+// ============================================================================
+
+function buildToolResults(userMsgs: SDKUserMessage[]): Map<string, ToolResult> {
+	const toolResults = new Map<string, ToolResult>();
+
+	for (const userMsg of userMsgs) {
+		const msgContent = userMsg.message.content;
+		if (!Array.isArray(msgContent)) continue;
+
+		for (const block of msgContent) {
+			if (typeof block !== "object" || block === null) continue;
+			if (!("type" in block) || block.type !== "tool_result") continue;
+
+			const tr = block as {
+				tool_use_id?: string;
+				content?: string | Array<{ type: string; text?: string }>;
+				is_error?: boolean;
+			};
+			if (!tr.tool_use_id) continue;
+
+			let output = "";
+			if (typeof tr.content === "string") {
+				output = tr.content;
+			} else if (Array.isArray(tr.content)) {
+				output = tr.content
+					.filter((c) => c.type === "text" && c.text)
+					.map((c) => c.text as string)
+					.join("");
+			}
+
+			toolResults.set(tr.tool_use_id, {
+				output,
+				isError: tr.is_error ?? false,
+			});
+		}
+	}
+
+	return toolResults;
+}
+
+// ============================================================================
+// Stream Event Reconstruction
+// ============================================================================
+
+function buildBlocksFromStreamEvents(
+	events: SDKPartialAssistantMessage[],
+): BetaContentBlock[] {
+	const blocks: BetaContentBlock[] = [];
+	const jsonAccumulators = new Map<number, string>();
+
+	for (const { event } of events) {
+		switch (event.type) {
+			case "content_block_start": {
+				const e = event as BetaRawContentBlockStartEvent;
+				blocks[e.index] = { ...e.content_block };
+				if (e.content_block.type === "tool_use") {
+					jsonAccumulators.set(e.index, "");
+				}
+				break;
+			}
+
+			case "content_block_delta": {
+				const e = event as BetaRawContentBlockDeltaEvent;
+				const block = blocks[e.index];
+				if (!block) break;
+
+				const delta = e.delta;
+				if (delta.type === "text_delta" && block.type === "text") {
+					(block as BetaTextBlock).text += delta.text;
+				} else if (delta.type === "input_json_delta") {
+					const accumulated =
+						(jsonAccumulators.get(e.index) ?? "") + delta.partial_json;
+					jsonAccumulators.set(e.index, accumulated);
+					if (block.type === "tool_use") {
+						try {
+							(block as BetaToolUseBlock).input = JSON.parse(accumulated);
+						} catch {
+							// Partial JSON
+						}
+					}
+				} else if (
+					delta.type === "thinking_delta" &&
+					block.type === "thinking"
+				) {
+					(block as { thinking: string }).thinking += delta.thinking;
+				}
+				break;
+			}
+
+			case "content_block_stop": {
+				const index = (event as { index: number }).index;
+				const accumulated = jsonAccumulators.get(index);
+				const block = blocks[index];
+				if (accumulated && block?.type === "tool_use") {
+					try {
+						(block as BetaToolUseBlock).input = JSON.parse(accumulated);
+					} catch {
+						// Best effort
+					}
+					jsonAccumulators.delete(index);
+				}
+				break;
+			}
+		}
+	}
+
+	return blocks.filter(Boolean);
+}
+
+// ============================================================================
+// Helpers
+// ============================================================================
+
+export function isUserMessage(row: MessageRow): boolean {
+	return row.role === "user";
+}
+
+export function isAssistantMessage(row: MessageRow): boolean {
+	return row.role === "assistant";
+}
diff --git a/packages/ai-chat/src/stream/schema.ts b/packages/ai-chat/src/stream/schema.ts
new file mode 100644
index 00000000000..c72444a10ef
--- /dev/null
+++ b/packages/ai-chat/src/stream/schema.ts
@@ -0,0 +1,79 @@
+/**
+ * Durable Streams State Schema
+ *
+ * Defines the state protocol schemas for real-time chat streaming with TanStack DB.
+ * Uses @durable-streams/state for protocol-compliant state management.
+ *
+ * Simplified design:
+ * - Presence = who's in the room (no status field - typing is derived from drafts)
+ * - Drafts = content being typed (non-empty content = user is typing)
+ * - Chunks = streaming message tokens
+ */
+
+import { createStateSchema } from "@durable-streams/state";
+import { z } from "zod";
+
+/**
+ * Chunk schema - raw SDK messages and user input stored directly.
+ *
+ * No envelope wrapping — SDK messages are passthrough, user input uses
+ * { type: "user_input", content, actorId, createdAt }.
+ * The `id` field (primary key) is injected at runtime from the event's `key`.
+ */
+export const chunkSchema = z.record(z.string(), z.unknown());
+
+export type StreamChunk = z.infer<typeof chunkSchema>;
+
+/**
+ * Presence schema - user presence tracking
+ *
+ * Simplified: No status field. Typing is derived from drafts with non-empty content.
+ */
+export const presenceSchema = z.object({
+	userId: z.string(),
+	userName: z.string(),
+	joinedAt: z.string(),
+});
+
+export type StreamPresence = z.infer<typeof presenceSchema>;
+
+/**
+ * Draft schema - user draft messages
+ *
+ * Non-empty content = user is typing.
+ */
+export const draftSchema = z.object({
+	userId: z.string(),
+	userName: z.string(),
+	content: z.string(),
+	cursorPosition: z.number().optional(),
+	updatedAt: z.string(),
+});
+
+export type StreamDraft = z.infer<typeof draftSchema>;
+
+/**
+ * Combined session state schema
+ *
+ * This creates a typed schema that routes different event types
+ * to their respective TanStack DB collections.
+ */
+export const sessionStateSchema = createStateSchema({
+	chunks: {
+		schema: chunkSchema,
+		type: "chunk",
+		primaryKey: "id",
+	},
+	presence: {
+		schema: presenceSchema,
+		type: "presence",
+		primaryKey: "userId",
+	},
+	drafts: {
+		schema: draftSchema,
+		type: "draft",
+		primaryKey: "userId",
+	},
+});
+
+export type SessionStateSchema = typeof sessionStateSchema;
diff --git a/packages/ai-chat/src/stream/useChatSession.ts b/packages/ai-chat/src/stream/useChatSession.ts
new file mode 100644
index 00000000000..14b75d886bc
--- /dev/null
+++ b/packages/ai-chat/src/stream/useChatSession.ts
@@ -0,0 +1,310 @@
+/**
+ * useChatSession - React hook for durable chat.
+ *
+ * Copied 1:1 from @electric-sql/react-durable-session/use-durable-chat.ts
+ * Adapted for our schema: chunks, presence, drafts (no agents, tool calls, etc.)
+ */
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import {
+	type ConnectionStatus,
+	DurableChatClient,
+	type DurableChatClientOptions,
+	type SessionCollections,
+} from "./client";
+import { type MessageRow, materializeMessages } from "./materialize";
+import type { StreamDraft, StreamPresence } from "./schema";
+import { useCollectionData } from "./useCollectionData";
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export interface UseChatSessionOptions
+	extends Omit<DurableChatClientOptions, "onError"> {
+	/** Auto-connect when hook mounts. Defaults to true. */
+	autoConnect?: boolean;
+	/** Provide an existing client instead of creating one */
+	client?: DurableChatClient;
+	/** Error handler */
+	onError?: (error: Error) => void;
+}
+
+export interface ChatUser {
+	userId: string;
+	name: string;
+}
+
+export interface UseChatSessionReturn {
+	// Data
+	messages: MessageRow[];
+	streamingMessage: MessageRow | null;
+	users: ChatUser[];
+	draft: string;
+	drafts: StreamDraft[];
+
+	// Actions
+	sendMessage: (content: string) => Promise<void>;
+	setDraft: (content: string) => void; // Sync for onChange compatibility
+
+	// State
+	isLoading: boolean;
+	error: Error | undefined;
+	connectionStatus: ConnectionStatus;
+
+	// Extensions
+	client: DurableChatClient;
+	collections: SessionCollections;
+	connect: () => Promise<void>;
+	disconnect: () => void;
+}
+
+// ============================================================================
+// Hook Implementation
+// ============================================================================
+
+/**
+ * React hook for durable chat with TanStack AI-compatible API.
+ *
+ * Provides reactive data binding with automatic updates when underlying
+ * collection data changes. Supports SSR through proper `useSyncExternalStore`
+ * integration.
+ *
+ * The client and collections are always available synchronously.
+ * Connection state is managed separately via `connectionStatus`.
+ *
+ * @example Basic usage
+ * ```typescript
+ * function Chat() {
+ *   const { messages, sendMessage, isLoading, collections } = useChatSession({
+ *     sessionId: 'my-session',
+ *     proxyUrl: 'http://localhost:8080',
+ *   })
+ *
+ *   return (
+ *     <div>
+ *       {messages.map(m => <Message key={m.id} message={m} />)}
+ *       <Input onSubmit={sendMessage} disabled={isLoading} />
+ *     </div>
+ *   )
+ * }
+ * ```
+ */
+export function useChatSession(
+	options: UseChatSessionOptions,
+): UseChatSessionReturn {
+	const {
+		autoConnect = true,
+		client: providedClient,
+		onError: userOnError,
+		...clientOptions
+	} = options;
+
+	// Error handler ref - allows client's onError to call setError
+	const [error, setError] = useState<Error | undefined>();
+	const onErrorRef = useRef<(err: Error) => void>(() => {});
+	onErrorRef.current = (err) => {
+		setError(err);
+		userOnError?.(err);
+	};
+
+	// Connection status state - ensures React re-renders on status changes
+	const [connectionStatus, setConnectionStatus] =
+		useState<ConnectionStatus>("disconnected");
+	const onStatusChangeRef = useRef<(status: ConnectionStatus) => void>(
+		() => {},
+	);
+	onStatusChangeRef.current = (status) => {
+		setConnectionStatus(status);
+	};
+
+	// Create client synchronously - always available immediately
+	const clientRef = useRef<{
+		client: DurableChatClient;
+		key: string;
+	} | null>(null);
+	const key = `${clientOptions.sessionId}:${clientOptions.proxyUrl}`;
+
+	// Create or recreate client when key changes or client was disposed
+	// The isDisposed check handles React Strict Mode: cleanup disposes the client,
+	// so the next render must create a fresh one with a new AbortController.
+	if (providedClient) {
+		if (!clientRef.current || clientRef.current.client !== providedClient) {
+			clientRef.current = { client: providedClient, key: "provided" };
+		}
+	} else if (
+		!clientRef.current ||
+		clientRef.current.key !== key ||
+		clientRef.current.client.isDisposed
+	) {
+		// Dispose old client if exists (may already be disposed, which is fine)
+		clientRef.current?.client.dispose();
+		clientRef.current = {
+			client: new DurableChatClient({
+				...clientOptions,
+				onError: (err) => onErrorRef.current(err),
+				onStatusChange: (status) => onStatusChangeRef.current(status),
+			}),
+			key,
+		};
+	}
+
+	const client = clientRef.current.client;
+
+	// =========================================================================
+	// Collection Subscriptions (1:1 from Electric SQL)
+	// =========================================================================
+
+	const chunkRows = useCollectionData(client.collections.chunks);
+	const presenceRows = useCollectionData(client.collections.presence);
+	const draftRows = useCollectionData(client.collections.drafts);
+
+	// =========================================================================
+	// Derived State
+	// =========================================================================
+
+	// Materialize messages from chunks (processed in collection order)
+	const { messages, streamingMessage } = useMemo(() => {
+		console.log(`[ai-chat/session] materialize: ${chunkRows.length} chunks`);
+		if (chunkRows.length === 0) {
+			return { messages: [], streamingMessage: null };
+		}
+
+		const all = materializeMessages(
+			chunkRows as Array<Record<string, unknown> & { id: string }>,
+		);
+
+		// Separate complete messages from streaming (incomplete) message
+		const complete = all.filter((m) => m.isComplete);
+		const streaming = all.find((m) => !m.isComplete) ?? null;
+
+		console.log(
+			`[ai-chat/session] materialized: ${all.length} total, ${complete.length} complete, streaming=${streaming ? `id=${streaming.id} role=${streaming.role} content="${streaming.content.slice(0, 80)}" blocks=${streaming.contentBlocks.length} isComplete=${streaming.isComplete} isStreaming=${streaming.isStreaming}` : "null"}`,
+		);
+		if (all.length > 0) {
+			console.log(
+				`[ai-chat/session] all messages:`,
+				all.map((m) => ({
+					id: m.id.slice(0, 8),
+					role: m.role,
+					isComplete: m.isComplete,
+					isStreaming: m.isStreaming,
+					contentLen: m.content.length,
+					blocks: m.contentBlocks.length,
+				})),
+			);
+		}
+
+		return { messages: complete, streamingMessage: streaming };
+	}, [chunkRows]);
+
+	// Transform presence to ChatUser[]
+	const users = useMemo(
+		(): ChatUser[] =>
+			presenceRows.map((p: StreamPresence) => ({
+				userId: p.userId,
+				name: p.userName,
+			})),
+		[presenceRows],
+	);
+
+	// All drafts
+	const drafts = useMemo((): StreamDraft[] => draftRows, [draftRows]);
+
+	// Current user's draft
+	const draft = useMemo((): string => {
+		const user = clientOptions.user;
+		if (!user) return "";
+		const myDraft = draftRows.find(
+			(d: StreamDraft) => d.userId === user.userId,
+		);
+		return myDraft?.content ?? "";
+	}, [draftRows]);
+
+	const isLoading = connectionStatus !== "connected";
+
+	// =========================================================================
+	// Connection Lifecycle (1:1 from Electric SQL)
+	// =========================================================================
+
+	useEffect(() => {
+		if (autoConnect && client.connectionStatus === "disconnected") {
+			client.connect().catch((err) => {
+				setError(err instanceof Error ? err : new Error(String(err)));
+			});
+		}
+
+		// Cleanup: unsubscribe and dispose (disposal is idempotent)
+		return () => {
+			if (!providedClient) {
+				client.dispose();
+			}
+		};
+	}, [client, autoConnect, providedClient]);
+
+	// =========================================================================
+	// Action Callbacks (1:1 from Electric SQL)
+	// =========================================================================
+
+	const sendMessage = useCallback(
+		async (content: string) => {
+			try {
+				await client.sendMessage(content);
+			} catch (err) {
+				setError(err instanceof Error ? err : new Error(String(err)));
+				throw err;
+			}
+		},
+		[client],
+	);
+
+	// setDraft is sync (fire-and-forget) for onChange compatibility
+	const setDraft = useCallback(
+		(content: string) => {
+			client.updateDraft(content).catch((err) => {
+				setError(err instanceof Error ? err : new Error(String(err)));
+			});
+		},
+		[client],
+	);
+
+	const connect = useCallback(async () => {
+		try {
+			await client.connect();
+		} catch (err) {
+			setError(err instanceof Error ? err : new Error(String(err)));
+			throw err;
+		}
+	}, [client]);
+
+	const disconnect = useCallback(() => {
+		client.disconnect();
+	}, [client]);
+
+	// =========================================================================
+	// Return (1:1 structure from Electric SQL)
+	// =========================================================================
+
+	return {
+		// Data
+		messages,
+		streamingMessage,
+		users,
+		draft,
+		drafts,
+
+		// Actions
+		sendMessage,
+		setDraft,
+
+		// State
+		isLoading,
+		error,
+		connectionStatus,
+
+		// Extensions
+		client,
+		collections: client.collections,
+		connect,
+		disconnect,
+	};
+}
diff --git a/packages/ai-chat/src/stream/useCollectionData.ts b/packages/ai-chat/src/stream/useCollectionData.ts
new file mode 100644
index 00000000000..7c749c5a804
--- /dev/null
+++ b/packages/ai-chat/src/stream/useCollectionData.ts
@@ -0,0 +1,104 @@
+/**
+ * SSR-safe hook for subscribing to TanStack DB collection data.
+ *
+ * Copied verbatim from @electric-sql/react-durable-session.
+ * This is a workaround to useLiveQuery not yet supporting SSR
+ * as per https://github.com/TanStack/db/pull/709
+ */
+
+import type { Collection } from "@tanstack/db";
+import { useRef, useSyncExternalStore } from "react";
+
+/**
+ * Extract the item type from a Collection.
+ *
+ * TanStack DB's Collection has 5 type parameters:
+ * `Collection<T, TKey, TUtils, TSchema, TInsertInput>`
+ *
+ * This helper extracts `T` (the item type) from any Collection variant.
+ */
+type CollectionItem<C> =
+	C extends Collection<infer T, any, any, any, any> ? T : never;
+
+/**
+ * SSR-safe hook for subscribing to TanStack DB collection data.
+ * This is a workaround to useLiveQuery not yet supporting SSR
+ * as per https://github.com/TanStack/db/pull/709
+ */
+export function useCollectionData<
+	C extends Collection<any, any, any, any, any>,
+>(collection: C): CollectionItem<C>[] {
+	type T = CollectionItem<C>;
+
+	// Track version to know when to create a new snapshot.
+	// Incremented by subscription callback when collection changes.
+	const versionRef = useRef(0);
+
+	// Cache the last snapshot to maintain stable reference.
+	// useSyncExternalStore requires getSnapshot to return the same reference
+	// when data hasn't changed, otherwise it triggers infinite re-renders.
+	const snapshotRef = useRef<{ version: number; data: T[] }>({
+		version: -1, // Force initial snapshot creation
+		data: [],
+	});
+
+	// Subscribe callback - increments version to signal data changed.
+	// Stored in ref to maintain stable reference for useSyncExternalStore.
+	const subscribeRef = useRef((onStoreChange: () => void): (() => void) => {
+		const subscription = collection.subscribeChanges(() => {
+			versionRef.current++;
+			onStoreChange();
+		});
+		return () => subscription.unsubscribe();
+	});
+
+	// Update subscribe ref when collection changes
+	subscribeRef.current = (onStoreChange: () => void): (() => void) => {
+		const subscription = collection.subscribeChanges(() => {
+			versionRef.current++;
+			console.log(`[ai-chat/collection] change detected, version=${versionRef.current}, size=${collection.size}`);
+			onStoreChange();
+		});
+		return () => subscription.unsubscribe();
+	};
+
+	// Snapshot callback - returns cached data unless version changed.
+	// Stored in ref to maintain stable reference for useSyncExternalStore.
+	const getSnapshotRef = useRef((): T[] => {
+		const currentVersion = versionRef.current;
+		const cached = snapshotRef.current;
+
+		// Return cached snapshot if version hasn't changed
+		if (cached.version === currentVersion) {
+			return cached.data;
+		}
+
+		// Version changed - create new snapshot and cache it
+		const data = [...collection.values()] as T[];
+		snapshotRef.current = { version: currentVersion, data };
+		return data;
+	});
+
+	// Update getSnapshot ref when collection changes
+	getSnapshotRef.current = (): T[] => {
+		const currentVersion = versionRef.current;
+		const cached = snapshotRef.current;
+
+		if (cached.version === currentVersion) {
+			return cached.data;
+		}
+
+		const data = [...collection.values()] as T[];
+		snapshotRef.current = { version: currentVersion, data };
+		return data;
+	};
+
+	// Pass the same function for both getSnapshot and getServerSnapshot.
+	// This ensures server and client render the same initial state (empty array),
+	// preventing hydration mismatches while enabling proper SSR.
+	return useSyncExternalStore(
+		subscribeRef.current,
+		getSnapshotRef.current,
+		getSnapshotRef.current,
+	);
+}
diff --git a/packages/ai-chat/src/types.ts b/packages/ai-chat/src/types.ts
new file mode 100644
index 00000000000..ee2c9903b06
--- /dev/null
+++ b/packages/ai-chat/src/types.ts
@@ -0,0 +1,112 @@
+/**
+ * Shared types for AI chat
+ */
+
+export interface StreamTextDeltaEvent {
+	type: "text_delta";
+	text: string;
+	timestamp: number;
+}
+
+export interface StreamToolUseStartEvent {
+	type: "tool_use_start";
+	toolName: string;
+	toolId: string;
+	timestamp: number;
+}
+
+export interface StreamToolUseDeltaEvent {
+	type: "tool_use_delta";
+	toolId: string;
+	partialJson: string;
+	timestamp: number;
+}
+
+export interface StreamToolUseEndEvent {
+	type: "tool_use_end";
+	toolId: string;
+	timestamp: number;
+}
+
+export interface StreamMessageCompleteEvent {
+	type: "message_complete";
+	inputTokens?: number;
+	outputTokens?: number;
+	timestamp: number;
+}
+
+export interface StreamErrorEvent {
+	type: "error";
+	error: string;
+	timestamp: number;
+}
+
+export interface StreamSessionStartEvent {
+	type: "session_start";
+	timestamp: number;
+}
+
+export interface StreamSessionEndEvent {
+	type: "session_end";
+	exitCode: number | null;
+	timestamp: number;
+}
+
+export type StreamEvent =
+	| StreamTextDeltaEvent
+	| StreamToolUseStartEvent
+	| StreamToolUseDeltaEvent
+	| StreamToolUseEndEvent
+	| StreamMessageCompleteEvent
+	| StreamErrorEvent
+	| StreamSessionStartEvent
+	| StreamSessionEndEvent;
+
+export interface StreamEntry {
+	offset: number;
+	event: StreamEvent;
+}
+
+export interface PresenceUser {
+	userId: string;
+	name: string;
+	image?: string;
+}
+
+export interface PresenceState {
+	viewers: PresenceUser[];
+	typingUsers: PresenceUser[];
+}
+
+export interface Draft {
+	userId: string;
+	userName: string;
+	content: string;
+	updatedAt: number;
+}
+
+export interface ChatMessage {
+	id: string;
+	sessionId: string;
+	role: "user" | "assistant";
+	content: string;
+	toolCalls?: unknown[];
+	inputTokens?: number;
+	outputTokens?: number;
+	createdById: string;
+	createdAt: Date;
+}
+
+export interface ChatSession {
+	id: string;
+	organizationId: string;
+	repositoryId?: string | null;
+	workspaceId?: string | null;
+	title: string;
+	claudeSessionId?: string | null;
+	cwd?: string | null;
+	createdById: string;
+	archivedAt?: Date | null;
+	createdAt: Date;
+	updatedAt: Date;
+}
diff --git a/packages/ai-chat/tsconfig.json b/packages/ai-chat/tsconfig.json
new file mode 100644
index 00000000000..f875d92d3a9
--- /dev/null
+++ b/packages/ai-chat/tsconfig.json
@@ -0,0 +1,12 @@
+{
+	"extends": "@superset/typescript/base.json",
+	"compilerOptions": {
+		"outDir": "./dist",
+		"rootDir": "./src",
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
+		"jsx": "react-jsx",
+		"types": ["node"]
+	},
+	"include": ["src/**/*.ts", "src/**/*.tsx"],
+	"exclude": ["node_modules", "dist"]
+}
diff --git a/packages/shared/src/constants.ts b/packages/shared/src/constants.ts
index ca3eb3005a7..4bde833f91d 100644
--- a/packages/shared/src/constants.ts
+++ b/packages/shared/src/constants.ts
@@ -55,6 +55,8 @@ export const FEATURE_FLAGS = {
 	BILLING_ENABLED: "billing-enabled",
 	/** Gates access to GitHub integration (currently buggy, internal only). */
 	GITHUB_INTEGRATION_ACCESS: "github-integration-access",
+	/** Gates access to AI chat (@superset.sh internal only). */
+	AI_CHAT: "ai-chat",
 	/** Gates access to Slack integration (internal only). */
 	SLACK_INTEGRATION_ACCESS: "slack-integration-access",
 } as const;

From 27c8890cdebf17201d44026ebf8d1edb071f8cfd Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Wed, 4 Feb 2026 13:02:56 -0800
Subject: [PATCH 2/4] Fix lints and types

---
 apps/api/package.json                         |   2 +-
 apps/desktop/src/renderer/index.tsx           |   2 +-
 apps/docs/package.json                        |   2 +-
 apps/marketing/package.json                   |   2 +-
 apps/web/package.json                         |   2 +-
 bun.lock                                      | 109 +++++++++++++++---
 packages/ai-chat/package.json                 |   7 +-
 packages/ai-chat/src/stream/client.ts         |  16 ++-
 packages/ai-chat/src/stream/materialize.ts    |   6 +-
 .../ai-chat/src/stream/useCollectionData.ts   |   6 +-
 packages/trpc/package.json                    |   2 +-
 packages/ui/package.json                      |   2 +-
 12 files changed, 121 insertions(+), 37 deletions(-)

diff --git a/apps/api/package.json b/apps/api/package.json
index 9ac03eee334..4effd9ac42d 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -11,7 +11,7 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@anthropic-ai/sdk": "^0.71.2",
+		"@anthropic-ai/sdk": "^0.72.1",
 		"@electric-sql/client": "https://pkg.pr.new/@electric-sql/client@3724",
 		"@linear/sdk": "^68.1.0",
 		"@modelcontextprotocol/sdk": "^1.25.3",
diff --git a/apps/desktop/src/renderer/index.tsx b/apps/desktop/src/renderer/index.tsx
index 7bbcf4bf404..922024714dd 100644
--- a/apps/desktop/src/renderer/index.tsx
+++ b/apps/desktop/src/renderer/index.tsx
@@ -41,7 +41,7 @@ const handleDeepLink = (path: string) => {
 	console.log("[deep-link] Navigating to:", path);
 	router.navigate({ to: path });
 };
-if (window.ipcRenderer?.on && window.ipcRenderer?.off) {
+if (window.ipcRenderer) {
 	window.ipcRenderer.on("deep-link-navigate", handleDeepLink);
 } else {
 	reportBootError(
diff --git a/apps/docs/package.json b/apps/docs/package.json
index dc968d55a59..80198f68a71 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -22,7 +22,7 @@
 		"fumadocs-core": "16.4.7",
 		"fumadocs-mdx": "14.2.5",
 		"fumadocs-ui": "16.4.7",
-		"lucide-react": "^0.560.0",
+		"lucide-react": "^0.563.0",
 		"next": "^16.0.10",
 		"posthog-js": "1.310.1",
 		"react": "19.1.0",
diff --git a/apps/marketing/package.json b/apps/marketing/package.json
index b57bd135650..53b3d0c1f2c 100644
--- a/apps/marketing/package.json
+++ b/apps/marketing/package.json
@@ -22,7 +22,7 @@
 		"geist": "^1.5.1",
 		"gray-matter": "^4.0.3",
 		"import-in-the-middle": "2.0.1",
-		"lucide-react": "^0.560.0",
+		"lucide-react": "^0.563.0",
 		"next": "^16.0.10",
 		"next-mdx-remote": "^5.0.0",
 		"next-themes": "^0.4.6",
diff --git a/apps/web/package.json b/apps/web/package.json
index d94cf8a8593..a338350fa2f 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -29,7 +29,7 @@
 		"geist": "^1.5.1",
 		"import-in-the-middle": "2.0.1",
 		"jose": "^6.1.3",
-		"lucide-react": "^0.560.0",
+		"lucide-react": "^0.563.0",
 		"next": "^16.0.10",
 		"next-themes": "^0.4.6",
 		"posthog-js": "1.310.1",
diff --git a/bun.lock b/bun.lock
index 4620526f5c4..cb477c62544 100644
--- a/bun.lock
+++ b/bun.lock
@@ -58,7 +58,7 @@
       "name": "@superset/api",
       "version": "0.1.0",
       "dependencies": {
-        "@anthropic-ai/sdk": "^0.71.2",
+        "@anthropic-ai/sdk": "^0.72.1",
         "@electric-sql/client": "https://pkg.pr.new/@electric-sql/client@3724",
         "@linear/sdk": "^68.1.0",
         "@modelcontextprotocol/sdk": "^1.25.3",
@@ -314,7 +314,7 @@
         "fumadocs-core": "16.4.7",
         "fumadocs-mdx": "14.2.5",
         "fumadocs-ui": "16.4.7",
-        "lucide-react": "^0.560.0",
+        "lucide-react": "^0.563.0",
         "next": "^16.0.10",
         "posthog-js": "1.310.1",
         "react": "19.1.0",
@@ -350,7 +350,7 @@
         "geist": "^1.5.1",
         "gray-matter": "^4.0.3",
         "import-in-the-middle": "2.0.1",
-        "lucide-react": "^0.560.0",
+        "lucide-react": "^0.563.0",
         "next": "^16.0.10",
         "next-mdx-remote": "^5.0.0",
         "next-themes": "^0.4.6",
@@ -468,7 +468,7 @@
         "geist": "^1.5.1",
         "import-in-the-middle": "2.0.1",
         "jose": "^6.1.3",
-        "lucide-react": "^0.560.0",
+        "lucide-react": "^0.563.0",
         "next": "^16.0.10",
         "next-themes": "^0.4.6",
         "posthog-js": "1.310.1",
@@ -493,6 +493,31 @@
         "typescript": "^5.9.3",
       },
     },
+    "packages/ai-chat": {
+      "name": "@superset/ai-chat",
+      "version": "0.0.1",
+      "dependencies": {
+        "@anthropic-ai/claude-agent-sdk": "^0.2.19",
+        "@anthropic-ai/sdk": "^0.72.1",
+        "@durable-streams/client": "^0.2.0",
+        "@durable-streams/state": "^0.2.0",
+        "@superset/ui": "workspace:*",
+        "@tanstack/db": "^0.5.24",
+        "@tanstack/react-db": "^0.1.68",
+        "lucide-react": "^0.563.0",
+        "zod": "^4.3.5",
+      },
+      "devDependencies": {
+        "@superset/typescript": "workspace:*",
+        "@types/node": "^24.9.1",
+        "@types/react": "~19.1.0",
+        "react": "19.1.0",
+        "typescript": "^5.9.3",
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+      },
+    },
     "packages/auth": {
       "name": "@superset/auth",
       "version": "0.1.0",
@@ -610,7 +635,7 @@
       "name": "@superset/trpc",
       "version": "0.1.0",
       "dependencies": {
-        "@anthropic-ai/sdk": "^0.71.2",
+        "@anthropic-ai/sdk": "^0.72.1",
         "@linear/sdk": "^68.1.0",
         "@superset/auth": "workspace:*",
         "@superset/db": "workspace:*",
@@ -670,7 +695,7 @@
         "date-fns": "^4.1.0",
         "embla-carousel-react": "^8.6.0",
         "input-otp": "^1.4.2",
-        "lucide-react": "^0.560.0",
+        "lucide-react": "^0.563.0",
         "motion": "^12.23.26",
         "nanoid": "^5.1.6",
         "next-themes": "^0.4.6",
@@ -727,7 +752,9 @@
 
     "@antfu/install-pkg": ["@antfu/install-pkg@1.1.0", "", { "dependencies": { "package-manager-detector": "^1.3.0", "tinyexec": "^1.0.1" } }, "sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ=="],
 
-    "@anthropic-ai/sdk": ["@anthropic-ai/sdk@0.71.2", "", { "dependencies": { "json-schema-to-ts": "^3.1.1" }, "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["zod"], "bin": { "anthropic-ai-sdk": "bin/cli" } }, "sha512-TGNDEUuEstk/DKu0/TflXAEt+p+p/WhTlFzEnoosvbaDU2LTjm42igSdlL0VijrKpWejtOKxX0b8A7uc+XiSAQ=="],
+    "@anthropic-ai/claude-agent-sdk": ["@anthropic-ai/claude-agent-sdk@0.2.31", "", { "optionalDependencies": { "@img/sharp-darwin-arm64": "^0.33.5", "@img/sharp-darwin-x64": "^0.33.5", "@img/sharp-linux-arm": "^0.33.5", "@img/sharp-linux-arm64": "^0.33.5", "@img/sharp-linux-x64": "^0.33.5", "@img/sharp-linuxmusl-arm64": "^0.33.5", "@img/sharp-linuxmusl-x64": "^0.33.5", "@img/sharp-win32-x64": "^0.33.5" }, "peerDependencies": { "zod": "^4.0.0" } }, "sha512-ZepnDG6r91je1LvrHST2C67m3olgmiYfrhnj4Elyj8AGqOHGYig1zDIPVhGF0u62y0rVVri2mGFDYQI0oW/LBw=="],
+
+    "@anthropic-ai/sdk": ["@anthropic-ai/sdk@0.72.1", "", { "dependencies": { "json-schema-to-ts": "^3.1.1" }, "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["zod"], "bin": { "anthropic-ai-sdk": "bin/cli" } }, "sha512-MiUnue7qN7DvLIoYHgkedN2z05mRf2CutBzjXXY2krzOhG2r/rIfISS2uVkNLikgToB5hYIzw+xp2jdOtRkqYQ=="],
 
     "@apm-js-collab/code-transformer": ["@apm-js-collab/code-transformer@0.8.2", "", {}, "sha512-YRjJjNq5KFSjDUoqu5pFUWrrsvGOxl6c3bu+uMFc9HNNptZ2rNU/TI2nLw4jnhQNtka972Ee2m3uqbvDQtPeCA=="],
 
@@ -991,6 +1018,10 @@
 
     "@drizzle-team/brocli": ["@drizzle-team/brocli@0.10.2", "", {}, "sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w=="],
 
+    "@durable-streams/client": ["@durable-streams/client@0.2.1", "", { "dependencies": { "@microsoft/fetch-event-source": "^2.0.1", "fastq": "^1.19.1" } }, "sha512-+mGdK6TuDR9fJPo8jw6DufPfoUv6g+27xoPES76GXQc6y3val9Oe/SK2o2FV9sqqLSE19HEUSxTp0D6CZebfZw=="],
+
+    "@durable-streams/state": ["@durable-streams/state@0.2.1", "", { "dependencies": { "@durable-streams/client": "0.2.1", "@standard-schema/spec": "^1.0.0" }, "peerDependencies": { "@tanstack/db": ">=0.5.0" } }, "sha512-8piCcw/y1Jz6QJn0vOf+yhovFlp3xvRbzWRWtF51ndlorofJi3pOfCXnEINuvSueuNMIJosmKOg0AEvpMKfoCw=="],
+
     "@electric-sql/client": ["@electric-sql/client@https://pkg.pr.new/@electric-sql/client@3724", { "dependencies": { "@microsoft/fetch-event-source": "^2.0.1" }, "optionalDependencies": { "@rollup/rollup-darwin-arm64": "^4.18.1" } }],
 
     "@electron/asar": ["@electron/asar@3.4.1", "", { "dependencies": { "commander": "^5.0.0", "glob": "^7.1.6", "minimatch": "^3.0.4" }, "bin": { "asar": "bin/asar.js" } }, "sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA=="],
@@ -1149,9 +1180,9 @@
 
     "@img/colour": ["@img/colour@1.0.0", "", {}, "sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw=="],
 
-    "@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.2.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w=="],
+    "@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.0.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ=="],
 
-    "@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.2.4" }, "os": "darwin", "cpu": "x64" }, "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw=="],
+    "@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.0.4" }, "os": "darwin", "cpu": "x64" }, "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q=="],
 
     "@img/sharp-libvips-darwin-arm64": ["@img/sharp-libvips-darwin-arm64@1.2.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g=="],
 
@@ -1173,9 +1204,9 @@
 
     "@img/sharp-libvips-linuxmusl-x64": ["@img/sharp-libvips-linuxmusl-x64@1.2.4", "", { "os": "linux", "cpu": "x64" }, "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg=="],
 
-    "@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.2.4" }, "os": "linux", "cpu": "arm" }, "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw=="],
+    "@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.0.5" }, "os": "linux", "cpu": "arm" }, "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ=="],
 
-    "@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.2.4" }, "os": "linux", "cpu": "arm64" }, "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg=="],
+    "@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.0.4" }, "os": "linux", "cpu": "arm64" }, "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA=="],
 
     "@img/sharp-linux-ppc64": ["@img/sharp-linux-ppc64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-ppc64": "1.2.4" }, "os": "linux", "cpu": "ppc64" }, "sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA=="],
 
@@ -1183,11 +1214,11 @@
 
     "@img/sharp-linux-s390x": ["@img/sharp-linux-s390x@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-s390x": "1.2.4" }, "os": "linux", "cpu": "s390x" }, "sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg=="],
 
-    "@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.2.4" }, "os": "linux", "cpu": "x64" }, "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ=="],
+    "@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.0.4" }, "os": "linux", "cpu": "x64" }, "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA=="],
 
-    "@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.2.4" }, "os": "linux", "cpu": "arm64" }, "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg=="],
+    "@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.0.4" }, "os": "linux", "cpu": "arm64" }, "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g=="],
 
-    "@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.2.4" }, "os": "linux", "cpu": "x64" }, "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q=="],
+    "@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.0.4" }, "os": "linux", "cpu": "x64" }, "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw=="],
 
     "@img/sharp-wasm32": ["@img/sharp-wasm32@0.34.5", "", { "dependencies": { "@emnapi/runtime": "^1.7.0" }, "cpu": "none" }, "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw=="],
 
@@ -1195,7 +1226,7 @@
 
     "@img/sharp-win32-ia32": ["@img/sharp-win32-ia32@0.34.5", "", { "os": "win32", "cpu": "ia32" }, "sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg=="],
 
-    "@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.34.5", "", { "os": "win32", "cpu": "x64" }, "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw=="],
+    "@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.33.5", "", { "os": "win32", "cpu": "x64" }, "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg=="],
 
     "@isaacs/balanced-match": ["@isaacs/balanced-match@4.0.1", "", {}, "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ=="],
 
@@ -1795,6 +1826,8 @@
 
     "@superset/admin": ["@superset/admin@workspace:apps/admin"],
 
+    "@superset/ai-chat": ["@superset/ai-chat@workspace:packages/ai-chat"],
+
     "@superset/api": ["@superset/api@workspace:apps/api"],
 
     "@superset/auth": ["@superset/auth@workspace:packages/auth"],
@@ -1871,7 +1904,7 @@
 
     "@tailwindcss/vite": ["@tailwindcss/vite@4.1.18", "", { "dependencies": { "@tailwindcss/node": "4.1.18", "@tailwindcss/oxide": "4.1.18", "tailwindcss": "4.1.18" }, "peerDependencies": { "vite": "^5.2.0 || ^6 || ^7" } }, "sha512-jVA+/UpKL1vRLg6Hkao5jldawNmRo7mQYrZtNHMIVpLfLhDml5nMRUo/8MwoX2vNXvnaXNNMedrMfMugAVX1nA=="],
 
-    "@tanstack/db": ["@tanstack/db@0.5.22", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@tanstack/db-ivm": "0.1.17", "@tanstack/pacer-lite": "^0.2.0" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-Qh33d9Idw7lEa/sg7veJfG8EUmSMtBzRkk/ghAVIDA3MJWAjyGOzU29TVZaM7K36BegTL8T/yVVlAFqjn/G2pw=="],
+    "@tanstack/db": ["@tanstack/db@0.5.25", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@tanstack/db-ivm": "0.1.17", "@tanstack/pacer-lite": "^0.2.0" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-VqVchs6Mm4rw2GyiOkaoD+PJw6lCJT8EI/TzPu8KWZy3QxyOlilpMvEuDTCl0LZdp1iLYlQT1NdgDg0gimV3kQ=="],
 
     "@tanstack/db-ivm": ["@tanstack/db-ivm@0.1.17", "", { "dependencies": { "fractional-indexing": "^3.2.0", "sorted-btree": "^1.8.1" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-DK7vm56CDxNuRAdsbiPs+gITJ+16tUtYgZg3BRTLYKGIDsy8sdIO7sQFq5zl7Y+aIKAPmMAbVp9UjJ75FTtwgQ=="],
 
@@ -1885,7 +1918,7 @@
 
     "@tanstack/query-devtools": ["@tanstack/query-devtools@5.93.0", "", {}, "sha512-+kpsx1NQnOFTZsw6HAFCW3HkKg0+2cepGtAWXjiiSOJJ1CtQpt72EE2nyZb+AjAbLRPoeRmPJ8MtQd8r8gsPdg=="],
 
-    "@tanstack/react-db": ["@tanstack/react-db@0.1.66", "", { "dependencies": { "@tanstack/db": "0.5.22", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-BEFrXv0pa3KPZfLmfrR6KU1QwUtDPQoV/PdJYGhVEsOwYf61yVQkuFOqK2aGYOynipMdACl5N6TXs82mS4fB6A=="],
+    "@tanstack/react-db": ["@tanstack/react-db@0.1.69", "", { "dependencies": { "@tanstack/db": "0.5.25", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-rqhajRK5InIEKT9RABE9zNbYZL5NGkySjGNVANyilu/ADFHV8rhtkMEnhHcbrzv0grIKpcSlx1AvTgJNbbzjkw=="],
 
     "@tanstack/react-query": ["@tanstack/react-query@5.90.20", "", { "dependencies": { "@tanstack/query-core": "5.90.20" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-vXBxa+qeyveVO7OA0jX1z+DeyCA4JKnThKv411jd5SORpBKgkcVnYKCiBgECvADvniBX7tobwBmg01qq9JmMJw=="],
 
@@ -3609,7 +3642,7 @@
 
     "lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
 
-    "lucide-react": ["lucide-react@0.560.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-NwKoUA/aBShsdL8WE5lukV2F/tjHzQRlonQs7fkNGI1sCT0Ay4a9Ap3ST2clUUkcY+9eQ0pBe2hybTQd2fmyDA=="],
+    "lucide-react": ["lucide-react@0.563.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-8dXPB2GI4dI8jV4MgUDGBeLdGk8ekfqVZ0BdLcrRzocGgG75ltNEmWS+gE7uokKF/0oSUuczNDT+g9hFJ23FkA=="],
 
     "lucide-react-native": ["lucide-react-native@0.562.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-native": "*", "react-native-svg": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0" } }, "sha512-ZF2ok8SzyUaiCIrLGqYh/6SPs+huVzbZOCv0i411L4+oP3tJgQvvKePiVgWCioa7HsT2xaJZSrdd92cuB2/+ew=="],
 
@@ -5115,6 +5148,20 @@
 
     "@fumadocs/ui/postcss-selector-parser": ["postcss-selector-parser@7.1.1", "", { "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" } }, "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg=="],
 
+    "@img/sharp-darwin-arm64/@img/sharp-libvips-darwin-arm64": ["@img/sharp-libvips-darwin-arm64@1.0.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg=="],
+
+    "@img/sharp-darwin-x64/@img/sharp-libvips-darwin-x64": ["@img/sharp-libvips-darwin-x64@1.0.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ=="],
+
+    "@img/sharp-linux-arm/@img/sharp-libvips-linux-arm": ["@img/sharp-libvips-linux-arm@1.0.5", "", { "os": "linux", "cpu": "arm" }, "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g=="],
+
+    "@img/sharp-linux-arm64/@img/sharp-libvips-linux-arm64": ["@img/sharp-libvips-linux-arm64@1.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA=="],
+
+    "@img/sharp-linux-x64/@img/sharp-libvips-linux-x64": ["@img/sharp-libvips-linux-x64@1.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw=="],
+
+    "@img/sharp-linuxmusl-arm64/@img/sharp-libvips-linuxmusl-arm64": ["@img/sharp-libvips-linuxmusl-arm64@1.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA=="],
+
+    "@img/sharp-linuxmusl-x64/@img/sharp-libvips-linuxmusl-x64": ["@img/sharp-libvips-linuxmusl-x64@1.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw=="],
+
     "@isaacs/cliui/string-width": ["string-width@5.1.2", "", { "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", "strip-ansi": "^7.0.1" } }, "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="],
 
     "@isaacs/cliui/wrap-ansi": ["wrap-ansi@8.1.0", "", { "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", "strip-ansi": "^7.0.1" } }, "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="],
@@ -5237,6 +5284,14 @@
 
     "@slack/web-api/eventemitter3": ["eventemitter3@5.0.4", "", {}, "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw=="],
 
+    "@superset/desktop/@tanstack/db": ["@tanstack/db@0.5.22", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@tanstack/db-ivm": "0.1.17", "@tanstack/pacer-lite": "^0.2.0" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-Qh33d9Idw7lEa/sg7veJfG8EUmSMtBzRkk/ghAVIDA3MJWAjyGOzU29TVZaM7K36BegTL8T/yVVlAFqjn/G2pw=="],
+
+    "@superset/desktop/@tanstack/react-db": ["@tanstack/react-db@0.1.66", "", { "dependencies": { "@tanstack/db": "0.5.22", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-BEFrXv0pa3KPZfLmfrR6KU1QwUtDPQoV/PdJYGhVEsOwYf61yVQkuFOqK2aGYOynipMdACl5N6TXs82mS4fB6A=="],
+
+    "@superset/mobile/@tanstack/db": ["@tanstack/db@0.5.22", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@tanstack/db-ivm": "0.1.17", "@tanstack/pacer-lite": "^0.2.0" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-Qh33d9Idw7lEa/sg7veJfG8EUmSMtBzRkk/ghAVIDA3MJWAjyGOzU29TVZaM7K36BegTL8T/yVVlAFqjn/G2pw=="],
+
+    "@superset/mobile/@tanstack/react-db": ["@tanstack/react-db@0.1.66", "", { "dependencies": { "@tanstack/db": "0.5.22", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-BEFrXv0pa3KPZfLmfrR6KU1QwUtDPQoV/PdJYGhVEsOwYf61yVQkuFOqK2aGYOynipMdACl5N6TXs82mS4fB6A=="],
+
     "@tailwindcss/node/jiti": ["jiti@2.6.1", "", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ=="],
 
     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.8.1", "", { "dependencies": { "@emnapi/wasi-threads": "1.1.0", "tslib": "^2.4.0" }, "bundled": true }, "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg=="],
@@ -5251,6 +5306,8 @@
 
     "@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
+    "@tanstack/electric-db-collection/@tanstack/db": ["@tanstack/db@0.5.22", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@tanstack/db-ivm": "0.1.17", "@tanstack/pacer-lite": "^0.2.0" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-Qh33d9Idw7lEa/sg7veJfG8EUmSMtBzRkk/ghAVIDA3MJWAjyGOzU29TVZaM7K36BegTL8T/yVVlAFqjn/G2pw=="],
+
     "@tanstack/router-generator/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
 
     "@tanstack/router-plugin/unplugin": ["unplugin@2.3.11", "", { "dependencies": { "@jridgewell/remapping": "^2.3.5", "acorn": "^8.15.0", "picomatch": "^4.0.3", "webpack-virtual-modules": "^0.6.2" } }, "sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww=="],
@@ -5641,6 +5698,22 @@
 
     "serialize-error/type-fest": ["type-fest@0.13.1", "", {}, "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="],
 
+    "sharp/@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.2.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w=="],
+
+    "sharp/@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.2.4" }, "os": "darwin", "cpu": "x64" }, "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw=="],
+
+    "sharp/@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.2.4" }, "os": "linux", "cpu": "arm" }, "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw=="],
+
+    "sharp/@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.2.4" }, "os": "linux", "cpu": "arm64" }, "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg=="],
+
+    "sharp/@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.2.4" }, "os": "linux", "cpu": "x64" }, "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ=="],
+
+    "sharp/@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.2.4" }, "os": "linux", "cpu": "arm64" }, "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg=="],
+
+    "sharp/@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.2.4" }, "os": "linux", "cpu": "x64" }, "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q=="],
+
+    "sharp/@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.34.5", "", { "os": "win32", "cpu": "x64" }, "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw=="],
+
     "simple-plist/bplist-parser": ["bplist-parser@0.3.1", "", { "dependencies": { "big-integer": "1.6.x" } }, "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA=="],
 
     "simple-swizzle/is-arrayish": ["is-arrayish@0.3.4", "", {}, "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA=="],
diff --git a/packages/ai-chat/package.json b/packages/ai-chat/package.json
index 687051bd84e..acc846b81af 100644
--- a/packages/ai-chat/package.json
+++ b/packages/ai-chat/package.json
@@ -6,7 +6,6 @@
 	"main": "./src/index.ts",
 	"exports": {
 		".": "./src/index.ts",
-		"./hooks": "./src/hooks/index.ts",
 		"./components": "./src/components/index.ts",
 		"./stream": "./src/stream/index.ts"
 	},
@@ -15,20 +14,20 @@
 	},
 	"dependencies": {
 		"@anthropic-ai/claude-agent-sdk": "^0.2.19",
-		"@anthropic-ai/sdk": "^0.71.2",
+		"@anthropic-ai/sdk": "^0.72.1",
 		"@durable-streams/client": "^0.2.0",
 		"@durable-streams/state": "^0.2.0",
 		"@superset/ui": "workspace:*",
 		"@tanstack/db": "^0.5.24",
 		"@tanstack/react-db": "^0.1.68",
-		"lucide-react": "^0.560.0",
-		"react": "19.1.0",
+		"lucide-react": "^0.563.0",
 		"zod": "^4.3.5"
 	},
 	"devDependencies": {
 		"@superset/typescript": "workspace:*",
 		"@types/node": "^24.9.1",
 		"@types/react": "~19.1.0",
+		"react": "19.1.0",
 		"typescript": "^5.9.3"
 	},
 	"peerDependencies": {
diff --git a/packages/ai-chat/src/stream/client.ts b/packages/ai-chat/src/stream/client.ts
index 0da066d8ead..e62ac7f715f 100644
--- a/packages/ai-chat/src/stream/client.ts
+++ b/packages/ai-chat/src/stream/client.ts
@@ -26,7 +26,10 @@ import {
 
 /** UUID generator with fallback for environments without crypto.randomUUID (React Native). */
 function generateUUID(): string {
-	if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+	if (
+		typeof crypto !== "undefined" &&
+		typeof crypto.randomUUID === "function"
+	) {
 		return crypto.randomUUID();
 	}
 	return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
@@ -124,8 +127,7 @@ export class DurableChatClient {
 	constructor(options: DurableChatClientOptions) {
 		this.options = options;
 		this.sessionId = options.sessionId;
-		this.actorId =
-			options.actorId ?? options.user?.userId ?? generateUUID();
+		this.actorId = options.actorId ?? options.user?.userId ?? generateUUID();
 
 		// Create abort controller before anything else
 		this._abortController = new AbortController();
@@ -204,7 +206,9 @@ export class DurableChatClient {
 
 		try {
 			this._setConnectionStatus("connecting");
-			console.log(`[ai-chat/client] connect() sessionId=${this.sessionId} url=${this.options.proxyUrl}`);
+			console.log(
+				`[ai-chat/client] connect() sessionId=${this.sessionId} url=${this.options.proxyUrl}`,
+			);
 
 			// Preload stream data
 			await this._db.preload();
@@ -270,7 +274,9 @@ export class DurableChatClient {
 		}
 
 		const uuid = generateUUID();
-		console.log(`[ai-chat/client] sendMessage uuid=${uuid} content="${content.slice(0, 50)}"`);
+		console.log(
+			`[ai-chat/client] sendMessage uuid=${uuid} content="${content.slice(0, 50)}"`,
+		);
 
 		await this._appendToStream([
 			{
diff --git a/packages/ai-chat/src/stream/materialize.ts b/packages/ai-chat/src/stream/materialize.ts
index 7b1fb3c8368..cfd47a08ce3 100644
--- a/packages/ai-chat/src/stream/materialize.ts
+++ b/packages/ai-chat/src/stream/materialize.ts
@@ -78,7 +78,9 @@ export function materializeMessages(chunks: ChunkRow[]): MessageRow[] {
 		return aSeq - bSeq;
 	});
 
-	console.log(`[ai-chat/materialize] processing ${sorted.length} sorted chunks, types: ${sorted.map(c => c.type).join(", ")}`);
+	console.log(
+		`[ai-chat/materialize] processing ${sorted.length} sorted chunks, types: ${sorted.map((c) => c.type).join(", ")}`,
+	);
 
 	const messages: MessageRow[] = [];
 	let currentTurnChunks: ChunkRow[] = [];
@@ -150,7 +152,7 @@ export function materializeMessages(chunks: ChunkRow[]): MessageRow[] {
  * Materialize a single assistant turn from its SDK message chunks.
  */
 function materializeTurn(chunks: ChunkRow[]): MessageRow {
-	const firstChunk = chunks[0]!;
+	const firstChunk = chunks[0] as ChunkRow;
 
 	console.log(
 		`[ai-chat/materialize] materializeTurn: ${chunks.length} chunks, types: ${chunks.map((c) => c.type).join(", ")}`,
diff --git a/packages/ai-chat/src/stream/useCollectionData.ts b/packages/ai-chat/src/stream/useCollectionData.ts
index 7c749c5a804..3826e5ff541 100644
--- a/packages/ai-chat/src/stream/useCollectionData.ts
+++ b/packages/ai-chat/src/stream/useCollectionData.ts
@@ -18,6 +18,7 @@ import { useRef, useSyncExternalStore } from "react";
  * This helper extracts `T` (the item type) from any Collection variant.
  */
 type CollectionItem<C> =
+	// biome-ignore lint/suspicious/noExplicitAny: Collection has constrained generic params that require any
 	C extends Collection<infer T, any, any, any, any> ? T : never;
 
 /**
@@ -26,6 +27,7 @@ type CollectionItem<C> =
  * as per https://github.com/TanStack/db/pull/709
  */
 export function useCollectionData<
+	// biome-ignore lint/suspicious/noExplicitAny: Collection has constrained generic params that require any
 	C extends Collection<any, any, any, any, any>,
 >(collection: C): CollectionItem<C>[] {
 	type T = CollectionItem<C>;
@@ -56,7 +58,9 @@ export function useCollectionData<
 	subscribeRef.current = (onStoreChange: () => void): (() => void) => {
 		const subscription = collection.subscribeChanges(() => {
 			versionRef.current++;
-			console.log(`[ai-chat/collection] change detected, version=${versionRef.current}, size=${collection.size}`);
+			console.log(
+				`[ai-chat/collection] change detected, version=${versionRef.current}, size=${collection.size}`,
+			);
 			onStoreChange();
 		});
 		return () => subscription.unsubscribe();
diff --git a/packages/trpc/package.json b/packages/trpc/package.json
index a04a063cc8b..1939359989b 100644
--- a/packages/trpc/package.json
+++ b/packages/trpc/package.json
@@ -18,7 +18,7 @@
 		"typecheck": "tsc --noEmit --emitDeclarationOnly false"
 	},
 	"dependencies": {
-		"@anthropic-ai/sdk": "^0.71.2",
+		"@anthropic-ai/sdk": "^0.72.1",
 		"@linear/sdk": "^68.1.0",
 		"@superset/auth": "workspace:*",
 		"@superset/db": "workspace:*",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 67e4b220b30..919a1447c79 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -58,7 +58,7 @@
 		"date-fns": "^4.1.0",
 		"embla-carousel-react": "^8.6.0",
 		"input-otp": "^1.4.2",
-		"lucide-react": "^0.560.0",
+		"lucide-react": "^0.563.0",
 		"motion": "^12.23.26",
 		"nanoid": "^5.1.6",
 		"next-themes": "^0.4.6",

From a009d09d54281a7387f1a103dbc9814c6fb15a24 Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Wed, 4 Feb 2026 13:17:52 -0800
Subject: [PATCH 3/4] Materialize fix and tests

---
 packages/ai-chat/package.json                 |  2 +
 packages/ai-chat/src/stream/client.ts         |  2 +-
 .../ai-chat/src/stream/materialize.test.ts    | 75 +++++++++++++++++++
 packages/ai-chat/src/stream/materialize.ts    | 48 +++++++++---
 4 files changed, 117 insertions(+), 10 deletions(-)
 create mode 100644 packages/ai-chat/src/stream/materialize.test.ts

diff --git a/packages/ai-chat/package.json b/packages/ai-chat/package.json
index acc846b81af..2282a54ec81 100644
--- a/packages/ai-chat/package.json
+++ b/packages/ai-chat/package.json
@@ -10,6 +10,7 @@
 		"./stream": "./src/stream/index.ts"
 	},
 	"scripts": {
+		"test": "bun test",
 		"typecheck": "tsc --noEmit --emitDeclarationOnly false"
 	},
 	"dependencies": {
@@ -25,6 +26,7 @@
 	},
 	"devDependencies": {
 		"@superset/typescript": "workspace:*",
+		"bun-types": "^1.3.1",
 		"@types/node": "^24.9.1",
 		"@types/react": "~19.1.0",
 		"react": "19.1.0",
diff --git a/packages/ai-chat/src/stream/client.ts b/packages/ai-chat/src/stream/client.ts
index e62ac7f715f..d4592470ad5 100644
--- a/packages/ai-chat/src/stream/client.ts
+++ b/packages/ai-chat/src/stream/client.ts
@@ -239,7 +239,6 @@ export class DurableChatClient {
 		}
 
 		this._db.close();
-		this._abortController.abort();
 		this._isConnected = false;
 		this._setConnectionStatus("disconnected");
 	}
@@ -254,6 +253,7 @@ export class DurableChatClient {
 		if (this._isDisposed) return;
 		this._isDisposed = true;
 		this.disconnect();
+		this._abortController.abort();
 	}
 
 	// =========================================================================
diff --git a/packages/ai-chat/src/stream/materialize.test.ts b/packages/ai-chat/src/stream/materialize.test.ts
new file mode 100644
index 00000000000..9e51b593227
--- /dev/null
+++ b/packages/ai-chat/src/stream/materialize.test.ts
@@ -0,0 +1,75 @@
+import { describe, expect, it } from "bun:test";
+import { materializeMessages } from "./materialize";
+
+type ChunkInput = {
+	id: string;
+	type: "user_input";
+	content: string;
+	actorId: string;
+	createdAt?: string;
+	_seq?: number;
+};
+
+const makeUserChunk = ({
+	id,
+	createdAt,
+	_seq,
+}: {
+	id: string;
+	createdAt?: string;
+	_seq?: number;
+}): ChunkInput => ({
+	id,
+	type: "user_input",
+	content: `msg-${id}`,
+	actorId: "user-1",
+	createdAt,
+	_seq,
+});
+
+describe("materializeMessages ordering", () => {
+	it("orders by _seq when available", () => {
+		const chunks = [
+			makeUserChunk({
+				id: "a",
+				createdAt: "2024-01-01T00:00:02.000Z",
+				_seq: 2,
+			}),
+			makeUserChunk({
+				id: "b",
+				createdAt: "2024-01-01T00:00:01.000Z",
+				_seq: 1,
+			}),
+		];
+
+		const messages = materializeMessages(chunks);
+		expect(messages.map((m) => m.id)).toEqual(["b", "a"]);
+	});
+
+	it("falls back to createdAt when _seq is missing", () => {
+		const chunks = [
+			makeUserChunk({
+				id: "a",
+				createdAt: "2024-01-01T00:00:02.000Z",
+			}),
+			makeUserChunk({
+				id: "b",
+				createdAt: "2024-01-01T00:00:01.000Z",
+			}),
+		];
+
+		const messages = materializeMessages(chunks);
+		expect(messages.map((m) => m.id)).toEqual(["b", "a"]);
+	});
+
+	it("preserves input order when both _seq and createdAt are missing", () => {
+		const chunks = [
+			makeUserChunk({ id: "a" }),
+			makeUserChunk({ id: "b" }),
+			makeUserChunk({ id: "c" }),
+		];
+
+		const messages = materializeMessages(chunks);
+		expect(messages.map((m) => m.id)).toEqual(["a", "b", "c"]);
+	});
+});
diff --git a/packages/ai-chat/src/stream/materialize.ts b/packages/ai-chat/src/stream/materialize.ts
index cfd47a08ce3..58880534039 100644
--- a/packages/ai-chat/src/stream/materialize.ts
+++ b/packages/ai-chat/src/stream/materialize.ts
@@ -51,6 +51,12 @@ export interface MessageRow {
 /** Raw chunk row from the durable stream collection */
 export type ChunkRow = Record<string, unknown> & { id: string };
 
+interface ChunkSortKey {
+	seq: number | null;
+	time: number | null;
+	index: number;
+}
+
 // ============================================================================
 // Materialize All Messages
 // ============================================================================
@@ -68,15 +74,15 @@ export type ChunkRow = Record<string, unknown> & { id: string };
 export function materializeMessages(chunks: ChunkRow[]): MessageRow[] {
 	if (chunks.length === 0) return [];
 
-	// Sort by createdAt, then _seq as tiebreaker for same-millisecond chunks
-	const sorted = [...chunks].sort((a, b) => {
-		const aTime = a.createdAt ? new Date(String(a.createdAt)).getTime() : 0;
-		const bTime = b.createdAt ? new Date(String(b.createdAt)).getTime() : 0;
-		if (aTime !== bTime) return aTime - bTime;
-		const aSeq = typeof a._seq === "number" ? a._seq : 0;
-		const bSeq = typeof b._seq === "number" ? b._seq : 0;
-		return aSeq - bSeq;
-	});
+	// Sort by stream sequence when available, then createdAt, then original index.
+	// createdAt is not guaranteed on SDK messages, so _seq should be authoritative.
+	const sorted = [...chunks]
+		.map((chunk, index) => ({
+			chunk,
+			key: getChunkSortKey(chunk, index),
+		}))
+		.sort((a, b) => compareChunkSortKeys(a.key, b.key))
+		.map(({ chunk }) => chunk);
 
 	console.log(
 		`[ai-chat/materialize] processing ${sorted.length} sorted chunks, types: ${sorted.map((c) => c.type).join(", ")}`,
@@ -338,3 +344,27 @@ export function isUserMessage(row: MessageRow): boolean {
 export function isAssistantMessage(row: MessageRow): boolean {
 	return row.role === "assistant";
 }
+
+function getChunkSortKey(chunk: ChunkRow, index: number): ChunkSortKey {
+	const seq = typeof chunk._seq === "number" ? chunk._seq : null;
+	const time = chunk.createdAt
+		? new Date(String(chunk.createdAt)).getTime()
+		: null;
+	return { seq, time, index };
+}
+
+function compareChunkSortKeys(a: ChunkSortKey, b: ChunkSortKey): number {
+	if (a.seq !== null || b.seq !== null) {
+		if (a.seq === null) return 1;
+		if (b.seq === null) return -1;
+		if (a.seq !== b.seq) return a.seq - b.seq;
+	}
+
+	if (a.time !== null || b.time !== null) {
+		if (a.time === null) return 1;
+		if (b.time === null) return -1;
+		if (a.time !== b.time) return a.time - b.time;
+	}
+
+	return a.index - b.index;
+}

From 2a3f01c37a01b904fd2cec4e49d4e89f279ee7d0 Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Wed, 4 Feb 2026 14:49:41 -0800
Subject: [PATCH 4/4] Fixes

---
 apps/desktop/src/renderer/index.tsx           |  9 ++-
 bun.lock                                      | 19 ++-----
 packages/ai-chat/package.json                 |  6 +-
 packages/ai-chat/src/stream/client.ts         |  2 +-
 packages/ai-chat/src/stream/materialize.ts    |  7 ++-
 packages/ai-chat/src/stream/useChatSession.ts |  4 ++
 .../ai-chat/src/stream/useCollectionData.ts   | 56 ++++++++-----------
 packages/ai-chat/tsconfig.json                |  2 +-
 8 files changed, 48 insertions(+), 57 deletions(-)

diff --git a/apps/desktop/src/renderer/index.tsx b/apps/desktop/src/renderer/index.tsx
index 922024714dd..f636d9f3341 100644
--- a/apps/desktop/src/renderer/index.tsx
+++ b/apps/desktop/src/renderer/index.tsx
@@ -41,8 +41,9 @@ const handleDeepLink = (path: string) => {
 	console.log("[deep-link] Navigating to:", path);
 	router.navigate({ to: path });
 };
-if (window.ipcRenderer) {
-	window.ipcRenderer.on("deep-link-navigate", handleDeepLink);
+const ipcRenderer = window.ipcRenderer as typeof window.ipcRenderer | undefined;
+if (ipcRenderer) {
+	ipcRenderer.on("deep-link-navigate", handleDeepLink);
 } else {
 	reportBootError(
 		"Renderer preload not available (window.ipcRenderer missing)",
@@ -52,7 +53,9 @@ if (window.ipcRenderer) {
 if (import.meta.hot) {
 	import.meta.hot.dispose(() => {
 		unsubscribe();
-		window.ipcRenderer?.off?.("deep-link-navigate", handleDeepLink);
+		if (ipcRenderer) {
+			ipcRenderer.off("deep-link-navigate", handleDeepLink);
+		}
 		cleanupBootErrorHandling();
 	});
 }
diff --git a/bun.lock b/bun.lock
index cb477c62544..3a40ee374a4 100644
--- a/bun.lock
+++ b/bun.lock
@@ -502,8 +502,8 @@
         "@durable-streams/client": "^0.2.0",
         "@durable-streams/state": "^0.2.0",
         "@superset/ui": "workspace:*",
-        "@tanstack/db": "^0.5.24",
-        "@tanstack/react-db": "^0.1.68",
+        "@tanstack/db": "0.5.22",
+        "@tanstack/react-db": "0.1.66",
         "lucide-react": "^0.563.0",
         "zod": "^4.3.5",
       },
@@ -511,6 +511,7 @@
         "@superset/typescript": "workspace:*",
         "@types/node": "^24.9.1",
         "@types/react": "~19.1.0",
+        "bun-types": "^1.3.1",
         "react": "19.1.0",
         "typescript": "^5.9.3",
       },
@@ -1904,7 +1905,7 @@
 
     "@tailwindcss/vite": ["@tailwindcss/vite@4.1.18", "", { "dependencies": { "@tailwindcss/node": "4.1.18", "@tailwindcss/oxide": "4.1.18", "tailwindcss": "4.1.18" }, "peerDependencies": { "vite": "^5.2.0 || ^6 || ^7" } }, "sha512-jVA+/UpKL1vRLg6Hkao5jldawNmRo7mQYrZtNHMIVpLfLhDml5nMRUo/8MwoX2vNXvnaXNNMedrMfMugAVX1nA=="],
 
-    "@tanstack/db": ["@tanstack/db@0.5.25", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@tanstack/db-ivm": "0.1.17", "@tanstack/pacer-lite": "^0.2.0" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-VqVchs6Mm4rw2GyiOkaoD+PJw6lCJT8EI/TzPu8KWZy3QxyOlilpMvEuDTCl0LZdp1iLYlQT1NdgDg0gimV3kQ=="],
+    "@tanstack/db": ["@tanstack/db@0.5.22", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@tanstack/db-ivm": "0.1.17", "@tanstack/pacer-lite": "^0.2.0" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-Qh33d9Idw7lEa/sg7veJfG8EUmSMtBzRkk/ghAVIDA3MJWAjyGOzU29TVZaM7K36BegTL8T/yVVlAFqjn/G2pw=="],
 
     "@tanstack/db-ivm": ["@tanstack/db-ivm@0.1.17", "", { "dependencies": { "fractional-indexing": "^3.2.0", "sorted-btree": "^1.8.1" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-DK7vm56CDxNuRAdsbiPs+gITJ+16tUtYgZg3BRTLYKGIDsy8sdIO7sQFq5zl7Y+aIKAPmMAbVp9UjJ75FTtwgQ=="],
 
@@ -1918,7 +1919,7 @@
 
     "@tanstack/query-devtools": ["@tanstack/query-devtools@5.93.0", "", {}, "sha512-+kpsx1NQnOFTZsw6HAFCW3HkKg0+2cepGtAWXjiiSOJJ1CtQpt72EE2nyZb+AjAbLRPoeRmPJ8MtQd8r8gsPdg=="],
 
-    "@tanstack/react-db": ["@tanstack/react-db@0.1.69", "", { "dependencies": { "@tanstack/db": "0.5.25", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-rqhajRK5InIEKT9RABE9zNbYZL5NGkySjGNVANyilu/ADFHV8rhtkMEnhHcbrzv0grIKpcSlx1AvTgJNbbzjkw=="],
+    "@tanstack/react-db": ["@tanstack/react-db@0.1.66", "", { "dependencies": { "@tanstack/db": "0.5.22", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-BEFrXv0pa3KPZfLmfrR6KU1QwUtDPQoV/PdJYGhVEsOwYf61yVQkuFOqK2aGYOynipMdACl5N6TXs82mS4fB6A=="],
 
     "@tanstack/react-query": ["@tanstack/react-query@5.90.20", "", { "dependencies": { "@tanstack/query-core": "5.90.20" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-vXBxa+qeyveVO7OA0jX1z+DeyCA4JKnThKv411jd5SORpBKgkcVnYKCiBgECvADvniBX7tobwBmg01qq9JmMJw=="],
 
@@ -5284,14 +5285,6 @@
 
     "@slack/web-api/eventemitter3": ["eventemitter3@5.0.4", "", {}, "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw=="],
 
-    "@superset/desktop/@tanstack/db": ["@tanstack/db@0.5.22", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@tanstack/db-ivm": "0.1.17", "@tanstack/pacer-lite": "^0.2.0" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-Qh33d9Idw7lEa/sg7veJfG8EUmSMtBzRkk/ghAVIDA3MJWAjyGOzU29TVZaM7K36BegTL8T/yVVlAFqjn/G2pw=="],
-
-    "@superset/desktop/@tanstack/react-db": ["@tanstack/react-db@0.1.66", "", { "dependencies": { "@tanstack/db": "0.5.22", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-BEFrXv0pa3KPZfLmfrR6KU1QwUtDPQoV/PdJYGhVEsOwYf61yVQkuFOqK2aGYOynipMdACl5N6TXs82mS4fB6A=="],
-
-    "@superset/mobile/@tanstack/db": ["@tanstack/db@0.5.22", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@tanstack/db-ivm": "0.1.17", "@tanstack/pacer-lite": "^0.2.0" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-Qh33d9Idw7lEa/sg7veJfG8EUmSMtBzRkk/ghAVIDA3MJWAjyGOzU29TVZaM7K36BegTL8T/yVVlAFqjn/G2pw=="],
-
-    "@superset/mobile/@tanstack/react-db": ["@tanstack/react-db@0.1.66", "", { "dependencies": { "@tanstack/db": "0.5.22", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-BEFrXv0pa3KPZfLmfrR6KU1QwUtDPQoV/PdJYGhVEsOwYf61yVQkuFOqK2aGYOynipMdACl5N6TXs82mS4fB6A=="],
-
     "@tailwindcss/node/jiti": ["jiti@2.6.1", "", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ=="],
 
     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.8.1", "", { "dependencies": { "@emnapi/wasi-threads": "1.1.0", "tslib": "^2.4.0" }, "bundled": true }, "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg=="],
@@ -5306,8 +5299,6 @@
 
     "@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
-    "@tanstack/electric-db-collection/@tanstack/db": ["@tanstack/db@0.5.22", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@tanstack/db-ivm": "0.1.17", "@tanstack/pacer-lite": "^0.2.0" }, "peerDependencies": { "typescript": ">=4.7" } }, "sha512-Qh33d9Idw7lEa/sg7veJfG8EUmSMtBzRkk/ghAVIDA3MJWAjyGOzU29TVZaM7K36BegTL8T/yVVlAFqjn/G2pw=="],
-
     "@tanstack/router-generator/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
 
     "@tanstack/router-plugin/unplugin": ["unplugin@2.3.11", "", { "dependencies": { "@jridgewell/remapping": "^2.3.5", "acorn": "^8.15.0", "picomatch": "^4.0.3", "webpack-virtual-modules": "^0.6.2" } }, "sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww=="],
diff --git a/packages/ai-chat/package.json b/packages/ai-chat/package.json
index 2282a54ec81..4d67b51cf71 100644
--- a/packages/ai-chat/package.json
+++ b/packages/ai-chat/package.json
@@ -19,16 +19,16 @@
 		"@durable-streams/client": "^0.2.0",
 		"@durable-streams/state": "^0.2.0",
 		"@superset/ui": "workspace:*",
-		"@tanstack/db": "^0.5.24",
-		"@tanstack/react-db": "^0.1.68",
+		"@tanstack/db": "0.5.22",
+		"@tanstack/react-db": "0.1.66",
 		"lucide-react": "^0.563.0",
 		"zod": "^4.3.5"
 	},
 	"devDependencies": {
 		"@superset/typescript": "workspace:*",
-		"bun-types": "^1.3.1",
 		"@types/node": "^24.9.1",
 		"@types/react": "~19.1.0",
+		"bun-types": "^1.3.1",
 		"react": "19.1.0",
 		"typescript": "^5.9.3"
 	},
diff --git a/packages/ai-chat/src/stream/client.ts b/packages/ai-chat/src/stream/client.ts
index d4592470ad5..e62ac7f715f 100644
--- a/packages/ai-chat/src/stream/client.ts
+++ b/packages/ai-chat/src/stream/client.ts
@@ -239,6 +239,7 @@ export class DurableChatClient {
 		}
 
 		this._db.close();
+		this._abortController.abort();
 		this._isConnected = false;
 		this._setConnectionStatus("disconnected");
 	}
@@ -253,7 +254,6 @@ export class DurableChatClient {
 		if (this._isDisposed) return;
 		this._isDisposed = true;
 		this.disconnect();
-		this._abortController.abort();
 	}
 
 	// =========================================================================
diff --git a/packages/ai-chat/src/stream/materialize.ts b/packages/ai-chat/src/stream/materialize.ts
index 58880534039..a2b12dcbbae 100644
--- a/packages/ai-chat/src/stream/materialize.ts
+++ b/packages/ai-chat/src/stream/materialize.ts
@@ -130,8 +130,11 @@ export function materializeMessages(chunks: ChunkRow[]): MessageRow[] {
 
 		if (!isRenderingType) continue;
 
-		// Turn boundary: stream_event after user (tool result) = new turn
-		if (chunkType === "stream_event" && lastRenderingType === "user") {
+		// Turn boundary: stream_event or assistant after user (tool result) = new turn
+		if (
+			lastRenderingType === "user" &&
+			(chunkType === "stream_event" || chunkType === "assistant")
+		) {
 			if (currentTurnChunks.length > 0) {
 				messages.push(materializeTurn(currentTurnChunks));
 				currentTurnChunks = [];
diff --git a/packages/ai-chat/src/stream/useChatSession.ts b/packages/ai-chat/src/stream/useChatSession.ts
index 14b75d886bc..8284508191f 100644
--- a/packages/ai-chat/src/stream/useChatSession.ts
+++ b/packages/ai-chat/src/stream/useChatSession.ts
@@ -150,6 +150,10 @@ export function useChatSession(
 
 	const client = clientRef.current.client;
 
+	useEffect(() => {
+		client.setUser(clientOptions.user ?? null);
+	}, [client]);
+
 	// =========================================================================
 	// Collection Subscriptions (1:1 from Electric SQL)
 	// =========================================================================
diff --git a/packages/ai-chat/src/stream/useCollectionData.ts b/packages/ai-chat/src/stream/useCollectionData.ts
index 3826e5ff541..17d8d631470 100644
--- a/packages/ai-chat/src/stream/useCollectionData.ts
+++ b/packages/ai-chat/src/stream/useCollectionData.ts
@@ -7,7 +7,7 @@
  */
 
 import type { Collection } from "@tanstack/db";
-import { useRef, useSyncExternalStore } from "react";
+import { useEffect, useRef, useSyncExternalStore } from "react";
 
 /**
  * Extract the item type from a Collection.
@@ -32,6 +32,8 @@ export function useCollectionData<
 >(collection: C): CollectionItem<C>[] {
 	type T = CollectionItem<C>;
 
+	const collectionRef = useRef(collection);
+
 	// Track version to know when to create a new snapshot.
 	// Incremented by subscription callback when collection changes.
 	const versionRef = useRef(0);
@@ -44,22 +46,23 @@ export function useCollectionData<
 		data: [],
 	});
 
+	useEffect(() => {
+		collectionRef.current = collection;
+		versionRef.current = 0;
+		snapshotRef.current = { version: -1, data: [] };
+	}, [collection]);
+
 	// Subscribe callback - increments version to signal data changed.
 	// Stored in ref to maintain stable reference for useSyncExternalStore.
-	const subscribeRef = useRef((onStoreChange: () => void): (() => void) => {
-		const subscription = collection.subscribeChanges(() => {
-			versionRef.current++;
-			onStoreChange();
-		});
-		return () => subscription.unsubscribe();
-	});
-
-	// Update subscribe ref when collection changes
+	const subscribeRef = useRef<(onStoreChange: () => void) => () => void>(
+		() => () => {},
+	);
 	subscribeRef.current = (onStoreChange: () => void): (() => void) => {
-		const subscription = collection.subscribeChanges(() => {
+		const currentCollection = collectionRef.current;
+		const subscription = currentCollection.subscribeChanges(() => {
 			versionRef.current++;
 			console.log(
-				`[ai-chat/collection] change detected, version=${versionRef.current}, size=${collection.size}`,
+				`[ai-chat/collection] change detected, version=${versionRef.current}, size=${currentCollection.size}`,
 			);
 			onStoreChange();
 		});
@@ -68,22 +71,7 @@ export function useCollectionData<
 
 	// Snapshot callback - returns cached data unless version changed.
 	// Stored in ref to maintain stable reference for useSyncExternalStore.
-	const getSnapshotRef = useRef((): T[] => {
-		const currentVersion = versionRef.current;
-		const cached = snapshotRef.current;
-
-		// Return cached snapshot if version hasn't changed
-		if (cached.version === currentVersion) {
-			return cached.data;
-		}
-
-		// Version changed - create new snapshot and cache it
-		const data = [...collection.values()] as T[];
-		snapshotRef.current = { version: currentVersion, data };
-		return data;
-	});
-
-	// Update getSnapshot ref when collection changes
+	const getSnapshotRef = useRef<() => T[]>(() => []);
 	getSnapshotRef.current = (): T[] => {
 		const currentVersion = versionRef.current;
 		const cached = snapshotRef.current;
@@ -92,17 +80,19 @@ export function useCollectionData<
 			return cached.data;
 		}
 
-		const data = [...collection.values()] as T[];
+		const data = [...collectionRef.current.values()] as T[];
 		snapshotRef.current = { version: currentVersion, data };
 		return data;
 	};
 
-	// Pass the same function for both getSnapshot and getServerSnapshot.
-	// This ensures server and client render the same initial state (empty array),
-	// preventing hydration mismatches while enabling proper SSR.
+	const getServerSnapshotRef = useRef<() => T[]>(() => []);
+	getServerSnapshotRef.current = (): T[] => snapshotRef.current.data;
+
+	// Use a stable server snapshot to keep SSR output consistent
+	// and avoid hydration mismatches.
 	return useSyncExternalStore(
 		subscribeRef.current,
 		getSnapshotRef.current,
-		getSnapshotRef.current,
+		getServerSnapshotRef.current,
 	);
 }
diff --git a/packages/ai-chat/tsconfig.json b/packages/ai-chat/tsconfig.json
index f875d92d3a9..41102bd9f88 100644
--- a/packages/ai-chat/tsconfig.json
+++ b/packages/ai-chat/tsconfig.json
@@ -5,7 +5,7 @@
 		"rootDir": "./src",
 		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"jsx": "react-jsx",
-		"types": ["node"]
+		"types": ["bun-types", "node"]
 	},
 	"include": ["src/**/*.ts", "src/**/*.tsx"],
 	"exclude": ["node_modules", "dist"]