Skip to content

Commit 8a4ce8e

Browse files
committed
perf(codex): prune historical files for date ranges
Use a conservative file-mtime prefilter before replay planning and parsing while keeping event-level date filtering authoritative. Preserve Codex detection when the selected range has no rows. Closes #1598
1 parent ed1929b commit 8a4ce8e

4 files changed

Lines changed: 103 additions & 20 deletions

File tree

‎rust/adapters/codex/src/aggregate.rs‎

Lines changed: 68 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ use jiff::tz::TimeZone as JiffTimeZone;
1111
use rustc_hash::FxHasher;
1212

1313
use crate::{
14-
CodexGroup, CodexServiceTier, CodexTokenUsageEvent, CodexUsageBucket, Result,
14+
CodexGroup, CodexServiceTier, CodexTokenUsageEvent, CodexUsageBucket, MILLIS_PER_DAY, Result,
1515
cli::{AgentReportKind, SharedArgs, WeekDay},
16+
date_range_bounds_ms,
1617
fast::FxHashMap,
1718
format_date_tz, merge_codex_service_tiers, parse_ts_timestamp, parse_tz, wants_json,
1819
week_start,
@@ -73,7 +74,10 @@ fn load_groups_from_sources(
7374
shared: &SharedArgs,
7475
kind: AgentReportKind,
7576
) -> Result<BTreeMap<String, CodexGroup>> {
76-
let file_groups = paths::collect_deduped_codex_usage_files(sources);
77+
let mut file_groups = paths::collect_deduped_codex_usage_files(sources);
78+
for group in &mut file_groups {
79+
retain_report_files(&mut group.files, shared);
80+
}
7781
let replay_plan = CodexReplayPlan::new(
7882
file_groups
7983
.iter()
@@ -106,7 +110,8 @@ pub(super) fn load_groups_from_directory(
106110
shared: &SharedArgs,
107111
kind: AgentReportKind,
108112
) -> Result<BTreeMap<String, CodexGroup>> {
109-
let files = paths::collect_codex_usage_files(sessions_dir);
113+
let mut files = paths::collect_codex_usage_files(sessions_dir);
114+
retain_report_files(&mut files, shared);
110115
let replay_plan =
111116
CodexReplayPlan::new([(sessions_dir, files.as_slice())], shared.single_thread);
112117
let run = CodexAggregateRun {
@@ -125,6 +130,31 @@ pub(super) fn load_groups_from_directory(
125130
Ok(groups)
126131
}
127132

133+
fn retain_report_files(files: &mut Vec<PathBuf>, shared: &SharedArgs) {
134+
let timezone = parse_tz(shared.timezone.as_deref()).or_else(|| Some(JiffTimeZone::system()));
135+
let (Some(start), _) = date_range_bounds_ms(shared.since.as_deref(), None, timezone.as_ref())
136+
else {
137+
return;
138+
};
139+
let now = std::time::SystemTime::now()
140+
.duration_since(std::time::UNIX_EPOCH)
141+
.ok()
142+
.and_then(|duration| i64::try_from(duration.as_millis()).ok());
143+
if now.is_none_or(|now| start > now) {
144+
return;
145+
}
146+
// ponytail: mtime is a one-day-widened proxy; inspect file tails if preserved mtimes matter.
147+
let cutoff = start.saturating_sub(MILLIS_PER_DAY);
148+
files.retain(|file| {
149+
file.metadata()
150+
.and_then(|metadata| metadata.modified())
151+
.ok()
152+
.and_then(|modified| modified.duration_since(std::time::UNIX_EPOCH).ok())
153+
.and_then(|duration| i64::try_from(duration.as_millis()).ok())
154+
.is_none_or(|modified| modified >= cutoff)
155+
});
156+
}
157+
128158
fn aggregate_files_with_dedupe(
129159
run: &CodexAggregateRun<'_>,
130160
seen: &CodexDedupeShards,
@@ -711,6 +741,41 @@ mod tests {
711741
}
712742
}
713743

744+
#[test]
745+
fn skips_codex_files_older_than_since_window() {
746+
let fixture = fs_fixture!({
747+
"old.jsonl": "",
748+
"recent.jsonl": "",
749+
});
750+
let old = fixture.path("old.jsonl");
751+
let recent = fixture.path("recent.jsonl");
752+
for (file, timestamp) in [
753+
(&old, "2026-05-20T00:00:00Z"),
754+
(&recent, "2026-05-28T12:00:00Z"),
755+
] {
756+
let modified = std::time::UNIX_EPOCH
757+
+ std::time::Duration::from_millis(
758+
parse_ts_timestamp(timestamp).unwrap().as_millis() as u64,
759+
);
760+
std::fs::File::options()
761+
.write(true)
762+
.open(file)
763+
.unwrap()
764+
.set_times(std::fs::FileTimes::new().set_modified(modified))
765+
.unwrap();
766+
}
767+
let mut files = vec![old, recent.clone()];
768+
let shared = SharedArgs {
769+
since: Some("20260529".to_string()),
770+
timezone: Some("UTC".to_string()),
771+
..SharedArgs::default()
772+
};
773+
774+
retain_report_files(&mut files, &shared);
775+
776+
assert_eq!(files, vec![recent]);
777+
}
778+
714779
#[test]
715780
fn omits_session_period_without_session_id() {
716781
let timestamp = parse_ts_timestamp("2026-05-29T08:01:00.000Z").unwrap();

‎rust/adapters/codex/src/lib.rs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ pub use types::{
2626
};
2727
pub(crate) use types::{CodexRawUsage, merge_codex_service_tiers};
2828

29+
pub fn has_data() -> bool {
30+
paths::codex_usage_sources().is_ok_and(|sources| {
31+
sources
32+
.iter()
33+
.any(|source| !paths::collect_codex_usage_files(&source.dir).is_empty())
34+
})
35+
}
36+
2937
use report::{print_table_from_groups, report_from_groups};
3038

3139
use crate::cli::{AgentReportKind, CodexSpeed};

‎rust/crates/ccusage-adapter-all/src/loader.rs‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -627,23 +627,8 @@ fn load_codex_rows(
627627
shared: &SharedArgs,
628628
pricing: &PricingMap,
629629
) -> Result<AgentRows> {
630-
if shared.since.is_none() && shared.until.is_none() {
631-
let groups = codex::load_groups(shared, kind)?;
632-
let detected = !groups.is_empty();
633-
let speed = codex::resolve_codex_speed(CodexSpeed::Auto);
634-
return Ok(AgentRows {
635-
rows: groups
636-
.iter()
637-
.map(|(period, group)| codex_group_row(period, group, pricing, speed))
638-
.collect(),
639-
detected,
640-
});
641-
}
642-
643-
let mut events = codex::load_codex_events(shared)?;
644-
let detected = !events.is_empty();
645-
codex::filter_events_by_date(&mut events, shared)?;
646-
let groups = codex::aggregate_events(&events, kind, shared.timezone.as_deref())?;
630+
let groups = codex::load_groups(shared, kind)?;
631+
let detected = !groups.is_empty() || codex::has_data();
647632
let speed = codex::resolve_codex_speed(CodexSpeed::Auto);
648633
Ok(AgentRows {
649634
rows: groups

‎rust/crates/ccusage-adapter-all/src/tests.rs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,31 @@ fn multi_section_codex_fixture_matches_standalone_sections_for_daily_and_session
525525
assert_daily_family_and_session_sections_match_standalone(&shared);
526526
}
527527

528+
#[test]
529+
fn detects_codex_when_date_filter_excludes_all_rows() {
530+
let fixture = fs_fixture!({
531+
"codex/sessions/session.jsonl": codex_usage_line(
532+
"2026-01-02T08:01:00.000Z",
533+
"gpt-5.2",
534+
1_000,
535+
),
536+
});
537+
let _env = isolated_agent_env(
538+
&fixture,
539+
"CODEX_HOME",
540+
fixture.path("codex").into_os_string(),
541+
);
542+
543+
let result = loader::load_rows(
544+
AgentReportKind::Daily,
545+
&fixture_shared("20990102", "20990102"),
546+
)
547+
.unwrap();
548+
549+
assert!(result.rows.is_empty());
550+
assert_eq!(result.detected_agents, vec!["codex"]);
551+
}
552+
528553
fn fixture_shared(since: &str, until: &str) -> SharedArgs {
529554
SharedArgs {
530555
since: Some(since.to_string()),

0 commit comments

Comments
 (0)