@agent-native/core 0.84.51 → 0.84.52

package/dist/client/AssistantChat.js

@@ -329,7 +329,7 @@ export function resolveAssistantChatRunningStatusLabel({ runningActivityLabel, i
     if (isAutoResuming)
         return "Resuming";
     if (isReconnecting && hasReconnectContent)
-        return "Continuing";
+        return "Still working";
     return "Thinking";
 }
 export const CHAT_STORAGE_PREFIX = "agent-chat:";
@@ -828,7 +828,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     const textStreaming = showRunningInUI || externalStreaming;
     // A revealed activity label wins; otherwise keep recovery states calm and
     // product-facing. Reconnect is transport machinery, so normal replay reads as
-    // "Continuing" instead of exposing "Reconnecting" mid-chat.
+    // ongoing work instead of exposing "Reconnecting" mid-chat.
     const runningStatusLabel = resolveAssistantChatRunningStatusLabel({
         runningActivityLabel,
         isAutoResuming,
@@ -1130,6 +1130,24 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         const streamReconnect = async () => {
             let noProgressDuringReconnect = false;
             let latestContent = [];
+            const preparingActionState = {};
+            const sameRunStillActive = async () => {
+                try {
+                    const res = await fetch(`${apiUrl}/runs/active?threadId=${encodeURIComponent(threadId)}`, { signal: abortCtrl.signal });
+                    if (!res.ok)
+                        return "unknown";
+                    const info = (await res.json());
+                    return info.active === true &&
+                        String(info.runId ?? "") === runId &&
+                        info.status === "running" &&
+                        !activeRunLooksStale(info)
+                        ? "active"
+                        : "inactive";
+                }
+                catch {
+                    return "unknown";
+                }
+            };
             const threadPollInterval = afterSeq > 0
                 ? window.setInterval(() => {
                     if (reconnectRunIdRef.current !== runId)
@@ -1138,11 +1156,22 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                 }, 2000)
                 : undefined;
             try {
-                const sseRes = await fetch(`${apiUrl}/runs/${encodeURIComponent(runId)}/events?after=${afterSeq}`, { signal: abortCtrl.signal });
-                if (sseRes.ok && sseRes.body) {
-                    const content = [];
-                    latestContent = content;
-                    const toolCallCounter = { value: 0 };
+                const content = [];
+                latestContent = content;
+                const toolCallCounter = { value: 0 };
+                while (reconnectRunIdRef.current === runId &&
+                    !abortCtrl.signal.aborted) {
+                    const reconnectAfterSeq = resolveReconnectAfterSeq(threadId, runId);
+                    reconnectTailOnlyRef.current = reconnectAfterSeq > 0;
+                    const sseRes = await fetch(`${apiUrl}/runs/${encodeURIComponent(runId)}/events?after=${reconnectAfterSeq}`, { signal: abortCtrl.signal });
+                    if (!sseRes.ok || !sseRes.body) {
+                        const activeState = await sameRunStillActive();
+                        if (activeState !== "inactive") {
+                            await new Promise((resolve) => window.setTimeout(resolve, 250));
+                            continue;
+                        }
+                        break;
+                    }
                     let rafPending = false;
                     let latestSnapshot = [];
                     const scheduleUpdate = (snapshot) => {
@@ -1155,13 +1184,35 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                             setReconnectContent(latestSnapshot);
                         });
                     };
-                    await readSSEStreamRaw(sseRes.body, content, toolCallCounter, tabId, scheduleUpdate, (seq) => {
-                        markReconnectProgress();
-                        updateActiveRunSeq(seq);
-                    });
-                    if (afterSeq === 0) {
-                        setReconnectContent([...content]);
+                    try {
+                        await readSSEStreamRaw(sseRes.body, content, toolCallCounter, tabId, scheduleUpdate, (seq) => {
+                            markReconnectProgress();
+                            updateActiveRunSeq(seq);
+                        }, { preparingActionState });
+                        if (reconnectAfterSeq === 0) {
+                            setReconnectContent([...content]);
+                        }
+                        break;
                     }
+                    catch (err) {
+                        if (err instanceof AgentAutoContinueSignal &&
+                            err.reason === "stream_ended") {
+                            if (reconnectAfterSeq === 0) {
+                                setReconnectContent([...content]);
+                            }
+                            const activeState = await sameRunStillActive();
+                            if (activeState !== "inactive") {
+                                await new Promise((resolve) => window.setTimeout(resolve, 250));
+                                continue;
+                            }
+                        }
+                        throw err;
+                    }
+                }
+                if (reconnectTimedOut && abortCtrl.signal.aborted) {
+                    const timeoutError = new Error("Reconnect timed out");
+                    timeoutError.name = "AbortError";
+                    throw timeoutError;
                 }
             }
             catch (err) {