fixed tool issues

Author: Ammar-Alnagar

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rust_tui_coder"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 description = "AI-powered terminal coding assistant with interactive TUI, supporting multiple LLMs and comprehensive development tools"
 license = "MIT OR Apache-2.0"

src/llm.rs

@@ -255,29 +255,32 @@ pub async fn stream_llm_response(
                 let chunk_str = String::from_utf8_lossy(&bytes);
 
                 // SSE format: "data: {...}\n\n"
-                if let Some(data_line) = chunk_str
-                    .lines()
-                    .find(|line| line.starts_with("data: "))
-                    .and_then(|line| line.strip_prefix("data: "))
-                {
-                    if data_line == "[DONE]" {
-                        Ok("".to_string()) // End of stream
-                    } else {
-                        // Parse the JSON chunk
-                        match serde_json::from_str::<ChatCompletionStreamResponse>(data_line) {
-                            Ok(parsed) => {
-                                if let Some(choice) = parsed.choices.first() {
-                                    Ok(choice.delta.content.clone().unwrap_or_default())
-                                } else {
-                                    Ok("".to_string())
+                // Process ALL data lines in this chunk, not just the first one
+                let mut collected_content = String::new();
+                
+                for line in chunk_str.lines() {
+                    if let Some(data_line) = line.strip_prefix("data: ") {
+                        if data_line == "[DONE]" {
+                            continue; // End of stream marker
+                        } else if !data_line.is_empty() {
+                            // Parse the JSON chunk
+                            match serde_json::from_str::<ChatCompletionStreamResponse>(data_line) {
+                                Ok(parsed) => {
+                                    if let Some(choice) = parsed.choices.first() {
+                                        if let Some(content) = &choice.delta.content {
+                                            collected_content.push_str(content);
+                                        }
+                                    }
+                                }
+                                Err(_) => {
+                                    // Skip unparseable chunks silently
                                 }
                             }
-                            Err(_) => Ok("".to_string()), // Skip unparseable chunks
                         }
                     }
-                } else {
-                    Ok("".to_string())
                 }
+                
+                Ok(collected_content)
             }
             Err(e) => Err(LlmError::RequestFailed(e)),
         }

tmp_rovodev_test_prompt.rs

@@ -0,0 +1,29 @@
+// Test to verify the system prompt looks correct
+fn main() {
+    let system_prompt = r#"You are an AI coding assistant with access to file system tools and development utilities.
+
+## AVAILABLE TOOLS
+
+### Planning and Task Management
+1. **CREATE_PLAN** `<task> <steps>` - Create a structured plan in plan.md breaking down tasks into steps
+2. **UPDATE_PLAN** `<step_number>` - Mark a specific step as completed in plan.md
+3. **CLEAR_PLAN** - Remove plan.md when task is fully completed
+
+### File Operations
+4. **READ_FILE** `<path>` - Read and display file contents with line numbers
+5. **WRITE_FILE** `<path> <content>` - Create or overwrite files (creates parent directories automatically)"#;
+
+    println!("System prompt preview (first 500 chars):");
+    let preview = if system_prompt.len() > 500 {
+        &system_prompt[..500]
+    } else {
+        system_prompt
+    };
+    println!("{}", preview);
+    println!("\n... (truncated)");
+    
+    // Count lines
+    let line_count = system_prompt.lines().count();
+    println!("\nTotal lines in system prompt: {}", line_count);
+    println!("Total characters: {}", system_prompt.len());
+}

tmp_rovodev_test_wrap

@@ -0,0 +1,99 @@
+// Test the wrap_text function
+fn wrap_text(text: &str, max_width: usize) -> Vec<String> {
+    if max_width == 0 {
+        return vec![text.to_string()];
+    }
+
+    let mut lines = Vec::new();
+    let mut current_line = String::new();
+
+    if text.trim().is_empty() {
+        return vec![text.to_string()];
+    }
+
+    for line in text.lines() {
+        if line.trim().is_empty() {
+            if !current_line.is_empty() {
+                lines.push(current_line.clone());
+                current_line.clear();
+            }
+            lines.push(String::new());
+            continue;
+        }
+
+        let words: Vec<&str> = line.split_whitespace().collect();
+
+        for word in words {
+            if word.len() > max_width {
+                if !current_line.is_empty() {
+                    lines.push(current_line.clone());
+                    current_line.clear();
+                }
+                let mut remaining_word = word;
+                while !remaining_word.is_empty() {
+                    let chunk_size = std::cmp::min(max_width, remaining_word.len());
+                    let chunk = &remaining_word[..chunk_size];
+                    lines.push(chunk.to_string());
+                    remaining_word = &remaining_word[chunk_size..];
+                }
+                continue;
+            }
+
+            let space_needed = if current_line.is_empty() {
+                word.len()
+            } else {
+                current_line.len() + 1 + word.len()
+            };
+
+            if space_needed <= max_width {
+                if !current_line.is_empty() {
+                    current_line.push(' ');
+                }
+                current_line.push_str(word);
+            } else {
+                if !current_line.is_empty() {
+                    lines.push(current_line.clone());
+                    current_line.clear();
+                }
+                current_line.push_str(word);
+            }
+        }
+
+        if !current_line.is_empty() {
+            lines.push(current_line.clone());
+            current_line.clear();
+        }
+    }
+
+    if !current_line.is_empty() {
+        lines.push(current_line);
+    }
+
+    if lines.is_empty() {
+        lines.push(text.to_string());
+    }
+
+    lines
+}
+
+fn main() {
+    let test_text = "Here are the tools:\n1. CREATE_PLAN - Create a plan for complex tasks\n2. UPDATE_PLAN - Mark a step as completed in the plan";
+    
+    println!("Original text:");
+    println!("{}", test_text);
+    println!("\nWrapped at 40 chars:");
+    let wrapped = wrap_text(test_text, 40);
+    for (i, line) in wrapped.iter().enumerate() {
+        println!("{}: '{}'", i, line);
+    }
+    
+    // Test garbled-looking text
+    let garbled = "Here the tools1 CREATE - a plan complex";
+    println!("\nGarbled text:");
+    println!("{}", garbled);
+    println!("\nWrapped at 40 chars:");
+    let wrapped2 = wrap_text(garbled, 40);
+    for (i, line) in wrapped2.iter().enumerate() {
+        println!("{}: '{}'", i, line);
+    }
+}