fix: Rework history and message view

Author: kosz78

Cargo.lock

@@ -52,7 +52,7 @@ ratatui = "0.29.0"
 color-eyre = "0.6.3"
 tui-textarea = "0.7.0"
 tui-tree-widget = "0.23.0"
-tui-widget-list = "0.13.2"
+tui-widget-list = { git = "https://github.com/preiter93/tui-widget-list.git", branch = "main" }
 textwrap = "0.16.0"
 throbber-widgets-tui = "0.8.0"
 tui-popup = "0.6.0"

Cargo.toml

@@ -346,7 +346,7 @@ impl Agent {
 
         match stream.next().await {
             Some(result) => {
-                tracing::trace!("Received response from model: {:?}", result);
+                //tracing::trace!("Received response from model: {:?}", result);
 
                 match result {
                     Ok(AssistantContent::Text(text)) => {

src/agent/mod.rs

@@ -368,7 +368,7 @@ impl App<'_> {
                 if focus == 0 {
                     focus = FocusedComponent::Terminal as u8;
                 } else {
-                    focus = focus - 1;
+                    focus -= 1;
                 }
                 self.ui.focus = focus.into();
             }
@@ -379,10 +379,10 @@ impl App<'_> {
                 if key_event.modifiers == KeyModifiers::ALT =>
             {
                 match key_event.code {
-                    KeyCode::Char('1') => self.ui.focus = FocusedComponent::Input.into(),
-                    KeyCode::Char('2') => self.ui.focus = FocusedComponent::History.into(),
-                    KeyCode::Char('3') => self.ui.focus = FocusedComponent::Tree.into(),
-                    KeyCode::Char('4') => self.ui.focus = FocusedComponent::Terminal.into(),
+                    KeyCode::Char('1') => self.ui.focus = FocusedComponent::Input,
+                    KeyCode::Char('2') => self.ui.focus = FocusedComponent::History,
+                    KeyCode::Char('3') => self.ui.focus = FocusedComponent::Tree,
+                    KeyCode::Char('4') => self.ui.focus = FocusedComponent::Terminal,
                     _ => {}
                 };
             }

src/tui/app.rs

@@ -9,3 +9,78 @@ mod widgets;
 pub use app::App;
 pub use theme::Theme;
 pub use widgets::*;
+
+pub(crate) fn split_think_tags(text: &str) -> Vec<(String, bool)> {
+    let mut result = vec![];
+    let mut current_string = String::new();
+    let mut tag_name = String::new();
+    let mut is_tag_content = false;
+    for ch in text.chars() {
+        if ch == '<' {
+            is_tag_content = true;
+            if !tag_name.is_empty()
+                && tag_name != "think"
+                && tag_name != "thinking"
+                && tag_name != "/think"
+                && tag_name != "/thinking"
+            {
+                current_string.push_str(&format!("<{}", tag_name));
+            }
+            tag_name.clear();
+        } else if ch == '>' && is_tag_content {
+            is_tag_content = false;
+            // start think tag
+            if (tag_name == "think" || tag_name == "thinking") && !current_string.is_empty() {
+                result.push((current_string.clone(), false));
+                current_string.clear();
+            }
+            if tag_name == "/think" || tag_name == "/thinking" && !current_string.is_empty() {
+                result.push((current_string.clone(), true));
+                current_string.clear();
+            }
+        } else if is_tag_content {
+            tag_name.push(ch);
+        } else {
+            current_string.push(ch);
+        }
+    }
+    if tag_name != "think"
+        && tag_name != "thinking"
+        && tag_name != "/think"
+        && tag_name != "/thinking"
+    {
+        current_string.push_str(&format!("<{}", tag_name));
+        tag_name.clear();
+    }
+
+    if !current_string.is_empty() {
+        result.push((
+            current_string.clone(),
+            tag_name == "think" || tag_name == "thinking",
+        ));
+    }
+    result
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_split_think_tags() {
+        let text =
+            "test <think>hello <- test </think> world -> test <- test <thinking>foo -> test</thinking> bar <think>baz";
+        let pairs = split_think_tags(text);
+        assert_eq!(
+            pairs,
+            vec![
+                ("test ".to_string(), false),
+                ("hello <- test ".to_string(), true),
+                (" world -> test <- test ".to_string(), false),
+                ("foo -> test".to_string(), true),
+                (" bar ".to_string(), false),
+                ("baz".to_string(), true)
+            ]
+        );
+    }
+}

src/tui/mod.rs

@@ -106,8 +106,8 @@ impl Theme {
             inactive: Color::DarkGray,
             status: Color::DarkGray,
             border: Color::Indexed(236),
-            assistant: Color::from_u32(0x2196F3),
-            user: Color::from_u32(0x4CAF50),
+            assistant: Color::Indexed(75),
+            user: Color::Indexed(113),
         }
     }