From 91036ea7dfd208f55c264e3c25efa328e25a744d Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Mon, 8 Sep 2025 13:06:34 -0700
Subject: [PATCH] timestamp

---
 codex-rs/core/src/codex.rs          | 55 ++++++++++++++++-------------
 codex-rs/core/tests/suite/client.rs | 15 ++++++++
 codex-rs/protocol/src/protocol.rs   |  2 +-
 3 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index f7974d062c..aa4d51cf6d 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -586,29 +586,12 @@ impl Session {
             self.record_conversation_items_internal(&responses, false).await;
         }
 
-        // Build initial UI messages: include everything before session resume marker,
-        // and only user messages afterwards
-        let before_resume_session = items
-            .get(0)
-            .map(|it| !matches!(it, RolloutItem::SessionMeta(..)))
-            .unwrap_or(true);
-
         let mut msgs = Vec::new();
-        for response in items.as_slice().get_response_items() {
-            let new_msgs: Vec<EventMsg> =
-                map_response_item_to_event_messages(&response, self.show_raw_agent_reasoning);
-            if before_resume_session {
-                msgs.extend(new_msgs);
-            } else {
-                msgs.extend(
-                    new_msgs
-                        .into_iter()
-                        .filter(|m| matches!(m, EventMsg::UserMessage(_))),
-                );
-            }
-        }
         for event in items.as_slice().get_events() {
-            msgs.push(event.msg);
+            match event.msg {
+                EventMsg::UserMessage(_) | EventMsg::AgentMessage(_) => msgs.push(event.msg),
+                _ => {}
+            }
         }
         msgs
     }
@@ -746,6 +729,27 @@ impl Session {
         }
     }
 
+    /// Records a user input into conversation history AND a corresponding UserMessage event in rollout.
+    /// Does not send events to the UI.
+    async fn record_user_input(&self, sub_id: &str, response_item: ResponseItem) {
+        // Record the message/tool input in conversation history/rollout state
+        self.record_conversation_items(response_item.clone()).await;
+
+        // Derive and record a UserMessage event alongside it in the rollout
+        let user_events =
+            map_response_item_to_event_messages(&response_item, self.show_raw_agent_reasoning)
+                .into_iter()
+                .filter(|m| matches!(m, EventMsg::UserMessage(_)));
+
+        for msg in user_events {
+            let event = Event {
+                id: sub_id.to_string(),
+                msg,
+            };
+            self.record_state_snapshot(RolloutItem::Event(event)).await;
+        }
+    }
+
     async fn on_exec_command_begin(
         &self,
         turn_diff_tracker: &mut TurnDiffTracker,
@@ -1448,8 +1452,9 @@ async fn run_task(
         return;
     }
     let initial_input_for_turn: ResponseInputItem = ResponseInputItem::from(input);
-    sess.record_conversation_items(ResponseItem::from(initial_input_for_turn.clone()))
-        .await;
+    // Record the user's input and corresponding event into the rollout
+    let user_input_response: ResponseItem = ResponseItem::from(initial_input_for_turn.clone());
+    sess.record_user_input(&sub_id, user_input_response).await;
     let event = Event {
         id: sub_id.clone(),
         msg: EventMsg::TaskStarted(TaskStartedEvent {
@@ -1472,8 +1477,8 @@ async fn run_task(
             .into_iter()
             .map(ResponseItem::from)
             .collect::<Vec<ResponseItem>>();
-        for item in pending_input.iter().cloned() {
-            sess.record_conversation_items(item).await;
+        for item in pending_input.iter() {
+            sess.record_user_input(&sub_id, item.clone()).await;
         }
 
         // Construct the input that we will send to the model. When using the
diff --git a/codex-rs/core/tests/suite/client.rs b/codex-rs/core/tests/suite/client.rs
index c3d989a2a2..e12fd8602b 100644
--- a/codex-rs/core/tests/suite/client.rs
+++ b/codex-rs/core/tests/suite/client.rs
@@ -7,7 +7,9 @@ use codex_core::built_in_model_providers;
 use codex_core::protocol::AgentMessageEvent;
 use codex_core::protocol::EventMsg;
 use codex_core::protocol::InputItem;
+use codex_core::protocol::InputMessageKind;
 use codex_core::protocol::Op;
+use codex_core::protocol::UserMessageEvent;
 use codex_core::spawn::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR;
 use codex_protocol::mcp_protocol::AuthMode;
 use core_test_support::load_default_config_for_test;
@@ -158,6 +160,19 @@ async fn resume_includes_initial_messages_and_sends_prior_items() {
     );
     writeln!(f, "{}", serde_json::Value::Object(prior_user_obj)).unwrap();
 
+    // Also include a matching user message event to preserve ordering at resume
+    let prior_user_event = EventMsg::UserMessage(UserMessageEvent {
+        message: "resumed user message".to_string(),
+        kind: Some(InputMessageKind::Plain),
+    });
+    let prior_user_event_line = serde_json::json!({
+        "timestamp": "2025-01-01T00:00:00Z",
+        "record_type": "event",
+        "id": "resume-0",
+        "msg": prior_user_event,
+    });
+    writeln!(f, "{prior_user_event_line}").unwrap();
+
     // Prior item: system message (excluded from API history)
     let prior_system = codex_protocol::models::ResponseItem::Message {
         id: None,
diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rs
index 192962316c..dcd52bff1f 100644
--- a/codex-rs/protocol/src/protocol.rs
+++ b/codex-rs/protocol/src/protocol.rs
@@ -424,7 +424,7 @@ pub enum EventMsg {
     /// Agent text output message
     AgentMessage(AgentMessageEvent),
 
-    /// User/system input message (what was sent to the model)
+    /// User/system input message (what was sent to the model).
     UserMessage(UserMessageEvent),
 
     /// Agent text output delta message