update

Author: branchseer

Cargo.lock

@@ -146,6 +146,7 @@ vite_task = { path = "crates/vite_task" }
 vite_task_bin = { path = "crates/vite_task_bin" }
 vite_task_graph = { path = "crates/vite_task_graph" }
 vite_task_plan = { path = "crates/vite_task_plan" }
+vite_task_tools = { path = "crates/vite_task_tools" }
 vite_workspace = { path = "crates/vite_workspace" }
 vt100 = "0.16.2"
 wax = "0.7.0"

Cargo.toml

@@ -10,10 +10,6 @@ rust-version.workspace = true
 name = "vt"
 path = "src/main.rs"
 
-[[bin]]
-name = "vtt"
-path = "src/vtt.rs"
-
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }

crates/vite_task_bin/Cargo.toml

@@ -26,8 +26,6 @@ const STEP_TIMEOUT: Duration =
 const SCREEN_SIZE: ScreenSize = ScreenSize { rows: 500, cols: 500 };
 
 const COMPILE_TIME_VT_PATH: &str = env!("CARGO_BIN_EXE_vt");
-/// Ensures the `vtt` binary is built before running e2e tests (vtt is in the same directory as vt).
-const _: &str = env!("CARGO_BIN_EXE_vtt");
 const COMPILE_TIME_MANIFEST_DIR: &str = env!("CARGO_MANIFEST_DIR");
 
 /// Get the shell executable for running e2e test steps.
@@ -269,8 +267,8 @@ fn run_case_inner(tmpdir: &AbsolutePath, fixture_path: &std::path::Path, fixture
     // Get shell executable for running steps
     let shell_exe = get_shell_exe();
 
-    // Prepare PATH for e2e tests: include vt and vtt binary directories.
-    // Both vt and vtt are in the same target directory.
+    // Prepare PATH for e2e tests: include vt binary directory (vtt is in the same directory
+    // since all workspace binaries are built into the same target/<profile>/ directory).
     let e2e_env_path = join_paths(
         std::iter::once({
             let vt_path = resolve_runtime_bin_path(COMPILE_TIME_VT_PATH);

crates/vite_task_bin/tests/e2e_snapshots/main.rs

@@ -21,6 +21,22 @@ use vite_task_graph::display::TaskDisplay;
 use vite_task_plan::{ExecutionGraph, ExecutionItemKind};
 use vite_workspace::find_workspace_root;
 
+/// Resolve the directory containing workspace binaries (vt, vtt) at runtime.
+/// Test binaries are in `target/<profile>/deps/`, while workspace binaries
+/// are in `target/<profile>/`. Go up from `deps/` to find them.
+fn resolve_runtime_bin_dir() -> AbsolutePathBuf {
+    let current_exe = std::env::current_exe().unwrap();
+    let deps_dir = current_exe.parent().unwrap();
+    let bin_dir = deps_dir.parent().unwrap();
+    let vtt_name = if cfg!(windows) { "vtt.exe" } else { "vtt" };
+    assert!(
+        bin_dir.join(vtt_name).exists(),
+        "vtt binary not found at {}. Build it first with: cargo build --bin vtt",
+        bin_dir.join(vtt_name).display(),
+    );
+    AbsolutePathBuf::new(bin_dir.to_path_buf()).unwrap()
+}
+
 /// Local parser wrapper for `BuiltInCommand`
 #[derive(Parser)]
 #[command(name = "vt")]
@@ -216,21 +232,10 @@ fn run_case_inner(
         Err(err) => panic!("Failed to read cases.toml for fixture {fixture_name}: {err}"),
     };
 
-    // Locate the vtt binary directory. Since both plan_snapshots test and vtt are built
-    // into the same Cargo target directory, we can find vtt next to the current test executable.
+    // Locate the directory containing vt and vtt binaries.
     let test_bin_path = {
-        let current_exe = std::env::current_exe().unwrap();
-        // Test binaries are in target/<profile>/deps/, but workspace binaries (vtt)
-        // are in target/<profile>/. Go up from deps/ to find vtt.
-        let deps_dir = current_exe.parent().unwrap();
-        let bin_dir = deps_dir.parent().unwrap();
-        let vtt_name = if cfg!(windows) { "vtt.exe" } else { "vtt" };
-        assert!(
-            bin_dir.join(vtt_name).exists(),
-            "vtt binary not found at {}. Build it first with: cargo build --bin vtt",
-            bin_dir.join(vtt_name).display(),
-        );
-        Arc::<OsStr>::from(bin_dir.as_os_str())
+        let bin_dir = resolve_runtime_bin_dir();
+        Arc::<OsStr>::from(bin_dir.as_path().as_os_str())
     };
 
     // Add vtt binary directory to PATH so test programs (such as vtt print-file) in fixtures can be found.

crates/vite_task_plan/tests/plan_snapshots/main.rs

@@ -62,15 +62,9 @@ fn redact_string(s: &mut String, redactions: &[(&str, &str)]) {
 
 pub fn redact_snapshot(value: &impl Serialize, workspace_root: &str) -> serde_json::Value {
     let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
-    // Get the vtt binary directory path — vtt is in target/<profile>/,
-    // while the test binary is in target/<profile>/deps/.
-    let tools_dir = {
-        let current_exe = std::env::current_exe().unwrap();
-        // Test binaries are in target/<profile>/deps/, but workspace binaries (vtt)
-        // are in target/<profile>/. Go up from deps/ to find the tools directory.
-        current_exe.parent().unwrap().parent().unwrap().to_owned()
-    };
-    let tools_dir_str = tools_dir.to_str().unwrap().to_owned();
+    // Get the vtt binary directory path at runtime.
+    let tools_dir = super::resolve_runtime_bin_dir();
+    let tools_dir_str = tools_dir.as_path().to_str().unwrap().to_owned();
     let mut json_value = serde_json::to_value(value).unwrap();
 
     // On Windows, paths might use either backslashes or forward slashes

crates/vite_task_plan/tests/plan_snapshots/redact.rs

@@ -0,0 +1,18 @@
+[package]
+name = "vite_task_tools"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+publish = false
+rust-version.workspace = true
+
+[[bin]]
+name = "vtt"
+path = "src/main.rs"
+
+[dependencies]
+serde_json = { workspace = true }
+
+[lints]
+workspace = true

crates/vite_task_tools/Cargo.toml

@@ -0,0 +1,3 @@
+# vite_task_tools
+
+`vtt` (Vite Task Tools) — a lightweight test utility binary with subcommands used by e2e and plan snapshot tests.

crates/vite_task_tools/README.md

@@ -1,8 +1,3 @@
-//! `vtt` — Vite Task Tools
-//!
-//! A lightweight test utility binary with subcommands used by e2e and plan snapshot tests.
-//! Replaces the Node.js tools previously in `packages/tools`.
-
 // This is a standalone test utility binary that deliberately uses std types
 // rather than the project's custom types (vite_str, vite_path, etc.).
 #![expect(clippy::disallowed_types, reason = "standalone test utility uses std types")]