split out billin info

Author: evanliu048

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

@@ -1,12 +1,19 @@
 use std::collections::HashSet;
 
-use clap::Subcommand;
+use clap::{
+    Args,
+    Subcommand,
+};
 use crossterm::style::Attribute;
 use crossterm::{
     execute,
     style,
 };
 
+use crate::cli::chat::cli::usage::{
+    usage_data_provider,
+    usage_renderer,
+};
 use crate::cli::chat::consts::AGENT_FORMAT_HOOKS_DOC_URL;
 use crate::cli::chat::context::{
     ContextFilePath,
@@ -27,12 +34,43 @@ use crate::constants::help_text::{
 use crate::os::Os;
 use crate::theme::StyledText;
 
-#[deny(missing_docs)]
-#[derive(Debug, PartialEq, Subcommand)]
+/// Context command for viewing token usage and managing context files.
+/// Without subcommands: displays context window token usage breakdown by component
+/// (context files, tools, assistant responses, user prompts).
+/// With subcommands: manages context file rules (show, add, remove, clear).
+#[derive(Debug, PartialEq, Args)]
 #[command(
     about = context_description(),
     before_long_help = context_long_help()
 )]
+pub struct ContextArgs {
+    #[command(subcommand)]
+    pub subcommand: Option<ContextSubcommand>,
+}
+
+impl ContextArgs {
+    pub async fn execute(self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
+        match self.subcommand {
+            Some(subcommand) => subcommand.execute(os, session).await,
+            None => {
+                // No subcommand - show context window usage (replaces /usage --context)
+                let usage_data = usage_data_provider::get_detailed_usage_data(session, os).await?;
+                usage_renderer::render_context_window(&usage_data, session).await?;
+
+                Ok(ChatState::PromptUser {
+                    skip_printing_tools: true,
+                })
+            },
+        }
+    }
+
+    pub fn subcommand_name(&self) -> Option<&'static str> {
+        self.subcommand.as_ref().map(|s| s.name())
+    }
+}
+
+#[deny(missing_docs)]
+#[derive(Debug, PartialEq, Subcommand)]
 /// Context subcommands
 pub enum ContextSubcommand {
     /// Display the context rule configuration and matched files

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

@@ -21,12 +21,10 @@ pub mod tangent;
 pub mod todos;
 pub mod tools;
 pub mod usage;
-
 use changelog::ChangelogArgs;
 use clap::Parser;
 use clear::ClearArgs;
 use compact::CompactArgs;
-use context::ContextSubcommand;
 use editor::EditorArgs;
 use experiment::ExperimentArgs;
 use hooks::HooksArgs;
@@ -44,6 +42,7 @@ use todos::TodoSubcommand;
 use tools::ToolsArgs;
 
 use crate::cli::chat::cli::checkpoint::CheckpointSubcommand;
+use crate::cli::chat::cli::context::ContextArgs;
 use crate::cli::chat::cli::subscribe::SubscribeArgs;
 use crate::cli::chat::cli::usage::UsageArgs;
 use crate::cli::chat::consts::AGENT_MIGRATION_DOC_URL;
@@ -72,9 +71,8 @@ pub enum SlashCommand {
     Agent(AgentSubcommand),
     #[command(hide = true)]
     Profile,
-    /// Manage context files for the chat session
-    #[command(subcommand)]
-    Context(ContextSubcommand),
+    /// Manage context files and view context window usage
+    Context(ContextArgs),
     /// (Beta) Manage knowledge base for persistent context storage. Requires "q settings
     /// chat.enableKnowledge true"
     #[command(subcommand, hide = true)]
@@ -99,7 +97,7 @@ pub enum SlashCommand {
     Prompts(PromptsArgs),
     /// View context hooks
     Hooks(HooksArgs),
-    /// Show current session's context window usage
+    /// Show billing and credits information
     Usage(UsageArgs),
     /// See mcp server loaded
     Mcp(McpArgs),
@@ -237,7 +235,7 @@ impl SlashCommand {
     pub fn subcommand_name(&self) -> Option<&'static str> {
         match self {
             SlashCommand::Agent(sub) => Some(sub.name()),
-            SlashCommand::Context(sub) => Some(sub.name()),
+            SlashCommand::Context(args) => args.subcommand_name(),
             SlashCommand::Knowledge(sub) => Some(sub.name()),
             SlashCommand::Tools(arg) => arg.subcommand_name(),
             SlashCommand::Prompts(arg) => arg.subcommand_name(),

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

@@ -1,9 +1,4 @@
 use clap::Args;
-use crossterm::style::Color;
-use crossterm::{
-    execute,
-    style,
-};
 
 use crate::cli::chat::token_counter::TokenCount;
 use crate::cli::chat::{
@@ -66,81 +61,18 @@ pub struct BonusCredit {
     pub days_until_expiry: i64,
 }
 
-/// Arguments for the usage command that displays token usage statistics and context window
-/// information.
-///
-/// This command shows how many tokens are being used by different components (context files, tools,
-/// assistant responses, and user prompts) within the current chat session's context window.
+/// Arguments for the usage command that displays credits and billing information.
 #[deny(missing_docs)]
 #[derive(Debug, PartialEq, Args)]
-pub struct UsageArgs {
-    /// Show only context window usage
-    #[arg(long)]
-    context: bool,
-    /// Show only credits and billing information
-    #[arg(long)]
-    credits: bool,
-}
+pub struct UsageArgs {}
 
 impl UsageArgs {
     pub async fn execute(self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
-        match (self.context, self.credits) {
-            (true, false) => {
-                // Show only context window usage
-                self.show_context_usage(os, session).await
-            },
-            (false, true) => {
-                // Show only credits/billing information
-                self.show_credits_info(os, session).await
-            },
-            (false, false) => {
-                // Show both (default behavior)
-                self.show_full_usage(os, session).await
-            },
-            (true, true) => {
-                // Both flags specified - show error
-                execute!(
-                    session.stderr,
-                    style::SetForegroundColor(Color::Red),
-                    style::Print("Error: Cannot specify both --context and --credits flags\n"),
-                    style::SetForegroundColor(Color::Reset),
-                )?;
-                Ok(ChatState::PromptUser {
-                    skip_printing_tools: true,
-                })
-            },
-        }
-    }
-
-    async fn show_context_usage(&self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
-        let usage_data = usage_data_provider::get_detailed_usage_data(session, os).await?;
-        usage_renderer::render_context_window(&usage_data, session).await?;
-        Ok(ChatState::PromptUser {
-            skip_printing_tools: true,
-        })
-    }
-
-    async fn show_credits_info(&self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
+        // Only show credits/billing information
         let billing_data = usage_data_provider::get_billing_usage_data(os).await?;
         usage_renderer::render_billing_info(&billing_data, session, true).await?;
         Ok(ChatState::PromptUser {
             skip_printing_tools: true,
         })
     }
-
-    async fn show_full_usage(&self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
-        // Get both billing and context data
-        let billing_data = usage_data_provider::get_billing_usage_data(os).await?;
-        let usage_data = usage_data_provider::get_detailed_usage_data(session, os).await?;
-
-        // Render billing information
-        usage_renderer::render_billing_info(&billing_data, session, false).await?;
-
-        // Render context window information
-        usage_renderer::render_context_window(&usage_data, session).await?;
-
-        Ok(ChatState::PromptUser {
-            skip_printing_tools: true,
-        })
-    }
 }

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

@@ -19,7 +19,7 @@ use crate::cli::chat::{
 use crate::os::Os;
 
 /// Get detailed usage data for context window analysis
-pub(super) async fn get_detailed_usage_data(
+pub async fn get_detailed_usage_data(
     session: &mut ChatSession,
     os: &Os,
 ) -> Result<super::DetailedUsageData, ChatError> {