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: inline pending cleanup check

Browse Source
This commit is contained in:
Brent Traut
2026-05-18 19:57:54 -07:00
parent 678543f365
commit 5e007ccff4
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,12 +183,13 @@ pub(crate) async fn apply_bespoke_event_handling(
outgoing.abort_pending_server_requests().await;
respond_to_pending_interrupts(&thread_state, &outgoing).await;
let turn_failed = thread_state.lock().await.turn_summary.last_error.is_some();
let preserve_terminal_plan_progress =
terminal_plan_cleanup_may_be_needed(&thread_state).await
&& should_preserve_terminal_plan_progress(
conversation.as_ref(),
conversation_id,
)
let has_pending_terminal_plan_cleanup = !thread_state
.lock()
.await
.pending_terminal_plan_cleanups
.is_empty();
let preserve_terminal_plan_progress = has_pending_terminal_plan_cleanup
&& should_preserve_terminal_plan_progress(conversation.as_ref(), conversation_id)
.await;
thread_watch_manager
.note_turn_completed(&conversation_id.to_string(), turn_failed)
@@ -1381,14 +1382,6 @@ async fn emit_turn_plan_updated(
.await;
}
async fn terminal_plan_cleanup_may_be_needed(thread_state: &Arc<Mutex<ThreadState>>) -> bool {
!thread_state
.lock()
.await
.pending_terminal_plan_cleanups
.is_empty()
}
async fn take_flushable_pending_terminal_plan_cleanup(
thread_state: &Arc<Mutex<ThreadState>>,
) -> Vec<PendingTerminalPlanCleanup> {