@botiverse/oar 0.78.0 → 0.80.0
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/README.md +32 -5
- package/dist/contracts/install.d.ts +16 -10
- package/dist/contracts/install.d.ts.map +1 -1
- package/dist/contracts/placement.d.ts +6 -3
- package/dist/contracts/placement.d.ts.map +1 -1
- package/dist/contracts/placement.js +1 -1
- package/dist/contracts/placement.js.map +1 -1
- package/dist/contracts/runtime.d.ts +4 -2
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js +5 -0
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/contracts/session-unavailable-error.d.ts +6 -4
- package/dist/contracts/session-unavailable-error.d.ts.map +1 -1
- package/dist/contracts/session-unavailable-error.js +4 -2
- package/dist/contracts/session-unavailable-error.js.map +1 -1
- package/dist/runtimes/antigravity/index.d.ts +1 -1
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/claude/index.d.ts +1 -1
- package/dist/runtimes/claude/index.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/index.d.ts +3 -1
- package/dist/runtimes/codebuddy/index.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/index.js +2 -1
- package/dist/runtimes/codebuddy/index.js.map +1 -1
- package/dist/runtimes/codebuddy/install.d.ts +6 -0
- package/dist/runtimes/codebuddy/install.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/install.js +11 -0
- package/dist/runtimes/codebuddy/install.js.map +1 -0
- package/dist/runtimes/codebuddy/installation.d.ts +3 -1
- package/dist/runtimes/codebuddy/installation.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/installation.js +23 -1
- package/dist/runtimes/codebuddy/installation.js.map +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts.map +1 -1
- package/dist/runtimes/codex/index.d.ts +1 -1
- package/dist/runtimes/codex/index.d.ts.map +1 -1
- package/dist/runtimes/codex/session.d.ts.map +1 -1
- package/dist/runtimes/codex/session.js +11 -10
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/grok/index.d.ts +1 -1
- package/dist/runtimes/grok/index.d.ts.map +1 -1
- package/dist/runtimes/kimi/index.d.ts +1 -1
- package/dist/runtimes/kimi/index.d.ts.map +1 -1
- package/dist/runtimes/opencode/index.d.ts +1 -1
- package/dist/runtimes/opencode/index.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.js +3 -1
- package/dist/runtimes/pi/rpc/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/session.js +2 -2
- package/dist/runtimes/pi/rpc/session.js.map +1 -1
- package/dist/runtimes/qoder/index.d.ts +1 -1
- package/dist/runtimes/qoder/index.d.ts.map +1 -1
- package/dist/runtimes/qoder/session.d.ts.map +1 -1
- package/dist/runtimes/qoder/session.js +2 -1
- package/dist/runtimes/qoder/session.js.map +1 -1
- package/dist/runtimes/qwen/index.d.ts +1 -1
- package/dist/runtimes/qwen/index.d.ts.map +1 -1
- package/dist/runtimes/qwen/session.d.ts.map +1 -1
- package/dist/runtimes/qwen/session.js +3 -1
- package/dist/runtimes/qwen/session.js.map +1 -1
- package/dist/shared/acp/client-app.d.ts +17 -4
- package/dist/shared/acp/client-app.d.ts.map +1 -1
- package/dist/shared/acp/client-app.js +35 -12
- package/dist/shared/acp/client-app.js.map +1 -1
- package/dist/shared/acp/errors.d.ts +3 -1
- package/dist/shared/acp/errors.d.ts.map +1 -1
- package/dist/shared/acp/errors.js +13 -3
- package/dist/shared/acp/errors.js.map +1 -1
- package/dist/shared/acp/initialize.d.ts +6 -0
- package/dist/shared/acp/initialize.d.ts.map +1 -0
- package/dist/shared/acp/initialize.js +30 -0
- package/dist/shared/acp/initialize.js.map +1 -0
- package/dist/shared/acp/process.d.ts +3 -0
- package/dist/shared/acp/process.d.ts.map +1 -1
- package/dist/shared/acp/process.js +1 -0
- package/dist/shared/acp/process.js.map +1 -1
- package/dist/shared/acp/profile.d.ts +2 -0
- package/dist/shared/acp/profile.d.ts.map +1 -1
- package/dist/shared/acp/profile.js +8 -24
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/acp/protocol-error.d.ts +5 -0
- package/dist/shared/acp/protocol-error.d.ts.map +1 -0
- package/dist/shared/acp/protocol-error.js +6 -0
- package/dist/shared/acp/protocol-error.js.map +1 -0
- package/dist/shared/acp/records.d.ts +10 -8
- package/dist/shared/acp/records.d.ts.map +1 -1
- package/dist/shared/acp/records.js +24 -11
- package/dist/shared/acp/records.js.map +1 -1
- package/dist/shared/acp/routing.d.ts +59 -0
- package/dist/shared/acp/routing.d.ts.map +1 -0
- package/dist/shared/acp/routing.js +374 -0
- package/dist/shared/acp/routing.js.map +1 -0
- package/dist/shared/acp/session.d.ts +28 -2
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +164 -104
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/shared-session.d.ts +27 -0
- package/dist/shared/acp/shared-session.d.ts.map +1 -0
- package/dist/shared/acp/shared-session.js +171 -0
- package/dist/shared/acp/shared-session.js.map +1 -0
- package/dist/shared/acp/shared-wire.d.ts +9 -0
- package/dist/shared/acp/shared-wire.d.ts.map +1 -0
- package/dist/shared/acp/shared-wire.js +113 -0
- package/dist/shared/acp/shared-wire.js.map +1 -0
- package/dist/shared/acp/turns.d.ts +4 -3
- package/dist/shared/acp/turns.d.ts.map +1 -1
- package/dist/shared/acp/turns.js +11 -4
- package/dist/shared/acp/turns.js.map +1 -1
- package/dist/shared/credential-redactor.d.ts +2 -0
- package/dist/shared/credential-redactor.d.ts.map +1 -1
- package/dist/shared/credential-redactor.js +1 -0
- package/dist/shared/credential-redactor.js.map +1 -1
- package/dist/shared/executable/diagnostics.d.ts +17 -0
- package/dist/shared/executable/diagnostics.d.ts.map +1 -1
- package/dist/shared/executable/diagnostics.js +11 -0
- package/dist/shared/executable/diagnostics.js.map +1 -1
- package/dist/shared/executable/ownership.d.ts.map +1 -1
- package/dist/shared/executable/ownership.js +22 -5
- package/dist/shared/executable/ownership.js.map +1 -1
- package/dist/shared/executable/process-cleanup.d.ts +29 -0
- package/dist/shared/executable/process-cleanup.d.ts.map +1 -0
- package/dist/shared/executable/process-cleanup.js +84 -0
- package/dist/shared/executable/process-cleanup.js.map +1 -0
- package/dist/shared/executable/process-tree.d.ts +29 -2
- package/dist/shared/executable/process-tree.d.ts.map +1 -1
- package/dist/shared/executable/process-tree.js +110 -21
- package/dist/shared/executable/process-tree.js.map +1 -1
- package/dist/shared/executable/process.d.ts +1 -1
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +20 -24
- package/dist/shared/executable/process.js.map +1 -1
- package/dist/shared/executable/run.d.ts.map +1 -1
- package/dist/shared/executable/run.js +16 -2
- package/dist/shared/executable/run.js.map +1 -1
- package/dist/shared/install-npm.d.ts +14 -0
- package/dist/shared/install-npm.d.ts.map +1 -0
- package/dist/shared/install-npm.js +81 -0
- package/dist/shared/install-npm.js.map +1 -0
- package/dist/shared/install.d.ts +2 -1
- package/dist/shared/install.d.ts.map +1 -1
- package/dist/shared/install.js +4 -4
- package/dist/shared/install.js.map +1 -1
- package/dist/shared/login.d.ts.map +1 -1
- package/dist/shared/login.js +2 -7
- package/dist/shared/login.js.map +1 -1
- package/dist/shared/process-pool.d.ts +5 -1
- package/dist/shared/process-pool.d.ts.map +1 -1
- package/dist/shared/process-pool.js +11 -8
- package/dist/shared/process-pool.js.map +1 -1
- package/dist/shared/process-session.d.ts.map +1 -1
- package/dist/shared/process-session.js +2 -1
- package/dist/shared/process-session.js.map +1 -1
- package/dist/shared/session-credentials.d.ts +2 -2
- package/dist/shared/session-credentials.d.ts.map +1 -1
- package/dist/shared/session-credentials.js +21 -18
- package/dist/shared/session-credentials.js.map +1 -1
- package/dist/shared/session-kernel.d.ts +2 -0
- package/dist/shared/session-kernel.d.ts.map +1 -1
- package/dist/shared/session-kernel.js +1 -1
- package/dist/shared/session-kernel.js.map +1 -1
- package/dist/shared/stream-json/session.d.ts.map +1 -1
- package/dist/shared/stream-json/session.js +10 -3
- package/dist/shared/stream-json/session.js.map +1 -1
- package/dist/shared/token-redaction.d.ts +3 -0
- package/dist/shared/token-redaction.d.ts.map +1 -0
- package/dist/shared/token-redaction.js +10 -0
- package/dist/shared/token-redaction.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
/* oxlint-disable unicorn/no-useless-undefined -- A dropped incoming frame is an explicit undefined projection. */
|
|
2
|
+
/* oxlint-disable import/prefer-default-export -- Private transport boundary shared by every pooled ACP vendor. */
|
|
3
|
+
import { methods } from "@agentclientprotocol/sdk";
|
|
4
|
+
import { asRecord } from "../json.js";
|
|
5
|
+
/** Preserve native arrival order/phase and keep SDK connection diagnostics behind pool redaction. */
|
|
6
|
+
export function sharedAcpWire(routing, extensions, lateNew, newTimeoutMs = 15_000) {
|
|
7
|
+
const requests = new Map();
|
|
8
|
+
const forget = (id) => {
|
|
9
|
+
const request = requests.get(id);
|
|
10
|
+
if (request?.timer !== undefined && request.timer !== null) {
|
|
11
|
+
clearTimeout(request.timer);
|
|
12
|
+
}
|
|
13
|
+
requests.delete(id);
|
|
14
|
+
};
|
|
15
|
+
const cancel = (id) => {
|
|
16
|
+
const request = requests.get(id);
|
|
17
|
+
if (request?.method !== methods.agent.session.new) {
|
|
18
|
+
forget(id);
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
if (request.cancelled) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
request.cancelled = true;
|
|
25
|
+
routing.newFinished(id);
|
|
26
|
+
request.timer = setTimeout(() => { forget(id); }, newTimeoutMs);
|
|
27
|
+
request.timer.unref();
|
|
28
|
+
};
|
|
29
|
+
const notifications = new Set([methods.client.session.update, ...extensions]);
|
|
30
|
+
return {
|
|
31
|
+
outgoing(message) {
|
|
32
|
+
if (!("id" in message)) {
|
|
33
|
+
if ("method" in message && message.method === methods.protocol.cancelRequest) {
|
|
34
|
+
const id = asRecord(message.params)?.requestId;
|
|
35
|
+
if (typeof id === "string" || typeof id === "number" || id === null) {
|
|
36
|
+
cancel(id);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
if ("method" in message) {
|
|
42
|
+
const params = asRecord(message.params);
|
|
43
|
+
requests.set(message.id, { method: message.method, sessionId: typeof params?.sessionId === "string" ? params.sessionId : null, cancelled: false, timer: null });
|
|
44
|
+
if (message.method === methods.agent.session.new) {
|
|
45
|
+
routing.newStarted(message.id);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
routing.answered(message.id);
|
|
50
|
+
}
|
|
51
|
+
},
|
|
52
|
+
incoming(message) {
|
|
53
|
+
if (asRecord(message) === null || (!("id" in message) && !("method" in message))) {
|
|
54
|
+
routing.diagnostic("invalid_message", message);
|
|
55
|
+
return undefined;
|
|
56
|
+
}
|
|
57
|
+
if (!("method" in message)) {
|
|
58
|
+
const request = requests.get(message.id);
|
|
59
|
+
forget(message.id);
|
|
60
|
+
if (request === undefined) {
|
|
61
|
+
routing.diagnostic("unknown_response", message);
|
|
62
|
+
return undefined;
|
|
63
|
+
}
|
|
64
|
+
if (request.method === methods.agent.session.new) {
|
|
65
|
+
routing.newFinished(message.id);
|
|
66
|
+
}
|
|
67
|
+
if (request.cancelled) {
|
|
68
|
+
routing.diagnostic("cancelled_session_new_response", message);
|
|
69
|
+
const id = "result" in message ? asRecord(message.result)?.sessionId : undefined;
|
|
70
|
+
if (typeof id === "string" && id.length > 0) {
|
|
71
|
+
// Never clean an already owned or retired id, even if the native reply is invalid.
|
|
72
|
+
if (routing.retireUnowned(id)) {
|
|
73
|
+
lateNew(id);
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
routing.diagnostic("cancelled_session_new_collision", { sessionId: id }, "conflict");
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return undefined;
|
|
80
|
+
}
|
|
81
|
+
if ("result" in message) {
|
|
82
|
+
const result = asRecord(message.result);
|
|
83
|
+
const id = request.method === methods.agent.session.new ? result?.sessionId : request.sessionId;
|
|
84
|
+
if (typeof id === "string" && [methods.agent.session.new, methods.agent.session.resume, methods.agent.session.load].some(method => method === request.method)) {
|
|
85
|
+
routing.opened(id, request.method !== methods.agent.session.new);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
return routing.redactValue(message);
|
|
89
|
+
}
|
|
90
|
+
if (!("id" in message) && !notifications.has(message.method)) {
|
|
91
|
+
// Protocol cancellation must still reach the SDK's pending request controller.
|
|
92
|
+
if (message.method === methods.protocol.cancelRequest) {
|
|
93
|
+
return message;
|
|
94
|
+
}
|
|
95
|
+
routing.diagnostic(message.method, message.params);
|
|
96
|
+
return undefined;
|
|
97
|
+
}
|
|
98
|
+
// Host requests must keep executable arguments/environment intact. Their
|
|
99
|
+
// records use pool redaction; SDK schema failures become protocol errors.
|
|
100
|
+
const requestId = "id" in message ? message.id : undefined;
|
|
101
|
+
const projected = "id" in message ? message : routing.redactValue(message);
|
|
102
|
+
const params = projected.params;
|
|
103
|
+
if (params !== null && typeof params === "object" && !Array.isArray(params)) {
|
|
104
|
+
routing.ingress(params, requestId);
|
|
105
|
+
}
|
|
106
|
+
return projected;
|
|
107
|
+
},
|
|
108
|
+
close() { for (const id of requests.keys()) {
|
|
109
|
+
forget(id);
|
|
110
|
+
} },
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
//# sourceMappingURL=shared-wire.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shared-wire.js","sources":["../../../src/shared/acp/shared-wire.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { type AcpSessionProfile, type UsageUpdateGate } from "./profile.js";
|
|
|
5
5
|
import { type AcpProcess } from "./process.js";
|
|
6
6
|
/**
|
|
7
7
|
* The turn machinery: ≤1 active turn, each `session/prompt` RPC of it, the
|
|
8
|
-
* host-held queue, cancel with
|
|
8
|
+
* host-held queue, cancel with an isolated-stop or shared-release fallback. The RPC ANSWER is the
|
|
9
9
|
* runtime's own turn end and is recorded as an event with a turn_ended event;
|
|
10
10
|
* a rejected prompt RPC is likewise the runtime's word. A refused steer
|
|
11
11
|
* instead drops that input and preserves the active turn's outcome. The
|
|
@@ -33,8 +33,8 @@ export interface AcpTurns {
|
|
|
33
33
|
begin(request: RequestRecord | null, input: string, images?: readonly InputImage[]): ResponseBody;
|
|
34
34
|
/** Another prompt RPC inside the active turn (the profile's steer params); rejected like `begin`. */
|
|
35
35
|
steer(state: ActiveTurn, input: string, options: InputOptions | undefined, extraParams: JsonRecord): Promise<ResponseBody>;
|
|
36
|
-
/** session/cancel, then a bounded
|
|
37
|
-
abort(state: ActiveTurn): Promise<ResponseBody>;
|
|
36
|
+
/** session/cancel, then a bounded fallback: release this shared root or stop its isolated process. */
|
|
37
|
+
abort(state: ActiveTurn, request?: RequestRecord): Promise<ResponseBody>;
|
|
38
38
|
/** Hold input for the next turn, drained when the active one closes; rejected like `begin`. */
|
|
39
39
|
hold(input: string, images: readonly InputImage[] | undefined, inputId: string | undefined): Promise<ResponseBody>;
|
|
40
40
|
/** Take a held input back by its `inputId` before the drain sends it (`withdrawHeld`). */
|
|
@@ -50,5 +50,6 @@ export declare function createAcpTurns(deps: {
|
|
|
50
50
|
readonly capabilities: Pick<SessionCapabilities, "images">;
|
|
51
51
|
readonly promptMeta?: JsonRecord | undefined;
|
|
52
52
|
readonly promptUsage: (response: JsonRecord) => RuntimeEventBody | null;
|
|
53
|
+
readonly fallback?: (request: RequestRecord) => Promise<void>;
|
|
53
54
|
}): AcpTurns;
|
|
54
55
|
//# sourceMappingURL=turns.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turns.d.ts","sources":["../../../src/shared/acp/turns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,WAAW,EACZ,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAa,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AACvF,OAAO,EAAW,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAOxD;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,UAAU;IACzB,6FAA6F;IAC7F,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IACvC,qFAAqF;IACrF,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;CACjC;AAED,yGAAyG;AACzG,wBAAgB,cAAc,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAE/D;AAUD,MAAM,WAAW,QAAQ;IACvB,MAAM,IAAI,UAAU,GAAG,IAAI,CAAC;IAC5B,wHAAwH;IACxH,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,UAAU,EAAE,GAAG,YAAY,CAAC;IAClG,qGAAqG;IACrG,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,SAAS,EAAE,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3H,
|
|
1
|
+
{"version":3,"file":"turns.d.ts","sources":["../../../src/shared/acp/turns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,WAAW,EACZ,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAa,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AACvF,OAAO,EAAW,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAOxD;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,UAAU;IACzB,6FAA6F;IAC7F,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IACvC,qFAAqF;IACrF,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;CACjC;AAED,yGAAyG;AACzG,wBAAgB,cAAc,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAE/D;AAUD,MAAM,WAAW,QAAQ;IACvB,MAAM,IAAI,UAAU,GAAG,IAAI,CAAC;IAC5B,wHAAwH;IACxH,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,UAAU,EAAE,GAAG,YAAY,CAAC;IAClG,qGAAqG;IACrG,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,SAAS,EAAE,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3H,sGAAsG;IACtG,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACzE,+FAA+F;IAC/F,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACnH,0FAA0F;IAC1F,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC;IACxC,uGAAuG;IACvG,MAAM,IAAI,IAAI,CAAC;CAChB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE;IACnC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;IAC3D,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7C,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,UAAU,KAAK,gBAAgB,GAAG,IAAI,CAAC;IACxE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D,GAAG,QAAQ,CA4KX"}
|
package/dist/shared/acp/turns.js
CHANGED
|
@@ -145,7 +145,7 @@ export function createAcpTurns(deps) {
|
|
|
145
145
|
return { kind: "accepted" };
|
|
146
146
|
});
|
|
147
147
|
},
|
|
148
|
-
async abort(state) {
|
|
148
|
+
async abort(state, request) {
|
|
149
149
|
if (!state.abortRequested) {
|
|
150
150
|
state.abortRequested = true;
|
|
151
151
|
try {
|
|
@@ -154,11 +154,18 @@ export function createAcpTurns(deps) {
|
|
|
154
154
|
catch (error) {
|
|
155
155
|
return { kind: "rejected", code: "error", reason: error instanceof Error ? error.message : String(error) };
|
|
156
156
|
}
|
|
157
|
-
// A
|
|
158
|
-
//
|
|
157
|
+
// A stalled shared prompt releases only this root; isolated fallback
|
|
158
|
+
// stops its own process and records the observed exit.
|
|
159
159
|
state.fallback = setTimeout(() => {
|
|
160
160
|
if (active === state) {
|
|
161
|
-
|
|
161
|
+
if (deps.fallback !== undefined && request !== undefined) {
|
|
162
|
+
closeTurn(state);
|
|
163
|
+
held.splice(0);
|
|
164
|
+
void deps.fallback(request);
|
|
165
|
+
}
|
|
166
|
+
else {
|
|
167
|
+
runtime.kill();
|
|
168
|
+
}
|
|
162
169
|
}
|
|
163
170
|
}, profile.abortTimeoutMs ?? 10_000);
|
|
164
171
|
state.fallback.unref();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turns.js","sources":["../../../src/shared/acp/turns.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAoB,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAgD,MAAM,cAAc,CAAC;AACvF,OAAO,EAAE,OAAO,EAAmB,MAAM,cAAc,CAAC;AACxD,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,iBAAiB,CAAC;AAyBzB,yGAAyG;AACzG,MAAM,UAAU,cAAc,CAAC,WAAuB;IACpD,OAAO,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,kBAAkB,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;AAC/F,CAAC;AAED,0GAA0G;AAC1G,SAAS,SAAS,CAAC,KAAa,EAAE,MAA8B;IAC9D,OAAO;QACL,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/H,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;KACzD,CAAC;AACJ,CAAC;AAkBD,MAAM,UAAU,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"turns.js","sources":["../../../src/shared/acp/turns.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { SessionOptions } from "../contracts/session.js";
|
|
2
2
|
export interface CredentialRedactor {
|
|
3
|
+
/** Private connection redaction input. Never put these values in records or diagnostics. */
|
|
4
|
+
values(this: void): readonly string[];
|
|
3
5
|
add(this: void, value: string | undefined): void;
|
|
4
6
|
redact(this: void, text: string): string;
|
|
5
7
|
redactValue<T>(this: void, value: T): T;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-redactor.d.ts","sources":["../../src/shared/credential-redactor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAuB9D,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjD,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACzC,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;CACzC;AAED,gGAAgG;AAChG,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,
|
|
1
|
+
{"version":3,"file":"credential-redactor.d.ts","sources":["../../src/shared/credential-redactor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAuB9D,MAAM,WAAW,kBAAkB;IACjC,4FAA4F;IAC5F,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,MAAM,EAAE,CAAC;IACtC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjD,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACzC,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;CACzC;AAED,gGAAgG;AAChG,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAmC9F"}
|
|
@@ -60,6 +60,7 @@ export function sessionCredentialRedactor(options) {
|
|
|
60
60
|
let values = [...known].toSorted((left, right) => right.length - left.length);
|
|
61
61
|
const redact = (text) => values.reduce((result, value) => result.replaceAll(value, "[redacted]"), text);
|
|
62
62
|
return {
|
|
63
|
+
values: () => values,
|
|
63
64
|
add(value) {
|
|
64
65
|
if (credentialValue(value) && !known.has(value)) {
|
|
65
66
|
known.add(value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-redactor.js","sources":["../../src/shared/credential-redactor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;AACzJ,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAAC,CAAC;AACvE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AACjD,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAChC,MAAM,UAAU,GAAG,wBAAwB,CAAC;AAE5C,SAAS,eAAe,CAAC,KAAgC;IACvD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,qBAAqB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACvG,CAAC;AAED,2FAA2F;AAC3F,SAAS,cAAc,CAAC,KAAgC;IACtD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAAC,OAAO,EAAE,CAAC;IAAC,CAAC;IAChH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,MAAM,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;QAAC,OAAO,EAAE,CAAC;IAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,CAAC;QAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,2EAA2E,CAAC,CAAC;IAClJ,OAAO,CAAC,KAAK,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,IAAI,qBAAqB,CAAC,CAAC,CAAC;AAC9F,CAAC;
|
|
1
|
+
{"version":3,"file":"credential-redactor.js","sources":["../../src/shared/credential-redactor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,31 @@
|
|
|
1
1
|
import type { ExecutableResult } from "./run.js";
|
|
2
|
+
import { type ProcessCleanupDiagnostics } from "./process-cleanup.js";
|
|
3
|
+
export interface ProcessExitObservation {
|
|
4
|
+
readonly at: string;
|
|
5
|
+
readonly elapsedMs: number;
|
|
6
|
+
readonly exitCode: number | null;
|
|
7
|
+
readonly signal: NodeJS.Signals | null;
|
|
8
|
+
}
|
|
9
|
+
/** Facts captured when the deadline fires, before timeout cleanup begins. */
|
|
10
|
+
export interface ProcessTimeoutObservation {
|
|
11
|
+
readonly at: string;
|
|
12
|
+
readonly elapsedMs: number;
|
|
13
|
+
/** Null means Node had not emitted exit at the deadline, not that no descendant exited. */
|
|
14
|
+
readonly exit: ProcessExitObservation | null;
|
|
15
|
+
readonly closeObserved: boolean;
|
|
16
|
+
}
|
|
2
17
|
/** A bounded observation of native process failure, not a retry policy. */
|
|
3
18
|
export interface ProcessDiagnostics {
|
|
4
19
|
readonly exitCode: number | null;
|
|
5
20
|
readonly signal: NodeJS.Signals | null;
|
|
6
21
|
readonly stderr: string;
|
|
7
22
|
readonly timeoutMs?: number;
|
|
23
|
+
readonly timeoutObservation?: ProcessTimeoutObservation;
|
|
8
24
|
readonly error?: {
|
|
9
25
|
readonly code?: string;
|
|
10
26
|
readonly message: string;
|
|
11
27
|
};
|
|
28
|
+
readonly cleanup?: ProcessCleanupDiagnostics;
|
|
12
29
|
}
|
|
13
30
|
export declare const STDERR_TAIL_BYTES = 8192;
|
|
14
31
|
/** Copy retained bytes so a small suffix cannot keep a large chunk alive. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.d.ts","sources":["../../../src/shared/executable/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"diagnostics.d.ts","sources":["../../../src/shared/executable/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAwB,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAE5F,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;CACxC;AAED,6EAA6E;AAC7E,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,2FAA2F;IAC3F,QAAQ,CAAC,IAAI,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC7C,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC;AAED,2EAA2E;AAC3E,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,yBAAyB,CAAC;IACxD,QAAQ,CAAC,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE,QAAQ,CAAC,OAAO,CAAC,EAAE,yBAAyB,CAAC;CAC9C;AAED,eAAO,MAAM,iBAAiB,OAAO,CAAC;AAEtC,6EAA6E;AAC7E,qBAAa,UAAU;IACrB,OAAO,CAAC,KAAK,CAA2B;IAExC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKnC;IAED,IAAI,IAAI,MAAM,CAWb;CACF;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI/C;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG;IAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAK9F;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,SAAgB,GAAG,KAAK,CAUzE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,CAUjD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,kBAAkB,GAAG,KAAK,CAsBtF;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAMzE"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { cleanupFailureReason } from "./process-cleanup.js";
|
|
1
2
|
export const STDERR_TAIL_BYTES = 8192;
|
|
2
3
|
/** Copy retained bytes so a small suffix cannot keep a large chunk alive. */
|
|
3
4
|
export class StderrTail {
|
|
@@ -74,9 +75,19 @@ export function processFailure(context, diagnostics) {
|
|
|
74
75
|
if (diagnostics.timeoutMs !== undefined) {
|
|
75
76
|
reasons.push(`timeout after ${String(diagnostics.timeoutMs)} ms`);
|
|
76
77
|
}
|
|
78
|
+
if (diagnostics.timeoutObservation !== undefined) {
|
|
79
|
+
const observation = diagnostics.timeoutObservation;
|
|
80
|
+
const exit = observation.exit;
|
|
81
|
+
reasons.push(exit === null ? "root exit not observed at timeout"
|
|
82
|
+
: `root exit observed at ${exit.at} (${String(exit.elapsedMs)} ms, code ${exit.exitCode === null ? "unavailable" : String(exit.exitCode)}, signal ${exit.signal ?? "none"})`, `close observed at timeout: ${String(observation.closeObserved)}`);
|
|
83
|
+
}
|
|
77
84
|
if (diagnostics.error !== undefined) {
|
|
78
85
|
reasons.push(`${diagnostics.error.code ?? "native error"}: ${diagnostics.error.message}`);
|
|
79
86
|
}
|
|
87
|
+
const cleanup = cleanupFailureReason(diagnostics.cleanup);
|
|
88
|
+
if (cleanup !== undefined) {
|
|
89
|
+
reasons.push(cleanup);
|
|
90
|
+
}
|
|
80
91
|
const stderr = diagnostics.stderr === "" ? "" : `\nstderr (tail):\n${diagnostics.stderr}`;
|
|
81
92
|
return new Error(`${context}: ${reasons.join("; ")}${stderr}`, { cause: diagnostics });
|
|
82
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.js","sources":["../../../src/shared/executable/diagnostics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"diagnostics.js","sources":["../../../src/shared/executable/diagnostics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAkC,MAAM,sBAAsB,CAAC;AA6B5F,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAEtC,6EAA6E;AAC7E,MAAM,OAAO,UAAU;IACb,KAAK,GAAW,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAExC,MAAM,CAAC,KAAsB;QAC3B,MAAM,QAAQ,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACxE,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,MAAM,IAAI,iBAAiB;YAC/C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,CAAC;YACpD,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,GAAG,iBAAiB,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC3H,CAAC;IAED,IAAI;QACF,oEAAoE;QACpE,oEAAoE;QACpE,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC3B,MAAM;YACR,CAAC;YACD,KAAK,IAAI,CAAC,CAAC;QACb,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC;CACF;AAED,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,MAAM,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;IAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAY;IACtC,OAAO;QACL,GAAG,CAAC,MAAM,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClF,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC;KACnC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,KAAY,EAAE,OAAO,GAAG,KAAK,CAAC,OAAO;IAChE,MAAM,OAAO,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IACnC,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC;QACvD,MAAM,KAAK,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC1D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,KAAK,GAAY,KAAK,CAAC,KAAK,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAI,KAAc;IAC5C,IAAI,CAAC;QACH,OAAO,KAAK,EAAE,CAAC;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,KAAK,CAAC;QACd,CAAC;QACD,8EAA8E;QAC9E,MAAM,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAClF,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe,EAAE,WAA+B;IAC7E,MAAM,OAAO,GAAG;QACd,aAAa,WAAW,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;QAC3F,UAAU,WAAW,CAAC,MAAM,IAAI,MAAM,EAAE;KACzC,CAAC;IACF,IAAI,WAAW,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,iBAAiB,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,WAAW,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QACjD,MAAM,WAAW,GAAG,WAAW,CAAC,kBAAkB,CAAC;QACnD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;QAC9B,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,mCAAmC;YAC9D,CAAC,CAAC,yBAAyB,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,IAAI,CAAC,MAAM,IAAI,MAAM,GAAG,EAC5K,8BAA8B,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,WAAW,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,IAAI,cAAc,KAAK,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5F,CAAC;IACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC1D,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAAC,CAAC;IACrD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,WAAW,CAAC,MAAM,EAAE,CAAC;IAC1F,OAAO,IAAI,KAAK,CAAC,GAAG,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;AACzF,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAC,MAAwB,EAAE,OAAe;IACjE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,IAAI,IAAI,MAAM,CAAC,WAAW,EAAE,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC;QAC5F,MAAM,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,IAAI;YAClD,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;SAC3E,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ownership.d.ts","sources":["../../../src/shared/executable/ownership.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ownership.d.ts","sources":["../../../src/shared/executable/ownership.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAkCrE;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CA4B3D"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { execFileSync } from "node:child_process";
|
|
2
|
-
import {
|
|
2
|
+
import { writeSync } from "node:fs";
|
|
3
|
+
import { descendantsOf, killEntries, observeProcessTable } from "./process-tree.js";
|
|
4
|
+
import { cleanupFailureReason } from "./process-cleanup.js";
|
|
3
5
|
const ownedChildren = new Set();
|
|
4
6
|
let exitHookInstalled = false;
|
|
5
7
|
function killOwnedProcess(child, table) {
|
|
@@ -19,8 +21,9 @@ function killOwnedProcess(child, table) {
|
|
|
19
21
|
else {
|
|
20
22
|
// Its descendants outside its group too, found below it only while
|
|
21
23
|
// it runs: a reaped pid may already be someone else's.
|
|
22
|
-
|
|
23
|
-
|
|
24
|
+
const current = child.exitCode === null && child.signalCode === null ? table() : undefined;
|
|
25
|
+
if (current !== undefined) {
|
|
26
|
+
killEntries(descendantsOf(current, child.pid), current);
|
|
24
27
|
}
|
|
25
28
|
process.kill(-child.pid, "SIGKILL");
|
|
26
29
|
}
|
|
@@ -58,8 +61,22 @@ export function trackOwnedProcess(child) {
|
|
|
58
61
|
exitHookInstalled = true;
|
|
59
62
|
process.once("exit", () => {
|
|
60
63
|
// One read of the process table serves every child.
|
|
61
|
-
let
|
|
62
|
-
const read = () => {
|
|
64
|
+
let observation = null;
|
|
65
|
+
const read = () => {
|
|
66
|
+
if (observation === null) {
|
|
67
|
+
observation = observeProcessTable();
|
|
68
|
+
if (!observation.ok) {
|
|
69
|
+
// Host exit cannot publish session records or await a retry.
|
|
70
|
+
// Keep the failure visible without blocking other owned roots.
|
|
71
|
+
const reason = cleanupFailureReason({ status: "unverified", observations: [{ ...observation, phase: "before_force" }] });
|
|
72
|
+
try {
|
|
73
|
+
writeSync(2, `[oar] ${reason ?? "Descendant cleanup could not be verified"}\n`);
|
|
74
|
+
}
|
|
75
|
+
catch { /* Stderr may already be closed. */ }
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return observation.ok ? observation.table : undefined;
|
|
79
|
+
};
|
|
63
80
|
for (const owned of ownedChildren) {
|
|
64
81
|
killOwnedProcess(owned, read);
|
|
65
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ownership.js","sources":["../../../src/shared/executable/ownership.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAqB,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"ownership.js","sources":["../../../src/shared/executable/ownership.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { type ProcessTableObservation } from "./process-tree.js";
|
|
2
|
+
type Phase = "before_eof" | "before_force" | "after_exit";
|
|
3
|
+
type Observation = (Exclude<ProcessTableObservation, {
|
|
4
|
+
ok: true;
|
|
5
|
+
}> | {
|
|
6
|
+
readonly ok: true;
|
|
7
|
+
readonly source: ProcessTableObservation["source"];
|
|
8
|
+
readonly elapsedMs: number;
|
|
9
|
+
readonly skipped: number;
|
|
10
|
+
}) & {
|
|
11
|
+
readonly phase: Phase;
|
|
12
|
+
};
|
|
13
|
+
/** Internal observations, not a guarantee that every descendant has exited. */
|
|
14
|
+
export interface ProcessCleanupDiagnostics {
|
|
15
|
+
readonly status: "observed" | "unverified";
|
|
16
|
+
readonly observations: readonly Observation[];
|
|
17
|
+
}
|
|
18
|
+
export declare function cleanupFailureReason(cleanup: ProcessCleanupDiagnostics | undefined): string | undefined;
|
|
19
|
+
/** Keep a startup error's native class, code and cause when cleanup also failed. */
|
|
20
|
+
export declare function appendCleanupFailure(error: unknown, reason: string | undefined): unknown;
|
|
21
|
+
/** Capture before EOF, then revalidate identities before signalling descendants. */
|
|
22
|
+
export declare function processTreeCleanup(pid: number): {
|
|
23
|
+
capture(): void;
|
|
24
|
+
force(stopRoot: () => void): void;
|
|
25
|
+
finish(): void;
|
|
26
|
+
diagnostics(): ProcessCleanupDiagnostics;
|
|
27
|
+
};
|
|
28
|
+
export {};
|
|
29
|
+
//# sourceMappingURL=process-cleanup.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-cleanup.d.ts","sources":["../../../src/shared/executable/process-cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyF,KAAK,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAExJ,KAAK,KAAK,GAAG,YAAY,GAAG,cAAc,GAAG,YAAY,CAAC;AAC1D,KAAK,WAAW,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CAAC,GAAG;IACnE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAClB,QAAQ,CAAC,MAAM,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IACnD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAE/B,+EAA+E;AAC/E,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,CAAC;IAC3C,QAAQ,CAAC,YAAY,EAAE,SAAS,WAAW,EAAE,CAAC;CAC/C;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,yBAAyB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAKvG;AAED,oFAAoF;AACpF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAQxF;AAED,oFAAoF;AACpF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG;IAC/C,OAAO,IAAI,IAAI,CAAC;IAChB,KAAK,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAClC,MAAM,IAAI,IAAI,CAAC;IACf,WAAW,IAAI,yBAAyB,CAAC;CAC1C,CA+CA"}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import { descendantsOf, killEntries, observeProcessTable } from "./process-tree.js";
|
|
2
|
+
export function cleanupFailureReason(cleanup) {
|
|
3
|
+
if (cleanup?.status !== "unverified") {
|
|
4
|
+
return undefined;
|
|
5
|
+
}
|
|
6
|
+
const reasons = cleanup.observations.filter((entry) => !entry.ok).map((entry) => `${entry.phase} ${entry.source}: ${entry.reason} (${entry.elapsedMs.toFixed(0)} ms${entry.code === undefined ? "" : `, ${entry.code}`}${entry.exitCode === undefined ? "" : `, exit ${String(entry.exitCode)}`}${entry.signal === undefined ? "" : `, ${entry.signal}`})`);
|
|
7
|
+
return `Descendant cleanup could not be verified: ${reasons.join("; ")}`;
|
|
8
|
+
}
|
|
9
|
+
/** Keep a startup error's native class, code and cause when cleanup also failed. */
|
|
10
|
+
export function appendCleanupFailure(error, reason) {
|
|
11
|
+
if (reason === undefined) {
|
|
12
|
+
return error;
|
|
13
|
+
}
|
|
14
|
+
const failure = error instanceof Error ? error : new Error(String(error));
|
|
15
|
+
if (!failure.message.includes(reason)) {
|
|
16
|
+
failure.message += `; ${reason}`;
|
|
17
|
+
if (failure.stack !== undefined) {
|
|
18
|
+
failure.stack += `\nCleanup: ${reason}`;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return failure;
|
|
22
|
+
}
|
|
23
|
+
/** Capture before EOF, then revalidate identities before signalling descendants. */
|
|
24
|
+
export function processTreeCleanup(pid) {
|
|
25
|
+
const observations = [];
|
|
26
|
+
let unverified = false;
|
|
27
|
+
let descendants = [];
|
|
28
|
+
let root = undefined;
|
|
29
|
+
const read = (phase) => {
|
|
30
|
+
const result = observeProcessTable();
|
|
31
|
+
if (!result.ok) {
|
|
32
|
+
observations.push({ ...result, phase });
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
if (phase === "before_eof" && !result.table.has(pid)) {
|
|
36
|
+
observations.push({ ok: false, phase, source: result.source, elapsedMs: result.elapsedMs, reason: "missing_root" });
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
observations.push({ ok: true, phase, source: result.source, elapsedMs: result.elapsedMs, skipped: result.skipped });
|
|
40
|
+
return result.table;
|
|
41
|
+
};
|
|
42
|
+
return {
|
|
43
|
+
capture() {
|
|
44
|
+
// One bounded retry before closing stdin preserves native shutdown hooks
|
|
45
|
+
// and keeps both observations. A later read cannot reconstruct reparented descendants.
|
|
46
|
+
const table = read("before_eof") ?? read("before_eof");
|
|
47
|
+
if (table === undefined) {
|
|
48
|
+
unverified = true;
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
root = table.get(pid);
|
|
52
|
+
descendants = descendantsOf(table, pid);
|
|
53
|
+
},
|
|
54
|
+
force(stopRoot) {
|
|
55
|
+
const table = read("before_force");
|
|
56
|
+
// A failed observation never prevents stopping the owned root. It does
|
|
57
|
+
// prevent signalling remembered PIDs without checking their identities.
|
|
58
|
+
stopRoot();
|
|
59
|
+
if (table === undefined) {
|
|
60
|
+
unverified = true;
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
const current = table.get(pid);
|
|
64
|
+
const now = root !== undefined && current?.start === root.start ? descendantsOf(table, pid) : [];
|
|
65
|
+
killEntries([...descendants, ...now], table);
|
|
66
|
+
descendants = [];
|
|
67
|
+
},
|
|
68
|
+
finish() {
|
|
69
|
+
if (descendants.length === 0) {
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
const table = read("after_exit");
|
|
73
|
+
if (table === undefined) {
|
|
74
|
+
unverified = true;
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
killEntries(descendants, table);
|
|
78
|
+
}
|
|
79
|
+
descendants = [];
|
|
80
|
+
},
|
|
81
|
+
diagnostics: () => ({ status: unverified ? "unverified" : "observed", observations: [...observations] }),
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=process-cleanup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-cleanup.js","sources":["../../../src/shared/executable/process-cleanup.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,37 @@ 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 {
|
|
11
|
+
readonly table: ProcessTable;
|
|
12
|
+
/** Entries omitted because access or a start identity was unavailable. */
|
|
13
|
+
readonly skipped: number;
|
|
14
|
+
}
|
|
15
|
+
export type ProcessTableSource = "procfs" | "ps" | "windows";
|
|
16
|
+
export type ProcessTableFailureReason = "timeout" | "command_failed" | "spawn_failed" | "read_failed" | "invalid_output" | "missing_host" | "missing_root";
|
|
17
|
+
/** No command output, process names, arguments or environment values are retained. */
|
|
18
|
+
export interface ProcessTableFailure {
|
|
19
|
+
readonly ok: false;
|
|
20
|
+
readonly source: ProcessTableSource;
|
|
21
|
+
readonly elapsedMs: number;
|
|
22
|
+
readonly reason: ProcessTableFailureReason;
|
|
23
|
+
readonly code?: string;
|
|
24
|
+
readonly exitCode?: number;
|
|
25
|
+
readonly signal?: string;
|
|
26
|
+
readonly timeoutMs?: number;
|
|
27
|
+
}
|
|
28
|
+
export type ProcessTableObservation = ProcessTableFailure | (ProcessTableRead & {
|
|
29
|
+
readonly ok: true;
|
|
30
|
+
readonly source: ProcessTableSource;
|
|
31
|
+
readonly elapsedMs: number;
|
|
32
|
+
});
|
|
10
33
|
/**
|
|
11
34
|
* The process table now (synchronous: the host's `exit` hook reads it too).
|
|
12
|
-
*
|
|
35
|
+
* A failed observation is distinct from a valid table with no descendants.
|
|
36
|
+
* The host must appear in a usable table, including its group on POSIX.
|
|
13
37
|
*/
|
|
14
|
-
export declare function
|
|
38
|
+
export declare function observeProcessTable(source?: ProcessTableSource): ProcessTableObservation;
|
|
39
|
+
/** Convenience for probes that require a usable observation. Never returns an empty fallback. */
|
|
40
|
+
export declare function readProcessTable(source?: ProcessTableSource): ProcessTable;
|
|
15
41
|
/** Every process below `pid` in `table`: its children, theirs, and so on. */
|
|
16
42
|
export declare function descendantsOf(table: ProcessTable, pid: number): ProcessEntry[];
|
|
17
43
|
/**
|
|
@@ -21,4 +47,5 @@ export declare function descendantsOf(table: ProcessTable, pid: number): Process
|
|
|
21
47
|
* processes started since the entries were read. Never the host, nor its group.
|
|
22
48
|
*/
|
|
23
49
|
export declare function killEntries(entries: Iterable<ProcessEntry>, table: ProcessTable): void;
|
|
50
|
+
export {};
|
|
24
51
|
//# sourceMappingURL=process-tree.d.ts.map
|