From d03e67e52ac1f4d0e953fa586ccae4e856264184 Mon Sep 17 00:00:00 2001
From: Eric Traut <etraut@openai.com>
Date: Fri, 6 Feb 2026 12:37:53 -0800
Subject: [PATCH] Code review feedback

---
 codex-rs/core/src/codex.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index 0610d3916a..1e9f7b2a97 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -2803,6 +2803,12 @@ async fn submission_loop(sess: Arc<Session>, config: Arc<Config>, rx_sub: Receiv
                         None,
                     )
                 };
+                if previous_context.is_none() {
+                    // Non-deferred sessions can receive overrides before the first turn.
+                    // Capture the current baseline so the first turn can persist diffed
+                    // settings updates (model/cwd/permissions/collaboration/personality).
+                    previous_context = Some(sess.new_default_turn().await);
+                }
                 handlers::override_turn_context(
                     &sess,
                     sub.id.clone(),