@agent-vm/agent-vm 0.0.26 → 0.0.29
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 +6 -1
- package/dist/build/docker-image-builder.d.ts.map +1 -1
- package/dist/build/docker-image-builder.js +14 -3
- package/dist/build/docker-image-builder.js.map +1 -1
- package/dist/build/gondolin-image-builder.d.ts +2 -0
- package/dist/build/gondolin-image-builder.d.ts.map +1 -1
- package/dist/build/gondolin-image-builder.js +1 -0
- package/dist/build/gondolin-image-builder.js.map +1 -1
- package/dist/cli/agent-vm-cli-support.d.ts +2 -0
- package/dist/cli/agent-vm-cli-support.d.ts.map +1 -1
- package/dist/cli/agent-vm-cli-support.js +2 -0
- package/dist/cli/agent-vm-cli-support.js.map +1 -1
- package/dist/cli/agent-vm-entrypoint.d.ts.map +1 -1
- package/dist/cli/agent-vm-entrypoint.js +3 -1
- package/dist/cli/agent-vm-entrypoint.js.map +1 -1
- package/dist/cli/auth-interactive-command.d.ts +2 -0
- package/dist/cli/auth-interactive-command.d.ts.map +1 -1
- package/dist/cli/auth-interactive-command.js +4 -1
- package/dist/cli/auth-interactive-command.js.map +1 -1
- package/dist/cli/build-command.d.ts +6 -1
- package/dist/cli/build-command.d.ts.map +1 -1
- package/dist/cli/build-command.js +44 -5
- package/dist/cli/build-command.js.map +1 -1
- package/dist/cli/cli-version.d.ts +2 -0
- package/dist/cli/cli-version.d.ts.map +1 -0
- package/dist/cli/cli-version.js +18 -0
- package/dist/cli/cli-version.js.map +1 -0
- package/dist/cli/commands/auth-interactive-definition.d.ts +4 -0
- package/dist/cli/commands/auth-interactive-definition.d.ts.map +1 -1
- package/dist/cli/commands/auth-interactive-definition.js +12 -2
- package/dist/cli/commands/auth-interactive-definition.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/commands/create-app.d.ts +5 -1
- package/dist/cli/commands/create-app.d.ts.map +1 -1
- package/dist/cli/commands/create-app.js +2 -2
- package/dist/cli/commands/create-app.js.map +1 -1
- package/dist/cli/controller-operation-commands.d.ts.map +1 -1
- package/dist/cli/controller-operation-commands.js +42 -0
- package/dist/cli/controller-operation-commands.js.map +1 -1
- package/dist/cli/init-command.d.ts +0 -2
- package/dist/cli/init-command.d.ts.map +1 -1
- package/dist/cli/init-command.js +62 -24
- package/dist/cli/init-command.js.map +1 -1
- package/dist/cli/run-task.d.ts.map +1 -1
- package/dist/cli/run-task.js +28 -5
- package/dist/cli/run-task.js.map +1 -1
- package/dist/controller/controller-runtime-operations.d.ts +3 -0
- package/dist/controller/controller-runtime-operations.d.ts.map +1 -1
- package/dist/controller/controller-runtime-operations.js +21 -2
- package/dist/controller/controller-runtime-operations.js.map +1 -1
- package/dist/controller/controller-runtime.d.ts.map +1 -1
- package/dist/controller/controller-runtime.js +9 -2
- package/dist/controller/controller-runtime.js.map +1 -1
- package/dist/controller/http/controller-http-route-support.d.ts +1 -0
- package/dist/controller/http/controller-http-route-support.d.ts.map +1 -1
- package/dist/controller/http/controller-http-route-support.js.map +1 -1
- package/dist/controller/http/controller-http-routes.d.ts.map +1 -1
- package/dist/controller/http/controller-http-routes.js +3 -0
- package/dist/controller/http/controller-http-routes.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 +1 -0
- package/dist/controller/http/controller-zone-operation-routes.js.map +1 -1
- package/dist/gateway/gateway-zone-orchestrator.d.ts +2 -0
- package/dist/gateway/gateway-zone-orchestrator.d.ts.map +1 -1
- package/dist/gateway/gateway-zone-orchestrator.js +81 -33
- package/dist/gateway/gateway-zone-orchestrator.js.map +1 -1
- package/dist/operations/controller-status.d.ts +32 -7
- package/dist/operations/controller-status.d.ts.map +1 -1
- package/dist/operations/controller-status.js +34 -7
- package/dist/operations/controller-status.js.map +1 -1
- package/dist/operations/doctor.d.ts +3 -0
- package/dist/operations/doctor.d.ts.map +1 -1
- package/dist/operations/doctor.js +11 -5
- package/dist/operations/doctor.js.map +1 -1
- package/dist/shared/run-task.d.ts +12 -1
- package/dist/shared/run-task.d.ts.map +1 -1
- package/dist/shared/run-task.js.map +1 -1
- package/package.json +7 -7
|
@@ -1,11 +1,16 @@
|
|
|
1
|
+
import type { TaskOutput } from '../shared/run-task.js';
|
|
2
|
+
export interface DockerCommandOptions {
|
|
3
|
+
readonly streamPreview?: TaskOutput;
|
|
4
|
+
}
|
|
1
5
|
export interface DockerImageBuilderDependencies {
|
|
2
|
-
readonly executeCommand?: (command: string, args: readonly string[]) => Promise<{
|
|
6
|
+
readonly executeCommand?: (command: string, args: readonly string[], options: DockerCommandOptions) => Promise<{
|
|
3
7
|
readonly exitCode?: number;
|
|
4
8
|
} | void>;
|
|
5
9
|
}
|
|
6
10
|
export interface BuildDockerImageOptions {
|
|
7
11
|
readonly dockerfilePath: string;
|
|
8
12
|
readonly imageTag: string;
|
|
13
|
+
readonly streamPreview?: TaskOutput;
|
|
9
14
|
}
|
|
10
15
|
export declare function buildDockerImage(options: BuildDockerImageOptions, dependencies?: DockerImageBuilderDependencies): Promise<void>;
|
|
11
16
|
//# sourceMappingURL=docker-image-builder.d.ts.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"docker-image-builder.d.ts","sourceRoot":"","sources":["../../src/build/docker-image-builder.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;CACpC;AAED,MAAM,WAAW,8BAA8B;IAC9C,QAAQ,CAAC,cAAc,CAAC,EAAE,CACzB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,oBAAoB,KACzB,OAAO,CAAC;QACZ,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,IAAI,CAAC,CAAC;CACV;AAED,MAAM,WAAW,uBAAuB;IACvC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;CACpC;AAsBD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,uBAAuB,EAChC,YAAY,GAAE,8BAAmC,GAC/C,OAAO,CAAC,IAAI,CAAC,CAyBf"}
|
|
@@ -1,7 +1,18 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import { execa } from 'execa';
|
|
3
|
-
async function executeDockerCommand(command, args) {
|
|
4
|
-
|
|
3
|
+
async function executeDockerCommand(command, args, options) {
|
|
4
|
+
if (!options.streamPreview) {
|
|
5
|
+
await execa(command, args, { stdio: 'inherit' });
|
|
6
|
+
return;
|
|
7
|
+
}
|
|
8
|
+
const child = execa(command, args, { stdio: ['inherit', 'pipe', 'pipe'] });
|
|
9
|
+
child.stdout?.on('data', (chunk) => {
|
|
10
|
+
options.streamPreview?.write(chunk);
|
|
11
|
+
});
|
|
12
|
+
child.stderr?.on('data', (chunk) => {
|
|
13
|
+
options.streamPreview?.write(chunk);
|
|
14
|
+
});
|
|
15
|
+
await child;
|
|
5
16
|
}
|
|
6
17
|
export async function buildDockerImage(options, dependencies = {}) {
|
|
7
18
|
const executeCommand = dependencies.executeCommand ?? executeDockerCommand;
|
|
@@ -16,7 +27,7 @@ export async function buildDockerImage(options, dependencies = {}) {
|
|
|
16
27
|
'-t',
|
|
17
28
|
options.imageTag,
|
|
18
29
|
dockerBuildContextDirectory,
|
|
19
|
-
]);
|
|
30
|
+
], options.streamPreview ? { streamPreview: options.streamPreview } : {});
|
|
20
31
|
}
|
|
21
32
|
catch (error) {
|
|
22
33
|
throw new Error(`Docker build failed for ${options.imageTag}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"docker-image-builder.js","sourceRoot":"","sources":["../../src/build/docker-image-builder.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAwB9B,KAAK,UAAU,oBAAoB,CAClC,OAAe,EACf,IAAuB,EACvB,OAA6B;IAE7B,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC5B,MAAM,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACjD,OAAO;IACR,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAC3E,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QAClC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QAClC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACrC,OAAgC,EAChC,eAA+C,EAAE;IAEjD,MAAM,cAAc,GAAG,YAAY,CAAC,cAAc,IAAI,oBAAoB,CAAC;IAC3E,MAAM,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACpE,MAAM,2BAA2B,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAEzE,IAAI,CAAC;QACJ,MAAM,cAAc,CACnB,QAAQ,EACR;YACC,OAAO;YACP,kBAAkB;YAClB,IAAI;YACJ,sBAAsB;YACtB,IAAI;YACJ,OAAO,CAAC,QAAQ;YAChB,2BAA2B;SAC3B,EACD,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CACrE,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACd,2BAA2B,OAAO,CAAC,QAAQ,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EACxG,EAAE,KAAK,EAAE,KAAK,EAAE,CAChB,CAAC;IACH,CAAC;AACF,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type BuildConfig, type BuildImageOptions, type BuildImageResult } from '@agent-vm/gondolin-adapter';
|
|
2
|
+
import type { TaskOutput } from '../shared/run-task.js';
|
|
2
3
|
export interface GondolinImageBuilderDependencies {
|
|
3
4
|
readonly buildImage?: (options: BuildImageOptions, dependencies?: {
|
|
4
5
|
readonly gondolinVersion?: string;
|
|
@@ -12,5 +13,6 @@ export declare function buildGondolinImage(options: {
|
|
|
12
13
|
readonly systemCacheIdentifierPath: string;
|
|
13
14
|
readonly cacheDir: string;
|
|
14
15
|
readonly fullReset?: boolean;
|
|
16
|
+
readonly streamPreview?: TaskOutput;
|
|
15
17
|
}, dependencies?: GondolinImageBuilderDependencies): Promise<BuildImageResult>;
|
|
16
18
|
//# sourceMappingURL=gondolin-image-builder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
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,4BAA4B,CAAC;
|
|
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,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,WAAW,gCAAgC;IAChD,QAAQ,CAAC,UAAU,CAAC,EAAE,CACrB,OAAO,EAAE,iBAAiB,EAC1B,YAAY,CAAC,EAAE;QAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,KAChD,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/B,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7E,QAAQ,CAAC,6BAA6B,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/D;AAuBD,wBAAsB,gCAAgC,CACrD,eAAe,EAAE,MAAM,EACvB,yBAAyB,EAAE,MAAM,EACjC,YAAY,GAAE,IAAI,CAAC,gCAAgC,EAAE,+BAA+B,CAAM,GACxF,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,kBAAkB,CACvC,OAAO,EAAE;IACR,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,yBAAyB,EAAE,MAAM,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;CACpC,EACD,YAAY,GAAE,gCAAqC,GACjD,OAAO,CAAC,gBAAgB,CAAC,CAyB3B"}
|
|
@@ -44,6 +44,7 @@ export async function buildGondolinImage(options, dependencies = {}) {
|
|
|
44
44
|
cacheDir: options.cacheDir,
|
|
45
45
|
configDir,
|
|
46
46
|
fingerprintInput,
|
|
47
|
+
...(options.streamPreview ? { output: options.streamPreview } : {}),
|
|
47
48
|
...(options.fullReset ? { fullReset: true } : {}),
|
|
48
49
|
}, {
|
|
49
50
|
gondolinVersion: runtimeBuildVersionTag,
|
|
@@ -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,GAIvB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"gondolin-image-builder.js","sourceRoot":"","sources":["../../src/build/gondolin-image-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { buildControllerStatus } from '../operations/controller-status.js';
|
|
|
11
11
|
import { runControllerDoctor } from '../operations/doctor.js';
|
|
12
12
|
import { runBuildCommand } from './build-command.js';
|
|
13
13
|
import { runCacheCommand } from './cache-commands.js';
|
|
14
|
+
import { resolveCliVersion } from './cli-version.js';
|
|
14
15
|
import { resetWorkerInstructions } from './config-commands.js';
|
|
15
16
|
import { type ScaffoldAgentVmProjectOptions, type ScaffoldAgentVmProjectResult } from './init-command.js';
|
|
16
17
|
import { type InitRepoResourcesResult, type UpdateRepoResourcesResult, type ValidateRepoResourcesResult } from './resources-commands.js';
|
|
@@ -46,6 +47,7 @@ export interface CliDependencies {
|
|
|
46
47
|
readonly runConfigValidation?: typeof runConfigValidation;
|
|
47
48
|
readonly promptAndStoreServiceAccountToken?: () => Promise<boolean>;
|
|
48
49
|
readonly resetWorkerInstructions?: typeof resetWorkerInstructions;
|
|
50
|
+
readonly resolveCliVersion?: typeof resolveCliVersion;
|
|
49
51
|
readonly scaffoldAgentVmProject?: (options: ScaffoldAgentVmProjectOptions) => Promise<ScaffoldAgentVmProjectResult>;
|
|
50
52
|
readonly startControllerRuntime: (options: {
|
|
51
53
|
readonly systemConfig: LoadedSystemConfig;
|
|
@@ -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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"}
|
|
@@ -11,6 +11,7 @@ import { buildControllerStatus } from '../operations/controller-status.js';
|
|
|
11
11
|
import { runControllerDoctor } from '../operations/doctor.js';
|
|
12
12
|
import { runBuildCommand } from './build-command.js';
|
|
13
13
|
import { runCacheCommand } from './cache-commands.js';
|
|
14
|
+
import { resolveCliVersion } from './cli-version.js';
|
|
14
15
|
import { resetWorkerInstructions } from './config-commands.js';
|
|
15
16
|
import { scaffoldAgentVmProject, } from './init-command.js';
|
|
16
17
|
import { initRepoResources, updateRepoResources, validateRepoResources, } from './resources-commands.js';
|
|
@@ -29,6 +30,7 @@ export const defaultCliDependencies = {
|
|
|
29
30
|
runControllerDoctor,
|
|
30
31
|
runConfigValidation,
|
|
31
32
|
resetWorkerInstructions,
|
|
33
|
+
resolveCliVersion,
|
|
32
34
|
scaffoldAgentVmProject,
|
|
33
35
|
initRepoResources,
|
|
34
36
|
updateRepoResources,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-vm-cli-support.js","sourceRoot":"","sources":["../../src/cli/agent-vm-cli-support.ts"],"names":[],"mappings":"AACA,OAAO,EACN,yBAAyB,EACzB,gCAAgC,EAChC,0BAA0B,GAC1B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EACN,gBAAgB,GAGhB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,oBAAoB,IAAI,8BAA8B,EAAE,MAAM,6CAA6C,CAAC;AAErH,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EACN,sBAAsB,GAGtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACN,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,GAIrB,MAAM,yBAAyB,CAAC;
|
|
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":"agent-vm-entrypoint.d.ts","sourceRoot":"","sources":["../../src/cli/agent-vm-entrypoint.ts"],"names":[],"mappings":";AAIA,iBAAS,gCAAgC,CAAC,mBAAmB,GAAE,MAAqB,GAAG,IAAI,CAe1F;AAMD,OAAO,EAEN,KAAK,eAAe,EACpB,KAAK,KAAK,EACV,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-vm-entrypoint.d.ts","sourceRoot":"","sources":["../../src/cli/agent-vm-entrypoint.ts"],"names":[],"mappings":";AAIA,iBAAS,gCAAgC,CAAC,mBAAmB,GAAE,MAAqB,GAAG,IAAI,CAe1F;AAMD,OAAO,EAEN,KAAK,eAAe,EACpB,KAAK,KAAK,EACV,MAAM,2BAA2B,CAAC;AAInC,qBAAa,gBAAiB,SAAQ,KAAK;CAAG;AAE9C,wBAAsB,aAAa,CAClC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,KAAK,EACT,YAAY,GAAE,eAAwC,GACpD,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,OAAO,EAAE,gCAAgC,EAAE,CAAC;AAE5C,wBAAgB,kBAAkB,CACjC,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,GACvC,IAAI,CASN;AASD,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CASjG"}
|
|
@@ -17,11 +17,13 @@ function loadOptionalLocalEnvironmentFile(environmentFilePath = '.env.local') {
|
|
|
17
17
|
loadOptionalLocalEnvironmentFile();
|
|
18
18
|
import { runSafely } from 'cmd-ts';
|
|
19
19
|
import { defaultCliDependencies, } from './agent-vm-cli-support.js';
|
|
20
|
+
import { resolveCliVersion } from './cli-version.js';
|
|
20
21
|
import { createAgentVmApp } from './commands/create-app.js';
|
|
21
22
|
export class ReportedCliError extends Error {
|
|
22
23
|
}
|
|
23
24
|
export async function runAgentVmCli(argv, io, dependencies = defaultCliDependencies) {
|
|
24
|
-
const
|
|
25
|
+
const cliVersion = await (dependencies.resolveCliVersion ?? resolveCliVersion)();
|
|
26
|
+
const result = await runSafely(createAgentVmApp(io, dependencies, cliVersion), [...argv]);
|
|
25
27
|
if (result._tag === 'ok') {
|
|
26
28
|
return;
|
|
27
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-vm-entrypoint.js","sourceRoot":"","sources":["../../src/cli/agent-vm-entrypoint.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,SAAS,gCAAgC,CAAC,sBAA8B,YAAY;IACnF,IAAI,CAAC;QACJ,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC/F,OAAO;QACR,CAAC;QAED,MAAM,IAAI,KAAK,CACd,kBAAkB,mBAAmB,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAClG;YACC,KAAK,EAAE,KAAK;SACZ,CACD,CAAC;IACH,CAAC;AACF,CAAC;AAED,gCAAgC,EAAE,CAAC;AAEnC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EACN,sBAAsB,GAGtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,OAAO,gBAAiB,SAAQ,KAAK;CAAG;AAE9C,MAAM,CAAC,KAAK,UAAU,aAAa,CAClC,IAAuB,EACvB,EAAS,EACT,eAAgC,sBAAsB;IAEtD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-vm-entrypoint.js","sourceRoot":"","sources":["../../src/cli/agent-vm-entrypoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export declare function listAuthProviders(options: {
|
|
|
14
14
|
export declare function runAuthInteractiveCommand(options: {
|
|
15
15
|
readonly authConfig: GatewayAuthConfig | undefined;
|
|
16
16
|
readonly dependencies: Pick<CliDependencies, 'createControllerClient' | 'runCommand' | 'runInteractiveProcess'>;
|
|
17
|
+
readonly deviceCode?: boolean;
|
|
17
18
|
readonly io: CliIo;
|
|
18
19
|
readonly provider: string;
|
|
19
20
|
readonly runCommand?: (command: string, arguments_: readonly string[]) => Promise<{
|
|
@@ -22,6 +23,7 @@ export declare function runAuthInteractiveCommand(options: {
|
|
|
22
23
|
readonly stdout: string;
|
|
23
24
|
}>;
|
|
24
25
|
readonly systemConfig: SystemConfig;
|
|
26
|
+
readonly setDefault?: boolean;
|
|
25
27
|
readonly zoneId: string;
|
|
26
28
|
}): Promise<void>;
|
|
27
29
|
//# sourceMappingURL=auth-interactive-command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
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,6BAA6B,CAAC;AAGrE,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,
|
|
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,6BAA6B,CAAC;AAGrE,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,UAAU,CAAC,EAAE,OAAO,CAAC;IAC9B,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,UAAU,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwDhB"}
|
|
@@ -65,7 +65,10 @@ export async function runAuthInteractiveCommand(options) {
|
|
|
65
65
|
'-p',
|
|
66
66
|
String(sshResponse.port),
|
|
67
67
|
`${sshResponse.user ?? 'root'}@${sshResponse.host}`,
|
|
68
|
-
wrapWithOpenClawShellEnvironment(options.authConfig.buildLoginCommand(options.provider
|
|
68
|
+
wrapWithOpenClawShellEnvironment(options.authConfig.buildLoginCommand(options.provider, {
|
|
69
|
+
deviceCode: options.deviceCode === true,
|
|
70
|
+
setDefault: options.setDefault === true,
|
|
71
|
+
})),
|
|
69
72
|
];
|
|
70
73
|
const runInteractiveProcess = options.dependencies.runInteractiveProcess ??
|
|
71
74
|
(async (command, arguments_) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-interactive-command.js","sourceRoot":"","sources":["../../src/cli/auth-interactive-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAG9B,OAAO,EAGN,wBAAwB,GACxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,2BAA2B,EAA8B,MAAM,mBAAmB,CAAC;AAE5F,MAAM,wBAAwB,GAAG,gCAAgC,CAAC;AAElE,SAAS,UAAU,CAAC,KAAa;IAChC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC;AAC7C,CAAC;AAED,SAAS,gCAAgC,CAAC,OAAe;IACxD,OAAO,YAAY,UAAU,CAAC,UAAU,wBAAwB,OAAO,OAAO,EAAE,CAAC,EAAE,CAAC;AACrF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAOvC;IACA,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;IAC3F,CAAC;IAED,MAAM,UAAU,GACf,OAAO,CAAC,UAAU;QAClB,CAAC,KAAK,EACL,OAAe,EACf,UAA6B,EAC8D,EAAE;YAC7F,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YACnE,OAAO;gBACN,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,CAAC;gBAC9B,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;aACrB,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE;QAC7C,IAAI;QACJ,0BAA0B;QAC1B,IAAI;QACJ,8BAA8B;QAC9B,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjF,IAAI;QACJ,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;QAC9B,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE;QAC/D,gCAAgC,CAAC,OAAO,CAAC,oBAAoB,CAAC;KAC9D,CAAC,CAAC;IACH,IAAI,aAAa,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACd,kCAAkC,aAAa,CAAC,MAAM,IAAI,mBAAmB,aAAa,CAAC,QAAQ,EAAE,EAAE,CACvG,CAAC;IACH,CAAC;IAED,OAAO,aAAa,CAAC,MAAM;SACzB,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,
|
|
1
|
+
{"version":3,"file":"auth-interactive-command.js","sourceRoot":"","sources":["../../src/cli/auth-interactive-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,24 @@
|
|
|
1
1
|
import type { BuildImageResult } from '@agent-vm/gondolin-adapter';
|
|
2
2
|
import type { LoadedSystemConfig } from '../config/system-config.js';
|
|
3
|
+
import type { RunTaskFn, TaskOutput } from '../shared/run-task.js';
|
|
3
4
|
export interface BuildCommandDependencies {
|
|
4
5
|
readonly buildDockerImage?: (options: {
|
|
5
6
|
readonly dockerfilePath: string;
|
|
6
7
|
readonly imageTag: string;
|
|
8
|
+
readonly streamPreview?: TaskOutput;
|
|
7
9
|
}) => Promise<void>;
|
|
8
10
|
readonly buildGondolinImage?: (options: {
|
|
9
11
|
readonly buildConfigPath: string;
|
|
10
12
|
readonly systemCacheIdentifierPath: string;
|
|
11
13
|
readonly cacheDir: string;
|
|
12
14
|
readonly fullReset?: boolean;
|
|
15
|
+
readonly streamPreview?: TaskOutput;
|
|
13
16
|
}) => Promise<BuildImageResult>;
|
|
14
17
|
readonly resolveOciImageTag?: (buildConfigPath: string) => Promise<string>;
|
|
18
|
+
readonly resolveRequiredZigVersion?: () => Promise<string>;
|
|
19
|
+
readonly resolveZigVersion?: () => Promise<string | undefined>;
|
|
15
20
|
/** Override the task runner for testing or custom CLI progress. */
|
|
16
|
-
readonly runTask?:
|
|
21
|
+
readonly runTask?: RunTaskFn;
|
|
17
22
|
readonly resolveProjectRootFromDockerfile?: (dockerfilePath: string) => Promise<string>;
|
|
18
23
|
readonly syncBundledOpenClawPlugin?: (targetDir: string, profileName: string) => Promise<'created' | 'skipped'>;
|
|
19
24
|
}
|
|
@@ -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;AAOnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAMrE,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInE,MAAM,WAAW,wBAAwB;IACxC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE;QACrC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;QAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;KACpC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE;QACvC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;QACjC,QAAQ,CAAC,yBAAyB,EAAE,MAAM,CAAC;QAC3C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAC7B,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;KACpC,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3E,QAAQ,CAAC,yBAAyB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3D,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/D,mEAAmE;IACnE,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxF,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CACpC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,KACf,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;CACpC;AA6GD,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,CAwGf"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
+
import { resolveGondolinMinimumZigVersion } from '@agent-vm/gondolin-adapter';
|
|
4
|
+
import { execa } from 'execa';
|
|
3
5
|
import { z } from 'zod';
|
|
4
6
|
import { buildDockerImage as buildDockerImageDefault } from '../build/docker-image-builder.js';
|
|
5
7
|
import { buildGondolinImage as buildGondolinImageDefault } from '../build/gondolin-image-builder.js';
|
|
8
|
+
import { buildZigInstallHint, buildZigUpgradeHint, isVersionAtLeast, } from '../operations/doctor.js';
|
|
6
9
|
import { formatZodError } from './format-zod-error.js';
|
|
7
10
|
import { syncBundledOpenClawPluginBundle } from './openclaw-plugin-bundle.js';
|
|
8
11
|
const ociImageTagSchema = z.object({
|
|
@@ -21,6 +24,25 @@ async function resolveOciImageTagFromConfig(buildConfigPath) {
|
|
|
21
24
|
}
|
|
22
25
|
return parsedConfig.data.oci.image;
|
|
23
26
|
}
|
|
27
|
+
async function resolveHostZigVersion() {
|
|
28
|
+
try {
|
|
29
|
+
const result = await execa('zig', ['version']);
|
|
30
|
+
return result.stdout.trim();
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
async function assertZigBuildPrerequisite(resolveRequiredZigVersion, resolveZigVersion) {
|
|
37
|
+
const requiredZigVersion = await resolveRequiredZigVersion();
|
|
38
|
+
const zigVersion = await resolveZigVersion();
|
|
39
|
+
if (!zigVersion) {
|
|
40
|
+
throw new Error(buildZigInstallHint(requiredZigVersion));
|
|
41
|
+
}
|
|
42
|
+
if (!isVersionAtLeast(zigVersion, requiredZigVersion)) {
|
|
43
|
+
throw new Error(`${buildZigUpgradeHint(requiredZigVersion)} Current version: ${zigVersion}.`);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
24
46
|
async function assertUniqueDockerImageTags(imageTargets, resolveOciImageTag) {
|
|
25
47
|
const profileByTag = new Map();
|
|
26
48
|
const tagByProfile = new Map();
|
|
@@ -36,11 +58,15 @@ async function assertUniqueDockerImageTags(imageTargets, resolveOciImageTag) {
|
|
|
36
58
|
}
|
|
37
59
|
return tagByProfile;
|
|
38
60
|
}
|
|
39
|
-
async
|
|
61
|
+
const defaultRunTask = async (title, fn) => {
|
|
40
62
|
process.stderr.write(` ${title}...\n`);
|
|
41
|
-
await fn(
|
|
63
|
+
await fn({
|
|
64
|
+
interactive: false,
|
|
65
|
+
setOutput: () => { },
|
|
66
|
+
setStatus: () => { },
|
|
67
|
+
});
|
|
42
68
|
process.stderr.write(` ${title} done\n`);
|
|
43
|
-
}
|
|
69
|
+
};
|
|
44
70
|
async function resolveProjectRootFromDockerfile(dockerfilePath) {
|
|
45
71
|
let searchDirectory = path.dirname(path.resolve(dockerfilePath));
|
|
46
72
|
for (;;) {
|
|
@@ -64,10 +90,13 @@ export async function runBuildCommand(options, dependencies = {}) {
|
|
|
64
90
|
const buildDockerImage = dependencies.buildDockerImage ?? buildDockerImageDefault;
|
|
65
91
|
const buildGondolinImage = dependencies.buildGondolinImage ?? buildGondolinImageDefault;
|
|
66
92
|
const resolveOciImageTag = dependencies.resolveOciImageTag ?? resolveOciImageTagFromConfig;
|
|
93
|
+
const resolveRequiredZigVersion = dependencies.resolveRequiredZigVersion ?? resolveGondolinMinimumZigVersion;
|
|
94
|
+
const resolveZigVersion = dependencies.resolveZigVersion ?? resolveHostZigVersion;
|
|
67
95
|
const runTaskStep = dependencies.runTask ?? defaultRunTask;
|
|
68
96
|
const resolveProjectRoot = dependencies.resolveProjectRootFromDockerfile ?? resolveProjectRootFromDockerfile;
|
|
69
97
|
const syncBundledOpenClawPlugin = dependencies.syncBundledOpenClawPlugin ?? syncBundledOpenClawPluginBundle;
|
|
70
98
|
const systemCacheIdentifierPath = options.systemConfig.systemCacheIdentifierPath;
|
|
99
|
+
await assertZigBuildPrerequisite(resolveRequiredZigVersion, resolveZigVersion);
|
|
71
100
|
const gatewayImageTargets = Object.entries(options.systemConfig.imageProfiles.gateways).map(([profileName, profile]) => ({
|
|
72
101
|
buildConfigPath: profile.buildConfig,
|
|
73
102
|
cacheDirectory: path.join(options.systemConfig.cacheDir, 'gateway-images', profileName),
|
|
@@ -105,24 +134,34 @@ export async function runBuildCommand(options, dependencies = {}) {
|
|
|
105
134
|
});
|
|
106
135
|
}
|
|
107
136
|
// oxlint-disable-next-line no-await-in-loop -- docker builds intentionally run one at a time to keep task output readable
|
|
108
|
-
await runTaskStep(`Docker: ${imageTarget.family}/${imageTarget.name} (${imageTag})`, async () => {
|
|
137
|
+
await runTaskStep(`Docker: ${imageTarget.family}/${imageTarget.name} (${imageTag})`, async (taskContext) => {
|
|
138
|
+
taskContext?.setStatus('docker build');
|
|
109
139
|
await buildDockerImage({
|
|
110
140
|
dockerfilePath: imageTarget.dockerfile,
|
|
111
141
|
imageTag,
|
|
142
|
+
...(taskContext?.interactive === true && taskContext.streamPreview
|
|
143
|
+
? { streamPreview: taskContext.streamPreview }
|
|
144
|
+
: {}),
|
|
112
145
|
});
|
|
146
|
+
taskContext?.setStatus('docker image ready');
|
|
113
147
|
});
|
|
114
148
|
}
|
|
115
149
|
const dockerBackedTargets = new Set(dockerImageTargets.map((imageTarget) => imageTargetKey(imageTarget)));
|
|
116
150
|
for (const imageTarget of imageTargets) {
|
|
117
151
|
const shouldResetGondolinCache = options.forceRebuild === true || dockerBackedTargets.has(imageTargetKey(imageTarget));
|
|
118
152
|
// oxlint-disable-next-line no-await-in-loop -- gondolin cache rebuilds are intentionally sequenced per image target
|
|
119
|
-
await runTaskStep(`Gondolin: ${imageTarget.family}/${imageTarget.name}`, async () => {
|
|
153
|
+
await runTaskStep(`Gondolin: ${imageTarget.family}/${imageTarget.name}`, async (taskContext) => {
|
|
154
|
+
taskContext?.setStatus('vm assets');
|
|
120
155
|
await buildGondolinImage({
|
|
121
156
|
buildConfigPath: imageTarget.buildConfigPath,
|
|
122
157
|
systemCacheIdentifierPath: imageTarget.systemCacheIdentifierPath,
|
|
123
158
|
cacheDir: imageTarget.cacheDirectory,
|
|
159
|
+
...(taskContext?.interactive === true && taskContext.streamPreview
|
|
160
|
+
? { streamPreview: taskContext.streamPreview }
|
|
161
|
+
: {}),
|
|
124
162
|
...(shouldResetGondolinCache ? { fullReset: true } : {}),
|
|
125
163
|
});
|
|
164
|
+
taskContext?.setStatus('vm assets ready');
|
|
126
165
|
});
|
|
127
166
|
}
|
|
128
167
|
}
|
|
@@ -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,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,IAAI,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAErG,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;
|
|
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,EAAE,gCAAgC,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,IAAI,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAErG,OAAO,EACN,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,GAChB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AA2B9E,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;QACb,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KACxB,CAAC;CACF,CAAC,CAAC;AAYH,SAAS,cAAc,CAAC,WAAiD;IACxE,OAAO,GAAG,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;AACpD,CAAC;AAED,KAAK,UAAU,4BAA4B,CAAC,eAAuB;IAClE,MAAM,SAAS,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;IAClF,MAAM,YAAY,GAAG,iBAAiB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC5D,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACd,cAAc,CAAC,gCAAgC,eAAe,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,CACtF,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;AACpC,CAAC;AAED,KAAK,UAAU,qBAAqB;IACnC,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,SAAS,CAAC;IAClB,CAAC;AACF,CAAC;AAED,KAAK,UAAU,0BAA0B,CACxC,yBAAgD,EAChD,iBAAoD;IAEpD,MAAM,kBAAkB,GAAG,MAAM,yBAAyB,EAAE,CAAC;IAC7D,MAAM,UAAU,GAAG,MAAM,iBAAiB,EAAE,CAAC;IAC7C,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,qBAAqB,UAAU,GAAG,CAAC,CAAC;IAC/F,CAAC;AACF,CAAC;AAED,KAAK,UAAU,2BAA2B,CACzC,YAAwE,EACxE,kBAAgE;IAEhE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC/C,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE/C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACxC,mGAAmG;QACnG,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACd,qBAAqB,QAAQ,qCAAqC,eAAe,UAAU,WAAW,CAAC,IAAI,kEAAkE,CAC7K,CAAC;QACH,CAAC;QACD,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QAC7C,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,YAAY,CAAC;AACrB,CAAC;AAED,MAAM,cAAc,GAAc,KAAK,EAAE,KAAK,EAAE,EAAE,EAAiB,EAAE;IACpE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC;IACxC,MAAM,EAAE,CAAC;QACR,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC;QACnB,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC;KACnB,CAAC,CAAC;IACH,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;AAC3C,CAAC,CAAC;AAEF,KAAK,UAAU,gCAAgC,CAAC,cAAsB;IACrE,IAAI,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;IAEjE,SAAS,CAAC;QACT,IAAI,CAAC;YACJ,iGAAiG;YACjG,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;YACrE,OAAO,eAAe,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACR,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACtD,IAAI,eAAe,KAAK,eAAe,EAAE,CAAC;gBACzC,6EAA6E;gBAC7E,mGAAmG;gBACnG,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACvD,CAAC;YACD,eAAe,GAAG,eAAe,CAAC;QACnC,CAAC;IACF,CAAC;AACF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACpC,OAGC,EACD,eAAyC,EAAE;IAE3C,MAAM,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,IAAI,uBAAuB,CAAC;IAClF,MAAM,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,IAAI,yBAAyB,CAAC;IACxF,MAAM,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,IAAI,4BAA4B,CAAC;IAC3F,MAAM,yBAAyB,GAC9B,YAAY,CAAC,yBAAyB,IAAI,gCAAgC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,IAAI,qBAAqB,CAAC;IAClF,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,IAAI,cAAc,CAAC;IAC3D,MAAM,kBAAkB,GACvB,YAAY,CAAC,gCAAgC,IAAI,gCAAgC,CAAC;IACnF,MAAM,yBAAyB,GAC9B,YAAY,CAAC,yBAAyB,IAAI,+BAA+B,CAAC;IAC3E,MAAM,yBAAyB,GAAG,OAAO,CAAC,YAAY,CAAC,yBAAyB,CAAC;IAEjF,MAAM,0BAA0B,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,CAAC;IAE/E,MAAM,mBAAmB,GAA2B,MAAM,CAAC,OAAO,CACjE,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,QAAQ,CAC3C,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAClC,eAAe,EAAE,OAAO,CAAC,WAAW;QACpC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE,gBAAgB,EAAE,WAAW,CAAC;QACvF,yBAAyB;QACzB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,SAAkB;QAC1B,WAAW,EAAE,OAAO,CAAC,IAAI;QACzB,IAAI,EAAE,WAAW;KACjB,CAAC,CAAC,CAAC;IACJ,MAAM,kBAAkB,GAA2B,MAAM,CAAC,OAAO,CAChE,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,CAC1C,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAClC,eAAe,EAAE,OAAO,CAAC,WAAW;QACpC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE,gBAAgB,EAAE,WAAW,CAAC;QACvF,yBAAyB;QACzB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,QAAiB;QACzB,IAAI,EAAE,WAAW;KACjB,CAAC,CAAC,CAAC;IACJ,MAAM,YAAY,GAA2B,CAAC,GAAG,mBAAmB,EAAE,GAAG,kBAAkB,CAAC,CAAC;IAC7F,MAAM,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAC7C,CAAC,WAAW,EAAgE,EAAE,CAC7E,WAAW,CAAC,UAAU,KAAK,SAAS,CACrC,CAAC;IACF,MAAM,uBAAuB,GAAG,MAAM,2BAA2B,CAChE,kBAAkB,EAClB,kBAAkB,CAClB,CAAC;IAEF,sIAAsI;IACtI,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE,CAAC;QAC9C,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,wDAAwD,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC;QAC/F,CAAC;QACD,IAAI,WAAW,CAAC,MAAM,KAAK,SAAS,IAAI,WAAW,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;YAChF,+EAA+E;YAC/E,gDAAgD;YAChD,mGAAmG;YACnG,MAAM,oBAAoB,GAAG,MAAM,kBAAkB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAC9E,iHAAiH;YACjH,MAAM,WAAW,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;gBACtD,MAAM,yBAAyB,CAAC,oBAAoB,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;YACzE,CAAC,CAAC,CAAC;QACJ,CAAC;QACD,0HAA0H;QAC1H,MAAM,WAAW,CAChB,WAAW,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ,GAAG,EACjE,KAAK,EAAE,WAAW,EAAE,EAAE;YACrB,WAAW,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;YACvC,MAAM,gBAAgB,CAAC;gBACtB,cAAc,EAAE,WAAW,CAAC,UAAU;gBACtC,QAAQ;gBACR,GAAG,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,IAAI,WAAW,CAAC,aAAa;oBACjE,CAAC,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,aAAa,EAAE;oBAC9C,CAAC,CAAC,EAAE,CAAC;aACN,CAAC,CAAC;YACH,WAAW,EAAE,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAC9C,CAAC,CACD,CAAC;IACH,CAAC;IACD,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAClC,kBAAkB,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CACpE,CAAC;IAEF,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACxC,MAAM,wBAAwB,GAC7B,OAAO,CAAC,YAAY,KAAK,IAAI,IAAI,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;QACvF,oHAAoH;QACpH,MAAM,WAAW,CAChB,aAAa,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,IAAI,EAAE,EACrD,KAAK,EAAE,WAAW,EAAE,EAAE;YACrB,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;YACpC,MAAM,kBAAkB,CAAC;gBACxB,eAAe,EAAE,WAAW,CAAC,eAAe;gBAC5C,yBAAyB,EAAE,WAAW,CAAC,yBAAyB;gBAChE,QAAQ,EAAE,WAAW,CAAC,cAAc;gBACpC,GAAG,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,IAAI,WAAW,CAAC,aAAa;oBACjE,CAAC,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,aAAa,EAAE;oBAC9C,CAAC,CAAC,EAAE,CAAC;gBACN,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACxD,CAAC,CAAC;YACH,WAAW,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAC3C,CAAC,CACD,CAAC;IACH,CAAC;AACF,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-version.d.ts","sourceRoot":"","sources":["../../src/cli/cli-version.ts"],"names":[],"mappings":"AAWA,wBAAsB,iBAAiB,CACtC,SAAS,GAAE,MAAuC,GAChD,OAAO,CAAC,MAAM,CAAC,CAejB"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import fs from 'node:fs/promises';
|
|
2
|
+
import { fileURLToPath } from 'node:url';
|
|
3
|
+
import { z } from 'zod';
|
|
4
|
+
import { findPackageJsonPathFromStart } from '../build/runtime-versions.js';
|
|
5
|
+
const packageVersionJsonSchema = z.object({
|
|
6
|
+
version: z.string().min(1),
|
|
7
|
+
});
|
|
8
|
+
export async function resolveCliVersion(startPath = fileURLToPath(import.meta.url)) {
|
|
9
|
+
const packageJsonPath = await findPackageJsonPathFromStart(startPath);
|
|
10
|
+
try {
|
|
11
|
+
const packageJson = packageVersionJsonSchema.parse(JSON.parse(await fs.readFile(packageJsonPath, 'utf8')));
|
|
12
|
+
return packageJson.version;
|
|
13
|
+
}
|
|
14
|
+
catch (error) {
|
|
15
|
+
throw new Error(`Failed to read CLI package version from ${packageJsonPath}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=cli-version.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-version.js","sourceRoot":"","sources":["../../src/cli/cli-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAE5E,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC1B,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACtC,YAAoB,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;IAElD,MAAM,eAAe,GAAG,MAAM,4BAA4B,CAAC,SAAS,CAAC,CAAC;IACtE,IAAI,CAAC;QACJ,MAAM,WAAW,GAAG,wBAAwB,CAAC,KAAK,CACjD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CACtD,CAAC;QACF,OAAO,WAAW,CAAC,OAAO,CAAC;IAC5B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACd,2CAA2C,eAAe,KACzD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACtD,EAAE,EACF,EAAE,KAAK,EAAE,KAAK,EAAE,CAChB,CAAC;IACH,CAAC;AACF,CAAC"}
|
|
@@ -2,12 +2,16 @@ import { type CliDependencies, type CliIo } from '../agent-vm-cli-support.js';
|
|
|
2
2
|
export declare function createAuthInteractiveCommand(io: CliIo, dependencies: CliDependencies): Partial<import("cmd-ts/dist/cjs/argparser.js").Register> & {
|
|
3
3
|
parse(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
|
|
4
4
|
config: string | undefined;
|
|
5
|
+
deviceCode: boolean;
|
|
5
6
|
provider: string;
|
|
7
|
+
setDefault: boolean;
|
|
6
8
|
zone: string | undefined;
|
|
7
9
|
}>>;
|
|
8
10
|
} & import("cmd-ts/dist/cjs/helpdoc.js").PrintHelp & import("cmd-ts/dist/cjs/helpdoc.js").ProvidesHelp & import("cmd-ts/dist/cjs/helpdoc.js").Named & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned> & import("cmd-ts/dist/cjs/argparser.js").Register & import("cmd-ts/dist/cjs/runner.js").Handling<{
|
|
9
11
|
config: string | undefined;
|
|
12
|
+
deviceCode: boolean;
|
|
10
13
|
provider: string;
|
|
14
|
+
setDefault: boolean;
|
|
11
15
|
zone: string | undefined;
|
|
12
16
|
}, Promise<void>> & {
|
|
13
17
|
run(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<Promise<void>>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-interactive-definition.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/auth-interactive-definition.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,KAAK,EAAe,MAAM,4BAA4B,CAAC;AAQ3F,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe
|
|
1
|
+
{"version":3,"file":"auth-interactive-definition.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/auth-interactive-definition.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,KAAK,EAAe,MAAM,4BAA4B,CAAC;AAQ3F,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe;;;;;;;;;;;;;;;;8JAuCpF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// oxlint-disable typescript-eslint/explicit-function-return-type
|
|
2
|
-
import { command, positional, string } from 'cmd-ts';
|
|
2
|
+
import { command, flag, positional, string } from 'cmd-ts';
|
|
3
3
|
import { loadGatewayLifecycle } from '../../gateway/gateway-lifecycle-loader.js';
|
|
4
4
|
import { requireZone } from '../agent-vm-cli-support.js';
|
|
5
5
|
import { runAuthInteractiveCommand } from '../auth-interactive-command.js';
|
|
@@ -10,22 +10,32 @@ export function createAuthInteractiveCommand(io, dependencies) {
|
|
|
10
10
|
description: 'Run interactive auth for a gateway zone.',
|
|
11
11
|
args: {
|
|
12
12
|
config: createConfigOption(),
|
|
13
|
+
deviceCode: flag({
|
|
14
|
+
long: 'device-code',
|
|
15
|
+
description: 'Use the provider device-code flow instead of browser callback auth.',
|
|
16
|
+
}),
|
|
13
17
|
provider: positional({
|
|
14
18
|
displayName: 'provider',
|
|
15
19
|
type: string,
|
|
16
20
|
description: 'Provider name (for example: codex).',
|
|
17
21
|
}),
|
|
22
|
+
setDefault: flag({
|
|
23
|
+
long: 'set-default',
|
|
24
|
+
description: 'Set the provider as the default model auth target after login.',
|
|
25
|
+
}),
|
|
18
26
|
zone: createZoneOption(),
|
|
19
27
|
},
|
|
20
|
-
handler: async ({ config, provider, zone }) => {
|
|
28
|
+
handler: async ({ config, deviceCode, provider, setDefault, zone }) => {
|
|
21
29
|
const systemConfig = await loadSystemConfigFromOption(config, dependencies);
|
|
22
30
|
const selectedZone = requireZone(systemConfig, zone);
|
|
23
31
|
const lifecycle = loadGatewayLifecycle(selectedZone.gateway.type);
|
|
24
32
|
await runAuthInteractiveCommand({
|
|
25
33
|
authConfig: lifecycle.authConfig,
|
|
26
34
|
dependencies,
|
|
35
|
+
deviceCode,
|
|
27
36
|
io,
|
|
28
37
|
provider,
|
|
38
|
+
setDefault,
|
|
29
39
|
systemConfig,
|
|
30
40
|
zoneId: selectedZone.id,
|
|
31
41
|
...(dependencies.runCommand ? { runCommand: dependencies.runCommand } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-interactive-definition.js","sourceRoot":"","sources":["../../../src/cli/commands/auth-interactive-definition.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-interactive-definition.js","sourceRoot":"","sources":["../../../src/cli/commands/auth-interactive-definition.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAoC,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EACN,kBAAkB,EAClB,gBAAgB,EAChB,0BAA0B,GAC1B,MAAM,iCAAiC,CAAC;AAEzC,MAAM,UAAU,4BAA4B,CAAC,EAAS,EAAE,YAA6B;IACpF,OAAO,OAAO,CAAC;QACd,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,0CAA0C;QACvD,IAAI,EAAE;YACL,MAAM,EAAE,kBAAkB,EAAE;YAC5B,UAAU,EAAE,IAAI,CAAC;gBAChB,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,qEAAqE;aAClF,CAAC;YACF,QAAQ,EAAE,UAAU,CAAC;gBACpB,WAAW,EAAE,UAAU;gBACvB,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,qCAAqC;aAClD,CAAC;YACF,UAAU,EAAE,IAAI,CAAC;gBAChB,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,gEAAgE;aAC7E,CAAC;YACF,IAAI,EAAE,gBAAgB,EAAE;SACxB;QACD,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE;YACrE,MAAM,YAAY,GAAG,MAAM,0BAA0B,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAC5E,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YACrD,MAAM,SAAS,GAAG,oBAAoB,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAElE,MAAM,yBAAyB,CAAC;gBAC/B,UAAU,EAAE,SAAS,CAAC,UAAU;gBAChC,YAAY;gBACZ,UAAU;gBACV,EAAE;gBACF,QAAQ;gBACR,UAAU;gBACV,YAAY;gBACZ,MAAM,EAAE,YAAY,CAAC,EAAE;gBACvB,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC3E,CAAC,CAAC;QACJ,CAAC;KACD,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -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 { createRunTask } 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 = await createRunTask(_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,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,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,MAAM,aAAa,CAAC,GAAG,CAAC,CAAC;YACzC,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"}
|