Fix: recover /save, /usage, and /compact behavior after slash command refactor (#281)

* fix /usage

* fix al

Author: evanliu048

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

@@ -31,6 +31,7 @@ How it works
 pub struct CompactArgs {
     /// The prompt to use when generating the summary
     prompt: Option<String>,
+    #[arg(long)]
     show_summary: bool,
 }
 

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

@@ -39,7 +39,7 @@ pub enum ContextSubcommand {
     Show {
         /// Print out each matched file's content, hook configurations, and last
         /// session.conversation summary
-        #[arg(short, long)]
+        #[arg(long)]
         expand: bool,
     },
     /// Add context rules (filenames or glob patterns)

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

@@ -18,7 +18,11 @@ use crate::platform::Context;
 #[derive(Debug, PartialEq, Subcommand)]
 pub enum PersistSubcommand {
     /// Save the current conversation
-    Save { path: String, force: bool },
+    Save {
+        path: String,
+        #[arg(short, long)]
+        force: bool,
+    },
     /// Load a previous conversation
     Load { path: String },
 }

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

@@ -88,6 +88,21 @@ impl PromptsArgs {
                 optimal_case
             }
         };
+        // Add usage guidance at the top
+        queue!(
+            session.output,
+            style::Print("\n"),
+            style::SetAttribute(Attribute::Bold),
+            style::Print("Usage: "),
+            style::SetAttribute(Attribute::Reset),
+            style::Print("You can use a prompt by typing "),
+            style::SetAttribute(Attribute::Bold),
+            style::SetForegroundColor(Color::Green),
+            style::Print("'@<prompt name> [...args]'"),
+            style::SetForegroundColor(Color::Reset),
+            style::SetAttribute(Attribute::Reset),
+            style::Print("\n\n"),
+        )?;
         queue!(
             session.output,
             style::Print("\n"),

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

@@ -10,14 +10,16 @@ use crossterm::{
 };
 
 use crate::cli::chat::consts::CONTEXT_WINDOW_SIZE;
-use crate::cli::chat::token_counter::TokenCount;
+use crate::cli::chat::token_counter::{
+    CharCount,
+    TokenCount,
+};
 use crate::cli::chat::{
     ChatError,
     ChatSession,
     ChatState,
 };
 use crate::platform::Context;
-
 #[deny(missing_docs)]
 #[derive(Debug, PartialEq, Args)]
 pub struct UsageArgs;
@@ -43,13 +45,19 @@ impl UsageArgs {
         }
 
         let data = state.calculate_conversation_size();
-
+        let tool_specs_json: String = state
+            .tools
+            .values()
+            .filter_map(|s| serde_json::to_string(s).ok())
+            .collect::<Vec<String>>()
+            .join("");
         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 = session.terminal_width();
         // set a max width for the progress bar for better aesthetic
         let progress_bar_width = std::cmp::min(window_width, 80);
@@ -58,13 +66,18 @@ impl UsageArgs {
             ((context_token_count.value() as f64 / CONTEXT_WINDOW_SIZE as f64) * 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);
+        let left_over_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!(
@@ -91,6 +104,7 @@ impl UsageArgs {
                     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
@@ -100,13 +114,23 @@ impl UsageArgs {
                     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)),
@@ -133,6 +157,14 @@ impl UsageArgs {
                 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),