@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/apply.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { printJson } from '../cli/json.js';
|
|
2
2
|
import { Command } from 'commander';
|
|
3
3
|
import * as fs from 'fs';
|
|
4
|
+
import * as path from 'path';
|
|
4
5
|
import { ClaudeCodeAdapter, CodexCliAdapter, CopilotAdapter, OpenCodeAdapter, GeminiCliAdapter, CursorAdapter, WindsurfAdapter, ClineAdapter, VibeAdapter, } from '../adapters/index.js';
|
|
5
6
|
import { getEnabledAgents, loadConfig, validateConfig } from '../config/schema.js';
|
|
6
7
|
import { configFilePath, findConfigPath, parseScopeFlag, baseDirForConfig, } from '../config/scopes.js';
|
|
@@ -10,6 +11,7 @@ import { checkAgentShellConfiguration, detectShell, fixShellConfiguration, } fro
|
|
|
10
11
|
import { shellFixStatePath } from '../shell/shell-fix-state.js';
|
|
11
12
|
import { isUnsupportedRtkAgentError } from '../toolchain/rtk.js';
|
|
12
13
|
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';
|
|
14
|
+
import { AGENT_CONFIG_FILES } from './agent-files.js';
|
|
13
15
|
import { normalizeOutput } from '../utils/output.js';
|
|
14
16
|
import { colorizeLine, theme } from '../ui/theme.js';
|
|
15
17
|
import { renderLogo, setQuietEnabled } from '../ui/output.js';
|
|
@@ -34,23 +36,43 @@ export function buildApplyJsonResult(result, extra) {
|
|
|
34
36
|
* can never disagree about what counts as a change) and, on Windows with
|
|
35
37
|
* Git Bash found, the per-agent Tier 0 shell-fix plan.
|
|
36
38
|
*/
|
|
37
|
-
export function buildApplyDryRunPlan(config, baseDir, configPath, files, agents, integrations) {
|
|
38
|
-
|
|
39
|
+
export function buildApplyDryRunPlan(config, baseDir, configPath, files, agents, integrations, fileConfig) {
|
|
40
|
+
// Committed outputs come from the file's own settings, as in applyConfiguration.
|
|
41
|
+
const generated = fileConfig ?? config;
|
|
42
|
+
const enabledToolCount = Object.values(generated.tools ?? {}).filter((on) => on === true).length;
|
|
39
43
|
const miseTomlPath = miseTomlPathFor(config.scope, baseDir);
|
|
40
|
-
const miseContent = generateMiseToml(
|
|
44
|
+
const miseContent = generateMiseToml(generated, generated.custom_tools ?? []);
|
|
41
45
|
const miseStatus = !fs.existsSync(miseTomlPath)
|
|
42
46
|
? 'create'
|
|
43
47
|
: fs.readFileSync(miseTomlPath, 'utf-8') === miseContent
|
|
44
48
|
? 'unchanged'
|
|
45
49
|
: 'update';
|
|
46
|
-
const markerStart =
|
|
47
|
-
const markerEnd =
|
|
50
|
+
const markerStart = generated.generate?.marker_start ?? '<!-- agentenv-managed-start -->';
|
|
51
|
+
const markerEnd = generated.generate?.marker_end ?? '<!-- agentenv-managed-end -->';
|
|
48
52
|
const generatedFiles = files.map((file) => {
|
|
49
53
|
const plan = planMarkerUpdate(file.path, file.content, markerStart, markerEnd);
|
|
50
54
|
return plan.status === 'error'
|
|
51
55
|
? { path: file.path, status: 'error', message: plan.message }
|
|
52
56
|
: { path: file.path, status: plan.status };
|
|
53
57
|
});
|
|
58
|
+
// Which agent files get written, so a project apply can't quietly change the
|
|
59
|
+
// user's home directory: most agents are wired through global config.
|
|
60
|
+
const agentFiles = [];
|
|
61
|
+
if (config.rtk?.enabled === true) {
|
|
62
|
+
for (const agent of agents) {
|
|
63
|
+
const meta = AGENT_CONFIG_FILES[agent];
|
|
64
|
+
if (!meta || (meta.projectOnly && config.scope === 'user'))
|
|
65
|
+
continue;
|
|
66
|
+
const file = meta.check(baseDir);
|
|
67
|
+
const relative = path.relative(baseDir, file);
|
|
68
|
+
agentFiles.push({
|
|
69
|
+
agent,
|
|
70
|
+
label: meta.label,
|
|
71
|
+
path: file,
|
|
72
|
+
global: relative.startsWith('..') || path.isAbsolute(relative),
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
}
|
|
54
76
|
let tier0 = null;
|
|
55
77
|
if (process.platform === 'win32') {
|
|
56
78
|
const shell = detectShell();
|
|
@@ -67,11 +89,35 @@ export function buildApplyDryRunPlan(config, baseDir, configPath, files, agents,
|
|
|
67
89
|
misePlan: { miseTomlPath, enabledToolCount, status: miseStatus },
|
|
68
90
|
generatedFiles,
|
|
69
91
|
agents,
|
|
92
|
+
agentFiles,
|
|
70
93
|
rtkEnabled: config.rtk?.enabled === true,
|
|
71
94
|
integrations: integrations.map((integration) => integration.getName()),
|
|
72
95
|
tier0,
|
|
73
96
|
};
|
|
74
97
|
}
|
|
98
|
+
/** The independent parts of an apply, selectable with `--only`. */
|
|
99
|
+
export const APPLY_STEPS = ['files', 'tools', 'agents'];
|
|
100
|
+
/**
|
|
101
|
+
* Parse `--only <steps>` (comma-separated). Absent when the flag is; an error
|
|
102
|
+
* naming the valid steps for anything else, so a typo never silently runs
|
|
103
|
+
* everything or nothing.
|
|
104
|
+
*/
|
|
105
|
+
export function parseOnly(value) {
|
|
106
|
+
if (value === undefined)
|
|
107
|
+
return {};
|
|
108
|
+
const requested = value
|
|
109
|
+
.split(',')
|
|
110
|
+
.map((step) => step.trim())
|
|
111
|
+
.filter((step) => step !== '');
|
|
112
|
+
const unknown = requested.filter((step) => !APPLY_STEPS.includes(step));
|
|
113
|
+
if (requested.length === 0 || unknown.length > 0) {
|
|
114
|
+
const got = requested.length === 0 ? '(nothing)' : unknown.join(', ');
|
|
115
|
+
return {
|
|
116
|
+
error: 'invalid --only ' + got + ' (expected one or more of: ' + APPLY_STEPS.join(', ') + ')',
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
return { steps: [...new Set(requested)] };
|
|
120
|
+
}
|
|
75
121
|
/**
|
|
76
122
|
* Whether the Tier 0 Windows shell fix should actually write files this run,
|
|
77
123
|
* given its resolved mode and whether stdin is a TTY:
|
|
@@ -96,6 +142,12 @@ export function resolveTier0WriteFiles(mode, isTTY) {
|
|
|
96
142
|
* `errors.length === 0` meant one broken agent shell-fix write silently
|
|
97
143
|
* skipped tool installation entirely.
|
|
98
144
|
*/
|
|
145
|
+
/** The second line of the success box: don't claim verification when no tools were installed. */
|
|
146
|
+
export function applySuccessSummary(skipMiseInstall) {
|
|
147
|
+
return skipMiseInstall
|
|
148
|
+
? 'files written; tools were not installed (--skip-mise-install)'
|
|
149
|
+
: 'everything is configured and verified';
|
|
150
|
+
}
|
|
99
151
|
export function shouldRunMiseInstall(miseTomlWritten, skipMiseInstall) {
|
|
100
152
|
return miseTomlWritten && !skipMiseInstall;
|
|
101
153
|
}
|
|
@@ -104,6 +156,7 @@ function adaptersFor(config, baseDir, options) {
|
|
|
104
156
|
enabled: true,
|
|
105
157
|
baseDir,
|
|
106
158
|
rtkEnabled: config.rtk?.enabled === true,
|
|
159
|
+
scope: config.scope,
|
|
107
160
|
rtkInit: options.rtkInit,
|
|
108
161
|
};
|
|
109
162
|
const adapters = [];
|
|
@@ -165,10 +218,13 @@ export async function applyConfiguration(config, baseDir, options = {}) {
|
|
|
165
218
|
};
|
|
166
219
|
const messages = track([], 'message');
|
|
167
220
|
const errors = track([], 'error');
|
|
221
|
+
// What the committed files and tool installs are generated from.
|
|
222
|
+
const generated = options.fileConfig ?? config;
|
|
223
|
+
const runs = (step) => options.only === undefined || options.only.includes(step);
|
|
168
224
|
// Step 0 — self-diagnose the prerequisite before touching anything, so a
|
|
169
225
|
// missing mise fails loudly with install instructions instead of half
|
|
170
226
|
// configuring the project.
|
|
171
|
-
if (!options.skipMiseInstall) {
|
|
227
|
+
if (!options.skipMiseInstall && runs('tools')) {
|
|
172
228
|
if (!isMiseInstalled()) {
|
|
173
229
|
errors.push('Prerequisite check failed: mise is not installed.');
|
|
174
230
|
errors.push("agentenv uses mise to install and manage this project's tools.");
|
|
@@ -180,7 +236,7 @@ export async function applyConfiguration(config, baseDir, options = {}) {
|
|
|
180
236
|
}
|
|
181
237
|
}
|
|
182
238
|
// Step 1 — Tier 0 shell compatibility fix.
|
|
183
|
-
if (config.tier0?.check_enabled !== false) {
|
|
239
|
+
if (runs('agents') && config.tier0?.check_enabled !== false) {
|
|
184
240
|
const enabledAgents = getEnabledAgents(config);
|
|
185
241
|
const tier0Mode = options.tier0Mode ?? config.tier0?.mode ?? 'auto';
|
|
186
242
|
const writeShellFixFiles = resolveTier0WriteFiles(tier0Mode, process.stdin.isTTY === true);
|
|
@@ -198,27 +254,30 @@ export async function applyConfiguration(config, baseDir, options = {}) {
|
|
|
198
254
|
}
|
|
199
255
|
}
|
|
200
256
|
// Step 2 — mise.toml (declares the tools).
|
|
201
|
-
const enabledToolCount = Object.values(
|
|
257
|
+
const enabledToolCount = Object.values(generated.tools ?? {}).filter((on) => on === true).length;
|
|
202
258
|
const misePath = miseTomlPathFor(config.scope, baseDir);
|
|
203
259
|
let miseTomlWritten = false;
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
if (
|
|
211
|
-
|
|
260
|
+
// mise.toml is both a generated file and the declaration the install reads.
|
|
261
|
+
if (runs('files') || runs('tools')) {
|
|
262
|
+
try {
|
|
263
|
+
saveMiseToml(generateMiseToml(generated, generated.custom_tools ?? []), misePath);
|
|
264
|
+
miseTomlWritten = true;
|
|
265
|
+
messages.push(`Tools: wrote ${misePath} (${enabledToolCount} enabled)`);
|
|
266
|
+
if (config.scope === 'user') {
|
|
267
|
+
const legacy = removeLegacyUserMiseToml(baseDir);
|
|
268
|
+
if (legacy)
|
|
269
|
+
messages.push(`Tools: removed superseded ${legacy}`);
|
|
270
|
+
}
|
|
271
|
+
const platformSkip = platformUnsupportedHint(generated);
|
|
272
|
+
if (platformSkip)
|
|
273
|
+
messages.push(platformSkip);
|
|
274
|
+
}
|
|
275
|
+
catch (error) {
|
|
276
|
+
errors.push(`Unable to write ${misePath}: ${error instanceof Error ? error.message : String(error)}`);
|
|
212
277
|
}
|
|
213
|
-
const platformSkip = platformUnsupportedHint(config);
|
|
214
|
-
if (platformSkip)
|
|
215
|
-
messages.push(platformSkip);
|
|
216
|
-
}
|
|
217
|
-
catch (error) {
|
|
218
|
-
errors.push(`Unable to write ${misePath}: ${error instanceof Error ? error.message : String(error)}`);
|
|
219
278
|
}
|
|
220
279
|
// Step 3 — global shims config + trust + install + verify.
|
|
221
|
-
if (shouldRunMiseInstall(miseTomlWritten, options.skipMiseInstall === true)) {
|
|
280
|
+
if (runs('tools') && shouldRunMiseInstall(miseTomlWritten, options.skipMiseInstall === true)) {
|
|
222
281
|
const shims = ensureGlobalShimsDir(shellFixStatePath());
|
|
223
282
|
(shims.success ? messages : errors).push(shims.message);
|
|
224
283
|
if (options.fixPath) {
|
|
@@ -227,7 +286,7 @@ export async function applyConfiguration(config, baseDir, options = {}) {
|
|
|
227
286
|
}
|
|
228
287
|
const trust = trustMiseToml(misePath, baseDir);
|
|
229
288
|
(trust.success ? messages : errors).push(trust.message);
|
|
230
|
-
const eulaAhead = eulaPreflightHint(
|
|
289
|
+
const eulaAhead = eulaPreflightHint(generated);
|
|
231
290
|
if (eulaAhead)
|
|
232
291
|
messages.push(eulaAhead);
|
|
233
292
|
options.onMiseInstall?.onStart?.();
|
|
@@ -243,7 +302,7 @@ export async function applyConfiguration(config, baseDir, options = {}) {
|
|
|
243
302
|
errors.push(`mise install failed${install.exitCode === null ? '' : ` (exit ${install.exitCode})`}: ${installDetail}${install.eulaHint ? ` ${install.eulaHint}` : ''}`);
|
|
244
303
|
}
|
|
245
304
|
if (install.success) {
|
|
246
|
-
const availability = verifyToolAvailability(
|
|
305
|
+
const availability = verifyToolAvailability(generated, {
|
|
247
306
|
cwd: baseDir,
|
|
248
307
|
miseTomlPath: misePath,
|
|
249
308
|
});
|
|
@@ -259,17 +318,20 @@ export async function applyConfiguration(config, baseDir, options = {}) {
|
|
|
259
318
|
}
|
|
260
319
|
}
|
|
261
320
|
// Step 4 — instruction files for the agents.
|
|
262
|
-
const markerStart =
|
|
263
|
-
const markerEnd =
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
321
|
+
const markerStart = generated.generate?.marker_start ?? '<!-- agentenv-managed-start -->';
|
|
322
|
+
const markerEnd = generated.generate?.marker_end ?? '<!-- agentenv-managed-end -->';
|
|
323
|
+
const instructionFiles = runs('files')
|
|
324
|
+
? [
|
|
325
|
+
...generateInstructionFiles(generated, baseDir),
|
|
326
|
+
...userScopeInstructionFiles(config, baseDir, options),
|
|
327
|
+
]
|
|
328
|
+
: [];
|
|
329
|
+
for (const file of instructionFiles) {
|
|
268
330
|
const update = updateWithMarkers(file.path, file.content, markerStart, markerEnd);
|
|
269
331
|
(update.success ? messages : errors).push(update.message);
|
|
270
332
|
}
|
|
271
333
|
// Step 5 - per-agent wiring.
|
|
272
|
-
for (const adapter of adaptersFor(config, baseDir, options)) {
|
|
334
|
+
for (const adapter of runs('agents') ? adaptersFor(config, baseDir, options) : []) {
|
|
273
335
|
const result = await adapter.initialize();
|
|
274
336
|
if (result.success) {
|
|
275
337
|
messages.push(`${adapter.getName()}: ${result.message}`);
|
|
@@ -286,7 +348,7 @@ export async function applyConfiguration(config, baseDir, options = {}) {
|
|
|
286
348
|
}
|
|
287
349
|
}
|
|
288
350
|
// Step 6 - optional upstream integrations (Superpowers).
|
|
289
|
-
for (const adapter of enabledIntegrations(config, options)) {
|
|
351
|
+
for (const adapter of runs('agents') ? enabledIntegrations(config, options) : []) {
|
|
290
352
|
const result = await adapter.apply(baseDir, config.integrations?.superpowers);
|
|
291
353
|
for (const line of integrationResultLines(result))
|
|
292
354
|
messages.push(`Superpowers: ${line}`);
|
|
@@ -308,6 +370,7 @@ export const applyCommand = new Command()
|
|
|
308
370
|
.option('--dry-run', 'show what would be written without changing anything')
|
|
309
371
|
.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')
|
|
310
372
|
.option('--scope <scope>', 'config scope to apply: project|user (default: nearest config)')
|
|
373
|
+
.option('--only <steps>', 'run only some parts: files (mise.toml + AGENTS.md/CLAUDE.md), tools (install), agents (wiring); comma-separated')
|
|
311
374
|
.option('--fix-path', 'Windows: add the mise shims directory to your user PATH (opt-in)')
|
|
312
375
|
.option('--json', 'emit a machine-readable JSON document on stdout')
|
|
313
376
|
.action(async (options, command) => {
|
|
@@ -322,6 +385,11 @@ export const applyCommand = new Command()
|
|
|
322
385
|
command.error(scope.error);
|
|
323
386
|
return;
|
|
324
387
|
}
|
|
388
|
+
const only = parseOnly(options.only);
|
|
389
|
+
if (only.error) {
|
|
390
|
+
command.error(only.error);
|
|
391
|
+
return;
|
|
392
|
+
}
|
|
325
393
|
let tier0Mode;
|
|
326
394
|
if (options.shellFix !== undefined) {
|
|
327
395
|
if (['auto', 'always', 'never'].includes(options.shellFix)) {
|
|
@@ -404,14 +472,16 @@ export const applyCommand = new Command()
|
|
|
404
472
|
if (!json)
|
|
405
473
|
reportValidation(report, 'Configuration invalid — not applying.');
|
|
406
474
|
const baseDir = baseDirForConfig(configPath, config.scope);
|
|
475
|
+
// Committed files come from the project file alone (see ApplyOptions.fileConfig).
|
|
476
|
+
const fileConfig = config.scope === 'project' ? loadConfig(configPath) : undefined;
|
|
407
477
|
if (dryRun) {
|
|
408
478
|
const files = [
|
|
409
|
-
...generateInstructionFiles(config, baseDir),
|
|
410
|
-
...userScopeInstructionFiles(config, baseDir,
|
|
479
|
+
...generateInstructionFiles(fileConfig ?? config, baseDir),
|
|
480
|
+
...userScopeInstructionFiles(config, baseDir, {}),
|
|
411
481
|
];
|
|
412
482
|
const agents = [...getEnabledAgents(config)];
|
|
413
|
-
const integrations = enabledIntegrations(config,
|
|
414
|
-
const plan = buildApplyDryRunPlan(config, baseDir, configPath, files, agents, integrations);
|
|
483
|
+
const integrations = enabledIntegrations(config, {});
|
|
484
|
+
const plan = buildApplyDryRunPlan(config, baseDir, configPath, files, agents, integrations, fileConfig);
|
|
415
485
|
if (json) {
|
|
416
486
|
const payload = { success: true, dryRun: true, ...plan };
|
|
417
487
|
printJson(payload);
|
|
@@ -428,6 +498,13 @@ export const applyCommand = new Command()
|
|
|
428
498
|
}
|
|
429
499
|
}
|
|
430
500
|
console.log(` Agents: ${agents.join(', ') || '(none)'}${config.rtk?.enabled === true ? ' (rtk rewriting on)' : ''}`);
|
|
501
|
+
for (const entry of plan.agentFiles) {
|
|
502
|
+
console.log(` ${entry.label}: ${entry.path}${entry.global ? ' (outside this directory)' : ''}`);
|
|
503
|
+
}
|
|
504
|
+
const outside = plan.agentFiles.filter((entry) => entry.global);
|
|
505
|
+
if (outside.length > 0 && config.scope !== 'user') {
|
|
506
|
+
console.log(` Note: ${outside.length} agent(s) are wired through files outside this project (your home directory); \`apply\` will change them.`);
|
|
507
|
+
}
|
|
431
508
|
console.log(` Integrations: ${integrations.length > 0 ? integrations.map((i) => i.getName()).join(', ') : '(none)'}`);
|
|
432
509
|
if (plan.tier0) {
|
|
433
510
|
console.log(' Tier 0 (Windows shell fix):');
|
|
@@ -440,7 +517,9 @@ export const applyCommand = new Command()
|
|
|
440
517
|
}
|
|
441
518
|
const result = await withSpinner('Applying configuration...', (spinner) => applyConfiguration(config, baseDir, {
|
|
442
519
|
skipMiseInstall: options.skipMiseInstall === true,
|
|
520
|
+
fileConfig,
|
|
443
521
|
tier0Mode,
|
|
522
|
+
only: only.steps,
|
|
444
523
|
fixPath: options.fixPath === true,
|
|
445
524
|
// Streamed mise install progress is human-only chrome — it would
|
|
446
525
|
// otherwise interleave raw text into the JSON document.
|
|
@@ -467,6 +546,6 @@ export const applyCommand = new Command()
|
|
|
467
546
|
printResult('fail', 'Apply failed', 'fix the errors above and re-run `agentenv apply`', result.elapsedMs);
|
|
468
547
|
return;
|
|
469
548
|
}
|
|
470
|
-
printResult('ok', 'Apply complete!',
|
|
549
|
+
printResult('ok', 'Apply complete!', applySuccessSummary(options.skipMiseInstall === true), result.elapsedMs);
|
|
471
550
|
});
|
|
472
551
|
//# sourceMappingURL=apply.js.map
|
|
@@ -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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"}
|
|
@@ -3,12 +3,20 @@ import { type AgentenvConfig } from '../config/schema.js';
|
|
|
3
3
|
export type ConfigEditKind = 'tool' | 'agent';
|
|
4
4
|
/** Classify `name` as a tool or agent config key, or undefined if it's neither. */
|
|
5
5
|
export declare function classifyConfigKey(name: string): ConfigEditKind | undefined;
|
|
6
|
-
export interface
|
|
6
|
+
export interface ConfigEditToggle {
|
|
7
7
|
kind: ConfigEditKind;
|
|
8
8
|
key: string;
|
|
9
9
|
from: boolean;
|
|
10
10
|
to: boolean;
|
|
11
11
|
}
|
|
12
|
+
/** A `tool@version` pin written to `[tool_versions]`. */
|
|
13
|
+
export interface ConfigEditPin {
|
|
14
|
+
kind: 'pin';
|
|
15
|
+
key: string;
|
|
16
|
+
from: string | null;
|
|
17
|
+
to: string;
|
|
18
|
+
}
|
|
19
|
+
export type ConfigEditChange = ConfigEditToggle | ConfigEditPin;
|
|
12
20
|
export interface ConfigEditPlan {
|
|
13
21
|
changes: ConfigEditChange[];
|
|
14
22
|
unknown: string[];
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,yDAAyD;AACzD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,KAAK,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,aAAa,CAAC;AAEhE,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,CAgChB;AAED,qFAAqF;AACrF,wBAAgB,eAAe,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,GAAG,cAAc,CAe5F;AAiLD,eAAO,MAAM,UAAU,SAerB,CAAC;AAEH,eAAO,MAAM,aAAa,SAYxB,CAAC"}
|
|
@@ -33,13 +33,26 @@ export function planConfigEdit(config, items, enable) {
|
|
|
33
33
|
const unknown = [];
|
|
34
34
|
const seen = new Set();
|
|
35
35
|
for (const raw of items) {
|
|
36
|
-
const
|
|
37
|
-
if (!
|
|
36
|
+
const item = raw.trim();
|
|
37
|
+
if (!item || seen.has(item))
|
|
38
38
|
continue;
|
|
39
|
-
seen.add(
|
|
39
|
+
seen.add(item);
|
|
40
|
+
// `tool@version` enables the tool (if needed) and pins it; only `add`, only tools.
|
|
41
|
+
const at = item.indexOf('@');
|
|
42
|
+
const name = at < 0 ? item : item.slice(0, at);
|
|
43
|
+
const version = at < 0 ? undefined : item.slice(at + 1).trim();
|
|
40
44
|
const kind = classifyConfigKey(name);
|
|
41
|
-
if (!kind) {
|
|
42
|
-
unknown.push(
|
|
45
|
+
if (!kind || (version !== undefined && (!enable || kind !== 'tool' || version === ''))) {
|
|
46
|
+
unknown.push(item);
|
|
47
|
+
continue;
|
|
48
|
+
}
|
|
49
|
+
if (version !== undefined) {
|
|
50
|
+
const pinned = config.tool_versions?.[name] ?? null;
|
|
51
|
+
const enabled = config.tools?.[name] ?? false;
|
|
52
|
+
if (!enabled)
|
|
53
|
+
changes.push({ kind: 'tool', key: name, from: false, to: true });
|
|
54
|
+
if (pinned !== version)
|
|
55
|
+
changes.push({ kind: 'pin', key: name, from: pinned, to: version });
|
|
43
56
|
continue;
|
|
44
57
|
}
|
|
45
58
|
const current = kind === 'agent'
|
|
@@ -59,12 +72,18 @@ export function applyConfigEdit(config, plan) {
|
|
|
59
72
|
tools: { ...config.tools },
|
|
60
73
|
};
|
|
61
74
|
for (const change of plan.changes) {
|
|
75
|
+
if (change.kind === 'pin') {
|
|
76
|
+
next.tool_versions = { ...next.tool_versions, [change.key]: change.to };
|
|
77
|
+
continue;
|
|
78
|
+
}
|
|
62
79
|
const bucket = (change.kind === 'agent' ? next.agents : next.tools);
|
|
63
80
|
bucket[change.key] = change.to;
|
|
64
81
|
}
|
|
65
82
|
return next;
|
|
66
83
|
}
|
|
67
84
|
function changeLine(change) {
|
|
85
|
+
if (change.kind === 'pin')
|
|
86
|
+
return ` pin ${change.key}: ${change.from ?? 'unpinned'} -> ${change.to}`;
|
|
68
87
|
return ` ${change.kind} ${change.key}: ${change.from} -> ${change.to}`;
|
|
69
88
|
}
|
|
70
89
|
async function doConfigEdit(items, enable, options) {
|
|
@@ -123,14 +142,23 @@ async function doConfigEdit(items, enable, options) {
|
|
|
123
142
|
}
|
|
124
143
|
if (!json)
|
|
125
144
|
reportValidation(report, 'Configuration invalid — not editing.');
|
|
126
|
-
|
|
145
|
+
// Plan against the file's own settings: a tool the user config already
|
|
146
|
+
// enables must still be declarable in (or removable from) this file.
|
|
147
|
+
const fileConfig = loadConfig(configPath);
|
|
148
|
+
const plan = planConfigEdit(fileConfig, items, enable);
|
|
127
149
|
if (plan.unknown.length > 0) {
|
|
128
150
|
usageError(`Unknown tool/agent key(s) to ${verb}: ${plan.unknown.join(', ')}. Valid keys: ${[...AGENT_KEYS, ...TOOL_KEYS].join(', ')}`);
|
|
129
151
|
return;
|
|
130
152
|
}
|
|
131
153
|
if (plan.changes.length === 0) {
|
|
132
|
-
if (json)
|
|
133
|
-
printJson({
|
|
154
|
+
if (json) {
|
|
155
|
+
printJson({
|
|
156
|
+
success: true,
|
|
157
|
+
message: 'Nothing to change.',
|
|
158
|
+
configPath,
|
|
159
|
+
warnings: report.warnings,
|
|
160
|
+
});
|
|
161
|
+
}
|
|
134
162
|
else
|
|
135
163
|
printResult('warn', 'Nothing to change.');
|
|
136
164
|
return;
|
|
@@ -143,6 +171,7 @@ async function doConfigEdit(items, enable, options) {
|
|
|
143
171
|
configPath,
|
|
144
172
|
dryRun: true,
|
|
145
173
|
changes: plan.changes,
|
|
174
|
+
warnings: report.warnings,
|
|
146
175
|
});
|
|
147
176
|
}
|
|
148
177
|
else {
|
|
@@ -155,12 +184,19 @@ async function doConfigEdit(items, enable, options) {
|
|
|
155
184
|
// `config` is the user-layered view used for planning and applying; only
|
|
156
185
|
// the file's own (unlayered) settings plus this edit may be written back,
|
|
157
186
|
// so user-level preferences are never baked into the project agentenv.toml.
|
|
158
|
-
const persisted = applyConfigEdit(
|
|
187
|
+
const persisted = applyConfigEdit(fileConfig, plan);
|
|
159
188
|
if (options.apply === false) {
|
|
160
189
|
saveConfig(persisted, configPath);
|
|
161
190
|
const message = `Updated ${plan.changes.length} setting(s)`;
|
|
162
191
|
if (json) {
|
|
163
|
-
printJson({
|
|
192
|
+
printJson({
|
|
193
|
+
success: true,
|
|
194
|
+
message,
|
|
195
|
+
configPath,
|
|
196
|
+
changes: plan.changes,
|
|
197
|
+
applied: false,
|
|
198
|
+
warnings: report.warnings,
|
|
199
|
+
});
|
|
164
200
|
}
|
|
165
201
|
else {
|
|
166
202
|
console.log(plan.changes.map(changeLine).join('\n'));
|
|
@@ -174,8 +210,13 @@ async function doConfigEdit(items, enable, options) {
|
|
|
174
210
|
const result = await applyConfiguration(nextConfig, baseDir, {
|
|
175
211
|
skipMiseInstall: options.skipMiseInstall,
|
|
176
212
|
skipPrereqMessage: true,
|
|
213
|
+
fileConfig: persisted.scope === 'project' ? persisted : undefined,
|
|
214
|
+
});
|
|
215
|
+
const applyJson = buildApplyJsonResult(result, {
|
|
216
|
+
configPath,
|
|
217
|
+
baseDir,
|
|
218
|
+
warnings: report.warnings,
|
|
177
219
|
});
|
|
178
|
-
const applyJson = buildApplyJsonResult(result, { configPath, baseDir, warnings: [] });
|
|
179
220
|
printJson({ ...applyJson, changes: plan.changes });
|
|
180
221
|
if (!result.success)
|
|
181
222
|
process.exitCode = 1;
|
|
@@ -200,7 +241,7 @@ function registerConfigEditFlags(command) {
|
|
|
200
241
|
export const addCommand = registerConfigEditFlags(new Command()
|
|
201
242
|
.name('add')
|
|
202
243
|
.description('Enable tool(s)/agent(s) in agentenv.toml, then apply (unless --no-apply)')
|
|
203
|
-
.argument('<items...>', 'tool or agent config keys to enable (e.g. ripgrep, claude_code)')).action((items, options, command) => {
|
|
244
|
+
.argument('<items...>', 'tool or agent config keys to enable (e.g. ripgrep, claude_code); tool@version also pins it (e.g. jq@1.7.1)')).action((items, options, command) => {
|
|
204
245
|
const scope = parseScopeFlag(options.scope);
|
|
205
246
|
if (scope.error) {
|
|
206
247
|
command.error(scope.error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-edit.js","sourceRoot":"","sources":["../../src/commands/config-edit.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EACL,UAAU,EACV,SAAS,EACT,UAAU,EACV,UAAU,EACV,cAAc,GAEf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErF,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAIjF,mFAAmF;AACnF,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,IAAK,UAAgC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,OAAO,CAAC;IACrE,IAAK,SAA+B,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC;IACnE,OAAO,SAAS,CAAC;AACnB,CAAC;
|
|
1
|
+
{"version":3,"file":"config-edit.js","sourceRoot":"","sources":["../../src/commands/config-edit.ts"],"names":[],"mappings":"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"}
|