fix(path): add Windows PATH bootstrap dirs

aniruddhaadak80 · aniruddhaadak80 · commit 696dc610978a · 2026-03-12T21:46:27.000+05:30
diff --git a/src/infra/path-env.test.ts b/src/infra/path-env.test.ts
@@ -44,6 +44,13 @@ describe("ensureOpenClawCliOnPath", () => {
     "HOMEBREW_PREFIX",
     "HOMEBREW_BREW_FILE",
     "XDG_BIN_HOME",
+    "LOCALAPPDATA",
+    "APPDATA",
+    "ProgramFiles",
+    "ProgramW6432",
+    "ProgramFiles(x86)",
+    "SystemRoot",
+    "WINDIR",
   ] as const;
   let envSnapshot: Record<(typeof envKeys)[number], string | undefined>;
 
@@ -212,4 +219,53 @@ describe("ensureOpenClawCliOnPath", () => {
     expect(parts[0]).toBe(linuxbrewBin);
     expect(parts[1]).toBe(linuxbrewSbin);
   });
+
+  it("prepends common Windows tool dirs when present", () => {
+    const homeDir = abs("C:/Users/TestUser");
+    const execDir = path.join(homeDir, "AppData", "Local", "Programs", "OpenClaw");
+    const localAppData = path.join(homeDir, "AppData", "Local");
+    const appData = path.join(homeDir, "AppData", "Roaming");
+    const programFiles = abs("C:/Program Files");
+    const systemRoot = abs("C:/Windows");
+
+    const pnpmDir = path.join(localAppData, "pnpm");
+    const windowsAppsDir = path.join(localAppData, "Microsoft", "WindowsApps");
+    const npmDir = path.join(appData, "npm");
+    const nodejsDir = path.join(programFiles, "nodejs");
+    const system32Dir = path.join(systemRoot, "System32");
+
+    setDir(homeDir);
+    setDir(execDir);
+    setDir(localAppData);
+    setDir(path.join(localAppData, "Microsoft"));
+    setDir(pnpmDir);
+    setDir(windowsAppsDir);
+    setDir(appData);
+    setDir(npmDir);
+    setDir(programFiles);
+    setDir(nodejsDir);
+    setDir(systemRoot);
+    setDir(system32Dir);
+
+    process.env.PATH = nodejsDir;
+    process.env.LOCALAPPDATA = localAppData;
+    process.env.APPDATA = appData;
+    process.env.ProgramFiles = programFiles;
+    process.env.ProgramW6432 = programFiles;
+    process.env.SystemRoot = systemRoot;
+    delete process.env.OPENCLAW_PATH_BOOTSTRAPPED;
+
+    ensureOpenClawCliOnPath({
+      execPath: path.join(execDir, "node.exe"),
+      cwd: homeDir,
+      homeDir,
+      platform: "win32",
+    });
+
+    const parts = (process.env.PATH ?? "").split(path.delimiter);
+    expect(parts).toEqual(
+      expect.arrayContaining([pnpmDir, windowsAppsDir, npmDir, nodejsDir, system32Dir, systemRoot]),
+    );
+    expect(parts.indexOf(pnpmDir)).toBeLessThan(parts.indexOf(nodejsDir));
+  });
 });
diff --git a/src/infra/path-env.ts b/src/infra/path-env.ts
@@ -93,6 +93,32 @@ function candidateBinDirs(opts: EnsureOpenClawPathOpts): { prepend: string[]; ap
   if (platform === "darwin") {
     prepend.push(path.join(homeDir, "Library", "pnpm"));
   }
+  if (platform === "win32") {
+    const localAppData = process.env.LOCALAPPDATA;
+    const roamingAppData = process.env.APPDATA;
+    const systemRoot = process.env.SystemRoot ?? process.env.WINDIR;
+    const programFiles = process.env.ProgramW6432 ?? process.env.ProgramFiles;
+    const programFilesX86 = process.env["ProgramFiles(x86)"];
+
+    if (localAppData) {
+      prepend.push(
+        path.join(localAppData, "pnpm"),
+        path.join(localAppData, "Microsoft", "WindowsApps"),
+      );
+    }
+    if (roamingAppData) {
+      prepend.push(path.join(roamingAppData, "npm"));
+    }
+    if (programFiles) {
+      prepend.push(path.join(programFiles, "nodejs"));
+    }
+    if (programFilesX86) {
+      prepend.push(path.join(programFilesX86, "nodejs"));
+    }
+    if (systemRoot) {
+      prepend.push(path.join(systemRoot, "System32"), systemRoot);
+    }
+  }
   if (process.env.XDG_BIN_HOME) {
     prepend.push(process.env.XDG_BIN_HOME);
   }
