Skip to content

Port v0.57.0: detect whitespace turn_context candidates #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Finesssee wants to merge 1 commit into
base: port/upstream-0.57.0
Choose a base branch
from
+44 −0
Open

Port v0.57.0: detect whitespace turn_context candidates #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust/src/core/jsonl_scanner/codex/helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ pub(super) fn parse_codex_fast_event(line: &str) -> Option<CodexFastEvent<'_>> {
pub(super) fn is_candidate_codex_line(line: &str) -> bool {
if !line.contains("\"type\":\"event_msg\"")
&& !line.contains("\"type\":\"turn_context\"")
&& !line.contains("\"turn_context\"")
&& !line.contains("\"event_msg\"")
{
return false;
Expand Down
43 changes: 43 additions & 0 deletions rust/src/core/jsonl_scanner/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,49 @@ fn test_fast_codex_parser_reads_legacy_event_msg_shape() {
assert_eq!((record.input, record.cached, record.output), (20, 5, 3));
}

#[test]
fn codex_fast_parser_accepts_compact_and_spaced_event_records_equally() {
let range = CostUsageDayRange::new(
NaiveDate::from_ymd_opt(2026, 5, 31).unwrap(),
NaiveDate::from_ymd_opt(2026, 5, 31).unwrap(),
);
let parsed = |line: &str| {
let mut parser = CodexParserState::new(Some("gpt-5".to_string()), None);
parser.process_line(line, &range);
(
parser.current_model,
parser
.records
.into_iter()
.map(|record| {
(
record.day_key,
record.model,
record.input,
record.cached,
record.output,
record.reasoning,
)
})
.collect::<Vec<_>>(),
)
};

let compact_event = r#"{"timestamp":"2026-05-31T10:00:01Z","type":"event_msg","payload":{"type":"token_count","info":{"last_token_usage":{"input_tokens":20,"cached_input_tokens":5,"output_tokens":3}}}}"#;
let spaced_event = r#"{ "timestamp": "2026-05-31T10:00:01Z", "type": "event_msg", "payload": { "type": "token_count", "info": { "last_token_usage": { "input_tokens": 20, "cached_input_tokens": 5, "output_tokens": 3 } } } }"#;
assert!(is_candidate_codex_line(spaced_event));
assert_eq!(parsed(compact_event), parsed(spaced_event));

let compact_context = r#"{"timestamp":"2026-05-31T10:00:00Z","type":"turn_context","payload":{"model":"gpt-5.5"}}"#;
let spaced_context = "{\t\"timestamp\": \"2026-05-31T10:00:00Z\",\t\"type\":\t\"turn_context\",\t\"payload\": {\t\"model\": \"gpt-5.5\"\t}\t}";
assert!(is_candidate_codex_line(spaced_context));
assert_eq!(parsed(compact_context), parsed(spaced_context));

let unrelated = r#"{ "timestamp": "2026-05-31T10:00:00Z", "type": "response", "payload": { "model": "gpt-5.5" } }"#;
assert!(!is_candidate_codex_line(unrelated));
assert_eq!(parsed(unrelated), (Some("gpt-5".to_string()), Vec::new()));
}

#[test]
fn test_parse_codex_file_uses_fast_parser_for_current_logs() {
let mut file = tempfile::NamedTempFile::new().expect("temp file");
Expand Down