@shravansunder/agent-vm 0.0.1 → 0.0.2
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 +3 -1
- package/dist/build/docker-image-builder.d.ts.map +1 -1
- package/dist/build/docker-image-builder.js +4 -4
- package/dist/build/docker-image-builder.js.map +1 -1
- package/dist/build/gondolin-image-builder.d.ts +2 -2
- package/dist/build/gondolin-image-builder.d.ts.map +1 -1
- package/dist/build/gondolin-image-builder.js +9 -9
- package/dist/build/gondolin-image-builder.js.map +1 -1
- package/dist/build/stale-image-cleaner.d.ts.map +1 -1
- package/dist/build/stale-image-cleaner.js +15 -11
- package/dist/build/stale-image-cleaner.js.map +1 -1
- package/dist/cli/agent-vm-cli-support.d.ts +3 -4
- package/dist/cli/agent-vm-cli-support.d.ts.map +1 -1
- package/dist/cli/agent-vm-cli-support.js +1 -1
- package/dist/cli/agent-vm-cli-support.js.map +1 -1
- package/dist/cli/agent-vm-entrypoint.js +0 -0
- package/dist/cli/auth-interactive-command.d.ts +1 -1
- package/dist/cli/auth-interactive-command.d.ts.map +1 -1
- package/dist/cli/auth-interactive-command.js +2 -9
- package/dist/cli/auth-interactive-command.js.map +1 -1
- package/dist/cli/build-command.d.ts +1 -2
- package/dist/cli/build-command.d.ts.map +1 -1
- package/dist/cli/build-command.js +0 -9
- package/dist/cli/build-command.js.map +1 -1
- package/dist/cli/commands/controller-definition.d.ts.map +1 -1
- package/dist/cli/commands/controller-definition.js +7 -12
- package/dist/cli/commands/controller-definition.js.map +1 -1
- package/dist/cli/commands/create-app.js +1 -1
- package/dist/cli/init-command.d.ts +0 -1
- package/dist/cli/init-command.d.ts.map +1 -1
- package/dist/cli/init-command.js +20 -40
- package/dist/cli/init-command.js.map +1 -1
- package/dist/cli/ssh-commands.d.ts.map +1 -1
- package/dist/cli/ssh-commands.js +1 -11
- package/dist/cli/ssh-commands.js.map +1 -1
- package/dist/config/system-config.d.ts +1 -1
- package/dist/config/system-config.js +1 -1
- package/dist/config/system-config.js.map +1 -1
- package/dist/controller/controller-runtime-operations.d.ts +2 -2
- package/dist/controller/controller-runtime-operations.d.ts.map +1 -1
- package/dist/controller/controller-runtime-operations.js +6 -1
- package/dist/controller/controller-runtime-operations.js.map +1 -1
- package/dist/controller/controller-runtime-support.d.ts +2 -2
- package/dist/controller/controller-runtime-support.d.ts.map +1 -1
- package/dist/controller/controller-runtime-support.js +1 -1
- package/dist/controller/controller-runtime-support.js.map +1 -1
- package/dist/controller/controller-runtime-types.d.ts +5 -3
- package/dist/controller/controller-runtime-types.d.ts.map +1 -1
- package/dist/controller/controller-runtime.d.ts.map +1 -1
- package/dist/controller/controller-runtime.js +36 -14
- package/dist/controller/controller-runtime.js.map +1 -1
- package/dist/controller/docker-service-routing.d.ts +11 -0
- package/dist/controller/docker-service-routing.d.ts.map +1 -0
- package/dist/controller/docker-service-routing.js +148 -0
- package/dist/controller/docker-service-routing.js.map +1 -0
- package/dist/controller/http/controller-http-route-support.d.ts +8 -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 +2 -0
- package/dist/controller/http/controller-http-routes.d.ts.map +1 -1
- package/dist/controller/http/controller-http-routes.js +20 -2
- package/dist/controller/http/controller-http-routes.js.map +1 -1
- package/dist/controller/http/controller-request-schemas.d.ts +8 -0
- package/dist/controller/http/controller-request-schemas.d.ts.map +1 -1
- package/dist/controller/http/controller-request-schemas.js +10 -0
- package/dist/controller/http/controller-request-schemas.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 +25 -1
- package/dist/controller/http/controller-zone-operation-routes.js.map +1 -1
- package/dist/controller/leases/lease-manager.d.ts +1 -1
- package/dist/controller/leases/lease-manager.d.ts.map +1 -1
- package/dist/controller/worker-task-runner.d.ts +39 -0
- package/dist/controller/worker-task-runner.d.ts.map +1 -0
- package/dist/controller/worker-task-runner.js +229 -0
- package/dist/controller/worker-task-runner.js.map +1 -0
- package/dist/gateway/credential-manager.d.ts +1 -1
- package/dist/gateway/credential-manager.d.ts.map +1 -1
- package/dist/gateway/credential-manager.js +9 -33
- package/dist/gateway/credential-manager.js.map +1 -1
- package/dist/gateway/gateway-image-builder.d.ts +1 -1
- package/dist/gateway/gateway-image-builder.d.ts.map +1 -1
- package/dist/gateway/gateway-lifecycle-loader.d.ts +1 -1
- package/dist/gateway/gateway-lifecycle-loader.d.ts.map +1 -1
- package/dist/gateway/gateway-lifecycle-loader.js +2 -2
- package/dist/gateway/gateway-lifecycle-loader.js.map +1 -1
- package/dist/gateway/gateway-zone-orchestrator.d.ts +2 -2
- package/dist/gateway/gateway-zone-orchestrator.d.ts.map +1 -1
- package/dist/gateway/gateway-zone-orchestrator.js +7 -3
- package/dist/gateway/gateway-zone-orchestrator.js.map +1 -1
- package/dist/gateway/gateway-zone-support.d.ts +6 -4
- package/dist/gateway/gateway-zone-support.d.ts.map +1 -1
- package/dist/gateway/gateway-zone-support.js.map +1 -1
- package/dist/tool-vm/tool-vm-lifecycle.d.ts +1 -1
- package/dist/tool-vm/tool-vm-lifecycle.d.ts.map +1 -1
- package/dist/tool-vm/tool-vm-lifecycle.js +1 -1
- package/dist/tool-vm/tool-vm-lifecycle.js.map +1 -1
- package/package.json +40 -40
- package/dist/cli/openclaw-plugin-bundle.d.ts +0 -3
- package/dist/cli/openclaw-plugin-bundle.d.ts.map +0 -1
- package/dist/cli/openclaw-plugin-bundle.js +0 -30
- package/dist/cli/openclaw-plugin-bundle.js.map +0 -1
|
@@ -0,0 +1,229 @@
|
|
|
1
|
+
import crypto from 'node:crypto';
|
|
2
|
+
import fs from 'node:fs/promises';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { workerConfigSchema } from '@shravansunder/agent-vm-worker';
|
|
5
|
+
import { execa } from 'execa';
|
|
6
|
+
import { z } from 'zod';
|
|
7
|
+
import { startGatewayZone } from '../gateway/gateway-zone-orchestrator.js';
|
|
8
|
+
import { DockerServiceRoutingError, startDockerServicesForTask, stopDockerServicesForTask, } from './docker-service-routing.js';
|
|
9
|
+
function isPlainObject(value) {
|
|
10
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
11
|
+
}
|
|
12
|
+
function deepMerge(base, override) {
|
|
13
|
+
if (Array.isArray(base) || Array.isArray(override)) {
|
|
14
|
+
return override ?? base;
|
|
15
|
+
}
|
|
16
|
+
if (isPlainObject(base) && isPlainObject(override)) {
|
|
17
|
+
const keys = new Set([...Object.keys(base), ...Object.keys(override)]);
|
|
18
|
+
const mergedEntries = [...keys].map((key) => [key, deepMerge(base[key], override[key])]);
|
|
19
|
+
return Object.fromEntries(mergedEntries);
|
|
20
|
+
}
|
|
21
|
+
return override ?? base;
|
|
22
|
+
}
|
|
23
|
+
function writeStderr(message) {
|
|
24
|
+
process.stderr.write(`${message}\n`);
|
|
25
|
+
}
|
|
26
|
+
const taskStatusResponseSchema = z
|
|
27
|
+
.object({
|
|
28
|
+
status: z.string().optional(),
|
|
29
|
+
})
|
|
30
|
+
.passthrough();
|
|
31
|
+
async function readJsonObjectFile(filePath, options) {
|
|
32
|
+
try {
|
|
33
|
+
const raw = await fs.readFile(filePath, 'utf8');
|
|
34
|
+
const parsed = JSON.parse(raw);
|
|
35
|
+
if (!isPlainObject(parsed)) {
|
|
36
|
+
throw new Error(`${options.label} must be a JSON object`);
|
|
37
|
+
}
|
|
38
|
+
return parsed;
|
|
39
|
+
}
|
|
40
|
+
catch (error) {
|
|
41
|
+
if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
|
|
42
|
+
return options.missingValue;
|
|
43
|
+
}
|
|
44
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
45
|
+
throw new Error(`Invalid ${options.label}: ${message}`, { cause: error });
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
function deriveRepoDirectoryName(repoUrl, usedNames) {
|
|
49
|
+
const cleanedUrl = repoUrl.replace(/\.git$/, '');
|
|
50
|
+
const baseName = cleanedUrl.split('/').pop()?.trim() ?? 'repo';
|
|
51
|
+
let candidate = baseName.replace(/[^a-zA-Z0-9._-]/g, '-');
|
|
52
|
+
let counter = 2;
|
|
53
|
+
while (usedNames.has(candidate)) {
|
|
54
|
+
candidate = `${baseName}-${counter}`;
|
|
55
|
+
counter += 1;
|
|
56
|
+
}
|
|
57
|
+
usedNames.add(candidate);
|
|
58
|
+
return candidate;
|
|
59
|
+
}
|
|
60
|
+
export async function preStartGateway(taskInput, zoneConfig) {
|
|
61
|
+
const taskId = crypto.randomUUID();
|
|
62
|
+
const taskRoot = path.join(zoneConfig.gateway.stateDir, 'tasks', taskId);
|
|
63
|
+
const workspaceDir = path.join(taskRoot, 'workspace');
|
|
64
|
+
const stateDir = path.join(taskRoot, 'state');
|
|
65
|
+
let composeFilePaths = [];
|
|
66
|
+
await fs.mkdir(workspaceDir, { recursive: true });
|
|
67
|
+
await fs.mkdir(stateDir, { recursive: true });
|
|
68
|
+
try {
|
|
69
|
+
const usedRepoNames = new Set();
|
|
70
|
+
const clonedRepoHostDirs = [];
|
|
71
|
+
const clonedRepos = [];
|
|
72
|
+
for (const repo of taskInput.repos) {
|
|
73
|
+
const repoDirectoryName = deriveRepoDirectoryName(repo.repoUrl, usedRepoNames);
|
|
74
|
+
const repoWorkspaceDir = path.join(workspaceDir, repoDirectoryName);
|
|
75
|
+
const cloneArgs = ['clone', '--branch', repo.baseBranch, repo.repoUrl, repoWorkspaceDir];
|
|
76
|
+
// Repo cloning is intentionally sequential to keep host-side side effects easy to reason about.
|
|
77
|
+
// oxlint-disable-next-line eslint/no-await-in-loop
|
|
78
|
+
await execa('git', cloneArgs);
|
|
79
|
+
clonedRepoHostDirs.push(repoWorkspaceDir);
|
|
80
|
+
clonedRepos.push({
|
|
81
|
+
repoUrl: repo.repoUrl,
|
|
82
|
+
baseBranch: repo.baseBranch,
|
|
83
|
+
workspacePath: `/workspace/${repoDirectoryName}`,
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
const primaryRepoWorkspaceDir = clonedRepoHostDirs[0] ?? workspaceDir;
|
|
87
|
+
const projectConfigPath = path.join(primaryRepoWorkspaceDir, '.agent-vm', 'config.json');
|
|
88
|
+
const projectConfig = await readJsonObjectFile(projectConfigPath, {
|
|
89
|
+
label: 'project config',
|
|
90
|
+
missingValue: {},
|
|
91
|
+
});
|
|
92
|
+
const baseConfig = await readJsonObjectFile(zoneConfig.gateway.gatewayConfig, {
|
|
93
|
+
label: 'gateway config',
|
|
94
|
+
missingValue: {},
|
|
95
|
+
});
|
|
96
|
+
const effectiveConfig = workerConfigSchema.parse(deepMerge(baseConfig, projectConfig));
|
|
97
|
+
await fs.writeFile(path.join(stateDir, 'effective-worker.json'), JSON.stringify(effectiveConfig, null, 2), { encoding: 'utf8', mode: 0o600 });
|
|
98
|
+
const dockerRouting = await startDockerServicesForTask(workspaceDir, clonedRepoHostDirs);
|
|
99
|
+
composeFilePaths = dockerRouting.composeFilePaths;
|
|
100
|
+
return {
|
|
101
|
+
taskId,
|
|
102
|
+
taskRoot,
|
|
103
|
+
workspaceDir,
|
|
104
|
+
stateDir,
|
|
105
|
+
composeFilePaths,
|
|
106
|
+
tcpHosts: dockerRouting.tcpHosts,
|
|
107
|
+
repos: clonedRepos,
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
catch (error) {
|
|
111
|
+
const composeFilesToStop = error instanceof DockerServiceRoutingError ? error.startedComposeFilePaths : composeFilePaths;
|
|
112
|
+
try {
|
|
113
|
+
await stopDockerServicesForTask(composeFilesToStop);
|
|
114
|
+
}
|
|
115
|
+
finally {
|
|
116
|
+
await fs.rm(taskRoot, { recursive: true, force: true });
|
|
117
|
+
}
|
|
118
|
+
throw error;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
export async function postStopGateway(taskId, zoneConfig, composeFilePaths = []) {
|
|
122
|
+
const taskRoot = path.join(zoneConfig.gateway.stateDir, 'tasks', taskId);
|
|
123
|
+
let cleanupError = null;
|
|
124
|
+
try {
|
|
125
|
+
await stopDockerServicesForTask(composeFilePaths);
|
|
126
|
+
}
|
|
127
|
+
catch (error) {
|
|
128
|
+
cleanupError = error;
|
|
129
|
+
}
|
|
130
|
+
finally {
|
|
131
|
+
await fs.rm(taskRoot, { recursive: true, force: true });
|
|
132
|
+
}
|
|
133
|
+
if (cleanupError) {
|
|
134
|
+
throw cleanupError;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
async function fetchJson(url, init) {
|
|
138
|
+
const response = await fetch(url, init);
|
|
139
|
+
if (!response.ok) {
|
|
140
|
+
throw new Error(`${init?.method ?? 'GET'} ${url} failed with ${response.status}`);
|
|
141
|
+
}
|
|
142
|
+
return await response.json();
|
|
143
|
+
}
|
|
144
|
+
export async function runWorkerTask(options) {
|
|
145
|
+
const zone = options.systemConfig.zones.find((candidateZone) => candidateZone.id === options.zoneId);
|
|
146
|
+
if (!zone) {
|
|
147
|
+
throw new Error(`Unknown zone '${options.zoneId}'.`);
|
|
148
|
+
}
|
|
149
|
+
if (zone.gateway.type !== 'coding') {
|
|
150
|
+
throw new Error(`Zone '${options.zoneId}' is not a coding zone.`);
|
|
151
|
+
}
|
|
152
|
+
const preStartResult = await preStartGateway(options.input, zone);
|
|
153
|
+
const taskZoneConfig = {
|
|
154
|
+
...zone,
|
|
155
|
+
gateway: {
|
|
156
|
+
...zone.gateway,
|
|
157
|
+
workspaceDir: preStartResult.workspaceDir,
|
|
158
|
+
stateDir: preStartResult.stateDir,
|
|
159
|
+
},
|
|
160
|
+
};
|
|
161
|
+
let gateway;
|
|
162
|
+
try {
|
|
163
|
+
gateway = await startGatewayZone({
|
|
164
|
+
secretResolver: options.secretResolver,
|
|
165
|
+
systemConfig: options.systemConfig,
|
|
166
|
+
tcpHostsOverride: preStartResult.tcpHosts,
|
|
167
|
+
zoneId: options.zoneId,
|
|
168
|
+
zoneOverride: taskZoneConfig,
|
|
169
|
+
});
|
|
170
|
+
const baseUrl = `http://${gateway.ingress.host}:${gateway.ingress.port}`;
|
|
171
|
+
await fetchJson(`${baseUrl}/tasks`, {
|
|
172
|
+
method: 'POST',
|
|
173
|
+
headers: { 'content-type': 'application/json' },
|
|
174
|
+
body: JSON.stringify({
|
|
175
|
+
taskId: preStartResult.taskId,
|
|
176
|
+
prompt: options.input.prompt,
|
|
177
|
+
repos: preStartResult.repos,
|
|
178
|
+
context: options.input.context,
|
|
179
|
+
}),
|
|
180
|
+
});
|
|
181
|
+
const timeoutMs = options.timeoutMs ?? 30 * 60 * 1000;
|
|
182
|
+
const start = Date.now();
|
|
183
|
+
let consecutivePollFailures = 0;
|
|
184
|
+
while (Date.now() - start < timeoutMs) {
|
|
185
|
+
let state;
|
|
186
|
+
try {
|
|
187
|
+
// Polling task state is intentionally sequential because each request depends on prior status.
|
|
188
|
+
// oxlint-disable-next-line eslint/no-await-in-loop
|
|
189
|
+
const response = await fetchJson(`${baseUrl}/tasks/${preStartResult.taskId}`);
|
|
190
|
+
state = taskStatusResponseSchema.parse(response);
|
|
191
|
+
consecutivePollFailures = 0;
|
|
192
|
+
}
|
|
193
|
+
catch (error) {
|
|
194
|
+
consecutivePollFailures += 1;
|
|
195
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
196
|
+
writeStderr(`[worker-task-runner] Poll failure ${consecutivePollFailures} for task ${preStartResult.taskId}: ${message}`);
|
|
197
|
+
if (consecutivePollFailures >= 3) {
|
|
198
|
+
throw error;
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
if (!state) {
|
|
202
|
+
// Poll retry loop intentionally sleeps before the next serial attempt.
|
|
203
|
+
// oxlint-disable-next-line eslint/no-await-in-loop
|
|
204
|
+
await new Promise((resolve) => setTimeout(resolve, 1000));
|
|
205
|
+
continue;
|
|
206
|
+
}
|
|
207
|
+
if (state.status === 'completed' || state.status === 'failed') {
|
|
208
|
+
return {
|
|
209
|
+
taskId: preStartResult.taskId,
|
|
210
|
+
finalState: state,
|
|
211
|
+
taskRoot: preStartResult.taskRoot,
|
|
212
|
+
};
|
|
213
|
+
}
|
|
214
|
+
// The sleep is part of the serial poll loop and cannot be parallelized.
|
|
215
|
+
// oxlint-disable-next-line eslint/no-await-in-loop
|
|
216
|
+
await new Promise((resolve) => setTimeout(resolve, 1000));
|
|
217
|
+
}
|
|
218
|
+
throw new Error(`Worker task timed out after ${timeoutMs}ms.`);
|
|
219
|
+
}
|
|
220
|
+
finally {
|
|
221
|
+
try {
|
|
222
|
+
await gateway?.vm.close();
|
|
223
|
+
}
|
|
224
|
+
finally {
|
|
225
|
+
await postStopGateway(preStartResult.taskId, zone, preStartResult.composeFilePaths);
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
//# sourceMappingURL=worker-task-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-task-runner.js","sourceRoot":"","sources":["../../src/controller/worker-task-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { SecretResolver } from '@shravansunder/
|
|
1
|
+
import type { SecretResolver } from '@shravansunder/gondolin-core';
|
|
2
2
|
import type { SystemConfig } from '../config/system-config.js';
|
|
3
3
|
export declare function resolveZoneSecrets(options: {
|
|
4
4
|
readonly systemConfig: SystemConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-manager.d.ts","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"credential-manager.d.ts","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAS/D,wBAAsB,kBAAkB,CAAC,OAAO,EAAE;IACjD,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;CACxC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAqBlC"}
|
|
@@ -1,19 +1,3 @@
|
|
|
1
|
-
function buildSuggestedSecretRef(zoneId, secretName) {
|
|
2
|
-
switch (secretName) {
|
|
3
|
-
case 'DISCORD_BOT_TOKEN':
|
|
4
|
-
return `op://agent-vm/${zoneId}-discord/bot-token`;
|
|
5
|
-
case 'PERPLEXITY_API_KEY':
|
|
6
|
-
return `op://agent-vm/${zoneId}-perplexity/credential`;
|
|
7
|
-
case 'OPENCLAW_GATEWAY_TOKEN':
|
|
8
|
-
return `op://agent-vm/${zoneId}-gateway-auth/password`;
|
|
9
|
-
case 'OPENAI_API_KEY':
|
|
10
|
-
return `op://agent-vm/${zoneId}-openai/credential`;
|
|
11
|
-
case 'ANTHROPIC_API_KEY':
|
|
12
|
-
return `op://agent-vm/${zoneId}-anthropic/credential`;
|
|
13
|
-
default:
|
|
14
|
-
return `op://agent-vm/${zoneId}-${secretName.toLowerCase().replace(/_/gu, '-')}/credential`;
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
1
|
function findZone(systemConfig, zoneId) {
|
|
18
2
|
return systemConfig.zones.find((zone) => zone.id === zoneId);
|
|
19
3
|
}
|
|
@@ -22,25 +6,17 @@ export async function resolveZoneSecrets(options) {
|
|
|
22
6
|
if (!zone) {
|
|
23
7
|
throw new Error(`Unknown zone '${options.zoneId}'.`);
|
|
24
8
|
}
|
|
25
|
-
const
|
|
9
|
+
const resolvedRefs = {};
|
|
26
10
|
for (const [secretName, secretConfig] of Object.entries(zone.secrets)) {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
try {
|
|
31
|
-
const secretRef = {
|
|
32
|
-
ref: secretConfig.ref,
|
|
33
|
-
source: secretConfig.source,
|
|
34
|
-
};
|
|
35
|
-
// Sequential resolution gives the user exact secret context on failure.
|
|
36
|
-
// oxlint-disable-next-line eslint/no-await-in-loop
|
|
37
|
-
resolvedSecrets[secretName] = await options.secretResolver.resolve(secretRef);
|
|
38
|
-
}
|
|
39
|
-
catch (error) {
|
|
40
|
-
const message = error instanceof Error ? error.message : String(error);
|
|
41
|
-
throw new Error(`Failed to resolve secret '${secretName}' for zone '${zone.id}' from '${secretConfig.ref}': ${message}`, { cause: error });
|
|
11
|
+
const ref = secretConfig.ref ?? process.env[`${secretName}_REF`]?.trim();
|
|
12
|
+
if (!ref) {
|
|
13
|
+
throw new Error(`Secret '${secretName}' has no ref in config and ${secretName}_REF is not set in environment.`);
|
|
42
14
|
}
|
|
15
|
+
resolvedRefs[secretName] = {
|
|
16
|
+
ref,
|
|
17
|
+
source: secretConfig.source,
|
|
18
|
+
};
|
|
43
19
|
}
|
|
44
|
-
return
|
|
20
|
+
return await options.secretResolver.resolveAll(resolvedRefs);
|
|
45
21
|
}
|
|
46
22
|
//# sourceMappingURL=credential-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-manager.js","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"AAIA,SAAS,
|
|
1
|
+
{"version":3,"file":"credential-manager.js","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"AAIA,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;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAIxC;IACA,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,YAAY,GAA8B,EAAE,CAAC;IACnD,KAAK,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACvE,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC;QACzE,IAAI,CAAC,GAAG,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CACd,WAAW,UAAU,8BAA8B,UAAU,iCAAiC,CAC9F,CAAC;QACH,CAAC;QACD,YAAY,CAAC,UAAU,CAAC,GAAG;YAC1B,GAAG;YACH,MAAM,EAAE,YAAY,CAAC,MAAM;SAC3B,CAAC;IACH,CAAC;IAED,OAAO,MAAM,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BuildImageResult } from '@shravansunder/
|
|
1
|
+
import type { BuildImageResult } from '@shravansunder/gondolin-core';
|
|
2
2
|
import { type GondolinImageBuilderDependencies } from '../build/gondolin-image-builder.js';
|
|
3
3
|
import type { GatewayBuildImageOptions } from './gateway-zone-support.js';
|
|
4
4
|
export interface GatewayImageBuilderDependencies {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-image-builder.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-image-builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAe,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"gateway-image-builder.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-image-builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAe,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAElF,OAAO,EAEN,KAAK,gCAAgC,EACrC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAE1E,MAAM,WAAW,+BAA+B;IAC/C,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACvF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,gCAAgC,CAAC,YAAY,CAAC,CAAC;IAC7E,QAAQ,CAAC,eAAe,CAAC,EAAE,gCAAgC,CAAC,iBAAiB,CAAC,CAAC;CAC/E;AAMD,wBAAsB,iBAAiB,CACtC,OAAO,EAAE;IACR,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B,EACD,YAAY,GAAE,+BAAoC,GAChD,OAAO,CAAC,gBAAgB,CAAC,CAa3B"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { GatewayLifecycle, GatewayZoneConfig } from '@shravansunder/
|
|
1
|
+
import type { GatewayLifecycle, GatewayZoneConfig } from '@shravansunder/gateway-interface';
|
|
2
2
|
export declare function loadGatewayLifecycle(type: GatewayZoneConfig['gateway']['type']): GatewayLifecycle;
|
|
3
3
|
//# sourceMappingURL=gateway-lifecycle-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-lifecycle-loader.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-lifecycle-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"gateway-lifecycle-loader.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-lifecycle-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAS5F,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAEjG"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { openclawLifecycle } from '@shravansunder/
|
|
2
|
-
import { workerLifecycle } from '@shravansunder/
|
|
1
|
+
import { openclawLifecycle } from '@shravansunder/openclaw-gateway';
|
|
2
|
+
import { workerLifecycle } from '@shravansunder/worker-gateway';
|
|
3
3
|
const lifecycleByType = {
|
|
4
4
|
coding: workerLifecycle,
|
|
5
5
|
openclaw: openclawLifecycle,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-lifecycle-loader.js","sourceRoot":"","sources":["../../src/gateway/gateway-lifecycle-loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gateway-lifecycle-loader.js","sourceRoot":"","sources":["../../src/gateway/gateway-lifecycle-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,eAAe,GAAG;IACvB,MAAM,EAAE,eAAe;IACvB,QAAQ,EAAE,iBAAiB;CACgB,CAAC;AAE7C,MAAM,UAAU,oBAAoB,CAAC,IAA0C;IAC9E,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { GatewayLifecycle, GatewayZoneConfig } from '@shravansunder/
|
|
2
|
-
import { type ManagedVm } from '@shravansunder/
|
|
1
|
+
import type { GatewayLifecycle, GatewayZoneConfig } from '@shravansunder/gateway-interface';
|
|
2
|
+
import { type ManagedVm } from '@shravansunder/gondolin-core';
|
|
3
3
|
import { type GatewayImageBuilderDependencies } from './gateway-image-builder.js';
|
|
4
4
|
import { type GatewayManagedVmFactoryOptions, type GatewayZoneStartResult, type StartGatewayZoneOptions } from './gateway-zone-support.js';
|
|
5
5
|
export interface GatewayManagerDependencies extends GatewayImageBuilderDependencies {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-zone-orchestrator.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-zone-orchestrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEX,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,
|
|
1
|
+
{"version":3,"file":"gateway-zone-orchestrator.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-zone-orchestrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEX,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAEN,KAAK,SAAS,EACd,MAAM,8BAA8B,CAAC;AAItC,OAAO,EAEN,KAAK,+BAA+B,EACpC,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAEN,KAAK,8BAA8B,EACnC,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC5B,MAAM,2BAA2B,CAAC;AAEnC,MAAM,WAAW,0BAA2B,SAAQ,+BAA+B;IAClF,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,8BAA8B,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3F,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,gBAAgB,CAAC;CACjG;AAmCD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,uBAAuB,EAChC,YAAY,GAAE,0BAA+B,GAC3C,OAAO,CAAC,sBAAsB,CAAC,CA6FjC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import { createManagedVm as createManagedVmFromCore, } from '@shravansunder/
|
|
3
|
+
import { createManagedVm as createManagedVmFromCore, } from '@shravansunder/gondolin-core';
|
|
4
4
|
import { runTaskWithResult } from '../shared/run-task.js';
|
|
5
5
|
import { resolveZoneSecrets } from './credential-manager.js';
|
|
6
6
|
import { buildGatewayImage, } from './gateway-image-builder.js';
|
|
@@ -26,7 +26,7 @@ async function waitForHealth(managedVm, healthCheck, attempt = 0, maxAttempts =
|
|
|
26
26
|
}
|
|
27
27
|
export async function startGatewayZone(options, dependencies = {}) {
|
|
28
28
|
const runTaskStep = options.runTask ?? (async (_title, fn) => await fn());
|
|
29
|
-
const zone = findGatewayZone(options.systemConfig, options.zoneId);
|
|
29
|
+
const zone = options.zoneOverride ?? findGatewayZone(options.systemConfig, options.zoneId);
|
|
30
30
|
const lifecycle = (dependencies.loadGatewayLifecycle ?? loadGatewayLifecycle)(zone.gateway.type);
|
|
31
31
|
const resolvedSecrets = await runTaskWithResult(runTaskStep, 'Resolving zone secrets', async () => await resolveZoneSecrets({
|
|
32
32
|
systemConfig: options.systemConfig,
|
|
@@ -48,6 +48,10 @@ export async function startGatewayZone(options, dependencies = {}) {
|
|
|
48
48
|
await lifecycle.prepareHostState?.(zone, options.secretResolver);
|
|
49
49
|
});
|
|
50
50
|
const vmSpec = lifecycle.buildVmSpec(zone, resolvedSecrets, options.systemConfig.host.controllerPort, options.systemConfig.tcpPool);
|
|
51
|
+
const mergedTcpHosts = {
|
|
52
|
+
...vmSpec.tcpHosts,
|
|
53
|
+
...options.tcpHostsOverride,
|
|
54
|
+
};
|
|
51
55
|
const processSpec = lifecycle.buildProcessSpec(zone, resolvedSecrets);
|
|
52
56
|
const createManagedVm = dependencies.createManagedVm ?? createManagedVmFromCore;
|
|
53
57
|
const managedVm = await runTaskWithResult(runTaskStep, 'Booting gateway VM', async () => await createManagedVm({
|
|
@@ -59,7 +63,7 @@ export async function startGatewayZone(options, dependencies = {}) {
|
|
|
59
63
|
rootfsMode: vmSpec.rootfsMode,
|
|
60
64
|
secrets: vmSpec.mediatedSecrets,
|
|
61
65
|
sessionLabel: vmSpec.sessionLabel,
|
|
62
|
-
tcpHosts:
|
|
66
|
+
tcpHosts: mergedTcpHosts,
|
|
63
67
|
vfsMounts: vmSpec.vfsMounts,
|
|
64
68
|
}));
|
|
65
69
|
await runTaskStep('Configuring gateway', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-zone-orchestrator.js","sourceRoot":"","sources":["../../src/gateway/gateway-zone-orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAO7B,OAAO,EACN,eAAe,IAAI,uBAAuB,GAE1C,MAAM,
|
|
1
|
+
{"version":3,"file":"gateway-zone-orchestrator.js","sourceRoot":"","sources":["../../src/gateway/gateway-zone-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,23 @@
|
|
|
1
|
-
import type { GatewayProcessSpec } from '@shravansunder/
|
|
1
|
+
import type { GatewayProcessSpec } from '@shravansunder/gateway-interface';
|
|
2
2
|
import type { SystemConfig } from '../config/system-config.js';
|
|
3
3
|
import type { RunTaskFn } from '../shared/run-task.js';
|
|
4
4
|
export type GatewayZone = SystemConfig['zones'][number];
|
|
5
5
|
export interface StartGatewayZoneOptions {
|
|
6
6
|
readonly runTask?: RunTaskFn;
|
|
7
|
-
readonly secretResolver: import('@shravansunder/
|
|
7
|
+
readonly secretResolver: import('@shravansunder/gondolin-core').SecretResolver;
|
|
8
8
|
readonly systemConfig: SystemConfig;
|
|
9
|
+
readonly tcpHostsOverride?: Record<string, string>;
|
|
9
10
|
readonly zoneId: string;
|
|
11
|
+
readonly zoneOverride?: GatewayZone;
|
|
10
12
|
}
|
|
11
13
|
export interface GatewayZoneStartResult {
|
|
12
|
-
readonly image: import('@shravansunder/
|
|
14
|
+
readonly image: import('@shravansunder/gondolin-core').BuildImageResult;
|
|
13
15
|
readonly ingress: {
|
|
14
16
|
readonly host: string;
|
|
15
17
|
readonly port: number;
|
|
16
18
|
};
|
|
17
19
|
readonly processSpec: GatewayProcessSpec;
|
|
18
|
-
readonly vm: import('@shravansunder/
|
|
20
|
+
readonly vm: import('@shravansunder/gondolin-core').ManagedVm;
|
|
19
21
|
readonly zone: GatewayZone;
|
|
20
22
|
}
|
|
21
23
|
export interface GatewayBuildImageOptions {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-zone-support.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-zone-support.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"gateway-zone-support.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-zone-support.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAE3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,MAAM,WAAW,uBAAuB;IACvC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,OAAO,8BAA8B,EAAE,cAAc,CAAC;IAC/E,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC;CACpC;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,KAAK,EAAE,OAAO,8BAA8B,EAAE,gBAAgB,CAAC;IACxE,QAAQ,CAAC,OAAO,EAAE;QACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,EAAE,EAAE,OAAO,8BAA8B,EAAE,SAAS,CAAC;IAC9D,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;CAC3B;AAED,MAAM,WAAW,wBAAwB;IACxC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,8BAA8B;IAC9C,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,QAAQ,GAAG,KAAK,CAAC;IACnD,QAAQ,CAAC,OAAO,EAAE,MAAM,CACvB,MAAM,EACN;QACC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;QAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;KACvB,CACD,CAAC;IACF,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM,CACzB,MAAM,EACN;QACC,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,iBAAiB,GAAG,QAAQ,GAAG,QAAQ,CAAC;QAClE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;YACjC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;SAClC,CAAC;KACF,CACD,CAAC;CACF;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAOvF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-zone-support.js","sourceRoot":"","sources":["../../src/gateway/gateway-zone-support.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gateway-zone-support.js","sourceRoot":"","sources":["../../src/gateway/gateway-zone-support.ts"],"names":[],"mappings":"AA8DA,MAAM,UAAU,eAAe,CAAC,YAA0B,EAAE,MAAc;IACzE,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;IACrF,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,MAAM,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createManagedVm as createManagedVmFromCore, type ManagedVm } from '@shravansunder/
|
|
1
|
+
import { createManagedVm as createManagedVmFromCore, type ManagedVm } from '@shravansunder/gondolin-core';
|
|
2
2
|
import { buildGondolinImage as buildGondolinImageDefault } from '../build/gondolin-image-builder.js';
|
|
3
3
|
import type { SystemConfig } from '../config/system-config.js';
|
|
4
4
|
import type { ToolProfile } from '../controller/leases/lease-manager.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-vm-lifecycle.d.ts","sourceRoot":"","sources":["../../src/tool-vm/tool-vm-lifecycle.ts"],"names":[],"mappings":"AAGA,OAAO,EACN,eAAe,IAAI,uBAAuB,EAC1C,KAAK,SAAS,EACd,MAAM,
|
|
1
|
+
{"version":3,"file":"tool-vm-lifecycle.d.ts","sourceRoot":"","sources":["../../src/tool-vm/tool-vm-lifecycle.ts"],"names":[],"mappings":"AAGA,OAAO,EACN,eAAe,IAAI,uBAAuB,EAC1C,KAAK,SAAS,EACd,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AACrG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,MAAM,WAAW,2BAA2B;IAC3C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE;QACvC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;QACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;KAC7B,KAAK,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC;IACnD,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,uBAAuB,CAAC;CAC1D;AAED,wBAAgB,+BAA+B,CAAC,OAAO,EAAE;IACxD,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,MAAM,CAET;AAED,wBAAsB,oBAAoB,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAepF;AAED,wBAAsB,YAAY,CACjC,OAAO,EAAE;IACR,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,EACD,YAAY,GAAE,2BAAgC,GAC5C,OAAO,CAAC,SAAS,CAAC,CAgCpB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import { createManagedVm as createManagedVmFromCore, } from '@shravansunder/
|
|
3
|
+
import { createManagedVm as createManagedVmFromCore, } from '@shravansunder/gondolin-core';
|
|
4
4
|
import { buildGondolinImage as buildGondolinImageDefault } from '../build/gondolin-image-builder.js';
|
|
5
5
|
export function resolveToolVmWorkspaceDirectory(options) {
|
|
6
6
|
return path.resolve(options.profile.workspaceRoot, `${options.zoneId}-${options.tcpSlot}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-vm-lifecycle.js","sourceRoot":"","sources":["../../src/tool-vm/tool-vm-lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACN,eAAe,IAAI,uBAAuB,GAE1C,MAAM,
|
|
1
|
+
{"version":3,"file":"tool-vm-lifecycle.js","sourceRoot":"","sources":["../../src/tool-vm/tool-vm-lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACN,eAAe,IAAI,uBAAuB,GAE1C,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAarG,MAAM,UAAU,+BAA+B,CAAC,OAI/C;IACA,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAC5F,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,kBAA0B;IACpE,IAAI,UAAoB,CAAC;IACzB,IAAI,CAAC;QACJ,UAAU,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACR,OAAO;IACR,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACpC,8FAA8F;QAC9F,MAAM,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC,EAAE;YACrD,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,IAAI;SACf,CAAC,CAAC;IACJ,CAAC;AACF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CACjC,OAOC,EACD,eAA4C,EAAE;IAE9C,MAAM,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,IAAI,yBAAyB,CAAC;IACxF,MAAM,eAAe,GAAG,YAAY,CAAC,eAAe,IAAI,uBAAuB,CAAC;IAChF,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC;QAC1C,eAAe,EAAE,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW;QAC7D,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC;KACvD,CAAC,CAAC;IACH,MAAM,sBAAsB,GAAG,+BAA+B,CAAC;QAC9D,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,MAAM,EAAE,OAAO,CAAC,MAAM;KACtB,CAAC,CAAC;IAEH,MAAM,EAAE,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;QACpC,YAAY,EAAE,EAAE;QAChB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QAC1B,SAAS,EAAE,SAAS,CAAC,SAAS;QAC9B,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM;QAC9B,UAAU,EAAE,QAAQ;QACpB,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,SAAS,OAAO,CAAC,OAAO,EAAE;QACzD,OAAO,EAAE,EAAE;QACX,SAAS,EAAE;YACV,YAAY,EAAE;gBACb,QAAQ,EAAE,sBAAsB;gBAChC,IAAI,EAAE,QAAQ;aACd;SACD;KACD,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,41 +1,41 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
2
|
+
"name": "@shravansunder/agent-vm",
|
|
3
|
+
"version": "0.0.2",
|
|
4
|
+
"bin": {
|
|
5
|
+
"agent-vm": "./dist/cli/agent-vm-entrypoint.js"
|
|
6
|
+
},
|
|
7
|
+
"files": [
|
|
8
|
+
"dist"
|
|
9
|
+
],
|
|
10
|
+
"type": "module",
|
|
11
|
+
"main": "./dist/index.js",
|
|
12
|
+
"types": "./dist/index.d.ts",
|
|
13
|
+
"exports": {
|
|
14
|
+
".": {
|
|
15
|
+
"types": "./dist/index.d.ts",
|
|
16
|
+
"import": "./dist/index.js"
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
"publishConfig": {
|
|
20
|
+
"access": "public"
|
|
21
|
+
},
|
|
22
|
+
"scripts": {
|
|
23
|
+
"build": "tsc -p tsconfig.build.json",
|
|
24
|
+
"typecheck": "tsc -p tsconfig.json --noEmit"
|
|
25
|
+
},
|
|
26
|
+
"dependencies": {
|
|
27
|
+
"@hono/node-server": "^1",
|
|
28
|
+
"@shravansunder/agent-vm-worker": "workspace:0.0.2",
|
|
29
|
+
"@shravansunder/gateway-interface": "workspace:0.0.2",
|
|
30
|
+
"@shravansunder/gondolin-core": "workspace:0.0.2",
|
|
31
|
+
"@shravansunder/openclaw-gateway": "workspace:0.0.2",
|
|
32
|
+
"@shravansunder/worker-gateway": "workspace:0.0.2",
|
|
33
|
+
"cmd-ts": "^0.14.0",
|
|
34
|
+
"execa": "^9.5.2",
|
|
35
|
+
"hono": "^4",
|
|
36
|
+
"zod": "^4"
|
|
37
|
+
},
|
|
38
|
+
"devDependencies": {
|
|
39
|
+
"tasuku": "^2.3.0"
|
|
40
|
+
}
|
|
41
|
+
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"openclaw-plugin-bundle.d.ts","sourceRoot":"","sources":["../../src/cli/openclaw-plugin-bundle.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,6BAA6B,mCAAmC,CAAC;AAkB9E,wBAAsB,+BAA+B,CACpD,SAAS,EAAE,MAAM,GACf,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAahC"}
|