@indy2kro/agentenv 1.1.3 → 1.2.0
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/adapters/base.d.ts +2 -0
- package/dist/adapters/base.d.ts.map +1 -1
- package/dist/adapters/base.js.map +1 -1
- package/dist/adapters/cline.d.ts.map +1 -1
- package/dist/adapters/cline.js +1 -0
- package/dist/adapters/cline.js.map +1 -1
- package/dist/adapters/codex.d.ts.map +1 -1
- package/dist/adapters/codex.js +9 -2
- package/dist/adapters/codex.js.map +1 -1
- package/dist/adapters/copilot.d.ts.map +1 -1
- package/dist/adapters/copilot.js +5 -1
- package/dist/adapters/copilot.js.map +1 -1
- package/dist/adapters/gemini.d.ts.map +1 -1
- package/dist/adapters/gemini.js +5 -0
- package/dist/adapters/gemini.js.map +1 -1
- package/dist/adapters/rtk-delegation.d.ts +15 -0
- package/dist/adapters/rtk-delegation.d.ts.map +1 -1
- package/dist/adapters/rtk-delegation.js +38 -3
- package/dist/adapters/rtk-delegation.js.map +1 -1
- package/dist/adapters/vibe.d.ts.map +1 -1
- package/dist/adapters/vibe.js +2 -0
- package/dist/adapters/vibe.js.map +1 -1
- package/dist/adapters/windsurf.d.ts.map +1 -1
- package/dist/adapters/windsurf.js +1 -0
- package/dist/adapters/windsurf.js.map +1 -1
- package/dist/cli/exit.d.ts +7 -0
- package/dist/cli/exit.d.ts.map +1 -1
- package/dist/cli/exit.js +9 -0
- package/dist/cli/exit.js.map +1 -1
- package/dist/commands/agent-files.d.ts +14 -0
- package/dist/commands/agent-files.d.ts.map +1 -0
- package/dist/commands/agent-files.js +58 -0
- package/dist/commands/agent-files.js.map +1 -0
- package/dist/commands/apply.d.ts +37 -1
- package/dist/commands/apply.d.ts.map +1 -1
- package/dist/commands/apply.js +117 -38
- package/dist/commands/apply.js.map +1 -1
- package/dist/commands/config-edit.d.ts +9 -1
- package/dist/commands/config-edit.d.ts.map +1 -1
- package/dist/commands/config-edit.js +53 -12
- package/dist/commands/config-edit.js.map +1 -1
- package/dist/commands/doctor.d.ts +9 -1
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +123 -8
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/setup.d.ts +7 -1
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +53 -15
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/status.d.ts +8 -7
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +39 -47
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/uninstall.d.ts +8 -0
- package/dist/commands/uninstall.d.ts.map +1 -1
- package/dist/commands/uninstall.js +42 -1
- package/dist/commands/uninstall.js.map +1 -1
- package/dist/commands/update.d.ts +29 -2
- package/dist/commands/update.d.ts.map +1 -1
- package/dist/commands/update.js +169 -12
- package/dist/commands/update.js.map +1 -1
- package/dist/commands/wizard.d.ts.map +1 -1
- package/dist/commands/wizard.js +20 -11
- package/dist/commands/wizard.js.map +1 -1
- package/dist/config/schema.d.ts +0 -1
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +30 -22
- package/dist/config/schema.js.map +1 -1
- package/dist/config/scopes.d.ts +8 -0
- package/dist/config/scopes.d.ts.map +1 -1
- package/dist/config/scopes.js +15 -0
- package/dist/config/scopes.js.map +1 -1
- package/dist/generate/agentsmd.d.ts.map +1 -1
- package/dist/generate/agentsmd.js +45 -10
- package/dist/generate/agentsmd.js.map +1 -1
- package/dist/index.js +6 -1
- package/dist/index.js.map +1 -1
- package/dist/integrations/base.d.ts +0 -1
- package/dist/integrations/base.d.ts.map +1 -1
- package/dist/integrations/superpowers.d.ts +12 -4
- package/dist/integrations/superpowers.d.ts.map +1 -1
- package/dist/integrations/superpowers.js +18 -34
- package/dist/integrations/superpowers.js.map +1 -1
- package/dist/shell/shell-fix-state.d.ts.map +1 -1
- package/dist/shell/shell-fix-state.js +10 -0
- package/dist/shell/shell-fix-state.js.map +1 -1
- package/dist/toolchain/gh.d.ts +7 -0
- package/dist/toolchain/gh.d.ts.map +1 -1
- package/dist/toolchain/gh.js +13 -1
- package/dist/toolchain/gh.js.map +1 -1
- package/dist/toolchain/mise.d.ts +39 -1
- package/dist/toolchain/mise.d.ts.map +1 -1
- package/dist/toolchain/mise.js +114 -23
- package/dist/toolchain/mise.js.map +1 -1
- package/dist/toolchain/rtk.d.ts +7 -0
- package/dist/toolchain/rtk.d.ts.map +1 -1
- package/dist/toolchain/rtk.js +9 -0
- package/dist/toolchain/rtk.js.map +1 -1
- package/dist/ui/output.d.ts.map +1 -1
- package/dist/ui/output.js +7 -3
- package/dist/ui/output.js.map +1 -1
- package/dist/wizard/build.d.ts +7 -1
- package/dist/wizard/build.d.ts.map +1 -1
- package/dist/wizard/build.js +11 -6
- package/dist/wizard/build.js.map +1 -1
- package/package.json +1 -1
package/dist/commands/update.js
CHANGED
|
@@ -3,9 +3,10 @@ import { Command } from 'commander';
|
|
|
3
3
|
import * as fs from 'fs';
|
|
4
4
|
import * as path from 'path';
|
|
5
5
|
import { loadConfig, validateConfig } from '../config/schema.js';
|
|
6
|
+
import { applyConfiguration } from './apply.js';
|
|
6
7
|
import { configFilePath, findConfigPath, parseScopeFlag, baseDirForConfig, } from '../config/scopes.js';
|
|
7
8
|
import { shellFixStatePath } from '../shell/shell-fix-state.js';
|
|
8
|
-
import { ensureGlobalShimsDir, getMiseVersion, getUpgradeableTools, isMiseInstalled, miseActivationHint, miseInstallInstructions, runMiseSelfUpdate, runMiseUpgrade, shimsDir, shimsDirOnPath, toolAvailabilityLine, trustMiseToml, verifyHintNeeded, verifySummaryLine, verifyToolAvailability, miseTomlPathFor, } from '../toolchain/mise.js';
|
|
9
|
+
import { ensureGlobalShimsDir, getMiseVersion, getOutdatedTools, getUpgradeableTools, isMiseInstalled, miseActivationHint, miseInstallInstructions, runMiseSelfUpdate, runMiseUpgrade, shimsDir, shimsDirOnPath, summarizeMiseFailures, toolAvailabilityLine, trustMiseToml, verifyHintNeeded, verifySummaryLine, verifyToolAvailability, miseTomlPathFor, } from '../toolchain/mise.js';
|
|
9
10
|
import { renderLogo, setQuietEnabled } from '../ui/output.js';
|
|
10
11
|
import { printConfigPath, printResult, reportValidation } from '../ui/report.js';
|
|
11
12
|
import { normalizeOutput } from '../utils/output.js';
|
|
@@ -20,9 +21,11 @@ export async function doUpdate(options, deps = {}) {
|
|
|
20
21
|
const runMiseSelfUpdateFn = deps.runMiseSelfUpdate ?? runMiseSelfUpdate;
|
|
21
22
|
const trustMiseTomlFn = deps.trustMiseToml ?? trustMiseToml;
|
|
22
23
|
const runMiseUpgradeFn = deps.runMiseUpgrade ?? runMiseUpgrade;
|
|
24
|
+
const getOutdatedToolsFn = deps.getOutdatedTools ?? getOutdatedTools;
|
|
23
25
|
const verifyToolAvailabilityFn = deps.verifyToolAvailability ?? verifyToolAvailability;
|
|
24
26
|
const loadConfigFn = deps.loadConfig ?? loadConfig;
|
|
25
27
|
const watchMiseTomlFn = deps.watchMiseToml ?? watchMiseToml;
|
|
28
|
+
const watchAgentenvConfigFn = deps.watchAgentenvConfig ?? watchAgentenvConfig;
|
|
26
29
|
// In --json mode every line that would otherwise print live is collected
|
|
27
30
|
// instead, so the command emits exactly one JSON document at the end —
|
|
28
31
|
// the same {success, messages, errors} shape `apply --json` uses.
|
|
@@ -40,9 +43,11 @@ export async function doUpdate(options, deps = {}) {
|
|
|
40
43
|
else
|
|
41
44
|
console.error(line);
|
|
42
45
|
};
|
|
46
|
+
// Filled by --check/--dry-run: the managed tools that have a newer version.
|
|
47
|
+
let outdated;
|
|
43
48
|
const finish = (success, elapsedMs) => {
|
|
44
49
|
if (json)
|
|
45
|
-
printJson({ success, messages, errors, elapsedMs });
|
|
50
|
+
printJson({ success, messages, errors, elapsedMs, outdated });
|
|
46
51
|
};
|
|
47
52
|
if (!isMiseInstalledFn()) {
|
|
48
53
|
logErr('agentenv update requires mise, but mise was not found.');
|
|
@@ -168,13 +173,55 @@ export async function doUpdate(options, deps = {}) {
|
|
|
168
173
|
}
|
|
169
174
|
else {
|
|
170
175
|
log(` mise up ${targets.join(' ')}${dryRun ? ' (would run)' : ''}`);
|
|
176
|
+
if (dryRun) {
|
|
177
|
+
const all = getOutdatedToolsFn(scopeDir);
|
|
178
|
+
if (all === null) {
|
|
179
|
+
log(' could not check for newer versions (mise outdated failed)');
|
|
180
|
+
}
|
|
181
|
+
else {
|
|
182
|
+
outdated = all.filter((row) => targets.includes(row.tool));
|
|
183
|
+
if (outdated.length === 0)
|
|
184
|
+
log(' all upgradeable tools are up to date');
|
|
185
|
+
for (const row of outdated) {
|
|
186
|
+
log(' outdated: ' + row.tool + ' ' + row.current + ' -> ' + row.latest);
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
}
|
|
171
190
|
if (!dryRun) {
|
|
172
|
-
|
|
191
|
+
// Human mode shows mise's own progress live (it can run for minutes);
|
|
192
|
+
// --json collects everything into the one document instead.
|
|
193
|
+
let streamed = false;
|
|
194
|
+
const upgrade = await runMiseUpgradeFn(targets, scopeDir, json
|
|
195
|
+
? undefined
|
|
196
|
+
: (chunk) => {
|
|
197
|
+
streamed = true;
|
|
198
|
+
process.stdout.write(chunk);
|
|
199
|
+
});
|
|
173
200
|
if (upgrade.success) {
|
|
174
|
-
|
|
201
|
+
if (!streamed) {
|
|
202
|
+
log(` ${(upgrade.stdout || upgrade.stderr || '').trim() || 'all tools up to date'}`);
|
|
203
|
+
}
|
|
175
204
|
}
|
|
176
205
|
else {
|
|
177
|
-
|
|
206
|
+
const output = `${upgrade.stderr}\n${upgrade.stdout}`;
|
|
207
|
+
const failures = summarizeMiseFailures(output);
|
|
208
|
+
const head = ` mise up failed (exit ${upgrade.exitCode ?? 'null'})`;
|
|
209
|
+
if (failures.length > 0) {
|
|
210
|
+
// Name what broke; the rest of mise's output was already shown
|
|
211
|
+
// (human mode) or is still in the JSON document's raw detail.
|
|
212
|
+
logErr(`${head} for:`);
|
|
213
|
+
for (const failure of failures)
|
|
214
|
+
logErr(` ${failure}`);
|
|
215
|
+
logErr(' The other tools were upgraded. Pin a broken tool under [tool_versions], or `agentenv remove <tool>` to stop managing it.');
|
|
216
|
+
if (json)
|
|
217
|
+
logErr(normalizeOutput(upgrade.stderr || upgrade.stdout).trim());
|
|
218
|
+
}
|
|
219
|
+
else if (streamed) {
|
|
220
|
+
logErr(`${head}; see mise's output above.`);
|
|
221
|
+
}
|
|
222
|
+
else {
|
|
223
|
+
logErr(`${head}: ${normalizeOutput(upgrade.stderr || upgrade.stdout).trim()}`);
|
|
224
|
+
}
|
|
178
225
|
failed = true;
|
|
179
226
|
}
|
|
180
227
|
}
|
|
@@ -220,10 +267,17 @@ export async function doUpdate(options, deps = {}) {
|
|
|
220
267
|
console.log('\nSkipping watch mode (dry run).');
|
|
221
268
|
}
|
|
222
269
|
else {
|
|
223
|
-
console.log('\nWatching mise.toml
|
|
270
|
+
console.log('\nWatching agentenv.toml (re-applies files + tools) and mise.toml (mise up); Ctrl+C to stop...');
|
|
224
271
|
const scopeDir = baseDirForConfig(configPath, config.scope ?? 'project');
|
|
225
272
|
const miseTomlPath = miseTomlPathFor(config.scope, scopeDir);
|
|
226
|
-
|
|
273
|
+
// A re-apply rewrites mise.toml; the mise watcher must not treat that as an edit.
|
|
274
|
+
let paused = false;
|
|
275
|
+
watchMiseTomlFn(miseTomlPath, scopeDir, configPath, undefined, () => paused);
|
|
276
|
+
watchAgentenvConfigFn(configPath, scopeDir, {
|
|
277
|
+
onBusy: (busy) => {
|
|
278
|
+
paused = busy;
|
|
279
|
+
},
|
|
280
|
+
});
|
|
227
281
|
}
|
|
228
282
|
}
|
|
229
283
|
}
|
|
@@ -244,7 +298,7 @@ export async function doUpdate(options, deps = {}) {
|
|
|
244
298
|
* `debounceMs` is overridable so tests don't have to wait out the real
|
|
245
299
|
* 1000ms debounce.
|
|
246
300
|
*/
|
|
247
|
-
export function watchMiseToml(miseTomlPath, scopeDir, configPath, debounceMs = 1000) {
|
|
301
|
+
export function watchMiseToml(miseTomlPath, scopeDir, configPath, debounceMs = 1000, isPaused = () => false) {
|
|
248
302
|
const resolvedPath = path.resolve(miseTomlPath);
|
|
249
303
|
// fs.realpathSync.native canonicalizes 8.3-short-name vs. long-name and
|
|
250
304
|
// casing differences that path.resolve() leaves alone. On Windows, a
|
|
@@ -260,15 +314,27 @@ export function watchMiseToml(miseTomlPath, scopeDir, configPath, debounceMs = 1
|
|
|
260
314
|
catch {
|
|
261
315
|
resolvedDir = path.resolve(scopeDir);
|
|
262
316
|
}
|
|
317
|
+
// The watch target is the directory the mise file really lives in. In user
|
|
318
|
+
// scope that is <mise config>/conf.d, not the agentenv config directory
|
|
319
|
+
// (scopeDir), where a file with the same name is agentenv's own config.
|
|
320
|
+
let watchDir;
|
|
321
|
+
try {
|
|
322
|
+
watchDir = fs.realpathSync.native(path.dirname(resolvedPath));
|
|
323
|
+
}
|
|
324
|
+
catch {
|
|
325
|
+
watchDir = path.dirname(resolvedPath);
|
|
326
|
+
}
|
|
263
327
|
const watchedName = path.basename(resolvedPath);
|
|
264
328
|
let timeout = null;
|
|
265
329
|
try {
|
|
266
|
-
const watcher = fs.watch(
|
|
267
|
-
// A directory watch fires for every file in
|
|
330
|
+
const watcher = fs.watch(watchDir, (_eventType, filename) => {
|
|
331
|
+
// A directory watch fires for every file in watchDir; only react
|
|
268
332
|
// to mise.toml itself. When the platform can't report a filename,
|
|
269
333
|
// don't filter it out — better an extra check than a missed one.
|
|
270
334
|
if (filename && filename !== watchedName)
|
|
271
335
|
return;
|
|
336
|
+
if (isPaused())
|
|
337
|
+
return;
|
|
272
338
|
if (timeout)
|
|
273
339
|
clearTimeout(timeout);
|
|
274
340
|
timeout = setTimeout(async () => {
|
|
@@ -276,6 +342,8 @@ export function watchMiseToml(miseTomlPath, scopeDir, configPath, debounceMs = 1
|
|
|
276
342
|
// new one lands; nothing to do yet if it hasn't landed.
|
|
277
343
|
if (!fs.existsSync(resolvedPath))
|
|
278
344
|
return;
|
|
345
|
+
if (isPaused())
|
|
346
|
+
return;
|
|
279
347
|
console.log(`\nDetected change in ${resolvedPath}, running mise up...`);
|
|
280
348
|
let config;
|
|
281
349
|
try {
|
|
@@ -312,7 +380,96 @@ export function watchMiseToml(miseTomlPath, scopeDir, configPath, debounceMs = 1
|
|
|
312
380
|
return watcher;
|
|
313
381
|
}
|
|
314
382
|
catch (err) {
|
|
315
|
-
console.error(`Failed to watch ${
|
|
383
|
+
console.error(`Failed to watch ${watchDir}: ${err instanceof Error ? err.message : String(err)}`);
|
|
384
|
+
return undefined;
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
/**
|
|
388
|
+
* Watch agentenv.toml and, when it changes, re-apply the generated files and
|
|
389
|
+
* the tool install (`only: files, tools`). The agent wiring is deliberately
|
|
390
|
+
* left out: that writes to the user's home directory, and a file save is not a
|
|
391
|
+
* request to do that again. This is the file people actually edit; mise.toml is
|
|
392
|
+
* only ever written by apply.
|
|
393
|
+
*
|
|
394
|
+
* Watches the directory (editors save via atomic rename, which replaces the
|
|
395
|
+
* file's inode) and reads the config fresh on every trigger.
|
|
396
|
+
*/
|
|
397
|
+
export function watchAgentenvConfig(configPath, baseDir, options = {}) {
|
|
398
|
+
const debounceMs = options.debounceMs ?? 1000;
|
|
399
|
+
const settleMs = options.settleMs ?? 2000;
|
|
400
|
+
const apply = options.apply ?? applyConfiguration;
|
|
401
|
+
const resolvedConfig = path.resolve(configPath);
|
|
402
|
+
const watchedName = path.basename(resolvedConfig);
|
|
403
|
+
let watchDir;
|
|
404
|
+
try {
|
|
405
|
+
watchDir = fs.realpathSync.native(path.dirname(resolvedConfig));
|
|
406
|
+
}
|
|
407
|
+
catch {
|
|
408
|
+
watchDir = path.dirname(resolvedConfig);
|
|
409
|
+
}
|
|
410
|
+
let timeout = null;
|
|
411
|
+
let running = false;
|
|
412
|
+
try {
|
|
413
|
+
const watcher = fs.watch(watchDir, (_eventType, filename) => {
|
|
414
|
+
if (filename && filename !== watchedName)
|
|
415
|
+
return;
|
|
416
|
+
if (running)
|
|
417
|
+
return;
|
|
418
|
+
if (timeout)
|
|
419
|
+
clearTimeout(timeout);
|
|
420
|
+
timeout = setTimeout(async () => {
|
|
421
|
+
if (!fs.existsSync(resolvedConfig) || running)
|
|
422
|
+
return;
|
|
423
|
+
let config;
|
|
424
|
+
try {
|
|
425
|
+
config = loadConfig(resolvedConfig, { layerUserConfig: true });
|
|
426
|
+
}
|
|
427
|
+
catch (error) {
|
|
428
|
+
console.error(` Could not re-read ${resolvedConfig}: ${error instanceof Error ? error.message : String(error)}`);
|
|
429
|
+
return;
|
|
430
|
+
}
|
|
431
|
+
const report = validateConfig(config);
|
|
432
|
+
if (report.errors.length > 0) {
|
|
433
|
+
for (const error of report.errors)
|
|
434
|
+
console.error(` error: ${error}`);
|
|
435
|
+
console.error(' Configuration invalid; not re-applying.');
|
|
436
|
+
return;
|
|
437
|
+
}
|
|
438
|
+
running = true;
|
|
439
|
+
options.onBusy?.(true);
|
|
440
|
+
console.log(`\nDetected change in ${resolvedConfig}, re-applying files and tools...`);
|
|
441
|
+
try {
|
|
442
|
+
const result = await apply(config, baseDir, {
|
|
443
|
+
only: ['files', 'tools'],
|
|
444
|
+
skipPrereqMessage: true,
|
|
445
|
+
fileConfig: config.scope === 'project' ? loadConfig(resolvedConfig) : undefined,
|
|
446
|
+
});
|
|
447
|
+
for (const message of result.messages)
|
|
448
|
+
console.log(` ${message}`);
|
|
449
|
+
for (const error of result.errors)
|
|
450
|
+
console.error(` ${error}`);
|
|
451
|
+
if (!result.success)
|
|
452
|
+
console.error(' Re-apply failed; fix the errors above and save again.');
|
|
453
|
+
}
|
|
454
|
+
catch (error) {
|
|
455
|
+
console.error(` Re-apply failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
456
|
+
}
|
|
457
|
+
finally {
|
|
458
|
+
setTimeout(() => {
|
|
459
|
+
running = false;
|
|
460
|
+
options.onBusy?.(false);
|
|
461
|
+
}, settleMs);
|
|
462
|
+
}
|
|
463
|
+
}, debounceMs);
|
|
464
|
+
});
|
|
465
|
+
watcher.on('error', (err) => {
|
|
466
|
+
console.error(`Watch error: ${err instanceof Error ? err.message : String(err)}`);
|
|
467
|
+
});
|
|
468
|
+
process.on('SIGINT', () => watcher.close());
|
|
469
|
+
return { close: () => watcher.close() };
|
|
470
|
+
}
|
|
471
|
+
catch (err) {
|
|
472
|
+
console.error(`Failed to watch ${watchDir}: ${err instanceof Error ? err.message : String(err)}`);
|
|
316
473
|
return undefined;
|
|
317
474
|
}
|
|
318
475
|
}
|
|
@@ -322,7 +479,7 @@ export const updateCommand = new Command()
|
|
|
322
479
|
.option('--self', 'only update the mise binary itself')
|
|
323
480
|
.option('--tools', 'only upgrade mise-managed tools (pinned tools are skipped)')
|
|
324
481
|
.option('--scope <scope>', 'config scope to update: project|user (default: nearest config)')
|
|
325
|
-
.option('--watch', '
|
|
482
|
+
.option('--watch', 'keep running: re-apply files + tools when agentenv.toml changes, and run mise up when mise.toml is edited (optional)')
|
|
326
483
|
.option('--dry-run', 'print the update plan without changing anything')
|
|
327
484
|
.option('--check', 'alias for --dry-run')
|
|
328
485
|
.option('--json', 'emit a machine-readable JSON document on stdout (not with --watch)')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wizard.d.ts","sourceRoot":"","sources":["../../src/commands/wizard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAa,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAA+B,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE9E,OAAO,EAAkB,cAAc,EAAiB,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAU1C,OAAO,EACL,cAAc,EACd,eAAe,EAGhB,MAAM,sBAAsB,CAAC;AAI9B;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,OAAO,QAAQ,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,eAAe,CAAC;IACzC,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;IACvC,UAAU,CAAC,EAAE,OAAO,UAAU,CAAC;IAC/B,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;IACvC,qBAAqB,CAAC,EAAE,OAAO,qBAAqB,CAAC;IACrD,YAAY,CAAC,EAAE,OAAO,YAAY,CAAC;IACnC,8EAA8E;IAC9E,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC;IACtB,oEAAoE;IACpE,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CAC5B;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"wizard.d.ts","sourceRoot":"","sources":["../../src/commands/wizard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAa,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAA+B,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE9E,OAAO,EAAkB,cAAc,EAAiB,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAU1C,OAAO,EACL,cAAc,EACd,eAAe,EAGhB,MAAM,sBAAsB,CAAC;AAI9B;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,OAAO,QAAQ,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,eAAe,CAAC;IACzC,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;IACvC,UAAU,CAAC,EAAE,OAAO,UAAU,CAAC;IAC/B,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;IACvC,qBAAqB,CAAC,EAAE,OAAO,qBAAqB,CAAC;IACrD,YAAY,CAAC,EAAE,OAAO,YAAY,CAAC;IACnC,8EAA8E;IAC9E,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC;IACtB,oEAAoE;IACpE,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CAC5B;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAwR1E"}
|
package/dist/commands/wizard.js
CHANGED
|
@@ -55,6 +55,17 @@ export async function runConfigWizard(deps = {}) {
|
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
57
|
const hasExistingConfig = findConfigPathFn() !== undefined;
|
|
58
|
+
// The file itself, without the user layer: what a save may carry over from.
|
|
59
|
+
const foundConfig = findConfigPathFn();
|
|
60
|
+
let fileConfig;
|
|
61
|
+
if (foundConfig) {
|
|
62
|
+
try {
|
|
63
|
+
fileConfig = loadConfigFn(foundConfig);
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
fileConfig = undefined;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
58
69
|
const detected = detectInstalledAgentsFn();
|
|
59
70
|
// Step 1: Select agents (pre-checked = already enabled or detected; one page; no wrap).
|
|
60
71
|
console.log('Step 1/7: Select agents to configure');
|
|
@@ -80,7 +91,10 @@ export async function runConfigWizard(deps = {}) {
|
|
|
80
91
|
}));
|
|
81
92
|
// Step 3: Add custom binaries
|
|
82
93
|
console.log('\nStep 3/7: Add custom binaries');
|
|
83
|
-
const customTools = [];
|
|
94
|
+
const customTools = [...(fileConfig?.custom_tools ?? [])];
|
|
95
|
+
if (customTools.length > 0) {
|
|
96
|
+
console.log(` Keeping ${customTools.length} existing custom binar${customTools.length === 1 ? 'y' : 'ies'}`);
|
|
97
|
+
}
|
|
84
98
|
let addCustom = await confirmFn({ message: 'Add a custom binary?', default: false });
|
|
85
99
|
while (addCustom) {
|
|
86
100
|
const name = await inputFn({ message: 'Tool name (e.g. "my-tool"):' });
|
|
@@ -151,7 +165,6 @@ export async function runConfigWizard(deps = {}) {
|
|
|
151
165
|
console.log('\nStep 4/7: Choose configuration scope');
|
|
152
166
|
// Preselect: an explicit `setup --scope`, else the scope of the config that
|
|
153
167
|
// was found (so re-running on a user config doesn't default to project).
|
|
154
|
-
const foundConfig = findConfigPathFn();
|
|
155
168
|
const foundScope = foundConfig
|
|
156
169
|
? path.resolve(path.dirname(foundConfig)) === path.resolve(userConfigDir())
|
|
157
170
|
? 'user'
|
|
@@ -174,7 +187,7 @@ export async function runConfigWizard(deps = {}) {
|
|
|
174
187
|
// Step 6: Optional integrations
|
|
175
188
|
console.log('\nStep 6/7: Optional integrations');
|
|
176
189
|
const existingSuperpowers = existing.integrations?.superpowers;
|
|
177
|
-
console.log(` Superpowers (${DEFAULT_CONFIG.integrations?.superpowers?.source}
|
|
190
|
+
console.log(` Superpowers (${DEFAULT_CONFIG.integrations?.superpowers?.source}) — currently ${existingSuperpowers?.enabled ? 'enabled' : 'disabled'}`);
|
|
178
191
|
const wantsSuperpowers = await confirmFn({
|
|
179
192
|
message: 'Enable the optional Superpowers integration for Claude Code? (installs a third-party plugin via `claude plugin install`)',
|
|
180
193
|
default: existingSuperpowers?.enabled === true,
|
|
@@ -182,14 +195,10 @@ export async function runConfigWizard(deps = {}) {
|
|
|
182
195
|
let integrations = existing.integrations;
|
|
183
196
|
if (wantsSuperpowers) {
|
|
184
197
|
console.log('\n Superpowers — enabling this installs a third-party Claude Code plugin:');
|
|
185
|
-
console.log(
|
|
198
|
+
console.log(' - source: github:obra/superpowers, from the official Claude Code marketplace');
|
|
186
199
|
console.log(' - it can register a SessionStart hook in the Claude Code setup');
|
|
187
200
|
console.log(' - the optional visual companion can make external requests');
|
|
188
|
-
console.log(' The next prompts
|
|
189
|
-
const ref = await inputFn({
|
|
190
|
-
message: 'Superpowers ref to pin (tag/branch/commit):',
|
|
191
|
-
default: existingSuperpowers?.ref ?? DEFAULT_CONFIG.integrations?.superpowers?.ref ?? 'v6.3.0',
|
|
192
|
-
});
|
|
201
|
+
console.log(' The next prompts set the two permissions below.\n');
|
|
193
202
|
const allowHooks = await confirmFn({
|
|
194
203
|
message: 'Allow Superpowers to register its SessionStart hook for Claude Code?',
|
|
195
204
|
default: existingSuperpowers?.allow_hooks === true,
|
|
@@ -198,7 +207,7 @@ export async function runConfigWizard(deps = {}) {
|
|
|
198
207
|
message: 'Allow the optional Superpowers visual companion to make external requests?',
|
|
199
208
|
default: existingSuperpowers?.allow_external_requests === true,
|
|
200
209
|
});
|
|
201
|
-
console.log(` Review: source=github:obra/superpowers,
|
|
210
|
+
console.log(` Review: source=github:obra/superpowers, scope=${scope}, agents=claude_code, hooks=${allowHooks}, external_requests=${allowExternalRequests}`);
|
|
202
211
|
const confirmIntegration = await confirmFn({
|
|
203
212
|
message: 'Confirm enabling Superpowers with these settings?',
|
|
204
213
|
default: true,
|
|
@@ -208,7 +217,6 @@ export async function runConfigWizard(deps = {}) {
|
|
|
208
217
|
superpowers: {
|
|
209
218
|
enabled: true,
|
|
210
219
|
source: 'github:obra/superpowers',
|
|
211
|
-
ref,
|
|
212
220
|
scope,
|
|
213
221
|
agents: ['claude_code'],
|
|
214
222
|
allow_hooks: allowHooks,
|
|
@@ -229,6 +237,7 @@ export async function runConfigWizard(deps = {}) {
|
|
|
229
237
|
scope,
|
|
230
238
|
rtkEnabled,
|
|
231
239
|
integrations,
|
|
240
|
+
base: foundConfig && foundScope === scope ? fileConfig : undefined,
|
|
232
241
|
});
|
|
233
242
|
const diff = diffConfigs(existing, config);
|
|
234
243
|
console.log('\nConfiguration summary:');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wizard.js","sourceRoot":"","sources":["../../src/commands/wizard.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"wizard.js","sourceRoot":"","sources":["../../src/commands/wizard.ts"],"names":[],"mappings":"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"}
|
package/dist/config/schema.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE;QACL,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,IAAI,CAAC,EAAE,OAAO,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,WAAW;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}
|
package/dist/config/schema.js
CHANGED
|
@@ -89,7 +89,6 @@ export const DEFAULT_CONFIG = {
|
|
|
89
89
|
superpowers: {
|
|
90
90
|
enabled: false,
|
|
91
91
|
source: 'github:obra/superpowers',
|
|
92
|
-
ref: 'v6.3.0',
|
|
93
92
|
agents: ['claude_code', 'codex_cli', 'copilot', 'opencode'],
|
|
94
93
|
allow_hooks: false,
|
|
95
94
|
allow_external_requests: false,
|
|
@@ -446,8 +445,6 @@ export function configToToml(config) {
|
|
|
446
445
|
lines.push(`enabled = ${superpowers.enabled}`);
|
|
447
446
|
if (superpowers.source)
|
|
448
447
|
lines.push(`source = ${tomlString(superpowers.source)}`);
|
|
449
|
-
if (superpowers.ref)
|
|
450
|
-
lines.push(`ref = ${tomlString(superpowers.ref)}`);
|
|
451
448
|
if (superpowers.scope)
|
|
452
449
|
lines.push(`scope = ${tomlString(superpowers.scope)}`);
|
|
453
450
|
if (superpowers.agents)
|
|
@@ -457,6 +454,19 @@ export function configToToml(config) {
|
|
|
457
454
|
if (superpowers.allow_external_requests !== undefined)
|
|
458
455
|
lines.push(`allow_external_requests = ${superpowers.allow_external_requests}`);
|
|
459
456
|
}
|
|
457
|
+
// Advanced (reserved keys, but a save must not delete what the user wrote)
|
|
458
|
+
const advanced = config.advanced;
|
|
459
|
+
if (advanced) {
|
|
460
|
+
const entries = [];
|
|
461
|
+
if (advanced.default_mode !== undefined) {
|
|
462
|
+
entries.push(`default_mode = ${tomlString(advanced.default_mode)}`);
|
|
463
|
+
}
|
|
464
|
+
if (advanced.show_diff_preview !== undefined) {
|
|
465
|
+
entries.push(`show_diff_preview = ${advanced.show_diff_preview}`);
|
|
466
|
+
}
|
|
467
|
+
if (entries.length > 0)
|
|
468
|
+
lines.push('\n[advanced]', ...entries);
|
|
469
|
+
}
|
|
460
470
|
return lines.join('\n');
|
|
461
471
|
}
|
|
462
472
|
function tomlString(value) {
|
|
@@ -521,6 +531,10 @@ function mergeWithDefaults(config, base = DEFAULT_CONFIG) {
|
|
|
521
531
|
// be silently dropped here the way a hand-maintained per-key list would)
|
|
522
532
|
if (config.tools) {
|
|
523
533
|
result.tools = Object.fromEntries(TOOL_KEYS.map((key) => [key, config.tools?.[key] ?? base.tools?.[key]]));
|
|
534
|
+
// Keep a key that isn't a catalog tool (a typo like `rpgrep`): dropping it
|
|
535
|
+
// here meant validateConfig's "Unknown tool" error could never fire and the
|
|
536
|
+
// tool was silently ignored. `[agents]` already behaves this way.
|
|
537
|
+
copyUnknownKeys(config.tools, result.tools, TOOL_KEYS);
|
|
524
538
|
}
|
|
525
539
|
// Merge custom_tools
|
|
526
540
|
if (config.custom_tools) {
|
|
@@ -578,7 +592,6 @@ function mergeWithDefaults(config, base = DEFAULT_CONFIG) {
|
|
|
578
592
|
? {
|
|
579
593
|
enabled: config.integrations.superpowers.enabled ?? base.integrations?.superpowers?.enabled,
|
|
580
594
|
source: config.integrations.superpowers.source ?? base.integrations?.superpowers?.source,
|
|
581
|
-
ref: config.integrations.superpowers.ref ?? base.integrations?.superpowers?.ref,
|
|
582
595
|
scope: config.integrations.superpowers.scope ?? base.integrations?.superpowers?.scope,
|
|
583
596
|
agents: config.integrations.superpowers.agents ?? base.integrations?.superpowers?.agents,
|
|
584
597
|
allow_hooks: config.integrations.superpowers.allow_hooks ??
|
|
@@ -590,7 +603,7 @@ function mergeWithDefaults(config, base = DEFAULT_CONFIG) {
|
|
|
590
603
|
};
|
|
591
604
|
copyUnknownKeys(config.integrations, result.integrations, ['superpowers']);
|
|
592
605
|
if (config.integrations.superpowers && result.integrations.superpowers) {
|
|
593
|
-
copyUnknownKeys(config.integrations.superpowers, result.integrations.superpowers, ['enabled', 'source', '
|
|
606
|
+
copyUnknownKeys(config.integrations.superpowers, result.integrations.superpowers, ['enabled', 'source', 'scope', 'agents', 'allow_hooks', 'allow_external_requests']);
|
|
594
607
|
}
|
|
595
608
|
}
|
|
596
609
|
// Merge advanced
|
|
@@ -689,6 +702,11 @@ function didYouMean(key, known) {
|
|
|
689
702
|
? best
|
|
690
703
|
: undefined;
|
|
691
704
|
}
|
|
705
|
+
/** ` (did you mean "x"?)` when `key` is close to a known name, else nothing. */
|
|
706
|
+
function suggestionSuffix(key, known) {
|
|
707
|
+
const suggestion = didYouMean(key, known);
|
|
708
|
+
return suggestion === undefined ? '' : ` (did you mean "${suggestion}"?)`;
|
|
709
|
+
}
|
|
692
710
|
/** Warn (with a did-you-mean suggestion where one is close) for any key of `obj` not in `known`. */
|
|
693
711
|
function warnUnknownKeys(obj, known, keyPrefix, warnings) {
|
|
694
712
|
if (!obj)
|
|
@@ -724,13 +742,13 @@ export function validateConfig(config) {
|
|
|
724
742
|
const agents = config.agents ?? {};
|
|
725
743
|
for (const key of Object.keys(agents)) {
|
|
726
744
|
if (!AGENT_KEYS.includes(key)) {
|
|
727
|
-
errors.push(`Unknown agent "${key}"`);
|
|
745
|
+
errors.push(`Unknown agent "${key}"${suggestionSuffix(key, AGENT_KEYS)}`);
|
|
728
746
|
}
|
|
729
747
|
}
|
|
730
748
|
const tools = (config.tools ?? {});
|
|
731
749
|
for (const key of Object.keys(tools)) {
|
|
732
750
|
if (!TOOL_KEYS.includes(key)) {
|
|
733
|
-
errors.push(`Unknown tool "${key}"`);
|
|
751
|
+
errors.push(`Unknown tool "${key}"${suggestionSuffix(key, TOOL_KEYS)}`);
|
|
734
752
|
}
|
|
735
753
|
}
|
|
736
754
|
for (const [key, value] of Object.entries(agents)) {
|
|
@@ -823,16 +841,11 @@ export function validateConfig(config) {
|
|
|
823
841
|
if (superpowers.source !== undefined && superpowers.source.trim() === '') {
|
|
824
842
|
errors.push('integrations.superpowers.source must not be empty');
|
|
825
843
|
}
|
|
826
|
-
|
|
827
|
-
|
|
828
|
-
|
|
829
|
-
|
|
830
|
-
|
|
831
|
-
errors.push(`integrations.superpowers.ref "${superpowers.ref}" contains characters that are not valid in a git ref`);
|
|
832
|
-
}
|
|
833
|
-
else if (['main', 'master', 'HEAD'].includes(superpowers.ref)) {
|
|
834
|
-
warnings.push(`integrations.superpowers.ref "${superpowers.ref}" is a floating branch; pin to a tag or commit for reproducibility`);
|
|
835
|
-
}
|
|
844
|
+
// `ref` used to pin the plugin version, but the official marketplace it is
|
|
845
|
+
// installed from cannot pin one, so the key does nothing. Older configs
|
|
846
|
+
// still carry it: say so instead of silently ignoring or rejecting it.
|
|
847
|
+
if ('ref' in superpowers) {
|
|
848
|
+
warnings.push('integrations.superpowers.ref is no longer used (the official marketplace cannot pin a version) and is ignored; remove it from agentenv.toml');
|
|
836
849
|
}
|
|
837
850
|
}
|
|
838
851
|
const generate = config.generate ?? DEFAULT_CONFIG.generate;
|
|
@@ -951,11 +964,6 @@ export function diffConfigs(oldConfig, newConfig) {
|
|
|
951
964
|
oldConfig.integrations?.superpowers?.source,
|
|
952
965
|
newConfig.integrations?.superpowers?.source,
|
|
953
966
|
],
|
|
954
|
-
[
|
|
955
|
-
'integrations.superpowers.ref',
|
|
956
|
-
oldConfig.integrations?.superpowers?.ref,
|
|
957
|
-
newConfig.integrations?.superpowers?.ref,
|
|
958
|
-
],
|
|
959
967
|
[
|
|
960
968
|
'integrations.superpowers.scope',
|
|
961
969
|
oldConfig.integrations?.superpowers?.scope,
|