@hashicorp/kits 0.1.4 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +173 -32
- package/dist/adapters/base-adapter.d.ts +2 -2
- package/dist/adapters/base-adapter.js +2 -2
- package/dist/adapters/claude-code/index.d.ts +1 -1
- package/dist/adapters/claude-code/index.js +1 -1
- package/dist/adapters/codex/index.d.ts +1 -1
- package/dist/adapters/codex/index.js +1 -1
- package/dist/adapters/gemini-cli/index.d.ts +1 -1
- package/dist/adapters/gemini-cli/index.js +1 -1
- package/dist/adapters/github-copilot/index.d.ts +1 -1
- package/dist/adapters/github-copilot/index.js +1 -1
- package/dist/adapters/opencode/index.d.ts +1 -1
- package/dist/adapters/opencode/index.js +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +29 -9
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/install.d.ts.map +1 -1
- package/dist/cli/install.js +820 -161
- package/dist/cli/install.js.map +1 -1
- package/dist/cli/list.d.ts.map +1 -1
- package/dist/cli/list.js +8 -6
- package/dist/cli/list.js.map +1 -1
- package/dist/cli/types.d.ts +17 -0
- package/dist/cli/types.d.ts.map +1 -1
- package/dist/cli/types.js +1 -0
- package/dist/cli/types.js.map +1 -1
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +300 -38
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/cli/upgrade.d.ts.map +1 -1
- package/dist/cli/upgrade.js +334 -105
- package/dist/cli/upgrade.js.map +1 -1
- package/dist/cli/validate.js +5 -5
- package/dist/cli/validate.js.map +1 -1
- package/dist/core/types.d.ts +5 -5
- package/dist/core/upgrade-executor.d.ts +7 -7
- package/dist/core/upgrade-executor.d.ts.map +1 -1
- package/dist/core/upgrade-executor.js +17 -17
- package/dist/core/upgrade-executor.js.map +1 -1
- package/dist/discovery/kit-scanner.d.ts +3 -3
- package/dist/discovery/kit-scanner.js +17 -17
- package/dist/discovery/kit-scanner.js.map +1 -1
- package/dist/discovery/types.d.ts +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/lockfile/index.d.ts +79 -0
- package/dist/lockfile/index.d.ts.map +1 -0
- package/dist/lockfile/index.js +203 -0
- package/dist/lockfile/index.js.map +1 -0
- package/dist/lockfile/read.d.ts +32 -0
- package/dist/lockfile/read.d.ts.map +1 -0
- package/dist/lockfile/read.js +88 -0
- package/dist/lockfile/read.js.map +1 -0
- package/dist/lockfile/types.d.ts +126 -0
- package/dist/lockfile/types.d.ts.map +1 -0
- package/dist/lockfile/types.js +44 -0
- package/dist/lockfile/types.js.map +1 -0
- package/dist/{manifest → lockfile}/upgrade-check.d.ts +5 -5
- package/dist/lockfile/upgrade-check.d.ts.map +1 -0
- package/dist/{manifest → lockfile}/upgrade-check.js +11 -9
- package/dist/lockfile/upgrade-check.js.map +1 -0
- package/dist/lockfile/utils.d.ts +35 -0
- package/dist/lockfile/utils.d.ts.map +1 -0
- package/dist/lockfile/utils.js +57 -0
- package/dist/lockfile/utils.js.map +1 -0
- package/dist/lockfile/write.d.ts +44 -0
- package/dist/lockfile/write.d.ts.map +1 -0
- package/dist/lockfile/write.js +77 -0
- package/dist/lockfile/write.js.map +1 -0
- package/dist/manifest/hash.d.ts +7 -0
- package/dist/manifest/hash.d.ts.map +1 -0
- package/dist/manifest/hash.js +30 -0
- package/dist/manifest/hash.js.map +1 -0
- package/dist/manifest/index.d.ts +8 -77
- package/dist/manifest/index.d.ts.map +1 -1
- package/dist/manifest/index.js +6 -197
- package/dist/manifest/index.js.map +1 -1
- package/dist/manifest/read.d.ts +4 -24
- package/dist/manifest/read.d.ts.map +1 -1
- package/dist/manifest/read.js +22 -46
- package/dist/manifest/read.js.map +1 -1
- package/dist/manifest/types.d.ts +17 -109
- package/dist/manifest/types.d.ts.map +1 -1
- package/dist/manifest/types.js +8 -37
- package/dist/manifest/types.js.map +1 -1
- package/dist/manifest/utils.d.ts +1 -27
- package/dist/manifest/utils.d.ts.map +1 -1
- package/dist/manifest/utils.js +1 -28
- package/dist/manifest/utils.js.map +1 -1
- package/dist/manifest/write.d.ts +3 -34
- package/dist/manifest/write.d.ts.map +1 -1
- package/dist/manifest/write.js +5 -45
- package/dist/manifest/write.js.map +1 -1
- package/dist/resolution/index.d.ts +7 -7
- package/dist/resolution/index.d.ts.map +1 -1
- package/dist/resolution/index.js +29 -19
- package/dist/resolution/index.js.map +1 -1
- package/dist/resolution/multi-kit-resolver.d.ts +2 -2
- package/dist/resolution/multi-kit-resolver.js +2 -2
- package/dist/resolution/primitives-registry.d.ts +1 -1
- package/dist/resolution/primitives-registry.js +2 -2
- package/dist/resolution/primitives-registry.js.map +1 -1
- package/dist/resolution/types.d.ts +1 -1
- package/dist/resolution/types.js +1 -1
- package/dist/tui/types.d.ts +1 -0
- package/dist/tui/types.d.ts.map +1 -1
- package/dist/tui/upgrade-select.d.ts +1 -1
- package/dist/tui/upgrade-select.d.ts.map +1 -1
- package/dist/tui/upgrade-select.js +15 -4
- package/dist/tui/upgrade-select.js.map +1 -1
- package/dist/validation/validate-kits.d.ts +1 -1
- package/dist/validation/validate-kits.js +5 -5
- package/dist/validation/validate-kits.js.map +1 -1
- package/package.json +1 -1
- package/schemas/{manifest.schema.json → kits-lock.schema.json} +34 -8
- package/schemas/kits-manifest.schema.json +95 -0
- package/schemas/{kits.schema.json → kits-registry.schema.json} +3 -3
- package/schemas/{primitives.schema.json → primitives-registry.schema.json} +2 -2
- package/dist/manifest/upgrade-check.d.ts.map +0 -1
- package/dist/manifest/upgrade-check.js.map +0 -1
package/dist/cli/upgrade.js
CHANGED
|
@@ -6,11 +6,14 @@
|
|
|
6
6
|
import * as clack from "@clack/prompts";
|
|
7
7
|
import pc from "picocolors";
|
|
8
8
|
import { ExitCode } from "./types.js";
|
|
9
|
-
import { readManifest } from "../manifest/index.js";
|
|
10
|
-
import {
|
|
9
|
+
import { readManifest, writeManifest, getManifestPath } from "../manifest/index.js";
|
|
10
|
+
import { hashManifest } from "../manifest/hash.js";
|
|
11
|
+
import { readLockfile } from "../lockfile/read.js";
|
|
12
|
+
import { writeLockfile } from "../lockfile/write.js";
|
|
13
|
+
import { checkForUpgrades } from "../lockfile/upgrade-check.js";
|
|
11
14
|
import { fetchSource, scanKits, NoFetcherError, SourceParseError, } from "../discovery/index.js";
|
|
12
15
|
import { PrimitivesRegistryLoader } from "../resolution/primitives-registry.js";
|
|
13
|
-
import { toUpgradeDisplayEntry, selectUpgrades, displayUpgradeCheck, upgradesToJson,
|
|
16
|
+
import { toUpgradeDisplayEntry, selectUpgrades, displayUpgradeCheck, upgradesToJson, filterUpgradesByHarness, } from "../tui/upgrade-select.js";
|
|
14
17
|
import { globalRegistry } from "../adapters/registry.js";
|
|
15
18
|
import { executeUpgrades } from "../core/upgrade-executor.js";
|
|
16
19
|
import { debugLog, enableDebugLogging, getDebugLogPath, checkDebugLogWritable, } from "../core/debug.js";
|
|
@@ -27,12 +30,40 @@ function getScopeFromOptions(options) {
|
|
|
27
30
|
}
|
|
28
31
|
return null;
|
|
29
32
|
}
|
|
33
|
+
function normalizeSourceRef(source) {
|
|
34
|
+
const atIndex = source.indexOf("@");
|
|
35
|
+
return atIndex === -1 ? source : source.slice(0, atIndex);
|
|
36
|
+
}
|
|
37
|
+
function filterLockfileBySource(lockfile, source) {
|
|
38
|
+
const normalized = normalizeSourceRef(source);
|
|
39
|
+
const filtered = {
|
|
40
|
+
...lockfile,
|
|
41
|
+
harnesses: {},
|
|
42
|
+
};
|
|
43
|
+
for (const [harnessName, harnessEntry] of Object.entries(lockfile.harnesses)) {
|
|
44
|
+
if (!harnessEntry)
|
|
45
|
+
continue;
|
|
46
|
+
const kits = {};
|
|
47
|
+
for (const [kitName, kit] of Object.entries(harnessEntry.kits)) {
|
|
48
|
+
if (normalizeSourceRef(kit.source) === normalized) {
|
|
49
|
+
kits[kitName] = kit;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
if (Object.keys(kits).length > 0) {
|
|
53
|
+
filtered.harnesses[harnessName] = {
|
|
54
|
+
...harnessEntry,
|
|
55
|
+
kits,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
return filtered;
|
|
60
|
+
}
|
|
30
61
|
/**
|
|
31
62
|
* Run the upgrade command.
|
|
32
63
|
*/
|
|
33
64
|
export async function runUpgrade(options) {
|
|
34
65
|
const isInteractive = !options.yes && !options.json;
|
|
35
|
-
|
|
66
|
+
const fetchResults = [];
|
|
36
67
|
enableDebugLogging(options.debug ?? false);
|
|
37
68
|
if (options.debug) {
|
|
38
69
|
const debugCheck = checkDebugLogWritable();
|
|
@@ -54,6 +85,8 @@ export async function runUpgrade(options) {
|
|
|
54
85
|
source: options.source,
|
|
55
86
|
agent: options.agent,
|
|
56
87
|
kit: options.kit,
|
|
88
|
+
alias: options.alias,
|
|
89
|
+
all: options.all ?? false,
|
|
57
90
|
check: options.check ?? false,
|
|
58
91
|
dryRun: options.dryRun ?? false,
|
|
59
92
|
yes: options.yes ?? false,
|
|
@@ -81,14 +114,26 @@ export async function runUpgrade(options) {
|
|
|
81
114
|
}
|
|
82
115
|
return { success: false, exitCode: ExitCode.ScopeRequired, error: message };
|
|
83
116
|
}
|
|
117
|
+
if (options.alias && options.all) {
|
|
118
|
+
const message = "--alias and --all cannot be used together.";
|
|
119
|
+
if (options.json) {
|
|
120
|
+
console.log(JSON.stringify({ success: false, error: message }));
|
|
121
|
+
}
|
|
122
|
+
else if (isInteractive) {
|
|
123
|
+
clack.log.error(message);
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
console.error(`Error: ${message}`);
|
|
127
|
+
}
|
|
128
|
+
return { success: false, exitCode: ExitCode.InvalidArguments, error: message };
|
|
129
|
+
}
|
|
84
130
|
try {
|
|
85
131
|
if (isInteractive) {
|
|
86
132
|
clack.intro(pc.cyan("@hashicorp/kits upgrade"));
|
|
87
133
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
const message = "No installation manifest found. No kits are installed.";
|
|
134
|
+
const lockfile = await readLockfile(scope, scope === "project" ? projectRoot : undefined);
|
|
135
|
+
if (!lockfile) {
|
|
136
|
+
const message = "No lockfile found. No kits are installed.";
|
|
92
137
|
if (isInteractive) {
|
|
93
138
|
clack.log.warn(message);
|
|
94
139
|
clack.outro(pc.yellow("Nothing to upgrade"));
|
|
@@ -109,10 +154,40 @@ export async function runUpgrade(options) {
|
|
|
109
154
|
}
|
|
110
155
|
return { success: true, exitCode: ExitCode.NoUpgradesAvailable };
|
|
111
156
|
}
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
const
|
|
157
|
+
const manifest = await readManifest(scope, scope === "project" ? projectRoot : undefined);
|
|
158
|
+
if (manifest) {
|
|
159
|
+
const currentHash = hashManifest(manifest);
|
|
160
|
+
const lockHash = lockfile.manifest?.hash;
|
|
161
|
+
if (!lockHash || lockHash !== currentHash) {
|
|
162
|
+
const message = "Lockfile is out of sync with kits.json. Run install to reconcile.";
|
|
163
|
+
if (isInteractive) {
|
|
164
|
+
clack.log.error(message);
|
|
165
|
+
clack.outro(pc.red("Upgrade failed"));
|
|
166
|
+
}
|
|
167
|
+
else if (options.json) {
|
|
168
|
+
console.log(JSON.stringify({ success: false, error: message }));
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
console.error(`Error: ${message}`);
|
|
172
|
+
}
|
|
173
|
+
return { success: false, exitCode: ExitCode.LockfileOutOfSync, error: message };
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
const sourcesFromLockfile = new Set();
|
|
177
|
+
for (const harnessEntry of Object.values(lockfile.harnesses)) {
|
|
178
|
+
if (!harnessEntry)
|
|
179
|
+
continue;
|
|
180
|
+
for (const kit of Object.values(harnessEntry.kits)) {
|
|
181
|
+
if (kit.source) {
|
|
182
|
+
sourcesFromLockfile.add(kit.source);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
const sourcesToCheck = options.source
|
|
187
|
+
? [options.source]
|
|
188
|
+
: Array.from(sourcesFromLockfile);
|
|
189
|
+
if (sourcesToCheck.length === 0) {
|
|
190
|
+
const message = "No source specified and no source in lockfile. Use --source to specify the kit repository.";
|
|
116
191
|
if (isInteractive) {
|
|
117
192
|
clack.log.error(message);
|
|
118
193
|
clack.outro(pc.red("Upgrade failed"));
|
|
@@ -125,72 +200,134 @@ export async function runUpgrade(options) {
|
|
|
125
200
|
}
|
|
126
201
|
return { success: false, exitCode: ExitCode.InvalidArguments, error: message };
|
|
127
202
|
}
|
|
128
|
-
|
|
129
|
-
const
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
203
|
+
const upgradesBySource = new Map();
|
|
204
|
+
const registryBySource = new Map();
|
|
205
|
+
const checkSourceMap = new Map();
|
|
206
|
+
const checkKey = (check) => `${check.harness}:${check.kit}:${check.type}:${check.primitive}`;
|
|
207
|
+
for (const sourceValue of sourcesToCheck) {
|
|
208
|
+
const filteredLockfile = filterLockfileBySource(lockfile, sourceValue);
|
|
209
|
+
const hasKits = Object.values(filteredLockfile.harnesses).some((entry) => entry && Object.keys(entry.kits).length > 0);
|
|
210
|
+
if (!hasKits) {
|
|
211
|
+
continue;
|
|
212
|
+
}
|
|
213
|
+
const fetchSpinner = isInteractive ? clack.spinner() : undefined;
|
|
138
214
|
if (fetchSpinner) {
|
|
139
|
-
fetchSpinner.
|
|
215
|
+
fetchSpinner.start(`Fetching ${pc.cyan(sourceValue)}...`);
|
|
216
|
+
}
|
|
217
|
+
else if (options.verbose) {
|
|
218
|
+
console.error(`Fetching ${sourceValue}...`);
|
|
219
|
+
}
|
|
220
|
+
let fetchResult;
|
|
221
|
+
try {
|
|
222
|
+
fetchResult = await fetchSource(sourceValue);
|
|
223
|
+
fetchResults.push(fetchResult);
|
|
224
|
+
if (fetchSpinner) {
|
|
225
|
+
fetchSpinner.stop(`Fetched ${pc.cyan(sourceValue)}`);
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
catch (error) {
|
|
229
|
+
if (fetchSpinner) {
|
|
230
|
+
fetchSpinner.stop(pc.red("Failed to fetch source"));
|
|
231
|
+
}
|
|
232
|
+
if (error instanceof NoFetcherError || error instanceof SourceParseError) {
|
|
233
|
+
const message = error.message;
|
|
234
|
+
if (isInteractive) {
|
|
235
|
+
clack.log.error(message);
|
|
236
|
+
clack.outro(pc.red("Upgrade failed"));
|
|
237
|
+
}
|
|
238
|
+
else if (options.json) {
|
|
239
|
+
console.log(JSON.stringify({ success: false, error: message }));
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
console.error(`Error: ${message}`);
|
|
243
|
+
}
|
|
244
|
+
return { success: false, exitCode: ExitCode.SourceNotFound, error: message };
|
|
245
|
+
}
|
|
246
|
+
throw error;
|
|
247
|
+
}
|
|
248
|
+
const scanSpinner = isInteractive ? clack.spinner() : undefined;
|
|
249
|
+
if (scanSpinner) {
|
|
250
|
+
scanSpinner.start("Checking for updates...");
|
|
251
|
+
}
|
|
252
|
+
await scanKits(fetchResult.localPath, sourceValue);
|
|
253
|
+
const registryLoader = new PrimitivesRegistryLoader(fetchResult.localPath);
|
|
254
|
+
await registryLoader.load();
|
|
255
|
+
const upgradeChecks = await checkForUpgrades(filteredLockfile, registryLoader);
|
|
256
|
+
if (scanSpinner) {
|
|
257
|
+
scanSpinner.stop("Checked for updates");
|
|
258
|
+
}
|
|
259
|
+
upgradesBySource.set(sourceValue, upgradeChecks);
|
|
260
|
+
registryBySource.set(sourceValue, registryLoader);
|
|
261
|
+
for (const check of upgradeChecks) {
|
|
262
|
+
checkSourceMap.set(checkKey(check), sourceValue);
|
|
140
263
|
}
|
|
141
264
|
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
265
|
+
const allUpgradeChecks = Array.from(upgradesBySource.values()).flat();
|
|
266
|
+
let displayEntries = allUpgradeChecks.map((check) => toUpgradeDisplayEntry(check, getHarnessDisplayName(check.harness)));
|
|
267
|
+
if (options.alias) {
|
|
268
|
+
displayEntries = displayEntries.filter((entry) => entry.kit === options.alias);
|
|
269
|
+
if (options.kit && options.kit.length > 0) {
|
|
270
|
+
const nameSet = new Set(options.kit);
|
|
271
|
+
displayEntries = displayEntries.filter((entry) => nameSet.has(entry.name ?? entry.kit));
|
|
145
272
|
}
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
273
|
+
}
|
|
274
|
+
if (options.kit && options.kit.length > 0 && !options.alias) {
|
|
275
|
+
const requested = options.kit;
|
|
276
|
+
const allowedInstances = new Set();
|
|
277
|
+
for (const kitName of requested) {
|
|
278
|
+
const aliasMatches = displayEntries.filter((entry) => entry.kit === kitName);
|
|
279
|
+
if (aliasMatches.length > 0) {
|
|
280
|
+
aliasMatches.forEach((entry) => allowedInstances.add(entry.kit));
|
|
281
|
+
continue;
|
|
151
282
|
}
|
|
152
|
-
|
|
153
|
-
|
|
283
|
+
const canonicalMatches = displayEntries.filter((entry) => (entry.name ?? entry.kit) === kitName);
|
|
284
|
+
const instanceNames = new Set(canonicalMatches.map((entry) => entry.kit));
|
|
285
|
+
if (instanceNames.size === 0) {
|
|
286
|
+
continue;
|
|
287
|
+
}
|
|
288
|
+
if (options.all || instanceNames.size === 1) {
|
|
289
|
+
for (const instanceName of instanceNames) {
|
|
290
|
+
allowedInstances.add(instanceName);
|
|
291
|
+
}
|
|
292
|
+
continue;
|
|
293
|
+
}
|
|
294
|
+
if (!isInteractive) {
|
|
295
|
+
const message = `Multiple kit instances match "${kitName}". Use --alias or --all.`;
|
|
296
|
+
if (options.json) {
|
|
297
|
+
console.log(JSON.stringify({ success: false, error: message }));
|
|
298
|
+
}
|
|
299
|
+
else {
|
|
300
|
+
console.error(`Error: ${message}`);
|
|
301
|
+
}
|
|
302
|
+
return { success: false, exitCode: ExitCode.InvalidArguments, error: message };
|
|
303
|
+
}
|
|
304
|
+
const choices = Array.from(instanceNames).map((instanceName) => ({
|
|
305
|
+
value: instanceName,
|
|
306
|
+
label: formatKitInstance(kitName, instanceName),
|
|
307
|
+
}));
|
|
308
|
+
choices.push({ value: "__all__", label: "All instances" });
|
|
309
|
+
const choice = await clack.select({
|
|
310
|
+
message: `Multiple instances of "${kitName}" are installed. Which would you like to upgrade?`,
|
|
311
|
+
options: choices,
|
|
312
|
+
});
|
|
313
|
+
if (clack.isCancel(choice)) {
|
|
314
|
+
clack.cancel("Upgrade cancelled");
|
|
315
|
+
return { success: true, exitCode: ExitCode.Success };
|
|
316
|
+
}
|
|
317
|
+
if (choice === "__all__") {
|
|
318
|
+
for (const instanceName of instanceNames) {
|
|
319
|
+
allowedInstances.add(instanceName);
|
|
320
|
+
}
|
|
154
321
|
}
|
|
155
322
|
else {
|
|
156
|
-
|
|
323
|
+
allowedInstances.add(choice);
|
|
157
324
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
throw error;
|
|
161
|
-
}
|
|
162
|
-
// Scan for kits and primitives
|
|
163
|
-
const scanSpinner = isInteractive ? clack.spinner() : undefined;
|
|
164
|
-
if (scanSpinner) {
|
|
165
|
-
scanSpinner.start("Checking for updates...");
|
|
166
|
-
}
|
|
167
|
-
await scanKits(fetchResult.localPath, source);
|
|
168
|
-
// Load primitives registry
|
|
169
|
-
const registryLoader = new PrimitivesRegistryLoader(fetchResult.localPath);
|
|
170
|
-
// Check for upgrades (manifest already loaded with correct scope)
|
|
171
|
-
const upgradeChecks = await checkForUpgrades(manifest, registryLoader);
|
|
172
|
-
if (scanSpinner) {
|
|
173
|
-
scanSpinner.stop("Checked for updates");
|
|
174
|
-
}
|
|
175
|
-
// Filter by kit and harness if specified
|
|
176
|
-
let filteredUpgradeChecks = upgradeChecks;
|
|
177
|
-
if (options.kit && options.kit.length > 0) {
|
|
178
|
-
const displayEntries = filteredUpgradeChecks.map((c) => toUpgradeDisplayEntry(c, getHarnessDisplayName(c.harness)));
|
|
179
|
-
const filtered = filterUpgradesByKit(displayEntries, options.kit);
|
|
180
|
-
filteredUpgradeChecks = filtered.map((e) => ({
|
|
181
|
-
...e,
|
|
182
|
-
harness: e.harness,
|
|
183
|
-
}));
|
|
325
|
+
}
|
|
326
|
+
displayEntries = displayEntries.filter((entry) => allowedInstances.has(entry.kit));
|
|
184
327
|
}
|
|
185
328
|
if (options.agent && options.agent.length > 0) {
|
|
186
|
-
|
|
187
|
-
const filtered = filterUpgradesByHarness(displayEntries, options.agent);
|
|
188
|
-
filteredUpgradeChecks = filtered.map((e) => ({
|
|
189
|
-
...e,
|
|
190
|
-
harness: e.harness,
|
|
191
|
-
}));
|
|
329
|
+
displayEntries = filterUpgradesByHarness(displayEntries, options.agent);
|
|
192
330
|
}
|
|
193
|
-
const displayEntries = filteredUpgradeChecks.map((check) => toUpgradeDisplayEntry(check, getHarnessDisplayName(check.harness)));
|
|
194
331
|
// Handle --dry-run as alias for --check
|
|
195
332
|
const isCheckOnly = options.check || options.dryRun;
|
|
196
333
|
if (isCheckOnly) {
|
|
@@ -257,16 +394,22 @@ export async function runUpgrade(options) {
|
|
|
257
394
|
selectedEntries = displayEntries;
|
|
258
395
|
}
|
|
259
396
|
// Convert back to UpgradeCheck for executor
|
|
260
|
-
const selectedChecks = selectedEntries.map((e) =>
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
397
|
+
const selectedChecks = selectedEntries.map((e) => {
|
|
398
|
+
const check = {
|
|
399
|
+
kit: e.kit,
|
|
400
|
+
harness: e.harness,
|
|
401
|
+
primitive: e.primitive,
|
|
402
|
+
type: e.type,
|
|
403
|
+
currentVersion: e.currentVersion,
|
|
404
|
+
availableVersion: e.availableVersion,
|
|
405
|
+
versionSpec: e.versionSpec,
|
|
406
|
+
breaking: e.breaking,
|
|
407
|
+
};
|
|
408
|
+
if (e.name) {
|
|
409
|
+
check.name = e.name;
|
|
410
|
+
}
|
|
411
|
+
return check;
|
|
412
|
+
});
|
|
270
413
|
// Get adapters for selected harnesses
|
|
271
414
|
const requiredHarnesses = new Set(selectedChecks.map((c) => c.harness));
|
|
272
415
|
const adapterMap = new Map();
|
|
@@ -276,58 +419,139 @@ export async function runUpgrade(options) {
|
|
|
276
419
|
adapterMap.set(harness, adapter);
|
|
277
420
|
}
|
|
278
421
|
}
|
|
279
|
-
|
|
422
|
+
const upgradesBySelectedSource = new Map();
|
|
423
|
+
for (const check of selectedChecks) {
|
|
424
|
+
const sourceKey = checkSourceMap.get(checkKey(check)) ?? options.source;
|
|
425
|
+
if (!sourceKey) {
|
|
426
|
+
const message = "Unable to resolve source for selected upgrade.";
|
|
427
|
+
if (isInteractive) {
|
|
428
|
+
clack.log.error(message);
|
|
429
|
+
clack.outro(pc.red("Upgrade failed"));
|
|
430
|
+
}
|
|
431
|
+
else if (options.json) {
|
|
432
|
+
console.log(JSON.stringify({ success: false, error: message }));
|
|
433
|
+
}
|
|
434
|
+
else {
|
|
435
|
+
console.error(`Error: ${message}`);
|
|
436
|
+
}
|
|
437
|
+
return { success: false, exitCode: ExitCode.InstallationFailed, error: message };
|
|
438
|
+
}
|
|
439
|
+
const existing = upgradesBySelectedSource.get(sourceKey) ?? [];
|
|
440
|
+
existing.push(check);
|
|
441
|
+
upgradesBySelectedSource.set(sourceKey, existing);
|
|
442
|
+
}
|
|
443
|
+
const aggregateResult = {
|
|
444
|
+
success: true,
|
|
445
|
+
upgraded: [],
|
|
446
|
+
failed: [],
|
|
447
|
+
backupPaths: [],
|
|
448
|
+
};
|
|
280
449
|
const upgradeSpinner = isInteractive ? clack.spinner() : undefined;
|
|
281
450
|
if (upgradeSpinner) {
|
|
282
451
|
upgradeSpinner.start("Applying upgrades...");
|
|
283
452
|
}
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
453
|
+
for (const [sourceKey, checks] of upgradesBySelectedSource) {
|
|
454
|
+
const registryLoader = registryBySource.get(sourceKey);
|
|
455
|
+
if (!registryLoader) {
|
|
456
|
+
aggregateResult.success = false;
|
|
457
|
+
aggregateResult.failed.push(...checks.map((check) => ({
|
|
458
|
+
primitive: check.primitive,
|
|
459
|
+
type: check.type,
|
|
460
|
+
harness: check.harness,
|
|
461
|
+
kit: check.kit,
|
|
462
|
+
currentVersion: check.currentVersion,
|
|
463
|
+
newVersion: check.availableVersion,
|
|
464
|
+
success: false,
|
|
465
|
+
error: `No registry available for ${sourceKey}`,
|
|
466
|
+
})));
|
|
467
|
+
continue;
|
|
468
|
+
}
|
|
469
|
+
const result = await executeUpgrades(checks, adapterMap, registryLoader, lockfile, {
|
|
470
|
+
onProgress: (progress) => {
|
|
471
|
+
if (options.verbose) {
|
|
472
|
+
console.error(` ${progress.phase}: ${progress.primitive} ${progress.currentVersion} → ${progress.newVersion}`);
|
|
473
|
+
}
|
|
474
|
+
},
|
|
475
|
+
});
|
|
476
|
+
if (!result.success) {
|
|
477
|
+
aggregateResult.success = false;
|
|
478
|
+
}
|
|
479
|
+
aggregateResult.upgraded.push(...result.upgraded);
|
|
480
|
+
aggregateResult.failed.push(...result.failed);
|
|
481
|
+
aggregateResult.backupPaths.push(...result.backupPaths);
|
|
482
|
+
}
|
|
291
483
|
if (upgradeSpinner) {
|
|
292
|
-
upgradeSpinner.stop(
|
|
484
|
+
upgradeSpinner.stop(aggregateResult.success ? "Upgrades complete" : pc.red("Upgrade failed"));
|
|
485
|
+
}
|
|
486
|
+
if (manifest && options.save && aggregateResult.upgraded.length > 0) {
|
|
487
|
+
const updatedSources = new Set();
|
|
488
|
+
for (const sourceKey of upgradesBySelectedSource.keys()) {
|
|
489
|
+
const normalized = normalizeSourceRef(sourceKey);
|
|
490
|
+
const index = manifest.sources.findIndex((entry) => normalizeSourceRef(entry.source) === normalized);
|
|
491
|
+
if (index === -1) {
|
|
492
|
+
continue;
|
|
493
|
+
}
|
|
494
|
+
if (!manifest.sources[index].source.includes("@")) {
|
|
495
|
+
if (options.verbose) {
|
|
496
|
+
console.error(`Warning: --save skipped for ${manifest.sources[index].source} (no pinned ref present)`);
|
|
497
|
+
}
|
|
498
|
+
continue;
|
|
499
|
+
}
|
|
500
|
+
if (!sourceKey.includes("@")) {
|
|
501
|
+
if (options.verbose) {
|
|
502
|
+
console.error(`Warning: --save skipped for ${sourceKey} (no pinned ref present)`);
|
|
503
|
+
}
|
|
504
|
+
continue;
|
|
505
|
+
}
|
|
506
|
+
manifest.sources[index].source = sourceKey;
|
|
507
|
+
updatedSources.add(sourceKey);
|
|
508
|
+
}
|
|
509
|
+
if (updatedSources.size > 0) {
|
|
510
|
+
const manifestPath = lockfile.manifest?.path ?? getManifestPath(scope, scope === "project" ? projectRoot : undefined);
|
|
511
|
+
const updatedHash = hashManifest(manifest);
|
|
512
|
+
await writeManifest(manifest, scope, scope === "project" ? projectRoot : undefined);
|
|
513
|
+
lockfile.manifest = { path: manifestPath, hash: updatedHash };
|
|
514
|
+
await writeLockfile(lockfile, scope, scope === "project" ? projectRoot : undefined);
|
|
515
|
+
}
|
|
293
516
|
}
|
|
294
517
|
// Display results
|
|
295
518
|
if (isInteractive) {
|
|
296
519
|
console.log();
|
|
297
|
-
if (
|
|
298
|
-
clack.log.success(`Upgraded ${
|
|
299
|
-
for (const u of
|
|
520
|
+
if (aggregateResult.upgraded.length > 0) {
|
|
521
|
+
clack.log.success(`Upgraded ${aggregateResult.upgraded.length} primitive${aggregateResult.upgraded.length === 1 ? "" : "s"}`);
|
|
522
|
+
for (const u of aggregateResult.upgraded) {
|
|
300
523
|
console.log(` ${pc.green("✓")} ${u.primitive}: ${u.currentVersion} → ${u.newVersion}`);
|
|
301
524
|
}
|
|
302
525
|
}
|
|
303
|
-
if (
|
|
304
|
-
clack.log.error(`Failed to upgrade ${
|
|
305
|
-
for (const f of
|
|
306
|
-
|
|
526
|
+
if (aggregateResult.failed.length > 0) {
|
|
527
|
+
clack.log.error(`Failed to upgrade ${aggregateResult.failed.length} primitive${aggregateResult.failed.length === 1 ? "" : "s"}`);
|
|
528
|
+
for (const f of aggregateResult.failed) {
|
|
529
|
+
const errorMsg = f.error ?? "Upgrade failed";
|
|
530
|
+
console.log(` ${pc.red("✗")} ${f.primitive}: ${errorMsg}`);
|
|
307
531
|
}
|
|
308
532
|
}
|
|
309
|
-
if (
|
|
533
|
+
if (aggregateResult.backupPaths.length > 0) {
|
|
310
534
|
console.log();
|
|
311
535
|
clack.log.info("Backups created:");
|
|
312
|
-
for (const backup of
|
|
536
|
+
for (const backup of aggregateResult.backupPaths) {
|
|
313
537
|
console.log(` ${pc.dim(backup)}`);
|
|
314
538
|
}
|
|
315
539
|
}
|
|
316
|
-
clack.outro(
|
|
540
|
+
clack.outro(aggregateResult.success
|
|
317
541
|
? pc.green("Upgrade successful")
|
|
318
542
|
: pc.red("Upgrade completed with errors"));
|
|
319
543
|
}
|
|
320
544
|
else if (options.json) {
|
|
321
545
|
console.log(JSON.stringify({
|
|
322
|
-
success:
|
|
323
|
-
upgraded:
|
|
324
|
-
failed:
|
|
325
|
-
backupPaths:
|
|
546
|
+
success: aggregateResult.success,
|
|
547
|
+
upgraded: aggregateResult.upgraded,
|
|
548
|
+
failed: aggregateResult.failed,
|
|
549
|
+
backupPaths: aggregateResult.backupPaths,
|
|
326
550
|
}));
|
|
327
551
|
}
|
|
328
552
|
return {
|
|
329
|
-
success:
|
|
330
|
-
exitCode:
|
|
553
|
+
success: aggregateResult.success,
|
|
554
|
+
exitCode: aggregateResult.success ? ExitCode.Success : ExitCode.InstallationFailed,
|
|
331
555
|
};
|
|
332
556
|
}
|
|
333
557
|
catch (error) {
|
|
@@ -345,10 +569,12 @@ export async function runUpgrade(options) {
|
|
|
345
569
|
return { success: false, exitCode: ExitCode.InstallationFailed, error: message };
|
|
346
570
|
}
|
|
347
571
|
finally {
|
|
348
|
-
// Clean up fetched
|
|
349
|
-
|
|
572
|
+
// Clean up fetched sources
|
|
573
|
+
for (const fetched of fetchResults) {
|
|
574
|
+
if (!fetched.cleanup)
|
|
575
|
+
continue;
|
|
350
576
|
try {
|
|
351
|
-
await
|
|
577
|
+
await fetched.cleanup();
|
|
352
578
|
}
|
|
353
579
|
catch {
|
|
354
580
|
// Ignore cleanup errors
|
|
@@ -369,4 +595,7 @@ function getHarnessDisplayName(harness) {
|
|
|
369
595
|
};
|
|
370
596
|
return names[harness] || harness;
|
|
371
597
|
}
|
|
598
|
+
function formatKitInstance(name, installAs) {
|
|
599
|
+
return name === installAs ? name : `${name} (as ${installAs})`;
|
|
600
|
+
}
|
|
372
601
|
//# sourceMappingURL=upgrade.js.map
|
package/dist/cli/upgrade.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/cli/upgrade.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/cli/upgrade.ts"],"names":[],"mappings":"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"}
|