fix: Fix fmt and pty E2E test timing

Author: CSRessel

codex-rs/core/src/lib.rs

@@ -38,7 +38,6 @@ pub use mcp_connection_manager::SandboxState;
 mod mcp_tool_call;
 mod message_history;
 mod model_provider_info;
-
 pub mod parse_command;
 pub mod powershell;
 mod response_processing;
@@ -48,12 +47,9 @@ pub mod token_data;
 mod truncate;
 mod unified_exec;
 mod user_instructions;
-pub use model_provider_info::CLAUDE_ACP_PROVIDER_ID;
 pub use model_provider_info::DEFAULT_LMSTUDIO_PORT;
 pub use model_provider_info::DEFAULT_OLLAMA_PORT;
-pub use model_provider_info::GEMINI_ACP_PROVIDER_ID;
 pub use model_provider_info::LMSTUDIO_OSS_PROVIDER_ID;
-pub use model_provider_info::MOCK_ACP_PROVIDER_ID;
 pub use model_provider_info::ModelProviderInfo;
 pub use model_provider_info::OLLAMA_OSS_PROVIDER_ID;
 pub use model_provider_info::WireApi;

codex-rs/core/src/model_family.rs

@@ -1,9 +1,6 @@
 use codex_protocol::config_types::ReasoningEffort;
 use codex_protocol::config_types::Verbosity;
 
-use crate::CLAUDE_ACP_PROVIDER_ID;
-use crate::GEMINI_ACP_PROVIDER_ID;
-use crate::MOCK_ACP_PROVIDER_ID;
 use crate::config::types::ReasoningSummaryFormat;
 use crate::tools::handlers::apply_patch::ApplyPatchToolType;
 use crate::tools::spec::ConfigShellToolType;
@@ -129,18 +126,6 @@ pub fn find_family_for_model(slug: &str) -> Option<ModelFamily> {
             needs_special_apply_patch_instructions: true,
             shell_type: ConfigShellToolType::Local,
         )
-    } else if slug.starts_with("gemini") {
-        model_family!(
-            slug, GEMINI_ACP_PROVIDER_ID,
-            supports_parallel_tool_calls: true,
-        )
-    } else if slug.starts_with("claude") {
-        model_family!(
-            slug, CLAUDE_ACP_PROVIDER_ID,
-            supports_parallel_tool_calls: true,
-        )
-    } else if slug.starts_with("mock") {
-        model_family!(slug, MOCK_ACP_PROVIDER_ID)
     } else if slug.starts_with("gpt-4.1") {
         model_family!(
             slug, "gpt-4.1",

codex-rs/core/src/model_provider_info.rs

@@ -36,10 +36,10 @@ const MAX_REQUEST_MAX_RETRIES: u64 = 100;
 #[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum WireApi {
-    /// The OpenAI Responses API. This is used by some internal models.
+    /// The Responses API exposed by OpenAI at `/v1/responses`.
     Responses,
 
-    /// The OpenAI Chat Completions API. This is the default.
+    /// Regular Chat Completions compatible with `/v1/chat/completions`.
     #[default]
     Chat,
 }
@@ -216,17 +216,7 @@ pub const DEFAULT_OLLAMA_PORT: u16 = 11434;
 pub const LMSTUDIO_OSS_PROVIDER_ID: &str = "lmstudio";
 pub const OLLAMA_OSS_PROVIDER_ID: &str = "ollama";
 
-// ACP provider identifiers (used for model inference, not in built_in_model_providers)
-// Actual ACP provider configuration is embedded in AcpAgentConfig from codex_acp::registry
-pub const CLAUDE_ACP_PROVIDER_ID: &str = "claude-acp";
-pub const GEMINI_ACP_PROVIDER_ID: &str = "gemini-acp";
-pub const MOCK_ACP_PROVIDER_ID: &str = "mock-acp";
-
 /// Built-in default provider list.
-///
-/// Note: ACP providers (mock-acp, claude-acp, gemini-acp) are NOT included here.
-/// ACP agent configuration is handled by the `codex_acp::registry` module,
-/// which embeds provider info directly in `AcpAgentConfig` to avoid circular dependencies.
 pub fn built_in_model_providers() -> HashMap<String, ModelProviderInfo> {
     use ModelProviderInfo as P;
 

codex-rs/mock-acp-agent/src/main.rs

@@ -14,6 +14,7 @@ use tokio::time::sleep;
 use tokio_util::compat::TokioAsyncReadCompatExt as _;
 use tokio_util::compat::TokioAsyncWriteCompatExt as _;
 
+#[allow(clippy::large_enum_variant)]
 enum MockClientRequest {
     ReadFile {
         session_id: acp::SessionId,

codex-rs/tui-pty-e2e/src/lib.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
-use portable_pty::native_pty_system;
 use portable_pty::CommandBuilder;
 use portable_pty::PtySize;
+use portable_pty::native_pty_system;
 use std::collections::HashMap;
 use std::io::Read;
 use std::io::Write;
@@ -547,7 +547,8 @@ fn codex_binary_path() -> String {
 }
 
 pub const TIMEOUT: Duration = Duration::from_secs(5);
-pub const TIMEOUT_INPUT: Duration = Duration::from_millis(300);
+pub const TIMEOUT_INPUT: Duration = Duration::from_millis(100);
+pub const TIMEOUT_PRESNAPSHOT: Duration = Duration::from_millis(500);
 
 /// Normalize dynamic content in screen output for snapshot testing
 pub fn normalize_for_snapshot(contents: String) -> String {

codex-rs/tui-pty-e2e/tests/acp_mode.rs

@@ -6,12 +6,13 @@
 //! 3. Permission requests from ACP agents are properly displayed in the TUI
 
 use std::time::Duration;
-use tui_pty_e2e::normalize_for_input_snapshot;
 use tui_pty_e2e::Key;
 use tui_pty_e2e::SessionConfig;
-use tui_pty_e2e::TuiSession;
 use tui_pty_e2e::TIMEOUT;
 use tui_pty_e2e::TIMEOUT_INPUT;
+use tui_pty_e2e::TIMEOUT_PRESNAPSHOT;
+use tui_pty_e2e::TuiSession;
+use tui_pty_e2e::normalize_for_input_snapshot;
 
 /// Test that ACP mode starts successfully with mock-model
 #[test]
@@ -160,8 +161,7 @@ fn test_acp_mode_startup_snapshot() {
         .wait_for_text("›", TIMEOUT)
         .expect("ACP mode should start");
 
-    std::thread::sleep(TIMEOUT_INPUT);
-
+    std::thread::sleep(TIMEOUT_PRESNAPSHOT);
     insta::assert_snapshot!(
         "acp_mode_startup",
         normalize_for_input_snapshot(session.screen_contents())

codex-rs/tui-pty-e2e/tests/acp_tool_calls.rs

@@ -26,12 +26,13 @@
 //! ```
 
 use std::time::Duration;
-use tui_pty_e2e::normalize_for_input_snapshot;
 use tui_pty_e2e::Key;
 use tui_pty_e2e::SessionConfig;
-use tui_pty_e2e::TuiSession;
 use tui_pty_e2e::TIMEOUT;
 use tui_pty_e2e::TIMEOUT_INPUT;
+use tui_pty_e2e::TIMEOUT_PRESNAPSHOT;
+use tui_pty_e2e::TuiSession;
+use tui_pty_e2e::normalize_for_input_snapshot;
 
 /// Test that an ACP tool call is rendered in the TUI
 ///
@@ -194,8 +195,7 @@ fn test_acp_tool_call_snapshot() {
         .wait_for_text("Read complete", Duration::from_secs(10))
         .expect("Should receive response");
 
-    std::thread::sleep(TIMEOUT_INPUT);
-
+    std::thread::sleep(TIMEOUT_PRESNAPSHOT);
     insta::assert_snapshot!(
         "acp_tool_call_rendered",
         normalize_for_input_snapshot(session.screen_contents())

codex-rs/tui-pty-e2e/tests/input_handling.rs

@@ -1,10 +1,10 @@
 use insta::assert_snapshot;
 use std::time::Duration;
-use tui_pty_e2e::normalize_for_input_snapshot;
 use tui_pty_e2e::Key;
-use tui_pty_e2e::TuiSession;
 use tui_pty_e2e::TIMEOUT;
-use tui_pty_e2e::TIMEOUT_INPUT;
+use tui_pty_e2e::TIMEOUT_PRESNAPSHOT;
+use tui_pty_e2e::TuiSession;
+use tui_pty_e2e::normalize_for_input_snapshot;
 
 #[test]
 fn test_ctrl_c_clears_input() {
@@ -23,9 +23,7 @@ fn test_ctrl_c_clears_input() {
         .wait_for(|s| !s.contains("draft message"), TIMEOUT)
         .expect("Input was not cleared");
 
-    std::thread::sleep(TIMEOUT_INPUT);
-    std::thread::sleep(TIMEOUT_INPUT);
-    std::thread::sleep(TIMEOUT_INPUT);
+    std::thread::sleep(TIMEOUT_PRESNAPSHOT);
     assert_snapshot!(
         "ctrl_c_clears",
         normalize_for_input_snapshot(session.screen_contents())
@@ -48,9 +46,7 @@ fn test_backspace() {
     session.wait_for_text("Hel", TIMEOUT).unwrap();
     session.wait_for(|s| !s.contains("Hello"), TIMEOUT).unwrap();
 
-    std::thread::sleep(TIMEOUT_INPUT);
-    std::thread::sleep(TIMEOUT_INPUT);
-    std::thread::sleep(TIMEOUT_INPUT);
+    std::thread::sleep(TIMEOUT_PRESNAPSHOT);
     assert_snapshot!(
         "typing_and_backspace",
         normalize_for_input_snapshot(session.screen_contents())
@@ -72,9 +68,7 @@ fn test_arrows() {
     session.send_key(Key::Down).unwrap();
     std::thread::sleep(Duration::from_millis(100));
 
-    std::thread::sleep(TIMEOUT_INPUT);
-    std::thread::sleep(TIMEOUT_INPUT);
-    std::thread::sleep(TIMEOUT_INPUT);
+    std::thread::sleep(TIMEOUT_PRESNAPSHOT);
     assert_snapshot!(
         "model_changed",
         normalize_for_input_snapshot(session.screen_contents())

codex-rs/tui-pty-e2e/tests/manual-test-cancellation.md

@@ -1,10 +1,11 @@
 use insta::assert_snapshot;
-use tui_pty_e2e::normalize_for_input_snapshot;
 use tui_pty_e2e::Key;
 use tui_pty_e2e::SessionConfig;
-use tui_pty_e2e::TuiSession;
 use tui_pty_e2e::TIMEOUT;
 use tui_pty_e2e::TIMEOUT_INPUT;
+use tui_pty_e2e::TIMEOUT_PRESNAPSHOT;
+use tui_pty_e2e::TuiSession;
+use tui_pty_e2e::normalize_for_input_snapshot;
 
 #[test]
 fn test_submit_prompt_default_response() {
@@ -30,7 +31,7 @@ fn test_submit_prompt_default_response() {
         .wait_for_text("Test message 2", TIMEOUT)
         .expect("Did not receive second mock response");
 
-    std::thread::sleep(TIMEOUT_INPUT);
+    std::thread::sleep(TIMEOUT_PRESNAPSHOT);
     assert_snapshot!(
         "prompt_submitted",
         normalize_for_input_snapshot(session.screen_contents())
@@ -67,7 +68,7 @@ fn test_submit_prompt_missing_model() {
         )
         .unwrap();
 
-    std::thread::sleep(TIMEOUT_INPUT);
+    std::thread::sleep(TIMEOUT_PRESNAPSHOT);
     assert_snapshot!(
         "missing_model",
         normalize_for_input_snapshot(session.screen_contents())
@@ -92,7 +93,7 @@ fn test_submit_prompt_custom_response() {
         .wait_for_text("This is a custom test response", TIMEOUT)
         .expect("Did not receive custom response");
 
-    std::thread::sleep(TIMEOUT_INPUT);
+    std::thread::sleep(TIMEOUT_PRESNAPSHOT);
     assert_snapshot!(
         "custom_response",
         normalize_for_input_snapshot(session.screen_contents())
@@ -112,7 +113,7 @@ fn test_multiline_input() {
     session.wait_for_text("Line 2", TIMEOUT).unwrap();
     session.wait_for_text("Line 3", TIMEOUT).unwrap();
 
-    std::thread::sleep(TIMEOUT_INPUT);
+    std::thread::sleep(TIMEOUT_PRESNAPSHOT);
     assert_snapshot!(
         "multiline_input",
         normalize_for_input_snapshot(session.screen_contents())