fix: lock to ensure atomicity of remove + rename operations

Author: fengmk2

.github/workflows/ci.yml

@@ -172,7 +172,7 @@ jobs:
 
       - name: Run CLI E2E tests
         run: |
-          pnpm test
+          RUST_BACKTRACE=1 pnpm test
           git diff --exit-code
 
   install-e2e-test:

crates/vite_install/src/package_manager.rs

@@ -9,7 +9,7 @@ use std::{
 
 use semver::{Version, VersionReq};
 use serde::{Deserialize, Serialize};
-use tokio::{fs::remove_dir_all, process::Command};
+use tokio::{fs::remove_dir_all, process::Command, sync::Mutex as TokioMutex};
 use vite_error::Error;
 use vite_path::{AbsolutePath, AbsolutePathBuf};
 use vite_str::Str;
@@ -320,6 +320,11 @@ async fn get_latest_version(package_manager_type: PackageManagerType) -> Result<
     Ok(package_json.version)
 }
 
+/// Global lock for atomic remove + rename operations during package manager download.
+/// This ensures that multiple concurrent threads won't conflict when
+/// installing package managers.
+static DOWNLOAD_LOCK: TokioMutex<()> = TokioMutex::const_new(());
+
 /// Download the package manager and extract it to the cache directory.
 /// Return the install directory, e.g. $`CACHE_DIR/vite/package_manager/pnpm/10.0.0/pnpm`
 async fn download_package_manager(
@@ -374,9 +379,18 @@ async fn download_package_manager(
     tracing::debug!("Rename package dir to {}", bin_name);
     tokio::fs::rename(&target_dir_tmp.join("package"), &target_dir_tmp.join(&bin_name)).await?;
 
-    // check bin_file again, for the concurrent download cases
-    if is_exists_file(&bin_file)? {
-        tracing::debug!("bin_file already exists, skip rename");
+    // Use a global lock to ensure atomicity of remove + rename operations
+    // This prevents DirectoryNotEmpty exceptions when multiple threads try to install
+    // the same package manager version concurrently.
+    let _guard = DOWNLOAD_LOCK.lock().await;
+
+    // Check again after acquiring the lock, in case another thread completed
+    // the installation while we were downloading
+    if is_exists_file(&bin_file)?
+        && is_exists_file(bin_file.with_extension("cmd"))?
+        && is_exists_file(bin_file.with_extension("ps1"))?
+    {
+        tracing::debug!("bin_file already exists after lock acquisition, skip rename");
         return Ok(install_dir);
     }
 
@@ -395,12 +409,13 @@ async fn download_package_manager(
 /// Remove the directory and all its contents.
 /// Ignore the error if the directory is not found.
 async fn remove_dir_all_force(path: impl AsRef<Path>) -> Result<(), std::io::Error> {
-    match remove_dir_all(path).await {
+    match remove_dir_all(path.as_ref()).await {
         Ok(()) => Ok(()),
         Err(e) => {
             if e.kind() == std::io::ErrorKind::NotFound {
                 Ok(())
             } else {
+                tracing::error!("remove_dir_all_force path: {:?} error: {e:?}", path.as_ref());
                 Err(e)
             }
         }

packages/tools/src/utils.ts

@@ -126,6 +126,8 @@ const DEFAULT_PASSTHROUGH_ENVS = [
   '*_TOKEN',
   // oxc specific
   'OXLINT_*',
+  // Rust specific
+  'RUST_*',
 ].map(env => new Minimatch(env));
 
 export function isPassThroughEnv(env: string) {