@agent-native/core 0.176.1 → 0.176.2-nightly-20260831184159

package/dist/client/chat/run-recovery.js

@@ -9,6 +9,7 @@ import { agentNativePath } from "../api-path.js";
 import { writeClipboardText } from "../clipboard.js";
 import { isProviderAuthenticationError, localizeKnownChatErrorText, } from "../error-format.js";
 import { useFormatters, useT } from "../i18n.js";
+import { BuilderConnectPopover } from "../settings/BuilderConnectPopover.js";
 import { AgentProviderSetupForm } from "../settings/ProviderSetupForm.js";
 import { useBuilderConnectFlow } from "../settings/useBuilderStatus.js";
 import { cn } from "../utils.js";
@@ -78,7 +79,7 @@ export function getRequestModeMetadata(message) {
     return requestMode === "act" || requestMode === "plan" ? requestMode : null;
 }
 // ─── Run error classifiers ────────────────────────────────────────────────────
-function isBuilderReconnectRunError(info) {
+export function isBuilderReconnectRunError(info) {
     const code = (info.errorCode ?? "").toLowerCase();
     const message = info.message.toLowerCase();
     const isAuthCode = code === "authentication_error" ||
@@ -136,17 +137,19 @@ function isDesktopChatRelayRunError(info) {
 // session. See packages/desktop-app/src/main/index.ts.
 export function BuilderConnectCta({ variant = "primary", onConnected, }) {
     const t = useT();
-    const { configured, orgName, connecting, error, start } = useBuilderConnectFlow({
+    const flow = useBuilderConnectFlow({
+        provisionAccount: true,
         trackingSource: "assistant_chat_builder_cta",
         onConnected,
     });
+    const { configured, orgName, connecting, error } = flow;
     if (variant === "compact") {
         if (configured) {
             return (_jsxs("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", children: [_jsx(IconCheck, { size: 11, className: "text-emerald-500" }), orgName
                         ? t("agentChat.setup.connectedTo", { organization: orgName })
                         : t("agentChat.setup.connected")] }));
         }
-        return (_jsxs("div", { className: "agent-builder-setup-card__builder-cta flex min-w-0 flex-col items-start gap-1 sm:items-end", children: [_jsx("button", { type: "button", onClick: () => start(), disabled: connecting, 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, children: connecting ? (_jsxs(_Fragment, { children: [_jsx(IconLoader2, { size: 10, className: "animate-spin" }), t("agentChat.common.waiting")] })) : (t("agentChat.setup.connectBuilder")) }), error && (_jsx("p", { className: "max-w-[13rem] text-[10px] leading-snug text-destructive sm:text-end", children: error }))] }));
+        return (_jsxs("div", { className: "agent-builder-setup-card__builder-cta flex min-w-0 flex-col items-start gap-1 sm:items-end", children: [_jsx(BuilderConnectPopover, { flow: flow, children: _jsx("button", { type: "button", disabled: connecting, 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, children: connecting ? (_jsxs(_Fragment, { children: [_jsx(IconLoader2, { size: 10, className: "animate-spin" }), t("agentChat.common.waiting")] })) : (t("agentChat.setup.connectBuilder")) }) }), error && (_jsx("p", { className: "max-w-[13rem] text-[10px] leading-snug text-destructive sm:text-end", children: error }))] }));
     }
     const containerClass = "flex items-center gap-3 rounded-md border border-border px-3 py-3";
     if (configured) {
@@ -156,7 +159,7 @@ export function BuilderConnectCta({ variant = "primary", onConnected, }) {
                                 })
                                 : t("agentChat.setup.connected") })] }), _jsxs("span", { className: "ms-auto inline-flex items-center gap-1 shrink-0 rounded-md bg-emerald-500/10 px-2 py-0.5 text-[10px] font-medium text-emerald-500", children: [_jsx(IconCheck, { size: 10 }), t("agentChat.setup.connected")] })] }));
     }
-    return (_jsxs("div", { className: containerClass, children: [_jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "text-xs font-medium text-foreground", children: t("agentChat.setup.connectBuilder") }), _jsx("p", { className: "text-[11px] text-muted-foreground mt-0.5 max-w-[220px]", children: t("agentChat.setup.freeCredits") }), error && _jsx("p", { className: "mt-1 text-[10px] text-destructive", children: error })] }), _jsx("button", { type: "button", onClick: () => start(), disabled: connecting, className: "ms-auto inline-flex items-center gap-1 shrink-0 rounded-md bg-foreground px-3 py-1.5 text-[11px] font-medium no-underline text-background hover:opacity-90 disabled:opacity-60 disabled:cursor-wait", "aria-busy": connecting, children: connecting ? (_jsxs(_Fragment, { children: [_jsx(IconLoader2, { size: 10, className: "animate-spin" }), t("agentChat.common.waiting")] })) : (t("agentChat.common.connect")) })] }));
+    return (_jsxs("div", { className: containerClass, children: [_jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "text-xs font-medium text-foreground", children: t("agentChat.setup.connectBuilder") }), _jsx("p", { className: "text-[11px] text-muted-foreground mt-0.5 max-w-[220px]", children: t("agentChat.setup.freeCredits") }), error && _jsx("p", { className: "mt-1 text-[10px] text-destructive", children: error })] }), _jsx(BuilderConnectPopover, { flow: flow, children: _jsx("button", { type: "button", disabled: connecting, className: "ms-auto inline-flex items-center gap-1 shrink-0 rounded-md bg-foreground px-3 py-1.5 text-[11px] font-medium no-underline text-background hover:opacity-90 disabled:opacity-60 disabled:cursor-wait", "aria-busy": connecting, children: connecting ? (_jsxs(_Fragment, { children: [_jsx(IconLoader2, { size: 10, className: "animate-spin" }), t("agentChat.common.waiting")] })) : (t("agentChat.common.connect")) }) })] }));
 }
 // ─── ApiKeyConnect ────────────────────────────────────────────────────────────
 export function ApiKeyConnect({ onConnected }) {
@@ -176,8 +179,18 @@ export function BuilderSetupContent({ onConnected, layout = "default", }) {
                                     defaultValue: "Custom keys",
                                 }) })] })] }), keyOpen ? (_jsx("div", { className: "mt-3", children: _jsx(ApiKeyConnect, { onConnected: onConnected }) })) : null] }));
 }
-export function BuilderSetupCard({ onConnected, bouncePulse, attached = false, fullWidth, layout = "default", }) {
+export function BuilderSetupCard({ onConnected, onDismiss, onRetry, bouncePulse, attached = false, fullWidth, layout = "default", }) {
     const sidebarLayout = layout === "sidebar";
+    const t = useT();
+    const retryRequestedRef = useRef(false);
+    const [retryRequested, setRetryRequested] = useState(false);
+    const handleRetry = useCallback(() => {
+        if (!onRetry || retryRequestedRef.current)
+            return;
+        retryRequestedRef.current = true;
+        setRetryRequested(true);
+        onRetry();
+    }, [onRetry]);
     const cardRef = useRef(null);
     // Replay the bounce keyframe each time bouncePulse increments. Toggling the
     // class off-then-on (with a forced reflow) restarts the animation even when
@@ -192,11 +205,11 @@ export function BuilderSetupCard({ onConnected, bouncePulse, attached = false, f
         void el.offsetWidth;
         el.classList.add("animate-bounce-once");
     }, [bouncePulse]);
-    return (_jsx("div", { ref: cardRef, className: cn("agent-builder-setup-card", sidebarLayout && "agent-builder-setup-card--sidebar", attached && "agent-builder-setup-card--attached", fullWidth
+    return (_jsxs("div", { ref: cardRef, className: cn("agent-builder-setup-card", sidebarLayout && "agent-builder-setup-card--sidebar", attached && "agent-builder-setup-card--attached", fullWidth
             ? "w-full px-3 pb-2"
             : sidebarLayout
                 ? "mx-auto w-full max-w-[42rem] px-3 pb-2"
-                : "mx-auto w-full max-w-[42rem] px-3 pb-2 sm:w-fit"), children: _jsx("div", { className: cn("agent-builder-setup-card__panel rounded-lg border border-border/80 bg-background/80 shadow-sm backdrop-blur", sidebarLayout ? "p-2.5" : "p-3"), children: _jsx(BuilderSetupContent, { onConnected: onConnected, layout: layout }) }) }));
+                : "mx-auto w-full max-w-[42rem] px-3 pb-2 sm:w-fit"), children: [_jsx("div", { className: cn("agent-builder-setup-card__panel rounded-lg border border-border/80 bg-background/80 shadow-sm backdrop-blur", sidebarLayout ? "p-2.5" : "p-3"), children: onDismiss ? (_jsxs("div", { className: "flex items-start gap-2", children: [_jsx("div", { className: "min-w-0 flex-1", children: _jsx(BuilderSetupContent, { onConnected: onConnected, layout: layout }) }), _jsx("button", { type: "button", onClick: onDismiss, "aria-label": t("agentChat.common.dismiss"), className: "flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground", children: _jsx(IconX, { size: 14 }) })] })) : (_jsx(BuilderSetupContent, { onConnected: onConnected, layout: layout })) }), onRetry ? (_jsx("div", { className: "flex justify-center px-3 pt-1", children: _jsxs("button", { type: "button", onClick: handleRetry, disabled: retryRequested, className: "inline-flex h-8 items-center gap-1.5 rounded-md bg-foreground px-3 text-xs font-medium text-background hover:opacity-90 disabled:cursor-wait disabled:opacity-60", children: [_jsx(IconRefresh, { size: 13 }), t("agentChat.common.retry")] }) })) : null] }));
 }
 // ─── RunErrorRecoveryCard ─────────────────────────────────────────────────────
 export function RunErrorRecoveryCard({ info, onContinue, onRetry, onFork, onDismiss, onProviderConnected, }) {
@@ -208,12 +221,15 @@ export function RunErrorRecoveryCard({ info, onContinue, onRetry, onFork, onDism
     const retryRequestedRef = useRef(false);
     const [retryRequested, setRetryRequested] = useState(false);
     const builderReconnect = useBuilderConnectFlow({
+        provisionAccount: true,
         trackingSource: "assistant_chat_reconnect_error",
     });
     const canRecover = info.recoverable === true;
     const shouldShowBuilderReconnect = isBuilderReconnectRunError(info);
-    const shouldShowProviderSetup = isMissingLlmProviderRunError(info) || isDesktopChatRelayRunError(info);
     const isProviderAuthError = isProviderAuthenticationError([info.message, info.details].filter(Boolean).join("\n"), info.errorCode);
+    const shouldShowProviderSetup = isMissingLlmProviderRunError(info) ||
+        isDesktopChatRelayRunError(info) ||
+        (isProviderAuthError && !shouldShowBuilderReconnect);
     // Blocked on something the reader goes and fixes elsewhere, then comes back
     // to. Recoverable runs and email verification keep a retry path; rejected
     // provider credentials use the setup flow below so the same bad key is not
@@ -300,14 +316,16 @@ export function RunErrorRecoveryCard({ info, onContinue, onRetry, onFork, onDism
         }
     }, [builderReconnectResolved, onDismiss]);
     if (shouldShowProviderSetup) {
-        return (_jsxs("div", { className: "w-full", children: [_jsx(BuilderSetupCard, { fullWidth: true, layout: "sidebar", onConnected: handleMissingProviderConnected }), _jsx("div", { className: "flex justify-center px-3 pt-1", children: _jsxs("button", { type: "button", onClick: handleMissingProviderRetry, disabled: retryRequested, className: "inline-flex h-8 items-center gap-1.5 rounded-md bg-foreground px-3 text-xs font-medium text-background hover:opacity-90 disabled:cursor-wait disabled:opacity-60", children: [_jsx(IconRefresh, { size: 13 }), t("agentChat.common.retry")] }) })] }));
+        return (_jsxs("div", { className: "w-full", children: [_jsx(BuilderSetupCard, { fullWidth: true, layout: "sidebar", onConnected: isProviderAuthError
+                        ? handleProviderConnected
+                        : handleMissingProviderConnected }), _jsx("div", { className: "flex justify-center px-3 pt-1", children: _jsxs("button", { type: "button", onClick: handleMissingProviderRetry, disabled: retryRequested, className: "inline-flex h-8 items-center gap-1.5 rounded-md bg-foreground px-3 text-xs font-medium text-background hover:opacity-90 disabled:cursor-wait disabled:opacity-60", children: [_jsx(IconRefresh, { size: 13 }), t("agentChat.common.retry")] }) })] }));
     }
     return (_jsxs("div", { className: "rounded-lg border border-amber-500/25 bg-amber-500/[0.06] p-3 text-sm", children: [_jsxs("div", { className: "flex items-start gap-2", children: [_jsx("span", { className: "mt-0.5 flex h-6 w-6 shrink-0 items-center justify-center rounded-md bg-amber-500/10 text-amber-700 dark:text-amber-300", children: _jsx(IconAlertTriangle, { size: 14 }) }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "font-medium text-foreground", children: runErrorHeadline(info, {
                                     recoverable: t("agentChat.error.stopped"),
                                     terminal: t("agentChat.error.failed"),
-                                }) }), _jsx("p", { className: "mt-1 text-xs leading-relaxed text-muted-foreground", children: localizeKnownChatErrorText(info.message, t) }), isProviderAuthError && (_jsx("div", { className: "mt-3 rounded-md border border-border/70 bg-background/60 p-2.5", children: _jsx(BuilderSetupContent, { layout: "sidebar", onConnected: handleProviderConnected }) })), shouldShowBuilderReconnect && !builderReconnectResolved && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-muted-foreground", children: t("agentChat.recovery.credentialRejected") })), isConnectionRecoveryError && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-muted-foreground", children: t("agentChat.recovery.newChatHint") })), (info.runId || info.errorCode || info.details) && (_jsxs("button", { type: "button", onClick: () => setDetailsOpen((v) => !v), className: "mt-2 inline-flex items-center gap-1 text-[11px] font-medium text-muted-foreground hover:text-foreground", children: [_jsx(IconChevronDown, { size: 12, className: cn("transition-transform", detailsOpen && "rotate-180") }), t("agentChat.common.details")] })), detailsOpen && (_jsxs("div", { className: "mt-2 rounded-md border border-border/60 bg-background/70 p-2 font-mono text-[11px] leading-relaxed text-muted-foreground", children: [info.runId && _jsxs("div", { children: ["run: ", info.runId] }), info.errorCode && _jsxs("div", { children: ["code: ", info.errorCode] }), info.details && (_jsx("pre", { className: "mt-2 max-h-28 overflow-auto whitespace-pre-wrap break-words font-mono", children: info.details }))] }))] }), _jsx("button", { type: "button", onClick: onDismiss, "aria-label": t("agentChat.common.dismiss"), className: "flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-background/80 hover:text-foreground", children: _jsx(IconX, { size: 14 }) })] }), _jsxs("div", { className: "mt-3 flex min-w-0 items-center gap-2", children: [shouldShowBuilderReconnect && !builderReconnectResolved && (_jsxs("button", { type: "button", onClick: () => builderReconnect.start(), disabled: builderReconnect.connecting, className: "inline-flex h-8 items-center gap-1.5 rounded-md bg-foreground px-3 text-xs font-medium text-background hover:opacity-90 disabled:cursor-wait disabled:opacity-70", children: [builderReconnect.connecting ? (_jsx(IconLoader2, { size: 13, className: "animate-spin" })) : null, builderReconnect.connecting
-                                ? t("agentChat.recovery.connectingBuilder")
-                                : t("agentChat.recovery.reconnectBuilder")] })), canRecover && (_jsxs("button", { type: "button", onClick: onContinue, className: "inline-flex min-w-0 flex-1 items-center justify-center gap-1.5 rounded-md bg-foreground px-3 py-2 text-xs font-medium text-background hover:opacity-90", children: [_jsx(IconPlayerPlay, { size: 13 }), _jsx("span", { className: "truncate", children: t("agentChat.common.continue") })] })), _jsxs("div", { className: "flex shrink-0 items-center gap-0.5", children: [canRetry && (_jsx("button", { type: "button", onClick: onRetry, title: isQueryError
+                                }) }), _jsx("p", { className: "mt-1 text-xs leading-relaxed text-muted-foreground", children: localizeKnownChatErrorText(info.message, t) }), shouldShowBuilderReconnect && !builderReconnectResolved && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-muted-foreground", children: t("agentChat.recovery.credentialRejected") })), isConnectionRecoveryError && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-muted-foreground", children: t("agentChat.recovery.newChatHint") })), (info.runId || info.errorCode || info.details) && (_jsxs("button", { type: "button", onClick: () => setDetailsOpen((v) => !v), className: "mt-2 inline-flex items-center gap-1 text-[11px] font-medium text-muted-foreground hover:text-foreground", children: [_jsx(IconChevronDown, { size: 12, className: cn("transition-transform", detailsOpen && "rotate-180") }), t("agentChat.common.details")] })), detailsOpen && (_jsxs("div", { className: "mt-2 rounded-md border border-border/60 bg-background/70 p-2 font-mono text-[11px] leading-relaxed text-muted-foreground", children: [info.runId && _jsxs("div", { children: ["run: ", info.runId] }), info.errorCode && _jsxs("div", { children: ["code: ", info.errorCode] }), info.details && (_jsx("pre", { className: "mt-2 max-h-28 overflow-auto whitespace-pre-wrap break-words font-mono", children: info.details }))] }))] }), _jsx("button", { type: "button", onClick: onDismiss, "aria-label": t("agentChat.common.dismiss"), className: "flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-background/80 hover:text-foreground", children: _jsx(IconX, { size: 14 }) })] }), _jsxs("div", { className: "mt-3 flex min-w-0 items-center gap-2", children: [shouldShowBuilderReconnect && !builderReconnectResolved && (_jsx(BuilderConnectPopover, { flow: builderReconnect, children: _jsxs("button", { type: "button", disabled: builderReconnect.connecting, className: "inline-flex h-8 items-center gap-1.5 rounded-md bg-foreground px-3 text-xs font-medium text-background hover:opacity-90 disabled:cursor-wait disabled:opacity-70", children: [builderReconnect.connecting ? (_jsx(IconLoader2, { size: 13, className: "animate-spin" })) : null, builderReconnect.connecting
+                                    ? t("agentChat.recovery.connectingBuilder")
+                                    : t("agentChat.recovery.reconnectBuilder")] }) })), canRecover && (_jsxs("button", { type: "button", onClick: onContinue, className: "inline-flex min-w-0 flex-1 items-center justify-center gap-1.5 rounded-md bg-foreground px-3 py-2 text-xs font-medium text-background hover:opacity-90", children: [_jsx(IconPlayerPlay, { size: 13 }), _jsx("span", { className: "truncate", children: t("agentChat.common.continue") })] })), _jsxs("div", { className: "flex shrink-0 items-center gap-0.5", children: [canRetry && (_jsx("button", { type: "button", onClick: onRetry, title: isQueryError
                                     ? t("agentChat.recovery.diagnoseRetry")
                                     : t("agentChat.common.retry"), "aria-label": isQueryError
                                     ? t("agentChat.recovery.diagnoseRetry")

package/dist/client/chat/tool-call-display.d.ts

@@ -64,7 +64,7 @@ export declare function toolCallHasPendingApproval(part: {
         dismissed?: boolean;
     } | null;
 }): boolean;
-export declare const TOOL_LONG_RUNNING_HINT_DELAY_MS = 45000;
+export declare const TOOL_LONG_RUNNING_HINT_DELAY_MS: number;
 export declare function ToolActivityPresentation({ toolName, isRunning, toolCallId, suppressLongRunningHint, children, }: {
     toolName: string;
     isRunning: boolean;
@@ -160,8 +160,10 @@ export declare function formatWorkedDuration(ms: number, options?: {
     second?: string;
 }): string;
 export declare function useLocalizedWorkedDuration(): (ms: number) => string;
-export declare function WorkedForSummary({ durationMs, defaultOpen, autoCollapse, children, }: {
+export declare function WorkedForSummary({ durationMs, isRunning, defaultOpen, autoCollapse, children, }: {
     durationMs?: number | null;
+    /** Show a live work label while the owning assistant turn streams. */
+    isRunning?: boolean;
     /** Keep completed work visible when the turn contains interactive UI. */
     defaultOpen?: boolean;
     /** When true, close the summary after a run has completed. */

package/dist/client/chat/tool-call-display.js

@@ -1,5 +1,8 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { IconLoader2, IconAlertTriangle, IconCircleX, IconCheck, IconChevronDown, IconChevronRight, IconCopy, IconCode, IconBrandSlack, IconTerminal2, IconDatabase, IconSearch, IconFileCode, IconShieldCheck, IconX, } from "@tabler/icons-react";
+// Owns: tool-payload formatting helpers, ToolCallDisplay, ToolCallFallback,
+// and ReconnectStreamMessage used by AssistantChat.
+import { CubeLoader } from "@agent-native/toolkit/ui/cube-loader";
+import { IconAlertTriangle, IconCircleX, IconCheck, IconChevronDown, IconChevronRight, IconCopy, IconCode, IconBrandSlack, IconTerminal2, IconDatabase, IconSearch, IconFileCode, IconShieldCheck, IconX, } from "@tabler/icons-react";
 import React, { useState, useEffect, useCallback, useLayoutEffect, useRef, } from "react";
 import { formatAgentChatContextItemsForPrompt } from "../agent-chat.js";
 import { AgentTaskCard } from "../AgentTaskCard.js";
@@ -43,7 +46,7 @@ export function toolCallHasPendingApproval(part) {
         approval.approvalKey.length > 0 &&
         approval.dismissed !== true);
 }
-export const TOOL_LONG_RUNNING_HINT_DELAY_MS = 45_000;
+export const TOOL_LONG_RUNNING_HINT_DELAY_MS = 5 * 60_000;
 export function ToolActivityPresentation({ toolName, isRunning, toolCallId, suppressLongRunningHint = false, children, }) {
     const t = useT();
     const [showLongRunningHint, setShowLongRunningHint] = useState(false);
@@ -454,7 +457,7 @@ function ToolCallDisplayGeneric({ toolName, toolCallId, argsText, args, result,
                 ? structuredMeta.agentDurationMs
                 : agentActivity?.durationMs }));
     }
-    return (_jsxs("div", { className: "group/tool my-0.5 w-full overflow-hidden", children: [mcpApp && !(suppressInlineOpenApp && toolName === "open_app") && (_jsx(McpAppRenderer, { app: mcpApp, className: "mb-1.5" })), _jsxs("button", { type: "button", onClick: () => canExpand && setExpanded(!isExpanded), "aria-expanded": canExpand ? isExpanded : undefined, className: cn("flex w-full items-center gap-1.5 rounded-md py-0.5 text-left text-[13px] text-muted-foreground transition-colors", canExpand && "hover:text-foreground", isRunning && "text-muted-foreground"), children: [_jsx("span", { className: "relative flex size-4 shrink-0 items-center justify-center", children: isRunning ? (_jsx(IconLoader2, { className: "size-3.5 animate-spin" })) : isAgentError ? (_jsx(IconCircleX, { className: "size-3.5 text-destructive" })) : isUnknownOutcome ? (_jsx(IconAlertTriangle, { className: "size-3.5 text-muted-foreground" })) : (_jsxs(_Fragment, { children: [_jsx(ToolIcon, { className: cn("size-3.5 transition-opacity", canExpand && "group-hover/tool:opacity-0") }), canExpand && (_jsx(IconChevronRight, { className: cn("absolute size-3.5 opacity-0 transition-[opacity,transform] group-hover/tool:opacity-100", isExpanded && "rotate-90") }))] })) }), _jsx("span", { className: cn("min-w-0 truncate font-normal", isActiveTail && "agent-running-shimmer"), children: displayName }), repeatCount && repeatCount > 1 && (_jsxs("span", { className: "shrink-0 rounded border border-border/60 px-1.5 py-0.5 text-[10px] leading-none text-muted-foreground", title: t("agentChat.tool.repeated", { count: repeatCount }), children: [repeatCount, "x"] }))] }), _jsx(AnimatedCollapse, { open: isExpanded && !isAgentCall && (hasArgs || result !== undefined), children: _jsxs("div", { className: "mt-1 space-y-2 pl-5", children: [inputPayload && (_jsx(SimpleCodeViewer, { text: inputPayload.text, lang: inputPayload.lang })), resultPayload && (_jsx(ToolOutputPopover, { open: outputOpen, onOpenChange: setOutputOpen, title: outputTitle, payload: resultPayload, children: _jsx("button", { type: "button", "aria-label": t("agentChat.tool.viewOutput", {
+    return (_jsxs("div", { className: "group/tool my-0.5 w-full overflow-hidden", children: [mcpApp && !(suppressInlineOpenApp && toolName === "open_app") && (_jsx(McpAppRenderer, { app: mcpApp, className: "mb-1.5" })), _jsxs("button", { type: "button", onClick: () => canExpand && setExpanded(!isExpanded), "aria-expanded": canExpand ? isExpanded : undefined, className: cn("flex w-full items-center gap-2 rounded-md py-0.5 text-left text-[13px] text-muted-foreground transition-colors", canExpand && "hover:text-foreground", isRunning && "text-muted-foreground"), children: [_jsx("span", { className: "relative flex size-4 shrink-0 items-center justify-center", children: isRunning ? (_jsx(CubeLoader, { "aria-hidden": "true", className: "size-3.5" })) : isAgentError ? (_jsx(IconCircleX, { className: "size-3.5 text-destructive" })) : isUnknownOutcome ? (_jsx(IconAlertTriangle, { className: "size-3.5 text-muted-foreground" })) : (_jsxs(_Fragment, { children: [_jsx(ToolIcon, { className: cn("size-3.5 transition-opacity", canExpand && "group-hover/tool:opacity-0") }), canExpand && (_jsx(IconChevronRight, { className: cn("absolute size-3.5 opacity-0 transition-[opacity,transform] group-hover/tool:opacity-100", isExpanded && "rotate-90") }))] })) }), _jsx("span", { className: cn("min-w-0 truncate font-normal", isActiveTail && "agent-running-shimmer"), children: displayName }), repeatCount && repeatCount > 1 && (_jsxs("span", { className: "shrink-0 rounded border border-border/60 px-1.5 py-0.5 text-[10px] leading-none text-muted-foreground", title: t("agentChat.tool.repeated", { count: repeatCount }), children: [repeatCount, "x"] }))] }), _jsx(AnimatedCollapse, { open: isExpanded && !isAgentCall && (hasArgs || result !== undefined), children: _jsxs("div", { className: "mt-1 space-y-2 pl-5", children: [inputPayload && (_jsx(SimpleCodeViewer, { text: inputPayload.text, lang: inputPayload.lang })), resultPayload && (_jsx(ToolOutputPopover, { open: outputOpen, onOpenChange: setOutputOpen, title: outputTitle, payload: resultPayload, children: _jsx("button", { type: "button", "aria-label": t("agentChat.tool.viewOutput", {
                                     tool: toolName,
                                 }), className: "inline-flex size-6 items-center justify-center rounded-md text-muted-foreground/70 transition-colors hover:bg-accent hover:text-foreground", children: _jsx(IconCode, { className: "size-3.5" }) }) }))] }) }), isUnknownOutcome && (_jsx("p", { role: "status", className: "ps-5 text-xs text-muted-foreground", children: t("agentChat.tool.interrupted") })), approval && (_jsx(ApprovalAffordance
             // A changed `askId` means the server re-emitted approval_required
@@ -508,13 +511,13 @@ function AgentCallCell({ agentName, activity, progress, responseText, isRunning,
             .filter(Boolean)
             .join(" · ")
         : null;
-    return (_jsxs("div", { className: "group/tool my-0.5 w-full", children: [_jsxs("button", { type: "button", onClick: () => setOpen((value) => !value), "aria-expanded": open, className: "flex w-full items-center gap-1.5 rounded-md py-0.5 text-left text-[13px] text-muted-foreground transition-colors hover:text-foreground", children: [isRunning ? (_jsx(IconLoader2, { className: "size-3.5 animate-spin" })) : isError ? (_jsx(IconCircleX, { className: "size-3.5 text-destructive" })) : (_jsx(IconChevronRight, { className: cn("size-3.5 transition-transform", open && "rotate-90") })), _jsx("span", { className: cn("min-w-0 truncate font-normal", isRunning && "agent-running-shimmer"), children: label })] }), _jsx(AnimatedCollapse, { open: open, children: _jsxs("div", { className: "ms-1 border-s border-border/50 ps-2 pt-1", children: [workContent &&
+    return (_jsxs("div", { className: "group/tool my-0.5 w-full", children: [_jsxs("button", { type: "button", onClick: () => setOpen((value) => !value), "aria-expanded": open, className: "flex w-full items-center gap-2 rounded-md py-0.5 text-left text-[13px] text-muted-foreground transition-colors hover:text-foreground", children: [isRunning ? (_jsx(CubeLoader, { "aria-hidden": "true", className: "size-3.5" })) : isError ? (_jsx(IconCircleX, { className: "size-3.5 text-destructive" })) : (_jsx(IconChevronRight, { className: cn("size-3.5 transition-transform", open && "rotate-90") })), _jsx("span", { className: cn("min-w-0 truncate font-normal", isRunning && "agent-running-shimmer"), children: label })] }), _jsx(AnimatedCollapse, { open: open, children: _jsxs("div", { className: "ms-1 border-s border-border/50 ps-2 pt-1", children: [workContent &&
                             (isRunning ? (workContent) : (_jsx(WorkedForSummary, { durationMs: durationMs, children: workContent }))), progressText && (_jsx("p", { className: "ps-5 pb-1 text-xs text-muted-foreground", "data-testid": "agent-call-progress", "aria-live": "polite", children: progressText })), finalText && (_jsx("div", { className: "ps-5 pb-1", children: _jsx(SmoothMarkdownText, { text: finalText, streaming: isRunning, resetKey: `agent-response-${agentName}`, statusType: isRunning ? "running" : "complete" }) }))] }) })] }));
 }
 function AgentActivityToolCallRow({ tool, isActiveTail, }) {
     const isRunning = tool.status === "running";
     const ToolIcon = resolveToolIcon(tool.name);
-    return (_jsx(ToolActivityPresentation, { toolName: tool.name, isRunning: isRunning, toolCallId: tool.id, suppressLongRunningHint: true, children: _jsxs("div", { className: "my-0.5 flex w-full items-center gap-1.5 rounded-md py-0.5 text-left text-[13px] text-muted-foreground", children: [_jsx("span", { className: "flex size-4 shrink-0 items-center justify-center", children: isRunning ? (_jsx(IconLoader2, { className: "size-3.5 animate-spin" })) : (_jsx(ToolIcon, { className: "size-3.5" })) }), _jsx("span", { className: cn("min-w-0 truncate font-normal", isActiveTail && "agent-running-shimmer"), children: humanizeToolName(tool.name) })] }) }));
+    return (_jsx(ToolActivityPresentation, { toolName: tool.name, isRunning: isRunning, toolCallId: tool.id, suppressLongRunningHint: true, children: _jsxs("div", { className: "my-0.5 flex w-full items-center gap-2 rounded-md py-0.5 text-left text-[13px] text-muted-foreground", children: [_jsx("span", { className: "flex size-4 shrink-0 items-center justify-center", children: isRunning ? (_jsx(CubeLoader, { "aria-hidden": "true", className: "size-3.5" })) : (_jsx(ToolIcon, { className: "size-3.5" })) }), _jsx("span", { className: cn("min-w-0 truncate font-normal", isActiveTail && "agent-running-shimmer"), children: humanizeToolName(tool.name) })] }) }));
 }
 // ─── ToolCallFallback ──────────────────────────────────────────────────────────
 export function ToolCallFallback({ toolName, toolCallId, args, argsText, result, ...rest }) {
@@ -737,7 +740,7 @@ export function useLocalizedWorkedDuration() {
         second: t("agentChat.duration.secondShort"),
     }), [locale, t]);
 }
-export function WorkedForSummary({ durationMs, defaultOpen = false, autoCollapse = false, children, }) {
+export function WorkedForSummary({ durationMs, isRunning = false, defaultOpen = false, autoCollapse = false, children, }) {
     const t = useT();
     const formatDuration = useLocalizedWorkedDuration();
     // Ordinary completed work starts closed so a remount never flashes details
@@ -751,11 +754,13 @@ export function WorkedForSummary({ durationMs, defaultOpen = false, autoCollapse
             setOpen(false);
         }
     }, [autoCollapse, defaultOpen]);
-    const label = durationMs != null && durationMs >= 1000
-        ? t("agentChat.tool.workedFor", {
-            duration: formatDuration(durationMs),
-        })
-        : t("agentChat.tool.worked");
+    const label = isRunning
+        ? t("agentChat.status.working")
+        : durationMs != null && durationMs >= 1000
+            ? t("agentChat.tool.workedFor", {
+                duration: formatDuration(durationMs),
+            })
+            : t("agentChat.tool.worked");
     return (_jsxs("div", { className: "my-1 w-full", children: [_jsxs("button", { type: "button", onClick: () => setOpen((v) => !v), "aria-expanded": open, className: "flex items-center gap-1.5 py-0.5 text-[13px] text-muted-foreground transition-colors hover:text-foreground", children: [_jsx("span", { children: label }), _jsx(IconChevronRight, { className: cn("size-3.5 shrink-0 transition-transform", open && "rotate-90") })] }), _jsx(AnimatedCollapse, { open: open, children: _jsx(WorkSummaryContentContext.Provider, { value: true, children: _jsx("div", { className: "pt-1", children: children }) }) })] }));
 }
 export function RanToolsSummary({ toolCount, motionKey = "summary", children, }) {

package/dist/client/chat-first.js

@@ -582,14 +582,20 @@ function createChatFirstSurfaceTabsStore(scope) {
         },
         open: (tab) => {
             const existingIndex = activeIndex(tab.id);
+            const keepMainChatActive = existingIndex < 0 &&
+                tab.kind === "app" &&
+                tab.placement === "side" &&
+                state.activeTabId === null &&
+                !state.tabs.some((current) => current.kind === "app" && current.placement === "side");
+            const nextActiveTabId = keepMainChatActive ? null : tab.id;
             if (existingIndex >= 0) {
                 const tabs = state.tabs.map((current, index) => index === existingIndex ? tab : current);
-                publish({ tabs, activeTabId: tab.id });
+                publish({ tabs, activeTabId: nextActiveTabId });
                 return;
             }
             publish({
                 tabs: [...state.tabs, tab],
-                activeTabId: tab.id,
+                activeTabId: nextActiveTabId,
             });
         },
         activate: (tabId) => {

package/dist/client/chat-model-groups.js

@@ -14,6 +14,10 @@ const HIDDEN_CHAT_MODEL_ENGINES = new Set([
     "ai-sdk:mistral",
     "ai-sdk:cohere",
 ]);
+const HIDDEN_UNCONFIGURED_CHAT_MODEL_ENGINES = new Set([
+    "ai-sdk:google",
+    "ai-sdk:openrouter",
+]);
 function addCurrentModel(models, engineName, currentEngineName, currentModel) {
     const next = [...models];
     if (engineName === currentEngineName && currentModel && next.length === 0) {
@@ -126,6 +130,11 @@ function modelPickerEngineRank(engine) {
 function sortModelPickerEngines(a, b) {
     return modelPickerEngineRank(a) - modelPickerEngineRank(b);
 }
+function shouldShowConfiguredGroup(group) {
+    if (group.configured)
+        return true;
+    return !HIDDEN_UNCONFIGURED_CHAT_MODEL_ENGINES.has(group.engine);
+}
 export function buildChatModelGroups({ engines, configuredKeys, builderConnected = false, currentEngineName, currentModel, }) {
     const configured = new Set(configuredKeys ?? []);
     if (builderConnected) {
@@ -148,5 +157,6 @@ export function buildChatModelGroups({ engines, configuredKeys, builderConnected
                     requiredEnvVars.some((key) => configured.has(key))),
         };
     })
-        .filter((group) => group.models.length > 0);
+        .filter((group) => group.models.length > 0)
+        .filter(shouldShowConfiguredGroup);
 }

package/dist/client/collab/index.d.ts

@@ -1,4 +1,4 @@
-export { useCollaborativeDoc, isReconcileLeadClient, emailToColor, emailToName, dedupeCollabUsersByEmail, type CollabUser, type UseCollaborativeDocOptions, type UseCollaborativeDocResult, } from "../../collab/client.js";
+export { useCollaborativeDoc, isReconcileLeadClient, emailToColor, emailToName, dedupeCollabUsersByEmail, type CollabUser, type UseCollaborativeDocOptions, type UseCollaborativeDocResult, type CollabInitializationErrorCategory, type CollabInitializationState, } from "../../collab/client.js";
 export { AGENT_CLIENT_ID } from "../../collab/agent-identity.js";
 export { usePresence, toNormalized, fromNormalized, type OtherPresence, type PresencePayload, type UsePresenceResult, type NormalizedPoint, } from "../../collab/presence.js";
 export { useFollowUser, type UseFollowUserOptions, type UseFollowUserResult, type ViewportDescriptor, } from "../../collab/follow-mode.js";

package/dist/client/components/CodeRequiredDialog.js

@@ -2,31 +2,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { IconPackageExport, IconCode, IconExternalLink, IconX, IconLoader2, } from "@tabler/icons-react";
 import { useEffect, useCallback, useState } from "react";
 import { createPortal } from "react-dom";
-import { trackEvent } from "../analytics.js";
 import { agentNativePath } from "../api-path.js";
 import { useT } from "../i18n.js";
-import { withBuilderConnectTrackingParams } from "../settings/useBuilderStatus.js";
+import { BuilderConnectPopover } from "../settings/BuilderConnectPopover.js";
+import { useBuilderConnectFlow } from "../settings/useBuilderStatus.js";
 const DESKTOP_DOWNLOAD_URL = "https://www.agent-native.com/download";
-function useBuilderConnected() {
-    const [connected, setConnected] = useState(false);
-    const [cloudAgentsAvailable, setCloudAgentsAvailable] = useState(false);
-    const [connectUrl, setConnectUrl] = useState(null);
-    useEffect(() => {
-        fetch(agentNativePath("/_agent-native/builder/status"))
-            .then((r) => (r.ok ? r.json() : null))
-            .then((data) => {
-            if (data) {
-                setConnected(!!data.configured);
-                setCloudAgentsAvailable(!!data.builderEnabled &&
-                    !!data.privateKeyConfigured &&
-                    !!data.publicKeyConfigured);
-                setConnectUrl(data.connectUrl || null);
-            }
-        })
-            .catch(() => { });
-    }, []);
-    return { connected, cloudAgentsAvailable, connectUrl };
-}
 /**
  * Modal shown when a user tries to use a code-requiring feature where local
  * source access is unavailable. Offers two paths: Agent-Native Desktop or the
@@ -35,11 +15,18 @@ function useBuilderConnected() {
  */
 export function CodeRequiredDialog({ open, onClose, featureLabel, }) {
     const t = useT();
-    const { connected: builderConnected, cloudAgentsAvailable, connectUrl, } = useBuilderConnected();
+    const builderFlow = useBuilderConnectFlow({
+        provisionAccount: true,
+        trackingSource: "code_required_dialog",
+        trackingFlow: "background_agent",
+    });
+    const builderConnected = builderFlow.statusResolved && builderFlow.configured;
+    const cloudAgentsAvailable = builderFlow.statusResolved &&
+        builderFlow.builderEnabled &&
+        builderFlow.codeChangeConfigured;
     const [submitting, setSubmitting] = useState(false);
     const [branchUrl, setBranchUrl] = useState(null);
     const [error, setError] = useState(null);
-    const builderHref = withBuilderConnectTrackingParams(connectUrl || agentNativePath("/_agent-native/builder/connect"), { source: "code_required_dialog", flow: "background_agent" });
     const handleKeyDown = useCallback((e) => {
         if (e.key === "Escape")
             onClose();
@@ -107,17 +94,13 @@ export function CodeRequiredDialog({ open, onClose, featureLabel, }) {
                                 ...s.optionCard,
                                 cursor: "default",
                                 opacity: 0.85,
-                            }, children: [_jsx("div", { style: s.optionIcon, children: _jsx(IconExternalLink, { size: 24 }) }), _jsxs("div", { style: s.optionText, children: [_jsx("span", { style: s.optionTitle, children: t("codeRequired.codeChangeTitle") }), _jsx("span", { style: s.optionDesc, children: t("codeRequired.fallbackDetail") })] }), _jsx("span", { style: s.badge, children: t("codeRequired.codeChangeBadge") })] })) : (_jsxs("a", { href: builderHref, target: "_blank", rel: "noreferrer", onClick: () => {
-                                trackEvent("builder connect clicked", {
-                                    feature: "builder",
-                                    stage: "client",
-                                    source: "code_required_dialog",
-                                    flow: "background_agent",
-                                    connect_url_kind: connectUrl ? "provided" : "default",
-                                });
-                            }, style: { ...s.optionCard, ...s.optionLink }, onMouseEnter: (e) => Object.assign(e.currentTarget.style, s.optionCardHover), onMouseLeave: (e) => Object.assign(e.currentTarget.style, {
-                                borderColor: "hsl(var(--border))",
-                            }), children: [_jsx("div", { style: s.optionIcon, children: _jsx(IconExternalLink, { size: 24 }) }), _jsxs("div", { style: s.optionText, children: [_jsx("span", { style: s.optionTitle, children: t("codeRequired.connectBuilderTitle") }), _jsx("span", { style: s.optionDesc, children: t("codeRequired.connectBuilderDescription") })] }), !connectUrl && (_jsx("span", { style: s.badge, children: t("codeRequired.setupRequired") }))] }))] }), branchUrl && (_jsxs("div", { style: s.result, children: [_jsx("span", { style: { fontSize: 13, fontWeight: 600 }, children: t("codeRequired.branchCreated") }), _jsx("a", { href: branchUrl, target: "_blank", rel: "noopener noreferrer", style: s.resultLink, children: branchUrl })] })), error && (_jsx("p", { style: {
+                            }, children: [_jsx("div", { style: s.optionIcon, children: _jsx(IconExternalLink, { size: 24 }) }), _jsxs("div", { style: s.optionText, children: [_jsx("span", { style: s.optionTitle, children: t("codeRequired.codeChangeTitle") }), _jsx("span", { style: s.optionDesc, children: t("codeRequired.fallbackDetail") })] }), _jsx("span", { style: s.badge, children: t("codeRequired.codeChangeBadge") })] })) : (_jsx(BuilderConnectPopover, { flow: builderFlow, children: _jsxs("button", { type: "button", disabled: builderFlow.connecting, style: {
+                                    ...s.optionCard,
+                                    ...s.optionLink,
+                                    ...(builderFlow.connecting ? s.optionCardDisabled : {}),
+                                }, onMouseEnter: (e) => Object.assign(e.currentTarget.style, s.optionCardHover), onMouseLeave: (e) => Object.assign(e.currentTarget.style, {
+                                    borderColor: "hsl(var(--border))",
+                                }), children: [_jsx("div", { style: s.optionIcon, children: builderFlow.connecting ? (_jsx(IconLoader2, { size: 24, style: { animation: "spin 1s linear infinite" } })) : (_jsx(IconExternalLink, { size: 24 })) }), _jsxs("div", { style: s.optionText, children: [_jsx("span", { style: s.optionTitle, children: t("codeRequired.connectBuilderTitle") }), _jsx("span", { style: s.optionDesc, children: t("codeRequired.connectBuilderDescription") })] }), _jsx("span", { style: s.badge, children: t("codeRequired.setupRequired") })] }) }))] }), branchUrl && (_jsxs("div", { style: s.result, children: [_jsx("span", { style: { fontSize: 13, fontWeight: 600 }, children: t("codeRequired.branchCreated") }), _jsx("a", { href: branchUrl, target: "_blank", rel: "noopener noreferrer", style: s.resultLink, children: branchUrl })] })), error && (_jsx("p", { style: {
                         color: "hsl(var(--destructive))",
                         fontSize: 12,
                         marginTop: 12,
@@ -199,6 +182,10 @@ const s = {
     optionCardHover: {
         borderColor: "hsl(var(--ring))",
     },
+    optionCardDisabled: {
+        opacity: 0.7,
+        cursor: "wait",
+    },
     optionLink: {
         textDecoration: "none",
         boxSizing: "border-box",

package/dist/client/components/icons/AgentNativeIcon.d.ts

@@ -10,9 +10,9 @@ interface AgentNativeIconProps extends Omit<SVGProps<SVGSVGElement>, "fill"> {
 }
 /**
  * Monochrome agent-native "A" mark. Source paths are taken from the Tauri
- * menu-bar icon at `packages/core/src/assets/branding/tray-icon.svg`, with the
- * padded tray viewBox cropped for toolbar use and `fill="white"` swapped for
- * `fill="currentColor"` so the icon inherits the surrounding text color.
+ * menu-bar icon at `packages/core/src/assets/branding/tray-icon.svg`, with
+ * `fill="white"` swapped for `fill="currentColor"` so the icon inherits the
+ * surrounding text color.
  */
 export declare function AgentNativeIcon({ size, className, ...rest }: AgentNativeIconProps): import("react").JSX.Element;
 export {};

package/dist/client/components/icons/AgentNativeIcon.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * Monochrome agent-native "A" mark. Source paths are taken from the Tauri
- * menu-bar icon at `packages/core/src/assets/branding/tray-icon.svg`, with the
- * padded tray viewBox cropped for toolbar use and `fill="white"` swapped for
- * `fill="currentColor"` so the icon inherits the surrounding text color.
+ * menu-bar icon at `packages/core/src/assets/branding/tray-icon.svg`, with
+ * `fill="white"` swapped for `fill="currentColor"` so the icon inherits the
+ * surrounding text color.
  */
 export function AgentNativeIcon({ size = 24, className, ...rest }) {
-    return (_jsx("svg", { xmlns: "http://www.w3.org/2000/svg", width: size, height: size, viewBox: "0 0 114 114", fill: "none", className: className, ...rest, children: _jsxs("g", { transform: "translate(0 24)", children: [_jsx("path", { d: "M24.5537 65.7695H0L15.0859 39.4619L37.708 0L60.4912 39.4619H39.6396L24.5537 65.7695Z", fill: "currentColor" }), _jsx("path", { d: "M89.446 0H114L76.2921 65.7704H51.7383L89.446 0Z", fill: "currentColor" })] }) }));
+    return (_jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", width: size, height: size, viewBox: "0 0 114 66", fill: "none", className: className, ...rest, children: [_jsx("path", { d: "M24.5537 65.7695H0L15.0859 39.4619L37.708 0L60.4912 39.4619H39.6396L24.5537 65.7695Z", fill: "currentColor" }), _jsx("path", { d: "M89.446 0H114L76.2921 65.7704H51.7383L89.446 0Z", fill: "currentColor" })] }));
 }

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

@@ -7,7 +7,7 @@ function MessageScrollerProvider(props) {
     return _jsx(ShadcnMessageScroller.Provider, { ...props });
 }
 function MessageScroller({ className, ...props }) {
-    return (_jsx(ShadcnMessageScroller.Root, { className: cn("relative flex min-h-0 flex-1 flex-col", className), ...props }));
+    return (_jsx(ShadcnMessageScroller.Root, { className: cn("relative flex min-h-0 flex-1 flex-col overflow-hidden", className), ...props }));
 }
 function MessageScrollerViewport({ className, children, "aria-label": ariaLabel, ...props }) {
     const t = useT();

package/dist/client/composer/runtime-adapters.js

@@ -17,6 +17,7 @@ import { useOrg } from "../org/hooks.js";
 import { isMcpIntegrationCatalogAvailable } from "../resources/mcp-integration-catalog.js";
 import { McpIntegrationDialog } from "../resources/McpIntegrationDialog.js";
 import { useCreateMcpServer } from "../resources/use-mcp-servers.js";
+import { BuilderConnectPopover } from "../settings/BuilderConnectPopover.js";
 import { useBuilderConnectFlow } from "../settings/useBuilderStatus.js";
 import { fetchAgentEngineConfiguredState, useAgentEngineConfigured, } from "../use-agent-engine-configured.js";
 import { useChatModels } from "../use-chat-models.js";
@@ -56,6 +57,7 @@ const coreComposerAdapters = {
     },
     builder: {
         useConnectFlow: useBuilderConnectFlow,
+        BuilderConnectPopover,
         tryDelegateBuildRequest: tryDelegateBuildRequestToBuilder,
         isTrustedBuilderMessage,
         isTrustedFrameMessage,

package/dist/client/feedback-context.d.ts

@@ -9,5 +9,6 @@ export interface FeedbackClientContext {
 export interface FeedbackClientContextOptions {
     chatSessionId?: string | null;
     storageKey?: string | null;
+    activeRunId?: string | null;
 }
 export declare function getFeedbackClientContext(options?: FeedbackClientContextOptions): FeedbackClientContext;

package/dist/client/feedback-context.js

@@ -64,8 +64,9 @@ export function getFeedbackClientContext(options = {}) {
     const context = {
         chatSessionIds: [...ids].slice(0, MAX_CHAT_SESSION_IDS),
     };
-    if (activeRun?.runId)
-        context.activeRunId = activeRun.runId;
+    const activeRunId = options.activeRunId === undefined ? activeRun?.runId : options.activeRunId;
+    if (activeRunId)
+        context.activeRunId = activeRunId;
     if (typeof window !== "undefined") {
         context.pageUrl = scrubUrl(window.location.href);
         context.clientSurface = getClientSurface();

package/dist/client/host-bridge.d.ts

@@ -52,6 +52,7 @@ export interface AgentNativeHostSession {
 }
 export interface AgentNativeClientActionRuntime {
     requestId?: string;
+    signal?: AbortSignal;
     origin: string;
     context: AgentNativeHostContext;
     session: AgentNativeHostSession;

package/dist/client/index.d.ts

@@ -15,14 +15,14 @@ export { AgentNativeI18nProvider, LanguagePicker, getLocaleInitScript, localeDir
 export { AgentNativeIcon } from "./components/icons/AgentNativeIcon.js";
 export { FeatureFlagsEditor, evaluatedFeatureFlagValues, featureFlagValue, useFeatureFlag, useFeatureFlags, type FeatureFlagActor, type FeatureFlagMetadata, type FeatureFlagRules, type SetFeatureFlagInput, } from "./feature-flags/index.js";
 export { withBuilderUtmTrackingParams } from "../shared/builder-link-tracking.js";
-export { SettingsPanel, SettingsTabsPage, SecretsSection, getAgentSettingsSearchTabs, openBuilderConnectPopup, useAgentSettingsTabs, type AgentSettingsTabFactory, type AgentSettingsTabFactoryContext, useBuilderConnectFlow, useBuilderStatus, withBuilderConnectTrackingParams, type BuilderConnectFlow, type BuilderConnectFlowOptions, type BuilderConnectStartOptions, type BuilderStatus, type AgentSettingsSearchTab, type OpenBuilderConnectPopupOptions, type SecretsSectionProps, type SettingsPanelProps, type SettingsSearchEntry, type SettingsTabItem, type SettingsTabsPageProps, } from "./settings/index.js";
+export { SettingsPanel, SettingsTabsPage, SecretsSection, BuilderConnectPopover, getAgentSettingsSearchTabs, openBuilderConnectPopup, useAgentSettingsTabs, type AgentSettingsTabFactory, type AgentSettingsTabFactoryContext, useBuilderConnectFlow, useBuilderStatus, withBuilderConnectTrackingParams, type BuilderConnectFlow, type BuilderConnectFlowOptions, type BuilderConnectStartOptions, type BuilderStatus, type AgentSettingsSearchTab, type OpenBuilderConnectPopupOptions, type SecretsSectionProps, type SettingsPanelProps, type SettingsSearchEntry, type SettingsTabItem, type SettingsTabsPageProps, type BuilderConnectPopoverProps, } from "./settings/index.js";
 export { DevDatabaseLink, type DevDatabaseLinkProps, } from "./db-admin/DevDatabaseLink.js";
 export { DbAdminPage } from "./db-admin/DbAdminPage.js";
 export { installRouteChunkRecovery, reloadForStaleChunk, recoverFromStaleChunkError, } from "./route-chunk-recovery.js";
 export { AgentTerminal, type AgentTerminalProps } from "./terminal/index.js";
 export { trackEvent, trackAgentChatLifecycle, trackSessionStatus, configureTracking, setTrackingContentCaptureEnabled, maybeStartSessionReplay, startSessionReplay, stopSessionReplay, getAnalyticsAnonymousId, getAnalyticsSessionId, setAnalyticsSessionId, clearAnalyticsSessionId, getFirstTouchAttribution, setSentryUser, setTrackingIdentity, getSessionReplayContext, getSessionReplayUrl, captureError, captureClientException, AGENT_NATIVE_EXCEPTION_EVENT_NAME, addErrorBreadcrumb, captureException, captureMessage, isErrorCaptureInstalled, type CaptureExceptionContext, type CapturedExceptionEvent, type ClientCaptureContext, type AgentChatLifecycleEvent, type ConfigureTrackingOptions, type ErrorCaptureConfigOptions, type ExceptionBreadcrumb, type ExceptionLevel, type FirstTouchAttribution, type SessionReplayOptions, type SessionReplayContext, type SessionReplayLinkOptions, type SessionReplayStartResult, type SessionReplayUrlMatcher, type TrackingIdentityUser, } from "./analytics.js";
 export { track } from "./track.js";
-export { useCollaborativeDoc, isReconcileLeadClient, emailToColor, emailToName, dedupeCollabUsersByEmail, type UseCollaborativeDocOptions, type UseCollaborativeDocResult, type CollabUser, } from "../collab/client.js";
+export { useCollaborativeDoc, isReconcileLeadClient, emailToColor, emailToName, dedupeCollabUsersByEmail, type UseCollaborativeDocOptions, type UseCollaborativeDocResult, type CollabInitializationErrorCategory, type CollabInitializationState, type CollabUser, } from "../collab/client.js";
 export { AGENT_CLIENT_ID } from "../collab/agent-identity.js";
 export { usePresence, toNormalized, fromNormalized, type OtherPresence, type PresencePayload, type UsePresenceResult, type NormalizedPoint, } from "../collab/presence.js";
 export { useFollowUser, type UseFollowUserOptions, type UseFollowUserResult, type ViewportDescriptor, } from "../collab/follow-mode.js";

package/dist/client/index.js

@@ -15,7 +15,7 @@ export { AgentNativeI18nProvider, LanguagePicker, getLocaleInitScript, localeDir
 export { AgentNativeIcon } from "./components/icons/AgentNativeIcon.js";
 export { FeatureFlagsEditor, evaluatedFeatureFlagValues, featureFlagValue, useFeatureFlag, useFeatureFlags, } from "./feature-flags/index.js";
 export { withBuilderUtmTrackingParams } from "../shared/builder-link-tracking.js";
-export { SettingsPanel, SettingsTabsPage, SecretsSection, getAgentSettingsSearchTabs, openBuilderConnectPopup, useAgentSettingsTabs, useBuilderConnectFlow, useBuilderStatus, withBuilderConnectTrackingParams, } from "./settings/index.js";
+export { SettingsPanel, SettingsTabsPage, SecretsSection, BuilderConnectPopover, getAgentSettingsSearchTabs, openBuilderConnectPopup, useAgentSettingsTabs, useBuilderConnectFlow, useBuilderStatus, withBuilderConnectTrackingParams, } from "./settings/index.js";
 export { DevDatabaseLink, } from "./db-admin/DevDatabaseLink.js";
 export { DbAdminPage } from "./db-admin/DbAdminPage.js";
 export { installRouteChunkRecovery, reloadForStaleChunk, recoverFromStaleChunkError, } from "./route-chunk-recovery.js";

package/dist/client/integrations/IntegrationsPanel.d.ts

@@ -9,9 +9,10 @@ export interface McpIntegrationsSectionProps {
     showHeader?: boolean;
     className?: string;
     onOAuthStart?: (url: string) => void | Promise<void>;
+    oauthReady?: boolean;
     oauthReturnPath?: string;
 }
-export declare function McpIntegrationsSection({ query, title, description, showTitle, showDescription, showHeader, className, onOAuthStart, oauthReturnPath, }: McpIntegrationsSectionProps): React.JSX.Element;
+export declare function McpIntegrationsSection({ query, title, description, showTitle, showDescription, showHeader, className, onOAuthStart, oauthReady, oauthReturnPath, }: McpIntegrationsSectionProps): React.JSX.Element;
 export interface McpIntegrationsLandingProps extends Omit<McpIntegrationsSectionProps, "query" | "showHeader"> {
 }
 export declare function McpIntegrationsLanding({ title, description, ...props }: McpIntegrationsLandingProps): React.JSX.Element;

package/dist/client/integrations/IntegrationsPanel.js

@@ -265,7 +265,7 @@ function McpServerStatus({ server, onReconnect, reconnecting = false, reconnectE
     }
     return (_jsxs("span", { className: "inline-flex items-center gap-1.5 text-xs text-muted-foreground", children: [_jsx("span", { className: "size-1.5 rounded-full bg-muted-foreground/50" }), "Status unknown"] }));
 }
-export function McpIntegrationsSection({ query, title, description, showTitle = true, showDescription = true, showHeader = true, className, onOAuthStart, oauthReturnPath, }) {
+export function McpIntegrationsSection({ query, title, description, showTitle = true, showDescription = true, showHeader = true, className, onOAuthStart, oauthReady, oauthReturnPath, }) {
     const t = useT();
     const serversQuery = useMcpServers();
     const createServer = useCreateMcpServer();
@@ -368,7 +368,7 @@ export function McpIntegrationsSection({ query, title, description, showTitle =
     }, [reconnectServer]);
     return (_jsxs("section", { "data-testid": "mcp-integrations", className: cn("space-y-5", className), children: [showHeader ? (_jsxs("div", { className: cn("flex flex-col gap-4 lg:flex-row lg:items-end", showTitle || showDescription
                     ? "lg:justify-between"
-                    : "lg:justify-end"), children: [showTitle || showDescription ? (_jsxs("div", { children: [showTitle ? (_jsx("h1", { className: "text-2xl font-semibold tracking-[-0.04em] text-foreground", children: title ?? t("mcpIntegrations.menuLabel") })) : null, showDescription ? (_jsx("p", { className: "mt-1.5 max-w-2xl text-sm leading-6 text-muted-foreground", children: description ?? t("mcpIntegrations.menuDescription") })) : null] })) : null, _jsxs("div", { className: "flex w-full flex-col gap-2 sm:flex-row lg:w-auto", children: [_jsxs("label", { className: "relative block min-w-0 flex-1 lg:w-72", children: [_jsx(IconSearch, { className: "pointer-events-none absolute start-3 top-1/2 size-4 -translate-y-1/2 text-muted-foreground" }), _jsx("input", { type: "search", value: activeQuery, onChange: (event) => setLocalQuery(event.target.value), placeholder: t("mcpIntegrations.searchPlaceholder"), "aria-label": t("mcpIntegrations.searchPlaceholder"), className: "h-9 w-full rounded-lg border border-border bg-background ps-9 pe-3 text-sm text-foreground outline-none transition-colors placeholder:text-muted-foreground focus:border-foreground/30 focus:ring-2 focus:ring-accent/40" })] }), _jsxs("button", { type: "button", onClick: () => openCatalog(), className: "inline-flex h-9 shrink-0 items-center justify-center gap-1.5 rounded-lg bg-primary px-3 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90", children: [_jsx(IconPlus, { className: "size-3.5" }), t("integrations.addIntegration")] })] })] })) : null, deleteError && (_jsx("p", { className: "border-y border-destructive/20 bg-destructive/5 py-3 text-xs text-destructive", children: deleteError })), serversQuery.isError ? (_jsx("p", { className: "border-y border-destructive/20 bg-destructive/5 py-3 text-xs text-destructive", children: "Could not load connected agent integrations. The catalog is still available." })) : serversQuery.isLoading ? (_jsxs("div", { className: "space-y-3 rounded-xl border border-border/70 bg-card px-4 py-4", children: [_jsx("div", { className: "h-5 w-1/2 animate-pulse rounded bg-muted" }), _jsx("div", { className: "h-5 w-3/4 animate-pulse rounded bg-muted" })] })) : servers.length > 0 && !normalizedQuery ? (_jsxs("section", { className: "space-y-2", children: [_jsx("h3", { className: "text-sm font-semibold text-foreground", children: "Installed" }), _jsx("div", { className: "grid gap-3 sm:grid-cols-2", children: servers.map((server) => {
+                    : "lg:justify-end"), children: [showTitle || showDescription ? (_jsxs("div", { children: [showTitle ? (_jsx("h1", { className: "text-2xl font-semibold tracking-[-0.04em] text-foreground", children: title ?? t("mcpIntegrations.menuLabel") })) : null, showDescription ? (_jsx("p", { className: "mt-1.5 max-w-2xl text-sm leading-6 text-muted-foreground", children: description ?? t("mcpIntegrations.menuDescription") })) : null] })) : null, _jsxs("div", { className: "flex w-full flex-col gap-2 sm:flex-row lg:w-auto", children: [_jsxs("label", { className: "relative block min-w-0 flex-1 lg:w-72", children: [_jsx(IconSearch, { className: "pointer-events-none absolute start-3 top-1/2 size-4 -translate-y-1/2 text-muted-foreground" }), _jsx("input", { type: "search", value: activeQuery, onChange: (event) => setLocalQuery(event.target.value), placeholder: t("mcpIntegrations.searchPlaceholder"), "aria-label": t("mcpIntegrations.searchPlaceholder"), className: "h-9 w-full rounded-lg border border-border bg-background ps-9 pe-3 text-sm text-foreground outline-none transition-colors placeholder:text-muted-foreground focus:border-foreground/30 focus:ring-2 focus:ring-accent/40" })] }), _jsxs("button", { type: "button", onClick: () => openCatalog(), className: "inline-flex h-9 shrink-0 items-center justify-center gap-1.5 rounded-lg bg-primary px-3 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90", children: [_jsx(IconPlus, { className: "size-3.5" }), t("integrations.addIntegration")] })] })] })) : null, deleteError && (_jsx("p", { className: "border-y border-destructive/20 bg-destructive/5 py-3 text-xs text-destructive", children: deleteError })), serversQuery.isError ? (_jsx("p", { className: "border-y border-destructive/20 bg-destructive/5 py-3 text-xs text-destructive", children: "Could not load connected agent integrations. The catalog is still available." })) : servers.length > 0 && !normalizedQuery ? (_jsxs("section", { className: "space-y-2", children: [_jsx("h3", { className: "text-sm font-semibold text-foreground", children: "Installed" }), _jsx("div", { className: "grid gap-3 sm:grid-cols-2", children: servers.map((server) => {
                             const key = `${server.scope}:${server.id}`;
                             const canRemove = server.scope === "user" ||
                                 serversQuery.data?.role === "owner" ||
@@ -402,7 +402,7 @@ export function McpIntegrationsSection({ query, title, description, showTitle =
                         setInitialIntegrationId(null);
                         setConnectIntegrationId(null);
                     }
-                }, initialIntegrationId: initialIntegrationId, connectIntegrationId: connectIntegrationId, defaultScope: "user", canCreateOrgMcp: canCreateOrgMcp, hasOrg: hasOrg, onCreateMcpServer: (args) => createServer.mutateAsync(args), onOAuthStart: onOAuthStart, oauthReturnPath: oauthReturnPath })] }));
+                }, initialIntegrationId: initialIntegrationId, connectIntegrationId: connectIntegrationId, defaultScope: "user", canCreateOrgMcp: canCreateOrgMcp, hasOrg: hasOrg, onCreateMcpServer: (args) => createServer.mutateAsync(args), onOAuthStart: onOAuthStart, oauthReady: oauthReady, oauthReturnPath: oauthReturnPath })] }));
 }
 export function McpIntegrationsLanding({ title, description, ...props }) {
     return (_jsx(McpIntegrationsSection, { ...props, title: title, description: description, showHeader: true }));