Cycle tabs with Cmd+Left/Right

Ctrl+Tab was the only way to step between tabs, which is an awkward
reach next to the ⌘-based tab shortcuts already in the panel. Bind
Cmd+← / Cmd+→ to the same selectPreviousSession/selectNextSession pair —
they already wrap with a modulo, so Cmd+← from the first tab lands on
the last.

The binding lives in TerminalPanel.performKeyEquivalent, but the arrow
keys are also claimed by ClickThroughTerminalView's key monitor, which
encodes them for the shell and ignores ⌘ when deriving the CSI modifier
parameter — so ⌘← would otherwise reach the shell as a bare left arrow.
Pass ⌘-only arrows through there instead. Local monitors run before
key-equivalent dispatch, but this works either way: whichever sees the
event first, the other never gets a chance to mis-handle it.

Reserved in ReservedShortcut so the quick-input recorder rejects ⌘←/⌘→;
⌘⌥← and friends stay bindable. 117 tests in 9 suites pass.

Author: bones7456

Notchy/QuickInput.swift

@@ -69,6 +69,8 @@ enum ReservedShortcut {
         (51, .command, "Kill line"),                     // ⌘⌫
         (48, .control, "Next tab"),                      // Ctrl+Tab
         (48, [.control, .shift], "Previous tab"),        // Ctrl+⇧Tab
+        (124, .command, "Next tab"),                     // ⌘→
+        (123, .command, "Previous tab"),                 // ⌘←
         (36, .shift, "Newline"),                         // ⇧Return
     ]
 

Notchy/TerminalManager.swift

@@ -518,6 +518,14 @@ class ClickThroughTerminalView: LocalProcessTerminalView {
                 return nil
             }
 
+            // Cmd+←/→ switch tabs. The panel's performKeyEquivalent acts on them,
+            // but local monitors run first, so they have to be passed through here
+            // rather than encoded as an arrow for the shell.
+            if event.keyCode == 123 || event.keyCode == 124,
+               event.modifierFlags.intersection([.command, .shift, .option, .control]) == .command {
+                return event
+            }
+
             let arrowCode: String?
             switch event.keyCode {
             case 126: arrowCode = "A" // Up

Notchy/TerminalPanel.swift

@@ -400,6 +400,17 @@ class TerminalPanel: NSPanel, NSWindowDelegate {
                 return true
             }
         }
+        // Cmd+← / Cmd+→: previous/next tab, wrapping around at both ends.
+        // ClickThroughTerminalView's key monitor deliberately lets these through
+        // instead of encoding an arrow for the shell.
+        if cmdOnly, event.keyCode == 123 || event.keyCode == 124 {
+            if event.keyCode == 123 {
+                sessionStore.selectPreviousSession()
+            } else {
+                sessionStore.selectNextSession()
+            }
+            return true
+        }
         // Cmd+Shift+P: toggle pin window. charactersIgnoringModifiers keeps the
         // Shift case, so this arrives as "P" — compare case-insensitively.
         if event.modifierFlags.intersection([.command, .shift, .control, .option]) == [.command, .shift],

NotchyTests/QuickInputTests.swift

@@ -35,6 +35,17 @@ struct QuickInputTests {
         #expect(ReservedShortcut.conflict(keyCode: 36, modifiers: shift) == "Newline")        // ⇧↩
     }
 
+    @Test("Both tab-cycling bindings are reserved")
+    func tabCyclingCombosConflict() {
+        #expect(ReservedShortcut.conflict(keyCode: 123, modifiers: cmd) == "Previous tab")  // ⌘←
+        #expect(ReservedShortcut.conflict(keyCode: 124, modifiers: cmd) == "Next tab")      // ⌘→
+        #expect(ReservedShortcut.conflict(keyCode: 48, modifiers: ctrl) == "Next tab")      // ⌃⇥
+        #expect(ReservedShortcut.conflict(keyCode: 48, modifiers: ctrl | shift) == "Previous tab")
+        // The arrows are only reserved with ⌘ alone — ⌘⌥← stays bindable.
+        #expect(ReservedShortcut.conflict(keyCode: 123, modifiers: cmd | opt) == nil)
+        #expect(ReservedShortcut.conflict(keyCode: 123, modifiers: 0) == nil)
+    }
+
     @Test("Shift disambiguates same-key combos")
     func shiftDisambiguates() {
         // ⌘T is "New tab"; ⌘⇧T is "Shadow tab" — the plain-⌘ entry must not

README.md

@@ -13,6 +13,7 @@ A macOS menu bar app that puts Claude Code or Codex right in your MacBook's notc
 - **AI agent auto-launch** — starts `claude` for projects with `CLAUDE.md`, or `codex` for projects with `AGENTS.md`
 - **Multi-session tabs** — run multiple Claude Code or Codex sessions side by side
 - **Drag to reorder tabs** — press and drag a tab left or right to change its position; drop it and the rest snap into place. Reordering also renumbers the Cmd+1…9 shortcuts
+- **Cycle tabs** — Cmd+← and Cmd+→ step to the tab on either side, wrapping around at both ends, so Cmd+← from the first tab lands on the last. Ctrl+Tab / Ctrl+Shift+Tab do the same
 - **Quick switcher** — Cmd+K opens a fuzzy-searchable list of sessions sorted by most-recently-used; type to filter, ↑↓ to move the selection, Enter to jump, Esc to cancel and return focus to the terminal you were in
 - **Pin tabs to persist** — right-click a `+` tab → **Pin Tab** to keep it across app restarts; Notchy remembers the tab's working directory and re-runs agent auto-launch on relaunch
 - **Shadow tabs** — right-click an Xcode or pinned tab → **Shadow Tab** to spawn a plain shell sibling cd'd into the same directory, for ad-hoc git/build commands without disturbing the agent