Skip to content

fix: add ~/.npm-global/bin and NPM_CONFIG_PREFIX to PATH bootstrap #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
apurv-1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add ~/.npm-global/bin and NPM_CONFIG_PREFIX to PATH bootstrap #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions src/infra/path-env.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ describe("ensureOpenClawCliOnPath", () => {
"HOMEBREW_PREFIX",
"HOMEBREW_BREW_FILE",
"XDG_BIN_HOME",
"NPM_CONFIG_PREFIX",
] as const;
let envSnapshot: Record<(typeof envKeys)[number], string | undefined>;

Expand Down Expand Up @@ -212,4 +213,55 @@ describe("ensureOpenClawCliOnPath", () => {
expect(parts[0]).toBe(linuxbrewBin);
expect(parts[1]).toBe(linuxbrewSbin);
});

it("prepends ~/.npm-global/bin when the directory exists", () => {
const tmp = abs("/tmp/openclaw-path/case-npm-global");
setDir(tmp);

const npmGlobalBin = path.join(tmp, ".npm-global", "bin");
setDir(path.join(tmp, ".npm-global"));
setDir(npmGlobalBin);

process.env.PATH = "/usr/bin";
delete process.env.OPENCLAW_PATH_BOOTSTRAPPED;

ensureOpenClawCliOnPath({
execPath: "/usr/bin/node",
cwd: tmp,
homeDir: tmp,
platform: "linux",
});

const updated = process.env.PATH ?? "";
const parts = updated.split(path.delimiter);
expect(parts).toContain(npmGlobalBin);
expect(parts.indexOf(npmGlobalBin)).toBeLessThan(parts.indexOf("/usr/bin"));
});

it("prepends NPM_CONFIG_PREFIX/bin when env var is set", () => {
const tmp = abs("/tmp/openclaw-path/case-npm-prefix");
setDir(tmp);

const npmPrefix = path.join(tmp, "custom-npm");
const npmPrefixBin = path.join(npmPrefix, "bin");
setDir(npmPrefix);
setDir(npmPrefixBin);

process.env.PATH = "/usr/bin";
delete process.env.OPENCLAW_PATH_BOOTSTRAPPED;
process.env.NPM_CONFIG_PREFIX = npmPrefix;

ensureOpenClawCliOnPath({
execPath: "/usr/bin/node",
cwd: tmp,
homeDir: tmp,
platform: "linux",
});

const updated = process.env.PATH ?? "";
const parts = updated.split(path.delimiter);
expect(parts).toContain(npmPrefixBin);
expect(parts.indexOf(npmPrefixBin)).toBeLessThan(parts.indexOf("/usr/bin"));
});

});
6 changes: 6 additions & 0 deletions src/infra/path-env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,19 @@ function candidateBinDirs(opts: EnsureOpenClawPathOpts): { prepend: string[]; ap

prepend.push(...resolveBrewPathDirs({ homeDir }));

// Respect custom npm prefix (set via `npm config set prefix` or NPM_CONFIG_PREFIX env).
if (process.env.NPM_CONFIG_PREFIX) {
prepend.push(path.join(process.env.NPM_CONFIG_PREFIX, "bin"));
}

// Common global install locations (macOS first).
if (platform === "darwin") {
prepend.push(path.join(homeDir, "Library", "pnpm"));
}
if (process.env.XDG_BIN_HOME) {
prepend.push(process.env.XDG_BIN_HOME);
}
prepend.push(path.join(homeDir, ".npm-global", "bin"));
prepend.push(path.join(homeDir, ".local", "bin"));
prepend.push(path.join(homeDir, ".local", "share", "pnpm"));
prepend.push(path.join(homeDir, ".bun", "bin"));
Expand Down