feat: rebind focus jumps to F-keys and pick up OSC tab titles

code0xff · claude · code0xff · commit ae17057a63ca · 2026-05-12T17:25:38.000+09:00
F1/F2 now jump to the file list and diff viewer, freeing Ctrl+1/2/3 for
terminal use; F3-F9 directly address terminal panes 1-7. Pane titles
also update from OSC 0/2 escape sequences emitted by claude, vim, ssh,
etc., so the tab bar reflects what is actually running.

Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/README.md b/README.md
@@ -48,7 +48,8 @@ nightcrow --repo ~/projects/myapp
 | `Ctrl+L` | Toggle between status view and commit log view |
 | `Ctrl+T` | Open new terminal pane |
 | `Ctrl+W` | Close active terminal pane |
-| `F1`…`F9` | Jump to terminal pane N |
+| `F1` / `F2` | Focus file list / diff viewer |
+| `F3`…`F9` | Jump to terminal pane 1…7 |
 | `Ctrl+F` | Toggle fullscreen for the focused pane (file/commit list, diff viewer, or terminal) |
 | `Ctrl+P` | Cycle accent color (yellow → cyan → green → magenta → blue) |
 | `Ctrl+O` | Change repo path |
diff --git a/docs/architecture.md b/docs/architecture.md
@@ -76,7 +76,7 @@ trait TerminalBackend {
 
 - **Upper panel focused**: Ratatui app이 모든 키 처리 (파일 탐색, diff/file subfocus 전환). `j`/`k`는 upper-pane handler 내부에서 vim navigation으로 변환되며, `map_key`는 plain character로 통과시킨다 — terminal focus에서 j/k가 PTY로 그대로 전달되도록 보장하기 위함.
 - **Lower panel focused**: 키 입력을 active backend의 stdin으로 직접 통과
-- **Global shortcuts** (`Shift+←/→`: 포커스 cycling, `Ctrl+T`: 터미널 생성, `F1`–`F9`: 터미널 pane jump 등)는 항상 앱이 먼저 처리
+- **Global shortcuts** (`Shift+←/→`: 포커스 cycling, `Ctrl+T`: 터미널 생성, `F1`/`F2`: 파일 리스트·diff 포커스 jump, `F3`–`F9`: 터미널 pane 1–7 jump 등)는 항상 앱이 먼저 처리
 - **Upper subfocus shortcuts** (`Left`/`Right`/`Shift+Tab`: 파일 리스트와 diff 뷰어 전환)는 상단 포커스에서만 앱이 처리한다.
 
 ## Critical Risk
diff --git a/src/app.rs b/src/app.rs
@@ -142,6 +142,7 @@ impl App {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::runtime::terminal::PaneCallbacks;
     use crate::git::diff::{
         ChangeStatus, CommitEntry, DiffHunk, DiffLine, LineKind, load_commit_log,
     };
@@ -336,7 +337,12 @@ mod tests {
         app.terminal.active = 0;
         app.terminal.size = (3, 10);
 
-        let mut parser = vt100::Parser::new(3, 10, SCROLLBACK_LINES);
+        let mut parser = vt100::Parser::new_with_callbacks(
+            3,
+            10,
+            SCROLLBACK_LINES,
+            PaneCallbacks::default(),
+        );
         parser.process(b"1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n");
         app.terminal.parsers.insert(1, parser);
         // Request scrolling well past screen height; vt100 supports
@@ -360,7 +366,12 @@ mod tests {
         app.terminal.active = 0;
         app.terminal.size = (3, 10);
 
-        let mut parser = vt100::Parser::new(3, 10, SCROLLBACK_LINES);
+        let mut parser = vt100::Parser::new_with_callbacks(
+            3,
+            10,
+            SCROLLBACK_LINES,
+            PaneCallbacks::default(),
+        );
         // Only a handful of buffered rows exist; an outsized request must
         // clamp to whatever vt100 actually has, never panic.
         parser.process(b"1\r\n2\r\n3\r\n4\r\n5\r\n");
@@ -432,36 +443,6 @@ mod tests {
         assert!(!app.terminal.fullscreen);
     }
 
-    #[test]
-    fn focus_terminal_is_noop_without_panes() {
-        let mut app = app_with_files(vec![]);
-        assert!(app.terminal.panes.is_empty());
-        app.focus = Focus::FileList;
-
-        app.focus_terminal();
-
-        // Without any terminal pane there is nothing to focus, so state stays
-        // on FileList rather than landing on an empty Terminal focus.
-        assert_eq!(app.focus, Focus::FileList);
-    }
-
-    #[test]
-    fn focus_terminal_jumps_and_exits_competing_fullscreens() {
-        let mut app = app_with_files(vec![]);
-        app.terminal.panes = vec![PaneInfo {
-            id: 1,
-            title: "shell".into(),
-        }];
-        app.toggle_diff_fullscreen();
-        assert!(app.diff.fullscreen);
-
-        app.focus_terminal();
-
-        assert_eq!(app.focus, Focus::Terminal);
-        assert!(!app.diff.fullscreen);
-        assert!(!app.list_fullscreen);
-    }
-
     #[test]
     fn switch_pane_exits_diff_fullscreen() {
         let mut app = app_with_files(vec![]);
@@ -743,7 +724,10 @@ mod tests {
         app.focus = Focus::Terminal;
         app.terminal.scroll.insert(1, 3);
         app.terminal.prompt_bufs.insert(1, "cargo test".to_string());
-        app.terminal.parsers.insert(1, vt100::Parser::new(3, 10, 0));
+        app.terminal.parsers.insert(
+            1,
+            vt100::Parser::new_with_callbacks(3, 10, 0, PaneCallbacks::default()),
+        );
 
         app.close_active_pane();
 
diff --git a/src/app/focus.rs b/src/app/focus.rs
@@ -158,13 +158,4 @@ impl App {
         self.list_fullscreen = false;
         self.terminal.fullscreen = false;
     }
-
-    pub fn focus_terminal(&mut self) {
-        if self.terminal.panes.is_empty() {
-            return;
-        }
-        self.focus = Focus::Terminal;
-        self.diff.fullscreen = false;
-        self.list_fullscreen = false;
-    }
 }
diff --git a/src/app/terminal_ctrl.rs b/src/app/terminal_ctrl.rs
@@ -1,5 +1,6 @@
 use super::{App, Focus, PaneInfo, SCROLLBACK_LINES};
 use crate::backend::{BackendEvent, PaneId};
+use crate::runtime::terminal::PaneCallbacks;
 
 impl App {
     pub(crate) fn ensure_initial_terminal(&mut self) {
@@ -23,8 +24,17 @@ impl App {
         for event in events {
             match event {
                 BackendEvent::Output { pane, data } => {
-                    if let Some(parser) = self.terminal.parsers.get_mut(&pane) {
+                    let new_title = if let Some(parser) = self.terminal.parsers.get_mut(&pane) {
                         parser.process(&data);
+                        parser.callbacks_mut().pending_title.take()
+                    } else {
+                        None
+                    };
+                    if let Some(title) = new_title
+                        && let Some(info) =
+                            self.terminal.panes.iter_mut().find(|p| p.id == pane)
+                    {
+                        info.title = title;
                     }
                 }
                 BackendEvent::Exited { pane } => {
@@ -59,11 +69,17 @@ impl App {
             .ok_or_else(|| anyhow::anyhow!("no terminal backend available"))?;
 
         let id = backend.create_pane(rows.max(1), cols.max(1))?;
-        let parser = vt100::Parser::new(rows.max(1), cols.max(1), SCROLLBACK_LINES);
+        let parser = vt100::Parser::new_with_callbacks(
+            rows.max(1),
+            cols.max(1),
+            SCROLLBACK_LINES,
+            PaneCallbacks::default(),
+        );
         self.terminal.parsers.insert(id, parser);
+        let default_title = format!("shell {}", self.terminal.panes.len() + 1);
         self.terminal.panes.push(PaneInfo {
             id,
-            title: "shell".to_string(),
+            title: default_title,
         });
         self.terminal.active = self.terminal.panes.len() - 1;
         tracing::info!(pane = id, "terminal pane opened");
diff --git a/src/input/mod.rs b/src/input/mod.rs
@@ -14,7 +14,6 @@ pub enum Action {
     SwitchPane(usize),
     FocusList,
     FocusDiff,
-    FocusTerminal,
     CycleForward,
     CycleBackward,
     TermScrollUp,
@@ -38,16 +37,18 @@ pub fn map_key(event: KeyEvent) -> Action {
         KeyCode::Char('f') if ctrl => Action::ToggleFullscreen,
         KeyCode::Char('l') if ctrl => Action::ToggleLogView,
         KeyCode::Char('p') if ctrl => Action::CycleTheme,
-        KeyCode::Char('1') if ctrl => Action::FocusList,
-        KeyCode::Char('2') if ctrl => Action::FocusDiff,
-        KeyCode::Char('3') if ctrl => Action::FocusTerminal,
         KeyCode::Left if shift => Action::CycleBackward,
         KeyCode::Right if shift => Action::CycleForward,
         KeyCode::Up if shift => Action::TermScrollLineUp,
         KeyCode::Down if shift => Action::TermScrollLineDown,
         KeyCode::PageUp if shift => Action::TermScrollUp,
         KeyCode::PageDown if shift => Action::TermScrollDown,
-        KeyCode::F(n @ 1..=9) => Action::SwitchPane(n as usize - 1),
+        // F-keys are universally distinct across terminals (no kitty protocol
+        // dependency), so they own focus jumps: F1=list, F2=diff,
+        // F3..=F9 = terminal panes 1..=7.
+        KeyCode::F(1) => Action::FocusList,
+        KeyCode::F(2) => Action::FocusDiff,
+        KeyCode::F(n @ 3..=9) => Action::SwitchPane(n as usize - 3),
         KeyCode::Up => Action::Up,
         KeyCode::Down => Action::Down,
         KeyCode::PageUp => Action::PageUp,
@@ -217,21 +218,17 @@ mod tests {
     }
 
     #[test]
-    fn maps_switch_pane() {
-        assert_eq!(map_key(key(KeyCode::F(1))), Action::SwitchPane(0));
-        assert_eq!(map_key(key(KeyCode::F(2))), Action::SwitchPane(1));
-        assert_eq!(map_key(key(KeyCode::F(9))), Action::SwitchPane(8));
+    fn maps_focus_jump_shortcuts() {
+        assert_eq!(map_key(key(KeyCode::F(1))), Action::FocusList);
+        assert_eq!(map_key(key(KeyCode::F(2))), Action::FocusDiff);
     }
 
     #[test]
-    fn maps_focus_jump_shortcuts() {
-        assert_eq!(map_key(ctrl(KeyCode::Char('1'))), Action::FocusList);
-        assert_eq!(map_key(ctrl(KeyCode::Char('2'))), Action::FocusDiff);
-        assert_eq!(map_key(ctrl(KeyCode::Char('3'))), Action::FocusTerminal);
-        // Plain digits must not steal focus from the underlying view.
-        assert_eq!(map_key(key(KeyCode::Char('1'))), Action::None);
-        assert_eq!(map_key(key(KeyCode::Char('2'))), Action::None);
-        assert_eq!(map_key(key(KeyCode::Char('3'))), Action::None);
+    fn maps_switch_pane() {
+        // F3..=F9 directly select terminal panes 0..=6.
+        assert_eq!(map_key(key(KeyCode::F(3))), Action::SwitchPane(0));
+        assert_eq!(map_key(key(KeyCode::F(4))), Action::SwitchPane(1));
+        assert_eq!(map_key(key(KeyCode::F(9))), Action::SwitchPane(6));
     }
 
     #[test]
diff --git a/src/main.rs b/src/main.rs
@@ -244,10 +244,6 @@ fn handle_global_action(app: &mut App, action: Action) -> Option<KeyOutcome> {
             app.focus_diff();
             Some(KeyOutcome::Continue)
         }
-        Action::FocusTerminal => {
-            app.focus_terminal();
-            Some(KeyOutcome::Continue)
-        }
         Action::CycleForward => {
             app.cycle_focus_forward();
             Some(KeyOutcome::Continue)
diff --git a/src/runtime/terminal.rs b/src/runtime/terminal.rs
@@ -6,13 +6,35 @@ pub struct PaneInfo {
     pub title: String,
 }
 
+/// vt100 callbacks that capture OSC 0/2 window title updates so the tab bar
+/// can reflect what the running program (claude, vim, ssh, …) advertises.
+/// Bare shells without precmd hooks never emit OSC, so a sensible default
+/// title still lives on `PaneInfo`.
+#[derive(Default, Debug)]
+pub(crate) struct PaneCallbacks {
+    pub(crate) pending_title: Option<String>,
+}
+
+impl vt100::Callbacks for PaneCallbacks {
+    fn set_window_title(&mut self, _: &mut vt100::Screen, title: &[u8]) {
+        let cleaned: String = String::from_utf8_lossy(title)
+            .chars()
+            .filter(|c| !c.is_control())
+            .collect();
+        let trimmed = cleaned.trim();
+        if !trimmed.is_empty() {
+            self.pending_title = Some(trimmed.to_string());
+        }
+    }
+}
+
 pub struct TerminalState {
     pub panes: Vec<PaneInfo>,
     pub active: usize,
     pub size: (u16, u16),
     pub scroll: HashMap<PaneId, usize>,
     pub fullscreen: bool,
-    pub(crate) parsers: HashMap<PaneId, vt100::Parser>,
+    pub(crate) parsers: HashMap<PaneId, vt100::Parser<PaneCallbacks>>,
     pub(crate) prompt_bufs: HashMap<PaneId, String>,
     prompt_log_enabled: bool,
     pub(crate) backend: Option<Box<dyn TerminalBackend>>,
@@ -217,3 +239,45 @@ pub(crate) fn strip_escape_sequences(data: &[u8]) -> String {
     }
     result
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn parser() -> vt100::Parser<PaneCallbacks> {
+        vt100::Parser::new_with_callbacks(3, 20, 0, PaneCallbacks::default())
+    }
+
+    #[test]
+    fn captures_osc_two_window_title() {
+        let mut p = parser();
+        p.process(b"\x1b]2;claude\x07");
+        assert_eq!(p.callbacks().pending_title.as_deref(), Some("claude"));
+    }
+
+    #[test]
+    fn captures_osc_zero_title_and_strips_controls() {
+        let mut p = parser();
+        // OSC 0 sets both icon name and window title; embedded tab/BS bytes
+        // must not leak into the tab label.
+        p.process(b"\x1b]0;cargo\t test\x08\x07");
+        assert_eq!(p.callbacks().pending_title.as_deref(), Some("cargo test"));
+    }
+
+    #[test]
+    fn ignores_empty_title() {
+        let mut p = parser();
+        p.process(b"\x1b]2;\x07");
+        assert!(p.callbacks().pending_title.is_none());
+    }
+
+    #[test]
+    fn later_title_replaces_earlier_until_taken() {
+        let mut p = parser();
+        p.process(b"\x1b]2;first\x07");
+        p.process(b"\x1b]2;second\x07");
+        let taken = p.callbacks_mut().pending_title.take();
+        assert_eq!(taken.as_deref(), Some("second"));
+        assert!(p.callbacks().pending_title.is_none());
+    }
+}
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
@@ -239,7 +239,7 @@ fn render_hint_bar(app: &App, accent: Color) -> Paragraph<'_> {
     }
     let hint = match app.focus {
         Focus::Terminal => {
-            " shift+↑/↓: scroll | shift+pgup/dn: page scroll | shift+←/→: cycle | ctrl+1/2/3: focus list/diff/term | ctrl+t: new pane | ctrl+w: close pane | F1-F9: switch pane | ctrl+f: fullscreen | ctrl+l: log view | ctrl+o: repo | ctrl+p: theme | ctrl+q: quit"
+            " shift+↑/↓: scroll | shift+pgup/dn: page scroll | shift+←/→: cycle | F1/F2: focus list/diff | F3-F9: terminal pane 1-7 | ctrl+t: new pane | ctrl+w: close pane | ctrl+f: fullscreen | ctrl+l: log view | ctrl+o: repo | ctrl+p: theme | ctrl+q: quit"
         }
         Focus::FileList => match app.mode {
             ViewMode::Log => {
@@ -250,7 +250,7 @@ fn render_hint_bar(app: &App, accent: Color) -> Paragraph<'_> {
                 }
             }
             ViewMode::Status => {
-                " shift+←/→: cycle | j/k: navigate | /: search | ctrl+1/2/3: focus list/diff/term | F1-F9: switch pane | ctrl+f: fullscreen | ctrl+l: log view | ctrl+o: repo | ctrl+p: theme | ctrl+q: quit"
+                " shift+←/→: cycle | j/k: navigate | /: search | F1/F2: focus list/diff | F3-F9: terminal pane 1-7 | ctrl+f: fullscreen | ctrl+l: log view | ctrl+o: repo | ctrl+p: theme | ctrl+q: quit"
             }
         },
         Focus::DiffViewer => {
@@ -261,7 +261,7 @@ fn render_hint_bar(app: &App, accent: Color) -> Paragraph<'_> {
             } else if !app.diff.search.query.is_empty() {
                 " n: next match | shift+n: prev match | /: new search | esc: clear"
             } else {
-                " shift+←/→: cycle | j/k: scroll | v: view file | /: search | ctrl+f: zoom | pgup/pgdn: scroll | ctrl+1/2/3: focus list/diff/term | F1-F9: switch pane | ctrl+l: log view | ctrl+o: repo | ctrl+p: theme | ctrl+q: quit"
+                " shift+←/→: cycle | j/k: scroll | v: view file | /: search | ctrl+f: zoom | pgup/pgdn: scroll | F1/F2: focus list/diff | F3-F9: terminal pane 1-7 | ctrl+l: log view | ctrl+o: repo | ctrl+p: theme | ctrl+q: quit"
             }
         }
     };
diff --git a/src/ui/terminal_tab.rs b/src/ui/terminal_tab.rs
@@ -59,7 +59,14 @@ pub fn render(frame: &mut Frame, app: &mut App, area: Rect, accent: Color) {
                 } else {
                     Style::default().fg(Color::DarkGray)
                 };
-                Span::styled(format!(" {} {} ", i + 1, pane.title), style)
+                // F3..=F9 are wired to panes 0..=6 in `input::map_key`; show
+                // the binding so the tab bar doubles as a key legend.
+                let key_hint = if i < 7 {
+                    format!("F{}", i + 3)
+                } else {
+                    format!("{}", i + 1)
+                };
+                Span::styled(format!(" {} {} ", key_hint, pane.title), style)
             })
             .collect()
     };

Original file line number	Diff line number	Diff line change
`@@ -158,13 +158,4 @@ impl App {`
`158`	`158`	`self.list_fullscreen = false;`
`159`	`159`	`self.terminal.fullscreen = false;`
`160`	`160`	`}`
`161`		`-`
`162`		`- pub fn focus_terminal(&mut self) {`
`163`		`- if self.terminal.panes.is_empty() {`
`164`		`- return;`
`165`		`- }`
`166`		`- self.focus = Focus::Terminal;`
`167`		`- self.diff.fullscreen = false;`
`168`		`- self.list_fullscreen = false;`
`169`		`- }`
`170`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ fn render_hint_bar(app: &App, accent: Color) -> Paragraph<'_> {`
`239`	`239`	`}`
`240`	`240`	`let hint = match app.focus {`
`241`	`241`	`Focus::Terminal => {`
`242`		`- " shift+↑/↓: scroll \| shift+pgup/dn: page scroll \| shift+←/→: cycle \| ctrl+1/2/3: focus list/diff/term \| ctrl+t: new pane \| ctrl+w: close pane \| F1-F9: switch pane \| ctrl+f: fullscreen \| ctrl+l: log view \| ctrl+o: repo \| ctrl+p: theme \| ctrl+q: quit"`
	`242`	`+ " shift+↑/↓: scroll \| shift+pgup/dn: page scroll \| shift+←/→: cycle \| F1/F2: focus list/diff \| F3-F9: terminal pane 1-7 \| ctrl+t: new pane \| ctrl+w: close pane \| ctrl+f: fullscreen \| ctrl+l: log view \| ctrl+o: repo \| ctrl+p: theme \| ctrl+q: quit"`
`243`	`243`	`}`
`244`	`244`	`Focus::FileList => match app.mode {`
`245`	`245`	`ViewMode::Log => {`
`@@ -250,7 +250,7 @@ fn render_hint_bar(app: &App, accent: Color) -> Paragraph<'_> {`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`	`ViewMode::Status => {`
`253`		`- " shift+←/→: cycle \| j/k: navigate \| /: search \| ctrl+1/2/3: focus list/diff/term \| F1-F9: switch pane \| ctrl+f: fullscreen \| ctrl+l: log view \| ctrl+o: repo \| ctrl+p: theme \| ctrl+q: quit"`
	`253`	`+ " shift+←/→: cycle \| j/k: navigate \| /: search \| F1/F2: focus list/diff \| F3-F9: terminal pane 1-7 \| ctrl+f: fullscreen \| ctrl+l: log view \| ctrl+o: repo \| ctrl+p: theme \| ctrl+q: quit"`
`254`	`254`	`}`
`255`	`255`	`},`
`256`	`256`	`Focus::DiffViewer => {`
`@@ -261,7 +261,7 @@ fn render_hint_bar(app: &App, accent: Color) -> Paragraph<'_> {`
`261`	`261`	`} else if !app.diff.search.query.is_empty() {`
`262`	`262`	`" n: next match \| shift+n: prev match \| /: new search \| esc: clear"`
`263`	`263`	`} else {`
`264`		`- " shift+←/→: cycle \| j/k: scroll \| v: view file \| /: search \| ctrl+f: zoom \| pgup/pgdn: scroll \| ctrl+1/2/3: focus list/diff/term \| F1-F9: switch pane \| ctrl+l: log view \| ctrl+o: repo \| ctrl+p: theme \| ctrl+q: quit"`
	`264`	`+ " shift+←/→: cycle \| j/k: scroll \| v: view file \| /: search \| ctrl+f: zoom \| pgup/pgdn: scroll \| F1/F2: focus list/diff \| F3-F9: terminal pane 1-7 \| ctrl+l: log view \| ctrl+o: repo \| ctrl+p: theme \| ctrl+q: quit"`
`265`	`265`	`}`
`266`	`266`	`}`
`267`	`267`	`};`