From 62df4d9f9e2bb56f19082d58773bb5d2adcbb70f Mon Sep 17 00:00:00 2001
From: Eric Traut <etraut@openai.com>
Date: Mon, 18 May 2026 21:46:46 -0700
Subject: [PATCH] Wait for pending settings before turn start

---
 codex-rs/app-server/src/request_processors/turn_processor.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/codex-rs/app-server/src/request_processors/turn_processor.rs b/codex-rs/app-server/src/request_processors/turn_processor.rs
index 50cefaf4f0..4ad481f994 100644
--- a/codex-rs/app-server/src/request_processors/turn_processor.rs
+++ b/codex-rs/app-server/src/request_processors/turn_processor.rs
@@ -636,9 +636,7 @@ impl TurnRequestProcessor {
             collaboration_mode: params.collaboration_mode,
             personality: params.personality,
         };
-        if thread_settings_request.has_any_overrides() {
-            self.wait_for_pending_thread_settings(thread_id).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);