chore(cli): drop header workaround changes

Author: Han5991

crates/vite_global_cli/src/cli.rs

@@ -1646,7 +1646,7 @@ pub async fn run_command_with_options(
             packages,
             pass_through_args,
         } => {
-            print_runtime_header(render_options.show_header && !silent, true);
+            print_runtime_header(render_options.show_header && !silent);
             // If packages are provided, redirect to Add command
             if let Some(pkgs) = packages
                 && !pkgs.is_empty()
@@ -1972,31 +1972,31 @@ pub async fn run_command_with_options(
             if help::maybe_print_unified_delegate_help("dev", &args, render_options.show_header) {
                 return Ok(ExitStatus::default());
             }
-            print_runtime_header(render_options.show_header, false);
+            print_runtime_header(render_options.show_header);
             commands::delegate::execute(cwd, "dev", &args).await
         }
 
         Commands::Build { args } => {
             if help::maybe_print_unified_delegate_help("build", &args, render_options.show_header) {
                 return Ok(ExitStatus::default());
             }
-            print_runtime_header(render_options.show_header, false);
+            print_runtime_header(render_options.show_header);
             commands::delegate::execute(cwd, "build", &args).await
         }
 
         Commands::Test { args } => {
             if help::maybe_print_unified_delegate_help("test", &args, render_options.show_header) {
                 return Ok(ExitStatus::default());
             }
-            print_runtime_header(render_options.show_header, false);
+            print_runtime_header(render_options.show_header);
             commands::delegate::execute(cwd, "test", &args).await
         }
 
         Commands::Lint { args } => {
             if help::maybe_print_unified_delegate_help("lint", &args, render_options.show_header) {
                 return Ok(ExitStatus::default());
             }
-            print_runtime_header(render_options.show_header, false);
+            print_runtime_header(render_options.show_header);
             if should_force_global_delegate("lint", &args) {
                 commands::delegate::execute_global(cwd, "lint", &args).await
             } else {
@@ -2008,7 +2008,7 @@ pub async fn run_command_with_options(
             if help::maybe_print_unified_delegate_help("fmt", &args, render_options.show_header) {
                 return Ok(ExitStatus::default());
             }
-            print_runtime_header(render_options.show_header, false);
+            print_runtime_header(render_options.show_header);
             if should_force_global_delegate("fmt", &args) {
                 commands::delegate::execute_global(cwd, "fmt", &args).await
             } else {
@@ -2020,31 +2020,31 @@ pub async fn run_command_with_options(
             if help::maybe_print_unified_delegate_help("check", &args, render_options.show_header) {
                 return Ok(ExitStatus::default());
             }
-            print_runtime_header(render_options.show_header, false);
+            print_runtime_header(render_options.show_header);
             commands::delegate::execute(cwd, "check", &args).await
         }
 
         Commands::Pack { args } => {
             if help::maybe_print_unified_delegate_help("pack", &args, render_options.show_header) {
                 return Ok(ExitStatus::default());
             }
-            print_runtime_header(render_options.show_header, false);
+            print_runtime_header(render_options.show_header);
             commands::delegate::execute(cwd, "pack", &args).await
         }
 
         Commands::Run { args } => {
             if help::maybe_print_unified_delegate_help("run", &args, render_options.show_header) {
                 return Ok(ExitStatus::default());
             }
-            print_runtime_header(render_options.show_header, false);
+            print_runtime_header(render_options.show_header);
             commands::delegate::execute(cwd, "run", &args).await
         }
 
         Commands::Exec { args } => {
             if help::maybe_print_unified_delegate_help("exec", &args, render_options.show_header) {
                 return Ok(ExitStatus::default());
             }
-            print_runtime_header(render_options.show_header, false);
+            print_runtime_header(render_options.show_header);
             commands::delegate::execute(cwd, "exec", &args).await
         }
 
@@ -2053,15 +2053,15 @@ pub async fn run_command_with_options(
             {
                 return Ok(ExitStatus::default());
             }
-            print_runtime_header(render_options.show_header, false);
+            print_runtime_header(render_options.show_header);
             commands::delegate::execute(cwd, "preview", &args).await
         }
 
         Commands::Cache { args } => {
             if help::maybe_print_unified_delegate_help("cache", &args, render_options.show_header) {
                 return Ok(ExitStatus::default());
             }
-            print_runtime_header(render_options.show_header, false);
+            print_runtime_header(render_options.show_header);
             commands::delegate::execute(cwd, "cache", &args).await
         }
 
@@ -2098,16 +2098,11 @@ pub(crate) fn exit_status(code: i32) -> ExitStatus {
     }
 }
 
-fn print_runtime_header(show_header: bool, dynamic_colors: bool) {
+fn print_runtime_header(show_header: bool) {
     if !show_header {
         return;
     }
-    let header = if dynamic_colors {
-        vite_shared::header::vite_plus_header()
-    } else {
-        vite_shared::header::vite_plus_header_static()
-    };
-    println!("{header}");
+    println!("{}", vite_shared::header::vite_plus_header());
     println!();
 }
 
@@ -2124,12 +2119,12 @@ pub fn command_with_help_with_options(render_options: RenderOptions) -> clap::Co
 /// Apply custom help formatting to a clap Command to match the JS CLI output.
 fn apply_custom_help(cmd: clap::Command, render_options: RenderOptions) -> clap::Command {
     let after_help = help::render_help_doc(&help::top_level_help_doc());
+    let options_heading = help::render_heading("Options");
     let header = if render_options.show_header {
-        format!("{}\n\n", vite_shared::header::vite_plus_header())
+        vite_shared::header::vite_plus_header()
     } else {
         String::new()
     };
-    let options_heading = help::render_heading("Options");
     let help_template = format!("{header}{{after-help}}\n{options_heading}\n{{options}}\n");
 
     cmd.after_help(after_help).help_template(help_template)
@@ -2156,10 +2151,7 @@ pub fn try_parse_args_from_with_options(
 
 #[cfg(test)]
 mod tests {
-    use super::{
-        RenderOptions, command_with_help_with_options, has_flag_before_terminator,
-        should_force_global_delegate,
-    };
+    use super::{has_flag_before_terminator, should_force_global_delegate};
 
     #[test]
     fn detects_flag_before_option_terminator() {
@@ -2192,22 +2184,4 @@ mod tests {
         assert!(!should_force_global_delegate("lint", &["src/index.ts".to_string()]));
         assert!(!should_force_global_delegate("fmt", &["--check".to_string()]));
     }
-
-    #[test]
-    fn top_level_help_includes_header_when_enabled() {
-        let help = command_with_help_with_options(RenderOptions { show_header: true })
-            .render_help()
-            .to_string();
-
-        assert!(help.starts_with("VITE+ - The Unified Toolchain for the Web\n\n"));
-    }
-
-    #[test]
-    fn top_level_help_omits_header_when_disabled() {
-        let help = command_with_help_with_options(RenderOptions { show_header: false })
-            .render_help()
-            .to_string();
-
-        assert!(!help.starts_with("VITE+ - The Unified Toolchain for the Web"));
-    }
 }

crates/vite_global_cli/src/main.rs

@@ -322,8 +322,7 @@ async fn main() -> ExitCode {
     }
 
     // Parse CLI arguments (using custom help formatting)
-    let parse_result =
-        try_parse_args_from_with_options(normalized_args, RenderOptions { show_header: false });
+    let parse_result = try_parse_args_from(normalized_args);
 
     // Spawn background upgrade check for eligible commands
     let upgrade_handle = match &parse_result {
@@ -339,9 +338,6 @@ async fn main() -> ExitCode {
 
             // --help and --version are clap "errors" but should exit successfully.
             if matches!(e.kind(), ErrorKind::DisplayHelp | ErrorKind::DisplayVersion) {
-                if e.kind() == ErrorKind::DisplayHelp {
-                    println!("{}", vite_shared::header::vite_plus_header());
-                }
                 e.print().ok();
                 ExitCode::SUCCESS
             } else if matches!(e.kind(), ErrorKind::InvalidSubcommand) {