@agent-vm/agent-vm 0.0.48 → 0.0.50
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/build/gondolin-image-build-child-entrypoint.d.ts +2 -0
- package/dist/build/gondolin-image-build-child-entrypoint.d.ts.map +1 -0
- package/dist/build/gondolin-image-build-child-entrypoint.js +52 -0
- package/dist/build/gondolin-image-build-child-entrypoint.js.map +1 -0
- package/dist/build/gondolin-image-builder.d.ts +14 -0
- package/dist/build/gondolin-image-builder.d.ts.map +1 -1
- package/dist/build/gondolin-image-builder.js +152 -7
- package/dist/build/gondolin-image-builder.js.map +1 -1
- package/dist/build/managed-image-dockerfile.d.ts +11 -5
- package/dist/build/managed-image-dockerfile.d.ts.map +1 -1
- package/dist/build/managed-image-dockerfile.js +62 -13
- package/dist/build/managed-image-dockerfile.js.map +1 -1
- package/dist/build/stale-image-cleaner.d.ts +6 -0
- package/dist/build/stale-image-cleaner.d.ts.map +1 -1
- package/dist/build/stale-image-cleaner.js +32 -0
- package/dist/build/stale-image-cleaner.js.map +1 -1
- package/dist/build/zig-compatibility.d.ts +32 -0
- package/dist/build/zig-compatibility.d.ts.map +1 -0
- package/dist/build/zig-compatibility.js +148 -0
- package/dist/build/zig-compatibility.js.map +1 -0
- package/dist/cli/auth-interactive-command.d.ts +1 -1
- package/dist/cli/auth-interactive-command.d.ts.map +1 -1
- package/dist/cli/auth-interactive-command.js +12 -3
- package/dist/cli/auth-interactive-command.js.map +1 -1
- package/dist/cli/build-command.d.ts +10 -3
- package/dist/cli/build-command.d.ts.map +1 -1
- package/dist/cli/build-command.js +121 -36
- package/dist/cli/build-command.js.map +1 -1
- package/dist/cli/cache-commands.d.ts +1 -5
- package/dist/cli/cache-commands.d.ts.map +1 -1
- package/dist/cli/cache-commands.js.map +1 -1
- package/dist/cli/commands/command-definition-support.d.ts +1 -4
- package/dist/cli/commands/command-definition-support.d.ts.map +1 -1
- package/dist/cli/commands/command-definition-support.js +4 -10
- package/dist/cli/commands/command-definition-support.js.map +1 -1
- package/dist/cli/commands/controller-definition.d.ts +2 -4
- package/dist/cli/commands/controller-definition.d.ts.map +1 -1
- package/dist/cli/commands/controller-definition.js +4 -6
- package/dist/cli/commands/controller-definition.js.map +1 -1
- package/dist/cli/commands/create-app.d.ts +2 -4
- package/dist/cli/commands/create-app.d.ts.map +1 -1
- package/dist/cli/init-command.d.ts.map +1 -1
- package/dist/cli/init-command.js +29 -6
- package/dist/cli/init-command.js.map +1 -1
- package/dist/cli/manual-templates.d.ts.map +1 -1
- package/dist/cli/manual-templates.js +5 -0
- package/dist/cli/manual-templates.js.map +1 -1
- package/dist/cli/ssh-commands.d.ts +6 -0
- package/dist/cli/ssh-commands.d.ts.map +1 -1
- package/dist/cli/ssh-commands.js +44 -22
- package/dist/cli/ssh-commands.js.map +1 -1
- package/dist/cli/vm-host-system-templates.d.ts.map +1 -1
- package/dist/cli/vm-host-system-templates.js +0 -6
- package/dist/cli/vm-host-system-templates.js.map +1 -1
- package/dist/config/system-cache-identifier.d.ts +5 -2
- package/dist/config/system-cache-identifier.d.ts.map +1 -1
- package/dist/config/system-cache-identifier.js +33 -3
- package/dist/config/system-cache-identifier.js.map +1 -1
- package/dist/config/system-config.d.ts +24 -0
- package/dist/config/system-config.d.ts.map +1 -1
- package/dist/config/system-config.js +22 -0
- package/dist/config/system-config.js.map +1 -1
- package/dist/controller/controller-runtime-operations.d.ts +9 -2
- package/dist/controller/controller-runtime-operations.d.ts.map +1 -1
- package/dist/controller/controller-runtime-operations.js +75 -6
- package/dist/controller/controller-runtime-operations.js.map +1 -1
- package/dist/controller/controller-runtime.d.ts.map +1 -1
- package/dist/controller/controller-runtime.js +1 -0
- package/dist/controller/controller-runtime.js.map +1 -1
- package/dist/controller/git-pull-default-operations.d.ts +1 -0
- package/dist/controller/git-pull-default-operations.d.ts.map +1 -1
- package/dist/controller/git-pull-default-operations.js +100 -43
- package/dist/controller/git-pull-default-operations.js.map +1 -1
- package/dist/controller/git-push-operations.d.ts +1 -0
- package/dist/controller/git-push-operations.d.ts.map +1 -1
- package/dist/controller/git-push-operations.js +50 -32
- package/dist/controller/git-push-operations.js.map +1 -1
- package/dist/controller/git-retry-support.d.ts +3 -2
- package/dist/controller/git-retry-support.d.ts.map +1 -1
- package/dist/controller/git-retry-support.js +16 -8
- package/dist/controller/git-retry-support.js.map +1 -1
- package/dist/controller/heartbeat-sender.d.ts.map +1 -1
- package/dist/controller/heartbeat-sender.js +6 -0
- package/dist/controller/heartbeat-sender.js.map +1 -1
- package/dist/controller/host-git-command.d.ts +6 -0
- package/dist/controller/host-git-command.d.ts.map +1 -0
- package/dist/controller/host-git-command.js +13 -0
- package/dist/controller/host-git-command.js.map +1 -0
- package/dist/controller/http/controller-client.d.ts +9 -2
- package/dist/controller/http/controller-client.d.ts.map +1 -1
- package/dist/controller/http/controller-client.js +13 -3
- package/dist/controller/http/controller-client.js.map +1 -1
- package/dist/controller/http/controller-http-route-support.d.ts +9 -2
- package/dist/controller/http/controller-http-route-support.d.ts.map +1 -1
- package/dist/controller/http/controller-http-route-support.js.map +1 -1
- package/dist/controller/http/controller-request-schemas.d.ts +9 -1
- package/dist/controller/http/controller-request-schemas.d.ts.map +1 -1
- package/dist/controller/http/controller-request-schemas.js +11 -2
- package/dist/controller/http/controller-request-schemas.js.map +1 -1
- package/dist/controller/http/controller-zone-operation-routes.d.ts.map +1 -1
- package/dist/controller/http/controller-zone-operation-routes.js +101 -24
- package/dist/controller/http/controller-zone-operation-routes.js.map +1 -1
- package/dist/controller/worker-task-runner.d.ts.map +1 -1
- package/dist/controller/worker-task-runner.js +42 -19
- package/dist/controller/worker-task-runner.js.map +1 -1
- package/dist/controller/zone-runtimes/zone-runtime-errors.d.ts +10 -0
- package/dist/controller/zone-runtimes/zone-runtime-errors.d.ts.map +1 -1
- package/dist/controller/zone-runtimes/zone-runtime-errors.js +14 -0
- package/dist/controller/zone-runtimes/zone-runtime-errors.js.map +1 -1
- package/dist/gateway/gateway-zone-support.d.ts.map +1 -1
- package/dist/gateway/gateway-zone-support.js +1 -0
- package/dist/gateway/gateway-zone-support.js.map +1 -1
- package/dist/operations/doctor.d.ts +0 -3
- package/dist/operations/doctor.d.ts.map +1 -1
- package/dist/operations/doctor.js +8 -35
- package/dist/operations/doctor.js.map +1 -1
- package/dist/resources/repo-resource-contract-loader.d.ts +1 -1
- package/dist/resources/repo-resource-contract-loader.d.ts.map +1 -1
- package/dist/resources/repo-resource-contract-loader.js +2 -6
- package/dist/resources/repo-resource-contract-loader.js.map +1 -1
- package/dist/resources/repo-resource-provider-runner.d.ts +3 -1
- package/dist/resources/repo-resource-provider-runner.d.ts.map +1 -1
- package/dist/resources/repo-resource-provider-runner.js +24 -10
- package/dist/resources/repo-resource-provider-runner.js.map +1 -1
- package/managed-images.json +19 -0
- package/package.json +10 -9
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
import { resolveGondolinMinimumZigVersion } from '@agent-vm/gondolin-adapter';
|
|
2
|
+
import { execa } from 'execa';
|
|
3
|
+
export async function resolveGondolinCompatibleZigVersion(resolveRequiredVersion = resolveGondolinMinimumZigVersion) {
|
|
4
|
+
return await resolveRequiredVersion();
|
|
5
|
+
}
|
|
6
|
+
function errorMessage(error) {
|
|
7
|
+
return error instanceof Error ? error.message : String(error);
|
|
8
|
+
}
|
|
9
|
+
function isMissingExecutableError(error) {
|
|
10
|
+
return (typeof error === 'object' &&
|
|
11
|
+
error !== null &&
|
|
12
|
+
'code' in error &&
|
|
13
|
+
error.code === 'ENOENT');
|
|
14
|
+
}
|
|
15
|
+
export async function resolveHostZigVersion() {
|
|
16
|
+
try {
|
|
17
|
+
const result = await execa('zig', ['version']);
|
|
18
|
+
return result.stdout.trim();
|
|
19
|
+
}
|
|
20
|
+
catch (error) {
|
|
21
|
+
if (isMissingExecutableError(error)) {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
throw new Error(`Failed to run zig version: ${errorMessage(error)}`, { cause: error });
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
function parseZigVersion(version) {
|
|
28
|
+
const versionMatch = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/u.exec(version.trim());
|
|
29
|
+
if (!versionMatch) {
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
const [majorVersion, minorVersion, patchVersion] = versionMatch.slice(1, 4).map((part) => Number.parseInt(part, 10));
|
|
33
|
+
if (majorVersion === undefined ||
|
|
34
|
+
minorVersion === undefined ||
|
|
35
|
+
patchVersion === undefined) {
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
38
|
+
const prereleaseText = versionMatch[4];
|
|
39
|
+
return {
|
|
40
|
+
major: majorVersion,
|
|
41
|
+
minor: minorVersion,
|
|
42
|
+
patch: patchVersion,
|
|
43
|
+
prerelease: prereleaseText ? prereleaseText.split('.') : [],
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
function compareNumbers(left, right) {
|
|
47
|
+
return left === right ? 0 : left > right ? 1 : -1;
|
|
48
|
+
}
|
|
49
|
+
function isNumericIdentifier(identifier) {
|
|
50
|
+
return /^\d+$/u.test(identifier);
|
|
51
|
+
}
|
|
52
|
+
function comparePrereleaseIdentifiers(left, right) {
|
|
53
|
+
const leftIsNumeric = isNumericIdentifier(left);
|
|
54
|
+
const rightIsNumeric = isNumericIdentifier(right);
|
|
55
|
+
if (leftIsNumeric && rightIsNumeric) {
|
|
56
|
+
return compareNumbers(Number.parseInt(left, 10), Number.parseInt(right, 10));
|
|
57
|
+
}
|
|
58
|
+
if (leftIsNumeric !== rightIsNumeric) {
|
|
59
|
+
return leftIsNumeric ? -1 : 1;
|
|
60
|
+
}
|
|
61
|
+
return left.localeCompare(right);
|
|
62
|
+
}
|
|
63
|
+
function compareZigVersions(left, right) {
|
|
64
|
+
for (const key of ['major', 'minor', 'patch']) {
|
|
65
|
+
const result = compareNumbers(left[key], right[key]);
|
|
66
|
+
if (result !== 0) {
|
|
67
|
+
return result;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
if (left.prerelease.length === 0 && right.prerelease.length === 0) {
|
|
71
|
+
return 0;
|
|
72
|
+
}
|
|
73
|
+
if (left.prerelease.length === 0) {
|
|
74
|
+
return 1;
|
|
75
|
+
}
|
|
76
|
+
if (right.prerelease.length === 0) {
|
|
77
|
+
return -1;
|
|
78
|
+
}
|
|
79
|
+
const identifierCount = Math.max(left.prerelease.length, right.prerelease.length);
|
|
80
|
+
for (let index = 0; index < identifierCount; index += 1) {
|
|
81
|
+
const leftIdentifier = left.prerelease[index];
|
|
82
|
+
const rightIdentifier = right.prerelease[index];
|
|
83
|
+
if (leftIdentifier === undefined) {
|
|
84
|
+
return -1;
|
|
85
|
+
}
|
|
86
|
+
if (rightIdentifier === undefined) {
|
|
87
|
+
return 1;
|
|
88
|
+
}
|
|
89
|
+
const result = comparePrereleaseIdentifiers(leftIdentifier, rightIdentifier);
|
|
90
|
+
if (result !== 0) {
|
|
91
|
+
return result;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
return 0;
|
|
95
|
+
}
|
|
96
|
+
export function isZigVersionAtLeast(version, minimumVersion) {
|
|
97
|
+
const parsedVersion = parseZigVersion(version);
|
|
98
|
+
const parsedMinimumVersion = parseZigVersion(minimumVersion);
|
|
99
|
+
if (!parsedVersion || !parsedMinimumVersion) {
|
|
100
|
+
return false;
|
|
101
|
+
}
|
|
102
|
+
return compareZigVersions(parsedVersion, parsedMinimumVersion) >= 0;
|
|
103
|
+
}
|
|
104
|
+
export function buildZigInstallHint(requiredZigVersion) {
|
|
105
|
+
return requiredZigVersion
|
|
106
|
+
? `Install Zig >= ${requiredZigVersion}. On macOS: brew install zig.`
|
|
107
|
+
: 'Install Zig required by Gondolin. On macOS: brew install zig.';
|
|
108
|
+
}
|
|
109
|
+
export function buildZigUpgradeHint(requiredZigVersion) {
|
|
110
|
+
return `Requires Zig >= ${requiredZigVersion}. On macOS: brew install zig.`;
|
|
111
|
+
}
|
|
112
|
+
export function checkGondolinZigCompatibility(options) {
|
|
113
|
+
if (!options.installedVersion) {
|
|
114
|
+
return {
|
|
115
|
+
compatible: false,
|
|
116
|
+
kind: 'missing',
|
|
117
|
+
requiredVersion: options.requiredVersion,
|
|
118
|
+
hint: buildZigInstallHint(options.requiredVersion),
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
if (isZigVersionAtLeast(options.installedVersion, options.requiredVersion)) {
|
|
122
|
+
return {
|
|
123
|
+
compatible: true,
|
|
124
|
+
kind: 'compatible',
|
|
125
|
+
requiredVersion: options.requiredVersion,
|
|
126
|
+
installedVersion: options.installedVersion,
|
|
127
|
+
hint: `found ${options.installedVersion}, required >= ${options.requiredVersion}`,
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
return {
|
|
131
|
+
compatible: false,
|
|
132
|
+
kind: 'incompatible',
|
|
133
|
+
requiredVersion: options.requiredVersion,
|
|
134
|
+
installedVersion: options.installedVersion,
|
|
135
|
+
hint: buildZigUpgradeHint(options.requiredVersion),
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
export function assertGondolinZigCompatibility(options) {
|
|
139
|
+
const result = checkGondolinZigCompatibility(options);
|
|
140
|
+
if (result.compatible) {
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
if (result.kind === 'incompatible') {
|
|
144
|
+
throw new Error(`${result.hint} Current version: ${result.installedVersion}.`);
|
|
145
|
+
}
|
|
146
|
+
throw new Error(result.hint);
|
|
147
|
+
}
|
|
148
|
+
//# sourceMappingURL=zig-compatibility.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zig-compatibility.js","sourceRoot":"","sources":["../../src/build/zig-compatibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export declare function listAuthProviders(options: {
|
|
|
13
13
|
}): Promise<readonly string[]>;
|
|
14
14
|
export declare function runAuthInteractiveCommand(options: {
|
|
15
15
|
readonly authConfig: GatewayAuthConfig | undefined;
|
|
16
|
-
readonly dependencies: Pick<CliDependencies, 'createControllerClient' | 'runCommand' | 'runInteractiveProcess'>;
|
|
16
|
+
readonly dependencies: Pick<CliDependencies, 'createControllerClient' | 'createSecretResolver' | 'resolveServiceAccountToken' | 'runCommand' | 'runInteractiveProcess'>;
|
|
17
17
|
readonly deviceCode?: boolean;
|
|
18
18
|
readonly io: CliIo;
|
|
19
19
|
readonly provider: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-interactive-command.d.ts","sourceRoot":"","sources":["../../src/cli/auth-interactive-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EACN,KAAK,eAAe,EACpB,KAAK,KAAK,
|
|
1
|
+
{"version":3,"file":"auth-interactive-command.d.ts","sourceRoot":"","sources":["../../src/cli/auth-interactive-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EACN,KAAK,eAAe,EACpB,KAAK,KAAK,EAGV,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAGN,KAAK,qBAAqB,EAC1B,MAAM,mBAAmB,CAAC;AAY3B,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAChD,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,CACrB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,SAAS,MAAM,EAAE,KACzB,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9F,QAAQ,CAAC,SAAS,EAAE,qBAAqB,CAAC;CAC1C,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAuC7B;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE;IACxD,QAAQ,CAAC,UAAU,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACnD,QAAQ,CAAC,YAAY,EAAE,IAAI,CAC1B,eAAe,EACb,wBAAwB,GACxB,sBAAsB,GACtB,4BAA4B,GAC5B,YAAY,GACZ,uBAAuB,CACzB,CAAC;IACF,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,CACrB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,SAAS,MAAM,EAAE,KACzB,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9F,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiEhB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { execa } from 'execa';
|
|
2
|
-
import { resolveControllerBaseUrl, } from './agent-vm-cli-support.js';
|
|
3
|
-
import { zoneSshAccessResponseSchema } from './ssh-commands.js';
|
|
2
|
+
import { requireZone, resolveControllerBaseUrl, } from './agent-vm-cli-support.js';
|
|
3
|
+
import { resolveZoneAdminToken, zoneSshAccessResponseSchema, } from './ssh-commands.js';
|
|
4
4
|
const openClawShellEnvFilePath = '/etc/profile.d/openclaw-env.sh';
|
|
5
5
|
function shellQuote(value) {
|
|
6
6
|
return `'${value.replace(/'/gu, `'\\''`)}'`;
|
|
@@ -47,7 +47,16 @@ export async function runAuthInteractiveCommand(options) {
|
|
|
47
47
|
const controllerClient = options.dependencies.createControllerClient({
|
|
48
48
|
baseUrl: resolveControllerBaseUrl(options.systemConfig),
|
|
49
49
|
});
|
|
50
|
-
const
|
|
50
|
+
const zone = requireZone(options.systemConfig, options.zoneId);
|
|
51
|
+
const adminToken = await resolveZoneAdminToken({
|
|
52
|
+
dependencies: options.dependencies,
|
|
53
|
+
systemConfig: options.systemConfig,
|
|
54
|
+
zone,
|
|
55
|
+
});
|
|
56
|
+
const parsedSshResponse = zoneSshAccessResponseSchema.safeParse(await controllerClient.enableZoneSsh(options.zoneId, {
|
|
57
|
+
...(adminToken ? { adminToken } : {}),
|
|
58
|
+
secretEnv: 'default',
|
|
59
|
+
}));
|
|
51
60
|
if (!parsedSshResponse.success) {
|
|
52
61
|
throw new Error('Controller returned an invalid SSH response.');
|
|
53
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-interactive-command.js","sourceRoot":"","sources":["../../src/cli/auth-interactive-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAG9B,OAAO,EAGN,wBAAwB,GACxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,
|
|
1
|
+
{"version":3,"file":"auth-interactive-command.js","sourceRoot":"","sources":["../../src/cli/auth-interactive-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { BuildImageResult } from '@agent-vm/gondolin-adapter';
|
|
2
|
-
import { type ManagedImageSource } from '../build/managed-image-dockerfile.js';
|
|
2
|
+
import { type ManagedImageRelease, type ManagedImageSource } from '../build/managed-image-dockerfile.js';
|
|
3
|
+
import { type CurrentImageFingerprints, type StaleImageEntry } from '../build/stale-image-cleaner.js';
|
|
3
4
|
import type { LoadedSystemConfig } from '../config/system-config.js';
|
|
4
5
|
import type { RunTaskFn, TaskOutput } from '../shared/run-task.js';
|
|
5
6
|
export interface BuildCommandDependencies {
|
|
@@ -15,6 +16,12 @@ export interface BuildCommandDependencies {
|
|
|
15
16
|
readonly fullReset?: boolean;
|
|
16
17
|
readonly streamPreview?: TaskOutput;
|
|
17
18
|
}) => Promise<BuildImageResult>;
|
|
19
|
+
readonly deleteStaleImageDirectories?: (entries: readonly StaleImageEntry[]) => Promise<void>;
|
|
20
|
+
readonly findPrunableImageDirectories?: (options: {
|
|
21
|
+
readonly cacheDir: string;
|
|
22
|
+
readonly currentFingerprints: CurrentImageFingerprints;
|
|
23
|
+
readonly retainStaleGenerationsPerProfile: number;
|
|
24
|
+
}) => Promise<readonly StaleImageEntry[]>;
|
|
18
25
|
readonly resolveOciImageTag?: (buildConfigPath: string) => Promise<string>;
|
|
19
26
|
readonly resolveRequiredZigVersion?: () => Promise<string>;
|
|
20
27
|
readonly resolveZigVersion?: () => Promise<string | undefined>;
|
|
@@ -27,10 +34,10 @@ export interface BuildCommandDependencies {
|
|
|
27
34
|
readonly imageTargetName: string;
|
|
28
35
|
readonly outputDirectory: string;
|
|
29
36
|
readonly overlayPath?: string | undefined;
|
|
30
|
-
readonly
|
|
37
|
+
readonly managedImageRelease: ManagedImageRelease;
|
|
31
38
|
readonly requiredOpenClawPackages?: readonly string[];
|
|
32
39
|
}) => Promise<string>;
|
|
33
|
-
readonly
|
|
40
|
+
readonly resolveManagedImageRelease?: () => Promise<ManagedImageRelease>;
|
|
34
41
|
readonly syncBundledOpenClawPlugin?: (targetDir: string, profileName: string) => Promise<'created' | 'skipped'>;
|
|
35
42
|
}
|
|
36
43
|
export declare function runBuildCommand(options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-command.d.ts","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"build-command.d.ts","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import { resolveGondolinMinimumZigVersion } from '@agent-vm/gondolin-adapter';
|
|
4
|
-
import { execa } from 'execa';
|
|
5
3
|
import { z } from 'zod';
|
|
6
4
|
import { buildDockerImage as buildDockerImageDefault } from '../build/docker-image-builder.js';
|
|
7
5
|
import { buildGondolinImage as buildGondolinImageDefault } from '../build/gondolin-image-builder.js';
|
|
8
|
-
import {
|
|
6
|
+
import { generateManagedDockerfile as generateManagedDockerfileDefault, resolveManagedImageRelease as resolveManagedImageReleaseDefault, } from '../build/managed-image-dockerfile.js';
|
|
7
|
+
import { deleteStaleImageDirectories as deleteStaleImageDirectoriesDefault, findPrunableImageDirectories as findPrunableImageDirectoriesDefault, } from '../build/stale-image-cleaner.js';
|
|
8
|
+
import { assertGondolinZigCompatibility, resolveGondolinCompatibleZigVersion, resolveHostZigVersion, } from '../build/zig-compatibility.js';
|
|
9
9
|
import { loadJsonConfigFile } from '../config/json-config-file.js';
|
|
10
|
-
import { buildZigInstallHint, buildZigUpgradeHint, isVersionAtLeast, } from '../operations/doctor.js';
|
|
11
10
|
import { formatZodError } from './format-zod-error.js';
|
|
12
11
|
import { syncBundledOpenClawPluginBundle } from './openclaw-plugin-bundle.js';
|
|
13
12
|
const ociImageTagSchema = z.object({
|
|
@@ -15,6 +14,8 @@ const ociImageTagSchema = z.object({
|
|
|
15
14
|
image: z.string().min(1),
|
|
16
15
|
}),
|
|
17
16
|
});
|
|
17
|
+
const RETAIN_STALE_IMAGE_GENERATIONS_PER_PROFILE = 2;
|
|
18
|
+
const gatewayRuntimeRecordFileName = 'gateway-runtime.json';
|
|
18
19
|
const openClawManagedPackageConfigSchema = z
|
|
19
20
|
.object({
|
|
20
21
|
channels: z
|
|
@@ -34,6 +35,57 @@ const openClawManagedPackageRules = [
|
|
|
34
35
|
function imageTargetKey(imageTarget) {
|
|
35
36
|
return `${imageTarget.family}/${imageTarget.name}`;
|
|
36
37
|
}
|
|
38
|
+
function createEmptyCurrentImageFingerprints() {
|
|
39
|
+
return {
|
|
40
|
+
gateways: {},
|
|
41
|
+
toolVms: {},
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
function setCurrentImageFingerprint(currentFingerprints, imageTarget, fingerprint) {
|
|
45
|
+
if (imageTarget.family === 'gateway') {
|
|
46
|
+
currentFingerprints.gateways[imageTarget.name] = fingerprint;
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
currentFingerprints.toolVms[imageTarget.name] = fingerprint;
|
|
50
|
+
}
|
|
51
|
+
async function findZoneIdsWithGatewayRuntimeRecords(systemConfig) {
|
|
52
|
+
const zoneIds = [];
|
|
53
|
+
for (const zone of systemConfig.zones) {
|
|
54
|
+
const runtimeRecordPath = path.join(zone.gateway.stateDir, gatewayRuntimeRecordFileName);
|
|
55
|
+
let runtimeRecordExists = false;
|
|
56
|
+
try {
|
|
57
|
+
// oxlint-disable-next-line no-await-in-loop -- state dirs are zone-local and errors should point at one zone
|
|
58
|
+
await fs.access(runtimeRecordPath);
|
|
59
|
+
runtimeRecordExists = true;
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
if (typeof error !== 'object' ||
|
|
63
|
+
error === null ||
|
|
64
|
+
!('code' in error) ||
|
|
65
|
+
error.code !== 'ENOENT') {
|
|
66
|
+
throw error;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (runtimeRecordExists) {
|
|
70
|
+
zoneIds.push(zone.id);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return zoneIds;
|
|
74
|
+
}
|
|
75
|
+
function startElapsedStatusHeartbeat(taskContext, baseStatus) {
|
|
76
|
+
taskContext?.setStatus(baseStatus);
|
|
77
|
+
if (taskContext?.interactive !== true) {
|
|
78
|
+
return () => { };
|
|
79
|
+
}
|
|
80
|
+
const startedAtMs = Date.now();
|
|
81
|
+
const heartbeatInterval = setInterval(() => {
|
|
82
|
+
const elapsedSeconds = Math.max(1, Math.floor((Date.now() - startedAtMs) / 1000));
|
|
83
|
+
taskContext.setStatus(`${baseStatus} · ${elapsedSeconds}s elapsed`);
|
|
84
|
+
}, 8_000);
|
|
85
|
+
return () => {
|
|
86
|
+
clearInterval(heartbeatInterval);
|
|
87
|
+
};
|
|
88
|
+
}
|
|
37
89
|
async function resolveOciImageTagFromConfig(buildConfigPath) {
|
|
38
90
|
const rawConfig = await loadJsonConfigFile(buildConfigPath);
|
|
39
91
|
const parsedConfig = ociImageTagSchema.safeParse(rawConfig);
|
|
@@ -42,24 +94,13 @@ async function resolveOciImageTagFromConfig(buildConfigPath) {
|
|
|
42
94
|
}
|
|
43
95
|
return parsedConfig.data.oci.image;
|
|
44
96
|
}
|
|
45
|
-
async function resolveHostZigVersion() {
|
|
46
|
-
try {
|
|
47
|
-
const result = await execa('zig', ['version']);
|
|
48
|
-
return result.stdout.trim();
|
|
49
|
-
}
|
|
50
|
-
catch {
|
|
51
|
-
return undefined;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
97
|
async function assertZigBuildPrerequisite(resolveRequiredZigVersion, resolveZigVersion) {
|
|
55
98
|
const requiredZigVersion = await resolveRequiredZigVersion();
|
|
56
99
|
const zigVersion = await resolveZigVersion();
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
throw new Error(`${buildZigUpgradeHint(requiredZigVersion)} Current version: ${zigVersion}.`);
|
|
62
|
-
}
|
|
100
|
+
assertGondolinZigCompatibility({
|
|
101
|
+
requiredVersion: requiredZigVersion,
|
|
102
|
+
...(zigVersion ? { installedVersion: zigVersion } : {}),
|
|
103
|
+
});
|
|
63
104
|
}
|
|
64
105
|
async function assertUniqueDockerImageTags(imageTargets, resolveOciImageTag) {
|
|
65
106
|
const profileByTag = new Map();
|
|
@@ -111,7 +152,7 @@ async function resolveProjectRootFromDockerfile(dockerfilePath) {
|
|
|
111
152
|
}
|
|
112
153
|
}
|
|
113
154
|
}
|
|
114
|
-
async function resolveRequiredOpenClawPackagesForTarget(systemConfig, imageTarget) {
|
|
155
|
+
async function resolveRequiredOpenClawPackagesForTarget(systemConfig, imageTarget, managedImageRelease) {
|
|
115
156
|
if (imageTarget.family !== 'gateway' ||
|
|
116
157
|
imageTarget.gatewayType !== 'openclaw' ||
|
|
117
158
|
imageTarget.source?.base !== 'openclaw-gateway') {
|
|
@@ -127,7 +168,7 @@ async function resolveRequiredOpenClawPackagesForTarget(systemConfig, imageTarge
|
|
|
127
168
|
const openClawConfig = openClawManagedPackageConfigSchema.parse(rawOpenClawConfig);
|
|
128
169
|
for (const packageRule of openClawManagedPackageRules) {
|
|
129
170
|
if (packageRule.isEnabled(openClawConfig)) {
|
|
130
|
-
requiredPackageSpecs.add(`${packageRule.packageName}@${
|
|
171
|
+
requiredPackageSpecs.add(`${packageRule.packageName}@${managedImageRelease.openClawVersion}`);
|
|
131
172
|
}
|
|
132
173
|
}
|
|
133
174
|
}
|
|
@@ -136,13 +177,15 @@ async function resolveRequiredOpenClawPackagesForTarget(systemConfig, imageTarge
|
|
|
136
177
|
export async function runBuildCommand(options, dependencies = {}) {
|
|
137
178
|
const buildDockerImage = dependencies.buildDockerImage ?? buildDockerImageDefault;
|
|
138
179
|
const buildGondolinImage = dependencies.buildGondolinImage ?? buildGondolinImageDefault;
|
|
180
|
+
const deleteStaleImageDirectories = dependencies.deleteStaleImageDirectories ?? deleteStaleImageDirectoriesDefault;
|
|
181
|
+
const findPrunableImageDirectories = dependencies.findPrunableImageDirectories ?? findPrunableImageDirectoriesDefault;
|
|
139
182
|
const resolveOciImageTag = dependencies.resolveOciImageTag ?? resolveOciImageTagFromConfig;
|
|
140
|
-
const resolveRequiredZigVersion = dependencies.resolveRequiredZigVersion ??
|
|
183
|
+
const resolveRequiredZigVersion = dependencies.resolveRequiredZigVersion ?? resolveGondolinCompatibleZigVersion;
|
|
141
184
|
const resolveZigVersion = dependencies.resolveZigVersion ?? resolveHostZigVersion;
|
|
142
185
|
const runTaskStep = dependencies.runTask ?? defaultRunTask;
|
|
143
186
|
const resolveProjectRoot = dependencies.resolveProjectRootFromDockerfile ?? resolveProjectRootFromDockerfile;
|
|
144
187
|
const generateManagedDockerfile = dependencies.generateManagedDockerfile ?? generateManagedDockerfileDefault;
|
|
145
|
-
const
|
|
188
|
+
const resolveManagedImageRelease = dependencies.resolveManagedImageRelease ?? resolveManagedImageReleaseDefault;
|
|
146
189
|
const syncBundledOpenClawPlugin = dependencies.syncBundledOpenClawPlugin ?? syncBundledOpenClawPluginBundle;
|
|
147
190
|
const systemCacheIdentifierPath = options.systemConfig.systemCacheIdentifierPath;
|
|
148
191
|
await assertZigBuildPrerequisite(resolveRequiredZigVersion, resolveZigVersion);
|
|
@@ -168,8 +211,8 @@ export async function runBuildCommand(options, dependencies = {}) {
|
|
|
168
211
|
const imageTargets = [...gatewayImageTargets, ...toolVmImageTargets];
|
|
169
212
|
const dockerImageTargets = imageTargets.filter((imageTarget) => imageTarget.dockerfile !== undefined || imageTarget.source !== undefined);
|
|
170
213
|
const dockerImageTagByProfile = await assertUniqueDockerImageTags(dockerImageTargets, resolveOciImageTag);
|
|
171
|
-
const
|
|
172
|
-
? await
|
|
214
|
+
const managedImageRelease = dockerImageTargets.some((imageTarget) => imageTarget.source !== undefined)
|
|
215
|
+
? await resolveManagedImageRelease()
|
|
173
216
|
: undefined;
|
|
174
217
|
// oxlint-disable-next-line no-await-in-loop -- image builds are intentionally sequential for stable task output and shared image tags
|
|
175
218
|
for (const imageTarget of dockerImageTargets) {
|
|
@@ -179,11 +222,11 @@ export async function runBuildCommand(options, dependencies = {}) {
|
|
|
179
222
|
}
|
|
180
223
|
let dockerfilePath = imageTarget.dockerfile;
|
|
181
224
|
if (imageTarget.source) {
|
|
182
|
-
if (!
|
|
183
|
-
throw new Error('Missing managed
|
|
225
|
+
if (!managedImageRelease) {
|
|
226
|
+
throw new Error('Missing managed image release for managed image build.');
|
|
184
227
|
}
|
|
185
228
|
// oxlint-disable-next-line no-await-in-loop -- package detection is profile-local and low-volume
|
|
186
|
-
const requiredOpenClawPackages = await resolveRequiredOpenClawPackagesForTarget(options.systemConfig, imageTarget);
|
|
229
|
+
const requiredOpenClawPackages = await resolveRequiredOpenClawPackagesForTarget(options.systemConfig, imageTarget, managedImageRelease);
|
|
187
230
|
// oxlint-disable-next-line no-await-in-loop -- each generated Docker context belongs to one image target
|
|
188
231
|
dockerfilePath = await generateManagedDockerfile({
|
|
189
232
|
base: imageTarget.source.base,
|
|
@@ -191,7 +234,7 @@ export async function runBuildCommand(options, dependencies = {}) {
|
|
|
191
234
|
imageTargetName: imageTarget.name,
|
|
192
235
|
outputDirectory: path.join(options.systemConfig.cacheDir, 'generated-dockerfiles', imageTarget.family, imageTarget.name),
|
|
193
236
|
...(imageTarget.source.overlay ? { overlayPath: imageTarget.source.overlay } : {}),
|
|
194
|
-
|
|
237
|
+
managedImageRelease,
|
|
195
238
|
requiredOpenClawPackages,
|
|
196
239
|
});
|
|
197
240
|
}
|
|
@@ -224,19 +267,61 @@ export async function runBuildCommand(options, dependencies = {}) {
|
|
|
224
267
|
});
|
|
225
268
|
}
|
|
226
269
|
const dockerBackedTargets = new Set(dockerImageTargets.map((imageTarget) => imageTargetKey(imageTarget)));
|
|
270
|
+
const currentFingerprints = createEmptyCurrentImageFingerprints();
|
|
227
271
|
for (const imageTarget of imageTargets) {
|
|
228
272
|
const shouldResetGondolinCache = options.forceRebuild === true || dockerBackedTargets.has(imageTargetKey(imageTarget));
|
|
229
273
|
// oxlint-disable-next-line no-await-in-loop -- gondolin cache rebuilds are intentionally sequenced per image target
|
|
230
274
|
await runTaskStep(`Gondolin: ${imageTarget.family}/${imageTarget.name}`, async (taskContext) => {
|
|
231
|
-
taskContext
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
275
|
+
const stopHeartbeat = startElapsedStatusHeartbeat(taskContext, shouldResetGondolinCache ? 'building vm assets' : 'checking vm assets');
|
|
276
|
+
let result;
|
|
277
|
+
try {
|
|
278
|
+
result = await buildGondolinImage({
|
|
279
|
+
buildConfigPath: imageTarget.buildConfigPath,
|
|
280
|
+
systemCacheIdentifierPath: imageTarget.systemCacheIdentifierPath,
|
|
281
|
+
cacheDir: imageTarget.cacheDirectory,
|
|
282
|
+
...(shouldResetGondolinCache ? { fullReset: true } : {}),
|
|
283
|
+
...(taskContext?.interactive === true && taskContext.streamPreview
|
|
284
|
+
? { streamPreview: taskContext.streamPreview }
|
|
285
|
+
: {}),
|
|
286
|
+
});
|
|
287
|
+
}
|
|
288
|
+
finally {
|
|
289
|
+
stopHeartbeat();
|
|
290
|
+
}
|
|
291
|
+
setCurrentImageFingerprint(currentFingerprints, imageTarget, result.fingerprint);
|
|
238
292
|
taskContext?.setStatus(result.built ? 'vm assets ready' : 'vm assets cache hit');
|
|
239
293
|
});
|
|
240
294
|
}
|
|
295
|
+
await runTaskStep('Cache auto-prune', async (taskContext) => {
|
|
296
|
+
taskContext?.setStatus('checking old image generations');
|
|
297
|
+
try {
|
|
298
|
+
const activeGatewayRuntimeZoneIds = await findZoneIdsWithGatewayRuntimeRecords(options.systemConfig);
|
|
299
|
+
if (activeGatewayRuntimeZoneIds.length > 0) {
|
|
300
|
+
taskContext?.setOutput({
|
|
301
|
+
message: `Image cache auto-prune skipped because gateway runtime records exist for zone(s): ${activeGatewayRuntimeZoneIds.join(', ')}. Stop the controller before pruning old image generations.`,
|
|
302
|
+
});
|
|
303
|
+
taskContext?.setStatus('image cache auto-prune skipped');
|
|
304
|
+
return;
|
|
305
|
+
}
|
|
306
|
+
const prunableEntries = await findPrunableImageDirectories({
|
|
307
|
+
cacheDir: options.systemConfig.cacheDir,
|
|
308
|
+
currentFingerprints,
|
|
309
|
+
retainStaleGenerationsPerProfile: RETAIN_STALE_IMAGE_GENERATIONS_PER_PROFILE,
|
|
310
|
+
});
|
|
311
|
+
if (prunableEntries.length === 0) {
|
|
312
|
+
taskContext?.setStatus('no old image generations found');
|
|
313
|
+
return;
|
|
314
|
+
}
|
|
315
|
+
await deleteStaleImageDirectories(prunableEntries);
|
|
316
|
+
taskContext?.setStatus(`deleted ${prunableEntries.length} old image generation${prunableEntries.length === 1 ? '' : 's'}`);
|
|
317
|
+
}
|
|
318
|
+
catch (error) {
|
|
319
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
320
|
+
taskContext?.setOutput({
|
|
321
|
+
message: `Image cache auto-prune failed after build succeeded: ${message}`,
|
|
322
|
+
});
|
|
323
|
+
taskContext?.setStatus('image cache auto-prune failed');
|
|
324
|
+
}
|
|
325
|
+
});
|
|
241
326
|
}
|
|
242
327
|
//# sourceMappingURL=build-command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-command.js","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,gCAAgC,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,IAAI,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AACrG,OAAO,EACN,wBAAwB,EACxB,yBAAyB,IAAI,gCAAgC,EAC7D,8BAA8B,IAAI,qCAAqC,GAEvE,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,EACN,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,GAChB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAqC9E,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;QACb,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KACxB,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,kCAAkC,GAAG,CAAC;KAC1C,MAAM,CAAC;IACP,QAAQ,EAAE,CAAC;SACT,MAAM,CAAC;QACP,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;KAC/E,CAAC;SACD,WAAW,EAAE;SACb,QAAQ,EAAE;CACZ,CAAC;KACD,WAAW,EAAE,CAAC;AAOhB,MAAM,2BAA2B,GAAG;IACnC;QACC,WAAW,EAAE,mBAAmB;QAChC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI;KACjE;CACwD,CAAC;AAa3D,SAAS,cAAc,CAAC,WAAiD;IACxE,OAAO,GAAG,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;AACpD,CAAC;AAED,KAAK,UAAU,4BAA4B,CAAC,eAAuB;IAClE,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,eAAe,CAAC,CAAC;IAC5D,MAAM,YAAY,GAAG,iBAAiB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC5D,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACd,cAAc,CAAC,gCAAgC,eAAe,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,CACtF,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;AACpC,CAAC;AAED,KAAK,UAAU,qBAAqB;IACnC,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,SAAS,CAAC;IAClB,CAAC;AACF,CAAC;AAED,KAAK,UAAU,0BAA0B,CACxC,yBAAgD,EAChD,iBAAoD;IAEpD,MAAM,kBAAkB,GAAG,MAAM,yBAAyB,EAAE,CAAC;IAC7D,MAAM,UAAU,GAAG,MAAM,iBAAiB,EAAE,CAAC;IAC7C,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,qBAAqB,UAAU,GAAG,CAAC,CAAC;IAC/F,CAAC;AACF,CAAC;AAED,KAAK,UAAU,2BAA2B,CACzC,YAAoC,EACpC,kBAAgE;IAEhE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC/C,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE/C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACxC,mGAAmG;QACnG,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACd,qBAAqB,QAAQ,qCAAqC,eAAe,UAAU,WAAW,CAAC,IAAI,kEAAkE,CAC7K,CAAC;QACH,CAAC;QACD,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QAC7C,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,YAAY,CAAC;AACrB,CAAC;AAED,MAAM,cAAc,GAAc,KAAK,EAAE,KAAK,EAAE,EAAE,EAAiB,EAAE;IACpE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC;IACxC,MAAM,EAAE,CAAC;QACR,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC;QACnB,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC;KACnB,CAAC,CAAC;IACH,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;AAC3C,CAAC,CAAC;AAEF,KAAK,UAAU,gCAAgC,CAAC,cAAsB;IACrE,IAAI,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;IAEjE,SAAS,CAAC;QACT,IAAI,CAAC;YACJ,iGAAiG;YACjG,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;YACrE,OAAO,eAAe,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACR,IAAI,CAAC;gBACJ,iGAAiG;gBACjG,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;gBACtE,OAAO,eAAe,CAAC;YACxB,CAAC;YAAC,MAAM,CAAC;gBACR,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;gBACtD,IAAI,eAAe,KAAK,eAAe,EAAE,CAAC;oBACzC,6EAA6E;oBAC7E,mGAAmG;oBACnG,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBACvD,CAAC;gBACD,eAAe,GAAG,eAAe,CAAC;YACnC,CAAC;QACF,CAAC;IACF,CAAC;AACF,CAAC;AAED,KAAK,UAAU,wCAAwC,CACtD,YAAgC,EAChC,WAAwB;IAExB,IACC,WAAW,CAAC,MAAM,KAAK,SAAS;QAChC,WAAW,CAAC,WAAW,KAAK,UAAU;QACtC,WAAW,CAAC,MAAM,EAAE,IAAI,KAAK,kBAAkB,EAC9C,CAAC;QACF,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/C,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;QACvC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;YACxF,SAAS;QACV,CAAC;QACD,gHAAgH;QAChH,MAAM,iBAAiB,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxE,MAAM,cAAc,GAAG,kCAAkC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACnF,KAAK,MAAM,WAAW,IAAI,2BAA2B,EAAE,CAAC;YACvD,IAAI,WAAW,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC3C,oBAAoB,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,WAAW,IAAI,wBAAwB,EAAE,CAAC,CAAC;YACpF,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,CAAC,GAAG,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACpC,OAGC,EACD,eAAyC,EAAE;IAE3C,MAAM,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,IAAI,uBAAuB,CAAC;IAClF,MAAM,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,IAAI,yBAAyB,CAAC;IACxF,MAAM,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,IAAI,4BAA4B,CAAC;IAC3F,MAAM,yBAAyB,GAC9B,YAAY,CAAC,yBAAyB,IAAI,gCAAgC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,IAAI,qBAAqB,CAAC;IAClF,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,IAAI,cAAc,CAAC;IAC3D,MAAM,kBAAkB,GACvB,YAAY,CAAC,gCAAgC,IAAI,gCAAgC,CAAC;IACnF,MAAM,yBAAyB,GAC9B,YAAY,CAAC,yBAAyB,IAAI,gCAAgC,CAAC;IAC5E,MAAM,8BAA8B,GACnC,YAAY,CAAC,8BAA8B,IAAI,qCAAqC,CAAC;IACtF,MAAM,yBAAyB,GAC9B,YAAY,CAAC,yBAAyB,IAAI,+BAA+B,CAAC;IAC3E,MAAM,yBAAyB,GAAG,OAAO,CAAC,YAAY,CAAC,yBAAyB,CAAC;IAEjF,MAAM,0BAA0B,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,CAAC;IAE/E,MAAM,mBAAmB,GAA2B,MAAM,CAAC,OAAO,CACjE,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,QAAQ,CAC3C,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAClC,eAAe,EAAE,OAAO,CAAC,WAAW;QACpC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE,gBAAgB,EAAE,WAAW,CAAC;QACvF,yBAAyB;QACzB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,SAAkB;QAC1B,WAAW,EAAE,OAAO,CAAC,IAAI;QACzB,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE,OAAO,CAAC,MAAM;KACtB,CAAC,CAAC,CAAC;IACJ,MAAM,kBAAkB,GAA2B,MAAM,CAAC,OAAO,CAChE,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,CAC1C,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAClC,eAAe,EAAE,OAAO,CAAC,WAAW;QACpC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE,gBAAgB,EAAE,WAAW,CAAC;QACvF,yBAAyB;QACzB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,QAAiB;QACzB,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE,OAAO,CAAC,MAAM;KACtB,CAAC,CAAC,CAAC;IACJ,MAAM,YAAY,GAA2B,CAAC,GAAG,mBAAmB,EAAE,GAAG,kBAAkB,CAAC,CAAC;IAC7F,MAAM,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAC7C,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,KAAK,SAAS,IAAI,WAAW,CAAC,MAAM,KAAK,SAAS,CACzF,CAAC;IACF,MAAM,uBAAuB,GAAG,MAAM,2BAA2B,CAChE,kBAAkB,EAClB,kBAAkB,CAClB,CAAC;IACF,MAAM,uBAAuB,GAAG,kBAAkB,CAAC,IAAI,CACtD,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,KAAK,SAAS,CACjD;QACA,CAAC,CAAC,MAAM,8BAA8B,EAAE;QACxC,CAAC,CAAC,SAAS,CAAC;IAEb,sIAAsI;IACtI,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE,CAAC;QAC9C,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,wDAAwD,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC;QAC/F,CAAC;QACD,IAAI,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC;QAC5C,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACxB,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;YAChF,CAAC;YACD,iGAAiG;YACjG,MAAM,wBAAwB,GAAG,MAAM,wCAAwC,CAC9E,OAAO,CAAC,YAAY,EACpB,WAAW,CACX,CAAC;YACF,yGAAyG;YACzG,cAAc,GAAG,MAAM,yBAAyB,CAAC;gBAChD,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI;gBAC7B,iBAAiB,EAAE,WAAW,CAAC,MAAM;gBACrC,eAAe,EAAE,WAAW,CAAC,IAAI;gBACjC,eAAe,EAAE,IAAI,CAAC,IAAI,CACzB,OAAO,CAAC,YAAY,CAAC,QAAQ,EAC7B,uBAAuB,EACvB,WAAW,CAAC,MAAM,EAClB,WAAW,CAAC,IAAI,CAChB;gBACD,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClF,gBAAgB,EAAE,uBAAuB;gBACzC,wBAAwB;aACxB,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,cAAc,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,8CAA8C,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC;QACrF,CAAC;QACD,IACC,WAAW,CAAC,MAAM,KAAK,SAAS;YAChC,WAAW,CAAC,WAAW,KAAK,UAAU;YACtC,CAAC,WAAW,CAAC,MAAM,EAClB,CAAC;YACF,+EAA+E;YAC/E,gDAAgD;YAChD,mGAAmG;YACnG,MAAM,oBAAoB,GAAG,MAAM,kBAAkB,CAAC,cAAc,CAAC,CAAC;YACtE,iHAAiH;YACjH,MAAM,WAAW,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;gBACtD,MAAM,yBAAyB,CAAC,oBAAoB,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;YACzE,CAAC,CAAC,CAAC;QACJ,CAAC;QACD,0HAA0H;QAC1H,MAAM,WAAW,CAChB,WAAW,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ,GAAG,EACjE,KAAK,EAAE,WAAW,EAAE,EAAE;YACrB,WAAW,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;YACvC,MAAM,gBAAgB,CAAC;gBACtB,cAAc;gBACd,QAAQ;gBACR,GAAG,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,IAAI,WAAW,CAAC,aAAa;oBACjE,CAAC,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,aAAa,EAAE;oBAC9C,CAAC,CAAC,EAAE,CAAC;aACN,CAAC,CAAC;YACH,WAAW,EAAE,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAC9C,CAAC,CACD,CAAC;IACH,CAAC;IACD,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAClC,kBAAkB,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CACpE,CAAC;IAEF,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACxC,MAAM,wBAAwB,GAC7B,OAAO,CAAC,YAAY,KAAK,IAAI,IAAI,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;QACvF,oHAAoH;QACpH,MAAM,WAAW,CAChB,aAAa,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,IAAI,EAAE,EACrD,KAAK,EAAE,WAAW,EAAE,EAAE;YACrB,WAAW,EAAE,SAAS,CACrB,wBAAwB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,CACtE,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;gBACvC,eAAe,EAAE,WAAW,CAAC,eAAe;gBAC5C,yBAAyB,EAAE,WAAW,CAAC,yBAAyB;gBAChE,QAAQ,EAAE,WAAW,CAAC,cAAc;gBACpC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACxD,CAAC,CAAC;YACH,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC;QAClF,CAAC,CACD,CAAC;IACH,CAAC;AACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"build-command.js","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type StaleImageEntry } from '../build/stale-image-cleaner.js';
|
|
1
|
+
import { type CurrentImageFingerprints, type StaleImageEntry } from '../build/stale-image-cleaner.js';
|
|
2
2
|
import type { LoadedSystemConfig } from '../config/system-config.js';
|
|
3
3
|
interface CacheCommandIo {
|
|
4
4
|
readonly stderr: Pick<NodeJS.WriteStream, 'write'>;
|
|
@@ -9,10 +9,6 @@ interface CacheEntry {
|
|
|
9
9
|
readonly fingerprint: string;
|
|
10
10
|
}
|
|
11
11
|
type ImageProfileFamily = 'gateway' | 'toolVm';
|
|
12
|
-
interface CurrentImageFingerprints {
|
|
13
|
-
readonly gateways: Record<string, string>;
|
|
14
|
-
readonly toolVms: Record<string, string>;
|
|
15
|
-
}
|
|
16
12
|
export interface CacheCommandDependencies {
|
|
17
13
|
readonly computeFingerprintFromConfigPath?: (buildConfigPath: string, systemCacheIdentifierPath: string) => Promise<string>;
|
|
18
14
|
readonly deleteStaleImageDirectories?: (entries: readonly StaleImageEntry[]) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-commands.d.ts","sourceRoot":"","sources":["../../src/cli/cache-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EAGN,KAAK,eAAe,EACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErE,UAAU,cAAc;IACvB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACnD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;CACnD;AAED,UAAU,UAAU;IACnB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC7B;AAED,KAAK,kBAAkB,GAAG,SAAS,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"cache-commands.d.ts","sourceRoot":"","sources":["../../src/cli/cache-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EAGN,KAAK,wBAAwB,EAC7B,KAAK,eAAe,EACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErE,UAAU,cAAc;IACvB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACnD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;CACnD;AAED,UAAU,UAAU;IACnB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC7B;AAED,KAAK,kBAAkB,GAAG,SAAS,GAAG,QAAQ,CAAC;AAQ/C,MAAM,WAAW,wBAAwB;IACxC,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAC3C,eAAe,EAAE,MAAM,EACvB,yBAAyB,EAAE,MAAM,KAC7B,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,QAAQ,CAAC,2BAA2B,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,eAAe,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9F,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC,OAAO,EAAE;QAC9C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,mBAAmB,EAAE,wBAAwB,CAAC;KACvD,KAAK,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC,CAAC;IAC1C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAC3B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,MAAM,EACnB,kBAAkB,EAAE,MAAM,KACtB,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAAC;CACpC;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAEjF;AAwFD,wBAAsB,eAAe,CACpC,OAAO,EAAE;IACR,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;CAC1C,EACD,EAAE,EAAE,cAAc,EAClB,YAAY,GAAE,wBAA6B,GACzC,OAAO,CAAC,IAAI,CAAC,CA+Df"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-commands.js","sourceRoot":"","sources":["../../src/cli/cache-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EACN,2BAA2B,IAAI,kCAAkC,EACjE,yBAAyB,IAAI,gCAAgC,
|
|
1
|
+
{"version":3,"file":"cache-commands.js","sourceRoot":"","sources":["../../src/cli/cache-commands.ts"],"names":[],"mappings":"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"}
|