Merge branch 'main' into codex/napi-cross-runner-fix

Author: wan9chi

README.md

@@ -1,10 +1,9 @@
 <p align="center">
-  <a href="https://viteplus.dev" target="_blank" rel="noopener noreferrer">
-    <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="./docs/public/logo-dark.svg">
-      <source media="(prefers-color-scheme: light)" srcset="./docs/public/logo.svg">
-      <img alt="Vite+" src="./docs/public/logo.svg" height="60">
-    </picture>
+  <a href="https://viteplus.dev/#gh-light-mode-only" target="_blank" rel="noopener noreferrer">
+    <img alt="Vite+" src="./docs/public/logo.svg" width="412">
+  </a>
+  <a href="https://viteplus.dev/#gh-dark-mode-only" target="_blank" rel="noopener noreferrer">
+    <img alt="Vite+" src="./docs/public/logo-dark.svg" width="412">
   </a>
 </p>
 

crates/vp_global_cli/Cargo.toml

@@ -13,7 +13,7 @@ path = "src/main.rs"
 
 [dependencies]
 chrono = { workspace = true }
-clap = { workspace = true, features = ["derive"] }
+clap = { workspace = true, features = ["derive", "string"] }
 clap_complete = { workspace = true, features = ["unstable-dynamic"] }
 directories = { workspace = true }
 dialoguer = { workspace = true }

crates/vp_global_cli/src/cli.rs

@@ -1283,6 +1283,25 @@ fn maybe_print_runtime_header(command: &str, args: &[String], show_header: bool)
     print_runtime_header(show_header);
 }
 
+fn sanitize_subcommand_aliases_for_completion(cmd: &mut clap::Command) {
+    for subcmd in cmd.get_subcommands_mut() {
+        if subcmd.get_visible_aliases().next().is_some() {
+            let aliases: Vec<String> = subcmd.get_all_aliases().map(str::to_string).collect();
+            // Clear aliases and re-add them as hidden.
+            *subcmd = std::mem::take(subcmd).alias(None::<&str>).aliases(aliases);
+        }
+        sanitize_subcommand_aliases_for_completion(subcmd);
+    }
+}
+
+/// Build a completion command with hidden aliases so clap_complete's ID-based
+/// deduplication preserves canonical names.
+pub fn command_for_completion() -> clap::Command {
+    let mut cmd = Args::command();
+    sanitize_subcommand_aliases_for_completion(&mut cmd);
+    cmd
+}
+
 /// Build a clap Command with custom help formatting matching the JS CLI output.
 pub fn command_with_help() -> clap::Command {
     command_with_help_with_options(RenderOptions::default())
@@ -1338,6 +1357,37 @@ mod tests {
         args.iter().map(|arg| (*arg).to_string()).collect()
     }
 
+    #[test]
+    fn command_for_completion_preserves_canonical_subcommands() {
+        let mut cmd = super::command_for_completion();
+        for (parent, alias, name) in [
+            (None, "i", "install"),
+            (None, "up", "update"),
+            (None, "rm", "remove"),
+            (None, "un", "remove"),
+            (None, "uninstall", "remove"),
+            (Some("pm"), "ls", "list"),
+        ] {
+            let cmd = match parent {
+                Some(name) => cmd.find_subcommand_mut(name).unwrap(),
+                None => &mut cmd,
+            };
+            let candidates =
+                clap_complete::engine::complete(cmd, vec!["vp".into(), "".into()], 1, None)
+                    .unwrap();
+
+            assert!(
+                candidates.iter().any(|c| c.get_value() == name),
+                "missing {name}: {candidates:?}"
+            );
+            assert!(
+                !candidates.iter().any(|c| c.get_value() == alias),
+                "alias {alias} should be hidden from candidates: {candidates:?}"
+            );
+            assert_eq!(cmd.find_subcommand(alias).unwrap().get_name(), name);
+        }
+    }
+
     #[test]
     fn raw_subcommand_is_the_token_as_written() {
         assert_eq!(raw_subcommand(&argv(&["vp", "fmt", "src/"])), Some("fmt"));

crates/vp_global_cli/src/main.rs

@@ -40,7 +40,7 @@ use vp_shared::{exit_code_from_status, output};
 
 pub use crate::cli::try_parse_args_from;
 use crate::cli::{
-    RenderOptions, command_with_help, raw_subcommand, run_command, run_command_with_options,
+    RenderOptions, command_for_completion, raw_subcommand, run_command, run_command_with_options,
     try_parse_args_from_with_options,
 };
 
@@ -414,7 +414,7 @@ async fn main() -> ExitCode {
         // Best-effort and silent: mid-typing values are often not (yet) dirs.
         let _ = apply_chdir(&current, &dir);
     }
-    CompleteEnv::with_factory(command_with_help).var("VP_COMPLETE").complete();
+    CompleteEnv::with_factory(command_for_completion).var("VP_COMPLETE").complete();
 
     // Check for shim mode (invoked as node, npm, or npx)
     let argv0 = args.first().map(|s| s.as_str()).unwrap_or("vp");