clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-22 12:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

app-server: simplify deferred cleanup emission

Browse Source
This commit is contained in:
Brent Traut
2026-05-18 19:24:46 -07:00
parent 8ed9601d2d
commit 97bcd94066
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
codex-rs/app-server/src/bespoke_event_handling.rs
View File

@@ -1608,16 +1608,14 @@ async fn handle_turn_complete(
thread_state: &Arc<Mutex<ThreadState>>,
) {
let turn_summary = find_and_remove_turn_summary(thread_state).await;
emit_terminal_plan_cleanup(
conversation_id,
if preserve_terminal_plan_progress {
Vec::new()
} else {
take_pending_terminal_plan_cleanup(thread_state).await
},
outgoing,
)
.await;
if !preserve_terminal_plan_progress {
emit_terminal_plan_cleanup(
conversation_id,
take_pending_terminal_plan_cleanup(thread_state).await,
outgoing,
)
.await;
}
let (status, error) = match turn_summary.last_error {
Some(error) => (TurnStatus::Failed, Some(error)),
@@ -1648,16 +1646,14 @@ async fn handle_turn_interrupted(
thread_state: &Arc<Mutex<ThreadState>>,
) {
let turn_summary = find_and_remove_turn_summary(thread_state).await;
emit_terminal_plan_cleanup(
conversation_id,
if preserve_terminal_plan_progress {
Vec::new()
} else {
take_pending_terminal_plan_cleanup(thread_state).await
},
outgoing,
)
.await;
if !preserve_terminal_plan_progress {
emit_terminal_plan_cleanup(
conversation_id,
take_pending_terminal_plan_cleanup(thread_state).await,
outgoing,
)
.await;
}
emit_turn_completed_with_status(
conversation_id,