romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 2516dc78a1 into da71eaebd2

Browse Source
This commit is contained in:
ANDRES CARDONA 2026-01-30 07:34:15 -04:00 committed by GitHub
commit d82c38047e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/process/exec.ts
View File

@ -63,15 +63,14 @@ export async function runCommandWithTimeout(
const { windowsVerbatimArguments } = options; const { windowsVerbatimArguments } = options;
const hasInput = input !== undefined; const hasInput = input !== undefined;
const shouldSuppressNpmFund = (() => {
const cmd = path.basename(argv[0] ?? ""); const cmd = path.basename(argv[0] ?? "");
if (cmd === "npm" || cmd === "npm.cmd" || cmd === "npm.exe") return true; const isNpmCommand = cmd === "npm" || cmd === "npm.cmd" || cmd === "npm.exe";
if (cmd === "node" || cmd === "node.exe") { const isNpmViaCli =
const script = argv[1] ?? ""; (cmd === "node" || cmd === "node.exe") && (argv[1] ?? "").includes("npm-cli.js");
return script.includes("npm-cli.js"); const shouldSuppressNpmFund = isNpmCommand || isNpmViaCli;
}
return false; // On Windows, npm is a .cmd batch file that requires shell mode to execute
})(); const useShell = process.platform === "win32" && isNpmCommand;
const resolvedEnv = env ? { ...process.env, ...env } : { ...process.env }; const resolvedEnv = env ? { ...process.env, ...env } : { ...process.env };
if (shouldSuppressNpmFund) { if (shouldSuppressNpmFund) {
@ -85,6 +84,7 @@ export async function runCommandWithTimeout(
cwd, cwd,
env: resolvedEnv, env: resolvedEnv,
windowsVerbatimArguments, windowsVerbatimArguments,
shell: useShell,
}); });
// Spawn with inherited stdin (TTY) so tools like `pi` stay interactive when needed. // Spawn with inherited stdin (TTY) so tools like `pi` stay interactive when needed.
return await new Promise((resolve, reject) => { return await new Promise((resolve, reject) => {