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

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

@@ -0,0 +1,57 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach } from 'vitest';
+import * as processUtils from '../../utils/processUtils.js';
+import { renderWithProviders } from '../../test-utils/render.js';
+import { IdeTrustChangeDialog } from './IdeTrustChangeDialog.js';
+describe('IdeTrustChangeDialog', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    it('renders the correct message for CONNECTION_CHANGE', () => {
+        const { lastFrame } = renderWithProviders(_jsx(IdeTrustChangeDialog, { reason: "CONNECTION_CHANGE" }));
+        const frameText = lastFrame();
+        expect(frameText).toContain('Workspace trust has changed due to a change in the IDE connection.');
+        expect(frameText).toContain("Press 'r' to restart Gemini");
+    });
+    it('renders the correct message for TRUST_CHANGE', () => {
+        const { lastFrame } = renderWithProviders(_jsx(IdeTrustChangeDialog, { reason: "TRUST_CHANGE" }));
+        const frameText = lastFrame();
+        expect(frameText).toContain('Workspace trust has changed due to a change in the IDE trust.');
+        expect(frameText).toContain("Press 'r' to restart Gemini");
+    });
+    it('renders a generic message and logs an error for NONE reason', () => {
+        const consoleErrorSpy = vi
+            .spyOn(console, 'error')
+            .mockImplementation(() => { });
+        const { lastFrame } = renderWithProviders(_jsx(IdeTrustChangeDialog, { reason: "NONE" }));
+        const frameText = lastFrame();
+        expect(frameText).toContain('Workspace trust has changed.');
+        expect(consoleErrorSpy).toHaveBeenCalledWith('IdeTrustChangeDialog rendered with unexpected reason "NONE"');
+    });
+    it('calls relaunchApp when "r" is pressed', () => {
+        const relaunchAppSpy = vi.spyOn(processUtils, 'relaunchApp');
+        const { stdin } = renderWithProviders(_jsx(IdeTrustChangeDialog, { reason: "NONE" }));
+        stdin.write('r');
+        expect(relaunchAppSpy).toHaveBeenCalledTimes(1);
+    });
+    it('calls relaunchApp when "R" is pressed', () => {
+        const relaunchAppSpy = vi.spyOn(processUtils, 'relaunchApp');
+        const { stdin } = renderWithProviders(_jsx(IdeTrustChangeDialog, { reason: "CONNECTION_CHANGE" }));
+        stdin.write('R');
+        expect(relaunchAppSpy).toHaveBeenCalledTimes(1);
+    });
+    it('does not call relaunchApp when another key is pressed', async () => {
+        const relaunchAppSpy = vi.spyOn(processUtils, 'relaunchApp');
+        const { stdin } = renderWithProviders(_jsx(IdeTrustChangeDialog, { reason: "CONNECTION_CHANGE" }));
+        stdin.write('a');
+        // Give it a moment to ensure no async actions are triggered
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        expect(relaunchAppSpy).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=IdeTrustChangeDialog.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"IdeTrustChangeDialog.test.js","sourceRoot":"","sources":["../../../../src/ui/components/IdeTrustChangeDialog.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,KAAK,YAAY,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,oBAAoB,IAAC,MAAM,EAAC,mBAAmB,GAAG,CACpD,CAAC;QAEF,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC;QAC9B,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CACzB,oEAAoE,CACrE,CAAC;QACF,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,oBAAoB,IAAC,MAAM,EAAC,cAAc,GAAG,CAC/C,CAAC;QAEF,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC;QAC9B,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CACzB,+DAA+D,CAChE,CAAC;QACF,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,eAAe,GAAG,EAAE;aACvB,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC;aACvB,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAChC,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,oBAAoB,IAAC,MAAM,EAAC,MAAM,GAAG,CACvC,CAAC;QAEF,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC;QAC9B,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;QAC5D,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC1C,6DAA6D,CAC9D,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,cAAc,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAC7D,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,CACnC,KAAC,oBAAoB,IAAC,MAAM,EAAC,MAAM,GAAG,CACvC,CAAC;QAEF,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEjB,MAAM,CAAC,cAAc,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,cAAc,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAC7D,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,CACnC,KAAC,oBAAoB,IAAC,MAAM,EAAC,mBAAmB,GAAG,CACpD,CAAC;QAEF,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEjB,MAAM,CAAC,cAAc,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,cAAc,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAC7D,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,CACnC,KAAC,oBAAoB,IAAC,MAAM,EAAC,mBAAmB,GAAG,CACpD,CAAC;QAEF,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEjB,4DAA4D;QAC5D,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QAExD,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -8,6 +8,7 @@ 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';
+import { ApprovalMode } from '@umsai/ums-code-core';
 export interface InputPromptProps {
     buffer: TextBuffer;
     onSubmit: (value: string) => void;
@@ -22,7 +23,15 @@ export interface InputPromptProps {
     suggestionsWidth: number;
     shellModeActive: boolean;
     setShellModeActive: (value: boolean) => void;
+    approvalMode: ApprovalMode;
     onEscapePromptChange?: (showPrompt: boolean) => void;
     vimHandleInput?: (key: Key) => boolean;
+    isEmbeddedShellFocused?: boolean;
 }
+export declare const calculatePromptWidths: (terminalWidth: number) => {
+    readonly inputWidth: number;
+    readonly containerWidth: number;
+    readonly suggestionsWidth: number;
+    readonly frameOverhead: number;
+};
 export declare const InputPrompt: React.FC<InputPromptProps>;

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

@@ -1,27 +1,52 @@
 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 { SuggestionsDisplay, MAX_WIDTH } from './SuggestionsDisplay.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, toCodePoints } from '../utils/textUtils.js';
+import { cpSlice, cpLen } 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 { ApprovalMode } from '@umsai/ums-code-core';
+import { parseInputForHighlighting, buildSegmentsForVisualSlice, } from '../utils/highlight.js';
+import { t } from '../../i18n/index.js';
 import { clipboardHasImage, saveClipboardImage, cleanupOldClipboardImages, } from '../utils/clipboardUtils.js';
 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, onEscapePromptChange, vimHandleInput, }) => {
+import { useShellFocusState } from '../contexts/ShellFocusContext.js';
+// The input content, input container, and input suggestions list may have different widths
+export const calculatePromptWidths = (terminalWidth) => {
+    const widthFraction = 0.9;
+    const FRAME_PADDING_AND_BORDER = 4; // Border (2) + padding (2)
+    const PROMPT_PREFIX_WIDTH = 2; // '> ' or '! '
+    const MIN_CONTENT_WIDTH = 2;
+    const innerContentWidth = Math.floor(terminalWidth * widthFraction) -
+        FRAME_PADDING_AND_BORDER -
+        PROMPT_PREFIX_WIDTH;
+    const inputWidth = Math.max(MIN_CONTENT_WIDTH, innerContentWidth);
+    const FRAME_OVERHEAD = FRAME_PADDING_AND_BORDER + PROMPT_PREFIX_WIDTH;
+    const containerWidth = inputWidth + FRAME_OVERHEAD;
+    const suggestionsWidth = Math.max(20, Math.floor(terminalWidth * 1.0));
+    return {
+        inputWidth,
+        containerWidth,
+        suggestionsWidth,
+        frameOverhead: FRAME_OVERHEAD,
+    };
+};
+export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, config, slashCommands, commandContext, placeholder, focus = true, suggestionsWidth, shellModeActive, setShellModeActive, approvalMode, onEscapePromptChange, vimHandleInput, isEmbeddedShellFocused, }) => {
+    const isShellFocused = useShellFocusState();
     const [justNavigatedHistory, setJustNavigatedHistory] = useState(false);
     const [escPressCount, setEscPressCount] = useState(0);
     const [showEscapePrompt, setShowEscapePrompt] = useState(false);
     const escapeTimerRef = useRef(null);
+    const [recentPasteTime, setRecentPasteTime] = useState(null);
+    const pasteTimeoutRef = useRef(null);
     const [dirs, setDirs] = useState(config.getWorkspaceContext().getDirectories());
     const dirsChanged = config.getWorkspaceContext().getDirectories();
     useEffect(() => {
@@ -30,16 +55,21 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         }
     }, [dirs.length, dirsChanged]);
     const [reverseSearchActive, setReverseSearchActive] = useState(false);
+    const [commandSearchActive, setCommandSearchActive] = useState(false);
     const [textBeforeReverseSearch, setTextBeforeReverseSearch] = useState('');
     const [cursorPosition, setCursorPosition] = useState([
         0, 0,
     ]);
-    const shellHistory = useShellHistory(config.getProjectRoot(), config.storage);
-    const historyData = shellHistory.history;
+    const [expandedSuggestionIndex, setExpandedSuggestionIndex] = useState(-1);
+    const shellHistory = useShellHistory(config.getProjectRoot());
+    const shellHistoryData = shellHistory.history;
     const completion = useCommandCompletion(buffer, dirs, config.getTargetDir(), slashCommands, commandContext, reverseSearchActive, config);
-    const reverseSearchCompletion = useReverseSearchCompletion(buffer, historyData, reverseSearchActive);
+    const reverseSearchCompletion = useReverseSearchCompletion(buffer, shellHistoryData, reverseSearchActive);
+    const commandSearchCompletion = useReverseSearchCompletion(buffer, userMessages, 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);
@@ -59,6 +89,9 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         if (escapeTimerRef.current) {
             clearTimeout(escapeTimerRef.current);
         }
+        if (pasteTimeoutRef.current) {
+            clearTimeout(pasteTimeoutRef.current);
+        }
     }, []);
     const handleSubmitAndClear = useCallback((submittedValue) => {
         if (shellModeActive) {
@@ -95,6 +128,8 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         if (justNavigatedHistory) {
             resetCompletionState();
             resetReverseSearchCompletionState();
+            resetCommandSearchCompletionState();
+            setExpandedSuggestionIndex(-1);
             setJustNavigatedHistory(false);
         }
     }, [
@@ -103,6 +138,7 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         resetCompletionState,
         setJustNavigatedHistory,
         resetReverseSearchCompletionState,
+        resetCommandSearchCompletionState,
     ]);
     // Handle clipboard image pasting with Ctrl+V
     const handleClipboardImage = useCallback(async () => {
@@ -146,11 +182,25 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         }
     }, [buffer, config]);
     const handleInput = useCallback((key) => {
+        // TODO(jacobr): this special case is likely not needed anymore.
+        // We should probably stop supporting paste if the InputPrompt is not
+        // focused.
         /// We want to handle paste even when not focused to support drag and drop.
         if (!focus && !key.paste) {
             return;
         }
         if (key.paste) {
+            // Record paste time to prevent accidental auto-submission
+            setRecentPasteTime(Date.now());
+            // Clear any existing paste timeout
+            if (pasteTimeoutRef.current) {
+                clearTimeout(pasteTimeoutRef.current);
+            }
+            // Clear the paste protection after a safe delay
+            pasteTimeoutRef.current = setTimeout(() => {
+                setRecentPasteTime(null);
+                pasteTimeoutRef.current = null;
+            }, 500);
             // Ensure we never accidentally interpret paste as regular input.
             buffer.handleInput(key);
             return;
@@ -172,12 +222,20 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             return;
         }
         if (keyMatchers[Command.ESCAPE](key)) {
-            if (reverseSearchActive) {
-                setReverseSearchActive(false);
-                reverseSearchCompletion.resetCompletionState();
+            const cancelSearch = (setActive, resetCompletion) => {
+                setActive(false);
+                resetCompletion();
                 buffer.setText(textBeforeReverseSearch);
                 const offset = logicalPosToOffset(buffer.lines, cursorPosition[0], cursorPosition[1]);
                 buffer.moveToOffset(offset);
+                setExpandedSuggestionIndex(-1);
+            };
+            if (reverseSearchActive) {
+                cancelSearch(setReverseSearchActive, reverseSearchCompletion.resetCompletionState);
+                return;
+            }
+            if (commandSearchActive) {
+                cancelSearch(setCommandSearchActive, commandSearchCompletion.resetCompletionState);
                 return;
             }
             if (shellModeActive) {
@@ -187,6 +245,7 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             }
             if (completion.showSuggestions) {
                 completion.resetCompletionState();
+                setExpandedSuggestionIndex(-1);
                 resetEscapeState();
                 return;
             }
@@ -222,8 +281,16 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             onClearScreen();
             return;
         }
-        if (reverseSearchActive) {
-            const { activeSuggestionIndex, navigateUp, navigateDown, showSuggestions, suggestions, } = reverseSearchCompletion;
+        if (reverseSearchActive || commandSearchActive) {
+            const isCommandSearch = commandSearchActive;
+            const sc = isCommandSearch
+                ? commandSearchCompletion
+                : reverseSearchCompletion;
+            const { activeSuggestionIndex, navigateUp, navigateDown, showSuggestions, suggestions, } = sc;
+            const setActive = isCommandSearch
+                ? setCommandSearchActive
+                : setReverseSearchActive;
+            const resetState = sc.resetCompletionState;
             if (showSuggestions) {
                 if (keyMatchers[Command.NAVIGATION_UP](key)) {
                     navigateUp();
@@ -233,10 +300,22 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
                     navigateDown();
                     return;
                 }
+                if (keyMatchers[Command.COLLAPSE_SUGGESTION](key)) {
+                    if (suggestions[activeSuggestionIndex].value.length >= MAX_WIDTH) {
+                        setExpandedSuggestionIndex(-1);
+                        return;
+                    }
+                }
+                if (keyMatchers[Command.EXPAND_SUGGESTION](key)) {
+                    if (suggestions[activeSuggestionIndex].value.length >= MAX_WIDTH) {
+                        setExpandedSuggestionIndex(activeSuggestionIndex);
+                        return;
+                    }
+                }
                 if (keyMatchers[Command.ACCEPT_SUGGESTION_REVERSE_SEARCH](key)) {
-                    reverseSearchCompletion.handleAutocomplete(activeSuggestionIndex);
-                    reverseSearchCompletion.resetCompletionState();
-                    setReverseSearchActive(false);
+                    sc.handleAutocomplete(activeSuggestionIndex);
+                    resetState();
+                    setActive(false);
                     return;
                 }
             }
@@ -245,8 +324,8 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
                     ? suggestions[activeSuggestionIndex].value
                     : buffer.text;
                 handleSubmitAndClear(textToSubmit);
-                reverseSearchCompletion.resetCompletionState();
-                setReverseSearchActive(false);
+                resetState();
+                setActive(false);
                 return;
             }
             // Prevent up/down from falling through to regular history navigation
@@ -264,10 +343,12 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             if (completion.suggestions.length > 1) {
                 if (keyMatchers[Command.COMPLETION_UP](key)) {
                     completion.navigateUp();
+                    setExpandedSuggestionIndex(-1); // Reset expansion when navigating
                     return;
                 }
                 if (keyMatchers[Command.COMPLETION_DOWN](key)) {
                     completion.navigateDown();
+                    setExpandedSuggestionIndex(-1); // Reset expansion when navigating
                     return;
                 }
             }
@@ -278,19 +359,19 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
                         : completion.activeSuggestionIndex;
                     if (targetIndex < completion.suggestions.length) {
                         completion.handleAutocomplete(targetIndex);
+                        setExpandedSuggestionIndex(-1); // Reset expansion after selection
                     }
                 }
                 return;
             }
         }
-        // Handle Tab key for ghost text acceptance
-        if (key.name === 'tab' &&
-            !completion.showSuggestions &&
-            completion.promptCompletion.text) {
-            completion.promptCompletion.accept();
-            return;
-        }
         if (!shellModeActive) {
+            if (keyMatchers[Command.REVERSE_SEARCH](key)) {
+                setCommandSearchActive(true);
+                setTextBeforeReverseSearch(buffer.text);
+                setCursorPosition(buffer.cursor);
+                return;
+            }
             if (keyMatchers[Command.HISTORY_UP](key)) {
                 inputHistory.navigateUp();
                 return;
@@ -330,6 +411,11 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         }
         if (keyMatchers[Command.SUBMIT](key)) {
             if (buffer.text.trim()) {
+                // Check if a paste operation occurred recently to prevent accidental auto-submission
+                if (recentPasteTime !== null) {
+                    // Paste occurred recently, ignore this submit to prevent auto-execution
+                    return;
+                }
                 const [row, col] = buffer.cursor;
                 const line = buffer.lines[row];
                 const charBefore = col > 0 ? cpSlice(line, col - 1, col) : '';
@@ -374,6 +460,10 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
             buffer.killLineLeft();
             return;
         }
+        if (keyMatchers[Command.DELETE_WORD_BACKWARD](key)) {
+            buffer.deleteWordLeft();
+            return;
+        }
         // External editor
         if (keyMatchers[Command.OPEN_EXTERNAL_EDITOR](key)) {
             buffer.openInExternalEditor();
@@ -386,14 +476,6 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         }
         // 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,
@@ -414,150 +496,88 @@ export const InputPrompt = ({ buffer, onSubmit, userMessages, onClearScreen, con
         reverseSearchActive,
         textBeforeReverseSearch,
         cursorPosition,
+        recentPasteTime,
+        commandSearchActive,
+        commandSearchCompletion,
     ]);
-    useKeypress(handleInput, {
-        isActive: true,
-    });
+    useKeypress(handleInput, { isActive: !isEmbeddedShellFocused });
     const linesToRender = buffer.viewportVisualLines;
     const [cursorVisualRowAbsolute, cursorVisualColAbsolute] = buffer.visualCursor;
     const scrollVisualRow = buffer.visualScrollRow;
-    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 getActiveCompletion = () => {
+        if (commandSearchActive)
+            return commandSearchCompletion;
+        if (reverseSearchActive)
+            return reverseSearchCompletion;
+        return completion;
+    };
+    const activeCompletion = getActiveCompletion();
+    const shouldShowSuggestions = activeCompletion.showSuggestions;
+    const showAutoAcceptStyling = !shellModeActive && approvalMode === ApprovalMode.AUTO_EDIT;
+    const showYoloStyling = !shellModeActive && approvalMode === ApprovalMode.YOLO;
+    let statusColor;
+    let statusText = '';
+    if (shellModeActive) {
+        statusColor = theme.ui.symbol;
+        statusText = t('Shell mode');
+    }
+    else if (showYoloStyling) {
+        statusColor = theme.status.error;
+        statusText = t('YOLO mode');
+    }
+    else if (showAutoAcceptStyling) {
+        statusColor = theme.status.warning;
+        statusText = t('Accepting edits');
+    }
+    return (_jsxs(_Fragment, { children: [_jsxs(Box, { borderStyle: "round", borderColor: isShellFocused && !isEmbeddedShellFocused
+                    ? (statusColor ?? theme.border.focused)
+                    : theme.border.default, paddingX: 1, 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", children: buffer.text.length === 0 && placeholder ? (showCursor ? (_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 absoluteVisualIdx = scrollVisualRow + visualIdxInRenderedSet;
+                            const mapEntry = buffer.visualToLogicalMap[absoluteVisualIdx];
                             const cursorVisualRow = cursorVisualRowAbsolute - scrollVisualRow;
-                            let display = cpSlice(lineText, 0, inputWidth);
                             const isOnCursorLine = focus && visualIdxInRenderedSet === cursorVisualRow;
-                            const currentLineGhost = isOnCursorLine ? inlineGhost : '';
-                            const ghostWidth = stringWidth(currentLineGhost);
-                            if (focus && visualIdxInRenderedSet === cursorVisualRow) {
-                                const relativeVisualColForHighlight = cursorVisualColAbsolute;
-                                if (relativeVisualColForHighlight >= 0) {
-                                    if (relativeVisualColForHighlight < cpLen(display)) {
-                                        const charToHighlight = cpSlice(display, relativeVisualColForHighlight, relativeVisualColForHighlight + 1) || ' ';
-                                        const highlighted = chalk.inverse(charToHighlight);
+                            const renderedLine = [];
+                            const [logicalLineIdx, logicalStartCol] = mapEntry;
+                            const logicalLine = buffer.lines[logicalLineIdx] || '';
+                            const tokens = parseInputForHighlighting(logicalLine, logicalLineIdx);
+                            const visualStart = logicalStartCol;
+                            const visualEnd = logicalStartCol + cpLen(lineText);
+                            const segments = buildSegmentsForVisualSlice(tokens, visualStart, visualEnd);
+                            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(seg.text, relativeVisualColForHighlight - segStart, relativeVisualColForHighlight - segStart + 1);
+                                        const highlighted = showCursor
+                                            ? chalk.inverse(charToHighlight)
+                                            : charToHighlight;
                                         display =
-                                            cpSlice(display, 0, relativeVisualColForHighlight) +
+                                            cpSlice(seg.text, 0, relativeVisualColForHighlight - segStart) +
                                                 highlighted +
-                                                cpSlice(display, relativeVisualColForHighlight + 1);
-                                    }
-                                    else if (relativeVisualColForHighlight === cpLen(display)) {
-                                        if (!currentLineGhost) {
-                                            display = display + chalk.inverse(' ');
-                                        }
+                                                cpSlice(seg.text, relativeVisualColForHighlight - segStart + 1);
                                     }
+                                    charCount = segEnd;
                                 }
+                                const color = seg.type === 'command' || seg.type === 'file'
+                                    ? theme.text.accent
+                                    : theme.text.primary;
+                                renderedLine.push(_jsx(Text, { color: color, children: display }, `token-${segIdx}`));
+                            });
+                            if (isOnCursorLine &&
+                                cursorVisualColAbsolute === cpLen(lineText)) {
+                                renderedLine.push(_jsx(Text, { children: showCursor ? chalk.inverse(' ') : ' ' }, `cursor-end-${cursorVisualColAbsolute}`));
                             }
-                            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 }) }))] }));
+                            return (_jsx(Box, { height: 1, children: _jsx(Text, { children: renderedLine }) }, `line-${visualIdxInRenderedSet}`));
+                        })) })] }), shouldShowSuggestions && (_jsx(Box, { paddingRight: 2, children: _jsx(SuggestionsDisplay, { suggestions: activeCompletion.suggestions, activeIndex: activeCompletion.activeSuggestionIndex, isLoading: activeCompletion.isLoadingSuggestions, width: suggestionsWidth, scrollOffset: activeCompletion.visibleStartIndex, userInput: buffer.text, mode: buffer.text.startsWith('/') &&
+                        !reverseSearchActive &&
+                        !commandSearchActive
+                        ? 'slash'
+                        : 'reverse', expandedIndex: expandedSuggestionIndex }) }))] }));
 };
 //# sourceMappingURL=InputPrompt.js.map