sdjifodjio

Author: brandonskiser

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

@@ -9,7 +9,6 @@ mod message;
 mod parse;
 mod parser;
 mod prompt;
-mod shared_writer;
 #[cfg(unix)]
 mod skim_integration;
 mod token_counter;
@@ -55,7 +54,6 @@ use crossterm::style::{
     Color,
     Stylize,
 };
-use crossterm::terminal::ClearType;
 use crossterm::{
     cursor,
     execute,
@@ -82,8 +80,9 @@ use rand::distr::{
     Alphanumeric,
     SampleString,
 };
-use shared_writer::SharedWriter;
 use tokio::signal::ctrl_c;
+use util::shared_writer::SharedWriter;
+use util::ui::draw_box;
 
 use crate::fig_api_client::StreamingClient;
 use crate::fig_api_client::clients::SendMessageOutput;
@@ -676,100 +675,6 @@ impl ChatContext {
         Ok(content.trim().to_string())
     }
 
-    fn draw_tip_box(&mut self, text: &str) -> Result<()> {
-        let box_width = GREETING_BREAK_POINT;
-        let inner_width = box_width - 4; // account for │ and padding
-
-        // wrap the single line into multiple lines respecting inner width
-        // Manually wrap the text by splitting at word boundaries
-        let mut wrapped_lines = Vec::new();
-        let mut line = String::new();
-
-        for word in text.split_whitespace() {
-            if line.len() + word.len() < inner_width {
-                if !line.is_empty() {
-                    line.push(' ');
-                }
-                line.push_str(word);
-            } else {
-                // Here we need to account for words that are too long as well
-                if word.len() >= inner_width {
-                    let mut start = 0_usize;
-                    for (i, _) in word.chars().enumerate() {
-                        if i - start >= inner_width {
-                            wrapped_lines.push(word[start..i].to_string());
-                            start = i;
-                        }
-                    }
-                    wrapped_lines.push(word[start..].to_string());
-                    line = String::new();
-                } else {
-                    wrapped_lines.push(line);
-                    line = word.to_string();
-                }
-            }
-        }
-
-        if !line.is_empty() {
-            wrapped_lines.push(line);
-        }
-
-        // ───── Did you know? ─────
-        let label = " Did you know? ";
-        let side_len = (box_width.saturating_sub(label.len())) / 2;
-        let top_border = format!(
-            "╭{}{}{}╮",
-            "─".repeat(side_len - 1),
-            label,
-            "─".repeat(box_width - side_len - label.len() - 1)
-        );
-
-        // Build output
-        execute!(
-            self.output,
-            terminal::Clear(ClearType::CurrentLine),
-            cursor::MoveToColumn(0),
-            style::Print(format!("{top_border}\n")),
-        )?;
-
-        // Top vertical padding
-        execute!(
-            self.output,
-            style::Print(format!("│{: <width$}│\n", "", width = box_width - 2))
-        )?;
-
-        // Centered wrapped content
-        for line in wrapped_lines {
-            let visible_line_len = strip_ansi_escapes::strip(&line).len();
-            let left_pad = box_width.saturating_sub(4).saturating_sub(visible_line_len) / 2;
-
-            let content = format!(
-                "│ {: <pad$}{}{: <rem$} │",
-                "",
-                line,
-                "",
-                pad = left_pad,
-                rem = box_width
-                    .saturating_sub(4)
-                    .saturating_sub(left_pad)
-                    .saturating_sub(visible_line_len),
-            );
-            execute!(self.output, style::Print(format!("{}\n", content)))?;
-        }
-
-        // Bottom vertical padding
-        execute!(
-            self.output,
-            style::Print(format!("│{: <width$}│\n", "", width = box_width - 2))
-        )?;
-
-        // Bottom rounded corner line: ╰────────────╯
-        let bottom = format!("╰{}╯", "─".repeat(box_width - 2));
-        execute!(self.output, style::Print(format!("{}\n", bottom)))?;
-
-        Ok(())
-    }
-
     async fn try_chat(&mut self) -> Result<()> {
         let is_small_screen = self.terminal_width() < GREETING_BREAK_POINT;
         if self.interactive && self.settings.get_bool_or("chat.greeting.enabled", true) {
@@ -796,7 +701,13 @@ impl ChatContext {
                     style::Print("\n")
                 )?;
             } else {
-                self.draw_tip_box(tip)?;
+                draw_box(
+                    self.output.clone(),
+                    "Did you know?",
+                    tip,
+                    GREETING_BREAK_POINT,
+                    Color::DarkGrey,
+                )?;
             }
 
             execute!(
@@ -3469,9 +3380,6 @@ fn create_stream(model_responses: serde_json::Value) -> StreamingClient {
 
 #[cfg(test)]
 mod tests {
-    use bstr::ByteSlice;
-    use shared_writer::TestWriterWithSink;
-
     use super::*;
 
     #[tokio::test]
@@ -3854,86 +3762,4 @@ mod tests {
             assert_eq!(processed, expected.trim().to_string(), "Failed for input: {}", input);
         }
     }
-
-    #[tokio::test]
-    async fn test_draw_tip_box() {
-        let ctx = Context::builder().with_test_home().await.unwrap().build_fake();
-        let buf = Arc::new(std::sync::Mutex::new(Vec::<u8>::new()));
-        let test_writer = TestWriterWithSink { sink: buf.clone() };
-        let output = SharedWriter::new(test_writer.clone());
-        let tool_manager = ToolManager::default();
-        let tool_config = serde_json::from_str::<HashMap<String, ToolSpec>>(include_str!("tools/tool_index.json"))
-            .expect("Tools failed to load");
-        let test_client = create_stream(serde_json::json!([]));
-
-        let mut chat_context = ChatContext::new(
-            Arc::clone(&ctx),
-            "fake_conv_id",
-            Settings::new(),
-            State::new(),
-            output,
-            None,
-            InputSource::new_mock(vec![]),
-            true,
-            test_client,
-            || Some(80),
-            tool_manager,
-            None,
-            tool_config,
-            ToolPermissions::new(0),
-        )
-        .await
-        .unwrap();
-
-        // Test with a short tip
-        let short_tip = "This is a short tip";
-        chat_context.draw_tip_box(short_tip).expect("Failed to draw tip box");
-
-        // Test with a longer tip that should wrap
-        let long_tip = "This is a much longer tip that should wrap to multiple lines because it exceeds the inner width of the tip box which is calculated based on the GREETING_BREAK_POINT constant";
-        chat_context.draw_tip_box(long_tip).expect("Failed to draw tip box");
-
-        // Test with a long tip with two long words that should wrap
-        let long_tip_with_one_long_word = {
-            let mut s = "a".repeat(200);
-            s.push(' ');
-            s.push_str(&"a".repeat(200));
-            s
-        };
-        chat_context
-            .draw_tip_box(long_tip_with_one_long_word.as_str())
-            .expect("Failed to draw tip box");
-
-        // Test with a long tip with two long words that should wrap
-        let long_tip_with_two_long_words = "a".repeat(200);
-        chat_context
-            .draw_tip_box(long_tip_with_two_long_words.as_str())
-            .expect("Failed to draw tip box");
-
-        // Get the output and verify it contains expected formatting elements
-        let content = test_writer.get_content();
-        let output_str = content.to_str_lossy();
-
-        // Check for box drawing characters
-        assert!(output_str.contains("╭"), "Output should contain top-left corner");
-        assert!(output_str.contains("╮"), "Output should contain top-right corner");
-        assert!(output_str.contains("│"), "Output should contain vertical lines");
-        assert!(output_str.contains("╰"), "Output should contain bottom-left corner");
-        assert!(output_str.contains("╯"), "Output should contain bottom-right corner");
-
-        // Check for the label
-        assert!(
-            output_str.contains("Did you know?"),
-            "Output should contain the 'Did you know?' label"
-        );
-
-        // Check that both tips are present
-        assert!(output_str.contains(short_tip), "Output should contain the short tip");
-
-        // For the long tip, we check for substrings since it will be wrapped
-        let long_tip_parts: Vec<&str> = long_tip.split_whitespace().collect();
-        for part in long_tip_parts.iter().take(3) {
-            assert!(output_str.contains(part), "Output should contain parts of the long tip");
-        }
-    }
 }

crates/chat-cli/src/cli/chat/util/ui.rs

@@ -120,14 +120,10 @@ mod tests {
 
     use bstr::ByteSlice;
     use crossterm::style::Color;
-    use shared_writer::TestWriterWithSink;
-
-    use crate::GREETING_BREAK_POINT;
-    use crate::chat::util::shared_writer::{
-        self,
-        SharedWriter,
-    };
-    use crate::util::ui::draw_box;
+
+    use super::*;
+    use crate::cli::chat::GREETING_BREAK_POINT;
+    use crate::cli::chat::util::shared_writer::TestWriterWithSink;
 
     #[tokio::test]
     async fn test_draw_tip_box() {

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

@@ -1,5 +1,4 @@
 pub mod error;
-pub mod keys;
 pub mod settings;
 pub mod sqlite;
 pub mod state;