From 1233c47e397a7136cb282efface58104ed36072d Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Wed, 29 Apr 2026 17:46:53 +0900
Subject: [PATCH 01/16] fix(command): route Windows .cmd shims through
 PowerShell for pm commands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Apply the same .cmd → .ps1 rewrite to `vite_command::run_command` (and
`run_command_with_fspy`) so package-manager-routed commands (`vp dlx`,
`vp add`, `vp remove`, `vp update`, `vp install`, …) stop spawning
`cmd.exe` on Windows and Ctrl+C no longer leaves the terminal in a
broken state.

The task-layer fix (`vite_task_plan::ps1_shim`) only covered
`node_modules/.bin/*.cmd` — too narrow for pm shims like `npm.cmd` /
`pnpm.cmd` / `yarn.cmd` which live in `~/.vite-plus/js_runtime/...`
and system PATH. The new module drops the `node_modules/.bin` check:
if a `.cmd` has a sibling `.ps1`, route through PowerShell.

Closes #1489
---
 crates/vite_command/src/lib.rs      |  30 +++--
 crates/vite_command/src/ps1_shim.rs | 197 ++++++++++++++++++++++++++++
 2 files changed, 217 insertions(+), 10 deletions(-)
 create mode 100644 crates/vite_command/src/ps1_shim.rs

diff --git a/crates/vite_command/src/lib.rs b/crates/vite_command/src/lib.rs
index 9f724e3aac..7eae766b95 100644
--- a/crates/vite_command/src/lib.rs
+++ b/crates/vite_command/src/lib.rs
@@ -12,6 +12,8 @@ use tokio_util::sync::CancellationToken;
 use vite_error::Error;
 use vite_path::{AbsolutePath, AbsolutePathBuf, RelativePathBuf};
 
+mod ps1_shim;
+
 /// Result of running a command with fspy tracking.
 #[derive(Debug)]
 pub struct FspyCommandResult {
@@ -142,8 +144,12 @@ where
     let cwd = cwd.as_ref();
     let paths = envs.get("PATH");
     let bin_path = resolve_bin(bin_name, paths.map(|p| OsStr::new(p.as_str())), cwd)?;
-    let mut cmd = build_command(&bin_path, cwd);
-    cmd.args(args).envs(envs);
+    let (program, prefix_args) = match ps1_shim::rewrite_cmd_to_powershell(&bin_path) {
+        Some(rewritten) => rewritten,
+        None => (bin_path, Vec::new()),
+    };
+    let mut cmd = build_command(&program, cwd);
+    cmd.args(&prefix_args).args(args).envs(envs);
     let status = cmd.status().await?;
     Ok(status)
 }
@@ -171,8 +177,15 @@ where
     S: AsRef<OsStr>,
 {
     let cwd = cwd.as_ref();
-    let mut cmd = fspy::Command::new(bin_name);
-    cmd.args(args)
+    let bin_path = resolve_bin(bin_name, envs.get("PATH").map(|p| OsStr::new(p.as_str())), cwd)?;
+    let (program, prefix_args) = match ps1_shim::rewrite_cmd_to_powershell(&bin_path) {
+        Some(rewritten) => rewritten,
+        None => (bin_path, Vec::new()),
+    };
+
+    let mut cmd = fspy::Command::new(program.as_path());
+    cmd.args(&prefix_args)
+        .args(args)
         // set system environment variables first
         .envs(std::env::vars_os())
         // then set custom environment variables
@@ -454,12 +467,9 @@ mod tests {
                 run_command_with_fspy("npm-not-exists", &["--version"], &envs, &temp_dir_path)
                     .await;
             assert!(result.is_err(), "Should not find binary path, but got: {:?}", result);
-            assert!(
-                result
-                    .err()
-                    .unwrap()
-                    .to_string()
-                    .contains("could not resolve the full path of program '\"npm-not-exists\"'")
+            assert_eq!(
+                result.unwrap_err().to_string(),
+                "Cannot find binary path for command 'npm-not-exists'"
             );
         }
     }
diff --git a/crates/vite_command/src/ps1_shim.rs b/crates/vite_command/src/ps1_shim.rs
new file mode 100644
index 0000000000..6712d31890
--- /dev/null
+++ b/crates/vite_command/src/ps1_shim.rs
@@ -0,0 +1,197 @@
+//! Windows-specific: when a resolved binary is a `.cmd` shim with a sibling
+//! `.ps1`, rewrite the spawn to go through `powershell.exe -File <sibling.ps1>`.
+//!
+//! Running a `.cmd` from any shell makes `cmd.exe` prompt "Terminate batch
+//! job (Y/N)?" on Ctrl+C, which leaves the terminal corrupt. Routing through
+//! `PowerShell` sidesteps the prompt and lets Ctrl+C propagate cleanly.
+//!
+//! Unlike the task-layer rewrite (`vite_task_plan::ps1_shim`, scoped to
+//! `node_modules/.bin/*.cmd` inside the workspace), this one applies to any
+//! `.cmd` whose `.ps1` sibling exists. Package manager shims (`npm.cmd`,
+//! `pnpm.cmd`, `yarn.cmd`, `npx.cmd`) live in `~/.vite-plus/js_runtime/...`
+//! or system PATH — outside any `node_modules/.bin` — so the structural
+//! check there is too narrow for this code path. If a `.ps1` sibling exists,
+//! the same tool that emitted the `.cmd` (npm cmd-shim, pnpm, yarn) emitted
+//! the `.ps1` with equivalent semantics.
+//!
+//! See <https://github.com/voidzero-dev/vite-plus/issues/1489>
+//! and <https://github.com/voidzero-dev/vite-plus/issues/1176>.
+
+use std::ffi::OsString;
+
+use vite_path::{AbsolutePath, AbsolutePathBuf};
+
+/// Fixed arguments prepended before the `.ps1` path. `-NoProfile`/`-NoLogo`
+/// skip user profile loading; `-ExecutionPolicy Bypass` allows running the
+/// unsigned shims that npm/pnpm/yarn install.
+#[cfg(any(windows, test))]
+const POWERSHELL_PREFIX: &[&str] =
+    &["-NoProfile", "-NoLogo", "-ExecutionPolicy", "Bypass", "-File"];
+
+/// Rewrite a resolved `.cmd` invocation to go through PowerShell.
+///
+/// Returns `Some((powershell_host, prefix_args))` when the rewrite applies,
+/// where `prefix_args` is `["-NoProfile", "-NoLogo", "-ExecutionPolicy",
+/// "Bypass", "-File", <abs ps1 path>]`. Caller prepends `prefix_args` to the
+/// user args and spawns `powershell_host`.
+///
+/// Returns `None` when:
+/// - not on Windows,
+/// - no PowerShell host (`pwsh.exe` or `powershell.exe`) is on PATH,
+/// - the resolved path is not a `.cmd` (case-insensitive),
+/// - the `.cmd` has no sibling `.ps1`.
+#[cfg(windows)]
+#[must_use]
+pub fn rewrite_cmd_to_powershell(
+    resolved: &AbsolutePath,
+) -> Option<(AbsolutePathBuf, Vec<OsString>)> {
+    let host = powershell_host()?;
+    rewrite_with_host(resolved, host)
+}
+
+#[cfg(not(windows))]
+#[must_use]
+pub const fn rewrite_cmd_to_powershell(
+    _resolved: &AbsolutePath,
+) -> Option<(AbsolutePathBuf, Vec<OsString>)> {
+    None
+}
+
+/// Cached location of the PowerShell host. Prefers cross-platform `pwsh.exe`
+/// when present, falling back to the Windows built-in `powershell.exe`.
+#[cfg(windows)]
+fn powershell_host() -> Option<&'static AbsolutePathBuf> {
+    use std::sync::LazyLock;
+
+    static POWERSHELL_HOST: LazyLock<Option<AbsolutePathBuf>> = LazyLock::new(|| {
+        let resolved = which::which("pwsh.exe").or_else(|_| which::which("powershell.exe")).ok()?;
+        AbsolutePathBuf::new(resolved)
+    });
+    POWERSHELL_HOST.as_ref()
+}
+
+/// Pure rewrite logic. Factored out so tests can drive it on any platform
+/// without depending on a real `powershell.exe`.
+#[cfg(any(windows, test))]
+fn rewrite_with_host(
+    resolved: &AbsolutePath,
+    host: &AbsolutePathBuf,
+) -> Option<(AbsolutePathBuf, Vec<OsString>)> {
+    let ps1 = find_ps1_sibling(resolved)?;
+
+    tracing::debug!(
+        "rewriting .cmd to powershell: {} -> {} -File {}",
+        resolved.as_path().display(),
+        host.as_path().display(),
+        ps1.as_path().display(),
+    );
+
+    let mut prefix_args: Vec<OsString> =
+        POWERSHELL_PREFIX.iter().copied().map(OsString::from).collect();
+    prefix_args.push(ps1.as_path().as_os_str().to_owned());
+
+    Some((host.clone(), prefix_args))
+}
+
+#[cfg(any(windows, test))]
+fn find_ps1_sibling(resolved: &AbsolutePath) -> Option<AbsolutePathBuf> {
+    let ext = resolved.as_path().extension().and_then(|e| e.to_str())?;
+    if !ext.eq_ignore_ascii_case("cmd") {
+        return None;
+    }
+
+    let ps1 = resolved.with_extension("ps1");
+    if !ps1.as_path().is_file() {
+        return None;
+    }
+
+    Some(ps1)
+}
+
+#[cfg(test)]
+mod tests {
+    use std::fs;
+
+    use tempfile::tempdir;
+
+    use super::*;
+
+    #[expect(clippy::disallowed_types, reason = "tempdir bridges std PathBuf into AbsolutePath")]
+    fn abs(buf: std::path::PathBuf) -> AbsolutePathBuf {
+        AbsolutePathBuf::new(buf).unwrap()
+    }
+
+    #[test]
+    fn rewrites_cmd_to_powershell_with_sibling_ps1() {
+        let dir = tempdir().unwrap();
+        let root = abs(dir.path().canonicalize().unwrap());
+        fs::write(root.as_path().join("npm.cmd"), "").unwrap();
+        fs::write(root.as_path().join("npm.ps1"), "").unwrap();
+
+        let host = abs(root.as_path().join("powershell.exe"));
+        let resolved = abs(root.as_path().join("npm.cmd"));
+
+        let (program, prefix_args) = rewrite_with_host(&resolved, &host).expect("should rewrite");
+
+        assert_eq!(program.as_path(), host.as_path());
+        let as_strs: Vec<&str> = prefix_args.iter().filter_map(|a| a.to_str()).collect();
+        let ps1_path = root.as_path().join("npm.ps1");
+        let ps1_str = ps1_path.to_str().unwrap();
+        assert_eq!(
+            as_strs,
+            vec!["-NoProfile", "-NoLogo", "-ExecutionPolicy", "Bypass", "-File", ps1_str]
+        );
+    }
+
+    #[test]
+    fn rewrites_uppercase_cmd_extension() {
+        let dir = tempdir().unwrap();
+        let root = abs(dir.path().canonicalize().unwrap());
+        fs::write(root.as_path().join("pnpm.CMD"), "").unwrap();
+        fs::write(root.as_path().join("pnpm.ps1"), "").unwrap();
+
+        let host = abs(root.as_path().join("powershell.exe"));
+        let resolved = abs(root.as_path().join("pnpm.CMD"));
+
+        let result = rewrite_with_host(&resolved, &host);
+        assert!(result.is_some(), "case-insensitive .CMD should still rewrite");
+    }
+
+    #[test]
+    fn returns_none_when_no_ps1_sibling() {
+        let dir = tempdir().unwrap();
+        let root = abs(dir.path().canonicalize().unwrap());
+        fs::write(root.as_path().join("npm.cmd"), "").unwrap();
+
+        let host = abs(root.as_path().join("powershell.exe"));
+        let resolved = abs(root.as_path().join("npm.cmd"));
+
+        assert!(rewrite_with_host(&resolved, &host).is_none());
+    }
+
+    #[test]
+    fn returns_none_for_exe() {
+        let dir = tempdir().unwrap();
+        let root = abs(dir.path().canonicalize().unwrap());
+        fs::write(root.as_path().join("bun.exe"), "").unwrap();
+        fs::write(root.as_path().join("bun.ps1"), "").unwrap();
+
+        let host = abs(root.as_path().join("powershell.exe"));
+        let resolved = abs(root.as_path().join("bun.exe"));
+
+        assert!(rewrite_with_host(&resolved, &host).is_none());
+    }
+
+    #[test]
+    fn returns_none_for_no_extension() {
+        let dir = tempdir().unwrap();
+        let root = abs(dir.path().canonicalize().unwrap());
+        fs::write(root.as_path().join("node"), "").unwrap();
+        fs::write(root.as_path().join("node.ps1"), "").unwrap();
+
+        let host = abs(root.as_path().join("powershell.exe"));
+        let resolved = abs(root.as_path().join("node"));
+
+        assert!(rewrite_with_host(&resolved, &host).is_none());
+    }
+}

From ebbace435e463995c318f3127cd303cdfc62d140 Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Wed, 29 Apr 2026 17:51:51 +0900
Subject: [PATCH 02/16] refactor(command): extract resolve_program to dedupe
 ps1-rewrite plumbing

Both `run_command` and `run_command_with_fspy` were doing the same
resolve_bin + rewrite_cmd_to_powershell match. Pull that into a
private helper so each call site is one line.
---
 crates/vite_command/src/lib.rs | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/crates/vite_command/src/lib.rs b/crates/vite_command/src/lib.rs
index 7eae766b95..d0e136e867 100644
--- a/crates/vite_command/src/lib.rs
+++ b/crates/vite_command/src/lib.rs
@@ -45,6 +45,21 @@ pub fn resolve_bin(
     AbsolutePathBuf::new(path).ok_or_else(|| Error::CannotFindBinaryPath(bin_name.into()))
 }
 
+/// Resolve `bin_name` to a path and apply the Windows `.cmd` → PowerShell
+/// rewrite. Returns the program to spawn and the arg prefix to prepend
+/// before the user args (empty when no rewrite applies).
+fn resolve_program(
+    bin_name: &str,
+    envs: &HashMap<String, String>,
+    cwd: &AbsolutePath,
+) -> Result<(AbsolutePathBuf, Vec<std::ffi::OsString>), Error> {
+    let bin_path = resolve_bin(bin_name, envs.get("PATH").map(|p| OsStr::new(p.as_str())), cwd)?;
+    Ok(match ps1_shim::rewrite_cmd_to_powershell(&bin_path) {
+        Some(rewritten) => rewritten,
+        None => (bin_path, Vec::new()),
+    })
+}
+
 /// Build a `tokio::process::Command` for a pre-resolved binary path.
 /// Sets inherited stdio and `fix_stdio_streams` (Unix pre_exec).
 /// Callers can further customize (add args, envs, override stdio, etc.).
@@ -142,12 +157,7 @@ where
     S: AsRef<OsStr>,
 {
     let cwd = cwd.as_ref();
-    let paths = envs.get("PATH");
-    let bin_path = resolve_bin(bin_name, paths.map(|p| OsStr::new(p.as_str())), cwd)?;
-    let (program, prefix_args) = match ps1_shim::rewrite_cmd_to_powershell(&bin_path) {
-        Some(rewritten) => rewritten,
-        None => (bin_path, Vec::new()),
-    };
+    let (program, prefix_args) = resolve_program(bin_name, envs, cwd)?;
     let mut cmd = build_command(&program, cwd);
     cmd.args(&prefix_args).args(args).envs(envs);
     let status = cmd.status().await?;
@@ -177,11 +187,7 @@ where
     S: AsRef<OsStr>,
 {
     let cwd = cwd.as_ref();
-    let bin_path = resolve_bin(bin_name, envs.get("PATH").map(|p| OsStr::new(p.as_str())), cwd)?;
-    let (program, prefix_args) = match ps1_shim::rewrite_cmd_to_powershell(&bin_path) {
-        Some(rewritten) => rewritten,
-        None => (bin_path, Vec::new()),
-    };
+    let (program, prefix_args) = resolve_program(bin_name, envs, cwd)?;
 
     let mut cmd = fspy::Command::new(program.as_path());
     cmd.args(&prefix_args)

From 86258423e6931989f7bc32af0fcee46d7ef43a86 Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Wed, 29 Apr 2026 20:28:56 +0900
Subject: [PATCH 03/16] refactor(command): use shared vite_powershell crate for
 ps1 rewrite

Switch `vite_command::ps1_shim` to depend on the new `vite_powershell`
crate (companion change in voidzero-dev/vite-task#368) for the
PowerShell host lookup, the fixed argument prefix, and the
sibling-`.ps1` discovery. This module now just composes those
primitives with vp's own conventions: absolute `.ps1` path in args
and `Vec<OsString>` return type to match the spawn API.

Bumps the vite-task git rev across all pinned crates to pick up the
extraction.
---
 Cargo.lock                          |  53 ++++++++------
 Cargo.toml                          |  14 ++--
 crates/vite_command/Cargo.toml      |   1 +
 crates/vite_command/src/ps1_shim.rs | 110 +++++-----------------------
 4 files changed, 58 insertions(+), 120 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9f3786249e..54d9016a2e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1872,7 +1872,7 @@ dependencies = [
 [[package]]
 name = "fspy"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "allocator-api2",
  "anyhow",
@@ -1908,7 +1908,7 @@ dependencies = [
 [[package]]
 name = "fspy_detours_sys"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "cc",
  "winapi",
@@ -1917,7 +1917,7 @@ dependencies = [
 [[package]]
 name = "fspy_preload_unix"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "anyhow",
  "bstr",
@@ -1932,7 +1932,7 @@ dependencies = [
 [[package]]
 name = "fspy_preload_windows"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "constcat",
  "fspy_detours_sys",
@@ -1948,7 +1948,7 @@ dependencies = [
 [[package]]
 name = "fspy_seccomp_unotify"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "futures-util",
  "libc",
@@ -1965,7 +1965,7 @@ dependencies = [
 [[package]]
 name = "fspy_shared"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "allocator-api2",
  "bitflags 2.11.0",
@@ -1984,7 +1984,7 @@ dependencies = [
 [[package]]
 name = "fspy_shared_unix"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -3124,7 +3124,7 @@ dependencies = [
 [[package]]
 name = "materialized_artifact"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "tempfile",
 ]
@@ -3132,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "materialized_artifact_build"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "xxhash-rust",
 ]
@@ -3346,7 +3346,7 @@ dependencies = [
 [[package]]
 name = "native_str"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "allocator-api2",
  "bytemuck",
@@ -4821,7 +4821,7 @@ dependencies = [
 [[package]]
 name = "pty_terminal_test_client"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 
 [[package]]
 name = "quote"
@@ -7467,6 +7467,7 @@ dependencies = [
  "tracing",
  "vite_error",
  "vite_path",
+ "vite_powershell",
  "which",
 ]
 
@@ -7496,7 +7497,7 @@ dependencies = [
 [[package]]
 name = "vite_glob"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "thiserror 2.0.18",
  "vite_path",
@@ -7536,7 +7537,7 @@ dependencies = [
 [[package]]
 name = "vite_graph_ser"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "petgraph 0.8.3",
  "serde",
@@ -7635,7 +7636,7 @@ dependencies = [
 [[package]]
 name = "vite_path"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "diff-struct",
  "path-clean",
@@ -7646,10 +7647,19 @@ dependencies = [
  "wincode",
 ]
 
+[[package]]
+name = "vite_powershell"
+version = "0.1.0"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+dependencies = [
+ "vite_path",
+ "which",
+]
+
 [[package]]
 name = "vite_select"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "anyhow",
  "crossterm",
@@ -7699,7 +7709,7 @@ dependencies = [
 [[package]]
 name = "vite_shell"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "brush-parser 0.3.0 (git+https://github.com/reubeno/brush?rev=dcb760933b10ee0433d7b740a5709b06f5c67c6b)",
  "diff-struct",
@@ -7726,7 +7736,7 @@ dependencies = [
 [[package]]
 name = "vite_str"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "compact_str",
  "diff-struct",
@@ -7737,7 +7747,7 @@ dependencies = [
 [[package]]
 name = "vite_task"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7775,7 +7785,7 @@ dependencies = [
 [[package]]
 name = "vite_task_graph"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7797,7 +7807,7 @@ dependencies = [
 [[package]]
 name = "vite_task_plan"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7815,6 +7825,7 @@ dependencies = [
  "vite_glob",
  "vite_graph_ser",
  "vite_path",
+ "vite_powershell",
  "vite_shell",
  "vite_str",
  "vite_task_graph",
@@ -7829,7 +7840,7 @@ version = "0.0.0"
 [[package]]
 name = "vite_workspace"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef#d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
 dependencies = [
  "clap",
  "petgraph 0.8.3",
diff --git a/Cargo.toml b/Cargo.toml
index 02932f7530..07c5320a55 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -89,7 +89,7 @@ dunce = "1.0.5"
 fast-glob = "1.0.0"
 flate2 = { version = "=1.1.9", features = ["zlib-rs"] }
 form_urlencoded = "1.2.1"
-fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef" }
+fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
 futures = "0.3.31"
 futures-util = "0.3.31"
 glob = "0.3.2"
@@ -194,16 +194,17 @@ vfs = "0.13.0"
 vite_command = { path = "crates/vite_command" }
 vite_error = { path = "crates/vite_error" }
 vite_js_runtime = { path = "crates/vite_js_runtime" }
-vite_glob = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef" }
+vite_glob = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
 vite_install = { path = "crates/vite_install" }
 vite_migration = { path = "crates/vite_migration" }
 vite_setup = { path = "crates/vite_setup" }
 vite_shared = { path = "crates/vite_shared" }
 vite_static_config = { path = "crates/vite_static_config" }
-vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef" }
-vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef" }
-vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef" }
-vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "d1b8cdae8b6df5eab8b9f1143ceb4fb13933a5ef" }
+vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
+vite_powershell = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
+vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
+vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
+vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
 walkdir = "2.5.0"
 wax = "0.6.0"
 which = "8.0.0"
@@ -314,6 +315,7 @@ string_wizard = { path = "./rolldown/crates/string_wizard", features = ["serde"]
 # fspy = { path = "../vite-task/crates/fspy" }
 # vite_glob = { path = "../vite-task/crates/vite_glob" }
 # vite_path = { path = "../vite-task/crates/vite_path" }
+# vite_powershell = { path = "../vite-task/crates/vite_powershell" }
 # vite_str = { path = "../vite-task/crates/vite_str" }
 # vite_task = { path = "../vite-task/crates/vite_task" }
 # vite_workspace = { path = "../vite-task/crates/vite_workspace" }
diff --git a/crates/vite_command/Cargo.toml b/crates/vite_command/Cargo.toml
index 4d031bfe42..e1cd5a971d 100644
--- a/crates/vite_command/Cargo.toml
+++ b/crates/vite_command/Cargo.toml
@@ -14,6 +14,7 @@ tokio-util = { workspace = true }
 tracing = { workspace = true }
 vite_error = { workspace = true }
 vite_path = { workspace = true }
+vite_powershell = { workspace = true }
 which = { workspace = true, features = ["tracing"] }
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
diff --git a/crates/vite_command/src/ps1_shim.rs b/crates/vite_command/src/ps1_shim.rs
index 6712d31890..59a6ee3c25 100644
--- a/crates/vite_command/src/ps1_shim.rs
+++ b/crates/vite_command/src/ps1_shim.rs
@@ -10,23 +10,21 @@
 //! `.cmd` whose `.ps1` sibling exists. Package manager shims (`npm.cmd`,
 //! `pnpm.cmd`, `yarn.cmd`, `npx.cmd`) live in `~/.vite-plus/js_runtime/...`
 //! or system PATH — outside any `node_modules/.bin` — so the structural
-//! check there is too narrow for this code path. If a `.ps1` sibling exists,
-//! the same tool that emitted the `.cmd` (npm cmd-shim, pnpm, yarn) emitted
-//! the `.ps1` with equivalent semantics.
+//! check there is too narrow for this code path.
+//!
+//! The cross-platform primitives (`POWERSHELL_PREFIX`, `powershell_host`,
+//! `find_ps1_sibling`) live in the `vite_powershell` crate and are shared
+//! with `vite_task_plan::ps1_shim`. This module composes them with vp's
+//! own conventions: absolute `.ps1` path in args (no cache fingerprint to
+//! keep portable) and `Vec<OsString>` return type (matches the spawn API).
 //!
 //! See <https://github.com/voidzero-dev/vite-plus/issues/1489>
 //! and <https://github.com/voidzero-dev/vite-plus/issues/1176>.
 
-use std::ffi::OsString;
+use std::{ffi::OsString, sync::Arc};
 
 use vite_path::{AbsolutePath, AbsolutePathBuf};
-
-/// Fixed arguments prepended before the `.ps1` path. `-NoProfile`/`-NoLogo`
-/// skip user profile loading; `-ExecutionPolicy Bypass` allows running the
-/// unsigned shims that npm/pnpm/yarn install.
-#[cfg(any(windows, test))]
-const POWERSHELL_PREFIX: &[&str] =
-    &["-NoProfile", "-NoLogo", "-ExecutionPolicy", "Bypass", "-File"];
+use vite_powershell::{POWERSHELL_PREFIX, find_ps1_sibling, powershell_host};
 
 /// Rewrite a resolved `.cmd` invocation to go through PowerShell.
 ///
@@ -40,7 +38,6 @@ const POWERSHELL_PREFIX: &[&str] =
 /// - no PowerShell host (`pwsh.exe` or `powershell.exe`) is on PATH,
 /// - the resolved path is not a `.cmd` (case-insensitive),
 /// - the `.cmd` has no sibling `.ps1`.
-#[cfg(windows)]
 #[must_use]
 pub fn rewrite_cmd_to_powershell(
     resolved: &AbsolutePath,
@@ -49,33 +46,11 @@ pub fn rewrite_cmd_to_powershell(
     rewrite_with_host(resolved, host)
 }
 
-#[cfg(not(windows))]
-#[must_use]
-pub const fn rewrite_cmd_to_powershell(
-    _resolved: &AbsolutePath,
-) -> Option<(AbsolutePathBuf, Vec<OsString>)> {
-    None
-}
-
-/// Cached location of the PowerShell host. Prefers cross-platform `pwsh.exe`
-/// when present, falling back to the Windows built-in `powershell.exe`.
-#[cfg(windows)]
-fn powershell_host() -> Option<&'static AbsolutePathBuf> {
-    use std::sync::LazyLock;
-
-    static POWERSHELL_HOST: LazyLock<Option<AbsolutePathBuf>> = LazyLock::new(|| {
-        let resolved = which::which("pwsh.exe").or_else(|_| which::which("powershell.exe")).ok()?;
-        AbsolutePathBuf::new(resolved)
-    });
-    POWERSHELL_HOST.as_ref()
-}
-
 /// Pure rewrite logic. Factored out so tests can drive it on any platform
 /// without depending on a real `powershell.exe`.
-#[cfg(any(windows, test))]
 fn rewrite_with_host(
     resolved: &AbsolutePath,
-    host: &AbsolutePathBuf,
+    host: &Arc<AbsolutePath>,
 ) -> Option<(AbsolutePathBuf, Vec<OsString>)> {
     let ps1 = find_ps1_sibling(resolved)?;
 
@@ -90,22 +65,7 @@ fn rewrite_with_host(
         POWERSHELL_PREFIX.iter().copied().map(OsString::from).collect();
     prefix_args.push(ps1.as_path().as_os_str().to_owned());
 
-    Some((host.clone(), prefix_args))
-}
-
-#[cfg(any(windows, test))]
-fn find_ps1_sibling(resolved: &AbsolutePath) -> Option<AbsolutePathBuf> {
-    let ext = resolved.as_path().extension().and_then(|e| e.to_str())?;
-    if !ext.eq_ignore_ascii_case("cmd") {
-        return None;
-    }
-
-    let ps1 = resolved.with_extension("ps1");
-    if !ps1.as_path().is_file() {
-        return None;
-    }
-
-    Some(ps1)
+    Some((host.to_absolute_path_buf(), prefix_args))
 }
 
 #[cfg(test)]
@@ -121,6 +81,10 @@ mod tests {
         AbsolutePathBuf::new(buf).unwrap()
     }
 
+    fn host_arc(root: &AbsolutePath) -> Arc<AbsolutePath> {
+        Arc::<AbsolutePath>::from(abs(root.as_path().join("powershell.exe")))
+    }
+
     #[test]
     fn rewrites_cmd_to_powershell_with_sibling_ps1() {
         let dir = tempdir().unwrap();
@@ -128,7 +92,7 @@ mod tests {
         fs::write(root.as_path().join("npm.cmd"), "").unwrap();
         fs::write(root.as_path().join("npm.ps1"), "").unwrap();
 
-        let host = abs(root.as_path().join("powershell.exe"));
+        let host = host_arc(&root);
         let resolved = abs(root.as_path().join("npm.cmd"));
 
         let (program, prefix_args) = rewrite_with_host(&resolved, &host).expect("should rewrite");
@@ -143,55 +107,15 @@ mod tests {
         );
     }
 
-    #[test]
-    fn rewrites_uppercase_cmd_extension() {
-        let dir = tempdir().unwrap();
-        let root = abs(dir.path().canonicalize().unwrap());
-        fs::write(root.as_path().join("pnpm.CMD"), "").unwrap();
-        fs::write(root.as_path().join("pnpm.ps1"), "").unwrap();
-
-        let host = abs(root.as_path().join("powershell.exe"));
-        let resolved = abs(root.as_path().join("pnpm.CMD"));
-
-        let result = rewrite_with_host(&resolved, &host);
-        assert!(result.is_some(), "case-insensitive .CMD should still rewrite");
-    }
-
     #[test]
     fn returns_none_when_no_ps1_sibling() {
         let dir = tempdir().unwrap();
         let root = abs(dir.path().canonicalize().unwrap());
         fs::write(root.as_path().join("npm.cmd"), "").unwrap();
 
-        let host = abs(root.as_path().join("powershell.exe"));
+        let host = host_arc(&root);
         let resolved = abs(root.as_path().join("npm.cmd"));
 
         assert!(rewrite_with_host(&resolved, &host).is_none());
     }
-
-    #[test]
-    fn returns_none_for_exe() {
-        let dir = tempdir().unwrap();
-        let root = abs(dir.path().canonicalize().unwrap());
-        fs::write(root.as_path().join("bun.exe"), "").unwrap();
-        fs::write(root.as_path().join("bun.ps1"), "").unwrap();
-
-        let host = abs(root.as_path().join("powershell.exe"));
-        let resolved = abs(root.as_path().join("bun.exe"));
-
-        assert!(rewrite_with_host(&resolved, &host).is_none());
-    }
-
-    #[test]
-    fn returns_none_for_no_extension() {
-        let dir = tempdir().unwrap();
-        let root = abs(dir.path().canonicalize().unwrap());
-        fs::write(root.as_path().join("node"), "").unwrap();
-        fs::write(root.as_path().join("node.ps1"), "").unwrap();
-
-        let host = abs(root.as_path().join("powershell.exe"));
-        let resolved = abs(root.as_path().join("node"));
-
-        assert!(rewrite_with_host(&resolved, &host).is_none());
-    }
 }

From 121a5449191e54e0fb0fe8562f3541c42ef3ec30 Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Wed, 29 Apr 2026 20:33:19 +0900
Subject: [PATCH 04/16] chore(deps): bump vite-task pin to 957278df

Picks up the test-only AbsolutePathBuf import move from
voidzero-dev/vite-task#368 review feedback.
---
 Cargo.lock | 44 ++++++++++++++++++++++----------------------
 Cargo.toml | 14 +++++++-------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 54d9016a2e..9a3061876e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1872,7 +1872,7 @@ dependencies = [
 [[package]]
 name = "fspy"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "allocator-api2",
  "anyhow",
@@ -1908,7 +1908,7 @@ dependencies = [
 [[package]]
 name = "fspy_detours_sys"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "cc",
  "winapi",
@@ -1917,7 +1917,7 @@ dependencies = [
 [[package]]
 name = "fspy_preload_unix"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "anyhow",
  "bstr",
@@ -1932,7 +1932,7 @@ dependencies = [
 [[package]]
 name = "fspy_preload_windows"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "constcat",
  "fspy_detours_sys",
@@ -1948,7 +1948,7 @@ dependencies = [
 [[package]]
 name = "fspy_seccomp_unotify"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "futures-util",
  "libc",
@@ -1965,7 +1965,7 @@ dependencies = [
 [[package]]
 name = "fspy_shared"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "allocator-api2",
  "bitflags 2.11.0",
@@ -1984,7 +1984,7 @@ dependencies = [
 [[package]]
 name = "fspy_shared_unix"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -3124,7 +3124,7 @@ dependencies = [
 [[package]]
 name = "materialized_artifact"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "tempfile",
 ]
@@ -3132,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "materialized_artifact_build"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "xxhash-rust",
 ]
@@ -3346,7 +3346,7 @@ dependencies = [
 [[package]]
 name = "native_str"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "allocator-api2",
  "bytemuck",
@@ -4821,7 +4821,7 @@ dependencies = [
 [[package]]
 name = "pty_terminal_test_client"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 
 [[package]]
 name = "quote"
@@ -7497,7 +7497,7 @@ dependencies = [
 [[package]]
 name = "vite_glob"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "thiserror 2.0.18",
  "vite_path",
@@ -7537,7 +7537,7 @@ dependencies = [
 [[package]]
 name = "vite_graph_ser"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "petgraph 0.8.3",
  "serde",
@@ -7636,7 +7636,7 @@ dependencies = [
 [[package]]
 name = "vite_path"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "diff-struct",
  "path-clean",
@@ -7650,7 +7650,7 @@ dependencies = [
 [[package]]
 name = "vite_powershell"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "vite_path",
  "which",
@@ -7659,7 +7659,7 @@ dependencies = [
 [[package]]
 name = "vite_select"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "anyhow",
  "crossterm",
@@ -7709,7 +7709,7 @@ dependencies = [
 [[package]]
 name = "vite_shell"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "brush-parser 0.3.0 (git+https://github.com/reubeno/brush?rev=dcb760933b10ee0433d7b740a5709b06f5c67c6b)",
  "diff-struct",
@@ -7736,7 +7736,7 @@ dependencies = [
 [[package]]
 name = "vite_str"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "compact_str",
  "diff-struct",
@@ -7747,7 +7747,7 @@ dependencies = [
 [[package]]
 name = "vite_task"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7785,7 +7785,7 @@ dependencies = [
 [[package]]
 name = "vite_task_graph"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7807,7 +7807,7 @@ dependencies = [
 [[package]]
 name = "vite_task_plan"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7840,7 +7840,7 @@ version = "0.0.0"
 [[package]]
 name = "vite_workspace"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=1e2b7913840c15aa670d702f8bf4c7fdcd45c56f#1e2b7913840c15aa670d702f8bf4c7fdcd45c56f"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
 dependencies = [
  "clap",
  "petgraph 0.8.3",
diff --git a/Cargo.toml b/Cargo.toml
index 07c5320a55..fa90ec27fb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -89,7 +89,7 @@ dunce = "1.0.5"
 fast-glob = "1.0.0"
 flate2 = { version = "=1.1.9", features = ["zlib-rs"] }
 form_urlencoded = "1.2.1"
-fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
+fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
 futures = "0.3.31"
 futures-util = "0.3.31"
 glob = "0.3.2"
@@ -194,17 +194,17 @@ vfs = "0.13.0"
 vite_command = { path = "crates/vite_command" }
 vite_error = { path = "crates/vite_error" }
 vite_js_runtime = { path = "crates/vite_js_runtime" }
-vite_glob = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
+vite_glob = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
 vite_install = { path = "crates/vite_install" }
 vite_migration = { path = "crates/vite_migration" }
 vite_setup = { path = "crates/vite_setup" }
 vite_shared = { path = "crates/vite_shared" }
 vite_static_config = { path = "crates/vite_static_config" }
-vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
-vite_powershell = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
-vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
-vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
-vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1e2b7913840c15aa670d702f8bf4c7fdcd45c56f" }
+vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
+vite_powershell = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
+vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
+vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
+vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
 walkdir = "2.5.0"
 wax = "0.6.0"
 which = "8.0.0"

From fbf831a97c1dc3759a6fae06eb5932381cd99f5e Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Wed, 29 Apr 2026 20:38:26 +0900
Subject: [PATCH 05/16] style(command): import OsString and drop Arc turbofish
 in ps1_shim
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two minor cleanups from review:
- Hoist `OsString` into the existing `std::ffi` `use` so the
  `resolve_program` return type reads `Vec<OsString>` instead of
  the inlined `Vec<std::ffi::OsString>`.
- Drop the `Arc::<AbsolutePath>::from(...)` turbofish in the
  `host_arc` test helper — type inference handles it.
---
 crates/vite_command/src/lib.rs      | 4 ++--
 crates/vite_command/src/ps1_shim.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/vite_command/src/lib.rs b/crates/vite_command/src/lib.rs
index d0e136e867..19efcabb54 100644
--- a/crates/vite_command/src/lib.rs
+++ b/crates/vite_command/src/lib.rs
@@ -2,7 +2,7 @@
 use std::os::fd::{BorrowedFd, RawFd};
 use std::{
     collections::HashMap,
-    ffi::OsStr,
+    ffi::{OsStr, OsString},
     process::{ExitStatus, Stdio},
 };
 
@@ -52,7 +52,7 @@ fn resolve_program(
     bin_name: &str,
     envs: &HashMap<String, String>,
     cwd: &AbsolutePath,
-) -> Result<(AbsolutePathBuf, Vec<std::ffi::OsString>), Error> {
+) -> Result<(AbsolutePathBuf, Vec<OsString>), Error> {
     let bin_path = resolve_bin(bin_name, envs.get("PATH").map(|p| OsStr::new(p.as_str())), cwd)?;
     Ok(match ps1_shim::rewrite_cmd_to_powershell(&bin_path) {
         Some(rewritten) => rewritten,
diff --git a/crates/vite_command/src/ps1_shim.rs b/crates/vite_command/src/ps1_shim.rs
index 59a6ee3c25..5b206da3f1 100644
--- a/crates/vite_command/src/ps1_shim.rs
+++ b/crates/vite_command/src/ps1_shim.rs
@@ -82,7 +82,7 @@ mod tests {
     }
 
     fn host_arc(root: &AbsolutePath) -> Arc<AbsolutePath> {
-        Arc::<AbsolutePath>::from(abs(root.as_path().join("powershell.exe")))
+        Arc::from(abs(root.as_path().join("powershell.exe")))
     }
 
     #[test]

From 221b88a62062a12a9b26ddedff224241b6842b10 Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Wed, 29 Apr 2026 21:14:56 +0900
Subject: [PATCH 06/16] fix(command): look up PATH case-insensitively in
 resolve_program
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On Windows the canonical key is `Path`, and the TS layer's
`prependToPathToEnvs` preserves whatever casing the process started
with when adding the downloaded package-manager bin dir. Hard-coding
`envs.get("PATH")` missed a `Path`-keyed override and silently fell
back to the process PATH — where the prepended shim is absent —
making `vp create` (and any other flow routed through
`runCommandAndDetectProjectDir` / `run_command_with_fspy`) fail with
`Cannot find binary path...` for `npx`/`pnpm`.

Match the case-insensitive lookup `fspy::Command::resolve_program`
already does, so the previously-correct behavior of the fspy path
holds after vp-side resolution moved up a layer in
1b77707e (refactor(command): extract resolve_program to dedupe
ps1-rewrite plumbing).

Adds a Windows-only regression test (`resolve_program_tests`) that
writes a `.exe` into a tempdir and resolves via a `Path`-keyed env
map; without the fix the test fails because resolution falls back to
the process PATH.
---
 crates/vite_command/src/lib.rs | 55 +++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/crates/vite_command/src/lib.rs b/crates/vite_command/src/lib.rs
index 19efcabb54..2d7d041ef6 100644
--- a/crates/vite_command/src/lib.rs
+++ b/crates/vite_command/src/lib.rs
@@ -53,7 +53,16 @@ fn resolve_program(
     envs: &HashMap<String, String>,
     cwd: &AbsolutePath,
 ) -> Result<(AbsolutePathBuf, Vec<OsString>), Error> {
-    let bin_path = resolve_bin(bin_name, envs.get("PATH").map(|p| OsStr::new(p.as_str())), cwd)?;
+    // Look up PATH case-insensitively: on Windows the canonical key is `Path`
+    // and the TS layer's `prependToPathToEnvs` preserves whatever casing the
+    // process started with. Hard-coding `"PATH"` would miss a `Path`-keyed
+    // override and silently fall back to the process PATH (where the
+    // prepended package-manager bin dir is absent).
+    let path_env = envs
+        .iter()
+        .find(|(k, _)| k.eq_ignore_ascii_case("path"))
+        .map(|(_, v)| OsStr::new(v.as_str()));
+    let bin_path = resolve_bin(bin_name, path_env, cwd)?;
     Ok(match ps1_shim::rewrite_cmd_to_powershell(&bin_path) {
         Some(rewritten) => rewritten,
         None => (bin_path, Vec::new()),
@@ -369,6 +378,50 @@ mod tests {
         }
     }
 
+    #[cfg(windows)]
+    mod resolve_program_tests {
+        use super::*;
+
+        // Regression for voidzero-dev/vite-plus#1489 follow-up: on Windows the
+        // PATH environment variable is conventionally keyed `Path` (and the
+        // TS layer's `prependToPathToEnvs` preserves that casing when adding
+        // the downloaded package-manager bin dir). `resolve_program` must
+        // look up PATH case-insensitively or it falls back to the process
+        // environment and can't find the prepended shim.
+        #[test]
+        fn resolve_program_finds_binary_via_lowercase_path_key() {
+            let temp_dir = create_temp_dir();
+            let temp_dir_path =
+                AbsolutePathBuf::new(temp_dir.path().canonicalize().unwrap().to_path_buf())
+                    .unwrap();
+
+            // Unique name so it can't accidentally resolve via the process PATH.
+            let bin_name = "vp_test_resolve_program_path_casing";
+            let bin_path = temp_dir.path().join(format!("{bin_name}.exe"));
+            std::fs::write(&bin_path, b"").unwrap();
+
+            // `Path`, not `PATH` — the real-world Windows casing.
+            let envs = HashMap::from([(
+                "Path".to_string(),
+                temp_dir_path.as_path().to_string_lossy().into_owned(),
+            )]);
+
+            let result = resolve_program(bin_name, &envs, &temp_dir_path);
+            assert!(
+                result.is_ok(),
+                "resolve_program must find the binary via the `Path` env key on Windows; got: {:?}",
+                result.err()
+            );
+            let (program, prefix_args) = result.unwrap();
+            assert!(prefix_args.is_empty(), "no .ps1 sibling, no PowerShell prefix expected");
+            assert_eq!(
+                program.as_path().file_stem().and_then(|s| s.to_str()),
+                Some(bin_name),
+                "resolved program should be the .exe in the tempdir"
+            );
+        }
+    }
+
     mod run_command_with_fspy_tests {
         use super::*;
 

From 466b3a571bfbb5f8b0fc59f5c7a089ae0eeedc5a Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Wed, 29 Apr 2026 23:31:29 +0900
Subject: [PATCH 07/16] fix(command): restrict .cmd to PowerShell rewrite to
 vp-managed shims
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per the Codex adversarial review: the previous implementation
rewrote any `.cmd` with a sibling `.ps1` to spawn through
`PowerShell -ExecutionPolicy Bypass`. That covers vp's own pm
shims but also silently retargets unrelated PATH commands —
system tools, globally-installed npm wrappers, third-party CLIs
whose `.cmd`/`.ps1` wrappers may not be semantically equivalent —
and broadens execution semantics on locked-down hosts that
intentionally block unsigned `.ps1` execution.

Gate the rewrite on `resolved.starts_with($VP_HOME)`, where
`$VP_HOME` is the vp install root (`~/.vite-plus` by default).
That covers the legitimate cases (`$VP_HOME/js_runtime/node/<v>/npm.cmd`
and `$VP_HOME/package_manager/<pm>/<v>/<pm>/bin/<pm>.cmd`) and
leaves anything else alone. `$VP_HOME` is read once via
`vite_shared::get_vp_home()` and cached in a `LazyLock`.

Adds a regression test (`returns_none_for_cmd_outside_vp_home`)
that puts a matching `.cmd`+`.ps1` pair outside the scope and
asserts no rewrite happens.
---
 Cargo.lock                          |   1 +
 crates/vite_command/Cargo.toml      |   1 +
 crates/vite_command/src/ps1_shim.rs | 127 ++++++++++++++++++++--------
 3 files changed, 95 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9a3061876e..8377b47639 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7468,6 +7468,7 @@ dependencies = [
  "vite_error",
  "vite_path",
  "vite_powershell",
+ "vite_shared",
  "which",
 ]
 
diff --git a/crates/vite_command/Cargo.toml b/crates/vite_command/Cargo.toml
index e1cd5a971d..b2bc76aead 100644
--- a/crates/vite_command/Cargo.toml
+++ b/crates/vite_command/Cargo.toml
@@ -15,6 +15,7 @@ tracing = { workspace = true }
 vite_error = { workspace = true }
 vite_path = { workspace = true }
 vite_powershell = { workspace = true }
+vite_shared = { workspace = true }
 which = { workspace = true, features = ["tracing"] }
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
diff --git a/crates/vite_command/src/ps1_shim.rs b/crates/vite_command/src/ps1_shim.rs
index 5b206da3f1..1814a8b8bc 100644
--- a/crates/vite_command/src/ps1_shim.rs
+++ b/crates/vite_command/src/ps1_shim.rs
@@ -1,22 +1,28 @@
-//! Windows-specific: when a resolved binary is a `.cmd` shim with a sibling
-//! `.ps1`, rewrite the spawn to go through `powershell.exe -File <sibling.ps1>`.
+//! Windows-specific: when a vp-managed package-manager `.cmd` shim has a
+//! sibling `.ps1`, rewrite the spawn to go through
+//! `powershell.exe -File <sibling.ps1>`.
 //!
 //! Running a `.cmd` from any shell makes `cmd.exe` prompt "Terminate batch
 //! job (Y/N)?" on Ctrl+C, which leaves the terminal corrupt. Routing through
 //! `PowerShell` sidesteps the prompt and lets Ctrl+C propagate cleanly.
 //!
-//! Unlike the task-layer rewrite (`vite_task_plan::ps1_shim`, scoped to
-//! `node_modules/.bin/*.cmd` inside the workspace), this one applies to any
-//! `.cmd` whose `.ps1` sibling exists. Package manager shims (`npm.cmd`,
-//! `pnpm.cmd`, `yarn.cmd`, `npx.cmd`) live in `~/.vite-plus/js_runtime/...`
-//! or system PATH — outside any `node_modules/.bin` — so the structural
-//! check there is too narrow for this code path.
+//! The rewrite is intentionally **scoped to paths inside `$VP_HOME`**
+//! (`~/.vite-plus` by default). vp's managed shims live there:
+//!   - `$VP_HOME/js_runtime/node/<ver>/{npm,npx}.cmd` (npm/npx shipped with
+//!     the managed Node.js),
+//!   - `$VP_HOME/package_manager/<pm>/<ver>/<pm>/bin/<pm>.cmd` (downloaded
+//!     pnpm/yarn/bun).
 //!
-//! The cross-platform primitives (`POWERSHELL_PREFIX`, `powershell_host`,
-//! `find_ps1_sibling`) live in the `vite_powershell` crate and are shared
-//! with `vite_task_plan::ps1_shim`. This module composes them with vp's
-//! own conventions: absolute `.ps1` path in args (no cache fingerprint to
-//! keep portable) and `Vec<OsString>` return type (matches the spawn API).
+//! Anything outside `$VP_HOME` — system tools, globally-installed npm
+//! shims, third-party CLIs whose `.cmd` and `.ps1` wrappers may not be
+//! semantically equivalent, hosts that intentionally block unsigned
+//! `.ps1` execution — is left alone. Stricter scoping means the prior
+//! `.cmd` path still runs there, but that matches the pre-fix status quo
+//! and avoids broadening execution semantics for unrelated commands.
+//!
+//! The task-layer rewrite (`vite_task_plan::ps1_shim`) is scoped
+//! differently — to `node_modules/.bin/*.cmd` inside the workspace — and
+//! covers `vp run <script>`. The two scopes don't overlap.
 //!
 //! See <https://github.com/voidzero-dev/vite-plus/issues/1489>
 //! and <https://github.com/voidzero-dev/vite-plus/issues/1176>.
@@ -26,32 +32,51 @@ use std::{ffi::OsString, sync::Arc};
 use vite_path::{AbsolutePath, AbsolutePathBuf};
 use vite_powershell::{POWERSHELL_PREFIX, find_ps1_sibling, powershell_host};
 
-/// Rewrite a resolved `.cmd` invocation to go through PowerShell.
+/// Rewrite a vp-managed `.cmd` invocation to go through PowerShell.
 ///
-/// Returns `Some((powershell_host, prefix_args))` when the rewrite applies,
-/// where `prefix_args` is `["-NoProfile", "-NoLogo", "-ExecutionPolicy",
-/// "Bypass", "-File", <abs ps1 path>]`. Caller prepends `prefix_args` to the
-/// user args and spawns `powershell_host`.
+/// Returns `Some((powershell_host, prefix_args))` when the rewrite applies.
+/// `prefix_args` is `["-NoProfile", "-NoLogo", "-ExecutionPolicy", "Bypass",
+/// "-File", <abs ps1 path>]`; callers prepend it to the user args and spawn
+/// `powershell_host`.
 ///
 /// Returns `None` when:
 /// - not on Windows,
 /// - no PowerShell host (`pwsh.exe` or `powershell.exe`) is on PATH,
+/// - `$VP_HOME` could not be resolved,
+/// - the resolved path is **outside** `$VP_HOME`,
 /// - the resolved path is not a `.cmd` (case-insensitive),
 /// - the `.cmd` has no sibling `.ps1`.
 #[must_use]
 pub fn rewrite_cmd_to_powershell(
     resolved: &AbsolutePath,
 ) -> Option<(AbsolutePathBuf, Vec<OsString>)> {
+    let vp_home = vp_home()?;
     let host = powershell_host()?;
-    rewrite_with_host(resolved, host)
+    rewrite_in_scope(resolved, vp_home, host)
+}
+
+/// Cached `$VP_HOME` (`~/.vite-plus` by default; overridable via env var).
+/// `None` only if `vite_shared::get_vp_home()` failed to resolve a home —
+/// in that case we conservatively skip the rewrite rather than retarget
+/// arbitrary PATH commands.
+fn vp_home() -> Option<&'static AbsolutePathBuf> {
+    use std::sync::LazyLock;
+
+    static VP_HOME: LazyLock<Option<AbsolutePathBuf>> =
+        LazyLock::new(|| vite_shared::get_vp_home().ok());
+    VP_HOME.as_ref()
 }
 
 /// Pure rewrite logic. Factored out so tests can drive it on any platform
-/// without depending on a real `powershell.exe`.
-fn rewrite_with_host(
+/// without depending on a real `powershell.exe` or a real `$VP_HOME`.
+fn rewrite_in_scope(
     resolved: &AbsolutePath,
+    vp_home: &AbsolutePath,
     host: &Arc<AbsolutePath>,
 ) -> Option<(AbsolutePathBuf, Vec<OsString>)> {
+    if !resolved.as_path().starts_with(vp_home.as_path()) {
+        return None;
+    }
     let ps1 = find_ps1_sibling(resolved)?;
 
     tracing::debug!(
@@ -86,36 +111,70 @@ mod tests {
     }
 
     #[test]
-    fn rewrites_cmd_to_powershell_with_sibling_ps1() {
+    fn rewrites_cmd_inside_vp_home_to_powershell() {
         let dir = tempdir().unwrap();
-        let root = abs(dir.path().canonicalize().unwrap());
-        fs::write(root.as_path().join("npm.cmd"), "").unwrap();
-        fs::write(root.as_path().join("npm.ps1"), "").unwrap();
+        let vp_home = abs(dir.path().canonicalize().unwrap());
+        // Mimic the real layout: $VP_HOME/js_runtime/node/<ver>/npm.cmd.
+        let bin_dir = vp_home.as_path().join("js_runtime").join("node").join("24.0.0");
+        fs::create_dir_all(&bin_dir).unwrap();
+        fs::write(bin_dir.join("npm.cmd"), "").unwrap();
+        fs::write(bin_dir.join("npm.ps1"), "").unwrap();
 
-        let host = host_arc(&root);
-        let resolved = abs(root.as_path().join("npm.cmd"));
+        let host = host_arc(&vp_home);
+        let resolved = abs(bin_dir.join("npm.cmd"));
 
-        let (program, prefix_args) = rewrite_with_host(&resolved, &host).expect("should rewrite");
+        let (program, prefix_args) =
+            rewrite_in_scope(&resolved, &vp_home, &host).expect("should rewrite");
 
         assert_eq!(program.as_path(), host.as_path());
         let as_strs: Vec<&str> = prefix_args.iter().filter_map(|a| a.to_str()).collect();
-        let ps1_path = root.as_path().join("npm.ps1");
-        let ps1_str = ps1_path.to_str().unwrap();
+        let ps1_str = bin_dir.join("npm.ps1");
+        let ps1_str = ps1_str.to_str().unwrap();
         assert_eq!(
             as_strs,
             vec!["-NoProfile", "-NoLogo", "-ExecutionPolicy", "Bypass", "-File", ps1_str]
         );
     }
 
+    /// Regression for the Codex review: the rewrite must NOT retarget
+    /// `.cmd` files that live outside `$VP_HOME` even when a sibling
+    /// `.ps1` exists. Otherwise unrelated PATH commands (system tools,
+    /// globally installed npm wrappers, third-party CLIs whose `.cmd`
+    /// and `.ps1` wrappers diverge) would silently switch to PowerShell
+    /// with `-ExecutionPolicy Bypass`.
     #[test]
-    fn returns_none_when_no_ps1_sibling() {
+    fn returns_none_for_cmd_outside_vp_home() {
         let dir = tempdir().unwrap();
         let root = abs(dir.path().canonicalize().unwrap());
-        fs::write(root.as_path().join("npm.cmd"), "").unwrap();
+        let vp_home_path = root.as_path().join("vite-plus");
+        fs::create_dir_all(&vp_home_path).unwrap();
+        let vp_home = abs(vp_home_path);
+
+        // A `.cmd`+`.ps1` pair *outside* vp_home — e.g. a global install at
+        // `%AppData%\npm\node_modules\.bin\foo.cmd` or any third-party tool.
+        let outside_bin = root.as_path().join("global").join("bin");
+        fs::create_dir_all(&outside_bin).unwrap();
+        fs::write(outside_bin.join("foo.cmd"), "").unwrap();
+        fs::write(outside_bin.join("foo.ps1"), "").unwrap();
 
         let host = host_arc(&root);
-        let resolved = abs(root.as_path().join("npm.cmd"));
+        let resolved = abs(outside_bin.join("foo.cmd"));
+
+        assert!(
+            rewrite_in_scope(&resolved, &vp_home, &host).is_none(),
+            "rewrite must stay hands-off for .cmd outside $VP_HOME"
+        );
+    }
+
+    #[test]
+    fn returns_none_when_no_ps1_sibling() {
+        let dir = tempdir().unwrap();
+        let vp_home = abs(dir.path().canonicalize().unwrap());
+        fs::write(vp_home.as_path().join("npm.cmd"), "").unwrap();
+
+        let host = host_arc(&vp_home);
+        let resolved = abs(vp_home.as_path().join("npm.cmd"));
 
-        assert!(rewrite_with_host(&resolved, &host).is_none());
+        assert!(rewrite_in_scope(&resolved, &vp_home, &host).is_none());
     }
 }

From 6a52487d745736ca7b348e38db86ad3d2e337a7c Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Wed, 29 Apr 2026 23:40:10 +0900
Subject: [PATCH 08/16] style(ps1_shim): tighten scope-rationale doc and
 unshadow ps1_str in test

Two minor cleanups from review:
- Merge the two-sentence "outside `$VP_HOME` is left alone" paragraph
  into one that focuses on the WHY (avoid silently changing execution
  semantics for unrelated commands; respect locked-down hosts) instead
  of restating the trade-off as status-quo prose.
- Rename the second `ps1_str` binding in the inside-vp-home test to
  `ps1_path` so the `PathBuf` and the `&str` derived from it have
  distinct names.
---
 crates/vite_command/src/ps1_shim.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/crates/vite_command/src/ps1_shim.rs b/crates/vite_command/src/ps1_shim.rs
index 1814a8b8bc..3e69aafdd4 100644
--- a/crates/vite_command/src/ps1_shim.rs
+++ b/crates/vite_command/src/ps1_shim.rs
@@ -14,11 +14,10 @@
 //!     pnpm/yarn/bun).
 //!
 //! Anything outside `$VP_HOME` — system tools, globally-installed npm
-//! shims, third-party CLIs whose `.cmd` and `.ps1` wrappers may not be
-//! semantically equivalent, hosts that intentionally block unsigned
-//! `.ps1` execution — is left alone. Stricter scoping means the prior
-//! `.cmd` path still runs there, but that matches the pre-fix status quo
-//! and avoids broadening execution semantics for unrelated commands.
+//! shims, third-party CLIs whose `.cmd` and `.ps1` wrappers may diverge —
+//! keeps its existing `.cmd` path (Ctrl+C corruption included), so we
+//! don't silently change execution semantics for unrelated commands or
+//! bypass execution policies on locked-down hosts.
 //!
 //! The task-layer rewrite (`vite_task_plan::ps1_shim`) is scoped
 //! differently — to `node_modules/.bin/*.cmd` inside the workspace — and
@@ -128,8 +127,8 @@ mod tests {
 
         assert_eq!(program.as_path(), host.as_path());
         let as_strs: Vec<&str> = prefix_args.iter().filter_map(|a| a.to_str()).collect();
-        let ps1_str = bin_dir.join("npm.ps1");
-        let ps1_str = ps1_str.to_str().unwrap();
+        let ps1_path = bin_dir.join("npm.ps1");
+        let ps1_str = ps1_path.to_str().unwrap();
         assert_eq!(
             as_strs,
             vec!["-NoProfile", "-NoLogo", "-ExecutionPolicy", "Bypass", "-File", ps1_str]

From 5d59d651ea00fa54f3d744b1f904cf63404077c4 Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Thu, 30 Apr 2026 10:11:01 +0900
Subject: [PATCH 09/16] fix(command): also rewrite .cmd shims under any
 node_modules/.bin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extends the rewrite scope so `<...>/node_modules/.bin/*.cmd` is also
routed through PowerShell, in addition to paths inside `$VP_HOME`.
The structural check is purely path-component based (case-insensitive
on `.bin`/`node_modules` to match Windows semantics) — no project
locality gate. npm/pnpm/yarn-emitted shims always come with a sibling
`.ps1`, so the rewrite stays self-consistent across single-package
projects, hoisted monorepos, and globally-installed shims.

Anything outside both scopes — system tools, third-party CLIs whose
`.cmd`/`.ps1` wrappers may diverge — still keeps its existing `.cmd`
path.

Adds tests for the node_modules/.bin path and a casing variant
(`Node_Modules\.Bin`); removes the now-redundant cwd-locality tests.
---
 crates/vite_command/src/ps1_shim.rs | 116 +++++++++++++++++++++-------
 1 file changed, 90 insertions(+), 26 deletions(-)

diff --git a/crates/vite_command/src/ps1_shim.rs b/crates/vite_command/src/ps1_shim.rs
index 3e69aafdd4..23f40f52af 100644
--- a/crates/vite_command/src/ps1_shim.rs
+++ b/crates/vite_command/src/ps1_shim.rs
@@ -6,22 +6,27 @@
 //! job (Y/N)?" on Ctrl+C, which leaves the terminal corrupt. Routing through
 //! `PowerShell` sidesteps the prompt and lets Ctrl+C propagate cleanly.
 //!
-//! The rewrite is intentionally **scoped to paths inside `$VP_HOME`**
-//! (`~/.vite-plus` by default). vp's managed shims live there:
-//!   - `$VP_HOME/js_runtime/node/<ver>/{npm,npx}.cmd` (npm/npx shipped with
-//!     the managed Node.js),
-//!   - `$VP_HOME/package_manager/<pm>/<ver>/<pm>/bin/<pm>.cmd` (downloaded
-//!     pnpm/yarn/bun).
+//! The rewrite is scoped to two patterns:
+//!   - Inside `$VP_HOME` (`~/.vite-plus` by default) — vp's managed shims:
+//!     - `$VP_HOME/js_runtime/node/<ver>/{npm,npx}.cmd`,
+//!     - `$VP_HOME/package_manager/<pm>/<ver>/<pm>/bin/<pm>.cmd`.
+//!   - Any `<...>/node_modules/.bin/*.cmd` — the canonical layout for
+//!     npm/pnpm/yarn-emitted shims (cmd-shim writes both `.cmd` and `.ps1`
+//!     so the wrappers stay equivalent).
 //!
-//! Anything outside `$VP_HOME` — system tools, globally-installed npm
-//! shims, third-party CLIs whose `.cmd` and `.ps1` wrappers may diverge —
-//! keeps its existing `.cmd` path (Ctrl+C corruption included), so we
-//! don't silently change execution semantics for unrelated commands or
-//! bypass execution policies on locked-down hosts.
+//! Anything outside both patterns — system tools, third-party CLIs whose
+//! `.cmd` and `.ps1` wrappers may diverge — keeps its existing `.cmd`
+//! path (Ctrl+C corruption included), so we don't silently change
+//! execution semantics for unrelated commands or bypass execution
+//! policies on locked-down hosts.
 //!
-//! The task-layer rewrite (`vite_task_plan::ps1_shim`) is scoped
-//! differently — to `node_modules/.bin/*.cmd` inside the workspace — and
-//! covers `vp run <script>`. The two scopes don't overlap.
+//! The task-layer rewrite (`vite_task_plan::ps1_shim`) covers the same
+//! `node_modules/.bin/*.cmd` pattern at task-graph plan time for `vp run
+//! <script>`. The two are complementary: the task-layer version records
+//! cwd-relative `.ps1` paths in the plan's spawn fingerprint (so it stays
+//! portable across machines), this one applies absolute-path rewriting at
+//! spawn time for paths the task layer doesn't see (pm-routed flows that
+//! go through `vite_command::run_command`).
 //!
 //! See <https://github.com/voidzero-dev/vite-plus/issues/1489>
 //! and <https://github.com/voidzero-dev/vite-plus/issues/1176>.
@@ -42,7 +47,8 @@ use vite_powershell::{POWERSHELL_PREFIX, find_ps1_sibling, powershell_host};
 /// - not on Windows,
 /// - no PowerShell host (`pwsh.exe` or `powershell.exe`) is on PATH,
 /// - `$VP_HOME` could not be resolved,
-/// - the resolved path is **outside** `$VP_HOME`,
+/// - the resolved path is outside `$VP_HOME` AND not under any
+///   `node_modules/.bin/`,
 /// - the resolved path is not a `.cmd` (case-insensitive),
 /// - the `.cmd` has no sibling `.ps1`.
 #[must_use]
@@ -73,7 +79,7 @@ fn rewrite_in_scope(
     vp_home: &AbsolutePath,
     host: &Arc<AbsolutePath>,
 ) -> Option<(AbsolutePathBuf, Vec<OsString>)> {
-    if !resolved.as_path().starts_with(vp_home.as_path()) {
+    if !is_in_managed_scope(resolved, vp_home) {
         return None;
     }
     let ps1 = find_ps1_sibling(resolved)?;
@@ -92,6 +98,24 @@ fn rewrite_in_scope(
     Some((host.to_absolute_path_buf(), prefix_args))
 }
 
+fn is_in_managed_scope(resolved: &AbsolutePath, vp_home: &AbsolutePath) -> bool {
+    resolved.as_path().starts_with(vp_home.as_path()) || is_in_node_modules_bin(resolved)
+}
+
+/// `true` when `resolved` is `<...>/node_modules/.bin/<file>` (matched
+/// case-insensitively on the `.bin`/`node_modules` components — Windows
+/// is case-insensitive, and pnpm's hoisted layouts can vary in casing).
+fn is_in_node_modules_bin(resolved: &AbsolutePath) -> bool {
+    let mut parents = resolved.as_path().components().rev();
+    parents.next(); // shim filename
+    let Some(bin) = parents.next() else { return false };
+    if !bin.as_os_str().eq_ignore_ascii_case(".bin") {
+        return false;
+    }
+    let Some(node_modules) = parents.next() else { return false };
+    node_modules.as_os_str().eq_ignore_ascii_case("node_modules")
+}
+
 #[cfg(test)]
 mod tests {
     use std::fs;
@@ -135,22 +159,62 @@ mod tests {
         );
     }
 
-    /// Regression for the Codex review: the rewrite must NOT retarget
-    /// `.cmd` files that live outside `$VP_HOME` even when a sibling
-    /// `.ps1` exists. Otherwise unrelated PATH commands (system tools,
-    /// globally installed npm wrappers, third-party CLIs whose `.cmd`
-    /// and `.ps1` wrappers diverge) would silently switch to PowerShell
-    /// with `-ExecutionPolicy Bypass`.
+    /// Any `<...>/node_modules/.bin/*.cmd` rewrites, regardless of where
+    /// the project root sits — covers single-package projects, hoisted
+    /// monorepos, and globally-installed shims uniformly.
+    #[test]
+    fn rewrites_cmd_in_node_modules_bin() {
+        let dir = tempdir().unwrap();
+        let root = abs(dir.path().canonicalize().unwrap());
+        // vp_home points elsewhere — this scope is the node_modules path.
+        let vp_home_path = root.as_path().join("vite-plus");
+        fs::create_dir_all(&vp_home_path).unwrap();
+        let vp_home = abs(vp_home_path);
+
+        let bin = root.as_path().join("my-project").join("node_modules").join(".bin");
+        fs::create_dir_all(&bin).unwrap();
+        fs::write(bin.join("vite.cmd"), "").unwrap();
+        fs::write(bin.join("vite.ps1"), "").unwrap();
+
+        let host = host_arc(&root);
+        let resolved = abs(bin.join("vite.cmd"));
+
+        let result = rewrite_in_scope(&resolved, &vp_home, &host);
+        assert!(result.is_some(), "any node_modules/.bin/*.cmd must rewrite");
+    }
+
+    /// The `.bin`/`node_modules` component check is case-insensitive so
+    /// a `.CMD` shim under `Node_Modules\.Bin\` (or any casing variant)
+    /// still matches.
+    #[test]
+    fn rewrites_cmd_in_node_modules_bin_case_insensitive() {
+        let dir = tempdir().unwrap();
+        let root = abs(dir.path().canonicalize().unwrap());
+        let vp_home = abs(root.as_path().join("vite-plus"));
+        fs::create_dir_all(vp_home.as_path()).unwrap();
+
+        let bin = root.as_path().join("Node_Modules").join(".Bin");
+        fs::create_dir_all(&bin).unwrap();
+        fs::write(bin.join("vite.cmd"), "").unwrap();
+        fs::write(bin.join("vite.ps1"), "").unwrap();
+
+        let host = host_arc(&root);
+        let resolved = abs(bin.join("vite.cmd"));
+
+        assert!(rewrite_in_scope(&resolved, &vp_home, &host).is_some());
+    }
+
+    /// A `.cmd`+`.ps1` pair outside `$VP_HOME` AND outside any
+    /// `node_modules/.bin/` (e.g. a system tool living at `<root>/global/bin/foo.cmd`)
+    /// must NOT be retargeted.
     #[test]
-    fn returns_none_for_cmd_outside_vp_home() {
+    fn returns_none_for_cmd_outside_managed_scope() {
         let dir = tempdir().unwrap();
         let root = abs(dir.path().canonicalize().unwrap());
         let vp_home_path = root.as_path().join("vite-plus");
         fs::create_dir_all(&vp_home_path).unwrap();
         let vp_home = abs(vp_home_path);
 
-        // A `.cmd`+`.ps1` pair *outside* vp_home — e.g. a global install at
-        // `%AppData%\npm\node_modules\.bin\foo.cmd` or any third-party tool.
         let outside_bin = root.as_path().join("global").join("bin");
         fs::create_dir_all(&outside_bin).unwrap();
         fs::write(outside_bin.join("foo.cmd"), "").unwrap();
@@ -161,7 +225,7 @@ mod tests {
 
         assert!(
             rewrite_in_scope(&resolved, &vp_home, &host).is_none(),
-            "rewrite must stay hands-off for .cmd outside $VP_HOME"
+            "rewrite must stay hands-off for .cmd outside both vp_home and node_modules/.bin"
         );
     }
 

From 35ba866edf51cacfa2ed05f1c4f8caf136a607b3 Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Thu, 30 Apr 2026 16:58:37 +0900
Subject: [PATCH 10/16] chore(deps): bump vite-task pin to merged 88bacaa7

Picks up the squash-merged voidzero-dev/vite-task#368 (the
`vite_powershell` crate extraction). Replaces the draft-branch SHA
`957278df` with the merged-to-main SHA across all 7 vite-task crate
pins (fspy, vite_glob, vite_path, vite_powershell, vite_str,
vite_task, vite_workspace).
---
 Cargo.lock                      | 44 ++++++++++++++++-----------------
 Cargo.toml                      | 14 +++++------
 packages/tools/src/snap-test.ts |  8 +++++-
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8377b47639..f9fb7b0ea9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1872,7 +1872,7 @@ dependencies = [
 [[package]]
 name = "fspy"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "allocator-api2",
  "anyhow",
@@ -1908,7 +1908,7 @@ dependencies = [
 [[package]]
 name = "fspy_detours_sys"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "cc",
  "winapi",
@@ -1917,7 +1917,7 @@ dependencies = [
 [[package]]
 name = "fspy_preload_unix"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "anyhow",
  "bstr",
@@ -1932,7 +1932,7 @@ dependencies = [
 [[package]]
 name = "fspy_preload_windows"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "constcat",
  "fspy_detours_sys",
@@ -1948,7 +1948,7 @@ dependencies = [
 [[package]]
 name = "fspy_seccomp_unotify"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "futures-util",
  "libc",
@@ -1965,7 +1965,7 @@ dependencies = [
 [[package]]
 name = "fspy_shared"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "allocator-api2",
  "bitflags 2.11.0",
@@ -1984,7 +1984,7 @@ dependencies = [
 [[package]]
 name = "fspy_shared_unix"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -3124,7 +3124,7 @@ dependencies = [
 [[package]]
 name = "materialized_artifact"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "tempfile",
 ]
@@ -3132,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "materialized_artifact_build"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "xxhash-rust",
 ]
@@ -3346,7 +3346,7 @@ dependencies = [
 [[package]]
 name = "native_str"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "allocator-api2",
  "bytemuck",
@@ -4821,7 +4821,7 @@ dependencies = [
 [[package]]
 name = "pty_terminal_test_client"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 
 [[package]]
 name = "quote"
@@ -7498,7 +7498,7 @@ dependencies = [
 [[package]]
 name = "vite_glob"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "thiserror 2.0.18",
  "vite_path",
@@ -7538,7 +7538,7 @@ dependencies = [
 [[package]]
 name = "vite_graph_ser"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "petgraph 0.8.3",
  "serde",
@@ -7637,7 +7637,7 @@ dependencies = [
 [[package]]
 name = "vite_path"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "diff-struct",
  "path-clean",
@@ -7651,7 +7651,7 @@ dependencies = [
 [[package]]
 name = "vite_powershell"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "vite_path",
  "which",
@@ -7660,7 +7660,7 @@ dependencies = [
 [[package]]
 name = "vite_select"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "anyhow",
  "crossterm",
@@ -7710,7 +7710,7 @@ dependencies = [
 [[package]]
 name = "vite_shell"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "brush-parser 0.3.0 (git+https://github.com/reubeno/brush?rev=dcb760933b10ee0433d7b740a5709b06f5c67c6b)",
  "diff-struct",
@@ -7737,7 +7737,7 @@ dependencies = [
 [[package]]
 name = "vite_str"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "compact_str",
  "diff-struct",
@@ -7748,7 +7748,7 @@ dependencies = [
 [[package]]
 name = "vite_task"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7786,7 +7786,7 @@ dependencies = [
 [[package]]
 name = "vite_task_graph"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7808,7 +7808,7 @@ dependencies = [
 [[package]]
 name = "vite_task_plan"
 version = "0.1.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7841,7 +7841,7 @@ version = "0.0.0"
 [[package]]
 name = "vite_workspace"
 version = "0.0.0"
-source = "git+https://github.com/voidzero-dev/vite-task.git?rev=957278dfba4eac6756a564372c0bb26df0870707#957278dfba4eac6756a564372c0bb26df0870707"
+source = "git+https://github.com/voidzero-dev/vite-task.git?rev=88bacaa770200ddab151dea252e04ba8cdcc4ade#88bacaa770200ddab151dea252e04ba8cdcc4ade"
 dependencies = [
  "clap",
  "petgraph 0.8.3",
diff --git a/Cargo.toml b/Cargo.toml
index fa90ec27fb..c6ba93484e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -89,7 +89,7 @@ dunce = "1.0.5"
 fast-glob = "1.0.0"
 flate2 = { version = "=1.1.9", features = ["zlib-rs"] }
 form_urlencoded = "1.2.1"
-fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
+fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "88bacaa770200ddab151dea252e04ba8cdcc4ade" }
 futures = "0.3.31"
 futures-util = "0.3.31"
 glob = "0.3.2"
@@ -194,17 +194,17 @@ vfs = "0.13.0"
 vite_command = { path = "crates/vite_command" }
 vite_error = { path = "crates/vite_error" }
 vite_js_runtime = { path = "crates/vite_js_runtime" }
-vite_glob = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
+vite_glob = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "88bacaa770200ddab151dea252e04ba8cdcc4ade" }
 vite_install = { path = "crates/vite_install" }
 vite_migration = { path = "crates/vite_migration" }
 vite_setup = { path = "crates/vite_setup" }
 vite_shared = { path = "crates/vite_shared" }
 vite_static_config = { path = "crates/vite_static_config" }
-vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
-vite_powershell = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
-vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
-vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
-vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "957278dfba4eac6756a564372c0bb26df0870707" }
+vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "88bacaa770200ddab151dea252e04ba8cdcc4ade" }
+vite_powershell = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "88bacaa770200ddab151dea252e04ba8cdcc4ade" }
+vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "88bacaa770200ddab151dea252e04ba8cdcc4ade" }
+vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "88bacaa770200ddab151dea252e04ba8cdcc4ade" }
+vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "88bacaa770200ddab151dea252e04ba8cdcc4ade" }
 walkdir = "2.5.0"
 wax = "0.6.0"
 which = "8.0.0"
diff --git a/packages/tools/src/snap-test.ts b/packages/tools/src/snap-test.ts
index 11c1bc08d8..e4c92a3ed7 100755
--- a/packages/tools/src/snap-test.ts
+++ b/packages/tools/src/snap-test.ts
@@ -168,7 +168,13 @@ export async function snapTest() {
   );
 
   // Clean up the temporary directory on exit
-  process.on('exit', () => fs.rmSync(tempTmpDir, { recursive: true, force: true }));
+  process.on('exit', () => {
+    try {
+      fs.rmSync(tempTmpDir, { recursive: true, force: true });
+    } catch (error) {
+      console.error('Error cleaning up temporary directory: %s, %s', tempTmpDir, error);
+    }
+  });
 
   const casesDir = path.resolve(values.dir || 'snap-tests');
 

From 3c3750a0ea33ff87292dd0e4d7f05c7c66bc6921 Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Thu, 30 Apr 2026 17:18:05 +0900
Subject: [PATCH 11/16] refactor(command): drop case-insensitive PATH lookup in
 resolve_program

Per PR review on #1498: every Rust call site of `run_command` /
`run_command_with_fspy` already builds envs with uppercase `"PATH"`
(via `HashMap::from([("PATH".to_string(), format_path_env(...))])`
in vite_install command handlers and vite_pm_cli). The `Path`-keyed
scenario the case-insensitive lookup defended against doesn't reach
this code path, so the lookup and its Windows-only regression test
are dead weight. Use `envs.get("PATH")` directly.
---
 crates/vite_command/src/lib.rs | 54 +---------------------------------
 1 file changed, 1 insertion(+), 53 deletions(-)

diff --git a/crates/vite_command/src/lib.rs b/crates/vite_command/src/lib.rs
index 2d7d041ef6..27daf1a6d9 100644
--- a/crates/vite_command/src/lib.rs
+++ b/crates/vite_command/src/lib.rs
@@ -53,15 +53,7 @@ fn resolve_program(
     envs: &HashMap<String, String>,
     cwd: &AbsolutePath,
 ) -> Result<(AbsolutePathBuf, Vec<OsString>), Error> {
-    // Look up PATH case-insensitively: on Windows the canonical key is `Path`
-    // and the TS layer's `prependToPathToEnvs` preserves whatever casing the
-    // process started with. Hard-coding `"PATH"` would miss a `Path`-keyed
-    // override and silently fall back to the process PATH (where the
-    // prepended package-manager bin dir is absent).
-    let path_env = envs
-        .iter()
-        .find(|(k, _)| k.eq_ignore_ascii_case("path"))
-        .map(|(_, v)| OsStr::new(v.as_str()));
+    let path_env = envs.get("PATH").map(|p| OsStr::new(p.as_str()));
     let bin_path = resolve_bin(bin_name, path_env, cwd)?;
     Ok(match ps1_shim::rewrite_cmd_to_powershell(&bin_path) {
         Some(rewritten) => rewritten,
@@ -378,50 +370,6 @@ mod tests {
         }
     }
 
-    #[cfg(windows)]
-    mod resolve_program_tests {
-        use super::*;
-
-        // Regression for voidzero-dev/vite-plus#1489 follow-up: on Windows the
-        // PATH environment variable is conventionally keyed `Path` (and the
-        // TS layer's `prependToPathToEnvs` preserves that casing when adding
-        // the downloaded package-manager bin dir). `resolve_program` must
-        // look up PATH case-insensitively or it falls back to the process
-        // environment and can't find the prepended shim.
-        #[test]
-        fn resolve_program_finds_binary_via_lowercase_path_key() {
-            let temp_dir = create_temp_dir();
-            let temp_dir_path =
-                AbsolutePathBuf::new(temp_dir.path().canonicalize().unwrap().to_path_buf())
-                    .unwrap();
-
-            // Unique name so it can't accidentally resolve via the process PATH.
-            let bin_name = "vp_test_resolve_program_path_casing";
-            let bin_path = temp_dir.path().join(format!("{bin_name}.exe"));
-            std::fs::write(&bin_path, b"").unwrap();
-
-            // `Path`, not `PATH` — the real-world Windows casing.
-            let envs = HashMap::from([(
-                "Path".to_string(),
-                temp_dir_path.as_path().to_string_lossy().into_owned(),
-            )]);
-
-            let result = resolve_program(bin_name, &envs, &temp_dir_path);
-            assert!(
-                result.is_ok(),
-                "resolve_program must find the binary via the `Path` env key on Windows; got: {:?}",
-                result.err()
-            );
-            let (program, prefix_args) = result.unwrap();
-            assert!(prefix_args.is_empty(), "no .ps1 sibling, no PowerShell prefix expected");
-            assert_eq!(
-                program.as_path().file_stem().and_then(|s| s.to_str()),
-                Some(bin_name),
-                "resolved program should be the .exe in the tempdir"
-            );
-        }
-    }
-
     mod run_command_with_fspy_tests {
         use super::*;
 

From 408c0d47b75e2239d6860fb01f3147a867614ad0 Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Thu, 30 Apr 2026 17:47:14 +0900
Subject: [PATCH 12/16] style(ps1_shim): drop Arc from rewrite_in_scope
 signature and trim docstring
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two cleanups from review:
- Trim the "complementary task-layer rewrite" paragraph from the
  module docstring — readers can `git grep ps1_shim` if they need to
  find the sibling module in vite-task.
- Tighten `rewrite_in_scope`'s `host` parameter from
  `&Arc<AbsolutePath>` to `&AbsolutePath` so the internal Arc wrapper
  no longer leaks through the test boundary. Tests now build a plain
  `AbsolutePathBuf` host via a renamed `host_buf` helper.
---
 crates/vite_command/src/ps1_shim.rs | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/crates/vite_command/src/ps1_shim.rs b/crates/vite_command/src/ps1_shim.rs
index 23f40f52af..c5ed9f3cb1 100644
--- a/crates/vite_command/src/ps1_shim.rs
+++ b/crates/vite_command/src/ps1_shim.rs
@@ -20,18 +20,10 @@
 //! execution semantics for unrelated commands or bypass execution
 //! policies on locked-down hosts.
 //!
-//! The task-layer rewrite (`vite_task_plan::ps1_shim`) covers the same
-//! `node_modules/.bin/*.cmd` pattern at task-graph plan time for `vp run
-//! <script>`. The two are complementary: the task-layer version records
-//! cwd-relative `.ps1` paths in the plan's spawn fingerprint (so it stays
-//! portable across machines), this one applies absolute-path rewriting at
-//! spawn time for paths the task layer doesn't see (pm-routed flows that
-//! go through `vite_command::run_command`).
-//!
 //! See <https://github.com/voidzero-dev/vite-plus/issues/1489>
 //! and <https://github.com/voidzero-dev/vite-plus/issues/1176>.
 
-use std::{ffi::OsString, sync::Arc};
+use std::ffi::OsString;
 
 use vite_path::{AbsolutePath, AbsolutePathBuf};
 use vite_powershell::{POWERSHELL_PREFIX, find_ps1_sibling, powershell_host};
@@ -77,7 +69,7 @@ fn vp_home() -> Option<&'static AbsolutePathBuf> {
 fn rewrite_in_scope(
     resolved: &AbsolutePath,
     vp_home: &AbsolutePath,
-    host: &Arc<AbsolutePath>,
+    host: &AbsolutePath,
 ) -> Option<(AbsolutePathBuf, Vec<OsString>)> {
     if !is_in_managed_scope(resolved, vp_home) {
         return None;
@@ -129,8 +121,8 @@ mod tests {
         AbsolutePathBuf::new(buf).unwrap()
     }
 
-    fn host_arc(root: &AbsolutePath) -> Arc<AbsolutePath> {
-        Arc::from(abs(root.as_path().join("powershell.exe")))
+    fn host_buf(root: &AbsolutePath) -> AbsolutePathBuf {
+        abs(root.as_path().join("powershell.exe"))
     }
 
     #[test]
@@ -143,7 +135,7 @@ mod tests {
         fs::write(bin_dir.join("npm.cmd"), "").unwrap();
         fs::write(bin_dir.join("npm.ps1"), "").unwrap();
 
-        let host = host_arc(&vp_home);
+        let host = host_buf(&vp_home);
         let resolved = abs(bin_dir.join("npm.cmd"));
 
         let (program, prefix_args) =
@@ -176,7 +168,7 @@ mod tests {
         fs::write(bin.join("vite.cmd"), "").unwrap();
         fs::write(bin.join("vite.ps1"), "").unwrap();
 
-        let host = host_arc(&root);
+        let host = host_buf(&root);
         let resolved = abs(bin.join("vite.cmd"));
 
         let result = rewrite_in_scope(&resolved, &vp_home, &host);
@@ -198,7 +190,7 @@ mod tests {
         fs::write(bin.join("vite.cmd"), "").unwrap();
         fs::write(bin.join("vite.ps1"), "").unwrap();
 
-        let host = host_arc(&root);
+        let host = host_buf(&root);
         let resolved = abs(bin.join("vite.cmd"));
 
         assert!(rewrite_in_scope(&resolved, &vp_home, &host).is_some());
@@ -220,7 +212,7 @@ mod tests {
         fs::write(outside_bin.join("foo.cmd"), "").unwrap();
         fs::write(outside_bin.join("foo.ps1"), "").unwrap();
 
-        let host = host_arc(&root);
+        let host = host_buf(&root);
         let resolved = abs(outside_bin.join("foo.cmd"));
 
         assert!(
@@ -235,7 +227,7 @@ mod tests {
         let vp_home = abs(dir.path().canonicalize().unwrap());
         fs::write(vp_home.as_path().join("npm.cmd"), "").unwrap();
 
-        let host = host_arc(&vp_home);
+        let host = host_buf(&vp_home);
         let resolved = abs(vp_home.as_path().join("npm.cmd"));
 
         assert!(rewrite_in_scope(&resolved, &vp_home, &host).is_none());

From afde39abc167bd158364d3d11d9b00575f2b70d1 Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Thu, 30 Apr 2026 20:06:11 +0900
Subject: [PATCH 13/16] fix(cli): consolidate runCommandSilently and skip stdin
 pipe to avoid PowerShell deadlock
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two intertwined fixes:

1. Drop the stdin pipe in `runCommandSilently` — use `stdio: ['ignore',
   'pipe', 'pipe']` instead of `stdio: 'pipe'`. Leaving an open stdin
   pipe deadlocks any descendant `.ps1` shim whose
   `$MyInvocation.ExpectingInput` branch reads stdin to EOF before
   invoking `node` (the npm/pnpm/yarn cmd-shim pwsh template). The
   `migration-prettier-eslint-combo` snap test on Windows hung because
   `vp migrate` shells out via `runCommandSilently` to `vp dlx
   @oxlint/migrate`, and after the .cmd → PowerShell rewrite landed on
   this branch the inherited stdin pipe was never closed.

2. Consolidate the two duplicate `runCommandSilently` / `runCommand`
   pairs (`packages/cli/src/utils/command.ts` and
   `packages/cli/src/create/command.ts`) into one canonical copy in
   `utils/command.ts`. `create/command.ts` now re-exports them and
   keeps only the create-specific helpers
   (`runCommandAndDetectProjectDir`, `getPackageRunner`,
   `formatDlxCommand`, `prependToPathToEnvs`). Aligns the previously
   diverging `runCommand` return types (`number` vs `ExecutionResult`)
   on `Promise<ExecutionResult>` — utils' `runCommand` had no callers
   so the rename is safe — and prevents the stdin fix from drifting
   between two copies.
---
 packages/cli/src/create/command.ts | 67 ++----------------------------
 packages/cli/src/utils/command.ts  | 19 ++++++---
 2 files changed, 17 insertions(+), 69 deletions(-)

diff --git a/packages/cli/src/create/command.ts b/packages/cli/src/create/command.ts
index 39fe68318e..688e0db462 100644
--- a/packages/cli/src/create/command.ts
+++ b/packages/cli/src/create/command.ts
@@ -1,22 +1,12 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import spawn from 'cross-spawn';
-
 import { runCommand as runCommandWithFspy } from '../../binding/index.js';
 import type { WorkspaceInfo } from '../types/index.ts';
+import type { ExecutionResult, RunCommandOptions } from '../utils/command.ts';
 
-export interface ExecutionResult {
-  exitCode: number;
-  projectDir?: string;
-}
-
-export interface RunCommandOptions {
-  command: string;
-  args: string[];
-  cwd: string;
-  envs: NodeJS.ProcessEnv;
-}
+export type { ExecutionResult, RunCommandOptions, RunCommandResult } from '../utils/command.ts';
+export { runCommand, runCommandSilently } from '../utils/command.ts';
 
 // Run a command and detect the project directory
 export async function runCommandAndDetectProjectDir(
@@ -89,57 +79,6 @@ export async function runCommandAndDetectProjectDir(
   };
 }
 
-export interface RunCommandResult extends ExecutionResult {
-  stdout: Buffer;
-  stderr: Buffer;
-}
-
-export async function runCommandSilently(options: RunCommandOptions): Promise<RunCommandResult> {
-  const child = spawn(options.command, options.args, {
-    stdio: 'pipe',
-    cwd: options.cwd,
-    env: options.envs,
-  });
-  const promise = new Promise<RunCommandResult>((resolve, reject) => {
-    const stdout: Buffer[] = [];
-    const stderr: Buffer[] = [];
-    child.stdout?.on('data', (data) => {
-      stdout.push(data);
-    });
-    child.stderr?.on('data', (data) => {
-      stderr.push(data);
-    });
-    child.on('close', (code) => {
-      resolve({
-        exitCode: code ?? 0,
-        stdout: Buffer.concat(stdout),
-        stderr: Buffer.concat(stderr),
-      });
-    });
-    child.on('error', (err) => {
-      reject(err);
-    });
-  });
-  return await promise;
-}
-
-export async function runCommand(options: RunCommandOptions): Promise<ExecutionResult> {
-  const child = spawn(options.command, options.args, {
-    stdio: 'inherit',
-    cwd: options.cwd,
-    env: options.envs,
-  });
-  const promise = new Promise<ExecutionResult>((resolve, reject) => {
-    child.on('close', (code) => {
-      resolve({ exitCode: code ?? 0 });
-    });
-    child.on('error', (err) => {
-      reject(err);
-    });
-  });
-  return await promise;
-}
-
 // Get the package runner command for each package manager
 export function getPackageRunner(workspaceInfo: WorkspaceInfo) {
   switch (workspaceInfo.packageManager) {
diff --git a/packages/cli/src/utils/command.ts b/packages/cli/src/utils/command.ts
index df58a49543..dc90a45b29 100644
--- a/packages/cli/src/utils/command.ts
+++ b/packages/cli/src/utils/command.ts
@@ -7,15 +7,24 @@ export interface RunCommandOptions {
   envs: NodeJS.ProcessEnv;
 }
 
-export interface RunCommandResult {
+export interface ExecutionResult {
   exitCode: number;
+  /** Set by `runCommandAndDetectProjectDir` (in `create/command.ts`); plain
+   * `runCommand` / `runCommandSilently` leave it undefined. */
+  projectDir?: string;
+}
+
+export interface RunCommandResult extends ExecutionResult {
   stdout: Buffer;
   stderr: Buffer;
 }
 
 export async function runCommandSilently(options: RunCommandOptions): Promise<RunCommandResult> {
   const child = spawn(options.command, options.args, {
-    stdio: 'pipe',
+    // No stdin pipe: leaving one open would deadlock any descendant `.ps1`
+    // shim whose `$MyInvocation.ExpectingInput` branch waits for EOF on
+    // stdin before invoking `node`.
+    stdio: ['ignore', 'pipe', 'pipe'],
     cwd: options.cwd,
     env: options.envs,
   });
@@ -42,15 +51,15 @@ export async function runCommandSilently(options: RunCommandOptions): Promise<Ru
   return await promise;
 }
 
-export async function runCommand(options: RunCommandOptions): Promise<number> {
+export async function runCommand(options: RunCommandOptions): Promise<ExecutionResult> {
   const child = spawn(options.command, options.args, {
     stdio: 'inherit',
     cwd: options.cwd,
     env: options.envs,
   });
-  return new Promise<number>((resolve, reject) => {
+  return new Promise<ExecutionResult>((resolve, reject) => {
     child.on('close', (code) => {
-      resolve(code ?? 0);
+      resolve({ exitCode: code ?? 0 });
     });
     child.on('error', (err) => {
       reject(err);

From c36baab5468faa9882ef08c50e947eeea7b4b9e5 Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Thu, 30 Apr 2026 20:55:05 +0900
Subject: [PATCH 14/16] fix(command): restore run_command_with_fspy to its
 pre-branch form
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`vp create vite@9.0.5 ... --template react-ts` was failing on Windows
with `vite-plus: failed to execute …\vp.exe`. The chain:

  fspy spawns powershell.exe (after the .cmd → .ps1 rewrite)
    → pnpm.ps1 invokes node.exe
      → node.exe is the vite_trampoline shim
        → trampoline tries `Command::new(vp_exe).status()` → fails

fspy uses Microsoft Detours (`DetourUpdateProcessWithDll` in
`crates/fspy/src/windows/mod.rs`) to inject a tracking DLL into spawned
processes and propagate the injection to descendants via the hooked
`CreateProcess`. With the rewrite landed, an extra PowerShell frame
sits between the fspy spawn and the descendant trampolines, and the
injection chain into the trampoline's vp.exe child fails — surfacing
as the "failed to execute" error from `vite_trampoline/src/main.rs`.

Pre-branch the chain went through cmd.exe, where Detours' standard
child-process hook propagates injection cleanly.

Restore `run_command_with_fspy` to its pre-branch form:
`fspy::Command::new(bin_name)`, no upfront `resolve_bin`, no rewrite —
let fspy do its own PATH lookup as before. Also reverts the test
assertion to fspy's native error message.

The fspy path is one-shot and non-interactive (project-dir detection
in `vp create`); the Ctrl+C corruption the rewrite avoids isn't a
concern there. The rewrite stays in place for `run_command`, which
serves all the pm subcommands (`vp dlx`, `vp add`, `vp remove`,
`vp update`, `vp install`, …) where Ctrl+C does matter.
---
 crates/vite_command/src/lib.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/vite_command/src/lib.rs b/crates/vite_command/src/lib.rs
index 27daf1a6d9..64da37182f 100644
--- a/crates/vite_command/src/lib.rs
+++ b/crates/vite_command/src/lib.rs
@@ -188,11 +188,8 @@ where
     S: AsRef<OsStr>,
 {
     let cwd = cwd.as_ref();
-    let (program, prefix_args) = resolve_program(bin_name, envs, cwd)?;
-
-    let mut cmd = fspy::Command::new(program.as_path());
-    cmd.args(&prefix_args)
-        .args(args)
+    let mut cmd = fspy::Command::new(bin_name);
+    cmd.args(args)
         // set system environment variables first
         .envs(std::env::vars_os())
         // then set custom environment variables
@@ -474,9 +471,12 @@ mod tests {
                 run_command_with_fspy("npm-not-exists", &["--version"], &envs, &temp_dir_path)
                     .await;
             assert!(result.is_err(), "Should not find binary path, but got: {:?}", result);
-            assert_eq!(
-                result.unwrap_err().to_string(),
-                "Cannot find binary path for command 'npm-not-exists'"
+            assert!(
+                result
+                    .err()
+                    .unwrap()
+                    .to_string()
+                    .contains("could not resolve the full path of program '\"npm-not-exists\"'")
             );
         }
     }

From f1fe1134c16e4928a2db6555997461cabdd6edfd Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Thu, 30 Apr 2026 21:13:04 +0900
Subject: [PATCH 15/16] refactor(cli): move projectDir off ExecutionResult into
 ExecutionWithProjectDir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per PR review on #1498: `projectDir?: string` doesn't belong on the
canonical `ExecutionResult` in `utils/command.ts` — plain `runCommand`
and `runCommandSilently` never produce one. Move it onto a new
domain-specific interface `ExecutionWithProjectDir extends
ExecutionResult` defined next to `runCommandAndDetectProjectDir` in
`create/command.ts` (the function that originates the field).

All template executors that produce projectDir now declare
`Promise<ExecutionWithProjectDir>`: `executeBundledTemplate`,
`executeBuiltinTemplate`, `executeGeneratorScaffold`,
`executeMonorepoTemplate`, `executeRemoteTemplate`,
`runRemoteTemplateCommand`. `bin.ts:938`'s `result` variable is
widened to the same interface so consumers can read `.projectDir`.

Type-only refactor — no runtime change.
---
 .../snap.txt                                  | 56 +++++++++++++++++++
 .../steps.json                                |  2 +-
 packages/cli/src/create/bin.ts                |  4 +-
 packages/cli/src/create/command.ts            |  9 ++-
 packages/cli/src/create/templates/builtin.ts  |  4 +-
 packages/cli/src/create/templates/bundled.ts  |  4 +-
 .../cli/src/create/templates/generator.ts     |  4 +-
 packages/cli/src/create/templates/monorepo.ts |  4 +-
 packages/cli/src/create/templates/remote.ts   |  8 +--
 packages/cli/src/utils/command.ts             |  3 -
 10 files changed, 78 insertions(+), 20 deletions(-)

diff --git a/packages/cli/snap-tests-global/new-create-vite-migrates-eslint-prettier/snap.txt b/packages/cli/snap-tests-global/new-create-vite-migrates-eslint-prettier/snap.txt
index dd2e928386..b7cef79680 100644
--- a/packages/cli/snap-tests-global/new-create-vite-migrates-eslint-prettier/snap.txt
+++ b/packages/cli/snap-tests-global/new-create-vite-migrates-eslint-prettier/snap.txt
@@ -1,4 +1,60 @@
 > vp create vite@9.0.5 --no-interactive -- my-react-ts --template react-ts # create vite app with pinned version + react-ts template, should auto-migrate ESLint -> Oxlint and merge lint config into vite.config.ts
+
+Using default package manager: pnpm
+
+pnpm@latest installing...
+
+pnpm@<semver> installed
+
+Generating project…
+
+Running: pnpm dlx create-vite@<semver> my-react-ts --template react-ts --no-immediate --no-rolldown
+│
+◇  Scaffolding project in <cwd>/my-react-ts...
+│
+└  Done. Now run:
+
+  cd my-react-ts
+  pnpm install
+  pnpm dev
+
+
+Wrote agent instructions to AGENTS.md
+
+Installing dependencies...
+
+Dependencies installed
+
+Migrating ESLint config to Oxlint...
+
+ESLint config migrated to .oxlintrc.json
+
+Replacing ESLint comments with Oxlint equivalents...
+
+ESLint comments replaced
+
+✔ Removed my-react-ts/eslint.config.js
+
+✔ Merged my-react-ts/.oxlintrc.json into my-react-ts/vite.config.ts
+
+Rewrote imports in one file
+
+  my-react-ts/vite.config.ts
+
+✔ Merged staged config into my-react-ts/vite.config.ts
+
+Installing dependencies...
+
+Dependencies installed
+
+Formatting code...
+
+Code formatted
+◇ Scaffolded my-react-ts with React + TypeScript
+• Node <semver>  pnpm <semver>
+✓ Dependencies installed in <variable>ms
+→ Next: cd my-react-ts && vp run
+
 > test ! -f my-react-ts/eslint.config.js && echo 'eslint.config.js removed' # eslint config deleted
 eslint.config.js removed
 
diff --git a/packages/cli/snap-tests-global/new-create-vite-migrates-eslint-prettier/steps.json b/packages/cli/snap-tests-global/new-create-vite-migrates-eslint-prettier/steps.json
index e1fde38fa5..44befe57c6 100644
--- a/packages/cli/snap-tests-global/new-create-vite-migrates-eslint-prettier/steps.json
+++ b/packages/cli/snap-tests-global/new-create-vite-migrates-eslint-prettier/steps.json
@@ -6,7 +6,7 @@
   "commands": [
     {
       "command": "vp create vite@9.0.5 --no-interactive -- my-react-ts --template react-ts # create vite app with pinned version + react-ts template, should auto-migrate ESLint -> Oxlint and merge lint config into vite.config.ts",
-      "ignoreOutput": true
+      "ignoreOutput": false
     },
     "test ! -f my-react-ts/eslint.config.js && echo 'eslint.config.js removed' # eslint config deleted",
     "test ! -f my-react-ts/.oxlintrc.json && echo '.oxlintrc.json merged into vite.config.ts' # migration output merged by rewrite step (matches vp migrate)",
diff --git a/packages/cli/src/create/bin.ts b/packages/cli/src/create/bin.ts
index a1152fcc08..323a59b87a 100644
--- a/packages/cli/src/create/bin.ts
+++ b/packages/cli/src/create/bin.ts
@@ -46,7 +46,7 @@ import {
   updatePackageJsonWithDeps,
   updateWorkspaceConfig,
 } from '../utils/workspace.ts';
-import type { ExecutionResult } from './command.ts';
+import type { ExecutionWithProjectDir } from './command.ts';
 import { discoverTemplate, inferGitHubRepoName, inferParentDir, isGitHubUrl } from './discovery.ts';
 import { getInitialTemplateOptions } from './initial-template-options.ts';
 import {
@@ -935,7 +935,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 
   // #region Handle single project template
 
-  let result: ExecutionResult;
+  let result: ExecutionWithProjectDir;
   if (templateInfo.type === TemplateType.bundled) {
     pauseCreateProgress();
     await checkProjectDirExists(path.join(workspaceInfo.rootDir, targetDir), options.interactive);
diff --git a/packages/cli/src/create/command.ts b/packages/cli/src/create/command.ts
index 688e0db462..333fd15afb 100644
--- a/packages/cli/src/create/command.ts
+++ b/packages/cli/src/create/command.ts
@@ -8,11 +8,16 @@ import type { ExecutionResult, RunCommandOptions } from '../utils/command.ts';
 export type { ExecutionResult, RunCommandOptions, RunCommandResult } from '../utils/command.ts';
 export { runCommand, runCommandSilently } from '../utils/command.ts';
 
-// Run a command and detect the project directory
+/** Set by `runCommandAndDetectProjectDir` and the template executors
+ * that call it; plain `runCommand` / `runCommandSilently` don't. */
+export interface ExecutionWithProjectDir extends ExecutionResult {
+  projectDir?: string;
+}
+
 export async function runCommandAndDetectProjectDir(
   options: RunCommandOptions,
   parentDir?: string,
-): Promise<ExecutionResult> {
+): Promise<ExecutionWithProjectDir> {
   const cwd = parentDir ? path.join(options.cwd, parentDir) : options.cwd;
   const existingDirs = new Set<string>();
   if (parentDir) {
diff --git a/packages/cli/src/create/templates/builtin.ts b/packages/cli/src/create/templates/builtin.ts
index d30b415953..3766f65bc3 100644
--- a/packages/cli/src/create/templates/builtin.ts
+++ b/packages/cli/src/create/templates/builtin.ts
@@ -5,7 +5,7 @@ import * as prompts from '@voidzero-dev/vite-plus-prompts';
 import colors from 'picocolors';
 
 import type { WorkspaceInfo } from '../../types/index.ts';
-import type { ExecutionResult } from '../command.ts';
+import type { ExecutionWithProjectDir } from '../command.ts';
 import { discoverTemplate } from '../discovery.ts';
 import { setPackageName } from '../utils.ts';
 import { executeGeneratorScaffold } from './generator.ts';
@@ -16,7 +16,7 @@ export async function executeBuiltinTemplate(
   workspaceInfo: WorkspaceInfo,
   templateInfo: BuiltinTemplateInfo,
   options?: { silent?: boolean },
-): Promise<ExecutionResult> {
+): Promise<ExecutionWithProjectDir> {
   assert(templateInfo.targetDir, 'targetDir is required');
   assert(templateInfo.packageName, 'packageName is required');
 
diff --git a/packages/cli/src/create/templates/bundled.ts b/packages/cli/src/create/templates/bundled.ts
index 03e3541878..316f32dfb5 100644
--- a/packages/cli/src/create/templates/bundled.ts
+++ b/packages/cli/src/create/templates/bundled.ts
@@ -2,7 +2,7 @@ import assert from 'node:assert';
 import path from 'node:path';
 
 import type { WorkspaceInfo } from '../../types/index.ts';
-import type { ExecutionResult } from '../command.ts';
+import type { ExecutionWithProjectDir } from '../command.ts';
 import { copyDir, setPackageName } from '../utils.ts';
 import type { BuiltinTemplateInfo } from './types.ts';
 
@@ -13,7 +13,7 @@ import type { BuiltinTemplateInfo } from './types.ts';
 export async function executeBundledTemplate(
   workspaceInfo: WorkspaceInfo,
   templateInfo: BuiltinTemplateInfo,
-): Promise<ExecutionResult> {
+): Promise<ExecutionWithProjectDir> {
   assert(templateInfo.localPath, 'localPath is required for bundled templates');
   assert(templateInfo.targetDir, 'targetDir is required');
   assert(templateInfo.packageName, 'packageName is required');
diff --git a/packages/cli/src/create/templates/generator.ts b/packages/cli/src/create/templates/generator.ts
index d550331b85..a87d651db6 100644
--- a/packages/cli/src/create/templates/generator.ts
+++ b/packages/cli/src/create/templates/generator.ts
@@ -6,7 +6,7 @@ import * as prompts from '@voidzero-dev/vite-plus-prompts';
 import type { WorkspaceInfo } from '../../types/index.ts';
 import { editJsonFile } from '../../utils/json.ts';
 import { templatesDir } from '../../utils/path.ts';
-import type { ExecutionResult } from '../command.ts';
+import type { ExecutionWithProjectDir } from '../command.ts';
 import { copyDir } from '../utils.ts';
 import type { BuiltinTemplateInfo } from './types.ts';
 
@@ -15,7 +15,7 @@ export async function executeGeneratorScaffold(
   workspaceInfo: WorkspaceInfo,
   templateInfo: BuiltinTemplateInfo,
   options?: { silent?: boolean },
-): Promise<ExecutionResult> {
+): Promise<ExecutionWithProjectDir> {
   if (!options?.silent) {
     prompts.log.step('Creating generator scaffold...');
   }
diff --git a/packages/cli/src/create/templates/monorepo.ts b/packages/cli/src/create/templates/monorepo.ts
index edc57a290f..3d72da0d47 100644
--- a/packages/cli/src/create/templates/monorepo.ts
+++ b/packages/cli/src/create/templates/monorepo.ts
@@ -8,7 +8,7 @@ import { rewriteMonorepoProject } from '../../migration/migrator.ts';
 import { PackageManager, type WorkspaceInfo } from '../../types/index.ts';
 import { editJsonFile } from '../../utils/json.ts';
 import { templatesDir } from '../../utils/path.ts';
-import type { ExecutionResult } from '../command.ts';
+import type { ExecutionWithProjectDir } from '../command.ts';
 import { discoverTemplate } from '../discovery.ts';
 import { copyDir, formatDisplayTargetDir, setPackageName } from '../utils.ts';
 import { runRemoteTemplateCommand } from './remote.ts';
@@ -21,7 +21,7 @@ export async function executeMonorepoTemplate(
   workspaceInfo: WorkspaceInfo,
   templateInfo: BuiltinTemplateInfo,
   options?: { silent?: boolean },
-): Promise<ExecutionResult> {
+): Promise<ExecutionWithProjectDir> {
   assert(templateInfo.packageName, 'packageName is required');
   assert(templateInfo.targetDir, 'targetDir is required');
 
diff --git a/packages/cli/src/create/templates/remote.ts b/packages/cli/src/create/templates/remote.ts
index 77c84fbe02..fc27b8d7ba 100644
--- a/packages/cli/src/create/templates/remote.ts
+++ b/packages/cli/src/create/templates/remote.ts
@@ -4,7 +4,7 @@ import colors from 'picocolors';
 import type { WorkspaceInfo } from '../../types/index.ts';
 import { checkNpmPackageExists } from '../../utils/package.ts';
 import {
-  type ExecutionResult,
+  type ExecutionWithProjectDir,
   formatDlxCommand,
   runCommand,
   runCommandAndDetectProjectDir,
@@ -18,14 +18,14 @@ export async function executeRemoteTemplate(
   workspaceInfo: WorkspaceInfo,
   templateInfo: TemplateInfo,
   options?: { silent?: boolean },
-): Promise<ExecutionResult> {
+): Promise<ExecutionWithProjectDir> {
   const silent = options?.silent ?? false;
   if (!silent) {
     prompts.log.step('Generating project…');
   }
 
   let isGitHubTemplate = templateInfo.command === 'degit';
-  let result: ExecutionResult;
+  let result: ExecutionWithProjectDir;
   if (templateInfo.command === 'node') {
     // Template found locally - execute directly
     const command = templateInfo.command;
@@ -84,7 +84,7 @@ export async function runRemoteTemplateCommand(
   templateInfo: TemplateInfo,
   detectCreatedProjectDir?: boolean,
   silent = false,
-): Promise<ExecutionResult> {
+): Promise<ExecutionWithProjectDir> {
   autoFixRemoteTemplateCommand(templateInfo, workspaceInfo);
   const remotePackageName = templateInfo.command;
   const execArgs = [...templateInfo.args];
diff --git a/packages/cli/src/utils/command.ts b/packages/cli/src/utils/command.ts
index dc90a45b29..27bed9900a 100644
--- a/packages/cli/src/utils/command.ts
+++ b/packages/cli/src/utils/command.ts
@@ -9,9 +9,6 @@ export interface RunCommandOptions {
 
 export interface ExecutionResult {
   exitCode: number;
-  /** Set by `runCommandAndDetectProjectDir` (in `create/command.ts`); plain
-   * `runCommand` / `runCommandSilently` leave it undefined. */
-  projectDir?: string;
 }
 
 export interface RunCommandResult extends ExecutionResult {

From d56a7420bf73cb24f1d1723e04e857cbb819a5b0 Mon Sep 17 00:00:00 2001
From: MK <fengmk2@gmail.com>
Date: Thu, 30 Apr 2026 21:24:03 +0900
Subject: [PATCH 16/16] refactor(cli): drop dead re-exports from
 create/command.ts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The five re-exports in `create/command.ts` were a leftover from the
earlier consolidation pass:

- `ExecutionResult`, `RunCommandOptions`, `RunCommandResult` (type
  re-exports): nobody imported them through `create/command.ts`. Three
  dead bridges.
- `runCommand`, `runCommandSilently` (value re-exports): only
  `create/templates/remote.ts` consumed them. Migrate that one file to
  import directly from `'../../utils/command.ts'` and the bridge can
  go.

`create/command.ts` is now strictly a create-flow module: it defines
`ExecutionWithProjectDir`, `runCommandAndDetectProjectDir`,
`getPackageRunner`, `formatDlxCommand`, `prependToPathToEnvs` — no
bridging from utils.
---
 packages/cli/src/create/command.ts          | 3 ---
 packages/cli/src/create/templates/remote.ts | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/cli/src/create/command.ts b/packages/cli/src/create/command.ts
index 333fd15afb..0083c60b55 100644
--- a/packages/cli/src/create/command.ts
+++ b/packages/cli/src/create/command.ts
@@ -5,9 +5,6 @@ import { runCommand as runCommandWithFspy } from '../../binding/index.js';
 import type { WorkspaceInfo } from '../types/index.ts';
 import type { ExecutionResult, RunCommandOptions } from '../utils/command.ts';
 
-export type { ExecutionResult, RunCommandOptions, RunCommandResult } from '../utils/command.ts';
-export { runCommand, runCommandSilently } from '../utils/command.ts';
-
 /** Set by `runCommandAndDetectProjectDir` and the template executors
  * that call it; plain `runCommand` / `runCommandSilently` don't. */
 export interface ExecutionWithProjectDir extends ExecutionResult {
diff --git a/packages/cli/src/create/templates/remote.ts b/packages/cli/src/create/templates/remote.ts
index fc27b8d7ba..a6800c7a9c 100644
--- a/packages/cli/src/create/templates/remote.ts
+++ b/packages/cli/src/create/templates/remote.ts
@@ -2,13 +2,12 @@ import * as prompts from '@voidzero-dev/vite-plus-prompts';
 import colors from 'picocolors';
 
 import type { WorkspaceInfo } from '../../types/index.ts';
+import { runCommand, runCommandSilently } from '../../utils/command.ts';
 import { checkNpmPackageExists } from '../../utils/package.ts';
 import {
   type ExecutionWithProjectDir,
   formatDlxCommand,
-  runCommand,
   runCommandAndDetectProjectDir,
-  runCommandSilently,
 } from '../command.ts';
 import type { TemplateInfo } from './types.ts';