@aui.io/apollo 0.1.39 → 0.1.41
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/node_modules/@aui.io/apollo-cli/dist/src/commands/bundles.js +131 -27
- package/node_modules/@aui.io/apollo-cli/dist/src/commands/bundles.js.map +1 -1
- package/node_modules/@aui.io/apollo-cli/dist/src/commands/vault.js +3 -4
- package/node_modules/@aui.io/apollo-cli/dist/src/commands/vault.js.map +1 -1
- package/node_modules/@aui.io/apollo-cli/dist/src/index.js +0 -2
- package/node_modules/@aui.io/apollo-cli/dist/src/index.js.map +1 -1
- package/node_modules/@aui.io/apollo-cli/package.json +3 -3
- package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.d.ts +11 -100
- package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.js +0 -17
- package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/api/builder-api.d.ts +71 -0
- package/node_modules/@aui.io/apollo-core/dist/src/api/builder-api.js +17 -0
- package/node_modules/@aui.io/apollo-core/dist/src/api/builder-api.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/api/vault.d.ts +8 -23
- package/node_modules/@aui.io/apollo-core/dist/src/api/vault.js +4 -23
- package/node_modules/@aui.io/apollo-core/dist/src/api/vault.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/bundle/baseline.d.ts +12 -1
- package/node_modules/@aui.io/apollo-core/dist/src/bundle/baseline.js +8 -2
- package/node_modules/@aui.io/apollo-core/dist/src/bundle/baseline.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/bundle/build-area.d.ts +15 -0
- package/node_modules/@aui.io/apollo-core/dist/src/bundle/build-area.js +121 -0
- package/node_modules/@aui.io/apollo-core/dist/src/bundle/build-area.js.map +1 -0
- package/node_modules/@aui.io/apollo-core/dist/src/index.d.ts +3 -4
- package/node_modules/@aui.io/apollo-core/dist/src/index.js +0 -1
- package/node_modules/@aui.io/apollo-core/dist/src/index.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/services/bundles.d.ts +54 -5
- package/node_modules/@aui.io/apollo-core/dist/src/services/bundles.js +189 -36
- package/node_modules/@aui.io/apollo-core/dist/src/services/bundles.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/services/evaluations.d.ts +42 -0
- package/node_modules/@aui.io/apollo-core/dist/src/services/evaluations.js +106 -0
- package/node_modules/@aui.io/apollo-core/dist/src/services/evaluations.js.map +1 -0
- package/node_modules/@aui.io/apollo-core/dist/src/services/vault.d.ts +2 -3
- package/node_modules/@aui.io/apollo-core/dist/src/services/vault.js +12 -12
- package/node_modules/@aui.io/apollo-core/dist/src/services/vault.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/package.json +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/actions/registry.js +0 -28
- package/node_modules/@aui.io/apollo-tui/dist/src/actions/registry.js.map +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/activity/operationStore.js +0 -3
- package/node_modules/@aui.io/apollo-tui/dist/src/activity/operationStore.js.map +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/author/AuthorHome.d.ts +1 -3
- package/node_modules/@aui.io/apollo-tui/dist/src/author/AuthorHome.js +3 -3
- package/node_modules/@aui.io/apollo-tui/dist/src/author/AuthorHome.js.map +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/lib/actions.js +4 -90
- package/node_modules/@aui.io/apollo-tui/dist/src/lib/actions.js.map +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/lib/commands.d.ts +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/lib/commands.js +0 -50
- package/node_modules/@aui.io/apollo-tui/dist/src/lib/commands.js.map +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/opentui-app.js +15 -159
- package/node_modules/@aui.io/apollo-tui/dist/src/opentui-app.js.map +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/shell/FooterHints.d.ts +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/shell/FooterHints.js +0 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/shell/FooterHints.js.map +1 -1
- package/node_modules/@aui.io/apollo-tui/package.json +2 -2
- package/package.json +4 -4
- package/node_modules/@aui.io/apollo-cli/dist/src/commands/scenarios.d.ts +0 -3
- package/node_modules/@aui.io/apollo-cli/dist/src/commands/scenarios.js +0 -124
- package/node_modules/@aui.io/apollo-cli/dist/src/commands/scenarios.js.map +0 -1
- package/node_modules/@aui.io/apollo-core/dist/src/services/scenarios.d.ts +0 -158
- package/node_modules/@aui.io/apollo-core/dist/src/services/scenarios.js +0 -481
- package/node_modules/@aui.io/apollo-core/dist/src/services/scenarios.js.map +0 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/author/ScenariosView.d.ts +0 -22
- package/node_modules/@aui.io/apollo-tui/dist/src/author/ScenariosView.js +0 -99
- package/node_modules/@aui.io/apollo-tui/dist/src/author/ScenariosView.js.map +0 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/author/scenarios.d.ts +0 -47
- package/node_modules/@aui.io/apollo-tui/dist/src/author/scenarios.js +0 -284
- package/node_modules/@aui.io/apollo-tui/dist/src/author/scenarios.js.map +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { AgentSettingsClient, BuildBundlePushResponse } from "../api/agent-settings.js";
|
|
1
2
|
import { type AgentVersion, type ManagementClient, type VersionPull, type VersionPush } from "../api/management.js";
|
|
2
3
|
import type { BuilderApiClient, BuilderCertification, EraCensus, OrphanCensus } from "../api/builder-api.js";
|
|
3
4
|
import type { RuntimeApiClient } from "../api/runtime-api.js";
|
|
@@ -11,27 +12,47 @@ export declare function requireAgent(context: Context): string;
|
|
|
11
12
|
/** The checkout root the context is bound to (exported for the sibling
|
|
12
13
|
* services that anchor per-checkout state there, e.g. the advisor thread). */
|
|
13
14
|
export declare function agentRoot(context: Context): string;
|
|
14
|
-
|
|
15
|
+
/** What one pull moved in the build area, when the agent has a build bundle. */
|
|
16
|
+
export interface BuildAreaSync {
|
|
17
|
+
version: number;
|
|
18
|
+
written: string[];
|
|
19
|
+
removed: string[];
|
|
20
|
+
}
|
|
21
|
+
export declare function pullBundle(context: Context, clients: {
|
|
22
|
+
management: ManagementClient;
|
|
23
|
+
agentSettings: AgentSettingsClient;
|
|
24
|
+
}, options?: {
|
|
15
25
|
tag?: string;
|
|
16
26
|
destination?: string;
|
|
17
27
|
homeDir?: string;
|
|
18
28
|
force?: boolean;
|
|
29
|
+
/** Injected for tests; used for the signed-URL build-file downloads. */
|
|
30
|
+
fetch?: typeof globalThis.fetch;
|
|
19
31
|
}): Promise<{
|
|
20
32
|
pull: VersionPull;
|
|
21
33
|
files: Record<string, string>;
|
|
22
34
|
removed: string[];
|
|
35
|
+
/** Absent when the agent has no build bundle yet — the area is untouched. */
|
|
36
|
+
build?: BuildAreaSync;
|
|
23
37
|
}>;
|
|
24
|
-
export declare function importBundle(context: Context,
|
|
38
|
+
export declare function importBundle(context: Context, clients: {
|
|
39
|
+
management: ManagementClient;
|
|
40
|
+
agentSettings: AgentSettingsClient;
|
|
41
|
+
}, agentId: string, destination: string, options?: {
|
|
25
42
|
tag?: string;
|
|
26
43
|
homeDir?: string;
|
|
27
44
|
/** The engine build to pin the new checkout to (see `runtime-version/`). */
|
|
28
45
|
runtimeVersion?: string;
|
|
29
46
|
/** `headless` skips skill packs for the checkout's whole life — see `WorkspaceMode`. */
|
|
30
47
|
workspace?: "headless";
|
|
48
|
+
/** Injected for tests; used for the signed-URL build-file downloads. */
|
|
49
|
+
fetch?: typeof globalThis.fetch;
|
|
31
50
|
}): Promise<{
|
|
32
51
|
pull: VersionPull;
|
|
33
52
|
files: Record<string, string>;
|
|
34
53
|
binding: ProjectBinding;
|
|
54
|
+
/** Absent when the agent has no build bundle yet. */
|
|
55
|
+
build?: BuildAreaSync;
|
|
35
56
|
}>;
|
|
36
57
|
/** Skill packs a checkout gets unless the caller narrows or disables them. */
|
|
37
58
|
export declare const DEFAULT_SKILL_TARGETS: SkillTarget[];
|
|
@@ -44,11 +65,15 @@ export interface PullCheckoutOptions {
|
|
|
44
65
|
skills?: SkillTarget[] | false;
|
|
45
66
|
/** Refresh the authoring JSON Schemas (default true). */
|
|
46
67
|
schemas?: boolean;
|
|
68
|
+
/** Injected for tests; used for the signed-URL build-file downloads. */
|
|
69
|
+
fetch?: typeof globalThis.fetch;
|
|
47
70
|
}
|
|
48
71
|
export interface PullCheckoutResult {
|
|
49
72
|
pull: VersionPull;
|
|
50
73
|
files: Record<string, string>;
|
|
51
74
|
removed: string[];
|
|
75
|
+
/** The build area sync, when the agent has a build bundle. */
|
|
76
|
+
build?: BuildAreaSync;
|
|
52
77
|
/** The engine build every fetch above was routed to, when pinned. */
|
|
53
78
|
runtimeVersion?: string;
|
|
54
79
|
skills?: string[];
|
|
@@ -76,14 +101,26 @@ export interface PullCheckoutResult {
|
|
|
76
101
|
export declare function pullCheckout(context: Context, clients: {
|
|
77
102
|
management: ManagementClient;
|
|
78
103
|
runtime: RuntimeApiClient;
|
|
104
|
+
agentSettings: AgentSettingsClient;
|
|
79
105
|
}, options?: PullCheckoutOptions): Promise<PullCheckoutResult>;
|
|
106
|
+
/** Both lanes against the baseline in one report: program paths bare (as
|
|
107
|
+
* ever), build paths under a `build/` prefix — same dialect as the push
|
|
108
|
+
* and pull dirty-guard messages. */
|
|
80
109
|
export declare function localDiff(context: Context, root?: string, homeDir?: string): Promise<FileDiff>;
|
|
110
|
+
/** Program lane only — the build-bundle pull serves signed URLs, not
|
|
111
|
+
* hashes, so a remote build diff would download the whole bundle to say
|
|
112
|
+
* anything. `apollo pull` (whose dirty guard covers the area) is the
|
|
113
|
+
* honest tool there. */
|
|
81
114
|
export declare function remoteDiff(context: Context, management: ManagementClient, root?: string): Promise<FileDiff>;
|
|
82
|
-
/** Named for symmetry with `PullCheckoutResult
|
|
83
|
-
* already owns `PushBundleResult` — its bundles are evaluation suites). */
|
|
115
|
+
/** Named for symmetry with `PullCheckoutResult`. */
|
|
84
116
|
export interface PushCheckoutResult {
|
|
117
|
+
/** The program lane (`bundle/src/**` vs the baseline). */
|
|
85
118
|
diff: FileDiff;
|
|
119
|
+
/** The build lane (`bundle/build/**` vs the baseline), bare relative paths. */
|
|
120
|
+
buildDiff: FileDiff;
|
|
86
121
|
push?: VersionPush;
|
|
122
|
+
/** Present when the build area changed and was published as a new bundle. */
|
|
123
|
+
buildPush?: BuildBundlePushResponse;
|
|
87
124
|
validation?: ValidationResult;
|
|
88
125
|
/**
|
|
89
126
|
* The runtime pin the push rode — the pre-flight validate routed to it,
|
|
@@ -92,7 +129,19 @@ export interface PushCheckoutResult {
|
|
|
92
129
|
*/
|
|
93
130
|
runtimeVersion?: string;
|
|
94
131
|
}
|
|
95
|
-
|
|
132
|
+
/**
|
|
133
|
+
* Publish the checkout, both lanes: a changed program becomes a new agent
|
|
134
|
+
* version (validated first), a changed build area becomes a new build
|
|
135
|
+
* bundle. Each lane only pushes when IT changed, so suite iteration does
|
|
136
|
+
* not mint program versions and vice versa. The baseline advances after
|
|
137
|
+
* each lane lands — a build-lane failure after a version push leaves a
|
|
138
|
+
* state where re-running pushes only the build lane.
|
|
139
|
+
*/
|
|
140
|
+
export declare function pushBundle(context: Context, clients: {
|
|
141
|
+
management: ManagementClient;
|
|
142
|
+
runtime: RuntimeApiClient;
|
|
143
|
+
agentSettings: AgentSettingsClient;
|
|
144
|
+
}, options?: {
|
|
96
145
|
root?: string;
|
|
97
146
|
commitMessage?: string;
|
|
98
147
|
homeDir?: string;
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { homedir } from "node:os";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { findLiveVersion, } from "../api/management.js";
|
|
4
|
-
import { diffHashes, isClean, readBaseline, writeBaseline } from "../bundle/baseline.js";
|
|
4
|
+
import { diffHashes, diffHashMaps, isClean, readBaseline, writeBaseline, } from "../bundle/baseline.js";
|
|
5
|
+
import { hashBuildFiles, readBuildFiles, writeBuildFiles, } from "../bundle/build-area.js";
|
|
5
6
|
import { hashFiles, readProgramFiles } from "../bundle/files.js";
|
|
6
7
|
import { assembleBundle, bundleFileLayout, bundleFiles, writeBundleFiles, } from "../bundle/materialize.js";
|
|
7
8
|
import { assertValidProgram, mapRuntimeValidation, } from "../bundle/validate.js";
|
|
8
9
|
import { patchBinding, writeBinding, } from "../config/index.js";
|
|
9
|
-
import { ConfigError } from "../errors/index.js";
|
|
10
|
+
import { ApiError, CliError, ConfigError, ValidationError } from "../errors/index.js";
|
|
10
11
|
import { checkoutSchemasDir, installSchemas } from "../schemas/install.js";
|
|
11
12
|
import { installAgentsPage } from "../skills/agents-page.js";
|
|
12
13
|
import { installSkills, removeManagedSkills, } from "../skills/install.js";
|
|
@@ -32,6 +33,11 @@ export function agentRoot(context) {
|
|
|
32
33
|
function bundleSourceRoot(context, root = agentRoot(context)) {
|
|
33
34
|
return path.join(root, "bundle", "src");
|
|
34
35
|
}
|
|
36
|
+
/** The build area beside a src root — `<checkout>/bundle/build`. Derived
|
|
37
|
+
* from the SRC root so callers that override it keep the pair together. */
|
|
38
|
+
function buildAreaRoot(sourceRoot) {
|
|
39
|
+
return path.resolve(sourceRoot, "..", "build");
|
|
40
|
+
}
|
|
35
41
|
/**
|
|
36
42
|
* Move the checkout's bound tag. A patch, not a rewrite: pull and push run
|
|
37
43
|
* constantly, and rebuilding the binding from the command's context would
|
|
@@ -77,25 +83,100 @@ async function assertCleanPullDestination(context, root, homeDir) {
|
|
|
77
83
|
throw new ConfigError(`Local bundle files have changed:\n${formatFileDiff(pending)}`, "Push your changes or pass --force to replace the local bundle.");
|
|
78
84
|
}
|
|
79
85
|
}
|
|
80
|
-
|
|
86
|
+
/**
|
|
87
|
+
* The agent's latest build bundle as bytes, or `undefined` when none exists
|
|
88
|
+
* yet (agent-settings answers 404 — a normal state, not an error). File
|
|
89
|
+
* bytes are not proxied: the pull response carries short-lived signed URLs,
|
|
90
|
+
* downloaded here.
|
|
91
|
+
*/
|
|
92
|
+
async function downloadBuildBundle(agentSettings, agentId, fetchImpl) {
|
|
93
|
+
let response;
|
|
94
|
+
try {
|
|
95
|
+
response = await agentSettings.pullBuildBundle(agentId);
|
|
96
|
+
}
|
|
97
|
+
catch (error) {
|
|
98
|
+
if (error instanceof ApiError && error.status === 404)
|
|
99
|
+
return undefined;
|
|
100
|
+
throw error;
|
|
101
|
+
}
|
|
102
|
+
const entries = Object.entries(response.file_urls ?? {}).filter((entry) => typeof entry[1] === "string" && entry[1].length > 0);
|
|
103
|
+
const files = {};
|
|
104
|
+
await Promise.all(entries.map(async ([relativePath, signedUrl]) => {
|
|
105
|
+
const download = await fetchImpl(signedUrl);
|
|
106
|
+
if (!download.ok) {
|
|
107
|
+
throw new CliError(`Failed to download build file "${relativePath}": ${String(download.status)} ${download.statusText}`);
|
|
108
|
+
}
|
|
109
|
+
files[relativePath] = Buffer.from(await download.arrayBuffer());
|
|
110
|
+
}));
|
|
111
|
+
return { version: response.bundle.version, files };
|
|
112
|
+
}
|
|
113
|
+
/** The build-area dirty check — same contract as the program one: local
|
|
114
|
+
* edits the baseline does not know about block a sync that would overwrite
|
|
115
|
+
* them. Only consulted when a remote bundle exists (a 404 pull never
|
|
116
|
+
* touches the area, so there is nothing to protect). */
|
|
117
|
+
async function assertCleanBuildArea(buildDir, baselineHashes) {
|
|
118
|
+
const local = await readBuildFiles(buildDir);
|
|
119
|
+
const pending = diffHashMaps(baselineHashes, hashBuildFiles(local.files));
|
|
120
|
+
if (isClean(pending))
|
|
121
|
+
return;
|
|
122
|
+
throw new ConfigError(`Local build files have changed:\n${formatFileDiff(prefixDiff(pending, "build/"))}`, "Push your changes (`apollo push`) or pass --force to replace bundle/build.");
|
|
123
|
+
}
|
|
124
|
+
function prefixDiff(diff, prefix) {
|
|
125
|
+
return {
|
|
126
|
+
added: diff.added.map((file) => `${prefix}${file}`),
|
|
127
|
+
changed: diff.changed.map((file) => `${prefix}${file}`),
|
|
128
|
+
removed: diff.removed.map((file) => `${prefix}${file}`),
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
export async function pullBundle(context, clients, options = {}) {
|
|
81
132
|
const agentId = requireAgent(context);
|
|
82
133
|
const tag = requireTag(context, options.tag);
|
|
83
134
|
const homeDir = options.homeDir ?? homedir();
|
|
84
|
-
const
|
|
135
|
+
const root = options.destination ?? agentRoot(context);
|
|
136
|
+
const destination = bundleSourceRoot(context, root);
|
|
137
|
+
const buildDir = buildAreaRoot(destination);
|
|
85
138
|
if (!options.force) {
|
|
86
139
|
await assertCleanPullDestination(context, destination, homeDir);
|
|
87
140
|
}
|
|
88
|
-
|
|
89
|
-
|
|
141
|
+
// The two lanes are independent remotes — fetch them together, write only
|
|
142
|
+
// after BOTH dirty checks pass, so a refusal never leaves a half-synced
|
|
143
|
+
// checkout.
|
|
144
|
+
const [pull, remoteBuild] = await Promise.all([
|
|
145
|
+
pullVersionByTag(clients.management, agentId, tag),
|
|
146
|
+
downloadBuildBundle(clients.agentSettings, agentId, options.fetch ?? globalThis.fetch),
|
|
147
|
+
]);
|
|
148
|
+
if (remoteBuild && !options.force) {
|
|
149
|
+
const baseline = await readBaseline(homeDir, agentId);
|
|
150
|
+
await assertCleanBuildArea(buildDir, baseline?.buildHashes ?? {});
|
|
151
|
+
}
|
|
90
152
|
const files = bundleFiles(pull.bundle);
|
|
91
153
|
const written = await writeBundleFiles(destination, files);
|
|
154
|
+
const buildSync = remoteBuild
|
|
155
|
+
? { version: remoteBuild.version, ...(await writeBuildFiles(buildDir, remoteBuild.files)) }
|
|
156
|
+
: undefined;
|
|
92
157
|
await updateTag(context, pull.version_tag);
|
|
93
|
-
|
|
94
|
-
|
|
158
|
+
// On a 404 the baseline records an EMPTY area even when local files exist:
|
|
159
|
+
// they are unpushed work, and recording them would make `apollo push`
|
|
160
|
+
// read the area as clean and never publish it.
|
|
161
|
+
await writeBaseline(homeDir, agentId, pull.version_tag, files, bundleFileLayout(pull.bundle), remoteBuild ? hashBuildFiles(remoteBuild.files) : {});
|
|
162
|
+
return {
|
|
163
|
+
pull,
|
|
164
|
+
files,
|
|
165
|
+
removed: written.removed,
|
|
166
|
+
...(buildSync ? { build: buildSync } : {}),
|
|
167
|
+
};
|
|
95
168
|
}
|
|
96
|
-
|
|
169
|
+
async function pullVersionByTag(management, agentId, tag) {
|
|
170
|
+
const version = await management.resolveVersion(agentId, tag);
|
|
171
|
+
return management.pullVersion(agentId, version.id, tag);
|
|
172
|
+
}
|
|
173
|
+
export async function importBundle(context, clients, agentId, destination, options = {}) {
|
|
97
174
|
const { tag, runtimeVersion, workspace } = options;
|
|
175
|
+
const { management } = clients;
|
|
98
176
|
const homeDir = options.homeDir ?? homedir();
|
|
177
|
+
// The build lane is an independent remote — start its download alongside
|
|
178
|
+
// the version resolution chain.
|
|
179
|
+
const buildPromise = downloadBuildBundle(clients.agentSettings, agentId, options.fetch ?? globalThis.fetch);
|
|
99
180
|
const agent = await management.getAgent(agentId);
|
|
100
181
|
let selectedTag = tag;
|
|
101
182
|
if (!selectedTag && agent.live_version_id) {
|
|
@@ -107,9 +188,19 @@ export async function importBundle(context, management, agentId, destination, op
|
|
|
107
188
|
if (!selectedTag)
|
|
108
189
|
throw new ConfigError("The agent has no live version; pass --tag.");
|
|
109
190
|
const version = await management.resolveVersion(agentId, selectedTag);
|
|
110
|
-
const pull = await
|
|
191
|
+
const [pull, remoteBuild] = await Promise.all([
|
|
192
|
+
management.pullVersion(agentId, version.id, selectedTag),
|
|
193
|
+
buildPromise,
|
|
194
|
+
]);
|
|
111
195
|
const files = bundleFiles(pull.bundle);
|
|
112
|
-
|
|
196
|
+
const sourceRoot = bundleSourceRoot(context, destination);
|
|
197
|
+
await writeBundleFiles(sourceRoot, files);
|
|
198
|
+
const buildSync = remoteBuild
|
|
199
|
+
? {
|
|
200
|
+
version: remoteBuild.version,
|
|
201
|
+
...(await writeBuildFiles(buildAreaRoot(sourceRoot), remoteBuild.files)),
|
|
202
|
+
}
|
|
203
|
+
: undefined;
|
|
113
204
|
const binding = {
|
|
114
205
|
config_version: 1,
|
|
115
206
|
...(context.orgId ? { org_id: context.orgId } : {}),
|
|
@@ -120,8 +211,8 @@ export async function importBundle(context, management, agentId, destination, op
|
|
|
120
211
|
...(workspace ? { workspace } : {}),
|
|
121
212
|
};
|
|
122
213
|
await writeBinding(path.join(destination, ".apollorc"), binding);
|
|
123
|
-
await writeBaseline(homeDir, agent.id, pull.version_tag, files, bundleFileLayout(pull.bundle));
|
|
124
|
-
return { pull, files, binding };
|
|
214
|
+
await writeBaseline(homeDir, agent.id, pull.version_tag, files, bundleFileLayout(pull.bundle), remoteBuild ? hashBuildFiles(remoteBuild.files) : {});
|
|
215
|
+
return { pull, files, binding, ...(buildSync ? { build: buildSync } : {}) };
|
|
125
216
|
}
|
|
126
217
|
/** Skill packs a checkout gets unless the caller narrows or disables them. */
|
|
127
218
|
export const DEFAULT_SKILL_TARGETS = ["cursor", "claude"];
|
|
@@ -137,10 +228,11 @@ export const DEFAULT_SKILL_TARGETS = ["cursor", "claude"];
|
|
|
137
228
|
*/
|
|
138
229
|
export async function pullCheckout(context, clients, options = {}) {
|
|
139
230
|
const root = options.destination ?? agentRoot(context);
|
|
140
|
-
const bundle = await pullBundle(context, clients
|
|
231
|
+
const bundle = await pullBundle(context, clients, {
|
|
141
232
|
...(options.tag ? { tag: options.tag } : {}),
|
|
142
233
|
...(options.destination ? { destination: options.destination } : {}),
|
|
143
234
|
...(options.homeDir ? { homeDir: options.homeDir } : {}),
|
|
235
|
+
...(options.fetch ? { fetch: options.fetch } : {}),
|
|
144
236
|
force: options.force === true,
|
|
145
237
|
});
|
|
146
238
|
// The checkout's profile beats the flags: a headless checkout never
|
|
@@ -208,14 +300,27 @@ export async function pullCheckout(context, clients, options = {}) {
|
|
|
208
300
|
...(note ? { note } : {}),
|
|
209
301
|
};
|
|
210
302
|
}
|
|
303
|
+
/** Both lanes against the baseline in one report: program paths bare (as
|
|
304
|
+
* ever), build paths under a `build/` prefix — same dialect as the push
|
|
305
|
+
* and pull dirty-guard messages. */
|
|
211
306
|
export async function localDiff(context, root = bundleSourceRoot(context), homeDir = homedir()) {
|
|
212
307
|
const agentId = requireAgent(context);
|
|
213
308
|
const baseline = await readBaseline(homeDir, agentId);
|
|
214
309
|
if (!baseline)
|
|
215
310
|
throw new ConfigError("No import/pull/push baseline exists yet.");
|
|
216
311
|
const current = await readProgramFiles(root);
|
|
217
|
-
|
|
312
|
+
const program = diffHashes(baseline.files, current.files);
|
|
313
|
+
const build = prefixDiff(diffHashMaps(baseline.buildHashes ?? {}, hashBuildFiles((await readBuildFiles(buildAreaRoot(root))).files)), "build/");
|
|
314
|
+
return {
|
|
315
|
+
added: [...program.added, ...build.added].sort(),
|
|
316
|
+
changed: [...program.changed, ...build.changed].sort(),
|
|
317
|
+
removed: [...program.removed, ...build.removed].sort(),
|
|
318
|
+
};
|
|
218
319
|
}
|
|
320
|
+
/** Program lane only — the build-bundle pull serves signed URLs, not
|
|
321
|
+
* hashes, so a remote build diff would download the whole bundle to say
|
|
322
|
+
* anything. `apollo pull` (whose dirty guard covers the area) is the
|
|
323
|
+
* honest tool there. */
|
|
219
324
|
export async function remoteDiff(context, management, root = bundleSourceRoot(context)) {
|
|
220
325
|
const agentId = requireAgent(context);
|
|
221
326
|
const tag = requireTag(context);
|
|
@@ -225,36 +330,84 @@ export async function remoteDiff(context, management, root = bundleSourceRoot(co
|
|
|
225
330
|
const current = await readProgramFiles(root);
|
|
226
331
|
return diffHashes(hashFiles(remote), current.files);
|
|
227
332
|
}
|
|
228
|
-
|
|
333
|
+
/** agent-settings enforces this per uploaded build file. */
|
|
334
|
+
const MAX_BUILD_FILE_BYTES = 5 * 1024 * 1024;
|
|
335
|
+
/**
|
|
336
|
+
* Publish the checkout, both lanes: a changed program becomes a new agent
|
|
337
|
+
* version (validated first), a changed build area becomes a new build
|
|
338
|
+
* bundle. Each lane only pushes when IT changed, so suite iteration does
|
|
339
|
+
* not mint program versions and vice versa. The baseline advances after
|
|
340
|
+
* each lane lands — a build-lane failure after a version push leaves a
|
|
341
|
+
* state where re-running pushes only the build lane.
|
|
342
|
+
*/
|
|
343
|
+
export async function pushBundle(context, clients, options = {}) {
|
|
229
344
|
const agentId = requireAgent(context);
|
|
345
|
+
const homeDir = options.homeDir ?? homedir();
|
|
230
346
|
const root = options.root ?? bundleSourceRoot(context);
|
|
231
347
|
const program = await readProgramFiles(root);
|
|
232
|
-
const validation = await validateProgramBundle(runtime, program.files);
|
|
348
|
+
const validation = await validateProgramBundle(clients.runtime, program.files);
|
|
233
349
|
assertValidProgram(validation);
|
|
234
|
-
const
|
|
350
|
+
const build = await readBuildFiles(buildAreaRoot(root));
|
|
351
|
+
const buildHashes = hashBuildFiles(build.files);
|
|
352
|
+
const baseline = await readBaseline(homeDir, agentId);
|
|
235
353
|
const diff = diffHashes(baseline?.files ?? {}, program.files);
|
|
354
|
+
const buildDiff = diffHashMaps(baseline?.buildHashes ?? {}, buildHashes);
|
|
236
355
|
const pinned = context.runtimeVersion
|
|
237
356
|
? { runtimeVersion: context.runtimeVersion }
|
|
238
357
|
: {};
|
|
239
|
-
if (options.dryRun || isClean(diff))
|
|
240
|
-
return { diff, validation, ...pinned };
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
358
|
+
if (options.dryRun || (isClean(diff) && isClean(buildDiff))) {
|
|
359
|
+
return { diff, buildDiff, validation, ...pinned };
|
|
360
|
+
}
|
|
361
|
+
let push;
|
|
362
|
+
let versionTag = baseline?.versionTag ?? requireTag(context);
|
|
363
|
+
let fileLayout = baseline?.fileLayout;
|
|
364
|
+
if (!isClean(diff)) {
|
|
365
|
+
const baseTag = requireTag(context);
|
|
366
|
+
const base = await clients.management.resolveVersion(agentId, baseTag);
|
|
367
|
+
const draft = base.status === "draft"
|
|
368
|
+
? base
|
|
369
|
+
: await clients.management.createVersion(agentId, {
|
|
370
|
+
source: "version",
|
|
371
|
+
fromVersion: base.id,
|
|
372
|
+
label: `Draft from ${base.version_tag}`,
|
|
373
|
+
});
|
|
374
|
+
const bundle = assembleBundle(program.files, baseline?.fileLayout);
|
|
375
|
+
// The revision records the engine build it targets: the checkout's pin
|
|
376
|
+
// (flag > env > `.apollorc`) rides the push body as `runtime_version`,
|
|
377
|
+
// the same value the pre-flight validate above was routed to.
|
|
378
|
+
push = await clients.management.pushVersion(agentId, draft.id, bundle, options.commitMessage, context.runtimeVersion);
|
|
379
|
+
versionTag = push.new_version_tag;
|
|
380
|
+
fileLayout = bundleFileLayout(bundle);
|
|
381
|
+
await updateTag(context, versionTag);
|
|
382
|
+
await writeBaseline(homeDir, agentId, versionTag, program.files, fileLayout, baseline?.buildHashes ?? {});
|
|
383
|
+
}
|
|
384
|
+
let buildPush;
|
|
385
|
+
if (!isClean(buildDiff)) {
|
|
386
|
+
for (const [relativePath, content] of Object.entries(build.files)) {
|
|
387
|
+
if (content.length > MAX_BUILD_FILE_BYTES) {
|
|
388
|
+
throw new ValidationError(`build/${relativePath} is ${(content.length / 1024 / 1024).toFixed(1)}MB — the build-bundle lane caps files at 5MB.`);
|
|
389
|
+
}
|
|
390
|
+
}
|
|
391
|
+
// A build bundle is a full snapshot, not a delta: every file in the
|
|
392
|
+
// area ships, and the new version replaces the old one wholesale.
|
|
393
|
+
buildPush = await clients.agentSettings.pushBuildBundle(agentId, {
|
|
394
|
+
files: Object.entries(build.files).map(([relativePath, content]) => ({
|
|
395
|
+
path: relativePath,
|
|
396
|
+
content,
|
|
397
|
+
})),
|
|
398
|
+
createdBy: context.userId ?? "apollo-cli",
|
|
399
|
+
...(options.commitMessage ? { notes: options.commitMessage } : {}),
|
|
249
400
|
});
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
401
|
+
await writeBaseline(homeDir, agentId, versionTag, program.files, fileLayout, buildHashes);
|
|
402
|
+
}
|
|
403
|
+
return {
|
|
404
|
+
diff,
|
|
405
|
+
buildDiff,
|
|
406
|
+
...(push ? { push } : {}),
|
|
407
|
+
...(buildPush ? { buildPush } : {}),
|
|
408
|
+
validation,
|
|
409
|
+
...pinned,
|
|
410
|
+
};
|
|
258
411
|
}
|
|
259
412
|
export async function validateProgramBundle(runtime, files) {
|
|
260
413
|
const response = await runtime.validateProgram({ files });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundles.js","sourceRoot":"","sources":["../../../src/services/bundles.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bundles.js","sourceRoot":"","sources":["../../../src/services/bundles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAO7B,OAAO,EACL,eAAe,GAKhB,MAAM,sBAAsB,CAAC;AAQ9B,OAAO,EACL,UAAU,EACV,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,aAAa,GAEd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,cAAc,EACd,cAAc,EACd,eAAe,GAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kBAAkB,EAClB,oBAAoB,GAErB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,YAAY,EACZ,YAAY,GAGb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EACL,aAAa,EACb,mBAAmB,GAEpB,MAAM,sBAAsB,CAAC;AAE9B;uDACuD;AACvD,MAAM,UAAU,YAAY,CAAC,OAAgB;IAC3C,IAAI,CAAC,OAAO,CAAC,OAAO;QAAE,MAAM,IAAI,WAAW,CAAC,kCAAkC,CAAC,CAAC;IAChF,OAAO,OAAO,CAAC,OAAO,CAAC;AACzB,CAAC;AAED,SAAS,UAAU,CAAC,OAAgB,EAAE,QAAiB;IACrD,MAAM,GAAG,GAAG,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC;IAC3C,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,WAAW,CAAC,6BAA6B,CAAC,CAAC;IAC/D,OAAO,GAAG,CAAC;AACb,CAAC;AAED;+EAC+E;AAC/E,MAAM,UAAU,SAAS,CAAC,OAAgB;IACxC,OAAO,OAAO,CAAC,SAAS;QACtB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAgB,EAAE,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC;IACnE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;AAC1C,CAAC;AAED;4EAC4E;AAC5E,SAAS,aAAa,CAAC,UAAkB;IACvC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,SAAS,CAAC,OAAgB,EAAE,UAAkB;IAC3D,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,IAAI,WAAW,CAAC,kDAAkD,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE;QACtC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,WAAW,EAAE,UAAU;KACxB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,IAAc;IACpC,OAAO;QACL,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC;QACzC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC;QAC3C,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC;KAC5C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,OAAgB,EAChB,IAAY,EACZ,OAAe;IAEf,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAEtD,IAAI,YAAY,GAA2B,EAAE,CAAC;IAC9C,IAAI,CAAC;QACH,YAAY,GAAG,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,MAAM,KAAK,CAAC;IACtE,CAAC;IAED,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACnD,MAAM,IAAI,WAAW,CACnB,uDAAuD,EACvD,mEAAmE,CACpE,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACzD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,WAAW,CACnB,qCAAqC,cAAc,CAAC,OAAO,CAAC,EAAE,EAC9D,gEAAgE,CACjE,CAAC;IACJ,CAAC;AACH,CAAC;AASD;;;;;GAKG;AACH,KAAK,UAAU,mBAAmB,CAChC,aAAkC,EAClC,OAAe,EACf,SAAkC;IAElC,IAAI,QAAiC,CAAC;IACtC,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG;YAAE,OAAO,SAAS,CAAC;QACxE,MAAM,KAAK,CAAC;IACd,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAC7D,CAAC,KAAK,EAA6B,EAAE,CACnC,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CACtD,CAAC;IACF,MAAM,KAAK,GAA2B,EAAE,CAAC;IACzC,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,EAAE,EAAE;QAC9C,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,QAAQ,CAChB,kCAAkC,YAAY,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,UAAU,EAAE,CACrG,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC,CACH,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;AACrD,CAAC;AAED;;;yDAGyD;AACzD,KAAK,UAAU,oBAAoB,CACjC,QAAgB,EAChB,cAAsC;IAEtC,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,YAAY,CAAC,cAAc,EAAE,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1E,IAAI,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO;IAC7B,MAAM,IAAI,WAAW,CACnB,oCAAoC,cAAc,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,EAAE,EACnF,4EAA4E,CAC7E,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,IAAc,EAAE,MAAc;IAChD,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC;QACnD,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC;QACvD,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC;KACxD,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAgB,EAChB,OAA6E,EAC7E,UAOI,EAAE;IAQN,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,EAAE,CAAC;IAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAC5C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,0BAA0B,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IACD,0EAA0E;IAC1E,wEAAwE;IACxE,YAAY;IACZ,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC5C,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,CAAC;QAClD,mBAAmB,CACjB,OAAO,CAAC,aAAa,EACrB,OAAO,EACP,OAAO,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,CAClC;KACF,CAAC,CAAC;IACH,IAAI,WAAW,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,WAAW;QAC3B,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,eAAe,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE;QAC3F,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3C,2EAA2E;IAC3E,sEAAsE;IACtE,+CAA+C;IAC/C,MAAM,aAAa,CACjB,OAAO,EACP,OAAO,EACP,IAAI,CAAC,WAAW,EAChB,KAAK,EACL,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,EAC7B,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CACrD,CAAC;IACF,OAAO;QACL,IAAI;QACJ,KAAK;QACL,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3C,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,UAA4B,EAC5B,OAAe,EACf,GAAW;IAEX,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC9D,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAgB,EAChB,OAA6E,EAC7E,OAAe,EACf,WAAmB,EACnB,UASI,EAAE;IAQN,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACnD,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,EAAE,CAAC;IAC7C,yEAAyE;IACzE,gCAAgC;IAChC,MAAM,YAAY,GAAG,mBAAmB,CACtC,OAAO,CAAC,aAAa,EACrB,OAAO,EACP,OAAO,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,CAClC,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,WAAW,GAAG,GAAG,CAAC;IACtB,IAAI,CAAC,WAAW,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;QAC1C,qEAAqE;QACrE,6CAA6C;QAC7C,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACxD,WAAW,GAAG,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;IACtE,CAAC;IACD,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,WAAW,CAAC,4CAA4C,CAAC,CAAC;IACtF,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtE,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC5C,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,WAAW,CAAC;QACxD,YAAY;KACb,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC1D,MAAM,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,WAAW;QAC3B,CAAC,CAAC;YACE,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,GAAG,CAAC,MAAM,eAAe,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;SACzE;QACH,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,OAAO,GAAmB;QAC9B,cAAc,EAAE,CAAC;QACjB,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,QAAQ,EAAE,KAAK,CAAC,EAAE;QAClB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpC,CAAC;IACF,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC;IACjE,MAAM,aAAa,CACjB,OAAO,EACP,KAAK,CAAC,EAAE,EACR,IAAI,CAAC,WAAW,EAChB,KAAK,EACL,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,EAC7B,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CACrD,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AAC9E,CAAC;AAED,8EAA8E;AAC9E,MAAM,CAAC,MAAM,qBAAqB,GAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAoCzE;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAgB,EAChB,OAIC,EACD,UAA+B,EAAE;IAEjC,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE;QAChD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,KAAK,EAAE,OAAO,CAAC,KAAK,KAAK,IAAI;KAC9B,CAAC,CAAC;IAEH,oEAAoE;IACpE,0EAA0E;IAC1E,4DAA4D;IAC5D,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,KAAK,UAAU,CAAC;IAClD,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACzF,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC;IAC9C,IAAI,MAA4B,CAAC;IACjC,IAAI,aAAmC,CAAC;IACxC,IAAI,OAA6B,CAAC;IAClC,IAAI,UAA+B,CAAC;IACpC,IAAI,IAAwB,CAAC;IAC7B,IAAI,CAAC;QACH,IAAI,QAAQ,EAAE,CAAC;YACb,oEAAoE;YACpE,qEAAqE;YACrE,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAC9C,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;gBAAE,aAAa,GAAG,KAAK,CAAC;YAC5C,UAAU,GAAG,MAAM,iBAAiB,CAClC,OAAO,CAAC,OAAO,EACf,IAAI,EACJ;gBACE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO;gBACpC,GAAG,CAAC,OAAO,CAAC,cAAc;oBACxB,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE;oBAC5C,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClE,EACD,UAAU,CACX,CAAC;YACF,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,IAAI;oBACF,sFAAsF,CAAC;YAC3F,CAAC;QACH,CAAC;aAAM,IAAI,UAAU,KAAK,KAAK,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzD,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;YACzE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;YAC1B,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;gBAAE,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC;YACpE,uEAAuE;YACvE,gDAAgD;YAChD,UAAU,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE;gBAC1D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO;gBACpC,GAAG,CAAC,OAAO,CAAC,cAAc;oBACxB,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE;oBAC5C,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClE,CAAC,CAAC;QACL,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,GAAG,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;iBACxE,KAAK,CAAC;QACX,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,GAAG,iCACL,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACvD,IAAI,CAAC;IACP,CAAC;IAED,OAAO;QACL,GAAG,MAAM;QACT,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC;QACnD,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1B,CAAC;AACJ,CAAC;AAED;;qCAEqC;AACrC,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,OAAgB,EAChB,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,EAChC,OAAO,GAAG,OAAO,EAAE;IAEnB,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtD,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,WAAW,CAAC,0CAA0C,CAAC,CAAC;IACjF,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,UAAU,CACtB,YAAY,CACV,QAAQ,CAAC,WAAW,IAAI,EAAE,EAC1B,cAAc,CAAC,CAAC,MAAM,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAClE,EACD,QAAQ,CACT,CAAC;IACF,OAAO;QACL,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE;QAChD,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE;QACtD,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE;KACvD,CAAC;AACJ,CAAC;AAED;;;yBAGyB;AACzB,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAgB,EAChB,UAA4B,EAC5B,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC;IAEhC,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,OAAO,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;AACtD,CAAC;AAoBD,4DAA4D;AAC5D,MAAM,oBAAoB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAE7C;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAgB,EAChB,OAIC,EACD,UAAyF,EAAE;IAE3F,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,EAAE,CAAC;IAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/E,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,EAAE,WAAW,IAAI,EAAE,EAAE,WAAW,CAAC,CAAC;IACzE,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc;QACnC,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE;QAC5C,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QAC5D,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE,CAAC;IACpD,CAAC;IAED,IAAI,IAA6B,CAAC;IAClC,IAAI,UAAU,GAAG,QAAQ,EAAE,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;IAC7D,IAAI,UAAU,GAAG,QAAQ,EAAE,UAAU,CAAC;IACtC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,KAAK,GACT,IAAI,CAAC,MAAM,KAAK,OAAO;YACrB,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,EAAE;gBAC9C,MAAM,EAAE,SAAS;gBACjB,WAAW,EAAE,IAAI,CAAC,EAAE;gBACpB,KAAK,EAAE,cAAc,IAAI,CAAC,WAAW,EAAE;aACxC,CAAC,CAAC;QACT,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QACnE,uEAAuE;QACvE,uEAAuE;QACvE,8DAA8D;QAC9D,IAAI,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,WAAW,CACzC,OAAO,EACP,KAAK,CAAC,EAAE,EACR,MAAM,EACN,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,cAAc,CACvB,CAAC;QACF,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC;QAClC,UAAU,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACrC,MAAM,aAAa,CACjB,OAAO,EACP,OAAO,EACP,UAAU,EACV,OAAO,CAAC,KAAK,EACb,UAAU,EACV,QAAQ,EAAE,WAAW,IAAI,EAAE,CAC5B,CAAC;IACJ,CAAC;IAED,IAAI,SAA8C,CAAC;IACnD,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAClE,IAAI,OAAO,CAAC,MAAM,GAAG,oBAAoB,EAAE,CAAC;gBAC1C,MAAM,IAAI,eAAe,CACvB,SAAS,YAAY,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,+CAA+C,CACrH,CAAC;YACJ,CAAC;QACH,CAAC;QACD,oEAAoE;QACpE,kEAAkE;QAClE,SAAS,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,EAAE;YAC/D,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnE,IAAI,EAAE,YAAY;gBAClB,OAAO;aACR,CAAC,CAAC;YACH,SAAS,EAAE,OAAO,CAAC,MAAM,IAAI,YAAY;YACzC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnE,CAAC,CAAC;QACH,MAAM,aAAa,CACjB,OAAO,EACP,OAAO,EACP,UAAU,EACV,OAAO,CAAC,KAAK,EACb,UAAU,EACV,WAAW,CACZ,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI;QACJ,SAAS;QACT,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,UAAU;QACV,GAAG,MAAM;KACV,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAAyB,EACzB,KAA6B;IAE7B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1D,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAY;IACjD,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,IAAI,GAA2B,EAAE,CAAC;IACxC,KAAK,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACpE,IAAI,CAAC,OAAO,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC;IACxC,CAAC;IACD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACtD,KAAK,MAAM,IAAI,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,EAAE,CAAC;QACvD,IAAI,CAAC;YACH,IAAI,CAAC,sBAAsB,CAAC,GAAG,MAAM,QAAQ,CAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,EACpC,MAAM,CACP,CAAC;YACF,MAAM;QACR,CAAC;QAAC,MAAM,CAAC;YACP,uEAAuE;QACzE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AASD;;;wCAGwC;AACxC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAgB,EAChB,OAAyB,EACzB,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC;IAEhC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAG,oBAAoB,CAAC;QAClC,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9D,CAAC,CAAC;IACH,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC;AAClF,CAAC;AAED;;yDAEyD;AACzD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAgB,EAChB,OAAyB,EACzB,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC;IAEhC,OAAO,OAAO,CAAC,WAAW,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,qEAAqE;AACrE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAgB,EAChB,OAAyB,EACzB,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC;IAEhC,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,OAAO,OAAO,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAgB,EAChB,UAA4B;IAE5B,OAAO,UAAU,CAAC,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;AACxD,CAAC"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import type { BuilderApiClient, EvaluationReceipt, EvaluationView } from "../api/builder-api.js";
|
|
2
|
+
import type { Context } from "../config/index.js";
|
|
3
|
+
/** A full run is `scenario × k` real conversations plus a judge call each —
|
|
4
|
+
* hours-scale like a build, so the poll loop's own deadline is generous;
|
|
5
|
+
* each poll request stays cheap. */
|
|
6
|
+
export declare const EVALUATE_DEADLINE_MS: number;
|
|
7
|
+
export interface EvaluationState {
|
|
8
|
+
evaluation_id: string;
|
|
9
|
+
}
|
|
10
|
+
/** The saved run handle, or nothing — a missing or corrupt file simply
|
|
11
|
+
* means there is no run to name. */
|
|
12
|
+
export declare function readEvaluationState(root: string): Promise<EvaluationState | undefined>;
|
|
13
|
+
export declare function writeEvaluationState(root: string, state: EvaluationState): Promise<void>;
|
|
14
|
+
export interface EvaluateStartOptions {
|
|
15
|
+
/** Checkout root (defaults to the bound checkout). */
|
|
16
|
+
root?: string;
|
|
17
|
+
/** A note on the run — shows up on the scoreboard. */
|
|
18
|
+
message?: string;
|
|
19
|
+
/** Scope the run to named scenario codes (a fixing-loop tool — a scoped
|
|
20
|
+
* run never promotes). */
|
|
21
|
+
scenarios?: string[];
|
|
22
|
+
/** The tag stamped on the minted trial threads (defaults to the
|
|
23
|
+
* checkout's pin, then the agent's active tag). */
|
|
24
|
+
versionTag?: string;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Start one detached run over this checkout and save its id. The tree is
|
|
28
|
+
* frozen at accept — keep editing, the run's bytes do not move. The receipt
|
|
29
|
+
* sizes the run (`total_trials`, `scenarios`) before a single trial starts.
|
|
30
|
+
*/
|
|
31
|
+
export declare function startEvaluation(context: Context, builder: BuilderApiClient, options?: EvaluateStartOptions): Promise<EvaluationReceipt>;
|
|
32
|
+
export interface EvaluatePollOptions {
|
|
33
|
+
pollIntervalMs?: number;
|
|
34
|
+
deadlineMs?: number;
|
|
35
|
+
/** Injectable for tests — real callers get a plain setTimeout sleep. */
|
|
36
|
+
sleep?: (ms: number) => Promise<void>;
|
|
37
|
+
}
|
|
38
|
+
/** Poll one run to its terminal view (completed, failed or cancelled). */
|
|
39
|
+
export declare function awaitEvaluation(builder: BuilderApiClient, evaluationId: string, options?: EvaluatePollOptions): Promise<EvaluationView>;
|
|
40
|
+
/** The run the caller means: the explicit id, else the checkout's saved
|
|
41
|
+
* last run — no run at all is a config story, not a 404. */
|
|
42
|
+
export declare function resolveEvaluationId(context: Context, explicit: string | undefined, root?: string): Promise<string>;
|