Skip to content

Commit 4fb1c0d

Browse files
fix(codex): guard truncated type fields from panicking the parser (ccusage#2034)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ryoppippi <[email protected]>
1 parent 40160d8 commit 4fb1c0d

2 files changed

Lines changed: 28 additions & 1 deletion

File tree

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,6 +939,31 @@ mod tests {
939939
assert_eq!(events[1].total_tokens, 125);
940940
}
941941

942+
#[test]
943+
fn skips_truncated_type_fields_without_losing_valid_usage() {
944+
let usage_line = r#"{"timestamp":"2026-01-02T00:00:01.000Z","type":"event_msg","payload":{"type":"token_count","info":{"model":"gpt-5","last_token_usage":{"input_tokens":100,"cached_input_tokens":10,"output_tokens":50,"total_tokens":150}}}}"#;
945+
for truncated in [
946+
r#"{"type" :"#,
947+
"{\"type\" : \t\r",
948+
r#"{"type" : ""#,
949+
r#"{"type":"event_msg","payload":{"type":"#,
950+
r#"{"type":"event_msg","payload":{"type":""#,
951+
] {
952+
let fixture = fs_fixture!({
953+
"session.jsonl": [truncated, usage_line, truncated].join("\n"),
954+
});
955+
956+
let events = load_codex_events_from_directory(fixture.root(), true).unwrap();
957+
958+
assert_eq!(events.len(), 1, "{truncated:?}");
959+
assert_eq!(events[0].model.as_deref(), Some("gpt-5"));
960+
assert_eq!(events[0].input_tokens, 100);
961+
assert_eq!(events[0].cached_input_tokens, 10);
962+
assert_eq!(events[0].output_tokens, 50);
963+
assert_eq!(events[0].total_tokens, 150);
964+
}
965+
}
966+
942967
#[test]
943968
fn subtracts_cache_write_usage_from_cumulative_token_totals() {
944969
let fixture = fs_fixture!({

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,9 @@ fn codex_line_type_flags(line: &[u8]) -> (bool, bool, bool, bool, bool, bool) {
736736
let mut has_thread_settings_applied = false;
737737
let mut has_token_usage_record = false;
738738
let mut has_compacted = false;
739-
while let Some(index) = TYPE_KEY_FINDER.find(&line[start..]) {
739+
while start < line.len()
740+
&& let Some(index) = TYPE_KEY_FINDER.find(&line[start..])
741+
{
740742
let key_start = start + index;
741743
let mut cursor = skip_json_whitespace(line, key_start + br#""type""#.len());
742744
if line.get(cursor) != Some(&b':') {

0 commit comments

Comments
 (0)