@umsai/ums-code 0.0.14-v1 → 0.0.14-v2

package/dist/src/ui/components/HistoryItemDisplay.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/ui/components/HistoryItemDisplay.test.js

@@ -0,0 +1,93 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { render } from 'ink-testing-library';
+import { describe, it, expect, vi } from 'vitest';
+import { HistoryItemDisplay } from './HistoryItemDisplay.js';
+import { MessageType } from '../types.js';
+import { SessionStatsProvider } from '../contexts/SessionContext.js';
+// Mock child components
+vi.mock('./messages/ToolGroupMessage.js', () => ({
+    ToolGroupMessage: () => _jsx("div", {}),
+}));
+describe('<HistoryItemDisplay />', () => {
+    const mockConfig = {};
+    const baseItem = {
+        id: 1,
+        timestamp: 12345,
+        isPending: false,
+        terminalWidth: 80,
+        config: mockConfig,
+    };
+    it('renders UserMessage for "user" type', () => {
+        const item = {
+            ...baseItem,
+            type: MessageType.USER,
+            text: 'Hello',
+        };
+        const { lastFrame } = render(_jsx(HistoryItemDisplay, { ...baseItem, item: item }));
+        expect(lastFrame()).toContain('Hello');
+    });
+    it('renders UserMessage for "user" type with slash command', () => {
+        const item = {
+            ...baseItem,
+            type: MessageType.USER,
+            text: '/theme',
+        };
+        const { lastFrame } = render(_jsx(HistoryItemDisplay, { ...baseItem, item: item }));
+        expect(lastFrame()).toContain('/theme');
+    });
+    it('renders StatsDisplay for "stats" type', () => {
+        const item = {
+            ...baseItem,
+            type: MessageType.STATS,
+            duration: '1s',
+        };
+        const { lastFrame } = render(_jsx(SessionStatsProvider, { children: _jsx(HistoryItemDisplay, { ...baseItem, item: item }) }));
+        expect(lastFrame()).toContain('Stats');
+    });
+    it('renders AboutBox for "about" type', () => {
+        const item = {
+            ...baseItem,
+            type: MessageType.ABOUT,
+            cliVersion: '1.0.0',
+            osVersion: 'test-os',
+            sandboxEnv: 'test-env',
+            modelVersion: 'test-model',
+            selectedAuthType: 'test-auth',
+            gcpProject: 'test-project',
+            ideClient: 'test-ide',
+        };
+        const { lastFrame } = render(_jsx(HistoryItemDisplay, { ...baseItem, item: item }));
+        expect(lastFrame()).toContain('About Qwen Code');
+    });
+    it('renders ModelStatsDisplay for "model_stats" type', () => {
+        const item = {
+            ...baseItem,
+            type: 'model_stats',
+        };
+        const { lastFrame } = render(_jsx(SessionStatsProvider, { children: _jsx(HistoryItemDisplay, { ...baseItem, item: item }) }));
+        expect(lastFrame()).toContain('No API calls have been made in this session.');
+    });
+    it('renders ToolStatsDisplay for "tool_stats" type', () => {
+        const item = {
+            ...baseItem,
+            type: 'tool_stats',
+        };
+        const { lastFrame } = render(_jsx(SessionStatsProvider, { children: _jsx(HistoryItemDisplay, { ...baseItem, item: item }) }));
+        expect(lastFrame()).toContain('No tool calls have been made in this session.');
+    });
+    it('renders SessionSummaryDisplay for "quit" type', () => {
+        const item = {
+            ...baseItem,
+            type: 'quit',
+            duration: '1s',
+        };
+        const { lastFrame } = render(_jsx(SessionStatsProvider, { children: _jsx(HistoryItemDisplay, { ...baseItem, item: item }) }));
+        expect(lastFrame()).toContain('Agent powering down. Goodbye!');
+    });
+});
+//# sourceMappingURL=HistoryItemDisplay.test.js.map

package/dist/src/ui/components/HistoryItemDisplay.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HistoryItemDisplay.test.js","sourceRoot":"","sources":["../../../../src/ui/components/HistoryItemDisplay.test.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/InputPrompt.d.ts

@@ -3,11 +3,11 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import React from 'react';
-import { TextBuffer } from './shared/text-buffer.js';
-import { Key } from '../hooks/useKeypress.js';
-import { CommandContext, SlashCommand } from '../commands/types.js';
-import { Config } from '@umsai/ums-code-core';
+import type React from 'react';
+import type { TextBuffer } from './shared/text-buffer.js';
+import type { Key } from '../hooks/useKeypress.js';
+import type { CommandContext, SlashCommand } from '../commands/types.js';
+import type { Config } from '@umsai/ums-code-core';
 export interface InputPromptProps {
     buffer: TextBuffer;
     onSubmit: (value: string) => void;
@@ -22,6 +22,7 @@ export interface InputPromptProps {
     suggestionsWidth: number;
     shellModeActive: boolean;
     setShellModeActive: (value: boolean) => void;
+    onEscapePromptChange?: (showPrompt: boolean) => void;
     vimHandleInput?: (key: Key) => boolean;
 }
 export declare const InputPrompt: React.FC<InputPromptProps>;

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

@@ -1,27 +1,27 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import { useCallback, useEffect, useState } from 'react';
+import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { useCallback, useEffect, useState, useRef } from 'react';
 import { Box, Text } from 'ink';
-import { Colors } from '../colors.js';
+import { theme } from '../semantic-colors.js';
 import { SuggestionsDisplay } from './SuggestionsDisplay.js';
 import { useInputHistory } from '../hooks/useInputHistory.js';
 import { logicalPosToOffset } from './shared/text-buffer.js';
-import { cpSlice, cpLen } from '../utils/textUtils.js';
+import { cpSlice, cpLen, toCodePoints } from '../utils/textUtils.js';
 import chalk from 'chalk';
 import stringWidth from 'string-width';
 import { useShellHistory } from '../hooks/useShellHistory.js';
 import { useReverseSearchCompletion } from '../hooks/useReverseSearchCompletion.js';
 import { useCommandCompletion } from '../hooks/useCommandCompletion.js';
 import { useKeypress } from '../hooks/useKeypress.js';
+import { keyMatchers, Command } from '../keyMatchers.js';
 import { clipboardHasImage, saveClipboardImage, cleanupOldClipboardImages, } from '../utils/clipboardUtils.js';
-import * as path from 'path';
+import * as path from 'node:path';
+import { SCREEN_READER_USER_PREFIX } from '../textConstants.js';
 // 输入组件
-export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, config, slashCommands, commandContext, placeholder = '  Type your message or @path/to/file', focus = true, inputWidth, suggestionsWidth, shellModeActive, setShellModeActive, vimHandleInput, }) => {
+export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, config, slashCommands, commandContext, placeholder = '  Type your message or @path/to/file', focus = true, inputWidth, suggestionsWidth, shellModeActive, setShellModeActive, onEscapePromptChange, vimHandleInput, }) => {
     const [justNavigatedHistory, setJustNavigatedHistory] = useState(false);
+    const [escPressCount, setEscPressCount] = useState(0);
+    const [showEscapePrompt, setShowEscapePrompt] = useState(false);
+    const escapeTimerRef = useRef(null);
     const [dirs, setDirs] = useState(config.getWorkspaceContext().getDirectories());
     const dirsChanged = config.getWorkspaceContext().getDirectories();
     useEffect(() => {
@@ -34,12 +34,32 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
     const [cursorPosition, setCursorPosition] = useState([
         0, 0,
     ]);
-    const shellHistory = useShellHistory(config.getProjectRoot());
+    const shellHistory = useShellHistory(config.getProjectRoot(), config.storage);
     const historyData = shellHistory.history;
     const completion = useCommandCompletion(buffer, dirs, config.getTargetDir(), slashCommands, commandContext, reverseSearchActive, config);
     const reverseSearchCompletion = useReverseSearchCompletion(buffer, historyData, reverseSearchActive);
     const resetCompletionState = completion.resetCompletionState;
     const resetReverseSearchCompletionState = reverseSearchCompletion.resetCompletionState;
+    const resetEscapeState = useCallback(() => {
+        if (escapeTimerRef.current) {
+            clearTimeout(escapeTimerRef.current);
+            escapeTimerRef.current = null;
+        }
+        setEscPressCount(0);
+        setShowEscapePrompt(false);
+    }, []);
+    // Notify parent component about escape prompt state changes
+    useEffect(() => {
+        if (onEscapePromptChange) {
+            onEscapePromptChange(showEscapePrompt);
+        }
+    }, [showEscapePrompt, onEscapePromptChange]);
+    // Clear escape prompt timer on unmount
+    useEffect(() => () => {
+        if (escapeTimerRef.current) {
+            clearTimeout(escapeTimerRef.current);
+        }
+    }, []);
     const handleSubmitAndClear = useCallback((submittedValue) => {
         if (shellModeActive) {
             shellHistory.addCommandToHistory(submittedValue);
@@ -130,9 +150,20 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         if (!focus && !key.paste) {
             return;
         }
+        if (key.paste) {
+            // Ensure we never accidentally interpret paste as regular input.
+            buffer.handleInput(key);
+            return;
+        }
         if (vimHandleInput && vimHandleInput(key)) {
             return;
         }
+        // Reset ESC count and hide prompt on any non-ESC key
+        if (key.name !== 'escape') {
+            if (escPressCount > 0 || showEscapePrompt) {
+                resetEscapeState();
+            }
+        }
         if (key.sequence === '!' &&
             buffer.text === '' &&
             !completion.showSuggestions) {
@@ -140,7 +171,7 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             buffer.setText(''); // Clear the '!' from input
             return;
         }
-        if (key.name === 'escape') {
+        if (keyMatchers[Command.ESCAPE](key)) {
             if (reverseSearchActive) {
                 setReverseSearchActive(false);
                 reverseSearchCompletion.resetCompletionState();
@@ -151,42 +182,65 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             }
             if (shellModeActive) {
                 setShellModeActive(false);
+                resetEscapeState();
                 return;
             }
             if (completion.showSuggestions) {
                 completion.resetCompletionState();
+                resetEscapeState();
                 return;
             }
+            // Handle double ESC for clearing input
+            if (escPressCount === 0) {
+                if (buffer.text === '') {
+                    return;
+                }
+                setEscPressCount(1);
+                setShowEscapePrompt(true);
+                if (escapeTimerRef.current) {
+                    clearTimeout(escapeTimerRef.current);
+                }
+                escapeTimerRef.current = setTimeout(() => {
+                    resetEscapeState();
+                }, 500);
+            }
+            else {
+                // clear input and immediately reset state
+                buffer.setText('');
+                resetCompletionState();
+                resetEscapeState();
+            }
+            return;
         }
-        if (shellModeActive && key.ctrl && key.name === 'r') {
+        if (shellModeActive && keyMatchers[Command.REVERSE_SEARCH](key)) {
             setReverseSearchActive(true);
             setTextBeforeReverseSearch(buffer.text);
             setCursorPosition(buffer.cursor);
             return;
         }
-        if (key.ctrl && key.name === 'l') {
+        if (keyMatchers[Command.CLEAR_SCREEN](key)) {
             onClearScreen();
             return;
         }
         if (reverseSearchActive) {
             const { activeSuggestionIndex, navigateUp, navigateDown, showSuggestions, suggestions, } = reverseSearchCompletion;
             if (showSuggestions) {
-                if (key.name === 'up') {
+                if (keyMatchers[Command.NAVIGATION_UP](key)) {
                     navigateUp();
                     return;
                 }
-                if (key.name === 'down') {
+                if (keyMatchers[Command.NAVIGATION_DOWN](key)) {
                     navigateDown();
                     return;
                 }
-                if (key.name === 'tab') {
+                if (keyMatchers[Command.ACCEPT_SUGGESTION_REVERSE_SEARCH](key)) {
                     reverseSearchCompletion.handleAutocomplete(activeSuggestionIndex);
                     reverseSearchCompletion.resetCompletionState();
                     setReverseSearchActive(false);
                     return;
                 }
             }
-            if (key.name === 'return' && !key.ctrl) {
+            if (keyMatchers[Command.SUBMIT_REVERSE_SEARCH](key)) {
                 const textToSubmit = showSuggestions && activeSuggestionIndex > -1
                     ? suggestions[activeSuggestionIndex].value
                     : buffer.text;
@@ -196,27 +250,28 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
                 return;
             }
             // Prevent up/down from falling through to regular history navigation
-            if (key.name === 'up' || key.name === 'down') {
+            if (keyMatchers[Command.NAVIGATION_UP](key) ||
+                keyMatchers[Command.NAVIGATION_DOWN](key)) {
                 return;
             }
         }
         // If the command is a perfect match, pressing enter should execute it.
-        if (completion.isPerfectMatch && key.name === 'return') {
+        if (completion.isPerfectMatch && keyMatchers[Command.RETURN](key)) {
             handleSubmitAndClear(buffer.text);
             return;
         }
         if (completion.showSuggestions) {
             if (completion.suggestions.length > 1) {
-                if (key.name === 'up' || (key.ctrl && key.name === 'p')) {
+                if (keyMatchers[Command.COMPLETION_UP](key)) {
                     completion.navigateUp();
                     return;
                 }
-                if (key.name === 'down' || (key.ctrl && key.name === 'n')) {
+                if (keyMatchers[Command.COMPLETION_DOWN](key)) {
                     completion.navigateDown();
                     return;
                 }
             }
-            if (key.name === 'tab' || (key.name === 'return' && !key.ctrl)) {
+            if (keyMatchers[Command.ACCEPT_SUGGESTION](key)) {
                 if (completion.suggestions.length > 0) {
                     const targetIndex = completion.activeSuggestionIndex === -1
                         ? 0 // Default to the first if none is active
@@ -228,23 +283,30 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
                 return;
             }
         }
+        // Handle Tab key for ghost text acceptance
+        if (key.name === 'tab' &&
+            !completion.showSuggestions &&
+            completion.promptCompletion.text) {
+            completion.promptCompletion.accept();
+            return;
+        }
         if (!shellModeActive) {
-            if (key.ctrl && key.name === 'p') {
+            if (keyMatchers[Command.HISTORY_UP](key)) {
                 inputHistory.navigateUp();
                 return;
             }
-            if (key.ctrl && key.name === 'n') {
+            if (keyMatchers[Command.HISTORY_DOWN](key)) {
                 inputHistory.navigateDown();
                 return;
             }
             // Handle arrow-up/down for history on single-line or at edges
-            if (key.name === 'up' &&
+            if (keyMatchers[Command.NAVIGATION_UP](key) &&
                 (buffer.allVisualLines.length === 1 ||
                     (buffer.visualCursor[0] === 0 && buffer.visualScrollRow === 0))) {
                 inputHistory.navigateUp();
                 return;
             }
-            if (key.name === 'down' &&
+            if (keyMatchers[Command.NAVIGATION_DOWN](key) &&
                 (buffer.allVisualLines.length === 1 ||
                     buffer.visualCursor[0] === buffer.allVisualLines.length - 1)) {
                 inputHistory.navigateDown();
@@ -252,20 +314,21 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             }
         }
         else {
-            if (key.name === 'up') {
+            // Shell History Navigation
+            if (keyMatchers[Command.NAVIGATION_UP](key)) {
                 const prevCommand = shellHistory.getPreviousCommand();
                 if (prevCommand !== null)
                     buffer.setText(prevCommand);
                 return;
             }
-            if (key.name === 'down') {
+            if (keyMatchers[Command.NAVIGATION_DOWN](key)) {
                 const nextCommand = shellHistory.getNextCommand();
                 if (nextCommand !== null)
                     buffer.setText(nextCommand);
                 return;
             }
         }
-        if (key.name === 'return' && !key.ctrl && !key.meta && !key.paste) {
+        if (keyMatchers[Command.SUBMIT](key)) {
             if (buffer.text.trim()) {
                 const [row, col] = buffer.cursor;
                 const line = buffer.lines[row];
@@ -281,51 +344,56 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             return;
         }
         // Newline insertion
-        if (key.name === 'return' && (key.ctrl || key.meta || key.paste)) {
+        if (keyMatchers[Command.NEWLINE](key)) {
             buffer.newline();
             return;
         }
         // Ctrl+A (Home) / Ctrl+E (End)
-        if (key.ctrl && key.name === 'a') {
+        if (keyMatchers[Command.HOME](key)) {
             buffer.move('home');
             return;
         }
-        if (key.ctrl && key.name === 'e') {
+        if (keyMatchers[Command.END](key)) {
             buffer.move('end');
-            buffer.moveToOffset(cpLen(buffer.text));
             return;
         }
         // Ctrl+C (Clear input)
-        if (key.ctrl && key.name === 'c') {
+        if (keyMatchers[Command.CLEAR_INPUT](key)) {
             if (buffer.text.length > 0) {
                 buffer.setText('');
                 resetCompletionState();
-                return;
             }
             return;
         }
         // Kill line commands
-        if (key.ctrl && key.name === 'k') {
+        if (keyMatchers[Command.KILL_LINE_RIGHT](key)) {
             buffer.killLineRight();
             return;
         }
-        if (key.ctrl && key.name === 'u') {
+        if (keyMatchers[Command.KILL_LINE_LEFT](key)) {
             buffer.killLineLeft();
             return;
         }
         // External editor
-        const isCtrlX = key.ctrl && (key.name === 'x' || key.sequence === '\x18');
-        if (isCtrlX) {
+        if (keyMatchers[Command.OPEN_EXTERNAL_EDITOR](key)) {
             buffer.openInExternalEditor();
             return;
         }
         // Ctrl+V for clipboard image paste
-        if (key.ctrl && key.name === 'v') {
+        if (keyMatchers[Command.PASTE_CLIPBOARD_IMAGE](key)) {
             handleClipboardImage();
             return;
         }
         // Fall back to the text buffer's default input handling for all other keys
         buffer.handleInput(key);
+        // Clear ghost text when user types regular characters (not navigation/control keys)
+        if (completion.promptCompletion.text &&
+            key.sequence &&
+            key.sequence.length === 1 &&
+            !key.ctrl &&
+            !key.meta) {
+            completion.promptCompletion.clear();
+        }
     }, [
         focus,
         buffer,
@@ -339,22 +407,124 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         reverseSearchCompletion,
         handleClipboardImage,
         resetCompletionState,
+        escPressCount,
+        showEscapePrompt,
+        resetEscapeState,
         vimHandleInput,
         reverseSearchActive,
         textBeforeReverseSearch,
         cursorPosition,
     ]);
-    useKeypress(handleInput, { isActive: true });
+    useKeypress(handleInput, {
+        isActive: true,
+    });
     const linesToRender = buffer.viewportVisualLines;
     const [cursorVisualRowAbsolute, cursorVisualColAbsolute] = buffer.visualCursor;
     const scrollVisualRow = buffer.visualScrollRow;
-    return (_jsxs(_Fragment, { children: [_jsxs(Box, { borderStyle: "round", borderColor: shellModeActive ? Colors.AccentYellow : Colors.AccentBlue, paddingX: 1, children: [_jsx(Text, { color: shellModeActive ? Colors.AccentYellow : Colors.AccentPurple, children: shellModeActive ? (reverseSearchActive ? (_jsx(Text, { color: Colors.AccentCyan, children: "(r:) " })) : ('! ')) : ('> ') }), _jsx(Box, { flexGrow: 1, flexDirection: "column", children: buffer.text.length === 0 && placeholder ? (focus ? (_jsxs(Text, { children: [chalk.inverse(placeholder.slice(0, 1)), _jsx(Text, { color: Colors.Gray, children: placeholder.slice(1) })] })) : (_jsx(Text, { color: Colors.Gray, children: placeholder }))) : (linesToRender.map((lineText, visualIdxInRenderedSet) => {
+    const getGhostTextLines = useCallback(() => {
+        if (!completion.promptCompletion.text ||
+            !buffer.text ||
+            !completion.promptCompletion.text.startsWith(buffer.text)) {
+            return { inlineGhost: '', additionalLines: [] };
+        }
+        const ghostSuffix = completion.promptCompletion.text.slice(buffer.text.length);
+        if (!ghostSuffix) {
+            return { inlineGhost: '', additionalLines: [] };
+        }
+        const currentLogicalLine = buffer.lines[buffer.cursor[0]] || '';
+        const cursorCol = buffer.cursor[1];
+        const textBeforeCursor = cpSlice(currentLogicalLine, 0, cursorCol);
+        const usedWidth = stringWidth(textBeforeCursor);
+        const remainingWidth = Math.max(0, inputWidth - usedWidth);
+        const ghostTextLinesRaw = ghostSuffix.split('\n');
+        const firstLineRaw = ghostTextLinesRaw.shift() || '';
+        let inlineGhost = '';
+        let remainingFirstLine = '';
+        if (stringWidth(firstLineRaw) <= remainingWidth) {
+            inlineGhost = firstLineRaw;
+        }
+        else {
+            const words = firstLineRaw.split(' ');
+            let currentLine = '';
+            let wordIdx = 0;
+            for (const word of words) {
+                const prospectiveLine = currentLine ? `${currentLine} ${word}` : word;
+                if (stringWidth(prospectiveLine) > remainingWidth) {
+                    break;
+                }
+                currentLine = prospectiveLine;
+                wordIdx++;
+            }
+            inlineGhost = currentLine;
+            if (words.length > wordIdx) {
+                remainingFirstLine = words.slice(wordIdx).join(' ');
+            }
+        }
+        const linesToWrap = [];
+        if (remainingFirstLine) {
+            linesToWrap.push(remainingFirstLine);
+        }
+        linesToWrap.push(...ghostTextLinesRaw);
+        const remainingGhostText = linesToWrap.join('\n');
+        const additionalLines = [];
+        if (remainingGhostText) {
+            const textLines = remainingGhostText.split('\n');
+            for (const textLine of textLines) {
+                const words = textLine.split(' ');
+                let currentLine = '';
+                for (const word of words) {
+                    const prospectiveLine = currentLine ? `${currentLine} ${word}` : word;
+                    const prospectiveWidth = stringWidth(prospectiveLine);
+                    if (prospectiveWidth > inputWidth) {
+                        if (currentLine) {
+                            additionalLines.push(currentLine);
+                        }
+                        let wordToProcess = word;
+                        while (stringWidth(wordToProcess) > inputWidth) {
+                            let part = '';
+                            const wordCP = toCodePoints(wordToProcess);
+                            let partWidth = 0;
+                            let splitIndex = 0;
+                            for (let i = 0; i < wordCP.length; i++) {
+                                const char = wordCP[i];
+                                const charWidth = stringWidth(char);
+                                if (partWidth + charWidth > inputWidth) {
+                                    break;
+                                }
+                                part += char;
+                                partWidth += charWidth;
+                                splitIndex = i + 1;
+                            }
+                            additionalLines.push(part);
+                            wordToProcess = cpSlice(wordToProcess, splitIndex);
+                        }
+                        currentLine = wordToProcess;
+                    }
+                    else {
+                        currentLine = prospectiveLine;
+                    }
+                }
+                if (currentLine) {
+                    additionalLines.push(currentLine);
+                }
+            }
+        }
+        return { inlineGhost, additionalLines };
+    }, [
+        completion.promptCompletion.text,
+        buffer.text,
+        buffer.lines,
+        buffer.cursor,
+        inputWidth,
+    ]);
+    const { inlineGhost, additionalLines } = getGhostTextLines();
+    return (_jsxs(_Fragment, { children: [_jsxs(Box, { borderStyle: "round", borderColor: shellModeActive ? theme.status.warning : theme.border.focused, paddingX: 1, children: [_jsx(Text, { color: shellModeActive ? theme.status.warning : theme.text.accent, children: shellModeActive ? (reverseSearchActive ? (_jsxs(Text, { color: theme.text.link, "aria-label": SCREEN_READER_USER_PREFIX, children: ["(r:)", ' '] })) : ('! ')) : ('> ') }), _jsx(Box, { flexGrow: 1, flexDirection: "column", children: buffer.text.length === 0 && placeholder ? (focus ? (_jsxs(Text, { 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 cursorVisualRow = cursorVisualRowAbsolute - scrollVisualRow;
                             let display = cpSlice(lineText, 0, inputWidth);
-                            const currentVisualWidth = stringWidth(display);
-                            if (currentVisualWidth < inputWidth) {
-                                display = display + ' '.repeat(inputWidth - currentVisualWidth);
-                            }
+                            const isOnCursorLine = focus && visualIdxInRenderedSet === cursorVisualRow;
+                            const currentLineGhost = isOnCursorLine ? inlineGhost : '';
+                            const ghostWidth = stringWidth(currentLineGhost);
                             if (focus && visualIdxInRenderedSet === cursorVisualRow) {
                                 const relativeVisualColForHighlight = cursorVisualColAbsolute;
                                 if (relativeVisualColForHighlight >= 0) {
@@ -366,13 +536,28 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
                                                 highlighted +
                                                 cpSlice(display, relativeVisualColForHighlight + 1);
                                     }
-                                    else if (relativeVisualColForHighlight === cpLen(display) &&
-                                        cpLen(display) === inputWidth) {
-                                        display = display + chalk.inverse(' ');
+                                    else if (relativeVisualColForHighlight === cpLen(display)) {
+                                        if (!currentLineGhost) {
+                                            display = display + chalk.inverse(' ');
+                                        }
                                     }
                                 }
                             }
-                            return (_jsx(Text, { children: display }, `line-${visualIdxInRenderedSet}`));
-                        })) })] }), completion.showSuggestions && (_jsx(Box, { children: _jsx(SuggestionsDisplay, { suggestions: completion.suggestions, activeIndex: completion.activeSuggestionIndex, isLoading: completion.isLoadingSuggestions, width: suggestionsWidth, scrollOffset: completion.visibleStartIndex, userInput: buffer.text }) })), reverseSearchActive && (_jsx(Box, { children: _jsx(SuggestionsDisplay, { suggestions: reverseSearchCompletion.suggestions, activeIndex: reverseSearchCompletion.activeSuggestionIndex, isLoading: reverseSearchCompletion.isLoadingSuggestions, width: suggestionsWidth, scrollOffset: reverseSearchCompletion.visibleStartIndex, userInput: buffer.text }) }))] }));
+                            const showCursorBeforeGhost = focus &&
+                                visualIdxInRenderedSet === cursorVisualRow &&
+                                cursorVisualColAbsolute ===
+                                    // eslint-disable-next-line no-control-regex
+                                    cpLen(display.replace(/\x1b\[[0-9;]*m/g, '')) &&
+                                currentLineGhost;
+                            const actualDisplayWidth = stringWidth(display);
+                            const cursorWidth = showCursorBeforeGhost ? 1 : 0;
+                            const totalContentWidth = actualDisplayWidth + cursorWidth + ghostWidth;
+                            const trailingPadding = Math.max(0, inputWidth - totalContentWidth);
+                            return (_jsxs(Text, { children: [display, showCursorBeforeGhost && chalk.inverse(' '), currentLineGhost && (_jsx(Text, { color: theme.text.secondary, children: currentLineGhost })), trailingPadding > 0 && ' '.repeat(trailingPadding)] }, `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}`));
+                        }))) })] }), completion.showSuggestions && (_jsx(Box, { paddingRight: 2, children: _jsx(SuggestionsDisplay, { suggestions: completion.suggestions, activeIndex: completion.activeSuggestionIndex, isLoading: completion.isLoadingSuggestions, width: suggestionsWidth, scrollOffset: completion.visibleStartIndex, userInput: buffer.text }) })), reverseSearchActive && (_jsx(Box, { paddingRight: 2, children: _jsx(SuggestionsDisplay, { suggestions: reverseSearchCompletion.suggestions, activeIndex: reverseSearchCompletion.activeSuggestionIndex, isLoading: reverseSearchCompletion.isLoadingSuggestions, width: suggestionsWidth, scrollOffset: reverseSearchCompletion.visibleStartIndex, userInput: buffer.text }) }))] }));
 };
 //# sourceMappingURL=InputPrompt.js.map