chore: unify conversation with thread name (#8830)

Done and verified by Codex + refactor feature of RustRover

codex-rs/core/src/codex.rs

@@ -32,7 +32,7 @@ use crate::user_notification::UserNotifier;
 use crate::util::error_or_panic;
 use async_channel::Receiver;
 use async_channel::Sender;
-use codex_protocol::ConversationId;
+use codex_protocol::ThreadId;
 use codex_protocol::approvals::ExecPolicyAmendment;
 use codex_protocol::items::TurnItem;
 use codex_protocol::protocol::FileChange;
@@ -179,7 +179,9 @@ pub struct Codex {
 /// unique session id.
 pub struct CodexSpawnOk {
     pub codex: Codex,
-    pub conversation_id: ConversationId,
+    pub thread_id: ThreadId,
+    #[deprecated(note = "use thread_id")]
+    pub conversation_id: ThreadId,
 }
 
 pub(crate) const INITIAL_SUBMIT_ID: &str = "";
@@ -299,7 +301,7 @@ impl Codex {
             error!("Failed to create session: {e:#}");
             map_session_init_error(&e, &config.codex_home)
         })?;
-        let conversation_id = session.conversation_id;
+        let thread_id = session.conversation_id;
 
         // This task will run until Op::Shutdown is received.
         tokio::spawn(submission_loop(session, config, rx_sub));
@@ -310,9 +312,11 @@ impl Codex {
             agent_status,
         };
 
+        #[allow(deprecated)]
         Ok(CodexSpawnOk {
             codex,
-            conversation_id,
+            thread_id,
+            conversation_id: thread_id,
         })
     }
 
@@ -356,7 +360,7 @@ impl Codex {
 ///
 /// A session has at most 1 running task at a time, and can be interrupted by user input.
 pub(crate) struct Session {
-    conversation_id: ConversationId,
+    conversation_id: ThreadId,
     tx_event: Sender<Event>,
     agent_status: Arc<RwLock<AgentStatus>>,
     state: Mutex<SessionState>,
@@ -368,7 +372,7 @@ pub(crate) struct Session {
     next_internal_sub_id: AtomicU64,
 }
 
-/// The context needed for a single turn of the conversation.
+/// The context needed for a single turn of the thread.
 #[derive(Debug)]
 pub(crate) struct TurnContext {
     pub(crate) sub_id: String,
@@ -505,7 +509,7 @@ impl Session {
         session_configuration: &SessionConfiguration,
         per_turn_config: Config,
         model_family: ModelFamily,
-        conversation_id: ConversationId,
+        conversation_id: ThreadId,
         sub_id: String,
     ) -> TurnContext {
         let otel_manager = otel_manager.clone().with_model(
@@ -581,7 +585,7 @@ impl Session {
 
         let (conversation_id, rollout_params) = match &initial_history {
             InitialHistory::New | InitialHistory::Forked(_) => {
-                let conversation_id = ConversationId::default();
+                let conversation_id = ThreadId::default();
                 (
                     conversation_id,
                     RolloutRecorderParams::new(
@@ -2958,7 +2962,7 @@ mod tests {
 
         session
             .record_initial_history(InitialHistory::Resumed(ResumedHistory {
-                conversation_id: ConversationId::default(),
+                conversation_id: ThreadId::default(),
                 history: rollout_items,
                 rollout_path: PathBuf::from("/tmp/resume.jsonl"),
             }))
@@ -3035,7 +3039,7 @@ mod tests {
 
         session
             .record_initial_history(InitialHistory::Resumed(ResumedHistory {
-                conversation_id: ConversationId::default(),
+                conversation_id: ThreadId::default(),
                 history: rollout_items,
                 rollout_path: PathBuf::from("/tmp/resume.jsonl"),
             }))
@@ -3471,7 +3475,7 @@ mod tests {
     }
 
     fn otel_manager(
-        conversation_id: ConversationId,
+        conversation_id: ThreadId,
         config: &Config,
         model_family: &ModelFamily,
         session_source: SessionSource,
@@ -3494,7 +3498,7 @@ mod tests {
         let codex_home = tempfile::tempdir().expect("create temp dir");
         let config = build_test_config(codex_home.path()).await;
         let config = Arc::new(config);
-        let conversation_id = ConversationId::default();
+        let conversation_id = ThreadId::default();
         let auth_manager =
             AuthManager::from_auth_for_testing(CodexAuth::from_api_key("Test API Key"));
         let models_manager = Arc::new(ModelsManager::new(auth_manager.clone()));
@@ -3585,7 +3589,7 @@ mod tests {
         let codex_home = tempfile::tempdir().expect("create temp dir");
         let config = build_test_config(codex_home.path()).await;
         let config = Arc::new(config);
-        let conversation_id = ConversationId::default();
+        let conversation_id = ThreadId::default();
         let auth_manager =
             AuthManager::from_auth_for_testing(CodexAuth::from_api_key("Test API Key"));
         let models_manager = Arc::new(ModelsManager::new(auth_manager.clone()));