@indy2kro/agentenv 1.1.1 → 1.1.3
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 +1 -1
- package/dist/adapters/claude.d.ts +0 -4
- package/dist/adapters/claude.d.ts.map +1 -1
- package/dist/adapters/claude.js +5 -36
- package/dist/adapters/claude.js.map +1 -1
- package/dist/adapters/codex.d.ts.map +1 -1
- package/dist/adapters/codex.js +3 -8
- package/dist/adapters/codex.js.map +1 -1
- package/dist/adapters/copilot.d.ts.map +1 -1
- package/dist/adapters/copilot.js +3 -8
- package/dist/adapters/copilot.js.map +1 -1
- package/dist/adapters/detect.d.ts +8 -0
- package/dist/adapters/detect.d.ts.map +1 -1
- package/dist/adapters/detect.js +26 -7
- package/dist/adapters/detect.js.map +1 -1
- package/dist/adapters/opencode.d.ts.map +1 -1
- package/dist/adapters/opencode.js +3 -8
- package/dist/adapters/opencode.js.map +1 -1
- package/dist/adapters/rtk-delegation.d.ts +5 -2
- package/dist/adapters/rtk-delegation.d.ts.map +1 -1
- package/dist/adapters/rtk-delegation.js +48 -8
- package/dist/adapters/rtk-delegation.js.map +1 -1
- package/dist/adapters/vibe.d.ts.map +1 -1
- package/dist/adapters/vibe.js +2 -1
- package/dist/adapters/vibe.js.map +1 -1
- package/dist/adapters/windsurf.d.ts.map +1 -1
- package/dist/adapters/windsurf.js +2 -1
- package/dist/adapters/windsurf.js.map +1 -1
- package/dist/cli/json.d.ts +22 -0
- package/dist/cli/json.d.ts.map +1 -0
- package/dist/cli/json.js +17 -0
- package/dist/cli/json.js.map +1 -0
- package/dist/commands/apply.d.ts +5 -0
- package/dist/commands/apply.d.ts.map +1 -1
- package/dist/commands/apply.js +52 -15
- package/dist/commands/apply.js.map +1 -1
- package/dist/commands/completion.d.ts +4 -0
- package/dist/commands/completion.d.ts.map +1 -1
- package/dist/commands/completion.js +46 -5
- package/dist/commands/completion.js.map +1 -1
- package/dist/commands/config-edit.d.ts +0 -6
- package/dist/commands/config-edit.d.ts.map +1 -1
- package/dist/commands/config-edit.js +15 -9
- package/dist/commands/config-edit.js.map +1 -1
- package/dist/commands/setup.d.ts +15 -2
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +90 -31
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/status.d.ts +3 -0
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +36 -14
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/uninstall.d.ts +7 -2
- package/dist/commands/uninstall.d.ts.map +1 -1
- package/dist/commands/uninstall.js +38 -13
- package/dist/commands/uninstall.js.map +1 -1
- package/dist/commands/update.d.ts.map +1 -1
- package/dist/commands/update.js +5 -4
- package/dist/commands/update.js.map +1 -1
- package/dist/commands/wizard.d.ts +2 -0
- package/dist/commands/wizard.d.ts.map +1 -1
- package/dist/commands/wizard.js +14 -2
- package/dist/commands/wizard.js.map +1 -1
- package/dist/config/schema.d.ts +3 -2
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +21 -6
- package/dist/config/schema.js.map +1 -1
- package/dist/config/scopes.d.ts +6 -0
- package/dist/config/scopes.d.ts.map +1 -1
- package/dist/config/scopes.js +8 -0
- package/dist/config/scopes.js.map +1 -1
- package/dist/generate/agentsmd.d.ts +9 -3
- package/dist/generate/agentsmd.d.ts.map +1 -1
- package/dist/generate/agentsmd.js +59 -15
- package/dist/generate/agentsmd.js.map +1 -1
- package/dist/integrations/superpowers.d.ts.map +1 -1
- package/dist/integrations/superpowers.js +15 -3
- package/dist/integrations/superpowers.js.map +1 -1
- package/dist/shell/detector.d.ts.map +1 -1
- package/dist/shell/detector.js +9 -0
- package/dist/shell/detector.js.map +1 -1
- package/dist/shell/shell-fix-state.d.ts +1 -1
- package/dist/shell/shell-fix-state.d.ts.map +1 -1
- package/dist/shell/shell-fix-state.js +3 -2
- package/dist/shell/shell-fix-state.js.map +1 -1
- package/dist/toolchain/mise.d.ts +15 -0
- package/dist/toolchain/mise.d.ts.map +1 -1
- package/dist/toolchain/mise.js +56 -4
- package/dist/toolchain/mise.js.map +1 -1
- package/dist/toolchain/rtk.d.ts.map +1 -1
- package/dist/toolchain/rtk.js +2 -0
- package/dist/toolchain/rtk.js.map +1 -1
- package/dist/ui/report.d.ts +13 -2
- package/dist/ui/report.d.ts.map +1 -1
- package/dist/ui/report.js +24 -4
- package/dist/ui/report.js.map +1 -1
- package/dist/utils/fs-retry.d.ts +11 -1
- package/dist/utils/fs-retry.d.ts.map +1 -1
- package/dist/utils/fs-retry.js +43 -4
- package/dist/utils/fs-retry.js.map +1 -1
- package/package.json +9 -8
package/dist/commands/apply.d.ts
CHANGED
|
@@ -3,12 +3,15 @@ import type { AgentenvConfig } from '../config/schema.js';
|
|
|
3
3
|
import type { SuperpowersAdapterDeps } from '../integrations/index.js';
|
|
4
4
|
import type { GeneratedFile } from '../generate/agentsmd.js';
|
|
5
5
|
import type { RtkInitFn } from '../toolchain/rtk.js';
|
|
6
|
+
import type { TimelineEntry } from '../ui/report.js';
|
|
6
7
|
export interface ApplyResult {
|
|
7
8
|
success: boolean;
|
|
8
9
|
messages: string[];
|
|
9
10
|
errors: string[];
|
|
10
11
|
/** Wall-clock milliseconds the apply took, for the end-of-run timing line. */
|
|
11
12
|
elapsedMs?: number;
|
|
13
|
+
/** Messages and errors in the order the steps produced them (for human output). */
|
|
14
|
+
timeline?: TimelineEntry[];
|
|
12
15
|
}
|
|
13
16
|
export interface ApplyJsonResult {
|
|
14
17
|
success: boolean;
|
|
@@ -82,6 +85,8 @@ export interface ApplyOptions {
|
|
|
82
85
|
* flag). Takes precedence over the config file when set.
|
|
83
86
|
*/
|
|
84
87
|
tier0Mode?: 'auto' | 'always' | 'never';
|
|
88
|
+
/** Add the mise shims dir to the Windows user PATH (`apply --fix-path`). */
|
|
89
|
+
fixPath?: boolean;
|
|
85
90
|
/** Injectable Superpowers adapter dependencies (tests pass a claude stub). */
|
|
86
91
|
superpowersDeps?: SuperpowersAdapterDeps;
|
|
87
92
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/commands/apply.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/commands/apply.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/apply.js
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
|
+
import { printJson } from '../cli/json.js';
|
|
1
2
|
import { Command } from 'commander';
|
|
2
3
|
import * as fs from 'fs';
|
|
3
4
|
import { ClaudeCodeAdapter, CodexCliAdapter, CopilotAdapter, OpenCodeAdapter, GeminiCliAdapter, CursorAdapter, WindsurfAdapter, ClineAdapter, VibeAdapter, } from '../adapters/index.js';
|
|
4
5
|
import { getEnabledAgents, loadConfig, validateConfig } from '../config/schema.js';
|
|
5
|
-
import { configFilePath, findConfigPath, parseScopeFlag,
|
|
6
|
+
import { configFilePath, findConfigPath, parseScopeFlag, baseDirForConfig, } from '../config/scopes.js';
|
|
6
7
|
import { SuperpowersAdapter, integrationResultLines } from '../integrations/index.js';
|
|
7
8
|
import { generateAgentsMd, generateInstructionFiles, planMarkerUpdate, updateWithMarkers, } from '../generate/agentsmd.js';
|
|
8
9
|
import { checkAgentShellConfiguration, detectShell, fixShellConfiguration, } from '../shell/detector.js';
|
|
9
10
|
import { shellFixStatePath } from '../shell/shell-fix-state.js';
|
|
10
11
|
import { isUnsupportedRtkAgentError } from '../toolchain/rtk.js';
|
|
11
|
-
import { ensureGlobalShimsDir, eulaPreflightHint, generateMiseToml, isMiseInstalled, miseActivationHint, miseInstallInstructions, miseInstallOutcome, platformUnsupportedHint, prereqMessage, runMiseInstall, saveMiseToml, toolAvailabilityLine, trustMiseToml, verifyHintNeeded, verifySummaryLine, verifyToolAvailability, miseTomlPathFor, removeLegacyUserMiseToml, } from '../toolchain/mise.js';
|
|
12
|
+
import { ensureDirOnWindowsUserPath, ensureGlobalShimsDir, eulaPreflightHint, shimsDir, generateMiseToml, isMiseInstalled, miseActivationHint, miseInstallInstructions, miseInstallOutcome, platformUnsupportedHint, prereqMessage, runMiseInstall, saveMiseToml, toolAvailabilityLine, trustMiseToml, verifyHintNeeded, verifySummaryLine, verifyToolAvailability, miseTomlPathFor, removeLegacyUserMiseToml, } from '../toolchain/mise.js';
|
|
12
13
|
import { normalizeOutput } from '../utils/output.js';
|
|
13
14
|
import { colorizeLine, theme } from '../ui/theme.js';
|
|
14
15
|
import { renderLogo, setQuietEnabled } from '../ui/output.js';
|
|
@@ -152,8 +153,18 @@ export function userScopeInstructionFiles(config, baseDir, options) {
|
|
|
152
153
|
/** Apply a validated configuration and return structured results for the CLI. */
|
|
153
154
|
export async function applyConfiguration(config, baseDir, options = {}) {
|
|
154
155
|
const startedAt = Date.now();
|
|
155
|
-
const
|
|
156
|
-
const
|
|
156
|
+
const timeline = [];
|
|
157
|
+
const track = (list, kind) => {
|
|
158
|
+
const push = list.push.bind(list);
|
|
159
|
+
list.push = (...items) => {
|
|
160
|
+
for (const text of items)
|
|
161
|
+
timeline.push({ kind, text });
|
|
162
|
+
return push(...items);
|
|
163
|
+
};
|
|
164
|
+
return list;
|
|
165
|
+
};
|
|
166
|
+
const messages = track([], 'message');
|
|
167
|
+
const errors = track([], 'error');
|
|
157
168
|
// Step 0 — self-diagnose the prerequisite before touching anything, so a
|
|
158
169
|
// missing mise fails loudly with install instructions instead of half
|
|
159
170
|
// configuring the project.
|
|
@@ -162,7 +173,7 @@ export async function applyConfiguration(config, baseDir, options = {}) {
|
|
|
162
173
|
errors.push('Prerequisite check failed: mise is not installed.');
|
|
163
174
|
errors.push("agentenv uses mise to install and manage this project's tools.");
|
|
164
175
|
errors.push(...miseInstallInstructions());
|
|
165
|
-
return { success: false, messages, errors, elapsedMs: Date.now() - startedAt };
|
|
176
|
+
return { success: false, messages, errors, elapsedMs: Date.now() - startedAt, timeline };
|
|
166
177
|
}
|
|
167
178
|
if (!options.skipPrereqMessage) {
|
|
168
179
|
messages.push(prereqMessage());
|
|
@@ -210,6 +221,10 @@ export async function applyConfiguration(config, baseDir, options = {}) {
|
|
|
210
221
|
if (shouldRunMiseInstall(miseTomlWritten, options.skipMiseInstall === true)) {
|
|
211
222
|
const shims = ensureGlobalShimsDir(shellFixStatePath());
|
|
212
223
|
(shims.success ? messages : errors).push(shims.message);
|
|
224
|
+
if (options.fixPath) {
|
|
225
|
+
const fixed = ensureDirOnWindowsUserPath(shimsDir());
|
|
226
|
+
(fixed.success ? messages : errors).push(fixed.message);
|
|
227
|
+
}
|
|
213
228
|
const trust = trustMiseToml(misePath, baseDir);
|
|
214
229
|
(trust.success ? messages : errors).push(trust.message);
|
|
215
230
|
const eulaAhead = eulaPreflightHint(config);
|
|
@@ -227,7 +242,7 @@ export async function applyConfiguration(config, baseDir, options = {}) {
|
|
|
227
242
|
const installDetail = normalizeOutput(install.stderr || install.stdout).trim();
|
|
228
243
|
errors.push(`mise install failed${install.exitCode === null ? '' : ` (exit ${install.exitCode})`}: ${installDetail}${install.eulaHint ? ` ${install.eulaHint}` : ''}`);
|
|
229
244
|
}
|
|
230
|
-
if (
|
|
245
|
+
if (install.success) {
|
|
231
246
|
const availability = verifyToolAvailability(config, {
|
|
232
247
|
cwd: baseDir,
|
|
233
248
|
miseTomlPath: misePath,
|
|
@@ -278,7 +293,13 @@ export async function applyConfiguration(config, baseDir, options = {}) {
|
|
|
278
293
|
for (const error of result.errors)
|
|
279
294
|
errors.push(`Superpowers: ${error}`);
|
|
280
295
|
}
|
|
281
|
-
return {
|
|
296
|
+
return {
|
|
297
|
+
success: errors.length === 0,
|
|
298
|
+
messages,
|
|
299
|
+
errors,
|
|
300
|
+
elapsedMs: Date.now() - startedAt,
|
|
301
|
+
timeline,
|
|
302
|
+
};
|
|
282
303
|
}
|
|
283
304
|
export const applyCommand = new Command()
|
|
284
305
|
.name('apply')
|
|
@@ -287,6 +308,7 @@ export const applyCommand = new Command()
|
|
|
287
308
|
.option('--dry-run', 'show what would be written without changing anything')
|
|
288
309
|
.option('--shell-fix <mode>', 'Tier 0 Windows shell fix: auto (default; only writes files with a TTY) | always (write even without a TTY — for an agent running apply) | never')
|
|
289
310
|
.option('--scope <scope>', 'config scope to apply: project|user (default: nearest config)')
|
|
311
|
+
.option('--fix-path', 'Windows: add the mise shims directory to your user PATH (opt-in)')
|
|
290
312
|
.option('--json', 'emit a machine-readable JSON document on stdout')
|
|
291
313
|
.action(async (options, command) => {
|
|
292
314
|
const startedAt = Date.now();
|
|
@@ -311,8 +333,15 @@ export const applyCommand = new Command()
|
|
|
311
333
|
}
|
|
312
334
|
}
|
|
313
335
|
/** Emit a single-error JSON failure document (json mode's equivalent of a themed console.error). */
|
|
314
|
-
const jsonFail = (error) => {
|
|
315
|
-
|
|
336
|
+
const jsonFail = (error, configPath = null) => {
|
|
337
|
+
printJson({
|
|
338
|
+
success: false,
|
|
339
|
+
configPath,
|
|
340
|
+
baseDir: null,
|
|
341
|
+
messages: [],
|
|
342
|
+
errors: [error],
|
|
343
|
+
warnings: [],
|
|
344
|
+
});
|
|
316
345
|
};
|
|
317
346
|
let config;
|
|
318
347
|
let configPath;
|
|
@@ -346,7 +375,7 @@ export const applyCommand = new Command()
|
|
|
346
375
|
catch (error) {
|
|
347
376
|
const message = error instanceof Error ? error.message : String(error);
|
|
348
377
|
if (json)
|
|
349
|
-
jsonFail(message);
|
|
378
|
+
jsonFail(message, configPath);
|
|
350
379
|
else
|
|
351
380
|
console.error(theme.fail(message));
|
|
352
381
|
process.exitCode = 1;
|
|
@@ -357,7 +386,14 @@ export const applyCommand = new Command()
|
|
|
357
386
|
const report = validateConfig(config);
|
|
358
387
|
if (report.errors.length > 0) {
|
|
359
388
|
if (json) {
|
|
360
|
-
|
|
389
|
+
printJson({
|
|
390
|
+
success: false,
|
|
391
|
+
configPath,
|
|
392
|
+
baseDir: null,
|
|
393
|
+
messages: [],
|
|
394
|
+
errors: report.errors,
|
|
395
|
+
warnings: report.warnings,
|
|
396
|
+
});
|
|
361
397
|
}
|
|
362
398
|
else {
|
|
363
399
|
reportValidation(report, 'Configuration invalid — not applying.');
|
|
@@ -367,7 +403,7 @@ export const applyCommand = new Command()
|
|
|
367
403
|
}
|
|
368
404
|
if (!json)
|
|
369
405
|
reportValidation(report, 'Configuration invalid — not applying.');
|
|
370
|
-
const baseDir =
|
|
406
|
+
const baseDir = baseDirForConfig(configPath, config.scope);
|
|
371
407
|
if (dryRun) {
|
|
372
408
|
const files = [
|
|
373
409
|
...generateInstructionFiles(config, baseDir),
|
|
@@ -378,7 +414,7 @@ export const applyCommand = new Command()
|
|
|
378
414
|
const plan = buildApplyDryRunPlan(config, baseDir, configPath, files, agents, integrations);
|
|
379
415
|
if (json) {
|
|
380
416
|
const payload = { success: true, dryRun: true, ...plan };
|
|
381
|
-
|
|
417
|
+
printJson(payload);
|
|
382
418
|
return;
|
|
383
419
|
}
|
|
384
420
|
console.log(` Tools: ${plan.misePlan.enabledToolCount} enabled -> ${plan.misePlan.miseTomlPath} [${plan.misePlan.status}]`);
|
|
@@ -405,6 +441,7 @@ export const applyCommand = new Command()
|
|
|
405
441
|
const result = await withSpinner('Applying configuration...', (spinner) => applyConfiguration(config, baseDir, {
|
|
406
442
|
skipMiseInstall: options.skipMiseInstall === true,
|
|
407
443
|
tier0Mode,
|
|
444
|
+
fixPath: options.fixPath === true,
|
|
408
445
|
// Streamed mise install progress is human-only chrome — it would
|
|
409
446
|
// otherwise interleave raw text into the JSON document.
|
|
410
447
|
onMiseInstall: json
|
|
@@ -419,12 +456,12 @@ export const applyCommand = new Command()
|
|
|
419
456
|
},
|
|
420
457
|
}));
|
|
421
458
|
if (json) {
|
|
422
|
-
|
|
459
|
+
printJson(buildApplyJsonResult(result, { configPath, baseDir, warnings: report.warnings }));
|
|
423
460
|
if (!result.success)
|
|
424
461
|
process.exitCode = 1;
|
|
425
462
|
return;
|
|
426
463
|
}
|
|
427
|
-
printMessages(result.messages, result.errors);
|
|
464
|
+
printMessages(result.messages, result.errors, result.timeline);
|
|
428
465
|
if (!result.success) {
|
|
429
466
|
process.exitCode = 1;
|
|
430
467
|
printResult('fail', 'Apply failed', 'fix the errors above and re-run `agentenv apply`', result.elapsedMs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/commands/apply.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/commands/apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,11 +14,15 @@ export interface CompletionCommandModel {
|
|
|
14
14
|
description: string;
|
|
15
15
|
/** Command flags plus the program-level globals (always suggested). */
|
|
16
16
|
flags: string[];
|
|
17
|
+
/** Positional argument values worth suggesting (tool/agent keys for add/remove/uninstall). */
|
|
18
|
+
positionals: string[];
|
|
17
19
|
}
|
|
18
20
|
export interface CompletionModel {
|
|
19
21
|
program: string;
|
|
20
22
|
globalFlags: string[];
|
|
21
23
|
commands: CompletionCommandModel[];
|
|
24
|
+
/** Fixed value sets for flags that take one (e.g. `--scope` → project, user). */
|
|
25
|
+
flagValues: Record<string, string[]>;
|
|
22
26
|
}
|
|
23
27
|
export declare function buildCompletionModel(root: Command): CompletionModel;
|
|
24
28
|
export declare function generateBash(model: CompletionModel): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAY,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAY,OAAO,EAAE,MAAM,WAAW,CAAC;AAG9C,eAAO,MAAM,iBAAiB,gDAAiD,CAAC;AAChF,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAKjE,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,uEAAuE;IACvE,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,8FAA8F;IAC9F,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,sBAAsB,EAAE,CAAC;IACnC,iFAAiF;IACjF,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACtC;AA4BD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,eAAe,CAUnE;AAMD,wBAAgB,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,CAyC3D;AAMD,wBAAgB,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,CAoD1D;AAeD,wBAAgB,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,CA8B3D;AAMD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,CAiDjE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,eAAe,GAAG,MAAM,CAWzF;AAED,eAAO,MAAM,iBAAiB,SAU1B,CAAC"}
|
|
@@ -6,9 +6,21 @@
|
|
|
6
6
|
* asserts the generated scripts cover every registered command and flag.
|
|
7
7
|
*/
|
|
8
8
|
import { Argument, Command } from 'commander';
|
|
9
|
+
import { AGENT_KEYS, TOOL_KEYS } from '../config/schema.js';
|
|
9
10
|
export const COMPLETION_SHELLS = ['bash', 'zsh', 'fish', 'powershell'];
|
|
10
11
|
/** Flags every command accepts, whether or not Commander lists them locally. */
|
|
11
12
|
const HELP_FLAGS = ['-h', '--help', '-V', '--version'];
|
|
13
|
+
/** Fixed flag values; kept next to the model so the scripts and tests share one source. */
|
|
14
|
+
const FLAG_VALUES = {
|
|
15
|
+
'--scope': ['project', 'user'],
|
|
16
|
+
'--shell-fix': ['auto', 'always', 'never'],
|
|
17
|
+
};
|
|
18
|
+
/** Positional values per command, drawn from the config's own key lists. */
|
|
19
|
+
const POSITIONAL_VALUES = {
|
|
20
|
+
add: [...AGENT_KEYS, ...TOOL_KEYS],
|
|
21
|
+
remove: [...AGENT_KEYS, ...TOOL_KEYS],
|
|
22
|
+
uninstall: [...TOOL_KEYS],
|
|
23
|
+
};
|
|
12
24
|
function optionWords(options) {
|
|
13
25
|
const words = [];
|
|
14
26
|
for (const option of options) {
|
|
@@ -29,15 +41,19 @@ export function buildCompletionModel(root) {
|
|
|
29
41
|
aliases: command.aliases(),
|
|
30
42
|
description: oneLine(command.description()),
|
|
31
43
|
flags: [...new Set([...optionWords(command.options), ...globalFlags])],
|
|
44
|
+
positionals: POSITIONAL_VALUES[command.name()] ?? [],
|
|
32
45
|
}));
|
|
33
|
-
return { program: root.name(), globalFlags, commands };
|
|
46
|
+
return { program: root.name(), globalFlags, commands, flagValues: FLAG_VALUES };
|
|
34
47
|
}
|
|
35
48
|
function commandWords(model) {
|
|
36
49
|
return model.commands.flatMap((command) => [command.name, ...command.aliases]);
|
|
37
50
|
}
|
|
38
51
|
export function generateBash(model) {
|
|
39
52
|
const cases = model.commands
|
|
40
|
-
.flatMap((command) => [command.name, ...command.aliases].map((name) => ` ${name}) flags="${command.flags.join(' ')}" ;;`))
|
|
53
|
+
.flatMap((command) => [command.name, ...command.aliases].map((name) => ` ${name}) flags="${[...command.flags, ...command.positionals].join(' ')}" ;;`))
|
|
54
|
+
.join('\n');
|
|
55
|
+
const valueCases = Object.entries(model.flagValues)
|
|
56
|
+
.map(([flag, values]) => ` ${flag}) COMPREPLY=( $(compgen -W "${values.join(' ')}" -- "\${cur}") ); return 0 ;;`)
|
|
41
57
|
.join('\n');
|
|
42
58
|
return `#!/usr/bin/env bash
|
|
43
59
|
# Bash completion for ${model.program}. Load with: source <(${model.program} completion bash)
|
|
@@ -50,6 +66,9 @@ _${model.program}_completions() {
|
|
|
50
66
|
COMPREPLY=( $(compgen -W "${COMPLETION_SHELLS.join(' ')}" -- "\${cur}") )
|
|
51
67
|
return 0
|
|
52
68
|
fi
|
|
69
|
+
case "\${prev}" in
|
|
70
|
+
${valueCases}
|
|
71
|
+
esac
|
|
53
72
|
if [ "\${COMP_CWORD}" -eq 1 ]; then
|
|
54
73
|
COMPREPLY=( $(compgen -W "${commandWords(model).join(' ')} ${model.globalFlags.join(' ')}" -- "\${cur}") )
|
|
55
74
|
return 0
|
|
@@ -73,7 +92,10 @@ export function generateZsh(model) {
|
|
|
73
92
|
.join('\n');
|
|
74
93
|
const shellEntries = COMPLETION_SHELLS.map((shell) => ` '${zshEscape(`${shell}:${shell}`)}'`).join('\n');
|
|
75
94
|
const cases = model.commands
|
|
76
|
-
.flatMap((command) => [command.name, ...command.aliases].map((name) => ` ${name}) flags=(${command.flags.join(' ')}) ;;`))
|
|
95
|
+
.flatMap((command) => [command.name, ...command.aliases].map((name) => ` ${name}) flags=(${[...command.flags, ...command.positionals].join(' ')}) ;;`))
|
|
96
|
+
.join('\n');
|
|
97
|
+
const valueCases = Object.entries(model.flagValues)
|
|
98
|
+
.map(([flag, values]) => ` ${flag}) compadd -- ${values.join(' ')}; return ;;`)
|
|
77
99
|
.join('\n');
|
|
78
100
|
return `#compdef ${model.program}
|
|
79
101
|
# Zsh completion for ${model.program}. Load with: source <(${model.program} completion zsh)
|
|
@@ -94,6 +116,9 @@ ${shellEntries}
|
|
|
94
116
|
_describe -t shells '${model.program} completion shell' shells
|
|
95
117
|
return
|
|
96
118
|
fi
|
|
119
|
+
case "\${words[CURRENT-1]}" in
|
|
120
|
+
${valueCases}
|
|
121
|
+
esac
|
|
97
122
|
local -a flags
|
|
98
123
|
case "\${words[2]}" in
|
|
99
124
|
${cases}
|
|
@@ -131,6 +156,12 @@ export function generateFish(model) {
|
|
|
131
156
|
for (const command of model.commands) {
|
|
132
157
|
const seen = [command.name, ...command.aliases].join(' ');
|
|
133
158
|
lines.push(`complete -c ${model.program} -n '__fish_seen_subcommand_from ${seen}' ${fishWordFlags(command.flags)}`);
|
|
159
|
+
if (command.positionals.length > 0) {
|
|
160
|
+
lines.push(`complete -c ${model.program} -n '__fish_seen_subcommand_from ${seen}' -a '${command.positionals.join(' ')}'`);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
for (const [flag, values] of Object.entries(model.flagValues)) {
|
|
164
|
+
lines.push(`complete -c ${model.program} -l ${flag.slice(2)} -x -a '${values.join(' ')}'`);
|
|
134
165
|
}
|
|
135
166
|
return `${lines.join('\n')}\n`;
|
|
136
167
|
}
|
|
@@ -145,7 +176,10 @@ export function generatePowerShell(model) {
|
|
|
145
176
|
const shellNames = COMPLETION_SHELLS.map((shell) => `'${shell}'`).join(', ');
|
|
146
177
|
const global = model.globalFlags.map((flag) => `'${flag}'`).join(', ');
|
|
147
178
|
const cases = model.commands
|
|
148
|
-
.flatMap((command) => [command.name, ...command.aliases].map((name) => ` '${name}' = @(${command.flags.map((flag) => `'${flag}'`).join(', ')})`))
|
|
179
|
+
.flatMap((command) => [command.name, ...command.aliases].map((name) => ` '${name}' = @(${[...command.flags, ...command.positionals].map((flag) => `'${flag}'`).join(', ')})`))
|
|
180
|
+
.join('\n');
|
|
181
|
+
const flagValueEntries = Object.entries(model.flagValues)
|
|
182
|
+
.map(([flag, values]) => ` '${flag}' = @(${values.map((value) => `'${value}'`).join(', ')})`)
|
|
149
183
|
.join('\n');
|
|
150
184
|
return `# PowerShell completion for ${model.program}. Load with: ${model.program} completion powershell | Out-String | Invoke-Expression
|
|
151
185
|
Register-ArgumentCompleter -Native -CommandName '${psEscape(model.program)}' -ScriptBlock {
|
|
@@ -155,9 +189,16 @@ Register-ArgumentCompleter -Native -CommandName '${psEscape(model.program)}' -Sc
|
|
|
155
189
|
$globals = @(${global})
|
|
156
190
|
$byCommand = @{
|
|
157
191
|
${cases}
|
|
192
|
+
}
|
|
193
|
+
$flagValues = @{
|
|
194
|
+
${flagValueEntries}
|
|
158
195
|
}
|
|
159
196
|
$elements = @($commandAst.CommandElements | ForEach-Object { $_.ToString() })
|
|
160
|
-
$
|
|
197
|
+
$prevIndex = if ($wordToComplete) { $elements.Count - 2 } else { $elements.Count - 1 }
|
|
198
|
+
$prev = if ($prevIndex -ge 0) { $elements[$prevIndex] } else { '' }
|
|
199
|
+
$candidates = if ($flagValues.ContainsKey($prev)) {
|
|
200
|
+
$flagValues[$prev]
|
|
201
|
+
} elseif ($elements.Count -gt 1 -and $elements[1] -eq 'completion') {
|
|
161
202
|
$shells + $globals
|
|
162
203
|
} elseif ($elements.Count -gt 1 -and $byCommand.ContainsKey($elements[1])) {
|
|
163
204
|
$byCommand[$elements[1]] + $globals
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,CAAU,CAAC;AAGhF,gFAAgF;AAChF,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AAoBvD,2FAA2F;AAC3F,MAAM,WAAW,GAA6B;IAC5C,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC;CAC3C,CAAC;AAEF,4EAA4E;AAC5E,MAAM,iBAAiB,GAA6B;IAClD,GAAG,EAAE,CAAC,GAAG,UAAU,EAAE,GAAG,SAAS,CAAC;IAClC,MAAM,EAAE,CAAC,GAAG,UAAU,EAAE,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC;CAC1B,CAAC;AAEF,SAAS,WAAW,CAAC,OAA2B;IAC9C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,KAAK;YAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,MAAM,CAAC,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,OAAO,CAAC,WAAmB;IAClC,OAAO,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAa;IAChD,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAChF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC/C,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE;QAC1B,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAC3C,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;QACtE,WAAW,EAAE,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE;KACrD,CAAC,CAAC,CAAC;IACJ,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;AAClF,CAAC;AAED,SAAS,YAAY,CAAC,KAAsB;IAC1C,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;AACjF,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAAsB;IACjD,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ;SACzB,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACnB,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CACpC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,YAAY,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAC5F,CACF;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;SAChD,GAAG,CACF,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CACjB,OAAO,IAAI,+BAA+B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,gCAAgC,CAC7F;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,OAAO;wBACe,KAAK,CAAC,OAAO,yBAAyB,KAAK,CAAC,OAAO;GACxE,KAAK,CAAC,OAAO;;;;;;gCAMgB,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC;;;;EAIzD,UAAU;;;gCAGoB,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC;;;;EAI1F,KAAK;gBACS,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC;;;;;eAK5B,KAAK,CAAC,OAAO,gBAAgB,KAAK,CAAC,OAAO;CACxD,CAAC;AACF,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAsB;IAChD,MAAM,cAAc,GAAG,KAAK,CAAC,QAAQ;SAClC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACnB,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CACpC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,SAAS,CAAC,GAAG,IAAI,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,CACjE,CACF;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,YAAY,GAAG,iBAAiB,CAAC,GAAG,CACxC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,SAAS,CAAC,GAAG,KAAK,IAAI,KAAK,EAAE,CAAC,GAAG,CACrD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ;SACzB,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACnB,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CACpC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,YAAY,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAC5F,CACF;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;SAChD,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,OAAO,IAAI,gBAAgB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC;SACjF,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,OAAO,YAAY,KAAK,CAAC,OAAO;uBACX,KAAK,CAAC,OAAO,yBAAyB,KAAK,CAAC,OAAO;GACvE,KAAK,CAAC,OAAO;;;EAGd,cAAc;;;6BAGa,KAAK,CAAC,OAAO;;;;;EAKxC,YAAY;;;2BAGa,KAAK,CAAC,OAAO;;;;EAItC,UAAU;;;;EAIV,KAAK;gBACS,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC;;0BAEjB,KAAK,CAAC,OAAO;;GAEpC,KAAK,CAAC,OAAO;CACf,CAAC;AACF,CAAC;AAED,SAAS,aAAa,CAAC,KAAe;IACpC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aACxD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,UAAU,CAAC,IAAY;IAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAAsB;IACjD,MAAM,KAAK,GAAG;QACZ,yBAAyB,KAAK,CAAC,OAAO,gBAAgB,KAAK,CAAC,OAAO,2BAA2B;KAC/F,CAAC;IACF,KAAK,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,OAAO,KAAK,CAAC,CAAC;IAC9C,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrC,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACtD,KAAK,CAAC,IAAI,CACR,eAAe,KAAK,CAAC,OAAO,kCAAkC,IAAI,QAAQ,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAC7G,CAAC;QACJ,CAAC;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CACR,eAAe,KAAK,CAAC,OAAO,oDAAoD,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAC/G,CAAC;IACF,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1D,KAAK,CAAC,IAAI,CACR,eAAe,KAAK,CAAC,OAAO,oCAAoC,IAAI,KAAK,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CACxG,CAAC;QACF,IAAI,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,KAAK,CAAC,IAAI,CACR,eAAe,KAAK,CAAC,OAAO,oCAAoC,IAAI,SAAS,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAC9G,CAAC;QACJ,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9D,KAAK,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,OAAO,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7F,CAAC;IACD,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACjC,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY;IAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAsB;IACvD,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ;SAChC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;SACxD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC;SAC1B,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvE,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ;SACzB,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACnB,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CACpC,CAAC,IAAI,EAAE,EAAE,CACP,QAAQ,IAAI,SAAS,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC3G,CACF;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;SACtD,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,QAAQ,IAAI,SAAS,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;SAC/F,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO,+BAA+B,KAAK,CAAC,OAAO,gBAAgB,KAAK,CAAC,OAAO;mDAC/B,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;;kBAExD,YAAY;gBACd,UAAU;iBACT,MAAM;;EAErB,KAAK;;;EAGL,gBAAgB;;;;;;;;;;;;;;;;;;;CAmBjB,CAAC;AACF,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAsB,EAAE,KAAsB;IAC/E,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,MAAM;YACT,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC;QAC7B,KAAK,KAAK;YACR,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,KAAK,MAAM;YACT,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC;QAC7B,KAAK,YAAY;YACf,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,OAAO,CAAC,YAAY,CAAC;KACvD,WAAW,CAAC,oCAAoC,CAAC;KACjD,WAAW,CACV,IAAI,QAAQ,CAAC,SAAS,EAAE,iBAAiB,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;IAChF,GAAG,iBAAiB;CACrB,CAAC,CACH;KACA,MAAM,CAAC,CAAC,KAAa,EAAE,QAAiB,EAAE,OAAgB,EAAE,EAAE;IAC7D,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;IACvC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,KAAwB,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjG,CAAC,CAAC,CAAC"}
|
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* `agentenv add` / `agentenv remove` — non-interactive config edits.
|
|
3
|
-
* Flips tool/agent booleans in agentenv.toml and (by default) re-applies,
|
|
4
|
-
* so an AI agent can say "enable jq here" without the TTY-only wizard or
|
|
5
|
-
* hand-editing TOML.
|
|
6
|
-
*/
|
|
7
1
|
import { Command } from 'commander';
|
|
8
2
|
import { type AgentenvConfig } from '../config/schema.js';
|
|
9
3
|
export type ConfigEditKind = 'tool' | 'agent';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-edit.d.ts","sourceRoot":"","sources":["../../src/commands/config-edit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config-edit.d.ts","sourceRoot":"","sources":["../../src/commands/config-edit.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAML,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAQ7B,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,OAAO,CAAC;AAE9C,mFAAmF;AACnF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAI1E;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,OAAO,CAAC;IACd,EAAE,EAAE,OAAO,CAAC;CACb;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,EAAE,OAAO,GACd,cAAc,CAqBhB;AAED,qFAAqF;AACrF,wBAAgB,eAAe,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,GAAG,cAAc,CAW5F;AAyJD,eAAO,MAAM,UAAU,SAYrB,CAAC;AAEH,eAAO,MAAM,aAAa,SAYxB,CAAC"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* so an AI agent can say "enable jq here" without the TTY-only wizard or
|
|
5
5
|
* hand-editing TOML.
|
|
6
6
|
*/
|
|
7
|
+
import { printJson } from '../cli/json.js';
|
|
7
8
|
import { Command } from 'commander';
|
|
8
9
|
import * as fs from 'fs';
|
|
9
10
|
import * as path from 'path';
|
|
@@ -75,7 +76,7 @@ async function doConfigEdit(items, enable, options) {
|
|
|
75
76
|
const verb = enable ? 'add' : 'remove';
|
|
76
77
|
const fail = (message, exitCode = 1) => {
|
|
77
78
|
if (json)
|
|
78
|
-
|
|
79
|
+
printJson({ success: false, message });
|
|
79
80
|
else
|
|
80
81
|
console.error(message);
|
|
81
82
|
process.exitCode = exitCode;
|
|
@@ -114,7 +115,7 @@ async function doConfigEdit(items, enable, options) {
|
|
|
114
115
|
const report = validateConfig(config);
|
|
115
116
|
if (report.errors.length > 0) {
|
|
116
117
|
if (json)
|
|
117
|
-
|
|
118
|
+
printJson({ success: false, message: report.errors.join('; ') });
|
|
118
119
|
else
|
|
119
120
|
reportValidation(report, 'Configuration invalid — not editing.');
|
|
120
121
|
process.exitCode = 1;
|
|
@@ -129,20 +130,20 @@ async function doConfigEdit(items, enable, options) {
|
|
|
129
130
|
}
|
|
130
131
|
if (plan.changes.length === 0) {
|
|
131
132
|
if (json)
|
|
132
|
-
|
|
133
|
+
printJson({ success: true, message: 'Nothing to change.', configPath });
|
|
133
134
|
else
|
|
134
135
|
printResult('warn', 'Nothing to change.');
|
|
135
136
|
return;
|
|
136
137
|
}
|
|
137
138
|
if (options.dryRun) {
|
|
138
139
|
if (json) {
|
|
139
|
-
|
|
140
|
+
printJson({
|
|
140
141
|
success: true,
|
|
141
142
|
message: 'no changes were made',
|
|
142
143
|
configPath,
|
|
143
144
|
dryRun: true,
|
|
144
145
|
changes: plan.changes,
|
|
145
|
-
}
|
|
146
|
+
});
|
|
146
147
|
}
|
|
147
148
|
else {
|
|
148
149
|
console.log(plan.changes.map(changeLine).join('\n'));
|
|
@@ -151,11 +152,15 @@ async function doConfigEdit(items, enable, options) {
|
|
|
151
152
|
return;
|
|
152
153
|
}
|
|
153
154
|
const nextConfig = applyConfigEdit(config, plan);
|
|
155
|
+
// `config` is the user-layered view used for planning and applying; only
|
|
156
|
+
// the file's own (unlayered) settings plus this edit may be written back,
|
|
157
|
+
// so user-level preferences are never baked into the project agentenv.toml.
|
|
158
|
+
const persisted = applyConfigEdit(loadConfig(configPath), plan);
|
|
154
159
|
if (options.apply === false) {
|
|
155
|
-
saveConfig(
|
|
160
|
+
saveConfig(persisted, configPath);
|
|
156
161
|
const message = `Updated ${plan.changes.length} setting(s)`;
|
|
157
162
|
if (json) {
|
|
158
|
-
|
|
163
|
+
printJson({ success: true, message, configPath, changes: plan.changes, applied: false });
|
|
159
164
|
}
|
|
160
165
|
else {
|
|
161
166
|
console.log(plan.changes.map(changeLine).join('\n'));
|
|
@@ -164,20 +169,21 @@ async function doConfigEdit(items, enable, options) {
|
|
|
164
169
|
return;
|
|
165
170
|
}
|
|
166
171
|
if (json) {
|
|
167
|
-
saveConfig(
|
|
172
|
+
saveConfig(persisted, configPath);
|
|
168
173
|
const baseDir = path.dirname(configPath);
|
|
169
174
|
const result = await applyConfiguration(nextConfig, baseDir, {
|
|
170
175
|
skipMiseInstall: options.skipMiseInstall,
|
|
171
176
|
skipPrereqMessage: true,
|
|
172
177
|
});
|
|
173
178
|
const applyJson = buildApplyJsonResult(result, { configPath, baseDir, warnings: [] });
|
|
174
|
-
|
|
179
|
+
printJson({ ...applyJson, changes: plan.changes });
|
|
175
180
|
if (!result.success)
|
|
176
181
|
process.exitCode = 1;
|
|
177
182
|
return;
|
|
178
183
|
}
|
|
179
184
|
console.log(plan.changes.map(changeLine).join('\n'));
|
|
180
185
|
await saveAndApply(nextConfig, configPath, {
|
|
186
|
+
persistConfig: persisted,
|
|
181
187
|
startedAt,
|
|
182
188
|
successMessage: `Updated ${plan.changes.length} setting(s) and applied`,
|
|
183
189
|
skipMiseInstall: options.skipMiseInstall,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-edit.js","sourceRoot":"","sources":["../../src/commands/config-edit.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config-edit.js","sourceRoot":"","sources":["../../src/commands/config-edit.ts"],"names":[],"mappings":"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"}
|