@agent-native/core 0.169.0 → 0.170.0

package/dist/client/AssistantChat.js

@@ -121,6 +121,8 @@ function getPollAbortMs(interval) {
     return Math.max(POLL_ABORT_MIN_MS, interval * 4);
 }
 const ACTIVE_RUN_CLEAR_TIMEOUT_MS = 5_000;
+const ACTIVE_RUN_CLEAR_STABLE_POLLS = 2;
+const ACTIVE_RUN_CLEAR_RETRY_DELAY_MS = 1_000;
 const ACTIVE_RUN_STUCK_THRESHOLD_MS = 90_000;
 const BACKGROUND_ACTIVE_RUN_STUCK_THRESHOLD_MS = 13 * 60_000;
 const ACTIVE_RUN_POLL_INTERVAL_MS = 150;
@@ -303,6 +305,7 @@ export async function waitForThreadRunToClear(apiUrl, threadId) {
         return true;
     const deadline = Date.now() + ACTIVE_RUN_CLEAR_TIMEOUT_MS;
     let activeRunToResume = null;
+    let consecutiveClearPolls = 0;
     const resumeActiveRun = (info) => {
         if (!info.runId)
             return;
@@ -323,11 +326,22 @@ export async function waitForThreadRunToClear(apiUrl, threadId) {
             const res = await fetch(`${apiUrl}/runs/active?threadId=${encodeURIComponent(threadId)}`);
             if (res.ok) {
                 const info = (await res.json());
-                if (!info?.active ||
+                const runLooksClear = !info?.active ||
                     info?.status !== "running" ||
-                    activeRunLooksStale(info))
-                    return true;
-                if (info.runId) {
+                    activeRunLooksStale(info);
+                if (runLooksClear) {
+                    consecutiveClearPolls += 1;
+                    // A terminal/no-active snapshot can briefly appear between a
+                    // foreground run and its server-owned continuation. Require two
+                    // consecutive clear polls before releasing a queued follow-up.
+                    if (consecutiveClearPolls >= ACTIVE_RUN_CLEAR_STABLE_POLLS) {
+                        return true;
+                    }
+                }
+                else {
+                    consecutiveClearPolls = 0;
+                }
+                if (!runLooksClear && info.runId) {
                     activeRunToResume = info;
                     if (info.awaitingRedispatch === true) {
                         // This is not the brief terminal-write lag the 5s waiter was built
@@ -340,8 +354,12 @@ export async function waitForThreadRunToClear(apiUrl, threadId) {
                     }
                 }
             }
+            else {
+                consecutiveClearPolls = 0;
+            }
         }
         catch {
+            consecutiveClearPolls = 0;
             // Transient poll failure — try again until the short grace period ends.
         }
         await new Promise((resolve) => window.setTimeout(resolve, ACTIVE_RUN_POLL_INTERVAL_MS));
@@ -1730,6 +1748,15 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         tabId,
         onActiveRunChange: setHasActiveServerRun,
     });
+    // Server truth must participate in submit gating, not only in the missing
+    // final-response warning. The local lifecycle can clear during a transport
+    // handoff while the server still owns the turn.
+    const serverRunState = useRunStuckDetection({
+        threadId: threadId ?? null,
+        enabled: isActiveComposer,
+        apiUrl,
+    });
+    const serverRunActive = serverRunState.runId != null && serverRunState.status === "running";
     // Real running state drives submission/queue gating; UI running also covers
     // short auto-continuation gaps so the latest assistant message does not flash
     // into a done state while the agent is still working.
@@ -1739,19 +1766,10 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         isReconnecting,
         optimisticRunning,
         isAutoResuming,
-        hasActiveServerRun,
+        hasActiveServerRun: hasActiveServerRun || serverRunActive,
         hasTerminalRunError: runErrorInfo !== null,
     });
     const textStreaming = showRunningInUI || externalStreaming;
-    // Server truth about this thread's run, used to suppress the "agent stopped
-    // without sending a final message" notice while the server still has the
-    // turn in flight. The poll backs itself off to 15s while nothing is running.
-    const serverRunState = useRunStuckDetection({
-        threadId: threadId ?? null,
-        enabled: isActiveComposer,
-        apiUrl,
-    });
-    const serverRunActive = serverRunState.runId != null && serverRunState.status === "running";
     const storedActiveRun = getActiveRun();
     const activeChatRunId = (serverRunState.status === "running" ? serverRunState.runId : null) ??
         (activeRunMatchesThread(storedActiveRun, threadId)
@@ -3318,6 +3336,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         dequeueInFlightRef.current = true;
         let cancelled = false;
         let started = false;
+        let retryTimer = null;
         const timer = window.setTimeout(() => {
             started = true;
             void (async () => {
@@ -3329,8 +3348,19 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     // complete. Starting the queued turn during that window can reconnect
                     // to the old run and replay the old answer under the new prompt.
                     const runCleared = await waitForThreadRunToClear(apiUrl, threadId);
-                    if (cancelled || !runCleared)
+                    if (cancelled)
                         return;
+                    if (!runCleared) {
+                        // The server still owns this turn (including a deferred durable
+                        // successor). Keep the queued message visible and retry after a
+                        // short delay so one transient idle snapshot cannot strand it.
+                        retryTimer = window.setTimeout(() => {
+                            if (!cancelled) {
+                                setQueueWakeVersion((version) => version + 1);
+                            }
+                        }, ACTIVE_RUN_CLEAR_RETRY_DELAY_MS);
+                        return;
+                    }
                     if (queueStopVersionRef.current !== stopVersion ||
                         queuedMessagesRef.current[0]?.id !== next.id) {
                         return;
@@ -3391,6 +3421,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         return () => {
             cancelled = true;
             window.clearTimeout(timer);
+            if (retryTimer !== null)
+                window.clearTimeout(retryTimer);
             if (!started) {
                 dequeueInFlightRef.current = false;
             }

package/dist/client/ConnectBuilderCard.d.ts

@@ -12,10 +12,12 @@ export interface ConnectBuilderCardProps {
     /** The user's feature/change request, forwarded to the selected coding
      *  agent when they click Send. Empty for generic "connect Builder" prompts. */
     prompt?: string;
+    /** Formatted staged chat context forwarded with the Builder request. */
+    context?: string;
 }
 /**
  * Rich inline card rendered for the `connect-builder` tool call. Shows the
  * Builder handoff when available, or routes local development requests to the
  * external coding agent.
  */
-export declare function ConnectBuilderCard({ configured: initialConfigured, builderEnabled: initialBuilderEnabled, connectUrl: initialConnectUrl, orgName: initialOrgName, prompt, }: ConnectBuilderCardProps): React.JSX.Element;
+export declare function ConnectBuilderCard({ configured: initialConfigured, builderEnabled: initialBuilderEnabled, connectUrl: initialConnectUrl, orgName: initialOrgName, prompt, context, }: ConnectBuilderCardProps): React.JSX.Element;

package/dist/client/ConnectBuilderCard.js

@@ -30,7 +30,7 @@ function hasElectronShellBridge() {
  * Builder handoff when available, or routes local development requests to the
  * external coding agent.
  */
-export function ConnectBuilderCard({ configured: initialConfigured, builderEnabled: initialBuilderEnabled = true, connectUrl: initialConnectUrl, orgName: initialOrgName, prompt = "", }) {
+export function ConnectBuilderCard({ configured: initialConfigured, builderEnabled: initialBuilderEnabled = true, connectUrl: initialConnectUrl, orgName: initialOrgName, prompt = "", context = "", }) {
     // The connect-poll state machine is shared — the tool-call result is
     // frozen at render time, so the hook's mount-time fetch + focus refresh
     // is what catches a flow the user completed in another tab.
@@ -89,7 +89,10 @@ export function ConnectBuilderCard({ configured: initialConfigured, builderEnabl
             const res = await fetch(new URL(agentNativePath("/_agent-native/builder/run"), origin).href, {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
-                body: JSON.stringify({ prompt }),
+                body: JSON.stringify({
+                    prompt,
+                    ...(context.trim() ? { context } : {}),
+                }),
             });
             const data = await res.json().catch(() => ({}));
             if (!res.ok) {
@@ -108,7 +111,7 @@ export function ConnectBuilderCard({ configured: initialConfigured, builderEnabl
             setSendErr(e instanceof Error ? e.message : "Send failed");
             setSending(false);
         }
-    }, [prompt]);
+    }, [context, prompt]);
     const handleJoinWaitlist = useCallback(async () => {
         setJoiningWaitlist(true);
         setWaitlistErr(null);

package/dist/client/EnvironmentBadge.d.ts

@@ -1,5 +1,5 @@
 import type { AgentNativeDeploymentEnvironment, AgentNativeConfig } from "../config.js";
-export { BETA_OPT_OUT_DURATION_MS, BETA_OPT_OUT_QUERY_PARAM, BETA_OPT_OUT_STORAGE_KEY, buildEnvironmentOptOutUrl, buildEnvironmentUrl, resolveEnvironmentTargets, type EnvironmentBadgeTargets, } from "../shared/environment-lanes.js";
+export { BETA_FORCE_QUERY_PARAM, BETA_FORCE_SESSION_STORAGE_KEY, BETA_OPT_OUT_DURATION_MS, BETA_OPT_OUT_QUERY_PARAM, BETA_OPT_OUT_STORAGE_KEY, buildEnvironmentOptOutUrl, buildEnvironmentUrl, resolveEnvironmentTargets, type EnvironmentBadgeTargets, } from "../shared/environment-lanes.js";
 export declare function isBuilderIoEmployee(email: string | null | undefined): boolean;
 export declare function isAgentNativeDesktopUserAgent(userAgent: string | undefined): boolean;
 export declare function resolveEnvironmentChannel(config: AgentNativeConfig, hostname: string | undefined): Extract<AgentNativeDeploymentEnvironment, "local" | "beta" | "production"> | null;

package/dist/client/EnvironmentBadge.js

@@ -1,13 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Button } from "@agent-native/toolkit/ui/button";
 import { Popover, PopoverContent, PopoverTrigger, } from "@agent-native/toolkit/ui/popover";
-import { useEffect, useMemo, useRef } from "react";
-import { BETA_OPT_OUT_QUERY_PARAM, BETA_OPT_OUT_STORAGE_KEY, buildEnvironmentOptOutUrl, buildEnvironmentUrl, resolveEnvironmentTargets, } from "../shared/environment-lanes.js";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { BETA_FORCE_QUERY_PARAM, BETA_FORCE_SESSION_STORAGE_KEY, BETA_OPT_OUT_QUERY_PARAM, BETA_OPT_OUT_STORAGE_KEY, buildEnvironmentOptOutUrl, buildEnvironmentUrl, resolveEnvironmentTargets, } from "../shared/environment-lanes.js";
 import { trackEvent } from "./analytics.js";
 import { injectedAgentNativeConfig } from "./app-config.js";
 import { useSession } from "./use-session.js";
 import { cn } from "./utils.js";
-export { BETA_OPT_OUT_DURATION_MS, BETA_OPT_OUT_QUERY_PARAM, BETA_OPT_OUT_STORAGE_KEY, buildEnvironmentOptOutUrl, buildEnvironmentUrl, resolveEnvironmentTargets, } from "../shared/environment-lanes.js";
+export { BETA_FORCE_QUERY_PARAM, BETA_FORCE_SESSION_STORAGE_KEY, BETA_OPT_OUT_DURATION_MS, BETA_OPT_OUT_QUERY_PARAM, BETA_OPT_OUT_STORAGE_KEY, buildEnvironmentOptOutUrl, buildEnvironmentUrl, resolveEnvironmentTargets, } from "../shared/environment-lanes.js";
 export function isBuilderIoEmployee(email) {
     return email?.trim().toLowerCase().endsWith("@builder.io") ?? false;
 }
@@ -50,6 +50,29 @@ function readBetaOptOutUntil(now = Date.now()) {
     }
     return null;
 }
+function rememberForcedProductionSession(sourceHref) {
+    let forcedByQuery = false;
+    try {
+        forcedByQuery =
+            new URL(sourceHref).searchParams.get(BETA_FORCE_QUERY_PARAM) === "true";
+    }
+    catch {
+        // coercion-ok: the browser supplied an invalid location.
+    }
+    if (typeof window === "undefined")
+        return forcedByQuery;
+    try {
+        if (forcedByQuery) {
+            window.sessionStorage.setItem(BETA_FORCE_SESSION_STORAGE_KEY, "1");
+        }
+        return (forcedByQuery ||
+            window.sessionStorage.getItem(BETA_FORCE_SESSION_STORAGE_KEY) === "1");
+    }
+    catch {
+        // coercion-ok: session storage is optional; the current URL remains authoritative.
+        return forcedByQuery;
+    }
+}
 function consumeBetaOptOutQueryParam(sourceHref, now = Date.now()) {
     let target;
     try {
@@ -81,8 +104,11 @@ function EnvironmentLink({ label, href }) {
     return (_jsx(Button, { asChild: true, className: "w-full justify-center", size: "sm", variant: "outline", children: _jsx("a", { href: href, children: label }) }));
 }
 function EnvironmentBadgeContent({ environment, targets, }) {
+    const [isHidden, setIsHidden] = useState(false);
     if (typeof window === "undefined")
         return null;
+    if (isHidden)
+        return null;
     const currentHref = window.location.href;
     const betaHref = buildEnvironmentUrl(currentHref, targets.betaHost);
     const productionHref = buildEnvironmentOptOutUrl(currentHref, targets.productionHost);
@@ -94,7 +120,7 @@ function EnvironmentBadgeContent({ environment, targets, }) {
         : "You're on Agent Native Production";
     return (_jsxs(Popover, { children: [_jsx(PopoverTrigger, { asChild: true, children: _jsx(Button, { "aria-label": `Open ${title.toLowerCase()} switcher`, className: cn(environmentBadgePlacementClasses, environment === "beta"
                         ? "border-primary/80"
-                        : "border-border/80 bg-background/95 text-foreground"), size: "sm", variant: environment === "beta" ? "default" : "outline", children: label }) }), _jsxs(PopoverContent, { align: "start", className: "w-[280px] p-5", side: "top", sideOffset: 8, children: [_jsx("div", { className: "mb-1 text-sm font-semibold leading-5", children: title }), _jsx("div", { className: "mb-4 text-sm text-muted-foreground", children: "Choose where you want to continue." }), _jsx("div", { className: "grid gap-2", children: environment === "beta" ? (_jsx(EnvironmentLink, { href: productionHref, label: "Switch to production" })) : (_jsx(EnvironmentLink, { href: betaHref, label: "Go to beta" })) })] })] }));
+                        : "border-border/80 bg-background/95 text-foreground"), size: "sm", variant: environment === "beta" ? "default" : "outline", children: label }) }), _jsxs(PopoverContent, { align: "start", className: "w-[280px] p-5", side: "top", sideOffset: 8, children: [_jsx("div", { className: "mb-1 text-sm font-semibold leading-5", children: title }), _jsx("div", { className: "mb-4 text-sm text-muted-foreground", children: "Choose where you want to continue." }), _jsxs("div", { className: "grid gap-2", children: [environment === "beta" ? (_jsx(EnvironmentLink, { href: productionHref, label: "Switch to production" })) : (_jsx(EnvironmentLink, { href: betaHref, label: "Go to beta" })), _jsx(Button, { className: "mt-2 -mb-2 w-full justify-center text-muted-foreground", onClick: () => setIsHidden(true), size: "sm", type: "button", variant: "ghost", children: "Hide badge" })] })] })] }));
 }
 function LocalEnvironmentBadge() {
     return (_jsx("div", { "aria-label": "Local development environment", className: cn(environmentBadgePlacementClasses, "inline-flex items-center justify-center border border-border/80 bg-background/95 text-foreground"), role: "status", children: "dev" }));
@@ -107,6 +133,10 @@ function ProductionEnvironmentBadge({ targets, }) {
         isBuilderIoEmployee(session?.email);
     const didAutoRedirect = useRef(false);
     useEffect(() => {
+        if (typeof window === "undefined")
+            return;
+        if (rememberForcedProductionSession(window.location.href))
+            return;
         if (!isEligible || didAutoRedirect.current) {
             return;
         }
@@ -140,11 +170,16 @@ function ProductionEnvironmentBadge({ targets, }) {
  * lane for authenticated staff.
  */
 export function EnvironmentBadge({ showProduction = true, } = {}) {
+    const [hydrated, setHydrated] = useState(false);
     const config = useMemo(injectedAgentNativeConfig, []);
     const hostname = typeof window === "undefined" ? undefined : window.location.hostname;
     const environment = resolveEnvironmentChannel(config, hostname);
     const targets = resolveEnvironmentTargets(hostname);
-    if (typeof window === "undefined" ||
+    useEffect(() => {
+        setHydrated(true);
+    }, []);
+    if (!hydrated ||
+        typeof window === "undefined" ||
         window.parent !== window ||
         !environment) {
         return null;

package/dist/client/MultiTabAssistantChat.d.ts

@@ -71,4 +71,4 @@ export type MultiTabAssistantChatProps = Omit<AssistantChatProps, "tabId" | "thr
     /** Cadence for hydrating agent-team sub-agent tab status. Default: 3000. */
     agentTeamPollMs?: number;
 };
-export declare function MultiTabAssistantChat({ showTabBar, renderHeader, renderOverlay, contentHidden, apiUrl, storageKey, restoreActiveThread, browserTabId, threadUrlSync, scope, isolateHistoryByScope, agentTeamPollMs, ...props }: MultiTabAssistantChatProps): React.JSX.Element;
+export declare function MultiTabAssistantChat({ showTabBar, renderHeader, renderOverlay, contentHidden, apiUrl, storageKey, restoreActiveThread, browserTabId, threadUrlSync, scope, isolateHistoryByScope, agentTeamPollMs, availableModels: hostAvailableModels, modelListLoading: hostModelListLoading, onModelChange: hostOnModelChange, ...props }: MultiTabAssistantChatProps): React.JSX.Element;

package/dist/client/MultiTabAssistantChat.js

@@ -17,7 +17,7 @@ import { DEFAULT_LOCALE, useOptionalLocale, useT } from "./i18n.js";
 import { RunStuckBanner } from "./RunStuckBanner.js";
 import { callAction } from "./use-action.js";
 import { useChangeVersion } from "./use-change-version.js";
-import { CHAT_MODEL_SELECTION_CHANGED_EVENT } from "./use-chat-models.js";
+import { CHAT_MODEL_SELECTION_CHANGED_EVENT, chatModelSelectionStorageKey, } from "./use-chat-models.js";
 import { useChatThreads, } from "./use-chat-threads.js";
 import { usePollLoop } from "./use-poll-loop.js";
 import { cn } from "./utils.js";
@@ -43,7 +43,6 @@ function deliverPendingSend(ref, send) {
         ref.sendMessage(send.message, send.images);
     }
 }
-const MODEL_SELECTION_STORAGE_KEY = "agent-native:chat-models:selection";
 function readStoredModelSelection(key) {
     if (typeof window === "undefined")
         return undefined;
@@ -402,7 +401,7 @@ function runToAgentTeamTabInfo(run) {
         status: run.status ?? "unknown",
     };
 }
-export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderOverlay, contentHidden = false, apiUrl = agentNativePath("/_agent-native/agent-chat"), storageKey, restoreActiveThread = true, browserTabId, threadUrlSync = false, scope = null, isolateHistoryByScope = false, agentTeamPollMs = DEFAULT_AGENT_TEAM_POLL_MS, ...props }) {
+export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderOverlay, contentHidden = false, apiUrl = agentNativePath("/_agent-native/agent-chat"), storageKey, restoreActiveThread = true, browserTabId, threadUrlSync = false, scope = null, isolateHistoryByScope = false, agentTeamPollMs = DEFAULT_AGENT_TEAM_POLL_MS, availableModels: hostAvailableModels, modelListLoading: hostModelListLoading, onModelChange: hostOnModelChange, ...props }) {
     const translate = useT();
     const contextNamespace = scope
         ? scope.contextKey?.trim() || `scope:${scope.type}:${scope.id}`
@@ -528,7 +527,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
     }, [switchThreadState, writeThreadUrl]);
     // Namespace all localStorage keys by storageKey when provided (for per-app isolation in frame)
     const keyPrefix = storageKey ? `:${storageKey}` : "";
-    const modelSelectionKey = `${MODEL_SELECTION_STORAGE_KEY}${keyPrefix}`;
+    const modelSelectionKey = chatModelSelectionStorageKey(storageKey);
     // Track which tabs have been focused at least once (lazy mount for sub-agent tabs)
     const mountedTabsRef = useRef(new Set());
     const activeThreadIdRef = useRef(activeThreadId);
@@ -557,8 +556,16 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         setPageOverlayScrolled(target.scrollTop > 1);
     }, [renderOverlay]);
     // ─── Model state ─────────────────────────────────────────────────────────
-    const [availableModels, setAvailableModels] = useState([]);
-    const [modelListLoading, setModelListLoading] = useState(true);
+    // A host that supplies its own catalog owns the whole picker: the server
+    // catalog must not be discovered or merged, or a host with no engine of its
+    // own silently gets this app's models instead.
+    const hostManagedModels = hostAvailableModels !== undefined;
+    const [discoveredModels, setDiscoveredModels] = useState([]);
+    const availableModels = hostAvailableModels ?? discoveredModels;
+    const [discoveredModelsLoading, setModelListLoading] = useState(true);
+    const modelListLoading = hostManagedModels
+        ? (hostModelListLoading ?? false)
+        : discoveredModelsLoading;
     const [defaultModel, setDefaultModel] = useState(DEFAULT_MODEL);
     const threadModelRef = useRef(new Map());
     const [persistedModelSelection, setPersistedModelSelection] = useState(() => readStoredModelSelection(modelSelectionKey));
@@ -666,6 +673,14 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         persistModelSelection,
         props.selectedAgent,
     ]);
+    // A host that owns the model list still needs the internal selection updated:
+    // `selectedModel`/`selectedEngine` render from it and submitted turns read it,
+    // so routing a pick only to the host snaps the picker back to the previous
+    // model and sends that one.
+    const handleModelChangeWithHost = useCallback((model, engine) => {
+        handleModelChange(model, engine);
+        hostOnModelChange?.(model, engine);
+    }, [handleModelChange, hostOnModelChange]);
     const handleEffortChange = useCallback((effort) => {
         const threadId = activeThreadIdRef.current;
         if (!threadId)
@@ -689,15 +704,19 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         resolveThreadModelSelection,
     ]);
     useEffect(() => {
-        const preferredAgentModel = props.selectedAgent
-            ? resolvePreferredAgentModel(props.selectedAgent, availableModels)
-            : undefined;
-        if (!preferredAgentModel)
-            return;
         const threadId = activeThreadIdRef.current;
         const current = threadId
             ? resolveThreadModelSelection(threadId)
             : persistedModelSelection;
+        // Only correct a selection the agent cannot run. This effect re-runs on
+        // every selection change, so an unconditional rewrite pins the picker and
+        // each later user pick snaps straight back.
+        const preferredAgentModel = isClaudeCodeAgentId(props.selectedAgent) &&
+            isLunaModel(current?.model ?? "")
+            ? resolvePreferredAgentModel(props.selectedAgent, availableModels)
+            : undefined;
+        if (!preferredAgentModel)
+            return;
         if (current?.model === preferredAgentModel.model &&
             current.engine === preferredAgentModel.engine) {
             return;
@@ -721,6 +740,8 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         resolveThreadModelSelection,
     ]);
     const refreshEngines = useCallback(() => {
+        if (hostManagedModels)
+            return;
         setModelListLoading(true);
         Promise.all([
             callAction("manage-agent-engine", { action: "list" }).catch(() => null),
@@ -751,12 +772,12 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
                 currentEngineName,
                 currentModel,
             });
-            setAvailableModels(groups);
+            setDiscoveredModels(groups);
             setDefaultModel(currentModel ?? DEFAULT_MODEL);
         })
             .catch(() => { })
             .finally(() => setModelListLoading(false));
-    }, []);
+    }, [hostManagedModels]);
     useEffect(() => {
         refreshEngines();
         window.addEventListener("agent-engine:configured-changed", refreshEngines);
@@ -1976,7 +1997,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
                                         ? clearActiveTab
                                         : undefined, isThreadStateLoading: isLoading, onMessageCountChange: (count) => setMessageCounts((prev) => prev[tabId] === count
                                         ? prev
-                                        : { ...prev, [tabId]: count }), onSaveThread: handleSaveThread, onGenerateTitle: handleGenerateTitle, onSlashCommand: handleSlashCommand, selectedModel: modelSelection?.model, selectedEngine: modelSelection?.engine, selectedEffort: modelSelection?.effort ?? DEFAULT_REASONING_EFFORT, composerSlot: props.composerSlot, defaultModel: defaultModel, availableModels: availableModels, modelListLoading: modelListLoading, onModelChange: handleModelChange, onEffortChange: handleEffortChange, onForkChat: () => handleForkChat(tabId), 
+                                        : { ...prev, [tabId]: count }), onSaveThread: handleSaveThread, onGenerateTitle: handleGenerateTitle, onSlashCommand: handleSlashCommand, selectedModel: modelSelection?.model, selectedEngine: modelSelection?.engine, selectedEffort: modelSelection?.effort ?? DEFAULT_REASONING_EFFORT, composerSlot: props.composerSlot, defaultModel: defaultModel, availableModels: availableModels, modelListLoading: modelListLoading, onModelChange: handleModelChangeWithHost, onEffortChange: handleEffortChange, onForkChat: () => handleForkChat(tabId), 
                                     // Sub-agent tabs are read-only: sending a new message from the
                                     // sub-agent tab would start a fresh run on that thread and kill
                                     // the in-flight team chunk. Disable the composer and show a

package/dist/client/agent-chat/index.d.ts

@@ -11,7 +11,7 @@ export { buildRepositoryFromCodeAgentTranscript, type BuildRepositoryFromCodeAge
 export { compareCodeAgentTranscriptEvents, getCodeAgentTranscriptSeq, isCodeAgentRunActive, mergeCodeAgentTranscriptEvents, type CodeAgentRunStateLike, type CodeAgentTranscriptOrderEvent, } from "../../code-agents/transcript-order.js";
 export { CREDENTIAL_GAP_SIGNAL, isCredentialGapCodeAgentEvent, } from "../../code-agents/transcript-normalizer.js";
 export { useSendToAgentChat } from "../use-send-to-agent-chat.js";
-export { useChatModels, type UseChatModelsResult, type EngineModelGroup, } from "../use-chat-models.js";
+export { chatModelSelectionStorageKey, useChatModels, type UseChatModelsResult, type EngineModelGroup, } from "../use-chat-models.js";
 export { CodeRequiredDialog, type CodeRequiredDialogProps, } from "../components/CodeRequiredDialog.js";
 export { ChatFirstAgentActivityPanel, type ChatFirstAgentActivityPanelProps, } from "../chat-first-agent-activity.js";
 export { ChatFirstSurfacePanelToggle } from "../chat-first-surface-panel-toggle.js";

package/dist/client/agent-chat/index.js

@@ -11,7 +11,7 @@ export { buildRepositoryFromCodeAgentTranscript, } from "../../agent/thread-data
 export { compareCodeAgentTranscriptEvents, getCodeAgentTranscriptSeq, isCodeAgentRunActive, mergeCodeAgentTranscriptEvents, } from "../../code-agents/transcript-order.js";
 export { CREDENTIAL_GAP_SIGNAL, isCredentialGapCodeAgentEvent, } from "../../code-agents/transcript-normalizer.js";
 export { useSendToAgentChat } from "../use-send-to-agent-chat.js";
-export { useChatModels, } from "../use-chat-models.js";
+export { chatModelSelectionStorageKey, useChatModels, } from "../use-chat-models.js";
 export { CodeRequiredDialog, } from "../components/CodeRequiredDialog.js";
 export { ChatFirstAgentActivityPanel, } from "../chat-first-agent-activity.js";
 export { ChatFirstSurfacePanelToggle } from "../chat-first-surface-panel-toggle.js";

package/dist/client/agent-page/use-jobs.d.ts

@@ -57,7 +57,8 @@ export type ManageJobInput = {
 };
 export type ManageAutomationInput = ManageJobInput;
 export interface RunAutomationNowInput {
-    name: string;
+    name?: string;
+    path?: string;
     scope: "personal" | "organization";
 }
 export interface RunAutomationNowResult {

package/dist/client/agent-page/use-jobs.js

@@ -87,12 +87,10 @@ export function useRunAutomationNow() {
     return useActionMutation("run-automation-now", {
         onSuccess: (_result, variables) => {
             const scope = variables.scope === "organization" ? "organization" : "personal";
+            const name = variables.name ??
+                variables.path?.replace(/^jobs\//, "").replace(/\.md$/, "");
             queryClient.invalidateQueries({
-                queryKey: [
-                    "action",
-                    "list-automation-runs",
-                    { scope, name: variables.name },
-                ],
+                queryKey: ["action", "list-automation-runs", { scope, name }],
             });
             queryClient.invalidateQueries({
                 queryKey: ["action", "list-automations", { scope }],

package/dist/client/agent-sidebar-state.js

@@ -1,4 +1,4 @@
-import { AGENT_SIDEBAR_QUERY_PARAM, AGENT_SIDEBAR_QUERY_VALUE_CLOSED, } from "../shared/agent-sidebar-url.js";
+import { AGENT_SIDEBAR_QUERY_PARAM, AGENT_SIDEBAR_QUERY_VALUE_CLOSED, AGENT_SIDEBAR_QUERY_VALUE_OPEN, } from "../shared/agent-sidebar-url.js";
 import { hasChatThreadDeepLink } from "./chat-thread-url.js";
 export { hasChatThreadDeepLink } from "./chat-thread-url.js";
 export const SIDEBAR_OPEN_KEY = "agent-native-sidebar-open";
@@ -62,6 +62,8 @@ export function getAgentSidebarUrlOpenOverride() {
         const value = url.searchParams.get(AGENT_SIDEBAR_QUERY_PARAM);
         if (value === AGENT_SIDEBAR_QUERY_VALUE_CLOSED)
             return false;
+        if (value === AGENT_SIDEBAR_QUERY_VALUE_OPEN)
+            return true;
     }
     catch { }
     return null;

package/dist/client/blocks/library/code-tabs.js

@@ -273,4 +273,9 @@ export const codeTabsBlock = defineBlock({
     label: "Code tabs",
     icon: IconCode,
     description: "A vertical file tab rail of syntax-highlighted code snippets, one tab per file with an optional language and caption.",
+    // `tabs` has schema min(1), so a fresh insert needs one starter tab — same
+    // shape `addTab` mints for a second tab.
+    empty: () => ({
+        tabs: [{ id: newCodeTabId(), label: "file-1.ts", code: "" }],
+    }),
 });

package/dist/client/blocks/library/code.js

@@ -131,4 +131,5 @@ export const codeBlock = defineBlock({
     label: "Code",
     icon: IconCode,
     description: "A single syntax-highlighted code snippet, Notion-style: one border, a hover language switcher + copy, and collapse-to-N lines. Put several in a `tabs` block for a file rail.",
+    empty: () => ({ code: "" }),
 });

package/dist/client/chat/message-components.d.ts

@@ -115,6 +115,13 @@ export declare function shouldShowMissingFinalResponse({ isCurrentTurnRunning, s
     hasActiveTool?: boolean;
     userStoppedRun?: boolean;
 }): boolean;
+/**
+ * "The agent stopped" is derived from local client state, which dips to
+ * not-running at every chunk boundary and transport re-attach while the turn is
+ * still alive server-side. Requiring the shape to hold for a beat keeps the
+ * notice off the screen for those gaps without hiding a real stop for long.
+ */
+export declare const MISSING_FINAL_RESPONSE_SETTLE_MS = 3000;
 export declare function useSettledFlag(active: boolean, delayMs: number): boolean;
 export declare function shouldShowAssistantWorkSummary({ isLast, isComplete, hasCollapsibleWork, hasUnresolvedTool, hasActiveTool, chatRunning, }: {
     isLast: boolean;

package/dist/client/chat/message-components.js

@@ -728,7 +728,7 @@ export function shouldShowMissingFinalResponse({ isCurrentTurnRunning, serverRun
  * still alive server-side. Requiring the shape to hold for a beat keeps the
  * notice off the screen for those gaps without hiding a real stop for long.
  */
-const MISSING_FINAL_RESPONSE_SETTLE_MS = 250;
+export const MISSING_FINAL_RESPONSE_SETTLE_MS = 3_000;
 export function useSettledFlag(active, delayMs) {
     const [settled, setSettled] = useState(false);
     useEffect(() => {

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

@@ -120,6 +120,9 @@ function isMissingLlmProviderRunError(info) {
         ((code === "missing_credentials" || code === "missing_api_key") &&
             !text.trim()));
 }
+function isDesktopChatRelayRunError(info) {
+    return [info.message, info.details].some((value) => typeof value === "string" && /desktop app chat relay failed/i.test(value));
+}
 // ─── BuilderConnectCta ────────────────────────────────────────────────────────
 // Renders a single row with left-aligned copy and a right-aligned action.
 // Click opens the Builder OAuth popup via the shared
@@ -210,7 +213,7 @@ export function RunErrorRecoveryCard({ info, onContinue, onRetry, onFork, onDism
     });
     const canRecover = info.recoverable === true;
     const shouldShowBuilderReconnect = isBuilderReconnectRunError(info);
-    const shouldShowMissingProviderSetup = isMissingLlmProviderRunError(info);
+    const shouldShowProviderSetup = isMissingLlmProviderRunError(info) || isDesktopChatRelayRunError(info);
     const isProviderAuthError = isProviderAuthenticationError([info.message, info.details].filter(Boolean).join("\n"), info.errorCode);
     // Blocked on something the reader goes and fixes elsewhere, then comes back
     // to. Recoverable runs and email verification keep a retry path; rejected
@@ -292,7 +295,7 @@ export function RunErrorRecoveryCard({ info, onContinue, onRetry, onFork, onDism
             onDismiss();
         }
     }, [builderReconnectResolved, onDismiss]);
-    if (shouldShowMissingProviderSetup) {
+    if (shouldShowProviderSetup) {
         return (_jsxs("div", { className: "w-full", children: [_jsx(BuilderSetupCard, { fullWidth: true, layout: "sidebar", onConnected: handleMissingProviderConnected }), providerConnected ? (_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")] }) })) : null] }));
     }
     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, {

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

@@ -1,6 +1,7 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { IconLoader2, IconAlertTriangle, IconCircleX, IconCheck, 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";
 import { writeClipboardText } from "../clipboard.js";
 import { Popover, PopoverContent, PopoverTrigger, } from "../components/ui/popover.js";
@@ -12,6 +13,7 @@ import { findMcpIntegrationForToolName } from "../resources/mcp-integration-cata
 import { McpIntegrationLogo } from "../resources/McpIntegrationLogo.js";
 import { BashCell, EditCell, WriteCell, FilesChangedSummary, } from "../tool-cells/index.js";
 import { humanizeToolName, isCallAgentToolCallShadowed, isToolCallActive, } from "../tool-display.js";
+import { useAgentChatContext } from "../use-agent-chat-context.js";
 import { cn } from "../utils.js";
 import { ActionChatUiSurface } from "./action-chat-ui-surface.js";
 import { SmoothMarkdownText, HighlightedCodeBlock, } from "./markdown-renderer.js";
@@ -280,6 +282,10 @@ function ApprovalAffordance({ toolName, toolCallId, approval, }) {
 }
 // ─── ToolCallDisplay ──────────────────────────────────────────────────────────
 export function ToolCallDisplay({ toolName, toolCallId, argsText, args, result, mcpApp, chatUI, isRunning, outcome, structuredMeta, activity, approval, repeatCount, isLatestRunning = isRunning, isActiveTail, }) {
+    const { items: agentChatContextItems } = useAgentChatContext(toolName === "connect-builder");
+    const builderContext = toolName === "connect-builder"
+        ? formatAgentChatContextItemsForPrompt(agentChatContextItems)
+        : "";
     const isDelegatedAgentCall = toolName === "call-agent" || toolName.startsWith("agent:");
     const effectiveIsRunning = isRunning ||
         (isDelegatedAgentCall &&
@@ -306,9 +312,9 @@ export function ToolCallDisplay({ toolName, toolCallId, argsText, args, result,
     if (toolKind === "write") {
         return wrapToolDisplay(_jsx(WriteCell, { meta: structuredMeta, isRunning: effectiveIsRunning }));
     }
-    return wrapToolDisplay(_jsx(ToolCallDisplayGeneric, { toolName: toolName, toolCallId: toolCallId, argsText: argsText, args: args, result: result, mcpApp: mcpApp, chatUI: chatUI, isRunning: effectiveIsRunning, outcome: outcome, isActiveTail: showActiveTail, structuredMeta: structuredMeta, approval: approval, repeatCount: repeatCount }));
+    return wrapToolDisplay(_jsx(ToolCallDisplayGeneric, { toolName: toolName, toolCallId: toolCallId, argsText: argsText, args: args, result: result, mcpApp: mcpApp, chatUI: chatUI, isRunning: effectiveIsRunning, outcome: outcome, isActiveTail: showActiveTail, structuredMeta: structuredMeta, approval: approval, repeatCount: repeatCount, context: builderContext }));
 }
-function ToolCallDisplayGeneric({ toolName, toolCallId, argsText, args, result, mcpApp, chatUI, isRunning, outcome, isActiveTail, structuredMeta, approval, repeatCount, }) {
+function ToolCallDisplayGeneric({ toolName, toolCallId, argsText, args, result, mcpApp, chatUI, isRunning, outcome, isActiveTail, structuredMeta, approval, repeatCount, context, }) {
     const t = useT();
     const suppressInlineOpenApp = React.useContext(SuppressInlineOpenAppContext);
     const isRawCallAgent = toolName === "call-agent";
@@ -339,7 +345,7 @@ function ToolCallDisplayGeneric({ toolName, toolCallId, argsText, args, result,
                 return (_jsx(ConnectBuilderCard, { configured: !!parsed.configured, builderEnabled: parsed.builderEnabled !== false, 
                     // Ignore obsolete direct-auth URLs from older tool results. The
                     // card fetches a fresh app-local connect URL on mount and click.
-                    connectUrl: parsed.connectUrl || "", orgName: parsed.orgName ?? null, prompt: typeof parsed.prompt === "string" ? parsed.prompt : "" }));
+                    connectUrl: parsed.connectUrl || "", orgName: parsed.orgName ?? null, prompt: typeof parsed.prompt === "string" ? parsed.prompt : "", context: context }));
             }
         }
         catch {