clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 06:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

codex: address PR review feedback (#15106)

Browse Source
This commit is contained in:
Eric Traut
2026-03-19 08:26:55 -06:00
parent f83b099c10
commit e616e4b28b
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
codex-rs/exec/src/event_processor_with_jsonl_output.rs
View File

@@ -286,6 +286,13 @@ impl EventProcessorWithJsonOutput {
Some(ExecThreadItem { id, details })
}
fn final_message_from_turn_items(items: &[ThreadItem]) -> Option<String> {
items.iter().rev().find_map(|item| match item {
ThreadItem::AgentMessage { text, .. } => Some(text.clone()),
_ => None,
})
}
fn thread_started_event(session_configured: &SessionConfiguredEvent) -> ThreadEvent {
ThreadEvent::ThreadStarted(ThreadStartedEvent {
thread_id: session_configured.session_id.to_string(),
@@ -397,6 +404,11 @@ impl EventProcessorWithJsonOutput {
}
match notification.turn.status {
TurnStatus::Completed => {
if self.final_message.is_none() {
self.final_message = Self::final_message_from_turn_items(
notification.turn.items.as_slice(),
);
}
events.push(ThreadEvent::TurnCompleted(TurnCompletedEvent {
usage: self.usage_from_last_total(),
}));

32
codex-rs/exec/src/event_processor_with_jsonl_output_tests.rs
View File

@@ -419,6 +419,38 @@ fn token_usage_update_is_emitted_on_turn_completion() {
);
}
#[test]
fn turn_completion_recovers_final_message_from_turn_items() {
let mut processor = EventProcessorWithJsonOutput::new(None);
let completed =
processor.collect_thread_events(TypedExecEvent::TurnCompleted(TurnCompletedNotification {
thread_id: "thread-1".to_string(),
turn: Turn {
id: "turn-1".to_string(),
items: vec![ThreadItem::AgentMessage {
id: "msg-1".to_string(),
text: "final answer".to_string(),
phase: None,
memory_citation: None,
}],
status: TurnStatus::Completed,
error: None,
},
}));
assert_eq!(
completed,
CollectedThreadEvents {
events: vec![ThreadEvent::TurnCompleted(TurnCompletedEvent {
usage: Usage::default(),
})],
status: CodexStatus::InitiateShutdown,
}
);
assert_eq!(processor.final_message.as_deref(), Some("final answer"));
}
#[test]
fn turn_failure_prefers_structured_error_message() {
let mut processor = EventProcessorWithJsonOutput::new(None);