@detergent-software/atk 9.4.0-dev.9 → 9.4.1-dev.1
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 +401 -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 +161 -90
- 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/PreferredScopeWarning.d.ts +4 -3
- package/build/components/PreferredScopeWarning.d.ts.map +1 -1
- package/build/components/PreferredScopeWarning.js +5 -2
- package/build/components/PreferredScopeWarning.js.map +1 -1
- 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/preferred-scope.d.ts +19 -5
- package/build/lib/preferred-scope.d.ts.map +1 -1
- package/build/lib/preferred-scope.js +38 -18
- package/build/lib/preferred-scope.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
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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"}
|
package/build/lib/gitignore.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Adapter } from './schemas/adapter.js';
|
|
2
|
+
import type { Lockfile } from './schemas/lockfile.js';
|
|
2
3
|
/**
|
|
3
4
|
* Ensure that all required gitignore entries for an adapter's placements
|
|
4
5
|
* are present in the project's `.gitignore` file.
|
|
@@ -58,4 +59,11 @@ export declare function hasAtkGitignoreBlock(dir: string): Promise<boolean>;
|
|
|
58
59
|
* Handles minor variations such as trailing slashes and leading slashes.
|
|
59
60
|
*/
|
|
60
61
|
export declare function isEntryPresent(gitignoreContent: string, pattern: string): boolean;
|
|
62
|
+
/**
|
|
63
|
+
* Remove from the ATK block of `projectDir`'s `.gitignore` each of {@link RETIRED_PATTERNS} that
|
|
64
|
+
* the adapter doesn't place and that no config entry in `lockfile` still records: until an
|
|
65
|
+
* install or sync has moved ATK's entries out of a retired file, it stays ignored. The same
|
|
66
|
+
* pattern anywhere else in the file is the user's and stays.
|
|
67
|
+
*/
|
|
68
|
+
export declare function removeRetiredGitignoreEntries(projectDir: string, adapter: Adapter, lockfile: Lockfile): Promise<void>;
|
|
61
69
|
//# sourceMappingURL=gitignore.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitignore.d.ts","sourceRoot":"","sources":["../../src/lib/gitignore.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"gitignore.d.ts","sourceRoot":"","sources":["../../src/lib/gitignore.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAYtD;;;;;;;;;;GAUG;AACH,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAcxD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAsDxD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAwC/D;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAKxE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAYjF;AAED;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,IAAI,CAAC,CAcf"}
|
package/build/lib/gitignore.js
CHANGED
|
@@ -2,6 +2,13 @@ import { existsSync } from 'node:fs';
|
|
|
2
2
|
import { readFile, writeFile } from 'node:fs/promises';
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
const ATK_HEADER = '# ATK managed assets';
|
|
5
|
+
/**
|
|
6
|
+
* Config files an adapter once placed and no longer does: copilot-cli's mcp-config went to
|
|
7
|
+
* `copilot/mcp-config.json`, then `.vscode/mcp.json` (ATK-410), then `.github/mcp.json` (ATK-823).
|
|
8
|
+
* Their lines leave the ATK block once nothing ATK installed is in them
|
|
9
|
+
* ({@link removeRetiredGitignoreEntries}), so a team's own VS Code `mcp.json` can be committed again.
|
|
10
|
+
*/
|
|
11
|
+
const RETIRED_PATTERNS = ['.vscode/mcp.json', 'copilot/mcp-config.json'];
|
|
5
12
|
/**
|
|
6
13
|
* Ensure that all required gitignore entries for an adapter's placements
|
|
7
14
|
* are present in the project's `.gitignore` file.
|
|
@@ -72,12 +79,7 @@ export async function ensureGitignorePatterns(projectDir, patterns) {
|
|
|
72
79
|
// following it (i.e., at the end of the ATK block).
|
|
73
80
|
const lines = content.split('\n');
|
|
74
81
|
const headerIndex = lines.findIndex((line) => line.trim() === ATK_HEADER);
|
|
75
|
-
|
|
76
|
-
// Walk past existing entries in the ATK block
|
|
77
|
-
while (insertIndex < lines.length && lines[insertIndex].trim() !== '' && !lines[insertIndex].startsWith('#')) {
|
|
78
|
-
insertIndex++;
|
|
79
|
-
}
|
|
80
|
-
lines.splice(insertIndex, 0, newEntries);
|
|
82
|
+
lines.splice(atkBlockEnd(lines, headerIndex), 0, newEntries);
|
|
81
83
|
updatedContent = lines.join('\n');
|
|
82
84
|
}
|
|
83
85
|
else {
|
|
@@ -166,6 +168,34 @@ export function isEntryPresent(gitignoreContent, pattern) {
|
|
|
166
168
|
return normalizePattern(line) === normalized;
|
|
167
169
|
});
|
|
168
170
|
}
|
|
171
|
+
/**
|
|
172
|
+
* Remove from the ATK block of `projectDir`'s `.gitignore` each of {@link RETIRED_PATTERNS} that
|
|
173
|
+
* the adapter doesn't place and that no config entry in `lockfile` still records: until an
|
|
174
|
+
* install or sync has moved ATK's entries out of a retired file, it stays ignored. The same
|
|
175
|
+
* pattern anywhere else in the file is the user's and stays.
|
|
176
|
+
*/
|
|
177
|
+
export async function removeRetiredGitignoreEntries(projectDir, adapter, lockfile) {
|
|
178
|
+
const gitignorePath = join(projectDir, '.gitignore');
|
|
179
|
+
if (!existsSync(gitignorePath))
|
|
180
|
+
return;
|
|
181
|
+
const inUse = new Set([
|
|
182
|
+
...getGitignorePatterns(adapter),
|
|
183
|
+
...(lockfile.assets ?? []).flatMap((asset) => (asset.configEntries ?? []).map((entry) => entry.file)),
|
|
184
|
+
].map(normalizePattern));
|
|
185
|
+
const retired = RETIRED_PATTERNS.filter((pattern) => !inUse.has(normalizePattern(pattern)));
|
|
186
|
+
const content = await readFile(gitignorePath, 'utf-8');
|
|
187
|
+
const updated = removeFromAtkBlock(content, retired);
|
|
188
|
+
if (updated !== content)
|
|
189
|
+
await writeFile(gitignorePath, updated, 'utf-8');
|
|
190
|
+
}
|
|
191
|
+
/** The index just past the ATK block's entries: the contiguous non-empty, non-comment lines after its header. */
|
|
192
|
+
function atkBlockEnd(lines, headerIndex) {
|
|
193
|
+
let end = headerIndex + 1;
|
|
194
|
+
while (end < lines.length && lines[end].trim() !== '' && !lines[end].startsWith('#')) {
|
|
195
|
+
end++;
|
|
196
|
+
}
|
|
197
|
+
return end;
|
|
198
|
+
}
|
|
169
199
|
/**
|
|
170
200
|
* Normalize a placement's `configFile` value into a gitignore-friendly pattern.
|
|
171
201
|
* Converts backslashes to forward slashes and strips a leading `./`.
|
|
@@ -195,4 +225,19 @@ function normalizePattern(pattern) {
|
|
|
195
225
|
}
|
|
196
226
|
return normalized;
|
|
197
227
|
}
|
|
228
|
+
/** `content` without the ATK block's lines that match one of `patterns`. */
|
|
229
|
+
function removeFromAtkBlock(content, patterns) {
|
|
230
|
+
if (patterns.length === 0)
|
|
231
|
+
return content;
|
|
232
|
+
const lines = content.split('\n');
|
|
233
|
+
const headerIndex = lines.findIndex((line) => line.trim() === ATK_HEADER);
|
|
234
|
+
if (headerIndex === -1)
|
|
235
|
+
return content;
|
|
236
|
+
const removed = new Set(patterns.map(normalizePattern));
|
|
237
|
+
const end = atkBlockEnd(lines, headerIndex);
|
|
238
|
+
const block = lines.slice(headerIndex + 1, end).filter((line) => !removed.has(normalizePattern(line)));
|
|
239
|
+
if (block.length === end - headerIndex - 1)
|
|
240
|
+
return content;
|
|
241
|
+
return [...lines.slice(0, headerIndex + 1), ...block, ...lines.slice(end)].join('\n');
|
|
242
|
+
}
|
|
198
243
|
//# sourceMappingURL=gitignore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitignore.js","sourceRoot":"","sources":["../../src/lib/gitignore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"gitignore.js","sourceRoot":"","sources":["../../src/lib/gitignore.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { PlacementConfig } from './schemas/adapter.js';
|
|
2
|
-
import type { HookEventBinding } from './schemas/index.js';
|
|
2
|
+
import type { HookConfig, HookEventBinding } from './schemas/index.js';
|
|
3
3
|
/**
|
|
4
4
|
* Helpers for translating a hook asset's `hookConfig` event bindings into
|
|
5
5
|
* tool-valid hook config (e.g. Claude Code's `.claude/settings.json` `hooks`
|
|
@@ -13,6 +13,31 @@ import type { HookEventBinding } from './schemas/index.js';
|
|
|
13
13
|
* This module is intentionally dependency-free so it can be shared by the
|
|
14
14
|
* installer, uninstaller, and checksum verifier without import cycles.
|
|
15
15
|
*/
|
|
16
|
+
/**
|
|
17
|
+
* A Copilot CLI hook entry under an event array. Copilot runs `bash` on Linux and macOS and
|
|
18
|
+
* `powershell` on Windows; ATK writes the same command in both, one that both shells run, unless
|
|
19
|
+
* the placement has a `configCommandPowershell` ({@link hookPowershellCommand}).
|
|
20
|
+
*
|
|
21
|
+
* Copilot CLI 1.0.105 also runs the hooks in a project's `.claude/settings.json`, and sets
|
|
22
|
+
* `CLAUDE_PROJECT_DIR` for every hook, which 0.0.422 did neither of (ATK-820). So the project
|
|
23
|
+
* adapter's commands exit at once when that variable is set, Claude Code's copy of the script is
|
|
24
|
+
* there (executable, for a `.sh`; ATK gitignores the scripts but not the settings) and Claude Code's
|
|
25
|
+
* settings register it: a hook installed for both tools then runs once in Copilot, from Claude
|
|
26
|
+
* Code's entry. For a `.sh` hook's `bash`, the settings have to register Claude Code's command with
|
|
27
|
+
* the path quoted (`"$CLAUDE_PROJECT_DIR"/…`, ATK-850; behind {@link deriveHookCommand}'s
|
|
28
|
+
* PowerShell prefix since ATK-849, without it as the CLI before wrote it), or the unquoted one an
|
|
29
|
+
* older CLI wrote while the project's path has no space: from a path with a space that one fails,
|
|
30
|
+
* and sync rewrites it only
|
|
31
|
+
* for a developer who has Claude Code set up. A `.sh` hook's `powershell` has no guard, since on
|
|
32
|
+
* Windows Copilot runs Claude Code's command in PowerShell, where it steps aside (ATK-849) or, as an
|
|
33
|
+
* older CLI wrote it, fails, and Copilot's own entry is the run that works.
|
|
34
|
+
*/
|
|
35
|
+
export interface CopilotHookEntry {
|
|
36
|
+
bash: string;
|
|
37
|
+
powershell: string;
|
|
38
|
+
timeoutSec?: number;
|
|
39
|
+
type: 'command';
|
|
40
|
+
}
|
|
16
41
|
/** A single Claude-Code-style hook command entry. */
|
|
17
42
|
export interface HookCommand {
|
|
18
43
|
command: string;
|
|
@@ -24,6 +49,22 @@ export interface HookGroup {
|
|
|
24
49
|
hooks: HookCommand[];
|
|
25
50
|
matcher?: string;
|
|
26
51
|
}
|
|
52
|
+
/** A `hookConfig` event a hook placement leaves out, and why. */
|
|
53
|
+
export interface LeftOutHookEvent {
|
|
54
|
+
event: string;
|
|
55
|
+
reason: 'duplicate' | 'matcher' | 'unknown-event';
|
|
56
|
+
}
|
|
57
|
+
/** One event a hook placement registers, by the tool's own name for it. */
|
|
58
|
+
export interface PlacedHookEvent {
|
|
59
|
+
binding: HookEventBinding | undefined;
|
|
60
|
+
event: string;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Build the entry a hook placement appends under an event, in its `configHookFormat`: a
|
|
64
|
+
* matcher-group ({@link buildHookGroup}) by default, or a Copilot CLI entry, whose timeout is
|
|
65
|
+
* `timeoutSec` and whose `powershell` is `powershellCommand` (the `command` without one).
|
|
66
|
+
*/
|
|
67
|
+
export declare function buildHookEntry(placement: Pick<PlacementConfig, 'configHookFormat'>, command: string, binding: HookEventBinding | undefined, powershellCommand?: string): CopilotHookEntry | HookGroup;
|
|
27
68
|
/**
|
|
28
69
|
* Build a tool-valid hook matcher-group for a single event binding.
|
|
29
70
|
* Only includes `matcher`/`timeout` when set, keeping config (and its checksum) minimal.
|
|
@@ -32,29 +73,71 @@ export declare function buildHookGroup(command: string, binding: HookEventBindin
|
|
|
32
73
|
/**
|
|
33
74
|
* Derive the hook command string from the placement's command prefix and the
|
|
34
75
|
* installed script's project-relative POSIX path.
|
|
35
|
-
* e.g. ("$CLAUDE_PROJECT_DIR/
|
|
36
|
-
* -> "$CLAUDE_PROJECT_DIR/.claude/hooks/notify-on-stop.sh
|
|
76
|
+
* e.g. (': "$(exit 0)"; exec "$CLAUDE_PROJECT_DIR"/', ".claude/hooks/notify-on-stop.sh")
|
|
77
|
+
* -> ': "$(exit 0)"; exec "$CLAUDE_PROJECT_DIR"/.claude/hooks/notify-on-stop.sh'
|
|
78
|
+
*
|
|
79
|
+
* Claude Code's prefix is for Copilot CLI, which runs the hooks in `.claude/settings.json` too, in
|
|
80
|
+
* PowerShell on Windows (ATK-849). PowerShell can't parse `"$CLAUDE_PROJECT_DIR"/…` as a command, so
|
|
81
|
+
* that entry failed, and on preToolUse Copilot denied every tool. Bash expands `$(exit 0)` to nothing
|
|
82
|
+
* and `exec` runs the script with its stdin and exit code; PowerShell parses the line and runs the
|
|
83
|
+
* `exit 0` while evaluating `:`'s argument, so the entry steps aside there.
|
|
37
84
|
*/
|
|
38
85
|
export declare function deriveHookCommand(commandPrefix: string | undefined, installedRelPath: string): string;
|
|
39
86
|
/**
|
|
40
87
|
* The command a hook placement registers for an asset: the placement's `configCommand` template
|
|
41
88
|
* when it has one (a command that doesn't name the installed path, such as a user hook's
|
|
42
89
|
* `"${CLAUDE_CONFIG_DIR:-$HOME/.claude}/hooks/x.sh"`, or one that names it as `{path}`, such as a
|
|
43
|
-
* node hook's), otherwise {@link deriveHookCommand}.
|
|
90
|
+
* node hook's, or as `{homePath}`), otherwise {@link deriveHookCommand}. `{homePath}` is the
|
|
91
|
+
* user-root-relative path from `$HOME`, which bash and PowerShell both expand, or the path itself
|
|
92
|
+
* when it is absolute (a moved user config directory on another drive).
|
|
44
93
|
*/
|
|
45
94
|
export declare function hookCommand(placement: Pick<PlacementConfig, 'configCommand' | 'configCommandPrefix' | 'path'>, assetName: string): string;
|
|
95
|
+
/**
|
|
96
|
+
* The events a hook placement registers for a `hookConfig`, by the tool's own names
|
|
97
|
+
* (`configHookEvents`), and the ones it leaves out: an event the map doesn't know, and, for
|
|
98
|
+
* Copilot CLI, a binding with a `matcher`, whose tool names are Claude Code's (`Bash`) and which
|
|
99
|
+
* a Copilot entry can't hold (run on every tool instead, a filtered hook would do the wrong thing).
|
|
100
|
+
* An event already named as the tool names it is taken as it is; a second binding for an event
|
|
101
|
+
* already taken is left out.
|
|
102
|
+
*/
|
|
103
|
+
export declare function hookEventsFor(placement: Pick<PlacementConfig, 'configHookEvents' | 'configHookFormat'>, hookConfig: HookConfig | undefined): {
|
|
104
|
+
events: PlacedHookEvent[];
|
|
105
|
+
leftOut: LeftOutHookEvent[];
|
|
106
|
+
};
|
|
46
107
|
/**
|
|
47
108
|
* Return true if a value looks like a hook matcher-group whose nested command
|
|
48
|
-
* entries include the given command — i.e. the group ATK owns for that asset
|
|
109
|
+
* entries include the given command — i.e. the group ATK owns for that asset —
|
|
110
|
+
* or a Copilot CLI entry whose `bash` command is it.
|
|
49
111
|
* Tolerant of arbitrary/foreign group shapes (returns false rather than throwing).
|
|
50
112
|
*/
|
|
51
113
|
export declare function hookGroupOwnsCommand(group: unknown, command: string): boolean;
|
|
114
|
+
/**
|
|
115
|
+
* The command a Copilot CLI entry's `powershell` runs on Windows: the placement's
|
|
116
|
+
* `configCommandPowershell` template, filled as {@link hookCommand} fills `configCommand`, or the
|
|
117
|
+
* {@link hookCommand} itself without one. A `.sh` hook's template finds Git Bash, since the `bash`
|
|
118
|
+
* PowerShell finds first on `PATH` is often WSL's (`System32\bash.exe`).
|
|
119
|
+
*/
|
|
120
|
+
export declare function hookPowershellCommand(placement: Pick<PlacementConfig, 'configCommand' | 'configCommandPowershell' | 'configCommandPrefix' | 'path'>, assetName: string): string;
|
|
121
|
+
/**
|
|
122
|
+
* Whether a config file holds nothing once ATK's entries are out of it: no keys, or only the
|
|
123
|
+
* `version` of a Copilot CLI hook file, which ATK writes and is the whole file without its hooks.
|
|
124
|
+
*/
|
|
125
|
+
export declare function isEmptyHookConfig(config: Record<string, unknown>): boolean;
|
|
52
126
|
/** Whether a hook's manifest entrypoint is an ES module, which a placement's `nodeEntrypoint` runs with node. */
|
|
53
127
|
export declare function isNodeHookEntrypoint(entrypoint: string | undefined): boolean;
|
|
128
|
+
/** Why a hook placement leaves out a `hookConfig` event, as the end of a sentence. */
|
|
129
|
+
export declare function leftOutHookEventReason(left: LeftOutHookEvent, toolName: string): string;
|
|
130
|
+
/**
|
|
131
|
+
* {@link placementForEntrypoint}, with `{name}` in its `configFile` filled in: a placement that
|
|
132
|
+
* writes one config file per hook (Copilot CLI's `.github/hooks/{name}.json`) names it after the
|
|
133
|
+
* asset. A shared config file has no `{name}` and stays as it is.
|
|
134
|
+
*/
|
|
135
|
+
export declare function placementForAsset<P extends PlacementConfig | undefined>(placement: P, entrypoint: string | undefined, assetName: string): P;
|
|
54
136
|
/**
|
|
55
137
|
* The placement a hook asset is placed with: its `nodeEntrypoint` path and command when the asset's
|
|
56
|
-
* entrypoint is an ES module,
|
|
57
|
-
*
|
|
138
|
+
* entrypoint is an ES module, its `jsonEntrypoint` path alone (no config merge) when the entrypoint
|
|
139
|
+
* is the tool's own hook config, otherwise the placement itself. A `.sh` hook is run by the shell
|
|
140
|
+
* the tool picks, which on Windows can be cmd, where neither `$VAR` nor a `.sh` script works; an
|
|
58
141
|
* `.mjs` hook run by node behaves the same under every shell.
|
|
59
142
|
*/
|
|
60
143
|
export declare function placementForEntrypoint<P extends PlacementConfig | undefined>(placement: P, entrypoint: string | undefined): P;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-config.d.ts","sourceRoot":"","sources":["../../src/lib/hook-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hook-config.d.ts","sourceRoot":"","sources":["../../src/lib/hook-config.ts"],"names":[],"mappings":"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"}
|