psadk 1.3.4 → 1.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/build/main/index.d.ts +3 -0
- package/build/main/index.js +4 -1
- package/build/main/lib/skills/constants.d.ts +1 -0
- package/build/main/lib/skills/constants.js +2 -1
- package/build/main/lib/skills/skillParser.d.ts +6 -1
- package/build/main/lib/skills/skillParser.js +25 -15
- package/build/main/lib/skills/types.d.ts +61 -0
- package/build/main/lib/skills/types.js +3 -0
- package/build/main/lib/skills/utils.d.ts +56 -0
- package/build/main/lib/skills/utils.js +342 -1
- package/build/main/lib/tools/PSSkillTool.d.ts +14 -0
- package/build/main/lib/tools/PSSkillTool.js +100 -0
- package/build/module/index.d.ts +3 -0
- package/build/module/index.js +4 -1
- package/build/module/lib/skills/constants.d.ts +1 -0
- package/build/module/lib/skills/constants.js +2 -1
- package/build/module/lib/skills/skillParser.d.ts +6 -1
- package/build/module/lib/skills/skillParser.js +25 -15
- package/build/module/lib/skills/types.d.ts +61 -0
- package/build/module/lib/skills/types.js +3 -0
- package/build/module/lib/skills/utils.d.ts +56 -0
- package/build/module/lib/skills/utils.js +340 -1
- package/build/module/lib/tools/PSSkillTool.d.ts +14 -0
- package/build/module/lib/tools/PSSkillTool.js +102 -0
- package/package.json +2 -1
package/build/main/index.d.ts
CHANGED
|
@@ -11,3 +11,6 @@ export * from './lib/tools/PSWriteFileTool';
|
|
|
11
11
|
export * from './lib/tools/PSSubAgentTool';
|
|
12
12
|
export * from './lib/tools/PSMemoryTool';
|
|
13
13
|
export * from './lib/tools/PSClarifyTool';
|
|
14
|
+
export * from './lib/tools/PSSkillTool';
|
|
15
|
+
export * from './lib/skills/types';
|
|
16
|
+
export * from './lib/skills/utils';
|
package/build/main/index.js
CHANGED
|
@@ -27,4 +27,7 @@ __exportStar(require("./lib/tools/PSWriteFileTool"), exports);
|
|
|
27
27
|
__exportStar(require("./lib/tools/PSSubAgentTool"), exports);
|
|
28
28
|
__exportStar(require("./lib/tools/PSMemoryTool"), exports);
|
|
29
29
|
__exportStar(require("./lib/tools/PSClarifyTool"), exports);
|
|
30
|
-
|
|
30
|
+
__exportStar(require("./lib/tools/PSSkillTool"), exports);
|
|
31
|
+
__exportStar(require("./lib/skills/types"), exports);
|
|
32
|
+
__exportStar(require("./lib/skills/utils"), exports);
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDZDQUEyQjtBQUMzQixnREFBOEI7QUFDOUIsc0RBQW9DO0FBQ3BDLHNEQUFvQztBQUNwQyxvREFBa0M7QUFDbEMsb0RBQWtDO0FBQ2xDLHVEQUFxQztBQUNyQyxnRUFBOEM7QUFDOUMsNkRBQTJDO0FBQzNDLDhEQUE0QztBQUM1Qyw2REFBMkM7QUFDM0MsMkRBQXlDO0FBQ3pDLDREQUEwQztBQUMxQywwREFBd0M7QUFDeEMscURBQW1DO0FBQ25DLHFEQUFtQyJ9
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const STATIC_CONSTANTS = {
|
|
7
7
|
// Directory names
|
|
8
8
|
SLINGSHOT_DIR: '.slingshot',
|
|
9
|
+
AGENTS_DIR: '.agents', // Base directory for npx skills CLI
|
|
9
10
|
SKILLS_DIR: 'skills',
|
|
10
11
|
GLOBAL_SKILLS_DIR: 'skills', // For extension global path
|
|
11
12
|
// File names
|
|
@@ -21,4 +22,4 @@ const SKILL_CONSTANTS = Object.assign(Object.assign({}, STATIC_CONSTANTS), {
|
|
|
21
22
|
// Watch pattern for folder deletions - watch the entire skills directory
|
|
22
23
|
SKILLS_FOLDER_WATCH_PATTERN: `${STATIC_CONSTANTS.SLINGSHOT_DIR}/${STATIC_CONSTANTS.SKILLS_DIR}/**` });
|
|
23
24
|
exports.default = SKILL_CONSTANTS;
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpYi9za2lsbHMvY29uc3RhbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUE7O0dBRUc7QUFDSCxNQUFNLGdCQUFnQixHQUFHO0lBQ3ZCLGtCQUFrQjtJQUNsQixhQUFhLEVBQUUsWUFBWTtJQUMzQixVQUFVLEVBQUUsU0FBUyxFQUFFLG9DQUFvQztJQUMzRCxVQUFVLEVBQUUsUUFBUTtJQUNwQixpQkFBaUIsRUFBRSxRQUFRLEVBQUUsNEJBQTRCO0lBRXpELGFBQWE7SUFDYixxQkFBcUIsRUFBRSxVQUFVO0lBQ2pDLGFBQWEsRUFBRSxxQkFBcUI7SUFDcEMsVUFBVSxFQUFFLG1CQUFtQjtJQUUvQixTQUFTO0lBQ1QsY0FBYyxFQUFFLEdBQUcsRUFBRSxlQUFlO0NBQ3JDLENBQUM7QUFFRixNQUFNLGVBQWUsbUNBQ2hCLGdCQUFnQjtJQUNuQix3Q0FBd0M7SUFDeEMsbUJBQW1CLEVBQUUsR0FBRyxnQkFBZ0IsQ0FBQyxhQUFhLElBQUksZ0JBQWdCLENBQUMsVUFBVSxPQUFPLGdCQUFnQixDQUFDLHFCQUFxQixFQUFFO0lBQ3BJLHlFQUF5RTtJQUN6RSwyQkFBMkIsRUFBRSxHQUFHLGdCQUFnQixDQUFDLGFBQWEsSUFBSSxnQkFBZ0IsQ0FBQyxVQUFVLEtBQUssR0FDbkcsQ0FBQztBQUVGLGtCQUFlLGVBQWUsQ0FBQyJ9
|
|
@@ -1,5 +1,10 @@
|
|
|
1
|
+
import { SkillMetadata } from './types';
|
|
1
2
|
/**
|
|
2
|
-
* Parses a SKILL.md file to extract metadata
|
|
3
|
+
* Parses a SKILL.md file content to extract all metadata using gray-matter
|
|
4
|
+
*/
|
|
5
|
+
export declare function parseSkillMetadataFromContent(content: string, skillPath: string): SkillMetadata;
|
|
6
|
+
/**
|
|
7
|
+
* Parses a SKILL.md file to extract metadata for the registry (legacy format)
|
|
3
8
|
* @param {string} filePath - The absolute path to the SKILL.md file.
|
|
4
9
|
* @returns {Object|null} - Returns { name, description, folderPath } or null if invalid.
|
|
5
10
|
*/
|
|
@@ -3,12 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.parseSkillMetadataFromContent = parseSkillMetadataFromContent;
|
|
6
7
|
exports.default = parseSkillMetadata;
|
|
7
8
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
9
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
-
const
|
|
10
|
+
const gray_matter_1 = __importDefault(require("gray-matter"));
|
|
10
11
|
/**
|
|
11
|
-
* Parses a SKILL.md file to extract metadata
|
|
12
|
+
* Parses a SKILL.md file content to extract all metadata using gray-matter
|
|
13
|
+
*/
|
|
14
|
+
function parseSkillMetadataFromContent(content, skillPath) {
|
|
15
|
+
const parsed = (0, gray_matter_1.default)(content);
|
|
16
|
+
return {
|
|
17
|
+
name: parsed.data.name || 'unknown',
|
|
18
|
+
description: parsed.data.description || 'No description available',
|
|
19
|
+
version: parsed.data.version,
|
|
20
|
+
author: parsed.data.author,
|
|
21
|
+
license: parsed.data.license,
|
|
22
|
+
path: skillPath,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Parses a SKILL.md file to extract metadata for the registry (legacy format)
|
|
12
27
|
* @param {string} filePath - The absolute path to the SKILL.md file.
|
|
13
28
|
* @returns {Object|null} - Returns { name, description, folderPath } or null if invalid.
|
|
14
29
|
*/
|
|
@@ -18,23 +33,18 @@ function parseSkillMetadata(filePath) {
|
|
|
18
33
|
return null;
|
|
19
34
|
}
|
|
20
35
|
const fileContent = node_fs_1.default.readFileSync(filePath, 'utf8');
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
return null;
|
|
26
|
-
}
|
|
27
|
-
const trimmedName = data.name.trim();
|
|
28
|
-
const trimmedDescription = data.description ? data.description.trim() : '';
|
|
36
|
+
const skillPath = node_path_1.default.dirname(filePath);
|
|
37
|
+
// Parse using the unified function
|
|
38
|
+
const fullMetadata = parseSkillMetadataFromContent(fileContent, skillPath);
|
|
39
|
+
// Return legacy format for backward compatibility
|
|
29
40
|
return {
|
|
30
|
-
name:
|
|
31
|
-
description:
|
|
32
|
-
|
|
33
|
-
folderPath: node_path_1.default.dirname(filePath),
|
|
41
|
+
name: fullMetadata.name,
|
|
42
|
+
description: fullMetadata.description,
|
|
43
|
+
folderPath: fullMetadata.path,
|
|
34
44
|
};
|
|
35
45
|
}
|
|
36
46
|
catch (_a) {
|
|
37
47
|
return null;
|
|
38
48
|
}
|
|
39
49
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2tpbGxQYXJzZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbGliL3NraWxscy9za2lsbFBhcnNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQVVBLHNFQWNDO0FBT0QscUNBdUJDO0FBdERELHNEQUF5QjtBQUN6QiwwREFBNkI7QUFFN0IsOERBQWlDO0FBSWpDOztHQUVHO0FBQ0gsU0FBZ0IsNkJBQTZCLENBQzNDLE9BQWUsRUFDZixTQUFpQjtJQUVqQixNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFNLEVBQUMsT0FBTyxDQUFDLENBQUM7SUFFL0IsT0FBTztRQUNMLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksSUFBSSxTQUFTO1FBQ25DLFdBQVcsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsSUFBSSwwQkFBMEI7UUFDbEUsT0FBTyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTztRQUM1QixNQUFNLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNO1FBQzFCLE9BQU8sRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU87UUFDNUIsSUFBSSxFQUFFLFNBQVM7S0FDaEIsQ0FBQztBQUNKLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsU0FBd0Isa0JBQWtCLENBQ3hDLFFBQWdCO0lBRWhCLElBQUksQ0FBQztRQUNILElBQUksQ0FBQyxpQkFBRSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1lBQzdCLE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQztRQUVELE1BQU0sV0FBVyxHQUFHLGlCQUFFLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUN0RCxNQUFNLFNBQVMsR0FBRyxtQkFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUV6QyxtQ0FBbUM7UUFDbkMsTUFBTSxZQUFZLEdBQUcsNkJBQTZCLENBQUMsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBRTNFLGtEQUFrRDtRQUNsRCxPQUFPO1lBQ0wsSUFBSSxFQUFFLFlBQVksQ0FBQyxJQUFJO1lBQ3ZCLFdBQVcsRUFBRSxZQUFZLENBQUMsV0FBVztZQUNyQyxVQUFVLEVBQUUsWUFBWSxDQUFDLElBQUk7U0FDOUIsQ0FBQztJQUNKLENBQUM7SUFBQyxXQUFNLENBQUM7UUFDUCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7QUFDSCxDQUFDIn0=
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
export interface SkillContent {
|
|
2
|
+
metadata: SkillFrontmatter;
|
|
3
|
+
content: string;
|
|
4
|
+
rawContent: string;
|
|
5
|
+
}
|
|
6
|
+
export interface SkillFrontmatter {
|
|
7
|
+
name: string;
|
|
8
|
+
description: string;
|
|
9
|
+
version: string;
|
|
10
|
+
author: string;
|
|
11
|
+
dependencies?: string[];
|
|
12
|
+
}
|
|
13
|
+
export interface SkillSourceConfig {
|
|
14
|
+
source: string;
|
|
15
|
+
sourceType?: 'git' | 'npm' | 'local';
|
|
16
|
+
version?: string;
|
|
17
|
+
branch?: string;
|
|
18
|
+
}
|
|
19
|
+
export interface SkillSourcesObject {
|
|
20
|
+
[skillName: string]: SkillSourceConfig;
|
|
21
|
+
}
|
|
22
|
+
export interface PSSkillToolConfig {
|
|
23
|
+
skillsPath: string;
|
|
24
|
+
allowedSkills?: string[];
|
|
25
|
+
skillSources?: SkillSourcesObject;
|
|
26
|
+
autoInstall?: boolean;
|
|
27
|
+
}
|
|
28
|
+
export interface PSSkillToolExecutionConfig {
|
|
29
|
+
skillsPath: string;
|
|
30
|
+
allowedSkills?: string[];
|
|
31
|
+
}
|
|
32
|
+
export interface SkillInstallationOptions {
|
|
33
|
+
source: string;
|
|
34
|
+
skillsPath: string;
|
|
35
|
+
timeout?: number;
|
|
36
|
+
}
|
|
37
|
+
export interface SkillInvocation {
|
|
38
|
+
skill_name: string;
|
|
39
|
+
arguments?: string;
|
|
40
|
+
}
|
|
41
|
+
export interface SkillMetadata {
|
|
42
|
+
name: string;
|
|
43
|
+
description: string;
|
|
44
|
+
path: string;
|
|
45
|
+
version?: string;
|
|
46
|
+
author?: string;
|
|
47
|
+
license?: string;
|
|
48
|
+
}
|
|
49
|
+
export interface SkillExecutionResult {
|
|
50
|
+
status: 'success' | 'error';
|
|
51
|
+
skill_name: string;
|
|
52
|
+
content?: string;
|
|
53
|
+
metadata?: {
|
|
54
|
+
name: string;
|
|
55
|
+
description: string;
|
|
56
|
+
version: string;
|
|
57
|
+
author: string;
|
|
58
|
+
};
|
|
59
|
+
message: string;
|
|
60
|
+
error?: string;
|
|
61
|
+
}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbGliL3NraWxscy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { IStreamLogger } from '../PSAgentLogger';
|
|
2
|
+
import { SkillContent, SkillInstallationOptions, SkillMetadata, SkillSourcesObject } from './types';
|
|
1
3
|
/**
|
|
2
4
|
* Gets the slingshot directories for both workspace and user levels.
|
|
3
5
|
* Creates the directories if they don't exist.
|
|
@@ -8,3 +10,57 @@ export default function getSlingshotDirectories(repoRoot: string): {
|
|
|
8
10
|
workspaceLevelSlingshotDir: string | null;
|
|
9
11
|
userLevelSlingshotDir: string | null;
|
|
10
12
|
};
|
|
13
|
+
/**
|
|
14
|
+
* Validates skill name for security (prevents path traversal)
|
|
15
|
+
*/
|
|
16
|
+
export declare function validateSkillName(skillName: string): boolean;
|
|
17
|
+
/**
|
|
18
|
+
* Validates skill source URL for security (prevents command injection)
|
|
19
|
+
*/
|
|
20
|
+
export declare function validateSkillSource(source: string): boolean;
|
|
21
|
+
/**
|
|
22
|
+
* Ensures skills directory exists
|
|
23
|
+
*/
|
|
24
|
+
export declare function ensureSkillsDirectory(skillsPath: string): Promise<void>;
|
|
25
|
+
/**
|
|
26
|
+
* Gets the path to a skill's SKILL.md file
|
|
27
|
+
* Skills are stored in the .agents/skills subdirectory as created by npx skills CLI
|
|
28
|
+
*/
|
|
29
|
+
export declare function getSkillFilePath(skillsPath: string, skillName: string): string;
|
|
30
|
+
/**
|
|
31
|
+
* Checks if a skill exists locally
|
|
32
|
+
*/
|
|
33
|
+
export declare function skillExists(skillsPath: string, skillName: string): boolean;
|
|
34
|
+
/**
|
|
35
|
+
* Reads skill content and parses frontmatter using skillParser
|
|
36
|
+
*/
|
|
37
|
+
export declare function readSkillContent(skillsPath: string, skillName: string): Promise<SkillContent>;
|
|
38
|
+
/**
|
|
39
|
+
* Scans a directory for installed skills and returns metadata
|
|
40
|
+
*/
|
|
41
|
+
export declare function scanInstalledSkills(skillsPath: string): Promise<Map<string, SkillMetadata>>;
|
|
42
|
+
/**
|
|
43
|
+
* Normalizes skill source URLs to handle common formatting issues
|
|
44
|
+
*/
|
|
45
|
+
export declare function normalizeSkillSource(source: string): string;
|
|
46
|
+
/**
|
|
47
|
+
* Extract skill name from source URL
|
|
48
|
+
*/
|
|
49
|
+
export declare function extractSkillName(source: string): string;
|
|
50
|
+
/**
|
|
51
|
+
* Install a skill using npx skills command (simplified)
|
|
52
|
+
*/
|
|
53
|
+
export declare function installSkill(options: SkillInstallationOptions): Promise<SkillMetadata>;
|
|
54
|
+
/**
|
|
55
|
+
* Converts skill metadata to XML format for system prompts
|
|
56
|
+
*/
|
|
57
|
+
export declare function convertSkillsToSystemPromptXml(skills: SkillMetadata[]): string;
|
|
58
|
+
/**
|
|
59
|
+
* Get skills XML from a skills directory scan
|
|
60
|
+
*/
|
|
61
|
+
export declare function getSkillsSystemPromptFromDirectory(skillsPath: string): Promise<string>;
|
|
62
|
+
/**
|
|
63
|
+
* Setup skills directory and get system prompt
|
|
64
|
+
* Accepts skill sources as an object mapping skill names to source configurations
|
|
65
|
+
*/
|
|
66
|
+
export declare function setupSkillsAndGetPrompt(skillsPath: string, sources?: SkillSourcesObject, log?: IStreamLogger): Promise<string>;
|
|
@@ -4,10 +4,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.default = getSlingshotDirectories;
|
|
7
|
+
exports.validateSkillName = validateSkillName;
|
|
8
|
+
exports.validateSkillSource = validateSkillSource;
|
|
9
|
+
exports.ensureSkillsDirectory = ensureSkillsDirectory;
|
|
10
|
+
exports.getSkillFilePath = getSkillFilePath;
|
|
11
|
+
exports.skillExists = skillExists;
|
|
12
|
+
exports.readSkillContent = readSkillContent;
|
|
13
|
+
exports.scanInstalledSkills = scanInstalledSkills;
|
|
14
|
+
exports.normalizeSkillSource = normalizeSkillSource;
|
|
15
|
+
exports.extractSkillName = extractSkillName;
|
|
16
|
+
exports.installSkill = installSkill;
|
|
17
|
+
exports.convertSkillsToSystemPromptXml = convertSkillsToSystemPromptXml;
|
|
18
|
+
exports.getSkillsSystemPromptFromDirectory = getSkillsSystemPromptFromDirectory;
|
|
19
|
+
exports.setupSkillsAndGetPrompt = setupSkillsAndGetPrompt;
|
|
20
|
+
const fs_1 = require("fs");
|
|
7
21
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
22
|
const node_os_1 = __importDefault(require("node:os"));
|
|
9
23
|
const node_path_1 = __importDefault(require("node:path"));
|
|
24
|
+
const gray_matter_1 = __importDefault(require("gray-matter"));
|
|
25
|
+
const debuglogger_1 = __importDefault(require("../utils/debuglogger"));
|
|
10
26
|
const constants_1 = __importDefault(require("./constants"));
|
|
27
|
+
const skillParser_1 = require("./skillParser");
|
|
28
|
+
const skillsXMLMetaDataGenerator_1 = __importDefault(require("./skillsXMLMetaDataGenerator"));
|
|
11
29
|
/**
|
|
12
30
|
* Gets the slingshot directories for both workspace and user levels.
|
|
13
31
|
* Creates the directories if they don't exist.
|
|
@@ -45,4 +63,327 @@ function getSlingshotDirectories(repoRoot) {
|
|
|
45
63
|
return result;
|
|
46
64
|
}
|
|
47
65
|
}
|
|
48
|
-
|
|
66
|
+
const dlog = (0, debuglogger_1.default)('PSAI:SkillUtils:');
|
|
67
|
+
// Extract skill-related constants from centralized constants
|
|
68
|
+
const { AGENTS_DIR, SKILLS_DIR, SKILL_DEFINITION_FILE } = constants_1.default;
|
|
69
|
+
// Map to track ongoing installations to prevent race conditions
|
|
70
|
+
const ongoingInstallations = new Map();
|
|
71
|
+
/**
|
|
72
|
+
* Validates skill name for security (prevents path traversal)
|
|
73
|
+
*/
|
|
74
|
+
function validateSkillName(skillName) {
|
|
75
|
+
// Skill name should not contain path separators or special characters
|
|
76
|
+
const validPattern = /^[a-zA-Z0-9_-]+$/;
|
|
77
|
+
return validPattern.test(skillName) && !skillName.includes('..');
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Validates skill source URL for security (prevents command injection)
|
|
81
|
+
*/
|
|
82
|
+
function validateSkillSource(source) {
|
|
83
|
+
if (!source || typeof source !== 'string') {
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
const trimmed = source.trim();
|
|
87
|
+
// Check for common malicious patterns
|
|
88
|
+
const dangerousPatterns = [
|
|
89
|
+
/[;&|`$(){}[\]\\]/, // Shell metacharacters
|
|
90
|
+
/\.\./, // Path traversal
|
|
91
|
+
/^-/, // Starting with dash (could be interpreted as flag)
|
|
92
|
+
/\s/, // Whitespace (could break command parsing)
|
|
93
|
+
// eslint-disable-next-line no-control-regex
|
|
94
|
+
/[\x00-\x1f\x7f]/, // Control characters
|
|
95
|
+
];
|
|
96
|
+
for (const pattern of dangerousPatterns) {
|
|
97
|
+
if (pattern.test(trimmed)) {
|
|
98
|
+
return false;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
// Only allow specific URL patterns
|
|
102
|
+
const allowedPatterns = [
|
|
103
|
+
/^[a-zA-Z0-9_-]+\/[a-zA-Z0-9_.-]+(@[a-zA-Z0-9_-]+)?$/, // owner/repo@skill
|
|
104
|
+
/^github\.com\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_.-]+(@[a-zA-Z0-9_-]+)?$/, // github.com/owner/repo@skill
|
|
105
|
+
/^https:\/\/github\.com\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_.-]+(@[a-zA-Z0-9_-]+)?$/, // Full GitHub URL
|
|
106
|
+
];
|
|
107
|
+
return allowedPatterns.some((pattern) => pattern.test(trimmed));
|
|
108
|
+
}
|
|
109
|
+
/**
|
|
110
|
+
* Ensures skills directory exists
|
|
111
|
+
*/
|
|
112
|
+
async function ensureSkillsDirectory(skillsPath) {
|
|
113
|
+
await fs_1.promises.mkdir(skillsPath, { recursive: true });
|
|
114
|
+
}
|
|
115
|
+
/**
|
|
116
|
+
* Gets the path to a skill's SKILL.md file
|
|
117
|
+
* Skills are stored in the .agents/skills subdirectory as created by npx skills CLI
|
|
118
|
+
*/
|
|
119
|
+
function getSkillFilePath(skillsPath, skillName) {
|
|
120
|
+
if (!validateSkillName(skillName)) {
|
|
121
|
+
throw new Error(`Invalid skill name: ${skillName}`);
|
|
122
|
+
}
|
|
123
|
+
return node_path_1.default.join(skillsPath, AGENTS_DIR, SKILLS_DIR, skillName, SKILL_DEFINITION_FILE);
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* Checks if a skill exists locally
|
|
127
|
+
*/
|
|
128
|
+
function skillExists(skillsPath, skillName) {
|
|
129
|
+
const skillFilePath = getSkillFilePath(skillsPath, skillName);
|
|
130
|
+
return node_fs_1.default.existsSync(skillFilePath);
|
|
131
|
+
}
|
|
132
|
+
/**
|
|
133
|
+
* Reads skill content and parses frontmatter using skillParser
|
|
134
|
+
*/
|
|
135
|
+
async function readSkillContent(skillsPath, skillName) {
|
|
136
|
+
const skillFilePath = getSkillFilePath(skillsPath, skillName);
|
|
137
|
+
const rawContent = await fs_1.promises.readFile(skillFilePath, 'utf-8');
|
|
138
|
+
const parsed = (0, gray_matter_1.default)(rawContent);
|
|
139
|
+
// Create SkillFrontmatter with user-friendly defaults (different from SkillMetadata)
|
|
140
|
+
const metadata = {
|
|
141
|
+
name: parsed.data.name || skillName,
|
|
142
|
+
description: parsed.data.description || 'No description provided',
|
|
143
|
+
version: parsed.data.version || '1.0.0',
|
|
144
|
+
author: parsed.data.author || 'Unknown',
|
|
145
|
+
dependencies: parsed.data.dependencies || [],
|
|
146
|
+
};
|
|
147
|
+
return {
|
|
148
|
+
metadata,
|
|
149
|
+
content: parsed.content,
|
|
150
|
+
rawContent,
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
/**
|
|
154
|
+
* Scans a directory for installed skills and returns metadata
|
|
155
|
+
*/
|
|
156
|
+
async function scanInstalledSkills(skillsPath) {
|
|
157
|
+
const installedSkills = new Map();
|
|
158
|
+
try {
|
|
159
|
+
await fs_1.promises.access(skillsPath);
|
|
160
|
+
}
|
|
161
|
+
catch (_a) {
|
|
162
|
+
return installedSkills;
|
|
163
|
+
}
|
|
164
|
+
try {
|
|
165
|
+
// Skills are located in .agents/skills directory (created by npx skills CLI)
|
|
166
|
+
const skillsDir = node_path_1.default.join(skillsPath, AGENTS_DIR, SKILLS_DIR);
|
|
167
|
+
dlog.info(`Scanning skills directory: ${skillsDir}`);
|
|
168
|
+
try {
|
|
169
|
+
await fs_1.promises.access(skillsDir);
|
|
170
|
+
}
|
|
171
|
+
catch (_b) {
|
|
172
|
+
dlog.info(`Skills directory does not exist: ${skillsDir}`);
|
|
173
|
+
return installedSkills;
|
|
174
|
+
}
|
|
175
|
+
const entries = await fs_1.promises.readdir(skillsDir, {
|
|
176
|
+
withFileTypes: true,
|
|
177
|
+
});
|
|
178
|
+
dlog.info(`Found entries:`, entries.map((e) => `${e.name} (${e.isDirectory() ? 'dir' : 'file'})`));
|
|
179
|
+
for (const entry of entries) {
|
|
180
|
+
if (entry.isDirectory()) {
|
|
181
|
+
const skillDir = node_path_1.default.join(skillsDir, entry.name);
|
|
182
|
+
dlog.info(`Checking skill directory: ${skillDir}`);
|
|
183
|
+
const metadata = await loadSkillMetadata(skillDir);
|
|
184
|
+
dlog.info(`Metadata loaded:`, metadata ? 'success' : 'failed');
|
|
185
|
+
if (metadata) {
|
|
186
|
+
metadata.path = skillDir;
|
|
187
|
+
installedSkills.set(entry.name, metadata);
|
|
188
|
+
dlog.info(`Added skill: ${entry.name}`);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
dlog.info(`Total skills found: ${installedSkills.size}`);
|
|
193
|
+
dlog.info(`Skill names:`, Array.from(installedSkills.keys()));
|
|
194
|
+
}
|
|
195
|
+
catch (error) {
|
|
196
|
+
dlog.error(`Error scanning skills:`, error);
|
|
197
|
+
}
|
|
198
|
+
return installedSkills;
|
|
199
|
+
}
|
|
200
|
+
/**
|
|
201
|
+
* Load skill metadata from SKILL.md file using skillParser
|
|
202
|
+
*/
|
|
203
|
+
async function loadSkillMetadata(skillDir) {
|
|
204
|
+
const skillMdPath = node_path_1.default.join(skillDir, SKILL_DEFINITION_FILE);
|
|
205
|
+
try {
|
|
206
|
+
const fileContent = await fs_1.promises.readFile(skillMdPath, 'utf-8');
|
|
207
|
+
return (0, skillParser_1.parseSkillMetadataFromContent)(fileContent, skillDir);
|
|
208
|
+
}
|
|
209
|
+
catch (_a) {
|
|
210
|
+
return null;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
/**
|
|
214
|
+
* Normalizes skill source URLs to handle common formatting issues
|
|
215
|
+
*/
|
|
216
|
+
function normalizeSkillSource(source) {
|
|
217
|
+
// Validate input first for security
|
|
218
|
+
if (!validateSkillSource(source)) {
|
|
219
|
+
throw new Error(`Invalid or potentially unsafe skill source: ${source}`);
|
|
220
|
+
}
|
|
221
|
+
let normalized = source.trim();
|
|
222
|
+
// Remove .git suffix if present (common mistake)
|
|
223
|
+
normalized = normalized.replace(/\.git$/, '');
|
|
224
|
+
// Remove https:// prefix if present (npx skills prefers short format)
|
|
225
|
+
normalized = normalized.replace(/^https:\/\//, '');
|
|
226
|
+
// Remove github.com/ prefix (npx skills prefers owner/repo format)
|
|
227
|
+
normalized = normalized.replace(/^github\.com\//, '');
|
|
228
|
+
return normalized;
|
|
229
|
+
}
|
|
230
|
+
/**
|
|
231
|
+
* Extract skill name from source URL
|
|
232
|
+
*/
|
|
233
|
+
function extractSkillName(source) {
|
|
234
|
+
// Handle formats like:
|
|
235
|
+
// - github.com/owner/repo@skill
|
|
236
|
+
// - owner/repo@skill
|
|
237
|
+
// - github.com/owner/repo (use repo name)
|
|
238
|
+
const normalized = source.replace(/^github\.com\//, '');
|
|
239
|
+
let skillName;
|
|
240
|
+
if (normalized.includes('@')) {
|
|
241
|
+
skillName = normalized.split('@')[1];
|
|
242
|
+
}
|
|
243
|
+
else {
|
|
244
|
+
// Use repo name if no skill specified
|
|
245
|
+
skillName = normalized.split('/')[1] || 'unknown-skill';
|
|
246
|
+
}
|
|
247
|
+
// Validate the extracted skill name for security
|
|
248
|
+
if (!validateSkillName(skillName)) {
|
|
249
|
+
throw new Error(`Invalid skill name extracted from source: ${skillName}`);
|
|
250
|
+
}
|
|
251
|
+
return skillName;
|
|
252
|
+
}
|
|
253
|
+
/**
|
|
254
|
+
* Install a skill using npx skills command (simplified)
|
|
255
|
+
*/
|
|
256
|
+
async function installSkill(options) {
|
|
257
|
+
const { source, skillsPath, timeout = 60000 } = options;
|
|
258
|
+
if (!source || typeof source !== 'string') {
|
|
259
|
+
throw new Error('Invalid skill source provided');
|
|
260
|
+
}
|
|
261
|
+
const normalizedSource = normalizeSkillSource(source);
|
|
262
|
+
const skillName = extractSkillName(normalizedSource);
|
|
263
|
+
if (!validateSkillName(skillName)) {
|
|
264
|
+
throw new Error(`Invalid skill name derived from source: ${skillName}`);
|
|
265
|
+
}
|
|
266
|
+
// Check if there's already an ongoing installation for this skill
|
|
267
|
+
if (ongoingInstallations.has(skillName)) {
|
|
268
|
+
dlog.info(`Installation for ${skillName} already in progress, waiting...`);
|
|
269
|
+
return ongoingInstallations.get(skillName);
|
|
270
|
+
}
|
|
271
|
+
// Check if already installed
|
|
272
|
+
if (skillExists(skillsPath, skillName)) {
|
|
273
|
+
const skillDir = node_path_1.default.join(skillsPath, AGENTS_DIR, SKILLS_DIR, skillName);
|
|
274
|
+
const metadata = await loadSkillMetadata(skillDir);
|
|
275
|
+
if (metadata) {
|
|
276
|
+
dlog.info(`Skill ${skillName} already installed`);
|
|
277
|
+
return metadata;
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
// Create installation promise and track it
|
|
281
|
+
const installationPromise = performSimpleInstallation(normalizedSource, skillName, skillsPath, timeout);
|
|
282
|
+
ongoingInstallations.set(skillName, installationPromise);
|
|
283
|
+
try {
|
|
284
|
+
return await installationPromise;
|
|
285
|
+
}
|
|
286
|
+
finally {
|
|
287
|
+
ongoingInstallations.delete(skillName);
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
/**
|
|
291
|
+
* Simple skill installation - just run npx skills add and check result
|
|
292
|
+
*/
|
|
293
|
+
async function performSimpleInstallation(normalizedSource, skillName, skillsPath, timeout) {
|
|
294
|
+
await ensureSkillsDirectory(skillsPath);
|
|
295
|
+
try {
|
|
296
|
+
// Run the installation command safely with spawn to prevent command injection
|
|
297
|
+
const command = 'npx';
|
|
298
|
+
const args = ['skills', 'add', normalizedSource, '--yes'];
|
|
299
|
+
dlog.info(`Installing skill: ${command} ${args.join(' ')}`);
|
|
300
|
+
const { spawnSync } = await import('child_process');
|
|
301
|
+
const result = spawnSync(command, args, {
|
|
302
|
+
cwd: skillsPath,
|
|
303
|
+
timeout,
|
|
304
|
+
stdio: 'inherit', // Show output directly
|
|
305
|
+
encoding: 'utf8',
|
|
306
|
+
});
|
|
307
|
+
// Check if the command failed
|
|
308
|
+
if (result.error) {
|
|
309
|
+
throw result.error;
|
|
310
|
+
}
|
|
311
|
+
if (result.status !== 0) {
|
|
312
|
+
throw new Error(`Installation process exited with code ${result.status}`);
|
|
313
|
+
}
|
|
314
|
+
// Check if installation succeeded by looking for the skill
|
|
315
|
+
const skillDir = node_path_1.default.join(skillsPath, AGENTS_DIR, SKILLS_DIR, skillName);
|
|
316
|
+
const metadata = await loadSkillMetadata(skillDir);
|
|
317
|
+
if (metadata) {
|
|
318
|
+
dlog.info(`Successfully installed skill: ${skillName}`);
|
|
319
|
+
return metadata;
|
|
320
|
+
}
|
|
321
|
+
else {
|
|
322
|
+
throw new Error(`Skill installation completed but no SKILL.md found at ${skillDir}`);
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
catch (error) {
|
|
326
|
+
throw new Error(`Failed to install skill ${skillName}: ${error}`);
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
/**
|
|
330
|
+
* Converts skill metadata to XML format for system prompts
|
|
331
|
+
*/
|
|
332
|
+
function convertSkillsToSystemPromptXml(skills) {
|
|
333
|
+
const skillsList = skills.map((skill) => ({
|
|
334
|
+
name: skill.name,
|
|
335
|
+
description: skill.description,
|
|
336
|
+
}));
|
|
337
|
+
return (0, skillsXMLMetaDataGenerator_1.default)(skillsList);
|
|
338
|
+
}
|
|
339
|
+
/**
|
|
340
|
+
* Get skills XML from a skills directory scan
|
|
341
|
+
*/
|
|
342
|
+
async function getSkillsSystemPromptFromDirectory(skillsPath) {
|
|
343
|
+
const installedSkills = await scanInstalledSkills(skillsPath);
|
|
344
|
+
const skillsArray = Array.from(installedSkills.values());
|
|
345
|
+
return convertSkillsToSystemPromptXml(skillsArray);
|
|
346
|
+
}
|
|
347
|
+
/**
|
|
348
|
+
* Setup skills directory and get system prompt
|
|
349
|
+
* Accepts skill sources as an object mapping skill names to source configurations
|
|
350
|
+
*/
|
|
351
|
+
async function setupSkillsAndGetPrompt(skillsPath, sources, log) {
|
|
352
|
+
var _a;
|
|
353
|
+
await ensureSkillsDirectory(skillsPath);
|
|
354
|
+
if (sources) {
|
|
355
|
+
const skillEntries = Object.entries(sources);
|
|
356
|
+
if (skillEntries.length > 0) {
|
|
357
|
+
(_a = log === null || log === void 0 ? void 0 : log.info) === null || _a === void 0 ? void 0 : _a.call(log, `🚀 Installing ${skillEntries.length} skills from configuration...`);
|
|
358
|
+
await Promise.all(skillEntries.map(async ([skillName, config]) => {
|
|
359
|
+
var _a, _b, _c;
|
|
360
|
+
try {
|
|
361
|
+
// Validate the source
|
|
362
|
+
if (!config.source || !validateSkillSource(config.source)) {
|
|
363
|
+
throw new Error(`Invalid source URL: ${config.source}`);
|
|
364
|
+
}
|
|
365
|
+
const normalizedSource = normalizeSkillSource(config.source);
|
|
366
|
+
// For object format, we use the key as the skill name
|
|
367
|
+
// Append it to the source if not already present
|
|
368
|
+
let sourceWithSkill = normalizedSource;
|
|
369
|
+
if (!normalizedSource.includes('@')) {
|
|
370
|
+
sourceWithSkill = `${normalizedSource}@${skillName}`;
|
|
371
|
+
}
|
|
372
|
+
(_a = log === null || log === void 0 ? void 0 : log.info) === null || _a === void 0 ? void 0 : _a.call(log, `⬇️ Installing skill "${skillName}" from ${config.source} (${config.sourceType || 'git'})`);
|
|
373
|
+
await installSkill({
|
|
374
|
+
source: sourceWithSkill,
|
|
375
|
+
skillsPath,
|
|
376
|
+
timeout: 60000,
|
|
377
|
+
});
|
|
378
|
+
(_b = log === null || log === void 0 ? void 0 : log.info) === null || _b === void 0 ? void 0 : _b.call(log, `✅ Successfully installed skill: ${skillName}`);
|
|
379
|
+
}
|
|
380
|
+
catch (error) {
|
|
381
|
+
(_c = log === null || log === void 0 ? void 0 : log.error) === null || _c === void 0 ? void 0 : _c.call(log, `❌ Failed to install skill "${skillName}":`, error);
|
|
382
|
+
// Continue with other skills even if one fails
|
|
383
|
+
}
|
|
384
|
+
}));
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
return await getSkillsSystemPromptFromDirectory(skillsPath);
|
|
388
|
+
}
|
|
389
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/lib/skills/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { PSAgentLogger } from '../PSAgentLogger';
|
|
2
|
+
import { PSAgentTool } from '../PSAgentTool';
|
|
3
|
+
import { PSSkillToolExecutionConfig, SkillExecutionResult } from '../skills/types';
|
|
4
|
+
export declare class PSSkillTool extends PSAgentTool {
|
|
5
|
+
static readonly toolName = "skill";
|
|
6
|
+
private skillsPath;
|
|
7
|
+
private allowedSkills?;
|
|
8
|
+
constructor(config: PSSkillToolExecutionConfig);
|
|
9
|
+
/**
|
|
10
|
+
* Validates if a skill is allowed to be executed
|
|
11
|
+
*/
|
|
12
|
+
private isSkillAllowed;
|
|
13
|
+
run(input: Record<string, any>, log?: PSAgentLogger): Promise<SkillExecutionResult>;
|
|
14
|
+
}
|