@agent-native/core 0.176.1 → 0.176.2-nightly-20260831184159

package/dist/client/auth/ResetPasswordPage.d.ts

@@ -0,0 +1,9 @@
+/** @jsxRuntime classic */
+import * as React from "react";
+export interface ResetPasswordPageProps {
+    pageType: "reset-password";
+    appBasePath: string;
+    passwordMinLength: number;
+    passwordMaxLength: number;
+}
+export declare function ResetPasswordPage({ appBasePath, passwordMinLength, passwordMaxLength, }: ResetPasswordPageProps): React.JSX.Element;

package/dist/client/auth/ResetPasswordPage.js

@@ -0,0 +1,119 @@
+/** @jsxRuntime classic */
+import * as React from "react";
+function inferResetBasePath(pathname) {
+    const marker = "/_agent-native/auth/reset";
+    const markerIndex = pathname.indexOf(marker);
+    return markerIndex >= 0 ? pathname.slice(0, markerIndex) : "";
+}
+function resetErrorText(data, fallback, passwordMinLength, passwordMaxLength) {
+    const candidate = data.error ?? data.message;
+    if (typeof candidate !== "string" || !candidate.trim())
+        return fallback;
+    const message = candidate.trim();
+    if (/failed query|\bselect\b.*\bfrom\b|\binsert\b.*\binto\b|\bupdate\b.*\bset\b|\bdelete\b.*\bfrom\b|\bsql\b|database|relation .* does not exist|column .* does not exist|syntax error|constraint|connection refused|econn|timeout/i.test(message)) {
+        return fallback;
+    }
+    if (/password.*(?:at least|minimum|min(?:imum)?|too short)/i.test(message)) {
+        return `Choose a password with at least ${passwordMinLength} characters.`;
+    }
+    if (/password.*(?:at most|maximum|max(?:imum)?|too long)/i.test(message)) {
+        return `Choose a password with no more than ${passwordMaxLength} characters.`;
+    }
+    return message;
+}
+export function ResetPasswordPage({ appBasePath, passwordMinLength, passwordMaxLength, }) {
+    const [runtimeAppBasePath, setRuntimeAppBasePath] = React.useState(appBasePath);
+    const [token, setToken] = React.useState("");
+    const [tokenChecked, setTokenChecked] = React.useState(false);
+    const [password, setPassword] = React.useState("");
+    const [confirmation, setConfirmation] = React.useState("");
+    const [message, setMessage] = React.useState(null);
+    const [saving, setSaving] = React.useState(false);
+    React.useEffect(() => {
+        if (!appBasePath) {
+            setRuntimeAppBasePath(inferResetBasePath(window.location.pathname));
+        }
+        setToken(new URLSearchParams(window.location.search).get("token") ?? "");
+        setTokenChecked(true);
+    }, [appBasePath]);
+    const passwordInvalid = React.useCallback((event) => {
+        const input = event.currentTarget;
+        if (input.validity.tooShort) {
+            input.setCustomValidity(`Choose a password with at least ${passwordMinLength} characters.`);
+        }
+        else if (input.validity.tooLong) {
+            input.setCustomValidity(`Choose a password with no more than ${passwordMaxLength} characters.`);
+        }
+    }, [passwordMaxLength, passwordMinLength]);
+    const clearPasswordValidity = React.useCallback((event) => {
+        event.currentTarget.setCustomValidity("");
+    }, []);
+    const handleSubmit = React.useCallback(async (event) => {
+        event.preventDefault();
+        if (password !== confirmation) {
+            setMessage({ kind: "error", text: "Passwords do not match." });
+            return;
+        }
+        setSaving(true);
+        setMessage(null);
+        try {
+            const response = await fetch(`${runtimeAppBasePath}/_agent-native/auth/ba/reset-password`, {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({ newPassword: password, token }),
+            });
+            if (response.ok) {
+                setMessage({
+                    kind: "success",
+                    text: "Password updated — redirecting to sign in…",
+                });
+                window.setTimeout(() => {
+                    window.location.href = `${runtimeAppBasePath}/`;
+                }, 1200);
+                return;
+            }
+            let data = {};
+            try {
+                const parsed = await response.json();
+                if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+                    data = parsed;
+                }
+            }
+            catch {
+                // coercion-ok: error status and fallback copy remain distinguishable.
+            }
+            setMessage({
+                kind: "error",
+                text: resetErrorText(data, "We couldn't update your password. The link may have expired; request a new one.", passwordMinLength, passwordMaxLength),
+            });
+            setSaving(false);
+        }
+        catch {
+            setMessage({
+                kind: "error",
+                text: "We couldn't reach the server. Check your connection and try again.",
+            });
+            setSaving(false);
+        }
+    }, [
+        confirmation,
+        password,
+        passwordMaxLength,
+        passwordMinLength,
+        runtimeAppBasePath,
+        token,
+    ]);
+    const missingToken = tokenChecked && !token;
+    return (React.createElement("div", { className: "card reset-password-card" },
+        React.createElement("h1", null, "Choose a new password"),
+        React.createElement("p", { className: "subtitle" }, "Set a new password for your account."),
+        React.createElement("form", { id: "reset-form", onSubmit: handleSubmit, hidden: missingToken },
+            React.createElement("label", { htmlFor: "p1" }, "New password"),
+            React.createElement("input", { id: "p1", type: "password", autoComplete: "new-password", placeholder: `At least ${passwordMinLength} characters`, required: true, minLength: passwordMinLength, maxLength: passwordMaxLength, value: password, onChange: (event) => setPassword(event.currentTarget.value), onInvalid: passwordInvalid, onInput: clearPasswordValidity }),
+            React.createElement("label", { htmlFor: "p2" }, "Confirm password"),
+            React.createElement("input", { id: "p2", type: "password", autoComplete: "new-password", placeholder: "Confirm password", required: true, minLength: passwordMinLength, maxLength: passwordMaxLength, value: confirmation, onChange: (event) => setConfirmation(event.currentTarget.value), onInvalid: passwordInvalid, onInput: clearPasswordValidity }),
+            React.createElement("button", { type: "submit", disabled: saving }, saving ? "Saving…" : "Save new password"),
+            message ? (React.createElement("p", { className: `msg show ${message.kind}`, role: "status" }, message.text)) : null),
+        missingToken ? (React.createElement("p", { className: "msg show error", role: "alert" }, "This password reset link is missing or invalid. Request a new one.")) : null,
+        React.createElement("a", { className: "back", id: "back-link", href: `${runtimeAppBasePath}/` }, "Back to sign in")));
+}

package/dist/client/auth/entry.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/client/auth/entry.js

@@ -0,0 +1,15 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { hydrateRoot } from "react-dom/client";
+import { AuthPage } from "./AuthPage.js";
+import { ResetPasswordPage, } from "./ResetPasswordPage.js";
+const root = document.getElementById("agent-native-auth-root");
+const data = document.getElementById("agent-native-auth-data");
+if (root && data) {
+    const props = JSON.parse(data.textContent ?? "{}");
+    if ("pageType" in props && props.pageType === "reset-password") {
+        hydrateRoot(root, _jsx(ResetPasswordPage, { ...props }));
+    }
+    else {
+        hydrateRoot(root, _jsx(AuthPage, { ...props }));
+    }
+}

package/dist/client/chat/message-components.d.ts

@@ -22,6 +22,56 @@ export declare const CheckpointContext: React.Context<{
     threadId?: string;
     checkpointRunIds?: ReadonlySet<string>;
 } | null>;
+export type AssistantChatHistoryDate = string | number | Date;
+export interface AssistantChatHistoryContext {
+    threadId?: string;
+    runId?: string;
+    turnId?: string;
+}
+export interface AssistantChatHistoryVersion {
+    id: string;
+    createdAt: AssistantChatHistoryDate;
+    editable?: boolean;
+    chatContext?: AssistantChatHistoryContext;
+}
+export interface AssistantChatHistoryScope {
+    type: string;
+    id: string;
+}
+export interface AssistantChatHistoryMessage {
+    id: string;
+    createdAt: AssistantChatHistoryDate;
+    scope?: AssistantChatHistoryScope;
+    parentId?: string;
+    turnStartedAt?: AssistantChatHistoryDate;
+    turnEndedAt?: AssistantChatHistoryDate;
+    runId?: string;
+    turnId?: string;
+    hasCompletedSideEffect: boolean;
+}
+export interface AssistantChatHistoryConfig<TListResult = unknown, TVersion extends AssistantChatHistoryVersion = AssistantChatHistoryVersion> {
+    list: {
+        action: string;
+        args?: Record<string, unknown>;
+        getVersions: (result: TListResult) => readonly TVersion[];
+    };
+    restore: {
+        action: string;
+        args: (version: TVersion) => Record<string, unknown>;
+    };
+    createVersion?: {
+        action: string;
+        args: Record<string, unknown> | ((message: AssistantChatHistoryMessage) => Record<string, unknown>);
+    };
+    isEditable?: (version: TVersion) => boolean;
+    scope?: AssistantChatHistoryScope;
+    matchVersion?: (version: TVersion, message: AssistantChatHistoryMessage) => boolean;
+}
+export interface AssistantChatHistoryContextValue {
+    findVersion: (message: AssistantChatHistoryMessage) => AssistantChatHistoryVersion | null;
+    restoreVersion: (version: AssistantChatHistoryVersion) => Promise<void>;
+}
+export declare const AssistantChatHistoryContext: React.Context<AssistantChatHistoryContextValue | null>;
 export declare const MessageActionsContext: React.Context<{
     onForkChat?: () => void | boolean | Promise<void | boolean>;
     onRetryRunError?: () => void;
@@ -33,6 +83,9 @@ export declare const MessageActionsContext: React.Context<{
     bannerRunErrorKey?: string | null;
 } | null>;
 export declare function isLocalDevelopmentHost(hostname: string): boolean;
+export declare function isAssistantChatHistoryVersion(value: unknown): value is AssistantChatHistoryVersion;
+export declare function assistantMessageHasCompletedSideEffect(message: unknown): boolean;
+export declare function findMatchingAssistantChatHistoryVersion<TVersion extends AssistantChatHistoryVersion>(versions: readonly TVersion[], message: AssistantChatHistoryMessage, options?: Pick<AssistantChatHistoryConfig<unknown, TVersion>, "isEditable" | "matchVersion" | "scope">): TVersion | null;
 /**
  * Restore rewrites the working tree, so only offer it when the server actually
  * has a checkpoint for this turn. Auto-checkpointing skips turns that started

package/dist/client/chat/message-components.js

@@ -5,7 +5,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 // displayableUserMessageText.
 import { isPastedTextAttachmentName } from "@agent-native/toolkit/composer/pasted-text";
 import { PastedTextChip } from "@agent-native/toolkit/composer/PastedTextChip";
-import { useThreadRuntime, useMessageRuntime, useComposer, MessagePrimitive, ActionBarPrimitive, BranchPickerPrimitive, ComposerPrimitive, useMessagePartReasoning, useMessagePartRuntime, useAuiState, } from "@assistant-ui/react";
+import { useThreadRuntime, useMessageRuntime, useComposer, MessagePrimitive, ActionBarPrimitive, BranchPickerPrimitive, ComposerPrimitive, useMessagePartReasoning, useMessagePartRuntime, useAuiState, useThread, } from "@assistant-ui/react";
 import { IconX, IconCheck, IconCopy, IconChevronDown, IconChevronLeft, IconChevronRight, IconDots, IconGitFork, IconId, IconQuote, IconRefresh, IconArrowBackUp, IconFile, IconFolder, IconFileText, IconCheckbox, IconMail, IconUser, IconPresentation, IconStack2, IconMessageChatbot, IconPencil, IconAlertTriangle, IconLoader2, } from "@tabler/icons-react";
 import React, { useState, useEffect, useCallback, useRef } from "react";
 import { DEFAULT_THINKING_DISPLAY, } from "../../shared/thinking-display.js";
@@ -14,6 +14,7 @@ import { agentNativePath } from "../api-path.js";
 import { writeClipboardText } from "../clipboard.js";
 import { Dialog, DialogClose, DialogContent, DialogTitle, } from "../components/ui/dialog.js";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger, } from "../components/ui/dropdown-menu.js";
+import { Popover, PopoverContent, PopoverTrigger, } from "../components/ui/popover.js";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger, } from "../components/ui/tooltip.js";
 import { localizeKnownChatErrorText } from "../error-format.js";
 import { DEFAULT_LOCALE, useFormatters, useOptionalLocale, useT, } from "../i18n.js";
@@ -21,6 +22,7 @@ import { ThumbsFeedback } from "../observability/ThumbsFeedback.js";
 import { McpConnectionSuggestion } from "../resources/McpConnectionSuggestion.js";
 import { useThinkingDisplay } from "../thinking-display.js";
 import { isCallAgentToolCallShadowed, isToolCallActive, shadowedCallAgentToolCallIds, } from "../tool-display.js";
+import { actionErrorMessage } from "../use-action.js";
 import { cn } from "../utils.js";
 import { MarkdownText, renderMarkdownToClipboardHtml, SmoothMarkdownText, } from "./markdown-renderer.js";
 import { getAssistantRunDurationMs } from "./repo-helpers.js";
@@ -158,6 +160,7 @@ export function SelectionAttachedPill() {
 }
 // ─── CheckpointContext / MessageActionsContext ────────────────────────────────
 export const CheckpointContext = React.createContext(null);
+export const AssistantChatHistoryContext = React.createContext(null);
 export const MessageActionsContext = React.createContext(null);
 export function isLocalDevelopmentHost(hostname) {
     const normalizedHostname = hostname.trim().toLowerCase();
@@ -167,6 +170,79 @@ export function isLocalDevelopmentHost(hostname) {
         normalizedHostname === "::1" ||
         normalizedHostname === "[::1]");
 }
+export function isAssistantChatHistoryVersion(value) {
+    if (!value || typeof value !== "object")
+        return false;
+    const version = value;
+    return (typeof version.id === "string" &&
+        version.id.trim().length > 0 &&
+        coerceMessageDate(version.createdAt) !== null);
+}
+function assistantMessageChatScope(message) {
+    const custom = message?.metadata;
+    const scope = custom?.custom?.chatScope;
+    if (!scope || typeof scope !== "object")
+        return undefined;
+    const typed = scope;
+    return typeof typed.type === "string" &&
+        typed.type.trim() &&
+        typeof typed.id === "string" &&
+        typed.id.trim()
+        ? { type: typed.type, id: typed.id }
+        : undefined;
+}
+export function assistantMessageHasCompletedSideEffect(message) {
+    const content = message?.content;
+    return (Array.isArray(content) &&
+        content.some((part) => {
+            if (!part || typeof part !== "object")
+                return false;
+            const toolPart = part;
+            return (toolPart.type === "tool-call" &&
+                toolPart.completedSideEffect === true &&
+                toolPart.isError !== true);
+        }));
+}
+export function findMatchingAssistantChatHistoryVersion(versions, message, options = {}) {
+    if (!message.hasCompletedSideEffect)
+        return null;
+    if (options.scope &&
+        (!message.scope ||
+            message.scope.type !== options.scope.type ||
+            message.scope.id !== options.scope.id)) {
+        return null;
+    }
+    let match = null;
+    let matchTime = Number.POSITIVE_INFINITY;
+    for (const version of versions) {
+        if (!isAssistantChatHistoryVersion(version))
+            continue;
+        if (version.editable === false || options.isEditable?.(version) === false) {
+            continue;
+        }
+        const chatContext = version.chatContext;
+        const matchesChatTurn = Boolean(chatContext &&
+            ((message.turnId && chatContext.turnId
+                ? chatContext.turnId === message.turnId
+                : false) ||
+                ((!message.turnId || !chatContext.turnId) &&
+                    message.runId &&
+                    chatContext.runId === message.runId)));
+        if (!matchesChatTurn)
+            continue;
+        const versionTime = coerceMessageDate(version.createdAt)?.getTime();
+        if (versionTime == null)
+            continue;
+        const matches = options.matchVersion
+            ? options.matchVersion(version, message)
+            : true;
+        if (!matches || versionTime >= matchTime)
+            continue;
+        match = version;
+        matchTime = versionTime;
+    }
+    return match;
+}
 /**
  * Restore rewrites the working tree, so only offer it when the server actually
  * has a checkpoint for this turn. Auto-checkpointing skips turns that started
@@ -402,6 +478,43 @@ export function MessageActionsMenu({ showRevert, onRevert, threadId = "", } = {}
                                         ? t("agentChat.recovery.copyFailed")
                                         : t("agentChat.message.copyRequestId")] }), showRevert && (_jsxs(DropdownMenuItem, { onSelect: handleRevert, children: [_jsx(IconArrowBackUp, { className: "h-3.5 w-3.5" }), t("agentChat.message.revertHere")] })), timestamp && (_jsxs(_Fragment, { children: [_jsx(DropdownMenuSeparator, {}), _jsx(DropdownMenuLabel, { className: "px-2 py-1 text-[11px] font-normal text-muted-foreground", children: t("agentChat.message.sentAt", { time: timestamp.short }) })] }))] })] }));
 }
+function AssistantChatHistoryRevertButton({ onRestore, onRestored, }) {
+    const t = useT();
+    const [open, setOpen] = useState(false);
+    const [state, setState] = useState("confirming");
+    const [error, setError] = useState(null);
+    const handleOpenChange = useCallback((nextOpen) => {
+        if (!nextOpen && state === "restoring")
+            return;
+        setOpen(nextOpen);
+        if (nextOpen) {
+            setState("confirming");
+            setError(null);
+        }
+        else {
+            setError(null);
+        }
+    }, [state]);
+    const handleRestore = useCallback(async () => {
+        setState("restoring");
+        setError(null);
+        try {
+            await onRestore();
+            setOpen(false);
+            onRestored();
+        }
+        catch (restoreError) {
+            const status = restoreError?.status;
+            const actionMessage = actionErrorMessage(restoreError);
+            setError(actionMessage ||
+                (typeof status === "number" || typeof status === "string"
+                    ? t("agentChat.message.restoreFailed", { status })
+                    : t("agentChat.message.restoreRequestFailed")));
+            setState("error");
+        }
+    }, [onRestore, onRestored, t]);
+    return (_jsxs(Popover, { open: open, onOpenChange: handleOpenChange, children: [_jsx(TooltipProvider, { delayDuration: 400, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(PopoverTrigger, { asChild: true, children: _jsx("button", { type: "button", "aria-label": t("agentChat.message.revertHere"), className: cn("flex h-6 w-6 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 transition-colors duration-150 hover:bg-accent hover:text-foreground", messageFooterFadeClassName, open && "bg-accent text-foreground"), children: _jsx(IconArrowBackUp, { className: "h-3.5 w-3.5" }) }) }) }), _jsx(TooltipContent, { side: "top", className: "text-xs", children: t("agentChat.message.revertHere") })] }) }), _jsx(PopoverContent, { side: "top", align: "start", sideOffset: 6, className: "w-56 rounded-lg border-border p-3 shadow-xl", children: state === "confirming" ? (_jsxs("div", { className: "grid gap-2", children: [_jsx("p", { className: "text-xs font-medium text-foreground", children: t("agentChat.message.restoreQuestion") }), _jsxs("div", { className: "flex justify-end gap-1.5", children: [_jsx("button", { type: "button", onClick: () => setOpen(false), className: "rounded-md px-2 py-1 text-xs font-medium text-muted-foreground hover:bg-accent hover:text-foreground", children: t("agentChat.common.cancel") }), _jsx("button", { type: "button", onClick: () => void handleRestore(), className: "rounded-md bg-destructive px-2 py-1 text-xs font-medium text-destructive-foreground hover:bg-destructive/90", children: t("agentChat.message.revertHere") })] })] })) : state === "restoring" ? (_jsxs("span", { className: "flex items-center gap-1.5 text-xs text-muted-foreground", children: [_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" }), t("agentChat.message.restoring")] })) : (_jsxs("div", { className: "grid gap-2", children: [_jsx("p", { className: "text-xs text-destructive", children: error ?? t("agentChat.message.restoreRequestFailed") }), _jsx("button", { type: "button", onClick: () => setOpen(false), className: "justify-self-end rounded-md px-2 py-1 text-xs font-medium text-muted-foreground hover:bg-accent hover:text-foreground", children: t("agentChat.common.dismiss") })] })) })] }));
+}
 // ─── UserMessage ──────────────────────────────────────────────────────────────
 export function UserMessage() {
     const t = useT();
@@ -748,14 +861,15 @@ export function useSettledFlag(active, delayMs) {
 export function shouldShowAssistantWorkSummary({ isLast, isComplete, hasCollapsibleWork, hasUnresolvedTool, hasActiveTool, chatRunning, }) {
     if (!hasCollapsibleWork)
         return false;
-    if (hasActiveTool)
-        return false;
-    // An unresolved tool means "still working" only while the turn is actually
-    // running. On a stalled or interrupted turn it used to hide the summary
-    // forever, so the longest turns showed no "Worked for Xm Ys" at all.
-    if (hasUnresolvedTool)
-        return !(isLast && chatRunning);
-    // Keep completed historical work wrapped while a later turn is running.
+    // Keep every work segment behind its disclosure while the current turn is
+    // streaming. Text parts still break the grouped-parts sequence, so a final
+    // response appears between separate work summaries instead of being buried
+    // with the tool calls that surround it.
+    if (isLast && chatRunning)
+        return true;
+    if (hasActiveTool || hasUnresolvedTool)
+        return true;
+    // Keep completed historical work grouped while a later turn is running.
     // Removing the wrapper exposes/remounts ReasoningCell and resets its
     // disclosure state to the default-open value on every new submission.
     return isComplete || !isLast;
@@ -879,7 +993,9 @@ export function AssistantMessage() {
     const locale = useOptionalLocale()?.locale ?? DEFAULT_LOCALE;
     const [restoreState, setRestoreState] = useState("idle");
     const [restoreError, setRestoreError] = useState(null);
+    const [historyReverted, setHistoryReverted] = useState(false);
     const messageRuntime = useMessageRuntime();
+    const thread = useThread();
     const threadRuntime = useThreadRuntime();
     const chatRunning = React.useContext(ChatRunningContext);
     const activeRunId = React.useContext(ChatRunningRunIdContext);
@@ -907,6 +1023,7 @@ export function AssistantMessage() {
     const responseConnectionText = finalResponseTextFromContent(msg.content);
     const statusIsTerminal = assistantMessageStatusIsTerminal(msg);
     const hasCompletedCustomUi = assistantMessageHasCompletedCustomUi(msg.content);
+    const hasCompletedSideEffect = assistantMessageHasCompletedSideEffect(msg);
     const hasCustomUi = assistantMessageHasCustomUi(msg.content);
     const serverRunActive = React.useContext(ServerRunActiveContext);
     const messageRunError = getRunErrorMetadata(msg);
@@ -974,6 +1091,51 @@ export function AssistantMessage() {
         }
         return "";
     }, [msg.parentId, threadRuntime]);
+    const historyMessage = React.useMemo(() => {
+        let turnStartedAt = msg.createdAt;
+        let parentId = msg.parentId;
+        while (parentId) {
+            const parentMessage = threadRuntime.getMessageById(parentId).getState();
+            if (parentMessage.role === "user" &&
+                !isHiddenUserMessage(parentMessage)) {
+                turnStartedAt = parentMessage.createdAt;
+                break;
+            }
+            if (parentMessage.parentId === parentId)
+                break;
+            parentId = parentMessage.parentId;
+        }
+        const messageIndex = thread.messages.findIndex((message) => message.id === msg.id);
+        const nextUserMessage = messageIndex < 0
+            ? undefined
+            : thread.messages
+                .slice(messageIndex + 1)
+                .find((message) => message.role === "user" && !isHiddenUserMessage(message));
+        return {
+            id: msg.id,
+            createdAt: msg.createdAt,
+            ...(assistantMessageChatScope(msg)
+                ? { scope: assistantMessageChatScope(msg) }
+                : {}),
+            ...(msg.parentId ? { parentId: msg.parentId } : {}),
+            turnStartedAt,
+            ...(nextUserMessage?.createdAt
+                ? { turnEndedAt: nextUserMessage.createdAt }
+                : {}),
+            ...(messageRunId ? { runId: messageRunId } : {}),
+            ...(messageTurnId ? { turnId: messageTurnId } : {}),
+            hasCompletedSideEffect,
+        };
+    }, [
+        hasCompletedSideEffect,
+        msg.createdAt,
+        msg.id,
+        msg.parentId,
+        messageRunId,
+        messageTurnId,
+        thread.messages,
+        threadRuntime,
+    ]);
     const isComplete = !shouldHoldCompletionFooter &&
         shouldShowAssistantMessageFooter({
             isLast,
@@ -988,6 +1150,14 @@ export function AssistantMessage() {
             hasActiveTool,
             userStoppedRun: isUserStoppedRun,
         });
+    const historyContext = React.useContext(AssistantChatHistoryContext);
+    const historyVersion = React.useMemo(() => historyContext?.findVersion(historyMessage) ?? null, [historyContext, historyMessage]);
+    const showHistoryRevert = isComplete && !historyReverted && historyVersion !== null;
+    const handleHistoryRestore = useCallback(async () => {
+        if (!historyContext || !historyVersion)
+            return;
+        await historyContext.restoreVersion(historyVersion);
+    }, [historyContext, historyVersion]);
     const cpCtx = React.useContext(CheckpointContext);
     useEffect(() => {
         if (isLast && chatRunning) {
@@ -1117,7 +1287,7 @@ export function AssistantMessage() {
                                         });
                                         if (!showSummary)
                                             return _jsx(_Fragment, { children: children });
-                                        return (_jsx(WorkedForSummary, { durationMs: getAssistantWorkSummaryDurationMs(capturedDurationMs ?? persistedDurationMs, part.indices[0] ?? -1, firstWorkPartIndex), defaultOpen: hasCustomUi, autoCollapse: animateCollapse && !hasCustomUi, children: children }));
+                                        return (_jsx(WorkedForSummary, { durationMs: getAssistantWorkSummaryDurationMs(capturedDurationMs ?? persistedDurationMs, part.indices[0] ?? -1, firstWorkPartIndex), isRunning: isLast && chatRunning, defaultOpen: hasCustomUi, autoCollapse: animateCollapse && !hasCustomUi, children: children }));
                                     }
                                     case "group-ran-tools":
                                         return (_jsx(RanToolsSummary, { toolCount: assistantToolSummary.hiddenToolCount, motionKey: `assistant-${msg.id}`, children: children }));
@@ -1144,7 +1314,7 @@ export function AssistantMessage() {
                             ? messageActions?.onRetryRunError
                             : undefined })), missingWarningText == null &&
                         missingFinalResponseNoticeText != null &&
-                        !showInlineRunError && (_jsx(MissingFinalResponseNotice, { messageId: msg.id, text: missingFinalResponseNoticeText, animate: animateMissingFinalResponse, onRevealComplete: handleMissingFinalResponseReveal })), isComplete && hasCodeAgentTools && msgContent && (_jsx(FilesChangedSummary, { parts: msgContent }))] }), isComplete && (_jsxs("div", { className: "mt-1 flex items-center justify-between", children: [_jsxs("div", { className: "flex min-w-0 items-center gap-1", children: [_jsx(MessageActionsMenu, { showRevert: showRestore && restoreState === "idle", onRevert: handleRestore, threadId: cpCtx?.threadId ?? "" }), isLast && (_jsx(TooltipProvider, { delayDuration: 400, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(ActionBarPrimitive.Reload, { asChild: true, children: _jsx("button", { type: "button", "aria-label": t("agentChat.message.regenerate"), className: `flex h-6 w-6 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 hover:bg-accent hover:text-foreground ${messageFooterFadeClassName} disabled:cursor-not-allowed disabled:opacity-40`, children: _jsx(IconRefresh, { className: "h-3.5 w-3.5" }) }) }) }), _jsx(TooltipContent, { side: "top", className: "text-xs", children: t("agentChat.message.regenerate") })] }) })), _jsx(MessageBranchPicker, {}), timestamp && (_jsx(MessageTimestamp, { timestamp: timestamp, className: messageFooterFadeClassName }))] }), showRestore && restoreState === "confirming" ? (_jsxs("div", { className: "flex items-center gap-1 text-xs", children: [_jsx("button", { onClick: handleRestore, className: "rounded-md bg-destructive px-1.5 py-0.5 text-destructive-foreground hover:bg-destructive/90", children: t("agentChat.message.restoreQuestion") }), _jsx("button", { onClick: cancelRestore, className: "rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: t("agentChat.common.cancel") })] })) : showRestore && restoreState === "restoring" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-muted-foreground", children: [_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" }), t("agentChat.message.restoring")] })) : restoreState === "error" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-destructive", children: [_jsx(IconAlertTriangle, { className: "h-3 w-3 shrink-0" }), _jsx("span", { className: "truncate", children: restoreError }), _jsx("button", { onClick: cancelRestore, className: "cursor-pointer rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: t("agentChat.common.dismiss") })] })) : (_jsx(ThumbsFeedback, { threadId: cpCtx?.threadId ?? "", runId: messageRunId ?? "", messageSeq: msg.index }))] }))] }));
+                        !showInlineRunError && (_jsx(MissingFinalResponseNotice, { messageId: msg.id, text: missingFinalResponseNoticeText, animate: animateMissingFinalResponse, onRevealComplete: handleMissingFinalResponseReveal })), isComplete && hasCodeAgentTools && msgContent && (_jsx(FilesChangedSummary, { parts: msgContent }))] }), isComplete && (_jsxs("div", { className: "mt-1 flex items-center justify-between", children: [_jsxs("div", { className: "flex min-w-0 items-center gap-1", children: [showHistoryRevert && (_jsx(AssistantChatHistoryRevertButton, { onRestore: handleHistoryRestore, onRestored: () => setHistoryReverted(true) })), _jsx(MessageActionsMenu, { showRevert: showRestore && restoreState === "idle", onRevert: handleRestore, threadId: cpCtx?.threadId ?? "" }), isLast && (_jsx(TooltipProvider, { delayDuration: 400, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(ActionBarPrimitive.Reload, { asChild: true, children: _jsx("button", { type: "button", "aria-label": t("agentChat.message.regenerate"), className: `flex h-6 w-6 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 hover:bg-accent hover:text-foreground ${messageFooterFadeClassName} disabled:cursor-not-allowed disabled:opacity-40`, children: _jsx(IconRefresh, { className: "h-3.5 w-3.5" }) }) }) }), _jsx(TooltipContent, { side: "top", className: "text-xs", children: t("agentChat.message.regenerate") })] }) })), _jsx(MessageBranchPicker, {}), timestamp && (_jsx(MessageTimestamp, { timestamp: timestamp, className: messageFooterFadeClassName }))] }), showRestore && restoreState === "confirming" ? (_jsxs("div", { className: "flex items-center gap-1 text-xs", children: [_jsx("button", { onClick: handleRestore, className: "rounded-md bg-destructive px-1.5 py-0.5 text-destructive-foreground hover:bg-destructive/90", children: t("agentChat.message.restoreQuestion") }), _jsx("button", { onClick: cancelRestore, className: "rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: t("agentChat.common.cancel") })] })) : showRestore && restoreState === "restoring" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-muted-foreground", children: [_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" }), t("agentChat.message.restoring")] })) : restoreState === "error" ? (_jsxs("span", { className: "flex items-center gap-1 text-xs text-destructive", children: [_jsx(IconAlertTriangle, { className: "h-3 w-3 shrink-0" }), _jsx("span", { className: "truncate", children: restoreError }), _jsx("button", { onClick: cancelRestore, className: "cursor-pointer rounded-md px-1.5 py-0.5 text-muted-foreground hover:bg-accent", children: t("agentChat.common.dismiss") })] })) : (_jsx(ThumbsFeedback, { threadId: cpCtx?.threadId ?? "", runId: messageRunId ?? "", messageSeq: msg.index }))] }))] }));
 }
 // ─── RunningActivityStatus / ThinkingIndicator ────────────────────────────────
 export function RunningActivityStatus({ label }) {

package/dist/client/chat/run-recovery.d.ts

@@ -21,6 +21,7 @@ export declare function runErrorHeadline(info: RunErrorInfo, labels?: {
     terminal: string;
 }): string;
 export declare function getRequestModeMetadata(message: unknown): "act" | "plan" | null;
+export declare function isBuilderReconnectRunError(info: RunErrorInfo): boolean;
 export declare function BuilderConnectCta({ variant, onConnected, }: {
     variant?: "primary" | "compact";
     onConnected?: () => void;
@@ -33,8 +34,10 @@ export declare function BuilderSetupContent({ onConnected, layout, }: {
     onConnected?: () => void;
     layout?: BuilderSetupCardLayout;
 }): import("react").JSX.Element;
-export declare function BuilderSetupCard({ onConnected, bouncePulse, attached, fullWidth, layout, }: {
+export declare function BuilderSetupCard({ onConnected, onDismiss, onRetry, bouncePulse, attached, fullWidth, layout, }: {
     onConnected?: () => void;
+    onDismiss?: () => void;
+    onRetry?: () => void;
     bouncePulse?: number;
     attached?: boolean;
     fullWidth?: boolean;