@mmmbuto/gemini-cli-termux 0.30.3-termux → 0.30.5-termux

package/packages/cli/dist/src/ui/components/InputPrompt.js

@@ -6,7 +6,7 @@ import { SuggestionsDisplay, MAX_WIDTH } from './SuggestionsDisplay.js';
 import { theme } from '../semantic-colors.js';
 import { useInputHistory } from '../hooks/useInputHistory.js';
 import { HalfLinePaddedBox } from './shared/HalfLinePaddedBox.js';
-import { logicalPosToOffset, PASTED_TEXT_PLACEHOLDER_REGEX, getTransformUnderCursor, } from './shared/text-buffer.js';
+import { logicalPosToOffset, PASTED_TEXT_PLACEHOLDER_REGEX, getTransformUnderCursor, LARGE_PASTE_LINE_THRESHOLD, LARGE_PASTE_CHAR_THRESHOLD, } from './shared/text-buffer.js';
 import { cpSlice, cpLen, toCodePoints, cpIndexToOffset, } from '../utils/textUtils.js';
 import chalk from 'chalk';
 import stringWidth from 'string-width';
@@ -22,17 +22,20 @@ import { clipboardHasImage, saveClipboardImage, cleanupOldClipboardImages, } fro
 import { isAutoExecutableCommand, isSlashCommand, } from '../utils/commandUtils.js';
 import * as path from 'node:path';
 import { SCREEN_READER_USER_PREFIX } from '../textConstants.js';
-import { DEFAULT_BACKGROUND_OPACITY } from '../constants.js';
+import { DEFAULT_BACKGROUND_OPACITY, DEFAULT_INPUT_BACKGROUND_OPACITY, } from '../constants.js';
 import { getSafeLowColorBackground } from '../themes/color-utils.js';
 import { isLowColorDepth } from '../utils/terminalUtils.js';
 import { useShellFocusState } from '../contexts/ShellFocusContext.js';
 import { useUIState } from '../contexts/UIStateContext.js';
+import { appEvents, AppEvent, TransientMessageType, } from '../../utils/events.js';
 import { useSettings } from '../contexts/SettingsContext.js';
 import { StreamingState } from '../types.js';
 import { useMouseClick } from '../hooks/useMouseClick.js';
 import { useMouse } from '../contexts/MouseContext.js';
 import { useUIActions } from '../contexts/UIActionsContext.js';
 import { useAlternateBuffer } from '../hooks/useAlternateBuffer.js';
+import { shouldDismissShortcutsHelpOnHotkey } from '../utils/shortcutsHelp.js';
+import { useRepeatedKeyPress } from '../hooks/useRepeatedKeyPress.js';
 /**
  * Returns if the terminal can be trusted to handle paste events atomically
  * rather than potentially sending multiple paste events separated by line
@@ -57,17 +60,77 @@ export const calculatePromptWidths = (mainContentWidth) => {
         frameOverhead: FRAME_OVERHEAD,
     };
 };
+/**
+ * Returns true if the given text exceeds the thresholds for being considered a "large paste".
+ */
+export function isLargePaste(text) {
+    const pasteLineCount = text.split('\n').length;
+    return (pasteLineCount > LARGE_PASTE_LINE_THRESHOLD ||
+        text.length > LARGE_PASTE_CHAR_THRESHOLD);
+}
+const DOUBLE_TAB_CLEAN_UI_TOGGLE_WINDOW_MS = 350;
+/**
+ * Attempt to toggle expansion of a paste placeholder in the buffer.
+ * Returns true if a toggle action was performed or hint was shown, false otherwise.
+ */
+export function tryTogglePasteExpansion(buffer) {
+    if (!buffer.pastedContent || Object.keys(buffer.pastedContent).length === 0) {
+        return false;
+    }
+    const [row, col] = buffer.cursor;
+    // 1. Check if cursor is on or immediately after a collapsed placeholder
+    const transform = getTransformUnderCursor(row, col, buffer.transformationsByLine, { includeEdge: true });
+    if (transform?.type === 'paste' && transform.id) {
+        buffer.togglePasteExpansion(transform.id, row, col);
+        return true;
+    }
+    // 2. Check if cursor is inside an expanded paste region — collapse it
+    const expandedId = buffer.getExpandedPasteAtLine(row);
+    if (expandedId) {
+        buffer.togglePasteExpansion(expandedId, row, col);
+        return true;
+    }
+    // 3. Placeholders exist but cursor isn't on one — show hint
+    appEvents.emit(AppEvent.TransientMessage, {
+        message: 'Move cursor within placeholder to expand',
+        type: TransientMessageType.Hint,
+    });
+    return true;
+}
 export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, config, slashCommands, commandContext, placeholder = '  Type your message or @path/to/file', focus = true, inputWidth, suggestionsWidth, shellModeActive, setShellModeActive, approvalMode, onEscapePromptChange, onSuggestionsVisibilityChange, vimHandleInput, isEmbeddedShellFocused, setQueueErrorMessage, streamingState, popAllMessages, suggestionsPosition = 'below', setBannerVisible, }) => {
     const { stdout } = useStdout();
     const { merged: settings } = useSettings();
     const kittyProtocol = useKittyKeyboardProtocol();
     const isShellFocused = useShellFocusState();
-    const { setEmbeddedShellFocused } = useUIActions();
-    const { terminalWidth, activePtyId, history, terminalBackgroundColor, backgroundShells, backgroundShellHeight, } = useUIState();
-    const [justNavigatedHistory, setJustNavigatedHistory] = useState(false);
-    const escPressCount = useRef(0);
+    const { setEmbeddedShellFocused, setShortcutsHelpVisible, toggleCleanUiDetailsVisible, } = useUIActions();
+    const { terminalWidth, activePtyId, history, backgroundShells, backgroundShellHeight, shortcutsHelpVisible, hintMode, } = useUIState();
+    const [suppressCompletion, setSuppressCompletion] = useState(false);
+    const { handlePress: registerPlainTabPress, resetCount: resetPlainTabPress } = useRepeatedKeyPress({
+        windowMs: DOUBLE_TAB_CLEAN_UI_TOGGLE_WINDOW_MS,
+    });
     const [showEscapePrompt, setShowEscapePrompt] = useState(false);
-    const escapeTimerRef = useRef(null);
+    const { handlePress: handleEscPress, resetCount: resetEscapeState } = useRepeatedKeyPress({
+        windowMs: 500,
+        onRepeat: (count) => {
+            if (count === 1) {
+                setShowEscapePrompt(true);
+            }
+            else if (count === 2) {
+                resetEscapeState();
+                if (buffer.text.length > 0) {
+                    buffer.setText('');
+                    resetCompletionState();
+                }
+                else if (history.length > 0) {
+                    onSubmit('/rewind');
+                }
+                else {
+                    coreEvents.emitFeedback('info', 'Nothing to rewind to');
+                }
+            }
+        },
+        onReset: () => setShowEscapePrompt(false),
+    });
     const [recentUnsafePasteTime, setRecentUnsafePasteTime] = useState(null);
     const pasteTimeoutRef = useRef(null);
     const innerBoxRef = useRef(null);
@@ -78,34 +141,33 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         0, 0,
     ]);
     const [expandedSuggestionIndex, setExpandedSuggestionIndex] = useState(-1);
-    const shellHistory = useShellHistory(config.getProjectRoot());
+    const shellHistory = useShellHistory(config.getProjectRoot(), config.storage);
     const shellHistoryData = shellHistory.history;
-    const completion = useCommandCompletion(buffer, config.getTargetDir(), slashCommands, commandContext, reverseSearchActive, shellModeActive, config);
+    const completion = useCommandCompletion({
+        buffer,
+        cwd: config.getTargetDir(),
+        slashCommands,
+        commandContext,
+        reverseSearchActive,
+        shellModeActive,
+        config,
+        active: !suppressCompletion,
+    });
     const reverseSearchCompletion = useReverseSearchCompletion(buffer, shellHistoryData, reverseSearchActive);
-    const commandSearchCompletion = useReverseSearchCompletion(buffer, userMessages, commandSearchActive);
+    const reversedUserMessages = useMemo(() => [...userMessages].reverse(), [userMessages]);
+    const commandSearchCompletion = useReverseSearchCompletion(buffer, reversedUserMessages, commandSearchActive);
     const resetCompletionState = completion.resetCompletionState;
     const resetReverseSearchCompletionState = reverseSearchCompletion.resetCompletionState;
     const resetCommandSearchCompletionState = commandSearchCompletion.resetCompletionState;
     const showCursor = focus && isShellFocused && !isEmbeddedShellFocused;
-    const resetEscapeState = useCallback(() => {
-        if (escapeTimerRef.current) {
-            clearTimeout(escapeTimerRef.current);
-            escapeTimerRef.current = null;
-        }
-        escPressCount.current = 0;
-        setShowEscapePrompt(false);
-    }, []);
     // Notify parent component about escape prompt state changes
     useEffect(() => {
         if (onEscapePromptChange) {
             onEscapePromptChange(showEscapePrompt);
         }
     }, [showEscapePrompt, onEscapePromptChange]);
-    // Clear escape prompt timer on unmount
+    // Clear paste timeout on unmount
     useEffect(() => () => {
-        if (escapeTimerRef.current) {
-            clearTimeout(escapeTimerRef.current);
-        }
         if (pasteTimeoutRef.current) {
             clearTimeout(pasteTimeoutRef.current);
         }
@@ -126,13 +188,26 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         resetCompletionState();
         resetReverseSearchCompletionState();
     }, [
-        onSubmit,
         buffer,
+        onSubmit,
         resetCompletionState,
         shellModeActive,
         shellHistory,
         resetReverseSearchCompletionState,
     ]);
+    const customSetTextAndResetCompletionSignal = useCallback((newText, cursorPosition) => {
+        buffer.setText(newText, cursorPosition);
+        setSuppressCompletion(true);
+    }, [buffer, setSuppressCompletion]);
+    const inputHistory = useInputHistory({
+        userMessages,
+        onSubmit: handleSubmitAndClear,
+        isActive: (!completion.showSuggestions || completion.suggestions.length === 1) &&
+            !shellModeActive,
+        currentQuery: buffer.text,
+        currentCursorOffset: buffer.getOffset(),
+        onChange: customSetTextAndResetCompletionSignal,
+    });
     const handleSubmit = useCallback((submittedValue) => {
         const trimmedMessage = submittedValue.trim();
         const isSlash = isSlashCommand(trimmedMessage);
@@ -142,41 +217,24 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             setQueueErrorMessage(`${isShell ? 'Shell' : 'Slash'} commands cannot be queued`);
             return;
         }
-        handleSubmitAndClear(trimmedMessage);
-    }, [
-        handleSubmitAndClear,
-        shellModeActive,
-        streamingState,
-        setQueueErrorMessage,
-    ]);
-    const customSetTextAndResetCompletionSignal = useCallback((newText) => {
-        buffer.setText(newText);
-        setJustNavigatedHistory(true);
-    }, [buffer, setJustNavigatedHistory]);
-    const inputHistory = useInputHistory({
-        userMessages,
-        onSubmit: handleSubmitAndClear,
-        isActive: (!completion.showSuggestions || completion.suggestions.length === 1) &&
-            !shellModeActive,
-        currentQuery: buffer.text,
-        onChange: customSetTextAndResetCompletionSignal,
-    });
+        inputHistory.handleSubmit(trimmedMessage);
+    }, [inputHistory, shellModeActive, streamingState, setQueueErrorMessage]);
     // Effect to reset completion if history navigation just occurred and set the text
     useEffect(() => {
-        if (justNavigatedHistory) {
+        if (suppressCompletion) {
             resetCompletionState();
             resetReverseSearchCompletionState();
             resetCommandSearchCompletionState();
             setExpandedSuggestionIndex(-1);
-            setJustNavigatedHistory(false);
         }
     }, [
-        justNavigatedHistory,
+        suppressCompletion,
         buffer.text,
         resetCompletionState,
-        setJustNavigatedHistory,
+        setSuppressCompletion,
         resetReverseSearchCompletionState,
         resetCommandSearchCompletionState,
+        setExpandedSuggestionIndex,
     ]);
     // Helper function to handle loading queued messages into input
     // Returns true if we should continue with input history navigation
@@ -197,6 +255,9 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
     }, [buffer, popAllMessages, inputHistory]);
     // Handle clipboard image pasting with Ctrl+V
     const handleClipboardPaste = useCallback(async () => {
+        if (shortcutsHelpVisible) {
+            setShortcutsHelpVisible(false);
+        }
         try {
             if (await clipboardHasImage()) {
                 const imagePath = await saveClipboardImage(config.getTargetDir());
@@ -231,13 +292,27 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             else {
                 const textToInsert = await clipboardy.read();
                 buffer.insert(textToInsert, { paste: true });
+                if (isLargePaste(textToInsert)) {
+                    appEvents.emit(AppEvent.TransientMessage, {
+                        message: 'Press Ctrl+O to expand pasted text',
+                        type: TransientMessageType.Hint,
+                    });
+                }
             }
         }
         catch (error) {
             debugLogger.error('Error handling paste:', error);
         }
-    }, [buffer, config, stdout, settings]);
+    }, [
+        buffer,
+        config,
+        stdout,
+        settings,
+        shortcutsHelpVisible,
+        setShortcutsHelpVisible,
+    ]);
     useMouseClick(innerBoxRef, (_event, relX, relY) => {
+        setSuppressCompletion(true);
         if (isEmbeddedShellFocused) {
             setEmbeddedShellFocused(false);
         }
@@ -259,7 +334,7 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             : buffer.getLogicalPositionFromVisual(buffer.visualScrollRow + relY, relX);
         // Check for paste placeholder (collapsed state)
         if (logicalPos) {
-            const transform = getTransformUnderCursor(logicalPos.row, logicalPos.col, buffer.transformationsByLine);
+            const transform = getTransformUnderCursor(logicalPos.row, logicalPos.col, buffer.transformationsByLine, { includeEdge: true });
             if (transform?.type === 'paste' && transform.id) {
                 buffer.togglePasteExpansion(transform.id, logicalPos.row, logicalPos.col);
                 return;
@@ -275,11 +350,46 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
     }, { isActive: focus, name: 'double-click' });
     useMouse((event) => {
         if (event.name === 'right-release') {
+            setSuppressCompletion(false);
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
             handleClipboardPaste();
         }
     }, { isActive: focus });
     const handleInput = useCallback((key) => {
+        // Determine if this keypress is a history navigation command
+        const isHistoryUp = !shellModeActive &&
+            (keyMatchers[Command.HISTORY_UP](key) ||
+                (keyMatchers[Command.NAVIGATION_UP](key) &&
+                    (buffer.allVisualLines.length === 1 ||
+                        (buffer.visualCursor[0] === 0 && buffer.visualScrollRow === 0))));
+        const isHistoryDown = !shellModeActive &&
+            (keyMatchers[Command.HISTORY_DOWN](key) ||
+                (keyMatchers[Command.NAVIGATION_DOWN](key) &&
+                    (buffer.allVisualLines.length === 1 ||
+                        buffer.visualCursor[0] === buffer.allVisualLines.length - 1)));
+        const isHistoryNav = isHistoryUp || isHistoryDown;
+        const isCursorMovement = keyMatchers[Command.MOVE_LEFT](key) ||
+            keyMatchers[Command.MOVE_RIGHT](key) ||
+            keyMatchers[Command.MOVE_UP](key) ||
+            keyMatchers[Command.MOVE_DOWN](key) ||
+            keyMatchers[Command.MOVE_WORD_LEFT](key) ||
+            keyMatchers[Command.MOVE_WORD_RIGHT](key) ||
+            keyMatchers[Command.HOME](key) ||
+            keyMatchers[Command.END](key);
+        const isSuggestionsNav = (completion.showSuggestions ||
+            reverseSearchCompletion.showSuggestions ||
+            commandSearchCompletion.showSuggestions) &&
+            (keyMatchers[Command.COMPLETION_UP](key) ||
+                keyMatchers[Command.COMPLETION_DOWN](key) ||
+                keyMatchers[Command.EXPAND_SUGGESTION](key) ||
+                keyMatchers[Command.COLLAPSE_SUGGESTION](key) ||
+                keyMatchers[Command.ACCEPT_SUGGESTION](key));
+        // Reset completion suppression if the user performs any action other than
+        // history navigation or cursor movement.
+        // We explicitly skip this if we are currently navigating suggestions.
+        if (!isSuggestionsNav) {
+            setSuppressCompletion(isHistoryNav || isCursorMovement || keyMatchers[Command.ESCAPE](key));
+        }
         // TODO(jacobr): this special case is likely not needed anymore.
         // We should probably stop supporting paste if the InputPrompt is not
         // focused.
@@ -287,7 +397,42 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         if (!focus && key.name !== 'paste') {
             return false;
         }
+        // Handle escape to close shortcuts panel first, before letting it bubble
+        // up for cancellation. This ensures pressing Escape once closes the panel,
+        // and pressing again cancels the operation.
+        if (shortcutsHelpVisible && key.name === 'escape') {
+            setShortcutsHelpVisible(false);
+            return true;
+        }
+        if (key.name === 'escape' &&
+            (streamingState === StreamingState.Responding ||
+                streamingState === StreamingState.WaitingForConfirmation)) {
+            return false;
+        }
+        const isPlainTab = key.name === 'tab' && !key.shift && !key.alt && !key.ctrl && !key.cmd;
+        const hasTabCompletionInteraction = completion.showSuggestions ||
+            Boolean(completion.promptCompletion.text) ||
+            reverseSearchActive ||
+            commandSearchActive;
+        if (isPlainTab) {
+            if (!hasTabCompletionInteraction) {
+                if (registerPlainTabPress() === 2) {
+                    toggleCleanUiDetailsVisible();
+                    resetPlainTabPress();
+                    return true;
+                }
+            }
+            else {
+                resetPlainTabPress();
+            }
+        }
+        else {
+            resetPlainTabPress();
+        }
         if (key.name === 'paste') {
+            if (shortcutsHelpVisible) {
+                setShortcutsHelpVisible(false);
+            }
             // Record paste time to prevent accidental auto-submission
             if (!isTerminalPasteTrusted(kittyProtocol.enabled)) {
                 setRecentUnsafePasteTime(Date.now());
@@ -311,6 +456,38 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             }
             // Ensure we never accidentally interpret paste as regular input.
             buffer.handleInput(key);
+            if (key.sequence && isLargePaste(key.sequence)) {
+                appEvents.emit(AppEvent.TransientMessage, {
+                    message: 'Press Ctrl+O to expand pasted text',
+                    type: TransientMessageType.Hint,
+                });
+            }
+            return true;
+        }
+        if (shortcutsHelpVisible && shouldDismissShortcutsHelpOnHotkey(key)) {
+            setShortcutsHelpVisible(false);
+        }
+        if (shortcutsHelpVisible) {
+            if (key.sequence === '?' && key.insertable) {
+                setShortcutsHelpVisible(false);
+                buffer.handleInput(key);
+                return true;
+            }
+            // Escape is handled earlier to ensure it closes the panel before
+            // potentially cancelling an operation
+            if (key.name === 'backspace' || key.sequence === '\b') {
+                setShortcutsHelpVisible(false);
+                return true;
+            }
+            if (key.insertable) {
+                setShortcutsHelpVisible(false);
+            }
+        }
+        if (key.sequence === '?' &&
+            key.insertable &&
+            !shortcutsHelpVisible &&
+            buffer.text.length === 0) {
+            setShortcutsHelpVisible(true);
             return true;
         }
         if (vimHandleInput && vimHandleInput(key)) {
@@ -318,9 +495,13 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         }
         // Reset ESC count and hide prompt on any non-ESC key
         if (key.name !== 'escape') {
-            if (escPressCount.current > 0 || showEscapePrompt) {
-                resetEscapeState();
-            }
+            resetEscapeState();
+        }
+        // Ctrl+O to expand/collapse paste placeholders
+        if (keyMatchers[Command.EXPAND_PASTE](key)) {
+            const handled = tryTogglePasteExpansion(buffer);
+            if (handled)
+                return true;
         }
         if (key.sequence === '!' &&
             buffer.text === '' &&
@@ -357,30 +538,7 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
                 resetEscapeState();
                 return true;
             }
-            // Handle double ESC
-            if (escPressCount.current === 0) {
-                escPressCount.current = 1;
-                setShowEscapePrompt(true);
-                if (escapeTimerRef.current) {
-                    clearTimeout(escapeTimerRef.current);
-                }
-                escapeTimerRef.current = setTimeout(() => {
-                    resetEscapeState();
-                }, 500);
-                return true;
-            }
-            // Second ESC
-            resetEscapeState();
-            if (buffer.text.length > 0) {
-                buffer.setText('');
-                resetCompletionState();
-                return true;
-            }
-            else if (history.length > 0) {
-                onSubmit('/rewind');
-                return true;
-            }
-            coreEvents.emitFeedback('info', 'Nothing to rewind to');
+            handleEscPress();
             return true;
         }
         if (keyMatchers[Command.CLEAR_SCREEN](key)) {
@@ -436,7 +594,7 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
                 const textToSubmit = showSuggestions && activeSuggestionIndex > -1
                     ? suggestions[activeSuggestionIndex].value
                     : buffer.text;
-                handleSubmitAndClear(textToSubmit);
+                handleSubmit(textToSubmit);
                 resetState();
                 setActive(false);
                 return true;
@@ -450,11 +608,17 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         // If the command is a perfect match, pressing enter should execute it.
         // We prioritize execution unless the user is explicitly selecting a different suggestion.
         if (completion.isPerfectMatch &&
-            keyMatchers[Command.RETURN](key) &&
+            keyMatchers[Command.SUBMIT](key) &&
+            recentUnsafePasteTime === null &&
             (!completion.showSuggestions || completion.activeSuggestionIndex <= 0)) {
             handleSubmit(buffer.text);
             return true;
         }
+        // Newline insertion
+        if (keyMatchers[Command.NEWLINE](key)) {
+            buffer.newline();
+            return true;
+        }
         if (completion.showSuggestions) {
             if (completion.suggestions.length > 1) {
                 if (keyMatchers[Command.COMPLETION_UP](key)) {
@@ -515,6 +679,7 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         }
         // Handle Tab key for ghost text acceptance
         if (key.name === 'tab' &&
+            !key.shift &&
             !completion.showSuggestions &&
             completion.promptCompletion.text) {
             completion.promptCompletion.accept();
@@ -527,24 +692,12 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
                 setCursorPosition(buffer.cursor);
                 return true;
             }
-            if (keyMatchers[Command.HISTORY_UP](key)) {
-                // Check for queued messages first when input is empty
-                // If no queued messages, inputHistory.navigateUp() is called inside tryLoadQueuedMessages
-                if (tryLoadQueuedMessages()) {
+            if (isHistoryUp) {
+                if (keyMatchers[Command.NAVIGATION_UP](key) &&
+                    buffer.visualCursor[1] > 0) {
+                    buffer.move('home');
                     return true;
                 }
-                // Only navigate history if popAllMessages doesn't exist
-                inputHistory.navigateUp();
-                return true;
-            }
-            if (keyMatchers[Command.HISTORY_DOWN](key)) {
-                inputHistory.navigateDown();
-                return true;
-            }
-            // Handle arrow-up/down for history on single-line or at edges
-            if (keyMatchers[Command.NAVIGATION_UP](key) &&
-                (buffer.allVisualLines.length === 1 ||
-                    (buffer.visualCursor[0] === 0 && buffer.visualScrollRow === 0))) {
                 // Check for queued messages first when input is empty
                 // If no queued messages, inputHistory.navigateUp() is called inside tryLoadQueuedMessages
                 if (tryLoadQueuedMessages()) {
@@ -554,9 +707,13 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
                 inputHistory.navigateUp();
                 return true;
             }
-            if (keyMatchers[Command.NAVIGATION_DOWN](key) &&
-                (buffer.allVisualLines.length === 1 ||
-                    buffer.visualCursor[0] === buffer.allVisualLines.length - 1)) {
+            if (isHistoryDown) {
+                if (keyMatchers[Command.NAVIGATION_DOWN](key) &&
+                    buffer.visualCursor[1] <
+                        cpLen(buffer.allVisualLines[buffer.visualCursor[0]] || '')) {
+                    buffer.move('end');
+                    return true;
+                }
                 inputHistory.navigateDown();
                 return true;
             }
@@ -564,12 +721,25 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         else {
             // Shell History Navigation
             if (keyMatchers[Command.NAVIGATION_UP](key)) {
+                if ((buffer.allVisualLines.length === 1 ||
+                    (buffer.visualCursor[0] === 0 && buffer.visualScrollRow === 0)) &&
+                    buffer.visualCursor[1] > 0) {
+                    buffer.move('home');
+                    return true;
+                }
                 const prevCommand = shellHistory.getPreviousCommand();
                 if (prevCommand !== null)
                     buffer.setText(prevCommand);
                 return true;
             }
             if (keyMatchers[Command.NAVIGATION_DOWN](key)) {
+                if ((buffer.allVisualLines.length === 1 ||
+                    buffer.visualCursor[0] === buffer.allVisualLines.length - 1) &&
+                    buffer.visualCursor[1] <
+                        cpLen(buffer.allVisualLines[buffer.visualCursor[0]] || '')) {
+                    buffer.move('end');
+                    return true;
+                }
                 const nextCommand = shellHistory.getNextCommand();
                 if (nextCommand !== null)
                     buffer.setText(nextCommand);
@@ -602,11 +772,6 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             }
             return true;
         }
-        // Newline insertion
-        if (keyMatchers[Command.NEWLINE](key)) {
-            buffer.newline();
-            return true;
-        }
         // Ctrl+A (Home) / Ctrl+E (End)
         if (keyMatchers[Command.HOME](key)) {
             buffer.move('home');
@@ -641,13 +806,16 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             handleClipboardPaste();
             return true;
         }
+        if (keyMatchers[Command.TOGGLE_BACKGROUND_SHELL](key)) {
+            return false;
+        }
         if (keyMatchers[Command.FOCUS_SHELL_INPUT](key)) {
-            // If we got here, Autocomplete didn't handle the key (e.g. no suggestions).
             if (activePtyId ||
                 (backgroundShells.size > 0 && backgroundShellHeight > 0)) {
                 setEmbeddedShellFocused(true);
+                return true;
             }
-            return true;
+            return false;
         }
         // Fall back to the text buffer's default input handling for all other keys
         const handled = buffer.handleInput(key);
@@ -675,13 +843,11 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         setShellModeActive,
         onClearScreen,
         inputHistory,
-        handleSubmitAndClear,
         handleSubmit,
         shellHistory,
         reverseSearchCompletion,
         handleClipboardPaste,
         resetCompletionState,
-        showEscapePrompt,
         resetEscapeState,
         vimHandleInput,
         reverseSearchActive,
@@ -691,14 +857,19 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         commandSearchActive,
         commandSearchCompletion,
         kittyProtocol.enabled,
+        shortcutsHelpVisible,
+        setShortcutsHelpVisible,
         tryLoadQueuedMessages,
         setBannerVisible,
-        onSubmit,
         activePtyId,
         setEmbeddedShellFocused,
         backgroundShells.size,
         backgroundShellHeight,
-        history,
+        streamingState,
+        handleEscPress,
+        registerPlainTabPress,
+        resetPlainTabPress,
+        toggleCleanUiDetailsVisible,
     ]);
     useKeypress(handleInput, {
         isActive: !isEmbeddedShellFocused,
@@ -815,7 +986,7 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
     const shouldShowSuggestions = activeCompletion.showSuggestions;
     const useBackgroundColor = config.getUseBackgroundColor();
     const isLowColor = isLowColorDepth();
-    const terminalBg = terminalBackgroundColor || 'black';
+    const terminalBg = theme.background.primary || 'black';
     // We should fallback to lines if the background color is disabled OR if it is
     // enabled but we are in a low color depth terminal where we don't have a safe
     // background color to use.
@@ -864,22 +1035,76 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
     const borderColor = isShellFocused && !isEmbeddedShellFocused
         ? (statusColor ?? theme.border.focused)
         : theme.border.default;
-    return (_jsxs(_Fragment, { children: [suggestionsPosition === 'above' && suggestionsNode, useLineFallback ? (_jsx(Box, { borderStyle: "round", borderTop: true, borderBottom: false, borderLeft: false, borderRight: false, borderColor: borderColor, width: terminalWidth, flexDirection: "row", alignItems: "flex-start", height: 0 })) : null, _jsxs(HalfLinePaddedBox, { backgroundBaseColor: isShellFocused && !isEmbeddedShellFocused
-                    ? theme.border.focused
-                    : theme.border.default, backgroundOpacity: DEFAULT_BACKGROUND_OPACITY, useBackgroundColor: useBackgroundColor, children: [_jsxs(Box, { flexGrow: 1, flexDirection: "row", paddingX: 1, borderColor: borderColor, borderStyle: useLineFallback ? 'round' : undefined, borderTop: false, borderBottom: false, borderLeft: !useBackgroundColor, borderRight: !useBackgroundColor, children: [_jsxs(Text, { color: statusColor ?? theme.text.accent, "aria-label": statusText || undefined, children: [shellModeActive ? (reverseSearchActive ? (_jsxs(Text, { color: theme.text.link, "aria-label": SCREEN_READER_USER_PREFIX, children: ["(r:)", ' '] })) : ('!')) : commandSearchActive ? (_jsx(Text, { color: theme.text.accent, children: "(r:) " })) : showYoloStyling ? ('*') : ('>'), ' '] }), _jsxs(Box, { flexGrow: 1, flexDirection: "column", ref: innerBoxRef, children: [buffer.text.length === 0 && placeholder ? (showCursor ? (_jsx(Text, { ...terminalCursorFocus })) : showCursor) : , /** @ts-ignore */ terminalCursorPosition, ": 0} >", chalk.inverse(placeholder.slice(0, 1)), _jsx(Text, { color: theme.text.secondary, children: placeholder.slice(1) })] }), ") : (", _jsx(Text, { color: theme.text.secondary, children: placeholder }), ") ) : ( linesToRender .map((lineText: string, visualIdxInRenderedSet: number) => ", , "const absoluteVisualIdx = scrollVisualRow + visualIdxInRenderedSet; const mapEntry = buffer.visualToLogicalMap[absoluteVisualIdx]; if (!mapEntry) return null; const cursorVisualRow = cursorVisualRowAbsolute - scrollVisualRow; const isOnCursorLine = focus && visualIdxInRenderedSet === cursorVisualRow; const renderedLine: React.ReactNode[] = []; const [logicalLineIdx] = mapEntry; const logicalLine = buffer.lines[logicalLineIdx] || ''; const transformations = buffer.transformationsByLine[logicalLineIdx] ?? []; const tokens = parseInputForHighlighting( logicalLine, logicalLineIdx, transformations, ...(focus && buffer.cursor[0] === logicalLineIdx ? [buffer.cursor[1]] : []), ); const startColInTransformed = buffer.visualToTransformedMap[absoluteVisualIdx] ?? 0; const visualStartCol = startColInTransformed; const visualEndCol = visualStartCol + cpLen(lineText); const segments = parseSegmentsFromTokens( tokens, visualStartCol, visualEndCol, ); let charCount = 0; segments.forEach((seg, segIdx) => ", , "const segLen = cpLen(seg.text); let display = seg.text; if (isOnCursorLine) ", , "const relativeVisualColForHighlight = cursorVisualColAbsolute; const segStart = charCount; const segEnd = segStart + segLen; if ( relativeVisualColForHighlight >= segStart && relativeVisualColForHighlight ", _jsx("segEnd", {}), ") ", , "const charToHighlight = cpSlice( display, relativeVisualColForHighlight - segStart, relativeVisualColForHighlight - segStart + 1, ); const highlighted = showCursor ? chalk.inverse(charToHighlight) : charToHighlight; display = cpSlice( display, 0, relativeVisualColForHighlight - segStart, ) + highlighted + cpSlice( display, relativeVisualColForHighlight - segStart + 1, ); } charCount = segEnd; } else ", 
-                            // Advance the running counter even when not on cursor line
-                            charCount += segLen, "; } const color = seg.type === 'command' || seg.type === 'file' || seg.type === 'paste' ? theme.text.accent : theme.text.primary; renderedLine.push(", _jsx(Text, { color: color, children: display }, `token-${segIdx}`), ", ); }); const currentLineGhost = isOnCursorLine ? inlineGhost : ''; if ( isOnCursorLine && cursorVisualColAbsolute === cpLen(lineText) ) ", , "if (!currentLineGhost) ", renderedLine.push(_jsx(Text, { children: showCursor ? chalk.inverse(' ') : ' ' }, `cursor-end-${cursorVisualColAbsolute}`)), "; } } const showCursorBeforeGhost = focus && isOnCursorLine && cursorVisualColAbsolute === cpLen(lineText) && currentLineGhost; return (", _jsxs(Box, { height: 1, children: [_jsx(Text, { ...terminalCursorFocus }), ": showCursor && isOnCursorLine} terminalCursorPosition=", cpIndexToOffset(lineText, cursorVisualColAbsolute), ">", renderedLine, showCursorBeforeGhost &&
-                                        (showCursor ? chalk.inverse(' ') : ' '), currentLineGhost && (_jsx(Text, { color: theme.text.secondary, children: currentLineGhost }))] }, `line-${visualIdxInRenderedSet}`)] }), "); }) .concat( additionalLines.map((ghostLine, index) => ", , "const padding = Math.max( 0, inputWidth - stringWidth(ghostLine), ); return (", _jsxs(Text, { color: theme.text.secondary, children: [ghostLine, ' '.repeat(padding)] }, `ghost-line-${index}`), "); }), ) )}"] })] }));
-    Box >
-    ;
+    return (_jsxs(_Fragment, { children: [suggestionsPosition === 'above' && suggestionsNode, useLineFallback ? (_jsx(Box, { borderStyle: "round", borderTop: true, borderBottom: false, borderLeft: false, borderRight: false, borderColor: borderColor, width: terminalWidth, flexDirection: "row", alignItems: "flex-start", height: 0 })) : null, _jsx(HalfLinePaddedBox, { backgroundBaseColor: hintMode ? theme.text.accent : theme.text.secondary, backgroundOpacity: showCursor
+                    ? DEFAULT_INPUT_BACKGROUND_OPACITY
+                    : DEFAULT_BACKGROUND_OPACITY, useBackgroundColor: useBackgroundColor, children: _jsxs(Box, { flexGrow: 1, flexDirection: "row", paddingX: 1, borderColor: borderColor, borderStyle: useLineFallback ? 'round' : undefined, borderTop: false, borderBottom: false, borderLeft: !useBackgroundColor, borderRight: !useBackgroundColor, children: [_jsxs(Text, { color: statusColor ?? theme.text.accent, "aria-label": statusText || undefined, children: [shellModeActive ? (reverseSearchActive ? (_jsxs(Text, { color: theme.text.link, "aria-label": SCREEN_READER_USER_PREFIX, children: ["(r:)", ' '] })) : ('!')) : commandSearchActive ? (_jsx(Text, { color: theme.text.accent, children: "(r:) " })) : showYoloStyling ? ('*') : ('>'), ' '] }), _jsx(Box, { flexGrow: 1, flexDirection: "column", ref: innerBoxRef, children: buffer.text.length === 0 && placeholder ? (showCursor ? (_jsxs(Text, { terminalCursorFocus: showCursor, terminalCursorPosition: 0, children: [chalk.inverse(placeholder.slice(0, 1)), _jsx(Text, { color: theme.text.secondary, children: placeholder.slice(1) })] })) : (_jsx(Text, { color: theme.text.secondary, children: placeholder }))) : (linesToRender
+                                .map((lineText, visualIdxInRenderedSet) => {
+                                const absoluteVisualIdx = scrollVisualRow + visualIdxInRenderedSet;
+                                const mapEntry = buffer.visualToLogicalMap[absoluteVisualIdx];
+                                if (!mapEntry)
+                                    return null;
+                                const cursorVisualRow = cursorVisualRowAbsolute - scrollVisualRow;
+                                const isOnCursorLine = focus && visualIdxInRenderedSet === cursorVisualRow;
+                                const renderedLine = [];
+                                const [logicalLineIdx] = mapEntry;
+                                const logicalLine = buffer.lines[logicalLineIdx] || '';
+                                const transformations = buffer.transformationsByLine[logicalLineIdx] ?? [];
+                                const tokens = parseInputForHighlighting(logicalLine, logicalLineIdx, transformations, ...(focus && buffer.cursor[0] === logicalLineIdx
+                                    ? [buffer.cursor[1]]
+                                    : []));
+                                const startColInTransformed = buffer.visualToTransformedMap[absoluteVisualIdx] ?? 0;
+                                const visualStartCol = startColInTransformed;
+                                const visualEndCol = visualStartCol + cpLen(lineText);
+                                const segments = parseSegmentsFromTokens(tokens, visualStartCol, visualEndCol);
+                                let charCount = 0;
+                                segments.forEach((seg, segIdx) => {
+                                    const segLen = cpLen(seg.text);
+                                    let display = seg.text;
+                                    if (isOnCursorLine) {
+                                        const relativeVisualColForHighlight = cursorVisualColAbsolute;
+                                        const segStart = charCount;
+                                        const segEnd = segStart + segLen;
+                                        if (relativeVisualColForHighlight >= segStart &&
+                                            relativeVisualColForHighlight < segEnd) {
+                                            const charToHighlight = cpSlice(display, relativeVisualColForHighlight - segStart, relativeVisualColForHighlight - segStart + 1);
+                                            const highlighted = showCursor
+                                                ? chalk.inverse(charToHighlight)
+                                                : charToHighlight;
+                                            display =
+                                                cpSlice(display, 0, relativeVisualColForHighlight - segStart) +
+                                                    highlighted +
+                                                    cpSlice(display, relativeVisualColForHighlight - segStart + 1);
+                                        }
+                                        charCount = segEnd;
+                                    }
+                                    else {
+                                        // Advance the running counter even when not on cursor line
+                                        charCount += segLen;
+                                    }
+                                    const color = seg.type === 'command' ||
+                                        seg.type === 'file' ||
+                                        seg.type === 'paste'
+                                        ? theme.text.accent
+                                        : theme.text.primary;
+                                    renderedLine.push(_jsx(Text, { color: color, children: display }, `token-${segIdx}`));
+                                });
+                                const currentLineGhost = isOnCursorLine ? inlineGhost : '';
+                                if (isOnCursorLine &&
+                                    cursorVisualColAbsolute === cpLen(lineText)) {
+                                    if (!currentLineGhost) {
+                                        renderedLine.push(_jsx(Text, { children: showCursor ? chalk.inverse(' ') : ' ' }, `cursor-end-${cursorVisualColAbsolute}`));
+                                    }
+                                }
+                                const showCursorBeforeGhost = focus &&
+                                    isOnCursorLine &&
+                                    cursorVisualColAbsolute === cpLen(lineText) &&
+                                    currentLineGhost;
+                                return (_jsx(Box, { height: 1, children: _jsxs(Text, { terminalCursorFocus: showCursor && isOnCursorLine, terminalCursorPosition: cpIndexToOffset(lineText, cursorVisualColAbsolute), children: [renderedLine, showCursorBeforeGhost &&
+                                                (showCursor ? chalk.inverse(' ') : ' '), currentLineGhost && (_jsx(Text, { color: theme.text.secondary, children: currentLineGhost }))] }) }, `line-${visualIdxInRenderedSet}`));
+                            })
+                                .concat(additionalLines.map((ghostLine, index) => {
+                                const padding = Math.max(0, inputWidth - stringWidth(ghostLine));
+                                return (_jsxs(Text, { color: theme.text.secondary, children: [ghostLine, ' '.repeat(padding)] }, `ghost-line-${index}`));
+                            }))) })] }) }), useLineFallback ? (_jsx(Box, { borderStyle: "round", borderTop: false, borderBottom: true, borderLeft: false, borderRight: false, borderColor: borderColor, width: terminalWidth, flexDirection: "row", alignItems: "flex-start", height: 0 })) : null, suggestionsPosition === 'below' && suggestionsNode] }));
 };
-HalfLinePaddedBox >
-    {};
-{
-    suggestionsPosition === 'below' && suggestionsNode;
-}
- >
-;
-;
-;
 //# sourceMappingURL=InputPrompt.js.map