fix: address flakiness in thread_resume_rejoins_running_thread_even_with_override_mismatch

codex-rs/app-server/src/codex_message_processor.rs

@@ -6244,6 +6244,9 @@ async fn handle_pending_thread_resume_request(
         let state = thread_state.lock().await;
         state.active_turn_snapshot()
     };
+    let has_in_progress_turn = active_turn
+        .as_ref()
+        .is_some_and(|turn| matches!(turn.status, TurnStatus::InProgress));
 
     let request_id = pending.request_id;
     let connection_id = request_id.connection_id;
@@ -6270,9 +6273,18 @@ async fn handle_pending_thread_resume_request(
             return;
         }
     };
-    thread.status = thread_watch_manager
+    let mut status = thread_watch_manager
         .loaded_status_for_thread(&thread.id)
         .await;
+    // Running-thread resume can arrive before thread-watch status updates are
+    // observed by listeners; fall back to the in-memory active turn state to
+    // avoid reporting an idle thread while a turn is still in progress.
+    if has_in_progress_turn && matches!(status, ThreadStatus::Idle | ThreadStatus::NotLoaded) {
+        status = ThreadStatus::Active {
+            active_flags: Vec::new(),
+        };
+    }
+    thread.status = status;
 
     let ThreadConfigSnapshot {
         model,