From af606aed9b99665edb6bf3747cb8bf757ece7a39 Mon Sep 17 00:00:00 2001
From: Thanh Nguyen <74597207+ThanhNguyxn@users.noreply.github.com>
Date: Sat, 7 Feb 2026 10:38:59 -0500
Subject: [PATCH] fix(cli): add SS3 Shift+Tab support for Windows terminals
 (#18187)

---
 packages/cli/src/ui/contexts/KeypressContext.test.tsx | 1 +
 packages/cli/src/ui/contexts/KeypressContext.tsx      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/cli/src/ui/contexts/KeypressContext.test.tsx b/packages/cli/src/ui/contexts/KeypressContext.test.tsx
index 16e3a42a37..1635fd3c14 100644
--- a/packages/cli/src/ui/contexts/KeypressContext.test.tsx
+++ b/packages/cli/src/ui/contexts/KeypressContext.test.tsx
@@ -668,6 +668,7 @@ describe('KeypressContext', () => {
       // Reverse tabs
       { sequence: `\x1b[Z`, expected: { name: 'tab', shift: true } },
       { sequence: `\x1b[1;2Z`, expected: { name: 'tab', shift: true } },
+      { sequence: `\x1bOZ`, expected: { name: 'tab', shift: true } },
       // Legacy Arrows
       {
         sequence: `\x1b[A`,
diff --git a/packages/cli/src/ui/contexts/KeypressContext.tsx b/packages/cli/src/ui/contexts/KeypressContext.tsx
index f64f47dcad..6b3a7db6d9 100644
--- a/packages/cli/src/ui/contexts/KeypressContext.tsx
+++ b/packages/cli/src/ui/contexts/KeypressContext.tsx
@@ -80,6 +80,7 @@ const KEY_INFO_MAP: Record<
   OQ: { name: 'f2' },
   OR: { name: 'f3' },
   OS: { name: 'f4' },
+  OZ: { name: 'tab', shift: true }, // SS3 Shift+Tab variant for Windows terminals
   '[[5~': { name: 'pageup' },
   '[[6~': { name: 'pagedown' },
   '[9u': { name: 'tab' },