@agent-vm/agent-vm 0.0.56 → 0.0.57
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-builder.d.ts +1 -3
- package/dist/build/gondolin-image-builder.d.ts.map +1 -1
- package/dist/build/gondolin-image-builder.js +1 -9
- package/dist/build/gondolin-image-builder.js.map +1 -1
- package/dist/build/managed-image-dockerfile.d.ts +33 -3
- package/dist/build/managed-image-dockerfile.d.ts.map +1 -1
- package/dist/build/managed-image-dockerfile.js +173 -15
- package/dist/build/managed-image-dockerfile.js.map +1 -1
- package/dist/cli/agent-vm-entrypoint.js +1 -1
- package/dist/cli/agent-vm-entrypoint.js.map +1 -1
- package/dist/cli/build-command.d.ts +3 -5
- package/dist/cli/build-command.d.ts.map +1 -1
- package/dist/cli/build-command.js +39 -15
- package/dist/cli/build-command.js.map +1 -1
- package/dist/cli/cache-commands.d.ts +1 -1
- package/dist/cli/cache-commands.d.ts.map +1 -1
- package/dist/cli/cache-commands.js +2 -3
- package/dist/cli/cache-commands.js.map +1 -1
- package/dist/cli/commands/controller-definition.d.ts +8 -8
- package/dist/cli/commands/controller-definition.d.ts.map +1 -1
- package/dist/cli/commands/controller-definition.js +1 -1
- package/dist/cli/commands/controller-definition.js.map +1 -1
- package/dist/cli/commands/create-app.d.ts +10 -8
- package/dist/cli/commands/create-app.d.ts.map +1 -1
- package/dist/cli/commands/init-definition.d.ts +4 -2
- package/dist/cli/commands/init-definition.d.ts.map +1 -1
- package/dist/cli/commands/init-definition.js +24 -1
- package/dist/cli/commands/init-definition.js.map +1 -1
- package/dist/cli/controller-operation-commands.d.ts.map +1 -1
- package/dist/cli/controller-operation-commands.js +8 -23
- package/dist/cli/controller-operation-commands.js.map +1 -1
- package/dist/cli/init-command.d.ts +2 -1
- package/dist/cli/init-command.d.ts.map +1 -1
- package/dist/cli/init-command.js +45 -28
- 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 +59 -16
- package/dist/cli/manual-templates.js.map +1 -1
- package/dist/cli/run-task.d.ts.map +1 -1
- package/dist/cli/run-task.js +4 -1
- package/dist/cli/run-task.js.map +1 -1
- package/dist/config/system-config.d.ts +1 -1
- package/dist/config/system-config.d.ts.map +1 -1
- package/dist/config/system-config.js +1 -3
- package/dist/config/system-config.js.map +1 -1
- package/dist/controller/zone-runtimes/openclaw-zone-runtime.d.ts.map +1 -1
- package/dist/controller/zone-runtimes/openclaw-zone-runtime.js +10 -1
- package/dist/controller/zone-runtimes/openclaw-zone-runtime.js.map +1 -1
- package/dist/gateway/gateway-image-builder.d.ts +0 -1
- package/dist/gateway/gateway-image-builder.d.ts.map +1 -1
- package/dist/gateway/gateway-image-builder.js +0 -3
- package/dist/gateway/gateway-image-builder.js.map +1 -1
- package/dist/gateway/gateway-zone-orchestrator.d.ts.map +1 -1
- package/dist/gateway/gateway-zone-orchestrator.js +6 -1
- package/dist/gateway/gateway-zone-orchestrator.js.map +1 -1
- package/dist/gateway/gateway-zone-support.d.ts +0 -1
- package/dist/gateway/gateway-zone-support.d.ts.map +1 -1
- package/dist/gateway/gateway-zone-support.js.map +1 -1
- package/dist/operations/config-validation.d.ts.map +1 -1
- package/dist/operations/config-validation.js +4 -28
- package/dist/operations/config-validation.js.map +1 -1
- package/dist/operations/destroy-zone.d.ts.map +1 -1
- package/dist/operations/destroy-zone.js +4 -0
- package/dist/operations/destroy-zone.js.map +1 -1
- package/dist/operations/doctor.d.ts.map +1 -1
- package/dist/operations/doctor.js +26 -23
- package/dist/operations/doctor.js.map +1 -1
- package/dist/operations/openclaw-deployment-doctor.d.ts +5 -0
- package/dist/operations/openclaw-deployment-doctor.d.ts.map +1 -1
- package/dist/operations/openclaw-deployment-doctor.js +61 -5
- package/dist/operations/openclaw-deployment-doctor.js.map +1 -1
- package/dist/operations/runtime-config-paths.d.ts +2 -0
- package/dist/operations/runtime-config-paths.d.ts.map +1 -1
- package/dist/operations/runtime-config-paths.js +13 -0
- package/dist/operations/runtime-config-paths.js.map +1 -1
- package/dist/tool-vm/tool-vm-lifecycle.d.ts +0 -1
- package/dist/tool-vm/tool-vm-lifecycle.d.ts.map +1 -1
- package/dist/tool-vm/tool-vm-lifecycle.js +0 -1
- package/dist/tool-vm/tool-vm-lifecycle.js.map +1 -1
- package/managed-images.json +1 -2
- package/package.json +12 -12
- package/dist/config/system-cache-identifier.d.ts +0 -19
- package/dist/config/system-cache-identifier.d.ts.map +0 -1
- package/dist/config/system-cache-identifier.js +0 -67
- package/dist/config/system-cache-identifier.js.map +0 -1
|
@@ -2,7 +2,6 @@ import { type BuildConfig, type BuildImageOptions, type BuildImageResult } from
|
|
|
2
2
|
import type { TaskOutput } from '../shared/run-task.js';
|
|
3
3
|
export interface GondolinImageBuildRequest {
|
|
4
4
|
readonly buildConfigPath: string;
|
|
5
|
-
readonly systemCacheIdentifierPath: string;
|
|
6
5
|
readonly cacheDir: string;
|
|
7
6
|
readonly fullReset?: boolean;
|
|
8
7
|
}
|
|
@@ -19,12 +18,11 @@ export interface GondolinImageBuilderDependencies {
|
|
|
19
18
|
readonly runBuildChildProcess?: (options: RunGondolinBuildChildProcessOptions) => Promise<BuildImageResult>;
|
|
20
19
|
readonly resolveRuntimeBuildVersionTag?: () => Promise<string>;
|
|
21
20
|
}
|
|
22
|
-
export declare function computeFingerprintFromConfigPath(buildConfigPath: string,
|
|
21
|
+
export declare function computeFingerprintFromConfigPath(buildConfigPath: string, dependencies?: Pick<GondolinImageBuilderDependencies, 'resolveRuntimeBuildVersionTag'>): Promise<string>;
|
|
23
22
|
export declare function runGondolinImageBuildRequest(request: GondolinImageBuildRequest, dependencies?: Omit<GondolinImageBuilderDependencies, 'runBuildChildProcess'>): Promise<BuildImageResult>;
|
|
24
23
|
export declare function runGondolinBuildChildProcess(options: RunGondolinBuildChildProcessOptions): Promise<BuildImageResult>;
|
|
25
24
|
export declare function buildGondolinImage(options: {
|
|
26
25
|
readonly buildConfigPath: string;
|
|
27
|
-
readonly systemCacheIdentifierPath: string;
|
|
28
26
|
readonly cacheDir: string;
|
|
29
27
|
readonly fullReset?: boolean;
|
|
30
28
|
readonly streamPreview?: TaskOutput;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gondolin-image-builder.d.ts","sourceRoot":"","sources":["../../src/build/gondolin-image-builder.ts"],"names":[],"mappings":"AAIA,OAAO,EAGN,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"gondolin-image-builder.d.ts","sourceRoot":"","sources":["../../src/build/gondolin-image-builder.ts"],"names":[],"mappings":"AAIA,OAAO,EAGN,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,WAAW,yBAAyB;IACzC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,mCAAmC;IACnD,QAAQ,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,yBAAyB,CAAC;IAC5C,QAAQ,CAAC,aAAa,EAAE,UAAU,CAAC;CACnC;AAED,MAAM,WAAW,gCAAgC;IAChD,QAAQ,CAAC,UAAU,CAAC,EAAE,CACrB,OAAO,EAAE,iBAAiB,EAC1B,YAAY,CAAC,EAAE;QAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,KAChD,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/B,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7E,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAC/B,OAAO,EAAE,mCAAmC,KACxC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/B,QAAQ,CAAC,6BAA6B,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/D;AAoCD,wBAAsB,gCAAgC,CACrD,eAAe,EAAE,MAAM,EACvB,YAAY,GAAE,IAAI,CAAC,gCAAgC,EAAE,+BAA+B,CAAM,GACxF,OAAO,CAAC,MAAM,CAAC,CAYjB;AA4DD,wBAAsB,4BAA4B,CACjD,OAAO,EAAE,yBAAyB,EAClC,YAAY,GAAE,IAAI,CAAC,gCAAgC,EAAE,sBAAsB,CAAM,GAC/E,OAAO,CAAC,gBAAgB,CAAC,CAoB3B;AAED,wBAAsB,4BAA4B,CACjD,OAAO,EAAE,mCAAmC,GAC1C,OAAO,CAAC,gBAAgB,CAAC,CA+E3B;AAED,wBAAsB,kBAAkB,CACvC,OAAO,EAAE;IACR,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;CACpC,EACD,YAAY,GAAE,gCAAqC,GACjD,OAAO,CAAC,gBAAgB,CAAC,CAc3B"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import { fork } from 'node:child_process';
|
|
3
3
|
import { buildImage as buildImageFromCore, computeEffectiveBuildFingerprint, } from '@agent-vm/gondolin-adapter';
|
|
4
|
-
import { loadSystemCacheIdentifier } from '../config/system-cache-identifier.js';
|
|
5
4
|
import { loadJsonConfigFile } from '../config/json-config-file.js';
|
|
6
5
|
import { resolveRuntimeBuildVersionTag as resolveRuntimeBuildVersionTagDefault } from './runtime-versions.js';
|
|
7
6
|
const CHILD_EXIT_GRACE_MS = 2_000;
|
|
@@ -22,14 +21,12 @@ async function loadBuildConfigFromJson(buildConfigPath) {
|
|
|
22
21
|
});
|
|
23
22
|
}
|
|
24
23
|
}
|
|
25
|
-
export async function computeFingerprintFromConfigPath(buildConfigPath,
|
|
24
|
+
export async function computeFingerprintFromConfigPath(buildConfigPath, dependencies = {}) {
|
|
26
25
|
const buildConfig = await loadBuildConfigFromJson(buildConfigPath);
|
|
27
|
-
const fingerprintInput = await loadSystemCacheIdentifier({ filePath: systemCacheIdentifierPath });
|
|
28
26
|
const runtimeBuildVersionTag = await (dependencies.resolveRuntimeBuildVersionTag ?? resolveRuntimeBuildVersionTagDefault)();
|
|
29
27
|
const effectiveBuildFingerprint = await computeEffectiveBuildFingerprint({
|
|
30
28
|
buildConfig,
|
|
31
29
|
configDir: path.dirname(path.resolve(buildConfigPath)),
|
|
32
|
-
fingerprintInput,
|
|
33
30
|
gondolinVersion: runtimeBuildVersionTag,
|
|
34
31
|
});
|
|
35
32
|
return effectiveBuildFingerprint.fingerprint;
|
|
@@ -92,15 +89,11 @@ export async function runGondolinImageBuildRequest(request, dependencies = {}) {
|
|
|
92
89
|
const buildImage = dependencies.buildImage ?? buildImageFromCore;
|
|
93
90
|
const configDir = path.dirname(path.resolve(request.buildConfigPath));
|
|
94
91
|
const buildConfig = await loadBuildConfig(request.buildConfigPath);
|
|
95
|
-
const fingerprintInput = await loadSystemCacheIdentifier({
|
|
96
|
-
filePath: request.systemCacheIdentifierPath,
|
|
97
|
-
});
|
|
98
92
|
const runtimeBuildVersionTag = await (dependencies.resolveRuntimeBuildVersionTag ?? resolveRuntimeBuildVersionTagDefault)();
|
|
99
93
|
return await buildImage({
|
|
100
94
|
buildConfig,
|
|
101
95
|
cacheDir: request.cacheDir,
|
|
102
96
|
configDir,
|
|
103
|
-
fingerprintInput,
|
|
104
97
|
...(request.fullReset ? { fullReset: true } : {}),
|
|
105
98
|
}, {
|
|
106
99
|
gondolinVersion: runtimeBuildVersionTag,
|
|
@@ -187,7 +180,6 @@ export async function buildGondolinImage(options, dependencies = {}) {
|
|
|
187
180
|
const request = {
|
|
188
181
|
buildConfigPath: options.buildConfigPath,
|
|
189
182
|
cacheDir: options.cacheDir,
|
|
190
|
-
systemCacheIdentifierPath: options.systemCacheIdentifierPath,
|
|
191
183
|
...(options.fullReset ? { fullReset: true } : {}),
|
|
192
184
|
};
|
|
193
185
|
if (options.streamPreview) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gondolin-image-builder.js","sourceRoot":"","sources":["../../src/build/gondolin-image-builder.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAG1C,OAAO,EACN,UAAU,IAAI,kBAAkB,EAChC,gCAAgC,GAIhC,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"gondolin-image-builder.js","sourceRoot":"","sources":["../../src/build/gondolin-image-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,37 @@ export interface GenerateManagedDockerfileOptions {
|
|
|
11
11
|
readonly outputDirectory: string;
|
|
12
12
|
readonly overlayPath?: string | undefined;
|
|
13
13
|
readonly managedImageRelease: ManagedImageRelease;
|
|
14
|
-
readonly
|
|
14
|
+
readonly requiredOpenClawPackageNames?: readonly string[];
|
|
15
|
+
}
|
|
16
|
+
export type ManagedDockerfilePlanSource = 'installed-package' | 'managed-default' | 'managed-images.json' | 'overlay';
|
|
17
|
+
export interface ManagedDockerfilePackagePlanEntry {
|
|
18
|
+
readonly name: string;
|
|
19
|
+
readonly source: ManagedDockerfilePlanSource;
|
|
20
|
+
readonly spec: string;
|
|
21
|
+
readonly version?: string;
|
|
22
|
+
}
|
|
23
|
+
export interface ManagedDockerfilePlanWarning {
|
|
24
|
+
readonly message: string;
|
|
25
|
+
readonly type: 'openclaw-package-version-mismatch';
|
|
26
|
+
}
|
|
27
|
+
export interface ManagedDockerfilePlan {
|
|
28
|
+
readonly base: ManagedImageBase;
|
|
29
|
+
readonly baseImage: {
|
|
30
|
+
readonly reference: string;
|
|
31
|
+
readonly repository: string;
|
|
32
|
+
readonly source: 'managed-images.json';
|
|
33
|
+
readonly tag: string;
|
|
34
|
+
};
|
|
35
|
+
readonly dockerfilePath: string;
|
|
36
|
+
readonly imageTargetFamily: 'gateway' | 'toolVm';
|
|
37
|
+
readonly imageTargetName: string;
|
|
38
|
+
readonly openClawAgentVmPluginPackage?: ManagedDockerfilePackagePlanEntry;
|
|
39
|
+
readonly openClawPackages: readonly ManagedDockerfilePackagePlanEntry[];
|
|
40
|
+
readonly warnings: readonly ManagedDockerfilePlanWarning[];
|
|
41
|
+
}
|
|
42
|
+
export interface GenerateManagedDockerfileResult {
|
|
43
|
+
readonly dockerfilePath: string;
|
|
44
|
+
readonly plan: ManagedDockerfilePlan;
|
|
15
45
|
}
|
|
16
46
|
export interface ManagedBaseImageReference {
|
|
17
47
|
readonly repository: string;
|
|
@@ -20,8 +50,8 @@ export interface ManagedBaseImageReference {
|
|
|
20
50
|
export interface ManagedImageRelease {
|
|
21
51
|
readonly baseImages: Readonly<Record<ManagedImageBase, ManagedBaseImageReference>>;
|
|
22
52
|
readonly openClawVersion: string;
|
|
23
|
-
readonly openClawAgentVmPluginVersion: string;
|
|
24
53
|
}
|
|
25
|
-
export declare function generateManagedDockerfile(options: GenerateManagedDockerfileOptions): Promise<
|
|
54
|
+
export declare function generateManagedDockerfile(options: GenerateManagedDockerfileOptions): Promise<GenerateManagedDockerfileResult>;
|
|
55
|
+
export declare function resolveManagedOpenClawAgentVmPluginPackageSpec(): Promise<string>;
|
|
26
56
|
export declare function resolveManagedImageRelease(): Promise<ManagedImageRelease>;
|
|
27
57
|
//# sourceMappingURL=managed-image-dockerfile.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-image-dockerfile.d.ts","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,SAAS,GAAG,gBAAgB,CAAC;AAOjF,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC;AAED,MAAM,WAAW,gCAAgC;IAChD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,GAAG,QAAQ,CAAC;IACjD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAClD,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"managed-image-dockerfile.d.ts","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,SAAS,GAAG,gBAAgB,CAAC;AAOjF,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC;AAED,MAAM,WAAW,gCAAgC;IAChD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,GAAG,QAAQ,CAAC;IACjD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAClD,QAAQ,CAAC,4BAA4B,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1D;AAED,MAAM,MAAM,2BAA2B,GACpC,mBAAmB,GACnB,iBAAiB,GACjB,qBAAqB,GACrB,SAAS,CAAC;AAEb,MAAM,WAAW,iCAAiC;IACjD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,2BAA2B,CAAC;IAC7C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,4BAA4B;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,mCAAmC,CAAC;CACnD;AAED,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE;QACnB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;QACvC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,GAAG,QAAQ,CAAC;IACjD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,4BAA4B,CAAC,EAAE,iCAAiC,CAAC;IAC1E,QAAQ,CAAC,gBAAgB,EAAE,SAAS,iCAAiC,EAAE,CAAC;IACxE,QAAQ,CAAC,QAAQ,EAAE,SAAS,4BAA4B,EAAE,CAAC;CAC3D;AAED,MAAM,WAAW,+BAA+B;IAC/C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;CACrC;AAED,MAAM,WAAW,yBAAyB;IACzC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,yBAAyB,CAAC,CAAC,CAAC;IACnF,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CACjC;AA6ND,wBAAsB,yBAAyB,CAC9C,OAAO,EAAE,gCAAgC,GACvC,OAAO,CAAC,+BAA+B,CAAC,CAqE1C;AAmCD,wBAAsB,8CAA8C,IAAI,OAAO,CAAC,MAAM,CAAC,CAmBtF;AAmCD,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAY/E"}
|
|
@@ -39,7 +39,6 @@ const managedImageReleaseSchema = z
|
|
|
39
39
|
})
|
|
40
40
|
.strict(),
|
|
41
41
|
openClawVersion: z.string().min(1),
|
|
42
|
-
openClawAgentVmPluginVersion: z.string().min(1),
|
|
43
42
|
})
|
|
44
43
|
.strict();
|
|
45
44
|
async function loadManagedImageOverlay(overlayPath) {
|
|
@@ -62,8 +61,34 @@ async function loadManagedImageOverlay(overlayPath) {
|
|
|
62
61
|
function shellJoin(argumentsToQuote) {
|
|
63
62
|
return argumentsToQuote.map((argument) => JSON.stringify(argument)).join(' ');
|
|
64
63
|
}
|
|
64
|
+
function parsePackageSpec(packageSpec) {
|
|
65
|
+
if (packageSpec.startsWith('@')) {
|
|
66
|
+
const scopeSeparatorIndex = packageSpec.indexOf('/');
|
|
67
|
+
if (scopeSeparatorIndex === -1) {
|
|
68
|
+
return { name: packageSpec };
|
|
69
|
+
}
|
|
70
|
+
const versionSeparatorIndex = packageSpec.indexOf('@', scopeSeparatorIndex + 1);
|
|
71
|
+
if (versionSeparatorIndex === -1) {
|
|
72
|
+
return { name: packageSpec };
|
|
73
|
+
}
|
|
74
|
+
return {
|
|
75
|
+
name: packageSpec.slice(0, versionSeparatorIndex),
|
|
76
|
+
version: packageSpec.slice(versionSeparatorIndex + 1),
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
const versionSeparatorIndex = packageSpec.indexOf('@');
|
|
80
|
+
if (versionSeparatorIndex === -1) {
|
|
81
|
+
return { name: packageSpec };
|
|
82
|
+
}
|
|
83
|
+
return {
|
|
84
|
+
name: packageSpec.slice(0, versionSeparatorIndex),
|
|
85
|
+
version: packageSpec.slice(versionSeparatorIndex + 1),
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
function packageSpec(packageName, version) {
|
|
89
|
+
return `${packageName}@${version}`;
|
|
90
|
+
}
|
|
65
91
|
function renderManagedDockerfile(props) {
|
|
66
|
-
const managedOpenClawAgentVmPluginPackage = `${managedOpenClawAgentVmPluginPackageName}@${props.openClawAgentVmPluginVersion}`;
|
|
67
92
|
const lines = [
|
|
68
93
|
`FROM ${props.baseImage.repository}:${props.baseImage.tag}`,
|
|
69
94
|
'',
|
|
@@ -75,16 +100,13 @@ function renderManagedDockerfile(props) {
|
|
|
75
100
|
' && rm -rf /var/lib/apt/lists/*');
|
|
76
101
|
}
|
|
77
102
|
if (props.base === 'openclaw-gateway') {
|
|
78
|
-
|
|
103
|
+
if (!props.openClawAgentVmPluginPackageSpec) {
|
|
104
|
+
throw new Error('OpenClaw gateway managed Dockerfiles require the OpenClaw plugin package spec.');
|
|
105
|
+
}
|
|
106
|
+
lines.push('RUN pnpm add -g ' + shellJoin([props.openClawAgentVmPluginPackageSpec]));
|
|
79
107
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
const openClawPackages = [
|
|
83
|
-
...props.requiredOpenClawPackages,
|
|
84
|
-
...overlayOpenClawPackages,
|
|
85
|
-
];
|
|
86
|
-
if (openClawPackages.length > 0) {
|
|
87
|
-
lines.push('RUN pnpm add -g ' + shellJoin(openClawPackages));
|
|
108
|
+
if (props.openClawPackages.length > 0) {
|
|
109
|
+
lines.push('RUN pnpm add -g ' + shellJoin(props.openClawPackages.map((entry) => entry.spec)));
|
|
88
110
|
}
|
|
89
111
|
for (const copy of props.overlay.copy) {
|
|
90
112
|
lines.push(`COPY overlay/${copy.from} ${copy.to}`);
|
|
@@ -98,6 +120,60 @@ function renderManagedDockerfile(props) {
|
|
|
98
120
|
lines.push('');
|
|
99
121
|
return lines.join('\n');
|
|
100
122
|
}
|
|
123
|
+
function resolveOpenClawPackagePlanEntries(props) {
|
|
124
|
+
const entriesByName = new Map();
|
|
125
|
+
let overlayOpenClawVersion;
|
|
126
|
+
for (const overlayPackageSpec of props.overlay.extraOpenClawPackages) {
|
|
127
|
+
if (overlayPackageSpec === managedOpenClawAgentVmPluginPackageName ||
|
|
128
|
+
overlayPackageSpec.startsWith(`${managedOpenClawAgentVmPluginPackageName}@`)) {
|
|
129
|
+
continue;
|
|
130
|
+
}
|
|
131
|
+
const parsedPackageSpec = parsePackageSpec(overlayPackageSpec);
|
|
132
|
+
const name = parsedPackageSpec.name;
|
|
133
|
+
const version = parsedPackageSpec.version;
|
|
134
|
+
if (name === 'openclaw' && version !== undefined) {
|
|
135
|
+
overlayOpenClawVersion = version;
|
|
136
|
+
}
|
|
137
|
+
entriesByName.set(name, {
|
|
138
|
+
name,
|
|
139
|
+
source: 'overlay',
|
|
140
|
+
spec: overlayPackageSpec,
|
|
141
|
+
...(version === undefined ? {} : { version }),
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
const fallbackOpenClawVersion = overlayOpenClawVersion ?? props.managedImageRelease.openClawVersion;
|
|
145
|
+
for (const packageName of props.requiredOpenClawPackageNames) {
|
|
146
|
+
if (entriesByName.has(packageName)) {
|
|
147
|
+
continue;
|
|
148
|
+
}
|
|
149
|
+
entriesByName.set(packageName, {
|
|
150
|
+
name: packageName,
|
|
151
|
+
source: overlayOpenClawVersion === undefined ? 'managed-default' : 'overlay',
|
|
152
|
+
spec: packageSpec(packageName, fallbackOpenClawVersion),
|
|
153
|
+
version: fallbackOpenClawVersion,
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
return [...entriesByName.values()];
|
|
157
|
+
}
|
|
158
|
+
function collectOpenClawPackagePlanWarnings(openClawPackages) {
|
|
159
|
+
const coreOpenClawPackage = openClawPackages.find((packageEntry) => packageEntry.name === 'openclaw');
|
|
160
|
+
if (!coreOpenClawPackage?.version) {
|
|
161
|
+
return [];
|
|
162
|
+
}
|
|
163
|
+
const warnings = [];
|
|
164
|
+
for (const packageEntry of openClawPackages) {
|
|
165
|
+
if (!packageEntry.name.startsWith('@openclaw/') ||
|
|
166
|
+
!packageEntry.version ||
|
|
167
|
+
packageEntry.version === coreOpenClawPackage.version) {
|
|
168
|
+
continue;
|
|
169
|
+
}
|
|
170
|
+
warnings.push({
|
|
171
|
+
type: 'openclaw-package-version-mismatch',
|
|
172
|
+
message: `OpenClaw package versions differ: openclaw uses ${coreOpenClawPackage.version}, but ${packageEntry.name} uses ${packageEntry.version}.`,
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
return warnings;
|
|
176
|
+
}
|
|
101
177
|
function assertOverlayCopySourceIsSafe(sourcePath) {
|
|
102
178
|
if (path.isAbsolute(sourcePath) || sourcePath.split(/[\\/]+/u).includes('..')) {
|
|
103
179
|
throw new Error(`Managed image overlay copy source '${sourcePath}' must be relative and must not contain parent traversal.`);
|
|
@@ -105,6 +181,18 @@ function assertOverlayCopySourceIsSafe(sourcePath) {
|
|
|
105
181
|
}
|
|
106
182
|
export async function generateManagedDockerfile(options) {
|
|
107
183
|
const overlay = await loadManagedImageOverlay(options.overlayPath);
|
|
184
|
+
const baseImage = options.managedImageRelease.baseImages[options.base];
|
|
185
|
+
const openClawPackages = options.base === 'openclaw-gateway'
|
|
186
|
+
? resolveOpenClawPackagePlanEntries({
|
|
187
|
+
managedImageRelease: options.managedImageRelease,
|
|
188
|
+
overlay,
|
|
189
|
+
requiredOpenClawPackageNames: options.requiredOpenClawPackageNames ?? [],
|
|
190
|
+
})
|
|
191
|
+
: [];
|
|
192
|
+
const warnings = collectOpenClawPackagePlanWarnings(openClawPackages);
|
|
193
|
+
const openClawAgentVmPluginPackageSpec = options.base === 'openclaw-gateway'
|
|
194
|
+
? await resolveManagedOpenClawAgentVmPluginPackageSpec()
|
|
195
|
+
: undefined;
|
|
108
196
|
await fs.rm(options.outputDirectory, { force: true, recursive: true });
|
|
109
197
|
await fs.mkdir(path.join(options.outputDirectory, 'overlay'), { recursive: true });
|
|
110
198
|
const overlayDirectory = options.overlayPath ? path.dirname(options.overlayPath) : undefined;
|
|
@@ -121,12 +209,82 @@ export async function generateManagedDockerfile(options) {
|
|
|
121
209
|
const dockerfilePath = path.join(options.outputDirectory, 'Dockerfile');
|
|
122
210
|
await fs.writeFile(dockerfilePath, renderManagedDockerfile({
|
|
123
211
|
base: options.base,
|
|
124
|
-
baseImage
|
|
212
|
+
baseImage,
|
|
125
213
|
overlay,
|
|
126
|
-
|
|
127
|
-
|
|
214
|
+
...(openClawAgentVmPluginPackageSpec === undefined
|
|
215
|
+
? {}
|
|
216
|
+
: { openClawAgentVmPluginPackageSpec }),
|
|
217
|
+
openClawPackages,
|
|
128
218
|
}), 'utf8');
|
|
129
|
-
return
|
|
219
|
+
return {
|
|
220
|
+
dockerfilePath,
|
|
221
|
+
plan: {
|
|
222
|
+
base: options.base,
|
|
223
|
+
baseImage: {
|
|
224
|
+
reference: `${baseImage.repository}:${baseImage.tag}`,
|
|
225
|
+
repository: baseImage.repository,
|
|
226
|
+
source: 'managed-images.json',
|
|
227
|
+
tag: baseImage.tag,
|
|
228
|
+
},
|
|
229
|
+
dockerfilePath,
|
|
230
|
+
imageTargetFamily: options.imageTargetFamily,
|
|
231
|
+
imageTargetName: options.imageTargetName,
|
|
232
|
+
...(openClawAgentVmPluginPackageSpec === undefined
|
|
233
|
+
? {}
|
|
234
|
+
: {
|
|
235
|
+
openClawAgentVmPluginPackage: {
|
|
236
|
+
name: managedOpenClawAgentVmPluginPackageName,
|
|
237
|
+
source: 'installed-package',
|
|
238
|
+
spec: openClawAgentVmPluginPackageSpec,
|
|
239
|
+
},
|
|
240
|
+
}),
|
|
241
|
+
openClawPackages,
|
|
242
|
+
warnings,
|
|
243
|
+
},
|
|
244
|
+
};
|
|
245
|
+
}
|
|
246
|
+
async function resolvePackageRootFromEntrypoint(packageName) {
|
|
247
|
+
let searchDirectory = path.dirname(fileURLToPath(import.meta.resolve(packageName)));
|
|
248
|
+
for (;;) {
|
|
249
|
+
const packageJsonPath = path.join(searchDirectory, 'package.json');
|
|
250
|
+
try {
|
|
251
|
+
// oxlint-disable-next-line no-await-in-loop -- upward package root discovery is intentionally sequential
|
|
252
|
+
const packageJson = await loadJsonConfigFile(packageJsonPath);
|
|
253
|
+
if (typeof packageJson === 'object' &&
|
|
254
|
+
packageJson !== null &&
|
|
255
|
+
'name' in packageJson &&
|
|
256
|
+
packageJson.name === packageName) {
|
|
257
|
+
return searchDirectory;
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
catch (error) {
|
|
261
|
+
if (typeof error !== 'object' ||
|
|
262
|
+
error === null ||
|
|
263
|
+
!('code' in error) ||
|
|
264
|
+
error.code !== 'ENOENT') {
|
|
265
|
+
throw error;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
const parentDirectory = path.dirname(searchDirectory);
|
|
269
|
+
if (parentDirectory === searchDirectory) {
|
|
270
|
+
throw new Error(`Unable to resolve ${packageName} package root.`);
|
|
271
|
+
}
|
|
272
|
+
searchDirectory = parentDirectory;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
export async function resolveManagedOpenClawAgentVmPluginPackageSpec() {
|
|
276
|
+
const packageRoot = await resolvePackageRootFromEntrypoint(managedOpenClawAgentVmPluginPackageName);
|
|
277
|
+
const packageJsonPath = path.join(packageRoot, 'package.json');
|
|
278
|
+
const packageJson = await loadJsonConfigFile(packageJsonPath);
|
|
279
|
+
if (typeof packageJson !== 'object' ||
|
|
280
|
+
packageJson === null ||
|
|
281
|
+
!('name' in packageJson) ||
|
|
282
|
+
packageJson.name !== managedOpenClawAgentVmPluginPackageName ||
|
|
283
|
+
!('version' in packageJson) ||
|
|
284
|
+
typeof packageJson.version !== 'string') {
|
|
285
|
+
throw new Error(`Expected ${packageJsonPath} to describe ${managedOpenClawAgentVmPluginPackageName} with a version.`);
|
|
286
|
+
}
|
|
287
|
+
return `${packageJson.name}@${packageJson.version}`;
|
|
130
288
|
}
|
|
131
289
|
async function resolveAgentVmPackageRoot() {
|
|
132
290
|
let searchDirectory = path.dirname(fileURLToPath(import.meta.url));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-image-dockerfile.js","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"managed-image-dockerfile.js","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export class ReportedCliError extends Error {
|
|
|
24
24
|
export async function runAgentVmCli(argv, io, dependencies = defaultCliDependencies) {
|
|
25
25
|
const cliVersion = await (dependencies.resolveCliVersion ?? resolveCliVersion)();
|
|
26
26
|
const result = await runSafely(createAgentVmApp(io, dependencies, cliVersion), [...argv]);
|
|
27
|
-
if (
|
|
27
|
+
if (!('error' in result)) {
|
|
28
28
|
return;
|
|
29
29
|
}
|
|
30
30
|
const outputStream = result.error.config.into === 'stderr' ? io.stderr : io.stdout;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-vm-entrypoint.js","sourceRoot":"","sources":["../../src/cli/agent-vm-entrypoint.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,SAAS,gCAAgC,CAAC,sBAA8B,YAAY;IACnF,IAAI,CAAC;QACJ,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC/F,OAAO;QACR,CAAC;QAED,MAAM,IAAI,KAAK,CACd,kBAAkB,mBAAmB,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAClG;YACC,KAAK,EAAE,KAAK;SACZ,CACD,CAAC;IACH,CAAC;AACF,CAAC;AAED,gCAAgC,EAAE,CAAC;AAEnC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EACN,sBAAsB,GAGtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,OAAO,gBAAiB,SAAQ,KAAK;CAAG;AAE9C,MAAM,CAAC,KAAK,UAAU,aAAa,CAClC,IAAuB,EACvB,EAAS,EACT,eAAgC,sBAAsB;IAEtD,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,EAAE,CAAC;IACjF,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,EAAE,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1F,IAAI,
|
|
1
|
+
{"version":3,"file":"agent-vm-entrypoint.js","sourceRoot":"","sources":["../../src/cli/agent-vm-entrypoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type BuildImageResult } from '@agent-vm/gondolin-adapter';
|
|
2
|
-
import { type ManagedImageRelease, type ManagedImageSource } from '../build/managed-image-dockerfile.js';
|
|
2
|
+
import { type GenerateManagedDockerfileResult, type ManagedImageRelease, type ManagedImageSource } from '../build/managed-image-dockerfile.js';
|
|
3
3
|
import { type CurrentImageFingerprints, type StaleImageEntry } from '../build/stale-image-cleaner.js';
|
|
4
4
|
import type { LoadedSystemConfig } from '../config/system-config.js';
|
|
5
5
|
import type { RunTaskFn, TaskOutput } from '../shared/run-task.js';
|
|
@@ -11,14 +11,12 @@ export interface BuildCommandDependencies {
|
|
|
11
11
|
}) => Promise<void>;
|
|
12
12
|
readonly buildGondolinImage?: (options: {
|
|
13
13
|
readonly buildConfigPath: string;
|
|
14
|
-
readonly systemCacheIdentifierPath: string;
|
|
15
14
|
readonly cacheDir: string;
|
|
16
15
|
readonly fullReset?: boolean;
|
|
17
16
|
readonly streamPreview?: TaskOutput;
|
|
18
17
|
}) => Promise<BuildImageResult>;
|
|
19
18
|
readonly computeGondolinFingerprint?: (options: {
|
|
20
19
|
readonly buildConfigPath: string;
|
|
21
|
-
readonly systemCacheIdentifierPath: string;
|
|
22
20
|
}) => Promise<string>;
|
|
23
21
|
readonly deleteStaleImageDirectories?: (entries: readonly StaleImageEntry[]) => Promise<void>;
|
|
24
22
|
readonly findPrunableImageDirectories?: (options: {
|
|
@@ -39,8 +37,8 @@ export interface BuildCommandDependencies {
|
|
|
39
37
|
readonly outputDirectory: string;
|
|
40
38
|
readonly overlayPath?: string | undefined;
|
|
41
39
|
readonly managedImageRelease: ManagedImageRelease;
|
|
42
|
-
readonly
|
|
43
|
-
}) => Promise<
|
|
40
|
+
readonly requiredOpenClawPackageNames?: readonly string[];
|
|
41
|
+
}) => Promise<GenerateManagedDockerfileResult>;
|
|
44
42
|
readonly resolveManagedImageRelease?: () => Promise<ManagedImageRelease>;
|
|
45
43
|
readonly syncBundledOpenClawPlugin?: (targetDir: string, profileName: string) => Promise<'created' | 'skipped'>;
|
|
46
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-command.d.ts","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"AAGA,OAAO,EAGN,KAAK,gBAAgB,EACrB,MAAM,4BAA4B,CAAC;AAQpC,OAAO,EAGN,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAGN,KAAK,wBAAwB,EAC7B,KAAK,eAAe,EACpB,MAAM,iCAAiC,CAAC;AAOzC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAkB,SAAS,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInF,MAAM,WAAW,wBAAwB;IACxC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE;QACrC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;QAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;KACpC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE;QACvC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;QACjC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"build-command.d.ts","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"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"}
|