@parhelia/core 0.1.12776 → 0.1.12777

package/dist/components/ui/button.d.ts

@@ -1,6 +1,6 @@
 import * as React from "react";
 declare const buttonVariants: (props?: ({
-    variant?: "select" | "link" | "outline" | "default" | "defaultInverted" | "destructive" | "secondary" | "ghost" | null | undefined;
+    variant?: "link" | "select" | "outline" | "default" | "defaultInverted" | "destructive" | "secondary" | "ghost" | null | undefined;
     size?: "select" | "default" | "icon" | "sm" | "xs" | "xxs" | "lg" | "iconSm" | "iconXs" | null | undefined;
 } & import("class-variance-authority/types").ClassProp) | undefined) => string;
 type BaseButtonProps = React.ComponentProps<"button"> & {

package/dist/editor/ai/AgentTerminal.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import { AgentChatMessage, Agent, AgentMetadata } from "../services/agentService";
 import { AiProfile } from "../services/aiService";
-export declare function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadProfiles, isActive, isVisible, isFocused, compact, displayMode, showSummaryInput, hideContext, hideBottomControls, hideGreeting, defaultCollapseJson, simpleMode, className, initialPrompt, onAgentUpdate, onMessage, onInteractionSubmitted, onQuestionnaireOpenChange, questionnaireFooterActions, hideSummaryMessages, summaryPlaceholderActions, summaryPlaceholderMessage, hideSummaryWaitingPlaceholder, }: {
+export declare function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadProfiles, isActive, isVisible, isFocused, compact, displayMode, showSummaryInput, hideContext, hideBottomControls, showStatusBar, showAgentConfigControls, hideGreeting, defaultCollapseJson, simpleMode, className, initialPrompt, onAgentUpdate, onMessage, onInteractionSubmitted, onQuestionnaireOpenChange, questionnaireFooterActions, hideSummaryMessages, summaryPlaceholderActions, summaryPlaceholderMessage, hideSummaryWaitingPlaceholder, }: {
     agentStub: Agent;
     initialMetadata?: AgentMetadata;
     profiles: AiProfile[];
@@ -17,6 +17,10 @@ export declare function AgentTerminal({ agentStub, initialMetadata, profiles, on
     showSummaryInput?: boolean;
     hideContext?: boolean;
     hideBottomControls?: boolean;
+    /** Force the bottom status bar (model/context/cost) to render even when bottom controls are hidden. Defaults to `!hideBottomControls`. */
+    showStatusBar?: boolean;
+    /** Force the agent configuration row (mode selector, Agent settings popover) to render even when bottom controls are hidden. Defaults to `!hideBottomControls`. */
+    showAgentConfigControls?: boolean;
     hideGreeting?: boolean;
     defaultCollapseJson?: boolean;
     simpleMode?: boolean;

package/dist/editor/ai/AgentTerminal.js

@@ -21,7 +21,7 @@ import { QueuedPromptsPanel } from "./QueuedPromptsPanel";
 import { AgentCapacityBanner, AgentCostLimitBanner, AgentErrorBanner, } from "./AgentBanners";
 import { InitialThinkingSplash } from "./InitialThinkingSplash";
 import { AgentInlineDialogContent } from "./AgentInlineDialogContent";
-import { AGENT_HISTORY_LIMIT, MACHINE_CAPACITY_REASON, buildPlaceholderAgentDetails, formatAllowanceLabel, formatAllowanceSource, getAgentRunMessageAgentId, getAgentRunMessageDetail, getAgentRunMessageSeq, isInactiveServerExecutionStatus, isAgentErrorStatusValue, isHeartbeatRunEventMessage, mergeAgentOperationHistory, normalizeDialogAgentId, normalizeProfileAllowanceOperations, normalizeServerExecutionStatus, } from "./agentMessageHelpers";
+import { AGENT_HISTORY_LIMIT, MACHINE_CAPACITY_REASON, buildPlaceholderAgentDetails, formatAllowanceLabel, formatAllowanceSource, getAgentRunMessageAgentId, getAgentRunMessageDetail, getAgentRunMessageSeq, isAgentErrorStatusValue, isHeartbeatRunEventMessage, mergeAgentOperationHistory, normalizeDialogAgentId, normalizeProfileAllowanceOperations, normalizeServerExecutionStatus, } from "./agentMessageHelpers";
 import { AgentDocumentList, } from "./AgentDocumentList";
 import { AgentEditOperationsPanel } from "./EditOperationsPanel";
 import { SpawnedAgentsPanel } from "./SpawnedAgentsPanel";
@@ -40,7 +40,7 @@ import { cn } from "../../lib/utils";
 import { sanitizeSvg } from "../../lib/sanitize";
 import { Select } from "../../components/ui/select";
 import { AgentTerminalStatusBar } from "./AgentTerminalStatusBar";
-import { checkReplayVerified, createRecoveryStateSlice, decideRecoveryAction, interpretAgentRunDiagnostics, reconcilePendingDialogTracker, } from "./agentDiagnostics";
+import { isStreamStalled, shouldReloadAfterDiagnostics, } from "./agentDiagnostics";
 import { forceEditorSocketReconnect } from "../client/hooks/useEditorWebSocket";
 import { SimpleTabs } from "../ui/SimpleTabs";
 import { Splitter } from "../ui/Splitter";
@@ -80,7 +80,7 @@ function hasStaleRunningLoadSuppression(agentId) {
 // interface AgentTerminalProps {
 //   agentStub: Agent;
 // }
-export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadProfiles, isActive, isVisible, isFocused, compact = false, displayMode = "full", showSummaryInput = false, hideContext = false, hideBottomControls = false, hideGreeting = false, defaultCollapseJson = false, simpleMode = false, className, initialPrompt, onAgentUpdate, onMessage, onInteractionSubmitted, onQuestionnaireOpenChange, questionnaireFooterActions, hideSummaryMessages = false, summaryPlaceholderActions, summaryPlaceholderMessage, hideSummaryWaitingPlaceholder = false, }) {
+export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadProfiles, isActive, isVisible, isFocused, compact = false, displayMode = "full", showSummaryInput = false, hideContext = false, hideBottomControls = false, showStatusBar, showAgentConfigControls, hideGreeting = false, defaultCollapseJson = false, simpleMode = false, className, initialPrompt, onAgentUpdate, onMessage, onInteractionSubmitted, onQuestionnaireOpenChange, questionnaireFooterActions, hideSummaryMessages = false, summaryPlaceholderActions, summaryPlaceholderMessage, hideSummaryWaitingPlaceholder = false, }) {
     // Derived from props. `isVisible` controls "is this terminal mounted and
     // streaming" (subscriptions, polling). `isFocused` controls "does this
     // terminal own keyboard focus and dialogs". Both fall back to legacy
@@ -1249,16 +1249,14 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
     const lastSeqRef = useRef(0);
     const subscribedAgentIdRef = useRef(null);
     const reconcileServerStateInFlightRef = useRef(false);
-    // Recovery ladder state. The graduated replay → reconnect → stale path lives in the
-    // diagnostics polling effect below. State is keyed by agentId so switching between
-    // agents in the same terminal doesn't cross-contaminate cooldowns.
-    const recoveryStateByAgentRef = useRef(new Map());
-    const replayVerifyTimeoutRef = useRef(null);
-    // Mirror refs so the one-shot verify timer (which fires outside the polling effect's
-    // closure) can read the latest snapshot/diagnostics without re-running the effect.
-    const runDiagnosticsSnapshotRef = useRef(null);
-    const lastDiagnosticsResponseRef = useRef(null);
-    const [showStaleAgentBanner, setShowStaleAgentBanner] = useState(false);
+    // Stream-stall watchdog timestamps. `lastNonHeartbeatUpdateAtRef` is set every time
+    // something non-heartbeat advances the run (prompt submit, isExecuting transition,
+    // status/delta/complete/error event, socket reconnect, or a stall reload).
+    // `lastStallReloadAtRef` enforces a minimum gap between automatic reloads so a
+    // backend that keeps advancing while our socket keeps bouncing can't trigger reloads
+    // every 15 seconds.
+    const lastNonHeartbeatUpdateAtRef = useRef(0);
+    const lastStallReloadAtRef = useRef(0);
     const toolCallFirstSeenAtRef = useRef({});
     const pendingToolCompletionTimersRef = useRef({});
     // Cache mode/model/profile changes made while the agent is still "new" (not yet persisted)
@@ -3019,6 +3017,9 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
             if (seq) {
                 lastSeqRef.current = seq;
             }
+            if (!isHeartbeat) {
+                lastNonHeartbeatUpdateAtRef.current = Date.now();
+            }
             // Route based on delta type
             const agentStreamMessage = {
                 type,
@@ -3092,6 +3093,9 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
             if (seq) {
                 lastSeqRef.current = seq;
             }
+            // Status events never carry a "Heartbeat" payload — heartbeats are deltas. Any
+            // status update is meaningful progress for the watchdog.
+            lastNonHeartbeatUpdateAtRef.current = Date.now();
             // Route based on statusData.state
             try {
                 // Normalize various status shapes and handle Cancelled uniformly
@@ -3425,12 +3429,14 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
         }
         // Lifecycle: agent:run:complete
         if (messageType === "agent:run:complete") {
+            lastNonHeartbeatUpdateAtRef.current = Date.now();
             const finalStatus = normalizeServerExecutionStatus(message.payload?.finalStatus);
             settleCompletedRun(finalStatus === "cancelled" ? "cancelled" : "completed");
             return;
         }
         // Lifecycle: agent:run:error
         if (messageType === "agent:run:error") {
+            lastNonHeartbeatUpdateAtRef.current = Date.now();
             const errorMsg = toUserFacingAgentErrorMessage(message.payload?.error) ||
                 "AI could not complete this request.";
             clearHeartbeatMessages();
@@ -4105,6 +4111,9 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
                 context: canonicalizeAgentMetadata(effectiveContext), // Use fresh live context when in live mode
             };
             console.log("[AgentTerminal] Calling startAgent API for agent:", agentId);
+            // Reset the stall watchdog so its 15s window starts at submit, not at the last
+            // delta of the previous run (which could be hours ago for a reused chat).
+            lastNonHeartbeatUpdateAtRef.current = Date.now();
             const response = await startAgent(request);
             console.log("[AgentTerminal] startAgent response:", response);
             const isQueuedForCapacity = response.reason === MACHINE_CAPACITY_REASON ||
@@ -4999,7 +5008,6 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
         const lastEvent = recentAgentRunEvents[recentAgentRunEvents.length - 1];
         const { receivedSeqs, missingSeqs, totalCount } = currentRunDiagnostics;
         const observedMaxSeq = receivedSeqs[receivedSeqs.length - 1] ?? 0;
-        const inlineCallback = activeInlineDialogRef.current?.request.callbackId?.trim() || null;
         return {
             agentId: currentAgentId,
             isSubmitting,
@@ -5026,8 +5034,6 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
             totalToolCallCount,
             incompleteToolCallCount,
             recentToolUiEvents,
-            activeInlineDialogCallbackId: inlineCallback,
-            pendingDialogReplayCallbackIds: Array.from(pendingDialogReplayCallbackIdsRef.current),
         };
     }, [
         assistantGroupCount,
@@ -5048,239 +5054,130 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
         recentToolUiEvents,
         totalToolCallCount,
         agent?.statusMessage,
-        activeInlineDialog,
     ]);
-    // Mirror the latest snapshot/diagnostics so the one-shot replay verify timer can read
-    // them after the polling effect's closure has gone stale.
+    // Bump the watchdog timestamp when isExecuting goes false→true. Covers resumed and
+    // foreign starts (where another browser kicks off a run we're observing) on top of
+    // the explicit submit-time bump in handleSubmit.
+    const previousIsExecutingRef = useRef(false);
     useEffect(() => {
-        runDiagnosticsSnapshotRef.current = runDiagnosticsSnapshot;
-    }, [runDiagnosticsSnapshot]);
-    // Reset all per-agent recovery state when the active agent changes.
+        if (isExecuting && !previousIsExecutingRef.current) {
+            lastNonHeartbeatUpdateAtRef.current = Date.now();
+        }
+        previousIsExecutingRef.current = isExecuting;
+    }, [isExecuting]);
+    // When the editor socket reconnects, the subscription registry resubscribes for us.
+    // Give it a fresh window before the watchdog judges silence — otherwise a slow
+    // resubscribe handshake would look like a stall.
     useEffect(() => {
-        recoveryStateByAgentRef.current.clear();
-        if (replayVerifyTimeoutRef.current) {
-            clearTimeout(replayVerifyTimeoutRef.current);
-            replayVerifyTimeoutRef.current = null;
+        if (isExecuting) {
+            lastNonHeartbeatUpdateAtRef.current = Date.now();
         }
-        setShowStaleAgentBanner(false);
-    }, [currentAgentId]);
-    // When the editor socket reconnects (socketConnectionVersion bump) clear the stale
-    // banner — the registry has just re-issued subscriptions, so any "stuck" state should
-    // resolve on the next poll. If it doesn't, the banner will reappear.
+    }, [editContext?.socketConnectionVersion, isExecuting]);
+    // Reset watchdog cooldown timestamps when the active agent changes — otherwise a
+    // recent reload on agent A would suppress the first reload for agent B.
     useEffect(() => {
-        setShowStaleAgentBanner(false);
-    }, [editContext?.socketConnectionVersion]);
+        lastNonHeartbeatUpdateAtRef.current = 0;
+        lastStallReloadAtRef.current = 0;
+    }, [currentAgentId]);
+    // Stream-stall watchdog. While the run is active and the terminal is visible, the
+    // watchdog ticks every 5s and checks whether the gap since the last non-heartbeat
+    // update exceeds 15s. If it does, it asks the backend whether it has produced
+    // sequence numbers we have not applied — and only if so, falls back to what a user
+    // would do: reload the agent and reconnect the socket.
     useEffect(() => {
         if (!effectiveIsVisible || !isExecuting || !currentAgentId) {
             return;
         }
         let disposed = false;
         const agentIdAtMount = currentAgentId;
-        const getRecoveryState = () => {
-            let state = recoveryStateByAgentRef.current.get(agentIdAtMount);
-            if (!state) {
-                state = createRecoveryStateSlice();
-                recoveryStateByAgentRef.current.set(agentIdAtMount, state);
-            }
-            return state;
-        };
+        lastNonHeartbeatUpdateAtRef.current = Date.now();
         const logRecoveryEvent = (kind, payload) => {
             try {
                 appendToolUiEvent(`recovery:${kind}`, JSON.stringify({ agentId: agentIdAtMount, ...payload }));
             }
             catch {
-                // Telemetry must never throw out of the polling path.
+                // Telemetry must never throw out of the watchdog path.
             }
         };
-        const clearVerifyTimer = () => {
-            if (replayVerifyTimeoutRef.current) {
-                clearTimeout(replayVerifyTimeoutRef.current);
-                replayVerifyTimeoutRef.current = null;
-            }
-        };
-        const tryReconnect = (state, reason) => {
-            const now = Date.now();
-            if (state.lastReconnectAt > 0 &&
-                now - state.lastReconnectAt < 60_000) {
-                logRecoveryEvent("reconnect-cooldown", { reason });
-                return false;
+        const sessionId = editContext?.sessionId;
+        const tick = async () => {
+            if (!isStreamStalled({
+                isExecuting: true,
+                isVisible: true,
+                isStopping: isStoppingRef.current,
+                isWaitingForCapacity: lastRunStatusReason === MACHINE_CAPACITY_REASON,
+                lastUpdateAt: lastNonHeartbeatUpdateAtRef.current,
+                now: Date.now(),
+            })) {
+                return;
             }
-            state.lastReconnectAt = now;
-            const closed = forceEditorSocketReconnect(reason);
-            logRecoveryEvent("reconnect-started", { reason, closed });
-            return true;
-        };
-        const checkServerCompletion = async () => {
+            logRecoveryEvent("stall-check", {
+                silentMs: Date.now() - lastNonHeartbeatUpdateAtRef.current,
+                localSeq: lastSeqRef.current,
+            });
+            let diagnostics;
             try {
-                const diagnostics = await getAgentDiagnostics(agentIdAtMount, editContext?.sessionId);
-                if (disposed) {
-                    return;
-                }
-                lastDiagnosticsResponseRef.current = diagnostics;
-                const serverStatus = diagnostics.execution?.status;
-                if (isInactiveServerExecutionStatus(serverStatus)) {
-                    setShowStaleAgentBanner(false);
-                    const lastRunRequestedAt = Date.parse(diagnostics.lastRunRequest?.requestedAt || "");
-                    const cancelRequestedAt = Date.parse(diagnostics.lastCancellation?.requestedAt || "");
-                    const cancellationAppliesToCurrentRun = Number.isFinite(cancelRequestedAt) &&
-                        (!Number.isFinite(lastRunRequestedAt) ||
-                            cancelRequestedAt >= lastRunRequestedAt);
-                    settleCompletedRun(normalizeServerExecutionStatus(serverStatus) === "cancelled" ||
-                        cancellationAppliesToCurrentRun
-                        ? "cancelled"
-                        : "completed");
-                    return;
-                }
-                // Backstop: if the backend reports an error but we never received the
-                // agent:run:error lifecycle event (e.g. it was missed or the broadcast
-                // path failed to fire), surface the error locally instead of waiting
-                // for the user to reload.
-                if (normalizeServerExecutionStatus(serverStatus) === "error") {
-                    const rawError = diagnostics.execution?.error ?? null;
-                    const errorMsg = toUserFacingAgentErrorMessage(rawError) ||
-                        rawError ||
-                        "AI could not complete this request.";
-                    clearHeartbeatMessages();
-                    setLastRunStatusReason(null);
-                    setError(errorMsg);
-                    setAgent((prev) => prev ? { ...prev, status: "error", statusMessage: errorMsg } : prev);
-                    setIsWaitingForResponse(false);
-                    isWaitingRef.current = false;
-                    setIsConnecting(false);
-                    setIsAgentThinking(false);
-                    setShowStaleAgentBanner(false);
-                    return;
-                }
-                const snapshot = runDiagnosticsSnapshot;
-                if (!editContext?.socketDiagnostics) {
-                    // No edit context to read socket diagnostics from — recovery decisions need it,
-                    // and without it we'd misclassify the stream. Wait for the next tick.
-                    return;
-                }
-                const summary = interpretAgentRunDiagnostics({
-                    socketDiagnostics: editContext.socketDiagnostics,
-                    localSnapshot: snapshot,
-                    serverDiagnostics: diagnostics,
-                });
-                const state = getRecoveryState();
-                const now = Date.now();
-                reconcilePendingDialogTracker(state, diagnostics.pendingDialogs, now);
-                // --- Verify-window resolution. Structured to avoid the "expired branch
-                // unreachable" pitfall: first check whether a verify is in flight, then branch on
-                // whether it's still inside the window or just expired.
-                if (state.lastReplayVerifyDeadlineAt > 0) {
-                    if (now < state.lastReplayVerifyDeadlineAt) {
-                        // Still inside the 4s window — leave verification to the one-shot timer.
-                        return;
-                    }
-                    const verified = checkReplayVerified(state, snapshot, diagnostics);
-                    state.lastReplayVerifyDeadlineAt = 0;
-                    state.lastReplayVerifySnapshot = null;
-                    logRecoveryEvent(verified ? "replay-succeeded" : "replay-failed", { kind: "poll", summaryCode: summary.code });
-                    if (verified) {
-                        setShowStaleAgentBanner(false);
-                        return;
-                    }
-                    // Fall through — decideRecoveryAction will likely return "reconnect" now.
-                }
-                const decision = decideRecoveryAction({
-                    summary,
-                    localSnapshot: snapshot,
-                    serverDiagnostics: diagnostics,
-                    recoveryState: state,
-                    now,
-                });
-                state.lastDecidedAction = decision.action;
-                logRecoveryEvent("decided", {
-                    action: decision.action,
-                    summaryCode: summary.code,
-                    reasonCode: decision.reasonCode,
-                    replayKey: decision.replayKey,
+                diagnostics = await getAgentDiagnostics(agentIdAtMount, sessionId);
+            }
+            catch (error) {
+                console.warn("[AgentTerminal] Stall watchdog failed to fetch diagnostics", error);
+                logRecoveryEvent("diagnostics-failed", {
+                    message: error instanceof Error ? error.message : String(error),
                 });
-                switch (decision.action) {
-                    case "replay": {
-                        const sent = requestAgentSubscriptionReplay(agentIdAtMount);
-                        if (!sent) {
-                            tryReconnect(state, "agent-recovery-replay-no-socket");
-                            break;
-                        }
-                        const serverLastSeq = diagnostics.currentSession?.lastDelivery?.lastSeq ??
-                            diagnostics.transport?.lastSeq ??
-                            null;
-                        const replayCallbackId = decision.replayKey?.split("|").pop() ?? null;
-                        state.lastReplayKey = decision.replayKey;
-                        state.lastReplayAt = now;
-                        state.lastReplayVerifyDeadlineAt = now + 4_000;
-                        state.lastReplayVerifySnapshot = {
-                            localSeq: snapshot.lastSeq,
-                            serverLastSeq,
-                            pendingDialogCallbackId: replayCallbackId === "none" ? null : replayCallbackId,
-                        };
-                        clearVerifyTimer();
-                        replayVerifyTimeoutRef.current = setTimeout(() => {
-                            replayVerifyTimeoutRef.current = null;
-                            if (disposed)
-                                return;
-                            const latestSnapshot = runDiagnosticsSnapshotRef.current ?? snapshot;
-                            const latestDiagnostics = lastDiagnosticsResponseRef.current;
-                            const verified = checkReplayVerified(state, latestSnapshot, latestDiagnostics);
-                            state.lastReplayVerifyDeadlineAt = 0;
-                            state.lastReplayVerifySnapshot = null;
-                            logRecoveryEvent(verified ? "replay-succeeded" : "replay-failed", { kind: "one-shot" });
-                            if (verified) {
-                                setShowStaleAgentBanner(false);
-                            }
-                            // Do not auto-escalate from here; the next poll will see the failed verify
-                            // and ask decideRecoveryAction for the next step (typically reconnect).
-                        }, 4_000);
-                        logRecoveryEvent("replay-started", {
-                            replayKey: decision.replayKey,
-                            summaryCode: summary.code,
-                            serverLastSeq,
-                            localSeq: snapshot.lastSeq,
-                        });
-                        break;
-                    }
-                    case "reconnect": {
-                        tryReconnect(state, "agent-recovery-escalation");
-                        break;
-                    }
-                    case "stale": {
-                        setShowStaleAgentBanner(true);
-                        logRecoveryEvent("stale", {
-                            summaryCode: summary.code,
-                            reasonCode: decision.reasonCode,
-                        });
-                        break;
-                    }
-                    case "none":
-                        break;
-                }
+                // Reset so we don't refire diagnostics every 5s while the call keeps failing.
+                lastNonHeartbeatUpdateAtRef.current = Date.now();
+                return;
+            }
+            if (disposed || agentIdAtMount !== currentAgentId) {
+                return;
+            }
+            const backendSeq = diagnostics.currentSession?.lastDelivery?.lastSeq ??
+                diagnostics.transport?.lastSeq ??
+                null;
+            const localSeq = lastSeqRef.current;
+            if (!shouldReloadAfterDiagnostics({ localSeq, backendSeq })) {
+                // Backend is at or behind us — silence is something else (idle, server lag).
+                // Suppress the watchdog for another full window instead of refiring every 5s.
+                lastNonHeartbeatUpdateAtRef.current = Date.now();
+                return;
+            }
+            const sinceLastReload = Date.now() - lastStallReloadAtRef.current;
+            if (lastStallReloadAtRef.current > 0 && sinceLastReload < 30_000) {
+                logRecoveryEvent("reload-cooldown", { sinceLastReload });
+                lastNonHeartbeatUpdateAtRef.current = Date.now();
+                return;
+            }
+            lastStallReloadAtRef.current = Date.now();
+            logRecoveryEvent("reload-fired", { backendSeq, localSeq });
+            lastSeqRef.current = 0;
+            seenMessageIdsRef.current.clear();
+            try {
+                await loadAgent();
             }
             catch (error) {
-                console.warn("[AgentTerminal] Failed to reconcile agent run status", error);
+                console.warn("[AgentTerminal] Stall reload loadAgent() failed", error);
+            }
+            if (disposed || agentIdAtMount !== currentAgentId) {
+                return;
             }
+            forceEditorSocketReconnect("agent-stream-stalled");
+            lastNonHeartbeatUpdateAtRef.current = Date.now();
         };
-        // Avoid racing a freshly submitted run before the backend has registered it.
-        const timeoutId = window.setTimeout(checkServerCompletion, 10_000);
-        const intervalId = window.setInterval(checkServerCompletion, 15_000);
+        const intervalId = window.setInterval(() => {
+            void tick();
+        }, 5_000);
         return () => {
             disposed = true;
-            window.clearTimeout(timeoutId);
             window.clearInterval(intervalId);
-            clearVerifyTimer();
         };
     }, [
         currentAgentId,
         editContext?.sessionId,
-        editContext?.socketConnectionVersion,
-        editContext?.socketDiagnostics,
         effectiveIsVisible,
         isExecuting,
+        lastRunStatusReason,
         appendToolUiEvent,
-        clearHeartbeatMessages,
-        runDiagnosticsSnapshot,
-        settleCompletedRun,
+        loadAgent,
     ]);
     const showInitialThinkingSplash = messages.length === 0 &&
         !error &&
@@ -5439,33 +5336,6 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
             "Waiting for capacity. The agent will start automatically when a slot becomes available.";
         return _jsx(AgentCapacityBanner, { message: message });
     };
-    const renderStaleAgentBanner = () => {
-        if (!showStaleAgentBanner || !currentAgentId)
-            return null;
-        const handleRefreshStream = () => {
-            const state = recoveryStateByAgentRef.current.get(currentAgentId);
-            if (state) {
-                state.lastReplayKey = null;
-                state.lastReplayAt = 0;
-            }
-            requestAgentSubscriptionReplay(currentAgentId);
-            void loadAgent();
-            setShowStaleAgentBanner(false);
-        };
-        const handleReconnect = () => {
-            const state = recoveryStateByAgentRef.current.get(currentAgentId);
-            if (state) {
-                state.lastReconnectAt = 0;
-            }
-            forceEditorSocketReconnect("user-stale-agent-action");
-            setShowStaleAgentBanner(false);
-        };
-        const handleCancel = () => {
-            void handleStop();
-            setShowStaleAgentBanner(false);
-        };
-        return (_jsxs("div", { role: "status", className: "m-3 rounded border border-amber-300 bg-amber-50 p-3 text-[12px] text-amber-900", children: [_jsx("p", { className: "font-medium", children: "Agent run looks stuck" }), _jsx("p", { className: "mt-1 text-[11px] text-amber-800", children: "The backend reports this run is still active, but recent recovery attempts did not resolve the stream. Pick an action below \u2014 automatic retries are paused until then." }), _jsxs("div", { className: "mt-2 flex flex-wrap gap-2", children: [_jsx(Button, { size: "sm", variant: "outline", onClick: handleRefreshStream, children: "Refresh stream" }), _jsx(Button, { size: "sm", variant: "outline", onClick: handleReconnect, children: "Reconnect socket" }), _jsx(Button, { size: "sm", variant: "outline", onClick: handleCancel, children: "Cancel agent" })] })] }));
-    };
     const renderBrowserClaimBanner = (variant = "inline") => {
         if (!agent?.id || !editContext?.sessionId)
             return null;
@@ -5589,7 +5459,7 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
                 ? getOperationsForMessageGroup(summaryMessages, agentOperations)
                 : [];
             return (_jsxs("div", { className: `flex h-full min-h-0 flex-col ${className || ""}`, children: [fixedBrowserClaimBanner, readOnlyAccessNotice, error &&
-                        !isAgentErrorStatusValue((agent || agentStub)?.status) && (_jsx("div", { className: "m-4 rounded-lg border-l-4 border-red-500 bg-red-50 p-3 select-text", children: _jsxs("div", { className: "flex items-start", children: [_jsx(AlertCircle, { className: "mt-0.5 h-5 w-5 text-red-400", strokeWidth: 1 }), _jsxs("div", { className: "ml-3", children: [_jsx("p", { className: "text-[11px] font-medium text-red-800", children: "Error" }), _jsx("p", { className: "mt-1 text-[11px] text-red-700", children: error })] })] }) })), renderCapacityBanner(), renderErrorBanner(), renderStaleAgentBanner(), _jsxs("div", { ref: messagesContainerRef, className: "flex-1 overflow-y-auto", onScroll: handleScroll, children: [showInitialThinkingSplash && (_jsx(InitialThinkingSplash, { svgIcon: activeProfile?.svgIcon })), inlineBrowserClaimBanner, inlineDialog ? (inlineDialog) : latestSummaryAssistantGroup ? (_jsx("div", { className: "space-y-0 divide-y divide-gray-100 select-text", children: _jsx(AiResponseMessage, { messages: summaryMessages, finished: !latestSummaryAssistantGroup.isLastGroup || !isExecuting, editOperations: summaryOperations, defaultCollapseJson: defaultCollapseJson, profileSvgIcon: activeProfile?.svgIcon, agentId: agent?.id || agentStub.id, agentName: activeProfile?.agentName ||
+                        !isAgentErrorStatusValue((agent || agentStub)?.status) && (_jsx("div", { className: "m-4 rounded-lg border-l-4 border-red-500 bg-red-50 p-3 select-text", children: _jsxs("div", { className: "flex items-start", children: [_jsx(AlertCircle, { className: "mt-0.5 h-5 w-5 text-red-400", strokeWidth: 1 }), _jsxs("div", { className: "ml-3", children: [_jsx("p", { className: "text-[11px] font-medium text-red-800", children: "Error" }), _jsx("p", { className: "mt-1 text-[11px] text-red-700", children: error })] })] }) })), renderCapacityBanner(), renderErrorBanner(), _jsxs("div", { ref: messagesContainerRef, className: "flex-1 overflow-y-auto", onScroll: handleScroll, children: [showInitialThinkingSplash && (_jsx(InitialThinkingSplash, { svgIcon: activeProfile?.svgIcon })), inlineBrowserClaimBanner, inlineDialog ? (inlineDialog) : latestSummaryAssistantGroup ? (_jsx("div", { className: "space-y-0 divide-y divide-gray-100 select-text", children: _jsx(AiResponseMessage, { messages: summaryMessages, finished: !latestSummaryAssistantGroup.isLastGroup || !isExecuting, editOperations: summaryOperations, defaultCollapseJson: defaultCollapseJson, profileSvgIcon: activeProfile?.svgIcon, agentId: agent?.id || agentStub.id, agentName: activeProfile?.agentName ||
                                         activeProfile?.displayTitle ||
                                         activeProfile?.name, allPendingApprovals: allPendingApprovals, onSwitchToAutonomous: handleSwitchToAutonomous, browserCaptureInlinePrompt: browserCaptureInlinePrompt, readOnly: readOnly, onQuickAction: (action) => {
                                         const text = (action.prompt ||
@@ -5951,9 +5821,10 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
                         const placeholderShowsOwnButtons = hideBottomControls && isInPlaceholderMode;
                         if (placeholderShowsOwnButtons)
                             return null;
-                        return (_jsxs("div", { className: cn("mt-2 flex items-stretch gap-2", hideBottomControls || simpleMode || isInPlaceholderMode
-                                ? "justify-end"
-                                : "justify-between"), children: [!hideBottomControls && !simpleMode && !isInPlaceholderMode && (_jsxs("div", { className: "flex flex-wrap items-center justify-start gap-2", children: [readOnly && (_jsx("span", { className: "shrink-0 rounded bg-gray-100 px-1 py-0.5 text-[10px] text-gray-600", title: "You have View-only access to this agent.", "data-testid": "agent-read-only-badge", children: "Read-only" })), _jsx(Select, { "data-testid": "agent-mode-selector", size: "xs", maxWidth: 240, disabled: readOnly, className: cn("h-5 w-auto min-w-[95px] rounded border px-1.5 text-[11px] font-normal", mode === "read-only"
+                        const showConfigControls = (showAgentConfigControls ?? !hideBottomControls) &&
+                            !simpleMode &&
+                            !isInPlaceholderMode;
+                        return (_jsxs("div", { className: cn("mt-2 flex items-stretch gap-2", showConfigControls ? "justify-between" : "justify-end"), children: [showConfigControls && (_jsxs("div", { className: "flex flex-wrap items-center justify-start gap-2", children: [readOnly && (_jsx("span", { className: "shrink-0 rounded bg-gray-100 px-1 py-0.5 text-[10px] text-gray-600", title: "You have View-only access to this agent.", "data-testid": "agent-read-only-badge", children: "Read-only" })), _jsx(Select, { "data-testid": "agent-mode-selector", size: "xs", maxWidth: 240, disabled: readOnly, className: cn("h-5 w-auto min-w-[95px] rounded border px-1.5 text-[11px] font-normal", mode === "read-only"
                                                 ? "border-green-300 bg-green-50! text-green-700 hover:bg-green-100!"
                                                 : mode === "supervised"
                                                     ? "border-amber-300 bg-amber-50! text-amber-700 hover:bg-amber-100!"
@@ -6212,7 +6083,7 @@ export function AgentTerminal({ agentStub, initialMetadata, profiles, onReloadPr
                                                     : allPendingApprovals.length > 0
                                                         ? "Approve or reject pending tool calls first"
                                                         : "Send", "aria-label": isExecuting ? "Stop" : "Send", "data-testid": "agent-send-stop-button", "data-executing": isExecuting ? "true" : "false", children: isExecuting ? (_jsx(Square, { className: "size-3", strokeWidth: 1 })) : (_jsx(Send, { className: "size-3", strokeWidth: 1 })) })] })] }));
-                    })(), !hideBottomControls &&
+                    })(), (showStatusBar ?? !hideBottomControls) &&
                         !simpleMode &&
                         editContext &&
                         !editContext.isMobile && (_jsx(AgentTerminalStatusBar, { agent: agent, contextWindowStatus: contextWindowStatus, effectiveModelName: effectiveModelName, socketDiagnostics: editContext.socketDiagnostics, runDiagnosticsSnapshot: runDiagnosticsSnapshot, liveTotals: liveTotals, totalTokens: liveTotals