feat(env): add corepack to the default shims tool list

vp env setup now creates a corepack shim alongside node/npm/npx. The shim
resolves corepack in this order: a vp-managed global install
(vp install -g corepack), the copy bundled with the project-resolved
Node.js (Node.js <= 24), and finally an automatic managed install on
Node.js 25+ where corepack is no longer bundled. The auto-install links
only the corepack bin so it never conflicts with vp-managed package
managers like an existing vp install -g pnpm.

corepack enable/disable without an explicit --install-directory get
--install-directory ~/.vite-plus/bin injected so the pnpm/yarn launchers
land on PATH. Vite+-owned shims (npm/npx and vp install -g binaries) are
restored with a warning if corepack removes or replaces them, and
vp remove -g corepack keeps the default shim in place.

Closes #1309
Closes #858

Author: fengmk2

crates/vite_global_cli/src/cli.rs

@@ -256,7 +256,7 @@ impl Commands {
 #[command(after_help = "\
 Examples:
   Setup:
-    vp env setup                  # Create shims for node, npm, npx
+    vp env setup                  # Create shims for node, npm, npx, corepack
     vp env on                     # Use vite-plus managed Node.js
     vp env print                  # Print shell snippet for this session
 
@@ -666,6 +666,7 @@ async fn managed_install(
         force,
         concurrency.unwrap_or(DEFAULT_GLOBAL_INSTALL_CONCURRENCY),
         false,
+        None,
     )
     .await
     {
@@ -791,9 +792,15 @@ async fn managed_update(
     }
 
     // Call reinstall logic
-    if let Err((package_name, error)) =
-        global::install::install(&to_update, Some(&current_node_version), false, concurrency, true)
-            .await
+    if let Err((package_name, error)) = global::install::install(
+        &to_update,
+        Some(&current_node_version),
+        false,
+        concurrency,
+        true,
+        None,
+    )
+    .await
     {
         output::error(&format!(
             "Failed to update {}: {error}",

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

@@ -15,7 +15,7 @@ mod off;
 mod on;
 pub mod package_metadata;
 mod pin;
-mod setup;
+pub(crate) mod setup;
 mod unpin;
 mod r#use;
 mod which;

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

@@ -1,16 +1,16 @@
 //! Setup command implementation for creating bin directory and shims.
 //!
 //! Creates the following structure:
-//! - ~/.vite-plus/bin/     - Contains vp symlink and node/npm/npx shims
+//! - ~/.vite-plus/bin/     - Contains vp symlink and node/npm/npx/corepack shims
 //! - ~/.vite-plus/current/ - Contains the actual vp CLI binary
 //!
 //! On Unix:
 //! - bin/vp is a symlink to the active vp binary
-//! - bin/node, bin/npm, bin/npx are symlinks to the active vp binary
+//! - bin/node, bin/npm, bin/npx, bin/corepack are symlinks to the active vp binary
 //! - Symlinks preserve argv[0], allowing tool detection via the symlink name
 //!
 //! On Windows:
-//! - bin/vp.exe, bin/node.exe, bin/npm.exe, bin/npx.exe are trampoline executables
+//! - bin/vp.exe, bin/node.exe, bin/npm.exe, bin/npx.exe, bin/corepack.exe are trampoline executables
 //! - Each trampoline detects its tool name from its own filename and spawns
 //!   current\bin\vp.exe with VP_SHIM_TOOL env var set
 //! - This avoids the "Terminate batch job (Y/N)?" prompt from .cmd wrappers
@@ -43,8 +43,8 @@ impl EnvShell {
     }
 }
 
-/// Tools to create shims for (node, npm, npx, vpx, vpr)
-pub(crate) const SHIM_TOOLS: &[&str] = &["node", "npm", "npx", "vpx", "vpr"];
+/// Tools to create shims for (node, npm, npx, corepack, vpx, vpr)
+pub(crate) const SHIM_TOOLS: &[&str] = &["node", "npm", "npx", "corepack", "vpx", "vpr"];
 
 fn accent_command(command: &str) -> String {
     if help::should_style_help() {
@@ -90,7 +90,7 @@ pub async fn execute(refresh: bool, env_only: bool) -> Result<ExitStatus, Error>
     // Create wrapper script in bin/
     setup_vp_wrapper(&current_exe, &bin_dir, refresh).await?;
 
-    // Create shims for node, npm, npx
+    // Create shims for node, npm, npx, corepack
     let mut created = Vec::new();
     let mut skipped = Vec::new();
 
@@ -228,10 +228,10 @@ pub(crate) async fn resolve_unix_vp_shim_target(
     Ok(current_exe.to_path_buf())
 }
 
-/// Create a single shim for node/npm/npx.
+/// Create a single shim for a default shim tool (node/npm/npx/corepack/vpx/vpr).
 ///
 /// Returns `true` if the shim was created, `false` if it already exists.
-async fn create_shim(
+pub(crate) async fn create_shim(
     source: &std::path::Path,
     bin_dir: &vite_path::AbsolutePath,
     tool: &str,
@@ -847,6 +847,13 @@ mod tests {
 
     use super::*;
 
+    #[test]
+    fn test_shim_tools_contains_default_shims() {
+        // corepack is a default shim (#858, #1309); node/npm/npx resolve the
+        // project Node.js version; vpx/vpr are command shorthands.
+        assert_eq!(SHIM_TOOLS, &["node", "npm", "npx", "corepack", "vpx", "vpr"]);
+    }
+
     /// Helper: create a test_guard with user_home set to the given path.
     fn home_guard(home: impl Into<std::path::PathBuf>) -> vite_shared::TestEnvGuard {
         vite_shared::EnvConfig::test_guard(vite_shared::EnvConfig {

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

@@ -2,8 +2,8 @@
 //!
 //! Shows the path to the tool binary that would be executed.
 //!
-//! For core tools (node, npm, npx), shows the resolved Node.js binary path
-//! along with version and resolution source.
+//! For core tools (node, npm, npx, corepack), shows the resolved Node.js
+//! binary path along with version and resolution source.
 //! For global packages, shows the binary path plus package metadata.
 
 use std::process::ExitStatus;
@@ -23,8 +23,8 @@ use super::{
 };
 use crate::error::Error;
 
-/// Core tools (node, npm, npx)
-const CORE_TOOLS: &[&str] = &["node", "npm", "npx"];
+/// Core tools (node, npm, npx, corepack)
+const CORE_TOOLS: &[&str] = &["node", "npm", "npx", "corepack"];
 
 /// Column width for left-side labels in aligned metadata output
 const LABEL_WIDTH: usize = 10;
@@ -37,6 +37,13 @@ pub async fn execute(cwd: AbsolutePathBuf, tool: &str) -> Result<ExitStatus, Err
 
     // Check if this is a core tool
     if CORE_TOOLS.contains(&tool) {
+        // corepack: a vp-managed global install wins over the Node-bundled
+        // copy (mirrors the shim dispatch order).
+        if tool == "corepack"
+            && let Some(metadata) = PackageMetadata::find_by_binary(tool).await?
+        {
+            return execute_package_binary(tool, &metadata).await;
+        }
         return execute_core_tool(cwd, tool).await;
     }
 
@@ -47,7 +54,7 @@ pub async fn execute(cwd: AbsolutePathBuf, tool: &str) -> Result<ExitStatus, Err
 
     // Unknown tool
     output::error(&format!("tool '{}' not found", tool.bold()));
-    eprintln!("Not a core tool (node, npm, npx) or installed global package.");
+    eprintln!("Not a core tool (node, npm, npx, corepack) or installed global package.");
     eprintln!("Run 'vp list -g' to see installed packages.");
     Ok(exit_status(1))
 }
@@ -94,7 +101,7 @@ async fn execute_package_manager_tool(
     Ok(Some(ExitStatus::default()))
 }
 
-/// Execute which for a core tool (node, npm, npx).
+/// Execute which for a core tool (node, npm, npx, corepack).
 async fn execute_core_tool(cwd: AbsolutePathBuf, tool: &str) -> Result<ExitStatus, Error> {
     // Resolve version for current directory
     let resolution = resolve_version(&cwd).await?;
@@ -115,9 +122,23 @@ async fn execute_core_tool(cwd: AbsolutePathBuf, tool: &str) -> Result<ExitStatu
 
     // Check if the tool exists
     if !tokio::fs::try_exists(&tool_path).await.unwrap_or(false) {
+        #[cfg(windows)]
+        let node_path = home_dir.join("node.exe");
+        #[cfg(not(windows))]
+        let node_path = home_dir.join("bin").join("node");
+        let node_installed = tokio::fs::try_exists(&node_path).await.unwrap_or(false);
+
         output::error(&format!("{} not found", tool.bold()));
-        eprintln!("Node.js {} is not installed.", resolution.version);
-        eprintln!("Run 'vp env install {}' to install it.", resolution.version);
+        if tool == "corepack" && node_installed {
+            // corepack is no longer bundled starting with Node.js 25
+            eprintln!("corepack is not bundled with Node.js {}.", resolution.version);
+            eprintln!(
+                "It is installed automatically on first use, or run 'vp install -g corepack'."
+            );
+        } else {
+            eprintln!("Node.js {} is not installed.", resolution.version);
+            eprintln!("Run 'vp env install {}' to install it.", resolution.version);
+        }
         return Ok(exit_status(1));
     }
 

crates/vite_global_cli/src/commands/global/install.rs

@@ -57,12 +57,16 @@ fn package_error(package_name: &str, error: impl Into<Error>) -> (Option<String>
 /// If `node_version` is provided, uses that version. Otherwise, resolves from current directory.
 /// If `force` is true, auto-uninstalls conflicting packages.
 /// Use `concurrency` to control the number of packages to install in parallel.
+/// If `only_bins` is provided, only those binaries are exposed as shims; other
+/// bins the package declares are ignored (used by the corepack shim
+/// auto-install, which must not link corepack's pnpm/yarn launchers).
 pub async fn install(
     package_specs: &[String],
     node_version: Option<&str>,
     force: bool,
     concurrency: usize,
     update: bool,
+    only_bins: Option<&[&str]>,
 ) -> Result<(), (Option<String>, Error)> {
     if package_specs.is_empty() {
         return Ok(());
@@ -194,6 +198,16 @@ pub async fn install(
         else {
             continue;
         };
+        // Restrict exposed binaries when requested (e.g., the corepack shim
+        // auto-install only links `corepack`, not the pnpm/yarn launchers
+        // that `corepack enable` creates on demand).
+        let (bin_names, js_bins) = match only_bins {
+            Some(only) => (
+                bin_names.into_iter().filter(|bin| only.contains(&bin.as_str())).collect(),
+                js_bins.into_iter().filter(|bin| only.contains(&bin.as_str())).collect(),
+            ),
+            None => (bin_names, js_bins),
+        };
         let mut backup = backup;
         let stale_bin_names = match stale_bin_names_for_package(&package_name, &bin_names).await {
             Ok(bin_names) => bin_names,
@@ -751,7 +765,7 @@ fn is_javascript_binary(path: &AbsolutePath) -> bool {
 ///
 /// On Unix: Creates a symlink to ../current/bin/vp
 /// On Windows: Creates a trampoline .exe that forwards to vp.exe
-async fn create_package_shim(
+pub(crate) async fn create_package_shim(
     bin_dir: &vite_path::AbsolutePath,
     bin_name: &str,
     package_name: &str,
@@ -819,8 +833,11 @@ async fn remove_package_shim(
     bin_dir: &vite_path::AbsolutePath,
     bin_name: &str,
 ) -> Result<(), Error> {
-    // Don't remove core shims
-    if CORE_SHIMS.contains(&bin_name) {
+    // Don't remove core shims or default env shims (e.g., `vp remove -g corepack`
+    // must keep the default corepack shim so it falls back to the Node-bundled
+    // or auto-installed corepack).
+    if CORE_SHIMS.contains(&bin_name) || crate::commands::env::setup::SHIM_TOOLS.contains(&bin_name)
+    {
         return Ok(());
     }
 

crates/vite_global_cli/src/help.rs

@@ -543,7 +543,7 @@ fn env_help_doc() -> HelpDoc {
                 "Examples",
                 vec![
                     "  Setup:",
-                    "    vp env setup                  # Create shims for node, npm, npx",
+                    "    vp env setup                  # Create shims for node, npm, npx, corepack",
                     "    vp env on                     # Use vite-plus managed Node.js",
                     "    vp env print                  # Print shell snippet for this session",
                     "",