faceted-prompting 0.3.1 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/cli/compose-command.d.ts +2 -2
- package/dist/cli/compose-command.d.ts.map +1 -1
- package/dist/cli/compose-command.js +15 -145
- package/dist/cli/compose-command.js.map +1 -1
- package/dist/cli/compose-definition-resolution.d.ts +12 -0
- package/dist/cli/compose-definition-resolution.d.ts.map +1 -0
- package/dist/cli/compose-definition-resolution.js +50 -0
- package/dist/cli/compose-definition-resolution.js.map +1 -0
- package/dist/cli/compose-execution.d.ts +18 -0
- package/dist/cli/compose-execution.d.ts.map +1 -0
- package/dist/cli/compose-execution.js +165 -0
- package/dist/cli/compose-execution.js.map +1 -0
- package/dist/cli/compose-options.d.ts +4 -0
- package/dist/cli/compose-options.d.ts.map +1 -0
- package/dist/cli/compose-options.js +64 -0
- package/dist/cli/compose-options.js.map +1 -0
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +2 -1
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/install-skill/flow.d.ts +2 -1
- package/dist/cli/install-skill/flow.d.ts.map +1 -1
- package/dist/cli/install-skill/flow.js +7 -2
- package/dist/cli/install-skill/flow.js.map +1 -1
- package/dist/cli/install-skill/modes.d.ts +3 -1
- package/dist/cli/install-skill/modes.d.ts.map +1 -1
- package/dist/cli/install-skill/modes.js +14 -13
- package/dist/cli/install-skill/modes.js.map +1 -1
- package/dist/cli/install-skill/targets.d.ts +4 -3
- package/dist/cli/install-skill/targets.d.ts.map +1 -1
- package/dist/cli/install-skill/targets.js +18 -4
- package/dist/cli/install-skill/targets.js.map +1 -1
- package/dist/cli/path-guard.d.ts +5 -0
- package/dist/cli/path-guard.d.ts.map +1 -1
- package/dist/cli/path-guard.js +25 -0
- package/dist/cli/path-guard.js.map +1 -1
- package/dist/cli/skill-commands.d.ts +8 -0
- package/dist/cli/skill-commands.d.ts.map +1 -1
- package/dist/cli/skill-commands.js +22 -6
- package/dist/cli/skill-commands.js.map +1 -1
- package/dist/cli/skill-file-ops.d.ts +1 -2
- package/dist/cli/skill-file-ops.d.ts.map +1 -1
- package/dist/cli/skill-file-ops.js +12 -38
- package/dist/cli/skill-file-ops.js.map +1 -1
- package/dist/cli/skill-types.d.ts +0 -1
- package/dist/cli/skill-types.d.ts.map +1 -1
- package/dist/cli/types.d.ts +6 -0
- package/dist/cli/types.d.ts.map +1 -1
- package/dist/config/index.d.ts +12 -0
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +44 -2
- package/dist/config/index.js.map +1 -1
- package/dist/config/install-targets.d.ts +6 -0
- package/dist/config/install-targets.d.ts.map +1 -0
- package/dist/config/install-targets.js +71 -0
- package/dist/config/install-targets.js.map +1 -0
- package/dist/install-targets.d.ts +2 -0
- package/dist/install-targets.d.ts.map +1 -0
- package/dist/install-targets.js +2 -0
- package/dist/install-targets.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { closeSync, constants, existsSync, lstatSync, mkdirSync, openSync, readdirSync, readFileSync, realpathSync, renameSync, rmSync, unlinkSync, writeFileSync, } from 'node:fs';
|
|
2
2
|
import { basename, dirname, join, resolve } from 'node:path';
|
|
3
|
-
import { ensurePathAncestorsAndRealPathWithinHome, ensurePathAncestorsContainNoSymbolicLinks, ensurePathIsNotSymbolicLink, isWithinRoot, ensurePathWithinRoots, } from '../path-guard.js';
|
|
3
|
+
import { ensurePathAncestorsAndRealPathWithinHome, ensurePathAncestorsAndRealPathWithinAllowedRoots, ensurePathAncestorsContainNoSymbolicLinks, ensurePathIsNotSymbolicLink, isWithinRoot, ensurePathWithinRoots, } from '../path-guard.js';
|
|
4
4
|
import { isResourcePath, resolveResourcePath } from '../../resolve.js';
|
|
5
|
-
export { defaultOutputPath, listInstallTargets, resolveInstallTarget } from './targets.js';
|
|
5
|
+
export { defaultOutputPath, listInstallTargets, resolveInstallTarget, resolveInstallTargetRoots, } from './targets.js';
|
|
6
6
|
export function shouldOverwrite(answer) {
|
|
7
7
|
const normalized = answer.trim().toLowerCase();
|
|
8
8
|
return normalized === 'y' || normalized === 'yes';
|
|
@@ -138,6 +138,10 @@ export function collectDirectoryFiles(dir, basePath = '') {
|
|
|
138
138
|
return files;
|
|
139
139
|
}
|
|
140
140
|
function ensurePathSafety(params) {
|
|
141
|
+
if (params.allowedRoots) {
|
|
142
|
+
ensurePathAncestorsAndRealPathWithinAllowedRoots(params.targetDir, params.allowedRoots, params.promptLabel);
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
141
145
|
if (params.homeDir) {
|
|
142
146
|
ensurePathAncestorsAndRealPathWithinHome(params.targetDir, params.homeDir, params.promptLabel);
|
|
143
147
|
return;
|
|
@@ -154,6 +158,7 @@ export async function ensureRegenerationTargetDir(params) {
|
|
|
154
158
|
targetDir,
|
|
155
159
|
promptLabel,
|
|
156
160
|
homeDir: params.homeDir,
|
|
161
|
+
allowedRoots: params.allowedRoots,
|
|
157
162
|
cwd: options.cwd,
|
|
158
163
|
});
|
|
159
164
|
if (existsSync(targetDir)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow.js","sourceRoot":"","sources":["../../../src/cli/install-skill/flow.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,SAAS,EACT,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,MAAM,EACN,UAAU,EACV,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EACL,wCAAwC,EACxC,yCAAyC,EACzC,2BAA2B,EAC3B,YAAY,EACZ,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,OAAO,
|
|
1
|
+
{"version":3,"file":"flow.js","sourceRoot":"","sources":["../../../src/cli/install-skill/flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import type { FacetCliOptions, FacetCliResult } from '../types.js';
|
|
2
2
|
import type { SkillSections } from './facets.js';
|
|
3
3
|
import type { ComposeDefinition } from '../../types.js';
|
|
4
|
-
import type { InstallTarget } from '
|
|
4
|
+
import type { InstallTarget } from '../../install-targets.js';
|
|
5
|
+
import type { FacetedConfig } from '../../config/index.js';
|
|
5
6
|
export declare function runSkillDeployInstall(params: {
|
|
6
7
|
options: FacetCliOptions;
|
|
7
8
|
facetedRoots: readonly string[];
|
|
8
9
|
definitionDir: string;
|
|
9
10
|
facetsRoots: readonly string[];
|
|
11
|
+
config: FacetedConfig;
|
|
10
12
|
safeSkillName: string;
|
|
11
13
|
definition: ComposeDefinition;
|
|
12
14
|
sections: SkillSections;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modes.d.ts","sourceRoot":"","sources":["../../../src/cli/install-skill/modes.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"modes.d.ts","sourceRoot":"","sources":["../../../src/cli/install-skill/modes.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAenE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAoB3D,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,MAAM,EAAE,aAAa,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,QAAQ,EAAE,aAAa,CAAC;CACzB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,aAAa,CAAA;CAAE,CAAC,CAiGjG"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { existsSync, lstatSync, readFileSync } from 'node:fs';
|
|
2
2
|
import { basename, dirname, resolve } from 'node:path';
|
|
3
|
-
import {
|
|
3
|
+
import { isWithinRoot } from '../path-guard.js';
|
|
4
4
|
import { hasYamlFrontmatter, renderSkillDocument, renderSkillFrontmatter } from '../skill-renderer.js';
|
|
5
5
|
import { writeSkillFile } from '../skill-file-ops.js';
|
|
6
6
|
import { applyFacetTokensToPath, buildInlineFacetTokenValues, copyFacetFiles, } from './facets.js';
|
|
7
|
-
import { copyDirectoryTree, defaultOutputPath, ensureRegenerationTargetDir, listInstallTargets, ensureTemplateDirectoryFromRoots, resolveInstallTarget, } from './flow.js';
|
|
7
|
+
import { copyDirectoryTree, defaultOutputPath, ensureRegenerationTargetDir, listInstallTargets, ensureTemplateDirectoryFromRoots, resolveInstallTarget, resolveInstallTargetRoots, } from './flow.js';
|
|
8
8
|
import { composePromptPayload } from '../../prompt-payload.js';
|
|
9
9
|
function ensureTemplateBackedSkillFrontmatter(params) {
|
|
10
10
|
if (!existsSync(params.outputPath)) {
|
|
@@ -15,18 +15,19 @@ function ensureTemplateBackedSkillFrontmatter(params) {
|
|
|
15
15
|
return;
|
|
16
16
|
}
|
|
17
17
|
const contentWithFrontmatter = `${renderSkillFrontmatter(params.definition)}\n${currentContent.trimStart()}`;
|
|
18
|
-
writeSkillFile(params.outputPath, contentWithFrontmatter, params.
|
|
18
|
+
writeSkillFile(params.outputPath, contentWithFrontmatter, params.targetRoots);
|
|
19
19
|
}
|
|
20
20
|
export async function runSkillDeployInstall(params) {
|
|
21
21
|
const targetLabel = await params.options.select(listInstallTargets().map(target => target.label), 'Choose install target with Up/Down and Enter:');
|
|
22
22
|
const target = resolveInstallTarget(targetLabel);
|
|
23
23
|
const mode = 'inline';
|
|
24
|
-
const
|
|
24
|
+
const targetRoots = resolveInstallTargetRoots(params.options.homeDir, target, params.config);
|
|
25
|
+
const defaultPath = defaultOutputPath(params.options.homeDir, params.safeSkillName, target, params.config);
|
|
25
26
|
const outputPath = resolve(await params.options.input('Output path', defaultPath));
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
throw new Error(`Skill output path must be inside target directory: ${
|
|
27
|
+
const boundedOutputPath = outputPath;
|
|
28
|
+
if (!targetRoots.some(targetRoot => isWithinRoot(boundedOutputPath, targetRoot))) {
|
|
29
|
+
const allowedRoots = targetRoots.join(', ');
|
|
30
|
+
throw new Error(`Skill output path must be inside target directory: ${allowedRoots}`);
|
|
30
31
|
}
|
|
31
32
|
if (basename(boundedOutputPath) !== 'SKILL.md') {
|
|
32
33
|
throw new Error(`Skill output path must point to SKILL.md: ${boundedOutputPath}`);
|
|
@@ -44,14 +45,14 @@ export async function runSkillDeployInstall(params) {
|
|
|
44
45
|
composeOptions: { contextMaxChars: 8000 },
|
|
45
46
|
});
|
|
46
47
|
const targetDir = dirname(boundedOutputPath);
|
|
47
|
-
if (resolve(targetDir) ===
|
|
48
|
-
throw new Error(`Skill output path must include a skill directory under target directory: ${
|
|
48
|
+
if (targetRoots.some(targetRoot => resolve(targetDir) === targetRoot)) {
|
|
49
|
+
throw new Error(`Skill output path must include a skill directory under target directory: ${targetRoots.join(', ')}`);
|
|
49
50
|
}
|
|
50
51
|
await ensureRegenerationTargetDir({
|
|
51
52
|
targetDir,
|
|
52
53
|
options: params.options,
|
|
53
54
|
promptLabel: 'Target directory',
|
|
54
|
-
|
|
55
|
+
allowedRoots: targetRoots,
|
|
55
56
|
});
|
|
56
57
|
if (templateDir) {
|
|
57
58
|
copyDirectoryTree(templateDir, targetDir);
|
|
@@ -72,7 +73,7 @@ export async function runSkillDeployInstall(params) {
|
|
|
72
73
|
ensureTemplateBackedSkillFrontmatter({
|
|
73
74
|
outputPath: boundedOutputPath,
|
|
74
75
|
definition: params.definition,
|
|
75
|
-
|
|
76
|
+
targetRoots,
|
|
76
77
|
});
|
|
77
78
|
}
|
|
78
79
|
else {
|
|
@@ -88,7 +89,7 @@ export async function runSkillDeployInstall(params) {
|
|
|
88
89
|
...params.sections,
|
|
89
90
|
mode,
|
|
90
91
|
});
|
|
91
|
-
writeSkillFile(boundedOutputPath, content,
|
|
92
|
+
writeSkillFile(boundedOutputPath, content, targetRoots);
|
|
92
93
|
}
|
|
93
94
|
return {
|
|
94
95
|
result: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modes.js","sourceRoot":"","sources":["../../../src/cli/install-skill/modes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"modes.js","sourceRoot":"","sources":["../../../src/cli/install-skill/modes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { FacetedConfig } from '../../config/index.js';
|
|
2
|
+
import type { InstallTarget } from '../../install-targets.js';
|
|
2
3
|
export interface InstallTargetDefinition {
|
|
3
4
|
readonly key: InstallTarget;
|
|
4
5
|
readonly label: string;
|
|
5
|
-
readonly relativeOutputPath: readonly string[];
|
|
6
6
|
}
|
|
7
7
|
export declare function listInstallTargets(): readonly InstallTargetDefinition[];
|
|
8
8
|
export declare function resolveInstallTarget(targetLabel: string): InstallTargetDefinition;
|
|
9
|
-
export declare function
|
|
9
|
+
export declare function resolveInstallTargetRoots(homeDir: string, target: InstallTargetDefinition, config?: FacetedConfig): readonly string[];
|
|
10
|
+
export declare function defaultOutputPath(homeDir: string, skillName: string, target: InstallTargetDefinition, config?: FacetedConfig): string;
|
|
10
11
|
//# sourceMappingURL=targets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"targets.d.ts","sourceRoot":"","sources":["../../../src/cli/install-skill/targets.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"targets.d.ts","sourceRoot":"","sources":["../../../src/cli/install-skill/targets.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAM3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAaD,wBAAgB,kBAAkB,IAAI,SAAS,uBAAuB,EAAE,CAEvE;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,uBAAuB,CAMjF;AAOD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,uBAAuB,EAC/B,MAAM,CAAC,EAAE,aAAa,GACrB,SAAS,MAAM,EAAE,CAKnB;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,uBAAuB,EAC/B,MAAM,CAAC,EAAE,aAAa,GACrB,MAAM,CAOR"}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import { join } from 'node:path';
|
|
2
|
+
import { getBuiltInInstallRootTemplates, readInstallRootTemplatesFromConfigValue, resolveInstallRootTemplates, } from '../../config/install-targets.js';
|
|
2
3
|
const INSTALL_TARGETS = [
|
|
3
4
|
{
|
|
4
5
|
key: 'cc',
|
|
5
6
|
label: 'Claude Code',
|
|
6
|
-
relativeOutputPath: ['.claude', 'skills'],
|
|
7
7
|
},
|
|
8
8
|
{
|
|
9
9
|
key: 'codex',
|
|
10
10
|
label: 'Codex',
|
|
11
|
-
relativeOutputPath: ['.codex', 'skills'],
|
|
12
11
|
},
|
|
13
12
|
];
|
|
14
13
|
export function listInstallTargets() {
|
|
@@ -21,7 +20,22 @@ export function resolveInstallTarget(targetLabel) {
|
|
|
21
20
|
}
|
|
22
21
|
return definition;
|
|
23
22
|
}
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
function resolveCodexInstallRoots(homeDir, config) {
|
|
24
|
+
const rootTemplates = readInstallRootTemplatesFromConfigValue('codex', config);
|
|
25
|
+
return resolveInstallRootTemplates(homeDir, rootTemplates);
|
|
26
|
+
}
|
|
27
|
+
export function resolveInstallTargetRoots(homeDir, target, config) {
|
|
28
|
+
if (target.key === 'codex') {
|
|
29
|
+
return resolveCodexInstallRoots(homeDir, config);
|
|
30
|
+
}
|
|
31
|
+
return resolveInstallRootTemplates(homeDir, getBuiltInInstallRootTemplates(target.key));
|
|
32
|
+
}
|
|
33
|
+
export function defaultOutputPath(homeDir, skillName, target, config) {
|
|
34
|
+
const roots = resolveInstallTargetRoots(homeDir, target, config);
|
|
35
|
+
const primaryRoot = roots[0];
|
|
36
|
+
if (!primaryRoot) {
|
|
37
|
+
throw new Error(`Install target roots are required: ${target.key}`);
|
|
38
|
+
}
|
|
39
|
+
return join(primaryRoot, skillName, 'SKILL.md');
|
|
26
40
|
}
|
|
27
41
|
//# sourceMappingURL=targets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"targets.js","sourceRoot":"","sources":["../../../src/cli/install-skill/targets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"targets.js","sourceRoot":"","sources":["../../../src/cli/install-skill/targets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EACL,8BAA8B,EAC9B,uCAAuC,EACvC,2BAA2B,GAC5B,MAAM,iCAAiC,CAAC;AAQzC,MAAM,eAAe,GAAuC;IAC1D;QACE,GAAG,EAAE,IAAI;QACT,KAAK,EAAE,aAAa;KACrB;IACD;QACE,GAAG,EAAE,OAAO;QACZ,KAAK,EAAE,OAAO;KACf;CACF,CAAC;AAEF,MAAM,UAAU,kBAAkB;IAChC,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,WAAmB;IACtD,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC;IACtF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,6BAA6B,WAAW,EAAE,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,wBAAwB,CAAC,OAAe,EAAE,MAAsB;IACvE,MAAM,aAAa,GAAG,uCAAuC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/E,OAAO,2BAA2B,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,OAAe,EACf,MAA+B,EAC/B,MAAsB;IAEtB,IAAI,MAAM,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;QAC3B,OAAO,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,2BAA2B,CAAC,OAAO,EAAE,8BAA8B,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAC1F,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,OAAe,EACf,SAAiB,EACjB,MAA+B,EAC/B,MAAsB;IAEtB,MAAM,KAAK,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACjE,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7B,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAClD,CAAC"}
|
package/dist/cli/path-guard.d.ts
CHANGED
|
@@ -4,10 +4,15 @@ export declare function ensurePathWithinHome(path: string, homeDir: string, labe
|
|
|
4
4
|
homeRealPath: string;
|
|
5
5
|
};
|
|
6
6
|
export declare function ensurePathWithinRoots(path: string, roots: readonly string[], label: string): string;
|
|
7
|
+
export declare function ensurePathWithinAllowedRoots(path: string, roots: readonly string[], label: string): string;
|
|
7
8
|
export declare function ensurePathIsNotSymbolicLink(path: string, label: string): string;
|
|
8
9
|
export declare function ensurePathAncestorsContainNoSymbolicLinks(path: string, label: string, stopAtPath?: string): string;
|
|
9
10
|
export declare function ensurePathAncestorsAndRealPathWithinHome(path: string, homeDir: string, label: string): {
|
|
10
11
|
resolvedPath: string;
|
|
11
12
|
homeRealPath: string;
|
|
12
13
|
};
|
|
14
|
+
export declare function ensurePathAncestorsAndRealPathWithinAllowedRoots(path: string, roots: readonly string[], label: string): {
|
|
15
|
+
resolvedPath: string;
|
|
16
|
+
allowedRootRealPaths: readonly string[];
|
|
17
|
+
};
|
|
13
18
|
//# sourceMappingURL=path-guard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-guard.d.ts","sourceRoot":"","sources":["../../src/cli/path-guard.ts"],"names":[],"mappings":"AAGA,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAUhD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAqBnG;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAY/E;AAcD,wBAAgB,yCAAyC,CACvD,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAmDR;AAED,wBAAgB,wCAAwC,CACtD,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAYhD"}
|
|
1
|
+
{"version":3,"file":"path-guard.d.ts","sourceRoot":"","sources":["../../src/cli/path-guard.ts"],"names":[],"mappings":"AAGA,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAUhD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAqBnG;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAS1G;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAY/E;AAcD,wBAAgB,yCAAyC,CACvD,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAmDR;AAED,wBAAgB,wCAAwC,CACtD,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAYhD;AAED,wBAAgB,gDAAgD,CAC9D,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,KAAK,EAAE,MAAM,GACZ;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,oBAAoB,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAmBnE"}
|
package/dist/cli/path-guard.js
CHANGED
|
@@ -31,6 +31,14 @@ export function ensurePathWithinRoots(path, roots, label) {
|
|
|
31
31
|
}
|
|
32
32
|
throw new Error(`${label} must be inside allowed facets directory: ${realPath}`);
|
|
33
33
|
}
|
|
34
|
+
export function ensurePathWithinAllowedRoots(path, roots, label) {
|
|
35
|
+
const resolvedPath = resolve(path);
|
|
36
|
+
const resolvedRoots = roots.map(root => resolve(root));
|
|
37
|
+
if (!resolvedRoots.some(root => isWithinRoot(resolvedPath, root))) {
|
|
38
|
+
throw new Error(`${label} must be inside allowed roots: ${resolvedPath}`);
|
|
39
|
+
}
|
|
40
|
+
return resolvedPath;
|
|
41
|
+
}
|
|
34
42
|
export function ensurePathIsNotSymbolicLink(path, label) {
|
|
35
43
|
const resolvedPath = resolve(path);
|
|
36
44
|
if (!existsSync(resolvedPath)) {
|
|
@@ -110,4 +118,21 @@ export function ensurePathAncestorsAndRealPathWithinHome(path, homeDir, label) {
|
|
|
110
118
|
}
|
|
111
119
|
return { resolvedPath, homeRealPath };
|
|
112
120
|
}
|
|
121
|
+
export function ensurePathAncestorsAndRealPathWithinAllowedRoots(path, roots, label) {
|
|
122
|
+
const resolvedPath = ensurePathWithinAllowedRoots(path, roots, label);
|
|
123
|
+
const resolvedRoots = roots.map(root => resolve(root));
|
|
124
|
+
const containingRoot = resolvedRoots.find(root => isWithinRoot(resolvedPath, root));
|
|
125
|
+
if (!containingRoot) {
|
|
126
|
+
throw new Error(`${label} must be inside allowed roots: ${resolvedPath}`);
|
|
127
|
+
}
|
|
128
|
+
ensurePathAncestorsContainNoSymbolicLinks(resolvedPath, label, containingRoot);
|
|
129
|
+
const existingAncestor = findNearestExistingAncestor(resolvedPath);
|
|
130
|
+
const ancestorRealPath = realpathSync(existingAncestor);
|
|
131
|
+
const allowedRootRealPaths = resolvedRoots.map(root => (existsSync(root) ? realpathSync(root) : root));
|
|
132
|
+
const containingRootRealPath = existsSync(containingRoot) ? realpathSync(containingRoot) : undefined;
|
|
133
|
+
if (containingRootRealPath && !isWithinRoot(ancestorRealPath, containingRootRealPath)) {
|
|
134
|
+
throw new Error(`${label} must resolve inside allowed roots: ${resolvedPath}`);
|
|
135
|
+
}
|
|
136
|
+
return { resolvedPath, allowedRootRealPaths };
|
|
137
|
+
}
|
|
113
138
|
//# sourceMappingURL=path-guard.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-guard.js","sourceRoot":"","sources":["../../src/cli/path-guard.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"path-guard.js","sourceRoot":"","sources":["../../src/cli/path-guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,8 @@ export declare function getSkillPaths(cwd: string, homeDir: string): {
|
|
|
3
3
|
readonly facetedRoots: readonly string[];
|
|
4
4
|
readonly facetsRoots: readonly string[];
|
|
5
5
|
readonly compositionsDirs: readonly string[];
|
|
6
|
+
readonly localCompositionsDir?: string;
|
|
7
|
+
readonly globalCompositionsDir: string;
|
|
6
8
|
};
|
|
7
9
|
export declare function selectCompositionDefinitionPath(params: {
|
|
8
10
|
options: FacetCliOptions;
|
|
@@ -13,5 +15,11 @@ export declare function selectCompositionDefinitionPath(params: {
|
|
|
13
15
|
}): Promise<{
|
|
14
16
|
definitionPath: string;
|
|
15
17
|
}>;
|
|
18
|
+
export declare function resolveCompositionDefinitionPathByName(params: {
|
|
19
|
+
compositionName: string;
|
|
20
|
+
compositionDefinitionDirs: readonly string[];
|
|
21
|
+
}): {
|
|
22
|
+
definitionPath: string;
|
|
23
|
+
};
|
|
16
24
|
export declare function runInstallSkillCommand(options: FacetCliOptions): Promise<FacetCliResult>;
|
|
17
25
|
//# sourceMappingURL=skill-commands.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-commands.d.ts","sourceRoot":"","sources":["../../src/cli/skill-commands.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAIlE,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG;IAC3D,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"skill-commands.d.ts","sourceRoot":"","sources":["../../src/cli/skill-commands.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAIlE,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG;IAC3D,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7C,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;CACxC,CAoBA;AA+BD,wBAAsB,+BAA+B,CAAC,MAAM,EAAE;IAC5D,OAAO,EAAE,eAAe,CAAC;IACzB,yBAAyB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7C,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;CACrC,GAAG,OAAO,CAAC;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC,CAyCtC;AAED,wBAAgB,sCAAsC,CAAC,MAAM,EAAE;IAC7D,eAAe,EAAE,MAAM,CAAC;IACxB,yBAAyB,EAAE,SAAS,MAAM,EAAE,CAAC;CAC9C,GAAG;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAe7B;AAED,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAqC9F"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { existsSync, realpathSync } from 'node:fs';
|
|
2
2
|
import { dirname, join, resolve, sep } from 'node:path';
|
|
3
3
|
import { loadComposeDefinition } from '../compose-definition.js';
|
|
4
|
-
import { getFacetedRoot } from '../config/index.js';
|
|
4
|
+
import { getFacetedRoot, readFacetedConfigOrDefault } from '../config/index.js';
|
|
5
5
|
import { buildSkillSections, ensureSafeDefinitionName, listCompositionDefinitions, } from './skill-renderer.js';
|
|
6
6
|
import { shouldOverwrite } from './install-skill/flow.js';
|
|
7
7
|
import { runSkillDeployInstall } from './install-skill/modes.js';
|
|
@@ -13,10 +13,16 @@ export function getSkillPaths(cwd, homeDir) {
|
|
|
13
13
|
const facetedRoots = realLocal && realLocal !== realGlobal
|
|
14
14
|
? [localFacetedRoot, globalFacetedRoot]
|
|
15
15
|
: [globalFacetedRoot];
|
|
16
|
+
const localCompositionsDir = facetedRoots.length === 2
|
|
17
|
+
? join(localFacetedRoot, 'compositions')
|
|
18
|
+
: undefined;
|
|
19
|
+
const globalCompositionsDir = join(globalFacetedRoot, 'compositions');
|
|
16
20
|
return {
|
|
17
21
|
facetedRoots,
|
|
18
22
|
facetsRoots: facetedRoots.map(facetedRoot => join(facetedRoot, 'facets')),
|
|
19
23
|
compositionsDirs: facetedRoots.map(facetedRoot => join(facetedRoot, 'compositions')),
|
|
24
|
+
localCompositionsDir,
|
|
25
|
+
globalCompositionsDir,
|
|
20
26
|
};
|
|
21
27
|
}
|
|
22
28
|
function resolveCompositionSource(definitionPath, localCompositionsDir) {
|
|
@@ -67,12 +73,20 @@ export async function selectCompositionDefinitionPath(params) {
|
|
|
67
73
|
}
|
|
68
74
|
return { definitionPath };
|
|
69
75
|
}
|
|
76
|
+
export function resolveCompositionDefinitionPathByName(params) {
|
|
77
|
+
const definitionMap = listCompositionDefinitions(params.compositionDefinitionDirs);
|
|
78
|
+
const definitionPath = definitionMap[params.compositionName];
|
|
79
|
+
if (definitionPath) {
|
|
80
|
+
return { definitionPath };
|
|
81
|
+
}
|
|
82
|
+
const availableNames = Object.keys(definitionMap).sort();
|
|
83
|
+
if (availableNames.length === 0) {
|
|
84
|
+
throw new Error(`No compose definitions found in ${params.compositionDefinitionDirs.join(', ')}`);
|
|
85
|
+
}
|
|
86
|
+
throw new Error(`Unknown compose definition: ${params.compositionName}. Available compositions: ${availableNames.join(', ')}`);
|
|
87
|
+
}
|
|
70
88
|
export async function runInstallSkillCommand(options) {
|
|
71
|
-
const { facetedRoots, facetsRoots, compositionsDirs } = getSkillPaths(options.cwd, options.homeDir);
|
|
72
|
-
const localFacetedRoot = getFacetedRoot(options.cwd);
|
|
73
|
-
const globalFacetedRoot = getFacetedRoot(options.homeDir);
|
|
74
|
-
const localCompositionsDir = existsSync(localFacetedRoot) ? join(localFacetedRoot, 'compositions') : undefined;
|
|
75
|
-
const globalCompositionsDir = join(globalFacetedRoot, 'compositions');
|
|
89
|
+
const { facetedRoots, facetsRoots, compositionsDirs, localCompositionsDir, globalCompositionsDir, } = getSkillPaths(options.cwd, options.homeDir);
|
|
76
90
|
const { definitionPath } = await selectCompositionDefinitionPath({
|
|
77
91
|
options,
|
|
78
92
|
compositionDefinitionDirs: compositionsDirs,
|
|
@@ -83,6 +97,7 @@ export async function runInstallSkillCommand(options) {
|
|
|
83
97
|
const definition = await loadComposeDefinition(definitionPath);
|
|
84
98
|
const safeSkillName = ensureSafeDefinitionName(definition.name);
|
|
85
99
|
const definitionDir = dirname(definitionPath);
|
|
100
|
+
const config = await readFacetedConfigOrDefault(options.homeDir);
|
|
86
101
|
const sections = buildSkillSections({
|
|
87
102
|
definition,
|
|
88
103
|
definitionDir,
|
|
@@ -93,6 +108,7 @@ export async function runInstallSkillCommand(options) {
|
|
|
93
108
|
facetedRoots,
|
|
94
109
|
definitionDir,
|
|
95
110
|
facetsRoots,
|
|
111
|
+
config,
|
|
96
112
|
safeSkillName,
|
|
97
113
|
definition,
|
|
98
114
|
sections,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-commands.js","sourceRoot":"","sources":["../../src/cli/skill-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"skill-commands.js","sourceRoot":"","sources":["../../src/cli/skill-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
export declare function writeSkillFile(outputPath: string, content: string,
|
|
2
|
-
export declare function removeSkillFile(outputPath: string, homeDir: string): void;
|
|
1
|
+
export declare function writeSkillFile(outputPath: string, content: string, allowedRoots: readonly string[]): void;
|
|
3
2
|
//# sourceMappingURL=skill-file-ops.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-file-ops.d.ts","sourceRoot":"","sources":["../../src/cli/skill-file-ops.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"skill-file-ops.d.ts","sourceRoot":"","sources":["../../src/cli/skill-file-ops.ts"],"names":[],"mappings":"AA8DA,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CA8BzG"}
|
|
@@ -1,30 +1,23 @@
|
|
|
1
|
-
import { closeSync, constants, existsSync, lstatSync, mkdirSync, openSync, realpathSync, renameSync,
|
|
1
|
+
import { closeSync, constants, existsSync, lstatSync, mkdirSync, openSync, realpathSync, renameSync, unlinkSync, writeFileSync, } from 'node:fs';
|
|
2
2
|
import { basename, dirname, join } from 'node:path';
|
|
3
|
-
import {
|
|
4
|
-
function
|
|
3
|
+
import { ensurePathAncestorsAndRealPathWithinAllowedRoots, isWithinRoot, } from './path-guard.js';
|
|
4
|
+
function ensureParentPathWithinAllowedRoots(resolvedPath, allowedRootRealPaths) {
|
|
5
5
|
const outputParentDirectory = dirname(resolvedPath);
|
|
6
6
|
mkdirSync(outputParentDirectory, { recursive: true });
|
|
7
7
|
const outputParentRealPath = realpathSync(outputParentDirectory);
|
|
8
|
-
if (!isWithinRoot(outputParentRealPath,
|
|
9
|
-
throw new Error(`Skill output path escapes
|
|
8
|
+
if (!allowedRootRealPaths.some(root => isWithinRoot(outputParentRealPath, root))) {
|
|
9
|
+
throw new Error(`Skill output path escapes allowed roots: ${resolvedPath}`);
|
|
10
10
|
}
|
|
11
11
|
return outputParentRealPath;
|
|
12
12
|
}
|
|
13
13
|
function buildTemporaryPath(targetPath, parentRealPath) {
|
|
14
14
|
return join(parentRealPath, `.${basename(targetPath)}.${process.pid}.${Date.now()}.tmp`);
|
|
15
15
|
}
|
|
16
|
-
function resolveOutputTargetPathForWrite(resolvedPath,
|
|
17
|
-
const outputParentRealPath =
|
|
16
|
+
function resolveOutputTargetPathForWrite(resolvedPath, allowedRootRealPaths) {
|
|
17
|
+
const outputParentRealPath = ensureParentPathWithinAllowedRoots(resolvedPath, allowedRootRealPaths);
|
|
18
18
|
const outputTargetPath = join(outputParentRealPath, basename(resolvedPath));
|
|
19
19
|
return { outputParentRealPath, outputTargetPath };
|
|
20
20
|
}
|
|
21
|
-
function resolveOutputTargetPathForRemoval(resolvedPath, homeRealPath) {
|
|
22
|
-
const outputParentRealPath = realpathSync(dirname(resolvedPath));
|
|
23
|
-
if (!isWithinRoot(outputParentRealPath, homeRealPath)) {
|
|
24
|
-
throw new Error(`Skill output path escapes home directory: ${resolvedPath}`);
|
|
25
|
-
}
|
|
26
|
-
return join(outputParentRealPath, basename(resolvedPath));
|
|
27
|
-
}
|
|
28
21
|
function writeFreshFile(path, content) {
|
|
29
22
|
const openFlags = constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | constants.O_NOFOLLOW;
|
|
30
23
|
let fileDescriptor;
|
|
@@ -45,9 +38,9 @@ function writeFreshFile(path, content) {
|
|
|
45
38
|
closeSync(fileDescriptor);
|
|
46
39
|
}
|
|
47
40
|
}
|
|
48
|
-
export function writeSkillFile(outputPath, content,
|
|
49
|
-
const { resolvedPath,
|
|
50
|
-
const { outputParentRealPath, outputTargetPath } = resolveOutputTargetPathForWrite(resolvedPath,
|
|
41
|
+
export function writeSkillFile(outputPath, content, allowedRoots) {
|
|
42
|
+
const { resolvedPath, allowedRootRealPaths } = ensurePathAncestorsAndRealPathWithinAllowedRoots(outputPath, allowedRoots, 'Skill output path');
|
|
43
|
+
const { outputParentRealPath, outputTargetPath } = resolveOutputTargetPathForWrite(resolvedPath, allowedRootRealPaths);
|
|
51
44
|
const tempOutputPath = buildTemporaryPath(outputTargetPath, outputParentRealPath);
|
|
52
45
|
try {
|
|
53
46
|
if (existsSync(outputTargetPath) && lstatSync(outputTargetPath).isSymbolicLink()) {
|
|
@@ -63,27 +56,8 @@ export function writeSkillFile(outputPath, content, homeDir) {
|
|
|
63
56
|
throw error;
|
|
64
57
|
}
|
|
65
58
|
const outputRealPath = realpathSync(outputTargetPath);
|
|
66
|
-
if (!isWithinRoot(outputRealPath,
|
|
67
|
-
throw new Error(`Skill output path escapes
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
export function removeSkillFile(outputPath, homeDir) {
|
|
71
|
-
const { resolvedPath, homeRealPath } = ensurePathWithinHome(outputPath, homeDir, 'Skill output path');
|
|
72
|
-
if (!existsSync(resolvedPath)) {
|
|
73
|
-
return;
|
|
74
|
-
}
|
|
75
|
-
const outputTargetPath = resolveOutputTargetPathForRemoval(resolvedPath, homeRealPath);
|
|
76
|
-
const fileStat = lstatSync(outputTargetPath);
|
|
77
|
-
if (fileStat.isSymbolicLink()) {
|
|
78
|
-
throw new Error(`Symbolic links are not allowed for skill output file: ${resolvedPath}`);
|
|
79
|
-
}
|
|
80
|
-
const fileRealPath = realpathSync(outputTargetPath);
|
|
81
|
-
if (!isWithinRoot(fileRealPath, homeRealPath)) {
|
|
82
|
-
throw new Error(`Skill output path escapes home directory: ${resolvedPath}`);
|
|
59
|
+
if (!allowedRootRealPaths.some(root => isWithinRoot(outputRealPath, root))) {
|
|
60
|
+
throw new Error(`Skill output path escapes allowed roots: ${resolvedPath}`);
|
|
83
61
|
}
|
|
84
|
-
const outputParentRealPath = ensureParentPathWithinHome(outputTargetPath, homeRealPath);
|
|
85
|
-
const quarantinePath = join(outputParentRealPath, `.${basename(outputTargetPath)}.${process.pid}.${Date.now()}.delete`);
|
|
86
|
-
renameSync(outputTargetPath, quarantinePath);
|
|
87
|
-
rmSync(quarantinePath, { force: true });
|
|
88
62
|
}
|
|
89
63
|
//# sourceMappingURL=skill-file-ops.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-file-ops.js","sourceRoot":"","sources":["../../src/cli/skill-file-ops.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,SAAS,EACT,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,
|
|
1
|
+
{"version":3,"file":"skill-file-ops.js","sourceRoot":"","sources":["../../src/cli/skill-file-ops.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-types.d.ts","sourceRoot":"","sources":["../../src/cli/skill-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"skill-types.d.ts","sourceRoot":"","sources":["../../src/cli/skill-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,WAAW,CAAC;AAE/C,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnG,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,SAAS,EAAE,SAAS,YAAY,EAAE,CAAC;IAC5C,QAAQ,CAAC,YAAY,EAAE,SAAS,kBAAkB,EAAE,CAAC;CACtD;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,SAAS,EAAE,SAAS,YAAY,EAAE,CAAC;IAC5C,QAAQ,CAAC,YAAY,EAAE,SAAS,kBAAkB,EAAE,CAAC;CACtD"}
|