alex/g3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add back progress bar to cli

Browse Source
This commit is contained in:
Dhanji Prasanna
2025-10-31 14:28:35 +11:00
parent bdaacfd051
commit 11eb01e04d
2 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
crates/g3-cli/src/lib.rs
View File

@@ -1,4 +1,5 @@
use anyhow::Result; use anyhow::Result;
use crossterm::style::{Color, SetForegroundColor, ResetColor};
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@@ -1479,10 +1480,32 @@ fn handle_execution_error(e: &anyhow::Error, input: &str, output: &SimpleOutput,
} }
} }
fn display_context_progress<W: UiWriter>(agent: &Agent<W>, output: &SimpleOutput) { fn display_context_progress<W: UiWriter>(agent: &Agent<W>, _output: &SimpleOutput) {
let context = agent.get_context_window(); let context = agent.get_context_window();
output.print(&format!("Context: {}/{} tokens ({:.1}%)", let percentage = context.percentage_used();
context.used_tokens, context.total_tokens, context.percentage_used()));
// Create 10 dots representing context fullness
let total_dots: usize = 10;
let filled_dots = ((percentage / 100.0) * total_dots as f32).round() as usize;
let empty_dots = total_dots.saturating_sub(filled_dots);
let filled_str = "●".repeat(filled_dots);
let empty_str = "○".repeat(empty_dots);
// Determine color based on percentage
let color = if percentage < 40.0 {
Color::Green
} else if percentage < 60.0 {
Color::Yellow
} else if percentage < 80.0 {
Color::Rgb { r: 255, g: 165, b: 0 } // Orange
} else {
Color::Red
};
// Print with colored dots (using print! directly to handle color codes)
print!("Context: {}{}{}{} {:.0}% ({}/{} tokens)\n",
SetForegroundColor(color), filled_str, empty_str, ResetColor, percentage, context.used_tokens, context.total_tokens);
} }
/// Set up the workspace directory for autonomous mode /// Set up the workspace directory for autonomous mode

20
crates/g3-cli/src/tui.rs
View File

@@ -71,18 +71,20 @@ impl SimpleOutput {
} }
pub fn print_context(&self, used: u32, total: u32, percentage: f32) { pub fn print_context(&self, used: u32, total: u32, percentage: f32) {
let bar_width: usize = 10; let total_dots = 10;
let filled_width = ((percentage / 100.0) * bar_width as f32) as usize; let filled_dots = ((percentage / 100.0) * total_dots as f32) as usize;
let empty_width = bar_width.saturating_sub(filled_width); let empty_dots = total_dots.saturating_sub(filled_dots);
let filled_chars = "●".repeat(filled_width); let filled_str = "●".repeat(filled_dots);
let empty_chars = "○".repeat(empty_width); let empty_str = "○".repeat(empty_dots);
// Determine color based on percentage // Determine color based on percentage
let color = if percentage < 60.0 { let color = if percentage < 40.0 {
crossterm::style::Color::Green crossterm::style::Color::Green
} else if percentage < 80.0 { } else if percentage < 60.0 {
crossterm::style::Color::Yellow crossterm::style::Color::Yellow
} else if percentage < 80.0 {
crossterm::style::Color::Rgb { r: 255, g: 165, b: 0 } // Orange
} else { } else {
crossterm::style::Color::Red crossterm::style::Color::Red
}; };
@@ -90,9 +92,9 @@ impl SimpleOutput {
// Print with colored progress bar // Print with colored progress bar
print!("Context: "); print!("Context: ");
print!("{}", SetForegroundColor(color)); print!("{}", SetForegroundColor(color));
print!("{}{}", filled_chars, empty_chars); print!("{}{}", filled_str, empty_str);
print!("{}", ResetColor); print!("{}", ResetColor);
println!(" {:.1}% | {}/{} tokens", percentage, used, total); println!(" {:.0}% ({}/{} tokens)", percentage, used, total);
} }
pub fn print_context_thinning(&self, message: &str) { pub fn print_context_thinning(&self, message: &str) {