tui(voice): simplify spinner lifecycle; rely on placeholder disappearance and 60s cap

nornagon-openai · nornagon-openai · commit 54619294a88a · 2025-08-22T15:51:44.000-07:00
- Remove explicit spinner stop flags and stop calls
- Spinner tasks auto-expire after 60s; UI ignores updates once placeholder is gone
- Keep Drop minimal: stop capture and clear placeholder

All TUI tests pass.
diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rs
@@ -34,7 +34,6 @@ use crate::tui::FrameRequester;
 use codex_file_search::FileMatch;
 use std::cell::RefCell;
 use std::collections::VecDeque;
-use std::collections::HashMap;
 use std::sync::Arc;
 use std::sync::Mutex;
 use std::sync::atomic::AtomicBool;
@@ -90,7 +89,6 @@ pub(crate) struct ChatComposer {
     space_hold_element_id: Option<String>,
     space_hold_trigger: Option<Arc<AtomicBool>>,
     // Spinner control flags keyed by placeholder id; set to true to stop.
-    spinner_stop_flags: HashMap<String, Arc<AtomicBool>>,
 }
 
 /// Popup state – at most one can be visible at any time.
@@ -130,7 +128,6 @@ impl ChatComposer {
             space_hold_started_at: None,
             space_hold_element_id: None,
             space_hold_trigger: None,
-            spinner_stop_flags: HashMap::new(),
         }
     }
 
@@ -880,10 +877,8 @@ impl ChatComposer {
         });
     }
 
-    fn spawn_transcribing_spinner(&mut self, id: String) {
+    fn spawn_transcribing_spinner(&self, id: String) {
         let tx = self.app_event_tx.clone();
-        let stop = Arc::new(AtomicBool::new(false));
-        self.spinner_stop_flags.insert(id.clone(), stop.clone());
         tokio::spawn(async move {
             use std::time::Duration;
             let frames: Vec<&'static str> = vec![
@@ -893,9 +888,6 @@ impl ChatComposer {
             // Safety stop after ~60s to avoid a runaway task if events are lost.
             let max_ticks = 600usize; // 600 * 100ms = 60s
             for _ in 0..max_ticks {
-                if stop.load(Ordering::Relaxed) {
-                    break;
-                }
                 let text = frames[i % frames.len()].to_string();
                 tx.send(crate::app_event::AppEvent::RecordingMeter {
                     id: id.clone(),
@@ -907,17 +899,10 @@ impl ChatComposer {
         });
     }
 
-    fn stop_spinner_if_any(&mut self, id: &str) {
-        if let Some(flag) = self.spinner_stop_flags.remove(id) {
-            flag.store(true, Ordering::Relaxed);
-        }
-    }
-
     pub fn replace_transcription(&mut self, id: &str, text: &str) {
         // Only replace if the placeholder still exists; otherwise do nothing.
         let replaced = self.textarea.replace_element_by_id(id, text);
         if replaced {
-            self.stop_spinner_if_any(id);
             self.sync_command_popup();
             self.sync_file_search_popup();
         }
@@ -929,9 +914,6 @@ impl ChatComposer {
         if updated {
             self.sync_command_popup();
             self.sync_file_search_popup();
-        } else {
-            // If placeholder disappeared, proactively stop spinner task.
-            self.stop_spinner_if_any(id);
         }
         updated
     }
@@ -941,7 +923,6 @@ impl ChatComposer {
     pub fn remove_transcription_placeholder(&mut self, id: &str) {
         // Replace with empty string to delete the placeholder if present.
         if self.textarea.replace_element_by_id(id, "") {
-            self.stop_spinner_if_any(id);
             self.sync_command_popup();
             self.sync_file_search_popup();
         }
@@ -1141,16 +1122,13 @@ impl WidgetRef for &ChatComposer {
 
 impl Drop for ChatComposer {
     fn drop(&mut self) {
-        // Stop any running spinner tasks.
-        for (_id, flag) in self.spinner_stop_flags.drain() {
-            flag.store(true, Ordering::Relaxed);
-        }
         // If recording is active, stop capture and clean up placeholder.
-        if let Some(vc) = self.voice.take()
-            && let Ok(_audio) = vc.stop()
-                && let Some(id) = self.recording_placeholder_id.take() {
-                    let _ = self.textarea.replace_element_by_id(&id, "");
-                }
+        if let Some(vc) = self.voice.take() {
+            let _ = vc.stop();
+        }
+        if let Some(id) = self.recording_placeholder_id.take() {
+            let _ = self.textarea.replace_element_by_id(&id, "");
+        }
     }
 }
 
