@botiverse/oar 0.117.0 → 0.120.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/dist/contracts/inventory.d.ts +7 -0
- package/dist/contracts/inventory.d.ts.map +1 -1
- package/dist/runtimes/antigravity/skill-files.d.ts +8 -0
- package/dist/runtimes/antigravity/skill-files.d.ts.map +1 -0
- package/dist/runtimes/antigravity/skill-files.js +126 -0
- package/dist/runtimes/antigravity/skill-files.js.map +1 -0
- package/dist/runtimes/antigravity/skill-manifests.d.ts +11 -0
- package/dist/runtimes/antigravity/skill-manifests.d.ts.map +1 -0
- package/dist/runtimes/antigravity/skill-manifests.js +97 -0
- package/dist/runtimes/antigravity/skill-manifests.js.map +1 -0
- package/dist/runtimes/antigravity/skill-metadata.d.ts +9 -0
- package/dist/runtimes/antigravity/skill-metadata.d.ts.map +1 -0
- package/dist/runtimes/antigravity/skill-metadata.js +57 -0
- package/dist/runtimes/antigravity/skill-metadata.js.map +1 -0
- package/dist/runtimes/antigravity/skills.d.ts +1 -1
- package/dist/runtimes/antigravity/skills.d.ts.map +1 -1
- package/dist/runtimes/antigravity/skills.js +9 -2
- package/dist/runtimes/antigravity/skills.js.map +1 -1
- package/dist/runtimes/claude/inventory.d.ts +17 -0
- package/dist/runtimes/claude/inventory.d.ts.map +1 -1
- package/dist/runtimes/claude/inventory.js +76 -3
- package/dist/runtimes/claude/inventory.js.map +1 -1
- package/dist/runtimes/cursor/projection.d.ts.map +1 -1
- package/dist/runtimes/cursor/projection.js +8 -1
- package/dist/runtimes/cursor/projection.js.map +1 -1
- package/dist/runtimes/devin/skills.js +1 -1
- package/dist/runtimes/devin/skills.js.map +1 -1
- package/dist/runtimes/dsh/skills.d.ts.map +1 -1
- package/dist/runtimes/dsh/skills.js +2 -1
- package/dist/runtimes/dsh/skills.js.map +1 -1
- package/dist/runtimes/factory/skills.d.ts.map +1 -1
- package/dist/runtimes/factory/skills.js +1 -0
- package/dist/runtimes/factory/skills.js.map +1 -1
- package/dist/runtimes/grok/inventory.d.ts.map +1 -1
- package/dist/runtimes/grok/inventory.js +2 -1
- package/dist/runtimes/grok/inventory.js.map +1 -1
- package/dist/runtimes/opencode/skill-diagnostic.d.ts +3 -0
- package/dist/runtimes/opencode/skill-diagnostic.d.ts.map +1 -0
- package/dist/runtimes/opencode/skill-diagnostic.js +25 -0
- package/dist/runtimes/opencode/skill-diagnostic.js.map +1 -0
- package/dist/runtimes/opencode/skill-scope.d.ts +2 -1
- package/dist/runtimes/opencode/skill-scope.d.ts.map +1 -1
- package/dist/runtimes/opencode/skill-scope.js +6 -4
- package/dist/runtimes/opencode/skill-scope.js.map +1 -1
- package/dist/runtimes/opencode/skills-v1.d.ts +4 -0
- package/dist/runtimes/opencode/skills-v1.d.ts.map +1 -0
- package/dist/runtimes/opencode/skills-v1.js +38 -0
- package/dist/runtimes/opencode/skills-v1.js.map +1 -0
- package/dist/runtimes/opencode/skills.d.ts.map +1 -1
- package/dist/runtimes/opencode/skills.js +16 -19
- package/dist/runtimes/opencode/skills.js.map +1 -1
- package/dist/runtimes/opencode/version.d.ts +2 -1
- package/dist/runtimes/opencode/version.d.ts.map +1 -1
- package/dist/runtimes/opencode/version.js +3 -3
- package/dist/runtimes/opencode/version.js.map +1 -1
- package/dist/runtimes/pi/inventory.d.ts.map +1 -1
- package/dist/runtimes/pi/inventory.js +2 -1
- package/dist/runtimes/pi/inventory.js.map +1 -1
- package/dist/runtimes/pi/rpc/readers.js +1 -1
- package/dist/runtimes/pi/rpc/readers.js.map +1 -1
- package/dist/runtimes/qwen/context-usage.d.ts +15 -0
- package/dist/runtimes/qwen/context-usage.d.ts.map +1 -0
- package/dist/runtimes/qwen/context-usage.js +77 -0
- package/dist/runtimes/qwen/context-usage.js.map +1 -0
- package/dist/runtimes/qwen/list-models.d.ts.map +1 -1
- package/dist/runtimes/qwen/list-models.js +38 -4
- package/dist/runtimes/qwen/list-models.js.map +1 -1
- package/dist/runtimes/qwen/session.d.ts.map +1 -1
- package/dist/runtimes/qwen/session.js +7 -2
- package/dist/runtimes/qwen/session.js.map +1 -1
- package/dist/runtimes/qwen/skills.js +2 -2
- package/dist/runtimes/qwen/skills.js.map +1 -1
- package/dist/shared/executable/run.d.ts +2 -0
- package/dist/shared/executable/run.d.ts.map +1 -1
- package/dist/shared/executable/run.js +3 -3
- package/dist/shared/executable/run.js.map +1 -1
- package/dist/shared/install.d.ts.map +1 -1
- package/dist/shared/install.js +2 -0
- package/dist/shared/install.js.map +1 -1
- package/dist/shared/installation.d.ts +1 -0
- package/dist/shared/installation.d.ts.map +1 -1
- package/dist/shared/installation.js +102 -3
- package/dist/shared/installation.js.map +1 -1
- package/dist/shared/stream-json/permission.d.ts +6 -0
- package/dist/shared/stream-json/permission.d.ts.map +1 -0
- package/dist/shared/stream-json/permission.js +12 -0
- package/dist/shared/stream-json/permission.js.map +1 -0
- package/dist/shared/stream-json/profile.d.ts +3 -0
- package/dist/shared/stream-json/profile.d.ts.map +1 -1
- package/dist/shared/stream-json/result-readback.d.ts +15 -0
- package/dist/shared/stream-json/result-readback.d.ts.map +1 -0
- package/dist/shared/stream-json/result-readback.js +74 -0
- package/dist/shared/stream-json/result-readback.js.map +1 -0
- package/dist/shared/stream-json/session.d.ts.map +1 -1
- package/dist/shared/stream-json/session.js +42 -35
- package/dist/shared/stream-json/session.js.map +1 -1
- package/dist/shared/update.d.ts.map +1 -1
- package/dist/shared/update.js +2 -0
- package/dist/shared/update.js.map +1 -1
- package/package.json +3 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { environmentValue, sessionEnvironment } from "./environment.js";
|
|
2
|
-
import {
|
|
2
|
+
import { createHash } from "node:crypto";
|
|
3
|
+
import { existsSync, realpathSync, statSync } from "node:fs";
|
|
3
4
|
import path from "node:path";
|
|
4
5
|
import { readExecutableVersion, resolveExecutable, resolveExecutableAll, runExecutable, } from "./executable/index.js";
|
|
5
6
|
import { assertRan } from "./executable/diagnostics.js";
|
|
@@ -67,6 +68,82 @@ function locateCandidate(entry, env) {
|
|
|
67
68
|
}
|
|
68
69
|
return locateOnPath(entry, env);
|
|
69
70
|
}
|
|
71
|
+
/**
|
|
72
|
+
* What a probe learned by running an executable (readiness passed, its
|
|
73
|
+
* version), kept while the file it resolves to is unchanged. Hosts call
|
|
74
|
+
* `installation()` often (Raft before every usage read and inventory), and a
|
|
75
|
+
* Node or Python CLI start costs seconds (codebuddy ~3.6 s, kimi ~1.7 s on
|
|
76
|
+
* 2026-11-18). An upgrade by npm, uv, Homebrew, the native installer or a
|
|
77
|
+
* staged self-update replaces the resolved file, which changes its identity
|
|
78
|
+
* here, so the next probe runs again. Version-manager shims are never cached
|
|
79
|
+
* (their file stays put across upgrades). OAR's own install and upgrade clear
|
|
80
|
+
* the cache explicitly. Lookups follow the caller's environment: the command is
|
|
81
|
+
* resolved first, the key covers the whole environment (a readiness check can
|
|
82
|
+
* depend on HOME or a runtime's own home variable), and a missing executable
|
|
83
|
+
* is never cached. A self-updater that swaps a staged binary in at its next
|
|
84
|
+
* start (kimi) is seen once something starts it again, such as a session or
|
|
85
|
+
* a usage read. Only successful runs with a version are kept: a failure or
|
|
86
|
+
* a missing version may be transient.
|
|
87
|
+
*/
|
|
88
|
+
const runCache = new Map();
|
|
89
|
+
export function clearInstallationCache() {
|
|
90
|
+
runCache.clear();
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* Version-manager shims (Volta, asdf, mise, rtx, pyenv, rbenv, nodenv) keep
|
|
94
|
+
* the same file at the command path while the tool behind it changes, so
|
|
95
|
+
* their identity says nothing about the version: never cached.
|
|
96
|
+
*/
|
|
97
|
+
const SHIM_DIRECTORY = /[\\/](?:shims|\.?volta[\\/]bin)[\\/][^\\/]+$/iu;
|
|
98
|
+
const SHIM_BINARY = /^(?:volta-shim|mise|rtx|asdf)(?:\.exe)?$/iu;
|
|
99
|
+
function isVersionManagerShim(command, file) {
|
|
100
|
+
return SHIM_DIRECTORY.test(command) || SHIM_DIRECTORY.test(file) || SHIM_BINARY.test(path.basename(file));
|
|
101
|
+
}
|
|
102
|
+
function fileIdentity(command) {
|
|
103
|
+
try {
|
|
104
|
+
const file = realpathSync.native(command);
|
|
105
|
+
if (isVersionManagerShim(command, file)) {
|
|
106
|
+
return null;
|
|
107
|
+
}
|
|
108
|
+
const stat = statSync(file, { bigint: true });
|
|
109
|
+
return `${file}\0${stat.dev}\0${stat.ino}\0${stat.size}\0${stat.mtimeNs}\0${stat.ctimeNs}`;
|
|
110
|
+
}
|
|
111
|
+
catch {
|
|
112
|
+
return null;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
function runKey(command, readiness, options, env) {
|
|
116
|
+
// A custom version reader is a closure whose identity cannot be keyed safely.
|
|
117
|
+
if (options.readVersion !== undefined) {
|
|
118
|
+
return null;
|
|
119
|
+
}
|
|
120
|
+
// The whole environment: a readiness check can depend on HOME, a runtime's own home variable or NODE_OPTIONS, not only PATH.
|
|
121
|
+
const environment = createHash("sha256").update(JSON.stringify(Object.entries(env).toSorted(([a], [b]) => a.localeCompare(b, "en")))).digest("hex");
|
|
122
|
+
return JSON.stringify([command, readiness ?? null, environment]);
|
|
123
|
+
}
|
|
124
|
+
function cachedVersion(key, command) {
|
|
125
|
+
if (key === null) {
|
|
126
|
+
return undefined;
|
|
127
|
+
}
|
|
128
|
+
const hit = runCache.get(key);
|
|
129
|
+
const identity = fileIdentity(command);
|
|
130
|
+
return hit !== undefined && identity !== null && hit.identity === identity ? hit.version : undefined;
|
|
131
|
+
}
|
|
132
|
+
function remember(key, command, identity, version) {
|
|
133
|
+
if (key !== null && identity !== null && version !== undefined && fileIdentity(command) === identity) {
|
|
134
|
+
runCache.set(key, { identity, version });
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
function snapshotOf({ command, shadowed }, version) {
|
|
138
|
+
const snapshot = {
|
|
139
|
+
kind: "available",
|
|
140
|
+
via: "executable",
|
|
141
|
+
command,
|
|
142
|
+
...(version === undefined ? {} : { version }),
|
|
143
|
+
...(shadowed.length === 0 ? {} : { shadowed }),
|
|
144
|
+
};
|
|
145
|
+
return snapshot;
|
|
146
|
+
}
|
|
70
147
|
async function versionSnapshot({ command, shadowed }, options, env) {
|
|
71
148
|
const version = await readExecutableVersion(command, options.versionTimeoutMs, options.readVersion, env);
|
|
72
149
|
const snapshot = {
|
|
@@ -109,16 +186,38 @@ export function executableInstallation(envVar, command, fallbacks = [], readines
|
|
|
109
186
|
return { kind: "not_found" };
|
|
110
187
|
}
|
|
111
188
|
if (readiness === undefined) {
|
|
112
|
-
return
|
|
189
|
+
return cachedSnapshot(first, undefined, options, env, async () => {
|
|
190
|
+
const snapshot = await versionSnapshot(first, options, env);
|
|
191
|
+
return snapshot;
|
|
192
|
+
});
|
|
113
193
|
}
|
|
114
194
|
for (const candidate of found) {
|
|
195
|
+
const key = runKey(candidate.command, readiness, options, env);
|
|
196
|
+
const cached = cachedVersion(key, candidate.command);
|
|
197
|
+
if (cached !== undefined) {
|
|
198
|
+
return snapshotOf(candidate, cached);
|
|
199
|
+
}
|
|
200
|
+
const identity = fileIdentity(candidate.command);
|
|
115
201
|
const result = await runExecutable(candidate.command, readiness, { env, ...(options.readinessTimeoutMs === undefined ? {} : { timeoutMs: options.readinessTimeoutMs }) });
|
|
116
202
|
assertRan(result, `Failed to run ${candidate.command} ${readiness.join(" ")}`);
|
|
117
203
|
if (result.ok) {
|
|
118
|
-
|
|
204
|
+
const snapshot = await versionSnapshot(candidate, options, env);
|
|
205
|
+
remember(key, candidate.command, identity, snapshot.version);
|
|
206
|
+
return snapshot;
|
|
119
207
|
}
|
|
120
208
|
}
|
|
121
209
|
return { kind: "unsupported", reason: `${readiness.join(" ")} failed` };
|
|
122
210
|
};
|
|
123
211
|
}
|
|
212
|
+
async function cachedSnapshot(candidate, readiness, options, env, probe) {
|
|
213
|
+
const key = runKey(candidate.command, readiness, options, env);
|
|
214
|
+
const cached = cachedVersion(key, candidate.command);
|
|
215
|
+
if (cached !== undefined) {
|
|
216
|
+
return snapshotOf(candidate, cached);
|
|
217
|
+
}
|
|
218
|
+
const identity = fileIdentity(candidate.command);
|
|
219
|
+
const snapshot = await probe();
|
|
220
|
+
remember(key, candidate.command, identity, snapshot.version);
|
|
221
|
+
return snapshot;
|
|
222
|
+
}
|
|
124
223
|
//# sourceMappingURL=installation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation.js","sources":["../../src/shared/installation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"installation.js","sources":["../../src/shared/installation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { LineProcess } from "../executable/index.js";
|
|
2
|
+
import { type JsonRecord } from "../json.js";
|
|
3
|
+
import type { SessionKernel } from "../session-kernel.js";
|
|
4
|
+
/** Record a native app request and, where supported, the dialect's permission response. */
|
|
5
|
+
export declare function streamJsonAppRequest(kernel: SessionKernel, child: Pick<LineProcess, "write">, id: string, type: string, message: JsonRecord, permissionResponse?: (requestId: string, request: JsonRecord) => JsonRecord | null): void;
|
|
6
|
+
//# sourceMappingURL=permission.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"permission.d.ts","sources":["../../../src/shared/stream-json/permission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,2FAA2F;AAC3F,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAC1I,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,KAAK,UAAU,GAAG,IAAI,GAAG,IAAI,CAQ1F"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { asRecord } from "../json.js";
|
|
2
|
+
/** Record a native app request and, where supported, the dialect's permission response. */
|
|
3
|
+
export function streamJsonAppRequest(kernel, child, id, type, message, permissionResponse) {
|
|
4
|
+
kernel.request("toApp", { kind: "native", type, native: message }, { id });
|
|
5
|
+
const request = asRecord(message.request);
|
|
6
|
+
const reply = type === "can_use_tool" && request !== null ? permissionResponse?.(id, request) : undefined;
|
|
7
|
+
if (reply !== undefined && reply !== null) {
|
|
8
|
+
child.write(`${JSON.stringify(reply)}\n`);
|
|
9
|
+
kernel.respond(id, { kind: "accepted", native: reply });
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=permission.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"permission.js","sources":["../../../src/shared/stream-json/permission.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AAGvD,2FAA2F;AAC3F,MAAM,UAAU,oBAAoB,CAAC,MAAqB,EAAE,KAAiC,EAAE,EAAU,EAAE,IAAY,EAAE,OAAmB,EAC1I,kBAAkF;IAClF,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,IAAI,KAAK,cAAc,IAAI,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,kBAAkB,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1G,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC1C,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { SessionKernel } from "../session-kernel.js";
|
|
1
2
|
import type { CompactionOperation } from "../manual-compaction.js";
|
|
2
3
|
import type { RuntimeEventBody, TurnOutcome, SessionCapabilities, Session, FrameBody, RequestRecord, ResponseBody } from "../../contracts/session.js";
|
|
3
4
|
import type { LoadedImage } from "../input-images.js";
|
|
@@ -56,6 +57,8 @@ export interface StreamJsonSessionProfile<S extends StreamJsonProjectionState> {
|
|
|
56
57
|
replace(state: S): void;
|
|
57
58
|
report(body: FrameBody): void;
|
|
58
59
|
}) => Promise<void>;
|
|
60
|
+
/** Read native settlement facts before publishing root turn end and draining queued input. Must settle on exit/disposal. */
|
|
61
|
+
readonly beforeRootResult?: (kernel: SessionKernel, state: S) => Promise<void> | void;
|
|
59
62
|
readonly exited: (code: number | null) => void;
|
|
60
63
|
/** Why OAR terminated its owned process; absent for an independent native exit. */
|
|
61
64
|
readonly exitReason?: () => string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.d.ts","sources":["../../../src/shared/stream-json/profile.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"profile.d.ts","sources":["../../../src/shared/stream-json/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { LineProcess } from "../executable/index.js";
|
|
2
|
+
import { type JsonRecord } from "../json.js";
|
|
3
|
+
/** Keep native controls outside this queue: their replies may be what settlement awaits. */
|
|
4
|
+
export declare function streamJsonResultReadback(child: LineProcess, callbacks: {
|
|
5
|
+
consume(message: JsonRecord): boolean;
|
|
6
|
+
exiting(code: number | null): void;
|
|
7
|
+
before(): Promise<void> | void;
|
|
8
|
+
process(message: JsonRecord, receivedAt: number): void;
|
|
9
|
+
exited(code: number | null, reason?: string): void;
|
|
10
|
+
}): {
|
|
11
|
+
listen(): void;
|
|
12
|
+
settling(): boolean;
|
|
13
|
+
hasExited(): boolean;
|
|
14
|
+
};
|
|
15
|
+
//# sourceMappingURL=result-readback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"result-readback.d.ts","sources":["../../../src/shared/stream-json/result-readback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAuB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAElE,4FAA4F;AAC5F,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE;IACtE,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC;IACtC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IACnC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC/B,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACvD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpD,GAAG;IACF,MAAM,IAAI,IAAI,CAAC;IACf,QAAQ,IAAI,OAAO,CAAC;IACpB,SAAS,IAAI,OAAO,CAAC;CACtB,CAoDA"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { asRecord, parseJson } from "../json.js";
|
|
2
|
+
/** Keep native controls outside this queue: their replies may be what settlement awaits. */
|
|
3
|
+
export function streamJsonResultReadback(child, callbacks) {
|
|
4
|
+
const buffered = [];
|
|
5
|
+
let settling = false;
|
|
6
|
+
let exited = false;
|
|
7
|
+
let deferredExit = null;
|
|
8
|
+
const receive = (message, receivedAt) => {
|
|
9
|
+
if (settling) {
|
|
10
|
+
buffered.push({ message, receivedAt });
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
const rootResult = message.type === "result" && (typeof message.parent_tool_use_id !== "string" || message.parent_tool_use_id.length === 0);
|
|
14
|
+
if (rootResult && !exited) {
|
|
15
|
+
settling = true;
|
|
16
|
+
const waiting = callbacks.before();
|
|
17
|
+
if (waiting !== undefined) {
|
|
18
|
+
void (async () => {
|
|
19
|
+
try {
|
|
20
|
+
await waiting;
|
|
21
|
+
}
|
|
22
|
+
finally {
|
|
23
|
+
settling = false;
|
|
24
|
+
callbacks.process(message, receivedAt);
|
|
25
|
+
drain();
|
|
26
|
+
if (deferredExit !== null) {
|
|
27
|
+
callbacks.exited(deferredExit.code, deferredExit.reason);
|
|
28
|
+
deferredExit = null;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
})();
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
settling = false;
|
|
35
|
+
}
|
|
36
|
+
callbacks.process(message, receivedAt);
|
|
37
|
+
};
|
|
38
|
+
function drain() {
|
|
39
|
+
for (;;) {
|
|
40
|
+
if (settling) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const next = buffered.shift();
|
|
44
|
+
if (next === undefined) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
receive(next.message, next.receivedAt);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return {
|
|
51
|
+
settling: () => settling, hasExited: () => exited,
|
|
52
|
+
listen() {
|
|
53
|
+
child.onLine(line => {
|
|
54
|
+
const message = asRecord(parseJson(line));
|
|
55
|
+
if (message !== null && !callbacks.consume(message)) {
|
|
56
|
+
receive(message, Date.now());
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
child.onExit((code, reason) => {
|
|
60
|
+
exited = true;
|
|
61
|
+
// End awaited readbacks now; other controls must settle through promises,
|
|
62
|
+
// not synchronously publish responses before the exit record.
|
|
63
|
+
callbacks.exiting(code);
|
|
64
|
+
if (settling) {
|
|
65
|
+
deferredExit = { code, ...(reason === undefined ? {} : { reason }) };
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
callbacks.exited(code, reason);
|
|
69
|
+
}
|
|
70
|
+
});
|
|
71
|
+
},
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=result-readback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"result-readback.js","sources":["../../../src/shared/stream-json/result-readback.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":"
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/shared/stream-json/session.ts"],"names":[],"mappings":"AAMA,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;AAI1D,OAAO,EAA4B,KAAK,yBAAyB,EAA+B,MAAM,YAAY,CAAC;AACnH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAE7D,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,CAiRlB"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import { streamJsonAppRequest } from "./permission.js";
|
|
2
|
+
import { streamJsonResultReadback } from "./result-readback.js";
|
|
1
3
|
import { writeHeldInput } from "./held-input.js";
|
|
2
4
|
import { streamJsonTaskControl } from "./task-control.js";
|
|
3
5
|
import { streamJsonCompaction } from "./compaction.js";
|
|
4
6
|
import { createAbortFallback } from "../abort-fallback.js";
|
|
5
7
|
import { withInputImages } from "../input-images.js";
|
|
6
8
|
import { withdrawControl } from "../held-input.js";
|
|
7
|
-
import { asRecord, parseJson } from "../json.js";
|
|
8
9
|
import { appendCleanupFailure, cleanupFailureReason } from "../executable/process-cleanup.js";
|
|
9
10
|
import { streamJsonUserMessage, streamJsonPrompted } from "./input-lifecycle.js";
|
|
10
11
|
import { foldStreamJsonStdout } from "./projection.js";
|
|
@@ -20,9 +21,9 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
20
21
|
const writtenQueues = new Map();
|
|
21
22
|
const heldQueue = [];
|
|
22
23
|
let dispatching = false;
|
|
23
|
-
const nativeBusy = () => state.active !== null || state.spontaneous;
|
|
24
|
+
const nativeBusy = () => !messages.settling() && (state.active !== null || state.spontaneous);
|
|
24
25
|
const compaction = streamJsonCompaction(kernel, profile, state, drainHeld, () => heldQueue.length > 0);
|
|
25
|
-
const busy = () => dispatching || nativeBusy() || compaction?.busy() === true;
|
|
26
|
+
const busy = () => dispatching || messages.settling() || nativeBusy() || compaction?.busy() === true;
|
|
26
27
|
let canCancelQueued = false;
|
|
27
28
|
const abortFallback = createAbortFallback(() => { child.kill(); });
|
|
28
29
|
const pendingInterrupts = new Map();
|
|
@@ -34,7 +35,7 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
34
35
|
try {
|
|
35
36
|
await observingCancellation?.result;
|
|
36
37
|
}
|
|
37
|
-
catch { /* The abort reports
|
|
38
|
+
catch { /* The abort reports observation failure; later input still proceeds. */ }
|
|
38
39
|
};
|
|
39
40
|
const sentInterrupts = new Set();
|
|
40
41
|
const completeCancellation = () => {
|
|
@@ -49,7 +50,7 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
49
50
|
}
|
|
50
51
|
};
|
|
51
52
|
function drainHeld() {
|
|
52
|
-
if (state.disposed || kernel.unreachable() !== null || busy() || observingCancellation !== null || heldQueue[0]?.accepted !== true) {
|
|
53
|
+
if (state.disposed || messages.hasExited() || kernel.unreachable() !== null || busy() || observingCancellation !== null || heldQueue[0]?.accepted !== true) {
|
|
53
54
|
return;
|
|
54
55
|
}
|
|
55
56
|
const next = heldQueue.shift();
|
|
@@ -66,18 +67,7 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
66
67
|
drainHeld();
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
|
-
|
|
70
|
-
child.onLine((line) => {
|
|
71
|
-
const message = asRecord(parseJson(line));
|
|
72
|
-
if (message === null) {
|
|
73
|
-
return;
|
|
74
|
-
}
|
|
75
|
-
if (message.type === "system" && message.subtype === "init" && typeof message.parent_tool_use_id !== "string" && Array.isArray(message.capabilities)) {
|
|
76
|
-
canCancelQueued = profile.cancelQueuedCapability !== undefined && message.capabilities.includes(profile.cancelQueuedCapability);
|
|
77
|
-
}
|
|
78
|
-
if (tasks?.consume(message) === true || profile.consume(message)) {
|
|
79
|
-
return;
|
|
80
|
-
}
|
|
70
|
+
const processMessage = (message, receivedAt) => {
|
|
81
71
|
const { state: nextProjection, commands } = foldStreamJsonStdout(profile.projection, state.projection, message);
|
|
82
72
|
state.projection = nextProjection;
|
|
83
73
|
if (message.type === "command_lifecycle" && message.state === "queued" && typeof message.command_uuid === "string") {
|
|
@@ -124,7 +114,7 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
124
114
|
state.active = null;
|
|
125
115
|
}
|
|
126
116
|
}
|
|
127
|
-
const record = kernel.frame(correlated ? { ...command.body, responseTo: nativeResponse } : command.body, { agentPath: command.agentPath });
|
|
117
|
+
const record = kernel.frame(correlated ? { ...command.body, responseTo: nativeResponse } : command.body, { agentPath: command.agentPath, receivedAt });
|
|
128
118
|
if (record.agentPath.length > 0) {
|
|
129
119
|
break;
|
|
130
120
|
}
|
|
@@ -148,16 +138,9 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
148
138
|
}
|
|
149
139
|
break;
|
|
150
140
|
}
|
|
151
|
-
case "toApp":
|
|
152
|
-
kernel
|
|
153
|
-
const request = asRecord(message.request);
|
|
154
|
-
const reply = command.type === "can_use_tool" && request !== null ? profile.permissionResponse?.(command.id, request) : undefined;
|
|
155
|
-
if (reply !== undefined && reply !== null) {
|
|
156
|
-
child.write(`${JSON.stringify(reply)}\n`);
|
|
157
|
-
kernel.respond(command.id, { kind: "accepted", native: reply });
|
|
158
|
-
}
|
|
141
|
+
case "toApp":
|
|
142
|
+
streamJsonAppRequest(kernel, child, command.id, command.type, message, profile.permissionResponse);
|
|
159
143
|
break;
|
|
160
|
-
}
|
|
161
144
|
default:
|
|
162
145
|
break;
|
|
163
146
|
}
|
|
@@ -174,8 +157,29 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
174
157
|
if (ended || (dropped && !busy())) {
|
|
175
158
|
drainHeld();
|
|
176
159
|
}
|
|
160
|
+
};
|
|
161
|
+
const messages = streamJsonResultReadback(child, {
|
|
162
|
+
before: () => {
|
|
163
|
+
if (profile.beforeRootResult === undefined || state.disposed) {
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
// Native work has ended; hold input without interrupting a completed turn during readback.
|
|
167
|
+
abortFallback.clear();
|
|
168
|
+
completeCancellation();
|
|
169
|
+
turnRevision += 1;
|
|
170
|
+
return profile.beforeRootResult(kernel, state.projection);
|
|
171
|
+
},
|
|
172
|
+
process: processMessage,
|
|
173
|
+
consume: (message) => {
|
|
174
|
+
if (message.type === "system" && message.subtype === "init" && typeof message.parent_tool_use_id !== "string" && Array.isArray(message.capabilities)) {
|
|
175
|
+
canCancelQueued = profile.cancelQueuedCapability !== undefined && message.capabilities.includes(profile.cancelQueuedCapability);
|
|
176
|
+
}
|
|
177
|
+
return tasks?.consume(message) === true || profile.consume(message);
|
|
178
|
+
},
|
|
179
|
+
exiting: profile.exited,
|
|
180
|
+
exited: (code, reason) => { finishExit(code, reason); },
|
|
177
181
|
});
|
|
178
|
-
|
|
182
|
+
const finishExit = (code, cleanupReason) => {
|
|
179
183
|
abortFallback.clear();
|
|
180
184
|
completeCancellation();
|
|
181
185
|
turnRevision += 1;
|
|
@@ -190,8 +194,8 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
190
194
|
kernel.respond(requestId, { kind: "rejected", code: "runtime_exited", reason: "runtime exited" });
|
|
191
195
|
}
|
|
192
196
|
tasks?.end();
|
|
193
|
-
|
|
194
|
-
|
|
197
|
+
};
|
|
198
|
+
messages.listen();
|
|
195
199
|
try {
|
|
196
200
|
await profile.open({ current: () => state.projection, replace: (projection) => { state.projection = projection; }, report: (body) => { kernel.frame(body); } });
|
|
197
201
|
}
|
|
@@ -211,6 +215,9 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
211
215
|
}
|
|
212
216
|
const body = { kind: "prompt", input, ...inputOptions };
|
|
213
217
|
return kernel.control(body, (request) => {
|
|
218
|
+
if (messages.hasExited()) {
|
|
219
|
+
return { kind: "rejected", code: "runtime_exited", reason: "runtime exited" };
|
|
220
|
+
}
|
|
214
221
|
if (busy() || heldQueue.length > 0) {
|
|
215
222
|
return { kind: "rejected", code: "busy", reason: "busy" };
|
|
216
223
|
}
|
|
@@ -244,6 +251,9 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
244
251
|
} : {}),
|
|
245
252
|
queue: async (input, inputOptions) => {
|
|
246
253
|
const result = await kernel.control({ kind: "queue", input, ...inputOptions }, (request) => withInputImages(capabilities, inputOptions?.images, (images) => {
|
|
254
|
+
if (messages.hasExited()) {
|
|
255
|
+
return { kind: "rejected", code: "runtime_exited", reason: "runtime exited" };
|
|
256
|
+
}
|
|
247
257
|
heldQueue.push({ request, input, ...(inputOptions?.inputId === undefined ? {} : { inputId: inputOptions.inputId }), options: { ...inputOptions }, images });
|
|
248
258
|
heldQueue.sort((left, right) => left.request.seq - right.request.seq);
|
|
249
259
|
return { kind: "accepted", queued: "adapter" };
|
|
@@ -310,11 +320,8 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
310
320
|
}
|
|
311
321
|
observation.commit();
|
|
312
322
|
sentInterrupts.add(requestId);
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
request_id: requestId,
|
|
316
|
-
request: { subtype: "interrupt", ...(canCancelQueued && state.projection.unstartedInputs.size > 0 ? { cancel_queued: true } : {}) },
|
|
317
|
-
})}\n`);
|
|
323
|
+
const interrupt = { subtype: "interrupt", ...(canCancelQueued && state.projection.unstartedInputs.size > 0 ? { cancel_queued: true } : {}) };
|
|
324
|
+
child.write(`${JSON.stringify({ type: "control_request", request_id: requestId, request: interrupt })}\n`);
|
|
318
325
|
const result = await promise;
|
|
319
326
|
unsubscribe();
|
|
320
327
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/shared/stream-json/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA4B,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAGvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAG9F,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAA+D,MAAM,YAAY,CAAC;AAGnH,sGAAsG;AACtG,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,KAAkB,EAClB,SAAiB,EACjB,WAA+B,EAC/B,OAAoC;IAEpC,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClH,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,qBAAqB,CAAC;IACjE,MAAM,KAAK,GAA8B,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACnI,mGAAmG;IACnG,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC,gBAAgB,KAAK,KAAK,CAAC;IACvE,MAAM,aAAa,GAAG,IAAI,GAAG,EAAyB,CAAC;IACvD,MAAM,SAAS,GAA0B,EAAE,CAAC;IAC5C,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,MAAM,UAAU,GAAG,GAAY,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,WAAW,CAAC;IAC7E,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvG,MAAM,IAAI,GAAG,GAAY,EAAE,CAAC,WAAW,IAAI,UAAU,EAAE,IAAI,UAAU,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;IACvF,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,MAAM,aAAa,GAAG,mBAAmB,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACnE,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAsB,CAAC;IACxD,IAAI,cAAc,GAAyB,IAAI,CAAC;IAChD,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,qBAAqB,GAA4F,IAAI,CAAC;IAC1H,IAAI,YAAY,GAAmC,IAAI,CAAC;IACxD,MAAM,mBAAmB,GAAG,KAAK,IAAmB,EAAE;QACpD,IAAI,CAAC;YAAC,MAAM,qBAAqB,EAAE,MAAM,CAAC;QAAC,CAAC;QAC5C,MAAM,CAAC,CAAC,4EAA4E,CAAC,CAAC;IACxF,CAAC,CAAC;IACF,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,MAAM,oBAAoB,GAAG,GAAS,EAAE;QACtC,YAAY,EAAE,QAAQ,EAAE,CAAC;QAAC,YAAY,GAAG,IAAI,CAAC;QAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IACxE,CAAC,CAAC;IACF,MAAM,kBAAkB,GAAG,CAAC,SAAiB,EAAQ,EAAE;QACrD,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACjC,IAAI,cAAc,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAAC,oBAAoB,EAAE,CAAC;QAAC,CAAC;IAC5D,CAAC,CAAC;IACF,SAAS,SAAS;QAChB,IAAI,KAAK,CAAC,QAAQ,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,IAAI,IAAI,IAAI,EAAE,IAAI,qBAAqB,KAAK,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,KAAK,IAAI,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAC/I,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;QAC/B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QACnC,WAAW,GAAG,IAAI,CAAC;QACnB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACvD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3I,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,YAAY,IAAI,CAAC,CAAC,CAAC,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACpL,WAAW,GAAG,KAAK,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACrC,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAAC,SAAS,EAAE,CAAC;QAAC,CAAC;IACpD,CAAC;IACD,8FAA8F;IAC9F,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACpB,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QACjC,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,OAAO,CAAC,kBAAkB,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACrJ,eAAe,GAAG,OAAO,CAAC,sBAAsB,KAAK,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QAClI,CAAC;QACD,IAAI,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAC7E,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAChH,KAAK,CAAC,UAAU,GAAG,cAAc,CAAC;QAClC,IAAI,OAAO,CAAC,IAAI,KAAK,mBAAmB,IAAI,OAAO,CAAC,KAAK,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YACnH,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YACvD,IAAI,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;gBAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YAAC,CAAC;QAC/E,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,mBAAmB,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,WAAW,IAAI,OAAO,CAAC,KAAK,KAAK,WAAW,CAAC,IAAI,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YACzJ,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,mBAAmB,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS;eAClE,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,YAAY,KAAK,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnH,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,KAAK,OAAO,EAAE,CAAC;oBACb,uEAAuE;oBACvE,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,EAAE,CAAC;wBACvI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;4BAAC,YAAY,IAAI,CAAC,CAAC;wBAAC,CAAC;wBACnC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;oBAC3B,CAAC;oBACD,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC;oBACjE,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,UAAU,EAAE,SAAS,EAAE,CAAC;oBAChI,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC;oBAClI,IAAI,MAAM,EAAE,CAAC;wBACX,aAAa,CAAC,KAAK,EAAE,CAAC;wBAAC,oBAAoB,EAAE,CAAC;wBAAC,YAAY,IAAI,CAAC,CAAC;wBACjE,IAAI,KAAK,CAAC,UAAU,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;4BAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;wBAAC,CAAC;wBACtE,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;oBAC5B,CAAC;oBACD,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;oBACtF,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,EAAE,IAAI,KAAK,eAAe,IAAI,SAAS,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;wBAC7G,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;wBACxC,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;4BAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;wBAAC,CAAC;oBAClN,CAAC;oBACD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;oBAC3I,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAAC,MAAM;oBAAC,CAAC;oBAC3C,KAAK,KAAK,MAAM,CAAC;oBACjB,OAAO,KAAK,SAAS,KAAK,SAAS,CAAC;oBACpC,MAAM;gBACR,CAAC;gBACD,KAAK,SAAS,EAAE,CAAC;oBACf,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;oBACzD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;wBAC1B,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;wBAC5C,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;4BACrC,OAAO,EAAE,CAAC;4BAAC,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;wBACnD,CAAC;wBACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;oBAClD,CAAC;yBAAM,CAAC;wBACN,+EAA+E;wBAC/E,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC1E,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD,KAAK,OAAO,EAAE,CAAC;oBACb,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC5G,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,KAAK,cAAc,IAAI,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBAClI,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;wBAC1C,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAC1C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;oBAClE,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD;oBACE,MAAM;YACV,CAAC;QACH,CAAC;QACD,IAAI,OAAO,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACjC,aAAa,CAAC,KAAK,EAAE,CAAC;YAAC,oBAAoB,EAAE,CAAC;YAAC,YAAY,IAAI,CAAC,CAAC;YACjE,IAAI,KAAK,CAAC,UAAU,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;gBAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;YAAC,CAAC;YACtE,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,IAAI,KAAK,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAAC,SAAS,EAAE,CAAC;QAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE;QACnC,aAAa,CAAC,KAAK,EAAE,CAAC;QAAC,oBAAoB,EAAE,CAAC;QAAC,YAAY,IAAI,CAAC,CAAC;QACjE,wEAAwE;QACxE,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;QAC/F,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrE,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAChH,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;QACpB,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;QAC1B,KAAK,MAAM,SAAS,IAAI,iBAAiB,CAAC,IAAI,EAAE,EAAE,CAAC;YACjD,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACpC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACpG,CAAC;QACD,KAAK,EAAE,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,UAAU,EAAE,EAAE,GAAG,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAClK,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAAC,MAAM,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAAC,CAAC;IACzG,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAC1C,MAAM,OAAO,GAAY,WAAW,CAAC,IAAI,CAAC;QACxC,EAAE,EAAE,MAAM,CAAC,SAAS;QACpB,YAAY;QACZ,GAAG,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;QAC/D,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;QACxD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,YAA2B,EAA0B,EAAE;YAC3E,IAAI,qBAAqB,KAAK,IAAI,EAAE,CAAC;gBAAC,MAAM,mBAAmB,EAAE,CAAC;YAAC,CAAC;YACpE,MAAM,IAAI,GAAG,EAAE,IAAI,EAAE,QAAiB,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,CAAC;YACjE,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE;gBACtC,IAAI,IAAI,EAAE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAAC,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;gBAAC,CAAC;gBAClG,OAAO,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;oBACpE,YAAY,IAAI,CAAC,CAAC;oBAClB,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC;oBACvB,KAAK,CAAC,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;oBACvG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;oBAC/D,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;gBAC9B,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QACD,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YAClB,KAAK,EAAE,KAAK,EAAE,KAAa,EAAE,YAA2B,EAA0B,EAAE;gBAClF,IAAI,qBAAqB,KAAK,IAAI,EAAE,CAAC;oBAAC,MAAM,mBAAmB,EAAE,CAAC;gBAAC,CAAC;gBACpE,OAAO,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,EAAE,GAAG,EAAE;oBACpE,IAAI,UAAU,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;wBAAC,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,wCAAwC,EAAE,CAAC;oBAAC,CAAC;oBACjI,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;wBAAC,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAC;oBAAC,CAAC;oBACpH,OAAO,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;wBACpE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;wBAC/D,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;oBAC9B,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC,CAAC,EAAE,CAAC;QACP,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,YAA2B,EAA0B,EAAE;YAC1E,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE,CACzF,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;gBAC7D,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,YAAY,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC5J,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBACtE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YACjD,CAAC,CAAC,CAAC,CAAC;YACN,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC5E,IAAI,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;YAAC,CAAC;YAC/F,SAAS,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,QAAQ,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE,GAAG,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC;QAC5H,KAAK,EAAE,KAAK,IAA4B,EAAE;YACxC,mFAAmF;YACnF,gBAAgB,IAAI,CAAC,CAAC;YACtB,MAAM,SAAS,GAAG,aAAa,gBAAgB,EAAE,CAAC;YAClD,+FAA+F;YAC/F,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;gBAC5F,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,2EAA2E,EAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC7I,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;YAClF,IAAI,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,UAAU,EAAE,IAAI,UAAU,EAAE,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,eAAe,IAAI,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1I,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,EAAE,CAAC;YAC9I,CAAC;YACD,MAAM,QAAQ,GAAG,YAAY,CAAC;YAC9B,qBAAqB,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACpI,MAAM,MAAM,GAAG,qBAAqB,CAAC;YACrC,IAAI,WAAW,GAAmC,IAAI,CAAC;YACvD,IAAI,CAAC;gBAAC,WAAW,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;YAAC,CAAC;YAC1C,OAAO,KAAK,EAAE,CAAC;gBACb,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YAChK,CAAC;oBAAS,CAAC;gBACT,iEAAiE;gBACjE,mEAAmE;gBACnE,IAAI,qBAAqB,KAAK,MAAM,EAAE,CAAC;oBAAC,qBAAqB,GAAG,IAAI,CAAC;oBAAC,cAAc,CAAC,SAAS,CAAC,CAAC;gBAAC,CAAC;YACpG,CAAC;YACD,MAAM,gBAAgB,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;YAC9C,IAAI,YAAY,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,gBAAgB,KAAK,IAAI,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAC7G,WAAW,CAAC,QAAQ,EAAE,CAAC;gBACvB,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,gBAAgB,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,yCAAyC,EAAE,CAAC,EAAE,CAAC;YAChL,CAAC;YACD,YAAY,GAAG,WAAW,CAAC;YAC3B,KAAK,CAAC,UAAU,GAAG,wBAAwB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9D,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,aAAa,EAAiB,CAAC;YACpE,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC9C,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;oBACjE,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC,CAAC,CAAC;YACH,uEAAuE;YACvE,iBAAiB,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE;gBACpC,IAAI,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;oBACxC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC,CAAC,CAAC;YACH,IAAI,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAAC,CAAC;YACnF,WAAW,CAAC,MAAM,EAAE,CAAC;YAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACpD,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC5B,IAAI,EAAE,iBAAiB;gBACvB,UAAU,EAAE,SAAS;gBACrB,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,eAAe,IAAI,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;aACpI,CAAC,IAAI,CAAC,CAAC;YACR,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC;YAC7B,WAAW,EAAE,CAAC;YACd,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;QACnE,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE;QAC/B,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QAC3B,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,GAAG,CAAC,OAAO,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACjG,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAAC,OAAO;YAAC,CAAC;YAC/B,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;YACtB,qDAAqD;YACrD,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,CAAC,mEAAmE;YAC/G,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;YAClE,KAAK,EAAE,GAAG,EAAE,CAAC;YACb,IAAI,IAAI,EAAE,CAAC;gBACT,4DAA4D;gBAC5D,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;gBACxD,OAAO;YACT,CAAC;YACD,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAAC,CAAC;iBAC7C,CAAC;gBAAC,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YAAC,CAAC;YACrC,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC,uFAAuF;QAC7G,CAAC;KACF,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/shared/stream-json/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sources":["../../src/shared/update.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AAClI,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAsD,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"update.d.ts","sources":["../../src/shared/update.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AAClI,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAsD,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIhH,eAAO,MAAM,gBAAgB,QAAS,CAAC;AAKvC,2HAA2H;AAC3H,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE/D;AAOD,sEAAsE;AACtE,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAStE;AAID;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAAC,UAAU,CAElF;AAED,MAAM,MAAM,gBAAgB,GACxB;IAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,YAAY,EAAE,sBAAsB,GAAG,8BAA8B,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC3I;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAAE,CAAC;AAElE,qFAAqF;AACrF,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,qBAAqB,GAAG,8BAA8B,GAAG,gBAAgB,CAgBvH;AAED,gFAAgF;AAChF,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAMrD;AAED,sGAAsG;AACtG,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CAahH;AAED,iFAAiF;AACjF,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAAE,CAAC,CAW7G;AAED,4FAA4F;AAC5F,wBAAsB,eAAe,CACnC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAGtE;AAWD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,wDAAwD;IACxD,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,8FAA8F;IAC9F,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC,UAAU,CAAC;CACxC;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,YAAY,EAAE,qBAAqB,GAAG,8BAA8B,EACpE,OAAO,EAAE,aAAa,EACtB,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,aAAa,CAAC,CAwBxB"}
|
package/dist/shared/update.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { realpathSync } from "node:fs";
|
|
2
2
|
import { isolatedOutput, readExecutableVersion, runIsolated } from "./executable/index.js";
|
|
3
|
+
import { clearInstallationCache } from "./installation.js";
|
|
3
4
|
import { parseJson } from "./json.js";
|
|
4
5
|
export const CHECK_TIMEOUT_MS = 20_000;
|
|
5
6
|
const UPGRADE_TIMEOUT_MS = 600_000;
|
|
@@ -129,6 +130,7 @@ export async function upgradeExecutable(installation, updater, options = {}) {
|
|
|
129
130
|
const before = now ?? (check.kind === "ok" ? check.installed : undefined);
|
|
130
131
|
const timeoutMs = options.timeoutMs ?? UPGRADE_TIMEOUT_MS;
|
|
131
132
|
const run = await runIsolated(installation.command, updater.args, { env: updaterEnv(updater.env?.() ?? process.env), timeoutMs });
|
|
133
|
+
clearInstallationCache();
|
|
132
134
|
const output = isolatedOutput(run, timeoutMs, "updater");
|
|
133
135
|
const after = await versionNow(installation.command);
|
|
134
136
|
if (before !== undefined && after !== undefined && after !== before) {
|