Merge 237928ac68 into sapling-pr-archive-bolinfest

codex-rs/cloud-tasks-client/BUILD.bazel

@@ -3,8 +3,4 @@ load("//:defs.bzl", "codex_rust_crate")
 codex_rust_crate(
     name = "cloud-tasks-client",
     crate_name = "codex_cloud_tasks_client",
-    crate_features = [
-        "mock",
-        "online",
-    ],
 )

codex-rs/cloud-tasks-client/Cargo.toml

@@ -11,11 +11,6 @@ path = "src/lib.rs"
 [lints]
 workspace = true
 
-[features]
-default = ["online"]
-online = ["dep:codex-backend-client"]
-mock = []
-
 [dependencies]
 anyhow = "1"
 async-trait = "0.1"
@@ -24,5 +19,5 @@ diffy = "0.4.2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 thiserror = "2.0.17"
-codex-backend-client = { path = "../backend-client", optional = true }
+codex-backend-client = { path = "../backend-client" }
 codex-git-utils = { workspace = true }

codex-rs/cloud-tasks-client/src/lib.rs

@@ -15,16 +15,9 @@ pub use api::TaskSummary;
 pub use api::TaskText;
 pub use api::TurnAttempt;
 
-#[cfg(feature = "mock")]
-mod mock;
-
-#[cfg(feature = "online")]
 mod http;
-
-#[cfg(feature = "mock")]
+mod mock;
+pub use http::HttpClient;
 pub use mock::MockClient;
 
-#[cfg(feature = "online")]
-pub use http::HttpClient;
-
 // Reusable apply engine now lives in the shared crate `codex-git-utils`.

codex-rs/cloud-tasks/Cargo.toml

@@ -16,10 +16,7 @@ anyhow = { workspace = true }
 base64 = { workspace = true }
 chrono = { workspace = true, features = ["serde"] }
 clap = { workspace = true, features = ["derive"] }
-codex-cloud-tasks-client = { path = "../cloud-tasks-client", features = [
-    "mock",
-    "online",
-] }
+codex-cloud-tasks-client = { path = "../cloud-tasks-client" }
 codex-client = { workspace = true }
 codex-core = { path = "../core" }
 codex-git-utils = { workspace = true }

codex-rs/tui/Cargo.toml

@@ -19,10 +19,6 @@ path = "src/lib.rs"
 
 [features]
 default = ["voice-input"]
-# Enable vt100-based tests (emulator) when running with `--features vt100-tests`.
-vt100-tests = []
-# Gate verbose debug logging inside the TUI implementation.
-debug-logs = []
 voice-input = ["dep:cpal"]
 
 [lints]

codex-rs/tui/src/bottom_pane/textarea.rs

@@ -530,7 +530,7 @@ impl TextArea {
                 self.move_cursor_to_end_of_line(/*move_down_at_eol*/ true);
             }
             _o => {
-                #[cfg(feature = "debug-logs")]
+                #[cfg(debug_assertions)]
                 tracing::debug!("Unhandled key event in TextArea: {:?}", _o);
             }
         }

codex-rs/tui/tests/all.rs

@@ -1,6 +1,6 @@
 // Single integration test binary that aggregates all test modules.
 // The submodules live in `tests/suite/`.
-#[cfg(feature = "vt100-tests")]
+#[cfg(debug_assertions)]
 mod test_backend;
 
 #[allow(unused_imports)]

codex-rs/tui/tests/suite/vt100_history.rs

@@ -1,4 +1,4 @@
-#![cfg(feature = "vt100-tests")]
+#![cfg(debug_assertions)]
 #![expect(clippy::expect_used)]
 
 use crate::test_backend::VT100Backend;

codex-rs/tui/tests/suite/vt100_live_commit.rs

@@ -1,4 +1,4 @@
-#![cfg(feature = "vt100-tests")]
+#![cfg(debug_assertions)]
 
 use crate::test_backend::VT100Backend;
 use ratatui::layout::Rect;