Resolve vt and vtt runtime paths using compile-time manifest diffing

Use `join(runtime_manifest, diff(compile_time_bin, compile_time_manifest))`
consistently for both binaries. Add build.rs to vite_task_plan to emit
compile-time binary paths. Don't assume vt and vtt share the same directory.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: branchseer

Cargo.lock

@@ -147,7 +147,6 @@ 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

@@ -58,6 +58,10 @@ fn get_shell_exe() -> std::path::PathBuf {
     }
 }
 
+/// Resolve a binary's runtime path from its compile-time path.
+///
+/// Computes `join(runtime_manifest, diff(compile_time_bin, compile_time_manifest))`.
+/// This handles cases where compile-time and runtime paths differ (e.g. CI caches).
 #[expect(
     clippy::disallowed_types,
     reason = "PathBuf required for compile-time/runtime binary path remapping"
@@ -68,28 +72,38 @@ fn resolve_runtime_bin_path(compile_time_bin_path: &str) -> AbsolutePathBuf {
     let runtime_manifest =
         std::path::PathBuf::from(std::env::var_os("CARGO_MANIFEST_DIR").unwrap());
 
-    let compile_time_repo_root = compile_time_manifest.parent().unwrap().parent().unwrap();
-    let runtime_repo_root = runtime_manifest.parent().unwrap().parent().unwrap();
-
-    let relative_bin = diff_paths(&compile_time_bin, compile_time_repo_root).unwrap_or_else(|| {
+    let relative_bin = diff_paths(&compile_time_bin, &compile_time_manifest).unwrap_or_else(|| {
         panic!(
-            "Failed to diff binary path. bin={} repo_root={}",
+            "Failed to diff binary path. bin={} manifest={}",
             compile_time_bin.display(),
-            compile_time_repo_root.display(),
+            compile_time_manifest.display(),
         )
     });
-    let runtime_bin = runtime_repo_root.join(&relative_bin);
+    let runtime_bin = runtime_manifest.join(&relative_bin);
 
-    assert!(
-        runtime_bin.exists(),
-        "Remapped binary path does not exist: {} (relative: {})",
-        runtime_bin.display(),
-        relative_bin.display(),
-    );
+    let runtime_bin = runtime_bin.canonicalize().unwrap_or_else(|_| {
+        panic!(
+            "Remapped binary path does not exist: {} (relative: {})",
+            runtime_bin.display(),
+            relative_bin.display(),
+        )
+    });
 
     AbsolutePathBuf::new(runtime_bin).unwrap()
 }
 
+/// Derive the compile-time path of `vtt` from the compile-time path of `vt`.
+/// Both binaries are workspace binaries built into the same target directory.
+#[expect(
+    clippy::disallowed_types,
+    reason = "Path/String required for compile-time binary path derivation"
+)]
+fn compile_time_vtt_path() -> std::string::String {
+    let vt = std::path::Path::new(COMPILE_TIME_VT_PATH);
+    let vtt_name = if cfg!(windows) { "vtt.exe" } else { "vtt" };
+    vt.with_file_name(vtt_name).to_str().unwrap().to_owned()
+}
+
 #[derive(serde::Deserialize, Debug)]
 #[serde(untagged)]
 enum Step {
@@ -267,15 +281,13 @@ 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 binary directory (vtt is in the same directory
-    // since all workspace binaries are built into the same target/<profile>/ directory).
+    // Prepare PATH for e2e tests: include vt and vtt binary directories.
+    let bin_dirs: [Arc<OsStr>; 2] = [COMPILE_TIME_VT_PATH, &compile_time_vtt_path()].map(|p| {
+        let bin = resolve_runtime_bin_path(p);
+        Arc::<OsStr>::from(bin.parent().unwrap().as_path().as_os_str())
+    });
     let e2e_env_path = join_paths(
-        std::iter::once({
-            let vt_path = resolve_runtime_bin_path(COMPILE_TIME_VT_PATH);
-            let vt_dir = vt_path.parent().unwrap();
-            vt_dir.as_path().as_os_str().into()
-        })
-        .chain(
+        bin_dirs.into_iter().chain(
             // the existing PATH
             split_paths(&env::var_os("PATH").unwrap())
                 .map(|path| Arc::<OsStr>::from(path.into_os_string())),

crates/vite_task_bin/tests/e2e_snapshots/main.rs

@@ -36,6 +36,7 @@ clap = { workspace = true, features = ["derive"] }
 copy_dir = { workspace = true }
 cow-utils = { workspace = true }
 insta = { workspace = true, features = ["glob", "json", "redactions", "filters", "ron"] }
+pathdiff = { workspace = true }
 serde_json = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true, features = ["rt", "macros"] }

crates/vite_task_plan/Cargo.toml

@@ -0,0 +1,17 @@
+#![expect(clippy::disallowed_types, reason = "build script uses std types")]
+
+fn main() {
+    // OUT_DIR is something like `<target>/<profile>/build/<crate>-<hash>/out`.
+    // Navigate up to `<target>/<profile>` to find workspace binaries.
+    let out_dir = std::env::var("OUT_DIR").unwrap();
+    let out_path = std::path::Path::new(&out_dir);
+    // out -> build/<crate>-<hash> -> build -> <profile>
+    let profile_dir = out_path.parent().unwrap().parent().unwrap().parent().unwrap();
+
+    for (env_name, bin_name) in [
+        ("COMPILE_TIME_VT_PATH", if cfg!(windows) { "vt.exe" } else { "vt" }),
+        ("COMPILE_TIME_VTT_PATH", if cfg!(windows) { "vtt.exe" } else { "vtt" }),
+    ] {
+        println!("cargo::rustc-env={env_name}={}", profile_dir.join(bin_name).display());
+    }
+}

crates/vite_task_plan/build.rs

@@ -76,7 +76,7 @@ input_file: crates/vite_task_plan/tests/plan_snapshots/fixtures/additional-env
                   ],
                   "all_envs": {
                     "NO_COLOR": "1",
-                    "PATH": "<workspace>/node_modules/.bin:<tools>",
+                    "PATH": "<workspace>/node_modules/.bin:<tools>:<tools>",
                     "TEST_VAR": "hello_world"
                   },
                   "cwd": "<workspace>/"

crates/vite_task_plan/tests/plan_snapshots/fixtures/additional-env/snapshots/query - env-test synthetic task in user task.snap

@@ -44,7 +44,7 @@ input_file: crates/vite_task_plan/tests/plan_snapshots/fixtures/cache-cli-overri
                   ],
                   "all_envs": {
                     "NO_COLOR": "1",
-                    "PATH": "<workspace>/node_modules/.bin:<tools>"
+                    "PATH": "<workspace>/node_modules/.bin:<tools>:<tools>"
                   },
                   "cwd": "<workspace>/"
                 }

crates/vite_task_plan/tests/plan_snapshots/fixtures/cache-cli-override/snapshots/query - --cache does not override per-task cache false.snap

@@ -76,7 +76,7 @@ input_file: crates/vite_task_plan/tests/plan_snapshots/fixtures/cache-cli-overri
                   ],
                   "all_envs": {
                     "NO_COLOR": "1",
-                    "PATH": "<workspace>/node_modules/.bin:<tools>"
+                    "PATH": "<workspace>/node_modules/.bin:<tools>:<tools>"
                   },
                   "cwd": "<workspace>/"
                 }

crates/vite_task_plan/tests/plan_snapshots/fixtures/cache-cli-override/snapshots/query - --cache enables script caching.snap

@@ -76,7 +76,7 @@ input_file: crates/vite_task_plan/tests/plan_snapshots/fixtures/cache-cli-overri
                   ],
                   "all_envs": {
                     "NO_COLOR": "1",
-                    "PATH": "<workspace>/node_modules/.bin:<tools>"
+                    "PATH": "<workspace>/node_modules/.bin:<tools>:<tools>"
                   },
                   "cwd": "<workspace>/"
                 }

crates/vite_task_plan/tests/plan_snapshots/fixtures/cache-cli-override/snapshots/query - --cache enables task caching even when cache.tasks is false.snap

@@ -76,7 +76,7 @@ input_file: crates/vite_task_plan/tests/plan_snapshots/fixtures/cache-cli-overri
                   ],
                   "all_envs": {
                     "NO_COLOR": "1",
-                    "PATH": "<workspace>/node_modules/.bin:<tools>"
+                    "PATH": "<workspace>/node_modules/.bin:<tools>:<tools>"
                   },
                   "cwd": "<workspace>/"
                 }