@agent-vm/agent-vm 0.0.31 → 0.0.33

package/dist/backup/backup-create-operation.d.ts

@@ -1,9 +1,11 @@
 import type { BackupEncryption, BackupResult } from './backup-manager.js';
 export declare function createEncryptedBackup(options: {
     readonly backupDir: string;
+    readonly cacheDir: string;
     readonly encryption: BackupEncryption;
+    readonly runtimeDir: string;
     readonly stateDir: string;
-    readonly workspaceDir: string;
+    readonly zoneFilesDir?: string;
     readonly zoneId: string;
 }): Promise<BackupResult>;
 //# sourceMappingURL=backup-create-operation.d.ts.map

package/dist/backup/backup-create-operation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backup-create-operation.d.ts","sourceRoot":"","sources":["../../src/backup/backup-create-operation.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAI1E,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACpD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,YAAY,CAAC,CAiDxB"}
+{"version":3,"file":"backup-create-operation.d.ts","sourceRoot":"","sources":["../../src/backup/backup-create-operation.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAI1E,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACpD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,YAAY,CAAC,CAqDxB"}

package/dist/backup/backup-create-operation.js

@@ -6,6 +6,12 @@ import { promisify } from 'node:util';
 import { buildBackupPaths } from './backup-archive-layout.js';
 const execFileAsync = promisify(execFile);
 export async function createEncryptedBackup(options) {
+    assertRuntimeDirOutsideBackupInputs({
+        cacheDir: options.cacheDir,
+        runtimeDir: options.runtimeDir,
+        stateDir: options.stateDir,
+        ...(options.zoneFilesDir !== undefined ? { zoneFilesDir: options.zoneFilesDir } : {}),
+    });
     const timestamp = new Date().toISOString().replace(/[:.]/gu, '-');
     const backupPaths = buildBackupPaths({
         backupDir: options.backupDir,
@@ -16,25 +22,22 @@ export async function createEncryptedBackup(options) {
     const stagingDirectory = await fs.mkdtemp(path.join(os.tmpdir(), 'backup-stage-'));
     try {
         await execFileAsync('cp', ['-a', options.stateDir, path.join(stagingDirectory, 'state')]);
-        await execFileAsync('cp', [
-            '-a',
-            options.workspaceDir,
-            path.join(stagingDirectory, 'workspace'),
-        ]);
+        if (options.zoneFilesDir !== undefined) {
+            await execFileAsync('cp', [
+                '-a',
+                options.zoneFilesDir,
+                path.join(stagingDirectory, 'zone-files'),
+            ]);
+        }
         await fs.writeFile(path.join(stagingDirectory, 'manifest.json'), JSON.stringify({
             createdAt: new Date().toISOString(),
             timestamp,
             zoneId: options.zoneId,
         }));
-        await execFileAsync('tar', [
-            'cf',
-            backupPaths.tarPath,
-            '-C',
-            stagingDirectory,
-            'state',
-            'workspace',
-            'manifest.json',
-        ]);
+        const tarEntries = options.zoneFilesDir !== undefined
+            ? ['state', 'zone-files', 'manifest.json']
+            : ['state', 'manifest.json'];
+        await execFileAsync('tar', ['cf', backupPaths.tarPath, '-C', stagingDirectory, ...tarEntries]);
     }
     finally {
         await fs.rm(stagingDirectory, { recursive: true, force: true });
@@ -47,4 +50,36 @@ export async function createEncryptedBackup(options) {
         zoneId: options.zoneId,
     };
 }
+function isSameOrDescendantPath(childPath, parentPath) {
+    const relativePath = path.relative(path.resolve(parentPath), path.resolve(childPath));
+    return relativePath === '' || (!relativePath.startsWith('..') && !path.isAbsolute(relativePath));
+}
+function assertNoPathOverlap(options) {
+    if (isSameOrDescendantPath(options.firstPath, options.secondPath) ||
+        isSameOrDescendantPath(options.secondPath, options.firstPath)) {
+        throw new Error(`${options.firstLabel} (${path.resolve(options.firstPath)}) must not overlap ${options.secondLabel} (${path.resolve(options.secondPath)}).`);
+    }
+}
+function assertRuntimeDirOutsideBackupInputs(options) {
+    assertNoPathOverlap({
+        firstLabel: 'runtimeDir',
+        firstPath: options.runtimeDir,
+        secondLabel: 'stateDir',
+        secondPath: options.stateDir,
+    });
+    assertNoPathOverlap({
+        firstLabel: 'runtimeDir',
+        firstPath: options.runtimeDir,
+        secondLabel: 'cacheDir',
+        secondPath: options.cacheDir,
+    });
+    if (options.zoneFilesDir !== undefined) {
+        assertNoPathOverlap({
+            firstLabel: 'runtimeDir',
+            firstPath: options.runtimeDir,
+            secondLabel: 'zoneFilesDir',
+            secondPath: options.zoneFilesDir,
+        });
+    }
+}
 //# sourceMappingURL=backup-create-operation.js.map

package/dist/backup/backup-create-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"backup-create-operation.js","sourceRoot":"","sources":["../../src/backup/backup-create-operation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAG9D,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAM3C;IACA,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,gBAAgB,CAAC;QACpC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,SAAS;QACT,MAAM,EAAE,OAAO,CAAC,MAAM;KACtB,CAAC,CAAC;IAEH,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvD,MAAM,gBAAgB,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;IACnF,IAAI,CAAC;QACJ,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1F,MAAM,aAAa,CAAC,IAAI,EAAE;YACzB,IAAI;YACJ,OAAO,CAAC,YAAY;YACpB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC;SACxC,CAAC,CAAC;QAEH,MAAM,EAAE,CAAC,SAAS,CACjB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,EAC5C,IAAI,CAAC,SAAS,CAAC;YACd,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,SAAS;YACT,MAAM,EAAE,OAAO,CAAC,MAAM;SACtB,CAAC,CACF,CAAC;QAEF,MAAM,aAAa,CAAC,KAAK,EAAE;YAC1B,IAAI;YACJ,WAAW,CAAC,OAAO;YACnB,IAAI;YACJ,gBAAgB;YAChB,OAAO;YACP,WAAW;YACX,eAAe;SACf,CAAC,CAAC;IACJ,CAAC;YAAS,CAAC;QACV,MAAM,EAAE,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACjF,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAErC,OAAO;QACN,UAAU,EAAE,WAAW,CAAC,aAAa;QACrC,SAAS;QACT,MAAM,EAAE,OAAO,CAAC,MAAM;KACtB,CAAC;AACH,CAAC"}
+{"version":3,"file":"backup-create-operation.js","sourceRoot":"","sources":["../../src/backup/backup-create-operation.ts"],"names":[],"mappings":"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"}

package/dist/backup/backup-manager.d.ts

@@ -9,20 +9,22 @@ export interface BackupResult {
 }
 export interface BackupRestoreResult {
     readonly stateDir: string;
-    readonly workspaceDir: string;
+    readonly zoneFilesDir?: string;
     readonly zoneId: string;
 }
 export interface ZoneBackupManager {
     createBackup(options: {
         readonly zoneId: string;
+        readonly cacheDir: string;
         readonly stateDir: string;
-        readonly workspaceDir: string;
+        readonly runtimeDir: string;
+        readonly zoneFilesDir?: string;
         readonly backupDir: string;
     }): Promise<BackupResult>;
     restoreBackup(options: {
         readonly backupPath: string;
         readonly stateDir: string;
-        readonly workspaceDir: string;
+        readonly zoneFilesDir?: string;
     }): Promise<BackupRestoreResult>;
     listBackups(options: {
         readonly backupDir: string;
@@ -31,12 +33,12 @@ export interface ZoneBackupManager {
 }
 /**
  * Archive layout inside the tar:
- *   state/      — contents of stateDir
- *   workspace/  — contents of workspaceDir
+ *   state/       — contents of stateDir
+ *   zone-files/  — contents of zoneFilesDir, when the gateway has durable zone files
  *   manifest.json
  *
  * This fixed layout decouples archive structure from host paths, so stateDir
- * and workspaceDir can live under completely different parents on restore.
+ * and zoneFilesDir can live under completely different parents on restore.
  */
 export declare function createZoneBackupManager(encryption: BackupEncryption): ZoneBackupManager;
 //# sourceMappingURL=backup-manager.d.ts.map

package/dist/backup/backup-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backup-manager.d.ts","sourceRoot":"","sources":["../../src/backup/backup-manager.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3E,QAAQ,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IACjC,YAAY,CAAC,OAAO,EAAE;QACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAE1B,aAAa,CAAC,OAAO,EAAE;QACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;KAC9B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEjC,WAAW,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,EAAE,CAAC;CAC/F;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,gBAAgB,GAAG,iBAAiB,CAuBvF"}
+{"version":3,"file":"backup-manager.d.ts","sourceRoot":"","sources":["../../src/backup/backup-manager.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3E,QAAQ,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IACjC,YAAY,CAAC,OAAO,EAAE;QACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAE1B,aAAa,CAAC,OAAO,EAAE;QACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;KAC/B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEjC,WAAW,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,EAAE,CAAC;CAC/F;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,gBAAgB,GAAG,iBAAiB,CAyBvF"}

package/dist/backup/backup-manager.js

@@ -3,12 +3,12 @@ import { createEncryptedBackup } from './backup-create-operation.js';
 import { restoreEncryptedBackup } from './backup-restore-operation.js';
 /**
  * Archive layout inside the tar:
- *   state/      — contents of stateDir
- *   workspace/  — contents of workspaceDir
+ *   state/       — contents of stateDir
+ *   zone-files/  — contents of zoneFilesDir, when the gateway has durable zone files
  *   manifest.json
  *
  * This fixed layout decouples archive structure from host paths, so stateDir
- * and workspaceDir can live under completely different parents on restore.
+ * and zoneFilesDir can live under completely different parents on restore.
  */
 export function createZoneBackupManager(encryption) {
     return {
@@ -16,8 +16,10 @@ export function createZoneBackupManager(encryption) {
             return await createEncryptedBackup({
                 encryption,
                 backupDir: options.backupDir,
+                cacheDir: options.cacheDir,
+                runtimeDir: options.runtimeDir,
                 stateDir: options.stateDir,
-                workspaceDir: options.workspaceDir,
+                ...(options.zoneFilesDir !== undefined ? { zoneFilesDir: options.zoneFilesDir } : {}),
                 zoneId: options.zoneId,
             });
         },
@@ -26,7 +28,7 @@ export function createZoneBackupManager(encryption) {
                 encryption,
                 backupPath: options.backupPath,
                 stateDir: options.stateDir,
-                workspaceDir: options.workspaceDir,
+                ...(options.zoneFilesDir !== undefined ? { zoneFilesDir: options.zoneFilesDir } : {}),
             });
         },
         listBackups(options) {

package/dist/backup/backup-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"backup-manager.js","sourceRoot":"","sources":["../../src/backup/backup-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAoCvE;;;;;;;;GAQG;AACH,MAAM,UAAU,uBAAuB,CAAC,UAA4B;IACnE,OAAO;QACN,KAAK,CAAC,YAAY,CAAC,OAAO;YACzB,OAAO,MAAM,qBAAqB,CAAC;gBAClC,UAAU;gBACV,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,MAAM,EAAE,OAAO,CAAC,MAAM;aACtB,CAAC,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,OAAO;YAC1B,OAAO,MAAM,sBAAsB,CAAC;gBACnC,UAAU;gBACV,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,YAAY,EAAE,OAAO,CAAC,YAAY;aAClC,CAAC,CAAC;QACJ,CAAC;QACD,WAAW,CAAC,OAAO;YAClB,OAAO,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;KACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"backup-manager.js","sourceRoot":"","sources":["../../src/backup/backup-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAsCvE;;;;;;;;GAQG;AACH,MAAM,UAAU,uBAAuB,CAAC,UAA4B;IACnE,OAAO;QACN,KAAK,CAAC,YAAY,CAAC,OAAO;YACzB,OAAO,MAAM,qBAAqB,CAAC;gBAClC,UAAU;gBACV,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,GAAG,CAAC,OAAO,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrF,MAAM,EAAE,OAAO,CAAC,MAAM;aACtB,CAAC,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,OAAO;YAC1B,OAAO,MAAM,sBAAsB,CAAC;gBACnC,UAAU;gBACV,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,GAAG,CAAC,OAAO,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACrF,CAAC,CAAC;QACJ,CAAC;QACD,WAAW,CAAC,OAAO;YAClB,OAAO,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;KACD,CAAC;AACH,CAAC"}

package/dist/backup/backup-restore-operation.d.ts

@@ -3,6 +3,6 @@ export declare function restoreEncryptedBackup(options: {
     readonly backupPath: string;
     readonly encryption: BackupEncryption;
     readonly stateDir: string;
-    readonly workspaceDir: string;
+    readonly zoneFilesDir?: string;
 }): Promise<BackupRestoreResult>;
 //# sourceMappingURL=backup-restore-operation.d.ts.map

package/dist/backup/backup-restore-operation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backup-restore-operation.d.ts","sourceRoot":"","sources":["../../src/backup/backup-restore-operation.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAqCjF,wBAAsB,sBAAsB,CAAC,OAAO,EAAE;IACrD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC9B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAsB/B"}
+{"version":3,"file":"backup-restore-operation.d.ts","sourceRoot":"","sources":["../../src/backup/backup-restore-operation.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AA0CjF,wBAAsB,sBAAsB,CAAC,OAAO,EAAE;IACrD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAC/B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAwB/B"}

package/dist/backup/backup-restore-operation.js

@@ -22,14 +22,16 @@ async function copyExtractedDirectoryContents(sourceDirectory, targetDirectory)
 }
 async function readZoneIdFromManifest(extractDirectory) {
     const manifestPath = path.join(extractDirectory, 'manifest.json');
-    try {
-        const rawManifest = await fs.readFile(manifestPath, 'utf8');
-        const manifest = JSON.parse(rawManifest);
-        return manifest.zoneId ?? 'unknown';
-    }
-    catch {
-        return 'unknown';
+    const rawManifest = await fs.readFile(manifestPath, 'utf8');
+    const manifest = JSON.parse(rawManifest);
+    if (typeof manifest !== 'object' ||
+        manifest === null ||
+        !('zoneId' in manifest) ||
+        typeof manifest.zoneId !== 'string' ||
+        manifest.zoneId.length === 0) {
+        throw new Error(`Backup manifest at ${manifestPath} must contain a non-empty zoneId.`);
     }
+    return manifest.zoneId;
 }
 export async function restoreEncryptedBackup(options) {
     const decryptedTarPath = `${options.backupPath}.decrypted.tar`;
@@ -38,10 +40,12 @@ export async function restoreEncryptedBackup(options) {
     try {
         await execFileAsync('tar', ['xf', decryptedTarPath, '-C', extractDirectory]);
         await copyExtractedDirectoryContents(path.join(extractDirectory, 'state'), options.stateDir);
-        await copyExtractedDirectoryContents(path.join(extractDirectory, 'workspace'), options.workspaceDir);
+        if (options.zoneFilesDir !== undefined) {
+            await copyExtractedDirectoryContents(path.join(extractDirectory, 'zone-files'), options.zoneFilesDir);
+        }
         return {
             stateDir: options.stateDir,
-            workspaceDir: options.workspaceDir,
+            ...(options.zoneFilesDir !== undefined ? { zoneFilesDir: options.zoneFilesDir } : {}),
             zoneId: await readZoneIdFromManifest(extractDirectory),
         };
     }

package/dist/backup/backup-restore-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"backup-restore-operation.js","sourceRoot":"","sources":["../../src/backup/backup-restore-operation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAItC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,KAAK,UAAU,8BAA8B,CAC5C,eAAuB,EACvB,eAAuB;IAEvB,IAAI,CAAC;QACJ,MAAM,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACR,OAAO;IACR,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAClD,MAAM,OAAO,CAAC,GAAG,CAChB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;QAC/B,MAAM,aAAa,CAAC,IAAI,EAAE;YACzB,IAAI;YACJ,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC;YACrC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC;SACrC,CAAC,CAAC;IACJ,CAAC,CAAC,CACF,CAAC;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,gBAAwB;IAC7D,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;IAClE,IAAI,CAAC;QACJ,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAiC,CAAC;QACzE,OAAO,QAAQ,CAAC,MAAM,IAAI,SAAS,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,SAAS,CAAC;IAClB,CAAC;AACF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,OAK5C;IACA,MAAM,gBAAgB,GAAG,GAAG,OAAO,CAAC,UAAU,gBAAgB,CAAC;IAC/D,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAEvE,MAAM,gBAAgB,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACrF,IAAI,CAAC;QACJ,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAC7E,MAAM,8BAA8B,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7F,MAAM,8BAA8B,CACnC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC,EACxC,OAAO,CAAC,YAAY,CACpB,CAAC;QAEF,OAAO;YACN,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,MAAM,EAAE,MAAM,sBAAsB,CAAC,gBAAgB,CAAC;SACtD,CAAC;IACH,CAAC;YAAS,CAAC;QACV,MAAM,EAAE,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACnC,CAAC;AACF,CAAC"}
+{"version":3,"file":"backup-restore-operation.js","sourceRoot":"","sources":["../../src/backup/backup-restore-operation.ts"],"names":[],"mappings":"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"}

package/dist/build/docker-image-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docker-image-builder.d.ts","sourceRoot":"","sources":["../../src/build/docker-image-builder.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;CACpC;AAED,MAAM,WAAW,8BAA8B;IAC9C,QAAQ,CAAC,cAAc,CAAC,EAAE,CACzB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,oBAAoB,KACzB,OAAO,CAAC;QACZ,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,IAAI,CAAC,CAAC;CACV;AAED,MAAM,WAAW,uBAAuB;IACvC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;CACpC;AAsBD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,uBAAuB,EAChC,YAAY,GAAE,8BAAmC,GAC/C,OAAO,CAAC,IAAI,CAAC,CAyBf"}
+{"version":3,"file":"docker-image-builder.d.ts","sourceRoot":"","sources":["../../src/build/docker-image-builder.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;CACpC;AAED,MAAM,WAAW,8BAA8B;IAC9C,QAAQ,CAAC,cAAc,CAAC,EAAE,CACzB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,oBAAoB,KACzB,OAAO,CAAC;QACZ,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,IAAI,CAAC,CAAC;CACV;AAED,MAAM,WAAW,uBAAuB;IACvC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;CACpC;AA+BD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,uBAAuB,EAChC,YAAY,GAAE,8BAAmC,GAC/C,OAAO,CAAC,IAAI,CAAC,CAyBf"}

package/dist/build/docker-image-builder.js

@@ -1,17 +1,23 @@
 import path from 'node:path';
+import { createInterface as createReadlineInterface } from 'node:readline';
 import { execa } from 'execa';
+function pipeStreamAsLines(stream, sink) {
+    if (!stream) {
+        return;
+    }
+    const lineReader = createReadlineInterface({ input: stream });
+    lineReader.on('line', (line) => {
+        sink.write(`${line}\n`);
+    });
+}
 async function executeDockerCommand(command, args, options) {
     if (!options.streamPreview) {
         await execa(command, args, { stdio: 'inherit' });
         return;
     }
     const child = execa(command, args, { stdio: ['inherit', 'pipe', 'pipe'] });
-    child.stdout?.on('data', (chunk) => {
-        options.streamPreview?.write(chunk);
-    });
-    child.stderr?.on('data', (chunk) => {
-        options.streamPreview?.write(chunk);
-    });
+    pipeStreamAsLines(child.stdout, options.streamPreview);
+    pipeStreamAsLines(child.stderr, options.streamPreview);
     await child;
 }
 export async function buildDockerImage(options, dependencies = {}) {

package/dist/build/docker-image-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker-image-builder.js","sourceRoot":"","sources":["../../src/build/docker-image-builder.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAwB9B,KAAK,UAAU,oBAAoB,CAClC,OAAe,EACf,IAAuB,EACvB,OAA6B;IAE7B,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC5B,MAAM,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACjD,OAAO;IACR,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAC3E,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QAClC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QAClC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACrC,OAAgC,EAChC,eAA+C,EAAE;IAEjD,MAAM,cAAc,GAAG,YAAY,CAAC,cAAc,IAAI,oBAAoB,CAAC;IAC3E,MAAM,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACpE,MAAM,2BAA2B,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAEzE,IAAI,CAAC;QACJ,MAAM,cAAc,CACnB,QAAQ,EACR;YACC,OAAO;YACP,kBAAkB;YAClB,IAAI;YACJ,sBAAsB;YACtB,IAAI;YACJ,OAAO,CAAC,QAAQ;YAChB,2BAA2B;SAC3B,EACD,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CACrE,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACd,2BAA2B,OAAO,CAAC,QAAQ,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EACxG,EAAE,KAAK,EAAE,KAAK,EAAE,CAChB,CAAC;IACH,CAAC;AACF,CAAC"}
+{"version":3,"file":"docker-image-builder.js","sourceRoot":"","sources":["../../src/build/docker-image-builder.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAE3E,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAwB9B,SAAS,iBAAiB,CACzB,MAAgD,EAChD,IAAgB;IAEhB,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO;IACR,CAAC;IACD,MAAM,UAAU,GAAG,uBAAuB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9D,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;QACtC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,oBAAoB,CAClC,OAAe,EACf,IAAuB,EACvB,OAA6B;IAE7B,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC5B,MAAM,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACjD,OAAO;IACR,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAC3E,iBAAiB,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACvD,iBAAiB,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACvD,MAAM,KAAK,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACrC,OAAgC,EAChC,eAA+C,EAAE;IAEjD,MAAM,cAAc,GAAG,YAAY,CAAC,cAAc,IAAI,oBAAoB,CAAC;IAC3E,MAAM,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACpE,MAAM,2BAA2B,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAEzE,IAAI,CAAC;QACJ,MAAM,cAAc,CACnB,QAAQ,EACR;YACC,OAAO;YACP,kBAAkB;YAClB,IAAI;YACJ,sBAAsB;YACtB,IAAI;YACJ,OAAO,CAAC,QAAQ;YAChB,2BAA2B;SAC3B,EACD,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CACrE,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACd,2BAA2B,OAAO,CAAC,QAAQ,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EACxG,EAAE,KAAK,EAAE,KAAK,EAAE,CAChB,CAAC;IACH,CAAC;AACF,CAAC"}

package/dist/cli/backup-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backup-commands.d.ts","sourceRoot":"","sources":["../../src/cli/backup-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAEN,KAAK,eAAe,EACpB,KAAK,KAAK,EAIV,MAAM,2BAA2B,CAAC;AAEnC,UAAU,uBAAuB;IAChC,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC;IACvC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACpC;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0DtF"}
+{"version":3,"file":"backup-commands.d.ts","sourceRoot":"","sources":["../../src/cli/backup-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAEN,KAAK,eAAe,EACpB,KAAK,KAAK,EAIV,MAAM,2BAA2B,CAAC;AAEnC,UAAU,uBAAuB;IAChC,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC;IACvC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACpC;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4DtF"}

package/dist/cli/backup-commands.js

@@ -23,8 +23,10 @@ export async function runBackupCommand(options) {
     if (backupSubcommand === 'create') {
         writeJson(options.io, await backupManager.createBackup({
             backupDir,
+            cacheDir: options.systemConfig.cacheDir,
+            runtimeDir: options.systemConfig.runtimeDir,
             stateDir: zone.gateway.stateDir,
-            workspaceDir: zone.gateway.workspaceDir,
+            ...(zone.gateway.type === 'openclaw' ? { zoneFilesDir: zone.gateway.zoneFilesDir } : {}),
             zoneId,
         }));
         return;
@@ -37,7 +39,7 @@ export async function runBackupCommand(options) {
         writeJson(options.io, await backupManager.restoreBackup({
             backupPath,
             stateDir: zone.gateway.stateDir,
-            workspaceDir: zone.gateway.workspaceDir,
+            ...(zone.gateway.type === 'openclaw' ? { zoneFilesDir: zone.gateway.zoneFilesDir } : {}),
         }));
         return;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"backup-commands.js","sourceRoot":"","sources":["../../src/cli/backup-commands.ts"],"names":[],"mappings":"AACA,OAAO,EACN,8BAA8B,EAG9B,YAAY,EACZ,WAAW,EACX,SAAS,GACT,MAAM,2BAA2B,CAAC;AASnC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAgC;IACtE,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,UAAU,CAAC;IAE/E,IAAI,gBAAgB,KAAK,MAAM,EAAE,CAAC;QACjC,MAAM,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,uBAAuB,CAAC;YAClE,OAAO,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;YACvB,OAAO,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;SACvB,CAAC,CAAC;QACH,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,aAAa,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACxE,OAAO;IACR,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,8BAA8B,CAC1D,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,YAAY,CACpB,CAAC;IACF,MAAM,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,yBAAyB,CAAC;QACvE,eAAe,EAAE,KAAK,IAAI,EAAE,CAC3B,MAAM,cAAc,CAAC,OAAO,CAAC;YAC5B,MAAM,EAAE,WAAW;YACnB,GAAG,EAAE,iBAAiB,MAAM,0BAA0B;SACtD,CAAC;KACH,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAErF,IAAI,gBAAgB,KAAK,QAAQ,EAAE,CAAC;QACnC,SAAS,CACR,OAAO,CAAC,EAAE,EACV,MAAM,aAAa,CAAC,YAAY,CAAC;YAChC,SAAS;YACT,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;YACvC,MAAM;SACN,CAAC,CACF,CAAC;QACF,OAAO;IACR,CAAC;IAED,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACxE,CAAC;QACD,SAAS,CACR,OAAO,CAAC,EAAE,EACV,MAAM,aAAa,CAAC,aAAa,CAAC;YACjC,UAAU;YACV,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;SACvC,CAAC,CACF,CAAC;QACF,OAAO;IACR,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,8BAA8B,gBAAgB,IAAI,WAAW,IAAI,CAAC,CAAC;AACpF,CAAC"}
+{"version":3,"file":"backup-commands.js","sourceRoot":"","sources":["../../src/cli/backup-commands.ts"],"names":[],"mappings":"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"}

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

@@ -3,26 +3,46 @@ import { type CliDependencies, type CliIo } from '../agent-vm-cli-support.js';
 export declare function isGatewayImageCached(systemConfig: LoadedSystemConfig, zoneId: string): Promise<boolean>;
 export declare function createControllerSubcommands(io: CliIo, dependencies: CliDependencies): Partial<import("cmd-ts/dist/cjs/argparser.js").Register> & {
     parse(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
-        command: "upgrade";
+        command: "ssh";
         args: {
-            purge?: boolean;
-            zone?: string | undefined;
             config: string | undefined;
+            print: boolean;
+            remoteCommandArguments: string[];
+            zone: string | undefined;
         };
     } | {
-        command: "status";
+        command: "upgrade";
         args: {
             purge?: boolean;
             zone?: string | undefined;
             config: string | undefined;
         };
     } | {
-        command: "ssh";
+        command: "lease";
         args: {
+            command: "peek";
+            args: {
+                config: string | undefined;
+                leaseId: string;
+            };
+        } | {
+            command: "release";
+            args: {
+                config: string | undefined;
+                leaseId: string;
+            };
+        } | {
+            command: "list";
+            args: {
+                config: string | undefined;
+            };
+        };
+    } | {
+        command: "status";
+        args: {
+            purge?: boolean;
+            zone?: string | undefined;
             config: string | undefined;
-            print: boolean;
-            remoteCommandArguments: string[];
-            zone: string | undefined;
         };
     } | {
         command: "logs";
@@ -48,18 +68,10 @@ export declare function createControllerSubcommands(io: CliIo, dependencies: Cli
             config: string | undefined;
         };
     } | {
-        command: "lease";
+        command: "start";
         args: {
-            command: "list";
-            args: {
-                config: string | undefined;
-            };
-        } | {
-            command: "release";
-            args: {
-                config: string | undefined;
-                leaseId: string;
-            };
+            config: string | undefined;
+            zone: string | undefined;
         };
     } | {
         command: "stop";
@@ -68,34 +80,48 @@ export declare function createControllerSubcommands(io: CliIo, dependencies: Cli
             zone?: string | undefined;
             config: string | undefined;
         };
-    } | {
-        command: "start";
-        args: {
-            config: string | undefined;
-            zone: string | undefined;
-        };
     }>>;
 } & import("cmd-ts/dist/cjs/helpdoc.js").Named & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Descriptive & import("cmd-ts/dist/cjs/helpdoc.js").Versioned> & import("cmd-ts/dist/cjs/helpdoc.js").PrintHelp & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned> & import("cmd-ts/dist/cjs/argparser.js").Register & import("cmd-ts/dist/cjs/runner.js").Handling<{
-    command: "upgrade";
+    command: "ssh";
     args: {
-        purge?: boolean;
-        zone?: string | undefined;
         config: string | undefined;
+        print: boolean;
+        remoteCommandArguments: string[];
+        zone: string | undefined;
     };
 } | {
-    command: "status";
+    command: "upgrade";
     args: {
         purge?: boolean;
         zone?: string | undefined;
         config: string | undefined;
     };
 } | {
-    command: "ssh";
+    command: "lease";
+    args: {
+        command: "peek";
+        args: {
+            config: string | undefined;
+            leaseId: string;
+        };
+    } | {
+        command: "release";
+        args: {
+            config: string | undefined;
+            leaseId: string;
+        };
+    } | {
+        command: "list";
+        args: {
+            config: string | undefined;
+        };
+    };
+} | {
+    command: "status";
     args: {
+        purge?: boolean;
+        zone?: string | undefined;
         config: string | undefined;
-        print: boolean;
-        remoteCommandArguments: string[];
-        zone: string | undefined;
     };
 } | {
     command: "logs";
@@ -121,18 +147,10 @@ export declare function createControllerSubcommands(io: CliIo, dependencies: Cli
         config: string | undefined;
     };
 } | {
-    command: "lease";
+    command: "start";
     args: {
-        command: "list";
-        args: {
-            config: string | undefined;
-        };
-    } | {
-        command: "release";
-        args: {
-            config: string | undefined;
-            leaseId: string;
-        };
+        config: string | undefined;
+        zone: string | undefined;
     };
 } | {
     command: "stop";
@@ -141,20 +159,26 @@ export declare function createControllerSubcommands(io: CliIo, dependencies: Cli
         zone?: string | undefined;
         config: string | undefined;
     };
-} | {
-    command: "start";
-    args: {
-        config: string | undefined;
-        zone: string | undefined;
-    };
 }, {
-    command: "upgrade";
+    command: "ssh";
     value: Promise<void>;
 } | {
-    command: "status";
+    command: "upgrade";
     value: Promise<void>;
 } | {
-    command: "ssh";
+    command: "lease";
+    value: {
+        command: "peek";
+        value: Promise<void>;
+    } | {
+        command: "release";
+        value: Promise<void>;
+    } | {
+        command: "list";
+        value: Promise<void>;
+    };
+} | {
+    command: "status";
     value: Promise<void>;
 } | {
     command: "logs";
@@ -169,29 +193,32 @@ export declare function createControllerSubcommands(io: CliIo, dependencies: Cli
     command: "destroy";
     value: Promise<void>;
 } | {
-    command: "lease";
-    value: {
-        command: "list";
-        value: Promise<void>;
-    } | {
-        command: "release";
-        value: Promise<void>;
-    };
-} | {
-    command: "stop";
+    command: "start";
     value: Promise<void>;
 } | {
-    command: "start";
+    command: "stop";
     value: Promise<void>;
 }> & {
     run(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
-        command: "upgrade";
+        command: "ssh";
         value: Promise<void>;
     } | {
-        command: "status";
+        command: "upgrade";
         value: Promise<void>;
     } | {
-        command: "ssh";
+        command: "lease";
+        value: {
+            command: "peek";
+            value: Promise<void>;
+        } | {
+            command: "release";
+            value: Promise<void>;
+        } | {
+            command: "list";
+            value: Promise<void>;
+        };
+    } | {
+        command: "status";
         value: Promise<void>;
     } | {
         command: "logs";
@@ -206,19 +233,10 @@ export declare function createControllerSubcommands(io: CliIo, dependencies: Cli
         command: "destroy";
         value: Promise<void>;
     } | {
-        command: "lease";
-        value: {
-            command: "list";
-            value: Promise<void>;
-        } | {
-            command: "release";
-            value: Promise<void>;
-        };
-    } | {
-        command: "stop";
+        command: "start";
         value: Promise<void>;
     } | {
-        command: "start";
+        command: "stop";
         value: Promise<void>;
     }>>;
 };