Feat/cs/polish 8

src/app.rs

@@ -1383,9 +1383,9 @@ impl App {
                 // Avoid closing the client connection with an oversized frame.
                 if s.len() > MAX_PASTE {
                     self.status = Some(format!(
-                        "paste dropped: {} MiB exceeds the {} MiB limit",
-                        s.len() >> 20,
-                        MAX_PASTE >> 20
+                        "paste dropped: {} exceeds the {} limit",
+                        crate::format::bytes(s.len()),
+                        crate::format::bytes(MAX_PASTE)
                     ));
                     return;
                 }

src/app_tests.rs

@@ -1105,7 +1105,8 @@ fn oversized_paste_is_refused_with_a_notice() {
     app.focused_id = Some(1);
     app.on_paste(&"x".repeat(MAX_PASTE + 1));
     let status = app.status.clone().unwrap_or_default();
-    assert!(status.contains("paste dropped"), "status was {status:?}");
+    // MiB values are truncated, so both sizes display as 8 MiB.
+    assert_eq!(status, "paste dropped: 8 MiB exceeds the 8 MiB limit");
     // The boundary value is accepted.
     app.on_paste(&"x".repeat(MAX_PASTE));
     assert!(app.status.is_none(), "boundary paste must not be refused");

src/harness/assets.rs

@@ -205,10 +205,11 @@ mod tests {
         process::{Command, Stdio},
     };
 
-    use super::super::testutil::ID;
-    use super::super::{CAPTURE_ENV, NOTIFY_CHAIN_ENV};
     use super::*;
-    use crate::testutil::{install_fake_notifier, temp, write_executable};
+    use crate::{
+        harness::{CAPTURE_ENV, NOTIFY_CHAIN_ENV, fixtures::ID},
+        testutil::{dead_pid, install_fake_notifier, temp, write_executable},
+    };
 
     fn mode(p: &Path) -> u32 {
         fs::metadata(p).unwrap().permissions().mode() & 0o777
@@ -366,14 +367,6 @@ mod tests {
         let _ = fs::remove_dir_all(&root);
     }
 
-    /// Spawn and reap a child, then return its inactive PID.
-    fn dead_pid() -> u32 {
-        let mut child = Command::new("sh").arg("-c").arg("exit 0").spawn().unwrap();
-        let pid = child.id();
-        child.wait().unwrap();
-        pid
-    }
-
     /// Installation removes a dead owner's namespace and its contents.
     #[test]
     fn install_reaps_a_dead_owner_namespace() {

src/harness/claude.rs

@@ -88,9 +88,11 @@ fn slug(cwd: &Path) -> Option<String> {
 mod tests {
     use std::{fs, path::PathBuf};
 
-    use super::super::testutil::{ID, OTHER, assert_all_opaque, assert_corpus_scrape, paths};
     use super::*;
-    use crate::testutil::temp;
+    use crate::{
+        harness::fixtures::{ID, OTHER, assert_all_opaque, assert_corpus_scrape, paths},
+        testutil::temp,
+    };
 
     /// Claude-specific opaque shapes: flags, `--continue`/`-c`, subcommands,
     /// the short/`=` resume spellings, and `--session-id`. The syntax shared

src/harness/codex.rs

@@ -353,9 +353,11 @@ fn line1_cwd_matches(path: &Path, cwd: &Path) -> bool {
 mod tests {
     use std::path::PathBuf;
 
-    use super::super::testutil::{OTHER, assert_all_opaque, assert_corpus_scrape, paths};
     use super::*;
-    use crate::testutil::{temp, v7_at, write_rollout};
+    use crate::{
+        harness::fixtures::{OTHER, assert_all_opaque, assert_corpus_scrape, paths},
+        testutil::{temp, v7_at, write_rollout},
+    };
 
     /// Codex's own launch and resume commands carry v7 IDs; the shared v4
     /// fixture stays valid for detection, which is version-agnostic.

src/harness/grok.rs

@@ -85,10 +85,14 @@ fn encode_cwd(cwd: &Path) -> Option<String> {
 mod tests {
     use std::fs;
 
-    use super::super::is_uuid;
-    use super::super::testutil::{ID, OTHER, assert_all_opaque, assert_corpus_scrape, paths};
     use super::*;
-    use crate::testutil::temp;
+    use crate::{
+        harness::{
+            fixtures::{ID, OTHER, assert_all_opaque, assert_corpus_scrape, paths},
+            is_uuid,
+        },
+        testutil::temp,
+    };
 
     /// Grok-specific opaque shapes: flags, the `-r`/`-s`/`=` spellings the
     /// tool prints but detection refuses, and subcommands. The syntax shared

src/harness/mod.rs

@@ -316,7 +316,7 @@ fn shell_quote(s: &str) -> String {
 
 /// Fixtures and assertions for harness detection and exit scraping.
 #[cfg(test)]
-pub(crate) mod testutil {
+pub(crate) mod fixtures {
     use std::path::PathBuf;
 
     use super::{CapturePaths, Harness};
@@ -358,8 +358,10 @@ pub(crate) mod testutil {
 
 #[cfg(test)]
 mod tests {
-    use super::testutil::{ID, OTHER};
-    use super::*;
+    use super::{
+        fixtures::{ID, OTHER},
+        *,
+    };
 
     /// Harness, program word, selector, and path prefix for the shape tests
     /// shared by every harness. Codex's resume selector is a subcommand, not

src/harness/summary.rs

@@ -27,7 +27,7 @@
 
 use std::path::Path;
 
-use crate::preview::{ScreenFacts, SummaryAdapter};
+use crate::preview::SummaryAdapter;
 
 /// Select an adapter by the basename of the command's first
 /// whitespace-separated word. Arguments are accepted; environment prefixes
@@ -107,17 +107,16 @@ const CLAUDE_STATUS_WINDOW: usize = 16;
 pub struct ClaudeSummary;
 
 impl SummaryAdapter for ClaudeSummary {
-    fn live_preview(&self, screen: &dyn ScreenFacts) -> Option<(String, &'static str)> {
-        let rows = screen.live_rows();
-        match claude_box_top(&rows) {
-            Some(top) => claude_spinner_status(&rows, top),
+    fn live_preview(&self, rows: &[String]) -> Option<(String, &'static str)> {
+        match claude_box_top(rows) {
+            Some(top) => claude_spinner_status(rows, top),
             // Consider approval menus only when the normal input box is absent.
-            None => claude_approval(&rows),
+            None => claude_approval(rows),
         }
     }
 
-    fn model_label(&self, screen: &dyn ScreenFacts) -> Option<String> {
-        claude_welcome_label(&screen.live_rows())
+    fn model_label(&self, rows: &[String]) -> Option<String> {
+        claude_welcome_label(rows)
     }
 
     /// Canonicalize a leading claude spinner or braille frame to `✻` so title
@@ -307,18 +306,16 @@ fn claude_welcome_label(rows: &[String]) -> Option<String> {
 pub struct CodexSummary;
 
 impl SummaryAdapter for CodexSummary {
-    fn live_preview(&self, screen: &dyn ScreenFacts) -> Option<(String, &'static str)> {
-        let rows = screen.live_rows();
-        if let Some(hit) = codex_approval(&rows) {
+    fn live_preview(&self, rows: &[String]) -> Option<(String, &'static str)> {
+        if let Some(hit) = codex_approval(rows) {
             return Some(hit);
         }
-        let composer = codex_composer(&rows)?;
-        codex_status(&rows, composer)
+        let composer = codex_composer(rows)?;
+        codex_status(rows, composer)
     }
 
-    fn model_label(&self, screen: &dyn ScreenFacts) -> Option<String> {
-        let rows = screen.live_rows();
-        let token = codex_token_line(&rows)?;
+    fn model_label(&self, rows: &[String]) -> Option<String> {
+        let token = codex_token_line(rows)?;
         // `codex_token_line` guarantees a non-empty first segment.
         Some(rows[token].trim().split(" · ").next()?.to_string())
     }
@@ -428,9 +425,8 @@ fn codex_working(after_paren: &str) -> String {
 pub struct GrokSummary;
 
 impl SummaryAdapter for GrokSummary {
-    fn live_preview(&self, screen: &dyn ScreenFacts) -> Option<(String, &'static str)> {
-        let rows = screen.live_rows();
-        let (top, _) = grok_input_box(&rows)?;
+    fn live_preview(&self, rows: &[String]) -> Option<(String, &'static str)> {
+        let (top, _) = grok_input_box(rows)?;
         // One probe row: the first painted row above the box. The splash
         // panel's hints and the session header land here in non-working
         // states and match neither shape.
@@ -444,9 +440,8 @@ impl SummaryAdapter for GrokSummary {
         grok_worked(t).then(|| (t.to_string(), "grok:worked"))
     }
 
-    fn model_label(&self, screen: &dyn ScreenFacts) -> Option<String> {
-        let rows = screen.live_rows();
-        let (_, bottom) = grok_input_box(&rows)?;
+    fn model_label(&self, rows: &[String]) -> Option<String> {
+        let (_, bottom) = grok_input_box(rows)?;
         grok_border_label(&rows[bottom])
     }
 }