@agent-vm/agent-vm 0.0.25 → 0.0.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build/docker-image-builder.d.ts.map +1 -1
- package/dist/build/docker-image-builder.js +1 -0
- package/dist/build/docker-image-builder.js.map +1 -1
- package/dist/cli/agent-vm-cli-support.d.ts +2 -1
- package/dist/cli/agent-vm-cli-support.d.ts.map +1 -1
- package/dist/cli/agent-vm-cli-support.js +2 -1
- package/dist/cli/agent-vm-cli-support.js.map +1 -1
- package/dist/cli/build-command.d.ts +1 -1
- package/dist/cli/build-command.d.ts.map +1 -1
- package/dist/cli/build-command.js +3 -6
- package/dist/cli/build-command.js.map +1 -1
- package/dist/cli/commands/build-definition.js +2 -2
- package/dist/cli/commands/build-definition.js.map +1 -1
- package/dist/cli/controller-operation-commands.d.ts.map +1 -1
- package/dist/cli/controller-operation-commands.js +51 -4
- package/dist/cli/controller-operation-commands.js.map +1 -1
- package/dist/cli/run-task.d.ts +1 -0
- package/dist/cli/run-task.d.ts.map +1 -1
- package/dist/cli/run-task.js +8 -5
- package/dist/cli/run-task.js.map +1 -1
- package/dist/operations/doctor.d.ts +4 -1
- package/dist/operations/doctor.d.ts.map +1 -1
- package/dist/operations/doctor.js +101 -0
- package/dist/operations/doctor.js.map +1 -1
- package/package.json +7 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-image-builder.d.ts","sourceRoot":"","sources":["../../src/build/docker-image-builder.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,8BAA8B;IAC9C,QAAQ,CAAC,cAAc,CAAC,EAAE,CACzB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,KACnB,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;CAC1B;AAMD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,uBAAuB,EAChC,YAAY,GAAE,8BAAmC,GAC/C,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"docker-image-builder.d.ts","sourceRoot":"","sources":["../../src/build/docker-image-builder.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,8BAA8B;IAC9C,QAAQ,CAAC,cAAc,CAAC,EAAE,CACzB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,KACnB,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;CAC1B;AAMD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,uBAAuB,EAChC,YAAY,GAAE,8BAAmC,GAC/C,OAAO,CAAC,IAAI,CAAC,CAqBf"}
|
|
@@ -1 +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;AAgB9B,KAAK,UAAU,oBAAoB,CAAC,OAAe,EAAE,IAAuB;IAC3E,MAAM,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AAClD,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,CAAC,QAAQ,EAAE;YAC9B,OAAO;YACP,IAAI;YACJ,sBAAsB;YACtB,IAAI;YACJ,OAAO,CAAC,QAAQ;YAChB,2BAA2B;SAC3B,CAAC,CAAC;IACJ,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"}
|
|
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;AAgB9B,KAAK,UAAU,oBAAoB,CAAC,OAAe,EAAE,IAAuB;IAC3E,MAAM,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AAClD,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,CAAC,QAAQ,EAAE;YAC9B,OAAO;YACP,kBAAkB;YAClB,IAAI;YACJ,sBAAsB;YACtB,IAAI;YACJ,OAAO,CAAC,QAAQ;YAChB,2BAA2B;SAC3B,CAAC,CAAC;IACJ,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { SecretResolver } from '@agent-vm/gondolin-adapter';
|
|
2
|
-
import { createOpCliSecretResolver, resolveServiceAccountToken } from '@agent-vm/gondolin-adapter';
|
|
2
|
+
import { createOpCliSecretResolver, resolveGondolinMinimumZigVersion, resolveServiceAccountToken } from '@agent-vm/gondolin-adapter';
|
|
3
3
|
import { createAgeBackupEncryption } from '../backup/backup-encryption.js';
|
|
4
4
|
import { createZoneBackupManager } from '../backup/backup-manager.js';
|
|
5
5
|
import { type LoadedSystemConfig, type SystemConfig } from '../config/system-config.js';
|
|
@@ -41,6 +41,7 @@ export interface CliDependencies {
|
|
|
41
41
|
}>;
|
|
42
42
|
readonly runInteractiveProcess?: (command: string, arguments_: readonly string[]) => Promise<void>;
|
|
43
43
|
readonly resolveServiceAccountToken: typeof resolveServiceAccountToken;
|
|
44
|
+
readonly resolveGondolinMinimumZigVersion: typeof resolveGondolinMinimumZigVersion;
|
|
44
45
|
readonly runControllerDoctor: typeof runControllerDoctor;
|
|
45
46
|
readonly runConfigValidation?: typeof runConfigValidation;
|
|
46
47
|
readonly promptAndStoreServiceAccountToken?: () => Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-vm-cli-support.d.ts","sourceRoot":"","sources":["../../src/cli/agent-vm-cli-support.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,
|
|
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,4 +1,4 @@
|
|
|
1
|
-
import { createOpCliSecretResolver, resolveServiceAccountToken } from '@agent-vm/gondolin-adapter';
|
|
1
|
+
import { createOpCliSecretResolver, resolveGondolinMinimumZigVersion, resolveServiceAccountToken, } from '@agent-vm/gondolin-adapter';
|
|
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';
|
|
@@ -24,6 +24,7 @@ export const defaultCliDependencies = {
|
|
|
24
24
|
loadSystemConfig,
|
|
25
25
|
runBuildCommand,
|
|
26
26
|
runCacheCommand,
|
|
27
|
+
resolveGondolinMinimumZigVersion,
|
|
27
28
|
resolveServiceAccountToken,
|
|
28
29
|
runControllerDoctor,
|
|
29
30
|
runConfigValidation,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-vm-cli-support.js","sourceRoot":"","sources":["../../src/cli/agent-vm-cli-support.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"agent-vm-cli-support.js","sourceRoot":"","sources":["../../src/cli/agent-vm-cli-support.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export interface BuildCommandDependencies {
|
|
|
12
12
|
readonly fullReset?: boolean;
|
|
13
13
|
}) => Promise<BuildImageResult>;
|
|
14
14
|
readonly resolveOciImageTag?: (buildConfigPath: string) => Promise<string>;
|
|
15
|
-
/** Override the task runner for testing
|
|
15
|
+
/** Override the task runner for testing or custom CLI progress. */
|
|
16
16
|
readonly runTask?: (title: string, fn: () => Promise<void>) => Promise<void>;
|
|
17
17
|
readonly resolveProjectRootFromDockerfile?: (dockerfilePath: string) => Promise<string>;
|
|
18
18
|
readonly syncBundledOpenClawPlugin?: (targetDir: string, profileName: string) => Promise<'created' | 'skipped'>;
|
|
@@ -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,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"build-command.d.ts","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAIrE,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,yBAAyB,EAAE,MAAM,CAAC;QAC3C,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,mEAAmE;IACnE,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,CACpC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,KACf,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;CACpC;AAkFD,wBAAsB,eAAe,CACpC,OAAO,EAAE;IACR,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;CAC1C,EACD,YAAY,GAAE,wBAA6B,GACzC,OAAO,CAAC,IAAI,CAAC,CAsFf"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import task from 'tasuku';
|
|
4
3
|
import { z } from 'zod';
|
|
5
4
|
import { buildDockerImage as buildDockerImageDefault } from '../build/docker-image-builder.js';
|
|
6
5
|
import { buildGondolinImage as buildGondolinImageDefault } from '../build/gondolin-image-builder.js';
|
|
@@ -38,11 +37,9 @@ async function assertUniqueDockerImageTags(imageTargets, resolveOciImageTag) {
|
|
|
38
37
|
return tagByProfile;
|
|
39
38
|
}
|
|
40
39
|
async function defaultRunTask(title, fn) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
taskState.setTitle(`${title} done`);
|
|
45
|
-
});
|
|
40
|
+
process.stderr.write(` ${title}...\n`);
|
|
41
|
+
await fn();
|
|
42
|
+
process.stderr.write(` ${title} done\n`);
|
|
46
43
|
}
|
|
47
44
|
async function resolveProjectRootFromDockerfile(dockerfilePath) {
|
|
48
45
|
let searchDirectory = path.dirname(path.resolve(dockerfilePath));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-command.js","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,
|
|
1
|
+
{"version":3,"file":"build-command.js","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// oxlint-disable typescript-eslint/explicit-function-return-type
|
|
2
2
|
import { command, flag } from 'cmd-ts';
|
|
3
3
|
import { runBuildCommand } from '../build-command.js';
|
|
4
|
-
import {
|
|
4
|
+
import { createPlainRunTask } from '../run-task.js';
|
|
5
5
|
import { createConfigOption, loadSystemConfigFromOption } from './command-definition-support.js';
|
|
6
6
|
export function createBuildCommand(_io, dependencies) {
|
|
7
7
|
return command({
|
|
@@ -16,7 +16,7 @@ export function createBuildCommand(_io, dependencies) {
|
|
|
16
16
|
},
|
|
17
17
|
handler: async ({ config, force }) => {
|
|
18
18
|
const systemConfig = await loadSystemConfigFromOption(config, dependencies);
|
|
19
|
-
const runTask =
|
|
19
|
+
const runTask = createPlainRunTask(_io);
|
|
20
20
|
await (dependencies.runBuildCommand ?? runBuildCommand)({
|
|
21
21
|
forceRebuild: force,
|
|
22
22
|
systemConfig,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-definition.js","sourceRoot":"","sources":["../../../src/cli/commands/build-definition.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGvC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"build-definition.js","sourceRoot":"","sources":["../../../src/cli/commands/build-definition.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGvC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAEjG,MAAM,UAAU,kBAAkB,CAAC,GAAU,EAAE,YAA6B;IAC3E,OAAO,OAAO,CAAC;QACd,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,gDAAgD;QAC7D,IAAI,EAAE;YACL,MAAM,EAAE,kBAAkB,EAAE;YAC5B,KAAK,EAAE,IAAI,CAAC;gBACX,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,+BAA+B;aAC5C,CAAC;SACF;QACD,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;YACpC,MAAM,YAAY,GAAG,MAAM,0BAA0B,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAC5E,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,CAAC,YAAY,CAAC,eAAe,IAAI,eAAe,CAAC,CACtD;gBACC,YAAY,EAAE,KAAK;gBACnB,YAAY;aACZ,EACD,EAAE,OAAO,EAAE,CACX,CAAC;QACH,CAAC;KACD,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-operation-commands.d.ts","sourceRoot":"","sources":["../../src/cli/controller-operation-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"controller-operation-commands.d.ts","sourceRoot":"","sources":["../../src/cli/controller-operation-commands.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAgB,MAAM,4BAA4B,CAAC;AAGnF,OAAO,EAEN,KAAK,eAAe,EACpB,KAAK,KAAK,EAKV,MAAM,2BAA2B,CAAC;AAEnC,UAAU,oCAAoC;IAC7C,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,UAAU,EAChB,aAAa,GACb,SAAS,GACT,QAAQ,GACR,MAAM,GACN,QAAQ,GACR,MAAM,GACN,SAAS,CAAC;IACb,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;CAC1C;AA+FD,wBAAsB,6BAA6B,CAClD,OAAO,EAAE,oCAAoC,GAC3C,OAAO,CAAC,IAAI,CAAC,CAmGf"}
|
|
@@ -1,14 +1,23 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { constants } from 'node:fs';
|
|
2
|
+
import fs from 'node:fs/promises';
|
|
2
3
|
import { loadWorkerConfigDraft } from '@agent-vm/agent-vm-worker';
|
|
4
|
+
import { execa } from 'execa';
|
|
3
5
|
import { loadSystemCacheIdentifier } from '../config/system-cache-identifier.js';
|
|
4
6
|
import { resolveZoneSecrets } from '../gateway/credential-manager.js';
|
|
5
7
|
import { collectVmHostSystemDoctorCheck } from '../operations/doctor.js';
|
|
6
8
|
import { createResolverFromSystemConfig, readZoneFlag, requireZone, resolveControllerBaseUrl, writeJson, } from './agent-vm-cli-support.js';
|
|
7
|
-
function collectAvailableBinaryNames(requiredBinaries) {
|
|
9
|
+
async function collectAvailableBinaryNames(requiredBinaries) {
|
|
8
10
|
const availableBinaries = new Set();
|
|
9
11
|
for (const binary of requiredBinaries) {
|
|
10
12
|
try {
|
|
11
|
-
|
|
13
|
+
if (binary.includes('/')) {
|
|
14
|
+
// oxlint-disable-next-line no-await-in-loop -- stable check order makes doctor output deterministic
|
|
15
|
+
await fs.access(binary, constants.X_OK);
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
// oxlint-disable-next-line no-await-in-loop -- stable check order makes doctor output deterministic
|
|
19
|
+
await execa('which', [binary], { stderr: 'ignore', stdout: 'ignore' });
|
|
20
|
+
}
|
|
12
21
|
availableBinaries.add(binary);
|
|
13
22
|
}
|
|
14
23
|
catch {
|
|
@@ -17,6 +26,27 @@ function collectAvailableBinaryNames(requiredBinaries) {
|
|
|
17
26
|
}
|
|
18
27
|
return availableBinaries;
|
|
19
28
|
}
|
|
29
|
+
async function collectCommandOutput(command, arguments_) {
|
|
30
|
+
try {
|
|
31
|
+
const result = await execa(command, [...arguments_]);
|
|
32
|
+
return result.stdout.trim();
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
async function collectDockerDaemonReady(availableBinaries) {
|
|
39
|
+
if (!availableBinaries.has('docker')) {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
try {
|
|
43
|
+
await execa('docker', ['info'], { stderr: 'ignore', stdout: 'ignore' });
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
20
50
|
async function collectWorkerGatewayConfigChecks(systemConfig) {
|
|
21
51
|
const checks = [];
|
|
22
52
|
for (const zone of systemConfig.zones) {
|
|
@@ -67,17 +97,34 @@ export async function runControllerOperationCommand(options) {
|
|
|
67
97
|
});
|
|
68
98
|
switch (options.subcommand) {
|
|
69
99
|
case 'doctor': {
|
|
70
|
-
const availableBinaries = collectAvailableBinaryNames([
|
|
100
|
+
const availableBinaries = await collectAvailableBinaryNames([
|
|
71
101
|
'qemu-system-aarch64',
|
|
72
102
|
'qemu-system-x86_64',
|
|
103
|
+
'qemu-img',
|
|
104
|
+
'docker',
|
|
73
105
|
'op',
|
|
74
106
|
'security',
|
|
107
|
+
'mke2fs',
|
|
108
|
+
'mkfs.ext4',
|
|
109
|
+
'/opt/homebrew/opt/e2fsprogs/sbin/mke2fs',
|
|
110
|
+
'/usr/local/opt/e2fsprogs/sbin/mke2fs',
|
|
111
|
+
'debugfs',
|
|
112
|
+
'/opt/homebrew/opt/e2fsprogs/sbin/debugfs',
|
|
113
|
+
'/usr/local/opt/e2fsprogs/sbin/debugfs',
|
|
114
|
+
'cpio',
|
|
115
|
+
'lz4',
|
|
75
116
|
]);
|
|
117
|
+
const requiredZigVersion = await options.dependencies.resolveGondolinMinimumZigVersion();
|
|
118
|
+
const zigVersion = await collectCommandOutput('zig', ['version']);
|
|
119
|
+
const dockerDaemonReady = await collectDockerDaemonReady(availableBinaries);
|
|
76
120
|
const doctorResult = options.dependencies.runControllerDoctor({
|
|
77
121
|
availableBinaries,
|
|
122
|
+
dockerDaemonReady,
|
|
78
123
|
env: process.env,
|
|
79
124
|
nodeVersion: process.version,
|
|
125
|
+
requiredZigVersion,
|
|
80
126
|
systemConfig: options.systemConfig,
|
|
127
|
+
...(zigVersion ? { zigVersion } : {}),
|
|
81
128
|
});
|
|
82
129
|
const workerGatewayConfigChecks = await collectWorkerGatewayConfigChecks(options.systemConfig);
|
|
83
130
|
const systemCacheIdentifierCheck = await collectSystemCacheIdentifierCheck(options.systemConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-operation-commands.js","sourceRoot":"","sources":["../../src/cli/controller-operation-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"controller-operation-commands.js","sourceRoot":"","sources":["../../src/cli/controller-operation-commands.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/run-task.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { RunTaskFn } from '../shared/run-task.js';
|
|
2
2
|
import type { CliIo } from './agent-vm-cli-support.js';
|
|
3
|
+
export declare function createPlainRunTask(io: CliIo): RunTaskFn;
|
|
3
4
|
export declare function createRunTask(io: CliIo): Promise<RunTaskFn>;
|
|
4
5
|
//# sourceMappingURL=run-task.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-task.d.ts","sourceRoot":"","sources":["../../src/cli/run-task.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEvD,wBAAsB,aAAa,CAAC,EAAE,EAAE,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"run-task.d.ts","sourceRoot":"","sources":["../../src/cli/run-task.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEvD,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,KAAK,GAAG,SAAS,CAMvD;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAajE"}
|
package/dist/cli/run-task.js
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
export function createPlainRunTask(io) {
|
|
2
|
+
return async (title, fn) => {
|
|
3
|
+
io.stderr.write(` ${title}...\n`);
|
|
4
|
+
await fn();
|
|
5
|
+
io.stderr.write(` ${title} done\n`);
|
|
6
|
+
};
|
|
7
|
+
}
|
|
1
8
|
export async function createRunTask(io) {
|
|
2
9
|
if (process.stdout.isTTY) {
|
|
3
10
|
const { default: task } = await import('tasuku');
|
|
@@ -8,10 +15,6 @@ export async function createRunTask(io) {
|
|
|
8
15
|
});
|
|
9
16
|
};
|
|
10
17
|
}
|
|
11
|
-
return
|
|
12
|
-
io.stderr.write(` ${title}...\n`);
|
|
13
|
-
await fn();
|
|
14
|
-
io.stderr.write(` ${title} done\n`);
|
|
15
|
-
};
|
|
18
|
+
return createPlainRunTask(io);
|
|
16
19
|
}
|
|
17
20
|
//# sourceMappingURL=run-task.js.map
|
package/dist/cli/run-task.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-task.js","sourceRoot":"","sources":["../../src/cli/run-task.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAAS;IAC5C,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC1B,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEjD,OAAO,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;YAC1B,MAAM,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;gBACrC,SAAS,CAAC,SAAS,EAAE,CAAC;gBACtB,MAAM,EAAE,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;IACH,CAAC;IAED,OAAO,
|
|
1
|
+
{"version":3,"file":"run-task.js","sourceRoot":"","sources":["../../src/cli/run-task.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,kBAAkB,CAAC,EAAS;IAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;QAC1B,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC;QACnC,MAAM,EAAE,EAAE,CAAC;QACX,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IACtC,CAAC,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAAS;IAC5C,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC1B,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEjD,OAAO,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;YAC1B,MAAM,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;gBACrC,SAAS,CAAC,SAAS,EAAE,CAAC;gBACtB,MAAM,EAAE,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;IACH,CAAC;IAED,OAAO,kBAAkB,CAAC,EAAE,CAAC,CAAC;AAC/B,CAAC"}
|
|
@@ -3,16 +3,19 @@ export interface DoctorCheck {
|
|
|
3
3
|
readonly name: string;
|
|
4
4
|
readonly ok: boolean;
|
|
5
5
|
readonly hint?: string;
|
|
6
|
-
readonly value?: number;
|
|
6
|
+
readonly value?: number | string;
|
|
7
7
|
}
|
|
8
8
|
export interface RunControllerDoctorOptions {
|
|
9
9
|
readonly availableBinaries?: ReadonlySet<string>;
|
|
10
10
|
readonly diskFreeBytes?: number;
|
|
11
|
+
readonly dockerDaemonReady?: boolean;
|
|
11
12
|
readonly env: NodeJS.ProcessEnv;
|
|
12
13
|
readonly occupiedPorts?: ReadonlySet<number>;
|
|
13
14
|
readonly nodeVersion: string;
|
|
15
|
+
readonly requiredZigVersion?: string;
|
|
14
16
|
readonly systemConfig: SystemConfig;
|
|
15
17
|
readonly totalMemoryBytes?: number;
|
|
18
|
+
readonly zigVersion?: string;
|
|
16
19
|
}
|
|
17
20
|
export interface ControllerDoctorResult {
|
|
18
21
|
readonly ok: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/operations/doctor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAEnF,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/operations/doctor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAEnF,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,0BAA0B;IAC1C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjD,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;CAC/B;AAwHD,wBAAsB,8BAA8B,CACnD,YAAY,EAAE,kBAAkB,GAC9B,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAsC7B;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,sBAAsB,CAmK/F"}
|
|
@@ -12,6 +12,89 @@ function checkAnyBinary(name, binaryNames, installHint, availableBinaries) {
|
|
|
12
12
|
function isObjectRecord(value) {
|
|
13
13
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
14
14
|
}
|
|
15
|
+
function parseVersionParts(version) {
|
|
16
|
+
const versionMatch = /^(\d+)\.(\d+)\.(\d+)/u.exec(version.trim());
|
|
17
|
+
if (!versionMatch) {
|
|
18
|
+
return null;
|
|
19
|
+
}
|
|
20
|
+
return [versionMatch[1], versionMatch[2], versionMatch[3]].map((part) => Number.parseInt(part ?? '0', 10));
|
|
21
|
+
}
|
|
22
|
+
function isVersionAtLeast(version, minimumVersion) {
|
|
23
|
+
const versionParts = parseVersionParts(version);
|
|
24
|
+
const minimumVersionParts = parseVersionParts(minimumVersion);
|
|
25
|
+
if (!versionParts || !minimumVersionParts) {
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
for (const [index, minimumVersionPart] of minimumVersionParts.entries()) {
|
|
29
|
+
const versionPart = versionParts[index] ?? 0;
|
|
30
|
+
if (versionPart > minimumVersionPart) {
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
if (versionPart < minimumVersionPart) {
|
|
34
|
+
return false;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return true;
|
|
38
|
+
}
|
|
39
|
+
function buildZigVersionCheck(zigVersion, requiredZigVersion) {
|
|
40
|
+
if (!zigVersion && !requiredZigVersion) {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
if (!zigVersion) {
|
|
44
|
+
return {
|
|
45
|
+
name: 'zig-version',
|
|
46
|
+
ok: false,
|
|
47
|
+
hint: requiredZigVersion
|
|
48
|
+
? `Install Zig >= ${requiredZigVersion}.`
|
|
49
|
+
: 'Install Zig required by Gondolin.',
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
if (!requiredZigVersion) {
|
|
53
|
+
return {
|
|
54
|
+
name: 'zig-version',
|
|
55
|
+
ok: true,
|
|
56
|
+
value: zigVersion,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
const ok = isVersionAtLeast(zigVersion, requiredZigVersion);
|
|
60
|
+
return {
|
|
61
|
+
name: 'zig-version',
|
|
62
|
+
ok,
|
|
63
|
+
value: zigVersion,
|
|
64
|
+
...(!ok ? { hint: `Requires Zig >= ${requiredZigVersion}.` } : {}),
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
function hasDockerBackedImageProfiles(systemConfig) {
|
|
68
|
+
const gatewayProfiles = Object.values(systemConfig.imageProfiles.gateways);
|
|
69
|
+
const toolVmProfiles = Object.values(systemConfig.imageProfiles.toolVms);
|
|
70
|
+
return [...gatewayProfiles, ...toolVmProfiles].some((profile) => profile.dockerfile !== undefined);
|
|
71
|
+
}
|
|
72
|
+
function buildDockerChecks(systemConfig, availableBinaries, dockerDaemonReady) {
|
|
73
|
+
if (!hasDockerBackedImageProfiles(systemConfig)) {
|
|
74
|
+
return [];
|
|
75
|
+
}
|
|
76
|
+
const dockerCliReady = availableBinaries.has('docker');
|
|
77
|
+
return [
|
|
78
|
+
{
|
|
79
|
+
name: 'docker-cli',
|
|
80
|
+
ok: dockerCliReady,
|
|
81
|
+
...(dockerCliReady
|
|
82
|
+
? { hint: 'docker' }
|
|
83
|
+
: {
|
|
84
|
+
hint: 'Install and start a Docker-compatible runtime. On macOS: brew install --cask orbstack && open -a OrbStack.',
|
|
85
|
+
}),
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
name: 'docker-daemon',
|
|
89
|
+
ok: dockerCliReady && dockerDaemonReady === true,
|
|
90
|
+
...(dockerCliReady && dockerDaemonReady === true
|
|
91
|
+
? { hint: 'docker info' }
|
|
92
|
+
: {
|
|
93
|
+
hint: 'Start Docker/OrbStack and verify with: docker info',
|
|
94
|
+
}),
|
|
95
|
+
},
|
|
96
|
+
];
|
|
97
|
+
}
|
|
15
98
|
export async function collectVmHostSystemDoctorCheck(systemConfig) {
|
|
16
99
|
let identifier;
|
|
17
100
|
try {
|
|
@@ -53,6 +136,7 @@ export function runControllerDoctor(options) {
|
|
|
53
136
|
const diskFreeBytes = options.diskFreeBytes ?? Number.POSITIVE_INFINITY;
|
|
54
137
|
const totalMemoryBytes = options.totalMemoryBytes ?? Number.POSITIVE_INFINITY;
|
|
55
138
|
const availableBinaries = options.availableBinaries ?? new Set();
|
|
139
|
+
const dockerChecks = buildDockerChecks(options.systemConfig, availableBinaries, options.dockerDaemonReady);
|
|
56
140
|
const configuredGatewayBytes = options.systemConfig.zones.reduce((totalBytes, zone) => {
|
|
57
141
|
const memoryMatch = /^(\d+)([GgMm])$/u.exec(zone.gateway.memory);
|
|
58
142
|
if (!memoryMatch) {
|
|
@@ -63,6 +147,7 @@ export function runControllerDoctor(options) {
|
|
|
63
147
|
return totalBytes + numericValue * multiplier;
|
|
64
148
|
}, 0);
|
|
65
149
|
const tokenSource = options.systemConfig.host.secretsProvider?.tokenSource;
|
|
150
|
+
const zigVersionCheck = buildZigVersionCheck(options.zigVersion, options.requiredZigVersion);
|
|
66
151
|
const tokenSourceReady = (() => {
|
|
67
152
|
if (!tokenSource) {
|
|
68
153
|
return true;
|
|
@@ -86,6 +171,7 @@ export function runControllerDoctor(options) {
|
|
|
86
171
|
ok: nodeMajorVersion >= 24,
|
|
87
172
|
...(nodeMajorVersion < 24 ? { hint: 'Requires Node.js >= 24. Install via nvm or fnm.' } : {}),
|
|
88
173
|
},
|
|
174
|
+
...(zigVersionCheck ? [zigVersionCheck] : []),
|
|
89
175
|
...(tokenSource
|
|
90
176
|
? [
|
|
91
177
|
{
|
|
@@ -103,6 +189,21 @@ export function runControllerDoctor(options) {
|
|
|
103
189
|
]
|
|
104
190
|
: []),
|
|
105
191
|
checkAnyBinary('qemu', ['qemu-system-aarch64', 'qemu-system-x86_64'], 'Install QEMU (for example: brew install qemu).', availableBinaries),
|
|
192
|
+
checkAnyBinary('qemu-img', ['qemu-img'], 'Install qemu-img (for example: brew install qemu).', availableBinaries),
|
|
193
|
+
checkAnyBinary('mke2fs', [
|
|
194
|
+
'mke2fs',
|
|
195
|
+
'mkfs.ext4',
|
|
196
|
+
'/opt/homebrew/opt/e2fsprogs/sbin/mke2fs',
|
|
197
|
+
'/usr/local/opt/e2fsprogs/sbin/mke2fs',
|
|
198
|
+
], 'Install e2fsprogs (for example: brew install e2fsprogs).', availableBinaries),
|
|
199
|
+
checkAnyBinary('debugfs', [
|
|
200
|
+
'debugfs',
|
|
201
|
+
'/opt/homebrew/opt/e2fsprogs/sbin/debugfs',
|
|
202
|
+
'/usr/local/opt/e2fsprogs/sbin/debugfs',
|
|
203
|
+
], 'Install e2fsprogs (for example: brew install e2fsprogs).', availableBinaries),
|
|
204
|
+
checkAnyBinary('cpio', ['cpio'], 'Install cpio.', availableBinaries),
|
|
205
|
+
checkAnyBinary('lz4', ['lz4'], 'Install lz4 (for example: brew install lz4).', availableBinaries),
|
|
206
|
+
...dockerChecks,
|
|
106
207
|
{
|
|
107
208
|
name: 'controller-port',
|
|
108
209
|
ok: options.systemConfig.host.controllerPort > 0 &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/operations/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/operations/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AA4BjF,SAAS,cAAc,CACtB,IAAY,EACZ,WAA8B,EAC9B,WAAmB,EACnB,iBAAsC;IAEtC,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IACxF,OAAO;QACN,IAAI;QACJ,EAAE,EAAE,WAAW,KAAK,SAAS;QAC7B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;KAChE,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAe;IACzC,MAAM,YAAY,GAAG,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,YAAY,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACb,CAAC;IACD,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACvE,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,GAAG,EAAE,EAAE,CAAC,CAChC,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAe,EAAE,cAAsB;IAChE,MAAM,YAAY,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAC9D,IAAI,CAAC,YAAY,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACd,CAAC;IACD,KAAK,MAAM,CAAC,KAAK,EAAE,kBAAkB,CAAC,IAAI,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC;QACzE,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,WAAW,GAAG,kBAAkB,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC;QACb,CAAC;QACD,IAAI,WAAW,GAAG,kBAAkB,EAAE,CAAC;YACtC,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,oBAAoB,CAC5B,UAA8B,EAC9B,kBAAsC;IAEtC,IAAI,CAAC,UAAU,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,OAAO;YACN,IAAI,EAAE,aAAa;YACnB,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,kBAAkB;gBACvB,CAAC,CAAC,kBAAkB,kBAAkB,GAAG;gBACzC,CAAC,CAAC,mCAAmC;SACtC,CAAC;IACH,CAAC;IACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACzB,OAAO;YACN,IAAI,EAAE,aAAa;YACnB,EAAE,EAAE,IAAI;YACR,KAAK,EAAE,UAAU;SACjB,CAAC;IACH,CAAC;IACD,MAAM,EAAE,GAAG,gBAAgB,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;IAC5D,OAAO;QACN,IAAI,EAAE,aAAa;QACnB,EAAE;QACF,KAAK,EAAE,UAAU;QACjB,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,mBAAmB,kBAAkB,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAClE,CAAC;AACH,CAAC;AAED,SAAS,4BAA4B,CAAC,YAA0B;IAC/D,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC3E,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACzE,OAAO,CAAC,GAAG,eAAe,EAAE,GAAG,cAAc,CAAC,CAAC,IAAI,CAClD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAC7C,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CACzB,YAA0B,EAC1B,iBAAsC,EACtC,iBAAsC;IAEtC,IAAI,CAAC,4BAA4B,CAAC,YAAY,CAAC,EAAE,CAAC;QACjD,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvD,OAAO;QACN;YACC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,cAAc;YAClB,GAAG,CAAC,cAAc;gBACjB,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE;gBACpB,CAAC,CAAC;oBACA,IAAI,EAAE,4GAA4G;iBAClH,CAAC;SACJ;QACD;YACC,IAAI,EAAE,eAAe;YACrB,EAAE,EAAE,cAAc,IAAI,iBAAiB,KAAK,IAAI;YAChD,GAAG,CAAC,cAAc,IAAI,iBAAiB,KAAK,IAAI;gBAC/C,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE;gBACzB,CAAC,CAAC;oBACA,IAAI,EAAE,oDAAoD;iBAC1D,CAAC;SACJ;KACD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,8BAA8B,CACnD,YAAgC;IAEhC,IAAI,UAAmB,CAAC;IACxB,IAAI,CAAC;QACJ,UAAU,GAAG,MAAM,yBAAyB,CAAC;YAC5C,QAAQ,EAAE,YAAY,CAAC,yBAAyB;SAChD,CAAC,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,cAAc,KAAK,WAAW,EAAE,CAAC;QAC9E,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CACpC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAC3C,IAAI,EACJ,gBAAgB,CAChB,CAAC;IACF,MAAM,aAAa,GAAG,CAAC,YAAY,EAAE,UAAU,EAAE,6BAA6B,CAAU,CAAC;IACzF,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;QACnE,IAAI,CAAC;YACJ,6FAA6F;YAC7F,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACR,OAAO;gBACN,IAAI,EAAE,gBAAgB;gBACtB,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,WAAW,gBAAgB,EAAE;aACnC,CAAC;QACH,CAAC;IACF,CAAC;IAED,OAAO;QACN,IAAI,EAAE,gBAAgB;QACtB,EAAE,EAAE,IAAI;QACR,IAAI,EAAE,gBAAgB;KACtB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAmC;IACtE,MAAM,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CACvC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAC3D,EAAE,CACF,CAAC;IACF,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,IAAI,GAAG,EAAU,CAAC;IACjE,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,MAAM,CAAC,iBAAiB,CAAC;IACxE,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,MAAM,CAAC,iBAAiB,CAAC;IAC9E,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,IAAI,IAAI,GAAG,EAAU,CAAC;IACzE,MAAM,YAAY,GAAG,iBAAiB,CACrC,OAAO,CAAC,YAAY,EACpB,iBAAiB,EACjB,OAAO,CAAC,iBAAiB,CACzB,CAAC;IACF,MAAM,sBAAsB,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE;QACrF,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,OAAO,UAAU,CAAC;QACnB,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;QAChE,MAAM,UAAU,GACf,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;QACjF,OAAO,UAAU,GAAG,YAAY,GAAG,UAAU,CAAC;IAC/C,CAAC,EAAE,CAAC,CAAC,CAAC;IACN,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC;IAC3E,MAAM,eAAe,GAAG,oBAAoB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC7F,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE;QAC9B,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACb,CAAC;QACD,QAAQ,WAAW,CAAC,IAAI,EAAE,CAAC;YAC1B,KAAK,KAAK,CAAC,CAAC,CAAC;gBACZ,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,IAAI,0BAA0B,CAAC;gBAChE,OAAO,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAClF,CAAC;YACD,KAAK,QAAQ;gBACZ,OAAO,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACpC,KAAK,UAAU;gBACd,OAAO,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC1C;gBACC,OAAO,KAAK,CAAC;QACf,CAAC;IACF,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,MAAM,GAAkB;QAC7B;YACC,IAAI,EAAE,cAAc;YACpB,EAAE,EAAE,gBAAgB,IAAI,EAAE;YAC1B,GAAG,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,iDAAiD,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7F;QACD,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7C,GAAG,CAAC,WAAW;YACd,CAAC,CAAC;gBACA;oBACC,IAAI,EAAE,wBAAwB;oBAC9B,EAAE,EAAE,gBAAgB;oBACpB,GAAG,CAAC,CAAC,gBAAgB,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK;wBAClD,CAAC,CAAC;4BACA,IAAI,EAAE,OAAO,WAAW,CAAC,MAAM,IAAI,0BAA0B,uBAAuB;yBACpF;wBACF,CAAC,CAAC,EAAE,CAAC;oBACN,GAAG,CAAC,CAAC,gBAAgB,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ;wBACrD,CAAC,CAAC,EAAE,IAAI,EAAE,mDAAmD,EAAE;wBAC/D,CAAC,CAAC,EAAE,CAAC;iBACgB;aACvB;YACF,CAAC,CAAC,EAAE,CAAC;QACN,cAAc,CACb,MAAM,EACN,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,EAC7C,gDAAgD,EAChD,iBAAiB,CACjB;QACD,cAAc,CACb,UAAU,EACV,CAAC,UAAU,CAAC,EACZ,oDAAoD,EACpD,iBAAiB,CACjB;QACD,cAAc,CACb,QAAQ,EACR;YACC,QAAQ;YACR,WAAW;YACX,yCAAyC;YACzC,sCAAsC;SACtC,EACD,0DAA0D,EAC1D,iBAAiB,CACjB;QACD,cAAc,CACb,SAAS,EACT;YACC,SAAS;YACT,0CAA0C;YAC1C,uCAAuC;SACvC,EACD,0DAA0D,EAC1D,iBAAiB,CACjB;QACD,cAAc,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,iBAAiB,CAAC;QACpE,cAAc,CACb,KAAK,EACL,CAAC,KAAK,CAAC,EACP,8CAA8C,EAC9C,iBAAiB,CACjB;QACD,GAAG,YAAY;QACf;YACC,IAAI,EAAE,iBAAiB;YACvB,EAAE,EACD,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,GAAG,CAAC;gBAC5C,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC;YAC7D,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc;SAC/C;QACD,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAChC,CAAC,IAAI,EAAE,EAAE,CACR,CAAC;YACA,IAAI,EAAE,gBAAgB,IAAI,CAAC,EAAE,EAAE;YAC/B,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YAClE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;SACxB,CAAuB,CACzB;QACD,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,GAAG,CACjE,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,CAC1B,CAAC;YACA,IAAI,EAAE,yBAAyB,WAAW,EAAE;YAC5C,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,QAAQ,OAAO,CAAC,IAAI,EAAE;SAC5B,CAAuB,CACzB;QACD,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,CAChE,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CACjB,CAAC;YACA,IAAI,EAAE,yBAAyB,WAAW,EAAE;YAC5C,EAAE,EAAE,IAAI;SACR,CAAuB,CACzB;QACD,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAChC,CAAC,IAAI,EAAE,EAAE,CACR,CAAC;YACA,IAAI,EAAE,kCAAkC,IAAI,CAAC,EAAE,EAAE;YACjD,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;SAC/B,CAAuB,CACzB;QACD;YACC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,aAAa,IAAI,EAAE,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI;YAC5C,GAAG,CAAC,aAAa,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI;gBAC1C,CAAC,CAAC,EAAE,IAAI,EAAE,oCAAoC,EAAE;gBAChD,CAAC,CAAC,EAAE,CAAC;SACN;QACD;YACC,IAAI,EAAE,eAAe;YACrB,EAAE,EAAE,gBAAgB,IAAI,sBAAsB;SAC9C;KACD,CAAC;IAEF,OAAO;QACN,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM;KACN,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agent-vm/agent-vm",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.26",
|
|
4
4
|
"description": "Controller CLI and HTTP server for sandboxed VM coding agents.",
|
|
5
5
|
"homepage": "https://github.com/ShravanSunder/agent-vm#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -38,12 +38,12 @@
|
|
|
38
38
|
"hono": "^4.12.14",
|
|
39
39
|
"tasuku": "^2.3.0",
|
|
40
40
|
"zod": "^4",
|
|
41
|
-
"@agent-vm/agent-vm-worker": "0.0.
|
|
42
|
-
"@agent-vm/gateway-interface": "0.0.
|
|
43
|
-
"@agent-vm/
|
|
44
|
-
"@agent-vm/
|
|
45
|
-
"@agent-vm/
|
|
46
|
-
"@agent-vm/openclaw-agent-vm-plugin": "0.0.
|
|
41
|
+
"@agent-vm/agent-vm-worker": "0.0.26",
|
|
42
|
+
"@agent-vm/gateway-interface": "0.0.26",
|
|
43
|
+
"@agent-vm/openclaw-gateway": "0.0.26",
|
|
44
|
+
"@agent-vm/worker-gateway": "0.0.26",
|
|
45
|
+
"@agent-vm/gondolin-adapter": "0.0.26",
|
|
46
|
+
"@agent-vm/openclaw-agent-vm-plugin": "0.0.26"
|
|
47
47
|
},
|
|
48
48
|
"scripts": {
|
|
49
49
|
"build": "rm -rf dist && tsc -p tsconfig.build.json",
|