Merge branch 'main' into adibakm/disable-esc-esc-rewind

packages/cli/src/ui/components/Composer.test.tsx

@@ -394,7 +394,7 @@ describe('Composer', () => {
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('Press Esc again to rewind');
+      expect(lastFrame()).toContain('Press Esc again to clear prompt');
     });
   });
 

packages/cli/src/ui/components/InputPrompt.test.tsx

@@ -2173,32 +2173,6 @@ describe('InputPrompt', () => {
       unmount();
     });
 
-    it('should submit /rewind on double ESC when buffer is empty', async () => {
-      const onEscapePromptChange = vi.fn();
-      props.onEscapePromptChange = onEscapePromptChange;
-      props.buffer.setText('');
-      vi.mocked(props.buffer.setText).mockClear();
-
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-        {
-          uiState: {
-            history: [{ id: 1, type: 'user', text: 'test' }],
-          },
-        },
-      );
-
-      await act(async () => {
-        stdin.write('\x1B\x1B');
-        vi.advanceTimersByTime(100);
-      });
-
-      await waitFor(() => {
-        expect(props.onSubmit).toHaveBeenCalledWith('/rewind');
-      });
-      unmount();
-    });
-
     it('should clear the buffer on esc esc if it has text', async () => {
       const onEscapePromptChange = vi.fn();
       props.onEscapePromptChange = onEscapePromptChange;

packages/cli/src/ui/components/InputPrompt.tsx

@@ -32,7 +32,7 @@ import { useKeypress } from '../hooks/useKeypress.js';
 import { keyMatchers, Command } from '../keyMatchers.js';
 import type { CommandContext, SlashCommand } from '../commands/types.js';
 import type { Config } from '@google/gemini-cli-core';
-import { ApprovalMode, coreEvents, debugLogger } from '@google/gemini-cli-core';
+import { ApprovalMode, debugLogger } from '@google/gemini-cli-core';
 import {
   parseInputForHighlighting,
   parseSegmentsFromTokens,
@@ -147,7 +147,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   const kittyProtocol = useKittyKeyboardProtocol();
   const isShellFocused = useShellFocusState();
   const { setEmbeddedShellFocused } = useUIActions();
-  const { terminalWidth, activePtyId, history, terminalBackgroundColor } =
+  const { terminalWidth, activePtyId, terminalBackgroundColor } =
     useUIState();
   const [justNavigatedHistory, setJustNavigatedHistory] = useState(false);
   const escPressCount = useRef(0);
@@ -586,12 +586,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           buffer.setText('');
           resetCompletionState();
           return;
-        } else if (history.length > 0) {
-          onSubmit('/rewind');
-          return;
         }
-        coreEvents.emitFeedback('info', 'Nothing to rewind to');
-        return;
       }
 
       if (shellModeActive && keyMatchers[Command.REVERSE_SEARCH](key)) {
@@ -959,10 +954,8 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       kittyProtocol.enabled,
       tryLoadQueuedMessages,
       setBannerVisible,
-      onSubmit,
       activePtyId,
       setEmbeddedShellFocused,
-      history,
     ],
   );
 

packages/cli/src/ui/components/StatusDisplay.tsx

@@ -45,17 +45,8 @@ export const StatusDisplay: React.FC<StatusDisplayProps> = ({
   }
 
   if (uiState.showEscapePrompt) {
-    const isPromptEmpty = uiState.buffer.text.length === 0;
-    const hasHistory = uiState.history.length > 0;
-
-    if (isPromptEmpty && !hasHistory) {
-      return null;
-    }
-
     return (
-      <Text color={theme.text.secondary}>
-        Press Esc again to {isPromptEmpty ? 'rewind' : 'clear prompt'}.
-      </Text>
+      <Text color={theme.text.secondary}>Press Esc again to clear prompt.</Text>
     );
   }
 

packages/cli/src/ui/components/__snapshots__/StatusDisplay.test.tsx.snap

@@ -12,7 +12,7 @@ exports[`StatusDisplay > renders Ctrl+D prompt 1`] = `"Press Ctrl+D again to exi
 
 exports[`StatusDisplay > renders Escape prompt when buffer is NOT empty 1`] = `"Press Esc again to clear prompt."`;
 
-exports[`StatusDisplay > renders Escape prompt when buffer is empty 1`] = `"Press Esc again to rewind."`;
+exports[`StatusDisplay > renders Escape prompt when buffer is empty 1`] = `"Press Esc again to clear prompt."`;
 
 exports[`StatusDisplay > renders HookStatusDisplay when hooks are active 1`] = `"Mock Hook Status Display"`;