@botiverse/oar 0.79.0 → 0.80.1
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 +8 -3
- package/dist/contracts/install.d.ts +16 -10
- package/dist/contracts/install.d.ts.map +1 -1
- package/dist/contracts/records.d.ts +2 -2
- package/dist/contracts/records.d.ts.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/claude/context-breakdown.js +2 -2
- package/dist/runtimes/claude/context-breakdown.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/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/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/daemon.js +1 -1
- package/dist/runtimes/qoder/daemon.js.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/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/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/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.map +1 -1
- package/dist/shared/acp/process.js +19 -2
- 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 +163 -106
- 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 +4 -0
- package/dist/shared/executable/ownership.d.ts.map +1 -1
- package/dist/shared/executable/ownership.js +44 -5
- 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 +13 -0
- package/dist/shared/executable/process-cleanup.d.ts.map +1 -0
- package/dist/shared/executable/process-cleanup.js +103 -0
- package/dist/shared/executable/process-cleanup.js.map +1 -0
- package/dist/shared/executable/process-shutdown.d.ts +17 -0
- package/dist/shared/executable/process-shutdown.d.ts.map +1 -0
- package/dist/shared/executable/process-shutdown.js +115 -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 +37 -2
- package/dist/shared/executable/process-tree.d.ts.map +1 -1
- package/dist/shared/executable/process-tree.js +123 -21
- package/dist/shared/executable/process-tree.js.map +1 -1
- package/dist/shared/executable/process.d.ts +7 -45
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +27 -143
- 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.map +1 -1
- package/dist/shared/install-npm.js +31 -4
- package/dist/shared/install-npm.js.map +1 -1
- package/dist/shared/install.d.ts +1 -1
- package/dist/shared/install.js +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/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.js","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"process.js","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sources":["../../../src/shared/executable/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"run.d.ts","sources":["../../../src/shared/executable/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,KAAK,kBAAkB,EAA+D,MAAM,kBAAkB,CAAC;AAGjJ,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAC;CAC3C;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,yEAAyE;IACzE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;CAC/B;AAED,MAAM,MAAM,gBAAgB,GAAG,CAC7B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,oBAAoB,KAC3B,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAI/B,eAAO,MAAM,aAAa,EAAE,gBAoG3B,CAAC"}
|
|
@@ -8,10 +8,14 @@ export const runExecutable = async (executable, args, options = {}) => {
|
|
|
8
8
|
// execFile does not forward `detached` to spawn. Own the actual process
|
|
9
9
|
// group here too, so a hung probe's tools cannot outlive the host.
|
|
10
10
|
const result = await new Promise((resolve) => {
|
|
11
|
+
const startedAt = performance.now();
|
|
11
12
|
let stdout = Buffer.alloc(0);
|
|
12
13
|
let stderr = Buffer.alloc(0);
|
|
13
14
|
let failure = null;
|
|
14
15
|
let timedOut = false;
|
|
16
|
+
let exitObservation = null;
|
|
17
|
+
let closeObserved = false;
|
|
18
|
+
let timeoutObservation = null;
|
|
15
19
|
let stopped = false;
|
|
16
20
|
let timer = null;
|
|
17
21
|
let escalation = null;
|
|
@@ -26,6 +30,7 @@ export const runExecutable = async (executable, args, options = {}) => {
|
|
|
26
30
|
...(ok ? {} : { diagnostics: {
|
|
27
31
|
exitCode, signal, stderr: stderrTail(stderr.toString("utf8")),
|
|
28
32
|
...(timedOut ? { timeoutMs } : {}),
|
|
33
|
+
...(timeoutObservation === null ? {} : { timeoutObservation }),
|
|
29
34
|
...(failure === null ? {} : { error: failure }),
|
|
30
35
|
} }),
|
|
31
36
|
});
|
|
@@ -78,9 +83,18 @@ export const runExecutable = async (executable, args, options = {}) => {
|
|
|
78
83
|
child.stdout.on("data", (chunk) => { stdout = append(stdout, chunk, "stdout"); });
|
|
79
84
|
child.stderr.on("data", (chunk) => { stderr = append(stderr, chunk, "stderr"); });
|
|
80
85
|
child.once("error", (error) => { failure ??= nativeError(error); });
|
|
81
|
-
child.once("
|
|
86
|
+
child.once("exit", (exitCode, signal) => {
|
|
87
|
+
exitObservation = { at: new Date().toISOString(), elapsedMs: performance.now() - startedAt, exitCode, signal };
|
|
88
|
+
});
|
|
89
|
+
child.once("close", (code, signal) => { closeObserved = true; complete(code, signal); });
|
|
82
90
|
if (timeoutMs > 0) {
|
|
83
|
-
timer = setTimeout(() => {
|
|
91
|
+
timer = setTimeout(() => {
|
|
92
|
+
timedOut = true;
|
|
93
|
+
// Preserve the deadline's facts even when cleanup later produces exit and close.
|
|
94
|
+
timeoutObservation = { at: new Date().toISOString(), elapsedMs: performance.now() - startedAt,
|
|
95
|
+
exit: exitObservation, closeObserved };
|
|
96
|
+
stop?.();
|
|
97
|
+
}, timeoutMs);
|
|
84
98
|
timer.unref();
|
|
85
99
|
}
|
|
86
100
|
options.signal?.addEventListener("abort", onAbort, { once: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sources":["../../../src/shared/executable/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtH,OAAO,EAAE,WAAW,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"run.js","sources":["../../../src/shared/executable/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-npm.d.ts","sources":["../../src/shared/install-npm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"install-npm.d.ts","sources":["../../src/shared/install-npm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAmC,MAAM,yBAAyB,CAAC;AAE/F,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAMpE,yFAAyF;AACzF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAUD,8HAA8H;AAC9H,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0BxG;AAED,sGAAsG;AACtG,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,MAAM,CAEjG;AAED,mJAAmJ;AACnJ,wBAAgB,cAAc,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,GAAE,WAAgC,GAAG,cAAc,CA4B/G"}
|
|
@@ -3,6 +3,14 @@ import { runExecutable } from "./executable/index.js";
|
|
|
3
3
|
import { defaultInstallHost } from "./install.js";
|
|
4
4
|
import { updaterEnv } from "./update.js";
|
|
5
5
|
import { privateTempDir } from "./private-temp.js";
|
|
6
|
+
const PREFIX_TIMEOUT_MS = 15_000;
|
|
7
|
+
/** Only controlled categories reach a plan; native output and error messages stay private. */
|
|
8
|
+
class NpmPrefixError extends Error {
|
|
9
|
+
constructor(category) {
|
|
10
|
+
super(`Could not determine npm's global installation directory: ${category}.`);
|
|
11
|
+
this.name = "NpmPrefixError";
|
|
12
|
+
}
|
|
13
|
+
}
|
|
6
14
|
/** Read npm's own configuration, including environment and user/global npmrc, without installing or retaining cache files. */
|
|
7
15
|
export async function npmGlobalPrefix(npm, env = process.env) {
|
|
8
16
|
// npm eagerly creates cache files even for prefix. Keep them in OAR's
|
|
@@ -10,11 +18,23 @@ export async function npmGlobalPrefix(npm, env = process.env) {
|
|
|
10
18
|
const cache = await privateTempDir("oar-npm-prefix-");
|
|
11
19
|
try {
|
|
12
20
|
const result = await runExecutable(npm, ["prefix", "-g", "--cache", cache.path, "--loglevel=error", "--logs-max=0", "--timing=false", "--update-notifier=false"], {
|
|
13
|
-
env: updaterEnv(env), timeoutMs:
|
|
21
|
+
env: updaterEnv(env), timeoutMs: PREFIX_TIMEOUT_MS,
|
|
14
22
|
});
|
|
23
|
+
if (!result.ok) {
|
|
24
|
+
if (result.diagnostics?.timeoutMs !== undefined) {
|
|
25
|
+
throw new NpmPrefixError(`query timed out after ${String(PREFIX_TIMEOUT_MS)} ms`);
|
|
26
|
+
}
|
|
27
|
+
if (result.exitCode !== null) {
|
|
28
|
+
throw new NpmPrefixError(`query exited with code ${String(result.exitCode)}`);
|
|
29
|
+
}
|
|
30
|
+
throw new NpmPrefixError("query could not start or complete");
|
|
31
|
+
}
|
|
15
32
|
const prefix = result.stdout.replace(/\r?\n$/u, "");
|
|
16
|
-
if (!
|
|
17
|
-
throw new
|
|
33
|
+
if (!path.isAbsolute(prefix)) {
|
|
34
|
+
throw new NpmPrefixError("query output is not an absolute path");
|
|
35
|
+
}
|
|
36
|
+
if (/[\r\n\0]/u.test(prefix)) {
|
|
37
|
+
throw new NpmPrefixError("query output is not a single path");
|
|
18
38
|
}
|
|
19
39
|
return prefix;
|
|
20
40
|
}
|
|
@@ -40,7 +60,14 @@ export function npmInstallPlan(method, host = defaultInstallHost) {
|
|
|
40
60
|
if (npm === null) {
|
|
41
61
|
return { kind: "unsupported", reason: "missing_tool", detail: "npm", steps, source: method.source };
|
|
42
62
|
}
|
|
43
|
-
const prefix = await npmGlobalPrefix(npm)
|
|
63
|
+
const prefix = await npmGlobalPrefix(npm).catch((error) => ({
|
|
64
|
+
kind: "unsupported", reason: "location_unknown",
|
|
65
|
+
detail: error instanceof NpmPrefixError ? error.message : new NpmPrefixError("local query failed").message,
|
|
66
|
+
steps, source: method.source,
|
|
67
|
+
}));
|
|
68
|
+
if (typeof prefix !== "string") {
|
|
69
|
+
return prefix;
|
|
70
|
+
}
|
|
44
71
|
const library = host.platform === "win32" ? path.join(prefix, "node_modules") : path.join(prefix, "lib", "node_modules");
|
|
45
72
|
for (const directory of [prefix, npmGlobalBin(prefix, host.platform), path.join(library, method.packageName)]) {
|
|
46
73
|
const blocked = host.unwritable(directory);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-npm.js","sources":["../../src/shared/install-npm.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAoB,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"install-npm.js","sources":["../../src/shared/install-npm.ts"],"names":[],"mappings":"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"}
|
package/dist/shared/install.d.ts
CHANGED
|
@@ -61,7 +61,7 @@ export declare function unsupportedInstallPlan(unsupported: InstallUnsupported):
|
|
|
61
61
|
export type InstallLineOf = (installation: AvailableInstallation) => string | undefined;
|
|
62
62
|
/**
|
|
63
63
|
* An installer from the runtime's installation probe and its plan. The
|
|
64
|
-
* probe decides both ends: an installation it already finds means
|
|
64
|
+
* probe decides both ends: an installation it already finds means no installer
|
|
65
65
|
* runs (`already_installed`, whichever line was asked for, so a copy of one
|
|
66
66
|
* line is never replaced by another), and after the plan's steps ran, only
|
|
67
67
|
* an available installation it finds is `installed`, whatever the installer
|
package/dist/shared/install.js
CHANGED
|
@@ -150,7 +150,7 @@ function withLine(installation, lineOf) {
|
|
|
150
150
|
}
|
|
151
151
|
/**
|
|
152
152
|
* An installer from the runtime's installation probe and its plan. The
|
|
153
|
-
* probe decides both ends: an installation it already finds means
|
|
153
|
+
* probe decides both ends: an installation it already finds means no installer
|
|
154
154
|
* runs (`already_installed`, whichever line was asked for, so a copy of one
|
|
155
155
|
* line is never replaced by another), and after the plan's steps ran, only
|
|
156
156
|
* an available installation it finds is `installed`, whatever the installer
|
|
@@ -9,6 +9,8 @@ export interface ProcessConfiguration {
|
|
|
9
9
|
readonly configDirectories?: readonly string[];
|
|
10
10
|
/** Set only for a process-level cwd, not a protocol's session-level cwd. */
|
|
11
11
|
readonly cwd?: string;
|
|
12
|
+
/** Serialized connection-level handshake inputs; compared privately, never logged. */
|
|
13
|
+
readonly protocol?: string;
|
|
12
14
|
}
|
|
13
15
|
export interface PooledProcess {
|
|
14
16
|
/** Resolves once at actual process exit, including unexpected exits; never rejects. */
|
|
@@ -16,6 +18,8 @@ export interface PooledProcess {
|
|
|
16
18
|
/** Bounded native/process shutdown. Called only after the last lease is disposed. May be retried after failure. */
|
|
17
19
|
stop(this: void): void | Promise<void>;
|
|
18
20
|
resources(this: void): Promise<SessionResources | null>;
|
|
21
|
+
/** Native/process cleanup observations accompanying actual exit. */
|
|
22
|
+
exitReason?(this: void): string | undefined;
|
|
19
23
|
}
|
|
20
24
|
export interface ProcessLease<T extends PooledProcess> {
|
|
21
25
|
readonly process: T;
|
|
@@ -27,7 +31,7 @@ export interface ProcessLease<T extends PooledProcess> {
|
|
|
27
31
|
resources(this: void): Promise<SessionResources | null>;
|
|
28
32
|
}
|
|
29
33
|
/** One runtime instance's pool. Nothing is global, restarted, or keyed by a runtime name. */
|
|
30
|
-
export declare function createProcessPool<T extends PooledProcess>(start: (configuration: ProcessConfiguration) => Promise<T>): {
|
|
34
|
+
export declare function createProcessPool<T extends PooledProcess>(start: (configuration: ProcessConfiguration, retire: () => void) => T | Promise<T>): {
|
|
31
35
|
acquire(configuration: ProcessConfiguration, placement: "shared" | "isolated"): Promise<ProcessLease<T>>;
|
|
32
36
|
};
|
|
33
37
|
//# sourceMappingURL=process-pool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-pool.d.ts","sources":["../../src/shared/process-pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE7E,0FAA0F;AAC1F,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,2GAA2G;IAC3G,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/C,4EAA4E;IAC5E,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"process-pool.d.ts","sources":["../../src/shared/process-pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE7E,0FAA0F;AAC1F,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,2GAA2G;IAC3G,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/C,4EAA4E;IAC5E,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,sFAAsF;IACtF,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC5B,uFAAuF;IACvF,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,mHAAmH;IACnH,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IACxD,oEAAoE;IACpE,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;CAC7C;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,aAAa;IACnD,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACpB,QAAQ,CAAC,SAAS,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC1C,kGAAkG;IAClG,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,GAAG,WAAW,CAAC;IAC7D,qFAAqF;IACrF,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,GAAG,QAAQ,CAAC,CAAC;IACpD,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;CACzD;AAkED,6FAA6F;AAC7F,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,aAAa,EAAE,KAAK,EAAE,CAAC,aAAa,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG;IAC9I,OAAO,CAAC,aAAa,EAAE,oBAAoB,EAAE,SAAS,EAAE,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;CAC1G,CA6BA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
function configurationKey(config) {
|
|
3
3
|
const values = JSON.stringify([config.command, config.args, Object.entries(config.env).toSorted(([a], [b]) => a < b ? -1 : (a > b ? 1 : 0)),
|
|
4
|
-
config.home, config.configDirectories, config.cwd]);
|
|
4
|
+
config.home, config.configDirectories, config.cwd, config.protocol]);
|
|
5
5
|
return createHash("sha256").update(values).digest("hex");
|
|
6
6
|
}
|
|
7
7
|
async function observeExit(entry, remove) {
|
|
@@ -88,10 +88,18 @@ export function createProcessPool(start) {
|
|
|
88
88
|
const captured = { ...configuration, args: [...configuration.args], env: { ...configuration.env },
|
|
89
89
|
...(configuration.configDirectories === undefined ? {} : { configDirectories: [...configuration.configDirectories] }) };
|
|
90
90
|
const key = configurationKey(captured);
|
|
91
|
+
const retire = (owned) => {
|
|
92
|
+
if (entries.get(key) === owned) {
|
|
93
|
+
entries.delete(key);
|
|
94
|
+
}
|
|
95
|
+
if (!owned.exited) {
|
|
96
|
+
retiring.add(owned);
|
|
97
|
+
}
|
|
98
|
+
};
|
|
91
99
|
let entry = placement === "shared" ? entries.get(key) : undefined;
|
|
92
100
|
if (entry === undefined) {
|
|
93
101
|
// Reserve before asynchronous start so concurrent opens join one promise.
|
|
94
|
-
entry = { ready: (async () => { await Promise.resolve(); return start(captured); })(), leases: 0, exited: false, code: null, listeners: new Set() };
|
|
102
|
+
entry = { ready: (async () => { await Promise.resolve(); return start(captured, () => { retire(created); }); })(), leases: 0, exited: false, code: null, listeners: new Set() };
|
|
95
103
|
if (placement === "shared") {
|
|
96
104
|
entries.set(key, entry);
|
|
97
105
|
}
|
|
@@ -103,12 +111,7 @@ export function createProcessPool(start) {
|
|
|
103
111
|
entry.leases += 1;
|
|
104
112
|
const owned = entry;
|
|
105
113
|
const process = await owned.ready;
|
|
106
|
-
return leaseOf(process, owned, placement, () => {
|
|
107
|
-
if (entries.get(key) === owned) {
|
|
108
|
-
entries.delete(key);
|
|
109
|
-
}
|
|
110
|
-
retiring.add(owned);
|
|
111
|
-
});
|
|
114
|
+
return leaseOf(process, owned, placement, () => { retire(owned); });
|
|
112
115
|
},
|
|
113
116
|
};
|
|
114
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-pool.js","sources":["../../src/shared/process-pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"process-pool.js","sources":["../../src/shared/process-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-session.d.ts","sources":["../../src/shared/process-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAkB,MAAM,yBAAyB,CAAC;AAE5F,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,WAAW,uBAAuB;IACtC,wFAAwF;IACxF,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9D,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAwBD,wFAAwF;AACxF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,gBAAgB,SAAO,GAAG,uBAAuB,
|
|
1
|
+
{"version":3,"file":"process-session.d.ts","sources":["../../src/shared/process-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAkB,MAAM,yBAAyB,CAAC;AAE5F,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,WAAW,uBAAuB;IACtC,wFAAwF;IACxF,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9D,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAwBD,wFAAwF;AACxF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,gBAAgB,SAAO,GAAG,uBAAuB,CA4DjL"}
|
|
@@ -43,7 +43,8 @@ export function processSessionLifecycle(kernel, lease, cleanup, cleanupTimeoutMs
|
|
|
43
43
|
return;
|
|
44
44
|
}
|
|
45
45
|
exitObserved = true;
|
|
46
|
-
|
|
46
|
+
const reason = lease.process.exitReason?.();
|
|
47
|
+
kernel.respond(disposeRequest?.id ?? "", { kind: "exited", code, ...(reason === undefined ? {} : { reason }) });
|
|
47
48
|
};
|
|
48
49
|
const unsubscribe = lease.onExit(recordExit);
|
|
49
50
|
const clean = cleanupQueue(kernel, cleanup, cleanupTimeoutMs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-session.js","sources":["../../src/shared/process-session.ts"],"names":[],"mappings":"AAWA,SAAS,YAAY,CAAC,MAAqB,EAAE,OAA4B,EAAE,SAAiB;IAC1F,IAAI,KAAK,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAC9B,MAAM,GAAG,GAAG,KAAK,EAAE,OAAsB,EAAiB,EAAE;QAC1D,IAAI,KAAK,GAA8C,SAAS,CAAC;QACjE,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAiB,CAAC,OAAO,EAAE,EAAE,GAAG,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,sDAAsD,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtM,MAAM,OAAO,GAAG,CAAC,KAAK,IAA6B,EAAE;YACnD,IAAI,CAAC;gBAAC,MAAM,OAAO,EAAE,CAAC;gBAAC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;YAAC,CAAC;YACtD,OAAO,KAAK,EAAE,CAAC;gBAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAAC,CAAC;QAC9G,CAAC,CAAC,EAAE,CAAC;QACL,IAAI,CAAC;YAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;QAAC,CAAC;gBACjG,CAAC;YAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAAC,CAAC;IAClC,CAAC,CAAC;IACF,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,QAAQ,GAAG,KAAK,CAAC;QACvB,KAAK,GAAG,CAAC,KAAK,IAAmB,EAAE;YACjC,IAAI,CAAC;gBAAC,MAAM,QAAQ,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,qEAAqE,CAAC,CAAC;YACvG,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC,CAAC,EAAE,CAAC;QACL,MAAM,KAAK,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,wFAAwF;AACxF,MAAM,UAAU,uBAAuB,CAAC,MAAqB,EAAE,KAAkC,EAAE,OAA4B,EAAE,gBAAgB,GAAG,IAAI;IACtJ,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,QAAQ,GAA+B,SAAS,CAAC;IACrD,IAAI,cAAc,GAA8B,SAAS,CAAC;IAC1D,IAAI,QAAQ,GAA8B,SAAS,CAAC;IACpD,MAAM,SAAS,GAAG,GAAY,EAAE,CAAC,YAAY,CAAC;IAC9C,MAAM,UAAU,GAAG,CAAC,IAAmB,EAAQ,EAAE;QAC/C,IAAI,YAAY,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAC7B,YAAY,GAAG,IAAI,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"process-session.js","sources":["../../src/shared/process-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ import type { AdapterSession, Session, SessionOptions, StartSession } from "../c
|
|
|
4
4
|
import { type CredentialRedactor } from "./credential-redactor.js";
|
|
5
5
|
import { type SessionKernel } from "./session-kernel.js";
|
|
6
6
|
export interface SessionCredentials extends CredentialRedactor {
|
|
7
|
-
kernel(id: string): SessionKernel;
|
|
8
|
-
seal(adapter: AdapterSession): Session;
|
|
7
|
+
kernel(id: string, extraRedact?: <T>(value: T) => T): SessionKernel;
|
|
8
|
+
seal(adapter: AdapterSession, extraRedact?: <T>(value: T) => T): Session;
|
|
9
9
|
}
|
|
10
10
|
/** Keep opening failures and later adapter errors under the same session credential rules as the record stream. */
|
|
11
11
|
export declare function withSessionCredentials(open: (installation: AvailableInstallation, options: SessionOptions, credentials: SessionCredentials, context: SessionOpenContext) => Promise<Session>, placement?: SessionPlacement): StartSession;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-credentials.d.ts","sources":["../../src/shared/session-credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACrG,OAAO,EAA6B,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9F,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE9E,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"session-credentials.d.ts","sources":["../../src/shared/session-credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACrG,OAAO,EAA6B,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9F,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE9E,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC;IACpE,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;CAC1E;AAoCD,mHAAmH;AACnH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,kBAAkB,EAAE,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,GAAE,gBAA6B,GAAG,YAAY,CAOrP"}
|
|
@@ -1,37 +1,40 @@
|
|
|
1
1
|
import { sessionCredentialRedactor } from "./credential-redactor.js";
|
|
2
2
|
import { sealSession } from "./seal-session.js";
|
|
3
3
|
import { createSessionKernel } from "./session-kernel.js";
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const { add, redact, redactValue } = sessionCredentialRedactor(options);
|
|
7
|
-
const guard = (method) => async (...args) => {
|
|
4
|
+
function guard(method, clean) {
|
|
5
|
+
return async (...args) => {
|
|
8
6
|
try {
|
|
9
7
|
return await method(...args);
|
|
10
8
|
}
|
|
11
9
|
catch (error) {
|
|
12
|
-
throw
|
|
10
|
+
throw clean(error);
|
|
13
11
|
}
|
|
14
12
|
};
|
|
13
|
+
}
|
|
14
|
+
/** Credentials supplied for this session, plus native keys the adapter resolves. No inherited environment or credential-file scan. */
|
|
15
|
+
function sessionCredentials(options, context) {
|
|
16
|
+
const { add, redact, redactValue, values } = sessionCredentialRedactor(options);
|
|
15
17
|
return {
|
|
16
18
|
add,
|
|
19
|
+
values,
|
|
17
20
|
redact,
|
|
18
21
|
redactValue,
|
|
19
|
-
kernel: (id) => { const kernel = createSessionKernel(id, redactValue); kernel.opened(context); return kernel; },
|
|
20
|
-
seal: (adapter) => sealSession({
|
|
22
|
+
kernel: (id, extraRedact) => { const kernel = createSessionKernel(id, extraRedact ?? redactValue); kernel.opened(context); return kernel; },
|
|
23
|
+
seal: (adapter, clean = redactValue) => sealSession({
|
|
21
24
|
...adapter,
|
|
22
25
|
...(adapter.goal === undefined ? {} : { goal: {
|
|
23
|
-
set: guard(adapter.goal.set.bind(adapter.goal)),
|
|
24
|
-
read: guard(adapter.goal.read.bind(adapter.goal)),
|
|
25
|
-
clear: guard(adapter.goal.clear.bind(adapter.goal)),
|
|
26
|
+
set: guard(adapter.goal.set.bind(adapter.goal), clean),
|
|
27
|
+
read: guard(adapter.goal.read.bind(adapter.goal), clean),
|
|
28
|
+
clear: guard(adapter.goal.clear.bind(adapter.goal), clean),
|
|
26
29
|
} }),
|
|
27
|
-
prompt: guard(adapter.prompt.bind(adapter)),
|
|
28
|
-
queue: guard(adapter.queue.bind(adapter)),
|
|
29
|
-
...(adapter.steer === undefined ? {} : { steer: guard(adapter.steer.bind(adapter)) }),
|
|
30
|
-
...(adapter.withdraw === undefined ? {} : { withdraw: guard(adapter.withdraw.bind(adapter)) }),
|
|
31
|
-
abort: guard(adapter.abort.bind(adapter)),
|
|
32
|
-
dispose: guard(adapter.dispose.bind(adapter)),
|
|
33
|
-
...(adapter.contextBreakdown === undefined ? {} : { contextBreakdown: guard(adapter.contextBreakdown.bind(adapter)) }),
|
|
34
|
-
...(adapter.resources === undefined ? {} : { resources: guard(adapter.resources.bind(adapter)) }),
|
|
30
|
+
prompt: guard(adapter.prompt.bind(adapter), clean),
|
|
31
|
+
queue: guard(adapter.queue.bind(adapter), clean),
|
|
32
|
+
...(adapter.steer === undefined ? {} : { steer: guard(adapter.steer.bind(adapter), clean) }),
|
|
33
|
+
...(adapter.withdraw === undefined ? {} : { withdraw: guard(adapter.withdraw.bind(adapter), clean) }),
|
|
34
|
+
abort: guard(adapter.abort.bind(adapter), clean),
|
|
35
|
+
dispose: guard(adapter.dispose.bind(adapter), clean),
|
|
36
|
+
...(adapter.contextBreakdown === undefined ? {} : { contextBreakdown: guard(adapter.contextBreakdown.bind(adapter), clean) }),
|
|
37
|
+
...(adapter.resources === undefined ? {} : { resources: guard(adapter.resources.bind(adapter), clean) }),
|
|
35
38
|
}),
|
|
36
39
|
};
|
|
37
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-credentials.js","sources":["../../src/shared/session-credentials.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAA2B,MAAM,0BAA0B,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAsB,MAAM,qBAAqB,CAAC;AAO9E,
|
|
1
|
+
{"version":3,"file":"session-credentials.js","sources":["../../src/shared/session-credentials.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,8 @@ import type { SessionOpenContext } from "../contracts/placement.js";
|
|
|
2
2
|
import type { ControlResult, Cursor, FrameBody, Frame, RequestBody, RequestDirection, RequestRecord, ResponseBody, ResponseRecord, SessionEdge, SessionGraph, RuntimeEventBody, RawEventObserver, RawEvent, Unsubscribe } from "../contracts/session.js";
|
|
3
3
|
/** Where a record sits: another session id for derived children, a sub-agent path, a runtime-native span id. */
|
|
4
4
|
export interface RecordAt {
|
|
5
|
+
/** Original adapter ingress time for frames buffered until native ownership is known. */
|
|
6
|
+
readonly receivedAt?: number;
|
|
5
7
|
readonly sessionId?: string;
|
|
6
8
|
readonly agentPath?: readonly string[];
|
|
7
9
|
readonly spanId?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-kernel.d.ts","sources":["../../src/shared/session-kernel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,OAAO,KAAK,EACV,aAAa,EACb,MAAM,EACN,SAAS,EACT,KAAK,EACL,WAAW,EACX,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,cAAc,EACd,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,EAChB,QAAQ,EACR,WAAW,EACZ,MAAM,yBAAyB,CAAC;AAEjC,gHAAgH;AAChH,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,sFAAsF;IACtF,MAAM,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C,8DAA8D;IAC9D,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC;IAC7C,gHAAgH;IAChH,OAAO,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG;QAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,aAAa,CAAC;IACjH,iDAAiD;IACjD,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,cAAc,CAAC;IAC9E;;;;;;OAMG;IACH,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC5I;;;;;;OAMG;IACH,WAAW,IAAI;QAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,UAAU,GAAG,kBAAkB,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChJ,SAAS,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IACpE,OAAO,IAAI,SAAS,QAAQ,EAAE,CAAC;IAC/B,KAAK,IAAI,YAAY,CAAC;IACtB,6IAA6I;IAC7I,IAAI,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC;CACzF;AAqBD,mIAAmI;AACnI,wBAAgB,mBAAmB,CAAC,SAAS,GAAE,MAAuC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,QAAQ,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,aAAa,CAoHpJ"}
|
|
1
|
+
{"version":3,"file":"session-kernel.d.ts","sources":["../../src/shared/session-kernel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,OAAO,KAAK,EACV,aAAa,EACb,MAAM,EACN,SAAS,EACT,KAAK,EACL,WAAW,EACX,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,cAAc,EACd,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,EAChB,QAAQ,EACR,WAAW,EACZ,MAAM,yBAAyB,CAAC;AAEjC,gHAAgH;AAChH,MAAM,WAAW,QAAQ;IACvB,yFAAyF;IACzF,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,sFAAsF;IACtF,MAAM,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C,8DAA8D;IAC9D,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC;IAC7C,gHAAgH;IAChH,OAAO,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG;QAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,aAAa,CAAC;IACjH,iDAAiD;IACjD,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,cAAc,CAAC;IAC9E;;;;;;OAMG;IACH,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC5I;;;;;;OAMG;IACH,WAAW,IAAI;QAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,UAAU,GAAG,kBAAkB,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChJ,SAAS,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IACpE,OAAO,IAAI,SAAS,QAAQ,EAAE,CAAC;IAC/B,KAAK,IAAI,YAAY,CAAC;IACtB,6IAA6I;IAC7I,IAAI,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC;CACzF;AAqBD,mIAAmI;AACnI,wBAAgB,mBAAmB,CAAC,SAAS,GAAE,MAAuC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,QAAQ,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,aAAa,CAoHpJ"}
|
|
@@ -54,7 +54,7 @@ export function createSessionKernel(sessionId = globalThis.crypto.randomUUID(),
|
|
|
54
54
|
agentPath: at?.agentPath ?? [],
|
|
55
55
|
...(spanId === undefined ? {} : { spanId }),
|
|
56
56
|
seq,
|
|
57
|
-
receivedAt: Date.now(),
|
|
57
|
+
receivedAt: at?.receivedAt ?? Date.now(),
|
|
58
58
|
});
|
|
59
59
|
seq += 1;
|
|
60
60
|
const retained = redact === undefined ? record : redact(record);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-kernel.js","sources":["../../src/shared/session-kernel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"session-kernel.js","sources":["../../src/shared/session-kernel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/shared/stream-json/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA8C,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAKtG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/shared/stream-json/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA8C,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAKtG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,EAA4B,KAAK,yBAAyB,EAAE,MAAM,YAAY,CAAC;AACtF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAY7D,sGAAsG;AACtG,wBAAsB,iBAAiB,CAAC,CAAC,SAAS,yBAAyB,EACzE,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,kBAAkB,EAC/B,OAAO,EAAE,wBAAwB,CAAC,CAAC,CAAC,GACnC,OAAO,CAAC,OAAO,CAAC,CAwOlB"}
|
|
@@ -2,6 +2,7 @@ import { createAbortFallback } from "../abort-fallback.js";
|
|
|
2
2
|
import { withInputImages } from "../input-images.js";
|
|
3
3
|
import { withdrawControl } from "../held-input.js";
|
|
4
4
|
import { asRecord, parseJson } from "../json.js";
|
|
5
|
+
import { appendCleanupFailure, cleanupFailureReason } from "../executable/process-cleanup.js";
|
|
5
6
|
import { streamJsonUserMessage, streamJsonPrompted } from "./input-lifecycle.js";
|
|
6
7
|
import { foldStreamJsonStdout } from "./projection.js";
|
|
7
8
|
import { streamJsonAbortRequested } from "./state.js";
|
|
@@ -131,10 +132,11 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
131
132
|
}
|
|
132
133
|
}
|
|
133
134
|
});
|
|
134
|
-
child.onExit((code) => {
|
|
135
|
+
child.onExit((code, cleanupReason) => {
|
|
135
136
|
abortFallback.clear();
|
|
136
137
|
// An exit before fallback still precedes the rejected pending controls.
|
|
137
|
-
const
|
|
138
|
+
const reasons = [profile.exitReason?.(), cleanupReason].filter((value) => value !== undefined);
|
|
139
|
+
const reason = reasons.length === 0 ? undefined : reasons.join("; ");
|
|
138
140
|
kernel.respond(disposeRequest?.id ?? "", { kind: "exited", code, ...(reason === undefined ? {} : { reason }) });
|
|
139
141
|
state.active = null;
|
|
140
142
|
state.spontaneous = false;
|
|
@@ -144,7 +146,12 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
144
146
|
}
|
|
145
147
|
profile.exited(code);
|
|
146
148
|
});
|
|
147
|
-
|
|
149
|
+
try {
|
|
150
|
+
await profile.open({ current: () => state.projection, replace: (projection) => { state.projection = projection; }, report: (body) => { kernel.frame(body); } });
|
|
151
|
+
}
|
|
152
|
+
catch (error) {
|
|
153
|
+
throw appendCleanupFailure(error, cleanupFailureReason(child.diagnostics().cleanup));
|
|
154
|
+
}
|
|
148
155
|
let interruptCounter = 0;
|
|
149
156
|
const capabilities = profile.capabilities;
|
|
150
157
|
const session = credentials.seal({
|