mirror of
https://github.com/affaan-m/everything-claude-code.git
synced 2026-03-30 13:43:26 +08:00
feat(ecc2): implement agent status panel with Table widget (#773)
- Table widget with columns: ID, Agent, State, Branch, Tokens, Duration - Color-coded states: green=Running, yellow=Idle, red=Failed, gray=Stopped, blue=Completed - Summary bar with running/completed/failed counts - Row selection highlighting
This commit is contained in:
@@ -13,7 +13,10 @@ pub enum MessageType {
|
||||
/// Response to a query
|
||||
Response { answer: String },
|
||||
/// Notification of completion
|
||||
Completed { summary: String, files_changed: Vec<String> },
|
||||
Completed {
|
||||
summary: String,
|
||||
files_changed: Vec<String>,
|
||||
},
|
||||
/// Conflict detected (e.g., two agents editing the same file)
|
||||
Conflict { file: String, description: String },
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
mod comms;
|
||||
mod config;
|
||||
mod observability;
|
||||
mod session;
|
||||
mod tui;
|
||||
mod worktree;
|
||||
mod observability;
|
||||
mod comms;
|
||||
|
||||
use anyhow::Result;
|
||||
use clap::Parser;
|
||||
@@ -63,10 +63,13 @@ async fn main() -> Result<()> {
|
||||
Some(Commands::Dashboard) | None => {
|
||||
tui::app::run(db, cfg).await?;
|
||||
}
|
||||
Some(Commands::Start { task, agent, worktree: use_worktree }) => {
|
||||
let session_id = session::manager::create_session(
|
||||
&db, &cfg, &task, &agent, use_worktree,
|
||||
).await?;
|
||||
Some(Commands::Start {
|
||||
task,
|
||||
agent,
|
||||
worktree: use_worktree,
|
||||
}) => {
|
||||
let session_id =
|
||||
session::manager::create_session(&db, &cfg, &task, &agent, use_worktree).await?;
|
||||
println!("Session started: {session_id}");
|
||||
}
|
||||
Some(Commands::Sessions) => {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use anyhow::Result;
|
||||
use std::fmt;
|
||||
|
||||
use super::{Session, SessionMetrics, SessionState};
|
||||
use super::store::StateStore;
|
||||
use super::{Session, SessionMetrics, SessionState};
|
||||
use crate::config::Config;
|
||||
use crate::worktree;
|
||||
|
||||
|
||||
@@ -170,16 +170,12 @@ impl StateStore {
|
||||
|
||||
pub fn get_session(&self, id: &str) -> Result<Option<Session>> {
|
||||
let sessions = self.list_sessions()?;
|
||||
Ok(sessions.into_iter().find(|s| s.id == id || s.id.starts_with(id)))
|
||||
Ok(sessions
|
||||
.into_iter()
|
||||
.find(|s| s.id == id || s.id.starts_with(id)))
|
||||
}
|
||||
|
||||
pub fn send_message(
|
||||
&self,
|
||||
from: &str,
|
||||
to: &str,
|
||||
content: &str,
|
||||
msg_type: &str,
|
||||
) -> Result<()> {
|
||||
pub fn send_message(&self, from: &str, to: &str, content: &str, msg_type: &str) -> Result<()> {
|
||||
self.conn.execute(
|
||||
"INSERT INTO messages (from_session, to_session, content, msg_type, timestamp)
|
||||
VALUES (?1, ?2, ?3, ?4, ?5)",
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
use ratatui::{
|
||||
prelude::*,
|
||||
widgets::{Block, Borders, List, ListItem, Paragraph, Tabs},
|
||||
widgets::{Block, Borders, Cell, HighlightSpacing, Paragraph, Row, Table, TableState, Tabs},
|
||||
};
|
||||
|
||||
use crate::config::Config;
|
||||
use crate::session::{Session, SessionState};
|
||||
use crate::session::store::StateStore;
|
||||
use crate::session::{Session, SessionState};
|
||||
|
||||
pub struct Dashboard {
|
||||
db: StateStore,
|
||||
@@ -17,6 +17,17 @@ pub struct Dashboard {
|
||||
scroll_offset: usize,
|
||||
}
|
||||
|
||||
#[derive(Debug, Default, PartialEq, Eq)]
|
||||
struct SessionSummary {
|
||||
total: usize,
|
||||
pending: usize,
|
||||
running: usize,
|
||||
idle: usize,
|
||||
completed: usize,
|
||||
failed: usize,
|
||||
stopped: usize,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
||||
enum Pane {
|
||||
Sessions,
|
||||
@@ -56,8 +67,8 @@ impl Dashboard {
|
||||
let main_chunks = Layout::default()
|
||||
.direction(Direction::Horizontal)
|
||||
.constraints([
|
||||
Constraint::Percentage(35), // Session list
|
||||
Constraint::Percentage(65), // Output/details
|
||||
Constraint::Percentage(50), // Session table
|
||||
Constraint::Percentage(50), // Output/details
|
||||
])
|
||||
.split(chunks[1]);
|
||||
|
||||
@@ -79,7 +90,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,53 +105,80 @@ 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);
|
||||
}
|
||||
|
||||
fn render_sessions(&self, frame: &mut Frame, area: Rect) {
|
||||
let items: Vec<ListItem> = self
|
||||
.sessions
|
||||
.iter()
|
||||
.enumerate()
|
||||
.map(|(i, s)| {
|
||||
let state_icon = match s.state {
|
||||
SessionState::Running => "●",
|
||||
SessionState::Idle => "○",
|
||||
SessionState::Completed => "✓",
|
||||
SessionState::Failed => "✗",
|
||||
SessionState::Stopped => "■",
|
||||
SessionState::Pending => "◌",
|
||||
};
|
||||
let style = if i == self.selected_session {
|
||||
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);
|
||||
ListItem::new(text).style(style)
|
||||
})
|
||||
.collect();
|
||||
|
||||
let border_style = if self.selected_pane == Pane::Sessions {
|
||||
Style::default().fg(Color::Cyan)
|
||||
} else {
|
||||
Style::default()
|
||||
};
|
||||
|
||||
let list = List::new(items).block(
|
||||
Block::default()
|
||||
let block = Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.title(" Sessions ")
|
||||
.border_style(border_style),
|
||||
.border_style(border_style);
|
||||
let inner_area = block.inner(area);
|
||||
frame.render_widget(block, area);
|
||||
|
||||
if inner_area.is_empty() {
|
||||
return;
|
||||
}
|
||||
|
||||
let summary = SessionSummary::from_sessions(&self.sessions);
|
||||
let chunks = Layout::default()
|
||||
.direction(Direction::Vertical)
|
||||
.constraints([Constraint::Length(1), Constraint::Min(3)])
|
||||
.split(inner_area);
|
||||
|
||||
frame.render_widget(Paragraph::new(summary_line(&summary)), chunks[0]);
|
||||
|
||||
let rows = self.sessions.iter().map(session_row);
|
||||
let header = Row::new(["ID", "Agent", "State", "Branch", "Tokens", "Duration"])
|
||||
.style(Style::default().add_modifier(Modifier::BOLD));
|
||||
let widths = [
|
||||
Constraint::Length(8),
|
||||
Constraint::Length(10),
|
||||
Constraint::Length(10),
|
||||
Constraint::Min(12),
|
||||
Constraint::Length(8),
|
||||
Constraint::Length(8),
|
||||
];
|
||||
|
||||
let table = Table::new(rows, widths)
|
||||
.header(header)
|
||||
.column_spacing(1)
|
||||
.highlight_symbol(">> ")
|
||||
.highlight_spacing(HighlightSpacing::Always)
|
||||
.row_highlight_style(
|
||||
Style::default()
|
||||
.bg(Color::DarkGray)
|
||||
.add_modifier(Modifier::BOLD),
|
||||
);
|
||||
frame.render_widget(list, area);
|
||||
|
||||
let selected = if self.sessions.is_empty() {
|
||||
None
|
||||
} else {
|
||||
Some(self.selected_session.min(self.sessions.len() - 1))
|
||||
};
|
||||
let mut table_state = TableState::default().with_selected(selected);
|
||||
|
||||
frame.render_stateful_widget(table, chunks[1], &mut table_state);
|
||||
}
|
||||
|
||||
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()
|
||||
};
|
||||
@@ -260,6 +302,7 @@ impl Dashboard {
|
||||
|
||||
pub fn refresh(&mut self) {
|
||||
self.sessions = self.db.list_sessions().unwrap_or_default();
|
||||
self.sync_selection();
|
||||
}
|
||||
|
||||
pub fn toggle_help(&mut self) {
|
||||
@@ -269,5 +312,303 @@ impl Dashboard {
|
||||
pub async fn tick(&mut self) {
|
||||
// Periodic refresh every few ticks
|
||||
self.sessions = self.db.list_sessions().unwrap_or_default();
|
||||
self.sync_selection();
|
||||
}
|
||||
|
||||
fn sync_selection(&mut self) {
|
||||
if self.sessions.is_empty() {
|
||||
self.selected_session = 0;
|
||||
} else {
|
||||
self.selected_session = self.selected_session.min(self.sessions.len() - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl SessionSummary {
|
||||
fn from_sessions(sessions: &[Session]) -> Self {
|
||||
sessions.iter().fold(
|
||||
Self {
|
||||
total: sessions.len(),
|
||||
..Self::default()
|
||||
},
|
||||
|mut summary, session| {
|
||||
match session.state {
|
||||
SessionState::Pending => summary.pending += 1,
|
||||
SessionState::Running => summary.running += 1,
|
||||
SessionState::Idle => summary.idle += 1,
|
||||
SessionState::Completed => summary.completed += 1,
|
||||
SessionState::Failed => summary.failed += 1,
|
||||
SessionState::Stopped => summary.stopped += 1,
|
||||
}
|
||||
summary
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fn session_row(session: &Session) -> Row<'static> {
|
||||
Row::new(vec![
|
||||
Cell::from(format_session_id(&session.id)),
|
||||
Cell::from(session.agent_type.clone()),
|
||||
Cell::from(session_state_label(&session.state)).style(
|
||||
Style::default()
|
||||
.fg(session_state_color(&session.state))
|
||||
.add_modifier(Modifier::BOLD),
|
||||
),
|
||||
Cell::from(session_branch(session)),
|
||||
Cell::from(session.metrics.tokens_used.to_string()),
|
||||
Cell::from(format_duration(session.metrics.duration_secs)),
|
||||
])
|
||||
}
|
||||
|
||||
fn summary_line(summary: &SessionSummary) -> Line<'static> {
|
||||
Line::from(vec![
|
||||
Span::styled(
|
||||
format!("Total {} ", summary.total),
|
||||
Style::default().add_modifier(Modifier::BOLD),
|
||||
),
|
||||
summary_span("Running", summary.running, Color::Green),
|
||||
summary_span("Idle", summary.idle, Color::Yellow),
|
||||
summary_span("Completed", summary.completed, Color::Blue),
|
||||
summary_span("Failed", summary.failed, Color::Red),
|
||||
summary_span("Stopped", summary.stopped, Color::DarkGray),
|
||||
summary_span("Pending", summary.pending, Color::Reset),
|
||||
])
|
||||
}
|
||||
|
||||
fn summary_span(label: &str, value: usize, color: Color) -> Span<'static> {
|
||||
Span::styled(
|
||||
format!("{label} {value} "),
|
||||
Style::default().fg(color).add_modifier(Modifier::BOLD),
|
||||
)
|
||||
}
|
||||
|
||||
fn session_state_label(state: &SessionState) -> &'static str {
|
||||
match state {
|
||||
SessionState::Pending => "Pending",
|
||||
SessionState::Running => "Running",
|
||||
SessionState::Idle => "Idle",
|
||||
SessionState::Completed => "Completed",
|
||||
SessionState::Failed => "Failed",
|
||||
SessionState::Stopped => "Stopped",
|
||||
}
|
||||
}
|
||||
|
||||
fn session_state_color(state: &SessionState) -> Color {
|
||||
match state {
|
||||
SessionState::Running => Color::Green,
|
||||
SessionState::Idle => Color::Yellow,
|
||||
SessionState::Failed => Color::Red,
|
||||
SessionState::Stopped => Color::DarkGray,
|
||||
SessionState::Completed => Color::Blue,
|
||||
SessionState::Pending => Color::Reset,
|
||||
}
|
||||
}
|
||||
|
||||
fn format_session_id(id: &str) -> String {
|
||||
id.chars().take(8).collect()
|
||||
}
|
||||
|
||||
fn session_branch(session: &Session) -> String {
|
||||
session
|
||||
.worktree
|
||||
.as_ref()
|
||||
.map(|worktree| worktree.branch.clone())
|
||||
.unwrap_or_else(|| "-".to_string())
|
||||
}
|
||||
|
||||
fn format_duration(duration_secs: u64) -> String {
|
||||
let hours = duration_secs / 3600;
|
||||
let minutes = (duration_secs % 3600) / 60;
|
||||
let seconds = duration_secs % 60;
|
||||
format!("{hours:02}:{minutes:02}:{seconds:02}")
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::session::{SessionMetrics, WorktreeInfo};
|
||||
use chrono::Utc;
|
||||
use ratatui::{backend::TestBackend, Terminal};
|
||||
use std::path::PathBuf;
|
||||
use uuid::Uuid;
|
||||
|
||||
#[test]
|
||||
fn session_state_color_matches_requested_palette() {
|
||||
assert_eq!(session_state_color(&SessionState::Running), Color::Green);
|
||||
assert_eq!(session_state_color(&SessionState::Idle), Color::Yellow);
|
||||
assert_eq!(session_state_color(&SessionState::Failed), Color::Red);
|
||||
assert_eq!(session_state_color(&SessionState::Stopped), Color::DarkGray);
|
||||
assert_eq!(session_state_color(&SessionState::Completed), Color::Blue);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn session_summary_counts_each_state() {
|
||||
let sessions = vec![
|
||||
sample_session(
|
||||
"run-12345678",
|
||||
"planner",
|
||||
SessionState::Running,
|
||||
Some("feat/run"),
|
||||
128,
|
||||
15,
|
||||
),
|
||||
sample_session(
|
||||
"idle-12345678",
|
||||
"reviewer",
|
||||
SessionState::Idle,
|
||||
Some("feat/idle"),
|
||||
256,
|
||||
30,
|
||||
),
|
||||
sample_session(
|
||||
"done-12345678",
|
||||
"architect",
|
||||
SessionState::Completed,
|
||||
Some("feat/done"),
|
||||
512,
|
||||
45,
|
||||
),
|
||||
sample_session(
|
||||
"fail-12345678",
|
||||
"worker",
|
||||
SessionState::Failed,
|
||||
Some("feat/fail"),
|
||||
1024,
|
||||
60,
|
||||
),
|
||||
sample_session(
|
||||
"stop-12345678",
|
||||
"security",
|
||||
SessionState::Stopped,
|
||||
None,
|
||||
64,
|
||||
10,
|
||||
),
|
||||
sample_session(
|
||||
"pend-12345678",
|
||||
"tdd",
|
||||
SessionState::Pending,
|
||||
Some("feat/pending"),
|
||||
32,
|
||||
5,
|
||||
),
|
||||
];
|
||||
|
||||
let summary = SessionSummary::from_sessions(&sessions);
|
||||
|
||||
assert_eq!(summary.total, 6);
|
||||
assert_eq!(summary.running, 1);
|
||||
assert_eq!(summary.idle, 1);
|
||||
assert_eq!(summary.completed, 1);
|
||||
assert_eq!(summary.failed, 1);
|
||||
assert_eq!(summary.stopped, 1);
|
||||
assert_eq!(summary.pending, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn render_sessions_shows_summary_headers_and_selected_row() {
|
||||
let dashboard = test_dashboard(
|
||||
vec![
|
||||
sample_session(
|
||||
"run-12345678",
|
||||
"planner",
|
||||
SessionState::Running,
|
||||
Some("feat/run"),
|
||||
128,
|
||||
15,
|
||||
),
|
||||
sample_session(
|
||||
"done-87654321",
|
||||
"reviewer",
|
||||
SessionState::Completed,
|
||||
Some("release/v1"),
|
||||
2048,
|
||||
125,
|
||||
),
|
||||
],
|
||||
1,
|
||||
);
|
||||
|
||||
let rendered = render_dashboard_text(&dashboard, 150, 24);
|
||||
|
||||
assert!(rendered.contains("ID"));
|
||||
assert!(rendered.contains("Agent"));
|
||||
assert!(rendered.contains("State"));
|
||||
assert!(rendered.contains("Branch"));
|
||||
assert!(rendered.contains("Tokens"));
|
||||
assert!(rendered.contains("Duration"));
|
||||
assert!(rendered.contains("Total 2"));
|
||||
assert!(rendered.contains("Running 1"));
|
||||
assert!(rendered.contains("Completed 1"));
|
||||
assert!(rendered.contains(">> done-876"));
|
||||
assert!(rendered.contains("reviewer"));
|
||||
assert!(rendered.contains("release/v1"));
|
||||
assert!(rendered.contains("00:02:05"));
|
||||
}
|
||||
|
||||
fn test_dashboard(sessions: Vec<Session>, selected_session: usize) -> Dashboard {
|
||||
Dashboard {
|
||||
db: test_store(),
|
||||
cfg: Config::default(),
|
||||
sessions,
|
||||
selected_pane: Pane::Sessions,
|
||||
selected_session,
|
||||
show_help: false,
|
||||
scroll_offset: 0,
|
||||
}
|
||||
}
|
||||
|
||||
fn test_store() -> StateStore {
|
||||
let db_path =
|
||||
std::env::temp_dir().join(format!("ecc-dashboard-test-{}.db", Uuid::new_v4()));
|
||||
StateStore::open(&db_path).expect("open test db")
|
||||
}
|
||||
|
||||
fn sample_session(
|
||||
id: &str,
|
||||
agent_type: &str,
|
||||
state: SessionState,
|
||||
branch: Option<&str>,
|
||||
tokens_used: u64,
|
||||
duration_secs: u64,
|
||||
) -> Session {
|
||||
Session {
|
||||
id: id.to_string(),
|
||||
task: "Render dashboard rows".to_string(),
|
||||
agent_type: agent_type.to_string(),
|
||||
state,
|
||||
worktree: branch.map(|branch| WorktreeInfo {
|
||||
path: PathBuf::from(format!("/tmp/{branch}")),
|
||||
branch: branch.to_string(),
|
||||
base_branch: "main".to_string(),
|
||||
}),
|
||||
created_at: Utc::now(),
|
||||
updated_at: Utc::now(),
|
||||
metrics: SessionMetrics {
|
||||
tokens_used,
|
||||
tool_calls: 4,
|
||||
files_changed: 2,
|
||||
duration_secs,
|
||||
cost_usd: 0.42,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
fn render_dashboard_text(dashboard: &Dashboard, width: u16, height: u16) -> String {
|
||||
let backend = TestBackend::new(width, height);
|
||||
let mut terminal = Terminal::new(backend).expect("create terminal");
|
||||
|
||||
terminal
|
||||
.draw(|frame| dashboard.render(frame))
|
||||
.expect("render dashboard");
|
||||
|
||||
let buffer = terminal.backend().buffer();
|
||||
buffer
|
||||
.content
|
||||
.chunks(buffer.area.width as usize)
|
||||
.map(|cells| cells.iter().map(|cell| cell.symbol()).collect::<String>())
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,7 +28,11 @@ pub fn create_for_session(session_id: &str, cfg: &Config) -> Result<WorktreeInfo
|
||||
anyhow::bail!("git worktree add failed: {stderr}");
|
||||
}
|
||||
|
||||
tracing::info!("Created worktree at {} on branch {}", path.display(), branch);
|
||||
tracing::info!(
|
||||
"Created worktree at {} on branch {}",
|
||||
path.display(),
|
||||
branch
|
||||
);
|
||||
|
||||
Ok(WorktreeInfo {
|
||||
path,
|
||||
|
||||
Reference in New Issue
Block a user