@agent-native/core 0.122.4 → 0.123.1

package/src/client/AssistantChat.tsx

@@ -57,6 +57,7 @@ import {
   updateActiveRunSeq,
 } from "./active-run-state.js";
 import {
+  activeRunLooksAlive,
   createAgentChatAdapter,
   type AgentChatSurfaceKind,
 } from "./agent-chat-adapter.js";
@@ -103,6 +104,7 @@ import {
   RunningActivityStatus,
   displayableUserMessageText,
   isHiddenUserMessage,
+  ServerRunActiveContext,
 } from "./chat/message-components.js";
 import {
   repoHasAssistantMessage,
@@ -174,7 +176,7 @@ import {
   GuidedQuestionFlow,
   useGuidedQuestionFlow,
 } from "./guided-questions.js";
-import { useT } from "./i18n.js";
+import { buildSignInReturnHref } from "./require-session.js";
 import {
   addMcpConnectionCompleteListener,
   consumeMcpConnectionResume,
@@ -194,6 +196,7 @@ import type {
   ChatThreadSnapshot,
 } from "./use-chat-threads.js";
 import { useDevMode } from "./use-dev-mode.js";
+import { useRunStuckDetection } from "./use-run-stuck-detection.js";
 import { cn } from "./utils.js";
 
 export {
@@ -285,6 +288,8 @@ const AUTO_RESUME_STATUS_TIMEOUT_MS = 30_000;
 const MAX_RECONNECT_AUTO_RECOVERIES = 3;
 const RECONNECT_NO_PROGRESS_CONTINUE_MESSAGE =
   "Continue from where you stopped. Use the partial work above, verify what succeeded, and finish the original request. If the last visible step was preparing an app action and no tool result was returned, treat that action input as stalled or too large: change strategy, use a smaller bounded input, and preserve optional details as visible affordances instead of repeating the same giant action. Do not rerun the exact same failed tool input unless the failure was transient or the user explicitly asked for an exact rerun. Prefer dedicated app actions over raw database edits when they exist.";
+const RECONNECT_EMPTY_RETRY_MESSAGE =
+  "The previous attempt disconnected before producing any output. Start the original request again.";
 // How long a single activity (model call, tool prep, long tool) must stay
 // in-flight before its label is surfaced in the running indicator. Below this
 // the indicator stays a steady "Thinking" so normal fast turns don't flicker
@@ -2238,7 +2243,6 @@ const AssistantChatInner = forwardRef<
 ) {
   const thread = useThread();
   const threadRuntime = useThreadRuntime();
-  const t = useT();
   const composerRuntime = useComposerRuntime();
   const isRuntimeRunning = thread.isRunning;
   // Latest-value ref so long-lived async closures (the reconnect reader, its
@@ -2364,16 +2368,11 @@ const AssistantChatInner = forwardRef<
     { tabId, threadId },
   );
   const missingApiKey = agentEngineConfigured.missing;
-  const isProviderStatusUnavailable =
-    providerStatusChecksEnabled &&
-    agentEngineConfigured.state === "unavailable";
-  const isComposerDisabled =
-    missingApiKey || isProviderStatusUnavailable || composerDisabled;
-  const retryAgentEngineStatus = useCallback(() => {
-    if (typeof window !== "undefined") {
-      window.dispatchEvent(new Event("agent-engine:configured-changed"));
-    }
-  }, []);
+  // A status check that has not answered is not a reason to swallow keystrokes,
+  // and a confirmed-missing key swaps the composer for the Connect AI button
+  // below rather than disabling it. Only the host's own `composerDisabled`
+  // (Desktop-only chats) blocks typing.
+  const isComposerDisabled = composerDisabled;
   const [missingKeySetupOpen, setMissingKeySetupOpen] = useState(false);
   const requestMissingKeySetup = useCallback(() => {
     setMissingKeySetupOpen(true);
@@ -2610,6 +2609,16 @@ const AssistantChatInner = forwardRef<
     hasActiveServerRun,
   });
   const textStreaming = showRunningInUI || externalStreaming;
+  // Server truth about this thread's run, used to suppress the "agent stopped
+  // without sending a final message" notice while the server still has the
+  // turn in flight. The poll backs itself off to 15s while nothing is running.
+  const serverRunState = useRunStuckDetection({
+    threadId: threadId ?? null,
+    enabled: isActiveComposer,
+    apiUrl,
+  });
+  const serverRunActive =
+    serverRunState.runId != null && serverRunState.status === "running";
   const chatRunStartedAtRef = useRef<number | null>(null);
   const [lastChatRunDurationMs, setLastChatRunDurationMs] = useState<
     number | null
@@ -3270,7 +3279,15 @@ const AssistantChatInner = forwardRef<
               contentLength: latestContent.length,
             },
           });
-          if (reconnectTerminalReason !== "run_timeout") {
+          if (
+            reconnectTerminalReason !== "run_timeout" &&
+            !(await activeRunLooksAlive({
+              apiUrl,
+              threadId,
+              runId,
+              content: latestContent,
+            }))
+          ) {
             try {
               await fetch(`${apiUrl}/runs/${encodeURIComponent(runId)}/abort`, {
                 method: "POST",
@@ -3316,7 +3333,12 @@ const AssistantChatInner = forwardRef<
             );
             setPendingReconnectRecovery({
               id: Date.now(),
-              message: RECONNECT_NO_PROGRESS_CONTINUE_MESSAGE,
+              // With no partial work on screen there is nothing to "continue
+              // from"; the long recovery brief only wastes context.
+              message:
+                latestContent.length > 0
+                  ? RECONNECT_NO_PROGRESS_CONTINUE_MESSAGE
+                  : RECONNECT_EMPTY_RETRY_MESSAGE,
             });
             window.dispatchEvent(
               new CustomEvent("agentNative.chatRunning", {
@@ -5152,525 +5174,513 @@ const AssistantChatInner = forwardRef<
       <MessageActionsContext.Provider value={messageActionsCtx}>
         <ApprovalContext.Provider value={approvalCtx}>
           <ChatRunDurationContext.Provider value={lastChatRunDurationMs}>
-            <ChatRunningContext.Provider value={showRunningInUI}>
-              <TextStreamingContext.Provider value={textStreaming}>
-                <div
-                  data-agent-empty-state={
-                    centeredEmptyState
-                      ? "centered"
-                      : compactMissingKeyEmptyState
-                        ? "compact-setup"
-                        : undefined
-                  }
-                  className={cn(
-                    "relative flex flex-1 flex-col h-full min-h-0 text-foreground",
-                    className,
-                  )}
-                  onDragEnter={handleChatDragEnter}
-                  onDragOver={handleChatDragOver}
-                  onDragLeave={handleChatDragLeave}
-                  onDropCapture={handleChatDropCapture}
-                  onDrop={handleChatDrop}
-                >
-                  {dropActive && (
-                    <div
-                      aria-hidden="true"
-                      className="pointer-events-none absolute inset-0 z-50 flex items-center justify-center rounded-md border-2 border-dashed border-primary/70 bg-primary/5 backdrop-blur-[1px]"
-                    >
-                      <span className="rounded-md bg-background/90 px-3 py-1.5 text-xs font-medium text-foreground shadow-sm">
-                        Drop to attach
-                      </span>
-                    </div>
-                  )}
-                  {showHeader && (
-                    <div className="flex h-11 shrink-0 items-center justify-between border-b border-border px-4">
-                      <span className="text-[13px] font-medium text-muted-foreground">
-                        Agent
-                      </span>
-                      <div className="flex items-center gap-1">
-                        {onSwitchToCli && (
-                          <TooltipProvider delayDuration={200}>
-                            <Tooltip>
-                              <TooltipTrigger asChild>
-                                <button
-                                  onClick={onSwitchToCli}
-                                  aria-label="Switch to CLI"
-                                  className="flex items-center gap-1 text-[12px] text-muted-foreground hover:text-foreground px-2 py-1 rounded-md hover:bg-accent"
-                                >
-                                  <IconTerminal className="h-3.5 w-3.5" />
-                                  CLI
-                                </button>
-                              </TooltipTrigger>
-                              <TooltipContent>Switch to CLI</TooltipContent>
-                            </Tooltip>
-                          </TooltipProvider>
-                        )}
-                      </div>
-                    </div>
-                  )}
-
-                  {/* Messages area */}
-                  <MessageScrollerProvider
-                    key={chatScrollResetKey}
-                    autoScroll={false}
+            <ServerRunActiveContext.Provider value={serverRunActive}>
+              <ChatRunningContext.Provider value={showRunningInUI}>
+                <TextStreamingContext.Provider value={textStreaming}>
+                  <div
+                    data-agent-empty-state={
+                      centeredEmptyState
+                        ? "centered"
+                        : compactMissingKeyEmptyState
+                          ? "compact-setup"
+                          : undefined
+                    }
+                    className={cn(
+                      "relative flex flex-1 flex-col h-full min-h-0 text-foreground",
+                      className,
+                    )}
+                    onDragEnter={handleChatDragEnter}
+                    onDragOver={handleChatDragOver}
+                    onDragLeave={handleChatDragLeave}
+                    onDropCapture={handleChatDropCapture}
+                    onDrop={handleChatDrop}
                   >
-                    <MessageScroller className="agent-chat-scroll">
-                      <MessageScrollerViewport ref={scrollRef}>
-                        {authError ? (
-                          <div className="flex flex-col items-center justify-center h-full px-4 gap-3">
-                            <div className="flex h-10 w-10 items-center justify-center rounded-full bg-muted">
-                              {authSessionAvailable ? (
-                                <IconRefresh className="h-5 w-5 text-muted-foreground" />
-                              ) : (
-                                <IconMessage className="h-5 w-5 text-muted-foreground" />
-                              )}
-                            </div>
-                            <div className="text-center max-w-[280px]">
-                              <p className="text-sm font-medium text-foreground mb-1">
-                                {authSessionAvailable
-                                  ? "Chat session needs refresh"
-                                  : authError.sessionExpired
-                                    ? "Session expired"
-                                    : "Authentication required"}
-                              </p>
-                              <p className="text-xs text-muted-foreground leading-relaxed">
-                                {authSessionAvailable
-                                  ? "You're signed in, but this chat connection needs to reconnect."
-                                  : authError.sessionExpired
-                                    ? "Your session may have expired. Log out and log back in to reconnect."
-                                    : "You need to log in to use the agent."}
-                              </p>
-                            </div>
-                            <div className="flex gap-2">
-                              {!authError.sessionExpired &&
-                                !authSessionAvailable && (
+                    {dropActive && (
+                      <div
+                        aria-hidden="true"
+                        className="pointer-events-none absolute inset-0 z-50 flex items-center justify-center rounded-md border-2 border-dashed border-primary/70 bg-primary/5 backdrop-blur-[1px]"
+                      >
+                        <span className="rounded-md bg-background/90 px-3 py-1.5 text-xs font-medium text-foreground shadow-sm">
+                          Drop to attach
+                        </span>
+                      </div>
+                    )}
+                    {showHeader && (
+                      <div className="flex h-11 shrink-0 items-center justify-between border-b border-border px-4">
+                        <span className="text-[13px] font-medium text-muted-foreground">
+                          Agent
+                        </span>
+                        <div className="flex items-center gap-1">
+                          {onSwitchToCli && (
+                            <TooltipProvider delayDuration={200}>
+                              <Tooltip>
+                                <TooltipTrigger asChild>
                                   <button
-                                    onClick={() => {
-                                      const ret =
-                                        window.location.pathname +
-                                        window.location.search;
-                                      window.location.href =
-                                        agentNativePath(
-                                          "/_agent-native/sign-in",
-                                        ) +
-                                        `?return=${encodeURIComponent(ret)}`;
-                                    }}
-                                    className="text-xs text-background bg-foreground hover:opacity-90 px-3 py-1.5 rounded-md"
+                                    onClick={onSwitchToCli}
+                                    aria-label="Switch to CLI"
+                                    className="flex items-center gap-1 text-[12px] text-muted-foreground hover:text-foreground px-2 py-1 rounded-md hover:bg-accent"
                                   >
-                                    Log in
-                                  </button>
-                                )}
-                              {authError.sessionExpired &&
-                                !authSessionAvailable && (
-                                  <button
-                                    onClick={async () => {
-                                      try {
-                                        await fetch(
-                                          agentNativePath(
-                                            "/_agent-native/auth/logout",
-                                          ),
-                                          {
-                                            method: "POST",
-                                          },
-                                        );
-                                      } catch {}
-                                      window.location.reload();
-                                    }}
-                                    className="text-xs text-destructive hover:text-destructive/80 px-3 py-1.5 rounded-md border border-destructive/30 hover:bg-destructive/10"
-                                  >
-                                    Log out
+                                    <IconTerminal className="h-3.5 w-3.5" />
+                                    CLI
                                   </button>
+                                </TooltipTrigger>
+                                <TooltipContent>Switch to CLI</TooltipContent>
+                              </Tooltip>
+                            </TooltipProvider>
+                          )}
+                        </div>
+                      </div>
+                    )}
+
+                    {/* Messages area */}
+                    <MessageScrollerProvider
+                      key={chatScrollResetKey}
+                      autoScroll={false}
+                    >
+                      <MessageScroller className="agent-chat-scroll">
+                        <MessageScrollerViewport ref={scrollRef}>
+                          {authError ? (
+                            <div className="flex flex-col items-center justify-center h-full px-4 gap-3">
+                              <div className="flex h-10 w-10 items-center justify-center rounded-full bg-muted">
+                                {authSessionAvailable ? (
+                                  <IconRefresh className="h-5 w-5 text-muted-foreground" />
+                                ) : (
+                                  <IconMessage className="h-5 w-5 text-muted-foreground" />
                                 )}
-                              <button
-                                onClick={() => {
-                                  setAuthError(null);
-                                  window.location.reload();
-                                }}
-                                className={
-                                  authSessionAvailable
-                                    ? "text-xs text-background bg-foreground hover:opacity-90 px-3 py-1.5 rounded-md"
-                                    : "text-xs text-muted-foreground hover:text-foreground px-3 py-1.5 rounded-md border border-border hover:bg-accent"
-                                }
-                              >
-                                Refresh chat
-                              </button>
-                            </div>
-                          </div>
-                        ) : isRestoring && centeredRestoringState ? (
-                          <div
-                            className={cn(
-                              "agent-empty-state",
-                              emptyStateDisplay === "hidden"
-                                ? "sr-only"
-                                : "flex h-full flex-col items-center justify-center gap-3 px-4 py-16",
-                            )}
-                            aria-busy="true"
-                          >
-                            <IconMessage className="h-5 w-5 text-muted-foreground/60" />
-                            <p className="sr-only">
-                              {emptyStateText ?? "Loading chat..."}
-                            </p>
-                          </div>
-                        ) : isRestoring ? (
-                          <div className="flex flex-col gap-3 p-4">
-                            <div className="flex justify-end">
-                              <div className="h-8 w-32 rounded-lg bg-muted animate-pulse" />
+                              </div>
+                              <div className="text-center max-w-[280px]">
+                                <p className="text-sm font-medium text-foreground mb-1">
+                                  {authSessionAvailable
+                                    ? "Chat session needs refresh"
+                                    : authError.sessionExpired
+                                      ? "Session expired"
+                                      : "Authentication required"}
+                                </p>
+                                <p className="text-xs text-muted-foreground leading-relaxed">
+                                  {authSessionAvailable
+                                    ? "You're signed in, but this chat connection needs to reconnect."
+                                    : authError.sessionExpired
+                                      ? "Your session may have expired. Log out and log back in to reconnect."
+                                      : "You need to log in to use the agent."}
+                                </p>
+                              </div>
+                              <div className="flex gap-2">
+                                {!authError.sessionExpired &&
+                                  !authSessionAvailable && (
+                                    <button
+                                      onClick={() => {
+                                        window.location.href =
+                                          buildSignInReturnHref();
+                                      }}
+                                      className="text-xs text-background bg-foreground hover:opacity-90 px-3 py-1.5 rounded-md"
+                                    >
+                                      Log in
+                                    </button>
+                                  )}
+                                {authError.sessionExpired &&
+                                  !authSessionAvailable && (
+                                    <button
+                                      onClick={async () => {
+                                        try {
+                                          await fetch(
+                                            agentNativePath(
+                                              "/_agent-native/auth/logout",
+                                            ),
+                                            {
+                                              method: "POST",
+                                            },
+                                          );
+                                        } catch {}
+                                        window.location.reload();
+                                      }}
+                                      className="text-xs text-destructive hover:text-destructive/80 px-3 py-1.5 rounded-md border border-destructive/30 hover:bg-destructive/10"
+                                    >
+                                      Log out
+                                    </button>
+                                  )}
+                                <button
+                                  onClick={() => {
+                                    setAuthError(null);
+                                    window.location.reload();
+                                  }}
+                                  className={
+                                    authSessionAvailable
+                                      ? "text-xs text-background bg-foreground hover:opacity-90 px-3 py-1.5 rounded-md"
+                                      : "text-xs text-muted-foreground hover:text-foreground px-3 py-1.5 rounded-md border border-border hover:bg-accent"
+                                  }
+                                >
+                                  Refresh chat
+                                </button>
+                              </div>
                             </div>
-                            <div className="flex flex-col gap-1.5">
-                              <div className="h-4 w-48 rounded bg-muted animate-pulse" />
-                              <div className="h-4 w-64 rounded bg-muted animate-pulse" />
-                              <div className="h-4 w-40 rounded bg-muted animate-pulse" />
+                          ) : isRestoring && centeredRestoringState ? (
+                            <div
+                              className={cn(
+                                "agent-empty-state",
+                                emptyStateDisplay === "hidden"
+                                  ? "sr-only"
+                                  : "flex h-full flex-col items-center justify-center gap-3 px-4 py-16",
+                              )}
+                              aria-busy="true"
+                            >
+                              <IconMessage className="h-5 w-5 text-muted-foreground/60" />
+                              <p className="sr-only">
+                                {emptyStateText ?? "Loading chat..."}
+                              </p>
                             </div>
-                          </div>
-                        ) : showEmptyState ? (
-                          <div
-                            className={cn(
-                              "agent-empty-state",
-                              emptyStateDisplay === "hidden"
-                                ? "sr-only"
-                                : "flex h-full flex-col items-center justify-center gap-3 px-4 py-16",
-                            )}
-                          >
-                            <IconMessage className="h-5 w-5 text-muted-foreground/60" />
-                            <p className="sr-only">
-                              {emptyStateText ?? "How can I help you?"}
-                            </p>
-                            {emptyStateAddon}
-                            {resolvedSuggestions &&
-                            resolvedSuggestions.length > 0 ? (
-                              <div className="flex w-full max-w-[280px] flex-col gap-1">
-                                {resolvedSuggestions.map((suggestion) => (
-                                  <button
-                                    key={suggestion}
-                                    onClick={() => {
-                                      if (missingApiKey) {
-                                        requestMissingKeySetup();
-                                        return;
-                                      }
-                                      void addToQueue(suggestion);
-                                    }}
-                                    className="w-full px-2 py-1 text-center text-[13px] text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-                                  >
-                                    {suggestion}
-                                  </button>
-                                ))}
+                          ) : isRestoring ? (
+                            <div className="flex flex-col gap-3 p-4">
+                              <div className="flex justify-end">
+                                <div className="h-8 w-32 rounded-lg bg-muted animate-pulse" />
                               </div>
-                            ) : null}
-                            {showInlineEmptyThreadFooterSlot ? (
-                              <div className="agent-thread-footer-slot agent-thread-footer-slot--empty">
-                                {resolvedThreadFooterSlot}
+                              <div className="flex flex-col gap-1.5">
+                                <div className="h-4 w-48 rounded bg-muted animate-pulse" />
+                                <div className="h-4 w-64 rounded bg-muted animate-pulse" />
+                                <div className="h-4 w-40 rounded bg-muted animate-pulse" />
                               </div>
-                            ) : null}
-                          </div>
-                        ) : (
-                          <MessageScrollerContent className="agent-thread-content gap-4 px-4 py-4">
-                            <AssistantMessageListErrorBoundary
-                              resetKey={messageListResetKey}
+                            </div>
+                          ) : showEmptyState ? (
+                            <div
+                              className={cn(
+                                "agent-empty-state",
+                                emptyStateDisplay === "hidden"
+                                  ? "sr-only"
+                                  : "flex h-full flex-col items-center justify-center gap-3 px-4 py-16",
+                              )}
                             >
-                              <ThreadPrimitive.Messages
-                                components={{
-                                  UserMessage: AssistantChatUserMessageItem,
-                                  AssistantMessage:
-                                    AssistantChatAssistantMessageItem,
-                                }}
-                              />
-                            </AssistantMessageListErrorBoundary>
-                            {visibleLoopLimit && !showRunningInUI && (
-                              <MessageScrollerItem>
-                                <LoopLimitContinueCard
-                                  info={visibleLoopLimit}
-                                  onContinue={() => {
-                                    setShowContinue(false);
-                                    setLoopLimitInfo(null);
-                                    addToQueue(
-                                      "Continue from where you left off.",
-                                      undefined,
-                                      undefined,
-                                      undefined,
-                                      undefined,
-                                      "queued",
-                                      "continue",
-                                    );
+                              <IconMessage className="h-5 w-5 text-muted-foreground/60" />
+                              <p className="sr-only">
+                                {emptyStateText ?? "How can I help you?"}
+                              </p>
+                              {emptyStateAddon}
+                              {resolvedSuggestions &&
+                              resolvedSuggestions.length > 0 ? (
+                                <div className="flex w-full max-w-[280px] flex-col gap-1">
+                                  {resolvedSuggestions.map((suggestion) => (
+                                    <button
+                                      key={suggestion}
+                                      onClick={() => {
+                                        if (missingApiKey) {
+                                          requestMissingKeySetup();
+                                          return;
+                                        }
+                                        void addToQueue(suggestion);
+                                      }}
+                                      className="w-full px-2 py-1 text-center text-[13px] text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+                                    >
+                                      {suggestion}
+                                    </button>
+                                  ))}
+                                </div>
+                              ) : null}
+                              {showInlineEmptyThreadFooterSlot ? (
+                                <div className="agent-thread-footer-slot agent-thread-footer-slot--empty">
+                                  {resolvedThreadFooterSlot}
+                                </div>
+                              ) : null}
+                            </div>
+                          ) : (
+                            <MessageScrollerContent className="agent-thread-content gap-4 px-4 py-4">
+                              <AssistantMessageListErrorBoundary
+                                resetKey={messageListResetKey}
+                              >
+                                <ThreadPrimitive.Messages
+                                  components={{
+                                    UserMessage: AssistantChatUserMessageItem,
+                                    AssistantMessage:
+                                      AssistantChatAssistantMessageItem,
                                   }}
                                 />
-                              </MessageScrollerItem>
-                            )}
-                            {shouldShowRunError && visibleRunError && (
-                              <MessageScrollerItem>
-                                <RunErrorRecoveryCard
-                                  info={visibleRunError}
-                                  onContinue={() => {
-                                    setRunErrorInfo(null);
-                                    addToQueue(
-                                      RECONNECT_NO_PROGRESS_CONTINUE_MESSAGE,
-                                      undefined,
-                                      undefined,
-                                      undefined,
-                                      undefined,
-                                      "queued",
-                                      "continue",
-                                    );
-                                  }}
-                                  onRetry={() => {
-                                    setRunErrorInfo(null);
-                                    addToQueue(
-                                      lastUserText
-                                        ? `Retry the previous request from a clean approach. Do not rerun the exact same failed tool input unless the failure was transient or the user explicitly asked for an exact rerun. If a provider query failed because of schema, syntax, or type mismatch, diagnose the error and adjust the query first.\n\nOriginal request:\n\n${lastUserText}`
-                                        : "Retry the previous request from a clean approach. Do not rerun the exact same failed tool input unless the failure was transient or the user explicitly asked for an exact rerun. If a provider query failed because of schema, syntax, or type mismatch, diagnose the error and adjust the query first.",
-                                      undefined,
-                                      undefined,
-                                      undefined,
-                                      undefined,
-                                      "queued",
-                                      "retry",
-                                    );
-                                  }}
-                                  onFork={onForkChat}
-                                  onDismiss={() => {
-                                    if (visibleRunErrorKey) {
-                                      setDismissedRunErrorKey(
-                                        visibleRunErrorKey,
+                              </AssistantMessageListErrorBoundary>
+                              {visibleLoopLimit && !showRunningInUI && (
+                                <MessageScrollerItem>
+                                  <LoopLimitContinueCard
+                                    info={visibleLoopLimit}
+                                    onContinue={() => {
+                                      setShowContinue(false);
+                                      setLoopLimitInfo(null);
+                                      addToQueue(
+                                        "Continue from where you left off.",
+                                        undefined,
+                                        undefined,
+                                        undefined,
+                                        undefined,
+                                        "queued",
+                                        "continue",
                                       );
-                                    }
-                                    setRunErrorInfo(null);
-                                  }}
-                                />
-                              </MessageScrollerItem>
-                            )}
-                            {(isReconnecting ||
-                              reconnectFrozen ||
-                              adapterHandoffPending) &&
-                              visibleReconnectContent.length > 0 && (
+                                    }}
+                                  />
+                                </MessageScrollerItem>
+                              )}
+                              {shouldShowRunError && visibleRunError && (
                                 <MessageScrollerItem>
-                                  <ReconnectStreamMessage
-                                    content={visibleReconnectContent}
+                                  <RunErrorRecoveryCard
+                                    info={visibleRunError}
+                                    onContinue={() => {
+                                      setRunErrorInfo(null);
+                                      addToQueue(
+                                        RECONNECT_NO_PROGRESS_CONTINUE_MESSAGE,
+                                        undefined,
+                                        undefined,
+                                        undefined,
+                                        undefined,
+                                        "queued",
+                                        "continue",
+                                      );
+                                    }}
+                                    onRetry={() => {
+                                      setRunErrorInfo(null);
+                                      addToQueue(
+                                        lastUserText
+                                          ? `Retry the previous request from a clean approach. Do not rerun the exact same failed tool input unless the failure was transient or the user explicitly asked for an exact rerun. If a provider query failed because of schema, syntax, or type mismatch, diagnose the error and adjust the query first.\n\nOriginal request:\n\n${lastUserText}`
+                                          : "Retry the previous request from a clean approach. Do not rerun the exact same failed tool input unless the failure was transient or the user explicitly asked for an exact rerun. If a provider query failed because of schema, syntax, or type mismatch, diagnose the error and adjust the query first.",
+                                        undefined,
+                                        undefined,
+                                        undefined,
+                                        undefined,
+                                        "queued",
+                                        "retry",
+                                      );
+                                    }}
+                                    onFork={onForkChat}
+                                    onDismiss={() => {
+                                      if (visibleRunErrorKey) {
+                                        setDismissedRunErrorKey(
+                                          visibleRunErrorKey,
+                                        );
+                                      }
+                                      setRunErrorInfo(null);
+                                    }}
                                   />
                                 </MessageScrollerItem>
                               )}
-                            {(isReconnecting ||
-                              reconnectFrozen ||
-                              adapterHandoffPending) &&
-                              visibleReconnectContent.length === 0 &&
-                              reconnectContent.length === 0 &&
-                              reconnectActivityContent.length > 0 && (
+                              {(isReconnecting ||
+                                reconnectFrozen ||
+                                adapterHandoffPending) &&
+                                visibleReconnectContent.length > 0 && (
+                                  <MessageScrollerItem>
+                                    <ReconnectStreamMessage
+                                      content={visibleReconnectContent}
+                                    />
+                                  </MessageScrollerItem>
+                                )}
+                              {(isReconnecting ||
+                                reconnectFrozen ||
+                                adapterHandoffPending) &&
+                                visibleReconnectContent.length === 0 &&
+                                reconnectContent.length === 0 &&
+                                reconnectActivityContent.length > 0 && (
+                                  <MessageScrollerItem>
+                                    <ReconnectStreamMessage
+                                      content={reconnectActivityContent}
+                                    />
+                                  </MessageScrollerItem>
+                                )}
+                              {showGlobalRunningStatus && (
                                 <MessageScrollerItem>
-                                  <ReconnectStreamMessage
-                                    content={reconnectActivityContent}
+                                  <RunningActivityStatus
+                                    label={runningStatusLabel}
                                   />
                                 </MessageScrollerItem>
                               )}
-                            {showGlobalRunningStatus && (
-                              <MessageScrollerItem>
-                                <RunningActivityStatus
-                                  label={runningStatusLabel}
-                                />
-                              </MessageScrollerItem>
-                            )}
-                            {queuedMessages
-                              .filter((msg) => !msg.hideUserMessage)
-                              .map((msg) => {
-                                const displayText = displayableUserMessageText(
-                                  msg.text,
-                                );
-                                const imageSources =
-                                  queuedMessageImageSources(msg);
-                                return (
-                                  <MessageScrollerItem
-                                    key={msg.id}
-                                    messageId={msg.id}
-                                  >
-                                    <div className="group flex items-start justify-end gap-1.5">
-                                      <button
-                                        type="button"
-                                        onClick={() =>
-                                          applyLocalQueuedMessages((prev) =>
-                                            prev.filter((m) => m.id !== msg.id),
-                                          )
-                                        }
-                                        aria-label="Remove from queue"
-                                        className="mt-1.5 flex h-5 w-5 items-center justify-center rounded-full border border-border bg-background text-muted-foreground opacity-0 shadow-sm transition-opacity hover:bg-accent hover:text-foreground focus-visible:opacity-100 group-hover:opacity-100"
-                                      >
-                                        <IconX className="h-3 w-3" />
-                                      </button>
-                                      <div className="max-w-[85%] rounded-lg bg-accent/50 px-3 py-2 text-sm leading-relaxed text-foreground/60 whitespace-pre-wrap break-words">
-                                        {displayText}
-                                        {imageSources.length > 0 && (
-                                          <div className="flex flex-wrap gap-1.5 mt-1.5">
-                                            {imageSources.map((img, j) => (
-                                              <img
-                                                key={j}
-                                                src={img}
-                                                alt=""
-                                                className="h-12 w-12 rounded object-cover border border-border/50"
-                                              />
-                                            ))}
-                                          </div>
-                                        )}
+                              {queuedMessages
+                                .filter((msg) => !msg.hideUserMessage)
+                                .map((msg) => {
+                                  const displayText =
+                                    displayableUserMessageText(msg.text);
+                                  const imageSources =
+                                    queuedMessageImageSources(msg);
+                                  return (
+                                    <MessageScrollerItem
+                                      key={msg.id}
+                                      messageId={msg.id}
+                                    >
+                                      <div className="group flex items-start justify-end gap-1.5">
+                                        <button
+                                          type="button"
+                                          onClick={() =>
+                                            applyLocalQueuedMessages((prev) =>
+                                              prev.filter(
+                                                (m) => m.id !== msg.id,
+                                              ),
+                                            )
+                                          }
+                                          aria-label="Remove from queue"
+                                          className="mt-1.5 flex h-5 w-5 items-center justify-center rounded-full border border-border bg-background text-muted-foreground opacity-0 shadow-sm transition-opacity hover:bg-accent hover:text-foreground focus-visible:opacity-100 group-hover:opacity-100"
+                                        >
+                                          <IconX className="h-3 w-3" />
+                                        </button>
+                                        <div className="max-w-[85%] rounded-lg bg-accent/50 px-3 py-2 text-sm leading-relaxed text-foreground/60 whitespace-pre-wrap break-words">
+                                          {displayText}
+                                          {imageSources.length > 0 && (
+                                            <div className="flex flex-wrap gap-1.5 mt-1.5">
+                                              {imageSources.map((img, j) => (
+                                                <img
+                                                  key={j}
+                                                  src={img}
+                                                  alt=""
+                                                  className="h-12 w-12 rounded object-cover border border-border/50"
+                                                />
+                                              ))}
+                                            </div>
+                                          )}
+                                        </div>
                                       </div>
-                                    </div>
-                                  </MessageScrollerItem>
-                                );
-                              })}
-                            {resolvedThreadFooterSlot ? (
-                              <MessageScrollerItem>
-                                <div className="agent-thread-footer-slot">
-                                  {resolvedThreadFooterSlot}
-                                </div>
-                              </MessageScrollerItem>
-                            ) : null}
-                          </MessageScrollerContent>
-                        )}
-                      </MessageScrollerViewport>
-                      {!authError &&
-                      !isRestoring &&
-                      !showEmptyState &&
-                      showScrollToBottom ? (
-                        <div className="shrink-0 flex justify-center -mb-1">
-                          <button
-                            type="button"
-                            onClick={scrollToBottom}
-                            className="flex h-7 w-7 items-center justify-center rounded-full border border-border bg-background shadow-sm hover:bg-accent"
-                            aria-label="Scroll to bottom"
-                          >
-                            <IconChevronDown className="h-3.5 w-3.5 text-muted-foreground" />
-                          </button>
-                        </div>
-                      ) : null}
-                    </MessageScroller>
-                  </MessageScrollerProvider>
-
-                  {showComposerSlot ? composerSlot : null}
-                  {isActiveComposer && (
-                    <McpConnectionSuggestion text={composerText} />
-                  )}
-                  {showCenteredEmptyThreadFooterSlot ? (
-                    <div className="agent-thread-footer-slot agent-thread-footer-slot--centered-empty">
-                      {resolvedThreadFooterSlot}
-                    </div>
-                  ) : null}
-                  {guidedQuestions && guidedQuestions.length > 0 && (
-                    <div className="shrink-0 px-3 pb-2">
-                      <GuidedQuestionFlow
-                        questions={guidedQuestions}
-                        onSubmit={handleGuidedQuestionsSubmit}
-                        onSkip={handleGuidedQuestionsSkip}
-                        {...(guidedQuestionsTitle
-                          ? { title: guidedQuestionsTitle }
-                          : {})}
-                        {...(guidedQuestionsDescription
-                          ? { description: guidedQuestionsDescription }
-                          : {})}
-                        {...(guidedQuestionsSkipLabel
-                          ? { skipLabel: guidedQuestionsSkipLabel }
-                          : {})}
-                        {...(guidedQuestionsSubmitLabel
-                          ? { submitLabel: guidedQuestionsSubmitLabel }
-                          : {})}
-                        className="h-auto items-stretch justify-stretch bg-transparent"
-                      />
-                    </div>
-                  )}
-                  {/* Inline attachment / body-size error */}
-                  {composerError && (
-                    <div
-                      role="alert"
-                      className="shrink-0 mx-3 mb-1.5 flex items-start gap-2 rounded-md border border-destructive/40 bg-destructive/10 px-3 py-2 text-xs text-destructive"
-                    >
-                      <IconAlertTriangle className="h-3.5 w-3.5 mt-0.5 shrink-0" />
-                      <span className="flex-1 leading-snug">
-                        {composerError}
-                      </span>
-                      <button
-                        type="button"
-                        aria-label="Dismiss error"
-                        onClick={() => setComposerError(null)}
-                        className="shrink-0 opacity-70 hover:opacity-100"
+                                    </MessageScrollerItem>
+                                  );
+                                })}
+                              {resolvedThreadFooterSlot ? (
+                                <MessageScrollerItem>
+                                  <div className="agent-thread-footer-slot">
+                                    {resolvedThreadFooterSlot}
+                                  </div>
+                                </MessageScrollerItem>
+                              ) : null}
+                            </MessageScrollerContent>
+                          )}
+                        </MessageScrollerViewport>
+                        {!authError &&
+                        !isRestoring &&
+                        !showEmptyState &&
+                        showScrollToBottom ? (
+                          <div className="shrink-0 flex justify-center -mb-1">
+                            <button
+                              type="button"
+                              onClick={scrollToBottom}
+                              className="flex h-7 w-7 items-center justify-center rounded-full border border-border bg-background shadow-sm hover:bg-accent"
+                              aria-label="Scroll to bottom"
+                            >
+                              <IconChevronDown className="h-3.5 w-3.5 text-muted-foreground" />
+                            </button>
+                          </div>
+                        ) : null}
+                      </MessageScroller>
+                    </MessageScrollerProvider>
+
+                    {showComposerSlot ? composerSlot : null}
+                    {isActiveComposer && (
+                      <McpConnectionSuggestion text={composerText} />
+                    )}
+                    {showCenteredEmptyThreadFooterSlot ? (
+                      <div className="agent-thread-footer-slot agent-thread-footer-slot--centered-empty">
+                        {resolvedThreadFooterSlot}
+                      </div>
+                    ) : null}
+                    {guidedQuestions && guidedQuestions.length > 0 && (
+                      <div className="shrink-0 px-3 pb-2">
+                        <GuidedQuestionFlow
+                          questions={guidedQuestions}
+                          onSubmit={handleGuidedQuestionsSubmit}
+                          onSkip={handleGuidedQuestionsSkip}
+                          {...(guidedQuestionsTitle
+                            ? { title: guidedQuestionsTitle }
+                            : {})}
+                          {...(guidedQuestionsDescription
+                            ? { description: guidedQuestionsDescription }
+                            : {})}
+                          {...(guidedQuestionsSkipLabel
+                            ? { skipLabel: guidedQuestionsSkipLabel }
+                            : {})}
+                          {...(guidedQuestionsSubmitLabel
+                            ? { submitLabel: guidedQuestionsSubmitLabel }
+                            : {})}
+                          className="h-auto items-stretch justify-stretch bg-transparent"
+                        />
+                      </div>
+                    )}
+                    {/* Inline attachment / body-size error */}
+                    {composerError && (
+                      <div
+                        role="alert"
+                        className="shrink-0 mx-3 mb-1.5 flex items-start gap-2 rounded-md border border-destructive/40 bg-destructive/10 px-3 py-2 text-xs text-destructive"
                       >
-                        <IconX className="h-3 w-3" />
-                      </button>
-                    </div>
-                  )}
-                  <div
-                    className="agent-composer-stack"
-                    data-agent-composer-adjacent-ui={
-                      hasComposerAccessoryAboveStack ? "true" : undefined
-                    }
-                  >
-                    <SelectionAttachedPill />
-                    {showPlanModeCallout && (
-                      <PlanModeCallout
-                        canImplementPlan={canImplementPlan}
-                        onImplementPlan={handleImplementPlan}
-                        onSwitchToAct={handleSwitchToAct}
-                      />
+                        <IconAlertTriangle className="h-3.5 w-3.5 mt-0.5 shrink-0" />
+                        <span className="flex-1 leading-snug">
+                          {composerError}
+                        </span>
+                        <button
+                          type="button"
+                          aria-label="Dismiss error"
+                          onClick={() => setComposerError(null)}
+                          className="shrink-0 opacity-70 hover:opacity-100"
+                        >
+                          <IconX className="h-3 w-3" />
+                        </button>
+                      </div>
                     )}
-                    {/* Input area */}
-                    <Popover
-                      open={showMissingKeySetup && missingKeySetupOpen}
-                      onOpenChange={setMissingKeySetupOpen}
+                    <div
+                      className="agent-composer-stack"
+                      data-agent-composer-adjacent-ui={
+                        hasComposerAccessoryAboveStack ? "true" : undefined
+                      }
                     >
-                      <AgentComposerFrame
-                        layoutVariant={composerLayoutVariant}
-                        className={cn(
-                          composerAreaClassName,
-                          isComposerDisabled &&
-                            !showMissingKeySetup &&
-                            "opacity-70",
-                          isProviderStatusUnavailable && "cursor-pointer",
-                        )}
-                        rootClassName={cn(
-                          showMissingKeySetup &&
-                            "agent-composer-root--missing-key",
-                        )}
-                        onClick={
-                          isProviderStatusUnavailable
-                            ? retryAgentEngineStatus
-                            : undefined
-                        }
+                      <SelectionAttachedPill />
+                      {showPlanModeCallout && (
+                        <PlanModeCallout
+                          canImplementPlan={canImplementPlan}
+                          onImplementPlan={handleImplementPlan}
+                          onSwitchToAct={handleSwitchToAct}
+                        />
+                      )}
+                      {/* Input area */}
+                      <Popover
+                        open={showMissingKeySetup && missingKeySetupOpen}
+                        onOpenChange={setMissingKeySetupOpen}
                       >
-                        {showMissingKeySetup ? (
-                          <PopoverTrigger asChild>
-                            <button
-                              type="button"
-                              className="agent-composer-missing-key-trigger"
-                              aria-label="Connect AI to start chatting"
-                            >
-                              <span className="agent-composer-missing-key-content">
-                                <span className="agent-composer-missing-key-copy">
-                                  <span className="agent-composer-missing-key-title">
-                                    {missingApiKeySetupLayout === "sidebar"
-                                      ? "Connect AI to chat"
-                                      : "Connect AI to start chatting"}
-                                  </span>
-                                  {missingApiKeySetupLayout !== "sidebar" ? (
-                                    <span className="agent-composer-missing-key-description">
-                                      Builder.io includes free credits, or use
-                                      your own API key.
+                        <AgentComposerFrame
+                          layoutVariant={composerLayoutVariant}
+                          className={cn(
+                            composerAreaClassName,
+                            isComposerDisabled &&
+                              !showMissingKeySetup &&
+                              "opacity-70",
+                          )}
+                          rootClassName={cn(
+                            showMissingKeySetup &&
+                              "agent-composer-root--missing-key",
+                          )}
+                        >
+                          {showMissingKeySetup ? (
+                            <PopoverTrigger asChild>
+                              <button
+                                type="button"
+                                className="agent-composer-missing-key-trigger"
+                                aria-label="Connect AI to start chatting"
+                              >
+                                <span className="agent-composer-missing-key-content">
+                                  <span className="agent-composer-missing-key-copy">
+                                    <span className="agent-composer-missing-key-title">
+                                      {missingApiKeySetupLayout === "sidebar"
+                                        ? "Connect AI to chat"
+                                        : "Connect AI to start chatting"}
                                     </span>
-                                  ) : null}
-                                </span>
-                                <span className="agent-composer-missing-key-cta">
-                                  Connect AI
+                                    {missingApiKeySetupLayout !== "sidebar" ? (
+                                      <span className="agent-composer-missing-key-description">
+                                        Builder.io includes free credits, or use
+                                        your own API key.
+                                      </span>
+                                    ) : null}
+                                  </span>
+                                  <span className="agent-composer-missing-key-cta">
+                                    Connect AI
+                                  </span>
                                 </span>
-                              </span>
-                            </button>
-                          </PopoverTrigger>
-                        ) : (
-                          <>
-                            <ComposerAttachmentPreviewStrip />
-                            <TiptapComposer
-                              focusRef={tiptapRef}
-                              onTextChange={
-                                isActiveComposer
-                                  ? handleComposerTextChange
-                                  : undefined
-                              }
-                              disabled={isComposerDisabled}
-                              placeholder={
-                                missingApiKey
-                                  ? "Connect AI to start chatting..."
-                                  : isProviderStatusUnavailable
-                                    ? t("agentPanel.connectionUnavailable")
+                              </button>
+                            </PopoverTrigger>
+                          ) : (
+                            <>
+                              <ComposerAttachmentPreviewStrip />
+                              <TiptapComposer
+                                focusRef={tiptapRef}
+                                onTextChange={
+                                  isActiveComposer
+                                    ? handleComposerTextChange
+                                    : undefined
+                                }
+                                disabled={isComposerDisabled}
+                                placeholder={
+                                  missingApiKey
+                                    ? "Connect AI to start chatting..."
                                     : composerDisabled
                                       ? (composerDisabledPlaceholder ??
                                         "Open Desktop to use this chat.")
@@ -5679,112 +5689,118 @@ const AssistantChatInner = forwardRef<
                                           ? `${queuedMessages.length} queued — send a follow-up...`
                                           : "Send a follow-up..."
                                         : composerPlaceholder
-                              }
-                              onSubmit={
-                                isRunning || composerContextItems.length > 0
-                                  ? (text, references, attachments, options) =>
-                                      void addToQueue(
+                                }
+                                onSubmit={
+                                  isRunning || composerContextItems.length > 0
+                                    ? (
                                         text,
-                                        undefined,
-                                        references.length > 0
-                                          ? references
-                                          : undefined,
+                                        references,
                                         attachments,
-                                        undefined,
-                                        resolveAssistantChatSubmitIntent({
-                                          isRunning,
-                                          requestedIntent: options?.intent,
-                                        }),
-                                        undefined,
-                                        true,
-                                      )
-                                  : undefined
-                              }
-                              onSlashCommand={onSlashCommand}
-                              execMode={execMode}
-                              onExecModeChange={onExecModeChange}
-                              planModeDisabled={planModeDisabled}
-                              planModeDisabledReason={planModeDisabledReason}
-                              selectedModel={selectedModel ?? defaultModel}
-                              selectedEffort={selectedEffort}
-                              availableModels={availableModels}
-                              modelListLoading={modelListLoading}
-                              onModelChange={onModelChange}
-                              onEffortChange={onEffortChange}
-                              imageModelMenu={imageModelMenu}
-                              onConnectProvider={onConnectProvider}
-                              onConnectLocalRuntime={onConnectLocalRuntime}
-                              toolbarSlot={composerToolbarSlot}
-                              contextItems={composerContextItems}
-                              onRemoveContextItem={removeComposerContextItem}
-                              plusMenuMode={plusMenuMode}
-                              layoutVariant={composerLayoutVariant}
-                              providerConnectStatusEnabled={
-                                providerStatusChecksEnabled
-                              }
-                              voiceEnabled
-                              draftScope={threadId || tabId}
-                              interceptBuildRequestsForBuilder
-                              onAttachmentError={setComposerError}
-                              extraActionButton={
-                                contextXRayEnabled ||
-                                composerExtraActionButton ? (
-                                  <>
-                                    {contextXRayEnabled && (
-                                      <ContextMeter threadId={threadId} />
-                                    )}
-                                    {composerExtraActionButton}
-                                  </>
-                                ) : undefined
-                              }
-                              stopButton={
-                                showRunningInUI ? (
-                                  <Tooltip>
-                                    <TooltipTrigger asChild>
-                                      <button
-                                        type="button"
-                                        onClick={() => stopActiveRun()}
-                                        aria-label="Stop response"
-                                        data-agent-composer-slot="stop-button"
-                                        className="shrink-0 flex h-7 w-7 cursor-pointer items-center justify-center rounded-full bg-primary text-primary-foreground shadow-sm transition-opacity hover:opacity-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-                                      >
-                                        <IconPlayerStopFilled className="h-3 w-3" />
-                                      </button>
-                                    </TooltipTrigger>
-                                    <TooltipContent>
-                                      Stop response
-                                    </TooltipContent>
-                                  </Tooltip>
-                                ) : undefined
-                              }
+                                        options,
+                                      ) =>
+                                        void addToQueue(
+                                          text,
+                                          undefined,
+                                          references.length > 0
+                                            ? references
+                                            : undefined,
+                                          attachments,
+                                          undefined,
+                                          resolveAssistantChatSubmitIntent({
+                                            isRunning,
+                                            requestedIntent: options?.intent,
+                                          }),
+                                          undefined,
+                                          true,
+                                        )
+                                    : undefined
+                                }
+                                onSlashCommand={onSlashCommand}
+                                execMode={execMode}
+                                onExecModeChange={onExecModeChange}
+                                planModeDisabled={planModeDisabled}
+                                planModeDisabledReason={planModeDisabledReason}
+                                selectedModel={selectedModel ?? defaultModel}
+                                selectedEffort={selectedEffort}
+                                availableModels={availableModels}
+                                modelListLoading={modelListLoading}
+                                onModelChange={onModelChange}
+                                onEffortChange={onEffortChange}
+                                imageModelMenu={imageModelMenu}
+                                onConnectProvider={onConnectProvider}
+                                onConnectLocalRuntime={onConnectLocalRuntime}
+                                toolbarSlot={composerToolbarSlot}
+                                contextItems={composerContextItems}
+                                onRemoveContextItem={removeComposerContextItem}
+                                plusMenuMode={plusMenuMode}
+                                layoutVariant={composerLayoutVariant}
+                                providerConnectStatusEnabled={
+                                  providerStatusChecksEnabled
+                                }
+                                voiceEnabled
+                                draftScope={threadId || tabId}
+                                interceptBuildRequestsForBuilder
+                                onAttachmentError={setComposerError}
+                                extraActionButton={
+                                  contextXRayEnabled ||
+                                  composerExtraActionButton ? (
+                                    <>
+                                      {contextXRayEnabled && (
+                                        <ContextMeter threadId={threadId} />
+                                      )}
+                                      {composerExtraActionButton}
+                                    </>
+                                  ) : undefined
+                                }
+                                stopButton={
+                                  showRunningInUI ? (
+                                    <Tooltip>
+                                      <TooltipTrigger asChild>
+                                        <button
+                                          type="button"
+                                          onClick={() => stopActiveRun()}
+                                          aria-label="Stop response"
+                                          data-agent-composer-slot="stop-button"
+                                          className="shrink-0 flex h-7 w-7 cursor-pointer items-center justify-center rounded-full bg-primary text-primary-foreground shadow-sm transition-opacity hover:opacity-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+                                        >
+                                          <IconPlayerStopFilled className="h-3 w-3" />
+                                        </button>
+                                      </TooltipTrigger>
+                                      <TooltipContent>
+                                        Stop response
+                                      </TooltipContent>
+                                    </Tooltip>
+                                  ) : undefined
+                                }
+                              />
+                            </>
+                          )}
+                        </AgentComposerFrame>
+                        {showMissingKeySetup ? (
+                          <PopoverContent
+                            side={
+                              missingApiKeySetupLayout === "sidebar"
+                                ? "top"
+                                : "bottom"
+                            }
+                            align="center"
+                            sideOffset={8}
+                            collisionPadding={12}
+                            data-agent-native-composer-popover="true"
+                            className="z-[260] box-border w-[min(calc(100vw-2rem),var(--radix-popover-content-available-width,26rem),26rem)] rounded-lg border-border p-3 shadow-lg"
+                          >
+                            <BuilderSetupContent
+                              onConnected={handleBuilderConnected}
+                              layout={missingApiKeySetupLayout}
                             />
-                          </>
-                        )}
-                      </AgentComposerFrame>
-                      {showMissingKeySetup ? (
-                        <PopoverContent
-                          side={
-                            missingApiKeySetupLayout === "sidebar"
-                              ? "top"
-                              : "bottom"
-                          }
-                          align="center"
-                          sideOffset={8}
-                          collisionPadding={12}
-                          data-agent-native-composer-popover="true"
-                          className="z-[260] box-border w-[min(calc(100vw-2rem),var(--radix-popover-content-available-width,26rem),26rem)] rounded-lg border-border p-3 shadow-lg"
-                        >
-                          <BuilderSetupContent
-                            onConnected={handleBuilderConnected}
-                            layout={missingApiKeySetupLayout}
-                          />
-                        </PopoverContent>
-                      ) : null}
-                    </Popover>
+                          </PopoverContent>
+                        ) : null}
+                      </Popover>
+                    </div>
                   </div>
-                </div>
-              </TextStreamingContext.Provider>
-            </ChatRunningContext.Provider>
+                </TextStreamingContext.Provider>
+              </ChatRunningContext.Provider>
+            </ServerRunActiveContext.Provider>
           </ChatRunDurationContext.Provider>
         </ApprovalContext.Provider>
       </MessageActionsContext.Provider>