@shravansunder/agent-vm 0.0.2 → 0.0.3

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 (101) hide show
  1. package/dist/backup/backup-encryption.d.ts +2 -2
  2. package/dist/backup/backup-encryption.d.ts.map +1 -1
  3. package/dist/backup/backup-encryption.js +29 -7
  4. package/dist/backup/backup-encryption.js.map +1 -1
  5. package/dist/build/gondolin-image-builder.d.ts.map +1 -1
  6. package/dist/build/gondolin-image-builder.js +3 -2
  7. package/dist/build/gondolin-image-builder.js.map +1 -1
  8. package/dist/cli/agent-vm-cli-support.d.ts +1 -0
  9. package/dist/cli/agent-vm-cli-support.d.ts.map +1 -1
  10. package/dist/cli/agent-vm-cli-support.js +4 -7
  11. package/dist/cli/agent-vm-cli-support.js.map +1 -1
  12. package/dist/cli/auth-interactive-command.d.ts.map +1 -1
  13. package/dist/cli/auth-interactive-command.js +9 -2
  14. package/dist/cli/auth-interactive-command.js.map +1 -1
  15. package/dist/cli/build-command.d.ts +2 -0
  16. package/dist/cli/build-command.d.ts.map +1 -1
  17. package/dist/cli/build-command.js +37 -0
  18. package/dist/cli/build-command.js.map +1 -1
  19. package/dist/cli/commands/command-definition-support.js +5 -5
  20. package/dist/cli/commands/command-definition-support.js.map +1 -1
  21. package/dist/cli/commands/controller-definition.d.ts.map +1 -1
  22. package/dist/cli/commands/controller-definition.js +10 -5
  23. package/dist/cli/commands/controller-definition.js.map +1 -1
  24. package/dist/cli/commands/create-app.d.ts +139 -139
  25. package/dist/cli/commands/create-app.js +2 -2
  26. package/dist/cli/commands/init-definition.js +1 -1
  27. package/dist/cli/init-command.d.ts +3 -2
  28. package/dist/cli/init-command.d.ts.map +1 -1
  29. package/dist/cli/init-command.js +63 -60
  30. package/dist/cli/init-command.js.map +1 -1
  31. package/dist/cli/openclaw-plugin-bundle.d.ts +10 -0
  32. package/dist/cli/openclaw-plugin-bundle.d.ts.map +1 -0
  33. package/dist/cli/openclaw-plugin-bundle.js +35 -0
  34. package/dist/cli/openclaw-plugin-bundle.js.map +1 -0
  35. package/dist/cli/ssh-commands.d.ts.map +1 -1
  36. package/dist/cli/ssh-commands.js +11 -1
  37. package/dist/cli/ssh-commands.js.map +1 -1
  38. package/dist/config/system-config.d.ts +22 -7
  39. package/dist/config/system-config.d.ts.map +1 -1
  40. package/dist/config/system-config.js +75 -9
  41. package/dist/config/system-config.js.map +1 -1
  42. package/dist/controller/composite-secret-resolver.d.ts +3 -0
  43. package/dist/controller/composite-secret-resolver.d.ts.map +1 -0
  44. package/dist/controller/composite-secret-resolver.js +38 -0
  45. package/dist/controller/composite-secret-resolver.js.map +1 -0
  46. package/dist/controller/controller-runtime-operations.d.ts.map +1 -1
  47. package/dist/controller/controller-runtime-operations.js +4 -21
  48. package/dist/controller/controller-runtime-operations.js.map +1 -1
  49. package/dist/controller/controller-runtime-support.d.ts +1 -0
  50. package/dist/controller/controller-runtime-support.d.ts.map +1 -1
  51. package/dist/controller/controller-runtime-support.js +10 -4
  52. package/dist/controller/controller-runtime-support.js.map +1 -1
  53. package/dist/controller/controller-runtime-types.d.ts +3 -1
  54. package/dist/controller/controller-runtime-types.d.ts.map +1 -1
  55. package/dist/controller/controller-runtime.d.ts.map +1 -1
  56. package/dist/controller/controller-runtime.js +64 -20
  57. package/dist/controller/controller-runtime.js.map +1 -1
  58. package/dist/controller/http/controller-request-schemas.d.ts.map +1 -1
  59. package/dist/controller/http/controller-request-schemas.js +2 -6
  60. package/dist/controller/http/controller-request-schemas.js.map +1 -1
  61. package/dist/controller/leases/lease-manager.d.ts.map +1 -1
  62. package/dist/controller/leases/lease-manager.js +1 -3
  63. package/dist/controller/leases/lease-manager.js.map +1 -1
  64. package/dist/controller/worker-task-runner.d.ts.map +1 -1
  65. package/dist/controller/worker-task-runner.js +19 -6
  66. package/dist/controller/worker-task-runner.js.map +1 -1
  67. package/dist/gateway/credential-manager.d.ts.map +1 -1
  68. package/dist/gateway/credential-manager.js +52 -9
  69. package/dist/gateway/credential-manager.js.map +1 -1
  70. package/dist/gateway/gateway-lifecycle-loader.js +1 -1
  71. package/dist/gateway/gateway-recovery.d.ts +19 -0
  72. package/dist/gateway/gateway-recovery.d.ts.map +1 -0
  73. package/dist/gateway/gateway-recovery.js +147 -0
  74. package/dist/gateway/gateway-recovery.js.map +1 -0
  75. package/dist/gateway/gateway-runtime-record.d.ts +33 -0
  76. package/dist/gateway/gateway-runtime-record.d.ts.map +1 -0
  77. package/dist/gateway/gateway-runtime-record.js +114 -0
  78. package/dist/gateway/gateway-runtime-record.js.map +1 -0
  79. package/dist/gateway/gateway-zone-orchestrator.d.ts +4 -0
  80. package/dist/gateway/gateway-zone-orchestrator.d.ts.map +1 -1
  81. package/dist/gateway/gateway-zone-orchestrator.js +60 -19
  82. package/dist/gateway/gateway-zone-orchestrator.js.map +1 -1
  83. package/dist/gateway/gateway-zone-support.d.ts +2 -1
  84. package/dist/gateway/gateway-zone-support.d.ts.map +1 -1
  85. package/dist/gateway/gateway-zone-support.js +34 -0
  86. package/dist/gateway/gateway-zone-support.js.map +1 -1
  87. package/dist/operations/doctor.d.ts.map +1 -1
  88. package/dist/operations/doctor.js +22 -11
  89. package/dist/operations/doctor.js.map +1 -1
  90. package/dist/operations/upgrade-zone.d.ts +0 -1
  91. package/dist/operations/upgrade-zone.d.ts.map +1 -1
  92. package/dist/operations/upgrade-zone.js +0 -1
  93. package/dist/operations/upgrade-zone.js.map +1 -1
  94. package/dist/runtime/project-namespace.d.ts +5 -0
  95. package/dist/runtime/project-namespace.d.ts.map +1 -0
  96. package/dist/runtime/project-namespace.js +22 -0
  97. package/dist/runtime/project-namespace.js.map +1 -0
  98. package/dist/tool-vm/tool-vm-lifecycle.d.ts.map +1 -1
  99. package/dist/tool-vm/tool-vm-lifecycle.js +2 -1
  100. package/dist/tool-vm/tool-vm-lifecycle.js.map +1 -1
  101. package/package.json +9 -7
@@ -12,8 +12,8 @@ interface AgeEncryptionDependencies {
12
12
  * is stored in 1Password per zone. The public key (recipient) is derived
13
13
  * at encryption time via age-keygen -y.
14
14
  *
15
- * Secret keys are never written to disk they're passed via stdin
16
- * using /dev/stdin as the identity file path.
15
+ * Secret keys are written only to a short-lived 0600 temp file for tool
16
+ * compatibility, then deleted immediately after each operation.
17
17
  */
18
18
  export declare function createAgeBackupEncryption(dependencies: AgeEncryptionDependencies): BackupEncryption;
19
19
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"backup-encryption.d.ts","sourceRoot":"","sources":["../../src/backup/backup-encryption.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,UAAU,yBAAyB;IAClC;;mFAE+E;IAC/E,QAAQ,CAAC,eAAe,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAChD;AAiDD;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACxC,YAAY,EAAE,yBAAyB,GACrC,gBAAgB,CAuBlB"}
1
+ {"version":3,"file":"backup-encryption.d.ts","sourceRoot":"","sources":["../../src/backup/backup-encryption.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,UAAU,yBAAyB;IAClC;;mFAE+E;IAC/E,QAAQ,CAAC,eAAe,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAChD;AAqED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACxC,YAAY,EAAE,yBAAyB,GACrC,gBAAgB,CA8BlB"}
@@ -1,4 +1,7 @@
1
1
  import { spawn } from 'node:child_process';
2
+ import fs from 'node:fs/promises';
3
+ import os from 'node:os';
4
+ import path from 'node:path';
2
5
  /**
3
6
  * Run a command with optional stdin input. Returns stdout as a string.
4
7
  * Rejects if the process exits non-zero.
@@ -30,13 +33,25 @@ function runWithStdin(command, args, stdinInput) {
30
33
  }
31
34
  });
32
35
  }
36
+ async function withTemporaryIdentityFile(identityLine, runWithIdentityFile) {
37
+ const temporaryIdentityPath = path.join(os.tmpdir(), `agent-vm-age-identity-${process.pid}-${Date.now()}.txt`);
38
+ await fs.writeFile(temporaryIdentityPath, `${identityLine}\n`, {
39
+ encoding: 'utf8',
40
+ mode: 0o600,
41
+ });
42
+ try {
43
+ return await runWithIdentityFile(temporaryIdentityPath);
44
+ }
45
+ finally {
46
+ await fs.rm(temporaryIdentityPath, { force: true });
47
+ }
48
+ }
33
49
  /**
34
- * Derive the public key (recipient) from an age identity key via stdin.
35
- * No temp files the secret key stays in memory.
50
+ * Derive the public key (recipient) from an age identity key via a short-lived
51
+ * 0600 temp file. `/dev/stdin` is not portable enough across CI runners.
36
52
  */
37
53
  async function deriveRecipientFromIdentity(identityLine) {
38
- const stdout = await runWithStdin('age-keygen', ['-y', '/dev/stdin'], identityLine + '\n');
39
- return stdout.trim();
54
+ return await withTemporaryIdentityFile(identityLine, async (identityFilePath) => (await runWithStdin('age-keygen', ['-y', identityFilePath])).trim());
40
55
  }
41
56
  /**
42
57
  * Age identity-key-based encryption for zone backups.
@@ -45,8 +60,8 @@ async function deriveRecipientFromIdentity(identityLine) {
45
60
  * is stored in 1Password per zone. The public key (recipient) is derived
46
61
  * at encryption time via age-keygen -y.
47
62
  *
48
- * Secret keys are never written to disk they're passed via stdin
49
- * using /dev/stdin as the identity file path.
63
+ * Secret keys are written only to a short-lived 0600 temp file for tool
64
+ * compatibility, then deleted immediately after each operation.
50
65
  */
51
66
  export function createAgeBackupEncryption(dependencies) {
52
67
  return {
@@ -64,7 +79,14 @@ export function createAgeBackupEncryption(dependencies) {
64
79
  },
65
80
  decrypt: async (inputPath, outputPath) => {
66
81
  const identity = await dependencies.resolveIdentity();
67
- await runWithStdin('age', ['--decrypt', '--identity', '/dev/stdin', '--output', outputPath, inputPath], identity + '\n');
82
+ await withTemporaryIdentityFile(identity, async (identityFilePath) => await runWithStdin('age', [
83
+ '--decrypt',
84
+ '--identity',
85
+ identityFilePath,
86
+ '--output',
87
+ outputPath,
88
+ inputPath,
89
+ ]));
68
90
  },
69
91
  };
70
92
  }
@@ -1 +1 @@
1
- {"version":3,"file":"backup-encryption.js","sourceRoot":"","sources":["../../src/backup/backup-encryption.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAW3C;;;GAGG;AACH,SAAS,YAAY,CACpB,OAAe,EACf,IAAuB,EACvB,UAAmB;IAEnB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7E,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACxC,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACxC,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YAC1B,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBAChB,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,OAAO,iBAAiB,IAAI,MAAM,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;gBACxE,OAAO;YACR,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC9B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9B,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACnB,CAAC;aAAM,CAAC;YACP,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACnB,CAAC;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,2BAA2B,CAAC,YAAoB;IAC9D,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC,CAAC;IAC3F,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,yBAAyB,CACxC,YAAuC;IAEvC,OAAO;QACN,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE;YACxC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAC;YACtD,MAAM,SAAS,GAAG,MAAM,2BAA2B,CAAC,QAAQ,CAAC,CAAC;YAC9D,MAAM,YAAY,CAAC,KAAK,EAAE;gBACzB,WAAW;gBACX,aAAa;gBACb,SAAS;gBACT,UAAU;gBACV,UAAU;gBACV,SAAS;aACT,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE;YACxC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAC;YACtD,MAAM,YAAY,CACjB,KAAK,EACL,CAAC,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAC5E,QAAQ,GAAG,IAAI,CACf,CAAC;QACH,CAAC;KACD,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"backup-encryption.js","sourceRoot":"","sources":["../../src/backup/backup-encryption.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"gondolin-image-builder.d.ts","sourceRoot":"","sources":["../../src/build/gondolin-image-builder.ts"],"names":[],"mappings":"AAGA,OAAO,EAIN,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,WAAW,gCAAgC;IAChD,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChF,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;CAC7E;AAMD,wBAAsB,gCAAgC,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG/F;AAED,wBAAsB,kBAAkB,CACvC,OAAO,EAAE;IACR,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC7B,EACD,YAAY,GAAE,gCAAqC,GACjD,OAAO,CAAC,gBAAgB,CAAC,CAY3B"}
1
+ {"version":3,"file":"gondolin-image-builder.d.ts","sourceRoot":"","sources":["../../src/build/gondolin-image-builder.ts"],"names":[],"mappings":"AAGA,OAAO,EAGN,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,WAAW,gCAAgC;IAChD,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChF,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;CAC7E;AAOD,wBAAsB,gCAAgC,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG/F;AAED,wBAAsB,kBAAkB,CACvC,OAAO,EAAE;IACR,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC7B,EACD,YAAY,GAAE,gCAAqC,GACjD,OAAO,CAAC,gBAAgB,CAAC,CAY3B"}
@@ -1,8 +1,9 @@
1
1
  import fs from 'node:fs/promises';
2
2
  import path from 'node:path';
3
- import { buildImage as buildImageFromCore, computeBuildFingerprint, parseBuildConfig, } from '@shravansunder/gondolin-core';
3
+ import { buildImage as buildImageFromCore, computeBuildFingerprint, } from '@shravansunder/gondolin-core';
4
4
  async function loadBuildConfigFromJson(buildConfigPath) {
5
- return parseBuildConfig(await fs.readFile(buildConfigPath, 'utf8'));
5
+ const rawContents = await fs.readFile(buildConfigPath, 'utf8');
6
+ return JSON.parse(rawContents);
6
7
  }
7
8
  export async function computeFingerprintFromConfigPath(buildConfigPath) {
8
9
  const buildConfig = await loadBuildConfigFromJson(buildConfigPath);
@@ -1 +1 @@
1
- {"version":3,"file":"gondolin-image-builder.js","sourceRoot":"","sources":["../../src/build/gondolin-image-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACN,UAAU,IAAI,kBAAkB,EAChC,uBAAuB,EACvB,gBAAgB,GAIhB,MAAM,8BAA8B,CAAC;AAOtC,KAAK,UAAU,uBAAuB,CAAC,eAAuB;IAC7D,OAAO,gBAAgB,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gCAAgC,CAAC,eAAuB;IAC7E,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,eAAe,CAAC,CAAC;IACnE,OAAO,uBAAuB,CAAC,WAAW,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,OAIC,EACD,eAAiD,EAAE;IAEnD,MAAM,eAAe,GAAG,YAAY,CAAC,eAAe,IAAI,uBAAuB,CAAC;IAChF,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,IAAI,kBAAkB,CAAC;IACjE,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAEnE,OAAO,MAAM,UAAU,CAAC;QACvB,WAAW;QACX,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,SAAS;QACT,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"gondolin-image-builder.js","sourceRoot":"","sources":["../../src/build/gondolin-image-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACN,UAAU,IAAI,kBAAkB,EAChC,uBAAuB,GAIvB,MAAM,8BAA8B,CAAC;AAOtC,KAAK,UAAU,uBAAuB,CAAC,eAAuB;IAC7D,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAC/D,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAgB,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gCAAgC,CAAC,eAAuB;IAC7E,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,eAAe,CAAC,CAAC;IACnE,OAAO,uBAAuB,CAAC,WAAW,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,OAIC,EACD,eAAiD,EAAE;IAEnD,MAAM,eAAe,GAAG,YAAY,CAAC,eAAe,IAAI,uBAAuB,CAAC;IAChF,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,IAAI,kBAAkB,CAAC;IACjE,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAEnE,OAAO,MAAM,UAAU,CAAC;QACvB,WAAW;QACX,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,SAAS;QACT,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC,CAAC;AACJ,CAAC"}
@@ -18,6 +18,7 @@ export interface CliDependencies {
18
18
  readonly createSecretResolver: typeof createOpCliSecretResolver;
19
19
  readonly createZoneBackupManager: typeof createZoneBackupManager;
20
20
  readonly getCurrentWorkingDirectory?: () => string;
21
+ readonly isGatewayImageCached?: (systemConfig: SystemConfig) => Promise<boolean>;
21
22
  readonly loadSystemConfig: typeof loadSystemConfig;
22
23
  readonly runBuildCommand?: typeof runBuildCommand;
23
24
  readonly runCacheCommand?: typeof runCacheCommand;
@@ -1 +1 @@
1
- {"version":3,"file":"agent-vm-cli-support.d.ts","sourceRoot":"","sources":["../../src/cli/agent-vm-cli-support.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"agent-vm-cli-support.d.ts","sourceRoot":"","sources":["../../src/cli/agent-vm-cli-support.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ import { createOpCliSecretResolver, resolveServiceAccountToken, } from '@shravan
2
2
  import { createAgeBackupEncryption } from '../backup/backup-encryption.js';
3
3
  import { createZoneBackupManager } from '../backup/backup-manager.js';
4
4
  import { loadSystemConfig } from '../config/system-config.js';
5
+ import { createSecretResolver as createControllerSecretResolver } from '../controller/controller-runtime-support.js';
5
6
  import { startControllerRuntime } from '../controller/controller-runtime.js';
6
7
  import { createControllerClient } from '../controller/http/controller-client.js';
7
8
  import { startGatewayZone } from '../gateway/gateway-zone-orchestrator.js';
@@ -32,9 +33,9 @@ export function writeJson(io, value) {
32
33
  export function resolveConfigPath(argv) {
33
34
  const configFlagIndex = argv.indexOf('--config');
34
35
  if (configFlagIndex >= 0) {
35
- return argv[configFlagIndex + 1] ?? 'system.json';
36
+ return argv[configFlagIndex + 1] ?? 'config/system.json';
36
37
  }
37
- return 'system.json';
38
+ return 'config/system.json';
38
39
  }
39
40
  export function readZoneFlag(argv) {
40
41
  const zoneFlagIndex = argv.indexOf('--zone');
@@ -63,10 +64,6 @@ export function requireZone(systemConfig, zoneFlag) {
63
64
  throw new Error(`--zone is required. Available zones:\n${zoneList}`);
64
65
  }
65
66
  export async function createResolverFromSystemConfig(systemConfig, dependencies) {
66
- const tokenSource = systemConfig.host.secretsProvider.tokenSource;
67
- const serviceAccountToken = await dependencies.resolveServiceAccountToken(tokenSource);
68
- return await dependencies.createSecretResolver({
69
- serviceAccountToken,
70
- });
67
+ return await createControllerSecretResolver(systemConfig, dependencies.createSecretResolver, dependencies.resolveServiceAccountToken);
71
68
  }
72
69
  //# sourceMappingURL=agent-vm-cli-support.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"agent-vm-cli-support.js","sourceRoot":"","sources":["../../src/cli/agent-vm-cli-support.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"agent-vm-cli-support.js","sourceRoot":"","sources":["../../src/cli/agent-vm-cli-support.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"auth-interactive-command.d.ts","sourceRoot":"","sources":["../../src/cli/auth-interactive-command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAE1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EACN,KAAK,eAAe,EACpB,KAAK,KAAK,EAEV,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAA+B,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE5F,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAChD,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,CACrB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,SAAS,MAAM,EAAE,KACzB,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9F,QAAQ,CAAC,SAAS,EAAE,qBAAqB,CAAC;CAC1C,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAuC7B;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE;IACxD,QAAQ,CAAC,UAAU,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACnD,QAAQ,CAAC,YAAY,EAAE,IAAI,CAC1B,eAAe,EACf,wBAAwB,GAAG,YAAY,GAAG,uBAAuB,CACjE,CAAC;IACF,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,CACrB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,SAAS,MAAM,EAAE,KACzB,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9F,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDhB"}
1
+ {"version":3,"file":"auth-interactive-command.d.ts","sourceRoot":"","sources":["../../src/cli/auth-interactive-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAG1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EACN,KAAK,eAAe,EACpB,KAAK,KAAK,EAEV,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAA+B,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAY5F,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAChD,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,CACrB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,SAAS,MAAM,EAAE,KACzB,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9F,QAAQ,CAAC,SAAS,EAAE,qBAAqB,CAAC;CAC1C,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAuC7B;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE;IACxD,QAAQ,CAAC,UAAU,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACnD,QAAQ,CAAC,YAAY,EAAE,IAAI,CAC1B,eAAe,EACf,wBAAwB,GAAG,YAAY,GAAG,uBAAuB,CACjE,CAAC;IACF,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,CACrB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,SAAS,MAAM,EAAE,KACzB,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9F,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDhB"}
@@ -1,6 +1,13 @@
1
1
  import { execa } from 'execa';
2
2
  import { resolveControllerBaseUrl, } from './agent-vm-cli-support.js';
3
3
  import { zoneSshAccessResponseSchema } from './ssh-commands.js';
4
+ const openClawShellEnvFilePath = '/etc/profile.d/openclaw-env.sh';
5
+ function shellQuote(value) {
6
+ return `'${value.replace(/'/gu, `'\\''`)}'`;
7
+ }
8
+ function wrapWithOpenClawShellEnvironment(command) {
9
+ return `bash -lc ${shellQuote(`source ${openClawShellEnvFilePath} && ${command}`)}`;
10
+ }
4
11
  export async function listAuthProviders(options) {
5
12
  if (!options.sshAccess.host || !options.sshAccess.port) {
6
13
  throw new Error('Cannot list auth providers: controller returned incomplete SSH access.');
@@ -23,7 +30,7 @@ export async function listAuthProviders(options) {
23
30
  '-p',
24
31
  String(options.sshAccess.port),
25
32
  `${options.sshAccess.user ?? 'root'}@${options.sshAccess.host}`,
26
- options.listProvidersCommand,
33
+ wrapWithOpenClawShellEnvironment(options.listProvidersCommand),
27
34
  ]);
28
35
  if (commandResult.exitCode !== 0) {
29
36
  throw new Error(`Failed to list auth providers: ${commandResult.stderr || `ssh exited with ${commandResult.exitCode}`}`);
@@ -58,7 +65,7 @@ export async function runAuthInteractiveCommand(options) {
58
65
  '-p',
59
66
  String(sshResponse.port),
60
67
  `${sshResponse.user ?? 'root'}@${sshResponse.host}`,
61
- options.authConfig.buildLoginCommand(options.provider),
68
+ wrapWithOpenClawShellEnvironment(options.authConfig.buildLoginCommand(options.provider)),
62
69
  ];
63
70
  const runInteractiveProcess = options.dependencies.runInteractiveProcess ??
64
71
  (async (command, arguments_) => {
@@ -1 +1 @@
1
- {"version":3,"file":"auth-interactive-command.js","sourceRoot":"","sources":["../../src/cli/auth-interactive-command.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-interactive-command.js","sourceRoot":"","sources":["../../src/cli/auth-interactive-command.ts"],"names":[],"mappings":"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"}
@@ -13,6 +13,8 @@ export interface BuildCommandDependencies {
13
13
  readonly resolveOciImageTag?: (buildConfigPath: string) => Promise<string>;
14
14
  /** Override the task runner for testing (bypasses tasuku terminal rendering). */
15
15
  readonly runTask?: (title: string, fn: () => Promise<void>) => Promise<void>;
16
+ readonly resolveProjectRootFromDockerfile?: (dockerfilePath: string) => Promise<string>;
17
+ readonly syncBundledOpenClawPlugin?: (targetDir: string) => Promise<'created' | 'skipped'>;
16
18
  }
17
19
  export declare function runBuildCommand(options: {
18
20
  readonly forceRebuild?: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"build-command.d.ts","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAMrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG/D,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;KAC1B,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,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;KAC7B,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3E,iFAAiF;IACjF,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7E;AAiCD,wBAAsB,eAAe,CACpC,OAAO,EAAE;IACR,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACpC,EACD,YAAY,GAAE,wBAA6B,GACzC,OAAO,CAAC,IAAI,CAAC,CA8Cf"}
1
+ {"version":3,"file":"build-command.d.ts","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAMrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI/D,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;KAC1B,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,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;KAC7B,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3E,iFAAiF;IACjF,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7E,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxF,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;CAC3F;AAqDD,wBAAsB,eAAe,CACpC,OAAO,EAAE;IACR,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACpC,EACD,YAAY,GAAE,wBAA6B,GACzC,OAAO,CAAC,IAAI,CAAC,CAmEf"}
@@ -5,6 +5,7 @@ import { z } from 'zod';
5
5
  import { buildDockerImage as buildDockerImageDefault } from '../build/docker-image-builder.js';
6
6
  import { buildGondolinImage as buildGondolinImageDefault } from '../build/gondolin-image-builder.js';
7
7
  import { formatZodError } from './format-zod-error.js';
8
+ import { syncBundledOpenClawPluginBundle } from './openclaw-plugin-bundle.js';
8
9
  const ociImageTagSchema = z.object({
9
10
  oci: z.object({
10
11
  image: z.string().min(1),
@@ -25,11 +26,32 @@ async function defaultRunTask(title, fn) {
25
26
  taskState.setTitle(`${title} done`);
26
27
  });
27
28
  }
29
+ async function resolveProjectRootFromDockerfile(dockerfilePath) {
30
+ let searchDirectory = path.dirname(path.resolve(dockerfilePath));
31
+ for (;;) {
32
+ try {
33
+ // oxlint-disable-next-line no-await-in-loop -- upward root discovery is intentionally sequential
34
+ await fs.access(path.join(searchDirectory, 'config', 'system.json'));
35
+ return searchDirectory;
36
+ }
37
+ catch {
38
+ const parentDirectory = path.dirname(searchDirectory);
39
+ if (parentDirectory === searchDirectory) {
40
+ // Fallback for older test scaffolds and legacy layouts that still follow the
41
+ // standard images/gateway/Dockerfile shape but do not materialize config/system.json.
42
+ return path.resolve(dockerfilePath, '..', '..', '..');
43
+ }
44
+ searchDirectory = parentDirectory;
45
+ }
46
+ }
47
+ }
28
48
  export async function runBuildCommand(options, dependencies = {}) {
29
49
  const buildDockerImage = dependencies.buildDockerImage ?? buildDockerImageDefault;
30
50
  const buildGondolinImage = dependencies.buildGondolinImage ?? buildGondolinImageDefault;
31
51
  const resolveOciImageTag = dependencies.resolveOciImageTag ?? resolveOciImageTagFromConfig;
32
52
  const runTaskStep = dependencies.runTask ?? defaultRunTask;
53
+ const resolveProjectRoot = dependencies.resolveProjectRootFromDockerfile ?? resolveProjectRootFromDockerfile;
54
+ const syncBundledOpenClawPlugin = dependencies.syncBundledOpenClawPlugin ?? syncBundledOpenClawPluginBundle;
33
55
  const imageTargets = [
34
56
  {
35
57
  buildConfigPath: options.systemConfig.images.gateway.buildConfig,
@@ -43,8 +65,22 @@ export async function runBuildCommand(options, dependencies = {}) {
43
65
  },
44
66
  ];
45
67
  const dockerImageTargets = imageTargets.filter((imageTarget) => imageTarget.dockerfile !== undefined);
68
+ // oxlint-disable-next-line no-await-in-loop -- image builds are intentionally sequential for stable task output and shared image tags
46
69
  for (const imageTarget of dockerImageTargets) {
70
+ // oxlint-disable-next-line no-await-in-loop -- each image tag is resolved in lockstep with its matching build task
47
71
  const imageTag = await resolveOciImageTag(imageTarget.buildConfigPath);
72
+ if (imageTarget.name === 'gateway' &&
73
+ options.systemConfig.zones.some((zone) => zone.gateway.type === 'openclaw')) {
74
+ // Resolve the scaffold root via config/system.json instead of assuming a fixed
75
+ // images/gateway/Dockerfile depth.
76
+ // oxlint-disable-next-line no-await-in-loop -- root discovery belongs to the matching build target
77
+ const projectRootDirectory = await resolveProjectRoot(imageTarget.dockerfile);
78
+ // oxlint-disable-next-line no-await-in-loop -- bundle sync must complete before the matching docker build starts
79
+ await runTaskStep('OpenClaw plugin bundle', async () => {
80
+ await syncBundledOpenClawPlugin(projectRootDirectory);
81
+ });
82
+ }
83
+ // oxlint-disable-next-line no-await-in-loop -- docker builds intentionally run one at a time to keep task output readable
48
84
  await runTaskStep(`Docker: ${imageTarget.name} (${imageTag})`, async () => {
49
85
  await buildDockerImage({
50
86
  dockerfilePath: imageTarget.dockerfile,
@@ -56,6 +92,7 @@ export async function runBuildCommand(options, dependencies = {}) {
56
92
  for (const imageTarget of imageTargets) {
57
93
  const cacheDirectory = path.join(options.systemConfig.cacheDir, 'images', imageTarget.name);
58
94
  const shouldResetGondolinCache = options.forceRebuild === true || dockerBackedTargets.has(imageTarget.name);
95
+ // oxlint-disable-next-line no-await-in-loop -- gondolin cache rebuilds are intentionally sequenced per image target
59
96
  await runTaskStep(`Gondolin: ${imageTarget.name}`, async () => {
60
97
  await buildGondolinImage({
61
98
  buildConfigPath: imageTarget.buildConfigPath,
@@ -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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"}
@@ -7,8 +7,8 @@ export function createConfigOption() {
7
7
  type: optional(string),
8
8
  long: 'config',
9
9
  short: 'c',
10
- description: 'Path to system.json',
11
- defaultValue: () => 'system.json',
10
+ description: 'Path to config/system.json',
11
+ defaultValue: () => 'config/system.json',
12
12
  });
13
13
  }
14
14
  export function createZoneOption() {
@@ -44,7 +44,7 @@ export function createRemoteCommandArguments() {
44
44
  });
45
45
  }
46
46
  export function loadSystemConfigFromOption(configPath, dependencies) {
47
- const resolvedConfigPath = configPath ?? 'system.json';
47
+ const resolvedConfigPath = configPath ?? 'config/system.json';
48
48
  return dependencies.loadSystemConfig(resolvedConfigPath).catch((error) => {
49
49
  if (error instanceof ZodError) {
50
50
  throw new Error(formatZodError(`Invalid ${resolvedConfigPath} configuration:`, error), {
@@ -66,9 +66,9 @@ export function parseGatewayType(gatewayType) {
66
66
  if (gatewayType === 'openclaw') {
67
67
  return gatewayType;
68
68
  }
69
- if (gatewayType === 'coding') {
69
+ if (gatewayType === 'worker') {
70
70
  return gatewayType;
71
71
  }
72
- throw new Error(`Gateway type is required. Expected 'openclaw' or 'coding'${gatewayType ? `, got '${gatewayType}'` : ''}.`);
72
+ throw new Error(`Gateway type is required. Expected 'openclaw' or 'worker'${gatewayType ? `, got '${gatewayType}'` : ''}.`);
73
73
  }
74
74
  //# sourceMappingURL=command-definition-support.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"command-definition-support.js","sourceRoot":"","sources":["../../../src/cli/commands/command-definition-support.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAI/B,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,MAAM,UAAU,kBAAkB;IACjC,OAAO,MAAM,CAAC;QACb,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;QACtB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,qBAAqB;QAClC,YAAY,EAAE,GAAG,EAAE,CAAC,aAAa;KACjC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC/B,OAAO,MAAM,CAAC;QACb,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;QACtB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,sDAAsD;KACnE,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB;IAChC,OAAO,IAAI,CAAC;QACX,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,gCAAgC;KAC7C,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe;IAC9B,OAAO,IAAI,CAAC;QACX,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,4CAA4C;KACzD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe;IAC9B,OAAO,IAAI,CAAC;QACX,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,kDAAkD;KAC/D,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B;IAC3C,OAAO,eAAe,CAAC;QACtB,WAAW,EAAE,gBAAgB;QAC7B,WAAW,EAAE,4CAA4C;KACzD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CACzC,UAA8B,EAC9B,YAAuD;IAEvD,MAAM,kBAAkB,GAAG,UAAU,IAAI,aAAa,CAAC;IACvD,OAAO,YAAY,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;QACjF,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,WAAW,kBAAkB,iBAAiB,EAAE,KAAK,CAAC,EAAE;gBACtF,KAAK,EAAE,KAAK;aACZ,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,kBAAkB,KAAK,KAAK,CAAC,OAAO,EAAE,EAAE;gBAC1E,KAAK,EAAE,KAAK;aACZ,CAAC,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACb,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,UAAoB,EAAE,MAAc;IACtE,OAAO,CAAC,GAAG,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,WAA+B;IAC/D,IAAI,WAAW,KAAK,UAAU,EAAE,CAAC;QAChC,OAAO,WAAW,CAAC;IACpB,CAAC;IACD,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,WAAW,CAAC;IACpB,CAAC;IAED,MAAM,IAAI,KAAK,CACd,4DAA4D,WAAW,CAAC,CAAC,CAAC,UAAU,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAC1G,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"command-definition-support.js","sourceRoot":"","sources":["../../../src/cli/commands/command-definition-support.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAI/B,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,MAAM,UAAU,kBAAkB;IACjC,OAAO,MAAM,CAAC;QACb,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;QACtB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,4BAA4B;QACzC,YAAY,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACxC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC/B,OAAO,MAAM,CAAC;QACb,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;QACtB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,sDAAsD;KACnE,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB;IAChC,OAAO,IAAI,CAAC;QACX,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,gCAAgC;KAC7C,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe;IAC9B,OAAO,IAAI,CAAC;QACX,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,4CAA4C;KACzD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe;IAC9B,OAAO,IAAI,CAAC;QACX,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,kDAAkD;KAC/D,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B;IAC3C,OAAO,eAAe,CAAC;QACtB,WAAW,EAAE,gBAAgB;QAC7B,WAAW,EAAE,4CAA4C;KACzD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CACzC,UAA8B,EAC9B,YAAuD;IAEvD,MAAM,kBAAkB,GAAG,UAAU,IAAI,oBAAoB,CAAC;IAC9D,OAAO,YAAY,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;QACjF,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,WAAW,kBAAkB,iBAAiB,EAAE,KAAK,CAAC,EAAE;gBACtF,KAAK,EAAE,KAAK;aACZ,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,kBAAkB,KAAK,KAAK,CAAC,OAAO,EAAE,EAAE;gBAC1E,KAAK,EAAE,KAAK;aACZ,CAAC,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACb,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,UAAoB,EAAE,MAAc;IACtE,OAAO,CAAC,GAAG,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,WAA+B;IAC/D,IAAI,WAAW,KAAK,UAAU,EAAE,CAAC;QAChC,OAAO,WAAW,CAAC;IACpB,CAAC;IACD,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,WAAW,CAAC;IACpB,CAAC;IAED,MAAM,IAAI,KAAK,CACd,4DAA4D,WAAW,CAAC,CAAC,CAAC,UAAU,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAC1G,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"controller-definition.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/controller-definition.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,KAAK,EAAe,MAAM,4BAA4B,CAAC;AAwE3F,wBAAgB,2BAA2B,CAAC,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6JnF"}
1
+ {"version":3,"file":"controller-definition.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/controller-definition.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,KAAK,EAAe,MAAM,4BAA4B,CAAC;AAmF3F,wBAAgB,2BAA2B,CAAC,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6JnF"}
@@ -36,13 +36,18 @@ function createControllerOperationSubcommand(io, dependencies, options) {
36
36
  },
37
37
  });
38
38
  }
39
- async function warnIfGatewayImageCacheIsCold(io, systemConfig) {
39
+ async function isGatewayImageCached(systemConfig) {
40
40
  const gatewayFingerprint = await computeFingerprintFromConfigPath(systemConfig.images.gateway.buildConfig);
41
41
  const gatewayCachePath = path.join(systemConfig.cacheDir, 'images', 'gateway', gatewayFingerprint);
42
- if (!fs.existsSync(path.join(gatewayCachePath, 'manifest.json'))) {
43
- io.stderr.write('[start] Gateway image not cached. Run `agent-vm build` first for faster startup.\n');
44
- io.stderr.write('[start] Building inline...\n');
42
+ return fs.existsSync(path.join(gatewayCachePath, 'manifest.json'));
43
+ }
44
+ async function requireGatewayImageCache(systemConfig, zoneId, dependencies) {
45
+ const cacheIsWarm = (await dependencies.isGatewayImageCached?.(systemConfig)) ??
46
+ (await isGatewayImageCached(systemConfig));
47
+ if (cacheIsWarm) {
48
+ return;
45
49
  }
50
+ throw new Error(`[start] Gateway image not cached. Run \`agent-vm build\` first, then retry \`agent-vm controller start --zone ${zoneId}\`.`);
46
51
  }
47
52
  export function createControllerSubcommands(io, dependencies) {
48
53
  return subcommands({
@@ -59,7 +64,7 @@ export function createControllerSubcommands(io, dependencies) {
59
64
  handler: async ({ config, zone }) => {
60
65
  const systemConfig = await loadSystemConfigFromOption(config, dependencies);
61
66
  const selectedZone = requireZone(systemConfig, zone);
62
- await warnIfGatewayImageCacheIsCold(io, systemConfig);
67
+ await requireGatewayImageCache(systemConfig, selectedZone.id, dependencies);
63
68
  const runTask = await createRunTask(io);
64
69
  const runtime = await dependencies.startControllerRuntime({
65
70
  systemConfig,
@@ -1 +1 @@
1
- {"version":3,"file":"controller-definition.js","sourceRoot":"","sources":["../../../src/cli/commands/controller-definition.ts"],"names":[],"mappings":"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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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"}