@agent-vm/agent-vm 0.0.42 → 0.0.44
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 +3 -2
- package/dist/build/managed-image-dockerfile.d.ts.map +1 -1
- package/dist/build/managed-image-dockerfile.js +5 -26
- package/dist/build/managed-image-dockerfile.js.map +1 -1
- package/dist/cli/build-command.d.ts +2 -2
- package/dist/cli/build-command.d.ts.map +1 -1
- package/dist/cli/build-command.js +7 -7
- package/dist/cli/build-command.js.map +1 -1
- package/dist/cli/manual-templates.js +1 -1
- package/dist/cli/ssh-commands.d.ts.map +1 -1
- package/dist/cli/ssh-commands.js +2 -1
- package/dist/cli/ssh-commands.js.map +1 -1
- package/package.json +7 -7
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export type ManagedImageBase = 'openclaw-gateway' | 'tool-vm' | 'worker-gateway';
|
|
2
|
+
export declare const MANAGED_BASE_IMAGE_VERSION = "0.0.43";
|
|
2
3
|
export declare const MANAGED_OPENCLAW_VERSION = "2026.5.2";
|
|
3
4
|
export interface ManagedImageSource {
|
|
4
5
|
readonly kind: 'managedBase';
|
|
@@ -11,9 +12,9 @@ export interface GenerateManagedDockerfileOptions {
|
|
|
11
12
|
readonly imageTargetName: string;
|
|
12
13
|
readonly outputDirectory: string;
|
|
13
14
|
readonly overlayPath?: string | undefined;
|
|
14
|
-
readonly
|
|
15
|
+
readonly baseImageVersion: string;
|
|
15
16
|
readonly requiredOpenClawPackages?: readonly string[];
|
|
16
17
|
}
|
|
17
18
|
export declare function generateManagedDockerfile(options: GenerateManagedDockerfileOptions): Promise<string>;
|
|
18
|
-
export declare function
|
|
19
|
+
export declare function resolveManagedBaseImageVersion(): Promise<string>;
|
|
19
20
|
//# sourceMappingURL=managed-image-dockerfile.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-image-dockerfile.d.ts","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"managed-image-dockerfile.d.ts","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,SAAS,GAAG,gBAAgB,CAAC;AAEjF,eAAO,MAAM,0BAA0B,WAAW,CAAC;AACnD,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC;AAED,MAAM,WAAW,gCAAgC;IAChD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,GAAG,QAAQ,CAAC;IACjD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACtD;AA8FD,wBAAsB,yBAAyB,CAC9C,OAAO,EAAE,gCAAgC,GACvC,OAAO,CAAC,MAAM,CAAC,CA2BjB;AAED,wBAAsB,8BAA8B,IAAI,OAAO,CAAC,MAAM,CAAC,CAEtE"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import { fileURLToPath } from 'node:url';
|
|
4
3
|
import { z } from 'zod';
|
|
5
4
|
import { loadJsonConfigFile } from '../config/json-config-file.js';
|
|
6
5
|
import { formatZodError } from '../cli/format-zod-error.js';
|
|
6
|
+
export const MANAGED_BASE_IMAGE_VERSION = '0.0.43';
|
|
7
7
|
export const MANAGED_OPENCLAW_VERSION = '2026.5.2';
|
|
8
8
|
const overlayCopySchema = z
|
|
9
9
|
.object({
|
|
@@ -47,7 +47,7 @@ function shellJoin(argumentsToQuote) {
|
|
|
47
47
|
}
|
|
48
48
|
function renderManagedDockerfile(props) {
|
|
49
49
|
const lines = [
|
|
50
|
-
`FROM ${baseImageRepositoryByBase[props.base]}:${props.
|
|
50
|
+
`FROM ${baseImageRepositoryByBase[props.base]}:${props.baseImageVersion}`,
|
|
51
51
|
'',
|
|
52
52
|
'# Generated by agent-vm from a managed image profile. Do not edit by hand.',
|
|
53
53
|
];
|
|
@@ -95,34 +95,13 @@ export async function generateManagedDockerfile(options) {
|
|
|
95
95
|
const dockerfilePath = path.join(options.outputDirectory, 'Dockerfile');
|
|
96
96
|
await fs.writeFile(dockerfilePath, renderManagedDockerfile({
|
|
97
97
|
base: options.base,
|
|
98
|
+
baseImageVersion: options.baseImageVersion,
|
|
98
99
|
overlay,
|
|
99
|
-
packageVersion: options.packageVersion,
|
|
100
100
|
requiredOpenClawPackages: options.requiredOpenClawPackages ?? [],
|
|
101
101
|
}), 'utf8');
|
|
102
102
|
return dockerfilePath;
|
|
103
103
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
let searchDirectory = path.dirname(fileURLToPath(import.meta.url));
|
|
107
|
-
for (;;) {
|
|
108
|
-
const packageJsonPath = path.join(searchDirectory, 'package.json');
|
|
109
|
-
try {
|
|
110
|
-
const packageJson = packageVersionSchema.parse(await loadJsonConfigFile(packageJsonPath));
|
|
111
|
-
return packageJson.version;
|
|
112
|
-
}
|
|
113
|
-
catch (error) {
|
|
114
|
-
if (typeof error !== 'object' ||
|
|
115
|
-
error === null ||
|
|
116
|
-
!('code' in error) ||
|
|
117
|
-
error.code !== 'ENOENT') {
|
|
118
|
-
throw error;
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
const parentDirectory = path.dirname(searchDirectory);
|
|
122
|
-
if (parentDirectory === searchDirectory) {
|
|
123
|
-
throw new Error('Unable to resolve @agent-vm/agent-vm package version.');
|
|
124
|
-
}
|
|
125
|
-
searchDirectory = parentDirectory;
|
|
126
|
-
}
|
|
104
|
+
export async function resolveManagedBaseImageVersion() {
|
|
105
|
+
return MANAGED_BASE_IMAGE_VERSION;
|
|
127
106
|
}
|
|
128
107
|
//# sourceMappingURL=managed-image-dockerfile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-image-dockerfile.js","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"managed-image-dockerfile.js","sourceRoot":"","sources":["../../src/build/managed-image-dockerfile.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,10 +27,10 @@ export interface BuildCommandDependencies {
|
|
|
27
27
|
readonly imageTargetName: string;
|
|
28
28
|
readonly outputDirectory: string;
|
|
29
29
|
readonly overlayPath?: string | undefined;
|
|
30
|
-
readonly
|
|
30
|
+
readonly baseImageVersion: string;
|
|
31
31
|
readonly requiredOpenClawPackages?: readonly string[];
|
|
32
32
|
}) => Promise<string>;
|
|
33
|
-
readonly
|
|
33
|
+
readonly resolveManagedBaseImageVersion?: () => Promise<string>;
|
|
34
34
|
readonly syncBundledOpenClawPlugin?: (targetDir: string, profileName: string) => Promise<'created' | 'skipped'>;
|
|
35
35
|
}
|
|
36
36
|
export declare function runBuildCommand(options: {
|
|
@@ -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;AAOnE,OAAO,EAIN,KAAK,kBAAkB,EACvB,MAAM,sCAAsC,CAAC;AAE9C,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,CAAC,OAAO,EAAE;QAC9C,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC1C,QAAQ,CAAC,iBAAiB,EAAE,SAAS,GAAG,QAAQ,CAAC;QACjD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;QACjC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;QACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,QAAQ,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,EAIN,KAAK,kBAAkB,EACvB,MAAM,sCAAsC,CAAC;AAE9C,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,CAAC,OAAO,EAAE;QAC9C,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC1C,QAAQ,CAAC,iBAAiB,EAAE,SAAS,GAAG,QAAQ,CAAC;QACjD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;QACjC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;QACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;QAClC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;KACtD,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,QAAQ,CAAC,8BAA8B,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CACpC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,KACf,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;CACpC;AAyJD,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,CAkJf"}
|
|
@@ -5,7 +5,7 @@ import { execa } from 'execa';
|
|
|
5
5
|
import { z } from 'zod';
|
|
6
6
|
import { buildDockerImage as buildDockerImageDefault } from '../build/docker-image-builder.js';
|
|
7
7
|
import { buildGondolinImage as buildGondolinImageDefault } from '../build/gondolin-image-builder.js';
|
|
8
|
-
import { MANAGED_OPENCLAW_VERSION, generateManagedDockerfile as generateManagedDockerfileDefault,
|
|
8
|
+
import { MANAGED_OPENCLAW_VERSION, generateManagedDockerfile as generateManagedDockerfileDefault, resolveManagedBaseImageVersion as resolveManagedBaseImageVersionDefault, } from '../build/managed-image-dockerfile.js';
|
|
9
9
|
import { loadJsonConfigFile } from '../config/json-config-file.js';
|
|
10
10
|
import { buildZigInstallHint, buildZigUpgradeHint, isVersionAtLeast, } from '../operations/doctor.js';
|
|
11
11
|
import { formatZodError } from './format-zod-error.js';
|
|
@@ -134,7 +134,7 @@ export async function runBuildCommand(options, dependencies = {}) {
|
|
|
134
134
|
const runTaskStep = dependencies.runTask ?? defaultRunTask;
|
|
135
135
|
const resolveProjectRoot = dependencies.resolveProjectRootFromDockerfile ?? resolveProjectRootFromDockerfile;
|
|
136
136
|
const generateManagedDockerfile = dependencies.generateManagedDockerfile ?? generateManagedDockerfileDefault;
|
|
137
|
-
const
|
|
137
|
+
const resolveManagedBaseImageVersion = dependencies.resolveManagedBaseImageVersion ?? resolveManagedBaseImageVersionDefault;
|
|
138
138
|
const syncBundledOpenClawPlugin = dependencies.syncBundledOpenClawPlugin ?? syncBundledOpenClawPluginBundle;
|
|
139
139
|
const systemCacheIdentifierPath = options.systemConfig.systemCacheIdentifierPath;
|
|
140
140
|
await assertZigBuildPrerequisite(resolveRequiredZigVersion, resolveZigVersion);
|
|
@@ -160,8 +160,8 @@ export async function runBuildCommand(options, dependencies = {}) {
|
|
|
160
160
|
const imageTargets = [...gatewayImageTargets, ...toolVmImageTargets];
|
|
161
161
|
const dockerImageTargets = imageTargets.filter((imageTarget) => imageTarget.dockerfile !== undefined || imageTarget.source !== undefined);
|
|
162
162
|
const dockerImageTagByProfile = await assertUniqueDockerImageTags(dockerImageTargets, resolveOciImageTag);
|
|
163
|
-
const
|
|
164
|
-
? await
|
|
163
|
+
const managedBaseImageVersion = dockerImageTargets.some((imageTarget) => imageTarget.source !== undefined)
|
|
164
|
+
? await resolveManagedBaseImageVersion()
|
|
165
165
|
: undefined;
|
|
166
166
|
// oxlint-disable-next-line no-await-in-loop -- image builds are intentionally sequential for stable task output and shared image tags
|
|
167
167
|
for (const imageTarget of dockerImageTargets) {
|
|
@@ -171,8 +171,8 @@ export async function runBuildCommand(options, dependencies = {}) {
|
|
|
171
171
|
}
|
|
172
172
|
let dockerfilePath = imageTarget.dockerfile;
|
|
173
173
|
if (imageTarget.source) {
|
|
174
|
-
if (!
|
|
175
|
-
throw new Error('Missing
|
|
174
|
+
if (!managedBaseImageVersion) {
|
|
175
|
+
throw new Error('Missing managed base image version for managed image build.');
|
|
176
176
|
}
|
|
177
177
|
// oxlint-disable-next-line no-await-in-loop -- package detection is profile-local and low-volume
|
|
178
178
|
const requiredOpenClawPackages = await resolveRequiredOpenClawPackagesForTarget(options.systemConfig, imageTarget);
|
|
@@ -183,7 +183,7 @@ export async function runBuildCommand(options, dependencies = {}) {
|
|
|
183
183
|
imageTargetName: imageTarget.name,
|
|
184
184
|
outputDirectory: path.join(options.systemConfig.cacheDir, 'generated-dockerfiles', imageTarget.family, imageTarget.name),
|
|
185
185
|
...(imageTarget.source.overlay ? { overlayPath: imageTarget.source.overlay } : {}),
|
|
186
|
-
|
|
186
|
+
baseImageVersion: managedBaseImageVersion,
|
|
187
187
|
requiredOpenClawPackages,
|
|
188
188
|
});
|
|
189
189
|
}
|
|
@@ -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,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;AACrG,OAAO,EACN,wBAAwB,EACxB,yBAAyB,IAAI,gCAAgC,EAC7D,
|
|
1
|
+
{"version":3,"file":"build-command.js","sourceRoot":"","sources":["../../src/cli/build-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ ${options.systemConfigPath} is the controller config. Agent-vm-authored config i
|
|
|
54
54
|
config/gateways/<zone>/openclaw.json is OpenClaw-owned gateway config.
|
|
55
55
|
config/gateways/<zone>/worker.jsonc is Agent Worker gateway config when the zone type is worker.
|
|
56
56
|
vm-images/ contains deployment-owned Gondolin build-config.jsonc files and small managed image overlays.
|
|
57
|
-
agent-vm owns the gateway/tool base image recipes and
|
|
57
|
+
agent-vm owns the gateway/tool base image recipes and pins the managed GHCR base layer version.
|
|
58
58
|
stateDir stores durable gateway state.
|
|
59
59
|
zoneFilesDir stores durable user/household files for OpenClaw zones.
|
|
60
60
|
cacheDir stores rebuildable artifacts.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-commands.d.ts","sourceRoot":"","sources":["../../src/cli/ssh-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EACN,KAAK,eAAe,EACpB,KAAK,KAAK,EAIV,MAAM,2BAA2B,CAAC;AAEnC,UAAU,oBAAoB;IAC7B,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC;IACvC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACpC;AAED,eAAO,MAAM,2BAA2B;;;;;;iBAQzB,CAAC;AAEhB,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ssh-commands.d.ts","sourceRoot":"","sources":["../../src/cli/ssh-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EACN,KAAK,eAAe,EACpB,KAAK,KAAK,EAIV,MAAM,2BAA2B,CAAC;AAEnC,UAAU,oBAAoB;IAC7B,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC;IACvC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACpC;AAED,eAAO,MAAM,2BAA2B;;;;;;iBAQzB,CAAC;AAEhB,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAchF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8DhF"}
|
package/dist/cli/ssh-commands.js
CHANGED
|
@@ -11,12 +11,13 @@ export const zoneSshAccessResponseSchema = z
|
|
|
11
11
|
})
|
|
12
12
|
.passthrough();
|
|
13
13
|
const openClawShellEnvFilePath = '/etc/profile.d/openclaw-env.sh';
|
|
14
|
+
const openClawAdminShellEnvFilePath = '/etc/profile.d/openclaw-admin.sh';
|
|
14
15
|
function shellQuote(value) {
|
|
15
16
|
return `'${value.replace(/'/gu, `'\\''`)}'`;
|
|
16
17
|
}
|
|
17
18
|
function buildOpenClawAwareRemoteCommand(commandArguments) {
|
|
18
19
|
const quotedCommand = commandArguments.map((commandPart) => shellQuote(commandPart)).join(' ');
|
|
19
|
-
return `bash -lc ${shellQuote(`source ${openClawShellEnvFilePath} &&
|
|
20
|
+
return `bash -lc ${shellQuote(`source ${openClawShellEnvFilePath} && source ${openClawAdminShellEnvFilePath} && ${quotedCommand}`)}`;
|
|
20
21
|
}
|
|
21
22
|
export async function runSshCommand(options) {
|
|
22
23
|
const controllerClient = options.dependencies.createControllerClient({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-commands.js","sourceRoot":"","sources":["../../src/cli/ssh-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAGN,YAAY,EACZ,WAAW,EACX,wBAAwB,GACxB,MAAM,2BAA2B,CAAC;AASnC,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC;KAC1C,MAAM,CAAC;IACP,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACrC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAClC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC1C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC5C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAClC,CAAC;KACD,WAAW,EAAE,CAAC;AAIhB,MAAM,wBAAwB,GAAG,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"ssh-commands.js","sourceRoot":"","sources":["../../src/cli/ssh-commands.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.44",
|
|
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": {
|
|
@@ -39,12 +39,12 @@
|
|
|
39
39
|
"jsonc-parser": "^3.3.1",
|
|
40
40
|
"tasuku": "^2.3.0",
|
|
41
41
|
"zod": "^4",
|
|
42
|
-
"@agent-vm/
|
|
43
|
-
"@agent-vm/
|
|
44
|
-
"@agent-vm/
|
|
45
|
-
"@agent-vm/
|
|
46
|
-
"@agent-vm/
|
|
47
|
-
"@agent-vm/openclaw-agent-vm-plugin": "0.0.
|
|
42
|
+
"@agent-vm/agent-vm-worker": "0.0.44",
|
|
43
|
+
"@agent-vm/gateway-interface": "0.0.44",
|
|
44
|
+
"@agent-vm/worker-gateway": "0.0.44",
|
|
45
|
+
"@agent-vm/openclaw-gateway": "0.0.44",
|
|
46
|
+
"@agent-vm/gondolin-adapter": "0.0.44",
|
|
47
|
+
"@agent-vm/openclaw-agent-vm-plugin": "0.0.44"
|
|
48
48
|
},
|
|
49
49
|
"scripts": {
|
|
50
50
|
"build": "rm -rf dist && tsc -p tsconfig.build.json",
|