@agent-vm/agent-vm 0.0.57 → 0.0.59
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/backup/backup-create-operation.d.ts +2 -0
- package/dist/backup/backup-create-operation.d.ts.map +1 -1
- package/dist/backup/backup-create-operation.js +23 -0
- package/dist/backup/backup-create-operation.js.map +1 -1
- package/dist/backup/backup-manager.d.ts +2 -0
- package/dist/backup/backup-manager.d.ts.map +1 -1
- package/dist/backup/backup-manager.js +1 -0
- package/dist/backup/backup-manager.js.map +1 -1
- package/dist/build/managed-image-dockerfile.d.ts +3 -0
- package/dist/build/managed-image-dockerfile.d.ts.map +1 -1
- package/dist/build/managed-image-dockerfile.js +66 -10
- package/dist/build/managed-image-dockerfile.js.map +1 -1
- package/dist/cli/backup-commands.d.ts.map +1 -1
- package/dist/cli/backup-commands.js +18 -0
- package/dist/cli/backup-commands.js.map +1 -1
- package/dist/cli/commands/create-app.d.ts +174 -86
- package/dist/cli/commands/create-app.d.ts.map +1 -1
- package/dist/cli/commands/create-app.js +2 -0
- package/dist/cli/commands/create-app.js.map +1 -1
- package/dist/cli/commands/migrate-definition.d.ts +16 -0
- package/dist/cli/commands/migrate-definition.d.ts.map +1 -1
- package/dist/cli/commands/migrate-definition.js +20 -1
- package/dist/cli/commands/migrate-definition.js.map +1 -1
- package/dist/cli/commands/resources-definition.d.ts +8 -8
- package/dist/cli/commands/zone-git-definition.d.ts +67 -0
- package/dist/cli/commands/zone-git-definition.d.ts.map +1 -0
- package/dist/cli/commands/zone-git-definition.js +46 -0
- package/dist/cli/commands/zone-git-definition.js.map +1 -0
- package/dist/cli/controller-operation-commands.d.ts.map +1 -1
- package/dist/cli/controller-operation-commands.js +13 -0
- package/dist/cli/controller-operation-commands.js.map +1 -1
- package/dist/cli/init-command.d.ts.map +1 -1
- package/dist/cli/init-command.js +153 -11
- 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 +58 -12
- package/dist/cli/manual-templates.js.map +1 -1
- package/dist/cli/migrate-commands.d.ts +8 -0
- package/dist/cli/migrate-commands.d.ts.map +1 -1
- package/dist/cli/migrate-commands.js +274 -0
- package/dist/cli/migrate-commands.js.map +1 -1
- package/dist/cli/zone-git-commands.d.ts +13 -0
- package/dist/cli/zone-git-commands.d.ts.map +1 -0
- package/dist/cli/zone-git-commands.js +89 -0
- package/dist/cli/zone-git-commands.js.map +1 -0
- package/dist/config/system-config.d.ts +70 -31
- package/dist/config/system-config.d.ts.map +1 -1
- package/dist/config/system-config.js +246 -47
- package/dist/config/system-config.js.map +1 -1
- package/dist/controller/controller-runtime-types.d.ts +7 -0
- package/dist/controller/controller-runtime-types.d.ts.map +1 -1
- package/dist/controller/controller-runtime.d.ts.map +1 -1
- package/dist/controller/controller-runtime.js +58 -6
- package/dist/controller/controller-runtime.js.map +1 -1
- package/dist/controller/git-auth-support.d.ts +4 -0
- package/dist/controller/git-auth-support.d.ts.map +1 -1
- package/dist/controller/git-auth-support.js +17 -0
- package/dist/controller/git-auth-support.js.map +1 -1
- package/dist/controller/git-push-operations.d.ts.map +1 -1
- package/dist/controller/git-push-operations.js +9 -13
- package/dist/controller/git-push-operations.js.map +1 -1
- package/dist/controller/http/controller-http-route-support.d.ts +10 -2
- package/dist/controller/http/controller-http-route-support.d.ts.map +1 -1
- package/dist/controller/http/controller-http-route-support.js +3 -2
- package/dist/controller/http/controller-http-route-support.js.map +1 -1
- package/dist/controller/http/controller-http-routes.d.ts +13 -3
- package/dist/controller/http/controller-http-routes.d.ts.map +1 -1
- package/dist/controller/http/controller-http-routes.js +96 -10
- package/dist/controller/http/controller-http-routes.js.map +1 -1
- package/dist/controller/http/controller-request-schemas.d.ts +12 -0
- package/dist/controller/http/controller-request-schemas.d.ts.map +1 -1
- package/dist/controller/http/controller-request-schemas.js +16 -0
- package/dist/controller/http/controller-request-schemas.js.map +1 -1
- package/dist/controller/http/controller-zone-operation-routes.d.ts.map +1 -1
- package/dist/controller/http/controller-zone-operation-routes.js +54 -1
- package/dist/controller/http/controller-zone-operation-routes.js.map +1 -1
- package/dist/controller/leases/lease-manager.d.ts +7 -0
- package/dist/controller/leases/lease-manager.d.ts.map +1 -1
- package/dist/controller/leases/lease-manager.js +15 -0
- package/dist/controller/leases/lease-manager.js.map +1 -1
- package/dist/controller/leases/lease-work-mount-paths.d.ts +8 -1
- package/dist/controller/leases/lease-work-mount-paths.d.ts.map +1 -1
- package/dist/controller/leases/lease-work-mount-paths.js +22 -2
- package/dist/controller/leases/lease-work-mount-paths.js.map +1 -1
- package/dist/controller/openclaw-runtime-status.d.ts +28 -0
- package/dist/controller/openclaw-runtime-status.d.ts.map +1 -0
- package/dist/controller/openclaw-runtime-status.js +43 -0
- package/dist/controller/openclaw-runtime-status.js.map +1 -0
- package/dist/controller/runtime-instructions-builder.d.ts +1 -0
- package/dist/controller/runtime-instructions-builder.d.ts.map +1 -1
- package/dist/controller/runtime-instructions-builder.js +33 -0
- package/dist/controller/runtime-instructions-builder.js.map +1 -1
- package/dist/controller/worker-task-runner.d.ts.map +1 -1
- package/dist/controller/worker-task-runner.js +1 -0
- package/dist/controller/worker-task-runner.js.map +1 -1
- package/dist/controller/zone-git/zone-git-capability-store.d.ts +16 -0
- package/dist/controller/zone-git/zone-git-capability-store.d.ts.map +1 -0
- package/dist/controller/zone-git/zone-git-capability-store.js +47 -0
- package/dist/controller/zone-git/zone-git-capability-store.js.map +1 -0
- package/dist/controller/zone-git/zone-git-operation-locks.d.ts +5 -0
- package/dist/controller/zone-git/zone-git-operation-locks.d.ts.map +1 -0
- package/dist/controller/zone-git/zone-git-operation-locks.js +23 -0
- package/dist/controller/zone-git/zone-git-operation-locks.js.map +1 -0
- package/dist/controller/zone-git/zone-git-operations.d.ts +50 -0
- package/dist/controller/zone-git/zone-git-operations.d.ts.map +1 -0
- package/dist/controller/zone-git/zone-git-operations.js +323 -0
- package/dist/controller/zone-git/zone-git-operations.js.map +1 -0
- package/dist/controller/zone-git/zone-git-paths.d.ts +28 -0
- package/dist/controller/zone-git/zone-git-paths.d.ts.map +1 -0
- package/dist/controller/zone-git/zone-git-paths.js +17 -0
- package/dist/controller/zone-git/zone-git-paths.js.map +1 -0
- package/dist/controller/zone-runtimes/openclaw-zone-runtime.d.ts.map +1 -1
- package/dist/controller/zone-runtimes/openclaw-zone-runtime.js +1 -0
- package/dist/controller/zone-runtimes/openclaw-zone-runtime.js.map +1 -1
- package/dist/controller/zone-runtimes/zone-runtime-types.d.ts +2 -0
- package/dist/controller/zone-runtimes/zone-runtime-types.d.ts.map +1 -1
- package/dist/gateway/credential-manager.d.ts +12 -2
- package/dist/gateway/credential-manager.d.ts.map +1 -1
- package/dist/gateway/credential-manager.js +15 -0
- package/dist/gateway/credential-manager.js.map +1 -1
- package/dist/gateway/gateway-zone-orchestrator.d.ts.map +1 -1
- package/dist/gateway/gateway-zone-orchestrator.js +41 -1
- package/dist/gateway/gateway-zone-orchestrator.js.map +1 -1
- package/dist/gateway/gateway-zone-support.d.ts +2 -0
- package/dist/gateway/gateway-zone-support.d.ts.map +1 -1
- package/dist/gateway/gateway-zone-support.js +4 -17
- package/dist/gateway/gateway-zone-support.js.map +1 -1
- package/dist/gateway/mcp-portal-openclaw-materialization.d.ts +19 -0
- package/dist/gateway/mcp-portal-openclaw-materialization.d.ts.map +1 -0
- package/dist/gateway/mcp-portal-openclaw-materialization.js +26 -0
- package/dist/gateway/mcp-portal-openclaw-materialization.js.map +1 -0
- package/dist/gateway-api-client/gateway-api-client.d.ts +1 -0
- package/dist/gateway-api-client/gateway-api-client.d.ts.map +1 -1
- package/dist/gateway-api-client/gateway-api-client.js +2 -1
- package/dist/gateway-api-client/gateway-api-client.js.map +1 -1
- package/dist/integration-tests/smoke-harness.d.ts +59 -0
- package/dist/integration-tests/smoke-harness.d.ts.map +1 -0
- package/dist/integration-tests/smoke-harness.js +244 -0
- package/dist/integration-tests/smoke-harness.js.map +1 -0
- package/dist/operations/config-validation.d.ts.map +1 -1
- package/dist/operations/config-validation.js +78 -0
- package/dist/operations/config-validation.js.map +1 -1
- package/dist/operations/doctor.js +1 -1
- package/dist/operations/doctor.js.map +1 -1
- package/dist/operations/openclaw-deployment-doctor.d.ts +9 -26
- package/dist/operations/openclaw-deployment-doctor.d.ts.map +1 -1
- package/dist/operations/openclaw-deployment-doctor.js +185 -60
- package/dist/operations/openclaw-deployment-doctor.js.map +1 -1
- package/dist/operations/openclaw-deployment-requirements.d.ts +63 -0
- package/dist/operations/openclaw-deployment-requirements.d.ts.map +1 -0
- package/dist/operations/openclaw-deployment-requirements.js +181 -0
- package/dist/operations/openclaw-deployment-requirements.js.map +1 -0
- package/dist/operations/zone-git-doctor.d.ts +7 -0
- package/dist/operations/zone-git-doctor.d.ts.map +1 -0
- package/dist/operations/zone-git-doctor.js +94 -0
- package/dist/operations/zone-git-doctor.js.map +1 -0
- package/dist/tool-vm/tool-vm-lifecycle.d.ts +4 -1
- package/dist/tool-vm/tool-vm-lifecycle.d.ts.map +1 -1
- package/dist/tool-vm/tool-vm-lifecycle.js +99 -23
- package/dist/tool-vm/tool-vm-lifecycle.js.map +1 -1
- package/package.json +10 -7
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type ZoneGitReadConfig } from '../controller/zone-git/zone-git-operations.js';
|
|
1
2
|
import type { BackupEncryption, BackupResult } from './backup-manager.js';
|
|
2
3
|
export declare function createEncryptedBackup(options: {
|
|
3
4
|
readonly backupDir: string;
|
|
@@ -6,6 +7,7 @@ export declare function createEncryptedBackup(options: {
|
|
|
6
7
|
readonly runtimeDir: string;
|
|
7
8
|
readonly stateDir: string;
|
|
8
9
|
readonly zoneFilesDir?: string;
|
|
10
|
+
readonly zoneGit?: ZoneGitReadConfig;
|
|
9
11
|
readonly zoneId: string;
|
|
10
12
|
}): Promise<BackupResult>;
|
|
11
13
|
//# sourceMappingURL=backup-create-operation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup-create-operation.d.ts","sourceRoot":"","sources":["../../src/backup/backup-create-operation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"backup-create-operation.d.ts","sourceRoot":"","sources":["../../src/backup/backup-create-operation.ts"],"names":[],"mappings":"AAMA,OAAO,EAEN,KAAK,iBAAiB,EACtB,MAAM,+CAA+C,CAAC;AAEvD,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,OAAO,CAAC,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,YAAY,CAAC,CAwDxB"}
|
|
@@ -3,6 +3,7 @@ import fs from 'node:fs/promises';
|
|
|
3
3
|
import os from 'node:os';
|
|
4
4
|
import path from 'node:path';
|
|
5
5
|
import { promisify } from 'node:util';
|
|
6
|
+
import { getZoneGitStatus, } from '../controller/zone-git/zone-git-operations.js';
|
|
6
7
|
import { buildBackupPaths } from './backup-archive-layout.js';
|
|
7
8
|
const execFileAsync = promisify(execFile);
|
|
8
9
|
export async function createEncryptedBackup(options) {
|
|
@@ -12,6 +13,9 @@ export async function createEncryptedBackup(options) {
|
|
|
12
13
|
stateDir: options.stateDir,
|
|
13
14
|
...(options.zoneFilesDir !== undefined ? { zoneFilesDir: options.zoneFilesDir } : {}),
|
|
14
15
|
});
|
|
16
|
+
if (options.zoneGit) {
|
|
17
|
+
await assertZoneGitReadyForBackup(options.zoneGit);
|
|
18
|
+
}
|
|
15
19
|
const timestamp = new Date().toISOString().replace(/[:.]/gu, '-');
|
|
16
20
|
const backupPaths = buildBackupPaths({
|
|
17
21
|
backupDir: options.backupDir,
|
|
@@ -50,6 +54,25 @@ export async function createEncryptedBackup(options) {
|
|
|
50
54
|
zoneId: options.zoneId,
|
|
51
55
|
};
|
|
52
56
|
}
|
|
57
|
+
async function assertZoneGitReadyForBackup(zoneGit) {
|
|
58
|
+
const status = await getZoneGitStatus(zoneGit);
|
|
59
|
+
const violations = [];
|
|
60
|
+
if (!status.initialized) {
|
|
61
|
+
violations.push(`zone Git is configured but not initialized. Run agent-vm zone-git init --zone ${zoneGit.zoneId} before backup.`);
|
|
62
|
+
}
|
|
63
|
+
if (status.dirty) {
|
|
64
|
+
violations.push('uncommitted zone Git changes are present. Run git status, git add, and git commit before backup.');
|
|
65
|
+
}
|
|
66
|
+
if (status.aheadOfRemote > 0) {
|
|
67
|
+
violations.push(`${String(status.aheadOfRemote)} unpushed zone Git commit(s) are present. Run agent-vm zone-git push --zone ${zoneGit.zoneId} before backup.`);
|
|
68
|
+
}
|
|
69
|
+
if (violations.length > 0) {
|
|
70
|
+
throw new Error([
|
|
71
|
+
`Zone '${zoneGit.zoneId}' is not ready for backup:`,
|
|
72
|
+
...violations.map((item) => `- ${item}`),
|
|
73
|
+
].join('\n'));
|
|
74
|
+
}
|
|
75
|
+
}
|
|
53
76
|
function isSameOrDescendantPath(childPath, parentPath) {
|
|
54
77
|
const relativePath = path.relative(path.resolve(parentPath), path.resolve(childPath));
|
|
55
78
|
return relativePath === '' || (!relativePath.startsWith('..') && !path.isAbsolute(relativePath));
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"backup-create-operation.js","sourceRoot":"","sources":["../../src/backup/backup-create-operation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ZoneGitReadConfig } from '../controller/zone-git/zone-git-operations.js';
|
|
1
2
|
export interface BackupEncryption {
|
|
2
3
|
readonly encrypt: (inputPath: string, outputPath: string) => Promise<void>;
|
|
3
4
|
readonly decrypt: (inputPath: string, outputPath: string) => Promise<void>;
|
|
@@ -19,6 +20,7 @@ export interface ZoneBackupManager {
|
|
|
19
20
|
readonly stateDir: string;
|
|
20
21
|
readonly runtimeDir: string;
|
|
21
22
|
readonly zoneFilesDir?: string;
|
|
23
|
+
readonly zoneGit?: ZoneGitReadConfig;
|
|
22
24
|
readonly backupDir: string;
|
|
23
25
|
}): Promise<BackupResult>;
|
|
24
26
|
restoreBackup(options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup-manager.d.ts","sourceRoot":"","sources":["../../src/backup/backup-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"backup-manager.d.ts","sourceRoot":"","sources":["../../src/backup/backup-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAKvF,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,OAAO,CAAC,EAAE,iBAAiB,CAAC;QACrC,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,CA0BvF"}
|
|
@@ -20,6 +20,7 @@ export function createZoneBackupManager(encryption) {
|
|
|
20
20
|
runtimeDir: options.runtimeDir,
|
|
21
21
|
stateDir: options.stateDir,
|
|
22
22
|
...(options.zoneFilesDir !== undefined ? { zoneFilesDir: options.zoneFilesDir } : {}),
|
|
23
|
+
...(options.zoneGit ? { zoneGit: options.zoneGit } : {}),
|
|
23
24
|
zoneId: options.zoneId,
|
|
24
25
|
});
|
|
25
26
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup-manager.js","sourceRoot":"","sources":["../../src/backup/backup-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"backup-manager.js","sourceRoot":"","sources":["../../src/backup/backup-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAuCvE;;;;;;;;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,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,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"}
|
|
@@ -36,6 +36,8 @@ export interface ManagedDockerfilePlan {
|
|
|
36
36
|
readonly imageTargetFamily: 'gateway' | 'toolVm';
|
|
37
37
|
readonly imageTargetName: string;
|
|
38
38
|
readonly openClawAgentVmPluginPackage?: ManagedDockerfilePackagePlanEntry;
|
|
39
|
+
readonly openClawMcpPortalPluginPackage?: ManagedDockerfilePackagePlanEntry;
|
|
40
|
+
readonly mcpPortalPackage?: ManagedDockerfilePackagePlanEntry;
|
|
39
41
|
readonly openClawPackages: readonly ManagedDockerfilePackagePlanEntry[];
|
|
40
42
|
readonly warnings: readonly ManagedDockerfilePlanWarning[];
|
|
41
43
|
}
|
|
@@ -53,5 +55,6 @@ export interface ManagedImageRelease {
|
|
|
53
55
|
}
|
|
54
56
|
export declare function generateManagedDockerfile(options: GenerateManagedDockerfileOptions): Promise<GenerateManagedDockerfileResult>;
|
|
55
57
|
export declare function resolveManagedOpenClawAgentVmPluginPackageSpec(): Promise<string>;
|
|
58
|
+
export declare function resolveManagedPackageSpec(packageName: string): Promise<string>;
|
|
56
59
|
export declare function resolveManagedImageRelease(): Promise<ManagedImageRelease>;
|
|
57
60
|
//# 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;
|
|
1
|
+
{"version":3,"file":"managed-image-dockerfile.d.ts","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,19 @@ import { z } from 'zod';
|
|
|
5
5
|
import { loadJsonConfigFile } from '../config/json-config-file.js';
|
|
6
6
|
import { formatZodError } from '../cli/format-zod-error.js';
|
|
7
7
|
const managedOpenClawAgentVmPluginPackageName = '@agent-vm/openclaw-agent-vm-plugin';
|
|
8
|
+
const managedOpenClawMcpPortalPluginPackageName = '@agent-vm/openclaw-mcp-portal-plugin';
|
|
9
|
+
const managedMcpPortalPackageName = '@agent-vm/mcp-portal';
|
|
10
|
+
const managedOpenClawPackageNames = new Set([
|
|
11
|
+
managedOpenClawAgentVmPluginPackageName,
|
|
12
|
+
managedOpenClawMcpPortalPluginPackageName,
|
|
13
|
+
managedMcpPortalPackageName,
|
|
14
|
+
]);
|
|
8
15
|
const managedOpenClawAgentVmPluginExtensionPath = '/home/openclaw/.openclaw/extensions/gondolin';
|
|
16
|
+
const managedOpenClawMcpPortalPluginExtensionPath = '/home/openclaw/.openclaw/extensions/mcp-portal';
|
|
9
17
|
const managedOpenClawAgentVmPluginPackagePath = '/pnpm/global/5/node_modules/@agent-vm/openclaw-agent-vm-plugin/dist';
|
|
18
|
+
const managedOpenClawMcpPortalPluginPackagePath = '/pnpm/global/5/node_modules/@agent-vm/openclaw-mcp-portal-plugin/dist';
|
|
19
|
+
const managedMcpPortalServerScriptPath = '/pnpm/global/5/node_modules/@agent-vm/mcp-portal/dist/bin/portal-server.js';
|
|
20
|
+
const managedMcpPortalServerWrapperPath = '/opt/agent-vm/portal/bin/agent-vm-mcp-portal-server';
|
|
10
21
|
const overlayCopySchema = z
|
|
11
22
|
.object({
|
|
12
23
|
from: z.string().min(1),
|
|
@@ -100,10 +111,21 @@ function renderManagedDockerfile(props) {
|
|
|
100
111
|
' && rm -rf /var/lib/apt/lists/*');
|
|
101
112
|
}
|
|
102
113
|
if (props.base === 'openclaw-gateway') {
|
|
103
|
-
if (!props.openClawAgentVmPluginPackageSpec) {
|
|
104
|
-
throw new Error('OpenClaw gateway managed Dockerfiles require
|
|
114
|
+
if (!props.openClawAgentVmPluginPackageSpec || !props.openClawMcpPortalPluginPackageSpec || !props.mcpPortalPackageSpec) {
|
|
115
|
+
throw new Error('OpenClaw gateway managed Dockerfiles require all managed OpenClaw plugin package specs.');
|
|
105
116
|
}
|
|
106
|
-
lines.push('RUN pnpm add -g ' +
|
|
117
|
+
lines.push('RUN pnpm add -g ' +
|
|
118
|
+
shellJoin([
|
|
119
|
+
props.openClawAgentVmPluginPackageSpec,
|
|
120
|
+
props.openClawMcpPortalPluginPackageSpec,
|
|
121
|
+
props.mcpPortalPackageSpec,
|
|
122
|
+
]));
|
|
123
|
+
}
|
|
124
|
+
if (props.base === 'tool-vm') {
|
|
125
|
+
if (!props.mcpPortalPackageSpec) {
|
|
126
|
+
throw new Error('Tool VM managed Dockerfiles require the MCP Portal package spec.');
|
|
127
|
+
}
|
|
128
|
+
lines.push('RUN pnpm add -g ' + shellJoin([props.mcpPortalPackageSpec]));
|
|
107
129
|
}
|
|
108
130
|
if (props.openClawPackages.length > 0) {
|
|
109
131
|
lines.push('RUN pnpm add -g ' + shellJoin(props.openClawPackages.map((entry) => entry.spec)));
|
|
@@ -115,7 +137,11 @@ function renderManagedDockerfile(props) {
|
|
|
115
137
|
lines.push(`RUN ${command}`);
|
|
116
138
|
}
|
|
117
139
|
if (props.base === 'openclaw-gateway') {
|
|
140
|
+
lines.push('RUN mkdir -p /pnpm/global/5/node_modules/@openclaw');
|
|
118
141
|
lines.push(`RUN ln -sf ${managedOpenClawAgentVmPluginPackagePath} ${managedOpenClawAgentVmPluginExtensionPath}`);
|
|
142
|
+
lines.push(`RUN ln -sf ${managedOpenClawMcpPortalPluginPackagePath} ${managedOpenClawMcpPortalPluginExtensionPath}`);
|
|
143
|
+
lines.push('RUN mkdir -p /opt/agent-vm/portal/bin');
|
|
144
|
+
lines.push(`RUN printf '%s\\n' '#!/bin/sh' 'exec node ${managedMcpPortalServerScriptPath} "$@"' > ${managedMcpPortalServerWrapperPath} && chmod 0755 ${managedMcpPortalServerWrapperPath}`);
|
|
119
145
|
}
|
|
120
146
|
lines.push('');
|
|
121
147
|
return lines.join('\n');
|
|
@@ -124,13 +150,12 @@ function resolveOpenClawPackagePlanEntries(props) {
|
|
|
124
150
|
const entriesByName = new Map();
|
|
125
151
|
let overlayOpenClawVersion;
|
|
126
152
|
for (const overlayPackageSpec of props.overlay.extraOpenClawPackages) {
|
|
127
|
-
if (overlayPackageSpec === managedOpenClawAgentVmPluginPackageName ||
|
|
128
|
-
overlayPackageSpec.startsWith(`${managedOpenClawAgentVmPluginPackageName}@`)) {
|
|
129
|
-
continue;
|
|
130
|
-
}
|
|
131
153
|
const parsedPackageSpec = parsePackageSpec(overlayPackageSpec);
|
|
132
154
|
const name = parsedPackageSpec.name;
|
|
133
155
|
const version = parsedPackageSpec.version;
|
|
156
|
+
if (managedOpenClawPackageNames.has(name)) {
|
|
157
|
+
throw new Error(`extraOpenClawPackages cannot override managed package ${name}. Update the agent-vm release instead.`);
|
|
158
|
+
}
|
|
134
159
|
if (name === 'openclaw' && version !== undefined) {
|
|
135
160
|
overlayOpenClawVersion = version;
|
|
136
161
|
}
|
|
@@ -193,6 +218,12 @@ export async function generateManagedDockerfile(options) {
|
|
|
193
218
|
const openClawAgentVmPluginPackageSpec = options.base === 'openclaw-gateway'
|
|
194
219
|
? await resolveManagedOpenClawAgentVmPluginPackageSpec()
|
|
195
220
|
: undefined;
|
|
221
|
+
const openClawMcpPortalPluginPackageSpec = options.base === 'openclaw-gateway'
|
|
222
|
+
? await resolveManagedPackageSpec(managedOpenClawMcpPortalPluginPackageName)
|
|
223
|
+
: undefined;
|
|
224
|
+
const mcpPortalPackageSpec = options.base === 'openclaw-gateway' || options.base === 'tool-vm'
|
|
225
|
+
? await resolveManagedPackageSpec(managedMcpPortalPackageName)
|
|
226
|
+
: undefined;
|
|
196
227
|
await fs.rm(options.outputDirectory, { force: true, recursive: true });
|
|
197
228
|
await fs.mkdir(path.join(options.outputDirectory, 'overlay'), { recursive: true });
|
|
198
229
|
const overlayDirectory = options.overlayPath ? path.dirname(options.overlayPath) : undefined;
|
|
@@ -210,10 +241,14 @@ export async function generateManagedDockerfile(options) {
|
|
|
210
241
|
await fs.writeFile(dockerfilePath, renderManagedDockerfile({
|
|
211
242
|
base: options.base,
|
|
212
243
|
baseImage,
|
|
244
|
+
...(mcpPortalPackageSpec === undefined ? {} : { mcpPortalPackageSpec }),
|
|
213
245
|
overlay,
|
|
214
246
|
...(openClawAgentVmPluginPackageSpec === undefined
|
|
215
247
|
? {}
|
|
216
248
|
: { openClawAgentVmPluginPackageSpec }),
|
|
249
|
+
...(openClawMcpPortalPluginPackageSpec === undefined
|
|
250
|
+
? {}
|
|
251
|
+
: { openClawMcpPortalPluginPackageSpec }),
|
|
217
252
|
openClawPackages,
|
|
218
253
|
}), 'utf8');
|
|
219
254
|
return {
|
|
@@ -238,6 +273,24 @@ export async function generateManagedDockerfile(options) {
|
|
|
238
273
|
spec: openClawAgentVmPluginPackageSpec,
|
|
239
274
|
},
|
|
240
275
|
}),
|
|
276
|
+
...(openClawMcpPortalPluginPackageSpec === undefined
|
|
277
|
+
? {}
|
|
278
|
+
: {
|
|
279
|
+
openClawMcpPortalPluginPackage: {
|
|
280
|
+
name: managedOpenClawMcpPortalPluginPackageName,
|
|
281
|
+
source: 'installed-package',
|
|
282
|
+
spec: openClawMcpPortalPluginPackageSpec,
|
|
283
|
+
},
|
|
284
|
+
}),
|
|
285
|
+
...(mcpPortalPackageSpec === undefined
|
|
286
|
+
? {}
|
|
287
|
+
: {
|
|
288
|
+
mcpPortalPackage: {
|
|
289
|
+
name: managedMcpPortalPackageName,
|
|
290
|
+
source: 'installed-package',
|
|
291
|
+
spec: mcpPortalPackageSpec,
|
|
292
|
+
},
|
|
293
|
+
}),
|
|
241
294
|
openClawPackages,
|
|
242
295
|
warnings,
|
|
243
296
|
},
|
|
@@ -273,16 +326,19 @@ async function resolvePackageRootFromEntrypoint(packageName) {
|
|
|
273
326
|
}
|
|
274
327
|
}
|
|
275
328
|
export async function resolveManagedOpenClawAgentVmPluginPackageSpec() {
|
|
276
|
-
|
|
329
|
+
return await resolveManagedPackageSpec(managedOpenClawAgentVmPluginPackageName);
|
|
330
|
+
}
|
|
331
|
+
export async function resolveManagedPackageSpec(packageName) {
|
|
332
|
+
const packageRoot = await resolvePackageRootFromEntrypoint(packageName);
|
|
277
333
|
const packageJsonPath = path.join(packageRoot, 'package.json');
|
|
278
334
|
const packageJson = await loadJsonConfigFile(packageJsonPath);
|
|
279
335
|
if (typeof packageJson !== 'object' ||
|
|
280
336
|
packageJson === null ||
|
|
281
337
|
!('name' in packageJson) ||
|
|
282
|
-
packageJson.name !==
|
|
338
|
+
packageJson.name !== packageName ||
|
|
283
339
|
!('version' in packageJson) ||
|
|
284
340
|
typeof packageJson.version !== 'string') {
|
|
285
|
-
throw new Error(`Expected ${packageJsonPath} to describe ${
|
|
341
|
+
throw new Error(`Expected ${packageJsonPath} to describe ${packageName} with a version.`);
|
|
286
342
|
}
|
|
287
343
|
return `${packageJson.name}@${packageJson.version}`;
|
|
288
344
|
}
|
|
@@ -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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"}
|
|
@@ -1 +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;
|
|
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;AAI/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,CA8EtF"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { resolveControllerGithubToken } from '../controller/controller-runtime-support.js';
|
|
2
|
+
import { isOpenClawZoneGitConfigured } from '../controller/zone-git/zone-git-paths.js';
|
|
1
3
|
import { createResolverFromSystemConfig, readZoneFlag, requireZone, writeJson, } from './agent-vm-cli-support.js';
|
|
2
4
|
export async function runBackupCommand(options) {
|
|
3
5
|
const backupSubcommand = options.restArguments[0];
|
|
@@ -21,12 +23,28 @@ export async function runBackupCommand(options) {
|
|
|
21
23
|
});
|
|
22
24
|
const backupManager = options.dependencies.createZoneBackupManager(backupEncryption);
|
|
23
25
|
if (backupSubcommand === 'create') {
|
|
26
|
+
let zoneGit;
|
|
27
|
+
if (isOpenClawZoneGitConfigured(zone)) {
|
|
28
|
+
const githubToken = await resolveControllerGithubToken(options.systemConfig, secretResolver);
|
|
29
|
+
if (!githubToken) {
|
|
30
|
+
throw new Error(`zoneGit for zone '${zoneId}' requires host.githubToken so the controller can push without exposing credentials to VMs.`);
|
|
31
|
+
}
|
|
32
|
+
zoneGit = {
|
|
33
|
+
branch: zone.gateway.zoneGit.remote.branch,
|
|
34
|
+
githubToken,
|
|
35
|
+
remoteUrl: zone.gateway.zoneGit.remote.repoUrl,
|
|
36
|
+
runtimeDir: options.systemConfig.runtimeDir,
|
|
37
|
+
zoneFilesDir: zone.gateway.zoneFilesDir,
|
|
38
|
+
zoneId,
|
|
39
|
+
};
|
|
40
|
+
}
|
|
24
41
|
writeJson(options.io, await backupManager.createBackup({
|
|
25
42
|
backupDir,
|
|
26
43
|
cacheDir: options.systemConfig.cacheDir,
|
|
27
44
|
runtimeDir: options.systemConfig.runtimeDir,
|
|
28
45
|
stateDir: zone.gateway.stateDir,
|
|
29
46
|
...(zone.gateway.type === 'openclaw' ? { zoneFilesDir: zone.gateway.zoneFilesDir } : {}),
|
|
47
|
+
...(zoneGit ? { zoneGit } : {}),
|
|
30
48
|
zoneId,
|
|
31
49
|
}));
|
|
32
50
|
return;
|
|
@@ -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":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAE3F,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AACvF,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,IAAI,OAAsC,CAAC;QAC3C,IAAI,2BAA2B,CAAC,IAAI,CAAC,EAAE,CAAC;YACvC,MAAM,WAAW,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YAC7F,IAAI,CAAC,WAAW,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CACd,qBAAqB,MAAM,6FAA6F,CACxH,CAAC;YACH,CAAC;YACD,OAAO,GAAG;gBACT,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM;gBAC1C,WAAW;gBACX,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO;gBAC9C,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,UAAU;gBAC3C,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;gBACvC,MAAM;aACN,CAAC;QACH,CAAC;QACD,SAAS,CACR,OAAO,CAAC,EAAE,EACV,MAAM,aAAa,CAAC,YAAY,CAAC;YAChC,SAAS;YACT,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,QAAQ;YACvC,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,UAAU;YAC3C,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxF,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/B,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,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxF,CAAC,CACF,CAAC;QACF,OAAO;IACR,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,8BAA8B,gBAAgB,IAAI,WAAW,IAAI,CAAC,CAAC;AACpF,CAAC"}
|