@agent-native/core 0.12.36 → 0.12.38

package/dist/client/AssistantChat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssistantChat.d.ts","sourceRoot":"","sources":["../../src/client/AssistantChat.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"AssistantChat.d.ts","sourceRoot":"","sources":["../../src/client/AssistantChat.tsx"],"names":[],"mappings":"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"}

package/dist/client/AssistantChat.js

@@ -229,6 +229,15 @@ const markdownStyles = `
 const PENDING_SELECTION_KEY = "pending-selection-context";
 const ACTIVE_RUN_CLEAR_TIMEOUT_MS = 5_000;
 const ACTIVE_RUN_POLL_INTERVAL_MS = 150;
+function activeRunLooksStale(runInfo) {
+    const heartbeatAt = typeof runInfo.heartbeatAt === "number" ? runInfo.heartbeatAt : null;
+    return (runInfo.status === "running" &&
+        heartbeatAt != null &&
+        Date.now() - heartbeatAt > 5000);
+}
+function repoHasAssistantMessage(repo) {
+    return repo?.messages?.some((m) => (m.message?.role ?? m.role) === "assistant");
+}
 function clearPendingSelection() {
     fetch(agentNativePath(`/_agent-native/application-state/${PENDING_SELECTION_KEY}`), {
         method: "DELETE",
@@ -1452,6 +1461,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     const [isReconnecting, setIsReconnecting] = useState(false);
     const [reconnectContent, setReconnectContent] = useState([]);
     const [activityLabel, setActivityLabel] = useState(null);
+    const activityStepIdCounter = useRef(0);
     // When stop is clicked during reconnect, keep content visible (don't wipe it)
     const [reconnectFrozen, setReconnectFrozen] = useState(false);
     const reconnectRunIdRef = useRef(null);
@@ -1487,6 +1497,201 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     const onGenerateTitleRef = useRef(onGenerateTitle);
     onGenerateTitleRef.current = onGenerateTitle;
     const titleGeneratedRef = useRef(false);
+    const importThreadData = useCallback((threadData, options) => {
+        const repo = typeof threadData === "string" ? JSON.parse(threadData) : threadData;
+        if (repo?.messages?.length > 0) {
+            if (options?.markTitleGenerated) {
+                titleGeneratedRef.current = true;
+            }
+            threadRuntime.import(ensureMessageMetadata(repo));
+        }
+        if (Array.isArray(repo?.queuedMessages)) {
+            setQueuedMessages(repo.queuedMessages);
+            lastPersistedQueueRef.current = JSON.stringify(repo.queuedMessages);
+        }
+        return repo;
+    }, [threadRuntime]);
+    const refreshThreadFromServer = useCallback(async () => {
+        if (!threadId)
+            return null;
+        try {
+            const refreshRes = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}`);
+            if (!refreshRes.ok)
+                return null;
+            const refreshData = await refreshRes.json();
+            if (!refreshData.threadData)
+                return null;
+            return importThreadData(refreshData.threadData);
+        }
+        catch {
+            return null;
+        }
+    }, [apiUrl, importThreadData, threadId]);
+    const wasRecentlyStoppedRun = useCallback((runId) => {
+        const stopped = userStoppedRunRef.current;
+        return Boolean(stopped &&
+            Date.now() - stopped.at < 10_000 &&
+            (!stopped.runId || !runId || stopped.runId === runId));
+    }, []);
+    const startReconnectToRun = useCallback((runInfo) => {
+        if (!threadId || !runInfo.runId || runInfo.status !== "running") {
+            return false;
+        }
+        const runId = String(runInfo.runId);
+        if (wasRecentlyStoppedRun(runId))
+            return false;
+        if (reconnectRunIdRef.current === runId)
+            return true;
+        reconnectRunIdRef.current = runId;
+        setIsReconnecting(true);
+        setReconnectFrozen(false);
+        setReconnectContent([]);
+        window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
+            detail: { isRunning: true, tabId: tabId || threadId },
+        }));
+        const abortCtrl = new AbortController();
+        reconnectAbortRef.current = abortCtrl;
+        const watchdog = setInterval(async () => {
+            try {
+                const res = await fetch(`${apiUrl}/runs/active?threadId=${encodeURIComponent(threadId)}`);
+                if (!res.ok) {
+                    abortCtrl.abort();
+                    clearInterval(watchdog);
+                    return;
+                }
+                const info = (await res.json());
+                if (info.status !== "running" || activeRunLooksStale(info)) {
+                    abortCtrl.abort();
+                    clearInterval(watchdog);
+                }
+            }
+            catch {
+                // Network blip — keep polling.
+            }
+        }, 1000);
+        let reconnectTimedOut = false;
+        const maxReconnectTimer = setTimeout(() => {
+            reconnectTimedOut = true;
+            abortCtrl.abort();
+            clearInterval(watchdog);
+        }, 20_000);
+        const streamReconnect = async () => {
+            let noProgressDuringReconnect = false;
+            let latestContent = [];
+            try {
+                const sseRes = await fetch(`${apiUrl}/runs/${encodeURIComponent(runId)}/events?after=0`, { signal: abortCtrl.signal });
+                if (sseRes.ok && sseRes.body) {
+                    const content = [];
+                    latestContent = content;
+                    const toolCallCounter = { value: 0 };
+                    let rafPending = false;
+                    let latestSnapshot = [];
+                    const scheduleUpdate = (snapshot) => {
+                        latestSnapshot = snapshot;
+                        if (rafPending)
+                            return;
+                        rafPending = true;
+                        requestAnimationFrame(() => {
+                            rafPending = false;
+                            setReconnectContent(latestSnapshot);
+                        });
+                    };
+                    await readSSEStreamRaw(sseRes.body, content, toolCallCounter, tabId, scheduleUpdate);
+                    setReconnectContent([...content]);
+                }
+            }
+            catch (err) {
+                if (err instanceof AgentAutoContinueSignal &&
+                    err.reason === "no_progress") {
+                    noProgressDuringReconnect = true;
+                }
+                else if (reconnectTimedOut &&
+                    err instanceof Error &&
+                    err.name === "AbortError") {
+                    noProgressDuringReconnect = true;
+                }
+            }
+            finally {
+                clearInterval(watchdog);
+                clearTimeout(maxReconnectTimer);
+            }
+            if (noProgressDuringReconnect && reconnectRunIdRef.current === runId) {
+                try {
+                    await fetch(`${apiUrl}/runs/${encodeURIComponent(runId)}/abort`, {
+                        method: "POST",
+                        headers: { "Content-Type": "application/json" },
+                        body: JSON.stringify({ reason: "no_progress" }),
+                    });
+                }
+                catch {
+                    // Best effort — the important part is unwinding the UI.
+                }
+                setReconnectContent([...latestContent]);
+                setReconnectFrozen(latestContent.length > 0);
+                setRunErrorInfo({
+                    message: "The previous agent run stopped producing visible progress while reconnecting, so it was stopped before it could keep looping.",
+                    errorCode: "reconnect_no_progress",
+                    recoverable: true,
+                    runId,
+                });
+                setDismissedRunErrorKey(null);
+                reconnectAbortRef.current = null;
+                setIsReconnecting(false);
+                reconnectRunIdRef.current = null;
+                window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
+                    detail: { isRunning: false, tabId: tabId || threadId },
+                }));
+                return;
+            }
+            setReconnectFrozen(true);
+            let loaded = false;
+            for (let attempt = 0; attempt < 10; attempt++) {
+                await new Promise((r) => setTimeout(r, 500));
+                if (reconnectRunIdRef.current !== runId)
+                    break;
+                const repo = await refreshThreadFromServer();
+                if (repoHasAssistantMessage(repo)) {
+                    setReconnectContent([]);
+                    setReconnectFrozen(false);
+                    loaded = true;
+                    break;
+                }
+            }
+            if (reconnectRunIdRef.current === runId) {
+                reconnectAbortRef.current = null;
+                setIsReconnecting(false);
+                reconnectRunIdRef.current = null;
+                window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
+                    detail: { isRunning: false, tabId: tabId || threadId },
+                }));
+            }
+            if (!loaded) {
+                await refreshThreadFromServer();
+            }
+        };
+        void streamReconnect();
+        return true;
+    }, [apiUrl, refreshThreadFromServer, tabId, threadId, wasRecentlyStoppedRun]);
+    const reconnectActiveRunForThread = useCallback(async () => {
+        if (!threadId)
+            return false;
+        try {
+            const runRes = await fetch(`${apiUrl}/runs/active?threadId=${encodeURIComponent(threadId)}`);
+            if (!runRes.ok)
+                return false;
+            const runInfo = (await runRes.json());
+            if (!runInfo.active ||
+                runInfo.status !== "running" ||
+                activeRunLooksStale(runInfo)) {
+                await refreshThreadFromServer();
+                return false;
+            }
+            return startReconnectToRun(runInfo);
+        }
+        catch {
+            return false;
+        }
+    }, [apiUrl, refreshThreadFromServer, startReconnectToRun, threadId]);
     // Restore messages from server on mount (when threadId is set)
     useEffect(() => {
         if (hasRestoredRef.current)
@@ -1501,238 +1706,15 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                         return;
                     const data = await res.json();
                     if (data.threadData) {
-                        const repo = typeof data.threadData === "string"
-                            ? JSON.parse(data.threadData)
-                            : data.threadData;
-                        if (repo?.messages?.length > 0) {
-                            titleGeneratedRef.current = true; // Don't re-generate for restored threads
-                            threadRuntime.import(ensureMessageMetadata(repo));
-                        }
-                        // Restore user-queued messages that were persisted before reload.
-                        if (Array.isArray(repo?.queuedMessages)) {
-                            setQueuedMessages(repo.queuedMessages);
-                            // Mark as restored so the debounced save effect doesn't write
-                            // the same data back to the server on mount.
-                            lastPersistedQueueRef.current = JSON.stringify(repo.queuedMessages);
-                        }
+                        importThreadData(data.threadData, { markTitleGenerated: true });
                     }
                     // Also skip title generation if thread already has a title
                     if (data.title) {
                         titleGeneratedRef.current = true;
                     }
-                    // Check if there's an active run for this thread (e.g. after hot reload)
-                    try {
-                        const runRes = await fetch(`${apiUrl}/runs/active?threadId=${encodeURIComponent(threadId)}`);
-                        if (runRes.ok) {
-                            const runInfo = await runRes.json();
-                            // Defense in depth: if the server says status="running" but the
-                            // heartbeat is stale (producer died before the server-side reap
-                            // sweep noticed), treat it as dead. 5s tolerates normal jitter
-                            // around the 1.5s heartbeat without false positives.
-                            const heartbeatAt = typeof runInfo.heartbeatAt === "number"
-                                ? runInfo.heartbeatAt
-                                : null;
-                            const looksStale = runInfo.status === "running" &&
-                                heartbeatAt != null &&
-                                Date.now() - heartbeatAt > 5000;
-                            // If the run already completed or looks stale, just re-fetch
-                            // thread data (don't enter "Thinking." reconnection mode).
-                            if (runInfo.status !== "running" || looksStale) {
-                                try {
-                                    const refreshRes = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}`);
-                                    if (refreshRes.ok) {
-                                        const refreshData = await refreshRes.json();
-                                        if (refreshData.threadData) {
-                                            const repo = typeof refreshData.threadData === "string"
-                                                ? JSON.parse(refreshData.threadData)
-                                                : refreshData.threadData;
-                                            if (repo?.messages?.length > 0) {
-                                                threadRuntime.import(ensureMessageMetadata(repo));
-                                            }
-                                            if (Array.isArray(repo?.queuedMessages)) {
-                                                setQueuedMessages(repo.queuedMessages);
-                                                lastPersistedQueueRef.current = JSON.stringify(repo.queuedMessages);
-                                            }
-                                        }
-                                    }
-                                }
-                                catch { }
-                                // Skip reconnection entirely
-                            }
-                            else {
-                                // Agent is still running — subscribe to live SSE stream
-                                reconnectRunIdRef.current = runInfo.runId;
-                                setIsReconnecting(true);
-                                setReconnectContent([]);
-                                // Signal tab running indicator
-                                window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
-                                    detail: { isRunning: true, tabId: tabId || threadId },
-                                }));
-                                // Create AbortController before the async call so stop button
-                                // can abort it even if clicked before the function body runs.
-                                const abortCtrl = new AbortController();
-                                reconnectAbortRef.current = abortCtrl;
-                                // Watchdog: poll /runs/active every 1s to detect when the run
-                                // is no longer running server-side, or the heartbeat has gone
-                                // stale (producer died). Aborts the SSE fetch so we fall
-                                // through to thread refresh instead of showing "Thinking..."
-                                // forever.
-                                const watchdog = setInterval(async () => {
-                                    try {
-                                        const res = await fetch(`${apiUrl}/runs/active?threadId=${encodeURIComponent(threadId)}`);
-                                        if (!res.ok) {
-                                            abortCtrl.abort();
-                                            clearInterval(watchdog);
-                                            return;
-                                        }
-                                        const info = await res.json();
-                                        const hb = typeof info.heartbeatAt === "number"
-                                            ? info.heartbeatAt
-                                            : null;
-                                        const stale = info.status === "running" &&
-                                            hb != null &&
-                                            Date.now() - hb > 5000;
-                                        if (info.status !== "running" || stale) {
-                                            abortCtrl.abort();
-                                            clearInterval(watchdog);
-                                        }
-                                    }
-                                    catch {
-                                        // Network blip — keep polling
-                                    }
-                                }, 1000);
-                                // Hard cap: no single reconnect should wedge the UI for
-                                // more than 20s. With the 1s watchdog + stale-heartbeat
-                                // detection + startup reap, this only triggers in truly
-                                // pathological cases. Keeps "Reconnecting…" from feeling
-                                // infinite.
-                                let reconnectTimedOut = false;
-                                const maxReconnectTimer = setTimeout(() => {
-                                    reconnectTimedOut = true;
-                                    abortCtrl.abort();
-                                    clearInterval(watchdog);
-                                }, 20_000);
-                                const streamReconnect = async () => {
-                                    let noProgressDuringReconnect = false;
-                                    let latestContent = [];
-                                    try {
-                                        const sseRes = await fetch(`${apiUrl}/runs/${encodeURIComponent(runInfo.runId)}/events?after=0`, { signal: abortCtrl.signal });
-                                        if (sseRes.ok && sseRes.body) {
-                                            const content = [];
-                                            latestContent = content;
-                                            const toolCallCounter = { value: 0 };
-                                            // Throttle React state updates via requestAnimationFrame
-                                            let rafPending = false;
-                                            let latestSnapshot = [];
-                                            const scheduleUpdate = (snapshot) => {
-                                                latestSnapshot = snapshot;
-                                                if (!rafPending) {
-                                                    rafPending = true;
-                                                    requestAnimationFrame(() => {
-                                                        rafPending = false;
-                                                        setReconnectContent(latestSnapshot);
-                                                    });
-                                                }
-                                            };
-                                            await readSSEStreamRaw(sseRes.body, content, toolCallCounter, tabId, scheduleUpdate);
-                                            // Final update with complete content
-                                            setReconnectContent([...content]);
-                                        }
-                                    }
-                                    catch (err) {
-                                        if (err instanceof AgentAutoContinueSignal &&
-                                            err.reason === "no_progress") {
-                                            noProgressDuringReconnect = true;
-                                        }
-                                        else if (reconnectTimedOut &&
-                                            err instanceof Error &&
-                                            err.name === "AbortError") {
-                                            noProgressDuringReconnect = true;
-                                        }
-                                        // Other stream errors/aborts fall through to re-fetch.
-                                    }
-                                    finally {
-                                        clearInterval(watchdog);
-                                        clearTimeout(maxReconnectTimer);
-                                    }
-                                    if (noProgressDuringReconnect && reconnectRunIdRef.current) {
-                                        try {
-                                            await fetch(`${apiUrl}/runs/${encodeURIComponent(runInfo.runId)}/abort`, {
-                                                method: "POST",
-                                                headers: { "Content-Type": "application/json" },
-                                                body: JSON.stringify({ reason: "no_progress" }),
-                                            });
-                                        }
-                                        catch {
-                                            // Best effort — the important part is unwinding the UI.
-                                        }
-                                        setReconnectContent([...latestContent]);
-                                        setReconnectFrozen(latestContent.length > 0);
-                                        setRunErrorInfo({
-                                            message: "The previous agent run stopped producing visible progress while reconnecting, so it was stopped before it could keep looping.",
-                                            errorCode: "reconnect_no_progress",
-                                            recoverable: true,
-                                            runId: runInfo.runId,
-                                        });
-                                        setDismissedRunErrorKey(null);
-                                        reconnectAbortRef.current = null;
-                                        setIsReconnecting(false);
-                                        reconnectRunIdRef.current = null;
-                                        window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
-                                            detail: { isRunning: false, tabId: tabId || threadId },
-                                        }));
-                                        return;
-                                    }
-                                    // Poll for thread data — server's updateThreadData may not have
-                                    // committed yet when the SSE `done` event fires, so retry until
-                                    // an assistant message appears (up to ~5 s) before clearing.
-                                    setReconnectFrozen(true);
-                                    let loaded = false;
-                                    for (let attempt = 0; attempt < 10; attempt++) {
-                                        await new Promise((r) => setTimeout(r, 500));
-                                        // If the stop button fired mid-poll, bail out
-                                        if (!reconnectRunIdRef.current)
-                                            break;
-                                        try {
-                                            const refreshRes = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}`);
-                                            if (refreshRes.ok) {
-                                                const refreshData = await refreshRes.json();
-                                                if (refreshData.threadData) {
-                                                    const repo = typeof refreshData.threadData === "string"
-                                                        ? JSON.parse(refreshData.threadData)
-                                                        : refreshData.threadData;
-                                                    const hasAssistant = repo?.messages?.some((m) => (m.message?.role ?? m.role) === "assistant");
-                                                    if (hasAssistant) {
-                                                        threadRuntime.import(ensureMessageMetadata(repo));
-                                                        setReconnectContent([]);
-                                                        setReconnectFrozen(false);
-                                                        loaded = true;
-                                                        break;
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        catch { }
-                                    }
-                                    // Only clean up if the stop button hasn't already done it
-                                    if (reconnectRunIdRef.current) {
-                                        reconnectAbortRef.current = null;
-                                        // If loaded=true, reconnectContent already cleared above.
-                                        // If loaded=false (timeout), keep content frozen so user sees what happened.
-                                        setIsReconnecting(false);
-                                        reconnectRunIdRef.current = null;
-                                        window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
-                                            detail: { isRunning: false, tabId: tabId || threadId },
-                                        }));
-                                    }
-                                };
-                                streamReconnect();
-                            } // end else (running)
-                        }
-                    }
-                    catch {
-                        // No active run — nothing to reconnect to
-                    }
+                    // Check if there's an active run for this thread (e.g. after hot
+                    // reload), and reconnect to it if it is still running.
+                    await reconnectActiveRunForThread();
                 }
                 catch {
                     // Start fresh
@@ -1757,7 +1739,48 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             catch { }
             setIsRestoring(false);
         }
-    }, [threadId, tabId, apiUrl, threadRuntime]);
+    }, [
+        threadId,
+        tabId,
+        apiUrl,
+        threadRuntime,
+        importThreadData,
+        reconnectActiveRunForThread,
+    ]);
+    // If assistant-ui stops the local runtime while the background server run is
+    // still alive, immediately switch into the same reconnect path used after a
+    // reload. Otherwise the composer unlocks, the next send hits a 409, and the
+    // user sees "still working" even though the UI stopped updating.
+    const prevRuntimeRunningForReconnectRef = useRef(isRuntimeRunning);
+    useEffect(() => {
+        const wasRuntimeRunning = prevRuntimeRunningForReconnectRef.current;
+        prevRuntimeRunningForReconnectRef.current = isRuntimeRunning;
+        if (!wasRuntimeRunning ||
+            isRuntimeRunning ||
+            !threadId ||
+            forceStopped ||
+            isReconnecting ||
+            wasRecentlyStoppedRun()) {
+            return;
+        }
+        let cancelled = false;
+        const timer = window.setTimeout(() => {
+            if (!cancelled) {
+                void reconnectActiveRunForThread();
+            }
+        }, 250);
+        return () => {
+            cancelled = true;
+            window.clearTimeout(timer);
+        };
+    }, [
+        forceStopped,
+        isReconnecting,
+        isRuntimeRunning,
+        reconnectActiveRunForThread,
+        threadId,
+        wasRecentlyStoppedRun,
+    ]);
     // Generate a title when the first user message is sent
     useEffect(() => {
         if (!hasRestoredRef.current)
@@ -2030,7 +2053,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     return [
                         ...prev,
                         {
-                            id: `${Date.now()}-${prev.length}`,
+                            id: `${Date.now()}-${++activityStepIdCounter.current}`,
                             label,
                             ...(tool ? { tool } : {}),
                         },