@agent-native/core 0.149.0 → 0.149.2

package/dist/client/chat-first/surface-tabs.js

@@ -17,54 +17,65 @@ function SurfaceIcon({ kind }) {
     const Icon = ICONS[kind];
     return _jsx(Icon, { size: 14, "aria-hidden": "true" });
 }
-export function ChatFirstSurfaceTabs({ tabs, activeTabId, onActivate, onClose, onCloseOthers, onCloseToRight, onCloseAll, onOpenSurface, copy = defaultChatFirstCopy, }) {
-    return (_jsx(TooltipProvider, { delayDuration: 400, children: _jsx("div", { "data-chat-first-surface-tabs": true, className: "shrink-0 border-b border-border bg-card", children: tabs.length > 0 ? (_jsx("div", { className: "flex min-w-0 items-center gap-1 overflow-x-auto px-2 py-1.5", role: "tablist", "aria-label": copy("openSideSurfaces"), children: tabs.map((tab, index) => (_jsxs(ContextMenu, { children: [_jsx(ContextMenuTrigger, { asChild: true, children: _jsxs("div", { role: "tab", tabIndex: activeTabId === tab.id ? 0 : -1, "aria-selected": activeTabId === tab.id, "data-surface-tab-id": tab.id, "data-active": activeTabId === tab.id ? "true" : "false", className: cn("group flex h-8 min-w-0 max-w-48 shrink-0 items-center rounded-md text-xs transition-colors", activeTabId === tab.id
+export function ChatFirstSurfaceTabs({ tabs, activeTabId, onActivate, onClose, onCloseOthers, onCloseToRight, onCloseAll, onOpenSurface, apps = [], onOpenApp, renderAppIcon, copy = defaultChatFirstCopy, }) {
+    return (_jsx(TooltipProvider, { delayDuration: 400, children: _jsx("div", { "data-chat-first-surface-tabs": true, className: cn("min-w-0 border-b border-border bg-card", tabs.length > 0
+                ? "shrink-0"
+                : "flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden"), children: tabs.length > 0 ? (_jsx("div", { className: "flex min-w-0 items-center gap-1 overflow-x-auto px-2 py-1.5", role: "tablist", "aria-label": copy("openSideSurfaces"), children: tabs.map((tab, index) => (_jsxs(ContextMenu, { children: [_jsx(ContextMenuTrigger, { asChild: true, children: _jsxs("div", { "data-surface-tab-id": tab.id, "data-active": activeTabId === tab.id ? "true" : "false", className: cn("group flex h-8 min-w-0 max-w-48 shrink-0 items-center rounded-md text-xs transition-colors", activeTabId === tab.id
                                     ? "bg-accent text-foreground"
-                                    : "text-muted-foreground hover:bg-accent hover:text-foreground"), onKeyDown: (event) => {
-                                    const nextIndex = event.key === "ArrowRight"
-                                        ? (index + 1) % tabs.length
-                                        : event.key === "ArrowLeft"
-                                            ? (index - 1 + tabs.length) % tabs.length
-                                            : event.key === "Home"
-                                                ? 0
-                                                : event.key === "End"
-                                                    ? tabs.length - 1
-                                                    : -1;
-                                    if (nextIndex < 0)
-                                        return;
-                                    event.preventDefault();
-                                    onActivate(tabs[nextIndex]);
-                                    requestAnimationFrame(() => {
-                                        document
-                                            .querySelector(`[data-chat-first-surface-tab-id="${CSS.escape(tabs[nextIndex].id)}"]`)
-                                            ?.focus();
-                                    });
-                                }, "data-chat-first-surface-tab-id": tab.id, onMouseDown: (event) => {
+                                    : "text-muted-foreground hover:bg-accent hover:text-foreground"), onMouseDown: (event) => {
                                     if (event.button === 1) {
                                         event.preventDefault();
                                         onClose(tab);
                                     }
-                                }, title: tab.title, children: [_jsxs("button", { type: "button", className: "flex min-w-0 flex-1 items-center gap-1.5 truncate px-2 text-start", onClick: () => onActivate(tab), tabIndex: -1, children: [_jsx(SurfaceIcon, { kind: tab.kind }), _jsx("span", { className: "truncate", children: tab.title })] }), _jsx("button", { type: "button", className: "mr-1 flex size-5 shrink-0 items-center justify-center rounded text-muted-foreground/65 opacity-0 transition-opacity hover:bg-background/70 hover:text-foreground group-hover:opacity-100 focus-visible:opacity-100", "aria-label": copy("closeTab", { name: tab.title }), title: copy("closeTab", { name: tab.title }), onClick: (event) => {
+                                }, title: tab.title, children: [_jsxs("button", { type: "button", role: "tab", tabIndex: activeTabId === tab.id ? 0 : -1, "aria-selected": activeTabId === tab.id, "data-chat-first-surface-tab-id": tab.id, className: "flex min-w-0 flex-1 items-center gap-1.5 truncate rounded-md px-2 text-start focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring", onKeyDown: (event) => {
+                                            if (event.key === "Enter" || event.key === " ") {
+                                                event.preventDefault();
+                                                onActivate(tab);
+                                                return;
+                                            }
+                                            const nextIndex = event.key === "ArrowRight"
+                                                ? (index + 1) % tabs.length
+                                                : event.key === "ArrowLeft"
+                                                    ? (index - 1 + tabs.length) % tabs.length
+                                                    : event.key === "Home"
+                                                        ? 0
+                                                        : event.key === "End"
+                                                            ? tabs.length - 1
+                                                            : -1;
+                                            if (nextIndex < 0)
+                                                return;
+                                            event.preventDefault();
+                                            onActivate(tabs[nextIndex]);
+                                            requestAnimationFrame(() => {
+                                                document
+                                                    .querySelector(`[data-chat-first-surface-tab-id="${CSS.escape(tabs[nextIndex].id)}"]`)
+                                                    ?.focus();
+                                            });
+                                        }, onClick: () => onActivate(tab), children: [_jsx(SurfaceIcon, { kind: tab.kind }), _jsx("span", { className: "truncate", children: tab.title })] }), _jsx("button", { type: "button", className: "mr-1 flex size-5 shrink-0 items-center justify-center rounded text-muted-foreground/65 opacity-0 transition-opacity hover:bg-background/70 hover:text-foreground group-hover:opacity-100 focus-visible:opacity-100", "aria-label": copy("closeTab", { name: tab.title }), title: copy("closeTab", { name: tab.title }), onClick: (event) => {
                                             event.stopPropagation();
                                             onClose(tab);
-                                        }, children: _jsx(IconX, { size: 12, "aria-hidden": "true" }) })] }) }), _jsxs(ContextMenuContent, { children: [_jsx(ContextMenuItem, { onSelect: () => onClose(tab), children: copy("close") }), _jsx(ContextMenuItem, { disabled: tabs.length < 2, onSelect: () => onCloseOthers(tab), children: copy("closeOthers") }), _jsx(ContextMenuItem, { disabled: tabs[tabs.length - 1]?.id === tab.id, onSelect: () => onCloseToRight(tab), children: copy("closeToRight") }), _jsx(ContextMenuSeparator, {}), _jsx(ContextMenuItem, { onSelect: onCloseAll, children: copy("closeAll") })] })] }, tab.id))) })) : (_jsx("div", { className: "flex flex-col px-2 py-1", "data-surface-empty-state": true, "aria-label": copy("openSideSurfaces"), children: CHAT_FIRST_SURFACE_CATALOG.map((surface) => {
-                    const label = copy(`surface.${surface.kind}.label`);
-                    const reason = surface.availability === "deferred"
-                        ? copy(`surface.${surface.kind}.reason`)
-                        : copy(`surface.${surface.kind}.reason`);
-                    const isDeferred = surface.availability === "deferred";
-                    const row = (_jsxs("div", { className: cn("flex h-7 min-w-0 items-center gap-2 rounded px-2 text-xs transition-colors", surface.kind === "agents" && onOpenSurface
-                            ? "text-foreground hover:bg-accent"
-                            : isDeferred
-                                ? "text-muted-foreground/60"
-                                : "text-muted-foreground hover:bg-accent hover:text-foreground"), title: !isDeferred ? reason : undefined, "aria-label": `${label}: ${reason}`, children: [_jsx(SurfaceIcon, { kind: surface.kind }), _jsx("span", { className: "min-w-0 flex-1 truncate", children: label }), isDeferred ? (_jsx("span", { "data-surface-availability": "deferred", className: "size-1.5 shrink-0 rounded-full bg-muted-foreground/45", "aria-label": copy("deferred") })) : null] }));
-                    if (surface.kind === "agents" && onOpenSurface) {
-                        return (_jsx("button", { type: "button", className: "text-start", title: copy("openActivity"), "aria-label": copy("openActivity"), onClick: () => onOpenSurface(surface.kind), children: row }, surface.kind));
-                    }
-                    if (!isDeferred)
-                        return _jsx("div", { children: row }, surface.kind);
-                    return (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("div", { className: "text-start", children: row }) }), _jsx(TooltipContent, { side: "left", className: "max-w-72", children: reason })] }, surface.kind));
-                }) })) }) }));
+                                        }, children: _jsx(IconX, { size: 12, "aria-hidden": "true" }) })] }) }), _jsxs(ContextMenuContent, { children: [_jsx(ContextMenuItem, { onSelect: () => onClose(tab), children: copy("close") }), _jsx(ContextMenuItem, { disabled: tabs.length < 2, onSelect: () => onCloseOthers(tab), children: copy("closeOthers") }), _jsx(ContextMenuItem, { disabled: tabs[tabs.length - 1]?.id === tab.id, onSelect: () => onCloseToRight(tab), children: copy("closeToRight") }), _jsx(ContextMenuSeparator, {}), _jsx(ContextMenuItem, { onSelect: onCloseAll, children: copy("closeAll") })] })] }, tab.id))) })) : (_jsxs("div", { className: "flex min-h-0 min-w-0 flex-1 flex-col overflow-y-auto px-2 py-1", "data-surface-empty-state": true, "aria-label": copy("openSideSurfaces"), children: [CHAT_FIRST_SURFACE_CATALOG.map((surface) => {
+                        const label = copy(`surface.${surface.kind}.label`);
+                        const reason = surface.availability === "deferred"
+                            ? copy(`surface.${surface.kind}.reason`)
+                            : copy(`surface.${surface.kind}.reason`);
+                        const isDeferred = surface.availability === "deferred";
+                        const canOpenSurface = onOpenSurface &&
+                            (surface.kind === "browser" ||
+                                surface.kind === "side-chat" ||
+                                surface.kind === "agents");
+                        const row = (_jsxs("div", { className: cn("flex h-7 min-w-0 items-center gap-2 rounded px-2 text-xs transition-colors", canOpenSurface
+                                ? "text-foreground hover:bg-accent"
+                                : isDeferred
+                                    ? "text-muted-foreground/60"
+                                    : "text-muted-foreground hover:bg-accent hover:text-foreground"), title: !isDeferred ? reason : undefined, "aria-label": `${label}: ${reason}`, children: [_jsx(SurfaceIcon, { kind: surface.kind }), _jsx("span", { className: "min-w-0 flex-1 truncate", children: label }), isDeferred ? (_jsx("span", { "data-surface-availability": "deferred", className: "size-1.5 shrink-0 rounded-full bg-muted-foreground/45", "aria-label": copy("deferred") })) : null] }));
+                        if (canOpenSurface) {
+                            return (_jsx("button", { type: "button", className: "block w-full text-start", title: surface.kind === "browser" ? reason : copy("openActivity"), "aria-label": surface.kind === "browser" ? label : copy("openActivity"), onClick: () => onOpenSurface(surface.kind === "side-chat" ? "agents" : surface.kind), children: row }, surface.kind));
+                        }
+                        if (!isDeferred)
+                            return _jsx("div", { children: row }, surface.kind);
+                        return (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("div", { className: "text-start", children: row }) }), _jsx(TooltipContent, { side: "left", className: "max-w-72", children: reason })] }, surface.kind));
+                    }), apps.length > 0 && onOpenApp ? (_jsxs("div", { className: "mt-1 border-t border-border pt-1", children: [_jsx("p", { className: "px-2 py-1 text-[10px] font-medium uppercase tracking-wide text-muted-foreground", children: copy("workspaceApps") }), _jsx("div", { className: "space-y-0.5", children: apps.map((app) => (_jsxs("button", { type: "button", "data-chat-first-surface-app": app.id, className: "flex h-8 w-full min-w-0 items-center gap-2 rounded px-2 text-start text-xs text-foreground transition-colors hover:bg-accent", title: copy("openApp", { name: app.name }), "aria-label": copy("openApp", { name: app.name }), onClick: () => onOpenApp(app), children: [renderAppIcon?.(app) ?? _jsx(SurfaceIcon, { kind: "app" }), _jsx("span", { className: "min-w-0 flex-1 truncate", children: app.name })] }, app.id))) })] })) : null] })) }) }));
 }
 export function ChatFirstSurfaceContent({ tabs, activeTabId, renderTab, }) {
     return (_jsx("div", { className: "min-h-0 flex-1 overflow-hidden", children: tabs.map((tab) => {

package/dist/client/chat-first/types.d.ts

@@ -31,6 +31,9 @@ export interface ChatFirstSurfaceTabsProps {
     onCloseToRight: (tab: ChatFirstSurfaceTab) => void;
     onCloseAll: () => void;
     onOpenSurface?: (kind: ChatFirstSurfaceKind) => void;
+    apps?: readonly ChatFirstAppItem[];
+    onOpenApp?: (app: ChatFirstAppItem) => void;
+    renderAppIcon?: (app: ChatFirstAppItem) => ReactNode;
     copy?: ChatFirstCopy;
 }
 export interface ChatFirstAppRailProps {

package/dist/client/chat-first.d.ts

@@ -36,11 +36,14 @@ export interface ChatFirstSessionWatchStore {
     close: () => void;
 }
 export type ChatFirstSurfaceKind = "app" | "browser" | "terminal" | "diff" | "files" | "side-chat" | "agents";
+export type ChatFirstAppSurfacePlacement = "main" | "side";
 export interface ChatFirstSurfaceTab {
     id: string;
     kind: ChatFirstSurfaceKind;
     title: string;
     appId?: string;
+    /** App tabs can either replace the main chat or sit beside it. */
+    placement?: ChatFirstAppSurfacePlacement;
     path?: string;
     view?: string;
     url?: string;
@@ -128,6 +131,7 @@ export type ChatFirstBrowserResolution = {
     target: {
         url: string;
         title?: string;
+        openExternally?: boolean;
     };
 } | {
     status: "unresolved";
@@ -202,6 +206,12 @@ export declare function subscribeChatFirstOpenApp(listener: ChatFirstOpenAppList
 export declare function emitChatFirstOpenApp(detail: ChatFirstOpenAppDetail): ChatFirstOpenAppDelivery;
 export declare function subscribeChatFirstOpenBrowser(listener: ChatFirstOpenBrowserListener): () => void;
 export declare function emitChatFirstOpenBrowser(detail: ChatFirstOpenBrowserDetail): ChatFirstOpenAppDelivery;
+/**
+ * Builder's web app sends frame-blocking headers. Its branch/editor URLs are
+ * open-browser targets, not the iframe-backed Fusion preview URLs served from
+ * builder.cloud, so keep them out of the chat-first browser iframe.
+ */
+export declare function shouldOpenChatFirstBrowserExternally(value: string): boolean;
 export declare function resolveChatFirstAppTarget(detail: ChatFirstOpenAppDetail, apps: readonly ChatFirstAppRegistration[], options?: {
     currentOrigin?: string;
 }): ChatFirstAppResolution;

package/dist/client/chat-first.js

@@ -338,6 +338,9 @@ export function resolveChatFirstBrowserTarget(detail) {
         target: {
             url: url.href,
             ...(detail.title?.trim() ? { title: detail.title.trim() } : {}),
+            ...(shouldOpenChatFirstBrowserExternally(url.href)
+                ? { openExternally: true }
+                : {}),
         },
     };
 }
@@ -464,9 +467,16 @@ function readChatFirstSurfaceTabsState(scope) {
             return { tabs: [], activeTabId: null };
         }
         const value = scoped;
+        let migratedLegacyPlacement = false;
         const tabs = Array.isArray(value.tabs)
             ? value.tabs.flatMap((candidate) => {
                 const tab = normalizePersistedChatFirstSurfaceTab(candidate);
+                if (tab?.kind === "app" &&
+                    candidate !== null &&
+                    typeof candidate === "object" &&
+                    !("placement" in candidate)) {
+                    migratedLegacyPlacement = true;
+                }
                 return tab ? [tab] : [];
             })
             : [];
@@ -474,7 +484,10 @@ function readChatFirstSurfaceTabsState(scope) {
             tabs.some((tab) => tab.id === value.activeTabId)
             ? value.activeTabId
             : (tabs[0]?.id ?? null);
-        return { tabs, activeTabId };
+        const state = { tabs, activeTabId };
+        if (migratedLegacyPlacement)
+            writeChatFirstSurfaceTabsState(scope, state);
+        return state;
     }
     catch {
         return { tabs: [], activeTabId: null };
@@ -498,11 +511,23 @@ function normalizePersistedChatFirstSurfaceTab(candidate) {
         const appId = typeof value.appId === "string" ? value.appId.trim() : "";
         if (!appId)
             return null;
+        const placement = value.placement;
+        if (placement !== undefined &&
+            placement !== "main" &&
+            placement !== "side") {
+            return null;
+        }
         if (value.path !== undefined &&
             (typeof value.path !== "string" || normalizedPath(value.path) === null)) {
             return null;
         }
-        return { ...tab, id, title, appId };
+        return {
+            ...tab,
+            id,
+            title,
+            appId,
+            placement: placement ?? "main",
+        };
     }
     if (kind === "browser") {
         const url = typeof value.url === "string" ? value.url.trim() : "";
@@ -700,6 +725,16 @@ function parseAbsoluteHttpUrl(value) {
         return null;
     }
 }
+/**
+ * Builder's web app sends frame-blocking headers. Its branch/editor URLs are
+ * open-browser targets, not the iframe-backed Fusion preview URLs served from
+ * builder.cloud, so keep them out of the chat-first browser iframe.
+ */
+export function shouldOpenChatFirstBrowserExternally(value) {
+    const url = parseAbsoluteHttpUrl(value);
+    return Boolean(url &&
+        (url.hostname === "builder.io" || url.hostname.endsWith(".builder.io")));
+}
 function registrationUrls(app, currentOrigin) {
     const values = [app.url, app.devUrl];
     if (app.path && currentOrigin)

package/dist/client/components/ui/message-scroller.js

@@ -10,7 +10,10 @@ function MessageScroller({ className, ...props }) {
 }
 function MessageScrollerViewport({ className, children, ...props }) {
     const { start: hasContentAbove } = useMessageScrollerScrollable();
-    return (_jsx(ShadcnMessageScroller.Viewport, { className: cn("min-h-0 flex-1 overflow-y-auto overflow-x-hidden", hasContentAbove && "message-scroller-viewport--top-fade", className), ...props, children: children }));
+    return (_jsx(ShadcnMessageScroller.Viewport, { className: cn("min-h-0 flex-1 overflow-y-auto overflow-x-hidden", 
+        // The base class carries the mask itself so it is never added or
+        // removed; the modifier only widens the fade. See agent-native.css.
+        "message-scroller-viewport", hasContentAbove && "message-scroller-viewport--top-fade", className), ...props, children: children }));
 }
 function MessageScrollerContent({ className, spacerClassName, ...props }) {
     return (_jsx(ShadcnMessageScroller.Content, { className: cn("flex flex-col", className), spacerClassName: cn("shrink-0", spacerClassName), ...props }));

package/dist/client/i18n.js

@@ -549,7 +549,9 @@ export function LanguagePicker({ className, includeSystem = true, label, variant
                             ? "flex h-8 w-8 items-center justify-center"
                             : variant === "select"
                                 ? "flex h-9 w-full items-center justify-between gap-2 px-3 text-start text-sm"
-                                : null), children: [_jsxs("span", { className: "flex min-w-0 items-center gap-2", children: [_jsx(IconLanguage, { className: "h-4 w-4 shrink-0 text-muted-foreground" }), variant === "select" ? (_jsx("span", { className: "truncate", children: selectedLabel })) : (_jsx("span", { className: "sr-only", children: triggerLabel }))] }), variant === "select" ? (_jsx(IconChevronDown, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground", "aria-hidden": "true" })) : null] }) }), _jsx(PopoverPrimitive.Portal, { children: _jsx(PopoverPrimitive.Content, { align: variant === "select" ? "start" : "end", sideOffset: 6, role: "menu", className: cn("z-[9999] max-h-[min(20rem,var(--radix-popover-content-available-height))] overflow-y-auto rounded-lg border border-border bg-popover p-1 text-popover-foreground shadow-lg outline-none will-change-[transform,opacity] 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-[state=closed]:duration-100 data-[state=open]:duration-150 data-[state=closed]:ease-in data-[state=open]:ease-out data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1", variant === "icon" || variant === "ghost-icon"
+                                : null), children: [_jsxs("span", { className: "flex min-w-0 items-center gap-2", children: [_jsx(IconLanguage, { className: "h-4 w-4 shrink-0 text-muted-foreground" }), variant === "select" ? (_jsx("span", { className: "truncate", children: selectedLabel })) : (_jsx("span", { className: "sr-only", children: triggerLabel }))] }), variant === "select" ? (_jsx(IconChevronDown, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground", "aria-hidden": "true" })) : null] }) }), _jsx(PopoverPrimitive.Portal, { children: _jsx(PopoverPrimitive.Content, { align: variant === "select" ? "start" : "end", sideOffset: 6, role: "menu", className: cn(
+                        // compositing-ok: popover content unmounts on close.
+                        "z-[9999] max-h-[min(20rem,var(--radix-popover-content-available-height))] overflow-y-auto rounded-lg border border-border bg-popover p-1 text-popover-foreground shadow-lg outline-none will-change-[transform,opacity] 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-[state=closed]:duration-100 data-[state=open]:duration-150 data-[state=closed]:ease-in data-[state=open]:ease-out data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1", variant === "icon" || variant === "ghost-icon"
                             ? "min-w-56"
                             : "w-[min(20rem,calc(100vw-2rem))] min-w-[var(--radix-popover-trigger-width)]"), children: options.map((option) => {
                             const optionSelected = option.value === preference;

package/dist/client/progress/RunsTray.js

@@ -9,6 +9,15 @@ import { useChangeVersion } from "../use-change-version.js";
 import { usePollLoop } from "../use-poll-loop.js";
 import { cn } from "../utils.js";
 const RUN_CHANGE_SETTLE_MS = 250;
+/**
+ * Cadence used while a run still reads as active, even for hosts that opted
+ * out of idle polling with `pollMs={0}`. Those hosts only refresh on mount and
+ * on a `runs` change event, and a run abandoned mid-flight (budget exhausted,
+ * dead worker) emits neither — so the spinner has no path back to a terminal
+ * status. Polling only while something looks active keeps the idle cost at
+ * zero and still lets the server's stale sweep terminalize the row.
+ */
+const ACTIVE_RUN_POLL_MS = 5000;
 function useRunsTrayState({ pollMs = 3000, limit = 5, hideWhenIdle = true, showRecent, }) {
     const t = useT();
     const [runs, setRuns] = useState([]);
@@ -39,7 +48,11 @@ function useRunsTrayState({ pollMs = 3000, limit = 5, hideWhenIdle = true, showR
         const timeout = window.setTimeout(() => void refresh(), RUN_CHANGE_SETTLE_MS);
         return () => window.clearTimeout(timeout);
     }, [refresh, runsVersion]);
-    usePollLoop(refresh, { intervalMs: pollMs, enabled: pollMs > 0 });
+    const hasActiveRun = runs.some((run) => run.status === "running");
+    usePollLoop(refresh, {
+        intervalMs: pollMs > 0 ? pollMs : ACTIVE_RUN_POLL_MS,
+        enabled: pollMs > 0 || hasActiveRun,
+    });
     const dismissRun = useCallback(async (runId) => {
         setRuns((current) => current.filter((run) => run.id !== runId));
         try {

package/dist/client/resources/McpConnectionSuggestion.js

@@ -9,8 +9,16 @@ import { buildMcpOAuthStartUrl, findMcpIntegrationForText, getMcpIntegrationApiF
 import { McpIntegrationDialog } from "./McpIntegrationDialog.js";
 import { McpIntegrationLogo } from "./McpIntegrationLogo.js";
 import { useCreateMcpServer, useMcpServers, } from "./use-mcp-servers.js";
+function visibleUserAuthoredText(text) {
+    return text
+        .replace(/<context\b[^>]*>[\s\S]*?<\/context>\n?/gi, "")
+        .replace(/<context\b[^>]*>[\s\S]*$/gi, "")
+        .replace(/<\/context>/gi, "")
+        .trim();
+}
 export function findMcpConnectionSuggestionIntegration({ text, contextText = "", variant = "composer", integrations = getDefaultMcpIntegrations(), }) {
-    return findMcpIntegrationForText(variant === "response" ? contextText : text, integrations);
+    const sourceText = variant === "response" ? contextText : text;
+    return findMcpIntegrationForText(visibleUserAuthoredText(sourceText), integrations);
 }
 export function shouldRenderMcpIntegrationFallback(logoUrl, logoLoadFailed) {
     return !logoUrl || logoLoadFailed;

package/dist/client/sse-event-processor.js

@@ -1291,6 +1291,9 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
                 detail: { ...runError, tabId },
             }));
         }
+        // This event is terminal. There may be no visible text or tool_done after
+        // the last preparation activity, so do not leave its label mounted.
+        dispatchActivityClear(tabId);
         settleInterruptedToolCalls(content, undefined, { includeActivity: true });
         content.push({
             type: "text",
@@ -1386,6 +1389,9 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
             ...(ev.errorCode ? { errorCode: ev.errorCode } : {}),
             ...(ev.recoverable ? { recoverable: ev.recoverable } : {}),
         };
+        // Non-recoverable errors end the turn. Recoverable errors return above as
+        // auto-continue signals and must keep their activity state alive.
+        dispatchActivityClear(tabId);
         if (typeof window !== "undefined") {
             window.dispatchEvent(new CustomEvent("agent-chat:run-error", {
                 detail: { ...runError, tabId },
@@ -1406,6 +1412,10 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
         };
     }
     if (ev.type === "done") {
+        // `done` is authoritative even when the final model chunk contains only
+        // a wrap-up marker. Clear any preparation label before inspecting pending
+        // tools so both success and interrupted-terminal paths settle the UI.
+        dispatchActivityClear(tabId);
         const interruptedTools = pendingToolNames(content);
         const allInterruptedTools = [
             ...interruptedTools.running,

package/dist/client/use-chat-models.js

@@ -6,6 +6,22 @@ import { fetchBuilderStatus, fetchEnvironmentStatus, } from "./client-status-req
 import { callAction } from "./use-action.js";
 const DEFAULT_STORAGE_KEY = "agent-native:chat-models:selection";
 export const CHAT_MODEL_SELECTION_CHANGED_EVENT = "agent-native:chat-model-selection-changed";
+const MODEL_DISCOVERY_RETRY_DELAYS_MS = [250, 1_000];
+async function fetchEngineCatalog() {
+    try {
+        const result = (await callAction("manage-agent-engine", { action: "list" }));
+        if (!result ||
+            typeof result !== "object" ||
+            !("engines" in result) ||
+            !Array.isArray(result.engines)) {
+            return { state: "unavailable" };
+        }
+        return { state: "available", value: result };
+    }
+    catch {
+        return { state: "unavailable" };
+    }
+}
 function readPersisted(key) {
     if (!key || typeof window === "undefined")
         return {};
@@ -50,6 +66,9 @@ export function useChatModels({ storageKey = DEFAULT_STORAGE_KEY, enabled = true
         selectedEngine,
         selectedEffort,
     });
+    const mountedRef = useRef(true);
+    const refreshGenerationRef = useRef(0);
+    const retryTimerRef = useRef(null);
     useEffect(() => {
         selectionRef.current = {
             selectedModel,
@@ -109,98 +128,155 @@ export function useChatModels({ storageKey = DEFAULT_STORAGE_KEY, enabled = true
     const refreshEngines = useCallback(() => {
         if (!enabled)
             return;
+        refreshGenerationRef.current += 1;
+        const refreshGeneration = refreshGenerationRef.current;
+        if (retryTimerRef.current !== null) {
+            clearTimeout(retryTimerRef.current);
+            retryTimerRef.current = null;
+        }
         setIsLoading(true);
-        Promise.all([
-            callAction("manage-agent-engine", { action: "list" }).catch(() => null),
-            fetchEnvironmentStatus(),
-            fetchBuilderStatus(),
-        ])
-            .then(([enginesData, envResult, builderResult]) => {
-            if (!enginesData?.engines) {
-                // Without a catalog the picker keeps an unvalidated DEFAULT_MODEL,
-                // which is indistinguishable from a real selection unless we say so.
-                console.warn("[agent-chat] no engine list; model picker is showing an unvalidated default");
-                return;
-            }
-            if (envResult.state !== "available" ||
-                builderResult.state !== "available") {
+        const isCurrentRefresh = () => mountedRef.current && refreshGenerationRef.current === refreshGeneration;
+        const finish = () => {
+            if (isCurrentRefresh())
+                setIsLoading(false);
+        };
+        function scheduleRetry(attempt) {
+            const delay = MODEL_DISCOVERY_RETRY_DELAYS_MS[attempt];
+            if (delay === undefined || !isCurrentRefresh())
+                return false;
+            retryTimerRef.current = setTimeout(() => {
+                retryTimerRef.current = null;
+                load(attempt + 1);
+            }, delay);
+            return true;
+        }
+        function load(attempt) {
+            if (!isCurrentRefresh())
                 return;
-            }
-            const envKeys = envResult.value;
-            const builderStatus = builderResult.value;
-            const configuredKeys = new Set(envKeys.filter((k) => k.configured).map((k) => k.key));
-            const builderConnected = builderStatus?.configured === true;
-            const currentEngineName = enginesData.current?.engine;
-            const currentModel = enginesData.current?.model;
-            const groups = buildChatModelGroups({
-                engines: enginesData.engines,
-                configuredKeys,
-                builderConnected,
-                currentEngineName,
-                currentModel,
-            });
-            const nextDefaultModel = currentModel ?? DEFAULT_MODEL;
-            setAvailableModels(groups);
-            setDefaultModel(nextDefaultModel);
-            const selection = selectionRef.current;
-            // Default only to a CONFIGURED group, and to nothing when there is
-            // none. `DEFAULT_MODEL` is a builder-gateway id that no group carries
-            // unless Builder is connected, and unconfigured groups are kept in the
-            // list for their connect affordance — so both `?? DEFAULT_MODEL` and
-            // `?? groups[0]` yield a selection the app cannot route, which the
-            // server silently replaces with its own default. An empty selection
-            // hides the picker instead of showing a model that will not be used.
-            const configuredGroups = groups.filter((g) => g.configured);
-            const resolveRoutableSelection = () => {
-                const group = configuredGroups.find((g) => g.models.includes(nextDefaultModel)) ??
-                    configuredGroups[0];
-                if (!group)
-                    return null;
-                const model = group.models.find((m) => m === nextDefaultModel) ?? group.models[0];
-                if (!model)
-                    return null;
-                return {
-                    model,
-                    engine: group.engine,
-                    effort: resolveReasoningEffortSelection(model, selection.selectedEffort),
+            Promise.all([
+                fetchEngineCatalog(),
+                fetchEnvironmentStatus(),
+                fetchBuilderStatus(),
+            ])
+                .then(([engineResult, envResult, builderResult]) => {
+                if (!isCurrentRefresh())
+                    return;
+                if (engineResult.state !== "available" ||
+                    envResult.state !== "available" ||
+                    builderResult.state !== "available") {
+                    if (scheduleRetry(attempt))
+                        return;
+                    if (engineResult.state !== "available") {
+                        // Without a catalog the picker keeps an unvalidated DEFAULT_MODEL,
+                        // which is indistinguishable from a real selection unless we say so.
+                        console.warn("[agent-chat] engine list unavailable; model picker is showing an unvalidated default");
+                    }
+                    finish();
+                    return;
+                }
+                const enginesData = engineResult.value;
+                const envKeys = envResult.value;
+                const builderStatus = builderResult.value;
+                const configuredKeys = new Set(envKeys.filter((k) => k.configured).map((k) => k.key));
+                const builderConnected = builderStatus?.configured === true;
+                const currentEngineName = enginesData.current?.engine;
+                const currentModel = enginesData.current?.model;
+                const groups = buildChatModelGroups({
+                    engines: enginesData.engines,
+                    configuredKeys,
+                    builderConnected,
+                    currentEngineName,
+                    currentModel,
+                });
+                const nextDefaultModel = currentModel ?? DEFAULT_MODEL;
+                setAvailableModels(groups);
+                setDefaultModel(nextDefaultModel);
+                const selection = selectionRef.current;
+                // Default only to a CONFIGURED group, and to nothing when there is
+                // none. `DEFAULT_MODEL` is a builder-gateway id that no group carries
+                // unless Builder is connected, and unconfigured groups are kept in the
+                // list for their connect affordance — so both `?? DEFAULT_MODEL` and
+                // `?? groups[0]` yield a selection the app cannot route, which the
+                // server silently replaces with its own default. An empty selection
+                // hides the picker instead of showing a model that will not be used.
+                const configuredGroups = groups.filter((g) => g.configured);
+                const resolveRoutableSelection = () => {
+                    const group = configuredGroups.find((g) => g.models.includes(nextDefaultModel)) ?? configuredGroups[0];
+                    if (!group)
+                        return null;
+                    const model = group.models.find((m) => m === nextDefaultModel) ??
+                        group.models[0];
+                    if (!model)
+                        return null;
+                    return {
+                        model,
+                        engine: group.engine,
+                        effort: resolveReasoningEffortSelection(model, selection.selectedEffort),
+                    };
+                };
+                const applyFallback = (persist) => {
+                    const next = resolveRoutableSelection();
+                    setSelectedModel(next?.model ?? "");
+                    setSelectedEngine(next?.engine ?? "");
+                    if (next) {
+                        setSelectedEffort(next.effort);
+                        if (persist)
+                            writePersisted(storageKey, next);
+                    }
                 };
-            };
-            const applyFallback = (persist) => {
-                const next = resolveRoutableSelection();
-                setSelectedModel(next?.model ?? "");
-                setSelectedEngine(next?.engine ?? "");
-                if (next) {
-                    setSelectedEffort(next.effort);
-                    if (persist)
-                        writePersisted(storageKey, next);
+                if (!hasExplicitSelectionRef.current) {
+                    applyFallback(false);
+                    finish();
+                    return;
                 }
-            };
-            if (!hasExplicitSelectionRef.current) {
-                applyFallback(false);
-                return;
-            }
-            const selectedGroup = groups.find((group) => group.models.includes(selection.selectedModel) &&
-                (!selection.selectedEngine ||
-                    group.engine === selection.selectedEngine));
-            if (selectedGroup) {
-                // Heal a selection stored without an engine (or with a stale one) so
-                // later submits carry the pair the catalog resolved.
-                if (selection.selectedEngine !== selectedGroup.engine) {
-                    setSelectedEngine(selectedGroup.engine);
+                const selectedGroup = groups.find((group) => group.models.includes(selection.selectedModel) &&
+                    (!selection.selectedEngine ||
+                        group.engine === selection.selectedEngine));
+                if (selectedGroup) {
+                    // Heal a selection stored without an engine (or with a stale one) so
+                    // later submits carry the pair the catalog resolved.
+                    if (selection.selectedEngine !== selectedGroup.engine) {
+                        setSelectedEngine(selectedGroup.engine);
+                    }
+                    finish();
+                    return;
                 }
-                return;
-            }
-            applyFallback(true);
-        })
-            .catch(() => { })
-            .finally(() => setIsLoading(false));
+                applyFallback(true);
+                finish();
+            })
+                .catch(() => {
+                if (!isCurrentRefresh())
+                    return;
+                if (!scheduleRetry(attempt))
+                    finish();
+            });
+        }
+        load(0);
     }, [enabled, storageKey]);
+    useEffect(() => {
+        mountedRef.current = true;
+        return () => {
+            mountedRef.current = false;
+            refreshGenerationRef.current += 1;
+            if (retryTimerRef.current !== null) {
+                clearTimeout(retryTimerRef.current);
+                retryTimerRef.current = null;
+            }
+        };
+    }, []);
     useEffect(() => {
         if (!enabled) {
+            refreshGenerationRef.current += 1;
+            if (retryTimerRef.current !== null) {
+                clearTimeout(retryTimerRef.current);
+                retryTimerRef.current = null;
+            }
             setIsLoading(false);
             return;
         }
         refreshEngines();
+        window.addEventListener("agent-engine:configured-changed", refreshEngines);
+        return () => window.removeEventListener("agent-engine:configured-changed", refreshEngines);
     }, [enabled, refreshEngines]);
     return {
         availableModels,