agentinit 1.20.0 → 1.20.2

package/dist/core/skillSecurityScanner.js

@@ -0,0 +1,167 @@
+import { promises as fs } from 'fs';
+import { join, relative } from 'path';
+const SCAN_RULES = [
+    {
+        id: 'AI001',
+        title: 'Prompt override language',
+        severity: 'medium',
+        regex: /\b(ignore|disregard|override|bypass)\b.{0,40}\b(previous|prior|system|safety|guardrails?|instructions?)\b/i,
+    },
+    {
+        id: 'AI002',
+        title: 'Secret or credential exfiltration',
+        severity: 'high',
+        regex: /\b(exfiltrat\w*|upload|send|post|curl|wget)\b.{0,80}\b(secret|token|key|credential|cookie|session|\.ssh|id_rsa|env(?:ironment)? variables?)\b/i,
+    },
+    {
+        id: 'AI003',
+        title: 'Destructive shell command',
+        severity: 'high',
+        regex: /\b(rm\s+-rf\s+\/|sudo\s+rm\s+-rf|mkfs\b|dd\s+if=\/dev\/zero|chmod\s+-R\s+777\s+\/)\b/i,
+    },
+    {
+        id: 'AI004',
+        title: 'Remote shell execution pipeline',
+        severity: 'high',
+        regex: /\b(curl|wget)\b[^\n|]{0,160}\|\s*(sh|bash|zsh)\b/i,
+    },
+    {
+        id: 'AI005',
+        title: 'Hardcoded credential material',
+        severity: 'low',
+        regex: /\b(api[_-]?key|token|secret|password)\b\s*[:=]\s*['"][^'"]{8,}['"]/i,
+    },
+    {
+        id: 'AI006',
+        title: 'Unicode bidi control characters',
+        severity: 'low',
+        regex: /[\u202A-\u202E\u2066-\u2069]/,
+    },
+];
+const MAX_TEXT_FILE_BYTES = 1024 * 1024;
+const SCANNED_TEXT_EXTENSIONS = new Set([
+    '',
+    '.md',
+    '.txt',
+    '.json',
+    '.yaml',
+    '.yml',
+    '.toml',
+    '.js',
+    '.ts',
+    '.mjs',
+    '.cjs',
+    '.sh',
+    '.bash',
+    '.zsh',
+    '.py',
+    '.ps1',
+]);
+const EXECUTABLE_TEXT_EXTENSIONS = new Set([
+    '.js',
+    '.ts',
+    '.mjs',
+    '.cjs',
+    '.sh',
+    '.bash',
+    '.zsh',
+    '.py',
+    '.ps1',
+]);
+export class SkillSecurityScanner {
+    async scanSkill(skill) {
+        const findings = skill.generatedContent
+            ? this.scanText(skill.generatedContent, 'SKILL.md')
+            : await this.scanDirectory(skill.path);
+        const stats = findings.reduce((acc, finding) => {
+            acc[finding.severity] += 1;
+            return acc;
+        }, { high: 0, medium: 0, low: 0 });
+        return {
+            blocked: findings.some(finding => finding.blocking),
+            findings,
+            stats,
+        };
+    }
+    formatShortSummary(result) {
+        const parts = [
+            result.stats.high ? `${result.stats.high} high` : null,
+            result.stats.medium ? `${result.stats.medium} medium` : null,
+            result.stats.low ? `${result.stats.low} low` : null,
+        ].filter((value) => !!value);
+        return parts.length > 0 ? parts.join(', ') : 'no findings';
+    }
+    formatBlockingReason(result) {
+        const finding = result.findings.find(entry => entry.blocking)
+            || result.findings.find(entry => entry.severity === 'high')
+            || result.findings[0];
+        if (!finding) {
+            return 'Security scan failed';
+        }
+        return `Security scan failed: ${finding.title} (${finding.ruleId}) at ${finding.filePath}:${finding.line}`;
+    }
+    async scanDirectory(rootPath) {
+        const findings = [];
+        await this.walk(rootPath, rootPath, findings);
+        return findings;
+    }
+    async walk(rootPath, currentPath, findings) {
+        const entries = await fs.readdir(currentPath, { withFileTypes: true });
+        for (const entry of entries) {
+            if (entry.name === '.git' || entry.name === 'node_modules') {
+                continue;
+            }
+            const entryPath = join(currentPath, entry.name);
+            if (entry.isDirectory()) {
+                await this.walk(rootPath, entryPath, findings);
+                continue;
+            }
+            const relativePath = relative(rootPath, entryPath).replace(/\\/g, '/');
+            const content = await this.readTextFile(entryPath);
+            if (content === null) {
+                continue;
+            }
+            findings.push(...this.scanText(content, relativePath, {
+                blockHighRisk: this.isExecutableTextFile(entryPath, content),
+            }));
+        }
+    }
+    async readTextFile(filePath) {
+        const extension = filePath.includes('.') ? filePath.slice(filePath.lastIndexOf('.')).toLowerCase() : '';
+        if (!SCANNED_TEXT_EXTENSIONS.has(extension)) {
+            return null;
+        }
+        const buffer = await fs.readFile(filePath);
+        if (buffer.length > MAX_TEXT_FILE_BYTES || buffer.includes(0)) {
+            return null;
+        }
+        return buffer.toString('utf8');
+    }
+    isExecutableTextFile(filePath, content) {
+        const extension = filePath.includes('.') ? filePath.slice(filePath.lastIndexOf('.')).toLowerCase() : '';
+        return EXECUTABLE_TEXT_EXTENSIONS.has(extension) || content.startsWith('#!');
+    }
+    scanText(content, filePath, options = {}) {
+        const findings = [];
+        const lines = content.split(/\r?\n/);
+        lines.forEach((line, index) => {
+            for (const rule of SCAN_RULES) {
+                rule.regex.lastIndex = 0;
+                if (!rule.regex.test(line)) {
+                    continue;
+                }
+                findings.push({
+                    ruleId: rule.id,
+                    title: rule.title,
+                    severity: rule.severity,
+                    filePath,
+                    line: index + 1,
+                    snippet: line.trim().slice(0, 160),
+                    blocking: rule.severity === 'high' && options.blockHighRisk === true,
+                });
+            }
+        });
+        return findings;
+    }
+}
+//# sourceMappingURL=skillSecurityScanner.js.map

package/dist/core/skillSecurityScanner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skillSecurityScanner.js","sourceRoot":"","sources":["../../src/core/skillSecurityScanner.ts"],"names":[],"mappings":"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"}

package/dist/core/skillsManager.d.ts

@@ -4,6 +4,7 @@ import type { SkillInfo, InstalledSkill, SkillInstallResult, SkillsAddOptions, S
 export declare class SkillsManager {
     private agentManager;
     private preparedSourceContexts;
+    private readonly skillScanner;
     constructor(agentManager?: AgentManager);
     /**
      * Parse a source string into a structured SkillSource
@@ -14,7 +15,13 @@ export declare class SkillsManager {
     private isImplicitCatalogSkillSource;
     private resolveSourceRequest;
     private parseGitHubHttpSource;
+    private parseGitLabHttpSource;
+    private parseBitbucketHttpSource;
+    private parseHttpRepositorySource;
+    private parseSshRepositorySource;
     private parseGitHubShorthandSource;
+    private parseGitLabShorthandSource;
+    private parseBitbucketShorthandSource;
     /**
      * Parse a SKILL.md file and extract name + description from frontmatter
      */
@@ -95,6 +102,10 @@ export declare class SkillsManager {
         global?: boolean;
     }): Promise<SkillInstallResult>;
     private getCanonicalInstallPlan;
+    private normalizeSkillPrefix;
+    private withSkillPrefix;
+    private rewriteSkillFileName;
+    private applyPrefixToSkills;
     private normalizeSkillName;
     private resolveInstallPath;
     getInstallPath(skillName: string, targetDir: string): string;

package/dist/core/skillsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skillsManager.d.ts","sourceRoot":"","sources":["../../src/core/skillsManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"skillsManager.d.ts","sourceRoot":"","sources":["../../src/core/skillsManager.ts"],"names":[],"mappings":"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"}

package/dist/core/skillsManager.js

@@ -9,6 +9,7 @@ import { createRelativeSymlink, fileExists, isDirectory, listFiles, readFileIfEx
 import { expandTilde } from '../utils/paths.js';
 import { AgentManager } from './agentManager.js';
 import { getConfiguredDefaultMarketplaceId, getMarketplace, getMarketplaceIds } from './marketplaceRegistry.js';
+import { SkillSecurityScanner } from './skillSecurityScanner.js';
 import { SHARED_SKILLS_TARGET_ID } from '../types/skills.js';
 import { InstallLock, hashDirectory, logLockWriteWarning } from './installLock.js';
 const execFileAsync = promisify(execFile);
@@ -33,6 +34,7 @@ const SKILL_SEARCH_DIRS = [
 export class SkillsManager {
     agentManager;
     preparedSourceContexts = new Map();
+    skillScanner = new SkillSecurityScanner();
     constructor(agentManager) {
         this.agentManager = agentManager || new AgentManager();
     }
@@ -45,12 +47,16 @@ export class SkillsManager {
             return { type: 'local', path: source };
         }
         // Full GitHub URL
-        const githubUrlSource = this.parseGitHubHttpSource(source);
-        if (githubUrlSource) {
-            return githubUrlSource;
+        const httpSource = this.parseHttpRepositorySource(source);
+        if (httpSource) {
+            return httpSource;
         }
         // Full git URL
-        if (source.startsWith('git@') || source.endsWith('.git')) {
+        const sshSource = this.parseSshRepositorySource(source);
+        if (sshSource) {
+            return sshSource;
+        }
+        if (source.endsWith('.git')) {
             return { type: 'github', url: source };
         }
         if (options?.from) {
@@ -63,6 +69,14 @@ export class SkillsManager {
                 pluginName: source,
             };
         }
+        const gitLabShorthandSource = this.parseGitLabShorthandSource(source);
+        if (gitLabShorthandSource) {
+            return gitLabShorthandSource;
+        }
+        const bitbucketShorthandSource = this.parseBitbucketShorthandSource(source);
+        if (bitbucketShorthandSource) {
+            return bitbucketShorthandSource;
+        }
         const githubShorthandSource = this.parseGitHubShorthandSource(source);
         if (githubShorthandSource?.subpath) {
             return githubShorthandSource;
@@ -163,6 +177,110 @@ export class SkillsManager {
             return null;
         }
     }
+    parseGitLabHttpSource(source) {
+        if (!source.startsWith('https://gitlab.com/') && !source.startsWith('http://gitlab.com/')) {
+            return null;
+        }
+        try {
+            const parsedUrl = new URL(source);
+            const segments = parsedUrl.pathname.replace(/\/+$/, '').split('/').filter(Boolean);
+            const dashIndex = segments.indexOf('-');
+            const repoBoundary = dashIndex >= 0 ? dashIndex : segments.length;
+            if (repoBoundary < 2) {
+                return null;
+            }
+            const repo = segments[repoBoundary - 1];
+            const owner = segments.slice(0, repoBoundary - 1).join('/');
+            if (!owner || !repo) {
+                return null;
+            }
+            let subpath;
+            if (dashIndex >= 0) {
+                const marker = segments[dashIndex + 1];
+                if ((marker === 'tree' || marker === 'blob') && segments.length > dashIndex + 3) {
+                    subpath = segments.slice(dashIndex + 3).join('/');
+                }
+            }
+            return {
+                type: 'gitlab',
+                url: `https://gitlab.com/${owner}/${repo}.git`,
+                owner,
+                repo,
+                ...(subpath ? { subpath } : {}),
+            };
+        }
+        catch {
+            return null;
+        }
+    }
+    parseBitbucketHttpSource(source) {
+        if (!source.startsWith('https://bitbucket.org/') && !source.startsWith('http://bitbucket.org/')) {
+            return null;
+        }
+        try {
+            const parsedUrl = new URL(source);
+            const segments = parsedUrl.pathname.replace(/\/+$/, '').split('/').filter(Boolean);
+            if (segments.length < 2) {
+                return null;
+            }
+            const [owner, repo, marker, _commitish, ...rest] = segments;
+            if (!owner || !repo) {
+                return null;
+            }
+            let subpath;
+            if (marker === 'src' && rest.length > 0) {
+                subpath = rest.join('/');
+            }
+            return {
+                type: 'bitbucket',
+                url: `https://bitbucket.org/${owner}/${repo}.git`,
+                owner,
+                repo,
+                ...(subpath ? { subpath } : {}),
+            };
+        }
+        catch {
+            return null;
+        }
+    }
+    parseHttpRepositorySource(source) {
+        return this.parseGitHubHttpSource(source)
+            || this.parseGitLabHttpSource(source)
+            || this.parseBitbucketHttpSource(source);
+    }
+    parseSshRepositorySource(source) {
+        const githubMatch = source.match(/^git@github\.com:([^/]+)\/([^/]+?)(?:\.git)?$/);
+        if (githubMatch) {
+            const [, owner, repo] = githubMatch;
+            return {
+                type: 'github',
+                url: `git@github.com:${owner}/${repo}.git`,
+                owner,
+                repo,
+            };
+        }
+        const gitlabMatch = source.match(/^git@gitlab\.com:(.+)\/([^/]+?)(?:\.git)?$/);
+        if (gitlabMatch) {
+            const [, owner, repo] = gitlabMatch;
+            return {
+                type: 'gitlab',
+                url: `git@gitlab.com:${owner}/${repo}.git`,
+                owner,
+                repo,
+            };
+        }
+        const bitbucketMatch = source.match(/^git@bitbucket\.org:([^/]+)\/([^/]+?)(?:\.git)?$/);
+        if (bitbucketMatch) {
+            const [, owner, repo] = bitbucketMatch;
+            return {
+                type: 'bitbucket',
+                url: `git@bitbucket.org:${owner}/${repo}.git`,
+                owner,
+                repo,
+            };
+        }
+        return null;
+    }
     parseGitHubShorthandSource(source) {
         const githubShorthandMatch = source.match(/^([a-zA-Z0-9._-]+)\/([a-zA-Z0-9._-]+)(?:\/(.+))?$/);
         if (!githubShorthandMatch) {
@@ -177,6 +295,58 @@ export class SkillsManager {
             ...(subpath ? { subpath } : {}),
         };
     }
+    parseGitLabShorthandSource(source) {
+        const normalized = source.startsWith('gitlab:')
+            ? source.slice('gitlab:'.length)
+            : source.startsWith('gitlab.com/')
+                ? source.slice('gitlab.com/'.length)
+                : null;
+        if (!normalized) {
+            return null;
+        }
+        const [repoSpec = normalized, subpathSpec] = normalized.split('//', 2);
+        const segments = repoSpec.split('/').filter(Boolean);
+        if (segments.length < 2) {
+            return null;
+        }
+        const repo = segments[segments.length - 1];
+        const owner = segments.slice(0, segments.length - 1).join('/');
+        if (!owner || !repo) {
+            return null;
+        }
+        return {
+            type: 'gitlab',
+            url: `https://gitlab.com/${owner}/${repo}.git`,
+            owner,
+            repo,
+            ...(subpathSpec ? { subpath: subpathSpec } : {}),
+        };
+    }
+    parseBitbucketShorthandSource(source) {
+        const normalized = source.startsWith('bitbucket:')
+            ? source.slice('bitbucket:'.length)
+            : source.startsWith('bitbucket.org/')
+                ? source.slice('bitbucket.org/'.length)
+                : null;
+        if (!normalized) {
+            return null;
+        }
+        const segments = normalized.split('/').filter(Boolean);
+        if (segments.length < 2) {
+            return null;
+        }
+        const [owner, repo, ...rest] = segments;
+        if (!owner || !repo) {
+            return null;
+        }
+        return {
+            type: 'bitbucket',
+            url: `https://bitbucket.org/${owner}/${repo}.git`,
+            owner,
+            repo,
+            ...(rest.length > 0 ? { subpath: rest.join('/') } : {}),
+        };
+    }
     /**
      * Parse a SKILL.md file and extract name + description from frontmatter
      */
@@ -324,7 +494,7 @@ export class SkillsManager {
     }
     async resolveDiscoveryRoot(repoPath, source, sourceLabel) {
         const resolvedRepoPath = resolve(repoPath);
-        if (source.type !== 'github' || !source.subpath) {
+        if ((source.type !== 'github' && source.type !== 'gitlab' && source.type !== 'bitbucket') || !source.subpath) {
             return resolvedRepoPath;
         }
         const discoveryRoot = resolve(resolvedRepoPath, source.subpath);
@@ -369,7 +539,7 @@ export class SkillsManager {
                 };
             }
             let repoPath;
-            if (resolved.type === 'github') {
+            if (resolved.type === 'github' || resolved.type === 'gitlab' || resolved.type === 'bitbucket') {
                 if (!resolved.url) {
                     throw new Error(`Invalid source: ${source}`);
                 }
@@ -627,6 +797,76 @@ export class SkillsManager {
             mode: 'symlink',
         };
     }
+    normalizeSkillPrefix(prefix) {
+        const normalized = prefix?.trim() ?? '';
+        if (normalized.includes('/') || normalized.includes('\\')) {
+            throw new Error(`Invalid skill prefix: ${prefix}`);
+        }
+        return normalized;
+    }
+    withSkillPrefix(skillName, prefix) {
+        const normalizedPrefix = this.normalizeSkillPrefix(prefix);
+        return normalizedPrefix ? `${normalizedPrefix}${skillName}` : skillName;
+    }
+    async rewriteSkillFileName(filePath, skillName) {
+        const content = await fs.readFile(filePath, 'utf8');
+        const parsed = matter(content);
+        const nextContent = matter.stringify(parsed.content, {
+            ...parsed.data,
+            name: skillName,
+        });
+        await fs.writeFile(filePath, nextContent, 'utf8');
+    }
+    async applyPrefixToSkills(skills, prefix) {
+        const normalizedPrefix = this.normalizeSkillPrefix(prefix);
+        if (!normalizedPrefix) {
+            return { skills, cleanup: async () => { } };
+        }
+        const tempDirs = [];
+        try {
+            const prefixedSkills = await Promise.all(skills.map(async (skill) => {
+                const name = this.withSkillPrefix(skill.name, normalizedPrefix);
+                if (skill.generatedContent) {
+                    return {
+                        ...skill,
+                        name,
+                        generatedContent: matter.stringify(matter(skill.generatedContent).content, {
+                            ...matter(skill.generatedContent).data,
+                            name,
+                        }),
+                    };
+                }
+                const tempRoot = await fs.mkdtemp(join(tmpdir(), 'agentinit-prefixed-skill-'));
+                const tempSkillPath = join(tempRoot, basename(skill.path));
+                tempDirs.push(tempRoot);
+                await this.copyDir(skill.path, tempSkillPath);
+                const skillMdPath = join(tempSkillPath, 'SKILL.md');
+                const skillMdPathLower = join(tempSkillPath, 'skill.md');
+                const skillFile = (await fileExists(skillMdPath)) ? skillMdPath
+                    : (await fileExists(skillMdPathLower)) ? skillMdPathLower
+                        : null;
+                if (!skillFile) {
+                    throw new Error(`Skill "${skill.name}" is missing SKILL.md`);
+                }
+                await this.rewriteSkillFileName(skillFile, name);
+                return {
+                    ...skill,
+                    name,
+                    path: tempSkillPath,
+                };
+            }));
+            return {
+                skills: prefixedSkills,
+                cleanup: async () => {
+                    await Promise.all(tempDirs.map(dir => fs.rm(dir, { recursive: true, force: true }).catch(() => { })));
+                },
+            };
+        }
+        catch (error) {
+            await Promise.all(tempDirs.map(dir => fs.rm(dir, { recursive: true, force: true }).catch(() => { })));
+            throw error;
+        }
+    }
     normalizeSkillName(skillName) {
         const normalized = skillName.trim();
         if (!normalized) {
@@ -732,11 +972,13 @@ export class SkillsManager {
      * Add skills from a source (GitHub repo or local path)
      */
     async addFromSource(source, projectPath, options = {}) {
+        const normalizedPrefix = this.normalizeSkillPrefix(options.prefix);
         const context = this.takePreparedSourceContext(source, projectPath, options.from)
             || await this.loadDiscoveredSkillsContext(source, projectPath, {
                 ...(options.from !== undefined ? { from: options.from } : {}),
                 ...(options.pluginName !== undefined ? { pluginName: options.pluginName } : {}),
             });
+        let prefixedCleanup = async () => { };
         try {
             let skills = context.skills;
             if (skills.length === 0) {
@@ -744,7 +986,37 @@ export class SkillsManager {
             }
             if (options.skills && options.skills.length > 0) {
                 const names = new Set(options.skills.map(skill => skill.toLowerCase()));
-                skills = skills.filter(skill => names.has(skill.name.toLowerCase()));
+                skills = skills.filter(skill => names.has(skill.name.toLowerCase())
+                    || names.has(this.withSkillPrefix(skill.name, normalizedPrefix).toLowerCase()));
+            }
+            const prefixed = await this.applyPrefixToSkills(skills, normalizedPrefix);
+            skills = prefixed.skills;
+            prefixedCleanup = prefixed.cleanup;
+            const result = { installed: [], updated: [], unchanged: [], skipped: [], warnings: [...context.warnings] };
+            if (options.scan !== false) {
+                const scannedWarnings = new Set();
+                const scannableSkills = [];
+                for (const skill of skills) {
+                    const scan = await this.skillScanner.scanSkill(skill);
+                    if (scan.findings.length === 0) {
+                        scannableSkills.push(skill);
+                        continue;
+                    }
+                    if (scan.blocked && !options.allowRisky) {
+                        result.skipped.push({
+                            skill,
+                            reason: this.skillScanner.formatBlockingReason(scan),
+                        });
+                        continue;
+                    }
+                    const summary = this.skillScanner.formatShortSummary(scan);
+                    scannedWarnings.add(scan.blocked
+                        ? `Proceeding with "${skill.name}" despite high-risk findings: ${summary}`
+                        : `Security warnings for "${skill.name}": ${summary}`);
+                    scannableSkills.push(skill);
+                }
+                skills = scannableSkills;
+                result.warnings.push(...scannedWarnings);
             }
             const installToSharedStore = options.agents?.includes(SHARED_SKILLS_TARGET_ID) ?? false;
             const agents = await this.getTargetAgents(projectPath, options);
@@ -753,11 +1025,13 @@ export class SkillsManager {
                     installed: [],
                     updated: [],
                     unchanged: [],
-                    skipped: skills.map(skill => ({ skill, reason: 'No target agents found' })),
-                    warnings: context.warnings,
+                    skipped: [
+                        ...result.skipped,
+                        ...skills.map(skill => ({ skill, reason: 'No target agents found' })),
+                    ],
+                    warnings: result.warnings,
                 };
             }
-            const result = { installed: [], updated: [], unchanged: [], skipped: [], warnings: context.warnings };
             const installableAgents = [];
             // Cache comparison results by install path to avoid re-comparing the same target
             const comparisonCache = new Map();
@@ -885,6 +1159,7 @@ export class SkillsManager {
                     type: resolvedSource.type,
                     ...(resolvedSource.marketplace ? { marketplace: resolvedSource.marketplace } : {}),
                     ...(resolvedSource.pluginName ? { pluginName: resolvedSource.pluginName } : {}),
+                    ...(normalizedPrefix ? { prefix: normalizedPrefix } : {}),
                     ...(resolvedSource.url ? { url: resolvedSource.url } : {}),
                     ...(resolvedSource.path ? { path: resolve(projectPath, expandTilde(resolvedSource.path)) } : {}),
                     ...(resolvedSource.owner ? { owner: resolvedSource.owner } : {}),
@@ -918,6 +1193,7 @@ export class SkillsManager {
             return result;
         }
         finally {
+            await prefixedCleanup();
             await context.cleanup();
         }
     }