@agent-native/core 0.18.0 → 0.19.0

package/dist/client/AssistantChat.js

@@ -10,6 +10,7 @@ import { getActiveRun } from "./active-run-state.js";
 import { AgentAutoContinueSignal, readSSEStreamRaw, } from "./sse-event-processor.js";
 import { captureError } from "./analytics.js";
 import { cn } from "./utils.js";
+import { useNearBottomAutoscroll } from "./conversation/index.js";
 import { TextAttachmentAdapter } from "./composer/attachment-accept.js";
 import { AgentTaskCard } from "./AgentTaskCard.js";
 import { ConnectBuilderCard } from "./ConnectBuilderCard.js";
@@ -1713,7 +1714,6 @@ function ensureMessageMetadata(repo) {
 import { extractThreadMeta, normalizeThreadRepository, } from "../agent/thread-data-builder.js";
 export { extractThreadMeta };
 const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateText, suggestions, emptyStateAddon, showHeader = true, onSwitchToCli, className, apiUrl, tabId, threadId, onMessageCountChange, onSaveThread, onGenerateTitle, composerSlot, composerDisabled = false, composerDisabledPlaceholder, isNewThread, onSlashCommand, execMode, onExecModeChange, planModeDisabled, planModeDisabledReason, selectedModel, defaultModel, selectedEngine, selectedEffort, availableModels, onModelChange, onEffortChange, onForkChat, }, ref) {
-    const scrollRef = useRef(null);
     const thread = useThread();
     const threadRuntime = useThreadRuntime();
     const composerRuntime = useComposerRuntime();
@@ -2552,7 +2552,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             setForceStopped(false);
         }
     }, [isReconnecting, forceStopped]);
-    const addToQueue = useCallback(async (text, images, references, attachments, requestMode) => {
+    const addToQueue = useCallback(async (text, images, references, attachments, requestMode, intent = "queued") => {
         setShowContinue(false);
         setLoopLimitInfo(null);
         setRunErrorInfo(null);
@@ -2568,8 +2568,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         // user had scrolled up to read history. The sticky-bottom override
         // exists to stop streaming from yanking the viewport, not to swallow
         // direct sends.
-        isNearBottomRef.current = true;
-        setShowScrollToBottom(false);
+        markNearBottom();
         const queuedAttachments = await serializeQueuedAttachments(attachments);
         // Snapshot the exec mode at enqueue time when the caller didn't
         // pass an explicit override. Without this, a plan-mode message that
@@ -2581,7 +2580,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                 : execMode === "build"
                     ? "act"
                     : undefined);
-        if (isRunning) {
+        if (isRunning && intent === "queued") {
             setQueuedMessages((prev) => [
                 ...prev,
                 {
@@ -2640,40 +2639,10 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             };
         },
     }), [addToQueue, messages.length, thread.isRunning, threadRuntime]);
-    // Track whether user has scrolled away from bottom
-    const isNearBottomRef = useRef(true);
-    const [showScrollToBottom, setShowScrollToBottom] = useState(false);
-    useEffect(() => {
-        const el = scrollRef.current;
-        if (!el)
-            return;
-        function onScroll() {
-            if (!el)
-                return;
-            const threshold = 40;
-            const nearBottom = el.scrollHeight - el.scrollTop - el.clientHeight < threshold;
-            isNearBottomRef.current = nearBottom;
-            setShowScrollToBottom(!nearBottom && messages.length > 0);
-        }
-        el.addEventListener("scroll", onScroll, { passive: true });
-        return () => el.removeEventListener("scroll", onScroll);
-    }, [messages.length]);
-    const scrollToBottom = useCallback(() => {
-        const el = scrollRef.current;
-        if (el) {
-            el.scrollTop = el.scrollHeight;
-            isNearBottomRef.current = true;
-            setShowScrollToBottom(false);
-        }
-    }, []);
-    const scrollToBottomAfterPaint = useCallback(() => {
-        scrollToBottom();
-        requestAnimationFrame(() => {
-            scrollToBottom();
-            requestAnimationFrame(scrollToBottom);
-        });
-        setTimeout(scrollToBottom, 80);
-    }, [scrollToBottom]);
+    const { scrollRef, isNearBottomRef, showScrollToBottom, markNearBottom, scrollToBottom, scrollToBottomAfterPaint, } = useNearBottomAutoscroll({
+        followKey: [messages, queuedMessages],
+        streaming: isRunning,
+    });
     const scrollToBottomWhileLayoutSettles = useCallback(() => {
         scrollToBottomAfterPaint();
         const el = scrollRef.current;
@@ -2705,32 +2674,11 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             return scrollToBottomWhileLayoutSettles();
         }
     }, [isRestoring, scrollToBottomWhileLayoutSettles]);
-    // Auto-scroll on new messages or queued messages (only if near bottom)
-    useEffect(() => {
-        const el = scrollRef.current;
-        if (el && isNearBottomRef.current) {
-            scrollToBottomAfterPaint();
-        }
-    }, [messages, queuedMessages, scrollToBottomAfterPaint]);
     useEffect(() => {
         if (!isRunning && isNearBottomRef.current) {
             scrollToBottomAfterPaint();
         }
     }, [isRunning, scrollToBottomAfterPaint]);
-    // Continuous auto-scroll while streaming (only if near bottom)
-    useEffect(() => {
-        if (!isRunning)
-            return;
-        const el = scrollRef.current;
-        if (!el)
-            return;
-        const interval = setInterval(() => {
-            if (isNearBottomRef.current) {
-                el.scrollTop = el.scrollHeight;
-            }
-        }, 100);
-        return () => clearInterval(interval);
-    }, [isRunning]);
     const { isDevMode: cpDevMode } = useDevMode(apiUrl);
     const checkpointCtx = useMemo(() => ({ apiUrl, devMode: cpDevMode, threadId }), [apiUrl, cpDevMode, threadId]);
     const messageActionsCtx = useMemo(() => ({ onForkChat }), [onForkChat]);
@@ -2852,10 +2800,10 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                                                 "Open Desktop to use this chat.")
                                             : isRunning
                                                 ? queuedMessages.length > 0
-                                                    ? `${queuedMessages.length} queued — type another...`
-                                                    : "Queue a message..."
+                                                    ? `${queuedMessages.length} queued — send a follow-up...`
+                                                    : "Send a follow-up..."
                                                 : undefined, onSubmit: isRunning
-                                        ? (text, references, attachments) => void addToQueue(text, undefined, references.length > 0 ? references : undefined, attachments)
+                                        ? (text, references, attachments, options) => void addToQueue(text, undefined, references.length > 0 ? references : undefined, attachments, undefined, options?.intent ?? "immediate")
                                         : undefined, onSlashCommand: onSlashCommand, execMode: execMode, onExecModeChange: onExecModeChange, planModeDisabled: planModeDisabled, planModeDisabledReason: planModeDisabledReason, selectedModel: selectedModel ?? defaultModel, selectedEffort: selectedEffort, availableModels: availableModels, onModelChange: onModelChange, onEffortChange: onEffortChange, draftScope: threadId || tabId, interceptBuildRequestsForBuilder: true, extraActionButton: showRunningInUI ? (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", onClick: () => {
                                                         // Nuclear stop: flip forceStopped so isRunning is false
                                                         // immediately. This unblocks submission even if the