fix(setup): execute original command after first-start installation

Author: liangmiQwQ

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_self_setup/snapshots.toml

@@ -5,11 +5,24 @@ steps = [
   { argv = ["vpt", "rm", "$VP_HOME/current/bin/.vp-setup-complete"], snapshot = false },
   { argv = ["vp", "--help"], envs = [["VP_SELF_SETUP_SUPPORT_CHECK", "1"]], comment = "The capability probe does not perform setup" },
   ["vpt", "stat-file", "$VP_HOME/current/bin/.vp-setup-complete", "--assert", "missing"],
-  { argv = ["vp", "not-a-command"], comment = "An unmarked deployed binary consumes the invocation as setup, without parsing the command", snapshot = false },
+  { argv = ["vp", "--help"], comment = "An unmarked deployed binary completes setup and executes the requested command", snapshot = false },
   ["vpt", "stat-file", "$VP_HOME/current/bin/.vp-setup-complete", "--assert", "file"],
   { argv = ["vp", "not-a-command"], comment = "Once marked, the binary dispatches commands normally", continue-on-failure = true },
 ]
 
+[[case]]
+name = "command_self_setup_handoff"
+vp = "global"
+requires = ["bash"]
+skip-platforms = ["windows"]
+steps = [
+  { argv = ["vpt", "mkdir", "-p", "external", "project", "home/js_runtime/node"], snapshot = false },
+  { argv = ["vpt", "cp", "-r", "$VP_HOME/js_runtime/node/22.18.0", "home/js_runtime/node/22.18.0"], snapshot = false },
+  { argv = ["vpt", "cp", "$VP_HOME/bin/vp", "external/vp"], snapshot = false },
+  { argv = ["vpt", "chmod", "+x", "external/vp"], snapshot = false },
+  { argv = ["vpt", "pipe-stdin", "original stdin", "--", "bash", "-c", 'exec ./external/vp "$@" 2>setup.log', "--", "-C", "project", "env", "exec", "--node", "22.18.0", "node", "-e", "console.log(JSON.stringify({cwd: require('node:path').basename(process.cwd()), value: process.env.HANDOFF_VALUE, input: require('node:fs').readFileSync(0, 'utf8')})); process.exit(17)"], tty = false, envs = [["VP_HOME", "${workspace}/home"], ["VP_SKIP_DEPS_INSTALL", "1"], ["VP_VERSION", "handoff-test"], ["VP_NODE_MANAGER", "no"], ["VP_SELF_SETUP_NO_MODIFY_PATH", "1"], ["HANDOFF_VALUE", "original environment"]], comment = "The deployed binary executes the original command with its cwd, environment, stdin and exit status", continue-on-failure = true },
+]
+
 [[case]]
 name = "command_self_setup_retry"
 vp = "global"

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_self_setup/snapshots/command_self_setup.md

@@ -17,9 +17,9 @@ vite-plus-self-setup-v1
 <home>/.vite-plus/current/bin/.vp-setup-complete: missing
 ```
 
-## `vp not-a-command`
+## `vp --help`
 
-An unmarked deployed binary consumes the invocation as setup, without parsing the command
+An unmarked deployed binary completes setup and executes the requested command
 
 
 ## `vpt stat-file $VP_HOME/current/bin/.vp-setup-complete --assert file`

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_self_setup/snapshots/command_self_setup_handoff.md

@@ -0,0 +1,23 @@
+# command_self_setup_handoff
+
+## `vpt mkdir -p external project home/js_runtime/node`
+
+
+## `vpt cp -r $VP_HOME/js_runtime/node/22.18.0 home/js_runtime/node/22.18.0`
+
+
+## `vpt cp $VP_HOME/bin/vp external/vp`
+
+
+## `vpt chmod +x external/vp`
+
+
+## `VP_HOME=${workspace}/home VP_SKIP_DEPS_INSTALL=1 VP_VERSION=handoff-test VP_NODE_MANAGER=no VP_SELF_SETUP_NO_MODIFY_PATH=1 HANDOFF_VALUE=original environment vpt pipe-stdin 'original stdin' -- bash -c 'exec ./external/vp "$@" 2>setup.log' -- -C project env exec --node 22.18.0 node -e 'console.log(JSON.stringify({cwd: require('\''node:path'\'').basename(process.cwd()), value: process.env.HANDOFF_VALUE, input: require('\''node:fs'\'').readFileSync(0, '\''utf8'\'')})); process.exit(17)'`
+
+The deployed binary executes the original command with its cwd, environment, stdin and exit status
+
+**Exit code:** 17
+
+```
+{"cwd":"project","value":"original environment","input":"original stdin\n"}
+```

crates/vp_global_cli/src/main.rs

@@ -387,8 +387,8 @@ async fn main() -> ExitCode {
     }
 
     match self_setup::maybe_run().await {
-        Ok(true) => return ExitCode::SUCCESS,
-        Ok(false) => {}
+        Ok(Some(code)) => return code,
+        Ok(None) => {}
         Err(error) => {
             output::error(&error.to_string());
             return ExitCode::FAILURE;

crates/vp_global_cli/src/self_setup.rs

@@ -1,8 +1,8 @@
-//! First-start installation. A completed binary accepts commands; an unmarked one only sets up.
+//! First-start installation followed by command execution through the deployed binary.
 
 mod shell;
 
-use std::path::Path;
+use std::{path::Path, process::ExitCode};
 
 use dialoguer::{Confirm, theme::ColorfulTheme};
 use vp_setup::{SELF_SETUP_MARKER, VP_BINARY_NAME, install};
@@ -14,7 +14,7 @@ use crate::{
     error::Error,
 };
 
-pub(crate) async fn maybe_run() -> Result<bool, Error> {
+pub(crate) async fn maybe_run() -> Result<Option<ExitCode>, Error> {
     let shell = std::env::var(env_vars::VP_SELF_SETUP_SHELL).ok();
     if let Some(shell) = shell.as_deref() {
         if !matches!(shell, "sh" | "powershell") {
@@ -32,17 +32,46 @@ pub(crate) async fn maybe_run() -> Result<bool, Error> {
     if bin.join(SELF_SETUP_MARKER).try_exists()? {
         if let Some(shell) = shell.as_deref() {
             print_shell_result(shell);
-            return Ok(true);
+            return Ok(Some(ExitCode::SUCCESS));
         }
-        return Ok(false);
+        return Ok(None);
     }
 
     vp_shared::validate_vp_dir_env().map_err(|error| Error::Other(error.to_string().into()))?;
-    run(&binary).await?;
+    // Setup diagnostics must not pollute the original command's machine-readable stdout.
+    output::route_user_output_to_stderr();
+    let installed_binary = run(&binary).await?;
     if let Some(shell) = shell.as_deref() {
         print_shell_result(shell);
+        return Ok(Some(ExitCode::SUCCESS));
+    }
+    let mut args = std::env::args_os();
+    let argv0 = args.next();
+    let shim_tool =
+        argv0.as_deref().and_then(|name| name.to_str()).and_then(crate::shim::detect_shim_tool);
+    if args.len() == 0 && shim_tool.is_none() && std::env::var_os("VP_COMPLETE").is_none() {
+        return Ok(Some(ExitCode::SUCCESS));
+    }
+    // Re-enter through the marked installation, inheriting cwd, environment and stdio.
+    let mut command = std::process::Command::new(installed_binary.as_path());
+    command.args(args);
+    #[cfg(unix)]
+    {
+        use std::os::unix::process::CommandExt;
+
+        if let Some(argv0) = argv0 {
+            command.arg0(argv0);
+        }
+        Err(command.exec().into())
+    }
+    #[cfg(windows)]
+    {
+        if let Some(tool) = shim_tool {
+            command.env(env_vars::VP_SHIM_TOOL, tool);
+        }
+        let status = command.status()?;
+        Ok(Some(ExitCode::from(vp_shared::exit_code_from_status(status) as u8)))
     }
-    Ok(true)
 }
 
 // Only successful setup emits executable output; logs use stderr in this mode.
@@ -68,7 +97,7 @@ fn print_shell_result(shell: &str) {
 }
 
 /// Setup Vite+ for the first run
-async fn run(source: &Path) -> Result<(), Error> {
+async fn run(source: &Path) -> Result<AbsolutePathBuf, Error> {
     let env = EnvConfig::get();
     let dirs = &env.dirs;
     let active_binary = dirs.data.join("current").join("bin").join(VP_BINARY_NAME);
@@ -231,7 +260,7 @@ async fn run(source: &Path) -> Result<(), Error> {
     // A failure above leaves the marker absent so a later launch can retry.
     tokio::fs::write(version_dir.join("bin").join(SELF_SETUP_MARKER), b"").await?;
     output::success("Vite+ setup complete.");
-    Ok(())
+    Ok(binary)
 }
 
 fn interactive() -> bool {