@botiverse/oar 0.80.0 → 0.80.2
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/dist/contracts/records.d.ts +2 -2
- package/dist/contracts/records.d.ts.map +1 -1
- package/dist/runtimes/claude/context-breakdown.js +2 -2
- package/dist/runtimes/claude/context-breakdown.js.map +1 -1
- package/dist/runtimes/qoder/daemon.d.ts.map +1 -1
- package/dist/runtimes/qoder/daemon.js +3 -1
- package/dist/runtimes/qoder/daemon.js.map +1 -1
- package/dist/runtimes/qoder/launch.d.ts.map +1 -1
- package/dist/runtimes/qoder/launch.js +1 -0
- package/dist/runtimes/qoder/launch.js.map +1 -1
- package/dist/runtimes/qwen/close.d.ts.map +1 -1
- package/dist/runtimes/qwen/close.js +1 -0
- package/dist/runtimes/qwen/close.js.map +1 -1
- package/dist/shared/acp/input.d.ts +8 -0
- package/dist/shared/acp/input.d.ts.map +1 -0
- package/dist/shared/acp/input.js +76 -0
- package/dist/shared/acp/input.js.map +1 -0
- package/dist/shared/acp/process.d.ts +4 -0
- package/dist/shared/acp/process.d.ts.map +1 -1
- package/dist/shared/acp/process.js +21 -2
- package/dist/shared/acp/process.js.map +1 -1
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +7 -0
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/executable/ownership.d.ts +4 -0
- package/dist/shared/executable/ownership.d.ts.map +1 -1
- package/dist/shared/executable/ownership.js +35 -13
- package/dist/shared/executable/ownership.js.map +1 -1
- package/dist/shared/executable/process-cleanup-diagnostics.d.ts +21 -0
- package/dist/shared/executable/process-cleanup-diagnostics.d.ts.map +1 -0
- package/dist/shared/executable/process-cleanup-diagnostics.js +22 -0
- package/dist/shared/executable/process-cleanup-diagnostics.js.map +1 -0
- package/dist/shared/executable/process-cleanup.d.ts +8 -24
- package/dist/shared/executable/process-cleanup.d.ts.map +1 -1
- package/dist/shared/executable/process-cleanup.js +81 -44
- package/dist/shared/executable/process-cleanup.js.map +1 -1
- package/dist/shared/executable/process-shutdown.d.ts +19 -0
- package/dist/shared/executable/process-shutdown.d.ts.map +1 -0
- package/dist/shared/executable/process-shutdown.js +148 -0
- package/dist/shared/executable/process-shutdown.js.map +1 -0
- package/dist/shared/executable/process-signals.d.ts +43 -0
- package/dist/shared/executable/process-signals.d.ts.map +1 -0
- package/dist/shared/executable/process-signals.js +74 -0
- package/dist/shared/executable/process-signals.js.map +1 -0
- package/dist/shared/executable/process-table-async.d.ts +10 -0
- package/dist/shared/executable/process-table-async.d.ts.map +1 -0
- package/dist/shared/executable/process-table-async.js +104 -0
- package/dist/shared/executable/process-table-async.js.map +1 -0
- package/dist/shared/executable/process-table-command.d.ts +4 -0
- package/dist/shared/executable/process-table-command.d.ts.map +1 -0
- package/dist/shared/executable/process-table-command.js +69 -0
- package/dist/shared/executable/process-table-command.js.map +1 -0
- package/dist/shared/executable/process-tree.d.ts +15 -4
- package/dist/shared/executable/process-tree.d.ts.map +1 -1
- package/dist/shared/executable/process-tree.js +49 -31
- package/dist/shared/executable/process-tree.js.map +1 -1
- package/dist/shared/executable/process.d.ts +13 -46
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +29 -139
- package/dist/shared/executable/process.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { type ProcessTableObservation, type ProcessTableSource } from "./process-tree.js";
|
|
2
|
+
export declare const processTableSource: () => ProcessTableSource;
|
|
3
|
+
/** One actual read, distinct from the callers waiting to join a new batch. */
|
|
4
|
+
export declare function observeProcessTableOnce(source: ProcessTableSource): Promise<ProcessTableObservation>;
|
|
5
|
+
type Reader = (source: ProcessTableSource) => Promise<ProcessTableObservation>;
|
|
6
|
+
/** Only requests made before a read starts may use it. No result is cached. */
|
|
7
|
+
export declare function batchProcessTableReads(read: Reader): Reader;
|
|
8
|
+
export declare function observeProcessTableAsync(source?: ProcessTableSource): Promise<ProcessTableObservation>;
|
|
9
|
+
export {};
|
|
10
|
+
//# sourceMappingURL=process-table-async.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-table-async.d.ts","sources":["../../../src/shared/executable/process-table-async.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2H,KAAK,uBAAuB,EAAyB,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAI1O,eAAO,MAAM,kBAAkB,QAAO,kBAAiH,CAAC;AAuBxJ,8EAA8E;AAC9E,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAc1G;AAED,KAAK,MAAM,GAAG,CAAC,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAM/E,+EAA+E;AAC/E,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAuB3D;AAGD,wBAAsB,wBAAwB,CAAC,MAAM,GAAE,kBAAyC,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAGlI"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import { readdir, readFile } from "node:fs/promises";
|
|
2
|
+
import { asRecord } from "../json.js";
|
|
3
|
+
import { InvalidProcessTableError, parseProcessPs, parseProcessStat, parseProcessWindows, processTableFailure } from "./process-tree.js";
|
|
4
|
+
import { processTableCommand } from "./process-table-command.js";
|
|
5
|
+
const BATCH = 64;
|
|
6
|
+
export const processTableSource = () => process.platform === "linux" ? "procfs" : (process.platform === "win32" ? "windows" : "ps");
|
|
7
|
+
async function readProcfs() {
|
|
8
|
+
const names = await readdir("/proc");
|
|
9
|
+
const listed = names.filter((name) => /^\d+$/u.test(name));
|
|
10
|
+
const table = new Map();
|
|
11
|
+
let skipped = 0;
|
|
12
|
+
const read = async (name) => {
|
|
13
|
+
try {
|
|
14
|
+
return parseProcessStat(Number(name), await readFile(`/proc/${name}/stat`, "utf8"));
|
|
15
|
+
}
|
|
16
|
+
catch (error) {
|
|
17
|
+
const code = asRecord(error)?.code;
|
|
18
|
+
if (code === "ENOENT" || code === "ESRCH") {
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
if (code === "EACCES" || code === "EPERM") {
|
|
22
|
+
skipped += 1;
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
throw error;
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
for (let offset = 0; offset < listed.length; offset += BATCH) {
|
|
29
|
+
const entries = await Promise.all(listed.slice(offset, offset + BATCH).map(async (name) => { const entry = await read(name); return entry; }));
|
|
30
|
+
for (const entry of entries) {
|
|
31
|
+
if (entry !== null) {
|
|
32
|
+
table.set(entry.pid, entry);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return { table, skipped };
|
|
37
|
+
}
|
|
38
|
+
/** One actual read, distinct from the callers waiting to join a new batch. */
|
|
39
|
+
export async function observeProcessTableOnce(source) {
|
|
40
|
+
const started = performance.now();
|
|
41
|
+
try {
|
|
42
|
+
let result = { table: new Map(), skipped: 0 };
|
|
43
|
+
if (source === "procfs") {
|
|
44
|
+
result = await readProcfs();
|
|
45
|
+
}
|
|
46
|
+
else if (source === "ps") {
|
|
47
|
+
result = parseProcessPs(await processTableCommand("ps", ["-A", "-o", "pid=,ppid=,pgid=,lstart="], { ...process.env, LC_ALL: "C" }));
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
result = parseProcessWindows(await processTableCommand("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command",
|
|
51
|
+
"$ErrorActionPreference='Stop'; Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,@{Name='Started';Expression={if ($null -ne $_.CreationDate) { $_.CreationDate.ToUniversalTime().ToString('o') }}} | ConvertTo-Json -Compress"]));
|
|
52
|
+
}
|
|
53
|
+
if (!result.table.has(process.pid)) {
|
|
54
|
+
throw new InvalidProcessTableError("missing_host");
|
|
55
|
+
}
|
|
56
|
+
return { ok: true, source, elapsedMs: performance.now() - started, ...result };
|
|
57
|
+
}
|
|
58
|
+
catch (error) {
|
|
59
|
+
return processTableFailure(error, source, performance.now() - started);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
/** Only requests made before a read starts may use it. No result is cached. */
|
|
63
|
+
export function batchProcessTableReads(read) {
|
|
64
|
+
const batches = new Map();
|
|
65
|
+
return async (source) => {
|
|
66
|
+
const previous = batches.get(source);
|
|
67
|
+
if (previous !== undefined && !previous.started) {
|
|
68
|
+
return previous.result;
|
|
69
|
+
}
|
|
70
|
+
const observe = async () => {
|
|
71
|
+
// A pending generation waits for its predecessor, then admits every
|
|
72
|
+
// caller that arrived before this query actually begins.
|
|
73
|
+
if (previous !== undefined) {
|
|
74
|
+
await previous.result;
|
|
75
|
+
}
|
|
76
|
+
await Promise.resolve();
|
|
77
|
+
batch.started = true;
|
|
78
|
+
const started = performance.now();
|
|
79
|
+
try {
|
|
80
|
+
return await read(source);
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
return processTableFailure(error, source, performance.now() - started);
|
|
84
|
+
}
|
|
85
|
+
finally {
|
|
86
|
+
if (batches.get(source) === batch) {
|
|
87
|
+
batches.delete(source);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
};
|
|
91
|
+
// The observed promise is the same one callers await, with every read
|
|
92
|
+
// failure converted into metadata. There is no detached worker promise.
|
|
93
|
+
const batch = { started: false, result: observe() };
|
|
94
|
+
batches.set(source, batch);
|
|
95
|
+
const result = await batch.result;
|
|
96
|
+
return result;
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
const observeBatched = batchProcessTableReads(observeProcessTableOnce);
|
|
100
|
+
export async function observeProcessTableAsync(source = processTableSource()) {
|
|
101
|
+
const result = await observeBatched(source);
|
|
102
|
+
return result;
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=process-table-async.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-table-async.js","sources":["../../../src/shared/executable/process-table-async.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export declare const PROCESS_TABLE_TIMEOUT_MS = 5000;
|
|
2
|
+
/** A query deadline includes pipe drain; a dead root cannot leave this read waiting on close. */
|
|
3
|
+
export declare function processTableCommand(command: string, args: readonly string[], env?: NodeJS.ProcessEnv): Promise<string>;
|
|
4
|
+
//# sourceMappingURL=process-table-command.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-table-command.d.ts","sources":["../../../src/shared/executable/process-table-command.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAG7C,iGAAiG;AACjG,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CA8C5H"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import { trackOwnedProcess } from "./ownership.js";
|
|
3
|
+
export const PROCESS_TABLE_TIMEOUT_MS = 5000;
|
|
4
|
+
const MAX_OUTPUT = 16 * 1024 * 1024;
|
|
5
|
+
/** A query deadline includes pipe drain; a dead root cannot leave this read waiting on close. */
|
|
6
|
+
export async function processTableCommand(command, args, env) {
|
|
7
|
+
const output = await new Promise((resolve, reject) => {
|
|
8
|
+
// Node's piped-stdio overload excludes the missing pipes of a failed spawn.
|
|
9
|
+
const child = spawn(command, [...args], { env, windowsHide: true, stdio: ["ignore", "pipe", "ignore"] });
|
|
10
|
+
trackOwnedProcess(child);
|
|
11
|
+
const chunks = [];
|
|
12
|
+
let size = 0;
|
|
13
|
+
let settled = false;
|
|
14
|
+
const deadline = {};
|
|
15
|
+
const finish = (error) => {
|
|
16
|
+
if (settled) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
settled = true;
|
|
20
|
+
clearTimeout(deadline.timer);
|
|
21
|
+
if (error !== undefined) {
|
|
22
|
+
// Never wait for close after the deadline. Ownership retains the query
|
|
23
|
+
// until close, including when the OS cannot terminate it immediately.
|
|
24
|
+
if (child.exitCode === null && child.signalCode === null) {
|
|
25
|
+
try {
|
|
26
|
+
child.kill("SIGKILL");
|
|
27
|
+
}
|
|
28
|
+
catch { /* Keep the original read failure. */ }
|
|
29
|
+
}
|
|
30
|
+
child.stdout?.destroy();
|
|
31
|
+
reject(error instanceof Error ? error : new Error("Process table query failed"));
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
resolve(Buffer.concat(chunks).toString("utf8"));
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
// Failed spawn (including EMFILE/ENFILE) may return no stdout. Register
|
|
38
|
+
// the native error before touching pipes or arming a deadline.
|
|
39
|
+
child.once("error", finish);
|
|
40
|
+
child.once("close", (code, signal) => {
|
|
41
|
+
if (code === 0 && signal === null) {
|
|
42
|
+
finish();
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
finish(Object.assign(new Error("Process table command failed"), { status: code, signal }));
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
const stdout = child.stdout;
|
|
49
|
+
if (!stdout) {
|
|
50
|
+
// The native spawn error is queued first; retain its metadata when it
|
|
51
|
+
// arrives, while also settling a malformed spawn with no error event.
|
|
52
|
+
setImmediate(() => { finish(new Error("Process table query has no stdout")); });
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
stdout.on("data", (chunk) => {
|
|
56
|
+
size += chunk.length;
|
|
57
|
+
if (size > MAX_OUTPUT) {
|
|
58
|
+
finish(Object.assign(new Error("Process table output exceeded limit"), { code: "ENOBUFS" }));
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
chunks.push(chunk);
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
stdout.once("error", finish);
|
|
65
|
+
deadline.timer = setTimeout(() => { finish(Object.assign(new Error("Process table query timed out"), { code: "ETIMEDOUT" })); }, PROCESS_TABLE_TIMEOUT_MS);
|
|
66
|
+
});
|
|
67
|
+
return output;
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=process-table-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-table-command.js","sources":["../../../src/shared/executable/process-table-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export interface ProcessEntry {
|
|
|
7
7
|
}
|
|
8
8
|
/** The process table at one moment, by pid. */
|
|
9
9
|
export type ProcessTable = ReadonlyMap<number, ProcessEntry>;
|
|
10
|
-
interface ProcessTableRead {
|
|
10
|
+
export interface ProcessTableRead {
|
|
11
11
|
readonly table: ProcessTable;
|
|
12
12
|
/** Entries omitted because access or a start identity was unavailable. */
|
|
13
13
|
readonly skipped: number;
|
|
@@ -30,16 +30,28 @@ export type ProcessTableObservation = ProcessTableFailure | (ProcessTableRead &
|
|
|
30
30
|
readonly source: ProcessTableSource;
|
|
31
31
|
readonly elapsedMs: number;
|
|
32
32
|
});
|
|
33
|
+
export declare class InvalidProcessTableError extends Error {
|
|
34
|
+
readonly reason: "invalid_output" | "missing_host";
|
|
35
|
+
constructor(reason?: "invalid_output" | "missing_host");
|
|
36
|
+
}
|
|
37
|
+
export declare function parseProcessStat(pid: number, stat: string): ProcessEntry;
|
|
38
|
+
export declare function parseProcessPs(output: string): ProcessTableRead;
|
|
39
|
+
export declare function parseProcessWindows(output: string): ProcessTableRead;
|
|
33
40
|
/**
|
|
34
41
|
* The process table now (synchronous: the host's `exit` hook reads it too).
|
|
35
42
|
* A failed observation is distinct from a valid table with no descendants.
|
|
36
43
|
* The host must appear in a usable table, including its group on POSIX.
|
|
37
44
|
*/
|
|
38
45
|
export declare function observeProcessTable(source?: ProcessTableSource): ProcessTableObservation;
|
|
46
|
+
/** Only bounded metadata leaves a failed process-table observation. */
|
|
47
|
+
export declare function processTableFailure(error: unknown, source: ProcessTableSource, elapsedMs: number): ProcessTableFailure;
|
|
39
48
|
/** Convenience for probes that require a usable observation. Never returns an empty fallback. */
|
|
40
49
|
export declare function readProcessTable(source?: ProcessTableSource): ProcessTable;
|
|
41
|
-
/**
|
|
42
|
-
|
|
50
|
+
/**
|
|
51
|
+
* Every process below `pid`. Windows preserves a dead parent's PID, so an
|
|
52
|
+
* edge is usable only if the child was created no earlier than this parent.
|
|
53
|
+
*/
|
|
54
|
+
export declare function descendantsOf(table: ProcessTable, pid: number, source?: ProcessTableSource): ProcessEntry[];
|
|
43
55
|
/**
|
|
44
56
|
* SIGKILL each of `entries` that `table` (read just before) shows still
|
|
45
57
|
* running, the same process (same start time), and the process group each
|
|
@@ -47,5 +59,4 @@ export declare function descendantsOf(table: ProcessTable, pid: number): Process
|
|
|
47
59
|
* processes started since the entries were read. Never the host, nor its group.
|
|
48
60
|
*/
|
|
49
61
|
export declare function killEntries(entries: Iterable<ProcessEntry>, table: ProcessTable): void;
|
|
50
|
-
export {};
|
|
51
62
|
//# sourceMappingURL=process-tree.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-tree.d.ts","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"AAeA,0FAA0F;AAC1F,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,+CAA+C;AAC/C,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAE7D,
|
|
1
|
+
{"version":3,"file":"process-tree.d.ts","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"AAeA,0FAA0F;AAC1F,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,+CAA+C;AAC/C,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAE7D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,0EAA0E;IAC1E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,kBAAkB,GAAG,QAAQ,GAAG,IAAI,GAAG,SAAS,CAAC;AAC7D,MAAM,MAAM,yBAAyB,GAAG,SAAS,GAAG,gBAAgB,GAAG,cAAc,GAAG,aAAa,GAAG,gBAAgB,GAAG,cAAc,GAAG,cAAc,CAAC;AAC3J,sFAAsF;AACtF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,yBAAyB,CAAC;IAC3C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AACD,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,GAAG,CAAC,gBAAgB,GAAG;IAC9E,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAClB,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC,CAAC;AAEH,qBAAa,wBAAyB,SAAQ,KAAK;IACrC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,GAAG,cAAc;IAA9D,YAAqB,MAAM,GAAE,gBAAgB,GAAG,cAAiC,EAA4D;CAC9I;AAgBD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY,CAOxE;AAiCD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAW/D;AAWD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAgBpE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,GAAE,kBAAgH,GAAG,uBAAuB,CASrL;AAED,uEAAuE;AACvE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,GAAG,mBAAmB,CAkBtH;AAED,iGAAiG;AACjG,wBAAgB,gBAAgB,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,YAAY,CAI1E;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,kBAAwE,GAAG,YAAY,EAAE,CAyBhK;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CA6BtF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { execFileSync } from "node:child_process";
|
|
2
2
|
import { readdirSync, readFileSync } from "node:fs";
|
|
3
3
|
import { asRecord } from "../json.js";
|
|
4
|
-
class InvalidProcessTableError extends Error {
|
|
4
|
+
export class InvalidProcessTableError extends Error {
|
|
5
5
|
reason;
|
|
6
6
|
constructor(reason = "invalid_output") {
|
|
7
7
|
super(reason);
|
|
@@ -23,6 +23,9 @@ function readStat(pid) {
|
|
|
23
23
|
}
|
|
24
24
|
throw error;
|
|
25
25
|
}
|
|
26
|
+
return parseProcessStat(pid, stat);
|
|
27
|
+
}
|
|
28
|
+
export function parseProcessStat(pid, stat) {
|
|
26
29
|
// Field 2, the command name, is parenthesized and may itself hold spaces
|
|
27
30
|
// and parentheses; the fields after its last ")" start at field 3 (state).
|
|
28
31
|
const fields = stat.slice(stat.lastIndexOf(")") + 2).split(" ");
|
|
@@ -66,6 +69,9 @@ function readPs() {
|
|
|
66
69
|
timeout: 5000,
|
|
67
70
|
maxBuffer: 16 * 1024 * 1024,
|
|
68
71
|
});
|
|
72
|
+
return parseProcessPs(output);
|
|
73
|
+
}
|
|
74
|
+
export function parseProcessPs(output) {
|
|
69
75
|
const table = new Map();
|
|
70
76
|
for (const line of output.split("\n")) {
|
|
71
77
|
if (line.trim() === "") {
|
|
@@ -88,6 +94,9 @@ function readWindows() {
|
|
|
88
94
|
"$ErrorActionPreference='Stop'; Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,@{Name='Started';Expression={if ($null -ne $_.CreationDate) { $_.CreationDate.ToUniversalTime().ToString('o') }}} | ConvertTo-Json -Compress"], {
|
|
89
95
|
encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5000, maxBuffer: 16 * 1024 * 1024,
|
|
90
96
|
});
|
|
97
|
+
return parseProcessWindows(output);
|
|
98
|
+
}
|
|
99
|
+
export function parseProcessWindows(output) {
|
|
91
100
|
const values = JSON.parse(output);
|
|
92
101
|
const table = new Map();
|
|
93
102
|
let skipped = 0;
|
|
@@ -129,35 +138,39 @@ export function observeProcessTable(source = process.platform === "linux" ? "pro
|
|
|
129
138
|
return { ok: true, source, elapsedMs: performance.now() - started, ...result };
|
|
130
139
|
}
|
|
131
140
|
catch (error) {
|
|
132
|
-
|
|
133
|
-
// Node's execFileSync error can embed stdout and the whole command.
|
|
134
|
-
// Preserve its identifying fields, never its message or output.
|
|
135
|
-
const code = typeof native?.code === "string" && /^[A-Z][A-Z0-9_]{0,63}$/u.test(native.code) ? native.code : undefined;
|
|
136
|
-
const exitCode = typeof native?.status === "number" ? native.status : undefined;
|
|
137
|
-
const signal = typeof native?.signal === "string" && /^SIG[A-Z0-9]{1,16}$/u.test(native.signal) ? native.signal : undefined;
|
|
138
|
-
let reason = "read_failed";
|
|
139
|
-
if (code === "ETIMEDOUT") {
|
|
140
|
-
reason = "timeout";
|
|
141
|
-
}
|
|
142
|
-
else if (error instanceof InvalidProcessTableError) {
|
|
143
|
-
reason = error.reason;
|
|
144
|
-
}
|
|
145
|
-
else if (error instanceof SyntaxError) {
|
|
146
|
-
reason = "invalid_output";
|
|
147
|
-
}
|
|
148
|
-
else if (exitCode !== undefined) {
|
|
149
|
-
reason = "command_failed";
|
|
150
|
-
}
|
|
151
|
-
else if (code === "ENOENT" || code === "EACCES" && source !== "procfs") {
|
|
152
|
-
reason = "spawn_failed";
|
|
153
|
-
}
|
|
154
|
-
return {
|
|
155
|
-
ok: false, source, elapsedMs: performance.now() - started, reason,
|
|
156
|
-
...(code === undefined ? {} : { code }), ...(exitCode === undefined ? {} : { exitCode }),
|
|
157
|
-
...(signal === undefined ? {} : { signal }), ...(reason === "timeout" ? { timeoutMs: 5000 } : {}),
|
|
158
|
-
};
|
|
141
|
+
return processTableFailure(error, source, performance.now() - started);
|
|
159
142
|
}
|
|
160
143
|
}
|
|
144
|
+
/** Only bounded metadata leaves a failed process-table observation. */
|
|
145
|
+
export function processTableFailure(error, source, elapsedMs) {
|
|
146
|
+
const native = asRecord(error);
|
|
147
|
+
// Node's execFileSync error can embed stdout and the whole command.
|
|
148
|
+
// Preserve its identifying fields, never its message or output.
|
|
149
|
+
const code = typeof native?.code === "string" && /^[A-Z][A-Z0-9_]{0,63}$/u.test(native.code) ? native.code : undefined;
|
|
150
|
+
const exitCode = typeof native?.status === "number" ? native.status : (typeof native?.code === "number" ? native.code : undefined);
|
|
151
|
+
const signal = typeof native?.signal === "string" && /^SIG[A-Z0-9]{1,16}$/u.test(native.signal) ? native.signal : undefined;
|
|
152
|
+
let reason = "read_failed";
|
|
153
|
+
if (code === "ETIMEDOUT") {
|
|
154
|
+
reason = "timeout";
|
|
155
|
+
}
|
|
156
|
+
else if (error instanceof InvalidProcessTableError) {
|
|
157
|
+
reason = error.reason;
|
|
158
|
+
}
|
|
159
|
+
else if (error instanceof SyntaxError) {
|
|
160
|
+
reason = "invalid_output";
|
|
161
|
+
}
|
|
162
|
+
else if (exitCode !== undefined) {
|
|
163
|
+
reason = "command_failed";
|
|
164
|
+
}
|
|
165
|
+
else if (code === "ENOENT" || code === "EACCES" && source !== "procfs") {
|
|
166
|
+
reason = "spawn_failed";
|
|
167
|
+
}
|
|
168
|
+
return {
|
|
169
|
+
ok: false, source, elapsedMs, reason,
|
|
170
|
+
...(code === undefined ? {} : { code }), ...(exitCode === undefined ? {} : { exitCode }),
|
|
171
|
+
...(signal === undefined ? {} : { signal }), ...(reason === "timeout" ? { timeoutMs: 5000 } : {}),
|
|
172
|
+
};
|
|
173
|
+
}
|
|
161
174
|
/** Convenience for probes that require a usable observation. Never returns an empty fallback. */
|
|
162
175
|
export function readProcessTable(source) {
|
|
163
176
|
const result = observeProcessTable(source);
|
|
@@ -166,8 +179,11 @@ export function readProcessTable(source) {
|
|
|
166
179
|
}
|
|
167
180
|
throw new Error(`Process table ${result.source}: ${result.reason}${result.code === undefined ? "" : ` (${result.code})`} after ${result.elapsedMs.toFixed(0)} ms`, { cause: result });
|
|
168
181
|
}
|
|
169
|
-
/**
|
|
170
|
-
|
|
182
|
+
/**
|
|
183
|
+
* Every process below `pid`. Windows preserves a dead parent's PID, so an
|
|
184
|
+
* edge is usable only if the child was created no earlier than this parent.
|
|
185
|
+
*/
|
|
186
|
+
export function descendantsOf(table, pid, source = process.platform === "win32" ? "windows" : "procfs") {
|
|
171
187
|
const children = new Map();
|
|
172
188
|
for (const entry of table.values()) {
|
|
173
189
|
const siblings = children.get(entry.ppid);
|
|
@@ -183,7 +199,9 @@ export function descendantsOf(table, pid) {
|
|
|
183
199
|
const pending = [pid];
|
|
184
200
|
for (let parent = pending.pop(); parent !== undefined; parent = pending.pop()) {
|
|
185
201
|
for (const child of children.get(parent) ?? []) {
|
|
186
|
-
|
|
202
|
+
const parentEntry = table.get(parent);
|
|
203
|
+
const validParent = source !== "windows" || parentEntry !== undefined && child.start >= parentEntry.start;
|
|
204
|
+
if (!seen.has(child.pid) && validParent) {
|
|
187
205
|
seen.add(child.pid);
|
|
188
206
|
found.push(child);
|
|
189
207
|
pending.push(child.pid);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-tree.js","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAiDtC,MAAM,wBAAyB,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"process-tree.js","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { type ChildProcess } from "node:child_process";
|
|
2
1
|
import { Duplex, type Readable, type Writable } from "node:stream";
|
|
3
2
|
import { type ProcessDiagnostics } from "./diagnostics.js";
|
|
4
3
|
import { treeResourcesReader } from "./process-resources.js";
|
|
5
4
|
export { trackOwnedProcess } from "./ownership.js";
|
|
5
|
+
export { killGraceMs, KILL_GRACE_MS, killProcessTree, signalProcessGroup, OWN_PROCESS_GROUP } from "./process-signals.js";
|
|
6
6
|
export interface LineProcessOptions {
|
|
7
7
|
readonly cwd?: string;
|
|
8
8
|
readonly env?: NodeJS.ProcessEnv;
|
|
@@ -14,9 +14,10 @@ export interface LineProcessOptions {
|
|
|
14
14
|
readonly inheritStderr?: boolean;
|
|
15
15
|
/**
|
|
16
16
|
* `kill()` ends the child's whole process tree. On Windows
|
|
17
|
-
* (
|
|
18
|
-
* npm `.cmd` shim is only `cmd.exe`.
|
|
19
|
-
*
|
|
17
|
+
* (killProcessTree) that is more than the direct child, which for an
|
|
18
|
+
* npm `.cmd` shim is only `cmd.exe`. Captured start identities also reach
|
|
19
|
+
* Windows tools whose intermediate parent exits before taskkill walks it.
|
|
20
|
+
* On POSIX, where the child's process group is always signalled, it adds the descendants that left the group
|
|
20
21
|
* (process-tree.ts): SIGTERM still goes to the group alone, so the child
|
|
21
22
|
* can stop its tools itself; the SIGKILL, or the child's exit if that comes
|
|
22
23
|
* first, also takes every descendant seen before (when `kill()` began, and
|
|
@@ -28,49 +29,14 @@ export interface LineProcessOptions {
|
|
|
28
29
|
/** Open a private bidirectional pipe at child fd 3, separate from stdout. */
|
|
29
30
|
readonly extraPipe?: boolean;
|
|
30
31
|
}
|
|
31
|
-
/**
|
|
32
|
-
* How long a process asked to stop (SIGTERM) gets before it is killed outright
|
|
33
|
-
* (SIGKILL): the bound that keeps `kill()` followed by `await exited` from
|
|
34
|
-
* hanging on a process that ignores the request. Generous on purpose: claude
|
|
35
|
-
* answers SIGTERM with a shutdown of its own that runs its SessionEnd hooks
|
|
36
|
-
* and force-exits after max(5 s, hook budget + 5 s), 15 s while writes are
|
|
37
|
-
* still pending (2.1.283; the hook budget defaults to 1.5 s), and cutting that
|
|
38
|
-
* short kills the hooks with it. Observed exits take 0.6-2.3 s.
|
|
39
|
-
*/
|
|
40
|
-
export declare const KILL_GRACE_MS = 10000;
|
|
41
|
-
/**
|
|
42
|
-
* The grace period in force: `OAR_KILL_GRACE_MS` when it holds a nonnegative
|
|
43
|
-
* number of milliseconds (a host whose runtimes need longer, e.g. claude with
|
|
44
|
-
* slow SessionEnd hooks, or that wants a faster teardown), else `KILL_GRACE_MS`.
|
|
45
|
-
*/
|
|
46
|
-
export declare function killGraceMs(env?: NodeJS.ProcessEnv): number;
|
|
47
|
-
/**
|
|
48
|
-
* POSIX children are spawned detached, which makes each the leader of its own
|
|
49
|
-
* process group, so one signal to the negative pid reaches every process it
|
|
50
|
-
* started (shells, dev servers, MCP servers), not only the child itself.
|
|
51
|
-
* Detaching changes neither stdio nor exit tracking: the pipes stay connected
|
|
52
|
-
* and the child is never unref'd, so the host still observes its exit. It does
|
|
53
|
-
* take the child out of the terminal's job control: Ctrl-C (SIGINT) and SIGHUP
|
|
54
|
-
* reach the host only, so a host that wants them to stop its runtimes
|
|
55
|
-
* disposes its sessions on them. Windows has no process groups, and a
|
|
56
|
-
* detached child there gets its own console, so it stays attached.
|
|
57
|
-
*/
|
|
58
|
-
export declare const OWN_PROCESS_GROUP: boolean;
|
|
59
|
-
/**
|
|
60
|
-
* Send `signal` to a child spawned with `detached: OWN_PROCESS_GROUP` and to
|
|
61
|
-
* everything in its process group. Falls back to the child alone where there
|
|
62
|
-
* are no groups (Windows) or the group is gone (the child left it; ESRCH).
|
|
63
|
-
* A reaped child's pid can be reused, so call this only while the child, or a
|
|
64
|
-
* process it started, can still be alive.
|
|
65
|
-
*/
|
|
66
|
-
export declare function signalProcessGroup(child: ChildProcess, signal: NodeJS.Signals): void;
|
|
67
32
|
/** A long-lived child whose raw streams can also be observed line-by-line. */
|
|
68
33
|
export interface LineProcess {
|
|
69
34
|
/** Resolves once the OS process exists; rejects when it cannot be spawned. */
|
|
70
35
|
readonly spawned: Promise<void>;
|
|
71
36
|
/**
|
|
72
37
|
* Resolves when the process is truly gone and its state has been released.
|
|
73
|
-
* After `kill()`, it
|
|
38
|
+
* After `kill()`, it includes bounded observations around the SIGKILL
|
|
39
|
+
* escalation and any asynchronous descendant cleanup after native exit.
|
|
74
40
|
*/
|
|
75
41
|
readonly exited: Promise<number | null>;
|
|
76
42
|
readonly stdin: Writable;
|
|
@@ -79,6 +45,12 @@ export interface LineProcess {
|
|
|
79
45
|
readonly extraPipe?: Duplex;
|
|
80
46
|
/** Native status and the last 8 KiB of stderr observed so far. */
|
|
81
47
|
diagnostics(): ProcessDiagnostics;
|
|
48
|
+
/** True immediately when kill begins, before asynchronous capture or EOF. */
|
|
49
|
+
stopping(): boolean;
|
|
50
|
+
/** Only immediately before stopping: memoizes descendant capture and registers exit cleanup. */
|
|
51
|
+
prepareShutdown(): Promise<void>;
|
|
52
|
+
/** Record the actual native stop attempt, immediately before sending cancel/close. */
|
|
53
|
+
markNativeStop(): void;
|
|
82
54
|
write(text: string): void;
|
|
83
55
|
/** Complete UTF-8 lines, independent of stdout byte-chunk boundaries. */
|
|
84
56
|
onLine(handler: (line: string) => void): void;
|
|
@@ -96,11 +68,6 @@ export interface LineProcess {
|
|
|
96
68
|
/** The child's memory with its group and descendants (process-resources.ts); null once it has exited. */
|
|
97
69
|
readonly resources: ReturnType<typeof treeResourcesReader>;
|
|
98
70
|
}
|
|
99
|
-
/**
|
|
100
|
-
* Windows taskkill /T /F ends the child and its descendants, falling back to
|
|
101
|
-
* the child alone when the walk fails. An exited child's pid may already be reused.
|
|
102
|
-
*/
|
|
103
|
-
export declare function killProcessTree(child: ChildProcess): void;
|
|
104
71
|
/**
|
|
105
72
|
* Spawn through cross-spawn. On Windows a `.cmd`/`.bat` shim is first
|
|
106
73
|
* resolved to its native target or an explicitly escaped cmd.exe invocation.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.d.ts","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process.d.ts","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAuD,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEhH,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAK7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC1H,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC;;;;OAIG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,uEAAuE;IACvE,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,6EAA6E;IAC7E,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC9B;AACD,8EAA8E;AAC9E,MAAM,WAAW,WAAW;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,kEAAkE;IAClE,WAAW,IAAI,kBAAkB,CAAC;IAClC,6EAA6E;IAC7E,QAAQ,IAAI,OAAO,CAAC;IACpB,gGAAgG;IAChG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,sFAAsF;IACtF,cAAc,IAAI,IAAI,CAAC;IACvB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,yEAAyE;IACzE,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9C,+DAA+D;IAC/D,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IACtE;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,CAAC;IACb,yGAAyG;IACzG,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CAC5D;AACD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,GAAE,kBAAuB,GAC/B,WAAW,CAkHb"}
|