From ee87c98f43cf9953a7cde1de5b7a727cf6f5f36a Mon Sep 17 00:00:00 2001
From: gemini-cli-robot <gemini-cli-robot@google.com>
Date: Thu, 22 Jan 2026 14:04:49 -0800
Subject: [PATCH] fix(patch): cherry-pick addb57c to
 release/v0.26.0-preview.2-pr-17331 [CONFLICTS] (#17345)

Co-authored-by: Tommaso Sciortino <sciortino@gmail.com>
---
 packages/cli/src/ui/contexts/KeypressContext.test.tsx | 3 +++
 packages/cli/src/ui/contexts/KeypressContext.tsx      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/cli/src/ui/contexts/KeypressContext.test.tsx b/packages/cli/src/ui/contexts/KeypressContext.test.tsx
index c557706b64..5a1580d219 100644
--- a/packages/cli/src/ui/contexts/KeypressContext.test.tsx
+++ b/packages/cli/src/ui/contexts/KeypressContext.test.tsx
@@ -212,6 +212,9 @@ describe('KeypressContext', () => {
           name: 'return',
           sequence: '\r',
           insertable: true,
+          shift: true,
+          meta: false,
+          ctrl: false,
         }),
       );
     });
diff --git a/packages/cli/src/ui/contexts/KeypressContext.tsx b/packages/cli/src/ui/contexts/KeypressContext.tsx
index 88aad71a27..5617c23b73 100644
--- a/packages/cli/src/ui/contexts/KeypressContext.tsx
+++ b/packages/cli/src/ui/contexts/KeypressContext.tsx
@@ -158,6 +158,9 @@ function bufferFastReturn(keypressHandler: KeypressHandler): KeypressHandler {
       keypressHandler({
         ...key,
         name: 'return',
+        shift: true, // to make it a newline, not a submission
+        ctrl: false,
+        meta: false,
         sequence: '\r',
         insertable: true,
       });