Skip to content

Commit 6707f93

Browse files
committed
fix(codex): align unified display pricing metadata
1 parent fe31750 commit 6707f93

3 files changed

Lines changed: 52 additions & 11 deletions

File tree

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -633,11 +633,13 @@ pub(super) fn print_table_from_groups(
633633
table.separator();
634634
table.push(codex_table_total_row(&totals, shared, shared.no_cost));
635635
table.print()?;
636-
let missing_models = codex_missing_pricing_models(groups, pricing);
637-
print_missing_pricing_warnings_for_models(
638-
missing_models.iter().map(String::as_str),
639-
shared.offline,
640-
);
636+
if shared.mode != CostMode::Display {
637+
let missing_models = codex_missing_pricing_models(groups, pricing);
638+
print_missing_pricing_warnings_for_models(
639+
missing_models.iter().map(String::as_str),
640+
shared.offline,
641+
);
642+
}
641643
Ok(())
642644
}
643645

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::{
1414
amp, antigravity, claude, codebuff, codex, copilot, droid, gemini, goose, grok, hermes,
1515
kilo, kimi, openclaw, opencode, pi, qwen, zcode,
1616
},
17-
cli::{AgentReportKind, CodexSpeed, NamedPiStore, SharedArgs, WeekDay},
17+
cli::{AgentReportKind, CodexSpeed, CostMode, NamedPiStore, SharedArgs, WeekDay},
1818
filter_loaded_entries_by_date, json_float,
1919
};
2020

@@ -674,7 +674,7 @@ fn load_codex_rows(
674674
return Ok(AgentRows {
675675
rows: groups
676676
.iter()
677-
.map(|(period, group)| codex_group_row(period, group, pricing, speed))
677+
.map(|(period, group)| codex_group_row(period, group, pricing, speed, shared.mode))
678678
.collect(),
679679
detected,
680680
});
@@ -687,7 +687,7 @@ fn load_codex_rows(
687687
Ok(AgentRows {
688688
rows: groups
689689
.iter()
690-
.map(|(period, group)| codex_group_row(period, group, pricing, speed))
690+
.map(|(period, group)| codex_group_row(period, group, pricing, speed, shared.mode))
691691
.collect(),
692692
detected,
693693
})
@@ -829,6 +829,7 @@ pub(super) fn codex_group_row<S>(
829829
group: &CodexGroup,
830830
pricing: &PricingMap,
831831
speed: S,
832+
mode: CostMode,
832833
) -> AllRow
833834
where
834835
S: Into<codex::CodexSpeedPolicy> + Copy,
@@ -851,7 +852,8 @@ where
851852
cache_read_tokens: usage.cached_input_tokens,
852853
extra_total_tokens: 0,
853854
cost: codex::calculate_codex_model_cost(model, usage, pricing, speed),
854-
missing_pricing: codex::codex_model_missing_pricing(model, usage, pricing),
855+
missing_pricing: mode != CostMode::Display
856+
&& codex::codex_model_missing_pricing(model, usage, pricing),
855857
}
856858
})
857859
.collect();
@@ -1097,7 +1099,7 @@ mod tests {
10971099
let speed = codex::CodexSpeedPolicy::Auto(codex::CodexServiceTier::Standard);
10981100

10991101
let focused_cost = codex::calculate_group_cost(&group, &pricing, speed);
1100-
let unified = codex_group_row("2026-07-22", &group, &pricing, speed);
1102+
let unified = codex_group_row("2026-07-22", &group, &pricing, speed, CostMode::Calculate);
11011103

11021104
assert!((focused_cost - 40e-6).abs() < f64::EPSILON);
11031105
assert!((unified.total_cost - focused_cost).abs() < f64::EPSILON);
@@ -1134,6 +1136,7 @@ mod tests {
11341136
&group,
11351137
&pricing,
11361138
codex::CodexSpeedPolicy::Forced(codex::CodexServiceTier::Standard),
1139+
CostMode::Calculate,
11371140
);
11381141
let expected_cost =
11391142
2_124.0 * 4e-6 + 875_306.0 * 0.4e-6 + 57_610.0 * 5e-6 + 11_150.0 * 18e-6;

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

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1142,6 +1142,7 @@ fn uses_non_cached_codex_input_tokens_in_all_rows() {
11421142
&group,
11431143
&PricingMap::default(),
11441144
CodexSpeed::Standard,
1145+
CostMode::Calculate,
11451146
);
11461147

11471148
assert_eq!(row.input_tokens, 10);
@@ -1195,7 +1196,13 @@ fn includes_codex_model_breakdowns_in_all_rows() {
11951196
},
11961197
);
11971198

1198-
let row = codex_group_row("2026-01-02", &group, &pricing, CodexSpeed::Standard);
1199+
let row = codex_group_row(
1200+
"2026-01-02",
1201+
&group,
1202+
&pricing,
1203+
CodexSpeed::Standard,
1204+
CostMode::Calculate,
1205+
);
11991206

12001207
assert_eq!(row.model_breakdowns.len(), 2);
12011208
assert_eq!(row.model_breakdowns[0].model_name, "gpt-5");
@@ -1205,6 +1212,35 @@ fn includes_codex_model_breakdowns_in_all_rows() {
12051212
assert_eq!(row.model_breakdowns[1].model_name, "gpt-5-mini");
12061213
}
12071214

1215+
#[test]
1216+
fn display_mode_omits_codex_missing_pricing_from_unified_json() {
1217+
let mut group = CodexGroup::default();
1218+
group.models.insert(
1219+
"gpt-unknown-preview".to_string(),
1220+
CodexModelUsage {
1221+
input_tokens: 100,
1222+
total_tokens: 100,
1223+
..CodexModelUsage::default()
1224+
},
1225+
);
1226+
let row = codex_group_row(
1227+
"2026-01-02",
1228+
&group,
1229+
&PricingMap::default(),
1230+
CodexSpeed::Standard,
1231+
CostMode::Display,
1232+
);
1233+
1234+
let report = report_json(&[row], AgentReportKind::Daily);
1235+
1236+
assert!(report["totals"].get("unpricedModels").is_none());
1237+
assert!(
1238+
report["daily"][0]["modelBreakdowns"][0]
1239+
.get("missingPricing")
1240+
.is_none()
1241+
);
1242+
}
1243+
12081244
#[test]
12091245
fn aggregates_model_breakdowns_across_agents() {
12101246
let rows = aggregate_rows(

0 commit comments

Comments
 (0)