mini-trellis 0.3.4 → 0.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -7
- package/dist/cli/index.js +8 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +44 -3
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/init.d.ts +2 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +27 -9
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/migrate.d.ts +1 -0
- package/dist/commands/migrate.d.ts.map +1 -1
- package/dist/commands/migrate.js +50 -3
- package/dist/commands/migrate.js.map +1 -1
- package/dist/commands/refresh.d.ts +6 -1
- package/dist/commands/refresh.d.ts.map +1 -1
- package/dist/commands/refresh.js +69 -13
- package/dist/commands/refresh.js.map +1 -1
- package/dist/commands/uninstall.d.ts.map +1 -1
- package/dist/commands/uninstall.js +10 -5
- package/dist/commands/uninstall.js.map +1 -1
- package/dist/configurators/codebuddy.d.ts +3 -0
- package/dist/configurators/codebuddy.d.ts.map +1 -0
- package/dist/configurators/codebuddy.js +29 -0
- package/dist/configurators/codebuddy.js.map +1 -0
- package/dist/configurators/index.d.ts +5 -1
- package/dist/configurators/index.d.ts.map +1 -1
- package/dist/configurators/index.js +43 -6
- package/dist/configurators/index.js.map +1 -1
- package/dist/configurators/opencode.d.ts +3 -1
- package/dist/configurators/opencode.d.ts.map +1 -1
- package/dist/configurators/opencode.js +36 -6
- package/dist/configurators/opencode.js.map +1 -1
- package/dist/configurators/shared.d.ts +6 -1
- package/dist/configurators/shared.d.ts.map +1 -1
- package/dist/configurators/shared.js +39 -2
- package/dist/configurators/shared.js.map +1 -1
- package/dist/templates/common/bundled-skills/mini-trellis-session-insight/SKILL.md +1 -1
- package/dist/templates/opencode/lib/context-visibility.js +9 -0
- package/dist/templates/opencode/lib/runtime-status.js +16 -0
- package/dist/templates/opencode/plugins/mini-trellis/index.js +35 -0
- package/dist/templates/opencode/plugins/session-start.js +9 -12
- package/dist/templates/shared-hooks/index.d.ts +1 -1
- package/dist/templates/shared-hooks/index.d.ts.map +1 -1
- package/dist/templates/shared-hooks/index.js +1 -0
- package/dist/templates/shared-hooks/index.js.map +1 -1
- package/dist/templates/shared-hooks/session-start.py +4 -5
- package/dist/types/ai-tools.d.ts +2 -2
- package/dist/types/ai-tools.d.ts.map +1 -1
- package/dist/types/ai-tools.js +16 -0
- package/dist/types/ai-tools.js.map +1 -1
- package/dist/utils/codebuddy-settings.d.ts +5 -0
- package/dist/utils/codebuddy-settings.d.ts.map +1 -0
- package/dist/utils/codebuddy-settings.js +99 -0
- package/dist/utils/codebuddy-settings.js.map +1 -0
- package/dist/utils/managed-manifest.d.ts +1 -1
- package/dist/utils/managed-manifest.d.ts.map +1 -1
- package/dist/utils/managed-manifest.js +5 -1
- package/dist/utils/managed-manifest.js.map +1 -1
- package/dist/utils/managed-merge.d.ts +1 -1
- package/dist/utils/managed-merge.d.ts.map +1 -1
- package/dist/utils/managed-merge.js +2 -2
- package/dist/utils/managed-merge.js.map +1 -1
- package/dist/utils/managed-path-safety.d.ts +11 -0
- package/dist/utils/managed-path-safety.d.ts.map +1 -0
- package/dist/utils/managed-path-safety.js +80 -0
- package/dist/utils/managed-path-safety.js.map +1 -0
- package/dist/utils/managed-removal.d.ts +1 -4
- package/dist/utils/managed-removal.d.ts.map +1 -1
- package/dist/utils/managed-removal.js +16 -69
- package/dist/utils/managed-removal.js.map +1 -1
- package/dist/utils/opencode-package.d.ts +4 -0
- package/dist/utils/opencode-package.d.ts.map +1 -0
- package/dist/utils/opencode-package.js +37 -0
- package/dist/utils/opencode-package.js.map +1 -0
- package/dist/utils/opencode-version.d.ts +12 -0
- package/dist/utils/opencode-version.d.ts.map +1 -0
- package/dist/utils/opencode-version.js +87 -0
- package/dist/utils/opencode-version.js.map +1 -0
- package/dist/utils/uninstall-scrubbers.d.ts +4 -7
- package/dist/utils/uninstall-scrubbers.d.ts.map +1 -1
- package/dist/utils/uninstall-scrubbers.js +24 -62
- package/dist/utils/uninstall-scrubbers.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai-tools.js","sourceRoot":"","sources":["../../src/types/ai-tools.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"ai-tools.js","sourceRoot":"","sources":["../../src/types/ai-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/** Validate the structure we merge, while allowing unrelated settings/hook types. */
|
|
2
|
+
export declare function readCodeBuddySettingsIssue(filePath: string, requireRegistration?: boolean): string | null;
|
|
3
|
+
/** Avoid repeating a managed command when a user adds hooks to its matcher group. */
|
|
4
|
+
export declare function mergeCodeBuddySettings(existing: unknown, desired: unknown): unknown;
|
|
5
|
+
//# sourceMappingURL=codebuddy-settings.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codebuddy-settings.d.ts","sourceRoot":"","sources":["../../src/utils/codebuddy-settings.ts"],"names":[],"mappings":"AAQA,qFAAqF;AACrF,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,MAAM,EAChB,mBAAmB,UAAQ,GAC1B,MAAM,GAAG,IAAI,CA8Df;AAYD,qFAAqF;AACrF,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,OAAO,GACf,OAAO,CAgCT"}
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import { mergeJsonValues } from "./managed-merge.js";
|
|
3
|
+
import { commandMatchesDeletedPath } from "./uninstall-scrubbers.js";
|
|
4
|
+
function isObject(value) {
|
|
5
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
6
|
+
}
|
|
7
|
+
/** Validate the structure we merge, while allowing unrelated settings/hook types. */
|
|
8
|
+
export function readCodeBuddySettingsIssue(filePath, requireRegistration = false) {
|
|
9
|
+
let value;
|
|
10
|
+
try {
|
|
11
|
+
value = JSON.parse(fs.readFileSync(filePath, "utf8"));
|
|
12
|
+
}
|
|
13
|
+
catch {
|
|
14
|
+
return "CodeBuddy settings could not be read as JSON";
|
|
15
|
+
}
|
|
16
|
+
if (!isObject(value))
|
|
17
|
+
return "CodeBuddy settings must be a JSON object";
|
|
18
|
+
if (value.hooks !== undefined && !isObject(value.hooks))
|
|
19
|
+
return "CodeBuddy hooks must be an object";
|
|
20
|
+
const hooks = value.hooks;
|
|
21
|
+
for (const [event, groups] of Object.entries(hooks ?? {})) {
|
|
22
|
+
if (!Array.isArray(groups))
|
|
23
|
+
return `CodeBuddy hooks.${event} must be an array`;
|
|
24
|
+
for (const group of groups) {
|
|
25
|
+
if (!isObject(group) ||
|
|
26
|
+
!Array.isArray(group.hooks) ||
|
|
27
|
+
(group.matcher !== undefined && typeof group.matcher !== "string")) {
|
|
28
|
+
return `CodeBuddy hooks.${event} requires matcher groups with a hooks array`;
|
|
29
|
+
}
|
|
30
|
+
if (typeof group.matcher === "string" && group.matcher !== "*") {
|
|
31
|
+
try {
|
|
32
|
+
new RegExp(group.matcher);
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
return `CodeBuddy hooks.${event} contains an invalid matcher`;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
for (const hook of group.hooks) {
|
|
39
|
+
if (!isObject(hook) ||
|
|
40
|
+
typeof hook.type !== "string" ||
|
|
41
|
+
!hook.type.trim() ||
|
|
42
|
+
(hook.type === "command" &&
|
|
43
|
+
(typeof hook.command !== "string" || !hook.command.trim()))) {
|
|
44
|
+
return `CodeBuddy hooks.${event} contains an invalid hook definition`;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
if (requireRegistration) {
|
|
50
|
+
const groups = (hooks?.SessionStart ?? []);
|
|
51
|
+
if (!groups.some((group) => matches(group.matcher, "startup") &&
|
|
52
|
+
group.hooks.some((hook) => hook.type === "command" &&
|
|
53
|
+
typeof hook.command === "string" &&
|
|
54
|
+
commandMatchesDeletedPath(hook.command, [
|
|
55
|
+
".codebuddy/hooks/session-start.py",
|
|
56
|
+
])))) {
|
|
57
|
+
return "mini-trellis SessionStart is not registered; run mini-trellis init --codebuddy";
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
return null;
|
|
61
|
+
}
|
|
62
|
+
function matches(matcher, source) {
|
|
63
|
+
if (matcher === undefined || matcher === "" || matcher === "*")
|
|
64
|
+
return true;
|
|
65
|
+
if (typeof matcher !== "string" || typeof source !== "string")
|
|
66
|
+
return false;
|
|
67
|
+
try {
|
|
68
|
+
return new RegExp(`^(?:${matcher})$`).test(source);
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
return false;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
/** Avoid repeating a managed command when a user adds hooks to its matcher group. */
|
|
75
|
+
export function mergeCodeBuddySettings(existing, desired) {
|
|
76
|
+
if (!isObject(existing) || !isObject(desired))
|
|
77
|
+
return mergeJsonValues(existing, desired);
|
|
78
|
+
const merged = mergeJsonValues(existing, desired);
|
|
79
|
+
const hooks = isObject(existing.hooks) ? { ...existing.hooks } : {};
|
|
80
|
+
for (const [event, wanted] of Object.entries(isObject(desired.hooks) ? desired.hooks : {})) {
|
|
81
|
+
if (!Array.isArray(wanted))
|
|
82
|
+
continue;
|
|
83
|
+
const groups = Array.isArray(hooks[event])
|
|
84
|
+
? [...hooks[event]]
|
|
85
|
+
: [];
|
|
86
|
+
for (const group of wanted) {
|
|
87
|
+
const missing = group.hooks.filter((hook) => !groups.some((candidate) => matches(candidate.matcher, group.matcher) &&
|
|
88
|
+
Array.isArray(candidate.hooks) &&
|
|
89
|
+
candidate.hooks.some((present) => isObject(present) &&
|
|
90
|
+
present.type === hook.type &&
|
|
91
|
+
present.command === hook.command)));
|
|
92
|
+
if (missing.length)
|
|
93
|
+
groups.push({ ...group, hooks: missing });
|
|
94
|
+
}
|
|
95
|
+
hooks[event] = groups;
|
|
96
|
+
}
|
|
97
|
+
return { ...merged, hooks };
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=codebuddy-settings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codebuddy-settings.js","sourceRoot":"","sources":["../../src/utils/codebuddy-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,6 @@ export declare function hashContent(content: string): string;
|
|
|
7
7
|
export declare function hashFile(filePath: string): string | null;
|
|
8
8
|
export declare function readManifest(cwd: string): MiniTrellisManifest;
|
|
9
9
|
export declare function writeManifest(cwd: string, manifest: MiniTrellisManifest): void;
|
|
10
|
-
export declare function updateManifestForTemplates(cwd: string, templates: Map<string, string
|
|
10
|
+
export declare function updateManifestForTemplates(cwd: string, templates: Map<string, string>, removedPaths?: readonly string[]): MiniTrellisManifest;
|
|
11
11
|
export { MANIFEST_PATH };
|
|
12
12
|
//# sourceMappingURL=managed-manifest.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-manifest.d.ts","sourceRoot":"","sources":["../../src/utils/managed-manifest.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,aAAa,yCAAyC,CAAC;AAG7D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMxD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAgB7D;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,mBAAmB,GAC5B,IAAI,CAIN;AAED,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"managed-manifest.d.ts","sourceRoot":"","sources":["../../src/utils/managed-manifest.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,aAAa,yCAAyC,CAAC;AAG7D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMxD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAgB7D;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,mBAAmB,GAC5B,IAAI,CAIN;AAED,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,YAAY,GAAE,SAAS,MAAM,EAAO,GACnC,mBAAmB,CAYrB;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
|
@@ -34,8 +34,12 @@ export function writeManifest(cwd, manifest) {
|
|
|
34
34
|
fs.mkdirSync(path.dirname(filePath), { recursive: true });
|
|
35
35
|
writeFileAtomic(filePath, `${JSON.stringify(manifest, null, 2)}\n`);
|
|
36
36
|
}
|
|
37
|
-
export function updateManifestForTemplates(cwd, templates) {
|
|
37
|
+
export function updateManifestForTemplates(cwd, templates, removedPaths = []) {
|
|
38
38
|
const manifest = readManifest(cwd);
|
|
39
|
+
for (const relative of removedPaths) {
|
|
40
|
+
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
|
|
41
|
+
delete manifest.files[relative];
|
|
42
|
+
}
|
|
39
43
|
for (const [relative, content] of templates) {
|
|
40
44
|
const actual = hashFile(path.join(cwd, ...relative.split("/")));
|
|
41
45
|
if (actual === hashContent(content))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-manifest.js","sourceRoot":"","sources":["../../src/utils/managed-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,aAAa,GAAG,sCAAsC,CAAC;AAC7D,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAO3B,MAAM,UAAU,WAAW,CAAC,OAAe;IACzC,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,QAAgB;IACvC,IAAI,CAAC;QACH,OAAO,WAAW,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CACvB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CACvB,CAAC;QAClC,IACE,MAAM,CAAC,OAAO,KAAK,gBAAgB;YACnC,MAAM,CAAC,KAAK;YACZ,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAChC,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;QACnE,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,wEAAwE;IAC1E,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAAW,EACX,QAA6B;IAE7B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC/C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,eAAe,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,GAAW,EACX,SAA8B;
|
|
1
|
+
{"version":3,"file":"managed-manifest.js","sourceRoot":"","sources":["../../src/utils/managed-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,aAAa,GAAG,sCAAsC,CAAC;AAC7D,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAO3B,MAAM,UAAU,WAAW,CAAC,OAAe;IACzC,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,QAAgB;IACvC,IAAI,CAAC;QACH,OAAO,WAAW,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CACvB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CACvB,CAAC;QAClC,IACE,MAAM,CAAC,OAAO,KAAK,gBAAgB;YACnC,MAAM,CAAC,KAAK;YACZ,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAChC,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;QACnE,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,wEAAwE;IAC1E,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAAW,EACX,QAA6B;IAE7B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC/C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,eAAe,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,GAAW,EACX,SAA8B,EAC9B,eAAkC,EAAE;IAEpC,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IACnC,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE,CAAC;QACpC,gEAAgE;QAChE,OAAO,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IACD,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,SAAS,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAChE,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC;YAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;IACzE,CAAC;IACD,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC7B,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
|
@@ -12,6 +12,6 @@ type JsonValue = unknown;
|
|
|
12
12
|
*/
|
|
13
13
|
export declare function mergeJsonValues(existing: JsonValue, desired: JsonValue): JsonValue;
|
|
14
14
|
/** Merge a JSON template on disk while preserving existing user values. */
|
|
15
|
-
export declare function mergeJsonFile(filePath: string, desiredContent: string): "written" | "unchanged" | "invalid";
|
|
15
|
+
export declare function mergeJsonFile(filePath: string, desiredContent: string, merge?: (existing: unknown, desired: unknown) => unknown): "written" | "unchanged" | "invalid";
|
|
16
16
|
export {};
|
|
17
17
|
//# sourceMappingURL=managed-merge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-merge.d.ts","sourceRoot":"","sources":["../../src/utils/managed-merge.ts"],"names":[],"mappings":"AAQA;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,MAAM,CAsBR;AAED,6EAA6E;AAC7E,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAST;AAED,KAAK,SAAS,GAAG,OAAO,CAAC;AAWzB;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,SAAS,EACnB,OAAO,EAAE,SAAS,GACjB,SAAS,CAoBX;AAED,2EAA2E;AAC3E,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"managed-merge.d.ts","sourceRoot":"","sources":["../../src/utils/managed-merge.ts"],"names":[],"mappings":"AAQA;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,MAAM,CAsBR;AAED,6EAA6E;AAC7E,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAST;AAED,KAAK,SAAS,GAAG,OAAO,CAAC;AAWzB;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,SAAS,EACnB,OAAO,EAAE,SAAS,GACjB,SAAS,CAoBX;AAED,2EAA2E;AAC3E,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,KAAK,GAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,KAAK,OAAyB,GACxE,SAAS,GAAG,WAAW,GAAG,SAAS,CA0BrC"}
|
|
@@ -71,7 +71,7 @@ export function mergeJsonValues(existing, desired) {
|
|
|
71
71
|
return existing;
|
|
72
72
|
}
|
|
73
73
|
/** Merge a JSON template on disk while preserving existing user values. */
|
|
74
|
-
export function mergeJsonFile(filePath, desiredContent) {
|
|
74
|
+
export function mergeJsonFile(filePath, desiredContent, merge = mergeJsonValues) {
|
|
75
75
|
let desired;
|
|
76
76
|
try {
|
|
77
77
|
desired = JSON.parse(desiredContent);
|
|
@@ -91,7 +91,7 @@ export function mergeJsonFile(filePath, desiredContent) {
|
|
|
91
91
|
catch {
|
|
92
92
|
return "invalid";
|
|
93
93
|
}
|
|
94
|
-
const merged =
|
|
94
|
+
const merged = merge(existing, desired);
|
|
95
95
|
const rendered = `${JSON.stringify(merged, null, 2)}\n`;
|
|
96
96
|
if (rendered === fs.readFileSync(filePath, "utf8"))
|
|
97
97
|
return "unchanged";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-merge.js","sourceRoot":"","sources":["../../src/utils/managed-merge.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"managed-merge.js","sourceRoot":"","sources":["../../src/utils/managed-merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,SAAS,MAAM,CAAC,KAAa,EAAE,GAAW;IACxC,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAC1D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAC/B,QAAgB,EAChB,OAAe,EACf,WAAmB,EACnB,SAAiB;IAEjB,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAC5D,IAAI,YAAY,GAAG,CAAC,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,KAAK,GAAG,OAAO;SAClB,KAAK,CAAC,YAAY,EAAE,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;SAClD,OAAO,EAAE,CAAC;IACb,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,WAAW,GACf,aAAa,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvE,IAAI,aAAa,IAAI,CAAC,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;QAC3C,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,OAAO,EAAE,CAAC;QAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC;QACzE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACpE,CAAC;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnC,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC;AAC7D,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,qBAAqB,CACnC,QAAgB,EAChB,OAAe,EACf,WAAmB,EACnB,SAAiB;IAEjB,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;QACtC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC;QACnC,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IAC5E,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClC,OAAO,IAAI,CAAC;AACd,CAAC;AAKD,SAAS,QAAQ,CAAC,KAAgB;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,SAAS,CAAC,IAAe,EAAE,KAAgB;IAClD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACxD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAC7B,QAAmB,EACnB,OAAkB;IAElB,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACtD,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QAC7B,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBACzD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAe,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC;gBAAE,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;;gBAC3C,MAAM,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,aAAa,CAC3B,QAAgB,EAChB,cAAsB,EACtB,QAA0D,eAAe;IAEzE,IAAI,OAAkB,CAAC;IACvB,IAAI,CAAC;QACH,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAc,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,eAAe,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACnE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,QAAmB,CAAC;IACxB,IAAI,CAAC;QACH,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAc,CAAC;IACxE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;IACxD,IAAI,QAAQ,KAAK,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC;QAAE,OAAO,WAAW,CAAC;IACvE,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACpC,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
export declare class ManagedAssetConflict extends Error {
|
|
3
|
+
readonly relativePath: string;
|
|
4
|
+
constructor(relativePath: string, detail: string);
|
|
5
|
+
}
|
|
6
|
+
export declare function lstatIfPresent(absPath: string): fs.Stats | null;
|
|
7
|
+
export declare function validateManagedRelativePath(posixPath: string): void;
|
|
8
|
+
export declare function assertSafeManagedPath(projectRoot: string, posixPath: string, options?: {
|
|
9
|
+
followLeaf?: boolean;
|
|
10
|
+
}): string;
|
|
11
|
+
//# sourceMappingURL=managed-path-safety.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"managed-path-safety.d.ts","sourceRoot":"","sources":["../../src/utils/managed-path-safety.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAGzB,qBAAa,oBAAqB,SAAQ,KAAK;IAE3C,QAAQ,CAAC,YAAY,EAAE,MAAM;gBAApB,YAAY,EAAE,MAAM,EAC7B,MAAM,EAAE,MAAM;CAKjB;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,EAAE,CAAC,KAAK,GAAG,IAAI,CAO/D;AAsBD,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAwBnE;AAED,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GACrC,MAAM,CAmCR"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
export class ManagedAssetConflict extends Error {
|
|
4
|
+
relativePath;
|
|
5
|
+
constructor(relativePath, detail) {
|
|
6
|
+
super(`${relativePath}: ${detail}`);
|
|
7
|
+
this.relativePath = relativePath;
|
|
8
|
+
this.name = "ManagedAssetConflict";
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
export function lstatIfPresent(absPath) {
|
|
12
|
+
try {
|
|
13
|
+
return fs.lstatSync(absPath);
|
|
14
|
+
}
|
|
15
|
+
catch (error) {
|
|
16
|
+
if (isMissingPathError(error))
|
|
17
|
+
return null;
|
|
18
|
+
throw error;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
function isMissingPathError(error) {
|
|
22
|
+
return (error instanceof Error &&
|
|
23
|
+
"code" in error &&
|
|
24
|
+
error.code === "ENOENT");
|
|
25
|
+
}
|
|
26
|
+
function assertWithinProject(projectRoot, absPath) {
|
|
27
|
+
let root = path.resolve(projectRoot);
|
|
28
|
+
let resolved = path.resolve(absPath);
|
|
29
|
+
if (process.platform === "win32") {
|
|
30
|
+
root = root.toLowerCase();
|
|
31
|
+
resolved = resolved.toLowerCase();
|
|
32
|
+
}
|
|
33
|
+
if (resolved !== root && !resolved.startsWith(`${root}${path.sep}`)) {
|
|
34
|
+
throw new Error(`Managed path escapes project root: ${absPath}`);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
export function validateManagedRelativePath(posixPath) {
|
|
38
|
+
if (posixPath.length === 0 ||
|
|
39
|
+
posixPath.includes("\0") ||
|
|
40
|
+
posixPath.includes("\\") ||
|
|
41
|
+
path.posix.isAbsolute(posixPath) ||
|
|
42
|
+
path.win32.isAbsolute(posixPath) ||
|
|
43
|
+
/^[A-Za-z]:/.test(posixPath)) {
|
|
44
|
+
throw new Error(`Invalid managed manifest path: ${JSON.stringify(posixPath)}`);
|
|
45
|
+
}
|
|
46
|
+
const segments = posixPath.split("/");
|
|
47
|
+
if (segments.some((segment) => segment.length === 0 || segment === "." || segment === "..")) {
|
|
48
|
+
throw new Error(`Invalid managed manifest path: ${JSON.stringify(posixPath)}`);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
export function assertSafeManagedPath(projectRoot, posixPath, options = {}) {
|
|
52
|
+
validateManagedRelativePath(posixPath);
|
|
53
|
+
const root = path.resolve(projectRoot);
|
|
54
|
+
const segments = posixPath.split("/");
|
|
55
|
+
let current = root;
|
|
56
|
+
for (let index = 0; index < segments.length; index += 1) {
|
|
57
|
+
current = path.join(current, segments[index] ?? "");
|
|
58
|
+
assertWithinProject(root, current);
|
|
59
|
+
const stat = lstatIfPresent(current);
|
|
60
|
+
if (!stat)
|
|
61
|
+
continue;
|
|
62
|
+
if (stat.isSymbolicLink() &&
|
|
63
|
+
(index < segments.length - 1 || options.followLeaf)) {
|
|
64
|
+
const realParent = fs.realpathSync(current);
|
|
65
|
+
assertWithinProject(root, realParent);
|
|
66
|
+
}
|
|
67
|
+
if (index === segments.length - 1) {
|
|
68
|
+
if (options.followLeaf &&
|
|
69
|
+
!(stat.isSymbolicLink() ? fs.statSync(current) : stat).isFile()) {
|
|
70
|
+
throw new Error(`Managed file destination is not a regular file: ${posixPath}`);
|
|
71
|
+
}
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
if (!stat.isDirectory() && !stat.isSymbolicLink()) {
|
|
75
|
+
throw new Error(`Managed path parent is not a directory: ${posixPath}`);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return current;
|
|
79
|
+
}
|
|
80
|
+
//# sourceMappingURL=managed-path-safety.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"managed-path-safety.js","sourceRoot":"","sources":["../../src/utils/managed-path-safety.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
* Ownership-aware removal planning for `uninstall`.
|
|
3
3
|
* Paths come from the current platform template maps, not a hash manifest.
|
|
4
4
|
*/
|
|
5
|
-
import fs from "node:fs";
|
|
6
5
|
import { type ScrubResult } from "./uninstall-scrubbers.js";
|
|
6
|
+
export { assertSafeManagedPath, lstatIfPresent, validateManagedRelativePath, } from "./managed-path-safety.js";
|
|
7
7
|
export interface StructuredFileSpec {
|
|
8
8
|
posixPath: string;
|
|
9
9
|
reason: string;
|
|
@@ -29,9 +29,6 @@ export interface ManagedRemovalPlan {
|
|
|
29
29
|
export interface BuildManagedRemovalPlanOptions {
|
|
30
30
|
strictPaths?: boolean;
|
|
31
31
|
}
|
|
32
|
-
export declare function lstatIfPresent(absPath: string): fs.Stats | null;
|
|
33
|
-
export declare function validateManagedRelativePath(posixPath: string): void;
|
|
34
|
-
export declare function assertSafeManagedPath(projectRoot: string, posixPath: string): string;
|
|
35
32
|
export declare function buildStructuredFileSpecs(): Map<string, StructuredFileSpec>;
|
|
36
33
|
export declare function buildManagedRemovalPlan(cwd: string, hashes: Record<string, string>, options?: BuildManagedRemovalPlanOptions): ManagedRemovalPlan;
|
|
37
34
|
export declare function executeManagedRemovalPlan(cwd: string, plan: ManagedRemovalPlan): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-removal.d.ts","sourceRoot":"","sources":["../../src/utils/managed-removal.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"managed-removal.d.ts","sourceRoot":"","sources":["../../src/utils/managed-removal.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EAKL,KAAK,WAAW,EACjB,MAAM,0BAA0B,CAAC;AAWlC,OAAO,EACL,qBAAqB,EACrB,cAAc,EACd,2BAA2B,GAC5B,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,MAAM,EAAE,KAAK,WAAW,CAAC;CAC1E;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,aAAa,EAAE,mBAAmB,EAAE,CAAC;IACrC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,8BAA8B;IAC7C,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,wBAAwB,IAAI,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAsD1E;AAED,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,OAAO,GAAE,8BAAmC,GAC3C,kBAAkB,CA2DpB;AAED,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,kBAAkB,GACvB;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CA+DtE"}
|
|
@@ -6,72 +6,17 @@ import fs from "node:fs";
|
|
|
6
6
|
import path from "node:path";
|
|
7
7
|
import { DIR_NAMES, FILE_NAMES } from "../constants/paths.js";
|
|
8
8
|
import { ALL_MANAGED_DIRS } from "../configurators/index.js";
|
|
9
|
-
import { scrubCodexConfigToml, scrubHooksJson, scrubManagedMarkdownBlock,
|
|
9
|
+
import { scrubCodexConfigToml, scrubHooksJson, scrubManagedMarkdownBlock, scrubPiSettings, } from "./uninstall-scrubbers.js";
|
|
10
10
|
import { cleanupEmptyDirs, TRELLIS_BLOCK_END, TRELLIS_BLOCK_START, } from "./managed-paths.js";
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
return fs.lstatSync(absPath);
|
|
14
|
-
}
|
|
15
|
-
catch (error) {
|
|
16
|
-
if (isMissingPathError(error))
|
|
17
|
-
return null;
|
|
18
|
-
throw error;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
function isMissingPathError(error) {
|
|
22
|
-
return (error instanceof Error &&
|
|
23
|
-
"code" in error &&
|
|
24
|
-
error.code === "ENOENT");
|
|
25
|
-
}
|
|
26
|
-
function assertWithinProject(projectRoot, absPath) {
|
|
27
|
-
let root = path.resolve(projectRoot);
|
|
28
|
-
let resolved = path.resolve(absPath);
|
|
29
|
-
if (process.platform === "win32") {
|
|
30
|
-
root = root.toLowerCase();
|
|
31
|
-
resolved = resolved.toLowerCase();
|
|
32
|
-
}
|
|
33
|
-
if (resolved !== root && !resolved.startsWith(`${root}${path.sep}`)) {
|
|
34
|
-
throw new Error(`Managed path escapes project root: ${absPath}`);
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
export function validateManagedRelativePath(posixPath) {
|
|
38
|
-
if (posixPath.length === 0 ||
|
|
39
|
-
posixPath.includes("\0") ||
|
|
40
|
-
posixPath.includes("\\") ||
|
|
41
|
-
path.posix.isAbsolute(posixPath) ||
|
|
42
|
-
path.win32.isAbsolute(posixPath) ||
|
|
43
|
-
/^[A-Za-z]:/.test(posixPath)) {
|
|
44
|
-
throw new Error(`Invalid managed manifest path: ${JSON.stringify(posixPath)}`);
|
|
45
|
-
}
|
|
46
|
-
const segments = posixPath.split("/");
|
|
47
|
-
if (segments.some((segment) => segment.length === 0 || segment === "." || segment === "..")) {
|
|
48
|
-
throw new Error(`Invalid managed manifest path: ${JSON.stringify(posixPath)}`);
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
export function assertSafeManagedPath(projectRoot, posixPath) {
|
|
52
|
-
validateManagedRelativePath(posixPath);
|
|
53
|
-
const root = path.resolve(projectRoot);
|
|
54
|
-
const segments = posixPath.split("/");
|
|
55
|
-
let current = root;
|
|
56
|
-
for (let index = 0; index < segments.length; index += 1) {
|
|
57
|
-
current = path.join(current, segments[index] ?? "");
|
|
58
|
-
assertWithinProject(root, current);
|
|
59
|
-
const stat = lstatIfPresent(current);
|
|
60
|
-
if (!stat || index === segments.length - 1)
|
|
61
|
-
continue;
|
|
62
|
-
if (stat.isSymbolicLink()) {
|
|
63
|
-
const realParent = fs.realpathSync(current);
|
|
64
|
-
assertWithinProject(root, realParent);
|
|
65
|
-
}
|
|
66
|
-
if (!stat.isDirectory() && !stat.isSymbolicLink()) {
|
|
67
|
-
throw new Error(`Managed path parent is not a directory: ${posixPath}`);
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
return current;
|
|
71
|
-
}
|
|
11
|
+
import { assertSafeManagedPath, lstatIfPresent, } from "./managed-path-safety.js";
|
|
12
|
+
export { assertSafeManagedPath, lstatIfPresent, validateManagedRelativePath, } from "./managed-path-safety.js";
|
|
72
13
|
export function buildStructuredFileSpecs() {
|
|
73
14
|
const specs = [
|
|
74
|
-
...[
|
|
15
|
+
...[
|
|
16
|
+
".claude/settings.json",
|
|
17
|
+
".codex/hooks.json",
|
|
18
|
+
".codebuddy/settings.json",
|
|
19
|
+
].map((posixPath) => ({
|
|
75
20
|
posixPath,
|
|
76
21
|
reason: "Strip mini-trellis hooks; preserve user fields",
|
|
77
22
|
scrub: (content, deletedPaths) => scrubHooksJson(content, deletedPaths, "nested"),
|
|
@@ -83,8 +28,10 @@ export function buildStructuredFileSpecs() {
|
|
|
83
28
|
},
|
|
84
29
|
{
|
|
85
30
|
posixPath: ".opencode/package.json",
|
|
86
|
-
reason: "
|
|
87
|
-
|
|
31
|
+
reason: "Preserve shared OpenCode package configuration and host SDK dependencies",
|
|
32
|
+
// The host pins this SDK and user plugins can import it. It is not
|
|
33
|
+
// exclusively owned by mini-trellis, even if init first added it.
|
|
34
|
+
scrub: (content) => ({ content, fullyEmpty: false }),
|
|
88
35
|
},
|
|
89
36
|
{
|
|
90
37
|
posixPath: ".pi/settings.json",
|
|
@@ -135,10 +82,10 @@ export function buildManagedRemovalPlan(cwd, hashes, options = {}) {
|
|
|
135
82
|
}
|
|
136
83
|
const content = fs.readFileSync(absPath, "utf-8");
|
|
137
84
|
const result = spec.scrub(content, allPosixPaths);
|
|
138
|
-
if (
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
85
|
+
if (!result.fullyEmpty && result.content === content) {
|
|
86
|
+
if (options.strictPaths)
|
|
87
|
+
throw new Error(`Cannot prove Trellis content was removed from structured file: ${posixPath}`);
|
|
88
|
+
continue;
|
|
142
89
|
}
|
|
143
90
|
if (result.fullyEmpty) {
|
|
144
91
|
deletions.push({ posixPath, absPath, missing: false });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-removal.js","sourceRoot":"","sources":["../../src/utils/managed-removal.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,oBAAoB,EACpB,cAAc,EACd,yBAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"managed-removal.js","sourceRoot":"","sources":["../../src/utils/managed-removal.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { OpenCodeVersion } from "./opencode-version.js";
|
|
2
|
+
/** OpenCode itself pins its SDK here; preserve that and unrelated user keys. */
|
|
3
|
+
export declare function readOpenCodePackageIssue(filePath: string, version: OpenCodeVersion): string | null;
|
|
4
|
+
//# sourceMappingURL=opencode-package.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencode-package.d.ts","sourceRoot":"","sources":["../../src/utils/opencode-package.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAM7D,gFAAgF;AAChF,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,GACvB,MAAM,GAAG,IAAI,CAiCf"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
function isObject(value) {
|
|
3
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
4
|
+
}
|
|
5
|
+
/** OpenCode itself pins its SDK here; preserve that and unrelated user keys. */
|
|
6
|
+
export function readOpenCodePackageIssue(filePath, version) {
|
|
7
|
+
let value;
|
|
8
|
+
try {
|
|
9
|
+
value = JSON.parse(fs.readFileSync(filePath, "utf8"));
|
|
10
|
+
}
|
|
11
|
+
catch {
|
|
12
|
+
return "OpenCode package.json could not be read as JSON";
|
|
13
|
+
}
|
|
14
|
+
if (!isObject(value))
|
|
15
|
+
return "OpenCode package.json must be a JSON object";
|
|
16
|
+
if (value.type !== undefined &&
|
|
17
|
+
value.type !== "module" &&
|
|
18
|
+
value.type !== "commonjs")
|
|
19
|
+
return "OpenCode package type must be module or commonjs";
|
|
20
|
+
if (version === "2" && value.type === "commonjs")
|
|
21
|
+
return "OpenCode V2 requires module type; existing commonjs configuration is kept";
|
|
22
|
+
for (const field of [
|
|
23
|
+
"dependencies",
|
|
24
|
+
"devDependencies",
|
|
25
|
+
"peerDependencies",
|
|
26
|
+
"optionalDependencies",
|
|
27
|
+
]) {
|
|
28
|
+
const dependencies = value[field];
|
|
29
|
+
if (dependencies === undefined)
|
|
30
|
+
continue;
|
|
31
|
+
if (!isObject(dependencies) ||
|
|
32
|
+
Object.values(dependencies).some((dependency) => typeof dependency !== "string" || !dependency.trim()))
|
|
33
|
+
return `OpenCode package ${field} must be an object of dependency strings`;
|
|
34
|
+
}
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=opencode-package.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencode-package.js","sourceRoot":"","sources":["../../src/utils/opencode-package.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAGzB,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,wBAAwB,CACtC,QAAgB,EAChB,OAAwB;IAExB,IAAI,KAAc,CAAC;IACnB,IAAI,CAAC;QACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAY,CAAC;IACnE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,iDAAiD,CAAC;IAC3D,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,6CAA6C,CAAC;IAC3E,IACE,KAAK,CAAC,IAAI,KAAK,SAAS;QACxB,KAAK,CAAC,IAAI,KAAK,QAAQ;QACvB,KAAK,CAAC,IAAI,KAAK,UAAU;QAEzB,OAAO,kDAAkD,CAAC;IAC5D,IAAI,OAAO,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;QAC9C,OAAO,2EAA2E,CAAC;IACrF,KAAK,MAAM,KAAK,IAAI;QAClB,cAAc;QACd,iBAAiB;QACjB,kBAAkB;QAClB,sBAAsB;KACvB,EAAE,CAAC;QACF,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,YAAY,KAAK,SAAS;YAAE,SAAS;QACzC,IACE,CAAC,QAAQ,CAAC,YAAY,CAAC;YACvB,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAC9B,CAAC,UAAU,EAAE,EAAE,CAAC,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CACrE;YAED,OAAO,oBAAoB,KAAK,0CAA0C,CAAC;IAC/E,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export type OpenCodeVersion = "1" | "2";
|
|
2
|
+
export declare const DEFAULT_OPENCODE_VERSION: OpenCodeVersion;
|
|
3
|
+
export declare const OPENCODE_ENTRIES: Record<OpenCodeVersion, string>;
|
|
4
|
+
export declare function parseOpenCodeVersion(value: unknown): OpenCodeVersion | undefined;
|
|
5
|
+
export declare function installedOpenCodeVersions(cwd: string): OpenCodeVersion[];
|
|
6
|
+
export declare function detectOpenCodeVersion(): OpenCodeVersion | undefined;
|
|
7
|
+
export declare function resolveOpenCodeVersion(cwd: string, explicit?: OpenCodeVersion): OpenCodeVersion;
|
|
8
|
+
/** Only unmodified, manifest-owned entries may be retired on an explicit switch. */
|
|
9
|
+
export declare function openCodeSwitchFiles(cwd: string, target: OpenCodeVersion, templates: Map<string, string>): string[];
|
|
10
|
+
/** An empty V2 directory is still discovered as a plugin by its host. */
|
|
11
|
+
export declare function cleanupOpenCodeEntryDirectory(cwd: string, relative: string): void;
|
|
12
|
+
//# sourceMappingURL=opencode-version.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencode-version.d.ts","sourceRoot":"","sources":["../../src/utils/opencode-version.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,eAAe,GAAG,GAAG,GAAG,GAAG,CAAC;AACxC,eAAO,MAAM,wBAAwB,EAAE,eAAqB,CAAC;AAC7D,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAG5D,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,OAAO,GACb,eAAe,GAAG,SAAS,CAI7B;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,EAAE,CAIxE;AAED,wBAAgB,qBAAqB,IAAI,eAAe,GAAG,SAAS,CAcnE;AAED,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,eAAe,GACzB,eAAe,CASjB;AAED,oFAAoF;AACpF,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,eAAe,EACvB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,MAAM,EAAE,CAwCV;AAED,yEAAyE;AACzE,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,GACf,IAAI,CAKN"}
|