From cb4f0c6fa4442723c279bdac8d90ca3fa777093e Mon Sep 17 00:00:00 2001
From: Dmitry Lyalin <dmitry.lyalin@lyalin.com>
Date: Sun, 1 Feb 2026 08:16:14 -0800
Subject: [PATCH] Fix Esc cancel during streaming (#18039)

---
 packages/cli/src/ui/components/InputPrompt.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/cli/src/ui/components/InputPrompt.tsx b/packages/cli/src/ui/components/InputPrompt.tsx
index f1bb8f331c..dbca3917c7 100644
--- a/packages/cli/src/ui/components/InputPrompt.tsx
+++ b/packages/cli/src/ui/components/InputPrompt.tsx
@@ -482,6 +482,14 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         return false;
       }
 
+      if (
+        key.name === 'escape' &&
+        (streamingState === StreamingState.Responding ||
+          streamingState === StreamingState.WaitingForConfirmation)
+      ) {
+        return false;
+      }
+
       if (key.name === 'paste') {
         // Record paste time to prevent accidental auto-submission
         if (!isTerminalPasteTrusted(kittyProtocol.enabled)) {
@@ -977,6 +985,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       backgroundShells.size,
       backgroundShellHeight,
       history,
+      streamingState,
     ],
   );