@agent-vm/agent-vm 0.0.63 → 0.0.64
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/managed-image-dockerfile.d.ts.map +1 -1
- package/dist/build/managed-image-dockerfile.js +9 -0
- package/dist/build/managed-image-dockerfile.js.map +1 -1
- package/dist/cli/agent-vm-cli-support.d.ts +2 -2
- package/dist/cli/agent-vm-cli-support.d.ts.map +1 -1
- package/dist/cli/agent-vm-cli-support.js +2 -2
- package/dist/cli/agent-vm-cli-support.js.map +1 -1
- package/dist/controller/composite-secret-resolver.d.ts.map +1 -1
- package/dist/controller/composite-secret-resolver.js +78 -13
- package/dist/controller/composite-secret-resolver.js.map +1 -1
- package/dist/controller/controller-runtime.d.ts.map +1 -1
- package/dist/controller/controller-runtime.js +2 -2
- package/dist/controller/controller-runtime.js.map +1 -1
- package/dist/gateway/credential-manager.d.ts.map +1 -1
- package/dist/gateway/credential-manager.js +21 -15
- package/dist/gateway/credential-manager.js.map +1 -1
- package/dist/integration-tests/live-integration-gates.d.ts +2 -0
- package/dist/integration-tests/live-integration-gates.d.ts.map +1 -0
- package/dist/integration-tests/live-integration-gates.js +4 -0
- package/dist/integration-tests/live-integration-gates.js.map +1 -0
- package/dist/integration-tests/smoke-harness.d.ts +68 -7
- package/dist/integration-tests/smoke-harness.d.ts.map +1 -1
- package/dist/integration-tests/smoke-harness.js +208 -20
- package/dist/integration-tests/smoke-harness.js.map +1 -1
- package/package.json +10 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-image-dockerfile.d.ts","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,SAAS,GAAG,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"managed-image-dockerfile.d.ts","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,8 @@ const managedOpenClawAgentVmPluginPackagePath = '/pnpm/global/5/node_modules/@ag
|
|
|
18
18
|
const managedOpenClawMcpPortalPluginPackagePath = '/pnpm/global/5/node_modules/@agent-vm/openclaw-mcp-portal-plugin/dist';
|
|
19
19
|
const managedMcpPortalServerScriptPath = '/pnpm/global/5/node_modules/@agent-vm/mcp-portal/dist/bin/portal-server.js';
|
|
20
20
|
const managedMcpPortalServerWrapperPath = '/opt/agent-vm/portal/bin/agent-vm-mcp-portal-server';
|
|
21
|
+
const managedPnpmHomePath = '/pnpm';
|
|
22
|
+
const managedPnpmGlobalDirectory = '/pnpm/global';
|
|
21
23
|
const overlayCopySchema = z
|
|
22
24
|
.object({
|
|
23
25
|
from: z.string().min(1),
|
|
@@ -110,6 +112,13 @@ function renderManagedDockerfile(props) {
|
|
|
110
112
|
shellJoin(props.overlay.extraAptPackages) +
|
|
111
113
|
' && rm -rf /var/lib/apt/lists/*');
|
|
112
114
|
}
|
|
115
|
+
if (props.base === 'openclaw-gateway' ||
|
|
116
|
+
props.base === 'tool-vm' ||
|
|
117
|
+
props.openClawPackages.length > 0) {
|
|
118
|
+
lines.push(`ENV PNPM_HOME=${managedPnpmHomePath}`);
|
|
119
|
+
lines.push('ENV PATH=${PNPM_HOME}:${PATH}');
|
|
120
|
+
lines.push(`RUN pnpm config set global-dir ${managedPnpmGlobalDirectory} && pnpm config set global-bin-dir ${managedPnpmHomePath}`);
|
|
121
|
+
}
|
|
113
122
|
if (props.base === 'openclaw-gateway') {
|
|
114
123
|
if (!props.openClawAgentVmPluginPackageSpec || !props.openClawMcpPortalPluginPackageSpec || !props.mcpPortalPackageSpec) {
|
|
115
124
|
throw new Error('OpenClaw gateway managed Dockerfiles require all managed OpenClaw plugin package specs.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-image-dockerfile.js","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"managed-image-dockerfile.js","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { SecretResolver } from '@agent-vm/gondolin-adapter';
|
|
2
|
-
import {
|
|
2
|
+
import { createSecretResolver, 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';
|
|
@@ -20,7 +20,7 @@ export interface CliDependencies {
|
|
|
20
20
|
readonly buildControllerStatus: typeof buildControllerStatus;
|
|
21
21
|
readonly createAgeBackupEncryption: typeof createAgeBackupEncryption;
|
|
22
22
|
readonly createControllerClient: typeof createControllerClient;
|
|
23
|
-
readonly createSecretResolver: typeof
|
|
23
|
+
readonly createSecretResolver: typeof createSecretResolver;
|
|
24
24
|
readonly createZoneBackupManager: typeof createZoneBackupManager;
|
|
25
25
|
readonly getCurrentWorkingDirectory?: () => string;
|
|
26
26
|
readonly initRepoResources?: (options: {
|
|
@@ -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,EACN,
|
|
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 {
|
|
1
|
+
import { createSecretResolver, 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';
|
|
@@ -20,7 +20,7 @@ export const defaultCliDependencies = {
|
|
|
20
20
|
buildControllerStatus,
|
|
21
21
|
createAgeBackupEncryption,
|
|
22
22
|
createControllerClient,
|
|
23
|
-
createSecretResolver
|
|
23
|
+
createSecretResolver,
|
|
24
24
|
createZoneBackupManager,
|
|
25
25
|
getCurrentWorkingDirectory: () => process.cwd(),
|
|
26
26
|
loadSystemConfig,
|
|
@@ -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,
|
|
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":"composite-secret-resolver.d.ts","sourceRoot":"","sources":["../../src/controller/composite-secret-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,cAAc,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"composite-secret-resolver.d.ts","sourceRoot":"","sources":["../../src/controller/composite-secret-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAyC5E,wBAAgB,6BAA6B,CAC5C,mBAAmB,EAAE,cAAc,GAAG,IAAI,EAC1C,GAAG,GAAE,MAAM,CAAC,UAAwB,GAClC,cAAc,CA4FhB"}
|
|
@@ -1,17 +1,34 @@
|
|
|
1
|
+
function resolveEnvironmentSecret(ref, env) {
|
|
2
|
+
const value = env[ref.ref];
|
|
3
|
+
if (value === undefined) {
|
|
4
|
+
throw new Error(`Environment variable '${ref.ref}' is not set.`);
|
|
5
|
+
}
|
|
6
|
+
if (value.trim().length === 0) {
|
|
7
|
+
throw new Error(`Environment variable '${ref.ref}' is set but empty.`);
|
|
8
|
+
}
|
|
9
|
+
return value;
|
|
10
|
+
}
|
|
11
|
+
function formatUnknownError(error) {
|
|
12
|
+
return error instanceof Error ? error.message : String(error);
|
|
13
|
+
}
|
|
14
|
+
function createSecretResolutionError(options) {
|
|
15
|
+
return new Error(`Failed to resolve secret '${options.secretName}' from '${options.ref.ref}': ${formatUnknownError(options.cause)}`, { cause: options.cause });
|
|
16
|
+
}
|
|
17
|
+
function throwAggregateSecretResolutionError(failures) {
|
|
18
|
+
if (failures.length > 0) {
|
|
19
|
+
throw new AggregateError(failures, `Failed to resolve ${String(failures.length)} secret(s).`);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
function extractAggregateErrors(error) {
|
|
23
|
+
const failures = Array.isArray(error.errors) ? error.errors : [error];
|
|
24
|
+
return failures.map((failure) => failure instanceof Error ? failure : new Error(formatUnknownError(failure), { cause: failure }));
|
|
25
|
+
}
|
|
1
26
|
export function createCompositeSecretResolver(onePasswordResolver, env = process.env) {
|
|
2
27
|
return {
|
|
3
28
|
async resolve(ref) {
|
|
4
29
|
switch (ref.source) {
|
|
5
|
-
case 'environment':
|
|
6
|
-
|
|
7
|
-
if (value === undefined) {
|
|
8
|
-
throw new Error(`Environment variable '${ref.ref}' is not set.`);
|
|
9
|
-
}
|
|
10
|
-
if (value.trim().length === 0) {
|
|
11
|
-
throw new Error(`Environment variable '${ref.ref}' is set but empty.`);
|
|
12
|
-
}
|
|
13
|
-
return value;
|
|
14
|
-
}
|
|
30
|
+
case 'environment':
|
|
31
|
+
return resolveEnvironmentSecret(ref, env);
|
|
15
32
|
case '1password': {
|
|
16
33
|
if (!onePasswordResolver) {
|
|
17
34
|
throw new Error("Secret with source '1password' requires host.secretsProvider to be configured.");
|
|
@@ -26,11 +43,59 @@ export function createCompositeSecretResolver(onePasswordResolver, env = process
|
|
|
26
43
|
},
|
|
27
44
|
async resolveAll(refs) {
|
|
28
45
|
const resolved = {};
|
|
46
|
+
const onePasswordRefs = {};
|
|
47
|
+
const failures = [];
|
|
29
48
|
for (const [name, ref] of Object.entries(refs)) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
49
|
+
switch (ref.source) {
|
|
50
|
+
case 'environment':
|
|
51
|
+
try {
|
|
52
|
+
resolved[name] = resolveEnvironmentSecret(ref, env);
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
failures.push(createSecretResolutionError({
|
|
56
|
+
cause: error,
|
|
57
|
+
ref,
|
|
58
|
+
secretName: name,
|
|
59
|
+
}));
|
|
60
|
+
}
|
|
61
|
+
break;
|
|
62
|
+
case '1password':
|
|
63
|
+
onePasswordRefs[name] = ref;
|
|
64
|
+
break;
|
|
65
|
+
default: {
|
|
66
|
+
const exhaustiveCheck = ref;
|
|
67
|
+
throw new Error(`Unsupported secret source: ${JSON.stringify(exhaustiveCheck)}`);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
if (Object.keys(onePasswordRefs).length > 0) {
|
|
72
|
+
if (!onePasswordResolver) {
|
|
73
|
+
failures.push(...Object.entries(onePasswordRefs).map(([name, ref]) => createSecretResolutionError({
|
|
74
|
+
cause: new Error("Secret with source '1password' requires host.secretsProvider to be configured."),
|
|
75
|
+
ref,
|
|
76
|
+
secretName: name,
|
|
77
|
+
})));
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
const resolver = onePasswordResolver;
|
|
81
|
+
try {
|
|
82
|
+
Object.assign(resolved, await resolver.resolveAll(onePasswordRefs));
|
|
83
|
+
}
|
|
84
|
+
catch (error) {
|
|
85
|
+
if (error instanceof AggregateError) {
|
|
86
|
+
failures.push(...extractAggregateErrors(error));
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
failures.push(...Object.entries(onePasswordRefs).map(([name, ref]) => createSecretResolutionError({
|
|
90
|
+
cause: error,
|
|
91
|
+
ref,
|
|
92
|
+
secretName: name,
|
|
93
|
+
})));
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
33
97
|
}
|
|
98
|
+
throwAggregateSecretResolutionError(failures);
|
|
34
99
|
return resolved;
|
|
35
100
|
},
|
|
36
101
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composite-secret-resolver.js","sourceRoot":"","sources":["../../src/controller/composite-secret-resolver.ts"],"names":[],"mappings":"AAEA,
|
|
1
|
+
{"version":3,"file":"composite-secret-resolver.js","sourceRoot":"","sources":["../../src/controller/composite-secret-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-runtime.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"controller-runtime.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime.ts"],"names":[],"mappings":"AAkBA,OAAO,EACN,KAAK,iBAAiB,EACtB,KAAK,6BAA6B,EAClC,KAAK,6BAA6B,EAClC,MAAM,+BAA+B,CAAC;AA4FvC,wBAAsB,sBAAsB,CAC3C,OAAO,EAAE,6BAA6B,EACtC,YAAY,EAAE,6BAA6B,GACzC,OAAO,CAAC,iBAAiB,CAAC,CAmR5B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createSecretResolver as createOnePasswordSecretResolver, } from '@agent-vm/gondolin-adapter';
|
|
2
2
|
import { startGatewayZone } from '../gateway/gateway-zone-orchestrator.js';
|
|
3
3
|
import { runTaskWithResult } from '../shared/run-task.js';
|
|
4
4
|
import { createToolVm } from '../tool-vm/tool-vm-lifecycle.js';
|
|
@@ -66,7 +66,7 @@ function resolveZoneGitOperationConfig(options) {
|
|
|
66
66
|
export async function startControllerRuntime(options, dependencies) {
|
|
67
67
|
const now = dependencies.now ?? Date.now;
|
|
68
68
|
const runTaskStep = dependencies.runTask ?? (async (_title, fn) => await fn());
|
|
69
|
-
const secretResolver = await runTaskWithResult(runTaskStep, 'Resolving 1Password secrets', async () => await createSecretResolver(options.systemConfig, dependencies.createSecretResolver ??
|
|
69
|
+
const secretResolver = await runTaskWithResult(runTaskStep, 'Resolving 1Password secrets', async () => await createSecretResolver(options.systemConfig, dependencies.createSecretResolver ?? createOnePasswordSecretResolver));
|
|
70
70
|
const controllerGithubToken = await resolveControllerGithubToken(options.systemConfig, secretResolver);
|
|
71
71
|
const createManagedToolVm = dependencies.createManagedToolVm ??
|
|
72
72
|
(async (toolVmOptions) => await createToolVm({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-runtime.js","sourceRoot":"","sources":["../../src/controller/controller-runtime.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"controller-runtime.js","sourceRoot":"","sources":["../../src/controller/controller-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-manager.d.ts","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAa,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"credential-manager.d.ts","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAa,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAwC/D,KAAK,yBAAyB,GAC3B;IACA,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,KAAK,GAAG,gBAAgB,CAAC;CAC7C,GACD;IACA,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;CACpC,CAAC;AAEL,wBAAsB,kBAAkB,CACvC,OAAO,EAAE,yBAAyB,GAChC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA6DjC"}
|
|
@@ -18,6 +18,18 @@ function buildSuggestedSecretRef(zoneId, secretName) {
|
|
|
18
18
|
function findZone(systemConfig, zoneId) {
|
|
19
19
|
return systemConfig.zones.find((zone) => zone.id === zoneId);
|
|
20
20
|
}
|
|
21
|
+
function formatUnknownError(error) {
|
|
22
|
+
return error instanceof Error ? error.message : String(error);
|
|
23
|
+
}
|
|
24
|
+
function formatSecretResolutionFailure(zoneId, error) {
|
|
25
|
+
const message = formatUnknownError(error);
|
|
26
|
+
if (error instanceof AggregateError && error.errors.length > 0) {
|
|
27
|
+
const details = Array.from(error.errors).map(formatUnknownError).join('; ');
|
|
28
|
+
const separator = message.endsWith('.') ? '' : '.';
|
|
29
|
+
return `Failed to resolve zone secrets for zone '${zoneId}': ${message}${separator} Details: ${details}`;
|
|
30
|
+
}
|
|
31
|
+
return `Failed to resolve zone secrets for zone '${zoneId}': ${message}`;
|
|
32
|
+
}
|
|
21
33
|
export async function resolveZoneSecrets(options) {
|
|
22
34
|
if (options.audience === 'tool-vm' && options.injection !== 'http-mediation') {
|
|
23
35
|
throw new Error("Tool VM secret resolution requires injection 'http-mediation'.");
|
|
@@ -28,7 +40,7 @@ export async function resolveZoneSecrets(options) {
|
|
|
28
40
|
if (!zone) {
|
|
29
41
|
throw new Error(`Unknown zone '${options.zoneId}'.`);
|
|
30
42
|
}
|
|
31
|
-
const
|
|
43
|
+
const secretRefs = {};
|
|
32
44
|
for (const [secretName, secretConfig] of Object.entries(zone.secrets)) {
|
|
33
45
|
if (!targetsAudience(secretConfig.audience, runtimeAudience)) {
|
|
34
46
|
continue;
|
|
@@ -39,13 +51,12 @@ export async function resolveZoneSecrets(options) {
|
|
|
39
51
|
if (injectionFilter && secretConfig.injection !== injectionFilter) {
|
|
40
52
|
continue;
|
|
41
53
|
}
|
|
42
|
-
let secretRef;
|
|
43
54
|
switch (secretConfig.source) {
|
|
44
55
|
case 'environment':
|
|
45
56
|
if (!secretConfig.envVar) {
|
|
46
57
|
throw new Error(`Zone '${zone.id}' secret '${secretName}' is missing 'envVar'. Add an explicit environment variable name.`);
|
|
47
58
|
}
|
|
48
|
-
|
|
59
|
+
secretRefs[secretName] = {
|
|
49
60
|
ref: secretConfig.envVar,
|
|
50
61
|
source: 'environment',
|
|
51
62
|
};
|
|
@@ -54,7 +65,7 @@ export async function resolveZoneSecrets(options) {
|
|
|
54
65
|
if (!secretConfig.ref) {
|
|
55
66
|
throw new Error(`Zone '${zone.id}' secret '${secretName}' is missing 'ref'. Add an explicit 1Password reference such as '${buildSuggestedSecretRef(zone.id, secretName)}'.`);
|
|
56
67
|
}
|
|
57
|
-
|
|
68
|
+
secretRefs[secretName] = {
|
|
58
69
|
ref: secretConfig.ref,
|
|
59
70
|
source: '1password',
|
|
60
71
|
};
|
|
@@ -64,17 +75,12 @@ export async function resolveZoneSecrets(options) {
|
|
|
64
75
|
throw new Error(`Unsupported secret config for '${secretName}': ${JSON.stringify(exhaustiveCheck)}`);
|
|
65
76
|
}
|
|
66
77
|
}
|
|
67
|
-
try {
|
|
68
|
-
// Sequential resolution gives the user exact secret context on failure.
|
|
69
|
-
// oxlint-disable-next-line eslint/no-await-in-loop
|
|
70
|
-
resolvedSecrets[secretName] = await options.secretResolver.resolve(secretRef);
|
|
71
|
-
}
|
|
72
|
-
catch (error) {
|
|
73
|
-
const message = error instanceof Error ? error.message : String(error);
|
|
74
|
-
const sourceReference = secretConfig.source === 'environment' ? secretConfig.envVar : secretConfig.ref;
|
|
75
|
-
throw new Error(`Failed to resolve secret '${secretName}' for zone '${zone.id}' from '${sourceReference}': ${message}`, { cause: error });
|
|
76
|
-
}
|
|
77
78
|
}
|
|
78
|
-
|
|
79
|
+
try {
|
|
80
|
+
return await options.secretResolver.resolveAll(secretRefs);
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
throw new Error(formatSecretResolutionFailure(zone.id, error), { cause: error });
|
|
84
|
+
}
|
|
79
85
|
}
|
|
80
86
|
//# sourceMappingURL=credential-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-manager.js","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA0B,MAAM,6BAA6B,CAAC;AAKtF,SAAS,uBAAuB,CAAC,MAAc,EAAE,UAAkB;IAClE,QAAQ,UAAU,EAAE,CAAC;QACpB,KAAK,mBAAmB;YACvB,OAAO,iBAAiB,MAAM,oBAAoB,CAAC;QACpD,KAAK,oBAAoB;YACxB,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;QACxD,KAAK,wBAAwB;YAC5B,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;QACxD,KAAK,gBAAgB;YACpB,OAAO,iBAAiB,MAAM,oBAAoB,CAAC;QACpD,KAAK,mBAAmB;YACvB,OAAO,iBAAiB,MAAM,uBAAuB,CAAC;QACvD;YACC,OAAO,iBAAiB,MAAM,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,aAAa,CAAC;IAC9F,CAAC;AACF,CAAC;AAED,SAAS,QAAQ,CAChB,YAA0B,EAC1B,MAAc;IAEd,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;AAC9D,CAAC;AAkBD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,OAAkC;IAElC,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,CAAC,SAAS,KAAK,gBAAgB,EAAE,CAAC;QAC9E,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;IACnF,CAAC;IACD,MAAM,eAAe,GAAsB,OAAO,CAAC,QAAQ,CAAC;IAC5D,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IAC1C,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5D,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"credential-manager.js","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"live-integration-gates.d.ts","sourceRoot":"","sources":["../../src/integration-tests/live-integration-gates.ts"],"names":[],"mappings":"AAAA,wBAAgB,0BAA0B,CACzC,GAAG,GAAE,OAAO,CAAC,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAe,GACnE,OAAO,CAET"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"live-integration-gates.js","sourceRoot":"","sources":["../../src/integration-tests/live-integration-gates.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,0BAA0B,CACzC,MAA0D,OAAO,CAAC,GAAG;IAErE,OAAO,GAAG,CAAC,uBAAuB,KAAK,GAAG,CAAC;AAC5C,CAAC"}
|
|
@@ -1,12 +1,19 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type SecretResolver } from '@agent-vm/gondolin-adapter';
|
|
2
2
|
import { type ImageArchitecture } from '../cli/init-command.js';
|
|
3
3
|
import { type LoadedSystemConfig } from '../config/system-config.js';
|
|
4
|
-
import type { ControllerRuntime, StartControllerRuntimeOptions } from '../controller/controller-runtime-types.js';
|
|
4
|
+
import type { ControllerRuntime, ControllerRuntimeDependencies, StartControllerRuntimeOptions } from '../controller/controller-runtime-types.js';
|
|
5
|
+
import { startGatewayZone } from '../gateway/gateway-zone-orchestrator.js';
|
|
6
|
+
import type { StartGatewayZoneOptions } from '../gateway/gateway-zone-support.js';
|
|
5
7
|
interface OpenClawSmokeZone extends Omit<LoadedSystemConfig['zones'][number], 'gateway'> {
|
|
6
8
|
readonly gateway: Extract<LoadedSystemConfig['zones'][number]['gateway'], {
|
|
7
9
|
readonly type: 'openclaw';
|
|
8
10
|
}>;
|
|
9
11
|
}
|
|
12
|
+
interface WorkerSmokeZone extends Omit<LoadedSystemConfig['zones'][number], 'gateway'> {
|
|
13
|
+
readonly gateway: Extract<LoadedSystemConfig['zones'][number]['gateway'], {
|
|
14
|
+
readonly type: 'worker';
|
|
15
|
+
}>;
|
|
16
|
+
}
|
|
10
17
|
export interface SmokeHarnessSecretMap {
|
|
11
18
|
readonly [secretKey: string]: string;
|
|
12
19
|
}
|
|
@@ -24,10 +31,47 @@ export interface OpenClawSmokeProject {
|
|
|
24
31
|
readonly tempRoot: string;
|
|
25
32
|
readonly zone: OpenClawSmokeZone;
|
|
26
33
|
}
|
|
34
|
+
export interface WorkerSmokeProject {
|
|
35
|
+
readonly controllerPort: number;
|
|
36
|
+
readonly gatewayPort: number;
|
|
37
|
+
readonly systemConfig: LoadedSystemConfig;
|
|
38
|
+
readonly tempRoot: string;
|
|
39
|
+
readonly zone: WorkerSmokeZone;
|
|
40
|
+
}
|
|
41
|
+
export type GatewaySmokeKind = 'openclaw' | 'worker';
|
|
42
|
+
export type GatewaySmokeProject = OpenClawSmokeProject | WorkerSmokeProject;
|
|
43
|
+
export interface ScaffoldGatewaySmokeProjectOptions {
|
|
44
|
+
readonly agents?: readonly string[];
|
|
45
|
+
readonly architecture: ImageArchitecture;
|
|
46
|
+
readonly kind: GatewaySmokeKind;
|
|
47
|
+
readonly prefix: string;
|
|
48
|
+
readonly zoneId: string;
|
|
49
|
+
}
|
|
50
|
+
export interface GondolinSmokePrerequisiteOptions {
|
|
51
|
+
readonly architecture: ImageArchitecture;
|
|
52
|
+
readonly commandExists?: (command: string) => boolean;
|
|
53
|
+
readonly resolveRequiredZigVersion?: () => Promise<string>;
|
|
54
|
+
readonly resolveZigVersion?: () => Promise<string | undefined>;
|
|
55
|
+
}
|
|
56
|
+
export interface StartSmokeControllerRuntimeOptions {
|
|
57
|
+
readonly secrets: SmokeHarnessSecretMap;
|
|
58
|
+
readonly startGatewayZone?: typeof startGatewayZone;
|
|
59
|
+
readonly startHttpServer?: NonNullable<ControllerRuntimeDependencies['startHttpServer']>;
|
|
60
|
+
readonly startOptions: StartControllerRuntimeOptions;
|
|
61
|
+
readonly tcpHostsOverride?: StartGatewayZoneOptions['tcpHostsOverride'];
|
|
62
|
+
readonly vfsMountsOverride?: StartGatewayZoneOptions['vfsMountsOverride'];
|
|
63
|
+
}
|
|
27
64
|
export declare function hasCommand(command: string): boolean;
|
|
28
65
|
export declare function currentSmokeArchitecture(): ImageArchitecture;
|
|
29
66
|
export declare function qemuCommandForArchitecture(architecture: ImageArchitecture): string;
|
|
30
|
-
export declare function canRunGondolinSmoke(
|
|
67
|
+
export declare function canRunGondolinSmoke(options: GondolinSmokePrerequisiteOptions): Promise<boolean>;
|
|
68
|
+
export declare function shouldRunWorkerGatewaySmoke(options: {
|
|
69
|
+
readonly architecture: ImageArchitecture;
|
|
70
|
+
readonly commandExists?: (command: string) => boolean;
|
|
71
|
+
readonly env?: Partial<Record<'AGENT_VM_WORKER_SMOKE' | 'OPEN_AI_TEST_KEY', string>>;
|
|
72
|
+
readonly resolveRequiredZigVersion?: () => Promise<string>;
|
|
73
|
+
readonly resolveZigVersion?: () => Promise<string | undefined>;
|
|
74
|
+
}): Promise<boolean>;
|
|
31
75
|
export declare function rebuildWorkspacePackages(repoRoot: string): void;
|
|
32
76
|
export declare function findAvailablePort(): Promise<number>;
|
|
33
77
|
export declare function waitForControllerReady(controllerPort: number): Promise<void>;
|
|
@@ -39,6 +83,12 @@ export declare function seedGatewayImageCacheIfAvailable(options: {
|
|
|
39
83
|
}): Promise<void>;
|
|
40
84
|
export declare function createSmokeSecretResolver(secrets: SmokeHarnessSecretMap): SecretResolver;
|
|
41
85
|
export declare function getOpenClawSmokeZone(systemConfig: LoadedSystemConfig): OpenClawSmokeProject['zone'];
|
|
86
|
+
export declare function useLocalOpenClawGatewayImagePackages(options: {
|
|
87
|
+
readonly profileName: string;
|
|
88
|
+
readonly projectRoot: string;
|
|
89
|
+
readonly repoRoot: string;
|
|
90
|
+
readonly systemConfig: LoadedSystemConfig;
|
|
91
|
+
}): Promise<void>;
|
|
42
92
|
export declare function useLocalOpenClawPluginGatewayImage(options: {
|
|
43
93
|
readonly profileName: string;
|
|
44
94
|
readonly projectRoot: string;
|
|
@@ -51,9 +101,20 @@ export declare function scaffoldOpenClawSmokeProject(options: {
|
|
|
51
101
|
readonly prefix: string;
|
|
52
102
|
readonly zoneId: string;
|
|
53
103
|
}): Promise<OpenClawSmokeProject>;
|
|
54
|
-
export declare function
|
|
55
|
-
|
|
56
|
-
readonly
|
|
57
|
-
|
|
104
|
+
export declare function prepareLocalWorkerPackageForGatewayImage(repoRoot: string): Promise<string>;
|
|
105
|
+
export declare function scaffoldWorkerSmokeProject(options: {
|
|
106
|
+
readonly architecture: ImageArchitecture;
|
|
107
|
+
readonly prefix: string;
|
|
108
|
+
readonly zoneId: string;
|
|
109
|
+
}): Promise<WorkerSmokeProject>;
|
|
110
|
+
export declare function scaffoldGatewaySmokeProject(options: ScaffoldGatewaySmokeProjectOptions): Promise<GatewaySmokeProject>;
|
|
111
|
+
export declare function writeOpenClawMcpPortalSmokeConfigs(options: {
|
|
112
|
+
readonly agentId: string;
|
|
113
|
+
readonly configDir: string;
|
|
114
|
+
readonly namespace: string;
|
|
115
|
+
readonly portalAccessHeaderName: string;
|
|
116
|
+
readonly upstreamUrl: string;
|
|
117
|
+
}): Promise<void>;
|
|
118
|
+
export declare function startSmokeControllerRuntime(options: StartSmokeControllerRuntimeOptions): Promise<SmokeHarnessRuntime>;
|
|
58
119
|
export {};
|
|
59
120
|
//# sourceMappingURL=smoke-harness.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smoke-harness.d.ts","sourceRoot":"","sources":["../../src/integration-tests/smoke-harness.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"smoke-harness.d.ts","sourceRoot":"","sources":["../../src/integration-tests/smoke-harness.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,14 @@ import fs from 'node:fs/promises';
|
|
|
3
3
|
import net from 'node:net';
|
|
4
4
|
import os from 'node:os';
|
|
5
5
|
import path from 'node:path';
|
|
6
|
+
import { resolveGondolinMinimumZigVersion, } from '@agent-vm/gondolin-adapter';
|
|
6
7
|
import { computeFingerprintFromConfigPath } from '../build/gondolin-image-builder.js';
|
|
7
8
|
import { resolveManagedImageRelease } from '../build/managed-image-dockerfile.js';
|
|
9
|
+
import { isZigVersionAtLeast, resolveHostZigVersion } from '../build/zig-compatibility.js';
|
|
8
10
|
import { scaffoldAgentVmProject } from '../cli/init-command.js';
|
|
9
11
|
import { loadSystemConfig } from '../config/system-config.js';
|
|
10
12
|
import { startControllerRuntime } from '../controller/controller-runtime.js';
|
|
13
|
+
import { startGatewayZone } from '../gateway/gateway-zone-orchestrator.js';
|
|
11
14
|
export function hasCommand(command) {
|
|
12
15
|
try {
|
|
13
16
|
execFileSync('sh', ['-lc', `command -v ${command} >/dev/null`], { stdio: 'ignore' });
|
|
@@ -23,10 +26,32 @@ export function currentSmokeArchitecture() {
|
|
|
23
26
|
export function qemuCommandForArchitecture(architecture) {
|
|
24
27
|
return architecture === 'aarch64' ? 'qemu-system-aarch64' : 'qemu-system-x86_64';
|
|
25
28
|
}
|
|
26
|
-
export function canRunGondolinSmoke(
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
29
|
+
export async function canRunGondolinSmoke(options) {
|
|
30
|
+
const commandExists = options.commandExists ?? hasCommand;
|
|
31
|
+
if (!commandExists(qemuCommandForArchitecture(options.architecture)) ||
|
|
32
|
+
!commandExists('docker')) {
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
const requiredZigVersion = await (options.resolveRequiredZigVersion ?? resolveGondolinMinimumZigVersion)();
|
|
36
|
+
const installedZigVersion = await (options.resolveZigVersion ?? resolveHostZigVersion)();
|
|
37
|
+
return (installedZigVersion !== undefined &&
|
|
38
|
+
isZigVersionAtLeast(installedZigVersion, requiredZigVersion));
|
|
39
|
+
}
|
|
40
|
+
export async function shouldRunWorkerGatewaySmoke(options) {
|
|
41
|
+
const env = options.env ?? process.env;
|
|
42
|
+
if (env.AGENT_VM_WORKER_SMOKE !== '1' ||
|
|
43
|
+
typeof env.OPEN_AI_TEST_KEY !== 'string' ||
|
|
44
|
+
env.OPEN_AI_TEST_KEY.length === 0) {
|
|
45
|
+
return false;
|
|
46
|
+
}
|
|
47
|
+
return await canRunGondolinSmoke({
|
|
48
|
+
architecture: options.architecture,
|
|
49
|
+
...(options.commandExists ? { commandExists: options.commandExists } : {}),
|
|
50
|
+
...(options.resolveRequiredZigVersion
|
|
51
|
+
? { resolveRequiredZigVersion: options.resolveRequiredZigVersion }
|
|
52
|
+
: {}),
|
|
53
|
+
...(options.resolveZigVersion ? { resolveZigVersion: options.resolveZigVersion } : {}),
|
|
54
|
+
});
|
|
30
55
|
}
|
|
31
56
|
export function rebuildWorkspacePackages(repoRoot) {
|
|
32
57
|
execFileSync('pnpm', ['build'], {
|
|
@@ -153,40 +178,71 @@ export function getOpenClawSmokeZone(systemConfig) {
|
|
|
153
178
|
}
|
|
154
179
|
return { ...zone, gateway: zone.gateway };
|
|
155
180
|
}
|
|
156
|
-
|
|
181
|
+
function getWorkerSmokeZone(systemConfig) {
|
|
182
|
+
const zone = systemConfig.zones[0];
|
|
183
|
+
if (!zone || zone.gateway.type !== 'worker') {
|
|
184
|
+
throw new Error('Expected smoke system config to contain a Worker Gateway zone.');
|
|
185
|
+
}
|
|
186
|
+
return { ...zone, gateway: zone.gateway };
|
|
187
|
+
}
|
|
188
|
+
async function archivePackageDist(props) {
|
|
189
|
+
await fs.access(path.join(props.distDirectory, 'index.js'));
|
|
190
|
+
execFileSync('tar', ['--no-xattrs', '-czf', props.archivePath, '-C', props.distDirectory, '.'], {
|
|
191
|
+
env: { ...process.env, COPYFILE_DISABLE: '1' },
|
|
192
|
+
stdio: 'inherit',
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
export async function useLocalOpenClawGatewayImagePackages(options) {
|
|
157
196
|
const gatewayProfile = options.systemConfig.imageProfiles.gateways[options.profileName];
|
|
158
197
|
if (!gatewayProfile) {
|
|
159
198
|
throw new Error(`Gateway image profile '${options.profileName}' is not configured.`);
|
|
160
199
|
}
|
|
161
|
-
const pluginDistDirectory = path.join(options.repoRoot, 'packages', 'openclaw-agent-vm-plugin', 'dist');
|
|
162
|
-
await fs.access(path.join(pluginDistDirectory, 'openclaw.plugin.json'));
|
|
163
200
|
const managedImageRelease = await resolveManagedImageRelease();
|
|
164
201
|
const baseImage = managedImageRelease.baseImages['openclaw-gateway'];
|
|
165
|
-
const dockerContextDirectory = path.join(options.projectRoot, 'vm-images', 'gateways', `${options.profileName}-local-
|
|
166
|
-
const pluginArchivePath = path.join(dockerContextDirectory, 'gondolin-dist.tgz');
|
|
202
|
+
const dockerContextDirectory = path.join(options.projectRoot, 'vm-images', 'gateways', `${options.profileName}-local-packages`);
|
|
167
203
|
const dockerfilePath = path.join(dockerContextDirectory, 'Dockerfile');
|
|
204
|
+
const packages = [
|
|
205
|
+
{
|
|
206
|
+
archiveName: 'gondolin-dist.tgz',
|
|
207
|
+
extensionPath: '/home/openclaw/.openclaw/extensions/gondolin',
|
|
208
|
+
packageDirectory: path.join(options.repoRoot, 'packages', 'openclaw-agent-vm-plugin'),
|
|
209
|
+
},
|
|
210
|
+
{
|
|
211
|
+
archiveName: 'mcp-portal-plugin-dist.tgz',
|
|
212
|
+
extensionPath: '/home/openclaw/.openclaw/extensions/mcp-portal',
|
|
213
|
+
packageDirectory: path.join(options.repoRoot, 'packages', 'openclaw-mcp-portal-plugin'),
|
|
214
|
+
},
|
|
215
|
+
];
|
|
168
216
|
await fs.rm(dockerContextDirectory, { force: true, recursive: true });
|
|
169
217
|
await fs.mkdir(dockerContextDirectory, { recursive: true });
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
});
|
|
218
|
+
await Promise.all(packages.map((packageConfig) => archivePackageDist({
|
|
219
|
+
archivePath: path.join(dockerContextDirectory, packageConfig.archiveName),
|
|
220
|
+
distDirectory: path.join(packageConfig.packageDirectory, 'dist'),
|
|
221
|
+
})));
|
|
222
|
+
const portalServerPath = path.join(options.repoRoot, 'packages', 'mcp-portal', 'dist', 'bin', 'portal-server.js');
|
|
223
|
+
await fs.access(portalServerPath);
|
|
174
224
|
await fs.writeFile(dockerfilePath, [
|
|
175
225
|
`FROM ${baseImage.repository}:${baseImage.tag}`,
|
|
176
226
|
'',
|
|
177
|
-
'# Generated by the OpenClaw
|
|
227
|
+
'# Generated by the OpenClaw smoke harness from local package dist outputs.',
|
|
178
228
|
'COPY gondolin-dist.tgz /tmp/gondolin-dist.tgz',
|
|
179
|
-
'
|
|
180
|
-
'RUN rm -rf /home/openclaw/.openclaw/extensions/gondolin && \\',
|
|
181
|
-
' mkdir -p /home/openclaw/.openclaw/extensions/gondolin && \\',
|
|
229
|
+
'COPY mcp-portal-plugin-dist.tgz /tmp/mcp-portal-plugin-dist.tgz',
|
|
230
|
+
'RUN rm -rf /home/openclaw/.openclaw/extensions/gondolin /home/openclaw/.openclaw/extensions/mcp-portal && \\',
|
|
231
|
+
' mkdir -p /home/openclaw/.openclaw/extensions/gondolin /home/openclaw/.openclaw/extensions/mcp-portal /opt/agent-vm/portal/bin && \\',
|
|
182
232
|
' tar -xzf /tmp/gondolin-dist.tgz -C /home/openclaw/.openclaw/extensions/gondolin && \\',
|
|
183
|
-
'
|
|
184
|
-
'
|
|
233
|
+
' tar -xzf /tmp/mcp-portal-plugin-dist.tgz -C /home/openclaw/.openclaw/extensions/mcp-portal && \\',
|
|
234
|
+
' chown -R root:root /home/openclaw/.openclaw/extensions/gondolin /home/openclaw/.openclaw/extensions/mcp-portal && \\',
|
|
235
|
+
' rm -f /tmp/gondolin-dist.tgz /tmp/mcp-portal-plugin-dist.tgz',
|
|
236
|
+
'RUN printf \'#!/bin/sh\\nexec node /work/repo/packages/mcp-portal/dist/bin/portal-server.js "$@"\\n\' > /opt/agent-vm/portal/bin/agent-vm-mcp-portal-server && \\',
|
|
237
|
+
' chmod 755 /opt/agent-vm/portal/bin/agent-vm-mcp-portal-server',
|
|
185
238
|
'',
|
|
186
239
|
].join('\n'), 'utf8');
|
|
187
240
|
gatewayProfile.dockerfile = dockerfilePath;
|
|
188
241
|
delete gatewayProfile.source;
|
|
189
242
|
}
|
|
243
|
+
export async function useLocalOpenClawPluginGatewayImage(options) {
|
|
244
|
+
await useLocalOpenClawGatewayImagePackages(options);
|
|
245
|
+
}
|
|
190
246
|
export async function scaffoldOpenClawSmokeProject(options) {
|
|
191
247
|
const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), options.prefix));
|
|
192
248
|
const controllerPort = await findAvailablePort();
|
|
@@ -213,14 +269,146 @@ export async function scaffoldOpenClawSmokeProject(options) {
|
|
|
213
269
|
zone,
|
|
214
270
|
};
|
|
215
271
|
}
|
|
272
|
+
export async function prepareLocalWorkerPackageForGatewayImage(repoRoot) {
|
|
273
|
+
await fs.mkdir(path.join(repoRoot, 'tmp'), { recursive: true });
|
|
274
|
+
const packDirectory = await fs.mkdtemp(path.join(repoRoot, 'tmp', 'agent-vm-worker-pack-'));
|
|
275
|
+
execFileSync('pnpm', ['pack', '--pack-destination', packDirectory], {
|
|
276
|
+
cwd: path.join(repoRoot, 'packages', 'agent-vm-worker'),
|
|
277
|
+
stdio: 'pipe',
|
|
278
|
+
});
|
|
279
|
+
const packedTarballs = (await fs.readdir(packDirectory)).filter((fileName) => fileName.endsWith('.tgz'));
|
|
280
|
+
const [packedTarballName] = packedTarballs;
|
|
281
|
+
if (packedTarballName === undefined) {
|
|
282
|
+
throw new Error('Failed to pack local agent-vm-worker tarball for smoke image.');
|
|
283
|
+
}
|
|
284
|
+
if (packedTarballs.length > 1) {
|
|
285
|
+
throw new Error('Expected pnpm pack to produce exactly one agent-vm-worker tarball.');
|
|
286
|
+
}
|
|
287
|
+
return path.join(packDirectory, packedTarballName);
|
|
288
|
+
}
|
|
289
|
+
export async function scaffoldWorkerSmokeProject(options) {
|
|
290
|
+
const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), options.prefix));
|
|
291
|
+
const controllerPort = await findAvailablePort();
|
|
292
|
+
const gatewayPort = await findAvailablePort();
|
|
293
|
+
await scaffoldAgentVmProject({
|
|
294
|
+
architecture: options.architecture,
|
|
295
|
+
gatewayType: 'worker',
|
|
296
|
+
secretsProvider: '1password',
|
|
297
|
+
targetDir: tempRoot,
|
|
298
|
+
zoneId: options.zoneId,
|
|
299
|
+
});
|
|
300
|
+
const systemConfig = await loadSystemConfig(path.join(tempRoot, 'config', 'system.json'));
|
|
301
|
+
systemConfig.host.controllerPort = controllerPort;
|
|
302
|
+
systemConfig.host.projectNamespace = 'claw-tests-worker';
|
|
303
|
+
systemConfig.cacheDir = path.join(tempRoot, 'cache');
|
|
304
|
+
systemConfig.host.secretsProvider = {
|
|
305
|
+
type: '1password',
|
|
306
|
+
tokenSource: { type: 'env', envVar: 'OPEN_AI_TEST_KEY' },
|
|
307
|
+
};
|
|
308
|
+
const zone = getWorkerSmokeZone(systemConfig);
|
|
309
|
+
zone.gateway.port = gatewayPort;
|
|
310
|
+
return {
|
|
311
|
+
controllerPort,
|
|
312
|
+
gatewayPort,
|
|
313
|
+
systemConfig,
|
|
314
|
+
tempRoot,
|
|
315
|
+
zone,
|
|
316
|
+
};
|
|
317
|
+
}
|
|
318
|
+
export async function scaffoldGatewaySmokeProject(options) {
|
|
319
|
+
if (options.kind === 'openclaw') {
|
|
320
|
+
return await scaffoldOpenClawSmokeProject({
|
|
321
|
+
architecture: options.architecture,
|
|
322
|
+
prefix: options.prefix,
|
|
323
|
+
zoneId: options.zoneId,
|
|
324
|
+
...(options.agents ? { agents: options.agents } : {}),
|
|
325
|
+
});
|
|
326
|
+
}
|
|
327
|
+
return await scaffoldWorkerSmokeProject({
|
|
328
|
+
architecture: options.architecture,
|
|
329
|
+
prefix: options.prefix,
|
|
330
|
+
zoneId: options.zoneId,
|
|
331
|
+
});
|
|
332
|
+
}
|
|
333
|
+
export async function writeOpenClawMcpPortalSmokeConfigs(options) {
|
|
334
|
+
await fs.writeFile(path.join(options.configDir, 'mcp.config.jsonc'), `${JSON.stringify({
|
|
335
|
+
$schema: '../../schemas/mcp.schema.json',
|
|
336
|
+
providers: {
|
|
337
|
+
upstreamMock: {
|
|
338
|
+
discovery: { summary: 'Mock upstream MCP server for smoke tests' },
|
|
339
|
+
kind: 'mcp',
|
|
340
|
+
namespace: options.namespace,
|
|
341
|
+
transport: {
|
|
342
|
+
kind: 'streamable-http',
|
|
343
|
+
url: options.upstreamUrl,
|
|
344
|
+
},
|
|
345
|
+
},
|
|
346
|
+
},
|
|
347
|
+
schemaVersion: 1,
|
|
348
|
+
}, null, '\t')}\n`, 'utf8');
|
|
349
|
+
await fs.writeFile(path.join(options.configDir, 'mcp-portal.config.jsonc'), `${JSON.stringify({
|
|
350
|
+
$schema: '../../schemas/mcp-portal.schema.json',
|
|
351
|
+
agents: {
|
|
352
|
+
[options.agentId]: { profile: 'smoke' },
|
|
353
|
+
},
|
|
354
|
+
profiles: {
|
|
355
|
+
smoke: {
|
|
356
|
+
approval: {
|
|
357
|
+
allowWithoutApprovalTools: [{ namespace: options.namespace, toolName: 'read_thing' }],
|
|
358
|
+
alwaysAskTools: [{ namespace: options.namespace, toolName: 'write_thing' }],
|
|
359
|
+
annotationPolicy: 'destructive-requires-approval',
|
|
360
|
+
trustedAnnotationNamespaces: [],
|
|
361
|
+
writeTools: [],
|
|
362
|
+
},
|
|
363
|
+
enabledNamespaces: [options.namespace],
|
|
364
|
+
enabledToolsByNamespace: {
|
|
365
|
+
[options.namespace]: ['read_thing', 'write_thing'],
|
|
366
|
+
},
|
|
367
|
+
hiddenToolsByNamespace: {},
|
|
368
|
+
promptContext: { enabled: true, maxNamespaces: 12 },
|
|
369
|
+
},
|
|
370
|
+
},
|
|
371
|
+
schemaVersion: 1,
|
|
372
|
+
server: {
|
|
373
|
+
accessHeader: {
|
|
374
|
+
name: options.portalAccessHeaderName,
|
|
375
|
+
secret: { name: 'MCP_PORTAL_SERVER_SECRET', source: 'environment' },
|
|
376
|
+
},
|
|
377
|
+
host: '127.0.0.1',
|
|
378
|
+
port: 18790,
|
|
379
|
+
},
|
|
380
|
+
}, null, '\t')}\n`, 'utf8');
|
|
381
|
+
}
|
|
216
382
|
export async function startSmokeControllerRuntime(options) {
|
|
217
383
|
const restoreEnvironment = applySmokeEnvironment(options.secrets);
|
|
218
384
|
const secretResolver = createSmokeSecretResolver(options.secrets);
|
|
219
385
|
try {
|
|
220
386
|
const runtime = await startControllerRuntime(options.startOptions, {
|
|
221
387
|
createSecretResolver: async () => secretResolver,
|
|
388
|
+
...(options.startHttpServer === undefined
|
|
389
|
+
? {}
|
|
390
|
+
: { startHttpServer: options.startHttpServer }),
|
|
391
|
+
...(options.startGatewayZone === undefined &&
|
|
392
|
+
options.tcpHostsOverride === undefined &&
|
|
393
|
+
options.vfsMountsOverride === undefined
|
|
394
|
+
? {}
|
|
395
|
+
: {
|
|
396
|
+
startGatewayZone: async (startGatewayOptions) => await (options.startGatewayZone ?? startGatewayZone)({
|
|
397
|
+
...startGatewayOptions,
|
|
398
|
+
tcpHostsOverride: {
|
|
399
|
+
...startGatewayOptions.tcpHostsOverride,
|
|
400
|
+
...options.tcpHostsOverride,
|
|
401
|
+
},
|
|
402
|
+
vfsMountsOverride: {
|
|
403
|
+
...startGatewayOptions.vfsMountsOverride,
|
|
404
|
+
...options.vfsMountsOverride,
|
|
405
|
+
},
|
|
406
|
+
}),
|
|
407
|
+
}),
|
|
222
408
|
});
|
|
223
|
-
|
|
409
|
+
if (options.startHttpServer === undefined) {
|
|
410
|
+
await waitForControllerReady(options.startOptions.systemConfig.host.controllerPort);
|
|
411
|
+
}
|
|
224
412
|
return {
|
|
225
413
|
controllerUrl: `http://127.0.0.1:${options.startOptions.systemConfig.host.controllerPort}`,
|
|
226
414
|
runtime,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smoke-harness.js","sourceRoot":"","sources":["../../src/integration-tests/smoke-harness.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"smoke-harness.js","sourceRoot":"","sources":["../../src/integration-tests/smoke-harness.ts"],"names":[],"mappings":"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"}
|
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.64",
|
|
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": {
|
|
@@ -40,15 +40,15 @@
|
|
|
40
40
|
"jsonc-parser": "^3.3.1",
|
|
41
41
|
"tasuku": "^2.3.0",
|
|
42
42
|
"zod": "^4.4.3",
|
|
43
|
-
"@agent-vm/agent-vm-worker": "0.0.
|
|
44
|
-
"@agent-vm/
|
|
45
|
-
"@agent-vm/
|
|
46
|
-
"@agent-vm/
|
|
47
|
-
"@agent-vm/openclaw-
|
|
48
|
-
"@agent-vm/
|
|
49
|
-
"@agent-vm/
|
|
50
|
-
"@agent-vm/
|
|
51
|
-
"@agent-vm/
|
|
43
|
+
"@agent-vm/agent-vm-worker": "0.0.64",
|
|
44
|
+
"@agent-vm/config-contracts": "0.0.64",
|
|
45
|
+
"@agent-vm/mcp-portal": "0.0.64",
|
|
46
|
+
"@agent-vm/gondolin-adapter": "0.0.64",
|
|
47
|
+
"@agent-vm/openclaw-agent-vm-plugin": "0.0.64",
|
|
48
|
+
"@agent-vm/gateway-interface": "0.0.64",
|
|
49
|
+
"@agent-vm/openclaw-gateway": "0.0.64",
|
|
50
|
+
"@agent-vm/openclaw-mcp-portal-plugin": "0.0.64",
|
|
51
|
+
"@agent-vm/worker-gateway": "0.0.64"
|
|
52
52
|
},
|
|
53
53
|
"scripts": {
|
|
54
54
|
"build": "rm -rf dist && tsc -p tsconfig.build.json",
|