[hermes] Hermes is responsible for all terminal UI

gherrit-pr-id: Gc48bae5a713c0931a406c162369f4a30ddc1f2b3

Author: joshlf

tools/Cargo.lock

@@ -23,6 +23,8 @@ syn = { version = "2.0.114", features = ["full", "visit", "extra-traits", "parsi
 quote = "1.0"
 thiserror = "2.0.18"
 walkdir = "2.5.0"
+indicatif = { version = "0.18.3", features = ["improved_unicode"] }
+console = "0.16.2"
 
 [dev-dependencies]
 syn = { version = "2.0.114", features = ["printing", "full", "visit", "extra-traits", "parsing"] }
@@ -35,6 +37,8 @@ datatest-stable = "0.3.3"
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.8"
 which = "6.0"
+regex.workspace = true
+strip-ansi-escapes = "0.2.1"
 
 [[test]]
 name = "integration"

tools/hermes/Cargo.toml

@@ -82,9 +82,34 @@ pub fn run_charon(args: &Args, roots: &Roots, packages: &[HermesArtifact]) -> Re
         log::debug!("Command: {:?}", cmd);
 
         cmd.stdout(std::process::Stdio::piped());
+        cmd.stderr(std::process::Stdio::piped());
         let mut child = cmd.spawn().context("Failed to spawn charon")?;
 
         let mut output_error = false;
+
+        let safety_buffer = std::sync::Arc::new(std::sync::Mutex::new(Vec::new()));
+        let safety_buffer_clone = std::sync::Arc::clone(&safety_buffer);
+        if let Some(stderr) = child.stderr.take() {
+            std::thread::spawn(move || {
+                use std::io::{BufRead, BufReader};
+                let reader = BufReader::new(stderr);
+                for line in reader.lines() {
+                    if let Ok(line) = line {
+                        if let Ok(mut buf) = safety_buffer_clone.lock() {
+                            buf.push(line);
+                        }
+                    }
+                }
+            });
+        }
+
+        let pb = indicatif::ProgressBar::new_spinner();
+        pb.set_style(
+            indicatif::ProgressStyle::default_spinner().template("{spinner:.green} {msg}").unwrap(),
+        );
+        pb.enable_steady_tick(std::time::Duration::from_millis(100));
+        pb.set_message("Compiling...");
+
         if let Some(stdout) = child.stdout.take() {
             use std::io::{BufRead, BufReader};
             let reader = BufReader::new(stdout);
@@ -105,8 +130,13 @@ pub fn run_charon(args: &Args, roots: &Roots, packages: &[HermesArtifact]) -> Re
                     if let Ok(msg) = serde_json::from_str::<cargo_metadata::Message>(&line) {
                         use cargo_metadata::Message;
                         match msg {
+                            Message::CompilerArtifact(a) => {
+                                pb.set_message(format!("Compiling {}", a.target.name));
+                            }
                             Message::CompilerMessage(msg) => {
-                                mapper.render_miette(&msg.message);
+                                pb.suspend(|| {
+                                    mapper.render_miette(&msg.message, |s| eprintln!("{}", s));
+                                });
                                 if matches!(
                                     msg.message.level,
                                     DiagnosticLevel::Error | DiagnosticLevel::Ice
@@ -115,23 +145,34 @@ pub fn run_charon(args: &Args, roots: &Roots, packages: &[HermesArtifact]) -> Re
                                 }
                             }
                             Message::TextLine(t) => {
-                                eprintln!("{}", t);
+                                if let Ok(mut buf) = safety_buffer.lock() {
+                                    buf.push(t);
+                                }
                             }
                             _ => {}
                         }
                     } else {
-                        // Print non-JSON lines to stderr
-                        eprintln!("{}", line);
+                        if let Ok(mut buf) = safety_buffer.lock() {
+                            buf.push(line);
+                        }
                     }
                 }
             }
         }
 
+        pb.finish_and_clear();
+
         let status = child.wait().context("Failed to wait for charon")?;
 
         if output_error {
             bail!("Diagnostic error in charon");
         } else if !status.success() {
+            // "Silent Death" dump
+            if let Ok(buf) = safety_buffer.lock() {
+                for line in buf.iter() {
+                    eprintln!("{}", line);
+                }
+            }
             bail!("Charon failed with status: {}", status);
         }
     }

tools/hermes/src/charon.rs

@@ -90,7 +90,10 @@ impl DiagnosticMapper {
         }
     }
 
-    pub fn render_miette(&mut self, diag: &Diagnostic) {
+    pub fn render_miette<F>(&mut self, diag: &Diagnostic, mut printer: F)
+    where
+        F: FnMut(String),
+    {
         let mut mapped_paths_and_spans: HashMap<PathBuf, Vec<&DiagnosticSpan>> = HashMap::new();
 
         // 1) Group spans by mapped path
@@ -160,7 +163,7 @@ impl DiagnosticMapper {
                 if !all_errors.is_empty() {
                     let mut main_err = all_errors.remove(0);
                     main_err.related = all_errors;
-                    eprintln!("{:?}", Report::new(main_err));
+                    printer(format!("{:?}", Report::new(main_err)));
                     return;
                 }
             }
@@ -172,6 +175,6 @@ impl DiagnosticMapper {
             DiagnosticLevel::Warning => "[External Warning]",
             _ => "[External Info]",
         };
-        eprintln!("{} {}", prefix, diag.message);
+        printer(format!("{} {}", prefix, diag.message));
     }
 }

tools/hermes/src/diagnostics.rs

@@ -1,4 +1,3 @@
-Line 1 from charon
   × interleaved error
    ╭─[[PROJECT_ROOT]/src/lib.rs:1:1]
  1 │ pub fn foo() {}
@@ -7,5 +6,4 @@ Line 1 from charon
  2 │ 
    ╰────
 
-Line 2 from charon
 Error: Diagnostic error in charon

tools/hermes/tests/fixtures/env_interleaved_stdout/expected_stderr.txt

@@ -0,0 +1 @@
+failure

tools/hermes/tests/fixtures/ui_build_script_noise/expected_status.txt

@@ -0,0 +1 @@
+.*

tools/hermes/tests/fixtures/ui_build_script_noise/expected_stderr.regex.txt

@@ -0,0 +1 @@
+[dependencies]

tools/hermes/tests/fixtures/ui_build_script_noise/hermes.toml

@@ -0,0 +1,2 @@
+Invalid JSON Data
+{"reason": "compiler-artifact", "target": {"name": "test_pkg", "kind": ["lib"]}}

tools/hermes/tests/fixtures/ui_build_script_noise/mock_charon_output.json

@@ -0,0 +1,6 @@
+[package]
+name = "test_pkg"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]