From 03606c72fdd69548f3c7e6ded9d6f50cdfb3659e Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Sun, 12 Apr 2026 12:50:51 -0700
Subject: [PATCH] Route realtime handoff through inner turn handler

---
 codex-rs/core/src/codex.rs | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index f5be00103b..c19c4b48fd 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -2265,7 +2265,7 @@ impl Session {
     }
 
     pub(crate) async fn route_realtime_text_input(self: &Arc<Self>, text: String) {
-        let _ = handlers::user_input_or_turn_without_realtime_text_mirror(
+        handlers::user_input_or_turn_inner(
             self,
             self.next_internal_sub_id(),
             Op::UserInput {
@@ -2276,6 +2276,7 @@ impl Session {
                 final_output_json_schema: None,
                 responsesapi_client_metadata: None,
             },
+            /*mirror_user_text_to_realtime*/ None,
         )
         .await;
     }
@@ -4960,18 +4961,21 @@ mod handlers {
     }
 
     pub async fn user_input_or_turn(sess: &Arc<Session>, sub_id: String, op: Op) {
-        let accepted_items =
-            user_input_or_turn_without_realtime_text_mirror(sess, sub_id, op).await;
-        if let Some(items) = accepted_items {
-            mirror_user_text_to_realtime(sess, &items).await;
-        }
+        user_input_or_turn_inner(
+            sess,
+            sub_id,
+            op,
+            /*mirror_user_text_to_realtime*/ Some(()),
+        )
+        .await;
     }
 
-    pub(super) async fn user_input_or_turn_without_realtime_text_mirror(
+    pub(super) async fn user_input_or_turn_inner(
         sess: &Arc<Session>,
         sub_id: String,
         op: Op,
-    ) -> Option<Vec<UserInput>> {
+        mirror_user_text_to_realtime: Option<()>,
+    ) {
         let (items, updates, responsesapi_client_metadata) = match op {
             Op::UserTurn {
                 cwd,
@@ -5033,11 +5037,11 @@ mod handlers {
 
         let Ok(current_context) = sess.new_turn_with_sub_id(sub_id.clone(), updates).await else {
             // new_turn_with_sub_id already emits the error event.
-            return None;
+            return;
         };
         sess.maybe_emit_unknown_model_warning_for_turn(current_context.as_ref())
             .await;
-        match sess
+        let accepted_items = match sess
             .steer_input(
                 items.clone(),
                 /*expected_turn_id*/ None,
@@ -5075,6 +5079,9 @@ mod handlers {
                 .await;
                 None
             }
+        };
+        if let (Some(items), Some(())) = (accepted_items, mirror_user_text_to_realtime) {
+            self::mirror_user_text_to_realtime(sess, &items).await;
         }
     }