Merge pull request #51 from myrk-kale/fix/tmux-shift-arrow-switch

feat(tmux): switch between the agent and the reviewer with Shift+arrows

Author: myrk-kale

docs/configuration.md

@@ -30,7 +30,7 @@ Every key has a default, so an empty file (or none) is valid. The schema lives i
 | `ui.hold_to_peek` | `false` | Hold `B` (the `peek_previous` key) while reading code to see the previous version, and let go to come back. It needs a terminal that reports key releases (the kitty keyboard protocol: kitty, Ghostty, WezTerm, recent iTerm2 and foot). Where that is missing, which includes tmux, the key says so and `v` still toggles. While it is on, the terminal sends keys as escape codes except inside text fields, which keep ordinary input so compose and `AltGr` characters still type. |
 | `integration.submit_mode` | `"manual"` | The only mode. Klaub never presses `Enter` in the agent. |
 | `integration.paste_requires_confirmation` | `true` | Putting text in the agent's input always asks first. |
-| `integration.tmux_prefix` | `"C-b"` | The prefix of the session chords (`Prefix+R`, `Prefix+A`, `Prefix+I`, `Prefix+C`, `Prefix+T`, `Prefix+B`, `Prefix+L`, `Prefix+Q`, `Prefix+?`). |
+| `integration.tmux_prefix` | `"C-b"` | The prefix of the session chords. Moving between the agent and the reviewer needs no prefix: `Shift+←` goes to the agent and `Shift+→` to the reviewer. The rest are `Prefix+R`, `Prefix+A`, `Prefix+I`, `Prefix+C`, `Prefix+T`, `Prefix+B`, `Prefix+L`, `Prefix+Q` and `Prefix+?`. |
 
 ## `[keys]`
 

src/adapters/tmux/config.rs

@@ -25,9 +25,9 @@ pub struct SessionConfig<'a> {
 }
 
 /// The help shown by `Prefix ?`.
-pub const HELP_TEXT: &str = "klaub  Prefix+R review  Prefix+A agent  Prefix+I impact  Prefix+C comments  \
-Prefix+T tests  Prefix+B brief  Prefix+L flow  Prefix+d detach  Prefix+Q quit  \
-(Prefix is Ctrl+B unless configured; R and A also work in lower case)";
+pub const HELP_TEXT: &str = "klaub  Shift+Left agent  Shift+Right review (no prefix)  Prefix+R review  \
+Prefix+A agent  Prefix+I impact  Prefix+C comments  Prefix+T tests  Prefix+B brief  Prefix+L flow  \
+Prefix+d detach  Prefix+Q quit  (Prefix is Ctrl+B unless configured; R and A also work in lower case)";
 
 /// Checks a tmux key name such as `C-b`, `C-Space` or `M-a`.
 pub fn validate_prefix(prefix: &str) -> Result<()> {
@@ -97,7 +97,7 @@ pub fn configuration(spec: &SessionConfig<'_>) -> Result<Vec<Vec<String>>> {
             "set-option",
             "-g",
             "status-right",
-            " Prefix+R review  Prefix+A agent  Prefix+Q quit  Prefix+? help ",
+            " Shift+← agent  Shift+→ review  Prefix+Q quit  Prefix+? help ",
         ]),
         command(&["set-option", "-g", "status-right-length", "80"]),
         command(&[
@@ -163,6 +163,24 @@ pub fn configuration(spec: &SessionConfig<'_>) -> Result<Vec<Vec<String>>> {
             "#{@klaub-focus-agent}",
         ]));
     }
+    // Moving between the two windows is the thing done most, so it takes one key and no prefix. The
+    // agent window is the first and the reviewer the second, which is the way the arrows point.
+    // Neither the agent nor the reader uses these keys, and they reach tmux whole in every terminal
+    // that encodes Shift+arrow the usual way.
+    for (key, target) in [
+        ("S-Left", "#{@klaub-focus-agent}"),
+        ("S-Right", "#{@klaub-focus-review}"),
+    ] {
+        commands.push(command(&[
+            "bind-key",
+            "-T",
+            "root",
+            key,
+            "run-shell",
+            "-b",
+            target,
+        ]));
+    }
     // Ends the whole session (the agent included), which `Prefix+d` does not: that only detaches.
     commands.push(command(&[
         "bind-key",
@@ -258,6 +276,16 @@ mod tests {
             flat.iter()
                 .any(|c| c == "bind-key -T prefix A run-shell -b #{@klaub-focus-agent}")
         );
+        assert!(
+            flat.iter()
+                .any(|c| c == "bind-key -T root S-Left run-shell -b #{@klaub-focus-agent}"),
+            "Shift+Left reaches the agent without the prefix"
+        );
+        assert!(
+            flat.iter()
+                .any(|c| c == "bind-key -T root S-Right run-shell -b #{@klaub-focus-review}"),
+            "Shift+Right reaches the reviewer without the prefix"
+        );
         assert!(flat.iter().any(|c| c == "set-option -g @klaub-focus-review /usr/bin/klaub session focus --id ses_abc123 review"));
         for key in ["r", "a"] {
             assert!(