@agent-native/core 0.84.23 → 0.84.25

package/dist/client/AssistantChat.js

@@ -4,7 +4,7 @@ import { CompositeAttachmentAdapter } from "@assistant-ui/react";
 import { IconMessage, IconX, IconPlayerStop, IconChevronDown, IconTerminal, IconAlertTriangle, IconRefresh, } from "@tabler/icons-react";
 import { useState, useRef, useEffect, useCallback, useMemo, useLayoutEffect, forwardRef, useImperativeHandle, } from "react";
 import { LLM_MISSING_CREDENTIALS_MESSAGE } from "../agent/engine/credential-errors.js";
-import { getActiveRunActivityTool, getActiveRun, resolveReconnectAfterSeq, setActiveRun, updateActiveRunActivity, updateActiveRunSeq, } from "./active-run-state.js";
+import { ACTIVE_RUN_STATE_EVENT, clearActiveRunIfMatches, getActiveRunActivityTool, getActiveRun, resolveReconnectAfterSeq, setActiveRun, updateActiveRunActivity, updateActiveRunSeq, } from "./active-run-state.js";
 import { createAgentChatAdapter, } from "./agent-chat-adapter.js";
 import { appendAgentChatContextToMessage, formatAgentChatContextItemsForPrompt, getAgentChatContextState, normalizeAgentChatContextItem, publishAgentChatContextItems, refreshAgentChatContext, subscribeAgentChatContext, } from "./agent-chat.js";
 import { captureError } from "./analytics.js";
@@ -96,6 +96,9 @@ export function reconnectProgressTimedOut(args) {
     const threshold = args.thresholdMs ?? ACTIVE_RUN_STUCK_THRESHOLD_MS;
     return args.now - args.lastProgressAt >= threshold;
 }
+function activeRunMatchesThread(state, threadId) {
+    return Boolean(threadId && state?.threadId === threadId && state.runId);
+}
 function isAssistantUiDuplicateMessageIdError(error) {
     const message = error instanceof Error ? error.message : String(error ?? "");
     return (message.includes("MessageRepository") &&
@@ -305,8 +308,12 @@ export function resolveAssistantChatSubmitIntent({ isRunning, requestedIntent, }
         return "queued";
     return requestedIntent ?? "immediate";
 }
-export function resolveAssistantChatRunningState({ forceStopped, isRuntimeRunning, isReconnecting, optimisticRunning, isAutoResuming, }) {
-    const isRunning = !forceStopped && (isRuntimeRunning || isReconnecting || optimisticRunning);
+export function resolveAssistantChatRunningState({ forceStopped, isRuntimeRunning, isReconnecting, optimisticRunning, isAutoResuming, hasActiveServerRun, }) {
+    const isRunning = !forceStopped &&
+        (isRuntimeRunning ||
+            isReconnecting ||
+            optimisticRunning ||
+            Boolean(hasActiveServerRun));
     return {
         isRunning,
         // During auto-continuation, assistant-ui can briefly mark the message done
@@ -771,13 +778,32 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     // When stop is clicked during reconnect, keep content visible (don't wipe it)
     const [reconnectFrozen, setReconnectFrozen] = useState(false);
     const reconnectRunIdRef = useRef(null);
-    const [reconnectAfterSeq, setReconnectAfterSeq] = useState(0);
+    const reconnectCanMaterializeRef = useRef(false);
     const reconnectAbortRef = useRef(null);
     // Nuclear stop: user clicked stop. Clears the stop button/indicator AND
     // lets new submissions go through immediately — prevents the "stuck
     // queueing forever" state where isReconnecting or isRuntimeRunning gets
     // wedged (e.g. after a tab refresh + stop during reconnect).
     const [forceStopped, setForceStopped] = useState(false);
+    const [hasActiveServerRun, setHasActiveServerRun] = useState(() => activeRunMatchesThread(getActiveRun(), threadId));
+    useEffect(() => {
+        const syncActiveRun = (state = getActiveRun()) => {
+            setHasActiveServerRun(activeRunMatchesThread(state, threadId));
+        };
+        syncActiveRun();
+        const handler = (event) => {
+            const state = event
+                .detail?.state;
+            syncActiveRun(state ?? null);
+        };
+        const storageHandler = () => syncActiveRun();
+        window.addEventListener(ACTIVE_RUN_STATE_EVENT, handler);
+        window.addEventListener("storage", storageHandler);
+        return () => {
+            window.removeEventListener(ACTIVE_RUN_STATE_EVENT, handler);
+            window.removeEventListener("storage", storageHandler);
+        };
+    }, [threadId]);
     // Real running state drives submission/queue gating; UI running also covers
     // short auto-continuation gaps so the latest assistant message does not flash
     // into a done state while the agent is still working.
@@ -787,14 +813,14 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         isReconnecting,
         optimisticRunning,
         isAutoResuming,
+        hasActiveServerRun,
     });
     const textStreaming = showRunningInUI || externalStreaming;
     // A revealed activity label wins; otherwise stay a steady "Thinking" by
     // default. We only surface "Reconnecting" while we are actively replaying
     // recovered content (reconnectContent populated). A bare reconnect with no
-    // replayed content — e.g. a tail-resume after the serverless wall, where
-    // `scheduleUpdate` intentionally leaves reconnectContent empty — is normal
-    // ongoing work, so it must read as "Thinking", never a perpetual "Working".
+    // replayed content is normal ongoing work, so it must read as "Thinking",
+    // never a perpetual "Working".
     const runningStatusLabel = runningActivityLabel
         ? runningActivityLabel
         : isAutoResuming
@@ -1033,9 +1059,9 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             return true;
         reconnectRunIdRef.current = runId;
         const afterSeq = resolveReconnectAfterSeq(threadId, runId);
+        reconnectCanMaterializeRef.current = afterSeq === 0;
         const storedActivityTool = getActiveRunActivityTool(threadId, runId);
         setRunningActivityTool(storedActivityTool);
-        setReconnectAfterSeq(afterSeq);
         setActiveRun({
             threadId,
             runId,
@@ -1112,8 +1138,6 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     let rafPending = false;
                     let latestSnapshot = [];
                     const scheduleUpdate = (snapshot) => {
-                        if (afterSeq > 0)
-                            return;
                         latestSnapshot = snapshot;
                         if (rafPending)
                             return;
@@ -1185,6 +1209,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     settleInterruptedToolCalls(latestContent);
                     setReconnectContent([...latestContent]);
                     setReconnectFrozen(latestContent.length > 0);
+                    reconnectCanMaterializeRef.current = latestContent.length > 0;
                 }
                 setRunErrorInfo({
                     message: "The previous agent run stopped producing visible progress while reconnecting, so it was stopped before it could keep looping.",
@@ -1193,16 +1218,19 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     runId,
                 });
                 setDismissedRunErrorKey(null);
+                clearActiveRunIfMatches(threadId, runId);
                 reconnectAbortRef.current = null;
                 setIsReconnecting(false);
                 reconnectRunIdRef.current = null;
-                setReconnectAfterSeq(0);
+                if (afterSeq > 0) {
+                    reconnectCanMaterializeRef.current = false;
+                }
                 window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
                     detail: { isRunning: false, tabId: tabId || threadId },
                 }));
                 return;
             }
-            setReconnectFrozen(true);
+            setReconnectFrozen(afterSeq === 0);
             let loaded = false;
             for (let attempt = 0; attempt < 10; attempt++) {
                 await new Promise((r) => setTimeout(r, 500));
@@ -1212,21 +1240,34 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                 if (repoHasAssistantMessage(repo)) {
                     setReconnectContent([]);
                     setReconnectFrozen(false);
+                    reconnectCanMaterializeRef.current = false;
                     loaded = true;
                     break;
                 }
             }
             if (reconnectRunIdRef.current === runId) {
+                if (afterSeq > 0) {
+                    setReconnectContent([]);
+                    setReconnectFrozen(false);
+                }
+                clearActiveRunIfMatches(threadId, runId);
                 reconnectAbortRef.current = null;
                 setIsReconnecting(false);
                 reconnectRunIdRef.current = null;
-                setReconnectAfterSeq(0);
+                if (loaded || afterSeq > 0 || latestContent.length === 0) {
+                    reconnectCanMaterializeRef.current = false;
+                }
                 window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
                     detail: { isRunning: false, tabId: tabId || threadId },
                 }));
             }
             if (!loaded) {
-                await refreshThreadFromServer();
+                const repo = await refreshThreadFromServer();
+                if (afterSeq > 0 || repoHasAssistantMessage(repo)) {
+                    setReconnectContent([]);
+                    setReconnectFrozen(false);
+                    reconnectCanMaterializeRef.current = false;
+                }
             }
         };
         void streamReconnect();
@@ -1885,6 +1926,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             if (reconnectFrozen) {
                 setReconnectFrozen(false);
                 setReconnectContent([]);
+                reconnectCanMaterializeRef.current = false;
             }
             if (forceStopped) {
                 setForceStopped(false);
@@ -1904,6 +1946,11 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     const materializeFrozenReconnectContent = useCallback(() => {
         if (!reconnectFrozen || reconnectContent.length === 0)
             return;
+        if (!reconnectCanMaterializeRef.current) {
+            setReconnectFrozen(false);
+            setReconnectContent([]);
+            return;
+        }
         try {
             const frozenContent = cloneContentParts(reconnectContent);
             settleInterruptedToolCalls(frozenContent);
@@ -1941,6 +1988,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             threadRuntime.import(ensureMessageMetadata(repo));
             setReconnectFrozen(false);
             setReconnectContent([]);
+            reconnectCanMaterializeRef.current = false;
         }
         catch (err) {
             captureError(err, {
@@ -1979,6 +2027,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         setRunErrorInfo(null);
         setDismissedRunErrorKey(null);
         if (runIdToAbort) {
+            if (threadId)
+                clearActiveRunIfMatches(threadId, runIdToAbort);
             fetch(`${apiUrl}/runs/${encodeURIComponent(runIdToAbort)}/abort`, {
                 method: "POST",
             }).catch(() => { });
@@ -1987,9 +2037,16 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             reconnectAbortRef.current?.abort();
             reconnectAbortRef.current = null;
             reconnectRunIdRef.current = null;
-            setReconnectAfterSeq(0);
             setIsReconnecting(false);
-            setReconnectFrozen(reconnectContent.length > 0);
+            const shouldFreezeReconnectContent = reconnectCanMaterializeRef.current && reconnectContent.length > 0;
+            if (shouldFreezeReconnectContent) {
+                setReconnectFrozen(true);
+            }
+            else {
+                setReconnectFrozen(false);
+                setReconnectContent([]);
+                reconnectCanMaterializeRef.current = false;
+            }
         }
         threadRuntime.cancelRun();
         if (typeof window !== "undefined") {
@@ -2480,9 +2537,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                     }
                                                     setRunErrorInfo(null);
                                                 } })), (isReconnecting || reconnectFrozen) &&
-                                                reconnectAfterSeq === 0 &&
                                                 reconnectContent.length > 0 && (_jsx(ReconnectStreamMessage, { content: reconnectContent })), (isReconnecting || reconnectFrozen) &&
-                                                reconnectAfterSeq > 0 &&
+                                                reconnectContent.length === 0 &&
                                                 reconnectActivityContent.length > 0 && (_jsx(ReconnectStreamMessage, { content: reconnectActivityContent })), showRunningInUI && (_jsx(RunningActivityStatus, { label: runningStatusLabel })), queuedMessages.map((msg) => {
                                                 const displayText = msg.text
                                                     .replace(/<context>[\s\S]*?<\/context>\n?/g, "")