faceted-prompting 0.2.1 → 0.3.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 +29 -5
- package/dist/cli/compose-command.d.ts +3 -0
- package/dist/cli/compose-command.d.ts.map +1 -0
- package/dist/cli/compose-command.js +156 -0
- package/dist/cli/compose-command.js.map +1 -0
- package/dist/cli/compose-context.js +3 -3
- package/dist/cli/compose-context.js.map +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +21 -89
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/install-skill/facet-token-file-ops.d.ts +7 -0
- package/dist/cli/install-skill/facet-token-file-ops.d.ts.map +1 -0
- package/dist/cli/install-skill/facet-token-file-ops.js +69 -0
- package/dist/cli/install-skill/facet-token-file-ops.js.map +1 -0
- package/dist/cli/install-skill/facet-token-renderer.d.ts +6 -0
- package/dist/cli/install-skill/facet-token-renderer.d.ts.map +1 -0
- package/dist/cli/install-skill/facet-token-renderer.js +35 -0
- package/dist/cli/install-skill/facet-token-renderer.js.map +1 -0
- package/dist/cli/install-skill/facets.d.ts +6 -3
- package/dist/cli/install-skill/facets.d.ts.map +1 -1
- package/dist/cli/install-skill/facets.js +33 -15
- package/dist/cli/install-skill/facets.js.map +1 -1
- package/dist/cli/install-skill/flow.d.ts +3 -3
- package/dist/cli/install-skill/flow.d.ts.map +1 -1
- package/dist/cli/install-skill/flow.js +115 -21
- package/dist/cli/install-skill/flow.js.map +1 -1
- package/dist/cli/install-skill/modes.d.ts +2 -10
- package/dist/cli/install-skill/modes.d.ts.map +1 -1
- package/dist/cli/install-skill/modes.js +16 -43
- package/dist/cli/install-skill/modes.js.map +1 -1
- package/dist/cli/path-guard.d.ts +1 -0
- package/dist/cli/path-guard.d.ts.map +1 -1
- package/dist/cli/path-guard.js +34 -2
- package/dist/cli/path-guard.js.map +1 -1
- package/dist/cli/runner.d.ts +1 -0
- package/dist/cli/runner.d.ts.map +1 -1
- package/dist/cli/runner.js +11 -0
- package/dist/cli/runner.js.map +1 -1
- package/dist/cli/skill-commands.d.ts +13 -4
- package/dist/cli/skill-commands.d.ts.map +1 -1
- package/dist/cli/skill-commands.js +66 -15
- package/dist/cli/skill-commands.js.map +1 -1
- package/dist/cli/skill-renderer.d.ts +7 -4
- package/dist/cli/skill-renderer.d.ts.map +1 -1
- package/dist/cli/skill-renderer.js +48 -21
- package/dist/cli/skill-renderer.js.map +1 -1
- package/dist/cli/update-check.d.ts +2 -0
- package/dist/cli/update-check.d.ts.map +1 -0
- package/dist/cli/update-check.js +32 -0
- package/dist/cli/update-check.js.map +1 -0
- package/dist/init/index.d.ts +5 -1
- package/dist/init/index.d.ts.map +1 -1
- package/dist/init/index.js +23 -14
- package/dist/init/index.js.map +1 -1
- package/dist/prompt-payload.d.ts +2 -1
- package/dist/prompt-payload.d.ts.map +1 -1
- package/dist/prompt-payload.js.map +1 -1
- package/package.json +2 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { basename, join } from 'node:path';
|
|
2
|
-
import { copyFileSync, mkdirSync,
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
import { copyFileSync, mkdirSync, readdirSync, realpathSync, writeFileSync, } from 'node:fs';
|
|
3
|
+
import { isWithinRoot } from '../path-guard.js';
|
|
4
|
+
import { readUtf8FileWithoutFollowingSymbolicLinks, resolveBoundedOutputFilePath, writeUtf8FileWithoutFollowingSymbolicLinks, } from './facet-token-file-ops.js';
|
|
5
|
+
import { hasFacetToken, replaceFacetTokens } from './facet-token-renderer.js';
|
|
5
6
|
function requireFacetPathCount(params) {
|
|
6
7
|
if (params.expected !== params.actual) {
|
|
7
8
|
throw new Error(`Copied ${params.label} facet count mismatch: expected ${params.expected}, received ${params.actual}`);
|
|
@@ -25,10 +26,21 @@ export function buildInlineFacetTokenValues(sections) {
|
|
|
25
26
|
instructions: sections.instruction ? sections.instruction.body : '',
|
|
26
27
|
};
|
|
27
28
|
}
|
|
28
|
-
function
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
function applyFacetTokensToSingleFile(params) {
|
|
30
|
+
const boundedPath = resolveBoundedOutputFilePath(params.filePath, params.rootDir);
|
|
31
|
+
const original = readUtf8FileWithoutFollowingSymbolicLinks(boundedPath.filePath);
|
|
32
|
+
if (!hasFacetToken(original)) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
const replaced = replaceFacetTokens(original, params.tokenValues);
|
|
36
|
+
if (replaced === original) {
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
writeUtf8FileWithoutFollowingSymbolicLinks(boundedPath.filePath, replaced);
|
|
40
|
+
const outputRealPath = realpathSync(boundedPath.filePath);
|
|
41
|
+
if (!isWithinRoot(outputRealPath, boundedPath.rootRealPath)) {
|
|
42
|
+
throw new Error(`Output path escapes target directory: ${params.filePath}`);
|
|
43
|
+
}
|
|
32
44
|
}
|
|
33
45
|
export function buildSectionsWithCopiedPaths(sections, facets) {
|
|
34
46
|
requireFacetPathCount({
|
|
@@ -138,18 +150,24 @@ export function applyFacetTokensToPath(params) {
|
|
|
138
150
|
if (!entry.isFile()) {
|
|
139
151
|
continue;
|
|
140
152
|
}
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
if (replaced !== original) {
|
|
147
|
-
writeFileSync(entryPath, replaced, 'utf-8');
|
|
148
|
-
}
|
|
153
|
+
applyFacetTokensToSingleFile({
|
|
154
|
+
filePath: entryPath,
|
|
155
|
+
tokenValues,
|
|
156
|
+
rootDir,
|
|
157
|
+
});
|
|
149
158
|
}
|
|
150
159
|
};
|
|
151
160
|
visit(rootDir, 0);
|
|
152
161
|
}
|
|
162
|
+
export function applyFacetTokensToFiles(params) {
|
|
163
|
+
for (const filePath of params.filePaths) {
|
|
164
|
+
applyFacetTokensToSingleFile({
|
|
165
|
+
filePath,
|
|
166
|
+
tokenValues: params.tokenValues,
|
|
167
|
+
rootDir: params.rootDir,
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
}
|
|
153
171
|
export function parseScanDepth(rawDepth) {
|
|
154
172
|
const parsed = Number.parseInt(rawDepth, 10);
|
|
155
173
|
if (!Number.isFinite(parsed) || parsed < 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facets.js","sourceRoot":"","sources":["../../../src/cli/install-skill/facets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,
|
|
1
|
+
{"version":3,"file":"facets.js","sourceRoot":"","sources":["../../../src/cli/install-skill/facets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import type { FacetCliOptions } from '../types.js';
|
|
2
2
|
export { defaultOutputPath, listInstallTargets, resolveInstallTarget } from './targets.js';
|
|
3
3
|
export declare function shouldOverwrite(answer: string): boolean;
|
|
4
|
-
export declare function
|
|
5
|
-
export declare function copyDirectoryTree(sourceDir: string, targetDir: string): void;
|
|
4
|
+
export declare function ensureTemplateDirectoryFromRoots(facetedRoots: readonly string[], templateName: string): string;
|
|
5
|
+
export declare function copyDirectoryTree(sourceDir: string, targetDir: string, rootTargetDir?: string): void;
|
|
6
|
+
export declare function collectDirectoryFiles(dir: string, basePath?: string): string[];
|
|
6
7
|
export declare function ensureRegenerationTargetDir(params: {
|
|
7
8
|
targetDir: string;
|
|
8
9
|
options: FacetCliOptions;
|
|
9
10
|
promptLabel: string;
|
|
10
11
|
homeDir?: string;
|
|
11
12
|
}): Promise<void>;
|
|
12
|
-
export declare function ensureDirectoryExists(path: string, label: string): void;
|
|
13
13
|
//# sourceMappingURL=flow.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow.d.ts","sourceRoot":"","sources":["../../../src/cli/install-skill/flow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"flow.d.ts","sourceRoot":"","sources":["../../../src/cli/install-skill/flow.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAE3F,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAGvD;AAED,wBAAgB,gCAAgC,CAC9C,YAAY,EAAE,SAAS,MAAM,EAAE,EAC/B,YAAY,EAAE,MAAM,GACnB,MAAM,CAwBR;AAgGD,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,SAAY,GAAG,IAAI,CASvG;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,SAAK,GAAG,MAAM,EAAE,CAsB1E;AAiBD,wBAAsB,2BAA2B,CAAC,MAAM,EAAE;IACxD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,eAAe,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBhB"}
|
|
@@ -1,45 +1,144 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { join } from 'node:path';
|
|
3
|
-
import { ensurePathAncestorsAndRealPathWithinHome, ensurePathAncestorsContainNoSymbolicLinks, ensurePathWithinRoots, } from '../path-guard.js';
|
|
1
|
+
import { closeSync, constants, existsSync, lstatSync, mkdirSync, openSync, readdirSync, readFileSync, realpathSync, renameSync, rmSync, unlinkSync, writeFileSync, } from 'node:fs';
|
|
2
|
+
import { basename, dirname, join, resolve } from 'node:path';
|
|
3
|
+
import { ensurePathAncestorsAndRealPathWithinHome, ensurePathAncestorsContainNoSymbolicLinks, ensurePathIsNotSymbolicLink, isWithinRoot, ensurePathWithinRoots, } from '../path-guard.js';
|
|
4
4
|
export { defaultOutputPath, listInstallTargets, resolveInstallTarget } from './targets.js';
|
|
5
5
|
export function shouldOverwrite(answer) {
|
|
6
6
|
const normalized = answer.trim().toLowerCase();
|
|
7
7
|
return normalized === 'y' || normalized === 'yes';
|
|
8
8
|
}
|
|
9
|
-
export function
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
if (!
|
|
13
|
-
throw new Error(
|
|
9
|
+
export function ensureTemplateDirectoryFromRoots(facetedRoots, templateName) {
|
|
10
|
+
const templatesRoots = facetedRoots.map(facetedRoot => join(facetedRoot, 'templates'));
|
|
11
|
+
const primaryTemplatesRoot = templatesRoots[0];
|
|
12
|
+
if (!primaryTemplatesRoot) {
|
|
13
|
+
throw new Error('Template roots are required');
|
|
14
|
+
}
|
|
15
|
+
for (const templatesRoot of templatesRoots) {
|
|
16
|
+
const candidatePath = join(templatesRoot, templateName);
|
|
17
|
+
if (!existsSync(candidatePath)) {
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
const templatePath = ensurePathWithinRoots(candidatePath, [templatesRoot], `template "${templateName}"`);
|
|
21
|
+
if (!lstatSync(templatePath).isDirectory()) {
|
|
22
|
+
throw new Error(`Template path must be a directory: ${templatePath}`);
|
|
23
|
+
}
|
|
24
|
+
return templatePath;
|
|
25
|
+
}
|
|
26
|
+
throw new Error(`Template directory does not exist: ${join(primaryTemplatesRoot, templateName)}`);
|
|
27
|
+
}
|
|
28
|
+
function copyFileIntoTargetRoot(params) {
|
|
29
|
+
const targetParentDir = dirname(params.targetPath);
|
|
30
|
+
mkdirSync(targetParentDir, { recursive: true });
|
|
31
|
+
ensurePathAncestorsContainNoSymbolicLinks(targetParentDir, 'Output directory', params.rootTargetDir);
|
|
32
|
+
const targetParentRealPath = realpathSync(targetParentDir);
|
|
33
|
+
if (!isWithinRoot(targetParentRealPath, params.rootTargetRealPath)) {
|
|
34
|
+
throw new Error(`Output path escapes target directory: ${params.targetPath}`);
|
|
35
|
+
}
|
|
36
|
+
const targetFilePath = join(targetParentRealPath, basename(params.targetPath));
|
|
37
|
+
const tempFilePath = join(targetParentRealPath, `.${basename(params.targetPath)}.${process.pid}.${Date.now()}.tmp`);
|
|
38
|
+
const openFlags = constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | constants.O_NOFOLLOW;
|
|
39
|
+
let targetFileDescriptor;
|
|
40
|
+
try {
|
|
41
|
+
if (existsSync(targetFilePath) && lstatSync(targetFilePath).isSymbolicLink()) {
|
|
42
|
+
throw new Error(`Symbolic links are not allowed for output file: ${params.targetPath}`);
|
|
43
|
+
}
|
|
44
|
+
targetFileDescriptor = openSync(tempFilePath, openFlags, 0o600);
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
const errorCode = error.code;
|
|
48
|
+
if (errorCode === 'ELOOP') {
|
|
49
|
+
throw new Error(`Symbolic links are not allowed for output file: ${tempFilePath}`);
|
|
50
|
+
}
|
|
51
|
+
throw error;
|
|
52
|
+
}
|
|
53
|
+
try {
|
|
54
|
+
writeFileSync(targetFileDescriptor, readFileSync(params.sourcePath));
|
|
55
|
+
}
|
|
56
|
+
finally {
|
|
57
|
+
closeSync(targetFileDescriptor);
|
|
58
|
+
}
|
|
59
|
+
try {
|
|
60
|
+
renameSync(tempFilePath, targetFilePath);
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
if (existsSync(tempFilePath)) {
|
|
64
|
+
unlinkSync(tempFilePath);
|
|
65
|
+
}
|
|
66
|
+
throw error;
|
|
67
|
+
}
|
|
68
|
+
const targetRealPath = realpathSync(targetFilePath);
|
|
69
|
+
if (!isWithinRoot(targetRealPath, params.rootTargetRealPath)) {
|
|
70
|
+
throw new Error(`Output path escapes target directory: ${params.targetPath}`);
|
|
14
71
|
}
|
|
15
|
-
return templatePath;
|
|
16
72
|
}
|
|
17
|
-
|
|
73
|
+
function copyDirectoryTreeInternal(params) {
|
|
74
|
+
mkdirSync(params.targetDir, { recursive: true });
|
|
75
|
+
for (const entry of readdirSync(params.sourceDir, { withFileTypes: true })) {
|
|
76
|
+
if (entry.isSymbolicLink()) {
|
|
77
|
+
throw new Error(`Symbolic links are not allowed in template directory: ${join(params.sourceDir, entry.name)}`);
|
|
78
|
+
}
|
|
79
|
+
const sourcePath = join(params.sourceDir, entry.name);
|
|
80
|
+
const targetPath = join(params.targetDir, entry.name);
|
|
81
|
+
if (entry.isDirectory()) {
|
|
82
|
+
ensurePathAncestorsContainNoSymbolicLinks(targetPath, 'Output directory', params.rootTargetDir);
|
|
83
|
+
copyDirectoryTreeInternal({
|
|
84
|
+
sourceDir: sourcePath,
|
|
85
|
+
targetDir: targetPath,
|
|
86
|
+
rootTargetDir: params.rootTargetDir,
|
|
87
|
+
rootTargetRealPath: params.rootTargetRealPath,
|
|
88
|
+
});
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
if (entry.isFile()) {
|
|
92
|
+
copyFileIntoTargetRoot({
|
|
93
|
+
sourcePath,
|
|
94
|
+
targetPath,
|
|
95
|
+
rootTargetDir: params.rootTargetDir,
|
|
96
|
+
rootTargetRealPath: params.rootTargetRealPath,
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
export function copyDirectoryTree(sourceDir, targetDir, rootTargetDir = targetDir) {
|
|
18
102
|
mkdirSync(targetDir, { recursive: true });
|
|
19
|
-
|
|
103
|
+
const rootTargetRealPath = realpathSync(rootTargetDir);
|
|
104
|
+
copyDirectoryTreeInternal({
|
|
105
|
+
sourceDir,
|
|
106
|
+
targetDir,
|
|
107
|
+
rootTargetDir,
|
|
108
|
+
rootTargetRealPath,
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
export function collectDirectoryFiles(dir, basePath = '') {
|
|
112
|
+
const files = [];
|
|
113
|
+
for (const entry of readdirSync(dir, { withFileTypes: true })) {
|
|
20
114
|
if (entry.isSymbolicLink()) {
|
|
21
|
-
|
|
115
|
+
continue;
|
|
22
116
|
}
|
|
23
|
-
const
|
|
24
|
-
const
|
|
117
|
+
const relativePath = basePath ? join(basePath, entry.name) : entry.name;
|
|
118
|
+
const entryPath = join(dir, entry.name);
|
|
25
119
|
if (entry.isDirectory()) {
|
|
26
|
-
|
|
120
|
+
files.push(...collectDirectoryFiles(entryPath, relativePath));
|
|
27
121
|
continue;
|
|
28
122
|
}
|
|
29
123
|
if (entry.isFile()) {
|
|
30
|
-
|
|
124
|
+
files.push(relativePath);
|
|
31
125
|
}
|
|
32
126
|
}
|
|
127
|
+
return files;
|
|
33
128
|
}
|
|
34
129
|
function ensurePathSafety(params) {
|
|
35
130
|
if (params.homeDir) {
|
|
36
131
|
ensurePathAncestorsAndRealPathWithinHome(params.targetDir, params.homeDir, params.promptLabel);
|
|
37
132
|
return;
|
|
38
133
|
}
|
|
134
|
+
ensurePathIsNotSymbolicLink(params.targetDir, params.promptLabel);
|
|
39
135
|
ensurePathAncestorsContainNoSymbolicLinks(params.targetDir, params.promptLabel, params.cwd);
|
|
40
136
|
}
|
|
41
137
|
export async function ensureRegenerationTargetDir(params) {
|
|
42
138
|
const { targetDir, options, promptLabel } = params;
|
|
139
|
+
if (params.homeDir && resolve(targetDir) === resolve(params.homeDir)) {
|
|
140
|
+
throw new Error(`${promptLabel} must not be home directory: ${resolve(targetDir)}`);
|
|
141
|
+
}
|
|
43
142
|
ensurePathSafety({
|
|
44
143
|
targetDir,
|
|
45
144
|
promptLabel,
|
|
@@ -55,9 +154,4 @@ export async function ensureRegenerationTargetDir(params) {
|
|
|
55
154
|
}
|
|
56
155
|
mkdirSync(targetDir, { recursive: true });
|
|
57
156
|
}
|
|
58
|
-
export function ensureDirectoryExists(path, label) {
|
|
59
|
-
if (!existsSync(path) || !lstatSync(path).isDirectory()) {
|
|
60
|
-
throw new Error(`${label} does not exist: ${path}`);
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
157
|
//# sourceMappingURL=flow.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow.js","sourceRoot":"","sources":["../../../src/cli/install-skill/flow.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"flow.js","sourceRoot":"","sources":["../../../src/cli/install-skill/flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,19 +2,11 @@ import type { FacetCliOptions, FacetCliResult } from '../types.js';
|
|
|
2
2
|
import type { SkillSections } from './facets.js';
|
|
3
3
|
import type { ComposeDefinition } from '../../types.js';
|
|
4
4
|
import type { InstallTarget } from '../skill-types.js';
|
|
5
|
-
export declare function runTemplateApplyInstall(params: {
|
|
6
|
-
options: FacetCliOptions;
|
|
7
|
-
safeSkillName: string;
|
|
8
|
-
sections: SkillSections;
|
|
9
|
-
templateDir: string;
|
|
10
|
-
definitionDir: string;
|
|
11
|
-
facetsRoot: string;
|
|
12
|
-
}): Promise<FacetCliResult>;
|
|
13
5
|
export declare function runSkillDeployInstall(params: {
|
|
14
6
|
options: FacetCliOptions;
|
|
15
|
-
|
|
7
|
+
facetedRoots: readonly string[];
|
|
16
8
|
definitionDir: string;
|
|
17
|
-
|
|
9
|
+
facetsRoots: readonly string[];
|
|
18
10
|
safeSkillName: string;
|
|
19
11
|
definition: ComposeDefinition;
|
|
20
12
|
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;AAcnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAqBvD,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,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,CAoGjG"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { existsSync, lstatSync, readFileSync } from 'node:fs';
|
|
2
|
-
import {
|
|
3
|
-
import { ensurePathWithinHome } from '../path-guard.js';
|
|
2
|
+
import { basename, dirname, resolve } from 'node:path';
|
|
3
|
+
import { ensurePathWithinHome, 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
|
-
import { applyFacetTokensToPath, buildInlineFacetTokenValues, copyFacetFiles,
|
|
7
|
-
import { copyDirectoryTree, defaultOutputPath,
|
|
6
|
+
import { applyFacetTokensToPath, buildInlineFacetTokenValues, copyFacetFiles, } from './facets.js';
|
|
7
|
+
import { copyDirectoryTree, defaultOutputPath, ensureRegenerationTargetDir, listInstallTargets, ensureTemplateDirectoryFromRoots, resolveInstallTarget, } from './flow.js';
|
|
8
8
|
import { composePromptPayload } from '../../prompt-payload.js';
|
|
9
9
|
function ensureTemplateBackedSkillFrontmatter(params) {
|
|
10
10
|
if (!existsSync(params.outputPath)) {
|
|
@@ -17,43 +17,6 @@ function ensureTemplateBackedSkillFrontmatter(params) {
|
|
|
17
17
|
const contentWithFrontmatter = `${renderSkillFrontmatter(params.definition)}\n${currentContent.trimStart()}`;
|
|
18
18
|
writeSkillFile(params.outputPath, contentWithFrontmatter, params.homeDir);
|
|
19
19
|
}
|
|
20
|
-
export async function runTemplateApplyInstall(params) {
|
|
21
|
-
const requestedDir = await params.options.input('Output directory', params.options.cwd);
|
|
22
|
-
const targetDir = resolve(requestedDir);
|
|
23
|
-
ensureDirectoryExists(targetDir, 'Output directory');
|
|
24
|
-
const scanDepth = parseScanDepth(await params.options.input('Scan depth', '1'));
|
|
25
|
-
const payload = composePromptPayload({
|
|
26
|
-
definition: params.sections.definition,
|
|
27
|
-
definitionDir: params.definitionDir,
|
|
28
|
-
facetsRoot: params.facetsRoot,
|
|
29
|
-
composeOptions: { contextMaxChars: 8000 },
|
|
30
|
-
});
|
|
31
|
-
copyDirectoryTree(params.templateDir, targetDir);
|
|
32
|
-
const facetsDir = join(targetDir, 'facets');
|
|
33
|
-
await ensureRegenerationTargetDir({
|
|
34
|
-
targetDir: facetsDir,
|
|
35
|
-
options: params.options,
|
|
36
|
-
promptLabel: 'Facets directory',
|
|
37
|
-
});
|
|
38
|
-
copyFacetFiles({
|
|
39
|
-
targetDir,
|
|
40
|
-
safeSkillName: params.safeSkillName,
|
|
41
|
-
copyFiles: payload.copyFiles,
|
|
42
|
-
literalInstructionBody: params.sections.instruction && !('path' in params.sections.instruction)
|
|
43
|
-
? params.sections.instruction.body
|
|
44
|
-
: undefined,
|
|
45
|
-
});
|
|
46
|
-
applyFacetTokensToPath({
|
|
47
|
-
rootDir: targetDir,
|
|
48
|
-
maxDepth: scanDepth,
|
|
49
|
-
tokenValues: buildInlineFacetTokenValues(params.sections),
|
|
50
|
-
excludeDirs: ['facets'],
|
|
51
|
-
});
|
|
52
|
-
return {
|
|
53
|
-
kind: 'path',
|
|
54
|
-
path: targetDir,
|
|
55
|
-
};
|
|
56
|
-
}
|
|
57
20
|
export async function runSkillDeployInstall(params) {
|
|
58
21
|
const targetLabel = await params.options.select(listInstallTargets().map(target => target.label), 'Choose install target with Up/Down and Enter:');
|
|
59
22
|
const target = resolveInstallTarget(targetLabel);
|
|
@@ -61,19 +24,29 @@ export async function runSkillDeployInstall(params) {
|
|
|
61
24
|
const defaultPath = defaultOutputPath(params.options.homeDir, params.safeSkillName, target);
|
|
62
25
|
const outputPath = resolve(await params.options.input('Output path', defaultPath));
|
|
63
26
|
const { resolvedPath: boundedOutputPath } = ensurePathWithinHome(outputPath, params.options.homeDir, 'Skill output path');
|
|
27
|
+
const targetRootDir = resolve(params.options.homeDir, ...target.relativeOutputPath);
|
|
28
|
+
if (!isWithinRoot(boundedOutputPath, targetRootDir)) {
|
|
29
|
+
throw new Error(`Skill output path must be inside target directory: ${targetRootDir}`);
|
|
30
|
+
}
|
|
31
|
+
if (basename(boundedOutputPath) !== 'SKILL.md') {
|
|
32
|
+
throw new Error(`Skill output path must point to SKILL.md: ${boundedOutputPath}`);
|
|
33
|
+
}
|
|
64
34
|
if (existsSync(boundedOutputPath) && lstatSync(boundedOutputPath).isSymbolicLink()) {
|
|
65
35
|
throw new Error(`Symbolic links are not allowed for skill output file: ${boundedOutputPath}`);
|
|
66
36
|
}
|
|
67
37
|
const templateDir = params.definition.template
|
|
68
|
-
?
|
|
38
|
+
? ensureTemplateDirectoryFromRoots(params.facetedRoots, params.definition.template)
|
|
69
39
|
: undefined;
|
|
70
40
|
const payload = composePromptPayload({
|
|
71
41
|
definition: params.definition,
|
|
72
42
|
definitionDir: params.definitionDir,
|
|
73
|
-
|
|
43
|
+
facetsRoots: params.facetsRoots,
|
|
74
44
|
composeOptions: { contextMaxChars: 8000 },
|
|
75
45
|
});
|
|
76
46
|
const targetDir = dirname(boundedOutputPath);
|
|
47
|
+
if (resolve(targetDir) === targetRootDir) {
|
|
48
|
+
throw new Error(`Skill output path must include a skill directory under target directory: ${targetRootDir}`);
|
|
49
|
+
}
|
|
77
50
|
await ensureRegenerationTargetDir({
|
|
78
51
|
targetDir,
|
|
79
52
|
options: params.options,
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"modes.js","sourceRoot":"","sources":["../../../src/cli/install-skill/modes.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/path-guard.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ 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 ensurePathIsNotSymbolicLink(path: string, label: string): string;
|
|
7
8
|
export declare function ensurePathAncestorsContainNoSymbolicLinks(path: string, label: string, stopAtPath?: string): string;
|
|
8
9
|
export declare function ensurePathAncestorsAndRealPathWithinHome(path: string, homeDir: string, label: string): {
|
|
9
10
|
resolvedPath: string;
|
|
@@ -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;AAcD,wBAAgB,yCAAyC,CACvD,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,
|
|
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"}
|
package/dist/cli/path-guard.js
CHANGED
|
@@ -31,6 +31,17 @@ 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 ensurePathIsNotSymbolicLink(path, label) {
|
|
35
|
+
const resolvedPath = resolve(path);
|
|
36
|
+
if (!existsSync(resolvedPath)) {
|
|
37
|
+
return resolvedPath;
|
|
38
|
+
}
|
|
39
|
+
const stat = lstatSync(resolvedPath);
|
|
40
|
+
if (stat.isSymbolicLink()) {
|
|
41
|
+
throw new Error(`Symbolic links are not allowed for ${label}: ${resolvedPath}`);
|
|
42
|
+
}
|
|
43
|
+
return resolvedPath;
|
|
44
|
+
}
|
|
34
45
|
function findNearestExistingAncestor(path) {
|
|
35
46
|
let current = path;
|
|
36
47
|
while (!existsSync(current)) {
|
|
@@ -45,22 +56,43 @@ function findNearestExistingAncestor(path) {
|
|
|
45
56
|
export function ensurePathAncestorsContainNoSymbolicLinks(path, label, stopAtPath) {
|
|
46
57
|
const resolvedPath = resolve(path);
|
|
47
58
|
const resolvedStopAtPath = stopAtPath ? resolve(stopAtPath) : undefined;
|
|
59
|
+
const nearestExistingAncestor = findNearestExistingAncestor(resolvedPath);
|
|
48
60
|
let current = resolvedPath;
|
|
49
61
|
while (true) {
|
|
50
|
-
if (
|
|
62
|
+
if (existsSync(current)) {
|
|
63
|
+
const stat = lstatSync(current);
|
|
64
|
+
if (stat.isSymbolicLink()) {
|
|
65
|
+
throw new Error(`Symbolic links are not allowed in ${label} path: ${current}`);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
if (current === nearestExistingAncestor) {
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
71
|
+
const parent = dirname(current);
|
|
72
|
+
if (parent === current) {
|
|
51
73
|
break;
|
|
52
74
|
}
|
|
75
|
+
current = parent;
|
|
76
|
+
}
|
|
77
|
+
if (!resolvedStopAtPath || !isWithinRoot(nearestExistingAncestor, resolvedStopAtPath)) {
|
|
78
|
+
return resolvedPath;
|
|
79
|
+
}
|
|
80
|
+
current = dirname(nearestExistingAncestor);
|
|
81
|
+
while (true) {
|
|
53
82
|
if (existsSync(current)) {
|
|
54
83
|
const stat = lstatSync(current);
|
|
55
84
|
if (stat.isSymbolicLink()) {
|
|
56
85
|
throw new Error(`Symbolic links are not allowed in ${label} path: ${current}`);
|
|
57
86
|
}
|
|
58
87
|
}
|
|
88
|
+
if (current === resolvedStopAtPath) {
|
|
89
|
+
break;
|
|
90
|
+
}
|
|
59
91
|
const parent = dirname(current);
|
|
60
92
|
if (parent === current) {
|
|
61
93
|
break;
|
|
62
94
|
}
|
|
63
|
-
if (
|
|
95
|
+
if (!isWithinRoot(parent, resolvedStopAtPath)) {
|
|
64
96
|
break;
|
|
65
97
|
}
|
|
66
98
|
current = parent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-guard.js","sourceRoot":"","sources":["../../src/cli/path-guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAElD,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,IAAY;IACrD,OAAO,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,GAAG,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,IAAY,EACZ,OAAe,EACf,KAAa;IAEb,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAEnD,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,eAAe,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,mCAAmC,YAAY,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAY,EAAE,KAAwB,EAAE,KAAa;IACzF,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,WAAW,KAAK,KAAK,YAAY,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,QAAQ,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IACzC,IAAI,QAAQ,CAAC,cAAc,EAAE,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,sCAAsC,KAAK,KAAK,YAAY,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;QACtF,IAAI,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;YACrC,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,6CAA6C,QAAQ,EAAE,CAAC,CAAC;AACnF,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAY;IAC/C,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,wCAAwC,IAAI,EAAE,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,GAAG,MAAM,CAAC;IACnB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,yCAAyC,CACvD,IAAY,EACZ,KAAa,EACb,UAAmB;IAEnB,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,kBAAkB,GAAG,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"path-guard.js","sourceRoot":"","sources":["../../src/cli/path-guard.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/runner.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { runFacetCli } from './index.js';
|
|
2
2
|
export interface RunnerDependencies {
|
|
3
|
+
readonly checkForUpdates: () => Promise<void>;
|
|
3
4
|
readonly runFacetCli: typeof runFacetCli;
|
|
4
5
|
readonly writeStdout: (message: string) => void;
|
|
5
6
|
readonly writeStderr: (message: string) => void;
|
package/dist/cli/runner.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/cli/runner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/cli/runner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAiBzC,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,QAAQ,CAAC,WAAW,EAAE,OAAO,WAAW,CAAC;IACzC,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C;AAsBD,wBAAsB,OAAO,CAC3B,IAAI,EAAE,MAAM,EAAE,EACd,YAAY,GAAE,kBAA0C,GACvD,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED,wBAAsB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAExD"}
|
package/dist/cli/runner.js
CHANGED
|
@@ -4,6 +4,7 @@ import { createInterface } from 'node:readline/promises';
|
|
|
4
4
|
import { pathToFileURL } from 'node:url';
|
|
5
5
|
import { runFacetCli } from './index.js';
|
|
6
6
|
import { selectInteractive } from './select.js';
|
|
7
|
+
import { checkForUpdates } from './update-check.js';
|
|
7
8
|
async function inputInteractive(prompt, defaultValue) {
|
|
8
9
|
const rl = createInterface({ input, output });
|
|
9
10
|
try {
|
|
@@ -19,6 +20,7 @@ async function inputInteractive(prompt, defaultValue) {
|
|
|
19
20
|
}
|
|
20
21
|
function defaultDependencies() {
|
|
21
22
|
return {
|
|
23
|
+
checkForUpdates,
|
|
22
24
|
runFacetCli,
|
|
23
25
|
writeStdout: message => {
|
|
24
26
|
output.write(message);
|
|
@@ -35,6 +37,15 @@ function toErrorMessage(error) {
|
|
|
35
37
|
return error instanceof Error ? error.message : String(error);
|
|
36
38
|
}
|
|
37
39
|
export async function runMain(argv, dependencies = defaultDependencies()) {
|
|
40
|
+
try {
|
|
41
|
+
const updateCheckTask = dependencies.checkForUpdates();
|
|
42
|
+
void updateCheckTask.catch((error) => {
|
|
43
|
+
dependencies.writeStderr(`update check failed: ${toErrorMessage(error)}\n`);
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
dependencies.writeStderr(`update check failed: ${toErrorMessage(error)}\n`);
|
|
48
|
+
}
|
|
38
49
|
try {
|
|
39
50
|
const result = await dependencies.runFacetCli(argv, {
|
|
40
51
|
cwd: process.cwd(),
|