chore: unify conversation with thread name (#8830)

Done and verified by Codex + refactor feature of RustRover

codex-rs/protocol/src/lib.rs

@@ -1,6 +1,8 @@
 pub mod account;
-mod conversation_id;
-pub use conversation_id::ConversationId;
+mod thread_id;
+#[allow(deprecated)]
+pub use thread_id::ConversationId;
+pub use thread_id::ThreadId;
 pub mod approvals;
 pub mod config_types;
 pub mod custom_prompts;

codex-rs/protocol/src/protocol.rs

@@ -10,7 +10,7 @@ use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::Duration;
 
-use crate::ConversationId;
+use crate::ThreadId;
 use crate::approvals::ElicitationRequestEvent;
 use crate::config_types::ReasoningSummary as ReasoningSummaryConfig;
 use crate::custom_prompts::CustomPrompt;
@@ -80,7 +80,7 @@ pub enum Op {
     },
 
     /// Similar to [`Op::UserInput`], but contains additional context required
-    /// for a turn of a [`crate::codex_conversation::CodexConversation`].
+    /// for a turn of a [`crate::codex_thread::CodexThread`].
     UserTurn {
         /// User input items, see `InputItem`
         items: Vec<UserInput>,
@@ -743,7 +743,7 @@ pub struct RawResponseItemEvent {
 
 #[derive(Debug, Clone, Deserialize, Serialize, TS, JsonSchema)]
 pub struct ItemStartedEvent {
-    pub thread_id: ConversationId,
+    pub thread_id: ThreadId,
     pub turn_id: String,
     pub item: TurnItem,
 }
@@ -761,7 +761,7 @@ impl HasLegacyEvent for ItemStartedEvent {
 
 #[derive(Debug, Clone, Deserialize, Serialize, TS, JsonSchema)]
 pub struct ItemCompletedEvent {
-    pub thread_id: ConversationId,
+    pub thread_id: ThreadId,
     pub turn_id: String,
     pub item: TurnItem,
 }
@@ -1185,17 +1185,18 @@ pub struct WebSearchEndEvent {
     pub query: String,
 }
 
+// Conversation kept for backward compatibility.
 /// Response payload for `Op::GetHistory` containing the current session's
 /// in-memory transcript.
 #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, TS)]
 pub struct ConversationPathResponseEvent {
-    pub conversation_id: ConversationId,
+    pub conversation_id: ThreadId,
     pub path: PathBuf,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, TS)]
 pub struct ResumedHistory {
-    pub conversation_id: ConversationId,
+    pub conversation_id: ThreadId,
     pub history: Vec<RolloutItem>,
     pub rollout_path: PathBuf,
 }
@@ -1290,7 +1291,7 @@ impl fmt::Display for SubAgentSource {
 
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, TS)]
 pub struct SessionMeta {
-    pub id: ConversationId,
+    pub id: ThreadId,
     pub timestamp: String,
     pub cwd: PathBuf,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -1306,7 +1307,7 @@ pub struct SessionMeta {
 impl Default for SessionMeta {
     fn default() -> Self {
         SessionMeta {
-            id: ConversationId::default(),
+            id: ThreadId::default(),
             timestamp: String::new(),
             cwd: PathBuf::new(),
             title: None,
@@ -1819,8 +1820,8 @@ pub struct SkillsListEntry {
 
 #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, TS)]
 pub struct SessionConfiguredEvent {
-    /// Name left as session_id instead of conversation_id for backwards compatibility.
-    pub session_id: ConversationId,
+    /// Name left as session_id instead of thread_id for backwards compatibility.
+    pub session_id: ThreadId,
 
     /// Tell the client what model is being queried.
     pub model: String,
@@ -1948,7 +1949,7 @@ mod tests {
     #[test]
     fn item_started_event_from_web_search_emits_begin_event() {
         let event = ItemStartedEvent {
-            thread_id: ConversationId::new(),
+            thread_id: ThreadId::new(),
             turn_id: "turn-1".into(),
             item: TurnItem::WebSearch(WebSearchItem {
                 id: "search-1".into(),
@@ -1967,7 +1968,7 @@ mod tests {
     #[test]
     fn item_started_event_from_non_web_search_emits_no_legacy_events() {
         let event = ItemStartedEvent {
-            thread_id: ConversationId::new(),
+            thread_id: ThreadId::new(),
             turn_id: "turn-1".into(),
             item: TurnItem::UserMessage(UserMessageItem::new(&[])),
         };
@@ -2035,7 +2036,7 @@ mod tests {
     /// amount of nesting.
     #[test]
     fn serialize_event() -> Result<()> {
-        let conversation_id = ConversationId::from_string("67e55044-10b1-426f-9247-bb680e5fe0c8")?;
+        let conversation_id = ThreadId::from_string("67e55044-10b1-426f-9247-bb680e5fe0c8")?;
         let rollout_file = NamedTempFile::new()?;
         let event = Event {
             id: "1234".to_string(),

codex-rs/protocol/src/thread_id.rs

@@ -10,11 +10,11 @@ use uuid::Uuid;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, TS, Hash)]
 #[ts(type = "string")]
-pub struct ConversationId {
+pub struct ThreadId {
     uuid: Uuid,
 }
 
-impl ConversationId {
+impl ThreadId {
     pub fn new() -> Self {
         Self {
             uuid: Uuid::now_v7(),
@@ -28,19 +28,19 @@ impl ConversationId {
     }
 }
 
-impl Default for ConversationId {
+impl Default for ThreadId {
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl Display for ConversationId {
+impl Display for ThreadId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}", self.uuid)
     }
 }
 
-impl Serialize for ConversationId {
+impl Serialize for ThreadId {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: serde::Serializer,
@@ -49,7 +49,7 @@ impl Serialize for ConversationId {
     }
 }
 
-impl<'de> Deserialize<'de> for ConversationId {
+impl<'de> Deserialize<'de> for ThreadId {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: serde::Deserializer<'de>,
@@ -60,9 +60,9 @@ impl<'de> Deserialize<'de> for ConversationId {
     }
 }
 
-impl JsonSchema for ConversationId {
+impl JsonSchema for ThreadId {
     fn schema_name() -> String {
-        "ConversationId".to_string()
+        "ThreadId".to_string()
     }
 
     fn json_schema(generator: &mut SchemaGenerator) -> Schema {
@@ -70,12 +70,16 @@ impl JsonSchema for ConversationId {
     }
 }
 
+/// Backward-compatible alias for the previous name.
+#[deprecated(note = "use ThreadId instead")]
+pub type ConversationId = ThreadId;
+
 #[cfg(test)]
 mod tests {
     use super::*;
     #[test]
-    fn test_conversation_id_default_is_not_zeroes() {
-        let id = ConversationId::default();
+    fn test_thread_id_default_is_not_zeroes() {
+        let id = ThreadId::default();
         assert_ne!(id.uuid, Uuid::nil());
     }
 }