fix(infra): preserve package paths from root cwd

vincentkoc · web-flow · commit 16cfff03540a · 2026-07-06T22:30:28.000-07:00
diff --git a/src/infra/path-env.test.ts b/src/infra/path-env.test.ts
@@ -356,6 +356,30 @@ describe("ensureOpenClawCliOnPath", () => {
     expectPathsAfter(updated, "/usr/bin", [pnpmHome, pnpmHomeBin, npmPrefixBin]);
   });
 
+  it("keeps package-manager env roots when cwd is the filesystem root", () => {
+    const { tmp, appCli } = setupAppCliRoot("case-package-manager-root-cwd");
+    const pnpmHome = path.join(tmp, "pnpm-home");
+    const pnpmHomeBin = path.join(pnpmHome, "bin");
+    const npmPrefix = path.join(tmp, "npm-prefix");
+    const npmPrefixBin = path.join(npmPrefix, "bin");
+    for (const dir of [pnpmHome, pnpmHomeBin, npmPrefix, npmPrefixBin]) {
+      setDir(dir);
+    }
+
+    resetBootstrapEnv("/usr/bin:/bin");
+    process.env.PNPM_HOME = pnpmHome;
+    process.env.NPM_CONFIG_PREFIX = npmPrefix;
+
+    const updated = bootstrapPath({
+      execPath: appCli,
+      cwd: path.parse(tmp).root,
+      homeDir: tmp,
+      platform: "linux",
+    });
+
+    expectPathsAfter(updated, "/usr/bin", [pnpmHome, pnpmHomeBin, npmPrefixBin]);
+  });
+
   it("ignores relative package-manager env roots", () => {
     const { tmp, appCli } = setupAppCliRoot("case-package-manager-relative");
     resetBootstrapEnv("/usr/bin:/bin");
diff --git a/src/infra/path-env.ts b/src/infra/path-env.ts
@@ -72,6 +72,10 @@ function isSameOrChildPath(candidate: string, parent: string): boolean {
   return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
 }
 
+function isFilesystemRoot(dirPath: string): boolean {
+  return path.dirname(dirPath) === dirPath;
+}
+
 function normalizeTrustedPackageManagerRoot(params: {
   value: string | undefined;
   cwd: string | undefined;
@@ -91,7 +95,7 @@ function normalizeTrustedPackageManagerRoot(params: {
 
   const cwd = path.resolve(params.cwd);
   const homeDir = path.resolve(params.homeDir);
-  if (cwd === homeDir) {
+  if (cwd === homeDir || isFilesystemRoot(cwd)) {
     return normalized;
   }
   if (isSameOrChildPath(normalized, cwd)) {
@@ -104,6 +108,7 @@ function normalizeTrustedPackageManagerRoot(params: {
   if (
     realCwd &&
     realCwd !== realHome &&
+    !isFilesystemRoot(realCwd) &&
     realCandidate &&
     isSameOrChildPath(realCandidate, realCwd)
   ) {
