@cortexkit/aft-bridge 0.63.5 → 0.65.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/bash-format.d.ts +5 -0
- package/dist/bash-format.d.ts.map +1 -1
- package/dist/bash-format.js +7 -0
- package/dist/bash-format.js.map +1 -1
- package/dist/bash-hints.d.ts +12 -5
- package/dist/bash-hints.d.ts.map +1 -1
- package/dist/bash-hints.js +88 -62
- package/dist/bash-hints.js.map +1 -1
- package/dist/bash-host-fallback.d.ts +4 -8
- package/dist/bash-host-fallback.d.ts.map +1 -1
- package/dist/bash-host-fallback.js +7 -8
- package/dist/bash-host-fallback.js.map +1 -1
- package/dist/bash-permissions.d.ts +1 -0
- package/dist/bash-permissions.d.ts.map +1 -1
- package/dist/bash-permissions.js +23 -11
- package/dist/bash-permissions.js.map +1 -1
- package/dist/bridge.d.ts +2 -0
- package/dist/bridge.d.ts.map +1 -1
- package/dist/bridge.js +26 -5
- package/dist/bridge.js.map +1 -1
- package/dist/callgraph-format.d.ts.map +1 -1
- package/dist/callgraph-format.js +64 -6
- package/dist/callgraph-format.js.map +1 -1
- package/dist/config-watch.d.ts +3 -1
- package/dist/config-watch.d.ts.map +1 -1
- package/dist/config-watch.js +108 -9
- package/dist/config-watch.js.map +1 -1
- package/dist/feature-config.d.ts +95 -11
- package/dist/feature-config.d.ts.map +1 -1
- package/dist/feature-config.js +307 -35
- package/dist/feature-config.js.map +1 -1
- package/dist/index.d.ts +4 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/lsp-github-install.d.ts +7 -0
- package/dist/lsp-github-install.d.ts.map +1 -1
- package/dist/lsp-github-install.js +14 -10
- package/dist/lsp-github-install.js.map +1 -1
- package/dist/lsp-npm-policy.d.ts.map +1 -1
- package/dist/lsp-npm-policy.js +4 -3
- package/dist/lsp-npm-policy.js.map +1 -1
- package/dist/lsp-npm-selection.d.ts +22 -0
- package/dist/lsp-npm-selection.d.ts.map +1 -0
- package/dist/lsp-npm-selection.js +97 -0
- package/dist/lsp-npm-selection.js.map +1 -0
- package/dist/npm-resolver.d.ts +4 -0
- package/dist/npm-resolver.d.ts.map +1 -1
- package/dist/npm-resolver.js +20 -0
- package/dist/npm-resolver.js.map +1 -1
- package/dist/subc-transport.d.ts +6 -1
- package/dist/subc-transport.d.ts.map +1 -1
- package/dist/subc-transport.js +45 -15
- package/dist/subc-transport.js.map +1 -1
- package/dist/wait-clock.d.ts +31 -0
- package/dist/wait-clock.d.ts.map +1 -0
- package/dist/wait-clock.js +80 -0
- package/dist/wait-clock.js.map +1 -0
- package/package.json +2 -2
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { readFile, realpath, stat } from "node:fs/promises";
|
|
2
|
+
import { dirname, join, resolve } from "node:path";
|
|
3
|
+
import { lspNpmInstallInvocation } from "./lsp-npm-policy.js";
|
|
4
|
+
import { npmCandidates } from "./npm-resolver.js";
|
|
5
|
+
// Approved by Ufuk (2026-11-02).
|
|
6
|
+
export const LSP_NPM_REFUSAL = "AFT can't install language servers with the npm at <path> (<reason>). Put a real npm 7 or newer first on PATH; pinning a server version won't help.";
|
|
7
|
+
export function lspNpmRefusal(path, reason) {
|
|
8
|
+
return LSP_NPM_REFUSAL.replace("<path>", path).replace("<reason>", reason);
|
|
9
|
+
}
|
|
10
|
+
async function genuineNpm(candidate) {
|
|
11
|
+
let executable;
|
|
12
|
+
try {
|
|
13
|
+
executable = await realpath(candidate.command);
|
|
14
|
+
}
|
|
15
|
+
catch (error) {
|
|
16
|
+
return { reason: `probe failed: ${String(error)}` };
|
|
17
|
+
}
|
|
18
|
+
// Unix npm resolves to npm's own bin/npm-cli.js. On Windows, bypass the
|
|
19
|
+
// command shim and invoke the adjacent npm package's CLI with its Node.
|
|
20
|
+
const windowsShim = /\.(?:cmd|bat)$/i.test(executable);
|
|
21
|
+
let current = dirname(executable);
|
|
22
|
+
if (windowsShim)
|
|
23
|
+
current = join(current, "node_modules", "npm");
|
|
24
|
+
for (;;) {
|
|
25
|
+
try {
|
|
26
|
+
const pkg = JSON.parse(await readFile(join(current, "package.json"), "utf8"));
|
|
27
|
+
const bin = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.npm;
|
|
28
|
+
if (pkg.name === "npm" && typeof bin === "string") {
|
|
29
|
+
const cli = await realpath(resolve(current, bin));
|
|
30
|
+
if (!windowsShim && cli !== executable)
|
|
31
|
+
return { reason: "not npm: command is not npm's declared CLI" };
|
|
32
|
+
const major = /^(\d+)\.\d+\.\d+$/.exec(pkg.version)?.[1];
|
|
33
|
+
if (!major)
|
|
34
|
+
return { reason: "probe failed: npm manifest has an unknown version" };
|
|
35
|
+
if (Number(major) < 7)
|
|
36
|
+
return { reason: `old npm: ${pkg.version} (requires npm 7 or newer)` };
|
|
37
|
+
if (windowsShim || (process.platform === "win32" && /\.[cm]?js$/i.test(cli))) {
|
|
38
|
+
const node = join(candidate.binDir ?? dirname(executable), "node.exe");
|
|
39
|
+
if (!(await stat(node)).isFile())
|
|
40
|
+
return { reason: "probe failed: adjacent Node is missing" };
|
|
41
|
+
return { npm: { command: node, binDir: dirname(node), cliPath: cli }, reason: "" };
|
|
42
|
+
}
|
|
43
|
+
return { npm: { command: cli, binDir: candidate.binDir }, reason: "" };
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
// Keep walking: npm's CLI is below its package root, and PATH aliases
|
|
48
|
+
// may be symlinks into a version manager's installation.
|
|
49
|
+
}
|
|
50
|
+
const parent = dirname(current);
|
|
51
|
+
if (parent === current || windowsShim)
|
|
52
|
+
break;
|
|
53
|
+
current = parent;
|
|
54
|
+
}
|
|
55
|
+
return { reason: "not npm: no matching npm package manifest and CLI" };
|
|
56
|
+
}
|
|
57
|
+
/** Verify package identity before either pinned or publication-filtered installs. */
|
|
58
|
+
export async function selectLspNpm(preferred, candidates, signal) {
|
|
59
|
+
const aborted = () => ({
|
|
60
|
+
refusal: lspNpmRefusal(preferred.command, "probe failed: installation aborted"),
|
|
61
|
+
});
|
|
62
|
+
if (signal?.aborted)
|
|
63
|
+
return aborted();
|
|
64
|
+
const first = await genuineNpm(preferred);
|
|
65
|
+
if (signal?.aborted)
|
|
66
|
+
return aborted();
|
|
67
|
+
if (first.npm)
|
|
68
|
+
return { npm: first.npm };
|
|
69
|
+
// Do not scan version-manager/system directories on the genuine-npm fast
|
|
70
|
+
// path. Fallback discovery is needed only after the preferred command fails.
|
|
71
|
+
const seen = new Set([preferred.command]);
|
|
72
|
+
for (const candidate of candidates ?? npmCandidates()) {
|
|
73
|
+
if (signal?.aborted)
|
|
74
|
+
return aborted();
|
|
75
|
+
if (seen.has(candidate.command))
|
|
76
|
+
continue;
|
|
77
|
+
seen.add(candidate.command);
|
|
78
|
+
const result = await genuineNpm(candidate);
|
|
79
|
+
if (signal?.aborted)
|
|
80
|
+
return aborted();
|
|
81
|
+
if (result.npm)
|
|
82
|
+
return { npm: result.npm };
|
|
83
|
+
}
|
|
84
|
+
return { refusal: lspNpmRefusal(preferred.command, first.reason) };
|
|
85
|
+
}
|
|
86
|
+
export async function prepareLspNpmInstall(preferred, target, before, candidates) {
|
|
87
|
+
const selection = await selectLspNpm(preferred, candidates);
|
|
88
|
+
if (!selection.npm)
|
|
89
|
+
return selection;
|
|
90
|
+
const invocation = await lspNpmInstallInvocation(selection.npm, target, before);
|
|
91
|
+
if (!invocation)
|
|
92
|
+
return {
|
|
93
|
+
refusal: lspNpmRefusal(selection.npm.command, "probe failed: cannot verify publication-cutoff support"),
|
|
94
|
+
};
|
|
95
|
+
return { npm: selection.npm, invocation };
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=lsp-npm-selection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lsp-npm-selection.js","sourceRoot":"","sources":["../src/lsp-npm-selection.ts"],"names":[],"mappings":"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"}
|
package/dist/npm-resolver.d.ts
CHANGED
|
@@ -23,6 +23,8 @@ export interface ResolvedNpm {
|
|
|
23
23
|
* `#!/usr/bin/env node` shebang can find its sibling node. Null when the
|
|
24
24
|
* command was found via the OS PATH resolver and no augmentation is needed. */
|
|
25
25
|
binDir: string | null;
|
|
26
|
+
/** npm's own CLI when invoking it directly with Node instead of a command shim. */
|
|
27
|
+
cliPath?: string;
|
|
26
28
|
}
|
|
27
29
|
/** Executable and arguments suitable for Node's child-process APIs. */
|
|
28
30
|
export interface NpmInvocation {
|
|
@@ -54,6 +56,8 @@ interface ResolveNpmDeps {
|
|
|
54
56
|
* found anywhere we know to look.
|
|
55
57
|
*/
|
|
56
58
|
export declare function resolveNpm(deps?: ResolveNpmDeps): ResolvedNpm | null;
|
|
59
|
+
/** All discovery candidates, so protected installs can skip incompatible PATH wrappers. */
|
|
60
|
+
export declare function npmCandidates(deps?: ResolveNpmDeps): ResolvedNpm[];
|
|
57
61
|
/**
|
|
58
62
|
* Build a cross-platform child-process invocation for a resolved npm command.
|
|
59
63
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-resolver.d.ts","sourceRoot":"","sources":["../src/npm-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,oBAAoB,CAAC;AAIzE,MAAM,WAAW,WAAW;IAC1B,gFAAgF;IAChF,OAAO,EAAE,MAAM,CAAC;IAChB;;mFAE+E;IAC/E,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"npm-resolver.d.ts","sourceRoot":"","sources":["../src/npm-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,oBAAoB,CAAC;AAIzE,MAAM,WAAW,WAAW;IAC1B,gFAAgF;IAChF,OAAO,EAAE,MAAM,CAAC;IAChB;;mFAE+E;IAC/E,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,mFAAmF;IACnF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,uEAAuE;AACvE,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,wDAAwD;IACxD,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvC,oEAAoE;IACpE,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,+DAA+D;IAC/D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AA6HD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,GAAE,cAA8B,GAAG,WAAW,GAAG,IAAI,CAkBnF;AAED,2FAA2F;AAC3F,wBAAgB,aAAa,CAAC,IAAI,GAAE,cAA8B,GAAG,WAAW,EAAE,CAgBjF;AAeD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,aAAa,CAyBf;AAED;;;;;;;;GAQG;AACH,qBAAa,0BAA2B,SAAQ,KAAK;IACnD,QAAQ,CAAC,IAAI,6BAA6B;gBAE9B,MAAM,EAAE,MAAM;CAI3B;AA4DD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,aAAa,EACzB,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,aAAa,SAAQ,GACpB,OAAO,CAAC,IAAI,CAAC,CAgGf;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,WAAW,EACrB,OAAO,GAAE,MAAM,CAAC,UAAwB,EACxC,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,MAAM,CAAC,UAAU,CAEnB;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,IAAI,GAAE,cAA8B,GAAG,OAAO,CAE5E;AAED,gFAAgF;AAChF,wBAAgB,eAAe,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAgBpE"}
|
package/dist/npm-resolver.js
CHANGED
|
@@ -167,6 +167,24 @@ export function resolveNpm(deps = defaultDeps()) {
|
|
|
167
167
|
}
|
|
168
168
|
return null;
|
|
169
169
|
}
|
|
170
|
+
/** All discovery candidates, so protected installs can skip incompatible PATH wrappers. */
|
|
171
|
+
export function npmCandidates(deps = defaultDeps()) {
|
|
172
|
+
const name = npmBinaryName(deps.platform);
|
|
173
|
+
const dirs = [
|
|
174
|
+
...(deps.env.PATH ?? "").split(deps.platform === "win32" ? ";" : ":").filter(isAbsolute),
|
|
175
|
+
dirname(deps.execPath),
|
|
176
|
+
...wellKnownNpmDirs(deps),
|
|
177
|
+
];
|
|
178
|
+
return [...new Set(dirs)].flatMap((binDir) => {
|
|
179
|
+
return [
|
|
180
|
+
join(binDir, name),
|
|
181
|
+
join(binDir, "node_modules", "npm", "bin", "npm-cli.js"),
|
|
182
|
+
join(binDir, "..", "lib", "node_modules", "npm", "bin", "npm-cli.js"),
|
|
183
|
+
]
|
|
184
|
+
.filter(isFile)
|
|
185
|
+
.map((command) => ({ command, binDir }));
|
|
186
|
+
});
|
|
187
|
+
}
|
|
170
188
|
function quoteCmdArgument(value) {
|
|
171
189
|
// cmd.exe expands percent variables even inside quotes, while quotes and line
|
|
172
190
|
// breaks can terminate the argument and append another command. npm's current
|
|
@@ -185,6 +203,8 @@ function quoteCmdArgument(value) {
|
|
|
185
203
|
* through cmd.exe; native executables and Unix npm scripts remain direct.
|
|
186
204
|
*/
|
|
187
205
|
export function npmInvocation(resolved, npmArgs, platform = process.platform, env = process.env) {
|
|
206
|
+
if (resolved.cliPath)
|
|
207
|
+
return { command: resolved.command, args: [resolved.cliPath, ...npmArgs] };
|
|
188
208
|
if (platform !== "win32" || !/\.(?:cmd|bat)$/i.test(resolved.command)) {
|
|
189
209
|
return { command: resolved.command, args: [...npmArgs] };
|
|
190
210
|
}
|
package/dist/npm-resolver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-resolver.js","sourceRoot":"","sources":["../src/npm-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAqB,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAqClD,SAAS,WAAW;IAClB,OAAO;QACL,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,IAAI,EAAE,OAAO,EAAE;QACf,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,QAAyB;IAC9C,OAAO,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;AAClD,CAAC;AAED,SAAS,MAAM,CAAC,CAAS;IACvB,IAAI,CAAC;QACH,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,+EAA+E;AAC/E,SAAS,WAAW,CAAC,IAAoB;IACvC,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClE,MAAM,OAAO,GACX,IAAI,CAAC,QAAQ,KAAK,OAAO;QACvB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;QAC9D,CAAC,CAAC,MAAM,CAAC;IACb,MAAM,GAAG,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IACxD,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QACvC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAAE,OAAO,GAAG,CAAC;IAC1C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,sFAAsF;AACtF,SAAS,iBAAiB,CAAC,IAAoB;IAC7C,sEAAsE;IACtE,2EAA2E;IAC3E,wEAAwE;IACxE,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnC,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACtE,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAAC,WAAmB,EAAE,IAAY;IAChE,IAAI,OAAiB,CAAC;IACtB,IAAI,CAAC;QACH,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,UAAU,GAAG,OAAO;SACvB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;SACxD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7C,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAChF,CAAC;AAED,8EAA8E;AAC9E,SAAS,mBAAmB,CAAC,CAAS,EAAE,CAAS;IAC/C,MAAM,EAAE,GAAG,CAAC;SACT,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;SACjB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACtC,MAAM,EAAE,GAAG,CAAC;SACT,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;SACjB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACxD,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,IAAI,EAAE,KAAK,EAAE;YAAE,OAAO,EAAE,GAAG,EAAE,CAAC;IAChC,CAAC;IACD,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AAC5B,CAAC;AAED,mFAAmF;AACnF,SAAS,gBAAgB,CAAC,IAAoB;IAC5C,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACrC,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACrC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,IAAI,GAAG,CAAC,GAA8B,EAAE,EAAE;QAC9C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC,CAAC;IAEF,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,GAAG,CAAC,YAAY,IAAI,mBAAmB,CAAC;QAC7D,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,MAAM,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;QACnC,IAAI,OAAO;YAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QACxC,IAAI,YAAY;YAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC3D,cAAc;QACd,IAAI,GAAG,CAAC,WAAW;YAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;SAAM,CAAC;QACN,gFAAgF;QAChF,IAAI,GAAG,CAAC,OAAO;YAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACnC,4DAA4D;QAC5D,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/F,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/E,2BAA2B;QAC3B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACnC,6EAA6E;QAC7E,MAAM,UAAU,GACd,IAAI,CAAC,aAAa;YAClB,CAAC,QAAQ,KAAK,QAAQ;gBACpB,CAAC,CAAC,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;gBACzC,CAAC,CAAC,CAAC,gBAAgB,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACnE,KAAK,MAAM,GAAG,IAAI,UAAU;YAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,OAAuB,WAAW,EAAE;IAC7D,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAE1C,4EAA4E;IAC5E,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,MAAM;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAEnE,iEAAiE;IACjE,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI,QAAQ;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAEzE,oDAAoD;IACpD,KAAK,MAAM,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAClC,IAAI,MAAM,CAAC,SAAS,CAAC;YAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACpE,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAa;IACrC,8EAA8E;IAC9E,8EAA8E;IAC9E,8EAA8E;IAC9E,wDAAwD;IACxD,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CACb,0DAA0D,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAClF,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,KAAK,GAAG,CAAC;AACtB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAC3B,QAAqB,EACrB,OAA0B,EAC1B,WAA4B,OAAO,CAAC,QAAQ,EAC5C,MAAyB,OAAO,CAAC,GAAG;IAEpC,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACtE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC;IAC3D,CAAC;IAED,IAAI,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CACb,yDAAyD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAC5F,CAAC;IACJ,CAAC;IAED,0EAA0E;IAC1E,6EAA6E;IAC7E,2EAA2E;IAC3E,MAAM,cAAc,GAAG,iBAAiB,CAAC;IACzC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,MAAM,cAAc,KAAK,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;IACxG,OAAO;QACL,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,IAAI,SAAS;QAChD,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC;QAC/C,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,OAAO,EAAE;QAC3C,wBAAwB,EAAE,IAAI;QAC9B,cAAc,EAAE,IAAI;KACrB,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,OAAO,0BAA2B,SAAQ,KAAK;IAC1C,IAAI,GAAG,yBAAyB,CAAC;IAE1C,YAAY,MAAc;QACxB,KAAK,CAAC,wDAAwD,MAAM,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAC;IAC3C,CAAC;CACF;AAED,SAAS,uBAAuB,CAAC,KAAmB,EAAE,aAAqB;IACzE,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAEnF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,UAAU,GAAyC,IAAI,CAAC;QAC5D,IAAI,iBAAiB,GAAyC,IAAI,CAAC;QACnE,IAAI,aAAa,GAAkB,IAAI,CAAC;QACxC,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,IAAI,UAAU;gBAAE,YAAY,CAAC,UAAU,CAAC,CAAC;YACzC,IAAI,iBAAiB;gBAAE,YAAY,CAAC,iBAAiB,CAAC,CAAC;YACvD,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACrC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAC9C,CAAC,CAAC;QACF,MAAM,MAAM,GAAG,GAAG,EAAE;YAClB,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;QACF,MAAM,IAAI,GAAG,GAAG,EAAE;YAChB,IAAI,OAAO;gBAAE,OAAO;YACpB,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;gBACzD,MAAM,EAAE,CAAC;gBACT,OAAO;YACT,CAAC;YACD,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,EAAE,CAAC;YACV,MAAM,CACJ,IAAI,0BAA0B,CAC5B,aAAa,IAAI,sDAAsD,aAAa,IAAI,CACzF,CACF,CAAC;QACJ,CAAC,CAAC;QACF,MAAM,YAAY,GAAG,CAAC,KAAY,EAAE,EAAE;YACpC,aAAa,GAAG,8CAA8C,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAChF,CAAC,CAAC;QACF,MAAM,MAAM,GAAG,CAAC,KAAsB,EAAE,EAAE;YACxC,IAAI,CAAC;gBACH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBACvB,aAAa,GAAG,6BAA6B,KAAK,IAAI,SAAS,EAAE,CAAC;gBACpE,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,aAAa,GAAG,oBAAoB,KAAK,IAAI,SAAS,YAAY,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACpF,CAAC;QACH,CAAC,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAChC,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE;YAC3B,MAAM,CAAC,SAAS,CAAC,CAAC;YAClB,iBAAiB,GAAG,UAAU,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACtD,CAAC,EAAE,aAAa,CAAC,CAAC;QAClB,MAAM,EAAE,CAAC;QACT,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI;YAAE,MAAM,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,KAAmB,EACnB,UAAyB,EACzB,MAAyB,OAAO,CAAC,GAAG,EACpC,aAAa,GAAG,KAAK;IAErB,IAAI,CAAC,UAAU,CAAC,cAAc;QAAE,OAAO,uBAAuB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IACrF,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,KAAK,CAAC,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACnF,+EAA+E;IAC/E,+EAA+E;IAC/E,2EAA2E;IAC3E,IAAI,kBAAkB,EAAE;QAAE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IACnD,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,0BAA0B,CAAC,iCAAiC,CAAC,CAAC,CAAC;IAC3F,CAAC;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,WAAW,GAAG,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;QACvE,IAAI,iBAAiB,GAAG,KAAK,CAAC;QAC9B,IAAI,eAAe,GAAkB,IAAI,CAAC;QAC1C,IAAI,MAAM,GAAwB,IAAI,CAAC;QACvC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,IAAI,CAAC;gBACH,MAAM,EAAE,IAAI,EAAE,CAAC;YACjB,CAAC;YAAC,MAAM,CAAC;gBACP,gDAAgD;YAClD,CAAC;YACD,IAAI,iBAAiB,IAAI,kBAAkB,EAAE,EAAE,CAAC;gBAC9C,OAAO,GAAG,IAAI,CAAC;gBACf,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;YACD,IAAI,CAAC,eAAe,IAAI,sCAAsC,aAAa,IAAI,CAAC,CAAC;QACnF,CAAC,EAAE,aAAa,CAAC,CAAC;QAClB,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC5C,CAAC,CAAC;QACF,MAAM,kBAAkB,GAAG,GAAG,EAAE;YAC9B,IAAI,OAAO,IAAI,CAAC,WAAW,IAAI,CAAC,iBAAiB;gBAAE,OAAO;YAC1D,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;QACF,MAAM,IAAI,GAAG,CAAC,MAAc,EAAE,EAAE;YAC9B,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC;QACF,SAAS,WAAW;YAClB,WAAW,GAAG,IAAI,CAAC;YACnB,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;gBAC7B,IAAI,kBAAkB,EAAE,EAAE,CAAC;oBACzB,OAAO,GAAG,IAAI,CAAC;oBACf,OAAO,EAAE,CAAC;oBACV,OAAO,EAAE,CAAC;gBACZ,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,eAAe,CAAC,CAAC;gBACxB,CAAC;gBACD,OAAO;YACT,CAAC;YACD,kBAAkB,EAAE,CAAC;QACvB,CAAC;QACD,MAAM,qBAAqB,GAAG,CAAC,MAAc,EAAE,EAAE;YAC/C,IAAI,OAAO;gBAAE,OAAO;YACpB,IAAI,kBAAkB,EAAE,EAAE,CAAC;gBACzB,OAAO,GAAG,IAAI,CAAC;gBACf,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;YACD,eAAe,GAAG,MAAM,CAAC;YACzB,IAAI,WAAW;gBAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAChC,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC;QACpD,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;QAC5F,IAAI,CAAC;YACH,MAAM,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE;gBAChE,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAC7B,qBAAqB,CAAC,iCAAiC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CACxE,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC3B,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,qBAAqB,CAAC,iCAAiC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;oBAC5E,OAAO;gBACT,CAAC;gBACD,iBAAiB,GAAG,IAAI,CAAC;gBACzB,kBAAkB,EAAE,CAAC;YACvB,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,qBAAqB,CAAC,iCAAiC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CACzB,QAAqB,EACrB,UAA6B,OAAO,CAAC,GAAG,EACxC,WAA4B,OAAO,CAAC,QAAQ;IAE5C,OAAO,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC/D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,OAAuB,WAAW,EAAE;IACjE,OAAO,UAAU,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AACnC,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,eAAe,CAAC,QAAqB;IACnD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE;YAC5D,GAAG,EAAE,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAC,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE;YACpD,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;YACnC,wBAAwB,EAAE,UAAU,CAAC,wBAAwB;SAC9D,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACrD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACrC,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"npm-resolver.js","sourceRoot":"","sources":["../src/npm-resolver.ts"],"names":[],"mappings":"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"}
|
package/dist/subc-transport.d.ts
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
*/
|
|
19
19
|
import type { RouteHandle } from "@cortexkit/subc-client";
|
|
20
20
|
import { type BindIdentity, type ConsumerIdentity, type ControlPush, type RequestOptions, type RouteOpenOptions, type RouteTarget, SubcCallError, SubcError } from "@cortexkit/subc-client";
|
|
21
|
-
import type { StatusSnapshot } from "./bridge.js";
|
|
21
|
+
import type { BridgeClock, StatusSnapshot } from "./bridge.js";
|
|
22
22
|
import { type CanonicalRootPath, type ConcretePoolId, type LifecycleEvent, type LifecyclePoolRegistration, type LifecyclePoolRegistrationOptions, LifecycleRegistry, type RootGeneration } from "./lifecycle-registry.js";
|
|
23
23
|
import type { AftProjectTransport, AftTransportOptions, AftTransportPool, ToolCallArguments, ToolCallOptions, ToolCallResult } from "./transport.js";
|
|
24
24
|
/** The subc pool is closing and cannot carry another request. */
|
|
@@ -128,6 +128,8 @@ export interface SubcClientLike {
|
|
|
128
128
|
close(): void;
|
|
129
129
|
}
|
|
130
130
|
export interface SubcTransportPoolOptions {
|
|
131
|
+
/** Wall/awake clocks and scheduler for caller-owned admission deadlines. */
|
|
132
|
+
clock?: BridgeClock;
|
|
131
133
|
/** Absolute path to the subc connection file (user-tier `subc.connection_file`). */
|
|
132
134
|
connectionFile: string;
|
|
133
135
|
/** Harness identity carried in every BindIdentity ("opencode" | "pi" | …). */
|
|
@@ -148,6 +150,7 @@ export interface SubcTransportPoolOptions {
|
|
|
148
150
|
connect?: (opts: {
|
|
149
151
|
connectionFile: string;
|
|
150
152
|
handshakeTimeoutMs?: number;
|
|
153
|
+
sleepGraceMs?: number;
|
|
151
154
|
onControlPush?: (push: ControlPush) => void;
|
|
152
155
|
}) => Promise<SubcClientLike>;
|
|
153
156
|
/**
|
|
@@ -318,6 +321,8 @@ export declare class SubcTransportPool implements AftTransportPool {
|
|
|
318
321
|
readonly harness: string;
|
|
319
322
|
private readonly connectionFile;
|
|
320
323
|
private readonly handshakeTimeoutMs?;
|
|
324
|
+
private readonly clock;
|
|
325
|
+
private readonly waitClock;
|
|
321
326
|
private readonly consumerIdentity;
|
|
322
327
|
private readonly hostScopes;
|
|
323
328
|
/** Scope identity is host-session-wide, even when the session uses multiple project roots. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subc-transport.d.ts","sourceRoot":"","sources":["../src/subc-transport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"subc-transport.d.ts","sourceRoot":"","sources":["../src/subc-transport.ts"],"names":[],"mappings":"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"}
|
package/dist/subc-transport.js
CHANGED
|
@@ -24,6 +24,7 @@ import { isRouteOpenReloadWindowError, isRouteRequestReloadRefusal } from "./err
|
|
|
24
24
|
import { asCanonicalRootPath, asRootGeneration, LifecycleRegistry, } from "./lifecycle-registry.js";
|
|
25
25
|
import { canonicalizeProjectRoot } from "./project-identity.js";
|
|
26
26
|
import { callPresetFor, HOST_TOOL_NAMES_FIELD, PRESET_FIELD, WORKER_SESSION_FIELD, } from "./transport.js";
|
|
27
|
+
import { deadlineTimer, RESUME_ALLOWANCE_MS, RequestDeadline, WaitClock } from "./wait-clock.js";
|
|
27
28
|
/** The subc pool is closing and cannot carry another request. */
|
|
28
29
|
export class SubcTransportShuttingDownError extends SubcCallError {
|
|
29
30
|
constructor() {
|
|
@@ -1081,6 +1082,8 @@ export class SubcTransportPool {
|
|
|
1081
1082
|
harness;
|
|
1082
1083
|
connectionFile;
|
|
1083
1084
|
handshakeTimeoutMs;
|
|
1085
|
+
clock;
|
|
1086
|
+
waitClock;
|
|
1084
1087
|
consumerIdentity;
|
|
1085
1088
|
hostScopes;
|
|
1086
1089
|
/** Scope identity is host-session-wide, even when the session uses multiple project roots. */
|
|
@@ -1144,6 +1147,13 @@ export class SubcTransportPool {
|
|
|
1144
1147
|
editSlotSurvives;
|
|
1145
1148
|
editSlotSurvivesCaptured = false;
|
|
1146
1149
|
constructor(options) {
|
|
1150
|
+
this.clock = options.clock ?? {
|
|
1151
|
+
now: () => Date.now(),
|
|
1152
|
+
awakeNow: () => performance.now(),
|
|
1153
|
+
setTimeout: (callback, ms) => setTimeout(callback, ms),
|
|
1154
|
+
clearTimeout: (timer) => clearTimeout(timer),
|
|
1155
|
+
};
|
|
1156
|
+
this.waitClock = new WaitClock(() => this.clock.now(), () => this.clock.awakeNow?.() ?? this.clock.now());
|
|
1147
1157
|
this.connectionFile = options.connectionFile;
|
|
1148
1158
|
this.harness = options.harness;
|
|
1149
1159
|
this.handshakeTimeoutMs = options.handshakeTimeoutMs;
|
|
@@ -1865,12 +1875,13 @@ export class SubcTransportPool {
|
|
|
1865
1875
|
}
|
|
1866
1876
|
/** Open or reuse a route while guarding every lifecycle boundary. */
|
|
1867
1877
|
async routeRequest(identity, body, timeoutMs, onProgress, expectedGeneration, abortSignal) {
|
|
1868
|
-
const callStartedAt =
|
|
1878
|
+
const callStartedAt = this.waitClock.now();
|
|
1869
1879
|
const callDeadlineMs = timeoutMs ?? SUBC_DEFAULT_REQUEST_TIMEOUT_MS;
|
|
1880
|
+
const deadline = new RequestDeadline(this.waitClock, callDeadlineMs);
|
|
1870
1881
|
// Charge shared backoff delays even when an injected sleeper advances no real time.
|
|
1871
1882
|
let scheduledDelayMs = 0;
|
|
1872
|
-
const spentMs = () => Math.max(
|
|
1873
|
-
const remainingMs = () =>
|
|
1883
|
+
const spentMs = () => Math.max(this.waitClock.now() - callStartedAt, scheduledDelayMs);
|
|
1884
|
+
const remainingMs = () => deadline.remaining() - Math.max(0, scheduledDelayMs - (this.waitClock.now() - callStartedAt));
|
|
1874
1885
|
const root = asCanonicalRootPath(identity.project_root);
|
|
1875
1886
|
let generation = expectedGeneration;
|
|
1876
1887
|
if (this.lifecycleEnabled()) {
|
|
@@ -1891,13 +1902,13 @@ export class SubcTransportPool {
|
|
|
1891
1902
|
const remaining = remainingMs();
|
|
1892
1903
|
if (remaining <= 0)
|
|
1893
1904
|
throw keyChanged ?? callDeadlinePassedError(undefined, callDeadlineMs);
|
|
1894
|
-
let
|
|
1905
|
+
let cancelTimer;
|
|
1895
1906
|
try {
|
|
1896
1907
|
// Each attempt calls SubcClient.connect anew, which re-reads the connection file.
|
|
1897
1908
|
const acquired = await Promise.race([
|
|
1898
1909
|
this.ensureClient(),
|
|
1899
1910
|
new Promise((resolve) => {
|
|
1900
|
-
|
|
1911
|
+
cancelTimer = deadlineTimer(this.clock, remainingMs, () => resolve(CALL_DEADLINE_EXPIRED));
|
|
1901
1912
|
}),
|
|
1902
1913
|
]);
|
|
1903
1914
|
if (acquired === CALL_DEADLINE_EXPIRED) {
|
|
@@ -1914,24 +1925,24 @@ export class SubcTransportPool {
|
|
|
1914
1925
|
throw error;
|
|
1915
1926
|
}
|
|
1916
1927
|
finally {
|
|
1917
|
-
|
|
1928
|
+
cancelTimer?.();
|
|
1918
1929
|
}
|
|
1919
1930
|
const { delayMs, wait } = this.waitForRouteReopenBackoff();
|
|
1920
1931
|
scheduledDelayMs = spentMs() + delayMs;
|
|
1921
1932
|
// A shared retry sleeper may outlive this caller's remaining budget.
|
|
1922
|
-
let
|
|
1933
|
+
let cancelRetryTimer;
|
|
1923
1934
|
try {
|
|
1924
1935
|
const waited = await Promise.race([
|
|
1925
1936
|
wait,
|
|
1926
1937
|
new Promise((resolve) => {
|
|
1927
|
-
|
|
1938
|
+
cancelRetryTimer = deadlineTimer(this.clock, remainingMs, () => resolve(CALL_DEADLINE_EXPIRED));
|
|
1928
1939
|
}),
|
|
1929
1940
|
]);
|
|
1930
1941
|
if (waited === CALL_DEADLINE_EXPIRED)
|
|
1931
1942
|
throw keyChanged;
|
|
1932
1943
|
}
|
|
1933
1944
|
finally {
|
|
1934
|
-
|
|
1945
|
+
cancelRetryTimer?.();
|
|
1935
1946
|
}
|
|
1936
1947
|
}
|
|
1937
1948
|
this.assertRecordLive(record);
|
|
@@ -1996,9 +2007,9 @@ export class SubcTransportPool {
|
|
|
1996
2007
|
const remaining = remainingMs();
|
|
1997
2008
|
if (remaining <= 0)
|
|
1998
2009
|
throw callDeadlinePassedError(lastRefusal, callDeadlineMs);
|
|
1999
|
-
let
|
|
2010
|
+
let cancelTimer;
|
|
2000
2011
|
const expired = new Promise((resolve) => {
|
|
2001
|
-
|
|
2012
|
+
cancelTimer = deadlineTimer(this.clock, remainingMs, () => resolve(CALL_DEADLINE_EXPIRED));
|
|
2002
2013
|
});
|
|
2003
2014
|
try {
|
|
2004
2015
|
const opened = await Promise.race([openRoute(), expired]);
|
|
@@ -2008,7 +2019,7 @@ export class SubcTransportPool {
|
|
|
2008
2019
|
return opened;
|
|
2009
2020
|
}
|
|
2010
2021
|
finally {
|
|
2011
|
-
|
|
2022
|
+
cancelTimer?.();
|
|
2012
2023
|
}
|
|
2013
2024
|
};
|
|
2014
2025
|
const openRouteAfterReloadWindow = async () => {
|
|
@@ -2101,8 +2112,13 @@ export class SubcTransportPool {
|
|
|
2101
2112
|
entry.inflight += 1;
|
|
2102
2113
|
let request;
|
|
2103
2114
|
try {
|
|
2115
|
+
// The SDK re-arms an expired request once across sleep, retaining
|
|
2116
|
+
// its correlation while a wake-delayed reply is delivered.
|
|
2104
2117
|
request = client.request(route, body, {
|
|
2105
2118
|
timeoutMs: Math.ceil(requestTimeoutMs),
|
|
2119
|
+
// Disable SDK sleep grace if admission already granted the call
|
|
2120
|
+
// its one resume allowance.
|
|
2121
|
+
...(deadline.resumed ? { sleepGraceMs: 0 } : {}),
|
|
2106
2122
|
onProgress,
|
|
2107
2123
|
});
|
|
2108
2124
|
}
|
|
@@ -2262,6 +2278,7 @@ export class SubcTransportPool {
|
|
|
2262
2278
|
this.connecting = this.connectFn({
|
|
2263
2279
|
connectionFile: this.connectionFile,
|
|
2264
2280
|
handshakeTimeoutMs: this.handshakeTimeoutMs,
|
|
2281
|
+
sleepGraceMs: RESUME_ALLOWANCE_MS,
|
|
2265
2282
|
onControlPush: (push) => {
|
|
2266
2283
|
if (owner && this.client === owner)
|
|
2267
2284
|
this.onScopeRouteClose(push);
|
|
@@ -2497,7 +2514,11 @@ export class SubcTransportPool {
|
|
|
2497
2514
|
retry = state.bindPending;
|
|
2498
2515
|
}
|
|
2499
2516
|
else {
|
|
2500
|
-
retry = this.hostScope(client, record.identity)
|
|
2517
|
+
retry = this.hostScope(client, record.identity).finally(() => {
|
|
2518
|
+
// A timer can wake before retryAt. Re-arm even when the lookup only saw backoff,
|
|
2519
|
+
// otherwise a session with persistent routes would never try core again.
|
|
2520
|
+
this.scheduleHostScopeRetry(session, state);
|
|
2521
|
+
});
|
|
2501
2522
|
}
|
|
2502
2523
|
void retry.catch((error) => {
|
|
2503
2524
|
warn(`subc head scope: session=${session} background retry failed code=${error instanceof Error ? error.name : "Error"}`);
|
|
@@ -2707,13 +2728,22 @@ export class SubcTransportPool {
|
|
|
2707
2728
|
}
|
|
2708
2729
|
return this.openScopedHostToolRoute(client, identity, record, entry, channel);
|
|
2709
2730
|
}
|
|
2710
|
-
bindHostToolRoute(client, identity, channel, reason, scope) {
|
|
2731
|
+
async bindHostToolRoute(client, identity, channel, reason, scope) {
|
|
2711
2732
|
log(`subc head scope: session=${identity.session} bind=${scope ? "scoped" : "unscoped"} channel=${channel} root=${identity.project_root} reason=${reason}` +
|
|
2712
2733
|
(scope ? ` ref=${scope.ref.slice(0, 8)} epoch=${scope.scopeEpoch}` : ""));
|
|
2713
|
-
|
|
2734
|
+
const route = await client.routeOpen({ kind: "tool_provider", module_id: AFT_MODULE_ID }, identity, {
|
|
2714
2735
|
consumerIdentity: this.consumerIdentity,
|
|
2715
2736
|
...(scope ? { scope } : {}),
|
|
2716
2737
|
});
|
|
2738
|
+
const state = this.hostScopeCache.get(identity.session);
|
|
2739
|
+
if (scope &&
|
|
2740
|
+
state?.unscopedReason &&
|
|
2741
|
+
state.answer?.result === "scope" &&
|
|
2742
|
+
state.answer.scope === scope) {
|
|
2743
|
+
log(`subc head scope: session=${identity.session} route=upgraded from=unscoped ref=${scope.ref.slice(0, 8)} epoch=${scope.scopeEpoch}`);
|
|
2744
|
+
state.unscopedReason = undefined;
|
|
2745
|
+
}
|
|
2746
|
+
return route;
|
|
2717
2747
|
}
|
|
2718
2748
|
async openScopedHostToolRoute(client, identity, record, entry, channel = "tool") {
|
|
2719
2749
|
const decision = await this.hostScope(client, identity);
|