Fix merge

codex-rs/core/src/codex.rs

@@ -139,7 +139,6 @@ use codex_protocol::protocol::InitialHistory;
 use codex_protocol::user_input::UserInput;
 use codex_utils_readiness::Readiness;
 use codex_utils_readiness::ReadinessFlag;
-use reqwest::StatusCode;
 use std::path::Path;
 
 /// The high-level interface to the Codex system.
@@ -1852,7 +1851,7 @@ mod handlers {
                     id: sub_id,
                     msg: EventMsg::Error(ErrorEvent {
                         message,
-                        http_status_code: None,
+                        codex_error_info: None,
                     }),
                 };
                 sess.send_event_raw(event).await;

codex-rs/core/src/conversation_manager.rs

@@ -59,6 +59,10 @@ impl ConversationManager {
         )
     }
 
+    pub fn session_source(&self) -> SessionSource {
+        self.session_source.clone()
+    }
+
     /// Start a brand new conversation with default initial history.
     pub async fn new_conversation(&self, config: Config) -> CodexResult<NewConversation> {
         self.spawn_conversation(config, self.auth_manager.clone())
@@ -263,6 +267,8 @@ impl ConversationManager {
 
         self.finalize_spawn(codex, conversation_id, session).await
     }
+
+
 }
 
 /// Return a prefix of `items` obtained by cutting strictly before the nth user message

codex-rs/core/src/message_history.rs

@@ -590,7 +590,7 @@ mod tests {
         assert_eq!(entries.len(), 1);
         assert_eq!(entries[0].text, long_entry);
 
-        let pruned_len = std::fs::metadata(&history_path).expect("metadata").len() as u64;
+        let pruned_len = std::fs::metadata(&history_path).expect("metadata").len();
         let max_bytes = config
             .history
             .max_bytes

codex-rs/tui/src/app.rs

@@ -343,6 +343,7 @@ impl App {
                     enhanced_keys_supported,
                     auth_manager: auth_manager.clone(),
                     feedback: feedback.clone(),
+                    is_first_run: false
                 };
                 ChatWidget::new_from_existing(
                     init,