octorus 0.6.2

A TUI tool for GitHub PR review, designed for Helix editor users
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
use anyhow::Result;
use crossterm::event::{self, KeyCode, KeyModifiers};
use ratatui::{backend::CrosstermBackend, Terminal};
use std::io::Stdout;

use crate::filter::ListFilter;
use crate::keybinding::{event_to_keybinding, SequenceMatch};

use super::types::*;
use super::{App, AppState};

impl App {
    pub(crate) async fn handle_split_view_file_list_input(
        &mut self,
        key: event::KeyEvent,
        terminal: &mut Terminal<CrosstermBackend<Stdout>>,
    ) -> Result<()> {
        if self.handle_filter_input(&key, "file") {
            self.sync_diff_to_selected_file();
            return Ok(());
        }

        let kb = self.config.keybindings.clone();
        let has_filter = self.file_list_filter.is_some();
        let tree_active = self.is_file_tree_active();

        if self.matches_single_key(&key, &kb.tree_toggle) && !has_filter {
            self.toggle_file_tree();
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.move_down) {
            if has_filter {
                self.handle_filter_navigation("file", true);
            } else if tree_active {
                self.file_tree_move_down();
            } else if !self.files().is_empty() {
                self.selected_file =
                    (self.selected_file + 1).min(self.files().len().saturating_sub(1));
            }
            // File 行移動時のみ diff 同期(Dir 行ではスキップ → 直前ファイルの diff を維持)
            if !tree_active
                || self
                    .file_tree_state
                    .as_ref()
                    .is_none_or(|t| t.selected_file_index().is_some())
            {
                self.sync_diff_to_selected_file();
            }
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.move_up) {
            if has_filter {
                self.handle_filter_navigation("file", false);
            } else if tree_active {
                self.file_tree_move_up();
            } else if self.selected_file > 0 {
                self.selected_file = self.selected_file.saturating_sub(1);
            }
            if !tree_active
                || self
                    .file_tree_state
                    .as_ref()
                    .is_none_or(|t| t.selected_file_index().is_some())
            {
                self.sync_diff_to_selected_file();
            }
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.page_down) || Self::is_shift_char_shortcut(&key, 'j') {
            if !has_filter {
                let page_step = terminal.size()?.height.saturating_sub(8) as usize;
                let step = page_step.max(1);
                if tree_active {
                    self.file_tree_page_down(step);
                } else if !self.files().is_empty() {
                    self.selected_file =
                        (self.selected_file + step).min(self.files().len().saturating_sub(1));
                }
                if !tree_active
                    || self
                        .file_tree_state
                        .as_ref()
                        .is_none_or(|t| t.selected_file_index().is_some())
                {
                    self.sync_diff_to_selected_file();
                }
            }
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.page_up) || Self::is_shift_char_shortcut(&key, 'k') {
            if !has_filter {
                let page_step = terminal.size()?.height.saturating_sub(8) as usize;
                let step = page_step.max(1);
                if tree_active {
                    self.file_tree_page_up(step);
                } else {
                    self.selected_file = self.selected_file.saturating_sub(step);
                }
                if !tree_active
                    || self
                        .file_tree_state
                        .as_ref()
                        .is_none_or(|t| t.selected_file_index().is_some())
                {
                    self.sync_diff_to_selected_file();
                }
            }
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.quit) {
            if self.handle_filter_esc("file") {
                return Ok(());
            }
            self.state = AppState::FileList;
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.git_ops) {
            self.open_git_ops();
            return Ok(());
        }

        if let Some(kb_event) = event_to_keybinding(&key) {
            self.check_sequence_timeout();

            if !self.pending_keys.is_empty() {
                self.push_pending_key(kb_event);

                if self.try_match_sequence(&kb.filter) == SequenceMatch::Full {
                    self.clear_pending_keys();
                    if let Some(ref mut filter) = self.file_list_filter {
                        filter.input_active = true;
                    } else {
                        let mut filter = ListFilter::new();
                        let files = self.files();
                        filter.apply(files, |_file, _q| true);
                        if let Some(idx) = filter.sync_selection() {
                            self.selected_file = idx;
                        }
                        self.file_list_filter = Some(filter);
                    }
                    return Ok(());
                }

                if self.try_match_sequence(&kb.jump_to_first) == SequenceMatch::Full {
                    self.clear_pending_keys();
                    if tree_active {
                        self.file_tree_jump_to_first();
                    } else {
                        self.selected_file = 0;
                    }
                    self.sync_diff_to_selected_file();
                    return Ok(());
                }

                self.clear_pending_keys();
            } else {
                let could_start_filter = self.key_could_match_sequence(&key, &kb.filter);
                let could_start_gg = self.key_could_match_sequence(&key, &kb.jump_to_first);
                if could_start_filter || could_start_gg {
                    self.push_pending_key(kb_event);
                    return Ok(());
                }
            }
        }

        // G: Jump to last
        if self.matches_single_key(&key, &kb.jump_to_last) {
            if tree_active {
                self.file_tree_jump_to_last();
            } else if !self.files().is_empty() {
                self.selected_file = self.files().len().saturating_sub(1);
            }
            self.sync_diff_to_selected_file();
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.open_panel)
            || self.matches_single_key(&key, &kb.move_right)
        {
            if self.is_filter_selection_empty("file") {
                return Ok(());
            }
            if tree_active && self.file_tree_enter() {
                return Ok(());
            }
            if !self.files().is_empty() {
                self.state = AppState::SplitViewDiff;
            }
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.move_left) {
            self.state = AppState::FileList;
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.comment_list) {
            self.previous_state = AppState::SplitViewFileList;
            self.open_comment_list();
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.help) {
            self.open_help(AppState::SplitViewFileList);
            return Ok(());
        }

        self.handle_common_file_list_keys(key, terminal).await?;

        Ok(())
    }
    pub(super) async fn handle_diff_input_common(
        &mut self,
        key: event::KeyEvent,
        terminal: &mut Terminal<CrosstermBackend<Stdout>>,
        variant: DiffViewVariant,
    ) -> Result<()> {
        if self.symbol_popup.is_some() {
            self.handle_symbol_popup_input(key, terminal).await?;
            return Ok(());
        }

        if self.matches_single_key(&key, &self.config.keybindings.help) {
            let from = match variant {
                DiffViewVariant::SplitPane => AppState::SplitViewDiff,
                DiffViewVariant::Fullscreen => AppState::DiffView,
            };
            self.open_help(from);
            return Ok(());
        }

        let term_size = terminal.size()?;
        let term_h = term_size.height as usize;
        let term_w = term_size.width as usize;

        // Calculate visible_lines matching the actual rendered diff body height.
        // When the comment panel is closed, the layout is:
        //   Header(3) + Diff(remaining) + Footer(3) + border(2) = term_h - 8
        // When the comment panel is open, the diff body only gets a percentage of
        // the available space (after subtracting fixed-height regions), so we must
        // replicate that proportional split here to keep adjust_scroll() accurate.
        let visible_lines = if self.cmt.comment_panel_open {
            let has_rally = self.has_background_rally();
            // Fixed-height rows consumed by Header + Footer (+ optional Rally bar)
            let fixed = if has_rally { 7usize } else { 6usize };
            let remaining = term_h.saturating_sub(fixed);
            // Diff percentage / total percentage — must match the rendering layout:
            //   Fullscreen without rally: 55% diff + 40% comments = 95%
            //   Fullscreen with rally:    50% diff + 40% comments = 90%
            //   SplitPane (both):         50% diff + 40% comments = 90%
            let (diff_pct, total_pct) = match variant {
                DiffViewVariant::Fullscreen if !has_rally => (55usize, 95usize),
                _ => (50, 90),
            };
            let diff_area_h = remaining * diff_pct / total_pct;
            // Subtract 2 for the Block borders around the diff body
            diff_area_h.saturating_sub(2)
        } else {
            // Header(3) + Footer(3) + border(2) = 8
            term_h.saturating_sub(8)
        };
        let panel_inner_width = self.comment_panel_inner_width(term_w);

        let kb = self.config.keybindings.clone();

        if self.multiline_selection.is_some() {
            if self.matches_single_key(&key, &kb.move_down) {
                if self.diff_scroll.line_count > 0 {
                    let new_cursor = (self.diff_scroll.selected_line + 1)
                        .min(self.diff_scroll.line_count.saturating_sub(1));
                    self.diff_scroll.selected_line = new_cursor;
                    if let Some(ref mut sel) = self.multiline_selection {
                        sel.cursor_line = new_cursor;
                    }
                    self.adjust_scroll(visible_lines);
                }
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.move_up) {
                let new_cursor = self.diff_scroll.selected_line.saturating_sub(1);
                self.diff_scroll.selected_line = new_cursor;
                if let Some(ref mut sel) = self.multiline_selection {
                    sel.cursor_line = new_cursor;
                }
                self.adjust_scroll(visible_lines);
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.comment) {
                self.enter_multiline_comment_input();
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.suggestion) {
                self.enter_multiline_suggestion_input();
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.quit) {
                self.multiline_selection = None;
                return Ok(());
            }

            return Ok(());
        }

        if self.cmt.comment_panel_open {
            if self.matches_single_key(&key, &kb.move_down) {
                let max_scroll = self.max_comment_panel_scroll(term_h, term_w);
                self.cmt.comment_panel_scroll = self
                    .cmt
                    .comment_panel_scroll
                    .saturating_add(1)
                    .min(max_scroll);
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.move_up) {
                self.cmt.comment_panel_scroll = self.cmt.comment_panel_scroll.saturating_sub(1);
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.next_comment) {
                let prev_line = self.diff_scroll.selected_line;
                self.jump_to_next_comment();
                if self.diff_scroll.selected_line != prev_line {
                    self.cmt.comment_panel_scroll = 0;
                    self.cmt.selected_inline_comment = 0;
                    self.adjust_scroll(visible_lines);
                }
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.prev_comment) {
                let prev_line = self.diff_scroll.selected_line;
                self.jump_to_prev_comment();
                if self.diff_scroll.selected_line != prev_line {
                    self.cmt.comment_panel_scroll = 0;
                    self.cmt.selected_inline_comment = 0;
                    self.adjust_scroll(visible_lines);
                }
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.comment) {
                self.enter_comment_input();
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.suggestion) {
                self.enter_suggestion_input();
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.reply) {
                if self.has_comment_at_current_line() {
                    self.enter_reply_input();
                }
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.tab_switch) {
                if self.has_comment_at_current_line() {
                    let count = self.get_comment_indices_at_current_line().len();
                    if count > 1 && self.cmt.selected_inline_comment + 1 < count {
                        self.cmt.selected_inline_comment += 1;
                        self.cmt.comment_panel_scroll = self.comment_panel_offset_for(
                            self.cmt.selected_inline_comment,
                            panel_inner_width,
                        );
                    }
                }
                return Ok(());
            }

            if key.code == KeyCode::BackTab {
                if self.has_comment_at_current_line() {
                    let count = self.get_comment_indices_at_current_line().len();
                    if count > 1 && self.cmt.selected_inline_comment > 0 {
                        self.cmt.selected_inline_comment -= 1;
                        self.cmt.comment_panel_scroll = self.comment_panel_offset_for(
                            self.cmt.selected_inline_comment,
                            panel_inner_width,
                        );
                    }
                }
                return Ok(());
            }

            match variant {
                DiffViewVariant::SplitPane => {
                    if self.matches_single_key(&key, &kb.move_right) {
                        self.diff_view_return_state = AppState::SplitViewDiff;
                        self.preview_return_state = AppState::DiffView;
                        self.state = AppState::DiffView;
                        return Ok(());
                    }

                    if self.matches_single_key(&key, &kb.quit)
                        || self.matches_single_key(&key, &kb.move_left)
                    {
                        self.cmt.comment_panel_open = false;
                        self.cmt.comment_panel_scroll = 0;
                        return Ok(());
                    }
                }
                DiffViewVariant::Fullscreen => {
                    if self.matches_single_key(&key, &kb.move_left) {
                        self.state = self.diff_view_return_state;
                        return Ok(());
                    }

                    if self.matches_single_key(&key, &kb.quit) {
                        self.cmt.comment_panel_open = false;
                        self.cmt.comment_panel_scroll = 0;
                        return Ok(());
                    }
                }
            }

            return Ok(());
        }

        self.check_sequence_timeout();

        let current_kb = event_to_keybinding(&key);

        if let Some(kb_event) = current_kb {
            if !self.pending_keys.is_empty() {
                self.push_pending_key(kb_event);

                if self.try_match_sequence(&kb.go_to_definition) == SequenceMatch::Full {
                    self.clear_pending_keys();
                    self.open_symbol_popup(terminal).await?;
                    return Ok(());
                }

                if self.try_match_sequence(&kb.go_to_file) == SequenceMatch::Full {
                    self.clear_pending_keys();
                    self.open_current_file_in_editor(terminal).await?;
                    return Ok(());
                }

                if self.try_match_sequence(&kb.jump_to_first) == SequenceMatch::Full {
                    self.clear_pending_keys();
                    self.diff_scroll.selected_line = 0;
                    self.diff_scroll.scroll_offset = 0;
                    return Ok(());
                }

                self.clear_pending_keys();
            } else {
                let could_start_gd = self.key_could_match_sequence(&key, &kb.go_to_definition);
                let could_start_gf = self.key_could_match_sequence(&key, &kb.go_to_file);
                let could_start_gg = self.key_could_match_sequence(&key, &kb.jump_to_first);

                if could_start_gd || could_start_gf || could_start_gg {
                    self.push_pending_key(kb_event);
                    return Ok(());
                }
            }
        }

        match variant {
            DiffViewVariant::SplitPane => {
                if self.matches_single_key(&key, &kb.move_right) {
                    self.diff_view_return_state = AppState::SplitViewDiff;
                    self.preview_return_state = AppState::DiffView;
                    self.state = AppState::DiffView;
                    return Ok(());
                }

                if self.matches_single_key(&key, &kb.move_left) {
                    self.state = AppState::SplitViewFileList;
                    return Ok(());
                }

                if self.matches_single_key(&key, &kb.quit) {
                    self.state = AppState::FileList;
                    return Ok(());
                }

                if self.matches_single_key(&key, &kb.comment) {
                    self.enter_comment_input();
                    return Ok(());
                }

                if self.matches_single_key(&key, &kb.suggestion) {
                    self.enter_suggestion_input();
                    return Ok(());
                }
            }
            DiffViewVariant::Fullscreen => {
                if self.matches_single_key(&key, &kb.quit) {
                    self.handle_fullscreen_diff_quit();
                    return Ok(());
                }

                if self.matches_single_key(&key, &kb.move_left) {
                    self.state = self.diff_view_return_state;
                    return Ok(());
                }
            }
        }

        if !self.local_mode && self.matches_single_key(&key, &kb.pr_description) {
            self.open_pr_description();
            return Ok(());
        }

        if (key.code == KeyCode::Enter && key.modifiers.contains(KeyModifiers::SHIFT))
            || self.matches_single_key(&key, &kb.multiline_select)
        {
            self.enter_multiline_selection();
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.move_down) {
            if self.diff_scroll.line_count > 0 {
                self.diff_scroll.selected_line = (self.diff_scroll.selected_line + 1)
                    .min(self.diff_scroll.line_count.saturating_sub(1));
                self.adjust_scroll(visible_lines);
            }
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.move_up) {
            self.diff_scroll.selected_line = self.diff_scroll.selected_line.saturating_sub(1);
            self.adjust_scroll(visible_lines);
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.jump_to_last) {
            if self.diff_scroll.line_count > 0 {
                self.diff_scroll.selected_line = self.diff_scroll.line_count.saturating_sub(1);
                self.adjust_scroll(visible_lines);
            }
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.jump_back) {
            self.jump_back();
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.page_down) || Self::is_shift_char_shortcut(&key, 'j') {
            if self.diff_scroll.line_count > 0 {
                self.diff_scroll.selected_line = (self.diff_scroll.selected_line + 20)
                    .min(self.diff_scroll.line_count.saturating_sub(1));
                self.adjust_scroll(visible_lines);
            }
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.page_up) || Self::is_shift_char_shortcut(&key, 'k') {
            self.diff_scroll.selected_line = self.diff_scroll.selected_line.saturating_sub(20);
            self.adjust_scroll(visible_lines);
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.next_comment) {
            self.jump_to_next_comment();
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.prev_comment) {
            self.jump_to_prev_comment();
            return Ok(());
        }

        if self.matches_single_key(&key, &kb.toggle_markdown_rich) {
            self.toggle_markdown_rich();
            self.ensure_diff_cache();
            return Ok(());
        }

        if self.try_open_comment_panel(&key, &kb) {
            return Ok(());
        }

        if variant == DiffViewVariant::Fullscreen {
            if self.matches_single_key(&key, &kb.comment) {
                self.enter_comment_input();
                return Ok(());
            }

            if self.matches_single_key(&key, &kb.suggestion) {
                self.enter_suggestion_input();
                return Ok(());
            }
        }

        Ok(())
    }
    pub(crate) fn try_open_comment_panel(
        &mut self,
        key: &event::KeyEvent,
        kb: &crate::config::KeybindingsConfig,
    ) -> bool {
        if !self.matches_single_key(key, &kb.open_panel) {
            return false;
        }
        self.cmt.comment_panel_open = true;
        self.cmt.comment_panel_scroll = 0;
        self.cmt.selected_inline_comment = 0;
        true
    }

    pub(crate) fn handle_fullscreen_diff_quit(&mut self) {
        if self.started_from_pr_list
            && self.diff_view_return_state == AppState::FileList
            && !self.zen_mode
        {
            self.back_to_pr_list();
        } else {
            self.state = self.diff_view_return_state;
        }
    }

    pub(crate) async fn handle_split_view_diff_input(
        &mut self,
        key: event::KeyEvent,
        terminal: &mut Terminal<CrosstermBackend<Stdout>>,
    ) -> Result<()> {
        self.handle_diff_input_common(key, terminal, DiffViewVariant::SplitPane)
            .await
    }
    pub(crate) async fn handle_diff_view_input(
        &mut self,
        key: event::KeyEvent,
        terminal: &mut Terminal<CrosstermBackend<Stdout>>,
    ) -> Result<()> {
        self.handle_diff_input_common(key, terminal, DiffViewVariant::Fullscreen)
            .await
    }
    pub(crate) fn adjust_scroll(&mut self, visible_lines: usize) {
        if visible_lines == 0 {
            return;
        }
        // When the entire diff fits within the viewport, no scrolling is needed.
        // Reset scroll_offset to prevent stale state from hiding lines after refresh.
        if self.diff_scroll.line_count <= visible_lines {
            self.diff_scroll.scroll_offset = 0;
            return;
        }

        // Scroll margin: keep cursor at least this many lines from viewport edges.
        // Uses half the viewport so scrolling begins when cursor passes the center.
        let margin = visible_lines / 2;

        // Cursor above the top margin
        if self.diff_scroll.selected_line < self.diff_scroll.scroll_offset + margin {
            self.diff_scroll.scroll_offset = self.diff_scroll.selected_line.saturating_sub(margin);
        }
        // Cursor below the bottom margin
        if self.diff_scroll.selected_line + margin >= self.diff_scroll.scroll_offset + visible_lines
        {
            self.diff_scroll.scroll_offset = self
                .diff_scroll
                .selected_line
                .saturating_sub(visible_lines.saturating_sub(margin + 1));
        }
    }
}