@detergent-software/atk 9.4.0-dev.13 → 9.4.0-dev.15
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 +21 -0
- package/README.md +1 -1
- package/build/commands/audit.d.ts.map +1 -1
- package/build/commands/audit.js +2 -1
- package/build/commands/audit.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/asset-tools.d.ts +4 -4
- package/build/lib/asset-tools.js +4 -4
- package/build/lib/config-entries.d.ts +2 -2
- package/build/lib/config-entries.d.ts.map +1 -1
- package/build/lib/config-entries.js +15 -5
- package/build/lib/config-entries.js.map +1 -1
- package/build/lib/hook-config.d.ts +60 -5
- package/build/lib/hook-config.d.ts.map +1 -1
- package/build/lib/hook-config.js +97 -5
- package/build/lib/hook-config.js.map +1 -1
- package/build/lib/hook-script.d.ts +10 -0
- package/build/lib/hook-script.d.ts.map +1 -1
- package/build/lib/hook-script.js +31 -1
- package/build/lib/hook-script.js.map +1 -1
- package/build/lib/installer.d.ts.map +1 -1
- package/build/lib/installer.js +35 -16
- package/build/lib/installer.js.map +1 -1
- package/build/lib/schemas/adapter.d.ts +24 -0
- package/build/lib/schemas/adapter.d.ts.map +1 -1
- package/build/lib/schemas/adapter.js +18 -4
- package/build/lib/schemas/adapter.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.map +1 -1
- package/build/lib/uninstaller.js +11 -3
- package/build/lib/uninstaller.js.map +1 -1
- package/package.json +1 -1
- package/tool-adapters/copilot-cli.json +50 -6
|
@@ -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":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEvE;;;;;;;;;;;;GAYG;AAEH;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,qDAAqD;AACrD,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,0EAA0E;AAC1E,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,iEAAiE;AACjE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,eAAe,CAAC;CACnD;AAED,2EAA2E;AAC3E,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACtC,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,kBAAkB,CAAC,EACpD,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,gBAAgB,GAAG,SAAS,GACpC,gBAAgB,GAAG,SAAS,CAU9B;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,GAAG,SAAS,CAUhG;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAErG;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,qBAAqB,GAAG,MAAM,CAAC,EAClF,SAAS,EAAE,MAAM,GAChB,MAAM,CAUR;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,kBAAkB,GAAG,kBAAkB,CAAC,EACzE,UAAU,EAAE,UAAU,GAAG,SAAS,GACjC;IAAE,MAAM,EAAE,eAAe,EAAE,CAAC;IAAC,OAAO,EAAE,gBAAgB,EAAE,CAAA;CAAE,CAkB5D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAY7E;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAG1E;AAED,iHAAiH;AACjH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAE5E;AAED,sFAAsF;AACtF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CASvF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,eAAe,GAAG,SAAS,EACrE,SAAS,EAAE,CAAC,EACZ,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,SAAS,EAAE,MAAM,GAChB,CAAC,CAMH;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,eAAe,GAAG,SAAS,EAC1E,SAAS,EAAE,CAAC,EACZ,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,CAAC,CASH;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,OAAO,CA2BT"}
|
package/build/lib/hook-config.js
CHANGED
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
import { isAbsolute } from 'node:path';
|
|
2
|
+
/**
|
|
3
|
+
* Build the entry a hook placement appends under an event, in its `configHookFormat`: a
|
|
4
|
+
* matcher-group ({@link buildHookGroup}) by default, or a Copilot CLI entry, whose timeout is
|
|
5
|
+
* `timeoutSec`.
|
|
6
|
+
*/
|
|
7
|
+
export function buildHookEntry(placement, command, binding) {
|
|
8
|
+
if (placement.configHookFormat !== 'copilot') {
|
|
9
|
+
return buildHookGroup(command, binding);
|
|
10
|
+
}
|
|
11
|
+
return {
|
|
12
|
+
bash: command,
|
|
13
|
+
powershell: command,
|
|
14
|
+
type: 'command',
|
|
15
|
+
...(binding?.timeout !== undefined ? { timeoutSec: binding.timeout } : {}),
|
|
16
|
+
};
|
|
17
|
+
}
|
|
1
18
|
/**
|
|
2
19
|
* Build a tool-valid hook matcher-group for a single event binding.
|
|
3
20
|
* Only includes `matcher`/`timeout` when set, keeping config (and its checksum) minimal.
|
|
@@ -26,41 +43,116 @@ export function deriveHookCommand(commandPrefix, installedRelPath) {
|
|
|
26
43
|
* The command a hook placement registers for an asset: the placement's `configCommand` template
|
|
27
44
|
* when it has one (a command that doesn't name the installed path, such as a user hook's
|
|
28
45
|
* `"${CLAUDE_CONFIG_DIR:-$HOME/.claude}/hooks/x.sh"`, or one that names it as `{path}`, such as a
|
|
29
|
-
* node hook's), otherwise {@link deriveHookCommand}.
|
|
46
|
+
* node hook's, or as `{homePath}`), otherwise {@link deriveHookCommand}. `{homePath}` is the
|
|
47
|
+
* user-root-relative path from `$HOME`, which bash and PowerShell both expand, or the path itself
|
|
48
|
+
* when it is absolute (a moved user config directory on another drive).
|
|
30
49
|
*/
|
|
31
50
|
export function hookCommand(placement, assetName) {
|
|
32
51
|
const installedPath = placement.path.replace(/\{name\}/g, assetName);
|
|
33
52
|
if (placement.configCommand !== undefined) {
|
|
34
|
-
|
|
53
|
+
const homePath = isAbsolute(installedPath) ? installedPath : `$HOME/${installedPath}`;
|
|
54
|
+
return placement.configCommand
|
|
55
|
+
.replace(/\{path\}/g, installedPath)
|
|
56
|
+
.replace(/\{homePath\}/g, homePath)
|
|
57
|
+
.replace(/\{name\}/g, assetName);
|
|
35
58
|
}
|
|
36
59
|
return deriveHookCommand(placement.configCommandPrefix, installedPath);
|
|
37
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* The events a hook placement registers for a `hookConfig`, by the tool's own names
|
|
63
|
+
* (`configHookEvents`), and the ones it leaves out: an event the map doesn't know, and, for
|
|
64
|
+
* Copilot CLI, a binding with a `matcher`, whose tool names are Claude Code's (`Bash`) and which
|
|
65
|
+
* a Copilot entry can't hold (run on every tool instead, a filtered hook would do the wrong thing).
|
|
66
|
+
* An event already named as the tool names it is taken as it is; a second binding for an event
|
|
67
|
+
* already taken is left out.
|
|
68
|
+
*/
|
|
69
|
+
export function hookEventsFor(placement, hookConfig) {
|
|
70
|
+
const events = [];
|
|
71
|
+
const leftOut = [];
|
|
72
|
+
const names = placement.configHookEvents;
|
|
73
|
+
const toolNames = new Set(Object.values(names ?? {}));
|
|
74
|
+
for (const [event, binding] of Object.entries(hookConfig ?? {})) {
|
|
75
|
+
const toolEvent = names ? (names[event] ?? (toolNames.has(event) ? event : undefined)) : event;
|
|
76
|
+
if (toolEvent === undefined) {
|
|
77
|
+
leftOut.push({ event, reason: 'unknown-event' });
|
|
78
|
+
}
|
|
79
|
+
else if (events.some((e) => e.event === toolEvent)) {
|
|
80
|
+
leftOut.push({ event, reason: 'duplicate' });
|
|
81
|
+
}
|
|
82
|
+
else if (placement.configHookFormat === 'copilot' && binding?.matcher) {
|
|
83
|
+
leftOut.push({ event, reason: 'matcher' });
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
events.push({ binding, event: toolEvent });
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
return { events, leftOut };
|
|
90
|
+
}
|
|
38
91
|
/**
|
|
39
92
|
* Return true if a value looks like a hook matcher-group whose nested command
|
|
40
|
-
* entries include the given command — i.e. the group ATK owns for that asset
|
|
93
|
+
* entries include the given command — i.e. the group ATK owns for that asset —
|
|
94
|
+
* or a Copilot CLI entry whose `bash` command is it.
|
|
41
95
|
* Tolerant of arbitrary/foreign group shapes (returns false rather than throwing).
|
|
42
96
|
*/
|
|
43
97
|
export function hookGroupOwnsCommand(group, command) {
|
|
44
98
|
if (!group || typeof group !== 'object') {
|
|
45
99
|
return false;
|
|
46
100
|
}
|
|
101
|
+
if (group.bash === command) {
|
|
102
|
+
return true;
|
|
103
|
+
}
|
|
47
104
|
const hooks = group.hooks;
|
|
48
105
|
if (!Array.isArray(hooks)) {
|
|
49
106
|
return false;
|
|
50
107
|
}
|
|
51
108
|
return hooks.some((h) => !!h && typeof h === 'object' && h.command === command);
|
|
52
109
|
}
|
|
110
|
+
/**
|
|
111
|
+
* Whether a config file holds nothing once ATK's entries are out of it: no keys, or only the
|
|
112
|
+
* `version` of a Copilot CLI hook file, which ATK writes and is the whole file without its hooks.
|
|
113
|
+
*/
|
|
114
|
+
export function isEmptyHookConfig(config) {
|
|
115
|
+
const keys = Object.keys(config);
|
|
116
|
+
return keys.length === 0 || (keys.length === 1 && keys[0] === 'version');
|
|
117
|
+
}
|
|
53
118
|
/** Whether a hook's manifest entrypoint is an ES module, which a placement's `nodeEntrypoint` runs with node. */
|
|
54
119
|
export function isNodeHookEntrypoint(entrypoint) {
|
|
55
120
|
return entrypoint?.endsWith('.mjs') ?? false;
|
|
56
121
|
}
|
|
122
|
+
/** Why a hook placement leaves out a `hookConfig` event, as the end of a sentence. */
|
|
123
|
+
export function leftOutHookEventReason(left, toolName) {
|
|
124
|
+
switch (left.reason) {
|
|
125
|
+
case 'duplicate':
|
|
126
|
+
return `another of its events has the same name in ${toolName}`;
|
|
127
|
+
case 'matcher':
|
|
128
|
+
return `its matcher names Claude Code's tools, and ${toolName} has no matcher for it`;
|
|
129
|
+
case 'unknown-event':
|
|
130
|
+
return `${toolName} has no such hook event`;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* {@link placementForEntrypoint}, with `{name}` in its `configFile` filled in: a placement that
|
|
135
|
+
* writes one config file per hook (Copilot CLI's `.github/hooks/{name}.json`) names it after the
|
|
136
|
+
* asset. A shared config file has no `{name}` and stays as it is.
|
|
137
|
+
*/
|
|
138
|
+
export function placementForAsset(placement, entrypoint, assetName) {
|
|
139
|
+
const resolved = placementForEntrypoint(placement, entrypoint);
|
|
140
|
+
if (!resolved?.configFile?.includes('{name}')) {
|
|
141
|
+
return resolved;
|
|
142
|
+
}
|
|
143
|
+
return { ...resolved, configFile: resolved.configFile.replace(/\{name\}/g, assetName) };
|
|
144
|
+
}
|
|
57
145
|
/**
|
|
58
146
|
* The placement a hook asset is placed with: its `nodeEntrypoint` path and command when the asset's
|
|
59
|
-
* entrypoint is an ES module,
|
|
60
|
-
*
|
|
147
|
+
* entrypoint is an ES module, its `jsonEntrypoint` path alone (no config merge) when the entrypoint
|
|
148
|
+
* is the tool's own hook config, otherwise the placement itself. A `.sh` hook is run by the shell
|
|
149
|
+
* the tool picks, which on Windows can be cmd, where neither `$VAR` nor a `.sh` script works; an
|
|
61
150
|
* `.mjs` hook run by node behaves the same under every shell.
|
|
62
151
|
*/
|
|
63
152
|
export function placementForEntrypoint(placement, entrypoint) {
|
|
153
|
+
if (placement?.jsonEntrypoint && entrypoint?.endsWith('.json')) {
|
|
154
|
+
return { path: placement.jsonEntrypoint.path };
|
|
155
|
+
}
|
|
64
156
|
if (!placement?.nodeEntrypoint || !isNodeHookEntrypoint(entrypoint)) {
|
|
65
157
|
return placement;
|
|
66
158
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-config.js","sourceRoot":"","sources":["../../src/lib/hook-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hook-config.js","sourceRoot":"","sources":["../../src/lib/hook-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { PlacementConfig } from './schemas/adapter.js';
|
|
2
|
+
import type { InstalledAsset } from './schemas/lockfile.js';
|
|
2
3
|
/**
|
|
3
4
|
* Project-relative path of the script a hook placement registers as its command, or
|
|
4
5
|
* undefined when the tool does not run the installed file directly.
|
|
@@ -23,4 +24,13 @@ export declare function lacksExecBit(filePath: string, platform?: NodeJS.Platfor
|
|
|
23
24
|
* API serves bytes only, so the installer has to set the mode itself. No-op on Windows.
|
|
24
25
|
*/
|
|
25
26
|
export declare function makeExecutable(filePath: string, platform?: NodeJS.Platform): Promise<void>;
|
|
27
|
+
/**
|
|
28
|
+
* The absolute path of the copy of a hook script that a CLI before ATK-204 saved under the name of
|
|
29
|
+
* the hook's own config file (Copilot CLI's `.github/hooks/{name}.json`), which the tool can't read
|
|
30
|
+
* as config, or undefined when there is none. That copy is a file that isn't readable config and
|
|
31
|
+
* holds the bytes of one of the files the given entries of the asset recorded, or a script (`#!`),
|
|
32
|
+
* which no config file starts with: the lockfile may already record a newer version than the copy's.
|
|
33
|
+
* `placement` is the adapter's hook placement, not one resolved for an entrypoint.
|
|
34
|
+
*/
|
|
35
|
+
export declare function misplacedHookCopy(placement: PlacementConfig | undefined, name: string, installed: Array<Pick<InstalledAsset, 'files'> | undefined>, projectDir: string): Promise<string | undefined>;
|
|
26
36
|
//# sourceMappingURL=hook-script.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-script.d.ts","sourceRoot":"","sources":["../../src/lib/hook-script.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hook-script.d.ts","sourceRoot":"","sources":["../../src/lib/hook-script.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAM5D;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE5G;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,CASnH;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAOlH;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,eAAe,GAAG,SAAS,EACtC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,EAC3D,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAc7B"}
|
package/build/lib/hook-script.js
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { existsSync } from 'node:fs';
|
|
2
|
+
import { access, chmod, constants, readFile, stat } from 'node:fs/promises';
|
|
3
|
+
import { hashBytes } from './checksum.js';
|
|
4
|
+
import { readConfigFile, resolveConfigFormat } from './config-file.js';
|
|
5
|
+
import { fromRoot } from './root-path.js';
|
|
2
6
|
/**
|
|
3
7
|
* Project-relative path of the script a hook placement registers as its command, or
|
|
4
8
|
* undefined when the tool does not run the installed file directly.
|
|
@@ -45,4 +49,30 @@ export async function makeExecutable(filePath, platform = process.platform) {
|
|
|
45
49
|
await chmod(filePath, executable);
|
|
46
50
|
}
|
|
47
51
|
}
|
|
52
|
+
/**
|
|
53
|
+
* The absolute path of the copy of a hook script that a CLI before ATK-204 saved under the name of
|
|
54
|
+
* the hook's own config file (Copilot CLI's `.github/hooks/{name}.json`), which the tool can't read
|
|
55
|
+
* as config, or undefined when there is none. That copy is a file that isn't readable config and
|
|
56
|
+
* holds the bytes of one of the files the given entries of the asset recorded, or a script (`#!`),
|
|
57
|
+
* which no config file starts with: the lockfile may already record a newer version than the copy's.
|
|
58
|
+
* `placement` is the adapter's hook placement, not one resolved for an entrypoint.
|
|
59
|
+
*/
|
|
60
|
+
export async function misplacedHookCopy(placement, name, installed, projectDir) {
|
|
61
|
+
if (!placement?.configHookMerge || !placement.configFile?.includes('{name}'))
|
|
62
|
+
return undefined;
|
|
63
|
+
const path = fromRoot(projectDir, placement.configFile.replace(/\{name\}/g, name));
|
|
64
|
+
if (!installed.some(Boolean) || !existsSync(path))
|
|
65
|
+
return undefined;
|
|
66
|
+
try {
|
|
67
|
+
await readConfigFile(path, resolveConfigFormat(path, placement));
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
// Not config: maybe the misplaced copy.
|
|
72
|
+
}
|
|
73
|
+
const content = await readFile(path);
|
|
74
|
+
const checksum = hashBytes(content);
|
|
75
|
+
const recorded = installed.some((entry) => entry?.files.some((f) => f.checksum === checksum));
|
|
76
|
+
return recorded || content.subarray(0, 2).toString() === '#!' ? path : undefined;
|
|
77
|
+
}
|
|
48
78
|
//# sourceMappingURL=hook-script.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-script.js","sourceRoot":"","sources":["../../src/lib/hook-script.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"hook-script.js","sourceRoot":"","sources":["../../src/lib/hook-script.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../../src/lib/installer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,EAAE,OAAO,EAAmB,MAAM,sBAAsB,CAAC;AAErE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAiC,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AA6ClG,OAAO,EAAE,YAAY,EAA+B,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../../src/lib/installer.ts"],"names":[],"mappings":"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"}
|
package/build/lib/installer.js
CHANGED
|
@@ -10,8 +10,8 @@ import { configLockPath, withConfigLock } from './config-lock.js';
|
|
|
10
10
|
import { addToEnabledList, removeFromEnabledList } from './enabled-list.js';
|
|
11
11
|
import { ApiCodeError, errorGuidance, errorMessage } from './errors.js';
|
|
12
12
|
import { ensureGitignoreEntries } from './gitignore.js';
|
|
13
|
-
import {
|
|
14
|
-
import { hookScriptPath, makeExecutable } from './hook-script.js';
|
|
13
|
+
import { buildHookEntry, hookCommand, hookEventsFor, hookGroupOwnsCommand, isEmptyHookConfig, isNodeHookEntrypoint, leftOutHookEventReason, placementForAsset, placementForEntrypoint, removeHookGroup, } from './hook-config.js';
|
|
14
|
+
import { hookScriptPath, makeExecutable, misplacedHookCopy } from './hook-script.js';
|
|
15
15
|
import { isInstalledForTool } from './installed-for-tool.js';
|
|
16
16
|
import { addAssetToLockfile, findInstalledAsset, readLockfile, removeAssetFromLockfile, writeLockfile, } from './lockfile.js';
|
|
17
17
|
import { formatOrgName } from './org.js';
|
|
@@ -783,7 +783,7 @@ async function installAsset(entry, options, managedPaths, managedEntries, owners
|
|
|
783
783
|
assetFiles.some((f) => isNodeHookEntrypoint(f.relativePath))) {
|
|
784
784
|
throw new InstallerError(`Couldn't read the manifest of "${asset.name}"@${entry.version}, which says how the hook runs, so it wasn't installed.`, { hint: 'Run the command again. If it keeps failing, check the asset in the registry.' });
|
|
785
785
|
}
|
|
786
|
-
const placement =
|
|
786
|
+
const placement = placementForAsset(typePlacement, declaredEntrypoint, asset.name);
|
|
787
787
|
// Find the entrypoint file
|
|
788
788
|
const entrypointFile = assetFiles.find((f) => isEntrypoint(f.relativePath, asset.type, declaredEntrypoint));
|
|
789
789
|
// A multi-tool install skips such a hook for the tool (see placeableEntries); any other path
|
|
@@ -831,9 +831,17 @@ async function installAsset(entry, options, managedPaths, managedEntries, owners
|
|
|
831
831
|
: []),
|
|
832
832
|
...staleConfigEntries(previousEntry, declaredEntrypoint, adapter, placement).map((stale) => configEntryPath(stale, previousEntry, adapter, projectDir)),
|
|
833
833
|
], asset.name, adapter, projectDir);
|
|
834
|
+
// A CLI before ATK-204 wrote a Copilot hook's script under the name of its hook config. That copy
|
|
835
|
+
// is the file this hook's own config is written to now, so it goes once every check has passed;
|
|
836
|
+
// anything else there is left for the check below to refuse. Another tool's pass of this run may
|
|
837
|
+
// have recorded the new version already, so the entry from before the run counts too.
|
|
838
|
+
const before = options.installedBefore ?? options.managedFrom;
|
|
839
|
+
const misplacedCopy = placement.configHookMerge
|
|
840
|
+
? await misplacedHookCopy(typePlacement, asset.name, [previousEntry, before && findInstalledAsset(before, asset.name, asset.type, entry.asset.org)], basePath)
|
|
841
|
+
: undefined;
|
|
834
842
|
// A config file the merge below couldn't read fails the install before any file is placed, so a
|
|
835
843
|
// reinstall's files keep the content its previous entries run.
|
|
836
|
-
if (placement.configFile && placement.configKey && !placement.fileless) {
|
|
844
|
+
if (placement.configFile && placement.configKey && !placement.fileless && !misplacedCopy) {
|
|
837
845
|
await checkConfigReadable(fromRoot(basePath, placement.configFile), configFormat, placement.configHookMerge ? 'the hook' : `"${asset.name}"`);
|
|
838
846
|
}
|
|
839
847
|
// Branch on placement type
|
|
@@ -958,7 +966,13 @@ async function installAsset(entry, options, managedPaths, managedEntries, owners
|
|
|
958
966
|
// config file as valid event arrays (e.g. settings.json hooks.Stop[]), with the
|
|
959
967
|
// command derived from the installed script path.
|
|
960
968
|
const { configFile, configKey } = placement;
|
|
961
|
-
|
|
969
|
+
if (misplacedCopy)
|
|
970
|
+
await unlink(misplacedCopy);
|
|
971
|
+
const { events, leftOut } = hookEventsFor(placement, entry.versionData.hookConfig);
|
|
972
|
+
for (const left of leftOut) {
|
|
973
|
+
onProgress?.(`Warning: ${asset.name}'s ${left.event} hook is not registered for ${adapter.tool}: ${leftOutHookEventReason(left, adapter.displayName)}`);
|
|
974
|
+
}
|
|
975
|
+
const hookEntries = await withConfigLock(lockFile, () => mergeHookConfig(fromRoot(basePath, configFile), configKey, configFormat, placement, events, hookCommand(placement, asset.name), projectDir, onProgress, writeOptions));
|
|
962
976
|
configEntries.push(...hookEntries);
|
|
963
977
|
}
|
|
964
978
|
else if (placement.configFile && placement.configKey) {
|
|
@@ -1167,16 +1181,17 @@ async function mergeFragmentConfig(configFilePath, configKey, format, projectDir
|
|
|
1167
1181
|
* Merge a hook asset's event bindings into a tool config file (e.g. .claude/settings.json).
|
|
1168
1182
|
*
|
|
1169
1183
|
* Claude Code stores hooks as `hooks.<Event>: [ { matcher?, hooks: [{ type:'command', command }] } ]`,
|
|
1170
|
-
* an ARRAY shared by every hook bound to that event. For each
|
|
1171
|
-
*
|
|
1172
|
-
*
|
|
1173
|
-
*
|
|
1174
|
-
*
|
|
1184
|
+
* an ARRAY shared by every hook bound to that event. For each of `events` (the `hookConfig` events
|
|
1185
|
+
* the placement registers, by the tool's names: {@link hookEventsFor}), this appends one entry in
|
|
1186
|
+
* the placement's format ({@link buildHookEntry}) whose command runs the installed script. ATK's
|
|
1187
|
+
* entry is identified by that command (no marker is written — the tool validates group shape).
|
|
1188
|
+
* Idempotent: an existing entry owned by this command is dropped before appending, so repeated
|
|
1189
|
+
* install/sync doesn't duplicate. A Copilot CLI hook file gets its `"version": 1` too. Returns one
|
|
1190
|
+
* lockfile config entry per event, checksummed over the ATK-owned entry only.
|
|
1175
1191
|
*/
|
|
1176
|
-
async function mergeHookConfig(configFilePath, configKey, format,
|
|
1177
|
-
const events = hookConfig ? Object.keys(hookConfig) : [];
|
|
1192
|
+
async function mergeHookConfig(configFilePath, configKey, format, placement, events, command, projectDir, onProgress, writeOptions = {}) {
|
|
1178
1193
|
if (events.length === 0) {
|
|
1179
|
-
// No hookConfig (e.g. legacy asset or un-rebuilt registry index) — write nothing.
|
|
1194
|
+
// No hookConfig (e.g. legacy asset or un-rebuilt registry index), or none the tool has — write nothing.
|
|
1180
1195
|
return [];
|
|
1181
1196
|
}
|
|
1182
1197
|
try {
|
|
@@ -1190,13 +1205,16 @@ async function mergeHookConfig(configFilePath, configKey, format, hookConfig, co
|
|
|
1190
1205
|
await mkdir(dir, { recursive: true });
|
|
1191
1206
|
}
|
|
1192
1207
|
}
|
|
1208
|
+
if (placement.configHookFormat === 'copilot' && config['version'] === undefined) {
|
|
1209
|
+
config = { version: 1, ...config };
|
|
1210
|
+
}
|
|
1193
1211
|
if (!config[configKey] || typeof config[configKey] !== 'object' || Array.isArray(config[configKey])) {
|
|
1194
1212
|
config[configKey] = {};
|
|
1195
1213
|
}
|
|
1196
1214
|
const section = config[configKey];
|
|
1197
1215
|
const entries = [];
|
|
1198
|
-
for (const event of events) {
|
|
1199
|
-
const group =
|
|
1216
|
+
for (const { binding, event } of events) {
|
|
1217
|
+
const group = buildHookEntry(placement, command, binding);
|
|
1200
1218
|
const existing = Array.isArray(section[event]) ? section[event] : [];
|
|
1201
1219
|
// Idempotency: remove any prior group this asset owns before re-appending.
|
|
1202
1220
|
const next = existing.filter((g) => !hookGroupOwnsCommand(g, command));
|
|
@@ -1340,7 +1358,8 @@ async function revertConfigEntry(configFilePath, keyPath, command, format, delet
|
|
|
1340
1358
|
delete config[sectionKey];
|
|
1341
1359
|
}
|
|
1342
1360
|
}
|
|
1343
|
-
|
|
1361
|
+
const empty = command !== undefined ? isEmptyHookConfig(config) : Object.keys(config).length === 0;
|
|
1362
|
+
if (deleteWhenEmpty && empty) {
|
|
1344
1363
|
await removeEmptiedConfigFile(configFilePath, format, writeOptions);
|
|
1345
1364
|
return;
|
|
1346
1365
|
}
|