@agent-native/core 0.149.1 → 0.149.3

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

@@ -3,10 +3,12 @@ import { type ChatHistoryItem, type ChatHistoryListProps } from "../chat/ChatHis
 export interface ChatFirstChatHistoryProps extends Omit<ChatHistoryListProps, "items" | "sections" | "variant"> {
     items: ChatHistoryItem[];
     label?: ReactNode;
+    /** Optional contextual actions for the Chats section header. */
+    headerAction?: ReactNode;
 }
 /**
  * The single chat-list presentation used by the chat-first rail on every
  * host. Hosts still own thread fetching and actions, but row rhythm and the
  * Chats section treatment stay identical.
  */
-export declare function ChatFirstChatHistory({ items, label, className, ...props }: ChatFirstChatHistoryProps): import("react").JSX.Element | null;
+export declare function ChatFirstChatHistory({ items, label, headerAction, className, ...props }: ChatFirstChatHistoryProps): import("react").JSX.Element;

package/dist/client/chat-first/chat-history.js

@@ -5,8 +5,11 @@ import { ChatHistoryList, } from "../chat/ChatHistoryList.js";
  * host. Hosts still own thread fetching and actions, but row rhythm and the
  * Chats section treatment stay identical.
  */
-export function ChatFirstChatHistory({ items, label = "Chats", className, ...props }) {
-    if (items.length === 0)
-        return null;
-    return (_jsxs("section", { "data-chat-first-chat-history": true, className: ["min-h-0 min-w-0", className].filter(Boolean).join(" "), children: [_jsx("p", { className: "mb-1 px-2 text-[11px] font-medium text-sidebar-foreground/50", children: label }), _jsx(ChatHistoryList, { ...props, items: items, variant: "rail", className: "min-w-0" })] }));
+export function ChatFirstChatHistory({ items, label = "Chats", headerAction, className, ...props }) {
+    if (items.length === 0) {
+        return (_jsx("section", { "data-chat-first-chat-history": true, className: ["min-h-0 min-w-0 flex-1", className]
+                .filter(Boolean)
+                .join(" ") }));
+    }
+    return (_jsxs("section", { "data-chat-first-chat-history": true, className: ["min-h-0 min-w-0", className].filter(Boolean).join(" "), children: [_jsxs("div", { "data-chat-first-chat-history-header": true, className: "group mb-1 flex min-h-6 items-center justify-between gap-2 px-2", children: [_jsx("p", { className: "min-w-0 text-[11px] font-medium text-sidebar-foreground/50", children: label }), headerAction ? (_jsx("div", { className: "shrink-0 opacity-0 transition-opacity duration-100 group-hover:opacity-100 group-focus-within:opacity-100", children: headerAction })) : null] }), _jsx(ChatHistoryList, { ...props, items: items, variant: "rail", className: "min-w-0" })] }));
 }

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

@@ -1,7 +1,7 @@
 import type { ReactNode } from "react";
 import { type ChatFirstSurfaceTab } from "../chat-first.js";
 import type { ChatFirstSurfaceTabsProps } from "./types.js";
-export declare function ChatFirstSurfaceTabs({ tabs, activeTabId, onActivate, onClose, onCloseOthers, onCloseToRight, onCloseAll, onOpenSurface, copy, }: ChatFirstSurfaceTabsProps): import("react").JSX.Element;
+export declare function ChatFirstSurfaceTabs({ tabs, activeTabId, onActivate, onClose, onCloseOthers, onCloseToRight, onCloseAll, onOpenSurface, apps, onOpenApp, renderAppIcon, copy, }: ChatFirstSurfaceTabsProps): import("react").JSX.Element;
 export declare function ChatFirstSurfaceContent({ tabs, activeTabId, renderTab, }: {
     tabs: readonly ChatFirstSurfaceTab[];
     activeTabId: string | null;

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/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.d.ts

@@ -196,6 +196,8 @@ export interface SSEStreamOptions {
     noProgressTimeoutMs?: number;
     /** Reader-local counterpart to `noProgressTimeoutMs` for action preparation. */
     actionPreparationStallTimeoutMs?: number;
+    /** Mark the adapter's final `done` snapshot terminal before it is yielded. */
+    markTerminalResults?: boolean;
     /**
      * Optional caller-owned preparation watchdog state. Passing the same object
      * across reconnect reads keeps a stuck action preparation from getting a
@@ -261,7 +263,7 @@ export declare function processEvent(ev: SSEEvent, content: ContentPart[], toolC
  */
 export declare function readSSEStream(body: ReadableStream<Uint8Array>, content: ContentPart[], toolCallCounter: {
     value: number;
-}, tabId: string | undefined, onSeq?: (seq: number) => void, runId?: string | null, options?: SSEStreamOptions): AsyncGenerator<ChatModelRunResult>;
+}, tabId: string | undefined, onSeq?: (seq: number, isProgress?: boolean) => void, runId?: string | null, options?: SSEStreamOptions): AsyncGenerator<ChatModelRunResult>;
 /**
  * Read raw SSE events from a ReadableStream and process them into ContentPart[].
  * Unlike readSSEStream, this doesn't yield ChatModelRunResult — it updates the
@@ -270,5 +272,5 @@ export declare function readSSEStream(body: ReadableStream<Uint8Array>, content:
  */
 export declare function readSSEStreamRaw(body: ReadableStream<Uint8Array>, content: ContentPart[], toolCallCounter: {
     value: number;
-}, tabId: string | undefined, onUpdate: (content: ContentPart[]) => void, onSeq?: (seq: number) => void, options?: SSEStreamOptions): Promise<void>;
+}, tabId: string | undefined, onUpdate: (content: ContentPart[]) => void, onSeq?: (seq: number, isProgress?: boolean) => void, options?: SSEStreamOptions): Promise<void>;
 export {};

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

@@ -154,6 +154,20 @@ function isMeaningfulProgressEvent(ev, actionPreparationProgress, options) {
     }
     return true;
 }
+/**
+ * The browser's durable liveness cursor must mirror the server's
+ * `last_progress_at` predicate. The stream watchdog intentionally has a
+ * broader background policy, so it cannot be reused for this cursor: raw
+ * keepalives and repeated zero-byte preparation are not proof of real work.
+ */
+function isDurableProgressEvent(ev, actionPreparationProgress) {
+    if (ev.type === "stream_keepalive" || ev.type === "clear")
+        return false;
+    if (ev.type === "activity" && isPreparingActionActivity(ev)) {
+        return actionPreparationProgress === true;
+    }
+    return true;
+}
 function baseActivityLabel(ev, tool) {
     return humanizeToolLabelText(ev.label ?? "Working", tool);
 }
@@ -1291,6 +1305,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 +1403,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 +1426,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,
@@ -1593,13 +1617,15 @@ export async function* readSSEStream(body, content, toolCallCounter, tabId, onSe
                 const now = Date.now();
                 inFlightWork = Math.max(0, inFlightWork + sseInFlightWorkDelta(ev));
                 const actionPreparationProgress = updatePreparingActionState(preparingActionState, ev, now);
-                if (isMeaningfulProgressEvent(ev, actionPreparationProgress, options)) {
+                const meaningfulProgress = isMeaningfulProgressEvent(ev, actionPreparationProgress, options);
+                const durableProgress = isDurableProgressEvent(ev, actionPreparationProgress);
+                if (meaningfulProgress) {
                     sawProgressEvent = true;
                     lastMeaningfulEventAt = now;
                 }
                 // Track sequence number for reconnection
                 if (ev.seq !== undefined && onSeq) {
-                    onSeq(ev.seq);
+                    onSeq(ev.seq, durableProgress);
                 }
                 if (ev.type === "clear") {
                     activityTrail.length = 0;
@@ -1627,9 +1653,21 @@ export async function* readSSEStream(body, content, toolCallCounter, tabId, onSe
                     }
                 }
                 const { action, result, autoContinue } = processEvent(ev, content, toolCallCounter, tabId, processEventState);
-                if (result) {
+                const terminalResult = result &&
+                    options?.markTerminalResults === true &&
+                    action === "done" &&
+                    result.status == null
+                    ? {
+                        ...result,
+                        status: {
+                            type: "complete",
+                            reason: "stop",
+                        },
+                    }
+                    : result;
+                if (terminalResult) {
                     await paceRenderUpdate();
-                    yield withStreamMetadata(result);
+                    yield withStreamMetadata(terminalResult);
                 }
                 if (hasStalledPreparingAction(preparingActionState, Date.now(), preparationStallTimeoutMs)) {
                     throw new AgentAutoContinueSignal({
@@ -1747,12 +1785,14 @@ export async function readSSEStreamRaw(body, content, toolCallCounter, tabId, on
                 const now = Date.now();
                 inFlightWork = Math.max(0, inFlightWork + sseInFlightWorkDelta(ev));
                 const actionPreparationProgress = updatePreparingActionState(preparingActionState, ev, now);
-                if (isMeaningfulProgressEvent(ev, actionPreparationProgress, options)) {
+                const meaningfulProgress = isMeaningfulProgressEvent(ev, actionPreparationProgress, options);
+                const durableProgress = isDurableProgressEvent(ev, actionPreparationProgress);
+                if (meaningfulProgress) {
                     sawProgressEvent = true;
                     lastMeaningfulEventAt = now;
                 }
                 if (ev.seq !== undefined && onSeq) {
-                    onSeq(ev.seq);
+                    onSeq(ev.seq, durableProgress);
                 }
                 if (ev.type === "clear") {
                     activityTrail.length = 0;