chore: run cargo +nightly fmt

Author: brandonskiser

crates/q_cli/src/cli/chat/chat_state.rs

@@ -1,4 +1,5 @@
 use std::collections::VecDeque;
+
 use fig_api_client::model::ChatMessage;
 
 /// Character count warning levels for conversation size
@@ -33,12 +34,12 @@ impl SummarizationState {
             show_summary: false,
         }
     }
-    
+
     pub fn with_prompt(prompt: Option<String>) -> Self {
         Self {
             original_history: None,
             custom_prompt: prompt,
             show_summary: false,
         }
     }
-}
+}

crates/q_cli/src/cli/chat/command.rs

@@ -9,17 +9,35 @@ use eyre::Result;
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum Command {
-    Ask { prompt: String },
-    Execute { command: String },
+    Ask {
+        prompt: String,
+    },
+    Execute {
+        command: String,
+    },
     Clear,
     Help,
-    Issue { prompt: Option<String> },
+    Issue {
+        prompt: Option<String>,
+    },
     Quit,
-    Profile { subcommand: ProfileSubcommand },
-    Context { subcommand: ContextSubcommand },
-    PromptEditor { initial_text: Option<String> },
-    Compact { prompt: Option<String>, show_summary: bool, help: bool },
-    Tools { subcommand: Option<ToolsSubcommand> },
+    Profile {
+        subcommand: ProfileSubcommand,
+    },
+    Context {
+        subcommand: ContextSubcommand,
+    },
+    PromptEditor {
+        initial_text: Option<String>,
+    },
+    Compact {
+        prompt: Option<String>,
+        show_summary: bool,
+        help: bool,
+    },
+    Tools {
+        subcommand: Option<ToolsSubcommand>,
+    },
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -229,13 +247,13 @@ impl Command {
                     let mut prompt = None;
                     let mut show_summary = false;
                     let mut help = false;
-                    
+
                     // Check if "help" is the first subcommand
                     if parts.len() > 1 && parts[1].to_lowercase() == "help" {
                         help = true;
                     } else {
                         let mut remaining_parts = Vec::new();
-                        
+
                         // Parse the parts to handle both prompt and flags
                         for part in &parts[1..] {
                             if *part == "--summary" {
@@ -244,7 +262,7 @@ impl Command {
                                 remaining_parts.push(*part);
                             }
                         }
-                        
+
                         // Check if the last word is "--summary" (which would have been captured as part of the prompt)
                         if !remaining_parts.is_empty() {
                             let last_idx = remaining_parts.len() - 1;
@@ -253,14 +271,14 @@ impl Command {
                                 show_summary = true;
                             }
                         }
-                        
+
                         // If we have remaining parts after parsing flags, join them as the prompt
                         if !remaining_parts.is_empty() {
                             prompt = Some(remaining_parts.join(" "));
                         }
                     }
-                    
-                    Self::Compact { 
+
+                    Self::Compact {
                         prompt,
                         show_summary,
                         help,
@@ -573,9 +591,18 @@ mod tests {
         let tests = &[
             ("/compact", compact!(None, false)),
             ("/compact --summary", compact!(None, true)),
-            ("/compact custom prompt", compact!(Some("custom prompt".to_string()), false)),
-            ("/compact --summary custom prompt", compact!(Some("custom prompt".to_string()), true)),
-            ("/compact custom prompt --summary", compact!(Some("custom prompt".to_string()), true)),
+            (
+                "/compact custom prompt",
+                compact!(Some("custom prompt".to_string()), false),
+            ),
+            (
+                "/compact --summary custom prompt",
+                compact!(Some("custom prompt".to_string()), true),
+            ),
+            (
+                "/compact custom prompt --summary",
+                compact!(Some("custom prompt".to_string()), true),
+            ),
             ("/profile list", profile!(ProfileSubcommand::List)),
             (
                 "/profile create new_profile",

crates/q_cli/src/cli/chat/conversation_state.rs

@@ -32,7 +32,10 @@ use tracing::{
     warn,
 };
 
-use super::chat_state::{MAX_CHARS, TokenWarningLevel};
+use super::chat_state::{
+    MAX_CHARS,
+    TokenWarningLevel,
+};
 use super::context::ContextManager;
 use super::tools::{
     QueuedTool,
@@ -124,12 +127,12 @@ impl ConversationState {
     pub fn history_as_vec(&self) -> Vec<ChatMessage> {
         self.history.iter().cloned().collect()
     }
-    
+
     /// Returns the length of the conversation history
     pub fn history_len(&self) -> usize {
         self.history.len()
     }
-    
+
     /// Clears the conversation history and optionally the summary.
     pub fn clear(&mut self, preserve_summary: bool) {
         self.next_message = None;
@@ -415,17 +418,18 @@ impl ConversationState {
     pub async fn context_messages(&self) -> Option<(UserInputMessage, AssistantResponseMessage)> {
         let mut context_content = String::new();
         let mut has_content = false;
-        
+
         // Add summary if available - emphasize its importance more strongly
         if let Some(summary) = &self.latest_summary {
-            context_content.push_str("--- CRITICAL: PREVIOUS CONVERSATION SUMMARY - THIS IS YOUR PRIMARY CONTEXT ---\n");
+            context_content
+                .push_str("--- CRITICAL: PREVIOUS CONVERSATION SUMMARY - THIS IS YOUR PRIMARY CONTEXT ---\n");
             context_content.push_str("This summary contains ALL relevant information from our previous conversation including tool uses, results, code analysis, and file operations. YOU MUST reference this information when answering questions and explicitly acknowledge specific details from the summary when they're relevant to the current question.\n\n");
             context_content.push_str("SUMMARY CONTENT:\n");
             context_content.push_str(summary);
             context_content.push_str("\n--- END SUMMARY - YOU MUST USE THIS INFORMATION IN YOUR RESPONSES ---\n\n");
             has_content = true;
         }
-        
+
         // Add context files if available
         if let Some(context_manager) = &self.context_manager {
             match context_manager.get_context_files(true).await {
@@ -444,7 +448,7 @@ impl ConversationState {
                 },
             }
         }
-        
+
         if has_content {
             let user_msg = UserInputMessage {
                 content: format!(
@@ -474,7 +478,7 @@ impl ConversationState {
     pub fn calculate_char_count(&self) -> usize {
         // Calculate total character count in all messages
         let mut total_chars = 0;
-        
+
         // Count characters in history
         for message in &self.history {
             match message {
@@ -494,7 +498,7 @@ impl ConversationState {
                                                 // Approximate JSON size
                                                 total_chars += 100;
                                             }
-                                        }
+                                        },
                                     }
                                 }
                             }
@@ -508,22 +512,22 @@ impl ConversationState {
                         // Approximation for tool uses
                         total_chars += tool_uses.len() * 200;
                     }
-                }
+                },
             }
         }
-        
+
         // Add summary if it exists (it's also in the context sent to the model)
         if let Some(summary) = &self.latest_summary {
             total_chars += summary.len();
         }
-        
+
         total_chars
     }
 
     /// Get the current token warning level
     pub fn get_token_warning_level(&self) -> TokenWarningLevel {
         let total_chars = self.calculate_char_count();
-        
+
         if total_chars >= MAX_CHARS {
             TokenWarningLevel::Critical
         } else {