fix conversation workflow; add detailed debugging info

Author: alexylon

README.md

@@ -4,7 +4,7 @@
 
 A blazingly fast, interactive AI coding assistant powered by Claude, implemented in pure Rust, that can generate code, edit files, and search the web - all from your terminal.
 
-<div style="text-align: center;"><img src="/assets/sofos_code.png" style="width: 700px;" alt="Ferrocrypt"></div>
+<div align="center"><img src="/assets/sofos_code.png" style="width: 700px;" alt="Ferrocrypt"></div>
 
 ## Features
 
@@ -76,7 +76,7 @@ sofos --prompt "Create a hello world Rust program"
 -p, --prompt <TEXT>     One-shot mode
 --model <MODEL>         Claude model (default: claude-sonnet-4-5)
 --morph-model <MODEL>   Morph model (default: morph-v3-fast)
---max-tokens <N>        Max response tokens (default: 4096)
+--max-tokens <N>        Max response tokens (default: 8192)
 -v, --verbose           Verbose logging
 ```
 

src/api/types.rs

@@ -3,21 +3,42 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Message {
     pub role: String,
-    pub content: String,
+    #[serde(flatten)]
+    pub content: MessageContent,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum MessageContent {
+    Text { content: String },
+    Blocks { content: Vec<MessageContentBlock> },
 }
 
 impl Message {
     pub fn user(content: impl Into<String>) -> Self {
         Self {
             role: "user".to_string(),
-            content: content.into(),
+            content: MessageContent::Text {
+                content: content.into(),
+            },
         }
     }
 
-    pub fn assistant(content: impl Into<String>) -> Self {
+    pub fn assistant_with_blocks(content_blocks: Vec<MessageContentBlock>) -> Self {
         Self {
             role: "assistant".to_string(),
-            content: content.into(),
+            content: MessageContent::Blocks {
+                content: content_blocks,
+            },
+        }
+    }
+
+    pub fn user_with_tool_results(results: Vec<MessageContentBlock>) -> Self {
+        Self {
+            role: "user".to_string(),
+            content: MessageContent::Blocks {
+                content: results,
+            },
         }
     }
 }
@@ -54,7 +75,7 @@ pub struct CreateMessageResponse {
     #[serde(rename = "model")]
     pub _model: String,
     #[serde(rename = "stop_reason")]
-    pub _stop_reason: Option<String>,
+    pub stop_reason: Option<String>,
     #[serde(rename = "usage")]
     pub _usage: Usage,
 }
@@ -72,6 +93,39 @@ pub enum ContentBlock {
     },
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum MessageContentBlock {
+    #[serde(rename = "text")]
+    Text { text: String },
+    #[serde(rename = "tool_use")]
+    ToolUse {
+        id: String,
+        name: String,
+        input: serde_json::Value,
+    },
+    #[serde(rename = "tool_result")]
+    ToolResult {
+        tool_use_id: String,
+        content: String,
+    },
+}
+
+impl MessageContentBlock {
+    pub fn from_content_block(block: &ContentBlock) -> Self {
+        match block {
+            ContentBlock::Text { text } => MessageContentBlock::Text {
+                text: text.clone(),
+            },
+            ContentBlock::ToolUse { id, name, input } => MessageContentBlock::ToolUse {
+                id: id.clone(),
+                name: name.clone(),
+                input: input.clone(),
+            },
+        }
+    }
+}
+
 #[derive(Debug, Deserialize)]
 pub struct Usage {
     #[serde(rename = "input_tokens")]

src/cli.rs

@@ -24,7 +24,7 @@ pub struct Cli {
     #[arg(long, default_value = "morph-v3-fast")]
     pub morph_model: String,
 
-    #[arg(long, default_value = "4096")]
+    #[arg(long, default_value = "8192")]
     pub max_tokens: u32,
 
     #[arg(short, long)]

src/conversation.rs

@@ -1,4 +1,4 @@
-use crate::api::{ContentBlock, Message};
+use crate::api::Message;
 
 /// Manages conversation history for the REPL
 pub struct ConversationHistory {
@@ -71,39 +71,12 @@ Your goal is to help users with coding tasks efficiently and accurately."#,
         self.messages.push(Message::user(content));
     }
 
-    pub fn add_assistant_message(&mut self, content: String) {
-        self.messages.push(Message::assistant(content));
+    pub fn add_assistant_with_blocks(&mut self, blocks: Vec<crate::api::MessageContentBlock>) {
+        self.messages.push(Message::assistant_with_blocks(blocks));
     }
 
-    /// Add assistant content blocks (including tool uses)
-    pub fn add_assistant_content(&mut self, content_blocks: &[ContentBlock]) {
-        let mut content_parts = Vec::new();
-
-        for block in content_blocks {
-            match block {
-                ContentBlock::Text { text } => {
-                    content_parts.push(text.clone());
-                }
-                ContentBlock::ToolUse { name, input, .. } => {
-                    content_parts.push(format!(
-                        "[Used tool: {} with input: {}]",
-                        name,
-                        serde_json::to_string_pretty(input).unwrap_or_default()
-                    ));
-                }
-            }
-        }
-
-        if !content_parts.is_empty() {
-            self.add_assistant_message(content_parts.join("\n\n"));
-        }
-    }
-
-    pub fn add_tool_result(&mut self, tool_name: &str, result: &str) {
-        self.messages.push(Message::user(format!(
-            "[Tool result for {}]\n{}",
-            tool_name, result
-        )));
+    pub fn add_tool_results(&mut self, results: Vec<crate::api::MessageContentBlock>) {
+        self.messages.push(Message::user_with_tool_results(results));
     }
 
     pub fn messages(&self) -> &[Message] {