@detergent-software/atk 9.4.0-dev.9 → 9.4.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/CHANGELOG.md +391 -0
- package/README.md +7 -2
- package/build/command-manifest.json +33 -7
- package/build/commands/_app.d.ts.map +1 -1
- package/build/commands/_app.js +4 -2
- package/build/commands/_app.js.map +1 -1
- package/build/commands/audit.d.ts.map +1 -1
- package/build/commands/audit.js +7 -4
- package/build/commands/audit.js.map +1 -1
- package/build/commands/diff.d.ts.map +1 -1
- package/build/commands/diff.js +10 -10
- package/build/commands/diff.js.map +1 -1
- package/build/commands/doctor.d.ts.map +1 -1
- package/build/commands/doctor.js +1 -1
- package/build/commands/doctor.js.map +1 -1
- package/build/commands/info.d.ts.map +1 -1
- package/build/commands/info.js +16 -14
- package/build/commands/info.js.map +1 -1
- package/build/commands/init.d.ts.map +1 -1
- package/build/commands/init.js +1 -1
- package/build/commands/init.js.map +1 -1
- package/build/commands/install.d.ts.map +1 -1
- package/build/commands/install.js +127 -69
- package/build/commands/install.js.map +1 -1
- package/build/commands/move.d.ts.map +1 -1
- package/build/commands/move.js +5 -4
- package/build/commands/move.js.map +1 -1
- package/build/commands/outdated.js +1 -1
- package/build/commands/outdated.js.map +1 -1
- package/build/commands/sync.d.ts.map +1 -1
- package/build/commands/sync.js +6 -4
- package/build/commands/sync.js.map +1 -1
- package/build/commands/update.d.ts +1 -1
- package/build/commands/update.d.ts.map +1 -1
- package/build/commands/update.js +1 -1
- package/build/commands/update.js.map +1 -1
- package/build/commands/upgrade.d.ts +16 -0
- package/build/commands/upgrade.d.ts.map +1 -0
- package/build/commands/upgrade.js +64 -0
- package/build/commands/upgrade.js.map +1 -0
- package/build/commands/why.d.ts.map +1 -1
- package/build/commands/why.js +28 -7
- package/build/commands/why.js.map +1 -1
- package/build/components/DiffView.d.ts +3 -1
- package/build/components/DiffView.d.ts.map +1 -1
- package/build/components/DiffView.js +18 -4
- package/build/components/DiffView.js.map +1 -1
- package/build/components/EnabledEntriesHint.d.ts +14 -0
- package/build/components/EnabledEntriesHint.d.ts.map +1 -0
- package/build/components/EnabledEntriesHint.js +13 -0
- package/build/components/EnabledEntriesHint.js.map +1 -0
- package/build/components/InitSuccess.d.ts.map +1 -1
- package/build/components/InitSuccess.js +4 -1
- package/build/components/InitSuccess.js.map +1 -1
- package/build/components/InstallSummary.d.ts +7 -2
- package/build/components/InstallSummary.d.ts.map +1 -1
- package/build/components/InstallSummary.js +3 -1
- package/build/components/InstallSummary.js.map +1 -1
- package/build/components/LeftoverFilesHint.d.ts +21 -0
- package/build/components/LeftoverFilesHint.d.ts.map +1 -0
- package/build/components/LeftoverFilesHint.js +13 -0
- package/build/components/LeftoverFilesHint.js.map +1 -0
- package/build/components/index.d.ts +2 -0
- package/build/components/index.d.ts.map +1 -1
- package/build/components/index.js +2 -0
- package/build/components/index.js.map +1 -1
- package/build/hooks/useInitState.d.ts +9 -1
- package/build/hooks/useInitState.d.ts.map +1 -1
- package/build/hooks/useInitState.js +52 -10
- package/build/hooks/useInitState.js.map +1 -1
- package/build/hooks/useListActions.d.ts.map +1 -1
- package/build/hooks/useListActions.js +4 -1
- package/build/hooks/useListActions.js.map +1 -1
- package/build/hooks/useUninstallState.d.ts.map +1 -1
- package/build/hooks/useUninstallState.js +46 -23
- package/build/hooks/useUninstallState.js.map +1 -1
- package/build/lib/adapter.d.ts +14 -9
- package/build/lib/adapter.d.ts.map +1 -1
- package/build/lib/adapter.js +46 -8
- package/build/lib/adapter.js.map +1 -1
- package/build/lib/api-client.d.ts.map +1 -1
- package/build/lib/api-client.js +2 -1
- package/build/lib/api-client.js.map +1 -1
- package/build/lib/asset-tools.d.ts +8 -0
- package/build/lib/asset-tools.d.ts.map +1 -1
- package/build/lib/asset-tools.js +14 -0
- package/build/lib/asset-tools.js.map +1 -1
- package/build/lib/completion/candidates.d.ts.map +1 -1
- package/build/lib/completion/candidates.js +21 -8
- package/build/lib/completion/candidates.js.map +1 -1
- package/build/lib/config-entries.d.ts +3 -3
- package/build/lib/config-entries.d.ts.map +1 -1
- package/build/lib/config-entries.js +16 -6
- package/build/lib/config-entries.js.map +1 -1
- package/build/lib/config-lock.d.ts +2 -1
- package/build/lib/config-lock.d.ts.map +1 -1
- package/build/lib/config-lock.js +10 -2
- package/build/lib/config-lock.js.map +1 -1
- package/build/lib/cross-scope.d.ts +6 -2
- package/build/lib/cross-scope.d.ts.map +1 -1
- package/build/lib/cross-scope.js +20 -13
- package/build/lib/cross-scope.js.map +1 -1
- package/build/lib/diagnostics.d.ts +3 -2
- package/build/lib/diagnostics.d.ts.map +1 -1
- package/build/lib/diagnostics.js +11 -11
- package/build/lib/diagnostics.js.map +1 -1
- package/build/lib/diff-command.d.ts +9 -3
- package/build/lib/diff-command.d.ts.map +1 -1
- package/build/lib/diff-command.js +58 -21
- package/build/lib/diff-command.js.map +1 -1
- package/build/lib/diff.d.ts +8 -4
- package/build/lib/diff.d.ts.map +1 -1
- package/build/lib/diff.js +23 -4
- package/build/lib/diff.js.map +1 -1
- package/build/lib/doctor-fix.d.ts +8 -3
- package/build/lib/doctor-fix.d.ts.map +1 -1
- package/build/lib/doctor-fix.js +50 -3
- package/build/lib/doctor-fix.js.map +1 -1
- package/build/lib/enabled-list.d.ts +7 -3
- package/build/lib/enabled-list.d.ts.map +1 -1
- package/build/lib/enabled-list.js +7 -5
- package/build/lib/enabled-list.js.map +1 -1
- package/build/lib/gitignore.d.ts +8 -0
- package/build/lib/gitignore.d.ts.map +1 -1
- package/build/lib/gitignore.js +51 -6
- package/build/lib/gitignore.js.map +1 -1
- package/build/lib/hook-config.d.ts +90 -7
- package/build/lib/hook-config.d.ts.map +1 -1
- package/build/lib/hook-config.js +135 -11
- package/build/lib/hook-config.js.map +1 -1
- package/build/lib/hook-script.d.ts +45 -0
- package/build/lib/hook-script.d.ts.map +1 -1
- package/build/lib/hook-script.js +118 -1
- package/build/lib/hook-script.js.map +1 -1
- package/build/lib/init.d.ts +34 -12
- package/build/lib/init.d.ts.map +1 -1
- package/build/lib/init.js +180 -32
- package/build/lib/init.js.map +1 -1
- package/build/lib/install-targets.d.ts +20 -6
- package/build/lib/install-targets.d.ts.map +1 -1
- package/build/lib/install-targets.js +65 -8
- package/build/lib/install-targets.js.map +1 -1
- package/build/lib/installer.d.ts +15 -5
- package/build/lib/installer.d.ts.map +1 -1
- package/build/lib/installer.js +201 -41
- package/build/lib/installer.js.map +1 -1
- package/build/lib/local-edits.d.ts +15 -2
- package/build/lib/local-edits.d.ts.map +1 -1
- package/build/lib/local-edits.js +40 -13
- package/build/lib/local-edits.js.map +1 -1
- package/build/lib/lockfile.d.ts +2 -2
- package/build/lib/lockfile.js +4 -4
- package/build/lib/lockfile.js.map +1 -1
- package/build/lib/mover.d.ts +5 -4
- package/build/lib/mover.d.ts.map +1 -1
- package/build/lib/mover.js +43 -35
- package/build/lib/mover.js.map +1 -1
- package/build/lib/multi-tool-install.d.ts +28 -5
- package/build/lib/multi-tool-install.d.ts.map +1 -1
- package/build/lib/multi-tool-install.js +105 -26
- package/build/lib/multi-tool-install.js.map +1 -1
- package/build/lib/named-entry.d.ts +12 -0
- package/build/lib/named-entry.d.ts.map +1 -1
- package/build/lib/named-entry.js +16 -8
- package/build/lib/named-entry.js.map +1 -1
- package/build/lib/notices.d.ts +2 -0
- package/build/lib/notices.d.ts.map +1 -1
- package/build/lib/notices.js +10 -0
- package/build/lib/notices.js.map +1 -1
- package/build/lib/schemas/adapter.d.ts +33 -0
- package/build/lib/schemas/adapter.d.ts.map +1 -1
- package/build/lib/schemas/adapter.js +31 -5
- package/build/lib/schemas/adapter.js.map +1 -1
- package/build/lib/self-upgrade.d.ts +66 -0
- package/build/lib/self-upgrade.d.ts.map +1 -0
- package/build/lib/self-upgrade.js +183 -0
- package/build/lib/self-upgrade.js.map +1 -0
- package/build/lib/sync.d.ts +39 -0
- package/build/lib/sync.d.ts.map +1 -1
- package/build/lib/sync.js +181 -10
- package/build/lib/sync.js.map +1 -1
- package/build/lib/touched-paths.d.ts.map +1 -1
- package/build/lib/touched-paths.js +2 -1
- package/build/lib/touched-paths.js.map +1 -1
- package/build/lib/uninstaller.d.ts +29 -1
- package/build/lib/uninstaller.d.ts.map +1 -1
- package/build/lib/uninstaller.js +99 -5
- package/build/lib/uninstaller.js.map +1 -1
- package/build/lib/update-check.d.ts +27 -1
- package/build/lib/update-check.d.ts.map +1 -1
- package/build/lib/update-check.js +74 -8
- package/build/lib/update-check.js.map +1 -1
- package/build/lib/updater.d.ts +2 -0
- package/build/lib/updater.d.ts.map +1 -1
- package/build/lib/updater.js +36 -3
- package/build/lib/updater.js.map +1 -1
- package/build/lib/version.d.ts +12 -4
- package/build/lib/version.d.ts.map +1 -1
- package/build/lib/version.js +19 -7
- package/build/lib/version.js.map +1 -1
- package/package.json +1 -1
- package/tool-adapters/claude-code.json +2 -1
- package/tool-adapters/codex-cli.json +5 -1
- package/tool-adapters/copilot-cli.json +58 -9
|
@@ -2,15 +2,16 @@ import { existsSync } from 'node:fs';
|
|
|
2
2
|
import { readFile } from 'node:fs/promises';
|
|
3
3
|
import { adapterAsPlaced, resolveInstalledPaths } from './adapter.js';
|
|
4
4
|
import { isExcludedAtVersion, isExcludedForTool, isUndeclaredForTool } from './asset-tools.js';
|
|
5
|
-
import {
|
|
5
|
+
import { gitBlobShas } from './checksum.js';
|
|
6
6
|
import { loadConfig } from './config.js';
|
|
7
|
-
import { computeAddedFileDiff, computeRemovedFileDiff, computeUnifiedDiff } from './diff.js';
|
|
7
|
+
import { computeAddedFileDiff, computeRemovedFileDiff, computeUnifiedDiff, splitContentLines } from './diff.js';
|
|
8
8
|
import { errorGuidance, errorMessage } from './errors.js';
|
|
9
9
|
import { findInstalledAssetWithFallback, readLockfile } from './lockfile.js';
|
|
10
|
-
import {
|
|
10
|
+
import { entrySpec, lookupNamedEntry } from './named-entry.js';
|
|
11
|
+
import { formatOrgName, GLOBAL_PREFIX, resolveSpecOrg, scopeSwitchGuidance } from './org.js';
|
|
11
12
|
import { fetchAssetFileBytes, fetchRegistry, findAsset, getSortedVersions, listAssetFiles, RegistryError, resolveAssetVersion, versionTools, } from './registry.js';
|
|
12
13
|
import { fromRoot } from './root-path.js';
|
|
13
|
-
import { resolveScope, scopedCommand } from './scope.js';
|
|
14
|
+
import { resolveScope, scopedCommand, scopeLabel } from './scope.js';
|
|
14
15
|
import { resolveTool } from './tool-resolver.js';
|
|
15
16
|
/**
|
|
16
17
|
* Core logic for the `atk diff` command. Computes the diff between a locally
|
|
@@ -26,29 +27,33 @@ import { resolveTool } from './tool-resolver.js';
|
|
|
26
27
|
* @param projectRoot - Optional project root override
|
|
27
28
|
* @param user - Use the user scope (`--user`)
|
|
28
29
|
* @param cliOrg - Org from the --org CLI flag
|
|
29
|
-
* @param
|
|
30
|
+
* @param named - The name as given: `@org/name`, `global:name` (which `--org` contradicts) or bare
|
|
30
31
|
* @param progress - Callback to report progress messages to the UI
|
|
31
32
|
*/
|
|
32
|
-
export async function computeDiffOutcome(name, target, org, tool, context, refresh, projectRoot, user, cliOrg,
|
|
33
|
+
export async function computeDiffOutcome(name, target, org, tool, context, refresh, projectRoot, user, cliOrg, named, progress) {
|
|
33
34
|
const { root: projectDir, scope } = await resolveScope({ projectRoot, user });
|
|
34
35
|
progress('Loading configuration...');
|
|
35
36
|
const config = await loadConfig();
|
|
36
37
|
const { adapter } = await resolveTool(tool, projectDir);
|
|
37
38
|
progress('Reading lockfile...');
|
|
38
39
|
const lockfile = await readLockfile(projectDir);
|
|
39
|
-
//
|
|
40
|
-
// the global entry (mirrors how `install` resolved the name).
|
|
41
|
-
|
|
42
|
-
const
|
|
40
|
+
// For a bare name the active org is a preference: prefer that org's lockfile entry, fall back to
|
|
41
|
+
// the global entry (mirrors how `install` resolved the name). `@org/name` and `global:name` name
|
|
42
|
+
// one entry, as the other commands read them (`lookupNamedEntry`).
|
|
43
|
+
const resolvedOrg = resolveSpecOrg(named, cliOrg, lockfile.org, config.org);
|
|
44
|
+
const installed = named.kind === 'default'
|
|
45
|
+
? findInstalledAssetWithFallback(lockfile, name, undefined, resolvedOrg)
|
|
46
|
+
: findScopedEntry(lockfile, named, target, { root: projectDir, scope });
|
|
43
47
|
if (!installed) {
|
|
44
48
|
return { name, outcome: 'not-installed' };
|
|
45
49
|
}
|
|
50
|
+
const spec = entrySpec(lockfile, installed);
|
|
46
51
|
// Uninstalled for this tool (`atk uninstall --tool`): there is no local copy to diff. A range
|
|
47
52
|
// compares two published versions, so it reads no local copy.
|
|
48
53
|
const excluded = target.kind !== 'range' && isExcludedForTool(installed, adapter.tool);
|
|
49
54
|
if (excluded && !isUndeclaredForTool(installed, adapter.tool)) {
|
|
50
55
|
throw Object.assign(new Error(`Asset "${name}" is not installed for ${adapter.tool}.`), {
|
|
51
|
-
command: scopedCommand(`atk install ${
|
|
56
|
+
command: scopedCommand(`atk install ${spec} --tool ${adapter.tool}`, scope),
|
|
52
57
|
hint: `It was uninstalled for ${adapter.tool}. Reinstall it for that tool, or pass --tool for a tool that has it.`,
|
|
53
58
|
});
|
|
54
59
|
}
|
|
@@ -76,7 +81,7 @@ export async function computeDiffOutcome(name, target, org, tool, context, refre
|
|
|
76
81
|
const from = resolveAssetVersion(registryAsset, target.from);
|
|
77
82
|
const to = from && resolveAssetVersion(registryAsset, target.to);
|
|
78
83
|
if (!from || !to) {
|
|
79
|
-
return versionNotFound(registryAsset, name, scope, target.kind, from ? target.to : target.from);
|
|
84
|
+
return versionNotFound(registryAsset, name, spec, scope, target.kind, from ? target.to : target.from);
|
|
80
85
|
}
|
|
81
86
|
progress(`Fetching v${from.version} and v${to.version}...`);
|
|
82
87
|
return {
|
|
@@ -94,7 +99,7 @@ export async function computeDiffOutcome(name, target, org, tool, context, refre
|
|
|
94
99
|
// The locked version too: it may have been unpublished since it was installed.
|
|
95
100
|
const resolvedTarget = resolveAssetVersion(registryAsset, requested);
|
|
96
101
|
if (!resolvedTarget) {
|
|
97
|
-
return versionNotFound(registryAsset, name, scope, target.kind, requested);
|
|
102
|
+
return versionNotFound(registryAsset, name, spec, scope, target.kind, requested);
|
|
98
103
|
}
|
|
99
104
|
comparedVersion = resolvedTarget.version;
|
|
100
105
|
}
|
|
@@ -135,17 +140,17 @@ export async function computeDiffOutcome(name, target, org, tool, context, refre
|
|
|
135
140
|
}
|
|
136
141
|
filesToFetch.push({ file, installedPath, remotePath: remoteFile.relativePath, remoteSha: remoteFile.sha });
|
|
137
142
|
}
|
|
138
|
-
// Diff each file in parallel. A local file with the remote's git blob sha
|
|
139
|
-
// it is unchanged and the remote side isn't fetched.
|
|
143
|
+
// Diff each file in parallel. A local file with the remote's git blob sha, with either line ending
|
|
144
|
+
// as the local-edits check and checksums count it, is unchanged and the remote side isn't fetched.
|
|
140
145
|
const fileDiffs = await Promise.all(filesToFetch.map(async ({ file, installedPath, remotePath, remoteSha }) => {
|
|
141
146
|
const localBytes = await readFile(fromRoot(projectDir, installedPath));
|
|
142
147
|
const localContent = localBytes.toString('utf-8');
|
|
143
|
-
const localLines = localContent
|
|
144
|
-
if (
|
|
148
|
+
const localLines = splitContentLines(localContent).length;
|
|
149
|
+
if (gitBlobShas(localBytes).includes(remoteSha)) {
|
|
145
150
|
return { fileName: file.sourcePath, localLines, remoteLines: localLines, status: 'unchanged' };
|
|
146
151
|
}
|
|
147
152
|
const remoteContent = await fetchRemoteText(assetRef, comparedVersion, remotePath);
|
|
148
|
-
const remoteLines = remoteContent
|
|
153
|
+
const remoteLines = splitContentLines(remoteContent).length;
|
|
149
154
|
if (localContent === remoteContent) {
|
|
150
155
|
return { fileName: file.sourcePath, localLines, remoteLines, status: 'unchanged' };
|
|
151
156
|
}
|
|
@@ -180,6 +185,7 @@ export async function computeDiffOutcome(name, target, org, tool, context, refre
|
|
|
180
185
|
registryAsset,
|
|
181
186
|
sameVersion,
|
|
182
187
|
scope,
|
|
188
|
+
spec,
|
|
183
189
|
target: target.kind,
|
|
184
190
|
};
|
|
185
191
|
}
|
|
@@ -208,7 +214,7 @@ async function diffVersions(ref, name, from, to, context) {
|
|
|
208
214
|
if (fromContent === toContent) {
|
|
209
215
|
return { fileName, status: 'unchanged' };
|
|
210
216
|
}
|
|
211
|
-
const lines = { fromLines: fromContent
|
|
217
|
+
const lines = { fromLines: splitContentLines(fromContent).length, toLines: splitContentLines(toContent).length };
|
|
212
218
|
return { diffLines: computeUnifiedDiff(fromContent, toContent, context), fileName, ...lines, status: 'modified' };
|
|
213
219
|
};
|
|
214
220
|
const diffAddedFile = async (fileName) => ({
|
|
@@ -226,6 +232,24 @@ async function diffVersions(ref, name, from, to, context) {
|
|
|
226
232
|
async function fetchRemoteText(ref, version, relativePath) {
|
|
227
233
|
return (await fetchAssetFileBytes(ref, version, relativePath)).toString('utf-8');
|
|
228
234
|
}
|
|
235
|
+
/**
|
|
236
|
+
* The entry an `@org/name` or `global:name` names, with no fallback to another scope. A name that
|
|
237
|
+
* reaches no entry while other entries of that name are installed is refused with them, as
|
|
238
|
+
* `findNamedEntry` refuses it; with none, it is not installed. A name installed as more than one
|
|
239
|
+
* type takes the first entry, since diff has no `--type`.
|
|
240
|
+
*/
|
|
241
|
+
function findScopedEntry(lockfile, named, target, where) {
|
|
242
|
+
const spec = named.kind === 'global' ? `${GLOBAL_PREFIX}${named.name}` : formatOrgName(named.org, named.name);
|
|
243
|
+
const { elsewhere, matches } = lookupNamedEntry(lockfile, spec);
|
|
244
|
+
if (matches.length > 0 || elsewhere.length === 0)
|
|
245
|
+
return matches[0];
|
|
246
|
+
const message = `Asset "${spec}" is not installed in ${scopeLabel(where)}. Installed as: ${elsewhere.join(', ')}.`;
|
|
247
|
+
throw Object.assign(new Error(message), {
|
|
248
|
+
...(elsewhere.length === 1
|
|
249
|
+
? { command: scopedCommand(`atk diff ${elsewhere[0]}${targetArgs(target)}`, where.scope) }
|
|
250
|
+
: {}),
|
|
251
|
+
});
|
|
252
|
+
}
|
|
229
253
|
/** The files of a registry version, by their path relative to the version root. */
|
|
230
254
|
async function listRemoteFiles(ref, name, version) {
|
|
231
255
|
try {
|
|
@@ -246,6 +270,19 @@ function requestedVersion(target, installed) {
|
|
|
246
270
|
return target.version;
|
|
247
271
|
}
|
|
248
272
|
}
|
|
273
|
+
/** How `atk diff` asks for `target` after the name: `@<version>`, `@<from>..<to>` or ` --installed`. */
|
|
274
|
+
function targetArgs(target) {
|
|
275
|
+
switch (target.kind) {
|
|
276
|
+
case 'installed':
|
|
277
|
+
return ' --installed';
|
|
278
|
+
case 'latest':
|
|
279
|
+
return '';
|
|
280
|
+
case 'range':
|
|
281
|
+
return `@${target.from}..${target.to}`;
|
|
282
|
+
case 'version':
|
|
283
|
+
return `@${target.version}`;
|
|
284
|
+
}
|
|
285
|
+
}
|
|
249
286
|
/**
|
|
250
287
|
* The error for diffing a hook marked undeclared for `tool` (`undeclaredTools`): the registry no
|
|
251
288
|
* longer has its locked version, the version doesn't declare the tool, or it now does, and
|
|
@@ -270,8 +307,8 @@ function undeclaredError(name, installed, tool, registry, scope) {
|
|
|
270
307
|
});
|
|
271
308
|
}
|
|
272
309
|
/** The outcome for a version the registry doesn't have, with the versions it does. */
|
|
273
|
-
function versionNotFound(asset, name, scope, target, version) {
|
|
310
|
+
function versionNotFound(asset, name, spec, scope, target, version) {
|
|
274
311
|
const { versions: availableVersions } = getSortedVersions(asset);
|
|
275
|
-
return { availableVersions, name, outcome: 'version-not-found', scope, target, version };
|
|
312
|
+
return { availableVersions, name, outcome: 'version-not-found', scope, spec, target, version };
|
|
276
313
|
}
|
|
277
314
|
//# sourceMappingURL=diff-command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-command.js","sourceRoot":"","sources":["../../src/lib/diff-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"diff-command.js","sourceRoot":"","sources":["../../src/lib/diff-command.ts"],"names":[],"mappings":"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"}
|
package/build/lib/diff.d.ts
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* A single line in a unified diff, with its type and text content.
|
|
3
|
-
* The `content` field does NOT include the prefix character (+, -, or
|
|
3
|
+
* The `content` field does NOT include the prefix character (+, -, space, or the `\ ` of a
|
|
4
|
+
* no-newline marker).
|
|
4
5
|
*/
|
|
5
6
|
export interface DiffLine {
|
|
6
7
|
content: string;
|
|
7
8
|
type: DiffLineType;
|
|
8
9
|
}
|
|
9
10
|
/**
|
|
10
|
-
* The type of a line in a unified diff output.
|
|
11
|
+
* The type of a line in a unified diff output. A `no-newline` line is the marker that the line
|
|
12
|
+
* before it is its side's last and has no final newline, not a line of the file.
|
|
11
13
|
*/
|
|
12
|
-
export type DiffLineType = 'addition' | 'context' | 'deletion' | 'hunk-header';
|
|
14
|
+
export type DiffLineType = 'addition' | 'context' | 'deletion' | 'hunk-header' | 'no-newline';
|
|
13
15
|
/**
|
|
14
16
|
* Produce diff lines for a completely new file (all lines are additions).
|
|
15
17
|
*
|
|
@@ -25,6 +27,8 @@ export declare function computeRemovedFileDiff(content: string): DiffLine[];
|
|
|
25
27
|
/**
|
|
26
28
|
* Compute a unified diff between two strings.
|
|
27
29
|
* Returns an array of typed diff lines including hunk headers, context, additions, and deletions.
|
|
30
|
+
* Line endings are ignored: CRLF counts as LF on both sides, so a CRLF copy with one edited line
|
|
31
|
+
* diffs as that line, and two texts that differ only in line endings have no lines.
|
|
28
32
|
*
|
|
29
33
|
* @param oldContent - The original file content.
|
|
30
34
|
* @param newContent - The new file content.
|
|
@@ -33,7 +37,7 @@ export declare function computeRemovedFileDiff(content: string): DiffLine[];
|
|
|
33
37
|
export declare function computeUnifiedDiff(oldContent: string, newContent: string, contextLines?: number): DiffLine[];
|
|
34
38
|
/**
|
|
35
39
|
* Split content into lines and strip the trailing empty string
|
|
36
|
-
* that results from a final newline character.
|
|
40
|
+
* that results from a final newline character. CRLF counts as LF, so no line keeps its `\r`.
|
|
37
41
|
*
|
|
38
42
|
* @param content - The raw string content to split.
|
|
39
43
|
*/
|
package/build/lib/diff.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/lib/diff.ts"],"names":[],"mappings":"AAEA
|
|
1
|
+
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/lib/diff.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,YAAY,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG,SAAS,GAAG,UAAU,GAAG,aAAa,GAAG,YAAY,CAAC;AAE9F;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,EAAE,CAehE;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,EAAE,CAelE;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,GAAE,MAAU,GAAG,QAAQ,EAAE,CA+B/G;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAM3D"}
|
package/build/lib/diff.js
CHANGED
|
@@ -14,7 +14,7 @@ export function computeAddedFileDiff(content) {
|
|
|
14
14
|
for (const line of contentLines) {
|
|
15
15
|
lines.push({ content: line, type: 'addition' });
|
|
16
16
|
}
|
|
17
|
-
return lines;
|
|
17
|
+
return withNoNewlineMarker(lines, content);
|
|
18
18
|
}
|
|
19
19
|
/**
|
|
20
20
|
* Produce diff lines for a completely removed file (all lines are deletions).
|
|
@@ -31,11 +31,13 @@ export function computeRemovedFileDiff(content) {
|
|
|
31
31
|
for (const line of contentLines) {
|
|
32
32
|
lines.push({ content: line, type: 'deletion' });
|
|
33
33
|
}
|
|
34
|
-
return lines;
|
|
34
|
+
return withNoNewlineMarker(lines, content);
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
37
|
* Compute a unified diff between two strings.
|
|
38
38
|
* Returns an array of typed diff lines including hunk headers, context, additions, and deletions.
|
|
39
|
+
* Line endings are ignored: CRLF counts as LF on both sides, so a CRLF copy with one edited line
|
|
40
|
+
* diffs as that line, and two texts that differ only in line endings have no lines.
|
|
39
41
|
*
|
|
40
42
|
* @param oldContent - The original file content.
|
|
41
43
|
* @param newContent - The new file content.
|
|
@@ -44,6 +46,7 @@ export function computeRemovedFileDiff(content) {
|
|
|
44
46
|
export function computeUnifiedDiff(oldContent, newContent, contextLines = 3) {
|
|
45
47
|
const patch = structuredPatch('a', 'b', oldContent, newContent, undefined, undefined, {
|
|
46
48
|
context: contextLines,
|
|
49
|
+
stripTrailingCr: true,
|
|
47
50
|
});
|
|
48
51
|
const lines = [];
|
|
49
52
|
for (const hunk of patch.hunks) {
|
|
@@ -60,6 +63,9 @@ export function computeUnifiedDiff(oldContent, newContent, contextLines = 3) {
|
|
|
60
63
|
else if (prefix === '-') {
|
|
61
64
|
lines.push({ content: text, type: 'deletion' });
|
|
62
65
|
}
|
|
66
|
+
else if (prefix === '\\') {
|
|
67
|
+
lines.push({ content: text.trimStart(), type: 'no-newline' });
|
|
68
|
+
}
|
|
63
69
|
else {
|
|
64
70
|
lines.push({ content: text, type: 'context' });
|
|
65
71
|
}
|
|
@@ -69,15 +75,28 @@ export function computeUnifiedDiff(oldContent, newContent, contextLines = 3) {
|
|
|
69
75
|
}
|
|
70
76
|
/**
|
|
71
77
|
* Split content into lines and strip the trailing empty string
|
|
72
|
-
* that results from a final newline character.
|
|
78
|
+
* that results from a final newline character. CRLF counts as LF, so no line keeps its `\r`.
|
|
73
79
|
*
|
|
74
80
|
* @param content - The raw string content to split.
|
|
75
81
|
*/
|
|
76
82
|
export function splitContentLines(content) {
|
|
77
|
-
const lines = content.split(
|
|
83
|
+
const lines = content.split(/\r?\n/);
|
|
78
84
|
if (lines.length > 0 && lines[lines.length - 1] === '') {
|
|
79
85
|
lines.pop();
|
|
80
86
|
}
|
|
81
87
|
return lines;
|
|
82
88
|
}
|
|
89
|
+
/**
|
|
90
|
+
* Append the no-newline marker, as `computeUnifiedDiff` words it, when non-empty content has no
|
|
91
|
+
* final newline.
|
|
92
|
+
*
|
|
93
|
+
* @param lines - The diff lines of the whole file.
|
|
94
|
+
* @param content - The file's content.
|
|
95
|
+
*/
|
|
96
|
+
function withNoNewlineMarker(lines, content) {
|
|
97
|
+
if (content !== '' && !content.endsWith('\n')) {
|
|
98
|
+
lines.push({ content: 'No newline at end of file', type: 'no-newline' });
|
|
99
|
+
}
|
|
100
|
+
return lines;
|
|
101
|
+
}
|
|
83
102
|
//# sourceMappingURL=diff.js.map
|
package/build/lib/diff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/lib/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/lib/diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { DiagnosticCheck } from '../components/index.js';
|
|
2
2
|
import { type DeviceCodePrompt } from './entra.js';
|
|
3
|
+
import { type UpgradeDeps } from './self-upgrade.js';
|
|
3
4
|
/** A repair `atk doctor --fix` can make, planned from the check it fixes. */
|
|
4
5
|
export interface DoctorFix {
|
|
5
6
|
/** The `id` of the check it fixes. */
|
|
@@ -7,7 +8,7 @@ export interface DoctorFix {
|
|
|
7
8
|
/** The command that makes the same repair by hand. */
|
|
8
9
|
command: string;
|
|
9
10
|
description: string;
|
|
10
|
-
kind: 'clear-cache' | 'login' | 'sync';
|
|
11
|
+
kind: 'clear-cache' | 'login' | 'sync' | 'upgrade';
|
|
11
12
|
}
|
|
12
13
|
export interface FixOptions {
|
|
13
14
|
/** False in `--json`: the sign-in is skipped, since a device-code sign-in needs someone at a browser. */
|
|
@@ -16,6 +17,8 @@ export interface FixOptions {
|
|
|
16
17
|
progress: (message: string) => void;
|
|
17
18
|
/** The scope, as `runDiagnostics` took it. */
|
|
18
19
|
projectRoot?: string;
|
|
20
|
+
/** The upgrade's npm and package; the tests pass fakes. */
|
|
21
|
+
upgradeDeps?: (progress: (message: string) => void) => UpgradeDeps;
|
|
19
22
|
user?: boolean;
|
|
20
23
|
}
|
|
21
24
|
export interface FixResult extends DoctorFix {
|
|
@@ -26,8 +29,10 @@ export interface FixResult extends DoctorFix {
|
|
|
26
29
|
export declare function applyFix(fix: DoctorFix, options: FixOptions): Promise<FixResult>;
|
|
27
30
|
/**
|
|
28
31
|
* The repairs for the checks that have one: a cached registry that doesn't parse, installed assets
|
|
29
|
-
* with missing files,
|
|
30
|
-
*
|
|
32
|
+
* with missing files, a missing, expired or rejected `atk login` session, and a CLI older than its
|
|
33
|
+
* channel on npm or than the API accepts (one upgrade for both). A refused `ATK_TOKEN` has none: the
|
|
34
|
+
* variable is the caller's to change. The upgrade comes last, so every other repair runs on the
|
|
35
|
+
* code this process loaded.
|
|
31
36
|
*/
|
|
32
37
|
export declare function planFixes(checks: DiagnosticCheck[]): DoctorFix[];
|
|
33
38
|
//# sourceMappingURL=doctor-fix.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor-fix.d.ts","sourceRoot":"","sources":["../../src/lib/doctor-fix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D,OAAO,EAAE,KAAK,gBAAgB,EAA4D,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"doctor-fix.d.ts","sourceRoot":"","sources":["../../src/lib/doctor-fix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D,OAAO,EAAE,KAAK,gBAAgB,EAA4D,MAAM,YAAY,CAAC;AAM7G,OAAO,EAAkC,KAAK,WAAW,EAAgB,MAAM,mBAAmB,CAAC;AAMnG,6EAA6E;AAC7E,MAAM,WAAW,SAAS;IACxB,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;CACpD;AAED,MAAM,WAAW,UAAU;IACzB,yGAAyG;IACzG,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACjD,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,8CAA8C;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2DAA2D;IAC3D,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAAK,WAAW,CAAC;IACnE,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,SAAU,SAAQ,SAAS;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CAC1C;AAED,wGAAwG;AACxG,wBAAsB,QAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAoBtF;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,SAAS,EAAE,CA0ChE"}
|
package/build/lib/doctor-fix.js
CHANGED
|
@@ -4,10 +4,15 @@ import { clearTokenCache, getLastEntraSession } from './auth.js';
|
|
|
4
4
|
import { loadConfig } from './config.js';
|
|
5
5
|
import { getEntraSession, loginWithDeviceCode, removeEntraAccount } from './entra.js';
|
|
6
6
|
import { errorMessage } from './errors.js';
|
|
7
|
+
import { removeNotice } from './notices.js';
|
|
8
|
+
import { isOffline } from './offline.js';
|
|
7
9
|
import { clearCache, fetchRegistry } from './registry.js';
|
|
8
10
|
import { loadScopeConfig, resolveScope } from './scope.js';
|
|
11
|
+
import { defaultUpgradeDeps, upgradeCli, UpgradeError } from './self-upgrade.js';
|
|
9
12
|
import { syncAssets } from './sync.js';
|
|
10
13
|
import { resolvePlacingTools } from './tool-resolver.js';
|
|
14
|
+
import { hideUpdateBanner } from './update-check.js';
|
|
15
|
+
import { UPGRADE_COMMAND } from './version.js';
|
|
11
16
|
/** Make one repair. Never throws: a repair that fails is a `failed` result with the error's message. */
|
|
12
17
|
export async function applyFix(fix, options) {
|
|
13
18
|
try {
|
|
@@ -23,6 +28,8 @@ export async function applyFix(fix, options) {
|
|
|
23
28
|
return await signIn(fix, options);
|
|
24
29
|
case 'sync':
|
|
25
30
|
return await syncMissing(fix, options);
|
|
31
|
+
case 'upgrade':
|
|
32
|
+
return await upgradeSelf(fix, options);
|
|
26
33
|
}
|
|
27
34
|
}
|
|
28
35
|
catch (err) {
|
|
@@ -31,12 +38,28 @@ export async function applyFix(fix, options) {
|
|
|
31
38
|
}
|
|
32
39
|
/**
|
|
33
40
|
* The repairs for the checks that have one: a cached registry that doesn't parse, installed assets
|
|
34
|
-
* with missing files,
|
|
35
|
-
*
|
|
41
|
+
* with missing files, a missing, expired or rejected `atk login` session, and a CLI older than its
|
|
42
|
+
* channel on npm or than the API accepts (one upgrade for both). A refused `ATK_TOKEN` has none: the
|
|
43
|
+
* variable is the caller's to change. The upgrade comes last, so every other repair runs on the
|
|
44
|
+
* code this process loaded.
|
|
36
45
|
*/
|
|
37
46
|
export function planFixes(checks) {
|
|
38
47
|
const fixes = [];
|
|
48
|
+
const last = [];
|
|
39
49
|
for (const check of checks) {
|
|
50
|
+
// Not with --offline: the upgrade reads npm, so it could only fail.
|
|
51
|
+
const outdated = (check.id === 'cli-version' && check.status === 'warn') || (check.id === 'auth' && check.status === 'fail');
|
|
52
|
+
if (outdated && check.command === UPGRADE_COMMAND) {
|
|
53
|
+
if (last.length === 0 && !isOffline()) {
|
|
54
|
+
last.push({
|
|
55
|
+
check: check.id,
|
|
56
|
+
command: UPGRADE_COMMAND,
|
|
57
|
+
description: "Install the newest ATK CLI on this CLI's npm channel",
|
|
58
|
+
kind: 'upgrade',
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
40
63
|
if (check.id === 'cache' && check.status === 'fail') {
|
|
41
64
|
fixes.push({
|
|
42
65
|
check: check.id,
|
|
@@ -62,7 +85,7 @@ export function planFixes(checks) {
|
|
|
62
85
|
});
|
|
63
86
|
}
|
|
64
87
|
}
|
|
65
|
-
return fixes;
|
|
88
|
+
return [...fixes, ...last];
|
|
66
89
|
}
|
|
67
90
|
/**
|
|
68
91
|
* Sign in with a device code, as `atk login` does, and confirm the new token with `GET /me`.
|
|
@@ -150,4 +173,28 @@ async function syncMissing(fix, options) {
|
|
|
150
173
|
}
|
|
151
174
|
return { ...fix, message: `${placed}${editedNote}`, status: synced > 0 ? 'applied' : 'skipped' };
|
|
152
175
|
}
|
|
176
|
+
/** `atk upgrade` on the running CLI's channel. A refusal (not an npm global install, say) fails with its command. */
|
|
177
|
+
async function upgradeSelf(fix, options) {
|
|
178
|
+
try {
|
|
179
|
+
const result = await upgradeCli({}, (options.upgradeDeps ?? defaultUpgradeDeps)(options.progress));
|
|
180
|
+
// The update check's notice and banner were set against the version this process loaded.
|
|
181
|
+
removeNotice('update-available');
|
|
182
|
+
hideUpdateBanner();
|
|
183
|
+
if (result.outcome === 'current') {
|
|
184
|
+
return { ...fix, message: `Already ${result.to}, the newest on npm ${result.tag}`, status: 'skipped' };
|
|
185
|
+
}
|
|
186
|
+
return {
|
|
187
|
+
...fix,
|
|
188
|
+
// The checks below run in this process, which still sends the API its old version.
|
|
189
|
+
message: `Installed ${result.to} from npm ${result.tag} (this run was ${result.from}); run \`atk doctor\` again to check the API with it`,
|
|
190
|
+
status: 'applied',
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
catch (err) {
|
|
194
|
+
if (err instanceof UpgradeError && err.command) {
|
|
195
|
+
return { ...fix, message: `${err.message} Run \`${err.command}\`.`, status: 'failed' };
|
|
196
|
+
}
|
|
197
|
+
throw err;
|
|
198
|
+
}
|
|
199
|
+
}
|
|
153
200
|
//# sourceMappingURL=doctor-fix.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor-fix.js","sourceRoot":"","sources":["../../src/lib/doctor-fix.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAkB,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAyB,eAAe,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC7G,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"doctor-fix.js","sourceRoot":"","sources":["../../src/lib/doctor-fix.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Append entry names to a string-array key in a config file (e.g., `enabledMcpjsonServers`
|
|
3
3
|
* in `.claude/settings.local.json`), creating the file/array as needed and de-duplicating.
|
|
4
|
-
* Used to auto-approve installed MCP servers so the tool doesn't prompt on open.
|
|
5
|
-
*
|
|
4
|
+
* Used to auto-approve installed MCP servers so the tool doesn't prompt on open. A name the same
|
|
5
|
+
* file lists under `disabledListKey` (e.g. `disabledMcpjsonServers`) is the user's denial, and is
|
|
6
|
+
* left out. Returns the names it added: a name already in the list is not one of them.
|
|
6
7
|
*/
|
|
7
|
-
export declare function addToEnabledList(enabledListFilePath: string, enabledListKey: string, names: string[],
|
|
8
|
+
export declare function addToEnabledList(enabledListFilePath: string, enabledListKey: string, names: string[], { disabledListKey, onProgress }?: {
|
|
9
|
+
disabledListKey?: string;
|
|
10
|
+
onProgress?: (message: string) => void;
|
|
11
|
+
}): Promise<string[]>;
|
|
8
12
|
/**
|
|
9
13
|
* Remove entry names from a string-array key in a config file (e.g., `enabledMcpjsonServers`
|
|
10
14
|
* in `.claude/settings.local.json`). Drops the array key when it becomes empty, and with
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enabled-list.d.ts","sourceRoot":"","sources":["../../src/lib/enabled-list.ts"],"names":[],"mappings":"AAOA
|
|
1
|
+
{"version":3,"file":"enabled-list.d.ts","sourceRoot":"","sources":["../../src/lib/enabled-list.ts"],"names":[],"mappings":"AAOA;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,mBAAmB,EAAE,MAAM,EAC3B,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,EAAE,EACf,EAAE,eAAe,EAAE,UAAU,EAAE,GAAE;IAAE,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAAO,GACzG,OAAO,CAAC,MAAM,EAAE,CAAC,CAgCnB;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,mBAAmB,EAAE,MAAM,EAC3B,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,EAAE,EACf,eAAe,EAAE,OAAO,EACxB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GACrC,OAAO,CAAC,OAAO,CAAC,CAuClB"}
|
|
@@ -6,10 +6,11 @@ import { errorMessage } from './errors.js';
|
|
|
6
6
|
/**
|
|
7
7
|
* Append entry names to a string-array key in a config file (e.g., `enabledMcpjsonServers`
|
|
8
8
|
* in `.claude/settings.local.json`), creating the file/array as needed and de-duplicating.
|
|
9
|
-
* Used to auto-approve installed MCP servers so the tool doesn't prompt on open.
|
|
10
|
-
*
|
|
9
|
+
* Used to auto-approve installed MCP servers so the tool doesn't prompt on open. A name the same
|
|
10
|
+
* file lists under `disabledListKey` (e.g. `disabledMcpjsonServers`) is the user's denial, and is
|
|
11
|
+
* left out. Returns the names it added: a name already in the list is not one of them.
|
|
11
12
|
*/
|
|
12
|
-
export async function addToEnabledList(enabledListFilePath, enabledListKey, names, onProgress) {
|
|
13
|
+
export async function addToEnabledList(enabledListFilePath, enabledListKey, names, { disabledListKey, onProgress } = {}) {
|
|
13
14
|
try {
|
|
14
15
|
const format = detectConfigFormat(enabledListFilePath);
|
|
15
16
|
let config = {};
|
|
@@ -24,9 +25,10 @@ export async function addToEnabledList(enabledListFilePath, enabledListKey, name
|
|
|
24
25
|
}
|
|
25
26
|
const existing = Array.isArray(config[enabledListKey]) ? config[enabledListKey] : [];
|
|
26
27
|
const list = existing.filter((v) => typeof v === 'string');
|
|
27
|
-
const
|
|
28
|
+
const denied = disabledListKey && Array.isArray(config[disabledListKey]) ? config[disabledListKey] : [];
|
|
29
|
+
const added = names.filter((name, i) => !list.includes(name) && !denied.includes(name) && names.indexOf(name) === i);
|
|
28
30
|
list.push(...added);
|
|
29
|
-
if (added.length > 0
|
|
31
|
+
if (added.length > 0) {
|
|
30
32
|
config[enabledListKey] = list;
|
|
31
33
|
await writeConfigFile(enabledListFilePath, config, format, onProgress);
|
|
32
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enabled-list.js","sourceRoot":"","sources":["../../src/lib/enabled-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C
|
|
1
|
+
{"version":3,"file":"enabled-list.js","sourceRoot":"","sources":["../../src/lib/enabled-list.ts"],"names":[],"mappings":"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"}
|