From 446cc27c95b1a999d245e52c78615c11eaa57ebe Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Tue, 23 Dec 2025 11:00:00 -0800
Subject: [PATCH] progress

---
 codex-rs/tui2/src/lib.rs             | 9 +--------
 codex-rs/tui2/src/model_migration.rs | 3 ---
 codex-rs/tui2/src/test_backend.rs    | 3 +--
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/codex-rs/tui2/src/lib.rs b/codex-rs/tui2/src/lib.rs
index 5b0d2cae51..e31194b5b8 100644
--- a/codex-rs/tui2/src/lib.rs
+++ b/codex-rs/tui2/src/lib.rs
@@ -58,8 +58,6 @@ pub mod live_wrap;
 mod markdown;
 mod markdown_render;
 mod markdown_stream;
-// Model migration prompt UI is no longer used in production; keep it for snapshot tests.
-#[cfg(test)]
 mod model_migration;
 mod notifications;
 pub mod onboarding;
@@ -79,8 +77,6 @@ mod style;
 mod terminal_palette;
 mod text_formatting;
 mod tooltips;
-mod transcript_copy;
-mod transcript_selection;
 mod tui;
 mod ui_consts;
 pub mod update_action;
@@ -282,10 +278,7 @@ pub async fn run_main(
 
     let file_layer = tracing_subscriber::fmt::layer()
         .with_writer(non_blocking)
-        // `with_target(true)` is the default, but we previously disabled it for file output.
-        // Keep it enabled so we can selectively enable targets via `RUST_LOG=...` and then
-        // grep for a specific module/target while troubleshooting.
-        .with_target(true)
+        .with_target(false)
         .with_ansi(false)
         .with_span_events(tracing_subscriber::fmt::format::FmtSpan::CLOSE)
         .with_filter(env_filter());
diff --git a/codex-rs/tui2/src/model_migration.rs b/codex-rs/tui2/src/model_migration.rs
index 6e1b7e3c13..0b74ad40a5 100644
--- a/codex-rs/tui2/src/model_migration.rs
+++ b/codex-rs/tui2/src/model_migration.rs
@@ -1,12 +1,9 @@
-#![allow(dead_code)]
-
 use crate::key_hint;
 use crate::render::Insets;
 use crate::render::renderable::ColumnRenderable;
 use crate::render::renderable::Renderable;
 use crate::render::renderable::RenderableExt as _;
 use crate::selection_list::selection_option_row;
-
 use crate::tui::FrameRequester;
 use crate::tui::Tui;
 use crate::tui::TuiEvent;
diff --git a/codex-rs/tui2/src/test_backend.rs b/codex-rs/tui2/src/test_backend.rs
index 7fa0e3fdb7..47f17e6b93 100644
--- a/codex-rs/tui2/src/test_backend.rs
+++ b/codex-rs/tui2/src/test_backend.rs
@@ -25,8 +25,7 @@ pub struct VT100Backend {
 impl VT100Backend {
     /// Creates a new `TestBackend` with the specified width and height.
     pub fn new(width: u16, height: u16) -> Self {
-        // Force ANSI color output even when the writer isn't a real TTY (e.g., vt100::Parser in tests).
-        crossterm::style::force_color_output(true);
+        crossterm::style::Colored::set_ansi_color_disabled(false);
         Self {
             crossterm_backend: CrosstermBackend::new(vt100::Parser::new(height, width, 0)),
         }