agent/codex
2
0
Fork 0
mirror of https://github.com/pchuan98/codex.git synced 2026-07-01 00:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add --compact mode to just log (#11994)

Browse Source 
Summary:
- add a `--compact` flag to the logs client to suppress thread/target
info
- format rows and timestamps differently when compact mode is enabled so
only hour time, level, and message remain
This commit is contained in:
jif-oai
2026-02-17 14:21:26 +00:00
committed by GitHub
parent 31d4bfdde0
commit 4ab44e2c5c
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/state/src/bin/logs_client.rs
+20 -9
View File
@@ -61,6 +61,10 @@ struct Args {
/// Poll interval in milliseconds. /// Poll interval in milliseconds.
#[arg(long, default_value_t = 500)] #[arg(long, default_value_t = 500)]
poll_ms: u64, poll_ms: u64,
/// Show compact output with only time, level, and message.
#[arg(long)]
compact: bool,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@@ -86,7 +90,8 @@ async fn main() -> anyhow::Result<()> {
.unwrap_or_else(|| PathBuf::from(".")); .unwrap_or_else(|| PathBuf::from("."));
let runtime = StateRuntime::init(codex_home, "logs-client".to_string(), None).await?; let runtime = StateRuntime::init(codex_home, "logs-client".to_string(), None).await?;
let mut last_id = print_backfill(runtime.as_ref(), &filter, args.backfill).await?; let mut last_id =
print_backfill(runtime.as_ref(), &filter, args.backfill, args.compact).await?;
if last_id == 0 { if last_id == 0 {
last_id = fetch_max_id(runtime.as_ref(), &filter).await?; last_id = fetch_max_id(runtime.as_ref(), &filter).await?;
} }
@@ -96,7 +101,7 @@ async fn main() -> anyhow::Result<()> {
let rows = fetch_new_rows(runtime.as_ref(), &filter, last_id).await?; let rows = fetch_new_rows(runtime.as_ref(), &filter, last_id).await?;
for row in rows { for row in rows {
last_id = last_id.max(row.id); last_id = last_id.max(row.id);
println!("{}", format_row(&row)); println!("{}", format_row(&row, args.compact));
} }
tokio::time::sleep(poll_interval).await; tokio::time::sleep(poll_interval).await;
} }
@@ -178,6 +183,7 @@ async fn print_backfill(
runtime: &StateRuntime, runtime: &StateRuntime,
filter: &LogFilter, filter: &LogFilter,
backfill: usize, backfill: usize,
compact: bool,
) -> anyhow::Result<i64> { ) -> anyhow::Result<i64> {
if backfill == 0 { if backfill == 0 {
return Ok(0); return Ok(0);
@@ -189,7 +195,7 @@ async fn print_backfill(
let mut last_id = 0; let mut last_id = 0;
for row in rows { for row in rows {
last_id = last_id.max(row.id); last_id = last_id.max(row.id);
println!("{}", format_row(&row)); println!("{}", format_row(&row, compact));
} }
Ok(last_id) Ok(last_id)
} }
@@ -247,8 +253,8 @@ fn to_log_query(
} }
} }
fn format_row(row: &LogRow) -> String { fn format_row(row: &LogRow, compact: bool) -> String {
let timestamp = formatter::ts(row.ts, row.ts_nanos); let timestamp = formatter::ts(row.ts, row.ts_nanos, compact);
let level = row.level.as_str(); let level = row.level.as_str();
let target = row.target.as_str(); let target = row.target.as_str();
let message = row.message.as_deref().unwrap_or(""); let message = row.message.as_deref().unwrap_or("");
@@ -258,9 +264,13 @@ fn format_row(row: &LogRow) -> String {
let thread_id_colored = thread_id.blue().dimmed().to_string(); let thread_id_colored = thread_id.blue().dimmed().to_string();
let target_colored = target.dimmed().to_string(); let target_colored = target.dimmed().to_string();
let message_colored = heuristic_formatting(message); let message_colored = heuristic_formatting(message);
format!( if compact {
"{timestamp_colored} {level_colored} [{thread_id_colored}] {target_colored} - {message_colored}" format!("{timestamp_colored} {level_colored} {message_colored}")
) } else {
format!(
"{timestamp_colored} {level_colored} [{thread_id_colored}] {target_colored} - {message_colored}"
)
}
} }
fn heuristic_formatting(message: &str) -> String { fn heuristic_formatting(message: &str) -> String {
@@ -299,9 +309,10 @@ mod formatter {
.join("\n") .join("\n")
} }
pub(super) fn ts(ts: i64, ts_nanos: i64) -> String { pub(super) fn ts(ts: i64, ts_nanos: i64, compact: bool) -> String {
let nanos = u32::try_from(ts_nanos).unwrap_or(0); let nanos = u32::try_from(ts_nanos).unwrap_or(0);
match DateTime::<Utc>::from_timestamp(ts, nanos) { match DateTime::<Utc>::from_timestamp(ts, nanos) {
Some(dt) if compact => dt.format("%H:%M:%S").to_string(),
Some(dt) => dt.to_rfc3339_opts(SecondsFormat::Millis, true), Some(dt) => dt.to_rfc3339_opts(SecondsFormat::Millis, true),
None => format!("{ts}.{ts_nanos:09}Z"), None => format!("{ts}.{ts_nanos:09}Z"),
} }