@openreef/cli 0.2.0 → 0.3.1
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/README.md +3 -3
- package/dist/commands/install.d.ts +2 -1
- package/dist/commands/install.d.ts.map +1 -1
- package/dist/commands/install.js +75 -10
- package/dist/commands/install.js.map +1 -1
- package/dist/commands/logs.d.ts +8 -0
- package/dist/commands/logs.d.ts.map +1 -0
- package/dist/commands/logs.js +118 -0
- package/dist/commands/logs.js.map +1 -0
- package/dist/commands/repair.d.ts +10 -0
- package/dist/commands/repair.d.ts.map +1 -0
- package/dist/commands/repair.js +328 -0
- package/dist/commands/repair.js.map +1 -0
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +10 -27
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/uninstall.d.ts +1 -0
- package/dist/commands/uninstall.d.ts.map +1 -1
- package/dist/commands/uninstall.js +94 -60
- package/dist/commands/uninstall.js.map +1 -1
- package/dist/commands/update.d.ts +12 -0
- package/dist/commands/update.d.ts.map +1 -0
- package/dist/commands/update.js +531 -0
- package/dist/commands/update.js.map +1 -0
- package/dist/core/config-patcher.d.ts.map +1 -1
- package/dist/core/config-patcher.js +10 -1
- package/dist/core/config-patcher.js.map +1 -1
- package/dist/core/gateway-client.js +1 -1
- package/dist/core/log-reader.d.ts +28 -0
- package/dist/core/log-reader.d.ts.map +1 -0
- package/dist/core/log-reader.js +69 -0
- package/dist/core/log-reader.js.map +1 -0
- package/dist/core/migration-planner.d.ts +37 -0
- package/dist/core/migration-planner.d.ts.map +1 -0
- package/dist/core/migration-planner.js +160 -0
- package/dist/core/migration-planner.js.map +1 -0
- package/dist/core/openclaw-paths.d.ts +6 -0
- package/dist/core/openclaw-paths.d.ts.map +1 -1
- package/dist/core/openclaw-paths.js +14 -0
- package/dist/core/openclaw-paths.js.map +1 -1
- package/dist/core/state-differ.d.ts +15 -0
- package/dist/core/state-differ.d.ts.map +1 -0
- package/dist/core/state-differ.js +135 -0
- package/dist/core/state-differ.js.map +1 -0
- package/dist/index.js +63 -1
- package/dist/index.js.map +1 -1
- package/dist/types/state.d.ts +14 -0
- package/dist/types/state.d.ts.map +1 -1
- package/dist/utils/identifiers.d.ts +18 -0
- package/dist/utils/identifiers.d.ts.map +1 -0
- package/dist/utils/identifiers.js +50 -0
- package/dist/utils/identifiers.js.map +1 -0
- package/dist/utils/tarball.d.ts +12 -0
- package/dist/utils/tarball.d.ts.map +1 -0
- package/dist/utils/tarball.js +23 -0
- package/dist/utils/tarball.js.map +1 -0
- package/package.json +1 -1
- package/template/reef.json +6 -6
|
@@ -0,0 +1,531 @@
|
|
|
1
|
+
import { readFile, writeFile, mkdir, rm } from 'node:fs/promises';
|
|
2
|
+
import { join, dirname } from 'node:path';
|
|
3
|
+
import { existsSync } from 'node:fs';
|
|
4
|
+
import { resolve, relative } from 'node:path';
|
|
5
|
+
import ora from 'ora';
|
|
6
|
+
import chalk from 'chalk';
|
|
7
|
+
import { resolveFormationPath } from '../utils/tarball.js';
|
|
8
|
+
import { loadManifest } from '../core/manifest-loader.js';
|
|
9
|
+
import { validateSchema } from '../core/schema-validator.js';
|
|
10
|
+
import { validateStructure } from '../core/structural-validator.js';
|
|
11
|
+
import { resolveVariables } from '../core/variable-resolver.js';
|
|
12
|
+
import { interpolate } from '../core/template-interpolator.js';
|
|
13
|
+
import { resolveWorkspacePath, resolveGatewayUrl, resolveStateDir, resolveAgentStatePaths, validateAgentIds, } from '../core/openclaw-paths.js';
|
|
14
|
+
import { readConfig, writeConfig, addAgentEntry, removeAgentEntry, addBinding, removeBinding, setAgentToAgent, } from '../core/config-patcher.js';
|
|
15
|
+
import { GatewayClient, resolveGatewayAuth } from '../core/gateway-client.js';
|
|
16
|
+
import { loadState, saveState, listStates, computeFileHash, } from '../core/state-manager.js';
|
|
17
|
+
import { generateAgentsMd } from '../core/agents-md-generator.js';
|
|
18
|
+
import { listFiles } from '../utils/fs.js';
|
|
19
|
+
import { computeMigrationPlan } from '../core/migration-planner.js';
|
|
20
|
+
import { icons, header, label } from '../utils/output.js';
|
|
21
|
+
const TOKEN_RE = /\{\{\w+\}\}/;
|
|
22
|
+
function isBinaryBuffer(buf) {
|
|
23
|
+
const check = buf.subarray(0, 8192);
|
|
24
|
+
return check.includes(0);
|
|
25
|
+
}
|
|
26
|
+
function parseSets(sets) {
|
|
27
|
+
const result = {};
|
|
28
|
+
if (!sets)
|
|
29
|
+
return result;
|
|
30
|
+
for (const s of sets) {
|
|
31
|
+
const eq = s.indexOf('=');
|
|
32
|
+
if (eq === -1)
|
|
33
|
+
continue;
|
|
34
|
+
result[s.slice(0, eq)] = s.slice(eq + 1);
|
|
35
|
+
}
|
|
36
|
+
return result;
|
|
37
|
+
}
|
|
38
|
+
export async function update(inputPath, options) {
|
|
39
|
+
// Resolve tarball to directory if needed
|
|
40
|
+
const { formationPath, tempDir } = await resolveFormationPath(inputPath);
|
|
41
|
+
try {
|
|
42
|
+
await _update(formationPath, options);
|
|
43
|
+
}
|
|
44
|
+
finally {
|
|
45
|
+
if (tempDir) {
|
|
46
|
+
await rm(tempDir, { recursive: true, force: true }).catch(() => { });
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
async function _update(formationPath, options) {
|
|
51
|
+
// 1. Parse + validate manifest
|
|
52
|
+
const spinner = ora('Loading formation...').start();
|
|
53
|
+
let manifest;
|
|
54
|
+
try {
|
|
55
|
+
manifest = await loadManifest(formationPath);
|
|
56
|
+
}
|
|
57
|
+
catch (err) {
|
|
58
|
+
spinner.fail('Failed to load formation');
|
|
59
|
+
throw err;
|
|
60
|
+
}
|
|
61
|
+
const schemaResult = await validateSchema(manifest);
|
|
62
|
+
if (!schemaResult.valid) {
|
|
63
|
+
spinner.fail('Schema validation failed');
|
|
64
|
+
for (const issue of schemaResult.issues) {
|
|
65
|
+
console.error(` ${icons.error} ${issue.message}`);
|
|
66
|
+
}
|
|
67
|
+
process.exit(1);
|
|
68
|
+
}
|
|
69
|
+
const structResult = await validateStructure(manifest, formationPath);
|
|
70
|
+
if (!structResult.valid) {
|
|
71
|
+
spinner.fail('Structural validation failed');
|
|
72
|
+
for (const issue of structResult.issues) {
|
|
73
|
+
if (issue.severity === 'error') {
|
|
74
|
+
console.error(` ${icons.error} ${issue.message}`);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
process.exit(1);
|
|
78
|
+
}
|
|
79
|
+
const namespace = options.namespace ?? manifest.namespace;
|
|
80
|
+
const slugs = Object.keys(manifest.agents);
|
|
81
|
+
const idValidation = validateAgentIds(slugs, namespace);
|
|
82
|
+
if (!idValidation.valid) {
|
|
83
|
+
spinner.fail('Agent ID validation failed');
|
|
84
|
+
for (const error of idValidation.errors) {
|
|
85
|
+
console.error(` ${icons.error} ${error}`);
|
|
86
|
+
}
|
|
87
|
+
process.exit(1);
|
|
88
|
+
}
|
|
89
|
+
spinner.succeed('Formation loaded and validated');
|
|
90
|
+
// 2. Load existing state
|
|
91
|
+
const existingState = await loadState(namespace, manifest.name);
|
|
92
|
+
if (!existingState) {
|
|
93
|
+
// Formation not found under resolved namespace — check if it exists
|
|
94
|
+
// under a different namespace to give an actionable error message
|
|
95
|
+
const allStates = await listStates();
|
|
96
|
+
const byName = allStates.filter((s) => s.name === manifest.name);
|
|
97
|
+
if (byName.length === 1 && byName[0].namespace !== namespace) {
|
|
98
|
+
console.error(`${icons.error} Formation installed under namespace "${byName[0].namespace}" but resolved namespace is "${namespace}".`);
|
|
99
|
+
console.error(` Use ${chalk.cyan(`--namespace ${byName[0].namespace}`)} to update, or uninstall and reinstall under the new namespace.`);
|
|
100
|
+
process.exit(1);
|
|
101
|
+
}
|
|
102
|
+
console.error(`${icons.error} Formation "${namespace}/${manifest.name}" is not installed. Use ${chalk.cyan('reef install')} instead.`);
|
|
103
|
+
process.exit(1);
|
|
104
|
+
}
|
|
105
|
+
// 3. Resolve variables
|
|
106
|
+
const { resolved: resolvedVars, missing } = await resolveVariables(manifest.variables ?? {}, formationPath, {
|
|
107
|
+
interactive: !options.yes,
|
|
108
|
+
cliOverrides: parseSets(options.set),
|
|
109
|
+
noEnv: options.noEnv,
|
|
110
|
+
});
|
|
111
|
+
// Fallback: merge non-sensitive values from prior state (low priority).
|
|
112
|
+
// Sensitive vars are stored as "$NAME" placeholders — never use those as fallback.
|
|
113
|
+
for (const name of Object.keys(manifest.variables ?? {})) {
|
|
114
|
+
if (resolvedVars[name] !== undefined)
|
|
115
|
+
continue;
|
|
116
|
+
const stateVal = existingState.variables[name];
|
|
117
|
+
if (stateVal !== undefined && !stateVal.startsWith('$')) {
|
|
118
|
+
resolvedVars[name] = stateVal;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
// Re-filter missing after state fallback
|
|
122
|
+
const stillMissing = missing.filter((name) => resolvedVars[name] === undefined);
|
|
123
|
+
if (stillMissing.length > 0) {
|
|
124
|
+
console.error(`${icons.error} Missing required variables: ${stillMissing.join(', ')}`);
|
|
125
|
+
console.error(' Use --set KEY=VALUE or set them in .env / environment.');
|
|
126
|
+
process.exit(1);
|
|
127
|
+
}
|
|
128
|
+
// 4. Compute file hashes for new source
|
|
129
|
+
const newFileHashes = {};
|
|
130
|
+
for (const [slug, agentDef] of Object.entries(manifest.agents)) {
|
|
131
|
+
const agentId = idValidation.ids.get(slug);
|
|
132
|
+
const sourceDir = join(formationPath, agentDef.source);
|
|
133
|
+
try {
|
|
134
|
+
const files = await listFiles(sourceDir);
|
|
135
|
+
for (const relativePath of files) {
|
|
136
|
+
const srcFile = join(sourceDir, relativePath);
|
|
137
|
+
const rawBytes = await readFile(srcFile);
|
|
138
|
+
let content;
|
|
139
|
+
if (isBinaryBuffer(rawBytes)) {
|
|
140
|
+
content = rawBytes;
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
const text = rawBytes.toString('utf-8');
|
|
144
|
+
content = Buffer.from(TOKEN_RE.test(text) ? interpolate(text, resolvedVars) : text, 'utf-8');
|
|
145
|
+
}
|
|
146
|
+
newFileHashes[`${agentId}:${relativePath}`] = computeFileHash(content);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
catch {
|
|
150
|
+
// Source dir may not exist for this agent yet
|
|
151
|
+
}
|
|
152
|
+
// AGENTS.md hash if agent-to-agent configured
|
|
153
|
+
if (manifest.agentToAgent?.[slug]?.length) {
|
|
154
|
+
const agentsMd = generateAgentsMd(manifest, slug, namespace);
|
|
155
|
+
const buf = Buffer.from(agentsMd, 'utf-8');
|
|
156
|
+
newFileHashes[`${agentId}:AGENTS.md`] = computeFileHash(buf);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
// 5. Compute migration plan
|
|
160
|
+
const plan = computeMigrationPlan(existingState, manifest, namespace, idValidation.ids, newFileHashes);
|
|
161
|
+
if (plan.isEmpty) {
|
|
162
|
+
console.log(`${icons.success} ${chalk.green('Already up to date.')}`);
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
// 6. Print migration plan
|
|
166
|
+
console.log('');
|
|
167
|
+
const versionStr = plan.versionChange
|
|
168
|
+
? ` v${plan.versionChange.from} → v${plan.versionChange.to}`
|
|
169
|
+
: '';
|
|
170
|
+
console.log(header(`Migration Plan: ${namespace}/${manifest.name}${versionStr}`));
|
|
171
|
+
console.log('');
|
|
172
|
+
// Agents
|
|
173
|
+
console.log(label('Agents:'));
|
|
174
|
+
for (const a of plan.agents) {
|
|
175
|
+
switch (a.type) {
|
|
176
|
+
case 'add':
|
|
177
|
+
console.log(` ${chalk.green('+')} ${a.slug} (add)`);
|
|
178
|
+
break;
|
|
179
|
+
case 'remove':
|
|
180
|
+
console.log(` ${chalk.red('-')} ${a.slug} (remove)`);
|
|
181
|
+
break;
|
|
182
|
+
case 'update':
|
|
183
|
+
console.log(` ${chalk.yellow('~')} ${a.slug} (${a.changedFiles?.length} files changed)`);
|
|
184
|
+
break;
|
|
185
|
+
case 'unchanged':
|
|
186
|
+
console.log(` ${chalk.dim('=')} ${a.slug} (unchanged)`);
|
|
187
|
+
break;
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
// Bindings
|
|
191
|
+
if (plan.bindings.length > 0) {
|
|
192
|
+
console.log('');
|
|
193
|
+
console.log(label('Bindings:'));
|
|
194
|
+
for (const b of plan.bindings) {
|
|
195
|
+
const prefix = b.type === 'add' ? chalk.green('+') : chalk.red('-');
|
|
196
|
+
console.log(` ${prefix} ${b.binding.match.channel} → ${b.binding.agentId}`);
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
// Cron
|
|
200
|
+
if (plan.cron.length > 0) {
|
|
201
|
+
console.log('');
|
|
202
|
+
console.log(label('Cron Jobs:'));
|
|
203
|
+
for (const c of plan.cron) {
|
|
204
|
+
switch (c.type) {
|
|
205
|
+
case 'add':
|
|
206
|
+
console.log(` ${chalk.green('+')} ${c.name}`);
|
|
207
|
+
break;
|
|
208
|
+
case 'remove':
|
|
209
|
+
console.log(` ${chalk.red('-')} ${c.name}`);
|
|
210
|
+
break;
|
|
211
|
+
case 'update':
|
|
212
|
+
console.log(` ${chalk.yellow('~')} ${c.name}`);
|
|
213
|
+
break;
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
// A2a
|
|
218
|
+
if (plan.a2a.length > 0) {
|
|
219
|
+
console.log('');
|
|
220
|
+
console.log(label('Agent-to-Agent:'));
|
|
221
|
+
for (const edge of plan.a2a) {
|
|
222
|
+
const prefix = edge.type === 'add'
|
|
223
|
+
? chalk.green('+')
|
|
224
|
+
: edge.type === 'remove'
|
|
225
|
+
? chalk.red('-')
|
|
226
|
+
: chalk.yellow('~');
|
|
227
|
+
console.log(` ${prefix} ${edge.from} → ${edge.to}`);
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
// 7. Dry run
|
|
231
|
+
if (options.dryRun) {
|
|
232
|
+
console.log('');
|
|
233
|
+
console.log(label('Dry run — no changes applied.'));
|
|
234
|
+
return;
|
|
235
|
+
}
|
|
236
|
+
// 8. Confirm
|
|
237
|
+
if (!options.yes) {
|
|
238
|
+
console.log('');
|
|
239
|
+
const { confirm } = await import('@inquirer/prompts');
|
|
240
|
+
const proceed = await confirm({
|
|
241
|
+
message: 'Apply this migration?',
|
|
242
|
+
});
|
|
243
|
+
if (!proceed) {
|
|
244
|
+
console.log('Aborted.');
|
|
245
|
+
process.exit(0);
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
// 9. Execute migration
|
|
249
|
+
const deploySpinner = ora('Applying migration...').start();
|
|
250
|
+
const agentStates = { ...existingState.agents };
|
|
251
|
+
const fileHashes = { ...existingState.fileHashes };
|
|
252
|
+
const cronJobStates = [...existingState.cronJobs];
|
|
253
|
+
const openClawBindings = [...existingState.bindings];
|
|
254
|
+
// 9a. Remove dropped agents
|
|
255
|
+
for (const change of plan.agents.filter((a) => a.type === 'remove')) {
|
|
256
|
+
const agent = existingState.agents[change.slug];
|
|
257
|
+
if (!agent)
|
|
258
|
+
continue;
|
|
259
|
+
// Try Gateway cleanup
|
|
260
|
+
try {
|
|
261
|
+
const { config: gwConfig } = await readConfig();
|
|
262
|
+
const gwUrl = options.gatewayUrl ?? resolveGatewayUrl(gwConfig, process.env);
|
|
263
|
+
const gwAuth = resolveGatewayAuth({
|
|
264
|
+
gatewayUrl: options.gatewayUrl,
|
|
265
|
+
gatewayToken: options.gatewayToken,
|
|
266
|
+
gatewayPassword: options.gatewayPassword,
|
|
267
|
+
config: gwConfig,
|
|
268
|
+
});
|
|
269
|
+
const gw = new GatewayClient({ url: gwUrl, ...gwAuth });
|
|
270
|
+
await gw.connect();
|
|
271
|
+
try {
|
|
272
|
+
await gw.call('agents.delete', { agentId: agent.id });
|
|
273
|
+
}
|
|
274
|
+
catch { /* Agent may not exist in Gateway */ }
|
|
275
|
+
gw.close();
|
|
276
|
+
}
|
|
277
|
+
catch { /* Gateway unreachable */ }
|
|
278
|
+
// Delete workspace
|
|
279
|
+
try {
|
|
280
|
+
await rm(agent.workspace, { recursive: true, force: true });
|
|
281
|
+
}
|
|
282
|
+
catch { /* Already gone */ }
|
|
283
|
+
// Clean agent state paths
|
|
284
|
+
const resolvedStateDir = resolve(resolveStateDir());
|
|
285
|
+
const statePaths = resolveAgentStatePaths(agent.id);
|
|
286
|
+
for (const p of statePaths) {
|
|
287
|
+
if (!existsSync(p))
|
|
288
|
+
continue;
|
|
289
|
+
const resolvedPath = resolve(p);
|
|
290
|
+
const rel = relative(resolvedStateDir, resolvedPath);
|
|
291
|
+
if (rel.startsWith('..') || resolve(resolvedStateDir, rel) !== resolvedPath)
|
|
292
|
+
continue;
|
|
293
|
+
try {
|
|
294
|
+
await rm(p, { recursive: true, force: true });
|
|
295
|
+
}
|
|
296
|
+
catch { /* Fine */ }
|
|
297
|
+
}
|
|
298
|
+
// Remove from state
|
|
299
|
+
delete agentStates[change.slug];
|
|
300
|
+
// Remove file hashes for this agent
|
|
301
|
+
for (const key of Object.keys(fileHashes)) {
|
|
302
|
+
if (key.startsWith(`${agent.id}:`)) {
|
|
303
|
+
delete fileHashes[key];
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
// 9b. Deploy new/changed workspace files
|
|
308
|
+
for (const change of plan.agents.filter((a) => a.type === 'add' || a.type === 'update')) {
|
|
309
|
+
const agentDef = manifest.agents[change.slug];
|
|
310
|
+
const agentId = change.agentId;
|
|
311
|
+
const workspacePath = resolveWorkspacePath(agentId);
|
|
312
|
+
await mkdir(workspacePath, { recursive: true });
|
|
313
|
+
const sourceDir = join(formationPath, agentDef.source);
|
|
314
|
+
const files = await listFiles(sourceDir);
|
|
315
|
+
const deployedFiles = [];
|
|
316
|
+
for (const relativePath of files) {
|
|
317
|
+
const srcFile = join(sourceDir, relativePath);
|
|
318
|
+
const destPath = join(workspacePath, relativePath);
|
|
319
|
+
await mkdir(dirname(destPath), { recursive: true });
|
|
320
|
+
const rawBytes = await readFile(srcFile);
|
|
321
|
+
if (isBinaryBuffer(rawBytes)) {
|
|
322
|
+
const hash = computeFileHash(rawBytes);
|
|
323
|
+
const existingHash = fileHashes[`${agentId}:${relativePath}`];
|
|
324
|
+
if (existingHash !== hash) {
|
|
325
|
+
await writeFile(destPath, rawBytes);
|
|
326
|
+
}
|
|
327
|
+
fileHashes[`${agentId}:${relativePath}`] = hash;
|
|
328
|
+
deployedFiles.push(relativePath);
|
|
329
|
+
continue;
|
|
330
|
+
}
|
|
331
|
+
let content = rawBytes.toString('utf-8');
|
|
332
|
+
if (TOKEN_RE.test(content)) {
|
|
333
|
+
content = interpolate(content, resolvedVars);
|
|
334
|
+
}
|
|
335
|
+
const written = Buffer.from(content, 'utf-8');
|
|
336
|
+
const hash = computeFileHash(written);
|
|
337
|
+
const existingHash = fileHashes[`${agentId}:${relativePath}`];
|
|
338
|
+
if (existingHash !== hash) {
|
|
339
|
+
await writeFile(destPath, written);
|
|
340
|
+
}
|
|
341
|
+
fileHashes[`${agentId}:${relativePath}`] = hash;
|
|
342
|
+
deployedFiles.push(relativePath);
|
|
343
|
+
}
|
|
344
|
+
// Generate AGENTS.md if needed
|
|
345
|
+
if (manifest.agentToAgent?.[change.slug]?.length) {
|
|
346
|
+
const agentsMd = generateAgentsMd(manifest, change.slug, namespace);
|
|
347
|
+
const buf = Buffer.from(agentsMd, 'utf-8');
|
|
348
|
+
await writeFile(join(workspacePath, 'AGENTS.md'), buf);
|
|
349
|
+
fileHashes[`${agentId}:AGENTS.md`] = computeFileHash(buf);
|
|
350
|
+
deployedFiles.push('AGENTS.md');
|
|
351
|
+
}
|
|
352
|
+
agentStates[change.slug] = {
|
|
353
|
+
id: agentId,
|
|
354
|
+
slug: change.slug,
|
|
355
|
+
workspace: workspacePath,
|
|
356
|
+
files: deployedFiles,
|
|
357
|
+
model: agentDef.model,
|
|
358
|
+
};
|
|
359
|
+
}
|
|
360
|
+
// 9c. Update config
|
|
361
|
+
deploySpinner.text = 'Patching config...';
|
|
362
|
+
let patchedConfig = (await readConfig()).config;
|
|
363
|
+
// Remove dropped agents and bindings from config
|
|
364
|
+
for (const change of plan.agents.filter((a) => a.type === 'remove')) {
|
|
365
|
+
patchedConfig = removeAgentEntry(patchedConfig, change.agentId);
|
|
366
|
+
}
|
|
367
|
+
for (const b of plan.bindings.filter((b) => b.type === 'remove')) {
|
|
368
|
+
patchedConfig = removeBinding(patchedConfig, b.binding);
|
|
369
|
+
const idx = openClawBindings.findIndex((ob) => ob.agentId === b.binding.agentId &&
|
|
370
|
+
ob.match.channel === b.binding.match.channel);
|
|
371
|
+
if (idx !== -1)
|
|
372
|
+
openClawBindings.splice(idx, 1);
|
|
373
|
+
}
|
|
374
|
+
// Add new agents and bindings
|
|
375
|
+
for (const change of plan.agents.filter((a) => a.type === 'add')) {
|
|
376
|
+
const agentDef = manifest.agents[change.slug];
|
|
377
|
+
patchedConfig = addAgentEntry(patchedConfig, {
|
|
378
|
+
id: change.agentId,
|
|
379
|
+
name: change.slug,
|
|
380
|
+
workspace: resolveWorkspacePath(change.agentId),
|
|
381
|
+
model: agentDef.model,
|
|
382
|
+
});
|
|
383
|
+
}
|
|
384
|
+
for (const b of plan.bindings.filter((b) => b.type === 'add')) {
|
|
385
|
+
patchedConfig = addBinding(patchedConfig, b.binding);
|
|
386
|
+
openClawBindings.push(b.binding);
|
|
387
|
+
}
|
|
388
|
+
// Update a2a
|
|
389
|
+
if (plan.a2a.length > 0) {
|
|
390
|
+
const hasNewEdges = plan.a2a.some((e) => e.type === 'add' || e.type === 'reapply');
|
|
391
|
+
if (hasNewEdges) {
|
|
392
|
+
patchedConfig = setAgentToAgent(patchedConfig, namespace);
|
|
393
|
+
}
|
|
394
|
+
}
|
|
395
|
+
const { path: configPath } = await readConfig();
|
|
396
|
+
await writeConfig(configPath, patchedConfig, { silent: true });
|
|
397
|
+
// 9d. Update cron jobs
|
|
398
|
+
if (plan.cron.length > 0) {
|
|
399
|
+
deploySpinner.text = 'Updating cron jobs...';
|
|
400
|
+
try {
|
|
401
|
+
const gwUrl = options.gatewayUrl ?? resolveGatewayUrl(patchedConfig, process.env);
|
|
402
|
+
const gwAuth = resolveGatewayAuth({
|
|
403
|
+
gatewayUrl: options.gatewayUrl,
|
|
404
|
+
gatewayToken: options.gatewayToken,
|
|
405
|
+
gatewayPassword: options.gatewayPassword,
|
|
406
|
+
config: patchedConfig,
|
|
407
|
+
});
|
|
408
|
+
const gw = new GatewayClient({ url: gwUrl, ...gwAuth });
|
|
409
|
+
await gw.connect();
|
|
410
|
+
for (const change of plan.cron) {
|
|
411
|
+
if (change.type === 'remove' && change.oldCron) {
|
|
412
|
+
try {
|
|
413
|
+
await gw.cronRemove(change.oldCron.id);
|
|
414
|
+
}
|
|
415
|
+
catch { /* Already gone */ }
|
|
416
|
+
const idx = cronJobStates.findIndex((j) => j.id === change.oldCron.id);
|
|
417
|
+
if (idx !== -1)
|
|
418
|
+
cronJobStates.splice(idx, 1);
|
|
419
|
+
}
|
|
420
|
+
else if (change.type === 'add' && change.newCron) {
|
|
421
|
+
const cronAgentId = idValidation.ids.get(change.agentSlug);
|
|
422
|
+
if (cronAgentId) {
|
|
423
|
+
const result = await gw.cronAdd({
|
|
424
|
+
name: change.name,
|
|
425
|
+
agentId: cronAgentId,
|
|
426
|
+
enabled: true,
|
|
427
|
+
schedule: {
|
|
428
|
+
kind: 'cron',
|
|
429
|
+
expr: change.newCron.schedule,
|
|
430
|
+
tz: change.newCron.timezone,
|
|
431
|
+
},
|
|
432
|
+
sessionTarget: 'isolated',
|
|
433
|
+
wakeMode: 'now',
|
|
434
|
+
payload: {
|
|
435
|
+
kind: 'agentTurn',
|
|
436
|
+
message: change.newCron.prompt,
|
|
437
|
+
},
|
|
438
|
+
});
|
|
439
|
+
cronJobStates.push({
|
|
440
|
+
id: result.id,
|
|
441
|
+
name: change.name,
|
|
442
|
+
agentSlug: change.agentSlug,
|
|
443
|
+
schedule: change.newCron.schedule,
|
|
444
|
+
timezone: change.newCron.timezone,
|
|
445
|
+
prompt: change.newCron.prompt,
|
|
446
|
+
});
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
else if (change.type === 'update' && change.oldCron && change.newCron) {
|
|
450
|
+
const cronAgentId = idValidation.ids.get(change.agentSlug);
|
|
451
|
+
if (cronAgentId) {
|
|
452
|
+
await gw.cronUpdate(change.oldCron.id, {
|
|
453
|
+
schedule: {
|
|
454
|
+
kind: 'cron',
|
|
455
|
+
expr: change.newCron.schedule,
|
|
456
|
+
tz: change.newCron.timezone,
|
|
457
|
+
},
|
|
458
|
+
payload: {
|
|
459
|
+
kind: 'agentTurn',
|
|
460
|
+
message: change.newCron.prompt,
|
|
461
|
+
},
|
|
462
|
+
agentId: cronAgentId,
|
|
463
|
+
enabled: true,
|
|
464
|
+
});
|
|
465
|
+
const existing = cronJobStates.find((j) => j.id === change.oldCron.id);
|
|
466
|
+
if (existing) {
|
|
467
|
+
existing.schedule = change.newCron.schedule;
|
|
468
|
+
existing.timezone = change.newCron.timezone;
|
|
469
|
+
existing.prompt = change.newCron.prompt;
|
|
470
|
+
}
|
|
471
|
+
}
|
|
472
|
+
}
|
|
473
|
+
}
|
|
474
|
+
gw.close();
|
|
475
|
+
}
|
|
476
|
+
catch (err) {
|
|
477
|
+
deploySpinner.warn(`Gateway error during cron update: ${err instanceof Error ? err.message : err}`);
|
|
478
|
+
}
|
|
479
|
+
}
|
|
480
|
+
// 10. Save updated state
|
|
481
|
+
const variablesForState = {};
|
|
482
|
+
for (const [name, config] of Object.entries(manifest.variables ?? {})) {
|
|
483
|
+
if (config.sensitive) {
|
|
484
|
+
variablesForState[name] = `$${name}`;
|
|
485
|
+
}
|
|
486
|
+
else {
|
|
487
|
+
variablesForState[name] = resolvedVars[name] ?? '';
|
|
488
|
+
}
|
|
489
|
+
}
|
|
490
|
+
const a2aState = existingState.agentToAgent ?? { wasEnabled: false, allowAdded: false };
|
|
491
|
+
if (manifest.agentToAgent && Object.keys(manifest.agentToAgent).length > 0) {
|
|
492
|
+
a2aState.allowAdded = true;
|
|
493
|
+
}
|
|
494
|
+
const updatedState = {
|
|
495
|
+
name: manifest.name,
|
|
496
|
+
version: manifest.version,
|
|
497
|
+
namespace,
|
|
498
|
+
installedAt: existingState.installedAt,
|
|
499
|
+
updatedAt: new Date().toISOString(),
|
|
500
|
+
agents: agentStates,
|
|
501
|
+
bindings: openClawBindings,
|
|
502
|
+
cronJobs: cronJobStates,
|
|
503
|
+
variables: variablesForState,
|
|
504
|
+
fileHashes,
|
|
505
|
+
agentToAgent: a2aState.allowAdded ? a2aState : undefined,
|
|
506
|
+
sourcePath: formationPath,
|
|
507
|
+
agentToAgentEdges: manifest.agentToAgent ?? undefined,
|
|
508
|
+
};
|
|
509
|
+
await saveState(updatedState);
|
|
510
|
+
// 11. Summary
|
|
511
|
+
deploySpinner.succeed('Migration applied');
|
|
512
|
+
console.log('');
|
|
513
|
+
const added = plan.agents.filter((a) => a.type === 'add').length;
|
|
514
|
+
const removed = plan.agents.filter((a) => a.type === 'remove').length;
|
|
515
|
+
const updated = plan.agents.filter((a) => a.type === 'update').length;
|
|
516
|
+
const parts = [];
|
|
517
|
+
if (added > 0)
|
|
518
|
+
parts.push(`${added} added`);
|
|
519
|
+
if (removed > 0)
|
|
520
|
+
parts.push(`${removed} removed`);
|
|
521
|
+
if (updated > 0)
|
|
522
|
+
parts.push(`${updated} updated`);
|
|
523
|
+
if (plan.bindings.length > 0)
|
|
524
|
+
parts.push(`${plan.bindings.length} binding changes`);
|
|
525
|
+
if (plan.cron.length > 0)
|
|
526
|
+
parts.push(`${plan.cron.length} cron changes`);
|
|
527
|
+
console.log(`${icons.success} ${chalk.green(parts.join(', '))}`);
|
|
528
|
+
console.log('');
|
|
529
|
+
console.log(` ${label('Status:')} reef status ${namespace}/${manifest.name}`);
|
|
530
|
+
}
|
|
531
|
+
//# sourceMappingURL=update.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-patcher.d.ts","sourceRoot":"","sources":["../../src/core/config-patcher.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC5D,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAsB,UAAU,CAC9B,UAAU,CAAC,EAAE,MAAM,EACnB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GACtB,OAAO,CAAC,UAAU,CAAC,CAmBrB;AAED,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7B,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"config-patcher.d.ts","sourceRoot":"","sources":["../../src/core/config-patcher.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC5D,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAsB,UAAU,CAC9B,UAAU,CAAC,EAAE,MAAM,EACnB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GACtB,OAAO,CAAC,UAAU,CAAC,CAmBrB;AAED,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7B,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAgBD,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,KAAK,EAAE,UAAU,EACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAqBzB;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAOzB;AAED,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,eAAe,GACvB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,eAAe,GACvB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMzB;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,MAAM,GAChB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgBzB;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,MAAM,EACjB,0BAA0B,EAAE,OAAO,EACnC,UAAU,CAAC,EAAE,OAAO,GACnB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAkBzB;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,GAAG,OAAO,CAE7E"}
|
|
@@ -26,8 +26,17 @@ export async function writeConfig(configPath, config, options) {
|
|
|
26
26
|
await writeFile(tmpPath, json, 'utf-8');
|
|
27
27
|
// Backup original if exists
|
|
28
28
|
if (existsSync(configPath)) {
|
|
29
|
+
const existing = await readFile(configPath, 'utf-8');
|
|
30
|
+
let isAlreadyJson = false;
|
|
31
|
+
try {
|
|
32
|
+
JSON.parse(existing);
|
|
33
|
+
isAlreadyJson = true;
|
|
34
|
+
}
|
|
35
|
+
catch {
|
|
36
|
+
// Not valid JSON — was JSON5 with comments/trailing commas
|
|
37
|
+
}
|
|
29
38
|
await rename(configPath, bakPath);
|
|
30
|
-
if (!options?.silent) {
|
|
39
|
+
if (!options?.silent && !isAlreadyJson) {
|
|
31
40
|
console.log(`Config rewritten as JSON — comments from original JSON5 removed. Backup: ${bakPath}`);
|
|
32
41
|
}
|
|
33
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-patcher.js","sourceRoot":"","sources":["../../src/core/config-patcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAqB9E,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,UAAmB,EACnB,GAAuB;IAEvB,MAAM,IAAI,GAAG,UAAU,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAClD,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,8CAA8C;QAC9C,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IAC3E,CAAC;IAED,4CAA4C;IAC5C,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACxD,OAAO,CAAC,IAAI,CACV,0HAA0H,CAC3H,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;AAC/B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,UAAkB,EAClB,MAA+B,EAC/B,OAA8B;IAE9B,MAAM,OAAO,GAAG,UAAU,GAAG,MAAM,CAAC;IACpC,MAAM,OAAO,GAAG,UAAU,GAAG,MAAM,CAAC;IACpC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;IAEpD,MAAM,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAExC,4BAA4B;IAC5B,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,MAAM,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"config-patcher.js","sourceRoot":"","sources":["../../src/core/config-patcher.ts"],"names":[],"mappings":"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"}
|