@serjm/deepseek-code 0.4.3 → 0.4.5

package/dist/ui/app.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useCallback, useRef, useEffect } from 'react';
-import { Box, Text, useInput, useApp, useStdin } from 'ink';
+import { Box, Text, useInput, useApp } from 'ink';
 import { ChatView } from './chat-view.js';
 import { InputBar } from './input-bar.js';
 import { StatusBar } from './status-bar.js';
@@ -20,6 +20,7 @@ import { i18n } from '../core/i18n.js';
 import { Logo, SetupWizard, useSetupWizard } from './setup-wizard.js';
 import { executeSlashCommand } from '../commands/index.js';
 import { checkLatestVersion } from '../commands/update-checker.js';
+import { logEvent } from '../utils/logger.js';
 /** Empty input hint timeout in ms before showing the guide text */
 const EMPTY_INPUT_HINT_DELAY = 2000;
 function stripExecutionSummary(content) {
@@ -43,6 +44,33 @@ function historyForModel(messages) {
         return [message];
     });
 }
+function isUserCancellationError(error, signal) {
+    if (!signal.aborted)
+        return false;
+    if (error.name === 'StreamTimeoutError')
+        return false;
+    const msg = error.message || '';
+    return error.name === 'AbortError' || /abort|cancel/i.test(msg);
+}
+function formatAgentError(error) {
+    const msg = error.message || '';
+    if (msg.includes('401') || msg.includes('403') || msg.includes('Unauthorized')) {
+        return i18n.t('apiErrorAuth');
+    }
+    if (msg.includes('429') || msg.includes('rate limit')) {
+        return i18n.t('apiErrorRateLimit');
+    }
+    if (/5\d{2}|server error|Service Unavailable/i.test(msg)) {
+        return i18n.t('apiErrorServer');
+    }
+    if (/ECONNRESET|ECONNREFUSED|ENOTFOUND/i.test(msg)) {
+        return i18n.t('apiErrorNetwork');
+    }
+    if (error.name === 'StreamTimeoutError' || /ETIMEDOUT|timed out|Stream timeout/i.test(msg)) {
+        return i18n.t('apiErrorTimeout');
+    }
+    return `${i18n.t('error')}: ${msg}`;
+}
 // Setup wizard step components are now in ./setup-wizard.tsx
 // Logo, SetupWizard, useSetupWizard imported from there
 export function App({ config, options }) {
@@ -50,12 +78,20 @@ export function App({ config, options }) {
     const [approvalMode, setApprovalMode] = useState(options.approvalMode ?? (options.turbo ? 'turbo' : config.approvalMode));
     const [messages, setMessages] = useState([]);
     const [isProcessing, setIsProcessing] = useState(false);
+    const [isPaused, setIsPaused] = useState(false);
+    const isPausedRef = useRef(false);
+    // Keep isPausedRef in sync so finally block can read it without stale closure
+    useEffect(() => { isPausedRef.current = isPaused; }, [isPaused]);
     const [statusText, setStatusText] = useState(i18n.t('ready'));
     const [localApiKey, setLocalApiKey] = useState(config.apiKey || '');
     const agentLoopRef = useRef(null);
     const abortControllerRef = useRef(null);
     const pendingApprovalResolveRef = useRef(null);
     const liveToolMessageIndexRef = useRef(-1);
+    // Tools belonging to the CURRENT (still-live) tool card. Each tool batch gets
+    // its own card so completed batches can be committed to the Static scrollback
+    // while only the active batch stays in the live region.
+    const currentCardToolsRef = useRef([]);
     const prevToolCallsRef = useRef([]);
     const [toolCalls, setToolCalls] = useState([]);
     const [pendingApproval, setPendingApproval] = useState(null);
@@ -68,20 +104,69 @@ export function App({ config, options }) {
     const initializedRef = useRef(false);
     const [emptyInputHint, setEmptyInputHint] = useState(false);
     const emptyInputTimerRef = useRef(null);
-    const [chatScrollOffset, setChatScrollOffset] = useState(0);
-    const [scrollMode, setScrollMode] = useState('follow');
-    const [newMessagesWhilePaused, setNewMessagesWhilePaused] = useState(false);
-    const visibleMessageCountRef = useRef(0);
+    // Chat history is rendered via Ink <Static> (see ChatView): finalized messages
+    // are printed once to the terminal scrollback (no flicker, native mouse scroll).
+    // `chatEpoch` remounts Static to reset the scrollback on /clear.
+    const [chatEpoch, setChatEpoch] = useState(0);
     const [contextPercent, setContextPercent] = useState(0);
+    const [compactProgress, setCompactProgress] = useState(0);
     const [totalTokens, setTotalTokens] = useState(0);
     const [estimatedCost, setEstimatedCost] = useState(0);
     const [pendingImage, setPendingImage] = useState(null);
+    const [followUpCount, setFollowUpCount] = useState(0);
     const [themePicker, setThemePicker] = useState(null);
     const [modelPicker, setModelPicker] = useState(null);
     const [langPicker, setLangPicker] = useState(null);
     const [serviceNotice, setServiceNotice] = useState(null);
     const serviceNoticeTimerRef = useRef(null);
     const budgetRef = useRef(undefined);
+    // Double Ctrl+C to exit when idle/paused (raw mode owns Ctrl+C on all platforms).
+    const ctrlCExitArmedRef = useRef(false);
+    const ctrlCExitTimerRef = useRef(null);
+    // ── Stream chunk batching ──────────────────────────────────────────────
+    const pendingChunksRef = useRef('');
+    const flushTimerRef = useRef(null);
+    // Flush buffered assistant text into the message list. Starting a new text
+    // block also finalizes the previous live tool card (→ compact) so it commits
+    // to the Static scrollback as a completed item.
+    const flushPending = useCallback(() => {
+        if (flushTimerRef.current) {
+            clearTimeout(flushTimerRef.current);
+            flushTimerRef.current = null;
+        }
+        const buffered = pendingChunksRef.current;
+        if (!buffered)
+            return;
+        pendingChunksRef.current = '';
+        setMessages(prev => {
+            const last = prev[prev.length - 1];
+            if (last?.role === 'assistant') {
+                const updated = [...prev];
+                updated[updated.length - 1] = { ...last, content: last.content + buffered };
+                return updated;
+            }
+            const updated = [...prev];
+            const cardIdx = liveToolMessageIndexRef.current;
+            if (cardIdx >= 0 && cardIdx < updated.length && updated[cardIdx]?.role === 'tool' && currentCardToolsRef.current.length > 0) {
+                updated[cardIdx] = {
+                    role: 'tool',
+                    content: JSON.stringify({ type: 'tool_activity_card', toolCalls: currentCardToolsRef.current, status: 'compact' }),
+                };
+            }
+            liveToolMessageIndexRef.current = -1;
+            currentCardToolsRef.current = [];
+            updated.push({ role: 'assistant', content: buffered });
+            return updated;
+        });
+    }, []);
+    const scheduleFlush = useCallback(() => {
+        if (flushTimerRef.current)
+            return;
+        flushTimerRef.current = setTimeout(() => {
+            flushTimerRef.current = null;
+            flushPending();
+        }, 75);
+    }, [flushPending]);
     const addServiceNotice = useCallback((text) => {
         setServiceNotice(text);
         if (serviceNoticeTimerRef.current)
@@ -167,60 +252,13 @@ export function App({ config, options }) {
             setStatusText(i18n.t('ready'));
         })();
     }, []);
-    // Register soft-cancel hook for the SIGINT handler in interactive.ts.
-    // While isProcessing, interactive.ts's onSIGINT calls this instead of process.exit().
-    useEffect(() => {
-        const proc = process;
-        if (isProcessing) {
-            proc.__agentSoftCancel = () => {
-                abortControllerRef.current?.abort();
-                if (pendingApprovalResolveRef.current) {
-                    pendingApprovalResolveRef.current(false);
-                    pendingApprovalResolveRef.current = null;
-                }
-                setPendingApproval(null);
-                setStatusText(i18n.t('cancelled'));
-            };
-        }
-        else {
-            proc.__agentSoftCancel = undefined;
-        }
-        return () => { proc.__agentSoftCancel = undefined; };
-    }, [isProcessing]);
-    const { stdin } = useStdin();
-    // Compensate scroll offset when new visible messages arrive while paused
-    useEffect(() => {
-        if (setupStepRef.current !== 'done')
-            return;
-        const visible = messages.filter(m => m.role !== 'tool').length;
-        if (scrollMode === 'paused' && visible > visibleMessageCountRef.current) {
-            const diff = visible - visibleMessageCountRef.current;
-            setChatScrollOffset(prev => prev + diff);
-            setNewMessagesWhilePaused(true);
-        }
-        visibleMessageCountRef.current = visible;
-    }, [messages.length, scrollMode]);
+    // __agentSoftCancel is now set synchronously in handleSubmit (before agentLoop.run())
+    // to eliminate the async useEffect race window on Windows where SIGINT fires
+    // before the effect commits. Cleanup is handled in finally block.
     // Sync prevToolCallsRef with toolCalls state
     useEffect(() => {
         prevToolCallsRef.current = toolCalls;
     }, [toolCalls]);
-    // Detect End key from raw stdin (Ink does not expose it in useInput)
-    useEffect(() => {
-        if (!stdin)
-            return;
-        const handler = (data) => {
-            if (setupStepRef.current !== 'done')
-                return;
-            const seq = data.toString();
-            if (seq === '\x1b[F' || seq === '\x1b[4~' || seq === '\x1b[8~' || seq === '\x1bOF') {
-                setChatScrollOffset(0);
-                setScrollMode('follow');
-                setNewMessagesWhilePaused(false);
-            }
-        };
-        stdin.on('data', handler);
-        return () => { stdin.off('data', handler); };
-    }, [stdin]);
     // Slash commands — delegated to commands/index.ts
     const handleSlashCommand = useCallback(async (input) => {
         const ctx = {
@@ -261,8 +299,18 @@ export function App({ config, options }) {
             emptyInputTimerRef.current = setTimeout(() => setEmptyInputHint(false), EMPTY_INPUT_HINT_DELAY);
             return;
         }
-        if (isProcessing)
+        if (isProcessing) {
+            // Live follow-up: inject into current active AgentLoop
+            if (agentLoopRef.current) {
+                agentLoopRef.current.addUserFollowUp(input.trim());
+                setFollowUpCount(c => c + 1);
+                addServiceNotice('[queue] Follow-up #' + (followUpCount + 1) + ' added. Agent will continue after current step.');
+            }
+            else {
+                addServiceNotice('Agent is not active. Send it as a new message.');
+            }
             return;
+        }
         // Handle setup wizard steps
         if (setupStep === 'apikey') {
             await handleApiKeySubmit(input);
@@ -278,6 +326,7 @@ export function App({ config, options }) {
                 }]);
             return;
         }
+        setIsPaused(false);
         if (input.startsWith('/')) {
             try {
                 const handled = await handleSlashCommand(input);
@@ -304,6 +353,23 @@ export function App({ config, options }) {
         }
         const abortController = new AbortController();
         abortControllerRef.current = abortController;
+        // SYNCHRONOUS: register soft-cancel hook before agentLoop.run().
+        // The old useEffect-based registration had a race window on Windows where
+        // SIGINT could fire between isProcessing=true and the effect commit.
+        const proc = process;
+        proc.__agentSoftCancel = () => {
+            logEvent('__agentSoftCancel invoked');
+            abortController.abort();
+            setIsPaused(true);
+            if (pendingApprovalResolveRef.current) {
+                pendingApprovalResolveRef.current(false);
+                pendingApprovalResolveRef.current = null;
+            }
+            setPendingApproval(null);
+            setStatusText(i18n.t('paused'));
+        };
+        proc.__agentAbortController = abortController;
+        logEvent('agent run: softCancel registered');
         let userContent = input;
         if (pendingImage) {
             userContent = [
@@ -325,9 +391,7 @@ export function App({ config, options }) {
         setStatusText(i18n.t('working'));
         setToolCalls([]);
         liveToolMessageIndexRef.current = -1;
-        setChatScrollOffset(0);
-        setScrollMode('follow');
-        setNewMessagesWhilePaused(false);
+        currentCardToolsRef.current = [];
         try {
             await hooksManager.execute('UserPromptSubmit', {
                 event: 'UserPromptSubmit',
@@ -340,21 +404,22 @@ export function App({ config, options }) {
                 signal: abortController.signal,
                 budget: budgetRef.current,
                 onToolCall: (tc) => {
+                    // Commit any buffered assistant text first so it lands above the card.
+                    flushPending();
                     const updatedCalls = [...prevToolCallsRef.current, tc];
                     prevToolCallsRef.current = updatedCalls;
                     setToolCalls(updatedCalls);
+                    currentCardToolsRef.current = [...currentCardToolsRef.current, tc];
                     setStatusText(`[tool] ${tc.name}...`);
-                    // Add/update live tool activity card in chat messages
+                    // Add/update the live tool activity card (one card per tool batch).
                     setMessages(prev => {
                         const idx = liveToolMessageIndexRef.current;
-                        const card = { type: 'tool_activity_card', toolCalls: updatedCalls, status: 'live' };
+                        const card = { type: 'tool_activity_card', toolCalls: currentCardToolsRef.current, status: 'live' };
                         if (idx >= 0 && idx < prev.length && prev[idx]?.role === 'tool') {
-                            // Update existing card
                             const updated = [...prev];
                             updated[idx] = { role: 'tool', content: JSON.stringify(card) };
                             return updated;
                         }
-                        // Add new card
                         liveToolMessageIndexRef.current = prev.length;
                         return [...prev, { role: 'tool', content: JSON.stringify(card) }];
                     });
@@ -364,16 +429,8 @@ export function App({ config, options }) {
                 },
                 onReasoningChunk: () => { },
                 onStreamChunk: (chunk) => {
-                    setMessages(prev => {
-                        const last = prev[prev.length - 1];
-                        if (last?.role === 'assistant') {
-                            // If last content is empty, replace with chunk; otherwise append
-                            const updated = [...prev];
-                            updated[updated.length - 1] = { ...last, content: last.content + chunk };
-                            return updated;
-                        }
-                        return [...prev, { role: 'assistant', content: chunk }];
-                    });
+                    pendingChunksRef.current += chunk;
+                    scheduleFlush();
                 },
                 // onResponse intentionally removed — onStreamChunk handles all text
                 // Avoids duplicate "assistant" message push that caused text doubling
@@ -382,6 +439,18 @@ export function App({ config, options }) {
                     // Handled by handleSubmit catch block — adding here would create duplicate
                     // assistant messages, breaking the conversation structure for the next request
                 },
+                onCompactStart: () => {
+                    setCompactProgress(5);
+                    setStatusText('Compacting context...');
+                },
+                onCompactProgress: (event) => {
+                    setCompactProgress(event.progress);
+                    setStatusText(`Compacting context ${event.progress}%...`);
+                },
+                onCompactEnd: (event) => {
+                    setCompactProgress(0);
+                    setStatusText(event.phase === 'done' ? 'Context compacted' : 'Context compact failed');
+                },
                 onApprovalRequest: async (toolName, args) => {
                     if (approvalModeRef.current === 'turbo')
                         return true;
@@ -399,6 +468,10 @@ export function App({ config, options }) {
                 },
             });
             const finalResponse = await agentLoopRef.current.run(input, historyForModel(messages));
+            // Abort during run: skip session save, let finally handle UI reset
+            if (abortController.signal.aborted) {
+                return;
+            }
             const toolHistory = agentLoopRef.current.getToolCallHistory();
             const bundleFile = await writeExecutionBundle({
                 sessionId: sessionIdRef.current,
@@ -440,15 +513,16 @@ export function App({ config, options }) {
             // Single batch: all final UI updates at once (no await between setState calls)
             setIsProcessing(false);
             setStatusText(i18n.t('ready'));
-            // Convert live tool activity card to compact summary
-            if (liveToolMessageIndexRef.current >= 0 && toolHistory.length > 0) {
+            // Finalize the last live tool batch (if the turn ended on tools) to compact.
+            if (liveToolMessageIndexRef.current >= 0 && currentCardToolsRef.current.length > 0) {
+                const cardTools = currentCardToolsRef.current;
                 setMessages(prev => {
                     const idx = liveToolMessageIndexRef.current;
                     if (idx >= 0 && idx < prev.length && prev[idx]?.role === 'tool') {
                         const updated = [...prev];
                         updated[idx] = {
                             role: 'tool',
-                            content: JSON.stringify({ type: 'tool_activity_card', toolCalls: toolHistory, status: 'compact' }),
+                            content: JSON.stringify({ type: 'tool_activity_card', toolCalls: cardTools, status: 'compact' }),
                         };
                         return updated;
                     }
@@ -456,33 +530,16 @@ export function App({ config, options }) {
                 });
             }
             liveToolMessageIndexRef.current = -1;
+            currentCardToolsRef.current = [];
         }
         catch (err) {
             const error = err;
-            // Don't show error on cancellation
-            if (error.name === 'AbortError' || error.message.includes('abort') || error.message.includes('cancel')) {
+            // User-triggered cancellation is expected and should not become an error message.
+            if (isUserCancellationError(error, abortController.signal)) {
                 return;
             }
-            const msg = error.message || '';
-            let friendlyMsg;
-            if (msg.includes('401') || msg.includes('403') || msg.includes('Unauthorized')) {
-                friendlyMsg = i18n.t('apiErrorAuth');
-            }
-            else if (msg.includes('429') || msg.includes('rate limit')) {
-                friendlyMsg = i18n.t('apiErrorRateLimit');
-            }
-            else if (/5\d{2}|server error|Service Unavailable/i.test(msg)) {
-                friendlyMsg = i18n.t('apiErrorServer');
-            }
-            else if (/ECONNRESET|ECONNREFUSED|ENOTFOUND/i.test(msg)) {
-                friendlyMsg = i18n.t('apiErrorNetwork');
-            }
-            else if (/ETIMEDOUT|timed out/i.test(msg)) {
-                friendlyMsg = i18n.t('apiErrorTimeout');
-            }
-            else {
-                friendlyMsg = `${i18n.t('error')}: ${msg}`;
-            }
+            const friendlyMsg = formatAgentError(error);
+            const toolHistory = agentLoopRef.current?.getToolCallHistory() ?? [];
             setMessages(prev => [...prev, {
                     role: 'assistant',
                     content: friendlyMsg,
@@ -492,16 +549,31 @@ export function App({ config, options }) {
                 prompt: input,
                 error: friendlyMsg,
                 approvalMode,
+                toolCalls: toolHistory.map(toolCall => ({
+                    name: toolCall.name,
+                    status: toolCall.status,
+                    durationMs: toolCall.durationMs,
+                    error: toolCall.error,
+                })),
             });
             const bundleFile = await writeExecutionBundle({
                 sessionId: sessionIdRef.current,
                 prompt: input,
                 error: friendlyMsg,
                 approvalMode,
+                toolCalls: toolHistory.map(toolCall => ({
+                    id: toolCall.id,
+                    name: toolCall.name,
+                    status: toolCall.status,
+                    durationMs: toolCall.durationMs,
+                    error: toolCall.error,
+                    result: toolCall.result,
+                })),
             });
             await saveSession({
                 id: sessionIdRef.current,
                 messageCount: messages.length + 2,
+                toolCallCount: toolHistory.length,
                 approvalMode,
                 lastPrompt: input,
                 lastError: friendlyMsg,
@@ -511,9 +583,14 @@ export function App({ config, options }) {
             });
         }
         finally {
+            logEvent('agent run: finally (clearing softCancel)');
             // Safety net: ensure UI is always reset regardless of exit path
+            flushPending();
             setIsProcessing(false);
-            setStatusText(i18n.t('ready'));
+            // Don't overwrite status if user paused the agent
+            if (!isPausedRef.current) {
+                setStatusText(i18n.t('ready'));
+            }
             // Clear any pending approval (covers error/abort exit paths)
             if (pendingApprovalResolveRef.current) {
                 pendingApprovalResolveRef.current(false);
@@ -523,29 +600,58 @@ export function App({ config, options }) {
             if (abortControllerRef.current === abortController) {
                 abortControllerRef.current = null;
             }
+            // Cleanup synchronous SIGINT hooks
+            const proc2 = process;
+            if (proc2.__agentSoftCancel)
+                proc2.__agentSoftCancel = undefined;
+            if (proc2.__agentAbortController === abortController)
+                proc2.__agentAbortController = undefined;
         }
     }, [messages, isProcessing, setupStep, handleApiKeySubmit, handleSlashCommand, approvalMode, config, localApiKey]);
     useInput((_input, key) => {
         const step = setupStepRef.current;
-        // Ctrl+C: delegate to interactive.ts SIGINT handler.
-        // - During processing: soft cancel (via __agentSoftCancel)
-        // - During Ready: double Ctrl+C guard (first shows hint, second exits)
-        // - Never call exit() here — that would bypass the double-Ctrl+C guard.
+        // Ctrl+C is handled here because Ink raw mode delivers it as input (not a
+        // SIGINT signal) on all platforms when exitOnCtrlC is false. The SIGINT
+        // handler in interactive.ts is only a fallback for non-TTY runs.
+        // - While the agent runs: first Ctrl+C aborts/pauses, never exits.
+        // - When idle or already paused: double Ctrl+C within 3s exits.
         if (key.ctrl && _input === 'c') {
-            if (isProcessing && abortControllerRef.current) {
+            logEvent('useInput Ctrl+C', { isProcessing, isPaused, hasAbort: !!abortControllerRef.current, step });
+            if (isProcessing && abortControllerRef.current && !isPaused) {
+                logEvent('useInput Ctrl+C -> abort+pause');
                 abortControllerRef.current.abort();
-                setStatusText(i18n.t('cancelled'));
+                setIsPaused(true);
+                setStatusText(i18n.t('paused'));
                 if (pendingApprovalResolveRef.current) {
                     pendingApprovalResolveRef.current(false);
                     pendingApprovalResolveRef.current = null;
                 }
                 setPendingApproval(null);
+                // Reset exit-arming: the interrupt is the user's action this press.
+                ctrlCExitArmedRef.current = false;
+                if (ctrlCExitTimerRef.current) {
+                    clearTimeout(ctrlCExitTimerRef.current);
+                    ctrlCExitTimerRef.current = null;
+                }
                 return;
             }
-            // When not processing: set flag so SIGINT handler can exit immediately
-            // (interactive.ts checks __pendingExit for immediate exit after agent finishes)
-            const proc = process;
-            proc.__pendingExit = true;
+            // Idle or paused — second press within the window exits.
+            if (ctrlCExitArmedRef.current) {
+                logEvent('useInput Ctrl+C -> doublePress -> exit()');
+                if (ctrlCExitTimerRef.current)
+                    clearTimeout(ctrlCExitTimerRef.current);
+                exit();
+                return;
+            }
+            logEvent('useInput Ctrl+C -> firstPress armed');
+            ctrlCExitArmedRef.current = true;
+            addServiceNotice(i18n.t('ctrlCHint'));
+            if (ctrlCExitTimerRef.current)
+                clearTimeout(ctrlCExitTimerRef.current);
+            ctrlCExitTimerRef.current = setTimeout(() => {
+                ctrlCExitArmedRef.current = false;
+                ctrlCExitTimerRef.current = null;
+            }, 3000);
             return;
         }
         // When not in setup mode, let InputBar handle all keyboard input
@@ -632,26 +738,9 @@ export function App({ config, options }) {
                 });
                 return;
             }
-            // Scroll chat history — always works regardless of processing state.
-            // PageUp: scroll up by ~half a screen
-            if (key.pageUp) {
-                const visibleCount = messages.filter(m => m.role !== 'tool').length;
-                const next = Math.min(chatScrollOffset + 10, Math.max(0, visibleCount - 1));
-                if (next > 0)
-                    setScrollMode('paused');
-                setChatScrollOffset(next);
-                return;
-            }
-            // PageDown: scroll down by ~half a screen
-            if (key.pageDown) {
-                const next = Math.max(0, chatScrollOffset - 10);
-                setChatScrollOffset(next);
-                if (next === 0) {
-                    setScrollMode('follow');
-                    setNewMessagesWhilePaused(false);
-                }
-                return;
-            }
+            // Chat history scrolling is handled natively by the terminal (messages are
+            // committed to the scrollback via Ink <Static>), so PageUp/PageDown are no
+            // longer intercepted here.
             // Theme picker: interactive selection
             if (themePicker) {
                 if (key.escape) {
@@ -738,23 +827,10 @@ export function App({ config, options }) {
                 }
                 return;
             }
-            // ArrowUp/ArrowDown: scroll by 1 line, but only when InputBar is disabled (processing)
-            // When InputBar is active, arrows belong to input history/suggestions.
-            if (key.upArrow && isProcessing) {
-                const visibleCount = messages.filter(m => m.role !== 'tool').length;
-                const next = Math.min(chatScrollOffset + 1, Math.max(0, visibleCount - 1));
-                if (next > 0)
-                    setScrollMode('paused');
-                setChatScrollOffset(next);
-                return;
-            }
-            if (key.downArrow && isProcessing) {
-                const next = Math.max(0, chatScrollOffset - 1);
-                setChatScrollOffset(next);
-                if (next === 0) {
-                    setScrollMode('follow');
-                    setNewMessagesWhilePaused(false);
-                }
+            // Esc when paused: dismiss pause, return to ready
+            if (key.escape && isPaused && !pendingApproval && !pendingClear && !themePicker && !modelPicker && !langPicker) {
+                setIsPaused(false);
+                setStatusText(i18n.t('ready'));
                 return;
             }
             return;
@@ -866,9 +942,7 @@ export function App({ config, options }) {
         setToolCalls([]);
         setPendingApproval(null);
         setPendingImage(null);
-        setScrollMode('follow');
-        setNewMessagesWhilePaused(false);
-        setChatScrollOffset(0);
+        setChatEpoch(e => e + 1); // remount Static so the scrollback resets
         liveToolMessageIndexRef.current = -1;
         setServiceNotice(null);
         if (serviceNoticeTimerRef.current) {
@@ -887,7 +961,7 @@ export function App({ config, options }) {
     }, [messages.length, toolCalls.length, executeClear]);
     const handleExit = useCallback(() => { exit(); }, [exit]);
     const colors = themeManager.getColors();
-    return (_jsxs(Box, { flexDirection: 'column', height: '100%', children: [setupStep !== 'done'
+    return (_jsxs(Box, { flexDirection: 'column', children: [setupStep !== 'done'
                 ? _jsx(SetupWizard, { state: {
                         step: setupStep,
                         apiKeyError,
@@ -898,21 +972,14 @@ export function App({ config, options }) {
                         langOptions,
                         modeOptions,
                     } })
-                : (_jsxs(Box, { flexDirection: 'column', flexGrow: 1, children: [_jsx(Logo, {}), _jsx(ChatView, { messages: messages, scrollOffset: chatScrollOffset, hasNewMessages: newMessagesWhilePaused }), serviceNotice && (_jsx(Box, { marginLeft: 2, marginBottom: 1, children: _jsx(Text, { color: colors.primary, children: serviceNotice }) })), themePicker && (_jsxs(Box, { flexDirection: 'column', marginLeft: 2, marginBottom: 1, borderStyle: 'round', borderColor: colors.primary, children: [_jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { bold: true, color: colors.primary, children: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0442\u0435\u043C\u0443" }) }), _jsx(Box, { marginLeft: 1, marginTop: 1, flexDirection: 'column', children: themePicker.themes.map((t, i) => (_jsx(Box, { children: _jsxs(Text, { color: i === themePicker.selectedIndex ? colors.primary : colors.textMuted, children: [i === themePicker.selectedIndex ? '▸ ' : '  ', t.name, t.name === themeManager.theme.name ? ' (текущая)' : ''] }) }, t.name))) }), _jsx(Box, { marginLeft: 1, marginBottom: 1, marginTop: 1, children: _jsx(Text, { color: colors.textMuted, children: "\u2191\u2193 \u2014 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F  Enter \u2014 \u043F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C  Esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0430" }) })] })), modelPicker && (_jsxs(Box, { flexDirection: 'column', marginLeft: 2, marginBottom: 1, borderStyle: 'round', borderColor: colors.primary, children: [_jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { bold: true, color: colors.primary, children: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043C\u043E\u0434\u0435\u043B\u044C" }) }), _jsx(Box, { marginLeft: 1, marginTop: 1, flexDirection: 'column', children: DEEPSEEK_MODELS.map((m, i) => (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { color: i === modelPicker.selectedIndex ? colors.primary : colors.textMuted, children: [i === modelPicker.selectedIndex ? '▸ ' : '  ', _jsx(Text, { bold: i === modelPicker.selectedIndex, children: m.label }), m.id === config.model ? _jsx(Text, { dimColor: true, children: " (\u0442\u0435\u043A\u0443\u0449\u0430\u044F)" }) : null] }), _jsxs(Text, { dimColor: true, children: ['    ', m.description] })] }, m.id))) }), _jsx(Box, { marginLeft: 1, marginBottom: 1, marginTop: 1, children: _jsx(Text, { color: colors.textMuted, children: "\u2191\u2193 \u2014 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F  Enter \u2014 \u043F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C  Esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0430" }) })] })), langPicker && (_jsxs(Box, { flexDirection: 'column', marginLeft: 2, marginBottom: 1, borderStyle: 'round', borderColor: colors.primary, children: [_jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { bold: true, color: colors.primary, children: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u044F\u0437\u044B\u043A / Select language / \u9009\u62E9\u8BED\u8A00" }) }), _jsx(Box, { marginLeft: 1, marginTop: 1, flexDirection: 'column', children: i18n.listLocales().map((loc, i) => (_jsx(Box, { children: _jsxs(Text, { color: i === langPicker.selectedIndex ? colors.primary : colors.textMuted, children: [i === langPicker.selectedIndex ? '▸ ' : '  ', loc.name, loc.code === i18n.getLocale() ? _jsx(Text, { dimColor: true, children: " (\u0442\u0435\u043A\u0443\u0449\u0438\u0439)" }) : null] }) }, loc.code))) }), _jsx(Box, { marginLeft: 1, marginBottom: 1, marginTop: 1, children: _jsx(Text, { color: colors.textMuted, children: "\u2191\u2193 \u2014 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F  Enter \u2014 \u043F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C  Esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0430" }) })] })), pendingApproval && (_jsxs(Box, { flexDirection: 'column', marginLeft: 2, marginBottom: 1, borderStyle: 'round', borderColor: colors.warning, children: [_jsx(Box, { children: _jsx(Text, { bold: true, color: colors.warning, children: "\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C \u0432\u044B\u0437\u043E\u0432 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0430?" }) }), _jsx(Box, { marginLeft: 1, children: _jsx(Text, { bold: true, color: colors.text, children: pendingApproval.toolName }) }), _jsx(Box, { marginLeft: 1, children: _jsx(Text, { color: colors.textMuted, children: JSON.stringify(pendingApproval.args, null, 2).slice(0, 200) }) }), _jsxs(Box, { flexDirection: 'column', marginTop: 1, children: [[
+                : (_jsxs(Box, { flexDirection: 'column', children: [_jsx(ChatView, { messages: messages, isProcessing: isProcessing, epoch: chatEpoch, header: _jsx(Logo, {}) }), serviceNotice && (_jsx(Box, { marginLeft: 2, marginBottom: 1, children: _jsx(Text, { color: colors.primary, children: serviceNotice }) })), themePicker && (_jsxs(Box, { flexDirection: 'column', marginLeft: 2, marginBottom: 1, borderStyle: 'round', borderColor: colors.primary, children: [_jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { bold: true, color: colors.primary, children: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0442\u0435\u043C\u0443" }) }), _jsx(Box, { marginLeft: 1, marginTop: 1, flexDirection: 'column', children: themePicker.themes.map((t, i) => (_jsx(Box, { children: _jsxs(Text, { color: i === themePicker.selectedIndex ? colors.primary : colors.textMuted, children: [i === themePicker.selectedIndex ? '▸ ' : '  ', t.name, t.name === themeManager.theme.name ? ' (текущая)' : ''] }) }, t.name))) }), _jsx(Box, { marginLeft: 1, marginBottom: 1, marginTop: 1, children: _jsx(Text, { color: colors.textMuted, children: "\u2191\u2193 \u2014 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F  Enter \u2014 \u043F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C  Esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0430" }) })] })), modelPicker && (_jsxs(Box, { flexDirection: 'column', marginLeft: 2, marginBottom: 1, borderStyle: 'round', borderColor: colors.primary, children: [_jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { bold: true, color: colors.primary, children: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043C\u043E\u0434\u0435\u043B\u044C" }) }), _jsx(Box, { marginLeft: 1, marginTop: 1, flexDirection: 'column', children: DEEPSEEK_MODELS.map((m, i) => (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { color: i === modelPicker.selectedIndex ? colors.primary : colors.textMuted, children: [i === modelPicker.selectedIndex ? '▸ ' : '  ', _jsx(Text, { bold: i === modelPicker.selectedIndex, children: m.label }), m.id === config.model ? _jsx(Text, { dimColor: true, children: " (\u0442\u0435\u043A\u0443\u0449\u0430\u044F)" }) : null] }), _jsxs(Text, { dimColor: true, children: ['    ', m.description] })] }, m.id))) }), _jsx(Box, { marginLeft: 1, marginBottom: 1, marginTop: 1, children: _jsx(Text, { color: colors.textMuted, children: "\u2191\u2193 \u2014 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F  Enter \u2014 \u043F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C  Esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0430" }) })] })), langPicker && (_jsxs(Box, { flexDirection: 'column', marginLeft: 2, marginBottom: 1, borderStyle: 'round', borderColor: colors.primary, children: [_jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { bold: true, color: colors.primary, children: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u044F\u0437\u044B\u043A / Select language / \u9009\u62E9\u8BED\u8A00" }) }), _jsx(Box, { marginLeft: 1, marginTop: 1, flexDirection: 'column', children: i18n.listLocales().map((loc, i) => (_jsx(Box, { children: _jsxs(Text, { color: i === langPicker.selectedIndex ? colors.primary : colors.textMuted, children: [i === langPicker.selectedIndex ? '▸ ' : '  ', loc.name, loc.code === i18n.getLocale() ? _jsx(Text, { dimColor: true, children: " (\u0442\u0435\u043A\u0443\u0449\u0438\u0439)" }) : null] }) }, loc.code))) }), _jsx(Box, { marginLeft: 1, marginBottom: 1, marginTop: 1, children: _jsx(Text, { color: colors.textMuted, children: "\u2191\u2193 \u2014 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F  Enter \u2014 \u043F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C  Esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0430" }) })] })), pendingApproval && (_jsxs(Box, { flexDirection: 'column', marginLeft: 2, marginBottom: 1, borderStyle: 'round', borderColor: colors.warning, children: [_jsx(Box, { children: _jsx(Text, { bold: true, color: colors.warning, children: "\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C \u0432\u044B\u0437\u043E\u0432 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0430?" }) }), _jsx(Box, { marginLeft: 1, children: _jsx(Text, { bold: true, color: colors.text, children: pendingApproval.toolName }) }), _jsx(Box, { marginLeft: 1, children: _jsx(Text, { color: colors.textMuted, children: JSON.stringify(pendingApproval.args, null, 2).slice(0, 200) }) }), _jsxs(Box, { flexDirection: 'column', marginTop: 1, children: [[
                                             '[ok]   Подтвердить',
                                             '[no]   Отклонить',
                                             `[mute] Не спрашивать для "${pendingApproval.toolName}"`,
                                             '[turbo] Выполнять всё без вопросов',
-                                        ].map((label, i) => (_jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: approvalCursor === i ? colors.primary : colors.text, children: [approvalCursor === i ? '> ' : '  ', label] }) }, i))), _jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { color: colors.textMuted, children: "\u2191\u2193 \u2014 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F  Enter \u2014 \u0432\u044B\u0431\u0440\u0430\u0442\u044C  Esc \u2014 \u043E\u0442\u043A\u043B\u043E\u043D\u0438\u0442\u044C" }) })] })] })), pendingClear && (_jsxs(Box, { flexDirection: 'column', marginLeft: 2, marginBottom: 1, borderStyle: 'round', borderColor: colors.warning, children: [_jsx(Box, { children: _jsx(Text, { bold: true, color: colors.warning, children: "\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0447\u0430\u0442\u0430?" }) }), _jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: colors.textMuted, children: [messages.length, " \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 \u0431\u0443\u0434\u0435\u0442 \u0443\u0434\u0430\u043B\u0435\u043D\u043E. \u041E\u0442\u043C\u0435\u043D\u0443 \u043D\u0435\u043B\u044C\u0437\u044F."] }) }), _jsxs(Box, { flexDirection: 'column', marginTop: 1, children: [['[ok] Да, очистить', '[no] Отмена'].map((label, i) => (_jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: clearCursor === i ? colors.primary : colors.text, children: [clearCursor === i ? '> ' : '  ', label] }) }, i))), _jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { color: colors.textMuted, children: "\u2191\u2193 \u2014 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F  Enter \u2014 \u0432\u044B\u0431\u0440\u0430\u0442\u044C  Esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0430" }) })] })] }))] })), _jsx(InputBar, { onSubmit: handleSubmit, disabled: isProcessing, onClear: handleClear, onExit: handleExit, isMasked: setupStep === 'apikey', isSetupMode: setupStep !== 'done', blockInput: setupStep === 'done' && (pendingApproval !== null || pendingClear), emptyHint: emptyInputHint, onImagePaste: (base64, mimeType) => {
-                    const model = config.model ?? '';
-                    if (!model.includes('vl') && !model.includes('vision')) {
-                        setMessages(prev => [...prev, {
-                                role: 'assistant',
-                                content: `[warn] Вставка изображения требует модель с поддержкой vision.\nТекущая модель: ${model || 'неизвестно'}\nИспользуйте модель с "vl" или "vision" в названии.`,
-                            }]);
-                        return;
-                    }
-                    setPendingImage({ base64, mimeType });
-                } }), _jsx(StatusBar, { mode: approvalMode, status: statusText, messageCount: messages.length, isProcessing: isProcessing, contextPercent: contextPercent, totalTokens: totalTokens, estimatedCost: estimatedCost, model: config.model })] }));
+                                        ].map((label, i) => (_jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: approvalCursor === i ? colors.primary : colors.text, children: [approvalCursor === i ? '> ' : '  ', label] }) }, i))), _jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { color: colors.textMuted, children: "\u2191\u2193 \u2014 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F  Enter \u2014 \u0432\u044B\u0431\u0440\u0430\u0442\u044C  Esc \u2014 \u043E\u0442\u043A\u043B\u043E\u043D\u0438\u0442\u044C" }) })] })] })), pendingClear && (_jsxs(Box, { flexDirection: 'column', marginLeft: 2, marginBottom: 1, borderStyle: 'round', borderColor: colors.warning, children: [_jsx(Box, { children: _jsx(Text, { bold: true, color: colors.warning, children: "\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0447\u0430\u0442\u0430?" }) }), _jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: colors.textMuted, children: [messages.length, " \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 \u0431\u0443\u0434\u0435\u0442 \u0443\u0434\u0430\u043B\u0435\u043D\u043E. \u041E\u0442\u043C\u0435\u043D\u0443 \u043D\u0435\u043B\u044C\u0437\u044F."] }) }), _jsxs(Box, { flexDirection: 'column', marginTop: 1, children: [['[ok] Да, очистить', '[no] Отмена'].map((label, i) => (_jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: clearCursor === i ? colors.primary : colors.text, children: [clearCursor === i ? '> ' : '  ', label] }) }, i))), _jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { color: colors.textMuted, children: "\u2191\u2193 \u2014 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F  Enter \u2014 \u0432\u044B\u0431\u0440\u0430\u0442\u044C  Esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0430" }) })] })] }))] })), _jsx(InputBar, { onSubmit: handleSubmit, disabled: false, 
+                // disabled is no longer tied to isProcessing — input is allowed during processing.
+                // blockInput still handles approval/clear dialogs.
+                onClear: handleClear, onExit: handleExit, isMasked: setupStep === 'apikey', isSetupMode: setupStep !== 'done', blockInput: setupStep === 'done' && (pendingApproval !== null || pendingClear), emptyHint: emptyInputHint, onImagePaste: (base64, mimeType) => setPendingImage({ base64, mimeType }) }), _jsx(StatusBar, { mode: approvalMode, status: statusText, messageCount: messages.length, isProcessing: isProcessing, isPaused: isPaused, contextPercent: contextPercent, compactProgress: compactProgress, totalTokens: totalTokens, estimatedCost: estimatedCost, model: config.model, followUpCount: followUpCount })] }));
 }
 //# sourceMappingURL=app.js.map