add a mix output type

Author: evanliu048

crates/chat-cli/src/cli/chat/message.rs

@@ -255,6 +255,7 @@ impl From<InvokeOutput> for ToolUseResultBlock {
             OutputKind::Text(text) => Self::Text(text),
             OutputKind::Json(value) => Self::Json(value),
             OutputKind::Images(_) => Self::Text("See images data supplied".to_string()),
+            OutputKind::Mixed { text, .. } => ToolUseResultBlock::Text(text),
         }
     }
 }

crates/chat-cli/src/cli/chat/mod.rs

@@ -1523,6 +1523,10 @@ impl ChatSession {
                         OutputKind::Images(ref image) => {
                             image_blocks.extend(image.clone());
                         },
+                        OutputKind::Mixed { ref text, ref images } => {
+                            debug!("Output is Mixed: text = {:?}, images = {}", text, images.len());
+                            image_blocks.extend(images.clone());
+                        },
                     }
 
                     debug!("tool result output: {:#?}", result);

crates/chat-cli/src/cli/chat/tools/fs_read.rs

@@ -6,7 +6,6 @@ use crossterm::queue;
 use crossterm::style::{
     self,
     Color,
-    Stylize,
 };
 use eyre::{
     Result,
@@ -38,9 +37,6 @@ use crate::cli::chat::util::images::{
 };
 use crate::os::Os;
 
-const CHECKMARK: &str = "✔";
-const CROSS: &str = "✘";
-
 #[derive(Debug, Clone, Deserialize)]
 pub struct FsRead {
     // For batch operations
@@ -112,7 +108,7 @@ impl FsRead {
                 // Multiple operations - combine results
                 let mut combined_results = Vec::new();
                 let mut all_images = Vec::new();
-
+                let mut has_non_image_ops = false;
                 let mut success_ops = 0usize;
                 let mut failed_ops = 0usize;
 
@@ -128,13 +124,15 @@ impl FsRead {
                                         i + 1,
                                         text
                                     ));
+                                    has_non_image_ops = true;
                                 },
                                 OutputKind::Json(json) => {
                                     combined_results.push(format!(
                                         "=== Operation {} Result (Json) ===\n{}",
                                         i + 1,
                                         serde_json::to_string_pretty(json)?
                                     ));
+                                    has_non_image_ops = true;
                                 },
                                 OutputKind::Images(images) => {
                                     all_images.extend(images.clone());
@@ -144,6 +142,9 @@ impl FsRead {
                                         images.len()
                                     ));
                                 },
+                                // This branch won't be reached because single operation execution never returns a Mixed
+                                // result
+                                OutputKind::Mixed { text: _, images: _ } => {},
                             }
                         },
 
@@ -172,15 +173,23 @@ impl FsRead {
                     true,
                 )?;
 
-                // If we have images, return them as the primary output
-                if !all_images.is_empty() {
+                let combined_text = combined_results.join("\n\n");
+
+                if !all_images.is_empty() && has_non_image_ops {
+                    queue!(updates, style::Print("\nherherherherherh"),)?;
+                    Ok(InvokeOutput {
+                        output: OutputKind::Mixed {
+                            text: combined_text,
+                            images: all_images,
+                        },
+                    })
+                } else if !all_images.is_empty() {
                     Ok(InvokeOutput {
                         output: OutputKind::Images(all_images),
                     })
                 } else {
-                    // Otherwise, return the combined text results
                     Ok(InvokeOutput {
-                        output: OutputKind::Text(combined_results.join("\n\n")),
+                        output: OutputKind::Text(combined_text),
                     })
                 }
             }
@@ -248,7 +257,7 @@ impl FsImage {
     pub async fn invoke(&self, updates: &mut impl Write) -> Result<InvokeOutput> {
         let pre_processed_paths: Vec<String> = self.image_paths.iter().map(|path| pre_process(path)).collect();
         let valid_images = handle_images_from_paths(updates, &pre_processed_paths);
-        super::queue_function_result(&format!("Successfully read image"), updates, false, false)?;
+        super::queue_function_result("Successfully read image", updates, false, false)?;
         Ok(InvokeOutput {
             output: OutputKind::Images(valid_images),
         })

crates/chat-cli/src/cli/chat/tools/mod.rs

@@ -327,6 +327,7 @@ impl InvokeOutput {
             OutputKind::Text(s) => s.as_str(),
             OutputKind::Json(j) => j.as_str().unwrap_or_default(),
             OutputKind::Images(_) => "",
+            OutputKind::Mixed { text, .. } => text.as_str(), // Return the text part
         }
     }
 }
@@ -337,6 +338,7 @@ pub enum OutputKind {
     Text(String),
     Json(serde_json::Value),
     Images(RichImageBlocks),
+    Mixed { text: String, images: RichImageBlocks },
 }
 
 impl Default for OutputKind {

crates/q_cli/src/cli/mod.rs

@@ -608,10 +608,13 @@ fn qchat_path() -> Result<PathBuf> {
 
 #[cfg(target_os = "macos")]
 fn qchat_path() -> Result<PathBuf> {
-    use fig_util::consts::CHAT_BINARY_NAME;
-    use macos_utils::bundle::get_bundle_path_for_executable;
+    Ok(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../target/debug/chat_cli"))
+
+    // use fig_util::consts::CHAT_BINARY_NAME;
+    // use macos_utils::bundle::get_bundle_path_for_executable;
 
-    Ok(get_bundle_path_for_executable(CHAT_BINARY_NAME).unwrap_or(home_local_bin()?.join(CHAT_BINARY_NAME)))
+    // Ok(get_bundle_path_for_executable(CHAT_BINARY_NAME).unwrap_or(home_local_bin()?.
+    // join(CHAT_BINARY_NAME)))
 }
 
 #[cfg(test)]