@comet/cli 9.0.0-beta.4 → 9.0.0-beta.5

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

@@ -89,6 +89,63 @@ var os = __importStar(require("os"));
 var path = __importStar(require("path"));
 var SKILL_SOURCE_PATHS = ["skills", "agentic-plugin/skills"];
 var RULE_SOURCE_PATHS = ["rules"];
+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 parseRepoUrl(rawUrl) {
     var hashIndex = rawUrl.lastIndexOf("#");
     if (hashIndex === -1) {
@@ -274,15 +331,53 @@ function installFeatures(cwd, repos, options) {
         itemLabelSingular: "rule",
         itemLabelPlural: "rules",
     }); });
+    // Discover skills/rules from node_modules (direct dependencies only, including @scoped packages)
+    var nodeModulesPackages = discoverNodeModulesPackages(cwd);
+    for (var _b = 0, nodeModulesPackages_1 = nodeModulesPackages; _b < nodeModulesPackages_1.length; _b++) {
+        var pkgDir = nodeModulesPackages_1[_b];
+        var pkgName = pkgDir.includes("".concat(path.sep, "@")) ? pkgDir.split(path.sep).slice(-2).join("/") : path.basename(pkgDir);
+        for (var _c = 0, SKILL_SOURCE_PATHS_1 = SKILL_SOURCE_PATHS; _c < SKILL_SOURCE_PATHS_1.length; _c++) {
+            var p = SKILL_SOURCE_PATHS_1[_c];
+            var dir = path.join(pkgDir, p);
+            if (fs.existsSync(dir)) {
+                skillSources.push({
+                    label: "node_modules ".concat(pkgName, " (").concat(p, "/)"),
+                    directory: dir,
+                    discover: "folders",
+                    symlink: true,
+                    filterInternal: true,
+                    installed: installedSkills,
+                    itemLabelSingular: "skill",
+                    itemLabelPlural: "skills",
+                });
+            }
+        }
+        for (var _d = 0, RULE_SOURCE_PATHS_1 = RULE_SOURCE_PATHS; _d < RULE_SOURCE_PATHS_1.length; _d++) {
+            var p = RULE_SOURCE_PATHS_1[_d];
+            var dir = path.join(pkgDir, p);
+            if (fs.existsSync(dir)) {
+                ruleSources.push({
+                    label: "node_modules ".concat(pkgName, " (").concat(p, "/)"),
+                    directory: dir,
+                    discover: "files",
+                    symlink: true,
+                    filterInternal: true,
+                    installed: installedRules,
+                    itemLabelSingular: "rule",
+                    itemLabelPlural: "rules",
+                });
+            }
+        }
+    }
     var sparsePatterns = __spreadArray(__spreadArray([], SKILL_SOURCE_PATHS, true), RULE_SOURCE_PATHS, true).map(function (p) { return "".concat(p, "/"); });
     var tempDirs = [];
     try {
-        for (var _b = 0, repos_1 = repos; _b < repos_1.length; _b++) {
-            var rawUrl = repos_1[_b];
+        for (var _e = 0, repos_1 = repos; _e < repos_1.length; _e++) {
+            var rawUrl = repos_1[_e];
             var cloneDir = cloneRepo(rawUrl, sparsePatterns);
             tempDirs.push(cloneDir);
-            for (var _c = 0, SKILL_SOURCE_PATHS_1 = SKILL_SOURCE_PATHS; _c < SKILL_SOURCE_PATHS_1.length; _c++) {
-                var p = SKILL_SOURCE_PATHS_1[_c];
+            for (var _f = 0, SKILL_SOURCE_PATHS_2 = SKILL_SOURCE_PATHS; _f < SKILL_SOURCE_PATHS_2.length; _f++) {
+                var p = SKILL_SOURCE_PATHS_2[_f];
                 skillSources.push({
                     label: "external ".concat(rawUrl, " (").concat(p, "/)"),
                     directory: path.join(cloneDir, p),
@@ -294,8 +389,8 @@ function installFeatures(cwd, repos, options) {
                     itemLabelPlural: "skills",
                 });
             }
-            for (var _d = 0, RULE_SOURCE_PATHS_1 = RULE_SOURCE_PATHS; _d < RULE_SOURCE_PATHS_1.length; _d++) {
-                var p = RULE_SOURCE_PATHS_1[_d];
+            for (var _g = 0, RULE_SOURCE_PATHS_2 = RULE_SOURCE_PATHS; _g < RULE_SOURCE_PATHS_2.length; _g++) {
+                var p = RULE_SOURCE_PATHS_2[_g];
                 ruleSources.push({
                     label: "external ".concat(rawUrl, " (").concat(p, "/)"),
                     directory: path.join(cloneDir, p),
@@ -314,8 +409,8 @@ function installFeatures(cwd, repos, options) {
         console.log("Total rules installed: ".concat(ruleCount));
     }
     finally {
-        for (var _e = 0, tempDirs_1 = tempDirs; _e < tempDirs_1.length; _e++) {
-            var tmpDir = tempDirs_1[_e];
+        for (var _h = 0, tempDirs_1 = tempDirs; _h < tempDirs_1.length; _h++) {
+            var tmpDir = tempDirs_1[_h];
             fs.rmSync(tmpDir, { recursive: true, force: true });
         }
     }

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

@@ -210,6 +210,97 @@ function mockFilesystem(_a) {
         (0, vitest_1.expect)(fs.symlinkSync).toHaveBeenCalledWith(path.resolve("/proj/skills/internal"), vitest_1.expect.any(String));
     });
 });
+(0, vitest_1.describe)("installFeatures – node_modules skills and rules", function () {
+    (0, vitest_1.it)("symlinks skills from node_modules packages", function () {
+        mockFilesystem({
+            listings: {
+                "/proj/node_modules": ["some-tool"],
+                "/proj/node_modules/some-tool": ["skills", "package.json"],
+                "/proj/node_modules/some-tool/skills": ["tool-docs"],
+            },
+        });
+        (0, install_agent_features_1.installFeatures)("/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)("symlinks rules from node_modules packages", function () {
+        mockFilesystem({
+            listings: {
+                "/proj/node_modules": ["some-tool"],
+                "/proj/node_modules/some-tool": ["rules", "package.json"],
+                "/proj/node_modules/some-tool/rules": ["best-practices.md"],
+            },
+        });
+        (0, install_agent_features_1.installFeatures)("/proj", [], { dryRun: false });
+        (0, vitest_1.expect)(fs.symlinkSync).toHaveBeenCalledWith(path.resolve("/proj/node_modules/some-tool/rules/best-practices.md"), path.join("/proj", ".agents", "rules", "best-practices.md"));
+        (0, vitest_1.expect)(fs.symlinkSync).toHaveBeenCalledWith(path.resolve("/proj/node_modules/some-tool/rules/best-practices.md"), path.join("/proj", ".claude", "rules", "best-practices.md"));
+    });
+    (0, vitest_1.it)("discovers skills from @scoped packages", function () {
+        mockFilesystem({
+            listings: {
+                "/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_features_1.installFeatures)("/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({
+            listings: {
+                "/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_features_1.installFeatures)("/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({
+            listings: {
+                "/proj/node_modules": ["some-tool"],
+                "/proj/node_modules/some-tool": ["skills", "package.json"],
+                "/proj/node_modules/some-tool/skills": ["public-skill", "internal-skill"],
+            },
+            fileContents: {
+                "/proj/node_modules/some-tool/skills/internal-skill/SKILL.md": "---\nmetadata:\n  internal: true\n---\n# Internal",
+            },
+        });
+        (0, install_agent_features_1.installFeatures)("/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({
+            listings: {
+                "/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_features_1.installFeatures)("/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/ or rules/ directory", function () {
+        mockFilesystem({
+            listings: {
+                "/proj/node_modules": ["no-skills-tool"],
+                "/proj/node_modules/no-skills-tool": ["dist", "package.json"],
+                // no skills/ or rules/ entry
+            },
+        });
+        (0, install_agent_features_1.installFeatures)("/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"));
+    });
+});
 (0, vitest_1.describe)("installFeatures – missing local sources", function () {
     (0, vitest_1.it)("runs cleanly when there are no local skills or rules", function () {
         mockFilesystem({});

package/package.json

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