mirror of
https://github.com/affaan-m/everything-claude-code.git
synced 2026-04-06 01:03:32 +08:00
feat(ecc2): add token/cost meter widget (#775)
- TokenMeter widget using ratatui Gauge with color gradient (green->yellow->red) - Budget fields (cost_budget_usd, token_budget) in Config - Aggregate cost display in status bar - Warning state at 80%+ budget consumption - Tests for gradient, config fallback, and meter rendering
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
use ratatui::{
|
||||
prelude::*,
|
||||
widgets::{Block, Borders, List, ListItem, Paragraph, Tabs},
|
||||
widgets::{Block, Borders, List, ListItem, Paragraph, Tabs, Wrap},
|
||||
};
|
||||
|
||||
use super::widgets::{budget_state, format_currency, format_token_count, BudgetState, TokenMeter};
|
||||
use crate::config::Config;
|
||||
use crate::session::{Session, SessionState};
|
||||
use crate::session::store::StateStore;
|
||||
use crate::session::{Session, SessionState};
|
||||
|
||||
pub struct Dashboard {
|
||||
db: StateStore,
|
||||
@@ -24,6 +25,15 @@ enum Pane {
|
||||
Metrics,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
struct AggregateUsage {
|
||||
total_tokens: u64,
|
||||
total_cost_usd: f64,
|
||||
token_state: BudgetState,
|
||||
cost_state: BudgetState,
|
||||
overall_state: BudgetState,
|
||||
}
|
||||
|
||||
impl Dashboard {
|
||||
pub fn new(db: StateStore, cfg: Config) -> Self {
|
||||
let sessions = db.list_sessions().unwrap_or_default();
|
||||
@@ -42,7 +52,7 @@ impl Dashboard {
|
||||
let chunks = Layout::default()
|
||||
.direction(Direction::Vertical)
|
||||
.constraints([
|
||||
Constraint::Length(3), // Header
|
||||
Constraint::Length(3), // Header
|
||||
Constraint::Min(10), // Main content
|
||||
Constraint::Length(3), // Status bar
|
||||
])
|
||||
@@ -79,7 +89,11 @@ impl Dashboard {
|
||||
}
|
||||
|
||||
fn render_header(&self, frame: &mut Frame, area: Rect) {
|
||||
let running = self.sessions.iter().filter(|s| s.state == SessionState::Running).count();
|
||||
let running = self
|
||||
.sessions
|
||||
.iter()
|
||||
.filter(|s| s.state == SessionState::Running)
|
||||
.count();
|
||||
let total = self.sessions.len();
|
||||
|
||||
let title = format!(" ECC 2.0 | {running} running / {total} total ");
|
||||
@@ -90,7 +104,11 @@ impl Dashboard {
|
||||
Pane::Output => 1,
|
||||
Pane::Metrics => 2,
|
||||
})
|
||||
.highlight_style(Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD));
|
||||
.highlight_style(
|
||||
Style::default()
|
||||
.fg(Color::Cyan)
|
||||
.add_modifier(Modifier::BOLD),
|
||||
);
|
||||
|
||||
frame.render_widget(tabs, area);
|
||||
}
|
||||
@@ -110,11 +128,18 @@ impl Dashboard {
|
||||
SessionState::Pending => "◌",
|
||||
};
|
||||
let style = if i == self.selected_session {
|
||||
Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD)
|
||||
Style::default()
|
||||
.fg(Color::Cyan)
|
||||
.add_modifier(Modifier::BOLD)
|
||||
} else {
|
||||
Style::default()
|
||||
};
|
||||
let text = format!("{state_icon} {} [{}] {}", &s.id[..8.min(s.id.len())], s.agent_type, s.task);
|
||||
let text = format!(
|
||||
"{state_icon} {} [{}] {}",
|
||||
&s.id[..8.min(s.id.len())],
|
||||
s.agent_type,
|
||||
s.task
|
||||
);
|
||||
ListItem::new(text).style(style)
|
||||
})
|
||||
.collect();
|
||||
@@ -136,7 +161,10 @@ impl Dashboard {
|
||||
|
||||
fn render_output(&self, frame: &mut Frame, area: Rect) {
|
||||
let content = if let Some(session) = self.sessions.get(self.selected_session) {
|
||||
format!("Agent output for session {}...\n\n(Live streaming coming soon)", session.id)
|
||||
format!(
|
||||
"Agent output for session {}...\n\n(Live streaming coming soon)",
|
||||
session.id
|
||||
)
|
||||
} else {
|
||||
"No sessions. Press 'n' to start one.".to_string()
|
||||
};
|
||||
@@ -157,37 +185,87 @@ impl Dashboard {
|
||||
}
|
||||
|
||||
fn render_metrics(&self, frame: &mut Frame, area: Rect) {
|
||||
let content = if let Some(session) = self.sessions.get(self.selected_session) {
|
||||
let m = &session.metrics;
|
||||
format!(
|
||||
"Tokens: {} | Tools: {} | Files: {} | Cost: ${:.4} | Duration: {}s",
|
||||
m.tokens_used, m.tool_calls, m.files_changed, m.cost_usd, m.duration_secs
|
||||
)
|
||||
} else {
|
||||
"No metrics available".to_string()
|
||||
};
|
||||
|
||||
let border_style = if self.selected_pane == Pane::Metrics {
|
||||
Style::default().fg(Color::Cyan)
|
||||
} else {
|
||||
Style::default()
|
||||
};
|
||||
|
||||
let paragraph = Paragraph::new(content).block(
|
||||
Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.title(" Metrics ")
|
||||
.border_style(border_style),
|
||||
let block = Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.title(" Metrics ")
|
||||
.border_style(border_style);
|
||||
let inner = block.inner(area);
|
||||
frame.render_widget(block, area);
|
||||
|
||||
if inner.is_empty() {
|
||||
return;
|
||||
}
|
||||
|
||||
let chunks = Layout::default()
|
||||
.direction(Direction::Vertical)
|
||||
.constraints([
|
||||
Constraint::Length(2),
|
||||
Constraint::Length(2),
|
||||
Constraint::Min(1),
|
||||
])
|
||||
.split(inner);
|
||||
|
||||
let aggregate = self.aggregate_usage();
|
||||
frame.render_widget(
|
||||
TokenMeter::tokens(
|
||||
"Token Budget",
|
||||
aggregate.total_tokens,
|
||||
self.cfg.token_budget,
|
||||
),
|
||||
chunks[0],
|
||||
);
|
||||
frame.render_widget(
|
||||
TokenMeter::currency(
|
||||
"Cost Budget",
|
||||
aggregate.total_cost_usd,
|
||||
self.cfg.cost_budget_usd,
|
||||
),
|
||||
chunks[1],
|
||||
);
|
||||
frame.render_widget(
|
||||
Paragraph::new(self.selected_session_metrics_text()).wrap(Wrap { trim: true }),
|
||||
chunks[2],
|
||||
);
|
||||
frame.render_widget(paragraph, area);
|
||||
}
|
||||
|
||||
fn render_status_bar(&self, frame: &mut Frame, area: Rect) {
|
||||
let text = " [n]ew session [s]top [Tab] switch pane [j/k] scroll [?] help [q]uit ";
|
||||
let paragraph = Paragraph::new(text)
|
||||
.style(Style::default().fg(Color::DarkGray))
|
||||
.block(Block::default().borders(Borders::ALL));
|
||||
frame.render_widget(paragraph, area);
|
||||
let aggregate = self.aggregate_usage();
|
||||
let (summary_text, summary_style) = self.aggregate_cost_summary();
|
||||
let block = Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.border_style(aggregate.overall_state.style());
|
||||
let inner = block.inner(area);
|
||||
frame.render_widget(block, area);
|
||||
|
||||
if inner.is_empty() {
|
||||
return;
|
||||
}
|
||||
|
||||
let summary_width = summary_text
|
||||
.len()
|
||||
.min(inner.width.saturating_sub(1) as usize) as u16;
|
||||
let chunks = Layout::default()
|
||||
.direction(Direction::Horizontal)
|
||||
.constraints([Constraint::Min(1), Constraint::Length(summary_width)])
|
||||
.split(inner);
|
||||
|
||||
frame.render_widget(
|
||||
Paragraph::new(text).style(Style::default().fg(Color::DarkGray)),
|
||||
chunks[0],
|
||||
);
|
||||
frame.render_widget(
|
||||
Paragraph::new(summary_text)
|
||||
.style(summary_style)
|
||||
.alignment(Alignment::Right),
|
||||
chunks[1],
|
||||
);
|
||||
}
|
||||
|
||||
fn render_help(&self, frame: &mut Frame, area: Rect) {
|
||||
@@ -270,4 +348,143 @@ impl Dashboard {
|
||||
// Periodic refresh every few ticks
|
||||
self.sessions = self.db.list_sessions().unwrap_or_default();
|
||||
}
|
||||
|
||||
fn aggregate_usage(&self) -> AggregateUsage {
|
||||
let total_tokens = self
|
||||
.sessions
|
||||
.iter()
|
||||
.map(|session| session.metrics.tokens_used)
|
||||
.sum();
|
||||
let total_cost_usd = self
|
||||
.sessions
|
||||
.iter()
|
||||
.map(|session| session.metrics.cost_usd)
|
||||
.sum::<f64>();
|
||||
let token_state = budget_state(total_tokens as f64, self.cfg.token_budget as f64);
|
||||
let cost_state = budget_state(total_cost_usd, self.cfg.cost_budget_usd);
|
||||
|
||||
AggregateUsage {
|
||||
total_tokens,
|
||||
total_cost_usd,
|
||||
token_state,
|
||||
cost_state,
|
||||
overall_state: token_state.max(cost_state),
|
||||
}
|
||||
}
|
||||
|
||||
fn selected_session_metrics_text(&self) -> String {
|
||||
if let Some(session) = self.sessions.get(self.selected_session) {
|
||||
let metrics = &session.metrics;
|
||||
format!(
|
||||
"Selected {} [{}]\nTokens {} | Tools {} | Files {}\nCost ${:.4} | Duration {}s",
|
||||
&session.id[..8.min(session.id.len())],
|
||||
session.state,
|
||||
format_token_count(metrics.tokens_used),
|
||||
metrics.tool_calls,
|
||||
metrics.files_changed,
|
||||
metrics.cost_usd,
|
||||
metrics.duration_secs
|
||||
)
|
||||
} else {
|
||||
"No metrics available".to_string()
|
||||
}
|
||||
}
|
||||
|
||||
fn aggregate_cost_summary(&self) -> (String, Style) {
|
||||
let aggregate = self.aggregate_usage();
|
||||
let mut text = if self.cfg.cost_budget_usd > 0.0 {
|
||||
format!(
|
||||
"Aggregate cost {} / {}",
|
||||
format_currency(aggregate.total_cost_usd),
|
||||
format_currency(self.cfg.cost_budget_usd),
|
||||
)
|
||||
} else {
|
||||
format!(
|
||||
"Aggregate cost {} (no budget)",
|
||||
format_currency(aggregate.total_cost_usd)
|
||||
)
|
||||
};
|
||||
|
||||
match aggregate.overall_state {
|
||||
BudgetState::Warning => text.push_str(" | Budget warning"),
|
||||
BudgetState::OverBudget => text.push_str(" | Budget exceeded"),
|
||||
_ => {}
|
||||
}
|
||||
|
||||
(text, aggregate.overall_state.style())
|
||||
}
|
||||
|
||||
fn aggregate_cost_summary_text(&self) -> String {
|
||||
self.aggregate_cost_summary().0
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::path::Path;
|
||||
|
||||
use chrono::Utc;
|
||||
|
||||
use super::Dashboard;
|
||||
use crate::config::Config;
|
||||
use crate::session::store::StateStore;
|
||||
use crate::session::{Session, SessionMetrics, SessionState};
|
||||
use crate::tui::widgets::BudgetState;
|
||||
|
||||
#[test]
|
||||
fn aggregate_usage_sums_tokens_and_cost_with_warning_state() {
|
||||
let db = StateStore::open(Path::new(":memory:")).unwrap();
|
||||
let mut cfg = Config::default();
|
||||
cfg.token_budget = 10_000;
|
||||
cfg.cost_budget_usd = 10.0;
|
||||
|
||||
let mut dashboard = Dashboard::new(db, cfg);
|
||||
dashboard.sessions = vec![
|
||||
session("sess-1", 4_000, 3.50),
|
||||
session("sess-2", 4_500, 4.80),
|
||||
];
|
||||
|
||||
let aggregate = dashboard.aggregate_usage();
|
||||
|
||||
assert_eq!(aggregate.total_tokens, 8_500);
|
||||
assert!((aggregate.total_cost_usd - 8.30).abs() < 1e-9);
|
||||
assert_eq!(aggregate.token_state, BudgetState::Warning);
|
||||
assert_eq!(aggregate.cost_state, BudgetState::Warning);
|
||||
assert_eq!(aggregate.overall_state, BudgetState::Warning);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn aggregate_cost_summary_mentions_total_cost() {
|
||||
let db = StateStore::open(Path::new(":memory:")).unwrap();
|
||||
let mut cfg = Config::default();
|
||||
cfg.cost_budget_usd = 10.0;
|
||||
|
||||
let mut dashboard = Dashboard::new(db, cfg);
|
||||
dashboard.sessions = vec![session("sess-1", 3_500, 8.25)];
|
||||
|
||||
assert_eq!(
|
||||
dashboard.aggregate_cost_summary_text(),
|
||||
"Aggregate cost $8.25 / $10.00 | Budget warning"
|
||||
);
|
||||
}
|
||||
|
||||
fn session(id: &str, tokens_used: u64, cost_usd: f64) -> Session {
|
||||
let now = Utc::now();
|
||||
Session {
|
||||
id: id.to_string(),
|
||||
task: "Budget tracking".to_string(),
|
||||
agent_type: "claude".to_string(),
|
||||
state: SessionState::Running,
|
||||
worktree: None,
|
||||
created_at: now,
|
||||
updated_at: now,
|
||||
metrics: SessionMetrics {
|
||||
tokens_used,
|
||||
tool_calls: 0,
|
||||
files_changed: 0,
|
||||
duration_secs: 0,
|
||||
cost_usd,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user