diff --git a/packages/tui/src/config/v1/keybind.ts b/packages/tui/src/config/v1/keybind.ts index 46a37a93269..0b4ecd94a06 100644 --- a/packages/tui/src/config/v1/keybind.ts +++ b/packages/tui/src/config/v1/keybind.ts @@ -88,10 +88,10 @@ export const Definitions = { session_new: keybind("n", "Create a new session"), session_list: keybind("l", "List all sessions"), open_menu: keybind("ctrl+o", "Open recent sessions and projects"), - session_tab_next: keybind("ctrl+tab,right,alt+shift+]", "Switch to next open tab"), - session_tab_previous: keybind("ctrl+shift+tab,left,alt+shift+[", "Switch to previous open tab"), - session_tab_next_unread: keybind("down", "Switch to next unread tab"), - session_tab_previous_unread: keybind("up", "Switch to previous unread tab"), + session_tab_next: keybind("ctrl+tab,alt+down", "Switch to next open tab"), + session_tab_previous: keybind("ctrl+shift+tab,alt+up", "Switch to previous open tab"), + session_tab_next_unread: keybind("alt+shift+down", "Switch to next unread tab"), + session_tab_previous_unread: keybind("alt+shift+up", "Switch to previous unread tab"), session_tab_close: keybind("w", "Close current tab"), session_tab_reopen: keybind("ctrl+shift+t", "Reopen last closed tab"), session_timeline: keybind("g", "Show session timeline"), @@ -150,10 +150,10 @@ export const Definitions = { messages_half_page_down: keybind("ctrl+alt+d", "Scroll messages down by half page"), messages_first: keybind("ctrl+g,home,alt+home", "Navigate to first message"), messages_last: keybind("ctrl+alt+g,end", "Navigate to last message"), - messages_next: keybind("alt+down", "Navigate to next message"), - messages_previous: keybind("alt+up", "Navigate to previous message"), - messages_next_user: keybind("alt+shift+down", "Navigate to next user message"), - messages_previous_user: keybind("alt+shift+up", "Navigate to previous user message"), + messages_next: keybind("none", "Navigate to next message"), + messages_previous: keybind("none", "Navigate to previous message"), + messages_next_user: keybind("none", "Navigate to next user message"), + messages_previous_user: keybind("none", "Navigate to previous user message"), messages_last_user: keybind("alt+end", "Navigate to last user message"), messages_copy: keybind("y", "Copy message"), messages_undo: keybind("u", "Undo message"), diff --git a/packages/tui/src/context/session-tabs-model.ts b/packages/tui/src/context/session-tabs-model.ts index 33807431188..ef92a20c8c7 100644 --- a/packages/tui/src/context/session-tabs-model.ts +++ b/packages/tui/src/context/session-tabs-model.ts @@ -82,11 +82,19 @@ export function moveSessionTab(tabs: SessionTab[], sessionID: string, index: num return next } -export function cycleSessionTab(tabs: readonly SessionTab[], active: string | undefined, direction: 1 | -1) { +export function cycleSessionTab( + tabs: readonly SessionTab[], + active: string | undefined, + direction: 1 | -1, + matches: (tab: SessionTab) => boolean = () => true, +) { if (tabs.length === 0) return const index = tabs.findIndex((tab) => tab.sessionID === active) const start = index === -1 ? (direction === 1 ? -1 : 0) : index - return tabs[(start + direction + tabs.length) % tabs.length] + return Array.from( + { length: tabs.length }, + (_, offset) => tabs[(start + direction * (offset + 1) + tabs.length * 2) % tabs.length], + ).find(matches) } // In-memory navigation history is bounded so a long-lived TUI does not accumulate one entry per diff --git a/packages/tui/src/context/session-tabs.tsx b/packages/tui/src/context/session-tabs.tsx index 3c8b56af0bb..37e32b56432 100644 --- a/packages/tui/src/context/session-tabs.tsx +++ b/packages/tui/src/context/session-tabs.tsx @@ -298,10 +298,8 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp }, cycleUnread(direction: 1 | -1) { if (!enabled()) return - const tab = cycleSessionTab( - state().tabs.filter((tab) => state().unread[tab.sessionID] || status(tab.sessionID).attention), - current(), - direction, + const tab = cycleSessionTab(state().tabs, current(), direction, (tab) => + Boolean(state().unread[tab.sessionID] || status(tab.sessionID).attention), ) if (tab) route.navigate({ type: "session", sessionID: tab.sessionID }) }, diff --git a/packages/tui/test/config.test.tsx b/packages/tui/test/config.test.tsx index 8dfa87ae367..f9a45963e40 100644 --- a/packages/tui/test/config.test.tsx +++ b/packages/tui/test/config.test.tsx @@ -90,10 +90,10 @@ test("resolves message navigation defaults", () => { const config = resolve({}, { terminalSuspend: true }) expect(config.keybinds.get("session.first")).toMatchObject([{ key: "ctrl+g,home,alt+home" }]) - expect(config.keybinds.get("session.message.previous")).toMatchObject([{ key: "alt+up" }]) - expect(config.keybinds.get("session.message.next")).toMatchObject([{ key: "alt+down" }]) - expect(config.keybinds.get("session.message.user.previous")).toMatchObject([{ key: "alt+shift+up" }]) - expect(config.keybinds.get("session.message.user.next")).toMatchObject([{ key: "alt+shift+down" }]) + expect(config.keybinds.get("session.message.previous")).toEqual([]) + expect(config.keybinds.get("session.message.next")).toEqual([]) + expect(config.keybinds.get("session.message.user.previous")).toEqual([]) + expect(config.keybinds.get("session.message.user.next")).toEqual([]) expect(config.keybinds.get("session.messages_last_user")).toMatchObject([{ key: "alt+end" }]) }) @@ -116,15 +116,13 @@ test("opens the subagent picker with down", () => { expect(config.keybinds.get("session.child.first")).toMatchObject([{ key: "down" }]) }) -test("navigates session tabs with leader arrows", () => { +test("navigates session tabs with option arrows", () => { const config = resolve({}, { terminalSuspend: true }) - expect(config.keybinds.get("session.tab.next")).toMatchObject([{ key: "ctrl+tab,right,alt+shift+]" }]) - expect(config.keybinds.get("session.tab.previous")).toMatchObject([ - { key: "ctrl+shift+tab,left,alt+shift+[" }, - ]) - expect(config.keybinds.get("session.tab.next_unread")).toMatchObject([{ key: "down" }]) - expect(config.keybinds.get("session.tab.previous_unread")).toMatchObject([{ key: "up" }]) + expect(config.keybinds.get("session.tab.next")).toMatchObject([{ key: "ctrl+tab,alt+down" }]) + expect(config.keybinds.get("session.tab.previous")).toMatchObject([{ key: "ctrl+shift+tab,alt+up" }]) + expect(config.keybinds.get("session.tab.next_unread")).toMatchObject([{ key: "alt+shift+down" }]) + expect(config.keybinds.get("session.tab.previous_unread")).toMatchObject([{ key: "alt+shift+up" }]) }) test("preserves pinned session bindings alongside tab bindings", () => { diff --git a/packages/tui/test/context/session-tabs-model.test.ts b/packages/tui/test/context/session-tabs-model.test.ts index 173ae570ae2..9d4fd26b878 100644 --- a/packages/tui/test/context/session-tabs-model.test.ts +++ b/packages/tui/test/context/session-tabs-model.test.ts @@ -93,6 +93,17 @@ describe("session tabs", () => { expect(cycleSessionTab(tabs, "b", 1)?.sessionID).toBe("a") }) + test("cycles to the nearest matching tab from an unmatched active tab", () => { + const tabs = ["a", "b", "c", "d", "e"].map((sessionID) => ({ sessionID })) + const unread = new Set(["a", "d"]) + const matches = (tab: { sessionID: string }) => unread.has(tab.sessionID) + + expect(cycleSessionTab(tabs, "c", 1, matches)?.sessionID).toBe("d") + expect(cycleSessionTab(tabs, "c", -1, matches)?.sessionID).toBe("a") + expect(cycleSessionTab(tabs, "e", 1, matches)?.sessionID).toBe("a") + expect(cycleSessionTab(tabs, "a", -1, matches)?.sessionID).toBe("d") + }) + test("moves backward and forward through selection history", () => { const tabs = ["a", "b", "c", "d"].map((sessionID) => ({ sessionID })) const history = ["a", "b", "c", "d"].reduce(recordSessionTabHistory, { entries: [], index: -1 })