@agent-native/core 0.157.6 → 0.157.7

package/dist/client/AssistantChat.js

@@ -18,6 +18,7 @@ import { modelCatalogConfirmsMissing } from "./chat-model-groups.js";
 import { AGENT_CHAT_VIEW_TRANSITION_PREPARE_EVENT } from "./chat-view-transition.js";
 // ─── chat/ module imports ─────────────────────────────────────────────────────
 import { DownscalingImageAttachmentAdapter, BinaryDocumentAttachmentAdapter, MAX_ESTIMATED_BODY_BYTES, AGGRESSIVE_MAX_IMAGE_DIMENSION, AGGRESSIVE_JPEG_QUALITY, transcodeImageToDataURL, createAgentImageAttachments, serializeQueuedAttachments, estimateAttachmentBodyBytes, } from "./chat/attachment-adapters.js";
+import { readAssistantChatComposerDraft, writeAssistantChatComposerDraft, } from "./chat/composer-draft.js";
 import { TextStreamingContext } from "./chat/markdown-renderer.js";
 import { CheckpointContext, MessageActionsContext, assistantMessageRunId, UserMessage, AssistantMessage, SelectionAttachedPill, RunningActivityStatus, displayableUserMessageText, isHiddenUserMessage, ServerRunActiveContext, UserStoppedRunContext, } from "./chat/message-components.js";
 import { repoHasAssistantMessage, getRepoMessages, getRepoMessage, shouldImportServerThreadData, dedupeRepoMessagesById, dropEmptyAssistantMessages, withLastAssistantRunDuration, } from "./chat/repo-helpers.js";
@@ -288,12 +289,6 @@ function clearPendingSelection() {
         window.dispatchEvent(new CustomEvent("agent-panel:selection-cleared"));
     }
 }
-// Thread ids the server has already told us don't exist (a prior mount's
-// /threads/:id probe returned 404). Module-scoped so it survives remounts:
-// re-probing a known-absent thread on every navigation just re-spams DevTools
-// with 404s for a thread that has no server row yet (e.g. a freshly created,
-// not-yet-sent chat). Reset on a full page reload.
-const knownAbsentThreadIds = new Set();
 export async function waitForThreadRunToClear(apiUrl, threadId) {
     if (!threadId)
         return true;
@@ -1375,7 +1370,7 @@ export function useAutoResumeStatus(tabId, forceStopped) {
 function approvalResolutionIdentity(approvalKey, toolCallId) {
     return `${toolCallId ?? ""}\u0000${approvalKey}`;
 }
-const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateText, suggestions, dynamicSuggestions, threadFooterSlot, emptyStateAddon, showHeader = true, onSwitchToCli, className, apiUrl, tabId, browserTabId, threadId, contextScope, contextNamespace, isActiveComposer = true, onMessageCountChange, onSaveThread, onGenerateTitle, composerSlot, onComposerTextChange, composerAreaClassName, composerPlaceholder, missingApiKeySetupLayout = "default", composerLayoutVariant = "default", centerComposerWhenEmpty = false, emptyStateDisplay = "default", composerToolbarSlot, composerExtraActionButton, showModelSelector = true, composerDisabled = false, composerDisabledPlaceholder, isNewThread, isThreadStateLoading, onSlashCommand, execMode, onExecModeChange, approvalActions, planModeDisabled, planModeDisabledReason, selectedModel, defaultModel, selectedEngine, selectedEffort, availableModels, modelListLoading, onModelChange, onEffortChange, availableAgents, selectedAgent, onAgentChange, imageModelMenu, onForkChat, onConnectProvider, onConnectLocalRuntime, plusMenuMode = "full", providerStatusChecksEnabled = true, loadHistoryRepository, historyReloadKey, externalStreaming = false, agentChatSurface = "app", suppressInlineOpenApp = false, }, ref) {
+const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateText, suggestions, dynamicSuggestions, threadFooterSlot, emptyStateAddon, showHeader = true, onSwitchToCli, className, apiUrl, tabId, browserTabId, threadId, contextScope, contextNamespace, isActiveComposer = true, onMessageCountChange, onSaveThread, onGenerateTitle, composerSlot, onComposerTextChange, composerAreaClassName, composerPlaceholder, missingApiKeySetupLayout = "default", composerLayoutVariant = "default", centerComposerWhenEmpty = false, emptyStateDisplay = "default", composerToolbarSlot, composerExtraActionButton, showModelSelector = true, composerDisabled = false, composerDisabledPlaceholder, isNewThread, isThreadStateLoading, onSlashCommand, execMode, onExecModeChange, approvalActions, planModeDisabled, planModeDisabledReason, selectedModel, defaultModel, selectedEngine, selectedEffort, availableModels, modelListLoading, onModelChange, onEffortChange, availableAgents, selectedAgent, hostedHarness, onAgentChange, imageModelMenu, onForkChat, onConnectProvider, onConnectLocalRuntime, plusMenuMode = "full", providerStatusChecksEnabled = true, loadHistoryRepository, historyReloadKey, externalStreaming = false, agentChatSurface = "app", suppressInlineOpenApp = false, }, ref) {
     const t = useT();
     const thread = useThread();
     const threadRuntime = useThreadRuntime();
@@ -1419,10 +1414,13 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     // Cleared on the next message send.
     const [composerError, setComposerError] = useState(null);
     const [composerText, setComposerText] = useState("");
+    const composerDraftScope = threadId || tabId;
+    const initialComposerText = useMemo(() => readAssistantChatComposerDraft(composerDraftScope), [composerDraftScope]);
     const handleComposerTextChange = useCallback((text) => {
         setComposerText(text);
+        writeAssistantChatComposerDraft(composerDraftScope, text);
         onComposerTextChange?.(text);
-    }, [onComposerTextChange]);
+    }, [composerDraftScope, onComposerTextChange]);
     const dropDepthRef = useRef(0);
     const handleChatDragEnter = useCallback((e) => {
         if (!Array.from(e.dataTransfer?.types ?? []).includes("Files"))
@@ -1598,17 +1596,19 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             return next;
         });
     }, []);
-    useEffect(() => {
+    useBrowserLayoutEffect(() => {
         if (!isActiveComposer)
             return;
         let cancelled = false;
-        void refreshAgentChatContext().then((state) => {
+        const applyVisibleItems = (state) => {
             if (cancelled || !isActiveComposerRef.current)
                 return;
             const visibleItems = filterAgentChatContextItems(state.items, normalizedContextNamespace);
             composerContextItemsRef.current = visibleItems;
             setComposerContextItems(visibleItems);
-        });
+        };
+        applyVisibleItems(getAgentChatContextState());
+        void refreshAgentChatContext().then(applyVisibleItems);
         const unsubscribe = subscribeAgentChatContext(() => {
             if (cancelled || !isActiveComposerRef.current)
                 return;
@@ -1622,6 +1622,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             unsubscribe();
         };
     }, [isActiveComposer, normalizedContextNamespace]);
+    const visibleComposerContextItems = useMemo(() => filterAgentChatContextItems(composerContextItems, normalizedContextNamespace), [composerContextItems, normalizedContextNamespace]);
     // Tracks the JSON of the last queue we successfully persisted so the
     // debounced save effect can skip no-op writes (e.g. restore-from-server
     // on mount, or queue state that hasn't actually changed).
@@ -1824,11 +1825,21 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
     }, [optimisticRunning]);
     // ─── Chat persistence ──────────────────────────────────────────────
     const hasRestoredRef = useRef(false);
+    const [threadRestoreError, setThreadRestoreError] = useState(null);
+    const [restoreAttempt, setRestoreAttempt] = useState(0);
     const [initialCachedThreadSnapshot] = useState(() => readCachedThreadSnapshot(apiUrl, threadId));
     const hasImportedInitialCachedSnapshotRef = useRef(false);
     const [isRestoring, setIsRestoring] = useState(!!(threadId || loadHistoryRepository) &&
         !isNewThread &&
         !initialCachedThreadSnapshot);
+    const retryThreadRestore = useCallback(() => {
+        if (!threadId || isNewThread)
+            return;
+        hasRestoredRef.current = false;
+        setThreadRestoreError(null);
+        setIsRestoring(true);
+        setRestoreAttempt((attempt) => attempt + 1);
+    }, [isNewThread, threadId]);
     const onSaveThreadRef = useRef(onSaveThread);
     onSaveThreadRef.current = onSaveThread;
     const onGenerateTitleRef = useRef(onGenerateTitle);
@@ -2610,87 +2621,111 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             return;
         hasRestoredRef.current = true;
         if (loadHistoryRepository) {
+            let cancelled = false;
             (async () => {
                 try {
                     const repo = await loadHistoryRepository();
+                    if (cancelled)
+                        return;
                     if (repo) {
                         importThreadData(repo, { markTitleGenerated: true });
                     }
                     titleGeneratedRef.current = true;
+                    setThreadRestoreError(null);
                 }
                 catch {
-                    // Start fresh
+                    if (!cancelled)
+                        setThreadRestoreError("unavailable");
                 }
                 finally {
-                    setIsRestoring(false);
+                    if (!cancelled)
+                        setIsRestoring(false);
                 }
             })();
+            return () => {
+                cancelled = true;
+            };
         }
         else if (threadId && isNewThread) {
             // Client-created empty tabs do not have a server row until the first
             // message is sent. Avoid probing /threads/:id on mount; that request
             // can only 404 and makes normal app startup look broken in DevTools.
-            setIsRestoring(false);
-        }
-        else if (threadId && knownAbsentThreadIds.has(threadId)) {
-            // A prior mount already learned this thread has no server row (404).
-            // Skip the re-probe so remounts don't re-spam 404s for the same id.
+            setThreadRestoreError(null);
             setIsRestoring(false);
         }
         else if (threadId) {
+            let cancelled = false;
             (async () => {
+                let canReconnect = false;
                 try {
                     const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}`);
-                    if (res.ok) {
-                        const data = await res.json();
-                        if (data.threadData) {
-                            const repo = importThreadData(data.threadData, {
-                                markTitleGenerated: true,
-                            });
-                            if (repo) {
-                                let shouldCacheServerSnapshot = true;
-                                try {
-                                    shouldCacheServerSnapshot = shouldImportServerThreadData(normalizeThreadRepository(threadRuntime.export()), repo);
-                                }
-                                catch {
-                                    shouldCacheServerSnapshot = false;
-                                }
-                                if (shouldCacheServerSnapshot) {
-                                    const { title, preview } = extractThreadMeta(repo);
-                                    writeCachedThreadSnapshot(apiUrl, threadId, {
-                                        threadData: typeof data.threadData === "string"
-                                            ? data.threadData
-                                            : JSON.stringify(data.threadData),
-                                        title: data.title || title,
-                                        preview,
-                                        messageCount: Array.isArray(repo.messages)
-                                            ? repo.messages.length
-                                            : 0,
-                                    });
-                                }
+                    if (!res.ok) {
+                        if (!cancelled) {
+                            setThreadRestoreError(res.status === 404 ? "not-found" : "unavailable");
+                        }
+                        return;
+                    }
+                    const data = await res.json();
+                    if (cancelled || !data || typeof data !== "object") {
+                        if (!cancelled)
+                            setThreadRestoreError("unavailable");
+                        return;
+                    }
+                    if (!data.threadData) {
+                        if (!cancelled)
+                            setThreadRestoreError("unavailable");
+                        return;
+                    }
+                    if (data.threadData) {
+                        const repo = importThreadData(data.threadData, {
+                            markTitleGenerated: true,
+                        });
+                        if (repo) {
+                            let shouldCacheServerSnapshot = true;
+                            try {
+                                shouldCacheServerSnapshot = shouldImportServerThreadData(normalizeThreadRepository(threadRuntime.export()), repo);
+                            }
+                            catch {
+                                shouldCacheServerSnapshot = false;
+                            }
+                            if (shouldCacheServerSnapshot) {
+                                const { title, preview } = extractThreadMeta(repo);
+                                writeCachedThreadSnapshot(apiUrl, threadId, {
+                                    threadData: typeof data.threadData === "string"
+                                        ? data.threadData
+                                        : JSON.stringify(data.threadData),
+                                    title: data.title || title,
+                                    preview,
+                                    messageCount: Array.isArray(repo.messages)
+                                        ? repo.messages.length
+                                        : 0,
+                                });
                             }
                         }
                         // Also skip title generation if thread already has a title
                         if (data.title) {
                             titleGeneratedRef.current = true;
                         }
-                    }
-                    else if (res.status === 404) {
-                        // No server row for this thread yet — remember it so later remounts
-                        // skip the probe instead of re-fetching a known 404.
-                        knownAbsentThreadIds.add(threadId);
+                        if (!cancelled) {
+                            setThreadRestoreError(null);
+                            canReconnect = true;
+                        }
                     }
                 }
                 catch {
-                    // Start fresh
+                    if (!cancelled)
+                        setThreadRestoreError("unavailable");
                 }
                 finally {
                     // Clear the skeleton as soon as the persisted messages are imported.
                     // The active-run reconnect probe below must NOT gate first paint — it
                     // only matters when a run is mid-flight (e.g. after a hot reload), and
                     // it streams on top of the already-rendered messages.
-                    setIsRestoring(false);
+                    if (!cancelled)
+                        setIsRestoring(false);
                 }
+                if (cancelled || !canReconnect)
+                    return;
                 // Reconnect to an in-progress run after the skeleton has cleared, so a
                 // background `/runs/active` probe never delays showing the conversation.
                 try {
@@ -2700,6 +2735,9 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     // No active run to reconnect to.
                 }
             })();
+            return () => {
+                cancelled = true;
+            };
         }
         else {
             // Legacy: restore from sessionStorage
@@ -2726,6 +2764,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         loadHistoryRepository,
         isNewThread,
         isThreadStateLoading,
+        restoreAttempt,
     ]);
     useEffect(() => {
         if (!loadHistoryRepository ||
@@ -4063,6 +4102,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         !authError &&
         showEmptyState &&
         !isRestoring;
+    const threadRestoreErrorSurface = threadRestoreError ? (_jsxs("div", { role: "alert", className: "flex max-w-[320px] flex-col items-center gap-3 rounded-lg border border-border bg-muted/30 px-4 py-3 text-center", children: [_jsx(IconRefresh, { className: "h-5 w-5 text-muted-foreground" }), _jsx("p", { className: "text-sm text-muted-foreground", children: t("agentChat.message.restoreRequestFailed") }), _jsx("button", { type: "button", onClick: retryThreadRestore, className: "rounded-md border border-border px-3 py-1.5 text-xs font-medium text-foreground hover:bg-accent", children: t("agentChat.common.retry") })] })) : null;
     // Clarifying-question surface: the `ask-question` action writes a
     // GuidedQuestionPayload to application_state under "guided-questions". The
     // hook polls that key, and on submit/skip composes the answer as a normal
@@ -4079,7 +4119,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         showComposerSlot ||
         showCenteredEmptyThreadFooterSlot ||
         (guidedQuestions && guidedQuestions.length > 0) ||
-        composerContextItems.length > 0 ||
+        visibleComposerContextItems.length > 0 ||
         showPlanModeCallout ||
         showInlineMissingKeySetup);
     const approvalResolutionScope = threadId ?? tabId ?? "default";
@@ -4173,7 +4213,8 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                                 : "text-xs text-muted-foreground hover:text-foreground px-3 py-1.5 rounded-md border border-border hover:bg-accent", children: t("agentChat.auth.refreshChat") })] })] })) : isRestoring && centeredRestoringState ? (_jsxs("div", { className: cn("agent-empty-state", emptyStateDisplay === "hidden"
                                                                                 ? "sr-only"
                                                                                 : "flex h-full flex-col items-center justify-center gap-3 px-4 py-16"), "aria-busy": "true", children: [_jsx(IconMessage, { className: "h-5 w-5 text-muted-foreground/60" }), _jsx("p", { className: "sr-only", children: emptyStateText ??
-                                                                                        t("agentChat.empty.loadingChat") })] })) : isRestoring ? (_jsxs("div", { className: "flex flex-col gap-3 p-4", children: [_jsx("div", { className: "flex justify-end", children: _jsx("div", { className: "h-8 w-32 rounded-lg bg-muted animate-pulse" }) }), _jsxs("div", { className: "flex flex-col gap-1.5", children: [_jsx("div", { className: "h-4 w-48 rounded bg-muted animate-pulse" }), _jsx("div", { className: "h-4 w-64 rounded bg-muted animate-pulse" }), _jsx("div", { className: "h-4 w-40 rounded bg-muted animate-pulse" })] })] })) : showEmptyState ? (_jsxs("div", { className: cn("agent-empty-state", emptyStateDisplay === "hidden"
+                                                                                        t("agentChat.empty.loadingChat") })] })) : isRestoring ? (_jsxs("div", { className: "flex flex-col gap-3 p-4", children: [_jsx("div", { className: "flex justify-end", children: _jsx("div", { className: "h-8 w-32 rounded-lg bg-muted animate-pulse" }) }), _jsxs("div", { className: "flex flex-col gap-1.5", children: [_jsx("div", { className: "h-4 w-48 rounded bg-muted animate-pulse" }), _jsx("div", { className: "h-4 w-64 rounded bg-muted animate-pulse" }), _jsx("div", { className: "h-4 w-40 rounded bg-muted animate-pulse" })] })] })) : threadRestoreError &&
+                                                                            messages.length === 0 ? (_jsx("div", { className: "flex h-full flex-col items-center justify-center gap-3 px-4 py-16", children: threadRestoreErrorSurface })) : showEmptyState ? (_jsxs("div", { className: cn("agent-empty-state", emptyStateDisplay === "hidden"
                                                                                 ? "sr-only"
                                                                                 : "flex h-full flex-col items-center justify-center gap-3 px-4 py-16"), children: [_jsx(IconMessage, { className: "h-5 w-5 text-muted-foreground/60" }), _jsx("p", { className: "sr-only", children: emptyStateText ??
                                                                                         t("agentChat.empty.prompt") }), emptyStateAddon, resolvedSuggestions &&
@@ -4183,7 +4224,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                                 return;
                                                                                             }
                                                                                             void addToQueue(suggestion);
-                                                                                        }, className: "w-full px-2 py-1 text-center text-[13px] text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2", children: suggestion }, suggestion))) })) : null, showInlineEmptyThreadFooterSlot ? (_jsx("div", { className: "agent-thread-footer-slot agent-thread-footer-slot--empty", children: resolvedThreadFooterSlot })) : null] })) : (_jsxs(MessageScrollerContent, { className: "agent-thread-content gap-4 px-4 py-4", children: [_jsx(AssistantMessageListErrorBoundary, { resetKey: messageListResetKey, children: _jsx(UserStoppedRunContext.Provider, { value: wasRecentlyStoppedRun, children: _jsx(ThreadPrimitive.Messages
+                                                                                        }, className: "w-full px-2 py-1 text-center text-[13px] text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2", children: suggestion }, suggestion))) })) : null, showInlineEmptyThreadFooterSlot ? (_jsx("div", { className: "agent-thread-footer-slot agent-thread-footer-slot--empty", children: resolvedThreadFooterSlot })) : null] })) : (_jsxs(MessageScrollerContent, { className: "agent-thread-content gap-4 px-4 py-4", children: [threadRestoreErrorSurface ? (_jsx(MessageScrollerItem, { children: threadRestoreErrorSurface })) : null, _jsx(AssistantMessageListErrorBoundary, { resetKey: messageListResetKey, children: _jsx(UserStoppedRunContext.Provider, { value: wasRecentlyStoppedRun, children: _jsx(ThreadPrimitive.Messages
                                                                                         // Deliberately NOT keyed on part structure. Doing that
                                                                                         // remounted the whole transcript every time a tool call
                                                                                         // started or a placeholder id was rewritten — a flash and a
@@ -4252,7 +4293,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                                         "sidebar"
                                                                                                         ? t("agentChat.setup.connectToChat")
                                                                                                         : t("agentChat.setup.connectToStart") }), missingApiKeySetupLayout !==
-                                                                                                    "sidebar" ? (_jsx("span", { className: "agent-composer-missing-key-description", children: t("agentChat.setup.builderCredits") })) : null] }), _jsx("span", { className: "agent-composer-missing-key-cta", children: t("agentChat.setup.connectAi") })] }) }) })) : (_jsxs(_Fragment, { children: [_jsx(ComposerAttachmentPreviewStrip, {}), _jsx(TiptapComposer, { focusRef: tiptapRef, onTextChange: isActiveComposer
+                                                                                                    "sidebar" ? (_jsx("span", { className: "agent-composer-missing-key-description", children: t("agentChat.setup.builderCredits") })) : null] }), _jsx("span", { className: "agent-composer-missing-key-cta", children: t("agentChat.setup.connectAi") })] }) }) })) : (_jsxs(_Fragment, { children: [_jsx(ComposerAttachmentPreviewStrip, {}), _jsx(TiptapComposer, { focusRef: tiptapRef, initialText: initialComposerText ?? undefined, initialTextKey: composerDraftScope, onTextChange: isActiveComposer
                                                                                         ? handleComposerTextChange
                                                                                         : undefined, disabled: isComposerDisabled ||
                                                                                         showInlineMissingKeySetup, placeholder: showInlineMissingKeySetup
@@ -4269,16 +4310,16 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                                                                         })
                                                                                                         : t("agentChat.queue.followUp")
                                                                                                     : resolveAssistantChatComposerPlaceholder(composerPlaceholder), onSubmit: isRunning ||
-                                                                                        composerContextItems.length > 0
+                                                                                        visibleComposerContextItems.length > 0
                                                                                         ? (text, references, attachments, options) => void addToQueue(text, undefined, references.length > 0
                                                                                             ? references
                                                                                             : undefined, attachments, undefined, resolveAssistantChatSubmitIntent({
                                                                                             isRunning,
                                                                                             requestedIntent: options?.intent,
                                                                                         }), undefined, true)
-                                                                                        : undefined, willQueue: engineSetupRequired || isRunning, onSlashCommand: onSlashCommand, execMode: execMode, onExecModeChange: onExecModeChange, planModeDisabled: planModeDisabled, planModeDisabledReason: planModeDisabledReason, selectedModel: selectedModel ?? defaultModel, selectedEffort: selectedEffort, availableModels: availableModels, availableAgents: availableAgents, selectedAgent: selectedAgent, modelListLoading: modelListLoading, onModelChange: shouldShowAssistantChatModelSelector(showModelSelector)
+                                                                                        : undefined, willQueue: engineSetupRequired || isRunning, onSlashCommand: onSlashCommand, execMode: execMode, onExecModeChange: onExecModeChange, planModeDisabled: planModeDisabled, planModeDisabledReason: planModeDisabledReason, selectedModel: selectedModel ?? defaultModel, selectedEffort: selectedEffort, availableModels: availableModels, availableAgents: availableAgents, selectedAgent: selectedAgent, hostedHarness: hostedHarness, modelListLoading: modelListLoading, onModelChange: shouldShowAssistantChatModelSelector(showModelSelector)
                                                                                         ? onModelChange
-                                                                                        : undefined, onEffortChange: onEffortChange, onAgentChange: onAgentChange, imageModelMenu: imageModelMenu, onConnectProvider: onConnectProvider, onConnectLocalRuntime: onConnectLocalRuntime, toolbarSlot: composerToolbarSlot, contextItems: composerContextItems, onRemoveContextItem: removeComposerContextItem, plusMenuMode: plusMenuMode, layoutVariant: composerLayoutVariant, providerConnectStatusEnabled: providerStatusChecksEnabled, voiceEnabled: true, draftScope: threadId || tabId, interceptBuildRequestsForBuilder: true, onAttachmentError: setComposerError, extraActionButton: composerExtraActionButton, stopButton: showRunningInUI ? (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", onClick: () => stopActiveRun({
+                                                                                        : undefined, onEffortChange: onEffortChange, onAgentChange: onAgentChange, imageModelMenu: imageModelMenu, onConnectProvider: onConnectProvider, onConnectLocalRuntime: onConnectLocalRuntime, toolbarSlot: composerToolbarSlot, contextItems: visibleComposerContextItems, onRemoveContextItem: removeComposerContextItem, plusMenuMode: plusMenuMode, layoutVariant: composerLayoutVariant, providerConnectStatusEnabled: providerStatusChecksEnabled, voiceEnabled: true, draftScope: composerDraftScope, interceptBuildRequestsForBuilder: true, onAttachmentError: setComposerError, extraActionButton: composerExtraActionButton, stopButton: showRunningInUI ? (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", onClick: () => stopActiveRun({
                                                                                                         preserveQueuedMessages: true,
                                                                                                     }), "aria-label": t("agentChat.composer.stopResponse"), "data-agent-composer-slot": "stop-button", className: "shrink-0 flex h-7 w-7 cursor-pointer items-center justify-center rounded-full bg-primary text-primary-foreground shadow-sm transition-opacity hover:opacity-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2", children: _jsx(IconPlayerStopFilled, { className: "h-3 w-3" }) }) }), _jsx(TooltipContent, { children: t("agentChat.composer.stopResponse") })] })) : undefined })] })) }), showMissingKeySetup &&
                                                                         !showInlineMissingKeySetup ? (_jsx(PopoverContent, { side: missingApiKeySetupLayout === "sidebar"
@@ -4292,6 +4333,10 @@ export const AssistantChat = forwardRef(function AssistantChat({ apiUrl = agentN
     engineRef.current = props.selectedEngine;
     const effortRef = useRef(props.selectedEffort);
     effortRef.current = props.selectedEffort;
+    const harnessRef = useRef(props.hostedHarness ? props.selectedAgent : undefined);
+    harnessRef.current = props.hostedHarness ? props.selectedAgent : undefined;
+    const hostedHarnessRef = useRef(props.hostedHarness === true);
+    hostedHarnessRef.current = props.hostedHarness === true;
     const execModeRef = useRef(props.execMode);
     execModeRef.current = props.execMode;
     const scopeRef = useRef(contextScope);
@@ -4309,6 +4354,8 @@ export const AssistantChat = forwardRef(function AssistantChat({ apiUrl = agentN
             modelRef,
             engineRef,
             effortRef,
+            harnessRef,
+            hostedHarnessRef,
             execModeRef,
             browserTabId,
             scopeRef,

package/dist/client/MultiTabAssistantChat.js

@@ -1,6 +1,7 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { isClaudeCodeAgentId, isLunaModel, resolvePreferredAgentModel, } from "@agent-native/toolkit/composer/model-selection";
 import { IconPlus, IconHistory, IconX } from "@tabler/icons-react";
-import { useState, useRef, useEffect, useCallback } from "react";
+import { useState, useRef, useEffect, useLayoutEffect, useCallback, } from "react";
 import { DEFAULT_MODEL } from "../agent/default-model.js";
 import { DEFAULT_REASONING_EFFORT, isReasoningEffort, resolveReasoningEffortSelection, } from "../shared/reasoning-effort.js";
 import { AGENT_CHAT_CLEAR_CONTEXT_MESSAGE_TYPE, AGENT_CHAT_REMOVE_CONTEXT_MESSAGE_TYPE, AGENT_CHAT_SET_CONTEXT_MESSAGE_TYPE, appendAgentChatContextToMessage, claimAgentChatOpenRequest, claimAgentChatSubmit, drainBufferedAgentChatOpenRequests, drainBufferedAgentChatSubmits, filterAgentChatContextItems, getAgentChatContextState, isAgentChatSubmitCancelled, normalizeAgentChatContextItem, parseSubmitChatMessage, removeAgentChatContextItem, reportAgentChatSubmitResult, reportAgentChatSubmitTarget, setAgentChatContextItem, } from "./agent-chat.js";
@@ -20,6 +21,7 @@ import { CHAT_MODEL_SELECTION_CHANGED_EVENT } from "./use-chat-models.js";
 import { useChatThreads, } from "./use-chat-threads.js";
 import { usePollLoop } from "./use-poll-loop.js";
 import { cn } from "./utils.js";
+const useBrowserLayoutEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
 /** The single path that hands a queued send to a mounted chat ref. */
 function deliverPendingSend(ref, send) {
     if (isAgentChatSubmitCancelled(send.submitMessageId))
@@ -630,13 +632,23 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         const threadId = activeThreadIdRef.current;
         if (!threadId)
             return;
+        const preferredAgentModel = isClaudeCodeAgentId(props.selectedAgent) && isLunaModel(model)
+            ? resolvePreferredAgentModel(props.selectedAgent, availableModels)
+            : undefined;
+        const nextModel = preferredAgentModel?.model ?? model;
+        const nextEngine = preferredAgentModel?.engine ?? engine;
         const existing = threadModelRef.current.get(threadId);
-        const effort = resolveReasoningEffortSelection(model, existing?.effort);
-        const selection = { model, engine, effort };
+        const effort = resolveReasoningEffortSelection(nextModel, existing?.effort);
+        const selection = { model: nextModel, engine: nextEngine, effort };
         threadModelRef.current.set(threadId, selection);
         persistModelSelection(selection);
         bumpModelSelectionVersion();
-    }, [bumpModelSelectionVersion, persistModelSelection]);
+    }, [
+        availableModels,
+        bumpModelSelectionVersion,
+        persistModelSelection,
+        props.selectedAgent,
+    ]);
     const handleEffortChange = useCallback((effort) => {
         const threadId = activeThreadIdRef.current;
         if (!threadId)
@@ -659,6 +671,38 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         persistModelSelection,
         resolveThreadModelSelection,
     ]);
+    useEffect(() => {
+        const preferredAgentModel = props.selectedAgent
+            ? resolvePreferredAgentModel(props.selectedAgent, availableModels)
+            : undefined;
+        if (!preferredAgentModel)
+            return;
+        const threadId = activeThreadIdRef.current;
+        const current = threadId
+            ? resolveThreadModelSelection(threadId)
+            : persistedModelSelection;
+        if (current?.model === preferredAgentModel.model &&
+            current.engine === preferredAgentModel.engine) {
+            return;
+        }
+        const selection = {
+            model: preferredAgentModel.model,
+            engine: preferredAgentModel.engine,
+            effort: resolveReasoningEffortSelection(preferredAgentModel.model, current?.effort),
+        };
+        if (threadId) {
+            threadModelRef.current.set(threadId, selection);
+            bumpModelSelectionVersion();
+        }
+        persistModelSelection(selection);
+    }, [
+        availableModels,
+        bumpModelSelectionVersion,
+        persistedModelSelection,
+        props.selectedAgent,
+        persistModelSelection,
+        resolveThreadModelSelection,
+    ]);
     const refreshEngines = useCallback(() => {
         setModelListLoading(true);
         Promise.all([
@@ -771,7 +815,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
     openTabIdsRef.current = openTabIds;
     const initializedRef = useRef(false);
     const openTabsKeyRef = useRef(OPEN_TABS_KEY);
-    useEffect(() => {
+    useBrowserLayoutEffect(() => {
         const nextScope = scope;
         if (!nextScope)
             return;
@@ -782,7 +826,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         const marker = `Resource context: ${nextScope.type}:${nextScope.id}`;
         const existing = getAgentChatContextState().items.find((item) => item.key === key);
         let ownsContextItem = false;
-        if (!existing || existing.context.startsWith(marker)) {
+        if (!existing || existing.context.startsWith("Resource context:")) {
             setAgentChatContextItem({
                 key,
                 title,

package/dist/client/NewWorkspaceAppFlow.js

@@ -226,7 +226,13 @@ export function NewWorkspaceAppFlow({ sourceApp = "chat", className = "", dispat
                 setStatusMessage("Sent to Builder chat.");
             }
             else if (isDevMode) {
-                sendToAgentChat({ message, submit: true, type: "code", newTab: true });
+                sendToAgentChat({
+                    message,
+                    submit: true,
+                    type: "code",
+                    newTab: true,
+                    reuseEmptyTab: true,
+                });
                 setStatusMessage("Sent to the local agent.");
             }
             else {

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

@@ -61,6 +61,12 @@ export interface CreateAgentChatAdapterOptions {
     effortRef?: {
         current: ReasoningEffort | undefined;
     };
+    harnessRef?: {
+        current: string | undefined;
+    };
+    hostedHarnessRef?: {
+        current: boolean;
+    };
     execModeRef?: {
         current: "build" | "plan" | undefined;
     };

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

@@ -65,6 +65,10 @@ const MAX_HISTORY_ATTACHMENT_CHARS = 60_000;
 const MAX_OUTBOUND_ATTACHMENT_CHARS = 200_000;
 const MAX_HISTORY_MESSAGES = 24;
 const MAX_HISTORY_TOTAL_CHARS = 64_000;
+// Budget for everything actually said in the thread — every user ask and every
+// assistant conclusion. Separate from MAX_HISTORY_TOTAL_CHARS, which bounds the
+// tool args/results those turns produced. See limitPriorMessagesForRequest.
+const MAX_HISTORY_WORD_CHARS = 32_000;
 const MAX_HISTORY_MESSAGE_CHARS = 12_000;
 const MAX_HISTORY_TOOL_ARGS_CHARS = 8_000;
 const MAX_HISTORY_TOOL_RESULT_CHARS = 12_000;
@@ -765,20 +769,36 @@ function estimateHistoryMessageCost(message) {
 function limitPriorMessagesForRequest(messages) {
     const recent = messages.slice(-MAX_HISTORY_MESSAGES);
     const kept = [];
-    let totalChars = 0;
+    let words = 0;
+    let payload = 0;
     for (let i = recent.length - 1; i >= 0; i--) {
         const message = recent[i];
         if (message.role !== "user" && message.role !== "assistant")
             continue;
-        const cost = estimateHistoryMessageCost(message);
-        if (kept.length > 0 && totalChars + cost > MAX_HISTORY_TOTAL_CHARS) {
-            break;
-        }
-        kept.push(message);
-        totalChars += cost;
+        // What was said is cheap and cannot be re-derived; what a tool returned is
+        // ~97% of a tool-heavy turn and can always be re-read. Pricing both against
+        // one budget let a single read-heavy turn evict the whole conversation, so
+        // the agent re-derived the same answer and re-asked the same question.
+        const wordCost = messageTextForHistory(message).length;
+        if (kept.length > 0 && words + wordCost > MAX_HISTORY_WORD_CHARS)
+            continue;
+        const payloadCost = estimateHistoryMessageCost(message) - wordCost;
+        const affordsPayload = payload + payloadCost <= MAX_HISTORY_TOTAL_CHARS;
+        const content = affordsPayload
+            ? message.content
+            : message.content.filter((part) => part.type === "text");
+        if (!content.length)
+            continue;
+        kept.push(affordsPayload ? message : { ...message, content });
+        words += wordCost;
+        if (affordsPayload)
+            payload += payloadCost;
     }
     kept.reverse();
-    while (kept.length > 0 && kept[0].role !== "user") {
+    // Stop before emptying: this rule exists to start history on a user turn for
+    // providers that require it, not to license sending no history at all. It was
+    // the last step that turned an over-budget turn into a blank conversation.
+    while (kept.length > 1 && kept[0].role !== "user") {
         kept.shift();
     }
     return kept;
@@ -1471,6 +1491,8 @@ export function createAgentChatAdapter(options) {
     const modelRef = options?.modelRef;
     const engineRef = options?.engineRef;
     const effortRef = options?.effortRef;
+    const harnessRef = options?.harnessRef;
+    const hostedHarnessRef = options?.hostedHarnessRef;
     const execModeRef = options?.execModeRef;
     const browserTabId = options?.browserTabId;
     const scopeRef = options?.scopeRef;
@@ -1575,6 +1597,9 @@ export function createAgentChatAdapter(options) {
             const engine = runConfigSelection("engine") ?? engineRef?.current;
             const effort = runConfigSelection("effort") ??
                 effortRef?.current;
+            const harness = hostedHarnessRef?.current
+                ? (runConfigSelection("harness") ?? harnessRef?.current)
+                : undefined;
             const requestedTurnId = (() => {
                 const raw = runConfig?.custom && typeof runConfig.custom === "object"
                     ? runConfig.custom.turnId
@@ -1980,6 +2005,8 @@ export function createAgentChatAdapter(options) {
                 // "dev-frame" explicitly; the reusable in-product chat defaults to
                 // "app" even when it is running in Desktop or inside a preview iframe.
                 headers["x-agent-native-surface"] = surface;
+                if (harness)
+                    headers["x-agent-native-hosted-harness"] = "1";
                 const reconnectCurrentRun = async function* () {
                     if (!runId)
                         return false;
@@ -3066,6 +3093,7 @@ export function createAgentChatAdapter(options) {
                                 ...(model ? { model } : {}),
                                 ...(engine ? { engine } : {}),
                                 ...(effort ? { effort } : {}),
+                                ...(harness ? { harness: { runtime: harness } } : {}),
                                 ...(browserTabId ? { browserTabId } : {}),
                                 ...(scopeRef?.current ? { scope: scopeRef.current } : {}),
                                 ...(includeAttachments ? { attachments } : {}),

package/dist/client/app-chat-sidebar.d.ts

@@ -4,8 +4,11 @@ export declare const APP_CHAT_SIDEBAR_STATE_EVENT = "agent-native:per-app-chat-s
 export declare const APP_CHAT_SIDEBAR_STATE_MESSAGE = "agentNative.perAppChatState";
 /** Request sent by an iframe that mounted after the host announced its state. */
 export declare const APP_CHAT_SIDEBAR_STATE_REQUEST_MESSAGE = "agentNative.perAppChatStateRequest";
+export type AppChatSidebarCommand = "toggle" | "open" | "close";
 export interface AppChatSidebarState {
     open: boolean;
+    /** True when a parent shell owns chat for this app surface. */
+    hosted: boolean;
 }
 export declare function buildAppChatSidebarStateMessage(open: boolean): {
     type: typeof APP_CHAT_SIDEBAR_STATE_MESSAGE;
@@ -20,4 +23,6 @@ export declare function buildAppChatSidebarStateRequest(): {
  * agent panels from changing the app's navigation chrome.
  */
 export declare function isPerAppChatStorageKey(storageKey: string | undefined): boolean;
+export declare function requestPerAppChatCommand(command: AppChatSidebarCommand): boolean;
+export declare function usePerAppChatState(enabled?: boolean): AppChatSidebarState;
 export declare function usePerAppChatOpen(): boolean;