@comet/cli 8.28.2 → 8.30.0

package/lib/commands/install-agent-skills.d.ts

@@ -12,4 +12,5 @@ export interface InstallOptions {
 }
 export declare function isInternalSkill(skillFolderPath: string): boolean;
 export declare function installSkills(sources: SkillSource[], targetDirs: string[], { dryRun }: InstallOptions): void;
+export declare function installAgentSkills(cwd: string, repos: string[], options: InstallOptions): void;
 export declare const installAgentSkillsCommand: Command;

package/lib/commands/install-agent-skills.js

@@ -72,6 +72,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.installAgentSkillsCommand = void 0;
 exports.isInternalSkill = isInternalSkill;
 exports.installSkills = installSkills;
+exports.installAgentSkills = installAgentSkills;
 /* eslint-disable no-console */
 var child_process_1 = require("child_process");
 var commander_1 = require("commander");
@@ -87,6 +88,63 @@ function parseRepoUrl(rawUrl) {
     return { repoUrl: rawUrl.slice(0, hashIndex), ref: rawUrl.slice(hashIndex + 1) || undefined };
 }
 var SKILL_SOURCE_PATHS = ["skills", "agentic-plugin/skills"];
+function discoverNodeModulesPackages(cwd) {
+    var nodeModulesDir = path.join(cwd, "node_modules");
+    if (!fs.existsSync(nodeModulesDir)) {
+        return [];
+    }
+    var packageDirs = [];
+    var entries;
+    try {
+        entries = fs.readdirSync(nodeModulesDir);
+    }
+    catch (_a) {
+        return [];
+    }
+    for (var _i = 0, entries_1 = entries; _i < entries_1.length; _i++) {
+        var entry = entries_1[_i];
+        if (entry.startsWith(".")) {
+            continue;
+        }
+        var fullPath = path.join(nodeModulesDir, entry);
+        if (entry.startsWith("@")) {
+            // Scoped package: read one level deeper
+            var scopedEntries = void 0;
+            try {
+                scopedEntries = fs.readdirSync(fullPath);
+            }
+            catch (_b) {
+                continue;
+            }
+            for (var _c = 0, scopedEntries_1 = scopedEntries; _c < scopedEntries_1.length; _c++) {
+                var scopedEntry = scopedEntries_1[_c];
+                if (scopedEntry.startsWith(".")) {
+                    continue;
+                }
+                var scopedPath = path.join(fullPath, scopedEntry);
+                try {
+                    if (fs.statSync(scopedPath).isDirectory()) {
+                        packageDirs.push(scopedPath);
+                    }
+                }
+                catch (_d) {
+                    // skip unreadable entries
+                }
+            }
+        }
+        else {
+            try {
+                if (fs.statSync(fullPath).isDirectory()) {
+                    packageDirs.push(fullPath);
+                }
+            }
+            catch (_e) {
+                // skip unreadable entries
+            }
+        }
+    }
+    return packageDirs;
+}
 function cloneRepo(rawUrl) {
     var _a = parseRepoUrl(rawUrl), repoUrl = _a.repoUrl, ref = _a.ref;
     var tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "comet-agent-skills-"));
@@ -198,54 +256,75 @@ function loadConfig(configPath) {
     var raw = fs.readFileSync(resolved, "utf-8");
     return JSON.parse(raw);
 }
+function installAgentSkills(cwd, repos, options) {
+    var targetDirs = [path.join(cwd, ".agents", "skills"), path.join(cwd, ".claude", "skills")];
+    // Ensure target directories exist (without clearing existing contents)
+    for (var _i = 0, targetDirs_2 = targetDirs; _i < targetDirs_2.length; _i++) {
+        var dir = targetDirs_2[_i];
+        fs.mkdirSync(dir, { recursive: true });
+    }
+    // Priority order: local skill folders (in declared order) > node_modules packages > external repos (in arg order)
+    var sources = SKILL_SOURCE_PATHS.map(function (p) { return ({
+        label: "local ".concat(p, "/"),
+        directory: path.join(cwd, p),
+        symlink: true,
+    }); });
+    // Discover skills from node_modules (direct dependencies only, including @scoped packages)
+    var nodeModulesPackages = discoverNodeModulesPackages(cwd);
+    for (var _a = 0, nodeModulesPackages_1 = nodeModulesPackages; _a < nodeModulesPackages_1.length; _a++) {
+        var pkgDir = nodeModulesPackages_1[_a];
+        var pkgName = pkgDir.includes("".concat(path.sep, "@")) ? pkgDir.split(path.sep).slice(-2).join("/") : path.basename(pkgDir);
+        for (var _b = 0, SKILL_SOURCE_PATHS_1 = SKILL_SOURCE_PATHS; _b < SKILL_SOURCE_PATHS_1.length; _b++) {
+            var p = SKILL_SOURCE_PATHS_1[_b];
+            var dir = path.join(pkgDir, p);
+            if (fs.existsSync(dir)) {
+                sources.push({
+                    label: "node_modules ".concat(pkgName, " (").concat(p, "/)"),
+                    directory: dir,
+                    symlink: true,
+                    filterInternal: true,
+                });
+            }
+        }
+    }
+    var tempDirs = [];
+    try {
+        for (var _c = 0, repos_1 = repos; _c < repos_1.length; _c++) {
+            var rawUrl = repos_1[_c];
+            var cloneDir = cloneRepo(rawUrl);
+            tempDirs.push(cloneDir);
+            for (var _d = 0, SKILL_SOURCE_PATHS_2 = SKILL_SOURCE_PATHS; _d < SKILL_SOURCE_PATHS_2.length; _d++) {
+                var p = SKILL_SOURCE_PATHS_2[_d];
+                sources.push({
+                    label: "external ".concat(rawUrl, " (").concat(p, "/)"),
+                    directory: path.join(cloneDir, p),
+                    symlink: false,
+                    filterInternal: true,
+                });
+            }
+        }
+        installSkills(sources, targetDirs, options);
+    }
+    finally {
+        for (var _e = 0, tempDirs_1 = tempDirs; _e < tempDirs_1.length; _e++) {
+            var tmpDir = tempDirs_1[_e];
+            fs.rmSync(tmpDir, { recursive: true, force: true });
+        }
+    }
+}
 exports.installAgentSkillsCommand = new commander_1.Command("install-agent-skills")
     .description("Install agent skills from local directories and optional external git repos")
     .option("--config <path>", "Path to a JSON config file specifying repos to install skills from", "agent-skills.json")
     .option("--dry-run", "Show which symlinks/copies would be created without making changes", false)
     .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
-    var configPath, dryRun, resolvedConfig, repos, cwd, targetDirs, _i, targetDirs_2, dir, sources, tempDirs, _a, repos_1, rawUrl, cloneDir, _b, SKILL_SOURCE_PATHS_1, p, _c, tempDirs_1, tmpDir;
-    var _d;
-    return __generator(this, function (_e) {
+    var configPath, dryRun, resolvedConfig, repos;
+    var _a;
+    return __generator(this, function (_b) {
         configPath = options.config, dryRun = options.dryRun;
         resolvedConfig = path.resolve(configPath);
-        repos = fs.existsSync(resolvedConfig) ? ((_d = loadConfig(configPath).repos) !== null && _d !== void 0 ? _d : []) : [];
+        repos = fs.existsSync(resolvedConfig) ? ((_a = loadConfig(configPath).repos) !== null && _a !== void 0 ? _a : []) : [];
         console.log("=== Installing agent skills".concat(dryRun ? " (dry run)" : "", " ==="));
-        cwd = process.cwd();
-        targetDirs = [path.join(cwd, ".agents", "skills"), path.join(cwd, ".claude", "skills")];
-        // Ensure target directories exist (without clearing existing contents)
-        for (_i = 0, targetDirs_2 = targetDirs; _i < targetDirs_2.length; _i++) {
-            dir = targetDirs_2[_i];
-            fs.mkdirSync(dir, { recursive: true });
-        }
-        sources = SKILL_SOURCE_PATHS.map(function (p) { return ({
-            label: "local ".concat(p, "/"),
-            directory: path.join(cwd, p),
-            symlink: true,
-        }); });
-        tempDirs = [];
-        try {
-            for (_a = 0, repos_1 = repos; _a < repos_1.length; _a++) {
-                rawUrl = repos_1[_a];
-                cloneDir = cloneRepo(rawUrl);
-                tempDirs.push(cloneDir);
-                for (_b = 0, SKILL_SOURCE_PATHS_1 = SKILL_SOURCE_PATHS; _b < SKILL_SOURCE_PATHS_1.length; _b++) {
-                    p = SKILL_SOURCE_PATHS_1[_b];
-                    sources.push({
-                        label: "external ".concat(rawUrl, " (").concat(p, "/)"),
-                        directory: path.join(cloneDir, p),
-                        symlink: false,
-                        filterInternal: true,
-                    });
-                }
-            }
-            installSkills(sources, targetDirs, { dryRun: dryRun });
-        }
-        finally {
-            for (_c = 0, tempDirs_1 = tempDirs; _c < tempDirs_1.length; _c++) {
-                tmpDir = tempDirs_1[_c];
-                fs.rmSync(tmpDir, { recursive: true, force: true });
-            }
-        }
+        installAgentSkills(process.cwd(), repos, { dryRun: dryRun });
         console.log("=== Finished ===");
         return [2 /*return*/];
     });

package/lib/commands/install-agent-skills.test.js

@@ -276,3 +276,69 @@ function mockFilesystem(skillMap, existingDests, skillMdContents) {
         (0, vitest_1.expect)(console.log).not.toHaveBeenCalledWith(vitest_1.expect.stringContaining("internal-skill"));
     });
 });
+(0, vitest_1.describe)("installAgentSkills – node_modules skills", function () {
+    (0, vitest_1.it)("symlinks skills from node_modules packages", function () {
+        mockFilesystem({
+            "/proj/node_modules": ["some-tool"],
+            "/proj/node_modules/some-tool": ["skills", "package.json"],
+            "/proj/node_modules/some-tool/skills": ["tool-docs"],
+        });
+        (0, install_agent_skills_1.installAgentSkills)("/proj", [], { dryRun: false });
+        (0, vitest_1.expect)(fs.symlinkSync).toHaveBeenCalledWith(path.resolve("/proj/node_modules/some-tool/skills/tool-docs"), path.join("/proj", ".agents", "skills", "tool-docs"));
+        (0, vitest_1.expect)(fs.symlinkSync).toHaveBeenCalledWith(path.resolve("/proj/node_modules/some-tool/skills/tool-docs"), path.join("/proj", ".claude", "skills", "tool-docs"));
+    });
+    (0, vitest_1.it)("discovers skills from @scoped packages", function () {
+        mockFilesystem({
+            "/proj/node_modules": ["@my-scope"],
+            "/proj/node_modules/@my-scope": ["my-tool"],
+            "/proj/node_modules/@my-scope/my-tool": ["skills", "package.json"],
+            "/proj/node_modules/@my-scope/my-tool/skills": ["scoped-skill"],
+        });
+        (0, install_agent_skills_1.installAgentSkills)("/proj", [], { dryRun: false });
+        (0, vitest_1.expect)(fs.symlinkSync).toHaveBeenCalledWith(path.resolve("/proj/node_modules/@my-scope/my-tool/skills/scoped-skill"), path.join("/proj", ".agents", "skills", "scoped-skill"));
+    });
+    (0, vitest_1.it)("local skills take priority over node_modules skills", function () {
+        mockFilesystem({
+            "/proj/skills": ["shared"],
+            "/proj/node_modules": ["some-tool"],
+            "/proj/node_modules/some-tool": ["skills", "package.json"],
+            "/proj/node_modules/some-tool/skills": ["shared"],
+        });
+        (0, install_agent_skills_1.installAgentSkills)("/proj", [], { dryRun: false });
+        (0, vitest_1.expect)(fs.symlinkSync).toHaveBeenCalledWith(path.resolve("/proj/skills/shared"), vitest_1.expect.any(String));
+        (0, vitest_1.expect)(fs.symlinkSync).not.toHaveBeenCalledWith(path.resolve("/proj/node_modules/some-tool/skills/shared"), vitest_1.expect.any(String));
+        (0, vitest_1.expect)(console.warn).toHaveBeenCalledWith(vitest_1.expect.stringContaining('CONFLICT: "shared"'));
+    });
+    (0, vitest_1.it)("filters internal skills from node_modules", function () {
+        mockFilesystem({
+            "/proj/node_modules": ["some-tool"],
+            "/proj/node_modules/some-tool": ["skills", "package.json"],
+            "/proj/node_modules/some-tool/skills": ["public-skill", "internal-skill"],
+        }, [], {
+            "/proj/node_modules/some-tool/skills/internal-skill/SKILL.md": "---\nmetadata:\n  internal: true\n---\n# Internal",
+        });
+        (0, install_agent_skills_1.installAgentSkills)("/proj", [], { dryRun: false });
+        (0, vitest_1.expect)(fs.symlinkSync).toHaveBeenCalledWith(path.resolve("/proj/node_modules/some-tool/skills/public-skill"), vitest_1.expect.any(String));
+        (0, vitest_1.expect)(fs.symlinkSync).not.toHaveBeenCalledWith(path.resolve("/proj/node_modules/some-tool/skills/internal-skill"), vitest_1.expect.any(String));
+    });
+    (0, vitest_1.it)("skips dotfiles and dotfolders in node_modules", function () {
+        mockFilesystem({
+            "/proj/node_modules": [".bin", ".package-lock.json", "some-tool"],
+            "/proj/node_modules/some-tool": ["skills", "package.json"],
+            "/proj/node_modules/some-tool/skills": ["my-skill"],
+        });
+        (0, install_agent_skills_1.installAgentSkills)("/proj", [], { dryRun: false });
+        (0, vitest_1.expect)(fs.symlinkSync).toHaveBeenCalledWith(path.resolve("/proj/node_modules/some-tool/skills/my-skill"), vitest_1.expect.any(String));
+    });
+    (0, vitest_1.it)("does not add a source entry for packages without a skills/ directory", function () {
+        mockFilesystem({
+            "/proj/node_modules": ["no-skills-tool"],
+            "/proj/node_modules/no-skills-tool": ["dist", "package.json"],
+            // no skills/ entry
+        });
+        (0, install_agent_skills_1.installAgentSkills)("/proj", [], { dryRun: false });
+        // No symlinks and no "No skills found in node_modules" log noise
+        (0, vitest_1.expect)(fs.symlinkSync).not.toHaveBeenCalled();
+        (0, vitest_1.expect)(console.log).not.toHaveBeenCalledWith(vitest_1.expect.stringContaining("node_modules no-skills-tool"));
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/cli",
-  "version": "8.28.2",
+  "version": "8.30.0",
   "description": "A collection of CLI tools for Comet projects",
   "repository": {
     "directory": "packages/cli",
@@ -32,7 +32,7 @@
     "rimraf": "^6.1.2",
     "typescript": "^5.9.3",
     "vitest": "^4.0.16",
-    "@comet/eslint-config": "8.28.2"
+    "@comet/eslint-config": "8.30.0"
   },
   "engines": {
     "node": ">=22.0.0"