@agent-native/core 0.80.10 → 0.81.0

package/corpus/core/src/client/AssistantChat.tsx

@@ -230,6 +230,12 @@ const PENDING_SELECTION_KEY = "pending-selection-context";
 const ACTIVE_RUN_CLEAR_TIMEOUT_MS = 5_000;
 const ACTIVE_RUN_STUCK_THRESHOLD_MS = 90_000;
 const ACTIVE_RUN_POLL_INTERVAL_MS = 150;
+// 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
+// through transient labels ("Contacting model", "Preparing X action"); past it
+// the live label appears so a genuinely slow step reads as working, not hung.
+const ACTIVITY_LABEL_REVEAL_DELAY_MS = 6_000;
 const SUBMIT_ENGINE_STATUS_TIMEOUT_MS = 1000;
 
 type ActiveRunLookup = {
@@ -254,6 +260,24 @@ function activeRunLooksStale(runInfo: ActiveRunLookup): boolean {
   );
 }
 
+/**
+ * Decide whether a reconnect should give up with "no progress". The signal is
+ * *time since the last streamed event*, NOT total reconnect duration: a healthy
+ * long-running tool (e.g. image generation, which emits `activity` heartbeats
+ * every few seconds) makes continuous progress and must never be aborted just
+ * for running longer than the threshold. Only genuine silence for the full
+ * stuck threshold counts as stuck. Pure + exported so the decision is unit
+ * testable without driving the whole reconnect lifecycle.
+ */
+export function reconnectProgressTimedOut(args: {
+  lastProgressAt: number;
+  now: number;
+  thresholdMs?: number;
+}): boolean {
+  const threshold = args.thresholdMs ?? ACTIVE_RUN_STUCK_THRESHOLD_MS;
+  return args.now - args.lastProgressAt >= threshold;
+}
+
 function isAssistantUiDuplicateMessageIdError(error: unknown): boolean {
   const message = error instanceof Error ? error.message : String(error ?? "");
   return (
@@ -1323,6 +1347,24 @@ const AssistantChatInner = forwardRef<
   // True during the 250ms continuation window and startup of the next chunk
   // (adapter's auto-continue delay before POSTing the next chunk).
   const [isAutoResuming, setIsAutoResuming] = useState(false);
+  const [runningActivityLabel, setRunningActivityLabel] = useState<
+    string | null
+  >(null);
+  // Delayed-reveal state for the activity label (see ACTIVITY_LABEL_REVEAL_DELAY_MS).
+  // `latest` holds the most recent activity label; `surfaced` flips true once the
+  // reveal timer fires; `timer` is the pending one-shot reveal.
+  const activityLabelTimerRef = useRef<number | null>(null);
+  const latestActivityLabelRef = useRef<string | null>(null);
+  const activityLabelSurfacedRef = useRef(false);
+  const resetRunningActivity = useCallback(() => {
+    if (activityLabelTimerRef.current !== null) {
+      window.clearTimeout(activityLabelTimerRef.current);
+      activityLabelTimerRef.current = null;
+    }
+    latestActivityLabelRef.current = null;
+    activityLabelSurfacedRef.current = false;
+    setRunningActivityLabel(null);
+  }, []);
   const [reconnectContent, setReconnectContent] = useState<ContentPart[]>([]);
   // When stop is clicked during reconnect, keep content visible (don't wipe it)
   const [reconnectFrozen, setReconnectFrozen] = useState(false);
@@ -1341,6 +1383,19 @@ const AssistantChatInner = forwardRef<
   const textStreaming = isRunning || externalStreaming;
   // UI-only running state — drives the stop button and thinking indicator.
   const showRunningInUI = isRunning;
+  // A revealed activity label wins; otherwise stay a steady "Thinking" by
+  // default. We only surface "Reconnecting" while we are actively replaying
+  // recovered content (reconnectContent populated). A bare reconnect with no
+  // replayed content — e.g. a tail-resume after the serverless wall, where
+  // `scheduleUpdate` intentionally leaves reconnectContent empty — is normal
+  // ongoing work, so it must read as "Thinking", never a perpetual "Working".
+  const runningStatusLabel = runningActivityLabel
+    ? runningActivityLabel
+    : isAutoResuming
+      ? "Resuming"
+      : isReconnecting && reconnectContent.length > 0
+        ? "Reconnecting"
+        : "Thinking";
   const lastBroadcastRunningRef = useRef(isRunning);
   const tiptapRef = useRef<TiptapComposerHandle>(null);
   // Stable ref to the "stop active run" action so addToQueue can abort
@@ -1608,11 +1663,32 @@ const AssistantChatInner = forwardRef<
       }, 1000);
 
       let reconnectTimedOut = false;
-      const maxReconnectTimer = setTimeout(() => {
+      // Idle deadline, NOT a total-duration cap. A long-but-healthy run (image
+      // generation emits `activity` heartbeats every few seconds) keeps
+      // advancing `lastReconnectProgressAt`, so it is never aborted for simply
+      // taking longer than the threshold. Only true silence for the full stuck
+      // threshold trips it — the same semantics as `activeRunLooksStale` and the
+      // SSE-level no-progress timeout. `markReconnectProgress` resets it on every
+      // streamed event (see the `onSeq` callback below, which fires for every
+      // event including activity, for both fresh and tail-resume reconnects).
+      let lastReconnectProgressAt = Date.now();
+      const markReconnectProgress = () => {
+        lastReconnectProgressAt = Date.now();
+      };
+      const idleCheck = setInterval(() => {
+        if (
+          !reconnectProgressTimedOut({
+            lastProgressAt: lastReconnectProgressAt,
+            now: Date.now(),
+          })
+        ) {
+          return;
+        }
         reconnectTimedOut = true;
         abortCtrl.abort();
         clearInterval(watchdog);
-      }, 20_000);
+        clearInterval(idleCheck);
+      }, 1000);
 
       const streamReconnect = async () => {
         let noProgressDuringReconnect = false;
@@ -1653,7 +1729,10 @@ const AssistantChatInner = forwardRef<
               toolCallCounter,
               tabId,
               scheduleUpdate,
-              (seq) => updateActiveRunSeq(seq),
+              (seq) => {
+                markReconnectProgress();
+                updateActiveRunSeq(seq);
+              },
             );
             if (afterSeq === 0) {
               setReconnectContent([...content]);
@@ -1677,7 +1756,7 @@ const AssistantChatInner = forwardRef<
             window.clearInterval(threadPollInterval);
           }
           clearInterval(watchdog);
-          clearTimeout(maxReconnectTimer);
+          clearInterval(idleCheck);
         }
 
         if (noProgressDuringReconnect && reconnectRunIdRef.current === runId) {
@@ -2235,11 +2314,9 @@ const AssistantChatInner = forwardRef<
     return () => window.removeEventListener("agent-chat:run-error", handler);
   }, [tabId]);
 
-  // Real activity means the next chunk has started — leave the auto-resume
-  // ("Resuming") state so the indicator settles back to "Thinking". The
-  // activity label itself is intentionally not surfaced: the running
-  // indicator stays a steady "Thinking" rather than flipping through
-  // transient step labels.
+  // Real activity means the next chunk has started. Surface longer-lived
+  // activity such as "Still generating image" so active-run reconnects do not
+  // look like failures while the server is still making progress.
   useEffect(() => {
     const handler = (e: Event) => {
       const detail = (e as CustomEvent).detail as {
@@ -2248,13 +2325,43 @@ const AssistantChatInner = forwardRef<
         tabId?: string;
       };
       if (tabId && detail?.tabId && detail.tabId !== tabId) return;
-      if (typeof detail?.label === "string" && detail.label.trim()) {
-        setIsAutoResuming(false);
+      const label =
+        typeof detail?.label === "string" ? detail.label.trim() : "";
+      if (!label) return;
+      setIsAutoResuming(false);
+      latestActivityLabelRef.current = label;
+      // Already past the delay → keep the visible label current.
+      if (activityLabelSurfacedRef.current) {
+        setRunningActivityLabel(label);
+        return;
+      }
+      // Not yet surfaced → arm a single reveal timer on the FIRST activity of
+      // this in-flight period. A burst of quick steps that all finish (clear)
+      // before the timer fires never surfaces anything, so normal fast turns
+      // stay a steady "Thinking". A step still in-flight at the deadline reveals
+      // the latest label so a slow operation reads as working, not hung.
+      if (activityLabelTimerRef.current === null) {
+        activityLabelTimerRef.current = window.setTimeout(() => {
+          activityLabelTimerRef.current = null;
+          activityLabelSurfacedRef.current = true;
+          if (latestActivityLabelRef.current) {
+            setRunningActivityLabel(latestActivityLabelRef.current);
+          }
+        }, ACTIVITY_LABEL_REVEAL_DELAY_MS);
       }
     };
+    const clear = (e: Event) => {
+      const detail = (e as CustomEvent).detail as { tabId?: string };
+      if (tabId && detail?.tabId && detail.tabId !== tabId) return;
+      resetRunningActivity();
+    };
     window.addEventListener("agent-chat:activity", handler);
-    return () => window.removeEventListener("agent-chat:activity", handler);
-  }, [tabId]);
+    window.addEventListener("agent-chat:activity-clear", clear);
+    return () => {
+      window.removeEventListener("agent-chat:activity", handler);
+      window.removeEventListener("agent-chat:activity-clear", clear);
+    };
+  }, [resetRunningActivity, tabId]);
 
   // Show "Resuming…" during the adapter's auto-continuation window (the
   // ~250ms gap between the end of one serverless chunk and the POST for the
@@ -2274,8 +2381,9 @@ const AssistantChatInner = forwardRef<
   useEffect(() => {
     if (!isRunning) {
       setIsAutoResuming(false);
+      resetRunningActivity();
     }
-  }, [isRunning]);
+  }, [isRunning, resetRunningActivity]);
 
   // Auto-dequeue: when the agent is idle, send the next queued message. This
   // intentionally does not depend on observing the running -> idle transition:
@@ -3336,18 +3444,7 @@ const AssistantChatInner = forwardRef<
                           <ReconnectStreamMessage content={reconnectContent} />
                         )}
                       {showRunningInUI && (
-                        <RunningActivityStatus
-                          label={
-                            isReconnecting
-                              ? "Reconnecting"
-                              : isAutoResuming
-                                ? "Resuming"
-                                : // Keep a steady "Thinking" while the model works —
-                                  // never flip through transient activity labels
-                                  // (e.g. "Contacting model", "Preparing X action").
-                                  "Thinking"
-                          }
-                        />
+                        <RunningActivityStatus label={runningStatusLabel} />
                       )}
                       {queuedMessages.map((msg) => {
                         const displayText = msg.text

package/corpus/core/src/client/ConnectBuilderCard.tsx

@@ -154,6 +154,7 @@ export function ConnectBuilderCard({
             orgName,
             pageUrl: window.location.href,
             source: "connect_builder_card",
+            useCase: "builder_agent_background_coding",
           }),
         },
       );

package/corpus/core/src/client/chat/index.ts

@@ -16,6 +16,7 @@ export {
   AGENT_CHAT_VIEW_TRANSITION_NAME,
   consumeAgentChatHomeHandoff,
   getAgentChatViewTransitionStyle,
+  isAgentChatHomeHandoffActive,
   markAgentChatHomeHandoff,
   navigateWithAgentChatViewTransition,
   startAgentChatViewTransition,

package/corpus/core/src/client/chat/run-recovery.tsx

@@ -195,7 +195,7 @@ export function BuilderConnectCta({
   if (variant === "compact") {
     if (configured) {
       return (
-        <span className="inline-flex h-8 items-center gap-1.5 whitespace-nowrap rounded-md border border-border bg-background px-2.5 text-[11px] font-medium text-foreground">
+        <span className="agent-builder-setup-card__builder-button inline-flex h-8 items-center gap-1.5 whitespace-nowrap rounded-md border border-border bg-background px-2.5 text-[11px] font-medium text-foreground">
           <IconCheck size={11} className="text-emerald-500" />
           {orgName ? `Connected to ${orgName}` : "Connected"}
         </span>
@@ -203,12 +203,12 @@ export function BuilderConnectCta({
     }
 
     return (
-      <div className="flex min-w-0 flex-col items-start gap-1 sm:items-end">
+      <div className="agent-builder-setup-card__builder-cta flex min-w-0 flex-col items-start gap-1 sm:items-end">
         <button
           type="button"
           onClick={() => start()}
           disabled={connecting}
-          className="inline-flex h-8 shrink-0 items-center gap-1 whitespace-nowrap rounded-md bg-foreground px-3 text-[11px] font-medium text-background hover:opacity-90 disabled:cursor-wait disabled:opacity-60"
+          className="agent-builder-setup-card__builder-button inline-flex h-8 shrink-0 items-center gap-1 whitespace-nowrap rounded-md bg-foreground px-3 text-[11px] font-medium text-background hover:opacity-90 disabled:cursor-wait disabled:opacity-60"
           aria-busy={connecting}
         >
           {connecting ? (
@@ -433,6 +433,8 @@ export function BuilderSetupCard({
     <div
       ref={cardRef}
       className={cn(
+        "agent-builder-setup-card",
+        sidebarLayout && "agent-builder-setup-card--sidebar",
         fullWidth
           ? "w-full pb-2"
           : sidebarLayout
@@ -441,8 +443,8 @@ export function BuilderSetupCard({
       )}
     >
       <div className="rounded-lg border border-border/80 bg-background/80 p-3 shadow-sm backdrop-blur">
-        <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
-          <div className="min-w-0">
+        <div className="agent-builder-setup-card__content flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+          <div className="agent-builder-setup-card__copy min-w-0">
             <h3 className="text-[13px] font-medium text-foreground">
               Connect AI
             </h3>
@@ -452,7 +454,7 @@ export function BuilderSetupCard({
           </div>
           <div
             className={cn(
-              "flex shrink-0",
+              "agent-builder-setup-card__actions flex shrink-0",
               sidebarLayout
                 ? "flex-col items-start gap-0 sm:items-center"
                 : "flex-nowrap items-center gap-2",
@@ -463,7 +465,7 @@ export function BuilderSetupCard({
               type="button"
               onClick={() => setKeyOpen((open) => !open)}
               className={cn(
-                "inline-flex shrink-0 items-center whitespace-nowrap rounded-md text-[11px] font-medium",
+                "agent-builder-setup-card__key-button inline-flex shrink-0 items-center whitespace-nowrap rounded-md text-[11px] font-medium",
                 sidebarLayout
                   ? "h-7 border-0 bg-transparent px-0 text-muted-foreground hover:bg-transparent hover:text-foreground"
                   : "h-8 border border-border bg-background px-3 text-foreground hover:bg-accent",

package/corpus/core/src/client/chat-view-transition.ts

@@ -132,6 +132,31 @@ export function markAgentChatHomeHandoff(storageKey?: string | null): void {
   } catch {}
 }
 
+/**
+ * Check whether a full-page-chat handoff marker is still recent without
+ * consuming it. Use this when a chat route should only restore or animate a
+ * conversation if the user actually chatted a moment ago.
+ */
+export function isAgentChatHomeHandoffActive(
+  storageKey?: string | null,
+  options: AgentChatHomeHandoffOptions = {},
+): boolean {
+  if (typeof window === "undefined") return false;
+
+  let startedAt = 0;
+  try {
+    const raw = window.sessionStorage.getItem(
+      agentChatHomeHandoffKey(storageKey),
+    );
+    startedAt = raw ? Number.parseInt(raw, 10) : 0;
+  } catch {
+    startedAt = 0;
+  }
+
+  const ttlMs = options.ttlMs ?? AGENT_CHAT_HOME_HANDOFF_TTL_MS;
+  return Number.isFinite(startedAt) && Date.now() - startedAt <= ttlMs;
+}
+
 /**
  * Consume a recent full-page-chat handoff marker. Returns true only once per
  * marker, so layouts can keep `openOnChatRunning` scoped to the route that
@@ -153,9 +178,15 @@ export function consumeAgentChatHomeHandoff(
     startedAt = 0;
   }
 
+  return isAgentChatHomeHandoffActiveFromTimestamp(startedAt, options);
+}
+
+function isAgentChatHomeHandoffActiveFromTimestamp(
+  startedAt: number,
+  options: AgentChatHomeHandoffOptions,
+): boolean {
   const ttlMs = options.ttlMs ?? AGENT_CHAT_HOME_HANDOFF_TTL_MS;
-  const active = Number.isFinite(startedAt) && Date.now() - startedAt <= ttlMs;
-  return active;
+  return Number.isFinite(startedAt) && Date.now() - startedAt <= ttlMs;
 }
 
 /**

package/corpus/core/src/client/composer/PromptComposer.tsx

@@ -30,7 +30,7 @@ import {
 
 import type { ReasoningEffort } from "../../shared/reasoning-effort.js";
 import { AssistantUiStaleIndexErrorBoundary } from "../assistant-ui-recovery.js";
-import { BuilderSetupCard } from "../chat/run-recovery.js";
+import { BuilderConnectCta, BuilderSetupCard } from "../chat/run-recovery.js";
 import { TooltipProvider } from "../components/ui/tooltip.js";
 import {
   fetchAgentEngineConfiguredState,
@@ -578,10 +578,11 @@ function PromptComposerInner({
     },
     [composerEffort, composerEngine, composerModel, onSubmit],
   );
+  const useInlineMissingKeySetup = layoutVariant === "compact";
 
   return (
     <>
-      {missingApiKey ? (
+      {missingApiKey && !useInlineMissingKeySetup ? (
         <BuilderSetupCard
           onConnected={handleBuilderConnected}
           bouncePulse={missingKeyBouncePulse}
@@ -589,6 +590,24 @@ function PromptComposerInner({
           layout="sidebar"
         />
       ) : null}
+      {missingApiKey && useInlineMissingKeySetup ? (
+        <div className="mb-2 rounded-md border border-border/80 bg-background/80 p-2.5 text-start shadow-sm">
+          <div className="flex flex-col gap-2">
+            <div className="min-w-0">
+              <p className="text-[12px] font-medium text-foreground">
+                Connect AI
+              </p>
+              <p className="mt-0.5 text-[11px] leading-4 text-muted-foreground">
+                Connect Builder.io before sending.
+              </p>
+            </div>
+            <BuilderConnectCta
+              variant="compact"
+              onConnected={handleBuilderConnected}
+            />
+          </div>
+        </div>
+      ) : null}
       <AgentComposerFrame
         className={cn(
           "text-start",

package/corpus/core/src/client/index.ts

@@ -529,6 +529,7 @@ export {
   AGENT_CHAT_VIEW_TRANSITION_NAME,
   consumeAgentChatHomeHandoff,
   getAgentChatViewTransitionStyle,
+  isAgentChatHomeHandoffActive,
   markAgentChatHomeHandoff,
   navigateWithAgentChatViewTransition,
   startAgentChatViewTransition,

package/corpus/core/src/client/org/OrgSwitcher.tsx

@@ -97,6 +97,9 @@ const SECTION_LABEL_CLASS =
 const APP_SUBMENU_CONTENT_CLASS =
   "z-50 w-72 rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2";
 
+const SWITCHER_BUTTON_CLASS =
+  "flex w-full items-center gap-2 rounded-md border border-border/70 px-2.5 py-1.5 text-xs font-medium text-muted-foreground hover:bg-accent/50 hover:text-foreground focus:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-60 cursor-pointer";
+
 const DEFAULT_ORGANIZATION_SETTINGS_PATH = "/settings#team";
 
 const APP_ICON_MAP: Record<string, typeof IconApps> = {
@@ -274,6 +277,25 @@ function AppsSubmenu({
   );
 }
 
+function ReservedOrgSwitcherSpace({ className }: { className?: string }) {
+  return <div aria-hidden="true" className={`h-8 ${className ?? ""}`} />;
+}
+
+function OrgSwitcherLoadingPlaceholder({ className }: { className?: string }) {
+  return (
+    <button
+      type="button"
+      disabled
+      aria-label="Loading organization"
+      className={`${SWITCHER_BUTTON_CLASS} animate-pulse ${className ?? ""}`}
+    >
+      <IconBuilding className="h-3.5 w-3.5 shrink-0 opacity-60" />
+      <span className="h-3 min-w-0 flex-1 rounded-sm bg-muted-foreground/20" />
+      <IconSelector className="h-3 w-3 shrink-0 opacity-30" />
+    </button>
+  );
+}
+
 /**
  * Compact org switcher button. Shows the active org (or "Personal" when the
  * user has none); opens a popover with the user's other orgs, pending
@@ -326,7 +348,7 @@ export function OrgSwitcher({
 
   if (!org) {
     return reserveSpace && isLoading ? (
-      <div aria-hidden="true" className={`h-8 ${className ?? ""}`} />
+      <OrgSwitcherLoadingPlaceholder className={className} />
     ) : null;
   }
 
@@ -338,7 +360,7 @@ export function OrgSwitcher({
     orgCount > 0 || pendingInvitations.length > 0 || domainMatches.length > 0;
   if (!hasAny && !org.email) {
     return reserveSpace ? (
-      <div aria-hidden="true" className={`h-8 ${className ?? ""}`} />
+      <ReservedOrgSwitcherSpace className={className} />
     ) : null;
   }
   if (
@@ -348,7 +370,7 @@ export function OrgSwitcher({
     domainMatches.length === 0
   ) {
     return reserveSpace ? (
-      <div aria-hidden="true" className={`h-8 ${className ?? ""}`} />
+      <ReservedOrgSwitcherSpace className={className} />
     ) : null;
   }
 
@@ -368,7 +390,7 @@ export function OrgSwitcher({
       <PopoverPrimitive.Trigger asChild>
         <button
           type="button"
-          className={`flex w-full items-center gap-2 rounded-md border border-border/70 px-2.5 py-1.5 text-xs font-medium text-muted-foreground hover:bg-accent/50 hover:text-foreground focus:outline-none focus-visible:ring-2 focus-visible:ring-ring cursor-pointer ${className ?? ""}`}
+          className={`${SWITCHER_BUTTON_CLASS} ${className ?? ""}`}
         >
           <ButtonIcon className="h-3.5 w-3.5 shrink-0" />
           <span className="truncate flex-1 text-start">{buttonLabel}</span>

package/corpus/core/src/client/sharing/ShareButton.tsx

@@ -153,13 +153,13 @@ interface SharesResponse {
   policy?: SharesPolicy;
 }
 
-// Mirror shadcn's <Button size="sm" variant="outline"> class string so the
-// trigger sits flush next to other sm outline buttons in the template.
+// Match shadcn's <Button size="sm" variant="outline"> sizing so the trigger
+// sits flush next to other controls while staying transparent at rest.
 const BUTTON_BASE =
   "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0";
 const BUTTON_OUTLINE_SM = cn(
   BUTTON_BASE,
-  "h-9 px-3 border border-[hsl(var(--sidebar-border,var(--input)))] bg-[hsl(var(--sidebar-background,var(--background)))] text-foreground hover:bg-[hsl(var(--sidebar-accent,var(--accent)))] hover:text-[hsl(var(--sidebar-accent-foreground,var(--accent-foreground)))]",
+  "h-9 px-3 border border-[hsl(var(--sidebar-border,var(--input)))] bg-transparent text-foreground hover:bg-[hsl(var(--sidebar-accent,var(--accent)))] hover:text-[hsl(var(--sidebar-accent-foreground,var(--accent-foreground)))]",
 );
 const BUTTON_PRIMARY_SM = cn(
   BUTTON_BASE,

package/corpus/core/src/client/sse-event-processor.ts

@@ -352,6 +352,11 @@ export function processEvent(
   }
 
   if (ev.type === "text") {
+    // Visible output means the run is plainly not hanging — drop any running
+    // activity label so a transient "Contacting model" / "Still generating
+    // image" doesn't linger beside streamed text. Idempotent (clears once, then
+    // no-ops) so per-token text deltas stay cheap.
+    if (ev.text) dispatchActivityClear(tabId);
     const lastPart = content[content.length - 1];
     if (lastPart && lastPart.type === "text") {
       lastPart.text += ev.text ?? "";
@@ -492,6 +497,10 @@ export function processEvent(
         }),
       );
     }
+    // Clear any sticky running-activity label (e.g. "Still generating image"):
+    // the tool that was emitting activity heartbeats has finished, so the label
+    // must not linger while the model streams its follow-up text or reasoning.
+    dispatchActivityClear(tabId);
     // Use id-based lookup when available so parallel same-name tool calls
     // get their results correctly assigned; fall back to name-matching.
     const doneIdx = findPendingToolCallIndex(content, doneTool, ev.id);

package/corpus/core/src/client/use-agent-chat-home-handoff.ts

@@ -4,6 +4,7 @@ import { useLocation, useNavigate } from "react-router";
 import { appBasePath } from "./api-path.js";
 import {
   consumeAgentChatHomeHandoff,
+  isAgentChatHomeHandoffActive,
   markAgentChatHomeHandoff,
   navigateWithAgentChatViewTransition,
 } from "./chat-view-transition.js";
@@ -13,6 +14,8 @@ export interface UseAgentChatHomeHandoffOptions {
   storageKey?: string | null;
   /** The current destination path that receives the sidebar handoff. */
   activePath: string;
+  /** How long the handoff marker remains valid. Defaults to 6 hours. */
+  ttlMs?: number;
   /** Disable consumption without changing hook call order. */
   enabled?: boolean;
 }
@@ -30,6 +33,10 @@ export interface UseAgentChatHomeHandoffLinksOptions {
   isChatPath?: (pathname: string) => boolean;
   /** Disable link interception without changing hook call order. */
   enabled?: boolean;
+  /** How long the handoff marker remains valid. Defaults to 6 hours. */
+  ttlMs?: number;
+  /** Only intercept links if a recent handoff marker already exists. */
+  requireActiveHandoff?: boolean;
 }
 
 function stripBasePath(path: string): string {
@@ -96,6 +103,10 @@ function shouldHandleAnchorClick(
   return true;
 }
 
+function handoffTtlOptions(ttlMs: number | undefined) {
+  return ttlMs === undefined ? undefined : { ttlMs };
+}
+
 /**
  * Returns true for the route that has just received a full-page-chat handoff.
  * Pass the result to `AgentSidebar openOnChatRunning`.
@@ -103,6 +114,7 @@ function shouldHandleAnchorClick(
 export function useAgentChatHomeHandoff({
   storageKey,
   activePath,
+  ttlMs,
   enabled = true,
 }: UseAgentChatHomeHandoffOptions): boolean {
   const [handoffPath, setHandoffPath] = useState<string | null>(null);
@@ -112,10 +124,10 @@ export function useAgentChatHomeHandoff({
       setHandoffPath(null);
       return;
     }
-    if (consumeAgentChatHomeHandoff(storageKey)) {
+    if (consumeAgentChatHomeHandoff(storageKey, handoffTtlOptions(ttlMs))) {
       setHandoffPath(activePath);
     }
-  }, [activePath, enabled, storageKey]);
+  }, [activePath, enabled, storageKey, ttlMs]);
 
   return enabled && handoffPath === activePath;
 }
@@ -129,6 +141,8 @@ export function useAgentChatHomeHandoffLinks({
   chatPath = "/",
   isChatPath,
   enabled = true,
+  ttlMs,
+  requireActiveHandoff = false,
 }: UseAgentChatHomeHandoffLinksOptions): void {
   const location = useLocation();
   const navigate = useNavigate();
@@ -161,6 +175,13 @@ export function useAgentChatHomeHandoffLinks({
         return;
       }
 
+      if (
+        requireActiveHandoff &&
+        !isAgentChatHomeHandoffActive(storageKey, handoffTtlOptions(ttlMs))
+      ) {
+        return;
+      }
+
       event.preventDefault();
       markAgentChatHomeHandoff(storageKey);
       navigateWithAgentChatViewTransition(navigate, path);
@@ -168,5 +189,12 @@ export function useAgentChatHomeHandoffLinks({
 
     document.addEventListener("click", handleClick, true);
     return () => document.removeEventListener("click", handleClick, true);
-  }, [enabled, location.pathname, navigate, storageKey]);
+  }, [
+    enabled,
+    location.pathname,
+    navigate,
+    requireActiveHandoff,
+    storageKey,
+    ttlMs,
+  ]);
 }