Lightweight coding agent that runs in your terminal
Rust
Use Tokio's clock for TUI paste timing (#47881)
Charlie Marsh90b67c96ca0e
diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rsindex 3f2e483f71..6cf0bcc4a1 100644--- a/codex-rs/tui/src/bottom_pane/chat_composer.rs+++ b/codex-rs/tui/src/bottom_pane/chat_composer.rs@@ -2,7 +2,9 @@//!//! It edits [`TextArea`] and attachments, routes popup keys, makes completed slash commands atomic,//! and handles Enter/newlines. It shows Luna Reserve's yellow arrow and detects unbracketed paste-//! bursts, especially on Windows. Copy shortcuts and right clicks preserve selected draft text.+//! bursts, especially on Windows. Paste timing uses Tokio's clock so asynchronous flush deadlines+//! and input classification share a clock, including in paused-time tests. Copy shortcuts and right+//! clicks preserve selected draft text.//! The live voice strip renders after effort ignition, followed by the Astra sparkle when eligible.//! Owned transcripts keep persistent status below the composer and hints on a separate final row.//! Shortcut help expands above the composer, with its close hint replacing the final shortcuts row@@ -1840,7 +1842,7 @@ impl ChatComposer {/// This also allows a single "held" ASCII char to render even when it turns out not to be part/// of a paste burst.pub(crate) fn flush_paste_burst_if_due(&mut self) -> bool {- self.handle_paste_burst_flush(Instant::now())+ self.handle_paste_burst_flush(tokio::time::Instant::now().into_std())}/// Returns whether the composer is currently in any paste-burst related transient state.@@ -1982,7 +1984,7 @@ impl ChatComposer {return self.begin_history_search();}- if self.handle_paste_tab(key_event, Instant::now()) {+ if self.handle_paste_tab(key_event, tokio::time::Instant::now().into_std()) {return (InputResult::None, true);}@@ -3119,7 +3121,8 @@ impl ChatComposer {/// Common logic for handling message submission/queuing./// Returns the appropriate InputResult based on `should_queue`.fn handle_submission(&mut self, should_queue: bool) -> (InputResult, bool) {- let result = self.handle_submission_with_time(should_queue, Instant::now());+ let result =+ self.handle_submission_with_time(should_queue, tokio::time::Instant::now().into_std());self.reset_vim_mode_after_successful_dispatch(&result.0);result}@@ -3604,7 +3607,7 @@ impl ChatComposer {return (InputResult::None, false);}- self.handle_input_basic_with_time(input, Instant::now())+ self.handle_input_basic_with_time(input, tokio::time::Instant::now().into_std())}fn handle_input_basic_with_time(diff --git a/codex-rs/tui/src/startup_draft.rs b/codex-rs/tui/src/startup_draft.rsindex c7a127e480..6fd83d8b3d 100644--- a/codex-rs/tui/src/startup_draft.rs+++ b/codex-rs/tui/src/startup_draft.rs@@ -7,7 +7,7 @@ use std::path::PathBuf;use std::pin::Pin;use std::task::Poll;use std::time::Duration;-use std::time::Instant;+use tokio::time::Instant;use crossterm::SynchronizedUpdate;use ratatui::layout::Size;diff --git a/codex-rs/tui/src/startup_draft_input.rs b/codex-rs/tui/src/startup_draft_input.rsindex b3ddf27318..3d398139f1 100644--- a/codex-rs/tui/src/startup_draft_input.rs+++ b/codex-rs/tui/src/startup_draft_input.rs@@ -4,7 +4,7 @@//! preserved, protected screens do not consume draft input, and confirmation never removes text.use std::io;-use std::time::Instant;+use tokio::time::Instant;use crossterm::event::KeyCode;use crossterm::event::KeyEvent;diff --git a/codex-rs/tui/src/startup_draft_tests.rs b/codex-rs/tui/src/startup_draft_tests.rsindex 1e9f907227..976573dbb4 100644--- a/codex-rs/tui/src/startup_draft_tests.rs+++ b/codex-rs/tui/src/startup_draft_tests.rs@@ -414,7 +414,7 @@ fn startup_draft_preserves_multiline_editing_without_submitting() {assert!(pump.app_event_rx.try_recv().is_err());}-#[tokio::test]+#[tokio::test(start_paused = true)]async fn startup_draft_preserves_non_bracketed_multiline_pastes_without_submitting() {let events = "first line\n\nsecond line\nthird line".chars()