npm - @agent-vm/agent-vm - Versions diffs - 0.0.56 → 0.0.58 - Mend

@agent-vm/agent-vm 0.0.56 → 0.0.58

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.

Files changed (172) hide show

package/dist/cli/backup-commands.js CHANGED Viewed

@@ -1,3 +1,5 @@
+import { resolveControllerGithubToken } from '../controller/controller-runtime-support.js';
+import { isOpenClawZoneGitConfigured } from '../controller/zone-git/zone-git-paths.js';
 import { createResolverFromSystemConfig, readZoneFlag, requireZone, writeJson, } from './agent-vm-cli-support.js';
 export async function runBackupCommand(options) {
     const backupSubcommand = options.restArguments[0];
@@ -21,12 +23,28 @@ export async function runBackupCommand(options) {
     });
     const backupManager = options.dependencies.createZoneBackupManager(backupEncryption);
     if (backupSubcommand === 'create') {
+        let zoneGit;
+        if (isOpenClawZoneGitConfigured(zone)) {
+            const githubToken = await resolveControllerGithubToken(options.systemConfig, secretResolver);
+            if (!githubToken) {
+                throw new Error(`zoneGit for zone '${zoneId}' requires host.githubToken so the controller can push without exposing credentials to VMs.`);
+            }
+            zoneGit = {
+                branch: zone.gateway.zoneGit.remote.branch,
+                githubToken,
+                remoteUrl: zone.gateway.zoneGit.remote.repoUrl,
+                runtimeDir: options.systemConfig.runtimeDir,
+                zoneFilesDir: zone.gateway.zoneFilesDir,
+                zoneId,
+            };
+        }
         writeJson(options.io, await backupManager.createBackup({
             backupDir,
             cacheDir: options.systemConfig.cacheDir,
             runtimeDir: options.systemConfig.runtimeDir,
             stateDir: zone.gateway.stateDir,
             ...(zone.gateway.type === 'openclaw' ? { zoneFilesDir: zone.gateway.zoneFilesDir } : {}),
+            ...(zoneGit ? { zoneGit } : {}),
             zoneId,
         }));
         return;

package/dist/cli/backup-commands.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"backup-commands.js","sourceRoot":"","sources":["../../src/cli/backup-commands.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"backup-commands.js","sourceRoot":"","sources":["../../src/cli/backup-commands.ts"],"names":[],"mappings":"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"}

package/dist/cli/build-command.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { type BuildImageResult } from '@agent-vm/gondolin-adapter';
-import { type ManagedImageRelease, type ManagedImageSource } from '../build/managed-image-dockerfile.js';
+import { type GenerateManagedDockerfileResult, type ManagedImageRelease, type ManagedImageSource } from '../build/managed-image-dockerfile.js';
 import { type CurrentImageFingerprints, type StaleImageEntry } from '../build/stale-image-cleaner.js';
 import type { LoadedSystemConfig } from '../config/system-config.js';
 import type { RunTaskFn, TaskOutput } from '../shared/run-task.js';
@@ -11,14 +11,12 @@ export interface BuildCommandDependencies {
     }) => Promise<void>;
     readonly buildGondolinImage?: (options: {
         readonly buildConfigPath: string;
-        readonly systemCacheIdentifierPath: string;
         readonly cacheDir: string;
         readonly fullReset?: boolean;
         readonly streamPreview?: TaskOutput;
     }) => Promise<BuildImageResult>;
     readonly computeGondolinFingerprint?: (options: {
         readonly buildConfigPath: string;
-        readonly systemCacheIdentifierPath: string;
     }) => Promise<string>;
     readonly deleteStaleImageDirectories?: (entries: readonly StaleImageEntry[]) => Promise<void>;
     readonly findPrunableImageDirectories?: (options: {
@@ -39,8 +37,8 @@ export interface BuildCommandDependencies {
         readonly outputDirectory: string;
         readonly overlayPath?: string | undefined;
         readonly managedImageRelease: ManagedImageRelease;
-        readonly requiredOpenClawPackages?: readonly string[];
-    }) => Promise<string>;
+        readonly requiredOpenClawPackageNames?: readonly string[];
+    }) => Promise<GenerateManagedDockerfileResult>;
     readonly resolveManagedImageRelease?: () => Promise<ManagedImageRelease>;
     readonly syncBundledOpenClawPlugin?: (targetDir: string, profileName: string) => Promise<'created' | 'skipped'>;
 }

package/dist/cli/build-command.d.ts.map CHANGED Viewed

	@@ -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,~~yBAAyB,EAAE,MAAM,CAAC;QAC3C,~~QAAQ,~~CAAC,QAAQ,~~EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAC7B,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;KACpC,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChC,QAAQ,CAAC,0BAA0B,CAAC,EAAE,CAAC,OAAO,EAAE;QAC/C,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;~~QACjC~~,~~QAAQ,CAAC,yBAAyB,EAAE,MAAM,CAAC;KAC3C,~~KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,QAAQ,CAAC,2BAA2B,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,eAAe,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9F,QAAQ,CAAC,4BAA4B,CAAC,EAAE,CAAC,OAAO,EAAE;QACjD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,mBAAmB,EAAE,wBAAwB,CAAC;QACvD,QAAQ,CAAC,gCAAgC,EAAE,MAAM,CAAC;KAClD,KAAK,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC,CAAC;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3E,QAAQ,CAAC,yBAAyB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3D,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/D,mEAAmE;IACnE,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxF,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC,OAAO,EAAE;QAC9C,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC1C,QAAQ,CAAC,iBAAiB,EAAE,SAAS,GAAG,QAAQ,CAAC;QACjD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;QACjC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;QACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;QAClD,QAAQ,CAAC,~~wBAAwB~~,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;~~KACtD~~,KAAK,OAAO,CAAC,~~MAAM,~~CAAC,CAAC;~~IACtB~~,QAAQ,CAAC,0BAA0B,CAAC,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACzE,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CACpC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,KACf,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;CACpC;~~AA0TD~~,wBAAsB,eAAe,CACpC,OAAO,EAAE;IACR,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;CAC1C,EACD,YAAY,GAAE,wBAA6B,GACzC,OAAO,CAAC,IAAI,CAAC,~~CA0Rf~~"}
1	+ {"version":3,"file":"build-command.d.ts","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"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"}

package/dist/cli/build-command.js CHANGED Viewed

@@ -41,7 +41,7 @@ function imageTargetDedupeKey(options) {
     return `${path.resolve(options.buildConfigPath)}${imageTargetKeySeparator}${options.fingerprint}`;
 }
 function imageTargetFingerprintKey(options) {
-    return `${path.resolve(options.buildConfigPath)}${imageTargetKeySeparator}${path.resolve(options.systemCacheIdentifierPath)}`;
+    return path.resolve(options.buildConfigPath);
 }
 function createEmptyCurrentImageFingerprints() {
     return {
@@ -200,13 +200,13 @@ async function resolveProjectRootFromDockerfile(dockerfilePath) {
         }
     }
 }
-async function resolveRequiredOpenClawPackagesForTarget(systemConfig, imageTarget, managedImageRelease) {
+async function resolveRequiredOpenClawPackagesForTarget(systemConfig, imageTarget) {
     if (imageTarget.family !== 'gateway' ||
         imageTarget.gatewayType !== 'openclaw' ||
         imageTarget.source?.base !== 'openclaw-gateway') {
         return [];
     }
-    const requiredPackageSpecs = new Set();
+    const requiredPackageNames = new Set();
     for (const zone of systemConfig.zones) {
         if (zone.gateway.type !== 'openclaw' || zone.gateway.imageProfile !== imageTarget.name) {
             continue;
@@ -216,17 +216,41 @@ async function resolveRequiredOpenClawPackagesForTarget(systemConfig, imageTarge
         const openClawConfig = openClawManagedPackageConfigSchema.parse(rawOpenClawConfig);
         for (const packageRule of openClawManagedPackageRules) {
             if (packageRule.isEnabled(openClawConfig)) {
-                requiredPackageSpecs.add(`${packageRule.packageName}@${managedImageRelease.openClawVersion}`);
+                requiredPackageNames.add(packageRule.packageName);
             }
         }
     }
-    return [...requiredPackageSpecs].toSorted();
+    return [...requiredPackageNames].toSorted();
+}
+function formatManagedDockerfilePlan(plan) {
+    const lines = [
+        `Managed image plan: ${plan.imageTargetFamily}/${plan.imageTargetName}`,
+        `base image: ${plan.baseImage.reference}`,
+        `source: ${plan.baseImage.source}`,
+        `generated Dockerfile: ${plan.dockerfilePath}`,
+    ];
+    if (plan.openClawAgentVmPluginPackage) {
+        lines.push(`agent-vm plugin: ${plan.openClawAgentVmPluginPackage.spec}`, `source: ${plan.openClawAgentVmPluginPackage.source}`);
+    }
+    if (plan.openClawPackages.length > 0) {
+        lines.push('OpenClaw packages:');
+        for (const packageEntry of plan.openClawPackages) {
+            lines.push(`  ${packageEntry.spec}`, `  source: ${packageEntry.source}`);
+        }
+    }
+    if (plan.warnings.length > 0) {
+        lines.push('warnings:');
+        for (const warning of plan.warnings) {
+            lines.push(`  ${warning.message}`);
+        }
+    }
+    return lines.join('\n');
 }
 export async function runBuildCommand(options, dependencies = {}) {
     const buildDockerImage = dependencies.buildDockerImage ?? buildDockerImageDefault;
     const buildGondolinImage = dependencies.buildGondolinImage ?? buildGondolinImageDefault;
     const computeGondolinFingerprint = dependencies.computeGondolinFingerprint ??
-        (async (fingerprintOptions) => await computeFingerprintFromConfigPath(fingerprintOptions.buildConfigPath, fingerprintOptions.systemCacheIdentifierPath));
+        (async (fingerprintOptions) => await computeFingerprintFromConfigPath(fingerprintOptions.buildConfigPath));
     const deleteStaleImageDirectories = dependencies.deleteStaleImageDirectories ?? deleteStaleImageDirectoriesDefault;
     const findPrunableImageDirectories = dependencies.findPrunableImageDirectories ?? findPrunableImageDirectoriesDefault;
     const resolveOciImageTag = dependencies.resolveOciImageTag ?? resolveOciImageTagFromConfig;
@@ -237,12 +261,10 @@ export async function runBuildCommand(options, dependencies = {}) {
     const generateManagedDockerfile = dependencies.generateManagedDockerfile ?? generateManagedDockerfileDefault;
     const resolveManagedImageRelease = dependencies.resolveManagedImageRelease ?? resolveManagedImageReleaseDefault;
     const syncBundledOpenClawPlugin = dependencies.syncBundledOpenClawPlugin ?? syncBundledOpenClawPluginBundle;
-    const systemCacheIdentifierPath = options.systemConfig.systemCacheIdentifierPath;
     await assertZigBuildPrerequisite(resolveRequiredZigVersion, resolveZigVersion);
     const gatewayImageTargets = Object.entries(options.systemConfig.imageProfiles.gateways).map(([profileName, profile]) => ({
         buildConfigPath: profile.buildConfig,
         cacheDirectory: path.join(options.systemConfig.cacheDir, 'gateway-images', profileName),
-        systemCacheIdentifierPath,
         dockerfile: profile.dockerfile,
         family: 'gateway',
         gatewayType: profile.type,
@@ -252,7 +274,6 @@ export async function runBuildCommand(options, dependencies = {}) {
     const toolVmImageTargets = Object.entries(options.systemConfig.imageProfiles.toolVms).map(([profileName, profile]) => ({
         buildConfigPath: profile.buildConfig,
         cacheDirectory: path.join(options.systemConfig.cacheDir, 'tool-vm-images', profileName),
-        systemCacheIdentifierPath,
         dockerfile: profile.dockerfile,
         family: 'toolVm',
         name: profileName,
@@ -271,22 +292,25 @@ export async function runBuildCommand(options, dependencies = {}) {
             throw new Error(`Missing resolved Docker image tag for image profile '${imageTarget.name}'.`);
         }
         let dockerfilePath = imageTarget.dockerfile;
+        let managedDockerfilePlan;
         if (imageTarget.source) {
             if (!managedImageRelease) {
                 throw new Error('Missing managed image release for managed image build.');
             }
             // oxlint-disable-next-line no-await-in-loop -- package detection is profile-local and low-volume
-            const requiredOpenClawPackages = await resolveRequiredOpenClawPackagesForTarget(options.systemConfig, imageTarget, managedImageRelease);
+            const requiredOpenClawPackageNames = await resolveRequiredOpenClawPackagesForTarget(options.systemConfig, imageTarget);
             // oxlint-disable-next-line no-await-in-loop -- each generated Docker context belongs to one image target
-            dockerfilePath = await generateManagedDockerfile({
+            const managedDockerfile = await generateManagedDockerfile({
                 base: imageTarget.source.base,
                 imageTargetFamily: imageTarget.family,
                 imageTargetName: imageTarget.name,
                 outputDirectory: path.join(options.systemConfig.cacheDir, 'generated-dockerfiles', imageTarget.family, imageTarget.name),
                 ...(imageTarget.source.overlay ? { overlayPath: imageTarget.source.overlay } : {}),
                 managedImageRelease,
-                requiredOpenClawPackages,
+                requiredOpenClawPackageNames,
             });
+            dockerfilePath = managedDockerfile.dockerfilePath;
+            managedDockerfilePlan = managedDockerfile.plan;
         }
         if (!dockerfilePath) {
             throw new Error(`Missing Dockerfile path for image profile '${imageTarget.name}'.`);
@@ -305,6 +329,9 @@ export async function runBuildCommand(options, dependencies = {}) {
         }
         // oxlint-disable-next-line no-await-in-loop -- docker builds intentionally run one at a time to keep task output readable
         await runTaskStep(`Docker: ${imageTarget.family}/${imageTarget.name} (${imageTag})`, async (taskContext) => {
+            if (managedDockerfilePlan) {
+                taskContext?.setOutput({ message: formatManagedDockerfilePlan(managedDockerfilePlan) });
+            }
             taskContext?.setStatus('docker build');
             await buildDockerImage({
                 dockerfilePath,
@@ -324,14 +351,12 @@ export async function runBuildCommand(options, dependencies = {}) {
     for (const imageTarget of imageTargets) {
         const fingerprintInputKey = imageTargetFingerprintKey({
             buildConfigPath: imageTarget.buildConfigPath,
-            systemCacheIdentifierPath: imageTarget.systemCacheIdentifierPath,
         });
         let fingerprint = fingerprintByInputKey.get(fingerprintInputKey);
         if (fingerprint === undefined) {
             // oxlint-disable-next-line no-await-in-loop -- fingerprint errors should identify the matching profile path
             fingerprint = await computeGondolinFingerprint({
                 buildConfigPath: imageTarget.buildConfigPath,
-                systemCacheIdentifierPath: imageTarget.systemCacheIdentifierPath,
             });
             fingerprintByInputKey.set(fingerprintInputKey, fingerprint);
         }
@@ -383,7 +408,6 @@ export async function runBuildCommand(options, dependencies = {}) {
             try {
                 result = await buildGondolinImage({
                     buildConfigPath: targetPlan.imageTarget.buildConfigPath,
-                    systemCacheIdentifierPath: targetPlan.imageTarget.systemCacheIdentifierPath,
                     cacheDir: targetPlan.imageTarget.cacheDirectory,
                     ...(targetPlan.shouldResetGondolinCache ? { fullReset: true } : {}),
                     ...(taskContext?.interactive === true && taskContext.streamPreview

package/dist/cli/build-command.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-command.js","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"build-command.js","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"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"}

package/dist/cli/cache-commands.d.ts CHANGED Viewed

@@ -10,7 +10,7 @@ interface CacheEntry {
 }
 type ImageProfileFamily = 'gateway' | 'toolVm';
 export interface CacheCommandDependencies {
-    readonly computeFingerprintFromConfigPath?: (buildConfigPath: string, systemCacheIdentifierPath: string) => Promise<string>;
+    readonly computeFingerprintFromConfigPath?: (buildConfigPath: string) => Promise<string>;
     readonly deleteStaleImageDirectories?: (entries: readonly StaleImageEntry[]) => Promise<void>;
     readonly findStaleImageDirectories?: (options: {
         readonly cacheDir: string;

package/dist/cli/cache-commands.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
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	+ {"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,CAAC,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACzF,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;AAuFD,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"}

package/dist/cli/cache-commands.js CHANGED Viewed

@@ -38,15 +38,14 @@ async function listCacheEntries(cacheDir, family, profileName, currentFingerprin
 }
 async function resolveCurrentFingerprints(systemConfig, dependencies) {
     const computeFingerprint = dependencies.computeFingerprintFromConfigPath ?? computeFingerprintFromConfigPath;
-    const systemCacheIdentifierPath = systemConfig.systemCacheIdentifierPath;
     return {
         gateways: recordFromEntries(await Promise.all(Object.entries(systemConfig.imageProfiles.gateways).map(async ([profileName, profile]) => [
             profileName,
-            await computeFingerprint(profile.buildConfig, systemCacheIdentifierPath),
+            await computeFingerprint(profile.buildConfig),
         ]))),
         toolVms: recordFromEntries(await Promise.all(Object.entries(systemConfig.imageProfiles.toolVms).map(async ([profileName, profile]) => [
             profileName,
-            await computeFingerprint(profile.buildConfig, systemCacheIdentifierPath),
+            await computeFingerprint(profile.buildConfig),
         ]))),
     };
 }

package/dist/cli/cache-commands.js.map CHANGED Viewed

	@@ -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,GAG7D,MAAM,iCAAiC,CAAC;AAezC,SAAS,iBAAiB,CACzB,OAA+C;IAE/C,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAA2B,CAAC;AAC9D,CAAC;~~AAoBD~~,MAAM,UAAU,8BAA8B,CAAC,MAA0B;IACxE,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC;AACnE,CAAC;AAED,SAAS,WAAW,CAAC,SAAiB;IACrC,IAAI,SAAS,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC;QAC7B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;IAC5C,CAAC;IAED,IAAI,SAAS,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC;QACpC,OAAO,GAAG,CAAC,SAAS,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IACtD,CAAC;IAED,OAAO,GAAG,CAAC,SAAS,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC9B,QAAgB,EAChB,MAA0B,EAC1B,WAAmB,EACnB,kBAA0B;IAE1B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,8BAA8B,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,CAAC;IAC/F,IAAI,OAA4D,CAAC;IACjE,IAAI,CAAC;QACJ,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtF,OAAO,EAAE,CAAC;QACX,CAAC;QACD,MAAM,KAAK,CAAC;IACb,CAAC;IAED,OAAO,OAAO;SACZ,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;SACtC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAChB,OAAO,EAAE,KAAK,CAAC,IAAI,KAAK,kBAAkB;QAC1C,WAAW,EAAE,KAAK,CAAC,IAAI;KACvB,CAAC,CAAC,CAAC;AACN,CAAC;AAED,KAAK,UAAU,0BAA0B,CACxC,YAAgC,EAChC,YAAgF;IAEhF,MAAM,kBAAkB,GACvB,YAAY,CAAC,gCAAgC,IAAI,gCAAgC,CAAC;~~IACnF~~,~~MAAM,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;IAEzE,~~OAAO;QACN,QAAQ,EAAE,iBAAiB,CAC1B,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;YACzF,WAAW;YACX,MAAM,kBAAkB,CAAC,OAAO,CAAC,WAAW,~~EAAE,yBAAyB,~~CAAC;~~SACxE~~,CAAC,CACF,CACD;QACD,OAAO,EAAE,iBAAiB,CACzB,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;YACxF,WAAW;YACX,MAAM,kBAAkB,CAAC,OAAO,CAAC,WAAW,~~EAAE,yBAAyB,~~CAAC;~~SACxE~~,CAAC,CACF,CACD;KACD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,OAKnC;IACA,OAAO,iBAAiB,CACvB,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC;QAC5F,WAAW;QACX,MAAM,OAAO,CAAC,WAAW,CACxB,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,MAAM,EACd,WAAW,EACX,kBAAkB,CAClB;KACD,CAAC,CACF,CACD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACpC,OAIC,EACD,EAAkB,EAClB,eAAyC,EAAE;IAE3C,MAAM,mBAAmB,GAAG,MAAM,0BAA0B,CAAC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IAEjG,IAAI,OAAO,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;QACnC,MAAM,WAAW,GAAG,YAAY,CAAC,gBAAgB,IAAI,gBAAgB,CAAC;QACtE,EAAE,CAAC,MAAM,CAAC,KAAK,CACd,GAAG,IAAI,CAAC,SAAS,CAChB;YACC,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,QAAQ;YACvC,mBAAmB;YACnB,QAAQ,EAAE,MAAM,oBAAoB,CAAC;gBACpC,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,QAAQ;gBACvC,mBAAmB,EAAE,mBAAmB,CAAC,QAAQ;gBACjD,MAAM,EAAE,SAAS;gBACjB,WAAW;aACX,CAAC;YACF,OAAO,EAAE,MAAM,oBAAoB,CAAC;gBACnC,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,QAAQ;gBACvC,mBAAmB,EAAE,mBAAmB,CAAC,OAAO;gBAChD,MAAM,EAAE,QAAQ;gBAChB,WAAW;aACX,CAAC;SACF,EACD,IAAI,EACJ,CAAC,CACD,IAAI,CACL,CAAC;QACF,OAAO;IACR,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;QACpC,MAAM,oBAAoB,GACzB,YAAY,CAAC,yBAAyB,IAAI,gCAAgC,CAAC;QAC5E,MAAM,YAAY,GAAG,MAAM,oBAAoB,CAAC;YAC/C,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,QAAQ;YACvC,mBAAmB;SACnB,CAAC,CAAC;QAEH,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACpD,OAAO;QACR,CAAC;QAED,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,YAAY,CAAC,MAAM,oBAAoB,CAAC,CAAC;QACpE,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YAClC,EAAE,CAAC,MAAM,CAAC,KAAK,CACd,KAAK,8BAA8B,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,KAAK,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CACjI,CAAC;QACH,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACtB,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,sEAAsE,CAAC,CAAC;YACxF,OAAO;QACR,CAAC;QAED,MAAM,sBAAsB,GAC3B,YAAY,CAAC,2BAA2B,IAAI,kCAAkC,CAAC;QAChF,MAAM,sBAAsB,CAAC,YAAY,CAAC,CAAC;QAC3C,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,YAAY,CAAC,MAAM,oBAAoB,CAAC,CAAC;QAC5E,OAAO;IACR,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC;AACtE,CAAC"}
1	+ {"version":3,"file":"cache-commands.js","sourceRoot":"","sources":["../../src/cli/cache-commands.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/controller-definition.d.ts CHANGED Viewed

@@ -37,14 +37,14 @@ export declare function createControllerSubcommands(io: CliIo, dependencies: Cli
             };
         };
     } | {
-        command: "status";
+        command: "logs";
         args: {
             purge?: boolean;
             zone?: string | undefined;
             config: string | undefined;
         };
     } | {
-        command: "logs";
+        command: "status";
         args: {
             purge?: boolean;
             zone?: string | undefined;
@@ -115,14 +115,14 @@ export declare function createControllerSubcommands(io: CliIo, dependencies: Cli
         };
     };
 } | {
-    command: "status";
+    command: "logs";
     args: {
         purge?: boolean;
         zone?: string | undefined;
         config: string | undefined;
     };
 } | {
-    command: "logs";
+    command: "status";
     args: {
         purge?: boolean;
         zone?: string | undefined;
@@ -176,10 +176,10 @@ export declare function createControllerSubcommands(io: CliIo, dependencies: Cli
         value: Promise<void>;
     };
 } | {
-    command: "status";
+    command: "logs";
     value: Promise<void>;
 } | {
-    command: "logs";
+    command: "status";
     value: Promise<void>;
 } | {
     command: "credentials";
@@ -216,10 +216,10 @@ export declare function createControllerSubcommands(io: CliIo, dependencies: Cli
             value: Promise<void>;
         };
     } | {
-        command: "status";
+        command: "logs";
         value: Promise<void>;
     } | {
-        command: "logs";
+        command: "status";
         value: Promise<void>;
     } | {
         command: "credentials";

package/dist/cli/commands/controller-definition.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"controller-definition.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/controller-definition.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,KAAK,EAAe,MAAM,4BAA4B,CAAC;AAoD3F,wBAAsB,oBAAoB,CACzC,YAAY,EAAE,kBAAkB,EAChC,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC,~~CAsBlB~~;AAmBD,wBAAgB,2BAA2B,CAAC,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+KnF"}
1	+ {"version":3,"file":"controller-definition.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/controller-definition.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,KAAK,EAAe,MAAM,4BAA4B,CAAC;AAoD3F,wBAAsB,oBAAoB,CACzC,YAAY,EAAE,kBAAkB,EAChC,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC,CAqBlB;AAmBD,wBAAgB,2BAA2B,CAAC,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+KnF"}

package/dist/cli/commands/controller-definition.js CHANGED Viewed

@@ -42,7 +42,7 @@ export async function isGatewayImageCached(systemConfig, zoneId) {
     if (!gatewayImageProfile) {
         throw new Error(`Gateway image profile '${zone.gateway.imageProfile}' is not configured.`);
     }
-    const gatewayFingerprint = await computeFingerprintFromConfigPath(gatewayImageProfile.buildConfig, systemConfig.systemCacheIdentifierPath);
+    const gatewayFingerprint = await computeFingerprintFromConfigPath(gatewayImageProfile.buildConfig);
     const gatewayCachePath = path.join(systemConfig.cacheDir, 'gateway-images', zone.gateway.imageProfile, gatewayFingerprint);
     try {
         await fs.access(path.join(gatewayCachePath, 'manifest.json'));

package/dist/cli/commands/controller-definition.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"controller-definition.js","sourceRoot":"","sources":["../../../src/cli/commands/controller-definition.ts"],"names":[],"mappings":"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~~EAC~~/B,~~YAAY,~~CAAC~~,yBAAyB,CACtC,CAAC~~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"}
1	+ {"version":3,"file":"controller-definition.js","sourceRoot":"","sources":["../../../src/cli/commands/controller-definition.ts"],"names":[],"mappings":"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"}