tui: dedupe resume/fork thread id resolution

Author: charley-oai

codex-rs/tui/src/lib.rs

@@ -574,21 +574,13 @@ async fn run_ratatui_app(
             };
             match path {
                 Some(path) => {
-                    let thread_id = if is_uuid {
-                        match ThreadId::from_string(id_str) {
-                            Ok(thread_id) => thread_id,
-                            Err(_) => return missing_session_exit(id_str, "fork"),
-                        }
-                    } else {
-                        match read_session_meta_line(path.as_path())
+                    let thread_id =
+                        match resolve_session_thread_id(path.as_path(), is_uuid.then_some(id_str))
                             .await
-                            .ok()
-                            .map(|meta_line| meta_line.meta.id)
                         {
                             Some(thread_id) => thread_id,
                             None => return missing_session_exit(id_str, "fork"),
-                        }
-                    };
+                        };
                     resume_picker::SessionSelection::Fork(resume_picker::SessionTarget {
                         path,
                         thread_id,
@@ -611,11 +603,7 @@ async fn run_ratatui_app(
             {
                 Ok(page) => match page.items.first() {
                     Some(item) => {
-                        match read_session_meta_line(item.path.as_path())
-                            .await
-                            .ok()
-                            .map(|meta_line| meta_line.meta.id)
-                        {
+                        match resolve_session_thread_id(item.path.as_path(), None).await {
                             Some(thread_id) => resume_picker::SessionSelection::Fork(
                                 resume_picker::SessionTarget {
                                     path: item.path.clone(),
@@ -656,20 +644,14 @@ async fn run_ratatui_app(
         };
         match path {
             Some(path) => {
-                let thread_id = if is_uuid {
-                    match ThreadId::from_string(id_str) {
-                        Ok(thread_id) => thread_id,
-                        Err(_) => return missing_session_exit(id_str, "resume"),
-                    }
-                } else {
-                    match read_session_meta_line(path.as_path())
-                        .await
-                        .ok()
-                        .map(|meta_line| meta_line.meta.id)
-                    {
-                        Some(thread_id) => thread_id,
-                        None => return missing_session_exit(id_str, "resume"),
-                    }
+                let thread_id = match resolve_session_thread_id(
+                    path.as_path(),
+                    is_uuid.then_some(id_str),
+                )
+                .await
+                {
+                    Some(thread_id) => thread_id,
+                    None => return missing_session_exit(id_str, "resume"),
                 };
                 resume_picker::SessionSelection::Resume(resume_picker::SessionTarget {
                     path,
@@ -697,11 +679,7 @@ async fn run_ratatui_app(
         )
         .await
         {
-            Ok(Some(path)) => match read_session_meta_line(path.as_path())
-                .await
-                .ok()
-                .map(|meta_line| meta_line.meta.id)
-            {
+            Ok(Some(path)) => match resolve_session_thread_id(path.as_path(), None).await {
                 Some(thread_id) => {
                     resume_picker::SessionSelection::Resume(resume_picker::SessionTarget {
                         path,
@@ -824,6 +802,19 @@ async fn run_ratatui_app(
     app_result
 }
 
+pub(crate) async fn resolve_session_thread_id(
+    path: &Path,
+    id_str_if_uuid: Option<&str>,
+) -> Option<ThreadId> {
+    match id_str_if_uuid {
+        Some(id_str) => ThreadId::from_string(id_str).ok(),
+        None => read_session_meta_line(path)
+            .await
+            .ok()
+            .map(|meta_line| meta_line.meta.id),
+    }
+}
+
 pub(crate) async fn read_session_cwd(
     config: &Config,
     thread_id: ThreadId,

codex-rs/tui/src/resume_picker.rs

@@ -21,7 +21,6 @@ use codex_core::ThreadsPage;
 use codex_core::config::Config;
 use codex_core::find_thread_names_by_ids;
 use codex_core::path_utils;
-use codex_core::read_session_meta_line;
 use codex_protocol::ThreadId;
 use color_eyre::eyre::Result;
 use crossterm::event::KeyCode;
@@ -413,10 +412,7 @@ impl PickerState {
                     let path = row.path.clone();
                     let thread_id = match row.thread_id {
                         Some(thread_id) => Some(thread_id),
-                        None => read_session_meta_line(path.as_path())
-                            .await
-                            .ok()
-                            .map(|meta_line| meta_line.meta.id),
+                        None => crate::resolve_session_thread_id(path.as_path(), None).await,
                     };
                     if let Some(thread_id) = thread_id {
                         return Ok(Some(self.action.selection(path, thread_id)));