fix: use npm for bundled runtime dep repair

This commit is contained in:
Peter Steinberger
2026-04-21 07:01:05 +01:00
parent fb2c405dbc
commit aacae4ce62
3 changed files with 27 additions and 1 deletions

View File

@@ -30,6 +30,7 @@ Docs: https://docs.openclaw.ai
- OpenAI/Responses: resolve `/think` levels against each GPT model's supported reasoning efforts so `/think off` no longer becomes high reasoning or sends unsupported `reasoning.effort: "none"` payloads.
- Lobster/TaskFlow: allow managed approval resumes to use `approvalId` without a resume token, and persist that id in approval wait state. (#69559) Thanks @kirkluokun.
- Plugins/startup: install bundled runtime dependencies into each plugin's own runtime directory, reuse source-checkout repair caches after rebuilds, and log only packages that were actually installed so repeated Gateway starts stay quiet once deps are present.
- Plugins/startup: ignore pnpm's `npm_execpath` when repairing bundled plugin runtime dependencies so npm-only install flags are not passed to pnpm-launched gateways.
- Setup/TUI: relaunch the setup hatch TUI in a fresh process while preserving the configured gateway target and auth source, so onboarding recovers terminal state cleanly without exposing gateway secrets on command-line args. (#69524) Thanks @shakkernerd.
- Codex: avoid re-exposing the image-generation tool on native vision turns with inbound images, and keep bare image-model overrides on the configured image provider. (#65061) Thanks @zhulijin1991.
- Sessions/reset: clear auto-sourced model, provider, and auth-profile overrides on `/new` and `/reset` while preserving explicit user selections, so channel sessions stop staying pinned to runtime fallback choices. (#69419) Thanks @sk7n4k3d.

View File

@@ -90,6 +90,25 @@ describe("resolveBundledRuntimeDepsNpmRunner", () => {
});
});
it("ignores pnpm npm_execpath and falls back to npm", () => {
const execPath = "/opt/node/bin/node";
const npmCliPath = "/opt/node/lib/node_modules/npm/bin/npm-cli.js";
const runner = resolveBundledRuntimeDepsNpmRunner({
env: {
npm_execpath: "/home/runner/setup-pnpm/node_modules/.bin/pnpm.cjs",
},
execPath,
existsSync: (candidate) => candidate === npmCliPath,
npmArgs: ["install", "acpx@0.5.3"],
platform: "linux",
});
expect(runner).toEqual({
command: execPath,
args: [npmCliPath, "install", "acpx@0.5.3"],
});
});
it("falls back to npm.cmd through shell on Windows", () => {
const runner = resolveBundledRuntimeDepsNpmRunner({
env: {},

View File

@@ -233,6 +233,11 @@ function resolvePathEnvKey(env: NodeJS.ProcessEnv, platform: NodeJS.Platform): s
return Object.keys(env).find((key) => key.toLowerCase() === "path") ?? "Path";
}
function isNpmCliPath(candidate: string): boolean {
const normalized = candidate.replaceAll("\\", "/").toLowerCase();
return normalized.endsWith("/npm-cli.js") || normalized.endsWith("/npm/bin/npm-cli.js");
}
export function resolveBundledRuntimeDepsNpmRunner(params: {
npmArgs: string[];
env?: NodeJS.ProcessEnv;
@@ -246,9 +251,10 @@ export function resolveBundledRuntimeDepsNpmRunner(params: {
const platform = params.platform ?? process.platform;
const pathImpl = platform === "win32" ? path.win32 : path.posix;
const nodeDir = pathImpl.dirname(execPath);
const npmExecPath = normalizeOptionalLowercaseString(env.npm_execpath)
const rawNpmExecPath = normalizeOptionalLowercaseString(env.npm_execpath)
? env.npm_execpath
: undefined;
const npmExecPath = rawNpmExecPath && isNpmCliPath(rawNpmExecPath) ? rawNpmExecPath : undefined;
const npmCliCandidates = [
npmExecPath,