refactor(provider): slim provider stack from ~11k to ~4k lines

.gitignore

@@ -12,3 +12,4 @@
 
 docs/
 vendor/
+.worktrees/

crewforge-rs/Cargo.toml

@@ -34,6 +34,9 @@ tui-textarea = { version = "0.7", features = ["crossterm"] }
 unicode-width = "0.2"
 uuid = { version = "1", features = ["v4"] }
 urlencoding = "2"
+glob = "0.3"
+walkdir = "2"
+which = "7"
 
 [dev-dependencies]
 assert_cmd = "2"

crewforge-rs/src/agent/dispatcher.rs

@@ -1,5 +1,5 @@
-use crate::provider::traits::{ChatMessage, ChatResponse, ConversationMessage, ToolResultMessage};
 use super::Tool;
+use crate::provider::traits::{ChatMessage, ChatResponse, ConversationMessage, ToolResultMessage};
 use serde_json::Value;
 use std::fmt::Write;
 
@@ -12,9 +12,8 @@ pub struct ParsedToolCall {
 
 #[derive(Debug, Clone)]
 pub struct ToolExecutionResult {
+    pub tool_result: super::ToolResult,
     pub name: String,
-    pub output: String,
-    pub success: bool,
     pub tool_call_id: Option<String>,
 }
 
@@ -95,11 +94,20 @@ impl ToolDispatcher for XmlToolDispatcher {
     fn format_results(&self, results: &[ToolExecutionResult]) -> ConversationMessage {
         let mut content = String::new();
         for result in results {
-            let status = if result.success { "ok" } else { "error" };
+            let status = if result.tool_result.success {
+                "ok"
+            } else {
+                "error"
+            };
+            let output = if let Some(ref err) = result.tool_result.error {
+                err.as_str()
+            } else {
+                &result.tool_result.output
+            };
             let _ = writeln!(
                 content,
                 "<tool_result name=\"{}\" status=\"{}\">\n{}\n</tool_result>",
-                result.name, status, result.output
+                result.name, status, output
             );
         }
         ConversationMessage::Chat(ChatMessage::user(format!("[Tool results]\n{content}")))
@@ -162,12 +170,19 @@ impl ToolDispatcher for NativeToolDispatcher {
     fn format_results(&self, results: &[ToolExecutionResult]) -> ConversationMessage {
         let messages: Vec<ToolResultMessage> = results
             .iter()
-            .map(|result| ToolResultMessage {
-                tool_call_id: result
-                    .tool_call_id
-                    .clone()
-                    .unwrap_or_else(|| "unknown".to_string()),
-                content: result.output.clone(),
+            .map(|result| {
+                let content = if let Some(ref err) = result.tool_result.error {
+                    format!("{}\n{}", result.tool_result.output, err)
+                } else {
+                    result.tool_result.output.clone()
+                };
+                ToolResultMessage {
+                    tool_call_id: result
+                        .tool_call_id
+                        .clone()
+                        .unwrap_or_else(|| "unknown".to_string()),
+                    content,
+                }
             })
             .collect();
         ConversationMessage::ToolResults(messages)
@@ -222,9 +237,12 @@ mod tests {
         assert_eq!(calls[0].tool_call_id.as_deref(), Some("tc1"));
 
         let msg = dispatcher.format_results(&[ToolExecutionResult {
+            tool_result: crate::agent::ToolResult {
+                success: true,
+                output: "hello".into(),
+                error: None,
+            },
             name: "file_read".into(),
-            output: "hello".into(),
-            success: true,
             tool_call_id: Some("tc1".into()),
         }]);
         match msg {
@@ -240,9 +258,12 @@ mod tests {
     fn xml_format_results_contains_tool_result_tags() {
         let dispatcher = XmlToolDispatcher;
         let msg = dispatcher.format_results(&[ToolExecutionResult {
+            tool_result: crate::agent::ToolResult {
+                success: true,
+                output: "ok".into(),
+                error: None,
+            },
             name: "shell".into(),
-            output: "ok".into(),
-            success: true,
             tool_call_id: None,
         }]);
         let rendered = match msg {
@@ -257,9 +278,12 @@ mod tests {
     fn native_format_results_keeps_tool_call_id() {
         let dispatcher = NativeToolDispatcher;
         let msg = dispatcher.format_results(&[ToolExecutionResult {
+            tool_result: crate::agent::ToolResult {
+                success: true,
+                output: "ok".into(),
+                error: None,
+            },
             name: "shell".into(),
-            output: "ok".into(),
-            success: true,
             tool_call_id: Some("tc-1".into()),
         }]);
 
@@ -341,9 +365,7 @@ mod tests {
     #[test]
     fn xml_dispatcher_skips_empty_name() {
         let response = ChatResponse {
-            text: Some(
-                "<tool_call>{\"name\":\"\",\"arguments\":{}}</tool_call>text after".into(),
-            ),
+            text: Some("<tool_call>{\"name\":\"\",\"arguments\":{}}</tool_call>text after".into()),
             tool_calls: vec![],
             usage: None,
             reasoning_content: None,

crewforge-rs/src/agent/history.rs

@@ -1,6 +1,4 @@
-use crate::provider::traits::{
-    ChatMessage, ConversationMessage, Provider, ToolResultMessage,
-};
+use crate::provider::traits::{ChatMessage, ConversationMessage, Provider};
 use anyhow::Result;
 use std::fmt::Write;
 
@@ -110,7 +108,9 @@ fn build_compaction_transcript(messages: &[ConversationMessage]) -> String {
                 let role = chat.role.to_uppercase();
                 let _ = writeln!(transcript, "{role}: {}", chat.content.trim());
             }
-            ConversationMessage::AssistantToolCalls { text, tool_calls, .. } => {
+            ConversationMessage::AssistantToolCalls {
+                text, tool_calls, ..
+            } => {
                 let text_str = text.as_deref().unwrap_or("").trim();
                 let _ = writeln!(transcript, "ASSISTANT: {text_str}");
                 for tc in tool_calls {
@@ -258,12 +258,10 @@ mod tests {
 
     #[test]
     fn to_provider_messages_native_tool_results() {
-        let history = vec![ConversationMessage::ToolResults(vec![
-            ToolResultMessage {
-                tool_call_id: "tc1".into(),
-                content: "output".into(),
-            },
-        ])];
+        let history = vec![ConversationMessage::ToolResults(vec![ToolResultMessage {
+            tool_call_id: "tc1".into(),
+            content: "output".into(),
+        }])];
         let msgs = to_provider_messages_native(&history);
         assert_eq!(msgs.len(), 1);
         assert_eq!(msgs[0].role, "tool");
@@ -291,12 +289,10 @@ mod tests {
 
     #[test]
     fn to_provider_messages_xml_tool_results_as_user() {
-        let history = vec![ConversationMessage::ToolResults(vec![
-            ToolResultMessage {
-                tool_call_id: "tc1".into(),
-                content: "result_data".into(),
-            },
-        ])];
+        let history = vec![ConversationMessage::ToolResults(vec![ToolResultMessage {
+            tool_call_id: "tc1".into(),
+            content: "result_data".into(),
+        }])];
         let msgs = to_provider_messages_xml(&history);
         assert_eq!(msgs.len(), 1);
         assert_eq!(msgs[0].role, "user");
@@ -318,9 +314,7 @@ mod tests {
         // system + 3 most recent non-system
         assert_eq!(history.len(), 4);
         // system is still first
-        assert!(
-            matches!(&history[0], ConversationMessage::Chat(m) if m.role == "system")
-        );
+        assert!(matches!(&history[0], ConversationMessage::Chat(m) if m.role == "system"));
         // most recent messages are preserved
         assert!(
             matches!(&history[history.len()-1], ConversationMessage::Chat(m) if m.content == "msg3")