@mycompbox/compbox-cli 1.21.15 → 1.21.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.tsbuildinfo +1 -1
- package/commands/configure.d.ts.map +1 -1
- package/commands/configure.js +3 -3
- package/commands/configure.js.map +1 -1
- package/commands/doctor.d.ts +21 -3
- package/commands/doctor.d.ts.map +1 -1
- package/commands/doctor.js +93 -8
- package/commands/doctor.js.map +1 -1
- package/commands/run.d.ts.map +1 -1
- package/commands/run.js +4 -1
- package/commands/run.js.map +1 -1
- package/commands/service.d.ts +10 -19
- package/commands/service.d.ts.map +1 -1
- package/commands/service.js +107 -73
- package/commands/service.js.map +1 -1
- package/commands/workspace.d.ts +18 -1
- package/commands/workspace.d.ts.map +1 -1
- package/commands/workspace.js +126 -14
- package/commands/workspace.js.map +1 -1
- package/index.js +1443 -367
- package/package.json +1 -1
- package/utils/agent-invoker.d.ts +29 -2
- package/utils/agent-invoker.d.ts.map +1 -1
- package/utils/agent-invoker.js +97 -16
- package/utils/agent-invoker.js.map +1 -1
- package/utils/claude-runtime.d.ts +63 -7
- package/utils/claude-runtime.d.ts.map +1 -1
- package/utils/claude-runtime.js +203 -67
- package/utils/claude-runtime.js.map +1 -1
- package/utils/config-store.d.ts.map +1 -1
- package/utils/config-store.js +7 -4
- package/utils/config-store.js.map +1 -1
- package/utils/mcp-config-writer.d.ts +30 -4
- package/utils/mcp-config-writer.d.ts.map +1 -1
- package/utils/mcp-config-writer.js +33 -6
- package/utils/mcp-config-writer.js.map +1 -1
- package/utils/package-manager-shims.d.ts +20 -4
- package/utils/package-manager-shims.d.ts.map +1 -1
- package/utils/package-manager-shims.js +84 -13
- package/utils/package-manager-shims.js.map +1 -1
- package/utils/process-group.d.ts +9 -2
- package/utils/process-group.d.ts.map +1 -1
- package/utils/process-group.js +14 -4
- package/utils/process-group.js.map +1 -1
- package/utils/process-spawn.d.ts +68 -0
- package/utils/process-spawn.d.ts.map +1 -0
- package/utils/process-spawn.js +119 -0
- package/utils/process-spawn.js.map +1 -0
- package/utils/project-checks.d.ts +28 -0
- package/utils/project-checks.d.ts.map +1 -1
- package/utils/project-checks.js +58 -50
- package/utils/project-checks.js.map +1 -1
- package/utils/repo-setup.js +3 -3
- package/utils/repo-setup.js.map +1 -1
- package/utils/windows-runner.d.ts +136 -0
- package/utils/windows-runner.d.ts.map +1 -0
- package/utils/windows-runner.js +407 -0
- package/utils/windows-runner.js.map +1 -0
- package/utils/wrap-up.d.ts +81 -3
- package/utils/wrap-up.d.ts.map +1 -1
- package/utils/wrap-up.js +240 -8
- package/utils/wrap-up.js.map +1 -1
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* per-employee token and central base URL are supplied through its `env`.
|
|
16
16
|
*/
|
|
17
17
|
import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
|
|
18
|
-
import { basename, dirname, join } from 'path';
|
|
18
|
+
import { basename, dirname, join, win32 } from 'path';
|
|
19
19
|
/** Default Claude Code project-level MCP config file name. */
|
|
20
20
|
export const DEFAULT_MCP_CONFIG_FILENAME = '.mcp.json';
|
|
21
21
|
/** Default server key used for the CompBox MCP entry. */
|
|
@@ -59,6 +59,28 @@ export function resolveInstalledMcpBundle(opts) {
|
|
|
59
59
|
}
|
|
60
60
|
return undefined;
|
|
61
61
|
}
|
|
62
|
+
/**
|
|
63
|
+
* True when `command` launches Node directly: bare `node`, or an absolute
|
|
64
|
+
* Node binary (`/usr/local/bin/node`, `C:\\Program Files\\nodejs\\node.exe`).
|
|
65
|
+
* Uses win32 basename so both `/` and `\\` separators are handled.
|
|
66
|
+
*/
|
|
67
|
+
export function isNodeCommand(command) {
|
|
68
|
+
return /^node(\.exe)?$/i.test(win32.basename(command));
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* True when the entry launches the published package through npx — bare
|
|
72
|
+
* `npx …` or the Windows-safe `cmd /c npx …` wrapper.
|
|
73
|
+
*/
|
|
74
|
+
export function isNpxLaunch(command, args) {
|
|
75
|
+
const base = win32.basename(command).toLowerCase();
|
|
76
|
+
if (base === 'npx' || base === 'npx.cmd')
|
|
77
|
+
return true;
|
|
78
|
+
if (base === 'cmd' || base === 'cmd.exe') {
|
|
79
|
+
const a = (args ?? []).map((x) => x.toLowerCase());
|
|
80
|
+
return a[0] === '/c' && (a[1] === 'npx' || a[1] === 'npx.cmd');
|
|
81
|
+
}
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
62
84
|
/** Default absolute path to the project MCP config in the given directory. */
|
|
63
85
|
export function defaultMcpConfigPath(projectRoot = process.cwd()) {
|
|
64
86
|
return join(projectRoot, DEFAULT_MCP_CONFIG_FILENAME);
|
|
@@ -67,10 +89,12 @@ export function defaultMcpConfigPath(projectRoot = process.cwd()) {
|
|
|
67
89
|
* Build the CompBox MCP server entry from a spec. Exposed for testing and reuse.
|
|
68
90
|
*
|
|
69
91
|
* Launch-target selection (when neither `command` nor `args` is explicitly
|
|
70
|
-
* overridden): prefer
|
|
71
|
-
* compbox-mcp.cjs resolves, else fall back to
|
|
72
|
-
* (fetched from the public npm registry on
|
|
73
|
-
*
|
|
92
|
+
* overridden): prefer `<process.execPath> <installed bundle>` when the
|
|
93
|
+
* installed compbox-mcp.cjs resolves (all platforms), else fall back to
|
|
94
|
+
* `npx -y ${MCP_SERVER_PACKAGE}` (fetched from the public npm registry on
|
|
95
|
+
* first use) — wrapped as `cmd /c npx -y …` on win32, where the bare `npx`
|
|
96
|
+
* shim cannot be spawned without a shell. An explicit `command` or `args`
|
|
97
|
+
* override always wins and disables detection.
|
|
74
98
|
*/
|
|
75
99
|
export function buildCompboxServerEntry(spec) {
|
|
76
100
|
const env = {
|
|
@@ -81,7 +105,10 @@ export function buildCompboxServerEntry(spec) {
|
|
|
81
105
|
if (!explicitLaunch) {
|
|
82
106
|
const bundlePath = (spec.resolveInstalledBundle ?? resolveInstalledMcpBundle)();
|
|
83
107
|
if (bundlePath !== undefined) {
|
|
84
|
-
return { command:
|
|
108
|
+
return { command: spec.execPath ?? process.execPath, args: [bundlePath], env };
|
|
109
|
+
}
|
|
110
|
+
if ((spec.platform ?? process.platform) === 'win32') {
|
|
111
|
+
return { command: 'cmd', args: ['/c', 'npx', '-y', MCP_SERVER_PACKAGE], env };
|
|
85
112
|
}
|
|
86
113
|
}
|
|
87
114
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config-writer.js","sourceRoot":"","sources":["../../src/utils/mcp-config-writer.ts"],"names":[],"mappings":"AAAA,iIAAiI;AACjI;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-config-writer.js","sourceRoot":"","sources":["../../src/utils/mcp-config-writer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type EnvLike } from './claude-runtime.js';
|
|
1
2
|
/**
|
|
2
3
|
* Package managers a project's lockfile may ask for that don't come with Node,
|
|
3
4
|
* and the npx package that stands in for each. pnpm 10 reads both v9 and
|
|
@@ -8,22 +9,36 @@ declare const STAND_INS: {
|
|
|
8
9
|
readonly yarn: "yarn@1";
|
|
9
10
|
};
|
|
10
11
|
export type ShimmedTool = keyof typeof STAND_INS;
|
|
11
|
-
/**
|
|
12
|
-
export declare function
|
|
12
|
+
/** PATH with `exclude` removed, so CompBox's own shims never count as an install. */
|
|
13
|
+
export declare function pathWithout(path: string, exclude: string, platform?: NodeJS.Platform): string;
|
|
14
|
+
/**
|
|
15
|
+
* Whether `command` is an executable file in one of the PATH's folders. On
|
|
16
|
+
* Windows each PATHEXT extension is tried too (`pnpm` finds `pnpm.cmd`), and
|
|
17
|
+
* PATH is split on `;`.
|
|
18
|
+
*/
|
|
19
|
+
export declare function isOnPath(command: string, path: string, platform?: NodeJS.Platform, env?: EnvLike): boolean;
|
|
13
20
|
/**
|
|
14
21
|
* The shell script that runs a missing package manager through npx. Node's
|
|
15
22
|
* folder goes first on PATH because npx and the package manager are Node
|
|
16
23
|
* scripts, and the runner's PATH may not include Node.
|
|
17
24
|
*/
|
|
18
25
|
export declare function shimScript(tool: ShimmedTool, nodeBinDir: string, npx: string): string;
|
|
26
|
+
/**
|
|
27
|
+
* The Windows batch file that runs a missing package manager through npx.
|
|
28
|
+
* Arguments are forwarded with %* and npx's exit code is passed back with
|
|
29
|
+
* `exit /b`, so a failing install or test still fails the build.
|
|
30
|
+
*/
|
|
31
|
+
export declare function shimCmdScript(tool: ShimmedTool, nodeBinDir: string, npx: string): string;
|
|
19
32
|
/**
|
|
20
33
|
* A build's first step installs the project's dependencies with the tool its
|
|
21
34
|
* lockfile names, and the agents then run that tool for tests and builds. A
|
|
22
35
|
* repo with a pnpm-lock.yaml on a computer without pnpm stopped every build
|
|
23
36
|
* with "spawn pnpm ENOENT" (Veena, 2026-10-22). For each such tool that isn't
|
|
24
37
|
* on the runner's PATH, write a stand-in to ~/.compbox/shims that runs it with
|
|
25
|
-
* npx, and return that folder so the caller puts it on PATH.
|
|
26
|
-
*
|
|
38
|
+
* npx, and return that folder so the caller puts it on PATH. On Windows the
|
|
39
|
+
* stand-ins are `<tool>.cmd` batch files. The shim folder itself is left out
|
|
40
|
+
* when checking what's installed and when finding npx, so a shim never stands
|
|
41
|
+
* in for, or calls, itself. Returns null when nothing is missing.
|
|
27
42
|
*/
|
|
28
43
|
export declare function ensurePackageManagerShims(opts?: {
|
|
29
44
|
path?: string | undefined;
|
|
@@ -32,6 +47,7 @@ export declare function ensurePackageManagerShims(opts?: {
|
|
|
32
47
|
nodeBinDir?: string;
|
|
33
48
|
/** Widens PATH with the usual install folders; tests pass PATH through as is. */
|
|
34
49
|
searchPath?: (path: string | undefined) => string;
|
|
50
|
+
env?: EnvLike;
|
|
35
51
|
}): {
|
|
36
52
|
dir: string;
|
|
37
53
|
tools: ShimmedTool[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manager-shims.d.ts","sourceRoot":"","sources":["../../src/utils/package-manager-shims.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package-manager-shims.d.ts","sourceRoot":"","sources":["../../src/utils/package-manager-shims.ts"],"names":[],"mappings":"AAGA,OAAO,EAAwC,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEzF;;;;GAIG;AACH,QAAA,MAAM,SAAS;;;CAA+C,CAAC;AAE/D,MAAM,MAAM,WAAW,GAAG,MAAM,OAAO,SAAS,CAAC;AAajD,qFAAqF;AACrF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,MAAM,CAM/G;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,OAAqB,GACzB,OAAO,CAeT;AAiBD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAUrF;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAUxF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,GAAE;IAC9C,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iFAAiF;IACjF,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,CAAC;IAClD,GAAG,CAAC,EAAE,OAAO,CAAC;CACV,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,WAAW,EAAE,CAAA;CAAE,GAAG,IAAI,CAkCpD"}
|
|
@@ -1,18 +1,45 @@
|
|
|
1
1
|
import { accessSync, chmodSync, constants, existsSync, mkdirSync, writeFileSync } from 'node:fs';
|
|
2
2
|
import { homedir } from 'node:os';
|
|
3
|
-
import {
|
|
4
|
-
import { claudeChildEnvPath } from './claude-runtime.js';
|
|
3
|
+
import { dirname, join, posix as posixPath, win32 as win32Path } from 'node:path';
|
|
4
|
+
import { claudeChildEnvPath, isExecutableFile } from './claude-runtime.js';
|
|
5
5
|
/**
|
|
6
6
|
* Package managers a project's lockfile may ask for that don't come with Node,
|
|
7
7
|
* and the npx package that stands in for each. pnpm 10 reads both v9 and
|
|
8
8
|
* older lockfiles; yarn 1 reads classic yarn.lock files.
|
|
9
9
|
*/
|
|
10
10
|
const STAND_INS = { pnpm: 'pnpm@10', yarn: 'yarn@1' };
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
function delimiterFor(platform) {
|
|
12
|
+
return platform === 'win32' ? win32Path.delimiter : posixPath.delimiter;
|
|
13
|
+
}
|
|
14
|
+
/** Compares folders the way the platform does: case-insensitively on Windows. */
|
|
15
|
+
function sameDir(a, b, platform) {
|
|
16
|
+
if (platform !== 'win32')
|
|
17
|
+
return posixPath.resolve(a) === posixPath.resolve(b);
|
|
18
|
+
const norm = (d) => d.replace(/[\\/]+$/, '').replace(/\//g, '\\').toLowerCase();
|
|
19
|
+
return norm(a) === norm(b);
|
|
20
|
+
}
|
|
21
|
+
/** PATH with `exclude` removed, so CompBox's own shims never count as an install. */
|
|
22
|
+
export function pathWithout(path, exclude, platform = process.platform) {
|
|
23
|
+
const delim = delimiterFor(platform);
|
|
24
|
+
return path
|
|
25
|
+
.split(delim)
|
|
26
|
+
.filter((d) => d && !sameDir(d, exclude, platform))
|
|
27
|
+
.join(delim);
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Whether `command` is an executable file in one of the PATH's folders. On
|
|
31
|
+
* Windows each PATHEXT extension is tried too (`pnpm` finds `pnpm.cmd`), and
|
|
32
|
+
* PATH is split on `;`.
|
|
33
|
+
*/
|
|
34
|
+
export function isOnPath(command, path, platform = process.platform, env = process.env) {
|
|
35
|
+
for (const dir of path.split(delimiterFor(platform))) {
|
|
14
36
|
if (!dir)
|
|
15
37
|
continue;
|
|
38
|
+
if (platform === 'win32') {
|
|
39
|
+
if (findWin32Executable(command, dir, env))
|
|
40
|
+
return true;
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
16
43
|
try {
|
|
17
44
|
accessSync(join(dir, command), constants.X_OK);
|
|
18
45
|
return true;
|
|
@@ -23,6 +50,20 @@ export function isOnPath(command, path) {
|
|
|
23
50
|
}
|
|
24
51
|
return false;
|
|
25
52
|
}
|
|
53
|
+
function win32Extensions(env) {
|
|
54
|
+
const raw = env.PATHEXT ?? '.COM;.EXE;.BAT;.CMD';
|
|
55
|
+
return raw.split(';').map((e) => e.trim().toLowerCase()).filter((e) => e.length > 1 && e.startsWith('.'));
|
|
56
|
+
}
|
|
57
|
+
/** `dir/command` or `dir/command<ext>` for an executable PATHEXT extension, else null. */
|
|
58
|
+
function findWin32Executable(command, dir, env) {
|
|
59
|
+
const names = win32Path.extname(command) ? [command] : win32Extensions(env).map((ext) => command + ext);
|
|
60
|
+
for (const name of names) {
|
|
61
|
+
const candidate = join(dir, name);
|
|
62
|
+
if (isExecutableFile(candidate, 'win32', env))
|
|
63
|
+
return candidate;
|
|
64
|
+
}
|
|
65
|
+
return null;
|
|
66
|
+
}
|
|
26
67
|
/**
|
|
27
68
|
* The shell script that runs a missing package manager through npx. Node's
|
|
28
69
|
* folder goes first on PATH because npx and the package manager are Node
|
|
@@ -39,28 +80,58 @@ export function shimScript(tool, nodeBinDir, npx) {
|
|
|
39
80
|
'',
|
|
40
81
|
].join('\n');
|
|
41
82
|
}
|
|
83
|
+
/**
|
|
84
|
+
* The Windows batch file that runs a missing package manager through npx.
|
|
85
|
+
* Arguments are forwarded with %* and npx's exit code is passed back with
|
|
86
|
+
* `exit /b`, so a failing install or test still fails the build.
|
|
87
|
+
*/
|
|
88
|
+
export function shimCmdScript(tool, nodeBinDir, npx) {
|
|
89
|
+
return [
|
|
90
|
+
'@echo off',
|
|
91
|
+
`rem Written by CompBox: ${tool} isn't installed on this computer, so it runs`,
|
|
92
|
+
"rem through Node's npx. Installing it yourself makes CompBox use that instead.",
|
|
93
|
+
`set "PATH=${nodeBinDir};%PATH%"`,
|
|
94
|
+
`"${npx}" --yes ${STAND_INS[tool]} %*`,
|
|
95
|
+
'exit /b %ERRORLEVEL%',
|
|
96
|
+
'',
|
|
97
|
+
].join('\r\n');
|
|
98
|
+
}
|
|
42
99
|
/**
|
|
43
100
|
* A build's first step installs the project's dependencies with the tool its
|
|
44
101
|
* lockfile names, and the agents then run that tool for tests and builds. A
|
|
45
102
|
* repo with a pnpm-lock.yaml on a computer without pnpm stopped every build
|
|
46
103
|
* with "spawn pnpm ENOENT" (Veena, 2026-10-22). For each such tool that isn't
|
|
47
104
|
* on the runner's PATH, write a stand-in to ~/.compbox/shims that runs it with
|
|
48
|
-
* npx, and return that folder so the caller puts it on PATH.
|
|
49
|
-
*
|
|
105
|
+
* npx, and return that folder so the caller puts it on PATH. On Windows the
|
|
106
|
+
* stand-ins are `<tool>.cmd` batch files. The shim folder itself is left out
|
|
107
|
+
* when checking what's installed and when finding npx, so a shim never stands
|
|
108
|
+
* in for, or calls, itself. Returns null when nothing is missing.
|
|
50
109
|
*/
|
|
51
110
|
export function ensurePackageManagerShims(opts = {}) {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
const
|
|
55
|
-
const
|
|
111
|
+
const platform = opts.platform ?? process.platform;
|
|
112
|
+
const env = opts.env ?? process.env;
|
|
113
|
+
const dir = join(opts.home ?? homedir(), '.compbox', 'shims');
|
|
114
|
+
const searchPath = opts.searchPath ?? ((p) => claudeChildEnvPath(p, { platform, env }));
|
|
115
|
+
const path = pathWithout(searchPath(opts.path ?? process.env.PATH), dir, platform);
|
|
116
|
+
const missing = Object.keys(STAND_INS).filter((tool) => !isOnPath(tool, path, platform, env));
|
|
56
117
|
if (missing.length === 0)
|
|
57
118
|
return null;
|
|
58
119
|
const nodeBinDir = opts.nodeBinDir ?? dirname(process.execPath);
|
|
59
|
-
const
|
|
60
|
-
|
|
120
|
+
const win32 = platform === 'win32';
|
|
121
|
+
let npx;
|
|
122
|
+
if (win32) {
|
|
123
|
+
npx = findWin32Executable('npx', nodeBinDir, env) ?? 'npx';
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
npx = existsSync(join(nodeBinDir, 'npx')) ? join(nodeBinDir, 'npx') : 'npx';
|
|
127
|
+
}
|
|
61
128
|
try {
|
|
62
129
|
mkdirSync(dir, { recursive: true });
|
|
63
130
|
for (const tool of missing) {
|
|
131
|
+
if (win32) {
|
|
132
|
+
writeFileSync(join(dir, `${tool}.cmd`), shimCmdScript(tool, nodeBinDir, npx));
|
|
133
|
+
continue;
|
|
134
|
+
}
|
|
64
135
|
const file = join(dir, tool);
|
|
65
136
|
writeFileSync(file, shimScript(tool, nodeBinDir, npx));
|
|
66
137
|
chmodSync(file, 0o755);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manager-shims.js","sourceRoot":"","sources":["../../src/utils/package-manager-shims.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"package-manager-shims.js","sourceRoot":"","sources":["../../src/utils/package-manager-shims.ts"],"names":[],"mappings":"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"}
|
package/utils/process-group.d.ts
CHANGED
|
@@ -7,19 +7,26 @@
|
|
|
7
7
|
* group — and cancellation signals the whole group: SIGTERM first, then SIGKILL
|
|
8
8
|
* after a grace period. On Windows, `taskkill /T /F` kills the process tree.
|
|
9
9
|
*/
|
|
10
|
-
import { type ChildProcess, type SpawnOptions } from 'node:child_process';
|
|
10
|
+
import { spawn as nodeSpawn, type ChildProcess, type SpawnOptions } from 'node:child_process';
|
|
11
11
|
/** How long the agent gets to exit on SIGTERM before the group is SIGKILLed. */
|
|
12
12
|
export declare const CANCEL_GRACE_MS = 10000;
|
|
13
13
|
export interface ProcessGroupDeps {
|
|
14
14
|
platform?: NodeJS.Platform;
|
|
15
15
|
/** Defaults to `process.kill`; called with a negative pid to signal the group. */
|
|
16
16
|
kill?: (pid: number, signal: NodeJS.Signals) => void;
|
|
17
|
-
/** Windows only: kills the process tree rooted at `pid` (defaults to `taskkill /
|
|
17
|
+
/** Windows only: kills the process tree rooted at `pid` (defaults to `taskkill /pid pid /T /F`). */
|
|
18
18
|
killTree?: (pid: number) => void;
|
|
19
|
+
/** Spawner used for `taskkill` by the default `killTree` (tests inject a fake). */
|
|
20
|
+
spawn?: typeof nodeSpawn;
|
|
19
21
|
graceMs?: number;
|
|
20
22
|
}
|
|
21
23
|
/** Spawn options that make the child lead its own process group (POSIX only). */
|
|
22
24
|
export declare function groupSpawnOptions(platform?: NodeJS.Platform): Pick<SpawnOptions, 'detached'>;
|
|
25
|
+
/**
|
|
26
|
+
* Windows tree kill: `taskkill /pid <pid> /T /F`. Shared by cancellation here
|
|
27
|
+
* and `killProcessTree` (process-spawn.ts) so both paths kill the same way.
|
|
28
|
+
*/
|
|
29
|
+
export declare function taskkillTree(pid: number, spawn?: typeof nodeSpawn): void;
|
|
23
30
|
/**
|
|
24
31
|
* Terminates the child and everything it started. POSIX: SIGTERM to the group,
|
|
25
32
|
* SIGKILL after the grace period unless the child has exited. Windows: taskkill
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-group.d.ts","sourceRoot":"","sources":["../../src/utils/process-group.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"process-group.d.ts","sourceRoot":"","sources":["../../src/utils/process-group.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE9F,gFAAgF;AAChF,eAAO,MAAM,eAAe,QAAS,CAAC;AAEtC,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,kFAAkF;IAClF,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IACrD,oGAAoG;IACpG,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,mFAAmF;IACnF,KAAK,CAAC,EAAE,OAAO,SAAS,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,iFAAiF;AACjF,wBAAgB,iBAAiB,CAAC,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAE9G;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,OAAO,SAAqB,GAAG,IAAI,CAYnF;AAiCD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,GAAE,gBAAqB,GAAG,MAAM,IAAI,CAgBlG;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,GAAE,gBAAqB,GAAG,IAAI,CAQ1F;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,IAAI,EACnB,IAAI,GAAE,gBAAqB,GAC1B,MAAM,IAAI,CAgBZ;AAED,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG;IAChD,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,CAKA"}
|
package/utils/process-group.js
CHANGED
|
@@ -14,9 +14,13 @@ export const CANCEL_GRACE_MS = 10_000;
|
|
|
14
14
|
export function groupSpawnOptions(platform = process.platform) {
|
|
15
15
|
return platform === 'win32' ? {} : { detached: true };
|
|
16
16
|
}
|
|
17
|
-
|
|
17
|
+
/**
|
|
18
|
+
* Windows tree kill: `taskkill /pid <pid> /T /F`. Shared by cancellation here
|
|
19
|
+
* and `killProcessTree` (process-spawn.ts) so both paths kill the same way.
|
|
20
|
+
*/
|
|
21
|
+
export function taskkillTree(pid, spawn = nodeSpawn) {
|
|
18
22
|
try {
|
|
19
|
-
const killer =
|
|
23
|
+
const killer = spawn('taskkill', ['/pid', String(pid), '/T', '/F'], {
|
|
20
24
|
stdio: 'ignore',
|
|
21
25
|
windowsHide: true,
|
|
22
26
|
});
|
|
@@ -28,6 +32,12 @@ function defaultKillTree(pid) {
|
|
|
28
32
|
// Best-effort.
|
|
29
33
|
}
|
|
30
34
|
}
|
|
35
|
+
function windowsKillTree(pid, deps) {
|
|
36
|
+
if (deps.killTree)
|
|
37
|
+
deps.killTree(pid);
|
|
38
|
+
else
|
|
39
|
+
taskkillTree(pid, deps.spawn);
|
|
40
|
+
}
|
|
31
41
|
/** Sends `signal` to the child's whole group; a group that's already gone (ESRCH) is fine. */
|
|
32
42
|
function signalGroup(child, signal, deps) {
|
|
33
43
|
const pid = child.pid;
|
|
@@ -66,7 +76,7 @@ export function terminateProcessGroup(child, deps = {}) {
|
|
|
66
76
|
const platform = deps.platform ?? process.platform;
|
|
67
77
|
if (platform === 'win32') {
|
|
68
78
|
if (child.pid !== undefined)
|
|
69
|
-
(
|
|
79
|
+
windowsKillTree(child.pid, deps);
|
|
70
80
|
else
|
|
71
81
|
child.kill('SIGKILL');
|
|
72
82
|
return () => undefined;
|
|
@@ -86,7 +96,7 @@ export function killProcessGroupNow(child, deps = {}) {
|
|
|
86
96
|
const platform = deps.platform ?? process.platform;
|
|
87
97
|
if (platform === 'win32') {
|
|
88
98
|
if (child.pid !== undefined)
|
|
89
|
-
(
|
|
99
|
+
windowsKillTree(child.pid, deps);
|
|
90
100
|
else
|
|
91
101
|
child.kill('SIGKILL');
|
|
92
102
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-group.js","sourceRoot":"","sources":["../../src/utils/process-group.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,KAAK,IAAI,SAAS,EAAwC,MAAM,oBAAoB,CAAC;AAE9F,gFAAgF;AAChF,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"process-group.js","sourceRoot":"","sources":["../../src/utils/process-group.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,KAAK,IAAI,SAAS,EAAwC,MAAM,oBAAoB,CAAC;AAE9F,gFAAgF;AAChF,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;AAatC,iFAAiF;AACjF,MAAM,UAAU,iBAAiB,CAAC,WAA4B,OAAO,CAAC,QAAQ;IAC5E,OAAO,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AACxD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,GAAW,EAAE,QAA0B,SAAS;IAC3E,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE;YAClE,KAAK,EAAE,QAAQ;YACf,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACtB,6CAA6C;QAC/C,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,eAAe;IACjB,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,GAAW,EAAE,IAAsB;IAC1D,IAAI,IAAI,CAAC,QAAQ;QAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;;QACjC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC;AAED,8FAA8F;AAC9F,SAAS,WAAW,CAAC,KAAmB,EAAE,MAAsB,EAAE,IAAsB;IACtF,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;IACtB,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,+EAA+E;QAC/E,IAAI,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACP,eAAe;QACjB,CAAC;QACD,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAS,EAAE,CAAiB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjF,IAAI,CAAC;QACH,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO;QAC9D,mFAAmF;QACnF,IAAI,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACP,eAAe;QACjB,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAAmB,EAAE,OAAyB,EAAE;IACpF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IACnD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS;YAAE,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;;YACzD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC;IACzB,CAAC;IACD,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;QAC/B,4EAA4E;QAC5E,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC,EAAE,IAAI,CAAC,OAAO,IAAI,eAAe,CAAC,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,OAAO,GAAG,EAAE;QACV,YAAY,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC,CAAC;AACJ,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,mBAAmB,CAAC,KAAmB,EAAE,OAAyB,EAAE;IAClF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IACnD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS;YAAE,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;;YACzD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,OAAO;IACT,CAAC;IACD,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAC9B,MAA+B,EAC/B,KAAmB,EACnB,OAAmB,EACnB,OAAyB,EAAE;IAE3B,IAAI,CAAC,MAAM;QAAE,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC;IACpC,+EAA+E;IAC/E,2EAA2E;IAC3E,MAAM,OAAO,GAAG,GAAS,EAAE;QACzB,OAAO,EAAE,CAAC;QACV,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC,CAAC;IACF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,GAAG,EAAE;QACV,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC,CAAC;AACJ,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAI7C,OAAO;QACL,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,mCAAmC,IAAI,eAAe,EAAE;KAC7F,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Cross-platform child spawning (ENG-404).
|
|
3
|
+
*
|
|
4
|
+
* On Windows, package-manager shims (`npm.cmd`, `pnpm.cmd`, `claude.cmd`, ...)
|
|
5
|
+
* are batch files. Since the CVE-2024-27980 fix, Node refuses to spawn `.cmd` /
|
|
6
|
+
* `.bat` files directly without `shell: true`, and `shell: true` hands an
|
|
7
|
+
* unescaped string to cmd.exe, which is an injection risk. Instead we run
|
|
8
|
+
* them through `cmd.exe /d /s /c "<command line>"` ourselves, with
|
|
9
|
+
* `windowsVerbatimArguments` so Node leaves our quoting alone, and escape every
|
|
10
|
+
* argument for both the MSVCRT argv parser and cmd.exe's metacharacters.
|
|
11
|
+
* `shell: true` is never used.
|
|
12
|
+
*
|
|
13
|
+
* Everywhere else (POSIX, or a real `.exe` on Windows) the command and argv go
|
|
14
|
+
* to `child_process.spawn` unchanged.
|
|
15
|
+
*/
|
|
16
|
+
import { spawn as nodeSpawn, type ChildProcess, type SpawnOptions } from 'node:child_process';
|
|
17
|
+
import { type ProcessGroupDeps } from './process-group.js';
|
|
18
|
+
/** True when `command` is a batch file that has to run through cmd.exe. */
|
|
19
|
+
export declare function isBatchFile(command: string): boolean;
|
|
20
|
+
/**
|
|
21
|
+
* Builds the command line handed to `cmd.exe /d /s /c` (without the outer
|
|
22
|
+
* quotes that `/s` strips). Pure, so it can be table-tested on any platform.
|
|
23
|
+
*/
|
|
24
|
+
export declare function buildWindowsCmdLine(command: string, args: readonly string[]): string;
|
|
25
|
+
export interface SpawnPlan {
|
|
26
|
+
command: string;
|
|
27
|
+
args: string[];
|
|
28
|
+
options: SpawnOptions;
|
|
29
|
+
}
|
|
30
|
+
/** Injectable environment for planning a spawn (tests run the win32 path anywhere). */
|
|
31
|
+
export interface SpawnPlanEnv {
|
|
32
|
+
platform?: NodeJS.Platform;
|
|
33
|
+
/** Used when `options.env` is not set; defaults to `process.env`. */
|
|
34
|
+
env?: NodeJS.ProcessEnv;
|
|
35
|
+
/** Defaults to `fs.existsSync`; used to resolve bare names on Windows. */
|
|
36
|
+
exists?: (path: string) => boolean;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Windows only: resolves a bare command name (`npm`, `pnpm`, `claude`) the way
|
|
40
|
+
* cmd.exe would — PATH × PATHEXT — so a `.cmd` shim is found and run through
|
|
41
|
+
* cmd.exe. Names with a directory or an extension are returned unchanged, as is
|
|
42
|
+
* a name that can't be found (spawn then reports ENOENT as before).
|
|
43
|
+
*/
|
|
44
|
+
export declare function resolveWindowsCommand(command: string, env: NodeJS.ProcessEnv, exists?: (path: string) => boolean): string;
|
|
45
|
+
/**
|
|
46
|
+
* Decides how to spawn `command args`. Exposed for tests; use
|
|
47
|
+
* `spawnCrossPlatform` to actually start the process. Off Windows the plan is
|
|
48
|
+
* the input unchanged (minus `shell`).
|
|
49
|
+
*/
|
|
50
|
+
export declare function planCrossPlatformSpawn(command: string, args: readonly string[], options?: SpawnOptions, planEnv?: SpawnPlanEnv): SpawnPlan;
|
|
51
|
+
export interface SpawnCrossPlatformDeps extends SpawnPlanEnv {
|
|
52
|
+
/** Defaults to node's `spawn`; agent-invoker passes its injectable `spawnImpl`. */
|
|
53
|
+
spawn?: typeof nodeSpawn;
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* `child_process.spawn` that also works for `.cmd` / `.bat` targets (and bare
|
|
57
|
+
* names resolving to them) on Windows, via cmd.exe with safe escaping. POSIX
|
|
58
|
+
* behaviour is unchanged: same command, argv and options.
|
|
59
|
+
*/
|
|
60
|
+
export declare function spawnCrossPlatform(command: string, args?: readonly string[], options?: SpawnOptions, deps?: SpawnCrossPlatformDeps): ChildProcess;
|
|
61
|
+
/**
|
|
62
|
+
* Immediately kills the child and everything it started. Windows:
|
|
63
|
+
* `taskkill /pid <pid> /T /F`, which includes cmd.exe and its grandchildren
|
|
64
|
+
* (tests inject `spawn` or `killTree`). POSIX: SIGKILL to the child's process
|
|
65
|
+
* group, the same as before; spawn with `groupSpawnOptions()` so it leads one.
|
|
66
|
+
*/
|
|
67
|
+
export declare function killProcessTree(child: ChildProcess, deps?: ProcessGroupDeps): void;
|
|
68
|
+
//# sourceMappingURL=process-spawn.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-spawn.d.ts","sourceRoot":"","sources":["../../src/utils/process-spawn.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG9F,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAKhF,2EAA2E;AAC3E,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEpD;AAmBD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAMpF;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,YAAY,CAAC;CACvB;AAED,uFAAuF;AACvF,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,qEAAqE;IACrE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;CACpC;AASD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,MAAM,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAoB,GAC7C,MAAM,CAaR;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,GAAE,YAAiB,EAC1B,OAAO,GAAE,YAAiB,GACzB,SAAS,CAaX;AAED,MAAM,WAAW,sBAAuB,SAAQ,YAAY;IAC1D,mFAAmF;IACnF,KAAK,CAAC,EAAE,OAAO,SAAS,CAAC;CAC1B;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,SAAS,MAAM,EAAO,EAC5B,OAAO,GAAE,YAAiB,EAC1B,IAAI,GAAE,sBAA2B,GAChC,YAAY,CAGd;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,GAAE,gBAAqB,GAAG,IAAI,CAEtF"}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Cross-platform child spawning (ENG-404).
|
|
3
|
+
*
|
|
4
|
+
* On Windows, package-manager shims (`npm.cmd`, `pnpm.cmd`, `claude.cmd`, ...)
|
|
5
|
+
* are batch files. Since the CVE-2024-27980 fix, Node refuses to spawn `.cmd` /
|
|
6
|
+
* `.bat` files directly without `shell: true`, and `shell: true` hands an
|
|
7
|
+
* unescaped string to cmd.exe, which is an injection risk. Instead we run
|
|
8
|
+
* them through `cmd.exe /d /s /c "<command line>"` ourselves, with
|
|
9
|
+
* `windowsVerbatimArguments` so Node leaves our quoting alone, and escape every
|
|
10
|
+
* argument for both the MSVCRT argv parser and cmd.exe's metacharacters.
|
|
11
|
+
* `shell: true` is never used.
|
|
12
|
+
*
|
|
13
|
+
* Everywhere else (POSIX, or a real `.exe` on Windows) the command and argv go
|
|
14
|
+
* to `child_process.spawn` unchanged.
|
|
15
|
+
*/
|
|
16
|
+
import { spawn as nodeSpawn } from 'node:child_process';
|
|
17
|
+
import { existsSync } from 'node:fs';
|
|
18
|
+
import { win32 as win32Path } from 'node:path';
|
|
19
|
+
import { killProcessGroupNow } from './process-group.js';
|
|
20
|
+
/** Characters cmd.exe treats specially; each is escaped with `^`. */
|
|
21
|
+
const CMD_META_CHARS = /([()\][%!^"`<>&|;, *?])/g;
|
|
22
|
+
/** True when `command` is a batch file that has to run through cmd.exe. */
|
|
23
|
+
export function isBatchFile(command) {
|
|
24
|
+
return /\.(cmd|bat)$/i.test(command.trim());
|
|
25
|
+
}
|
|
26
|
+
function escapeCmdMeta(value) {
|
|
27
|
+
return value.replace(CMD_META_CHARS, '^$1');
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Quotes one argument for the MSVCRT parser (backslashes before a quote and at
|
|
31
|
+
* the end are doubled, quotes become `\"`), wraps it in quotes, then escapes
|
|
32
|
+
* cmd.exe metacharacters. Batch files re-parse their arguments (`%*`, `%1`),
|
|
33
|
+
* so for them the metacharacters are escaped a second time.
|
|
34
|
+
*/
|
|
35
|
+
function escapeArgument(arg, doubleEscape) {
|
|
36
|
+
let quoted = arg.replace(/(\\*)"/g, '$1$1\\"');
|
|
37
|
+
quoted = quoted.replace(/(\\*)$/, '$1$1');
|
|
38
|
+
quoted = escapeCmdMeta(`"${quoted}"`);
|
|
39
|
+
return doubleEscape ? escapeCmdMeta(quoted) : quoted;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Builds the command line handed to `cmd.exe /d /s /c` (without the outer
|
|
43
|
+
* quotes that `/s` strips). Pure, so it can be table-tested on any platform.
|
|
44
|
+
*/
|
|
45
|
+
export function buildWindowsCmdLine(command, args) {
|
|
46
|
+
const doubleEscape = isBatchFile(command);
|
|
47
|
+
// The command is caret-escaped for cmd.exe (spaces in paths become `^ `),
|
|
48
|
+
// not MSVCRT-quoted: cmd.exe resolves it, not the target's argv parser.
|
|
49
|
+
const escapedCommand = escapeCmdMeta(command.replace(/"/g, ''));
|
|
50
|
+
return [escapedCommand, ...args.map((arg) => escapeArgument(arg, doubleEscape))].join(' ');
|
|
51
|
+
}
|
|
52
|
+
/** Windows env var names are case-insensitive (`Path`, `PATHEXT`, `ComSpec`). */
|
|
53
|
+
function envValue(env, name) {
|
|
54
|
+
const upper = name.toUpperCase();
|
|
55
|
+
const key = Object.keys(env).find((k) => k.toUpperCase() === upper);
|
|
56
|
+
return key === undefined ? undefined : env[key];
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Windows only: resolves a bare command name (`npm`, `pnpm`, `claude`) the way
|
|
60
|
+
* cmd.exe would — PATH × PATHEXT — so a `.cmd` shim is found and run through
|
|
61
|
+
* cmd.exe. Names with a directory or an extension are returned unchanged, as is
|
|
62
|
+
* a name that can't be found (spawn then reports ENOENT as before).
|
|
63
|
+
*/
|
|
64
|
+
export function resolveWindowsCommand(command, env, exists = existsSync) {
|
|
65
|
+
if (/[\\/:]/.test(command) || win32Path.extname(command) !== '')
|
|
66
|
+
return command;
|
|
67
|
+
const exts = (envValue(env, 'PATHEXT') ?? '.COM;.EXE;.BAT;.CMD')
|
|
68
|
+
.split(';')
|
|
69
|
+
.filter((ext) => ext !== '');
|
|
70
|
+
const dirs = (envValue(env, 'PATH') ?? '').split(';').filter((dir) => dir !== '');
|
|
71
|
+
for (const dir of dirs) {
|
|
72
|
+
for (const ext of exts) {
|
|
73
|
+
const candidate = win32Path.join(dir.replace(/"/g, ''), command + ext.toLowerCase());
|
|
74
|
+
if (exists(candidate))
|
|
75
|
+
return candidate;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return command;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Decides how to spawn `command args`. Exposed for tests; use
|
|
82
|
+
* `spawnCrossPlatform` to actually start the process. Off Windows the plan is
|
|
83
|
+
* the input unchanged (minus `shell`).
|
|
84
|
+
*/
|
|
85
|
+
export function planCrossPlatformSpawn(command, args, options = {}, planEnv = {}) {
|
|
86
|
+
const platform = planEnv.platform ?? process.platform;
|
|
87
|
+
// `shell` is never honoured: it's exactly the unescaped path we're avoiding.
|
|
88
|
+
const { shell: _shell, ...rest } = options;
|
|
89
|
+
if (platform !== 'win32')
|
|
90
|
+
return { command, args: [...args], options: rest };
|
|
91
|
+
const env = options.env ?? planEnv.env ?? process.env;
|
|
92
|
+
const resolved = resolveWindowsCommand(command, env, planEnv.exists);
|
|
93
|
+
if (!isBatchFile(resolved))
|
|
94
|
+
return { command, args: [...args], options: rest };
|
|
95
|
+
return {
|
|
96
|
+
command: envValue(env, 'ComSpec') ?? 'cmd.exe',
|
|
97
|
+
args: ['/d', '/s', '/c', `"${buildWindowsCmdLine(resolved, args)}"`],
|
|
98
|
+
options: { ...rest, windowsVerbatimArguments: true, windowsHide: true },
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* `child_process.spawn` that also works for `.cmd` / `.bat` targets (and bare
|
|
103
|
+
* names resolving to them) on Windows, via cmd.exe with safe escaping. POSIX
|
|
104
|
+
* behaviour is unchanged: same command, argv and options.
|
|
105
|
+
*/
|
|
106
|
+
export function spawnCrossPlatform(command, args = [], options = {}, deps = {}) {
|
|
107
|
+
const plan = planCrossPlatformSpawn(command, args, options, deps);
|
|
108
|
+
return (deps.spawn ?? nodeSpawn)(plan.command, plan.args, plan.options);
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* Immediately kills the child and everything it started. Windows:
|
|
112
|
+
* `taskkill /pid <pid> /T /F`, which includes cmd.exe and its grandchildren
|
|
113
|
+
* (tests inject `spawn` or `killTree`). POSIX: SIGKILL to the child's process
|
|
114
|
+
* group, the same as before; spawn with `groupSpawnOptions()` so it leads one.
|
|
115
|
+
*/
|
|
116
|
+
export function killProcessTree(child, deps = {}) {
|
|
117
|
+
killProcessGroupNow(child, deps);
|
|
118
|
+
}
|
|
119
|
+
//# sourceMappingURL=process-spawn.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-spawn.js","sourceRoot":"","sources":["../../src/utils/process-spawn.ts"],"names":[],"mappings":"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"}
|