From e64098089b77e5e3ab461b2e7cbf8bd683213962 Mon Sep 17 00:00:00 2001
From: "Matheus T. dos Santos" <matheuswhite1@protonmail.com>
Date: Wed, 22 Jul 2026 15:33:51 -0300
Subject: [PATCH 1/2] feat: bookmark lines and navigate them with Tab (#208)

Right-click a line to toggle a bookmark; a bookmarked line shows a yellow
timestamp. Tab jumps to the next bookmark and Shift+Tab to the previous one,
centering the view and wrapping around the ends (mirroring search navigation).
Tab still completes a @tag while the autocomplete pop-up is up.

Bookmarks pin to a new stable per-line BufferLine::id (a monotonic counter)
instead of a positional index, so they follow their line across scrollback
rotation and filter changes: a bookmark hidden by a filter reappears once the
line is shown again. State and navigation live in graphics/screen.rs.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 CLAUDE.md                     |   2 +-
 README.md                     |   8 +-
 src/graphics/buffer.rs        |  22 +++
 src/graphics/graphics_task.rs |  20 ++
 src/graphics/screen.rs        | 342 +++++++++++++++++++++++++++++++++-
 src/inputs/inputs_task.rs     |  40 +++-
 6 files changed, 422 insertions(+), 12 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index e090da7..e05603e 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -39,7 +39,7 @@ Every subsystem is a `Task<S, M>`: it owns shared state `S` behind an `Arc<RwLoc
 
 - **Interface** (`interfaces/`) — owns the serial port or RTT connection. Enum-dispatched: `InterfaceTask` / `InterfaceCommand` / `InterfaceShared` / `InterfaceType` select between `serial_if.rs` and `rtt_if.rs`.
 - **Inputs** (`inputs/inputs_task.rs`) — the command bar. Parses keystrokes, manages input history (`inputs/history.rs`), and has two `InputMode`s: `Normal` and `Search` (plus a `raw` passthrough flag used only in headless mode).
-- **Graphics** (`graphics/graphics_task.rs`) — renders the TUI, owns the scrollback buffer, handles selection/scrolling, persists the session to a timestamped `.txt` file, and is the sink for log messages. In headless mode it is replaced by `graphics/headless.rs` (same task slot, plain stdout, no TUI).
+- **Graphics** (`graphics/graphics_task.rs`) — renders the TUI, owns the scrollback buffer, handles selection/scrolling, persists the session to a timestamped `.txt` file, and is the sink for log messages. In headless mode it is replaced by `graphics/headless.rs` (same task slot, plain stdout, no TUI). Line-pinned features (bookmarks: right-click to toggle, `Tab`/`Shift+Tab` to jump, yellow timestamp) live in `graphics/screen.rs` and key off the stable per-line `BufferLine::id` so they survive scrollback rotation and filter changes.
 - **PluginEngine** (`plugin/engine.rs`) — runs a Tokio runtime hosting Lua plugins.
 
 ### Data buses (`infra/mpmc.rs`)
diff --git a/README.md b/README.md
index 3734dc9..d4c74ba 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,10 @@ Press `Ctrl+F` to enter **search mode** and type a query to find it in the captu
 
 ![Search gif](videos/015_search/video.gif)
 
+#### Bookmarks
+
+Jumping to a specific line in a long history is tedious. **Right-click** a line to bookmark it (right-click again to remove the bookmark); a bookmarked line is marked by a **yellow timestamp**. Press `Tab` to jump to the next bookmark and `Shift+Tab` for the previous one, cycling around the ends — the same navigation feel as search. Bookmarks follow their line as the history scrolls and survive changing the filter (a bookmark hidden by a filter reappears once the line is shown again); `Ctrl+L` clears them along with the screen.
+
 #### Message Filter
 
 When received data floods the history — for example a stream of `dbg` lines — use the `!filter` and `!mute` commands to control which received messages are shown. The current filter is shown between square brackets at the top-right of the command bar (e.g. `[.*]`). The two commands share that slot, so setting one replaces the other.
@@ -252,7 +256,8 @@ Anything typed on the command bar that starts with `!` is a command. A line with
 | `Up` / `Down` | Navigate the command history. In search mode: previous / next match. |
 | `Ctrl`+`F` | Toggle search mode. |
 | `Ctrl`+`W` | In search mode: toggle case sensitivity. |
-| `Tab` | Autocomplete a `@tag` from the tag file. |
+| `Tab` | Autocomplete a `@tag` from the tag file (while the pop-up is up); otherwise jump to the next bookmark. |
+| `Shift`+`Tab` | Jump to the previous bookmark. |
 | `Ctrl`+`S` | Save the whole session to a `.txt` file. |
 | `Ctrl`+`R` | Start / stop a record session. |
 | `Ctrl`+`C` | Copy the current selection to the clipboard. |
@@ -266,6 +271,7 @@ Anything typed on the command bar that starts with `!` is a command. A line with
 | `Backspace` / `Delete` | Delete the character before / at the cursor. |
 | Mouse wheel | Scroll the history (hold `Ctrl` to scroll horizontally). |
 | Mouse drag | Select text (copy it with `Ctrl`+`C`). |
+| Mouse right-click | Toggle a bookmark on the clicked line (navigate with `Tab` / `Shift`+`Tab`). |
 
 ## Command-Line Options
 
diff --git a/src/graphics/buffer.rs b/src/graphics/buffer.rs
index 3c76c3d..b0e646c 100644
--- a/src/graphics/buffer.rs
+++ b/src/graphics/buffer.rs
@@ -10,6 +10,19 @@ use crate::{
 use chrono::{DateTime, Local};
 use std::ops::AddAssign;
 use std::sync::Arc;
+use std::sync::atomic::{AtomicU64, Ordering};
+
+/// Monotonic source of per-line identifiers. A line keeps its `id` for its whole
+/// lifetime, independent of its position in the buffer, so features that pin to a
+/// specific line (bookmarks) survive re-indexing on capacity drop and the
+/// re-derivation of the displayed view when the filter changes. Every
+/// `BufferLine` is created on the graphics thread, so a `Relaxed` counter is
+/// enough — we only need uniqueness, not cross-thread ordering.
+static NEXT_LINE_ID: AtomicU64 = AtomicU64::new(0);
+
+fn next_line_id() -> u64 {
+    NEXT_LINE_ID.fetch_add(1, Ordering::Relaxed)
+}
 
 /// The payload of a stored buffer line. It is reference-counted so the filtered
 /// view (`Buffer`) can hold cheap clones of the lines in the full history
@@ -126,6 +139,11 @@ where
     T: AsRef<[u8]>,
 {
     pub line: usize,
+    /// Stable identity assigned at creation and preserved across cloning,
+    /// re-indexing and filter changes (see [`next_line_id`]). Unlike `line`
+    /// (the current index, which shifts as lines drop off the top), this never
+    /// changes for a given logical line, so it is what bookmarks pin to.
+    pub id: u64,
     pub timestamp: DateTime<Local>,
     pub level: Option<LogLevel>,
     pub message: T,
@@ -136,6 +154,7 @@ impl BufferLine<LineBytes> {
     pub fn decode(&self, decoder: ScreenDecoder) -> BufferLine<String> {
         BufferLine {
             line: self.line,
+            id: self.id,
             timestamp: self.timestamp,
             level: self.level,
             message: decoder.decode(&self.message),
@@ -146,6 +165,7 @@ impl BufferLine<LineBytes> {
     pub fn new_rx(timestamp: DateTime<Local>, message: Vec<u8>) -> Self {
         Self {
             line: 0,
+            id: next_line_id(),
             timestamp,
             level: None,
             message: message.into(),
@@ -156,6 +176,7 @@ impl BufferLine<LineBytes> {
     pub fn new_tx(timestamp: DateTime<Local>, message: Vec<u8>) -> Self {
         Self {
             line: 0,
+            id: next_line_id(),
             timestamp,
             level: None,
             message: message.into(),
@@ -166,6 +187,7 @@ impl BufferLine<LineBytes> {
     pub fn new_log(timestamp: DateTime<Local>, level: LogLevel, message: Vec<u8>) -> Self {
         Self {
             line: 0,
+            id: next_line_id(),
             timestamp,
             level: Some(level),
             message: message.into(),
diff --git a/src/graphics/graphics_task.rs b/src/graphics/graphics_task.rs
index bbd78d4..128a88f 100644
--- a/src/graphics/graphics_task.rs
+++ b/src/graphics/graphics_task.rs
@@ -108,6 +108,9 @@ pub enum GraphicsCommand {
     Click(ScreenPosition),
     Move(ScreenPosition),
     CopyToClipboard,
+    ToggleBookmark(ScreenPosition),
+    NextBookmark,
+    PrevBookmark,
 }
 
 pub struct SaveStats {
@@ -583,6 +586,23 @@ impl GraphicsTask {
                     GraphicsCommand::Move(end_pos) => {
                         private.screen.set_selection_end(end_pos);
                     }
+                    GraphicsCommand::ToggleBookmark(pos) => {
+                        private.screen.toggle_bookmark(&private.buffer, pos);
+                    }
+                    GraphicsCommand::NextBookmark => {
+                        let max_main_axis = Self::max_main_axis(&private);
+
+                        private
+                            .screen
+                            .jump_to_next_bookmark(&private.buffer, max_main_axis as usize);
+                    }
+                    GraphicsCommand::PrevBookmark => {
+                        let max_main_axis = Self::max_main_axis(&private);
+
+                        private
+                            .screen
+                            .jump_to_previous_bookmark(&private.buffer, max_main_axis as usize);
+                    }
                     GraphicsCommand::CopyToClipboard => {
                         if let Err(res) =
                             Self::handle_copy_to_clipboard(&mut private, &mut copy_blink)
diff --git a/src/graphics/screen.rs b/src/graphics/screen.rs
index 13e4c38..256348c 100644
--- a/src/graphics/screen.rs
+++ b/src/graphics/screen.rs
@@ -21,6 +21,7 @@ use ratatui::{
     },
 };
 use regex::{Regex, RegexBuilder};
+use std::collections::BTreeSet;
 
 pub struct Screen {
     position: BufferPosition,
@@ -29,6 +30,15 @@ pub struct Screen {
     decoder: ScreenDecoder,
     size: Rect,
     selection: Option<Selection>,
+    /// Bookmarked lines, tracked by their stable [`BufferLine::id`](crate::graphics::buffer::BufferLine)
+    /// so they follow a line through capacity drops and filter changes rather
+    /// than pinning to a positional index that shifts underneath them.
+    bookmarks: BTreeSet<u64>,
+    /// Id of the bookmark the last `Tab`/`Shift+Tab` jump landed on, so repeated
+    /// presses advance from where the user is instead of re-deriving an anchor
+    /// from the (possibly clamped) scroll offset. Cleared when that bookmark is
+    /// removed or the screen is cleared.
+    current_bookmark: Option<u64>,
 }
 
 pub struct ScreenPosition {
@@ -50,6 +60,8 @@ impl Default for Screen {
                 height: u16::MAX,
             },
             selection: None,
+            bookmarks: BTreeSet::new(),
+            current_bookmark: None,
         }
     }
 }
@@ -143,6 +155,8 @@ impl Screen {
         self.auto_scroll = true;
         self.position = Default::default();
         self.selection = None;
+        self.bookmarks.clear();
+        self.current_bookmark = None;
     }
 
     pub fn disable_auto_scroll(&mut self) {
@@ -269,7 +283,7 @@ impl Screen {
 
         let lines = self
             .mode
-            .to_lines(decoded_lines, self.selection.as_ref())
+            .to_lines(decoded_lines, self.selection.as_ref(), &self.bookmarks)
             .into_iter()
             .map(|line| Self::crop(line, self.position.column, max_width))
             .collect::<Vec<_>>();
@@ -450,6 +464,114 @@ impl Screen {
 
         self.jump_to_centered_position(pos, max_main_axis);
     }
+
+    /// Toggle the bookmark on the line under `point` (a right-click). A click on
+    /// the borders or the empty area past the last line is a no-op. The bookmark
+    /// pins to the line's stable id, so it stays on the same line even after the
+    /// buffer rotates or the filter is changed.
+    pub fn toggle_bookmark(&mut self, buffer: &Buffer, point: ScreenPosition) {
+        // Content starts one row below the top border; clicks on it (or above)
+        // do not map to a line.
+        let row = point.y as usize;
+        if row < Self::CONTENT_OFFSET_Y {
+            return;
+        }
+
+        let line = (row + self.position.line) - Self::CONTENT_OFFSET_Y;
+        let Some(buffer_line) = buffer.get_range(line, line + 1).first() else {
+            return;
+        };
+        let id = buffer_line.id;
+
+        if self.bookmarks.remove(&id) {
+            if self.current_bookmark == Some(id) {
+                self.current_bookmark = None;
+            }
+        } else {
+            self.bookmarks.insert(id);
+        }
+    }
+
+    /// The bookmarked lines currently present in the displayed buffer, as
+    /// `(line index, id)` pairs ordered top-to-bottom. Derived on demand: a
+    /// bookmark whose line is filtered out or has scrolled off simply does not
+    /// appear here, and comes back if the line does.
+    fn bookmark_positions(&self, buffer: &Buffer) -> Vec<(usize, u64)> {
+        buffer
+            .iter()
+            .filter(|line| self.bookmarks.contains(&line.id))
+            .map(|line| (line.line, line.id))
+            .collect()
+    }
+
+    pub fn jump_to_next_bookmark(&mut self, buffer: &Buffer, max_main_axis: usize) {
+        let positions = self.bookmark_positions(buffer);
+        let anchor = self.position.line + self.screen_center_y() as usize;
+        let Some(index) =
+            Self::next_bookmark_index(&positions, self.current_bookmark, anchor, true)
+        else {
+            return;
+        };
+        self.focus_bookmark(positions[index], max_main_axis);
+    }
+
+    pub fn jump_to_previous_bookmark(&mut self, buffer: &Buffer, max_main_axis: usize) {
+        let positions = self.bookmark_positions(buffer);
+        let anchor = self.position.line + self.screen_center_y() as usize;
+        let Some(index) =
+            Self::next_bookmark_index(&positions, self.current_bookmark, anchor, false)
+        else {
+            return;
+        };
+        self.focus_bookmark(positions[index], max_main_axis);
+    }
+
+    /// Which bookmark to jump to next. When `current` is still in view, step one
+    /// entry from it (wrapping around the ends); otherwise start from where the
+    /// user is looking — the first bookmark past the `anchor` line when going
+    /// forward, the last before it when going backward — wrapping if there is
+    /// none on that side. Returns `None` only when there are no bookmarks.
+    fn next_bookmark_index(
+        positions: &[(usize, u64)],
+        current: Option<u64>,
+        anchor: usize,
+        forward: bool,
+    ) -> Option<usize> {
+        let len = positions.len();
+        if len == 0 {
+            return None;
+        }
+
+        if let Some(current) = current
+            && let Some(i) = positions.iter().position(|(_, id)| *id == current)
+        {
+            return Some(if forward {
+                (i + 1) % len
+            } else {
+                (i + len - 1) % len
+            });
+        }
+
+        Some(if forward {
+            positions
+                .iter()
+                .position(|(line, _)| *line > anchor)
+                .unwrap_or(0)
+        } else {
+            positions
+                .iter()
+                .rposition(|(line, _)| *line < anchor)
+                .unwrap_or(len - 1)
+        })
+    }
+
+    fn focus_bookmark(&mut self, (line, id): (usize, u64), max_main_axis: usize) {
+        self.current_bookmark = Some(id);
+        self.jump_to_centered_position(BufferPosition { line, column: 0 }, max_main_axis);
+        // Parking on a bookmark should hold that view; keep new lines from
+        // yanking it back to the bottom even when the bookmark is the last line.
+        self.auto_scroll = false;
+    }
 }
 
 /// Turns a search query into the positions it matches on a line. Built once
@@ -604,15 +726,16 @@ impl ScreenMode {
         &self,
         cropped_lines: Vec<BufferLine<String>>,
         selection: Option<&Selection>,
+        bookmarks: &BTreeSet<u64>,
     ) -> Vec<Line<'static>> {
         match self {
             Self::Normal => cropped_lines
                 .into_iter()
-                .map(|line| self.to_normal_line(line, selection))
+                .map(|line| self.to_normal_line(line, selection, bookmarks))
                 .collect::<Vec<_>>(),
             Self::Search { .. } => cropped_lines
                 .into_iter()
-                .map(|line| self.to_search_line(line, selection))
+                .map(|line| self.to_search_line(line, selection, bookmarks))
                 .collect::<Vec<_>>(),
         }
     }
@@ -762,9 +885,11 @@ impl ScreenMode {
         &self,
         line: BufferLine<String>,
         selection: Option<&Selection>,
+        bookmarks: &BTreeSet<u64>,
     ) -> Line<'static> {
         let is_reversed = selection.is_some_and(|sel| sel.is_inside(line.line));
-        let timestamp = Self::timestamp_line(line.timestamp, is_reversed);
+        let is_bookmarked = bookmarks.contains(&line.id);
+        let timestamp = Self::timestamp_line(line.timestamp, is_reversed, is_bookmarked);
 
         let line_number = line.line;
         let content = if line.level.is_some() {
@@ -788,9 +913,11 @@ impl ScreenMode {
         &self,
         line: BufferLine<String>,
         selection: Option<&Selection>,
+        bookmarks: &BTreeSet<u64>,
     ) -> Line<'static> {
         let is_reversed = selection.is_some_and(|sel| sel.is_inside(line.line));
-        let timestamp = Self::timestamp_line(line.timestamp, is_reversed);
+        let is_bookmarked = bookmarks.contains(&line.id);
+        let timestamp = Self::timestamp_line(line.timestamp, is_reversed, is_bookmarked);
         let line_number = line.line;
         let content = self.search_line(line);
         let content = Self::reverse_content(content, selection, line_number);
@@ -889,12 +1016,21 @@ impl ScreenMode {
         Span::styled(line.message, style)
     }
 
-    fn timestamp_line(timestamp: DateTime<Local>, is_reversed: bool) -> Vec<Span<'static>> {
+    fn timestamp_line(
+        timestamp: DateTime<Local>,
+        is_reversed: bool,
+        is_bookmarked: bool,
+    ) -> Vec<Span<'static>> {
         let timestamp = timestamp_fmt(timestamp);
-        let style = if !is_reversed {
-            Style::default().fg(Color::DarkGray)
-        } else {
+        // A bookmark is a persistent mark, so it wins over the transient
+        // selection highlight: the yellow timestamp stays visible even while a
+        // selection is dragged across the line.
+        let style = if is_bookmarked {
+            Style::default().bg(Color::Yellow).fg(Color::Black)
+        } else if is_reversed {
             Style::default().bg(Color::White).fg(Color::DarkGray)
+        } else {
+            Style::default().fg(Color::DarkGray)
         };
 
         vec![Span::styled(timestamp, style), Span::raw(" ")]
@@ -1099,4 +1235,192 @@ mod tests {
         assert!(SearchMatcher::build("", false, false).is_empty());
         assert!(SearchMatcher::build("", false, true).is_empty());
     }
+
+    // Bookmarks (issue #208).
+    mod bookmarks {
+        use super::super::{Screen, ScreenPosition};
+        use crate::graphics::buffer::{Buffer, BufferLine};
+        use chrono::Local;
+        use ratatui::layout::Rect;
+
+        fn buffer_with(n: usize) -> Buffer {
+            let mut buffer = Buffer::new(n.max(1));
+            for _ in 0..n {
+                buffer += BufferLine::new_rx(Local::now(), b"x".to_vec());
+            }
+            buffer
+        }
+
+        fn ids(buffer: &Buffer) -> Vec<u64> {
+            buffer.iter().map(|line| line.id).collect()
+        }
+
+        fn sized_screen(height: u16, buffer_len: usize) -> Screen {
+            let mut screen = Screen::default();
+            screen.set_size(
+                Rect {
+                    x: 0,
+                    y: 0,
+                    width: 80,
+                    height,
+                },
+                buffer_len,
+            );
+            screen
+        }
+
+        #[test]
+        fn right_click_toggles_the_line_under_the_cursor() {
+            let buffer = buffer_with(5);
+            let ids = ids(&buffer);
+            let mut screen = sized_screen(10, buffer.len());
+
+            // Content starts one row below the top border, so line 2 is at y=3.
+            screen.toggle_bookmark(&buffer, ScreenPosition { x: 0, y: 3 });
+            assert!(screen.bookmarks.contains(&ids[2]));
+
+            // A second right-click on the same line removes it.
+            screen.toggle_bookmark(&buffer, ScreenPosition { x: 0, y: 3 });
+            assert!(!screen.bookmarks.contains(&ids[2]));
+        }
+
+        #[test]
+        fn clicks_off_the_content_are_ignored() {
+            let buffer = buffer_with(5);
+            let mut screen = sized_screen(10, buffer.len());
+
+            // Top border row.
+            screen.toggle_bookmark(&buffer, ScreenPosition { x: 0, y: 0 });
+            // Well past the last line.
+            screen.toggle_bookmark(&buffer, ScreenPosition { x: 0, y: 50 });
+
+            assert!(screen.bookmarks.is_empty());
+        }
+
+        #[test]
+        fn removing_the_current_bookmark_forgets_it() {
+            let buffer = buffer_with(5);
+            let ids = ids(&buffer);
+            let mut screen = sized_screen(10, buffer.len());
+
+            screen.toggle_bookmark(&buffer, ScreenPosition { x: 0, y: 3 });
+            screen.current_bookmark = Some(ids[2]);
+
+            screen.toggle_bookmark(&buffer, ScreenPosition { x: 0, y: 3 });
+            assert_eq!(screen.current_bookmark, None);
+        }
+
+        #[test]
+        fn clear_drops_all_bookmarks() {
+            let buffer = buffer_with(5);
+            let mut screen = sized_screen(10, buffer.len());
+            screen.toggle_bookmark(&buffer, ScreenPosition { x: 0, y: 3 });
+            screen.current_bookmark = Some(0);
+
+            screen.clear();
+
+            assert!(screen.bookmarks.is_empty());
+            assert_eq!(screen.current_bookmark, None);
+        }
+
+        #[test]
+        fn next_index_without_current_anchors_to_the_viewport() {
+            let positions = [(2, 100), (10, 101), (18, 102)];
+
+            // Forward: first bookmark below the anchor line.
+            assert_eq!(
+                Screen::next_bookmark_index(&positions, None, 4, true),
+                Some(1)
+            );
+            // Backward: last bookmark above the anchor line.
+            assert_eq!(
+                Screen::next_bookmark_index(&positions, None, 4, false),
+                Some(0)
+            );
+            // Forward with nothing below wraps to the first.
+            assert_eq!(
+                Screen::next_bookmark_index(&positions, None, 100, true),
+                Some(0)
+            );
+            // Backward with nothing above wraps to the last.
+            assert_eq!(
+                Screen::next_bookmark_index(&positions, None, 0, false),
+                Some(2)
+            );
+        }
+
+        #[test]
+        fn next_index_steps_and_wraps_from_the_current_bookmark() {
+            let positions = [(2, 100), (10, 101), (18, 102)];
+
+            assert_eq!(
+                Screen::next_bookmark_index(&positions, Some(101), 999, true),
+                Some(2)
+            );
+            // Forward off the end wraps to the first.
+            assert_eq!(
+                Screen::next_bookmark_index(&positions, Some(102), 999, true),
+                Some(0)
+            );
+            // Backward off the front wraps to the last.
+            assert_eq!(
+                Screen::next_bookmark_index(&positions, Some(100), 999, false),
+                Some(2)
+            );
+        }
+
+        #[test]
+        fn next_index_falls_back_to_anchor_when_current_is_gone() {
+            let positions = [(2, 100), (10, 101), (18, 102)];
+            // Id 999 is not among the positions (its line was filtered out or
+            // scrolled off), so navigation restarts from the viewport anchor.
+            assert_eq!(
+                Screen::next_bookmark_index(&positions, Some(999), 4, true),
+                Some(1)
+            );
+        }
+
+        #[test]
+        fn next_index_is_none_when_there_are_no_bookmarks() {
+            assert_eq!(Screen::next_bookmark_index(&[], None, 4, true), None);
+            assert_eq!(Screen::next_bookmark_index(&[], Some(1), 4, false), None);
+        }
+
+        #[test]
+        fn navigation_cycles_through_bookmarks_by_id() {
+            let buffer = buffer_with(20);
+            let ids = ids(&buffer);
+            let mut screen = sized_screen(10, buffer.len());
+            for line in [2usize, 10, 18] {
+                screen.bookmarks.insert(ids[line]);
+            }
+            let max_main_axis = buffer.len().saturating_sub(8);
+
+            // Fresh (no current): anchor is the screen centre (line 4), so the
+            // first Tab lands on the first bookmark below it.
+            screen.jump_to_next_bookmark(&buffer, max_main_axis);
+            assert_eq!(screen.current_bookmark, Some(ids[10]));
+
+            screen.jump_to_next_bookmark(&buffer, max_main_axis);
+            assert_eq!(screen.current_bookmark, Some(ids[18]));
+
+            // Wrap around to the top.
+            screen.jump_to_next_bookmark(&buffer, max_main_axis);
+            assert_eq!(screen.current_bookmark, Some(ids[2]));
+
+            // Shift+Tab steps back, wrapping to the bottom.
+            screen.jump_to_previous_bookmark(&buffer, max_main_axis);
+            assert_eq!(screen.current_bookmark, Some(ids[18]));
+        }
+
+        #[test]
+        fn navigation_is_a_no_op_without_bookmarks() {
+            let buffer = buffer_with(20);
+            let mut screen = sized_screen(10, buffer.len());
+            let max_main_axis = buffer.len().saturating_sub(8);
+
+            screen.jump_to_next_bookmark(&buffer, max_main_axis);
+            assert_eq!(screen.current_bookmark, None);
+        }
+    }
 }
diff --git a/src/inputs/inputs_task.rs b/src/inputs/inputs_task.rs
index 83baa89..7595849 100644
--- a/src/inputs/inputs_task.rs
+++ b/src/inputs/inputs_task.rs
@@ -582,7 +582,35 @@ impl InputsTask {
                 }
             }
             KeyCode::Tab => {
-                Self::handle_tab_input(private, shared.clone());
+                // While the tag pop-up is up, Tab confirms the highlighted entry
+                // (issue #177). Otherwise, in the command bar, it jumps to the
+                // next bookmark (issue #208) — mirroring search navigation.
+                let (is_normal, has_suggestions) = {
+                    let sr = shared.read().expect("Cannot get input lock for read");
+                    (sr.mode == InputMode::Normal, sr.tag_list.has_suggestions())
+                };
+
+                if is_normal && has_suggestions {
+                    Self::handle_tab_input(private, shared.clone());
+                } else if is_normal {
+                    let _ = private
+                        .graphics_cmd_sender
+                        .send(GraphicsCommand::NextBookmark);
+                }
+            }
+            KeyCode::BackTab => {
+                // Shift+Tab: jump to the previous bookmark (issue #208), the
+                // reverse of Tab. Suppressed while the tag pop-up is up so it
+                // does not fight the autocomplete flow.
+                let jump = {
+                    let sr = shared.read().expect("Cannot get input lock for read");
+                    sr.mode == InputMode::Normal && !sr.tag_list.has_suggestions()
+                };
+                if jump {
+                    let _ = private
+                        .graphics_cmd_sender
+                        .send(GraphicsCommand::PrevBookmark);
+                }
             }
             KeyCode::Enter if key.modifiers == ACTION_MODIFIER => {
                 let sr = shared.read().expect("Cannot get input lock for read");
@@ -1482,6 +1510,16 @@ impl InputsTask {
                             .graphics_cmd_sender
                             .send(GraphicsCommand::Move(point));
                     }
+                    event::MouseEventKind::Down(MouseButton::Right) => {
+                        let point = ScreenPosition {
+                            x: mouse_evt.column,
+                            y: mouse_evt.row,
+                        };
+
+                        let _ = private
+                            .graphics_cmd_sender
+                            .send(GraphicsCommand::ToggleBookmark(point));
+                    }
                     _ => {}
                 },
                 event::Event::Paste(data) => {

From fe545860e2832c00fd00f8aaf0c68461240039fe Mon Sep 17 00:00:00 2001
From: "Matheus T. dos Santos" <matheuswhite1@protonmail.com>
Date: Thu, 23 Jul 2026 18:58:46 -0300
Subject: [PATCH 2/2] feat: highlight the Tab-focused bookmark distinctly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Every bookmark shared the same yellow-background timestamp, so
Tab/Shift+Tab navigation gave no cue which one you'd landed on. Split the
styling in two: the current bookmark keeps the full yellow-background
highlight, while every other bookmark drops to a subtler yellow foreground
on the normal background — so all bookmarks stay visible and the focused one
stands out. Threads the existing `current_bookmark` through the render path
(`to_lines` -> `to_normal_line`/`to_search_line`) into `timestamp_line`.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 src/graphics/screen.rs | 72 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 63 insertions(+), 9 deletions(-)

diff --git a/src/graphics/screen.rs b/src/graphics/screen.rs
index 256348c..5d97f27 100644
--- a/src/graphics/screen.rs
+++ b/src/graphics/screen.rs
@@ -283,7 +283,12 @@ impl Screen {
 
         let lines = self
             .mode
-            .to_lines(decoded_lines, self.selection.as_ref(), &self.bookmarks)
+            .to_lines(
+                decoded_lines,
+                self.selection.as_ref(),
+                &self.bookmarks,
+                self.current_bookmark,
+            )
             .into_iter()
             .map(|line| Self::crop(line, self.position.column, max_width))
             .collect::<Vec<_>>();
@@ -727,15 +732,16 @@ impl ScreenMode {
         cropped_lines: Vec<BufferLine<String>>,
         selection: Option<&Selection>,
         bookmarks: &BTreeSet<u64>,
+        current_bookmark: Option<u64>,
     ) -> Vec<Line<'static>> {
         match self {
             Self::Normal => cropped_lines
                 .into_iter()
-                .map(|line| self.to_normal_line(line, selection, bookmarks))
+                .map(|line| self.to_normal_line(line, selection, bookmarks, current_bookmark))
                 .collect::<Vec<_>>(),
             Self::Search { .. } => cropped_lines
                 .into_iter()
-                .map(|line| self.to_search_line(line, selection, bookmarks))
+                .map(|line| self.to_search_line(line, selection, bookmarks, current_bookmark))
                 .collect::<Vec<_>>(),
         }
     }
@@ -886,10 +892,17 @@ impl ScreenMode {
         line: BufferLine<String>,
         selection: Option<&Selection>,
         bookmarks: &BTreeSet<u64>,
+        current_bookmark: Option<u64>,
     ) -> Line<'static> {
         let is_reversed = selection.is_some_and(|sel| sel.is_inside(line.line));
         let is_bookmarked = bookmarks.contains(&line.id);
-        let timestamp = Self::timestamp_line(line.timestamp, is_reversed, is_bookmarked);
+        let is_current_bookmark = current_bookmark == Some(line.id);
+        let timestamp = Self::timestamp_line(
+            line.timestamp,
+            is_reversed,
+            is_bookmarked,
+            is_current_bookmark,
+        );
 
         let line_number = line.line;
         let content = if line.level.is_some() {
@@ -914,10 +927,17 @@ impl ScreenMode {
         line: BufferLine<String>,
         selection: Option<&Selection>,
         bookmarks: &BTreeSet<u64>,
+        current_bookmark: Option<u64>,
     ) -> Line<'static> {
         let is_reversed = selection.is_some_and(|sel| sel.is_inside(line.line));
         let is_bookmarked = bookmarks.contains(&line.id);
-        let timestamp = Self::timestamp_line(line.timestamp, is_reversed, is_bookmarked);
+        let is_current_bookmark = current_bookmark == Some(line.id);
+        let timestamp = Self::timestamp_line(
+            line.timestamp,
+            is_reversed,
+            is_bookmarked,
+            is_current_bookmark,
+        );
         let line_number = line.line;
         let content = self.search_line(line);
         let content = Self::reverse_content(content, selection, line_number);
@@ -1020,13 +1040,18 @@ impl ScreenMode {
         timestamp: DateTime<Local>,
         is_reversed: bool,
         is_bookmarked: bool,
+        is_current_bookmark: bool,
     ) -> Vec<Span<'static>> {
         let timestamp = timestamp_fmt(timestamp);
-        // A bookmark is a persistent mark, so it wins over the transient
-        // selection highlight: the yellow timestamp stays visible even while a
-        // selection is dragged across the line.
-        let style = if is_bookmarked {
+        // Two-tier bookmark styling so `Tab` navigation is legible: the bookmark
+        // the cursor is parked on gets the full yellow-background highlight,
+        // while every other bookmark keeps a subtler yellow foreground on the
+        // normal background. Both win over the transient selection highlight, so
+        // a bookmark stays marked even while a selection is dragged across it.
+        let style = if is_current_bookmark {
             Style::default().bg(Color::Yellow).fg(Color::Black)
+        } else if is_bookmarked {
+            Style::default().fg(Color::Yellow)
         } else if is_reversed {
             Style::default().bg(Color::White).fg(Color::DarkGray)
         } else {
@@ -1422,5 +1447,34 @@ mod tests {
             screen.jump_to_next_bookmark(&buffer, max_main_axis);
             assert_eq!(screen.current_bookmark, None);
         }
+
+        // The `Tab`-focused bookmark must stand out from the others: it keeps the
+        // full yellow-background highlight, while every other bookmark drops to a
+        // subtler yellow foreground on the normal background.
+        #[test]
+        fn current_bookmark_is_highlighted_apart_from_other_bookmarks() {
+            use super::super::ScreenMode;
+            use ratatui::style::Color;
+
+            let ts = Local::now();
+            let style_of = |is_bookmarked, is_current| {
+                ScreenMode::timestamp_line(ts, false, is_bookmarked, is_current)[0].style
+            };
+
+            // A plain (non-bookmarked) line: dim gray text, no background.
+            let plain = style_of(false, false);
+            assert_eq!(plain.bg, None);
+            assert_eq!(plain.fg, Some(Color::DarkGray));
+
+            // A bookmark that isn't the current one: yellow text, normal background.
+            let other = style_of(true, false);
+            assert_eq!(other.bg, None);
+            assert_eq!(other.fg, Some(Color::Yellow));
+
+            // The current bookmark: full yellow-background highlight.
+            let current = style_of(true, true);
+            assert_eq!(current.bg, Some(Color::Yellow));
+            assert_eq!(current.fg, Some(Color::Black));
+        }
     }
 }