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

Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui

Browse Source
This commit is contained in:
Eric Traut
2026-05-18 21:02:09 -07:00
parent 1cf5fd347a bac94585e7
commit 54d4b5c862
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
codex-rs/app-server/src/request_processors/turn_processor.rs
View File

@@ -784,6 +784,14 @@ impl TurnRequestProcessor {
.inspect_err(|error| {
self.track_error_response(request_id, error, /*error_type*/ None);
})?;
let thread_state = self.thread_state_manager.thread_state(thread_id).await;
super::thread_lifecycle::ensure_listener_task_running(
self.listener_task_context(),
thread_id,
thread.clone(),
thread_state.clone(),
)
.await?;
self.wait_for_pending_thread_settings(thread_id).await?;
let before_snapshot = thread.config_snapshot().await;
let before_thread_settings = thread_settings_from_snapshot(&before_snapshot);
@@ -816,7 +824,6 @@ impl TurnRequestProcessor {
})?;
let update_id = Uuid::now_v7().to_string();
let (thread_settings_applied, notification_lock) = {
let thread_state = self.thread_state_manager.thread_state(thread_id).await;
let mut thread_state = thread_state.lock().await;
thread_state.track_pending_thread_settings(update_id.clone())
};
@@ -831,7 +838,6 @@ impl TurnRequestProcessor {
})
.await
{
let thread_state = self.thread_state_manager.thread_state(thread_id).await;
let mut thread_state = thread_state.lock().await;
thread_state.cancel_pending_thread_settings(&update_id);
return Err(internal_error(format!(