Merge branch 'codex-dev-no-race'

Author: LEON-gittech

codex-rs/core/src/session/turn.rs

@@ -2218,6 +2218,7 @@ async fn try_run_sampling_request(
                 if let Some(active) = active_item.as_ref() {
                     let event =
                         EventMsg::AgentReasoningSectionBreak(AgentReasoningSectionBreakEvent {
+                            turn_id: Some(turn_context.sub_id.clone()),
                             item_id: active.id(),
                             summary_index,
                         });

codex-rs/protocol/src/protocol.rs

@@ -2074,6 +2074,7 @@ pub struct AgentMessageContentDeltaEvent {
 impl HasLegacyEvent for AgentMessageContentDeltaEvent {
     fn as_legacy_events(&self, _: bool) -> Vec<EventMsg> {
         vec![EventMsg::AgentMessageDelta(AgentMessageDeltaEvent {
+            turn_id: Some(self.turn_id.clone()),
             delta: self.delta.clone(),
         })]
     }
@@ -2101,6 +2102,7 @@ pub struct ReasoningContentDeltaEvent {
 impl HasLegacyEvent for ReasoningContentDeltaEvent {
     fn as_legacy_events(&self, _: bool) -> Vec<EventMsg> {
         vec![EventMsg::AgentReasoningDelta(AgentReasoningDeltaEvent {
+            turn_id: Some(self.turn_id.clone()),
             delta: self.delta.clone(),
         })]
     }
@@ -2121,6 +2123,7 @@ impl HasLegacyEvent for ReasoningRawContentDeltaEvent {
     fn as_legacy_events(&self, _: bool) -> Vec<EventMsg> {
         vec![EventMsg::AgentReasoningRawContentDelta(
             AgentReasoningRawContentDeltaEvent {
+                turn_id: Some(self.turn_id.clone()),
                 delta: self.delta.clone(),
             },
         )]
@@ -2490,6 +2493,8 @@ pub struct UserMessageEvent {
 
 #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, TS)]
 pub struct AgentMessageDeltaEvent {
+    #[serde(default)]
+    pub turn_id: Option<String>,
     pub delta: String,
 }
 
@@ -2505,11 +2510,15 @@ pub struct AgentReasoningRawContentEvent {
 
 #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, TS)]
 pub struct AgentReasoningRawContentDeltaEvent {
+    #[serde(default)]
+    pub turn_id: Option<String>,
     pub delta: String,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, TS)]
 pub struct AgentReasoningSectionBreakEvent {
+    #[serde(default)]
+    pub turn_id: Option<String>,
     // load with default value so it's backward compatible with the old format.
     #[serde(default)]
     pub item_id: String,
@@ -2519,6 +2528,8 @@ pub struct AgentReasoningSectionBreakEvent {
 
 #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, TS)]
 pub struct AgentReasoningDeltaEvent {
+    #[serde(default)]
+    pub turn_id: Option<String>,
     pub delta: String,
 }
 

codex-rs/tui/src/app/app_server_adapter.rs

@@ -596,6 +596,7 @@ fn server_notification_thread_events(
             vec![Event {
                 id: String::new(),
                 msg: EventMsg::AgentMessageDelta(AgentMessageDeltaEvent {
+                    turn_id: Some(notification.turn_id),
                     delta: notification.delta,
                 }),
             }],
@@ -617,6 +618,7 @@ fn server_notification_thread_events(
             vec![Event {
                 id: String::new(),
                 msg: EventMsg::AgentReasoningDelta(AgentReasoningDeltaEvent {
+                    turn_id: Some(notification.turn_id),
                     delta: notification.delta,
                 }),
             }],
@@ -626,6 +628,7 @@ fn server_notification_thread_events(
             vec![Event {
                 id: String::new(),
                 msg: EventMsg::AgentReasoningRawContentDelta(AgentReasoningRawContentDeltaEvent {
+                    turn_id: Some(notification.turn_id),
                     delta: notification.delta,
                 }),
             }],
@@ -1463,6 +1466,7 @@ mod tests {
         let EventMsg::AgentMessageDelta(delta) = &agent_event.msg else {
             panic!("expected bridged agent message delta");
         };
+        assert_eq!(delta.turn_id.as_deref(), Some("turn"));
         assert_eq!(delta.delta, "Hello");
 
         let (_, reasoning_events) = server_notification_thread_events(

codex-rs/tui/src/bottom_pane/chat_composer.rs

@@ -142,6 +142,7 @@ use ratatui::style::Stylize;
 use ratatui::text::Line;
 use ratatui::text::Span;
 use ratatui::widgets::Block;
+use ratatui::widgets::Borders;
 use ratatui::widgets::Paragraph;
 use ratatui::widgets::StatefulWidgetRef;
 use ratatui::widgets::WidgetRef;
@@ -4129,7 +4130,11 @@ impl ChatComposer {
         let is_zellij = self.is_zellij;
         let style = user_message_style();
         let textarea_style = style.fg(ratatui::style::Color::Reset);
-        Block::default().style(style).render_ref(composer_rect, buf);
+        Block::default()
+            .borders(Borders::TOP | Borders::BOTTOM)
+            .style(style)
+            .border_style(Style::default().fg(ratatui::style::Color::White))
+            .render_ref(composer_rect, buf);
         if !remote_images_rect.is_empty() {
             Paragraph::new(self.remote_images_lines(remote_images_rect.width))
                 .style(style)

codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__zellij_empty_composer.snap

@@ -1,14 +1,14 @@
 ---
 source: tui/src/bottom_pane/chat_composer.rs
-assertion_line: 4001
+assertion_line: 4498
 expression: terminal.backend()
 ---
-"                                                                                                    "
+"────────────────────────────────────────────────────────────────────────────────────────────────────"
 "› Ask Codex to do anything                                                                          "
 "                                                                                                    "
 "                                                                                                    "
 "                                                                                                    "
 "                                                                                                    "
 "                                                                                                    "
-"                                                                                                    "
+"────────────────────────────────────────────────────────────────────────────────────────────────────"
 "  ? for shortcuts                                                                100% context left  "