feat: Add syntax highlighting for code blocks in conversation messages and introduce agent indexing with configuration updates for tool execution.

Author: Ammar-Alnagar

.agent_index.json

@@ -1,6 +1,6 @@
 [package]
 name = "rust_tui_coder"
-version = "0.2.4"
+version = "1.0.0"
 edition = "2021"
 description = "AI-powered terminal coding assistant with interactive TUI, supporting multiple LLMs and comprehensive development tools"
 license = "MIT OR Apache-2.0"
@@ -28,10 +28,14 @@ path = "src/main.rs"
 ratatui = { version = "0.26.0", features = ["all-widgets"] }
 crossterm = "0.27.0"
 tokio = { version = "1.35.1", features = ["full"] }
-reqwest = { version = "0.11.23", features = ["json", "stream"] }
+reqwest = { version = "0.11.23", features = ["json", "stream", "blocking"] }
+html2text = "0.11"
 serde = { version = "1.0.195", features = ["derive"] }
 serde_json = "1.0.111"
 toml = "0.8.8"
 futures-util = "0.3.30"
 chrono = "0.4"
 regex = "1.12.2"
+urlencoding = "2.1.3"
+syntect = { version = "5.3.0", features = ["default-fancy"] }
+once_cell = "1.21.3"

Cargo.lock

@@ -5,6 +5,20 @@ use std::io;
 #[derive(Deserialize, Debug, Clone)]
 pub struct Config {
     pub llm: LlmConfig,
+    #[serde(default)]
+    pub web: WebConfig,
+}
+
+#[derive(Deserialize, Debug, Clone, Default)]
+pub struct WebConfig {
+    #[serde(default = "default_provider")]
+    pub provider: String,
+    #[allow(dead_code)]
+    pub api_key: Option<String>,
+}
+
+fn default_provider() -> String {
+    "duckduckgo".to_string()
 }
 
 #[derive(Deserialize, Debug, Clone)]

Cargo.toml

@@ -279,7 +279,7 @@ async fn run_app<B: Backend>(
                                     // Run the agent with access to the shared app state
                                     // The agent will handle its own locking/unlocking to allow UI updates
                                     let result = agent_clone
-                                        .run(&config_clone.llm, user_input_clone, app_clone)
+                                        .run(&config_clone, user_input_clone, app_clone)
                                         .await;
                                     result
                                 }));

src/agent.rs

@@ -1,11 +1,93 @@
 use crate::app::App;
+use once_cell::sync::Lazy;
 use ratatui::{
     layout::{Constraint, Direction, Layout},
     style::{Color, Style, Stylize},
     text::{Line, Span},
     widgets::{Block, Borders, Paragraph, Scrollbar, ScrollbarOrientation, ScrollbarState},
     Frame,
 };
+use syntect::easy::HighlightLines;
+use syntect::highlighting::{Style as SyntectStyle, ThemeSet};
+use syntect::parsing::SyntaxSet;
+
+// Global syntax highlighting resources
+static SYNTAX_SET: Lazy<SyntaxSet> = Lazy::new(SyntaxSet::load_defaults_newlines);
+static THEME_SET: Lazy<ThemeSet> = Lazy::new(ThemeSet::load_defaults);
+
+// Convert syntect color to ratatui color
+fn syntect_to_ratatui_color(color: syntect::highlighting::Color) -> Color {
+    Color::Rgb(color.r, color.g, color.b)
+}
+
+// Parse a message and extract code blocks with syntax highlighting
+fn parse_message_with_highlighting(text: &str, max_width: usize) -> Vec<Line<'static>> {
+    let mut lines = Vec::new();
+    let mut in_code_block = false;
+    let mut code_buffer: Vec<String> = Vec::new();
+    let mut code_language = String::new();
+
+    for line in text.lines() {
+        if line.starts_with("```") {
+            if in_code_block {
+                // End of code block - highlight and flush
+                let theme = &THEME_SET.themes["base16-ocean.dark"];
+                let syntax = SYNTAX_SET
+                    .find_syntax_by_token(&code_language)
+                    .unwrap_or_else(|| SYNTAX_SET.find_syntax_plain_text());
+
+                let mut highlighter = HighlightLines::new(syntax, theme);
+
+                for code_line in &code_buffer {
+                    let ranges: Vec<(SyntectStyle, &str)> = highlighter
+                        .highlight_line(code_line, &SYNTAX_SET)
+                        .unwrap_or_default();
+
+                    let mut spans = Vec::new();
+                    for (style, text) in ranges {
+                        spans.push(Span::styled(
+                            text.to_string(),
+                            Style::default().fg(syntect_to_ratatui_color(style.foreground)),
+                        ));
+                    }
+                    lines.push(Line::from(spans));
+                }
+
+                code_buffer.clear();
+                in_code_block = false;
+            } else {
+                // Start of code block
+                in_code_block = true;
+                code_language = line.trim_start_matches("```").trim().to_string();
+                if code_language.is_empty() {
+                    code_language = "txt".to_string();
+                }
+            }
+        } else if in_code_block {
+            code_buffer.push(line.to_string());
+        } else {
+            // Regular text - wrap it
+            for wrapped_line in wrap_text(line, max_width) {
+                lines.push(Line::from(vec![Span::styled(
+                    wrapped_line,
+                    Style::default().fg(Color::White),
+                )]));
+            }
+        }
+    }
+
+    // Handle unclosed code block
+    if in_code_block && !code_buffer.is_empty() {
+        for code_line in &code_buffer {
+            lines.push(Line::from(vec![Span::styled(
+                code_line.clone(),
+                Style::default().fg(Color::Gray),
+            )]));
+        }
+    }
+
+    lines
+}
 
 // Enhanced helper function to wrap text to fit within a given width
 fn wrap_text(text: &str, max_width: usize) -> Vec<String> {
@@ -116,36 +198,30 @@ pub fn ui(f: &mut Frame, app: &App) {
     // Add all conversation messages
     for message in &app.conversation {
         if let Some(content) = message.strip_prefix("User: ") {
-            let wrapped_content = wrap_text(content, max_width.saturating_sub(6)); // Account for "User: " prefix
-
-            for (i, line) in wrapped_content.iter().enumerate() {
-                if i == 0 {
-                    conversation_lines.push(Line::from(vec![
-                        Span::styled("User: ", Style::default().fg(Color::Blue).bold()),
-                        Span::styled(line.clone(), Style::default().fg(Color::White)),
-                    ]));
-                } else {
-                    conversation_lines.push(Line::from(vec![
-                        Span::styled("      ", Style::default().fg(Color::Blue)), // Indent continuation
-                        Span::styled(line.clone(), Style::default().fg(Color::White)),
-                    ]));
-                }
+            // Add user prefix
+            conversation_lines.push(Line::from(vec![Span::styled(
+                "User: ",
+                Style::default().fg(Color::Blue).bold(),
+            )]));
+
+            // Parse and highlight the content
+            let content_lines =
+                parse_message_with_highlighting(content, max_width.saturating_sub(6));
+            for line in content_lines {
+                conversation_lines.push(line);
             }
         } else if let Some(content) = message.strip_prefix("Agent: ") {
-            let wrapped_content = wrap_text(content, max_width.saturating_sub(7)); // Account for "Agent: " prefix
-
-            for (i, line) in wrapped_content.iter().enumerate() {
-                if i == 0 {
-                    conversation_lines.push(Line::from(vec![
-                        Span::styled("Agent: ", Style::default().fg(Color::Green).bold()),
-                        Span::styled(line.clone(), Style::default().fg(Color::White)),
-                    ]));
-                } else {
-                    conversation_lines.push(Line::from(vec![
-                        Span::styled("       ", Style::default().fg(Color::Green)), // Indent continuation
-                        Span::styled(line.clone(), Style::default().fg(Color::White)),
-                    ]));
-                }
+            // Add agent prefix
+            conversation_lines.push(Line::from(vec![Span::styled(
+                "Agent: ",
+                Style::default().fg(Color::Green).bold(),
+            )]));
+
+            // Parse and highlight the content
+            let content_lines =
+                parse_message_with_highlighting(content, max_width.saturating_sub(7));
+            for line in content_lines {
+                conversation_lines.push(line);
             }
         } else {
             let wrapped_message = wrap_text(message, max_width);

src/config.rs

@@ -23,7 +23,7 @@ fn test_tool_read_file() {
         path: test_file.to_string(),
     };
 
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     assert!(result.is_ok());
     assert!(result.unwrap().contains("Test content"));
 
@@ -39,7 +39,7 @@ fn test_tool_write_file() {
         content: "Hello World!".to_string(),
     };
 
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     assert!(result.is_ok());
     assert!(Path::new(test_file).exists());
 
@@ -59,7 +59,7 @@ fn test_tool_append_file() {
         content: "Appended content".to_string(),
     };
 
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     assert!(result.is_ok());
 
     let content = fs::read_to_string(test_file).unwrap();
@@ -80,7 +80,7 @@ fn test_tool_search_replace() {
         new_string: "Rust".to_string(),
     };
 
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     assert!(result.is_ok());
 
     let content = fs::read_to_string(test_file).unwrap();
@@ -98,7 +98,7 @@ fn test_tool_delete_file() {
         path: test_file.to_string(),
     };
 
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     assert!(result.is_ok());
     assert!(!Path::new(test_file).exists());
 }
@@ -111,7 +111,7 @@ fn test_tool_create_directory() {
         path: test_dir.to_string(),
     };
 
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     assert!(result.is_ok());
     assert!(Path::new(test_dir).is_dir());
 
@@ -130,7 +130,7 @@ fn test_tool_list_files() {
         path: test_dir.to_string(),
     };
 
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     assert!(result.is_ok());
     let output = result.unwrap();
     assert!(output.contains("file1.txt"));
@@ -151,7 +151,7 @@ fn test_tool_list_files_recursive() {
         path: test_dir.to_string(),
     };
 
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     assert!(result.is_ok());
     let output = result.unwrap();
     assert!(output.contains("file1.txt"));
@@ -166,7 +166,7 @@ fn test_tool_run_command() {
         command: "echo 'Hello from test'".to_string(),
     };
 
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     assert!(result.is_ok());
     assert!(result.unwrap().contains("Hello from test"));
 }
@@ -178,7 +178,7 @@ fn test_tool_execute_code_python() {
         code: "print('Python test')".to_string(),
     };
 
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     // Python might not be available in all test environments
     if result.is_ok() {
         assert!(result.unwrap().contains("Python test"));
@@ -192,7 +192,7 @@ fn test_tool_execute_code_bash() {
         code: "echo 'Bash test'".to_string(),
     };
 
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     assert!(result.is_ok());
     assert!(result.unwrap().contains("Bash test"));
 }
@@ -202,7 +202,7 @@ fn test_tool_execute_code_bash() {
 #[test]
 fn test_tool_git_status() {
     let tool = Tool::GitStatus;
-    let result = tool.execute();
+    let result = tool.execute(&rust_tui_coder::config::WebConfig::default());
     // Git might not be available or this might not be a git repo
     assert!(result.is_ok());
 }