From b0ed9990b38e256cf42974665b9daf045094edc2 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Thu, 30 Jul 2026 15:51:10 -0400
Subject: [PATCH] feat(tui): add option tab shortcuts (#39725)

---
 packages/tui/src/config/v1/keybind.ts | 4 ++--
 packages/tui/test/config.test.tsx     | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/tui/src/config/v1/keybind.ts b/packages/tui/src/config/v1/keybind.ts
index 78561ab7f6..363ae79f1a 100644
--- a/packages/tui/src/config/v1/keybind.ts
+++ b/packages/tui/src/config/v1/keybind.ts
@@ -87,8 +87,8 @@ export const Definitions = {
   session_move: keybind("none", "Move session"),
   session_new: keybind("<leader>n", "Create a new session"),
   session_list: keybind("<leader>l", "List all sessions"),
-  session_tab_next: keybind("ctrl+tab,<leader>right", "Switch to next open session tab"),
-  session_tab_previous: keybind("ctrl+shift+tab,<leader>left", "Switch to previous open session tab"),
+  session_tab_next: keybind("ctrl+tab,<leader>right,alt+shift+]", "Switch to next open session tab"),
+  session_tab_previous: keybind("ctrl+shift+tab,<leader>left,alt+shift+[", "Switch to previous open session tab"),
   session_tab_history_back: keybind("ctrl+o", "Go back in session tab history"),
   session_tab_history_forward: keybind("ctrl+i", "Go forward in session tab history"),
   session_tab_next_unread: keybind("<leader>down", "Switch to next unread session tab"),
diff --git a/packages/tui/test/config.test.tsx b/packages/tui/test/config.test.tsx
index d1aed94f9f..0feb3dda3b 100644
--- a/packages/tui/test/config.test.tsx
+++ b/packages/tui/test/config.test.tsx
@@ -106,8 +106,10 @@ test("opens the subagent picker with down", () => {
 test("navigates session tabs with leader arrows", () => {
   const config = resolve({}, { terminalSuspend: true })
 
-  expect(config.keybinds.get("session.tab.next")).toMatchObject([{ key: "ctrl+tab,<leader>right" }])
-  expect(config.keybinds.get("session.tab.previous")).toMatchObject([{ key: "ctrl+shift+tab,<leader>left" }])
+  expect(config.keybinds.get("session.tab.next")).toMatchObject([{ key: "ctrl+tab,<leader>right,alt+shift+]" }])
+  expect(config.keybinds.get("session.tab.previous")).toMatchObject([
+    { key: "ctrl+shift+tab,<leader>left,alt+shift+[" },
+  ])
   expect(config.keybinds.get("session.tab.history.back")).toMatchObject([{ key: "ctrl+o" }])
   expect(config.keybinds.get("session.tab.history.forward")).toMatchObject([{ key: "ctrl+i" }])
   expect(config.keybinds.get("session.tab.next_unread")).toMatchObject([{ key: "<leader>down" }])