fix(install): use managed npm for global commands

Author: lyzno1

crates/vite_command/src/lib.rs

@@ -3,6 +3,7 @@ use std::os::fd::{BorrowedFd, RawFd};
 use std::{
     collections::HashMap,
     ffi::OsStr,
+    path::Path,
     process::{ExitStatus, Stdio},
 };
 
@@ -30,6 +31,15 @@ pub fn resolve_bin(
     path_env: Option<&OsStr>,
     cwd: impl AsRef<AbsolutePath>,
 ) -> Result<AbsolutePathBuf, Error> {
+    let candidate = Path::new(bin_name);
+    if candidate.is_absolute() {
+        if candidate.exists() {
+            return AbsolutePathBuf::new(candidate.to_path_buf())
+                .ok_or_else(|| Error::CannotFindBinaryPath(bin_name.into()));
+        }
+        return Err(Error::CannotFindBinaryPath(bin_name.into()));
+    }
+
     let current_path;
     let path_env = match path_env {
         Some(p) => p,
@@ -331,6 +341,36 @@ mod tests {
             assert!(result.is_ok(), "Should run command successfully, but got error: {:?}", result);
         }
 
+        #[tokio::test]
+        async fn test_run_command_with_absolute_binary_path() {
+            let temp_dir = create_temp_dir();
+            let temp_dir_path =
+                AbsolutePathBuf::new(temp_dir.path().canonicalize().unwrap().to_path_buf())
+                    .unwrap();
+
+            #[cfg(unix)]
+            let (bin_path, args) = {
+                use std::os::unix::fs::PermissionsExt;
+
+                let script_path = temp_dir_path.join("test-bin");
+                std::fs::write(&script_path, "#!/bin/sh\nexit 0\n").unwrap();
+                let mut permissions = std::fs::metadata(&script_path).unwrap().permissions();
+                permissions.set_mode(0o755);
+                std::fs::set_permissions(&script_path, permissions).unwrap();
+                (script_path.as_path().display().to_string(), Vec::<&str>::new())
+            };
+
+            #[cfg(not(unix))]
+            let (bin_path, args) = {
+                let current_exe = std::env::current_exe().unwrap();
+                (current_exe.to_string_lossy().to_string(), vec!["--help"])
+            };
+
+            let envs = HashMap::new();
+            let result = run_command(&bin_path, &args, &envs, &temp_dir_path).await;
+            assert!(result.is_ok(), "Should run absolute binary path, but got error: {:?}", result);
+        }
+
         #[tokio::test]
         async fn test_run_command_and_not_find_binary_path() {
             let temp_dir = create_temp_dir();

crates/vite_global_cli/src/commands/add.rs

@@ -6,7 +6,7 @@ use vite_install::{
 };
 use vite_path::AbsolutePathBuf;
 
-use super::prepend_js_runtime_to_path_env;
+use super::{managed_npm_bin_for_global_command, prepend_js_runtime_to_path_env};
 use crate::error::Error;
 
 /// Add command for adding packages to dependencies.
@@ -35,7 +35,7 @@ impl AddCommand {
         allow_build: Option<&str>,
         pass_through_args: Option<&[String]>,
     ) -> Result<ExitStatus, Error> {
-        prepend_js_runtime_to_path_env(&self.cwd).await?;
+        let node_bin_prefix = prepend_js_runtime_to_path_env(&self.cwd).await?;
         super::ensure_package_json(&self.cwd).await?;
 
         let add_command_options = AddCommandOptions {
@@ -53,8 +53,15 @@ impl AddCommand {
 
         // Detect package manager
         let package_manager = PackageManager::builder(&self.cwd).build_with_default().await?;
+        let global_npm_bin_path = managed_npm_bin_for_global_command(global, &node_bin_prefix);
 
-        Ok(package_manager.run_add_command(&add_command_options, &self.cwd).await?)
+        Ok(package_manager
+            .run_add_command_with_global_npm_bin(
+                &add_command_options,
+                &self.cwd,
+                global_npm_bin_path.as_deref(),
+            )
+            .await?)
     }
 }
 

crates/vite_global_cli/src/commands/mod.rs

@@ -25,8 +25,10 @@
 
 use std::{collections::HashMap, io::BufReader};
 
-use vite_install::package_manager::{PackageManager, PackageManagerType};
-use vite_path::AbsolutePath;
+use vite_install::package_manager::{
+    PackageManager, PackageManagerType, npm_bin_path_from_node_bin_prefix,
+};
+use vite_path::{AbsolutePath, AbsolutePathBuf};
 use vite_shared::{PrependOptions, prepend_to_path_env};
 
 use crate::{error::Error, js_executor::JsExecutor};
@@ -86,7 +88,9 @@ pub async fn ensure_package_json(project_path: &AbsolutePath) -> Result<(), Erro
 ///
 /// If `project_path` contains a package.json, uses the project's runtime
 /// (based on devEngines.runtime). Otherwise, falls back to the CLI's runtime.
-pub async fn prepend_js_runtime_to_path_env(project_path: &AbsolutePath) -> Result<(), Error> {
+pub async fn prepend_js_runtime_to_path_env(
+    project_path: &AbsolutePath,
+) -> Result<AbsolutePathBuf, Error> {
     let mut executor = JsExecutor::new(None);
 
     // Use project runtime if package.json exists, otherwise use CLI runtime
@@ -104,7 +108,19 @@ pub async fn prepend_js_runtime_to_path_env(project_path: &AbsolutePath) -> Resu
         tracing::debug!("Set PATH to include {:?}", node_bin_prefix);
     }
 
-    Ok(())
+    Ok(node_bin_prefix)
+}
+
+pub(crate) fn managed_npm_bin_for_global_command(
+    global: bool,
+    node_bin_prefix: &AbsolutePath,
+) -> Option<AbsolutePathBuf> {
+    if !global {
+        return None;
+    }
+
+    let npm_bin = npm_bin_path_from_node_bin_prefix(node_bin_prefix);
+    npm_bin.as_path().exists().then_some(npm_bin)
 }
 
 /// Build a PackageManager, converting PackageJsonNotFound into a friendly error message.
@@ -201,6 +217,25 @@ mod tests {
 
     use super::*;
 
+    #[test]
+    fn test_managed_npm_bin_for_global_command_uses_existing_adjacent_npm() {
+        let temp_dir = tempfile::tempdir().unwrap();
+        let node_bin_prefix = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap();
+        let expected = npm_bin_path_from_node_bin_prefix(&node_bin_prefix);
+        std::fs::write(&expected, "").unwrap();
+
+        let npm_bin = managed_npm_bin_for_global_command(true, &node_bin_prefix).unwrap();
+        assert_eq!(npm_bin, expected);
+        assert!(managed_npm_bin_for_global_command(false, &node_bin_prefix).is_none());
+    }
+
+    #[test]
+    fn test_managed_npm_bin_for_global_command_falls_back_when_adjacent_npm_is_missing() {
+        let temp_dir = tempfile::tempdir().unwrap();
+        let node_bin_prefix = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap();
+        assert!(managed_npm_bin_for_global_command(true, &node_bin_prefix).is_none());
+    }
+
     #[test]
     fn test_has_vite_plus_in_dev_dependencies() {
         let temp_dir = tempfile::tempdir().unwrap();

crates/vite_global_cli/src/commands/outdated.rs

@@ -3,7 +3,9 @@ use std::process::ExitStatus;
 use vite_install::commands::outdated::{Format, OutdatedCommandOptions};
 use vite_path::AbsolutePathBuf;
 
-use super::{build_package_manager, prepend_js_runtime_to_path_env};
+use super::{
+    build_package_manager, managed_npm_bin_for_global_command, prepend_js_runtime_to_path_env,
+};
 use crate::error::Error;
 
 /// Outdated command for checking outdated packages.
@@ -36,7 +38,7 @@ impl OutdatedCommand {
         global: bool,
         pass_through_args: Option<&[String]>,
     ) -> Result<ExitStatus, Error> {
-        prepend_js_runtime_to_path_env(&self.cwd).await?;
+        let node_bin_prefix = prepend_js_runtime_to_path_env(&self.cwd).await?;
 
         let package_manager = build_package_manager(&self.cwd).await?;
 
@@ -55,7 +57,14 @@ impl OutdatedCommand {
             global,
             pass_through_args,
         };
-        Ok(package_manager.run_outdated_command(&outdated_command_options, &self.cwd).await?)
+        let global_npm_bin_path = managed_npm_bin_for_global_command(global, &node_bin_prefix);
+        Ok(package_manager
+            .run_outdated_command_with_global_npm_bin(
+                &outdated_command_options,
+                &self.cwd,
+                global_npm_bin_path.as_deref(),
+            )
+            .await?)
     }
 }
 

crates/vite_global_cli/src/commands/remove.rs

@@ -3,7 +3,9 @@ use std::process::ExitStatus;
 use vite_install::commands::remove::RemoveCommandOptions;
 use vite_path::AbsolutePathBuf;
 
-use super::{build_package_manager, prepend_js_runtime_to_path_env};
+use super::{
+    build_package_manager, managed_npm_bin_for_global_command, prepend_js_runtime_to_path_env,
+};
 use crate::error::Error;
 
 /// Remove command for removing packages from dependencies.
@@ -31,7 +33,7 @@ impl RemoveCommand {
         global: bool,
         pass_through_args: Option<&[String]>,
     ) -> Result<ExitStatus, Error> {
-        prepend_js_runtime_to_path_env(&self.cwd).await?;
+        let node_bin_prefix = prepend_js_runtime_to_path_env(&self.cwd).await?;
 
         let package_manager = build_package_manager(&self.cwd).await?;
 
@@ -46,7 +48,14 @@ impl RemoveCommand {
             save_prod,
             pass_through_args,
         };
-        Ok(package_manager.run_remove_command(&remove_command_options, &self.cwd).await?)
+        let global_npm_bin_path = managed_npm_bin_for_global_command(global, &node_bin_prefix);
+        Ok(package_manager
+            .run_remove_command_with_global_npm_bin(
+                &remove_command_options,
+                &self.cwd,
+                global_npm_bin_path.as_deref(),
+            )
+            .await?)
     }
 }
 

crates/vite_global_cli/src/commands/update.rs

@@ -3,7 +3,9 @@ use std::process::ExitStatus;
 use vite_install::commands::update::UpdateCommandOptions;
 use vite_path::AbsolutePathBuf;
 
-use super::{build_package_manager, prepend_js_runtime_to_path_env};
+use super::{
+    build_package_manager, managed_npm_bin_for_global_command, prepend_js_runtime_to_path_env,
+};
 use crate::error::Error;
 
 /// Update command for updating packages to their latest versions.
@@ -36,7 +38,7 @@ impl UpdateCommand {
         workspace_only: bool,
         pass_through_args: Option<&[String]>,
     ) -> Result<ExitStatus, Error> {
-        prepend_js_runtime_to_path_env(&self.cwd).await?;
+        let node_bin_prefix = prepend_js_runtime_to_path_env(&self.cwd).await?;
 
         let package_manager = build_package_manager(&self.cwd).await?;
 
@@ -55,7 +57,14 @@ impl UpdateCommand {
             workspace_only,
             pass_through_args,
         };
-        Ok(package_manager.run_update_command(&update_command_options, &self.cwd).await?)
+        let global_npm_bin_path = managed_npm_bin_for_global_command(global, &node_bin_prefix);
+        Ok(package_manager
+            .run_update_command_with_global_npm_bin(
+                &update_command_options,
+                &self.cwd,
+                global_npm_bin_path.as_deref(),
+            )
+            .await?)
     }
 }
 

crates/vite_install/src/commands/add.rs

@@ -7,6 +7,7 @@ use vite_shared::output;
 
 use crate::package_manager::{
     PackageManager, PackageManagerType, ResolveCommandResult, format_path_env,
+    resolve_global_npm_bin_path,
 };
 
 /// The type of dependency to save.
@@ -46,21 +47,46 @@ impl PackageManager {
         options: &AddCommandOptions<'_>,
         cwd: impl AsRef<AbsolutePath>,
     ) -> Result<ExitStatus, Error> {
-        let resolve_command = self.resolve_add_command(options);
+        let resolve_command = self.resolve_add_command_with_global_npm_bin(options, None);
+        run_command(&resolve_command.bin_path, &resolve_command.args, &resolve_command.envs, cwd)
+            .await
+    }
+
+    /// Run the add command with an explicit npm binary for global installs.
+    /// Return the exit status of the command.
+    #[must_use]
+    pub async fn run_add_command_with_global_npm_bin(
+        &self,
+        options: &AddCommandOptions<'_>,
+        cwd: impl AsRef<AbsolutePath>,
+        global_npm_bin_path: Option<&AbsolutePath>,
+    ) -> Result<ExitStatus, Error> {
+        let resolve_command =
+            self.resolve_add_command_with_global_npm_bin(options, global_npm_bin_path);
         run_command(&resolve_command.bin_path, &resolve_command.args, &resolve_command.envs, cwd)
             .await
     }
 
     /// Resolve the add command.
     #[must_use]
     pub fn resolve_add_command(&self, options: &AddCommandOptions) -> ResolveCommandResult {
+        self.resolve_add_command_with_global_npm_bin(options, None)
+    }
+
+    /// Resolve the add command with an explicit npm binary for global installs.
+    #[must_use]
+    pub fn resolve_add_command_with_global_npm_bin(
+        &self,
+        options: &AddCommandOptions,
+        global_npm_bin_path: Option<&AbsolutePath>,
+    ) -> ResolveCommandResult {
         let bin_name: String;
         let envs = HashMap::from([("PATH".to_string(), format_path_env(self.get_bin_prefix()))]);
         let mut args: Vec<String> = Vec::new();
 
         // global packages should use npm cli only
         if options.global {
-            bin_name = "npm".into();
+            bin_name = resolve_global_npm_bin_path(global_npm_bin_path);
             args.push("install".into());
             args.push("--global".into());
             if let Some(pass_through_args) = options.pass_through_args {
@@ -600,4 +626,24 @@ mod tests {
         assert_eq!(result.args, vec!["add", "--allow-build=react,napi", "react"]);
         assert_eq!(result.bin_path, "pnpm");
     }
+
+    #[test]
+    fn test_global_add_uses_explicit_npm_bin() {
+        let pm = create_mock_package_manager(PackageManagerType::Pnpm);
+        let npm_bin = if cfg!(windows) {
+            AbsolutePathBuf::new("C:\\node\\npm.cmd".into()).unwrap()
+        } else {
+            AbsolutePathBuf::new("/node/bin/npm".into()).unwrap()
+        };
+        let result = pm.resolve_add_command_with_global_npm_bin(
+            &AddCommandOptions {
+                packages: &["typescript".to_string()],
+                global: true,
+                ..Default::default()
+            },
+            Some(&npm_bin),
+        );
+        assert_eq!(result.args, vec!["install", "--global", "typescript"]);
+        assert_eq!(result.bin_path, npm_bin.as_path().display().to_string());
+    }
 }