From 872f308536dc2d0a7d654fc548f1a92005dd4d8e Mon Sep 17 00:00:00 2001
From: Taylor Mullen <ntaylormullen@google.com>
Date: Tue, 20 May 2025 22:45:10 -0700
Subject: [PATCH] feat: Allow Esc to exit shell mode

- Update InputPrompt.tsx to handle Esc key for exiting shell mode.
- Modify ShellModeIndicator.tsx to reflect the new keybinding.
Fixes https://buganizer.corp.google.com/issues/419087952
---
 packages/cli/src/ui/components/InputPrompt.tsx        | 4 ++++
 packages/cli/src/ui/components/ShellModeIndicator.tsx | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/ui/components/InputPrompt.tsx b/packages/cli/src/ui/components/InputPrompt.tsx
index 26c9d14f..e3b13f51 100644
--- a/packages/cli/src/ui/components/InputPrompt.tsx
+++ b/packages/cli/src/ui/components/InputPrompt.tsx
@@ -189,6 +189,10 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           return true;
         }
         if (key.escape) {
+          if (shellModeActive) {
+            setShellModeActive(false);
+            return;
+          }
           completion.resetCompletionState();
           return;
         }
diff --git a/packages/cli/src/ui/components/ShellModeIndicator.tsx b/packages/cli/src/ui/components/ShellModeIndicator.tsx
index e4147035..612af1a6 100644
--- a/packages/cli/src/ui/components/ShellModeIndicator.tsx
+++ b/packages/cli/src/ui/components/ShellModeIndicator.tsx
@@ -12,7 +12,7 @@ export const ShellModeIndicator: React.FC = () => (
   <Box>
     <Text color={Colors.AccentYellow}>
       shell mode enabled
-      <Text color={Colors.SubtleComment}> (! to toggle)</Text>
+      <Text color={Colors.SubtleComment}> (esc to disable)</Text>
     </Text>
   </Box>
 );