@sdd-method/sdd-cli 0.12.1 → 0.12.2
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/lib/hooks-seed/merge.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/lib/hooks-seed/merge.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAEV,aAAa,EAEb,UAAU,EACV,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAwCpB,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IACrC,sEAAsE;IACtE,QAAQ,CAAC,aAAa,EAAE,SAAS,aAAa,EAAE,CAAC;IACjD,4CAA4C;IAC5C,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,EAAE,UAAU,GAChB,iBAAiB,CAuEnB;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,EAAE,UAAU,GAChB,SAAS,aAAa,EAAE,CAkB1B"}
|
|
@@ -5,7 +5,42 @@
|
|
|
5
5
|
* commands. Adopter-added matchers lack the sentinel and survive
|
|
6
6
|
* sync untouched.
|
|
7
7
|
*/
|
|
8
|
-
import { isMethodManagedMatcher } from "./types.js";
|
|
8
|
+
import { METHOD_MANAGED_SENTINEL, isMethodManagedMatcher } from "./types.js";
|
|
9
|
+
/**
|
|
10
|
+
* Strip the method-managed sentinel and trailing whitespace from a hook
|
|
11
|
+
* command so two commands can be compared modulo ownership marker.
|
|
12
|
+
*/
|
|
13
|
+
function normaliseCommand(command) {
|
|
14
|
+
return command.replace(METHOD_MANAGED_SENTINEL, "").trimEnd();
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Two matchers are equivalent (modulo sentinel) when:
|
|
18
|
+
* - their `matcher` strings are equal, AND
|
|
19
|
+
* - their `hooks` arrays have the same length, AND
|
|
20
|
+
* - each pair of corresponding `hooks[i]` has the same `type` and the
|
|
21
|
+
* same normalised `command` (sentinel suffix stripped, trailing
|
|
22
|
+
* whitespace trimmed).
|
|
23
|
+
*
|
|
24
|
+
* This handles the case where an adopter manually authored the method's
|
|
25
|
+
* hook before the first managed sync — the resulting entry differs from
|
|
26
|
+
* the method-supplied one only in the missing sentinel suffix.
|
|
27
|
+
*/
|
|
28
|
+
function matchersEquivalentExcludingSentinel(a, b) {
|
|
29
|
+
if (a.matcher !== b.matcher)
|
|
30
|
+
return false;
|
|
31
|
+
if (a.hooks.length !== b.hooks.length)
|
|
32
|
+
return false;
|
|
33
|
+
for (let i = 0; i < a.hooks.length; i++) {
|
|
34
|
+
const ha = a.hooks[i];
|
|
35
|
+
const hb = b.hooks[i];
|
|
36
|
+
if (ha.type !== hb.type)
|
|
37
|
+
return false;
|
|
38
|
+
if (normaliseCommand(ha.command) !== normaliseCommand(hb.command)) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return true;
|
|
43
|
+
}
|
|
9
44
|
export function upsertMethodManagedHooks(existing, owned) {
|
|
10
45
|
const current = isHooksObject(existing["hooks"])
|
|
11
46
|
? existing["hooks"]
|
|
@@ -13,10 +48,29 @@ export function upsertMethodManagedHooks(existing, owned) {
|
|
|
13
48
|
const nextHooks = {};
|
|
14
49
|
const changedEvents = [];
|
|
15
50
|
// Start by copying every existing event's adopter-owned matchers.
|
|
51
|
+
// Drop adopter matchers that are equivalent (modulo sentinel) to a
|
|
52
|
+
// method-managed matcher we're about to add — otherwise we'd leave
|
|
53
|
+
// a duplicated entry. This handles two cases:
|
|
54
|
+
// (a) Adopter authored the method's hook by hand before the first
|
|
55
|
+
// managed sync (no sentinel on their entry).
|
|
56
|
+
// (b) A historical sync that already produced the duplicate state
|
|
57
|
+
// (one marked entry + one unmarked equivalent); the unmarked
|
|
58
|
+
// twin is auto-cleaned on next merge.
|
|
59
|
+
let dedupedAny = false;
|
|
16
60
|
for (const [event, matchers] of Object.entries(current)) {
|
|
17
61
|
if (!matchers)
|
|
18
62
|
continue;
|
|
19
|
-
const
|
|
63
|
+
const ownedForEvent = owned[event] ?? [];
|
|
64
|
+
const adopterMatchers = matchers.filter((m) => {
|
|
65
|
+
if (isMethodManagedMatcher(m))
|
|
66
|
+
return false;
|
|
67
|
+
const equivalent = ownedForEvent.some((o) => matchersEquivalentExcludingSentinel(m, o));
|
|
68
|
+
if (equivalent) {
|
|
69
|
+
dedupedAny = true;
|
|
70
|
+
return false;
|
|
71
|
+
}
|
|
72
|
+
return true;
|
|
73
|
+
});
|
|
20
74
|
if (adopterMatchers.length > 0)
|
|
21
75
|
nextHooks[event] = [...adopterMatchers];
|
|
22
76
|
}
|
|
@@ -33,8 +87,9 @@ export function upsertMethodManagedHooks(existing, owned) {
|
|
|
33
87
|
bucket.push(...ownedMatchers);
|
|
34
88
|
nextHooks[event] = bucket;
|
|
35
89
|
}
|
|
36
|
-
const changed = changedEvents.length > 0;
|
|
37
|
-
if (!changed &&
|
|
90
|
+
const changed = changedEvents.length > 0 || dedupedAny;
|
|
91
|
+
if (!changed &&
|
|
92
|
+
Object.keys(nextHooks).length === Object.keys(current).length) {
|
|
38
93
|
// No method-managed changes AND no adopter matchers reshuffled.
|
|
39
94
|
return { settings: existing, changedEvents: [], changed: false };
|
|
40
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../src/lib/hooks-seed/merge.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../src/lib/hooks-seed/merge.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sdd-method/sdd-cli",
|
|
3
|
-
"version": "0.12.
|
|
4
|
-
"description": "Method-layer CLI for SDD repository lifecycle — init, sync, validate, list, plan, generate-claude-md, mcp serve, catalogue {build,aggregate,validate,version}. v0.12.0 extends the integration profileType enum to 11 values (per sdd-method ADR 0137 — adds device-platform, oem-platform, fleet-partner, camera-platform, data-aggregator) and fixes the init→sync conflict that aborted bootstrap mid-flight when the scaffold step's seed files collided with the bundle's canonical versions. v0.11.0 shipped the canonical catalogue surface per ADR 0134 + schema 2.1.0 (ADR 0136): per-SDD catalogue build covering all four profiles, federation aggregator, validate + version subcommands, and the C4 + persona/journey/product-edge builders that complete Phase 2.",
|
|
3
|
+
"version": "0.12.2",
|
|
4
|
+
"description": "Method-layer CLI for SDD repository lifecycle — init, sync, validate, list, plan, generate-claude-md, mcp serve, catalogue {build,aggregate,validate,version}. v0.12.2 dedupes equivalent unmarked adopter PreToolUse entries on settings.json upsert (no more duplicated claude-method-guard hooks; auto-cleans the historical duplicate state on next sync). v0.12.0 extends the integration profileType enum to 11 values (per sdd-method ADR 0137 — adds device-platform, oem-platform, fleet-partner, camera-platform, data-aggregator) and fixes the init→sync conflict that aborted bootstrap mid-flight when the scaffold step's seed files collided with the bundle's canonical versions. v0.11.0 shipped the canonical catalogue surface per ADR 0134 + schema 2.1.0 (ADR 0136): per-SDD catalogue build covering all four profiles, federation aggregator, validate + version subcommands, and the C4 + persona/journey/product-edge builders that complete Phase 2.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"sdd-method",
|
|
7
7
|
"sdd",
|