264 lines
8.9 KiB
Rust
264 lines
8.9 KiB
Rust
|
|
use std::collections::HashMap;
|
|||
|
|
|
|||
|
|
use tui_textarea::CursorMove;
|
|||
|
|
use tui_textarea::TextArea;
|
|||
|
|
|
|||
|
|
use crate::app_event::AppEvent;
|
|||
|
|
use crate::app_event_sender::AppEventSender;
|
|||
|
|
use codex_core::protocol::Op;
|
|||
|
|
|
|||
|
|
/// State machine that manages shell-style history navigation (Up/Down) inside
|
|||
|
|
/// the chat composer. This struct is intentionally decoupled from the
|
|||
|
|
/// rendering widget so the logic remains isolated and easier to test.
|
|||
|
|
pub(crate) struct ChatComposerHistory {
|
|||
|
|
/// Identifier of the history log as reported by `SessionConfiguredEvent`.
|
|||
|
|
history_log_id: Option<u64>,
|
|||
|
|
/// Number of entries already present in the persistent cross-session
|
|||
|
|
/// history file when the session started.
|
|||
|
|
history_entry_count: usize,
|
|||
|
|
|
|||
|
|
/// Messages submitted by the user *during this UI session* (newest at END).
|
|||
|
|
local_history: Vec<String>,
|
|||
|
|
|
|||
|
|
/// Cache of persistent history entries fetched on-demand.
|
|||
|
|
fetched_history: HashMap<usize, String>,
|
|||
|
|
|
|||
|
|
/// Current cursor within the combined (persistent + local) history. `None`
|
|||
|
|
/// indicates the user is *not* currently browsing history.
|
|||
|
|
history_cursor: Option<isize>,
|
|||
|
|
|
|||
|
|
/// The text that was last inserted into the composer as a result of
|
|||
|
|
/// history navigation. Used to decide if further Up/Down presses should be
|
|||
|
|
/// treated as navigation versus normal cursor movement.
|
|||
|
|
last_history_text: Option<String>,
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
impl ChatComposerHistory {
|
|||
|
|
pub fn new() -> Self {
|
|||
|
|
Self {
|
|||
|
|
history_log_id: None,
|
|||
|
|
history_entry_count: 0,
|
|||
|
|
local_history: Vec::new(),
|
|||
|
|
fetched_history: HashMap::new(),
|
|||
|
|
history_cursor: None,
|
|||
|
|
last_history_text: None,
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
/// Update metadata when a new session is configured.
|
|||
|
|
pub fn set_metadata(&mut self, log_id: u64, entry_count: usize) {
|
|||
|
|
self.history_log_id = Some(log_id);
|
|||
|
|
self.history_entry_count = entry_count;
|
|||
|
|
self.fetched_history.clear();
|
|||
|
|
self.local_history.clear();
|
|||
|
|
self.history_cursor = None;
|
|||
|
|
self.last_history_text = None;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
/// Record a message submitted by the user in the current session so it can
|
|||
|
|
/// be recalled later.
|
|||
|
|
pub fn record_local_submission(&mut self, text: &str) {
|
|||
|
|
if !text.is_empty() {
|
|||
|
|
self.local_history.push(text.to_string());
|
|||
|
|
self.history_cursor = None;
|
|||
|
|
self.last_history_text = None;
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
/// Should Up/Down key presses be interpreted as history navigation given
|
|||
|
|
/// the current content and cursor position of `textarea`?
|
|||
|
|
pub fn should_handle_navigation(&self, textarea: &TextArea) -> bool {
|
|||
|
|
if self.history_entry_count == 0 && self.local_history.is_empty() {
|
|||
|
|
return false;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
let lines = textarea.lines();
|
|||
|
|
if lines.len() == 1 && lines[0].is_empty() {
|
|||
|
|
return true;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
// Textarea is not empty – only navigate when cursor is at start and
|
|||
|
|
// text matches last recalled history entry so regular editing is not
|
|||
|
|
// hijacked.
|
|||
|
|
let (row, col) = textarea.cursor();
|
|||
|
|
if row != 0 || col != 0 {
|
|||
|
|
return false;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
matches!(&self.last_history_text, Some(prev) if prev == &lines.join("\n"))
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
/// Handle <Up>. Returns true when the key was consumed and the caller
|
|||
|
|
/// should request a redraw.
|
|||
|
|
pub fn navigate_up(&mut self, textarea: &mut TextArea, app_event_tx: &AppEventSender) -> bool {
|
|||
|
|
let total_entries = self.history_entry_count + self.local_history.len();
|
|||
|
|
if total_entries == 0 {
|
|||
|
|
return false;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
let next_idx = match self.history_cursor {
|
|||
|
|
None => (total_entries as isize) - 1,
|
|||
|
|
Some(0) => return true, // already at oldest
|
|||
|
|
Some(idx) => idx - 1,
|
|||
|
|
};
|
|||
|
|
|
|||
|
|
self.history_cursor = Some(next_idx);
|
|||
|
|
self.populate_history_at_index(next_idx as usize, textarea, app_event_tx);
|
|||
|
|
true
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
/// Handle <Down>.
|
|||
|
|
pub fn navigate_down(
|
|||
|
|
&mut self,
|
|||
|
|
textarea: &mut TextArea,
|
|||
|
|
app_event_tx: &AppEventSender,
|
|||
|
|
) -> bool {
|
|||
|
|
let total_entries = self.history_entry_count + self.local_history.len();
|
|||
|
|
if total_entries == 0 {
|
|||
|
|
return false;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
let next_idx_opt = match self.history_cursor {
|
|||
|
|
None => return false, // not browsing
|
|||
|
|
Some(idx) if (idx as usize) + 1 >= total_entries => None,
|
|||
|
|
Some(idx) => Some(idx + 1),
|
|||
|
|
};
|
|||
|
|
|
|||
|
|
match next_idx_opt {
|
|||
|
|
Some(idx) => {
|
|||
|
|
self.history_cursor = Some(idx);
|
|||
|
|
self.populate_history_at_index(idx as usize, textarea, app_event_tx);
|
|||
|
|
}
|
|||
|
|
None => {
|
|||
|
|
// Past newest – clear and exit browsing mode.
|
|||
|
|
self.history_cursor = None;
|
|||
|
|
self.last_history_text = None;
|
|||
|
|
self.replace_textarea_content(textarea, "");
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
true
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
/// Integrate a GetHistoryEntryResponse event.
|
|||
|
|
pub fn on_entry_response(
|
|||
|
|
&mut self,
|
|||
|
|
log_id: u64,
|
|||
|
|
offset: usize,
|
|||
|
|
entry: Option<String>,
|
|||
|
|
textarea: &mut TextArea,
|
|||
|
|
) -> bool {
|
|||
|
|
if self.history_log_id != Some(log_id) {
|
|||
|
|
return false;
|
|||
|
|
}
|
|||
|
|
let Some(text) = entry else { return false };
|
|||
|
|
self.fetched_history.insert(offset, text.clone());
|
|||
|
|
|
|||
|
|
if self.history_cursor == Some(offset as isize) {
|
|||
|
|
self.replace_textarea_content(textarea, &text);
|
|||
|
|
return true;
|
|||
|
|
}
|
|||
|
|
false
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
// ---------------------------------------------------------------------
|
|||
|
|
// Internal helpers
|
|||
|
|
// ---------------------------------------------------------------------
|
|||
|
|
|
|||
|
|
fn populate_history_at_index(
|
|||
|
|
&mut self,
|
|||
|
|
global_idx: usize,
|
|||
|
|
textarea: &mut TextArea,
|
|||
|
|
app_event_tx: &AppEventSender,
|
|||
|
|
) {
|
|||
|
|
if global_idx >= self.history_entry_count {
|
|||
|
|
// Local entry.
|
|||
|
|
if let Some(text) = self
|
|||
|
|
.local_history
|
|||
|
|
.get(global_idx - self.history_entry_count)
|
|||
|
|
{
|
|||
|
|
let t = text.clone();
|
|||
|
|
self.replace_textarea_content(textarea, &t);
|
|||
|
|
}
|
|||
|
|
} else if let Some(text) = self.fetched_history.get(&global_idx) {
|
|||
|
|
let t = text.clone();
|
|||
|
|
self.replace_textarea_content(textarea, &t);
|
|||
|
|
} else if let Some(log_id) = self.history_log_id {
|
|||
|
|
let op = Op::GetHistoryEntryRequest {
|
|||
|
|
offset: global_idx,
|
|||
|
|
log_id,
|
|||
|
|
};
|
|||
|
|
app_event_tx.send(AppEvent::CodexOp(op));
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
fn replace_textarea_content(&mut self, textarea: &mut TextArea, text: &str) {
|
|||
|
|
textarea.select_all();
|
|||
|
|
textarea.cut();
|
|||
|
|
let _ = textarea.insert_str(text);
|
|||
|
|
textarea.move_cursor(CursorMove::Jump(0, 0));
|
|||
|
|
self.last_history_text = Some(text.to_string());
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
#[cfg(test)]
|
|||
|
|
mod tests {
|
|||
|
|
#![expect(clippy::expect_used)]
|
|||
|
|
use super::*;
|
|||
|
|
use crate::app_event::AppEvent;
|
|||
|
|
use codex_core::protocol::Op;
|
|||
|
|
use std::sync::mpsc::channel;
|
|||
|
|
|
|||
|
|
#[test]
|
|||
|
|
fn navigation_with_async_fetch() {
|
|||
|
|
let (tx, rx) = channel::<AppEvent>();
|
|||
|
|
let tx = AppEventSender::new(tx);
|
|||
|
|
|
|||
|
|
let mut history = ChatComposerHistory::new();
|
|||
|
|
// Pretend there are 3 persistent entries.
|
|||
|
|
history.set_metadata(1, 3);
|
|||
|
|
|
|||
|
|
let mut textarea = TextArea::default();
|
|||
|
|
|
|||
|
|
// First Up should request offset 2 (latest) and await async data.
|
|||
|
|
assert!(history.should_handle_navigation(&textarea));
|
|||
|
|
assert!(history.navigate_up(&mut textarea, &tx));
|
|||
|
|
|
|||
|
|
// Verify that an AppEvent::CodexOp with the correct GetHistoryEntryRequest was sent.
|
|||
|
|
let event = rx.try_recv().expect("expected AppEvent to be sent");
|
|||
|
|
let AppEvent::CodexOp(history_request1) = event else {
|
|||
|
|
panic!("unexpected event variant");
|
|||
|
|
};
|
|||
|
|
assert_eq!(
|
|||
|
|
Op::GetHistoryEntryRequest {
|
|||
|
|
log_id: 1,
|
|||
|
|
offset: 2
|
|||
|
|
},
|
|||
|
|
history_request1
|
|||
|
|
);
|
|||
|
|
assert_eq!(textarea.lines().join("\n"), ""); // still empty
|
|||
|
|
|
|||
|
|
// Inject the async response.
|
|||
|
|
assert!(history.on_entry_response(1, 2, Some("latest".into()), &mut textarea));
|
|||
|
|
assert_eq!(textarea.lines().join("\n"), "latest");
|
|||
|
|
|
|||
|
|
// Next Up should move to offset 1.
|
|||
|
|
assert!(history.navigate_up(&mut textarea, &tx));
|
|||
|
|
|
|||
|
|
// Verify second CodexOp event for offset 1.
|
|||
|
|
let event2 = rx.try_recv().expect("expected second event");
|
|||
|
|
let AppEvent::CodexOp(history_request_2) = event2 else {
|
|||
|
|
panic!("unexpected event variant");
|
|||
|
|
};
|
|||
|
|
assert_eq!(
|
|||
|
|
Op::GetHistoryEntryRequest {
|
|||
|
|
log_id: 1,
|
|||
|
|
offset: 1
|
|||
|
|
},
|
|||
|
|
history_request_2
|
|||
|
|
);
|
|||
|
|
|
|||
|
|
history.on_entry_response(1, 1, Some("older".into()), &mut textarea);
|
|||
|
|
assert_eq!(textarea.lines().join("\n"), "older");
|
|||
|
|
}
|
|||
|
|
}
|