veryfront 0.1.47 → 0.1.49

package/esm/src/agent/react/use-chat/streaming/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../../../src/src/agent/react/use-chat/streaming/handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAqC,kBAAkB,EAAa,MAAM,YAAY,CAAC;AAwBnG,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,kBAAkB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAyBf"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../../../src/src/agent/react/use-chat/streaming/handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAIV,kBAAkB,EAEnB,MAAM,YAAY,CAAC;AA4BpB,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,kBAAkB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAwCf"}

package/esm/src/agent/react/use-chat/streaming/handler.js

@@ -5,23 +5,28 @@ function createStreamingState() {
         textBlocks: new Map(),
         toolCalls: new Map(),
         reasoningBlocks: new Map(),
+        steps: new Map(),
         messageParts: [],
         currentTextId: "",
         messageId: "",
         partOrderCounter: 0,
+        currentStep: 0,
     };
 }
 export async function handleStreamingResponse(body, callbacks) {
     const reader = body.getReader();
     const decoder = new TextDecoder();
     const state = createStreamingState();
-    const getBuildParts = () => buildCurrentParts(state.textBlocks, state.reasoningBlocks, state.toolCalls);
+    const getBuildParts = () => buildCurrentParts(state.textBlocks, state.reasoningBlocks, state.toolCalls, state.steps);
+    let buffer = "";
     while (true) {
         const { done, value } = await reader.read();
         if (done)
-            return;
-        const chunk = decoder.decode(value, { stream: true });
-        for (const line of chunk.split("\n")) {
+            break;
+        buffer += decoder.decode(value, { stream: true });
+        const lines = buffer.split("\n");
+        buffer = lines.pop() ?? ""; // last element may be incomplete
+        for (const line of lines) {
             if (!line.startsWith("data: ") || !line.trim())
                 continue;
             const data = line.slice(6);
@@ -34,6 +39,16 @@ export async function handleStreamingResponse(body, callbacks) {
             }
         }
     }
+    // Process any remaining buffered data
+    if (buffer.startsWith("data: ") && buffer.trim()) {
+        try {
+            const parsed = JSON.parse(buffer.slice(6));
+            processEvent(parsed, state, callbacks, getBuildParts);
+        }
+        catch {
+            // Skip invalid JSON
+        }
+    }
 }
 function processEvent(parsed, state, callbacks, getBuildParts) {
     const { onMessage, onData, onUpdate, onToolCall } = callbacks;
@@ -42,7 +57,10 @@ function processEvent(parsed, state, callbacks, getBuildParts) {
             handleStart(parsed, state);
             return;
         case "step-start":
+            handleStepStart(parsed, state, callbacks.onUpdate, getBuildParts);
+            return;
         case "step-end":
+            handleStepEnd(parsed, state, callbacks.onUpdate, getBuildParts);
             return;
         case "text-start":
             handleTextStart(parsed, state);
@@ -241,6 +259,26 @@ function handleReasoningEnd(parsed, state, onUpdate, getBuildParts) {
     });
     onUpdate?.(getBuildParts(), state.messageId);
 }
+function handleStepStart(_parsed, state, onUpdate, getBuildParts) {
+    const stepIndex = state.currentStep;
+    const step = {
+        index: stepIndex,
+        isComplete: false,
+        order: state.partOrderCounter++,
+    };
+    state.steps.set(stepIndex, step);
+    onUpdate?.(getBuildParts(), state.messageId);
+}
+function handleStepEnd(_parsed, state, onUpdate, getBuildParts) {
+    const step = state.steps.get(state.currentStep);
+    if (step) {
+        step.isComplete = true;
+        // Add a step-end order entry so the UI can render a completion marker
+        step.order = state.partOrderCounter++;
+    }
+    state.currentStep++;
+    onUpdate?.(getBuildParts(), state.messageId);
+}
 function handleFinish(state, onMessage, getBuildParts) {
     const finalParts = getBuildParts();
     if (finalParts.length > 0) {

package/esm/src/agent/react/use-chat/streaming/parts-builder.d.ts

@@ -1,4 +1,4 @@
 import type { UIMessagePart } from "../types.js";
-import type { OrderedReasoning, OrderedToolCall, TextBlock } from "./types.js";
-export declare function buildCurrentParts(textBlocks: Map<string, TextBlock>, reasoningBlocks: Map<string, OrderedReasoning>, toolCalls: Map<string, OrderedToolCall>): UIMessagePart[];
+import type { OrderedReasoning, OrderedStep, OrderedToolCall, TextBlock } from "./types.js";
+export declare function buildCurrentParts(textBlocks: Map<string, TextBlock>, reasoningBlocks: Map<string, OrderedReasoning>, toolCalls: Map<string, OrderedToolCall>, steps?: Map<number, OrderedStep>): UIMessagePart[];
 //# sourceMappingURL=parts-builder.d.ts.map

package/esm/src/agent/react/use-chat/streaming/parts-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parts-builder.d.ts","sourceRoot":"","sources":["../../../../../../src/src/agent/react/use-chat/streaming/parts-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAO/E,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAClC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAC9C,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,GACtC,aAAa,EAAE,CASjB"}
+{"version":3,"file":"parts-builder.d.ts","sourceRoot":"","sources":["../../../../../../src/src/agent/react/use-chat/streaming/parts-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAO5F,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAClC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAC9C,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,EACvC,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAC/B,aAAa,EAAE,CAUjB"}

package/esm/src/agent/react/use-chat/streaming/parts-builder.js

@@ -1,8 +1,10 @@
-export function buildCurrentParts(textBlocks, reasoningBlocks, toolCalls) {
+export function buildCurrentParts(textBlocks, reasoningBlocks, toolCalls, steps) {
     const orderedParts = [];
     addTextParts(orderedParts, textBlocks);
     addReasoningParts(orderedParts, reasoningBlocks);
     addToolParts(orderedParts, toolCalls);
+    if (steps)
+        addStepParts(orderedParts, steps);
     orderedParts.sort((a, b) => a.order - b.order);
     return orderedParts.map(({ part }) => part);
 }
@@ -44,3 +46,14 @@ function addToolParts(orderedParts, toolCalls) {
         orderedParts.push({ order: tool.order, part });
     }
 }
+function addStepParts(orderedParts, steps) {
+    for (const step of steps.values()) {
+        orderedParts.push({
+            order: step.order,
+            part: {
+                type: step.isComplete ? "step-end" : "step-start",
+                stepIndex: step.index,
+            },
+        });
+    }
+}

package/esm/src/agent/react/use-chat/streaming/types.d.ts

@@ -26,6 +26,11 @@ export interface TextBlock {
     state: "streaming" | "done";
     order: number | null;
 }
+export interface OrderedStep {
+    index: number;
+    isComplete: boolean;
+    order: number;
+}
 export type OrderedToolCall = StreamingToolCall & {
     order: number;
 };

package/esm/src/agent/react/use-chat/streaming/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/src/agent/react/use-chat/streaming/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEtF,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAChC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/D,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,CAAC;IACjB,+DAA+D;IAC/D,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,GAAG,MAAM,CAAC;IAC5B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,MAAM,eAAe,GAAG,iBAAiB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AACpE,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/src/agent/react/use-chat/streaming/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEtF,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAChC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/D,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,CAAC;IACjB,+DAA+D;IAC/D,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,GAAG,MAAM,CAAC;IAC5B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,eAAe,GAAG,iBAAiB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AACpE,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/esm/src/agent/react/use-chat/types.d.ts

@@ -40,7 +40,11 @@ export interface DynamicToolUIPart {
     output?: unknown;
     errorText?: string;
 }
-export type UIMessagePart = TextUIPart | ReasoningUIPart | ToolUIPart | ToolResultUIPart | DynamicToolUIPart;
+export interface StepUIPart {
+    type: "step-start" | "step-end";
+    stepIndex: number;
+}
+export type UIMessagePart = TextUIPart | ReasoningUIPart | ToolUIPart | ToolResultUIPart | DynamicToolUIPart | StepUIPart;
 export interface UIMessage {
     id: string;
     role: "system" | "user" | "assistant";
@@ -81,6 +85,10 @@ export interface UseChatOptions {
     onError?: (error: Error) => void;
     onToolCall?: (arg: OnToolCallArg) => void | Promise<void>;
 }
+export interface BranchInfo {
+    current: number;
+    total: number;
+}
 export interface UseChatResult {
     messages: UIMessage[];
     input: string;
@@ -88,6 +96,8 @@ export interface UseChatResult {
     error: Error | null;
     /** Current model override (undefined = use agent default) */
     model: string | undefined;
+    /** The actual model being used after auto-upgrade (e.g. "anthropic/claude-sonnet-4-20250514") */
+    activeModel: string | undefined;
     /** Where inference is currently happening */
     inferenceMode: InferenceMode;
     /** Browser-side model loading/inference status (null when not using browser fallback) */
@@ -98,6 +108,12 @@ export interface UseChatResult {
     sendMessage: (message: {
         text: string;
     }) => Promise<void>;
+    /** Edit a user message and resubmit — truncates history to that point */
+    editMessage: (messageId: string, newText: string) => Promise<void>;
+    /** Get branch info for a message (returns { current, total }; total=1 if no branches) */
+    getBranches: (messageId: string) => BranchInfo;
+    /** Switch to a different branch at a given message */
+    switchBranch: (messageId: string, branchIndex: number) => void;
     reload: () => Promise<void>;
     stop: () => void;
     setMessages: (messages: UIMessage[]) => void;
@@ -105,5 +121,11 @@ export interface UseChatResult {
     data?: unknown;
     handleInputChange: (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
     handleSubmit: (e: React.FormEvent) => Promise<void>;
+    /** Alias for `handleInputChange` — matches `ChatProps.onChange` for easy spreading */
+    onChange: (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
+    /** Alias for `handleSubmit` — matches `ChatProps.onSubmit` for easy spreading */
+    onSubmit: (e: React.FormEvent) => Promise<void>;
+    /** Alias for `setModel` — matches `ChatProps.onModelChange` for easy spreading */
+    onModelChange: (model: string | undefined) => void;
 }
 //# sourceMappingURL=types.d.ts.map

package/esm/src/agent/react/use-chat/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/src/agent/react/use-chat/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/src/agent/react/use-chat/types.ts"],"names":[],"mappings":"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"}

package/esm/src/agent/react/use-chat/use-chat.d.ts

@@ -1,6 +1,20 @@
-import type { UseChatOptions, UseChatResult } from "./types.js";
+import type { UIMessage, UseChatOptions, UseChatResult } from "./types.js";
+/** A snapshot of messages from a branch point onward */
+interface Branch {
+    messages: UIMessage[];
+}
+/** Tracks branches keyed by the message ID where the edit occurred */
+interface BranchState {
+    branches: Branch[];
+    currentIndex: number;
+    baseMessages: UIMessage[];
+}
+export declare function isLatestRequest(activeRequestId: number, requestId: number): boolean;
+export declare function resolveBranchKey(messageId: string, branchMap: Map<string, BranchState>, branchKeyByMessageId: Map<string, string>): string | undefined;
+export declare function findBranchUserMessageIndex(messages: UIMessage[], branchKey: string, branchKeyByMessageId: Map<string, string>): number;
 /**
  * useChat hook for managing chat state with veryfront stream events.
  */
 export declare function useChat(options: UseChatOptions): UseChatResult;
+export {};
 //# sourceMappingURL=use-chat.d.ts.map

package/esm/src/agent/react/use-chat/use-chat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-chat.d.ts","sourceRoot":"","sources":["../../../../../src/src/agent/react/use-chat/use-chat.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAMV,cAAc,EACd,aAAa,EACd,MAAM,YAAY,CAAC;AAGpB;;GAEG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,aAAa,CA+U9D"}
+{"version":3,"file":"use-chat.d.ts","sourceRoot":"","sources":["../../../../../src/src/agent/react/use-chat/use-chat.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAKV,SAAS,EAET,cAAc,EACd,aAAa,EACd,MAAM,YAAY,CAAC;AAGpB,wDAAwD;AACxD,UAAU,MAAM;IACd,QAAQ,EAAE,SAAS,EAAE,CAAC;CACvB;AAED,sEAAsE;AACtE,UAAU,WAAW;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,SAAS,EAAE,CAAC;CAC3B;AAED,wBAAgB,eAAe,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAEnF;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EACnC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACxC,MAAM,GAAG,SAAS,CAGpB;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,SAAS,EAAE,EACrB,SAAS,EAAE,MAAM,EACjB,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACxC,MAAM,CAIR;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,aAAa,CA4f9D"}

package/esm/src/agent/react/use-chat/use-chat.js

@@ -11,29 +11,52 @@
  * - browser: Server can't run ONNX (compiled binary), falls back to browser Worker
  */
 import * as dntShim from "../../../../_dnt.shims.js";
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { createError, ensureError, toError } from "../../../errors/veryfront-error.js";
 import { handleStreamingResponse } from "./streaming/index.js";
 import { generateClientId } from "./utils.js";
+export function isLatestRequest(activeRequestId, requestId) {
+    return activeRequestId === requestId;
+}
+export function resolveBranchKey(messageId, branchMap, branchKeyByMessageId) {
+    return branchKeyByMessageId.get(messageId) ??
+        (branchMap.has(messageId) ? messageId : undefined);
+}
+export function findBranchUserMessageIndex(messages, branchKey, branchKeyByMessageId) {
+    return messages.findIndex((m) => m.role === "user" && branchKeyByMessageId.get(m.id) === branchKey);
+}
 /**
  * useChat hook for managing chat state with veryfront stream events.
  */
 export function useChat(options) {
     const [messages, setMessages] = useState(options.initialMessages ?? []);
+    const messagesRef = useRef(messages);
+    messagesRef.current = messages;
     const [input, setInput] = useState("");
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
     const [data, setData] = useState(null);
     const [model, setModel] = useState(options.model);
     const [inferenceMode, setInferenceMode] = useState("cloud");
+    const [activeModel, setActiveModel] = useState(undefined);
     const [browserStatus, setBrowserStatus] = useState(null);
     const abortControllerRef = useRef(null);
+    const requestIdRef = useRef(0);
     const browserInferenceActiveRef = useRef(false);
     const browserInferenceRejectRef = useRef(null);
+    // Branch tracking: keyed by the message ID at the edit point
+    const branchMapRef = useRef(new Map());
+    const branchKeyByMessageIdRef = useRef(new Map());
     // System prompt for browser fallback (from 503 response or options)
     const systemPromptRef = useRef(options.systemPrompt ?? "You are a helpful AI assistant.");
     // Track pending tool outputs for addToolOutput
     const pendingToolOutputsRef = useRef(new Map());
+    // Abort in-flight request on unmount
+    useEffect(() => {
+        return () => {
+            abortControllerRef.current?.abort();
+        };
+    }, []);
     /**
      * Add tool output to pending tool-call parts.
      * Call from onToolCall to provide results (don't await)
@@ -49,7 +72,7 @@ export function useChat(options) {
                 }
                 return {
                     ...part,
-                    state: output.state ?? "output-available",
+                    state: output.state ?? (output.errorText ? "output-error" : "output-available"),
                     output: output.output,
                     errorText: output.errorText,
                 };
@@ -74,19 +97,30 @@ export function useChat(options) {
                             hasAddedMessage = true;
                             setMessages((prev) => [
                                 ...prev,
-                                { id: messageId, role: "assistant", parts },
+                                {
+                                    id: messageId,
+                                    role: "assistant",
+                                    parts,
+                                    metadata: { model: model ?? "browser" },
+                                },
                             ]);
                             return;
                         }
                         setMessages((prev) => prev.map((m) => (m.id === messageId ? { ...m, parts } : m)));
                     },
                     onMessage: (assistantMessage) => {
+                        const withMeta = {
+                            ...assistantMessage,
+                            metadata: { ...assistantMessage.metadata, model: model ?? "browser" },
+                        };
                         setMessages((prev) => {
                             if (!hasAddedMessage)
-                                return [...prev, assistantMessage];
-                            return prev.map((m) => m.id === assistantMessage.id ? assistantMessage : m);
+                                return [...prev, withMeta];
+                            return prev.map((m) => m.id === assistantMessage.id
+                                ? { ...withMeta, metadata: { ...m.metadata, ...withMeta.metadata } }
+                                : m);
                         });
-                        options.onFinish?.(assistantMessage);
+                        options.onFinish?.(withMeta);
                         browserInferenceRejectRef.current = null;
                         resolve();
                     },
@@ -111,16 +145,21 @@ export function useChat(options) {
      * Send a message and stream assistant updates.
      */
     const sendMessage = useCallback(async (message) => {
+        // Abort any in-flight request before starting a new one
+        abortControllerRef.current?.abort();
+        abortControllerRef.current = null;
+        const requestId = ++requestIdRef.current;
         const userMessage = {
-            id: generateClientId("msg"),
+            id: message.userMessageId ?? generateClientId("msg"),
             role: "user",
             parts: [{ type: "text", text: message.text }],
         };
-        setMessages((prev) => [...prev, userMessage]);
+        const base = message.baseMessages ?? messagesRef.current;
+        setMessages([...base, userMessage]);
         setIsLoading(true);
         setError(null);
         try {
-            const allMessages = [...messages, userMessage];
+            const allMessages = [...base, userMessage];
             // If already in browser mode, skip fetch entirely
             if (inferenceMode === "browser") {
                 await doBrowserInference(allMessages);
@@ -147,9 +186,6 @@ export function useChat(options) {
                 try {
                     const body = await response.json();
                     if (body.code === "NO_AI_AVAILABLE") {
-                        if (body.systemPrompt) {
-                            systemPromptRef.current = body.systemPrompt;
-                        }
                         setInferenceMode("browser");
                         setBrowserStatus("idle");
                         await doBrowserInference(allMessages);
@@ -171,33 +207,46 @@ export function useChat(options) {
                 return;
             const streamingMessageId = generateClientId("msg");
             let hasAddedStreamingMessage = false;
-            let currentMessageId = streamingMessageId;
+            const currentMessageIdRef = { current: streamingMessageId };
+            // Mutable local — updated by onData before onMessage/onUpdate use it.
+            let serverModel = model;
+            setActiveModel(undefined);
             await handleStreamingResponse(response.body, {
                 onMessage: (assistantMessage) => {
+                    const withMeta = {
+                        ...assistantMessage,
+                        metadata: { ...assistantMessage.metadata, model: serverModel },
+                    };
                     setMessages((prev) => {
                         if (!hasAddedStreamingMessage)
-                            return [...prev, assistantMessage];
-                        return prev.map((m) => (m.id === currentMessageId ? assistantMessage : m));
+                            return [...prev, withMeta];
+                        return prev.map((m) => (m.id === currentMessageIdRef.current
+                            ? { ...withMeta, metadata: { ...m.metadata, ...withMeta.metadata } }
+                            : m));
                     });
-                    options.onFinish?.(assistantMessage);
+                    options.onFinish?.(withMeta);
                 },
                 onData: (eventData) => {
                     setData(eventData);
-                    // Detect inference mode from server metadata
+                    // Detect inference mode and resolved model from server metadata
                     if (eventData &&
                         typeof eventData === "object" &&
                         "inferenceMode" in eventData) {
-                        const mode = eventData.inferenceMode;
-                        if (mode === "server-local" || mode === "cloud") {
-                            setInferenceMode(mode);
+                        const d = eventData;
+                        if (d.inferenceMode === "server-local" || d.inferenceMode === "cloud") {
+                            setInferenceMode(d.inferenceMode);
+                        }
+                        if (d.model) {
+                            serverModel = d.model;
+                            setActiveModel(d.model);
                         }
                     }
                 },
                 onUpdate: (parts, messageId) => {
                     const id = messageId ?? streamingMessageId;
-                    if (messageId && messageId !== currentMessageId) {
-                        const oldId = currentMessageId;
-                        currentMessageId = messageId;
+                    if (messageId && messageId !== currentMessageIdRef.current) {
+                        const oldId = currentMessageIdRef.current;
+                        currentMessageIdRef.current = messageId;
                         if (hasAddedStreamingMessage) {
                             setMessages((prev) => prev.map((m) => (m.id === oldId ? { ...m, id, parts } : m)));
                             return;
@@ -205,10 +254,10 @@ export function useChat(options) {
                     }
                     if (!hasAddedStreamingMessage) {
                         hasAddedStreamingMessage = true;
-                        setMessages((prev) => [...prev, { id, role: "assistant", parts }]);
+                        setMessages((prev) => [...prev, { id, role: "assistant", parts, metadata: { model: serverModel } }]);
                         return;
                     }
-                    setMessages((prev) => prev.map((m) => (m.id === currentMessageId ? { ...m, parts } : m)));
+                    setMessages((prev) => prev.map((m) => (m.id === currentMessageIdRef.current ? { ...m, parts } : m)));
                 },
                 onToolCall: options.onToolCall,
             });
@@ -221,26 +270,30 @@ export function useChat(options) {
             options.onError?.(nextError);
         }
         finally {
-            setIsLoading(false);
-            abortControllerRef.current = null;
+            // Only the latest request can clear loading/abort state.
+            if (isLatestRequest(requestIdRef.current, requestId)) {
+                setIsLoading(false);
+                abortControllerRef.current = null;
+            }
         }
-    }, [messages, model, options, inferenceMode, doBrowserInference]);
+    }, [model, options, inferenceMode, doBrowserInference]);
     /**
      * Reload last message
      */
     const reload = useCallback(async () => {
-        if (messages.length === 0)
+        const currentMessages = messagesRef.current;
+        if (currentMessages.length === 0)
             return;
-        const lastUserIndex = messages.findLastIndex((m) => m.role === "user");
+        const lastUserIndex = currentMessages.findLastIndex((m) => m.role === "user");
         if (lastUserIndex === -1)
             return;
-        const lastUserMessage = messages[lastUserIndex];
+        const lastUserMessage = currentMessages[lastUserIndex];
         const textPart = lastUserMessage?.parts.find((p) => p.type === "text");
         if (!textPart || !("text" in textPart))
             return;
-        setMessages(messages.slice(0, lastUserIndex));
-        await sendMessage({ text: textPart.text });
-    }, [messages, sendMessage]);
+        const base = currentMessages.slice(0, lastUserIndex);
+        await sendMessage({ text: textPart.text, baseMessages: base });
+    }, [sendMessage]);
     /**
      * Stop generation
      */
@@ -264,6 +317,97 @@ export function useChat(options) {
         }
         setIsLoading(false);
     }, []);
+    /**
+     * Edit a previous user message and resubmit.
+     * Saves the current messages from the edit point as a branch so the user
+     * can navigate back to it via switchBranch.
+     */
+    const editMessage = useCallback(async (messageId, newText) => {
+        const current = messagesRef.current;
+        const idx = current.findIndex((m) => m.id === messageId);
+        if (idx === -1)
+            return;
+        const branchKey = branchKeyByMessageIdRef.current.get(messageId) ?? messageId;
+        const tail = current.slice(idx);
+        let state = branchMapRef.current.get(branchKey);
+        if (state) {
+            // Persist the currently visible branch before creating a new edit branch.
+            state.baseMessages = current.slice(0, idx);
+            state.branches[state.currentIndex] = { messages: tail };
+            state.branches.push({ messages: [] }); // placeholder for the new edit branch
+            state.currentIndex = state.branches.length - 1;
+        }
+        else {
+            state = {
+                branches: [
+                    { messages: tail }, // original
+                    { messages: [] }, // placeholder for the new edit
+                ],
+                currentIndex: 1,
+                baseMessages: current.slice(0, idx),
+            };
+            branchMapRef.current.set(branchKey, state);
+        }
+        const newUserMessageId = generateClientId("msg");
+        await sendMessage({
+            text: newText,
+            baseMessages: state.baseMessages,
+            userMessageId: newUserMessageId,
+        });
+        // Update the placeholder with the newly generated branch and sync ID mappings.
+        state = branchMapRef.current.get(branchKey);
+        if (state) {
+            state.branches[state.currentIndex] = {
+                messages: messagesRef.current.slice(state.baseMessages.length),
+            };
+            for (const branch of state.branches) {
+                const firstMessageId = branch.messages[0]?.id;
+                if (firstMessageId) {
+                    branchKeyByMessageIdRef.current.set(firstMessageId, branchKey);
+                }
+            }
+        }
+    }, [sendMessage]);
+    /**
+     * Get branch info for a message.
+     */
+    const getBranches = useCallback((messageId) => {
+        const branchKey = resolveBranchKey(messageId, branchMapRef.current, branchKeyByMessageIdRef.current);
+        if (!branchKey)
+            return { current: 1, total: 1 };
+        const state = branchMapRef.current.get(branchKey);
+        if (!state)
+            return { current: 1, total: 1 };
+        return { current: state.currentIndex + 1, total: state.branches.length };
+    }, []);
+    /**
+     * Switch to a different branch at a given message.
+     * branchIndex is 0-based.
+     */
+    const switchBranch = useCallback((messageId, branchIndex) => {
+        const branchKey = resolveBranchKey(messageId, branchMapRef.current, branchKeyByMessageIdRef.current);
+        if (!branchKey)
+            return;
+        const state = branchMapRef.current.get(branchKey);
+        if (!state || branchIndex < 0 || branchIndex >= state.branches.length)
+            return;
+        // Save currently visible tail before switching away.
+        const current = messagesRef.current;
+        const idx = findBranchUserMessageIndex(current, branchKey, branchKeyByMessageIdRef.current);
+        if (idx !== -1) {
+            state.branches[state.currentIndex] = { messages: current.slice(idx) };
+        }
+        state.currentIndex = branchIndex;
+        const branch = state.branches[branchIndex];
+        if (!branch || branch.messages.length === 0)
+            return;
+        const firstMessageId = branch.messages[0]?.id;
+        if (firstMessageId) {
+            branchKeyByMessageIdRef.current.set(firstMessageId, branchKey);
+        }
+        // Rebuild from stable prefix captured at edit point.
+        setMessages([...state.baseMessages, ...branch.messages]);
+    }, []);
     /**
      * Handle input change
      */
@@ -281,7 +425,7 @@ export function useChat(options) {
         if (!text)
             return;
         setInput("");
-        await sendMessage({ text: input });
+        await sendMessage({ text });
     }, [input, isLoading, sendMessage]);
     return {
         messages,
@@ -289,11 +433,15 @@ export function useChat(options) {
         isLoading,
         error,
         model,
+        activeModel,
         inferenceMode,
         browserStatus,
         setInput,
         setModel,
         sendMessage,
+        editMessage,
+        getBranches,
+        switchBranch,
         reload,
         stop,
         setMessages,
@@ -301,5 +449,9 @@ export function useChat(options) {
         data,
         handleInputChange,
         handleSubmit,
+        // Aliases that match ChatProps / ChatWithSidebarProps so users can spread {...chat}
+        onChange: handleInputChange,
+        onSubmit: handleSubmit,
+        onModelChange: setModel,
     };
 }