Merge branch 'main' into test/e2e-varlet

Author: fengmk2

crates/vite_global_cli/src/cli.rs

@@ -2102,8 +2102,7 @@ fn print_runtime_header(show_header: bool) {
     if !show_header {
         return;
     }
-    println!("{}", vite_shared::header::vite_plus_header());
-    println!();
+    vite_shared::header::print_header();
 }
 
 /// Build a clap Command with custom help formatting matching the JS CLI output.
@@ -2120,7 +2119,7 @@ pub fn command_with_help_with_options(render_options: RenderOptions) -> clap::Co
 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 {
+    let header = if render_options.show_header && vite_shared::header::should_print_header() {
         vite_shared::header::vite_plus_header()
     } else {
         String::new()

crates/vite_global_cli/src/commands/env/mod.rs

@@ -32,8 +32,7 @@ use crate::{
 };
 
 fn print_env_header() {
-    println!("{}", vite_shared::header::vite_plus_header());
-    println!();
+    vite_shared::header::print_header();
 }
 
 fn should_print_env_header(subcommand: &EnvSubcommands) -> bool {
@@ -140,8 +139,7 @@ pub async fn execute(cwd: AbsolutePathBuf, args: EnvArgs) -> Result<ExitStatus,
     if !crate::help::print_unified_clap_help_for_path(&["env"]) {
         // Fallback to clap's built-in help printer if unified rendering fails.
         use clap::CommandFactory;
-        println!("{}", vite_shared::header::vite_plus_header());
-        println!();
+        vite_shared::header::print_header();
         crate::cli::Args::command()
             .find_subcommand("env")
             .unwrap()

crates/vite_global_cli/src/commands/version.rs

@@ -161,8 +161,7 @@ fn detect_system_node_version() -> Option<String> {
 
 /// Execute the `--version` command.
 pub async fn execute(cwd: AbsolutePathBuf) -> Result<ExitStatus, Error> {
-    println!("{}", vite_shared::header::vite_plus_header());
-    println!();
+    vite_shared::header::print_header();
 
     println!("vp v{}", env!("CARGO_PKG_VERSION"));
     println!();

crates/vite_global_cli/src/help.rs

@@ -993,8 +993,7 @@ pub fn maybe_print_unified_clap_subcommand_help(argv: &[String]) -> bool {
     }
 
     if command_path.len() == 1 && command_path[0] == "env" {
-        println!("{}", vite_shared::header::vite_plus_header());
-        println!();
+        vite_shared::header::print_header();
         println!("{}", render_help_doc(&env_help_doc()));
         return true;
     }
@@ -1024,17 +1023,15 @@ pub fn maybe_print_unified_delegate_help(
     };
 
     if show_header {
-        println!("{}", vite_shared::header::vite_plus_header());
-        println!();
+        vite_shared::header::print_header();
     }
     println!("{}", render_help_doc(&doc));
     true
 }
 
 pub fn print_unified_clap_help_for_path(command_path: &[&str]) -> bool {
     if command_path == ["env"] {
-        println!("{}", vite_shared::header::vite_plus_header());
-        println!();
+        vite_shared::header::print_header();
         println!("{}", render_help_doc(&env_help_doc()));
         return true;
     }
@@ -1057,8 +1054,7 @@ pub fn print_unified_clap_help_for_path(command_path: &[&str]) -> bool {
         ..doc
     };
 
-    println!("{}", vite_shared::header::vite_plus_header());
-    println!();
+    vite_shared::header::print_header();
     println!("{}", render_owned_help_doc(&doc));
     true
 }

crates/vite_global_cli/src/main.rs

@@ -116,8 +116,7 @@ fn extract_invalid_subcommand_details(error: &clap::Error) -> Option<InvalidSubc
 }
 
 fn print_invalid_subcommand_error(details: &InvalidSubcommandDetails) {
-    println!("{}", vite_shared::header::vite_plus_header());
-    println!();
+    vite_shared::header::print_header();
 
     let highlighted_subcommand = details.invalid_subcommand.bright_blue().to_string();
     output::error(&format!("Command '{highlighted_subcommand}' not found"));
@@ -237,8 +236,7 @@ fn print_unknown_argument_error(error: &clap::Error) -> bool {
         return false;
     };
 
-    println!("{}", vite_shared::header::vite_plus_header());
-    println!();
+    vite_shared::header::print_header();
 
     let highlighted_argument = invalid_argument.bright_blue().to_string();
     output::error(&format!("Unexpected argument '{highlighted_argument}'"));

crates/vite_shared/src/header.rs

@@ -536,6 +536,36 @@ pub fn vite_plus_header() -> String {
     render_header_variant(header_colors.blue, &header_colors.suffix_gradient, true, true)
 }
 
+/// Whether the Vite+ banner should be emitted in the current environment.
+///
+/// The banner is cosmetic and assumes an interactive terminal; it's
+/// suppressed when:
+/// - stdout is piped or redirected (lefthook/husky, `execSync`, CI, pagers).
+/// - a git commit-flow hook is running. Direct shell hooks inherit the
+///   terminal for stdout, so the TTY check alone doesn't catch them; git
+///   sets `GIT_INDEX_FILE` for pre-commit / commit-msg / prepare-commit-msg,
+///   which is where `vp check --fix` typically runs.
+#[must_use]
+pub fn should_print_header() -> bool {
+    if !std::io::stdout().is_terminal() {
+        return false;
+    }
+    if std::env::var_os("GIT_INDEX_FILE").is_some() {
+        return false;
+    }
+    true
+}
+
+/// Emit the Vite+ banner (header line + trailing blank line) to stdout, but
+/// only when the environment is interactive. No-op otherwise.
+pub fn print_header() {
+    if !should_print_header() {
+        return;
+    }
+    println!("{}", vite_plus_header());
+    println!();
+}
+
 #[cfg(all(test, unix))]
 mod tests {
     use std::io::{BufReader, Cursor};

packages/cli/binding/index.cjs

@@ -775,4 +775,5 @@ module.exports.rewritePrettier = nativeBinding.rewritePrettier;
 module.exports.rewriteScripts = nativeBinding.rewriteScripts;
 module.exports.run = nativeBinding.run;
 module.exports.runCommand = nativeBinding.runCommand;
+module.exports.shouldPrintVitePlusHeader = nativeBinding.shouldPrintVitePlusHeader;
 module.exports.vitePlusHeader = nativeBinding.vitePlusHeader;

packages/cli/binding/index.d.cts

@@ -369,5 +369,13 @@ export interface RunCommandResult {
   pathAccesses: Record<string, PathAccess>;
 }
 
+/**
+ * Whether the Vite+ banner should be emitted in the current environment.
+ *
+ * Mirrors `vite_shared::header::should_print_header` so both CLIs apply
+ * the same TTY + git-hook gating without duplicating the rules in JS.
+ */
+export declare function shouldPrintVitePlusHeader(): boolean;
+
 /** Render the Vite+ header using the Rust implementation. */
 export declare function vitePlusHeader(): string;

packages/cli/binding/src/cli/help.rs

@@ -169,14 +169,16 @@ fn print_unknown_argument_error(error: &clap::Error) -> bool {
 }
 
 pub(super) fn print_help() {
-    let header = vite_shared::header::vite_plus_header();
+    let header = if vite_shared::header::should_print_header() {
+        format!("{}\n\n", vite_shared::header::vite_plus_header())
+    } else {
+        String::new()
+    };
     let bold = "\x1b[1m";
     let bold_underline = "\x1b[1;4m";
     let reset = "\x1b[0m";
     println!(
-        "{header}
-
-{bold_underline}Usage:{reset} {bold}vp{reset} <COMMAND>
+        "{header}{bold_underline}Usage:{reset} {bold}vp{reset} <COMMAND>
 
 {bold_underline}Core Commands:{reset}
   {bold}dev{reset}            Run the development server

packages/cli/binding/src/lib.rs

@@ -215,3 +215,12 @@ pub async fn run(options: CliOptions) -> Result<i32> {
 pub fn vite_plus_header() -> String {
     vite_shared::header::vite_plus_header()
 }
+
+/// Whether the Vite+ banner should be emitted in the current environment.
+///
+/// Mirrors `vite_shared::header::should_print_header` so both CLIs apply
+/// the same TTY + git-hook gating without duplicating the rules in JS.
+#[napi]
+pub fn should_print_vite_plus_header() -> bool {
+    vite_shared::header::should_print_header()
+}