fix: /compact validation error: missing tool specs (#224)

* add mcp token in usage

* fix validation e & use cs.tools calculate token

* ci

* revise token cal

* change the ratio

* change the ratio

* ut

Author: evanliu048

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

@@ -600,9 +600,20 @@ impl ConversationState {
             flatten_history(conv_state.history.take(history_len.saturating_sub(1)))
         };
 
+        let user_input_message_context = UserInputMessageContext {
+            env_state: Some(build_env_state()),
+            git_state: None,
+            tool_results: None,
+            tools: if self.tools.is_empty() {
+                None
+            } else {
+                Some(self.tools.values().flatten().cloned().collect::<Vec<Tool>>())
+            },
+        };
+
         let mut summary_message = UserInputMessage {
             content: summary_content,
-            user_input_message_context: None,
+            user_input_message_context: Some(user_input_message_context),
             user_intent: None,
             images: None,
             model_id: self.model.clone(),

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

@@ -161,6 +161,7 @@ use crate::api_client::{
 };
 use crate::auth::AuthError;
 use crate::auth::builder_id::is_idc_user;
+use crate::cli::chat::token_counter::CharCount;
 use crate::database::Database;
 use crate::database::settings::Setting;
 use crate::mcp_client::{
@@ -2988,13 +2989,19 @@ impl ChatContext {
                 }
 
                 let data = state.calculate_conversation_size();
+                let tool_specs_json: String = state
+                    .tools
+                    .values()
+                    .filter_map(|s| serde_json::to_string(s).ok())
+                    .collect();
 
                 let context_token_count: TokenCount = data.context_messages.into();
                 let assistant_token_count: TokenCount = data.assistant_messages.into();
                 let user_token_count: TokenCount = data.user_messages.into();
+                let tools_char_count: CharCount = tool_specs_json.len().into(); // usize → CharCount
+                let tools_token_count: TokenCount = tools_char_count.into(); // CharCount → TokenCount
                 let total_token_used: TokenCount =
-                    (data.context_messages + data.user_messages + data.assistant_messages).into();
-
+                    (data.context_messages + data.user_messages + data.assistant_messages + tools_char_count).into();
                 let window_width = self.terminal_width();
                 // set a max width for the progress bar for better aesthetic
                 let progress_bar_width = std::cmp::min(window_width, 80);
@@ -3003,13 +3010,18 @@ impl ChatContext {
                     * progress_bar_width as f64) as usize;
                 let assistant_width = ((assistant_token_count.value() as f64 / CONTEXT_WINDOW_SIZE as f64)
                     * progress_bar_width as f64) as usize;
+                let tools_width = ((tools_token_count.value() as f64 / CONTEXT_WINDOW_SIZE as f64)
+                    * progress_bar_width as f64) as usize;
                 let user_width = ((user_token_count.value() as f64 / CONTEXT_WINDOW_SIZE as f64)
                     * progress_bar_width as f64) as usize;
 
                 let left_over_width = progress_bar_width
-                    - std::cmp::min(context_width + assistant_width + user_width, progress_bar_width);
+                    - std::cmp::min(
+                        context_width + assistant_width + user_width + tools_width,
+                        progress_bar_width,
+                    );
 
-                let is_overflow = (context_width + assistant_width + user_width) > progress_bar_width;
+                let is_overflow = (context_width + assistant_width + user_width + tools_width) > progress_bar_width;
 
                 if is_overflow {
                     queue!(
@@ -3036,6 +3048,7 @@ impl ChatContext {
                             total_token_used,
                             CONTEXT_WINDOW_SIZE / 1000
                         )),
+                        // Context files
                         style::SetForegroundColor(Color::DarkCyan),
                         // add a nice visual to mimic "tiny" progress, so the overral progress bar doesn't look too
                         // empty
@@ -3045,13 +3058,23 @@ impl ChatContext {
                             0
                         })),
                         style::Print("█".repeat(context_width)),
+                        // Tools
+                        style::SetForegroundColor(Color::DarkRed),
+                        style::Print("|".repeat(if tools_width == 0 && *tools_token_count > 0 {
+                            1
+                        } else {
+                            0
+                        })),
+                        style::Print("█".repeat(tools_width)),
+                        // Assistant responses
                         style::SetForegroundColor(Color::Blue),
                         style::Print("|".repeat(if assistant_width == 0 && *assistant_token_count > 0 {
                             1
                         } else {
                             0
                         })),
                         style::Print("█".repeat(assistant_width)),
+                        // User prompts
                         style::SetForegroundColor(Color::Magenta),
                         style::Print("|".repeat(if user_width == 0 && *user_token_count > 0 { 1 } else { 0 })),
                         style::Print("█".repeat(user_width)),
@@ -3079,6 +3102,14 @@ impl ChatContext {
                         context_token_count,
                         (context_token_count.value() as f32 / CONTEXT_WINDOW_SIZE as f32) * 100.0
                     )),
+                    style::SetForegroundColor(Color::DarkRed),
+                    style::Print("█ Tools:    "),
+                    style::SetForegroundColor(Color::Reset),
+                    style::Print(format!(
+                        " ~{} tokens ({:.2}%)\n",
+                        tools_token_count,
+                        (tools_token_count.value() as f32 / CONTEXT_WINDOW_SIZE as f32) * 100.0
+                    )),
                     style::SetForegroundColor(Color::Blue),
                     style::Print("█ Q responses: "),
                     style::SetForegroundColor(Color::Reset),

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

@@ -75,7 +75,7 @@ impl std::fmt::Display for TokenCount {
 pub struct TokenCounter;
 
 impl TokenCounter {
-    pub const TOKEN_TO_CHAR_RATIO: usize = 3;
+    pub const TOKEN_TO_CHAR_RATIO: usize = 4;
 
     /// Estimates the number of tokens in the input content.
     /// Currently uses a simple heuristic: content length / TOKEN_TO_CHAR_RATIO

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

@@ -189,7 +189,7 @@ mod tests {
                 "Yet another test file that's has the largest context file".to_string(),
             ),
         ];
-        let limit = 10;
+        let limit = 9;
 
         let dropped_files = drop_matched_context_files(&mut files, limit).unwrap();
         assert_eq!(dropped_files.len(), 1);