agent-dump 1.2.1__tar.gz → 1.2.2__tar.gz

{agent_dump-1.2.1 → agent_dump-1.2.2}/Cargo.lock

@@ -10,7 +10,7 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "agent-dump"
-version = "1.2.1"
+version = "1.2.2"
 dependencies = [
  "agent-dump-core",
  "caseless",

{agent_dump-1.2.1 → agent_dump-1.2.2}/Cargo.toml

@@ -46,7 +46,7 @@ nix = { version = "0.31", default-features = false, features = ["fs", "user"] }
 
 [package]
 name = "agent-dump"
-version = "1.2.1"
+version = "1.2.2"
 edition = "2024"
 rust-version = "1.90"
 publish = false

{agent_dump-1.2.1 → agent_dump-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-dump
-Version: 1.2.1
+Version: 1.2.2
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust

{agent_dump-1.2.1 → agent_dump-1.2.2}/crates/agent-dump-core/src/query/context.rs

@@ -45,17 +45,41 @@ pub fn locate(
     query: &Query,
 ) -> crate::Result<Vec<Location>> {
     let revision = revision(data)?;
+    Ok(evidence(data, query)
+        .into_iter()
+        .map(|(index, snippet)| {
+            let position = index + 1;
+            Location {
+                position,
+                locator: format!("{revision}:{position}"),
+                role: data.messages[index].role.clone(),
+                snippet,
+            }
+        })
+        .collect())
+}
+
+pub fn hits(data: &SessionData, query: &Query) -> Vec<usize> {
+    evidence(data, query)
+        .into_iter()
+        .map(|(index, _)| index)
+        .collect()
+}
+
+fn evidence(data: &SessionData, query: &Query) -> Vec<(usize, String)> {
     let text = TextQuery::new(
         query.keyword.as_deref().unwrap_or(""),
         crate::query::text::Mode::Terms,
     );
+    if text.literals.is_empty() {
+        return Vec::new();
+    }
     let terms: Vec<_> = text
         .literals
         .iter()
         .map(|term| TextQuery::new(term, crate::query::text::Mode::Phrase))
         .collect();
-    Ok(data
-        .messages
+    data.messages
         .iter()
         .enumerate()
         .filter_map(|(index, message)| {
@@ -69,15 +93,9 @@ pub fn locate(
             let content = searchable_message(message);
             let evidence =
                 terms.iter().find_map(|term| term.find(&[&content]))?;
-            let position = index + 1;
-            Some(Location {
-                position,
-                locator: format!("{revision}:{position}"),
-                role: message.role.clone(),
-                snippet: evidence.snippet,
-            })
+            Some((index, evidence.snippet))
         })
-        .collect())
+        .collect()
 }
 
 pub fn window(

{agent_dump-1.2.1 → agent_dump-1.2.2}/src/terminal/reader.rs

@@ -18,6 +18,7 @@ use ratatui::{
     text::Line,
     widgets::{Block, Borders, List, ListItem, ListState, Paragraph, Wrap},
 };
+use std::time::Duration;
 use unicode_width::UnicodeWidthChar;
 
 pub enum Action {
@@ -62,6 +63,7 @@ pub struct Reader {
     query: Query,
     scope: String,
     state: State,
+    pending: Option<Event>,
     zh: bool,
     pub status: String,
 }
@@ -81,6 +83,7 @@ impl Reader {
             state: State::with_query(query, 0),
             query: query.clone(),
             scope,
+            pending: None,
             zh,
             status: t("READER_READY", zh, &[]),
         })
@@ -170,7 +173,7 @@ impl Reader {
                     ..Query::default()
                 };
                 self.state.context = None;
-                self.state.search(data)?;
+                self.state.search(data);
                 self.state.expanded = true;
                 self.state.body_focus = true;
                 self.status = t(
@@ -184,13 +187,40 @@ impl Reader {
         Ok(None)
     }
 
+    fn navigate(&mut self, key: KeyCode) -> crate::Result<usize> {
+        let mut selected = step(self.state.selected, key, self.rows.len());
+        // Fold keys queued during a slow load so only the final row loads.
+        while event::poll(Duration::ZERO)? {
+            match event::read()? {
+                Event::Key(key) if key.kind == KeyEventKind::Release => {}
+                Event::Key(key)
+                    if matches!(
+                        key.code,
+                        KeyCode::Up
+                            | KeyCode::Down
+                            | KeyCode::Home
+                            | KeyCode::End
+                            | KeyCode::Char('k' | 'j')
+                    ) =>
+                {
+                    selected = step(selected, key.code, self.rows.len());
+                }
+                event => {
+                    self.pending = Some(event);
+                    break;
+                }
+            }
+        }
+        Ok(selected)
+    }
+
     pub fn next(
         &mut self,
         data: Option<&SessionData>,
         error: Option<&str>,
     ) -> crate::Result<Action> {
         let previous_hit = self.state.hit;
-        self.state.search(data)?;
+        self.state.search(data);
         self.state.hit =
             previous_hit.min(self.state.hits.len().saturating_sub(1));
         let mut dirty = true;
@@ -221,7 +251,7 @@ impl Reader {
                 .offset
                 .min(self.state.lines.len().saturating_sub(1));
             self.render()?;
-            match event::read()? {
+            match self.pending.take().map_or_else(event::read, Ok)? {
                 Event::Resize(_, _) => {
                     dirty = true;
                 }
@@ -391,17 +421,7 @@ impl Reader {
                         | KeyCode::Down
                         | KeyCode::Home
                         | KeyCode::End => {
-                            let selected = match key.code {
-                                KeyCode::Up | KeyCode::Char('k') => {
-                                    self.state.selected.saturating_sub(1)
-                                }
-                                KeyCode::Home => 0,
-                                KeyCode::End => {
-                                    self.rows.len().saturating_sub(1)
-                                }
-                                _ => (self.state.selected + 1)
-                                    .min(self.rows.len().saturating_sub(1)),
-                            };
+                            let selected = self.navigate(key.code)?;
                             if selected != self.state.selected {
                                 let marked =
                                     std::mem::take(&mut self.state.marked);
@@ -421,6 +441,15 @@ impl Reader {
     }
 }
 
+fn step(selected: usize, key: KeyCode, rows: usize) -> usize {
+    match key {
+        KeyCode::Up | KeyCode::Char('k') => selected.saturating_sub(1),
+        KeyCode::Home => 0,
+        KeyCode::End => rows.saturating_sub(1),
+        _ => (selected + 1).min(rows.saturating_sub(1)),
+    }
+}
+
 impl State {
     fn export(&self, data: &SessionData, zh: bool) -> crate::Result<Action> {
         let locator = if self.context.is_some() {
@@ -486,17 +515,12 @@ impl State {
             self.hits.get(self.hit).map(|&hit| self.hit_offset(hit));
     }
 
-    fn search(&mut self, data: Option<&SessionData>) -> crate::Result<()> {
+    fn search(&mut self, data: Option<&SessionData>) {
         self.hits = data
-            .map(|data| context::locate(data, &self.query))
-            .transpose()?
-            .unwrap_or_default()
-            .into_iter()
-            .map(|location| location.position - 1)
-            .collect();
+            .map(|data| context::hits(data, &self.query))
+            .unwrap_or_default();
         self.hit = 0;
         self.active_hit_line = None;
-        Ok(())
     }
 
     fn reflow(
@@ -860,7 +884,7 @@ mod tests {
             ..Query::default()
         };
         let mut state = State::with_query(&query, 0);
-        state.search(Some(&data)).unwrap();
+        state.search(Some(&data));
         assert_eq!(state.hits, [2, 4]);
         state.context = Some(0);
         state.reflow(Some(&data), None, 60, false);
@@ -974,7 +998,7 @@ mod tests {
                 },
                 ..State::default()
             };
-            state.search(Some(&data)).unwrap();
+            state.search(Some(&data));
             assert_eq!(state.hits, vec![0]);
             state.reflow(Some(&data), None, 65, false);
             state.offset = state.hit_offset(0);
@@ -1061,7 +1085,7 @@ mod tests {
                 .any(|line| line.contains("hidden-needle"))
         );
         state.query.keyword = Some("hidden-needle".into());
-        state.search(Some(&data)).unwrap();
+        state.search(Some(&data));
         assert_eq!(state.hits, vec![1]);
         state.reflow(Some(&data), None, 60, true);
         assert_eq!(state.active_hit_line, Some(state.starts[1]));
@@ -1133,7 +1157,7 @@ mod tests {
         state.reflow(Some(&data), None, 18, true);
         assert_eq!(state.active_hit_line, Some(state.starts[1]));
         state.query.keyword = None;
-        state.search(Some(&data)).unwrap();
+        state.search(Some(&data));
         assert_eq!(state.active_hit_line, None);
         state.reflow(Some(&data), None, 18, true);
         assert_eq!(state.active_hit_line, None);