From 98c38ee9bf8b5186a5744f4e564d1c5babba6ba5 Mon Sep 17 00:00:00 2001
From: Eric Traut <etraut@openai.com>
Date: Sat, 16 May 2026 18:05:35 -0700
Subject: [PATCH] Simplify turn context handler

---
 codex-rs/core/src/session/handlers.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/codex-rs/core/src/session/handlers.rs b/codex-rs/core/src/session/handlers.rs
index d9a6058a91..82133b6a7e 100644
--- a/codex-rs/core/src/session/handlers.rs
+++ b/codex-rs/core/src/session/handlers.rs
@@ -93,10 +93,11 @@ pub async fn user_input_or_turn(sess: &Arc<Session>, sub_id: String, op: Op) {
     .await;
 }
 
-pub async fn update_turn_context(sess: &Arc<Session>, sub_id: String, op: Op) {
-    let Op::TurnContext { turn_context } = op else {
-        unreachable!();
-    };
+pub async fn update_turn_context(
+    sess: &Arc<Session>,
+    sub_id: String,
+    turn_context: TurnContextOverrides,
+) {
     let updates = turn_context_settings_update(sess, turn_context).await;
     let msg = match sess.update_settings(updates).await {
         Ok(()) => turn_context_applied_event(sess).await,
@@ -768,8 +769,8 @@ pub(super) async fn submission_loop(
                     user_input_or_turn(&sess, sub.id.clone(), sub.op).await;
                     false
                 }
-                Op::TurnContext { .. } => {
-                    update_turn_context(&sess, sub.id.clone(), sub.op).await;
+                Op::TurnContext { turn_context } => {
+                    update_turn_context(&sess, sub.id.clone(), turn_context).await;
                     false
                 }
                 Op::InterAgentCommunication { communication } => {