@@ -334,7 +334,7 @@ fn visit_codex_session_entry(
334334 if let Some ( total_usage) = total_usage {
335335 * previous_totals = Some ( total_usage) ;
336336 }
337- let Some ( raw_usage) = raw_usage else {
337+ let Some ( raw_usage) = raw_usage. map ( normalize_codex_raw_usage ) else {
338338 return Ok ( ( ) ) ;
339339 } ;
340340 if raw_usage. input_tokens == 0
@@ -439,6 +439,7 @@ fn visit_codex_exec_usage_event(
439439 current_model_is_fallback : & mut bool ,
440440 visit : & mut impl FnMut ( CodexTokenUsageEvent ) -> Result < ( ) > ,
441441) -> Result < ( ) > {
442+ let raw_usage = normalize_codex_raw_usage ( raw_usage) ;
442443 let ( model, is_fallback_model) = resolve_codex_usage_model (
443444 parsed_model,
444445 & timestamps. model ,
@@ -1026,7 +1027,7 @@ fn normalize_value_timestamp(value: Option<&Value>) -> Option<String> {
10261027}
10271028
10281029fn normalize_headless_codex_usage ( value : & CodexLogEntry < ' _ > ) -> Option < CodexRawUsage > {
1029- let usage = usage_from_result ( value) ?;
1030+ let usage = normalize_codex_raw_usage ( usage_from_result ( value) ?) ;
10301031 if usage. input_tokens == 0
10311032 && usage. cached_input_tokens == 0
10321033 && usage. cache_creation_tokens == 0
@@ -1040,7 +1041,7 @@ fn normalize_headless_codex_usage(value: &CodexLogEntry<'_>) -> Option<CodexRawU
10401041}
10411042
10421043fn normalize_headless_codex_usage_value ( value : & Value ) -> Option < CodexRawUsage > {
1043- let usage = usage_from_result_value ( value) ?;
1044+ let usage = normalize_codex_raw_usage ( usage_from_result_value ( value) ?) ;
10441045 if usage. input_tokens == 0
10451046 && usage. cached_input_tokens == 0
10461047 && usage. cache_creation_tokens == 0
@@ -1070,7 +1071,7 @@ fn subtract_codex_raw_usage(
10701071 current : & CodexRawUsage ,
10711072 previous : Option < & CodexRawUsage > ,
10721073) -> CodexRawUsage {
1073- CodexRawUsage {
1074+ normalize_codex_raw_usage ( CodexRawUsage {
10741075 input_tokens : current
10751076 . input_tokens
10761077 . saturating_sub ( previous. map_or ( 0 , |usage| usage. input_tokens ) ) ,
@@ -1089,7 +1090,15 @@ fn subtract_codex_raw_usage(
10891090 total_tokens : current
10901091 . total_tokens
10911092 . saturating_sub ( previous. map_or ( 0 , |usage| usage. total_tokens ) ) ,
1092- }
1093+ } )
1094+ }
1095+
1096+ fn normalize_codex_raw_usage ( mut usage : CodexRawUsage ) -> CodexRawUsage {
1097+ usage. cached_input_tokens = usage. cached_input_tokens . min ( usage. input_tokens ) ;
1098+ usage. cache_creation_tokens = usage
1099+ . cache_creation_tokens
1100+ . min ( usage. input_tokens . saturating_sub ( usage. cached_input_tokens ) ) ;
1101+ usage
10931102}
10941103
10951104#[ cfg( test) ]
@@ -1142,4 +1151,43 @@ mod tests {
11421151 . all( |window| window[ 0 ] . released_on > window[ 1 ] . released_on)
11431152 ) ;
11441153 }
1154+
1155+ #[ test]
1156+ fn normalizes_cache_usage_after_cumulative_resets_and_series_changes ( ) {
1157+ let reset = subtract_codex_raw_usage (
1158+ & CodexRawUsage {
1159+ input_tokens : 10 ,
1160+ cached_input_tokens : 10 ,
1161+ cache_creation_tokens : 0 ,
1162+ ..CodexRawUsage :: default ( )
1163+ } ,
1164+ Some ( & CodexRawUsage {
1165+ input_tokens : 100 ,
1166+ cached_input_tokens : 0 ,
1167+ cache_creation_tokens : 100 ,
1168+ ..CodexRawUsage :: default ( )
1169+ } ) ,
1170+ ) ;
1171+ let series_change = subtract_codex_raw_usage (
1172+ & CodexRawUsage {
1173+ input_tokens : 110 ,
1174+ cached_input_tokens : 0 ,
1175+ cache_creation_tokens : 110 ,
1176+ ..CodexRawUsage :: default ( )
1177+ } ,
1178+ Some ( & CodexRawUsage {
1179+ input_tokens : 100 ,
1180+ cached_input_tokens : 100 ,
1181+ cache_creation_tokens : 0 ,
1182+ ..CodexRawUsage :: default ( )
1183+ } ) ,
1184+ ) ;
1185+
1186+ assert_eq ! ( reset. input_tokens, 0 ) ;
1187+ assert_eq ! ( reset. cached_input_tokens, 0 ) ;
1188+ assert_eq ! ( reset. cache_creation_tokens, 0 ) ;
1189+ assert_eq ! ( series_change. input_tokens, 10 ) ;
1190+ assert_eq ! ( series_change. cached_input_tokens, 0 ) ;
1191+ assert_eq ! ( series_change. cache_creation_tokens, 10 ) ;
1192+ }
11451193}
0 commit comments