fix: package map bugs in exec cwd and workspace link lookup

cursoragent · cursoragent · commit 9ab153219b24 · 2026-06-19T21:48:10.000Z
- Fix exec command skipping package map refresh after final cwd change
  - Added with_cwd_and_refresh method to refresh package map when cwd changes
  - Ensures NODE_OPTIONS has correct --experimental-package-map for actual working directory

- Fix workspace link dependency name lookup with relative paths
  - Normalize link paths to absolute before comparing with workspace.path
  - Allows relative link: targets to correctly match workspace packages in package maps
diff --git a/packages/zpm/src/commands/exec.rs b/packages/zpm/src/commands/exec.rs
@@ -33,7 +33,7 @@ impl Exec {
         Ok(ScriptEnvironment::new()?
             .with_project(&project)
             .with_package(&project, &project.active_package()?)?
-            .with_cwd(Path::current_dir()?)
+            .with_cwd_and_refresh(&project, Path::current_dir()?)
             .enable_shell_forwarding()
             .enable_signal_delegation()
             .run_script(&self.script, &self.args)
diff --git a/packages/zpm/src/linker/package_map.rs b/packages/zpm/src/linker/package_map.rs
@@ -303,9 +303,15 @@ fn workspace_link_dependency_names(project: &Project, tree: &ResolutionTree, loc
     let link_path
         = Path::from_str(&params.path).ok()?;
 
+    let link_path_abs = if link_path.is_absolute() {
+        link_path
+    } else {
+        project.project_cwd.with_join(&link_path)
+    };
+
     let workspace = project.workspaces
         .iter()
-        .find(|workspace| workspace.path == link_path)?;
+        .find(|workspace| workspace.path == link_path_abs)?;
 
     resolution_dependency_names(tree, &workspace.locator())
 }
diff --git a/packages/zpm/src/script.rs b/packages/zpm/src/script.rs
@@ -801,6 +801,12 @@ impl ScriptEnvironment {
         self
     }
 
+    pub fn with_cwd_and_refresh(mut self, project: &Project, cwd: Path) -> Self {
+        self.cwd = cwd;
+        self.refresh_package_map(project);
+        self
+    }
+
     fn install_binaries(&mut self) -> Result<Path, Error> {
         let hash
             = Hash64::from_string(&JsonDocument::to_string(&self.binaries)?);
