skiller 0.7.2 → 0.7.3

package/dist/core/SkillsProcessor.js

@@ -38,8 +38,10 @@ exports.syncMdcToSkillMd = syncMdcToSkillMd;
 exports.discoverSkills = discoverSkills;
 exports.getSkillsGitignorePaths = getSkillsGitignorePaths;
 exports.propagateSkills = propagateSkills;
+exports.migrateRulesToSkills = migrateRulesToSkills;
 exports.copySkillFoldersFromRules = copySkillFoldersFromRules;
 exports.copyMdcFilesFromRules = copyMdcFilesFromRules;
+exports.deleteRulesDir = deleteRulesDir;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs/promises"));
 const yaml = __importStar(require("js-yaml"));
@@ -445,6 +447,27 @@ async function findSkillFoldersInRules(dir, depth = 0) {
     }
     return skillFolders;
 }
+/**
+ * Migrates all content from .claude/rules to .claude/skills and deletes the rules directory.
+ * This is the main entry point for rules migration - it only processes if rules directory exists.
+ */
+async function migrateRulesToSkills(skillerDir, verbose, dryRun) {
+    const rulesDir = path.join(skillerDir, 'rules');
+    // Check if rules directory exists - early exit if not
+    try {
+        await fs.access(rulesDir);
+    }
+    catch {
+        // No rules directory - nothing to migrate
+        return;
+    }
+    // Copy skill folders (folders with SKILL.md)
+    await copySkillFoldersFromRules(skillerDir, verbose, dryRun);
+    // Copy standalone .mdc files
+    await copyMdcFilesFromRules(skillerDir, verbose, dryRun);
+    // Delete the rules directory after migration
+    await deleteRulesDir(skillerDir, verbose, dryRun);
+}
 /**
  * Copies skill folders (folders containing SKILL.md) from .claude/rules to .claude/skills.
  * This allows users to organize skills in the rules directory and have them automatically
@@ -507,13 +530,41 @@ async function copyMdcFilesFromRules(skillerDir, verbose, dryRun) {
         const targetDir = path.join(skillsDir, skillName);
         const targetPath = path.join(targetDir, mdcFile.name);
         try {
+            const content = await fs.readFile(sourcePath, 'utf8');
+            // Parse and clean frontmatter - remove globs and alwaysApply: false
+            const { frontmatter, body } = (0, FrontmatterParser_1.parseFrontmatter)(content);
+            let cleanedContent;
+            if (frontmatter && Object.keys(frontmatter).length > 0) {
+                const cleanedFrontmatter = {};
+                // Only keep description and alwaysApply: true
+                if (frontmatter.description) {
+                    cleanedFrontmatter.description = frontmatter.description;
+                }
+                if (frontmatter.alwaysApply === true) {
+                    cleanedFrontmatter.alwaysApply = true;
+                }
+                // Note: globs and alwaysApply: false are intentionally omitted
+                if (Object.keys(cleanedFrontmatter).length > 0) {
+                    cleanedContent = `---
+${yaml.dump(cleanedFrontmatter, { lineWidth: -1, noRefs: true }).trim()}
+---
+
+${body}
+`;
+                }
+                else {
+                    cleanedContent = body;
+                }
+            }
+            else {
+                cleanedContent = content;
+            }
             if (dryRun) {
                 (0, constants_1.logVerboseInfo)(`DRY RUN: Would copy ${mdcFile.name} from rules to skills/${skillName}/${mdcFile.name}`, verbose, dryRun);
             }
             else {
                 await fs.mkdir(targetDir, { recursive: true });
-                const content = await fs.readFile(sourcePath, 'utf8');
-                await fs.writeFile(targetPath, content, 'utf8');
+                await fs.writeFile(targetPath, cleanedContent, 'utf8');
                 (0, constants_1.logVerboseInfo)(`Copied ${mdcFile.name} from rules to skills/${skillName}/${mdcFile.name}`, verbose, dryRun);
             }
             copiedNames.push(skillName);
@@ -527,3 +578,30 @@ async function copyMdcFilesFromRules(skillerDir, verbose, dryRun) {
     }
     return copiedNames;
 }
+/**
+ * Deletes the .claude/rules directory after content has been migrated to .claude/skills.
+ * This completes the migration from the old rules-based structure to the new skills-based structure.
+ */
+async function deleteRulesDir(skillerDir, verbose, dryRun) {
+    const rulesDir = path.join(skillerDir, 'rules');
+    // Check if rules directory exists
+    try {
+        await fs.access(rulesDir);
+    }
+    catch {
+        return false; // No rules directory to delete
+    }
+    if (dryRun) {
+        (0, constants_1.logVerboseInfo)(`DRY RUN: Would delete .claude/rules directory after migration`, verbose, dryRun);
+        return true;
+    }
+    try {
+        await fs.rm(rulesDir, { recursive: true, force: true });
+        (0, constants_1.logVerboseInfo)(`Deleted .claude/rules directory after migration to .claude/skills`, verbose, dryRun);
+        return true;
+    }
+    catch (err) {
+        (0, constants_1.logWarn)(`Failed to delete .claude/rules: ${err.message}`, dryRun);
+        return false;
+    }
+}

package/dist/core/SkillsUtils.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasSkillMd = hasSkillMd;
+exports.hasAlwaysApplyMdc = hasAlwaysApplyMdc;
 exports.isGroupingDir = isGroupingDir;
 exports.walkSkillsTree = walkSkillsTree;
 exports.formatValidationWarnings = formatValidationWarnings;
@@ -42,6 +43,7 @@ exports.copySkillsDirectoryWithTransform = copySkillsDirectoryWithTransform;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs/promises"));
 const constants_1 = require("../constants");
+const FrontmatterParser_1 = require("./FrontmatterParser");
 /**
  * Checks if a directory contains a SKILL.md file.
  */
@@ -55,6 +57,30 @@ async function hasSkillMd(dirPath) {
         return false;
     }
 }
+/**
+ * Checks if a directory contains an .mdc file with alwaysApply: true.
+ * These directories are valid without SKILL.md since alwaysApply rules
+ * are Cursor-style rules, not Claude Code skills.
+ */
+async function hasAlwaysApplyMdc(dirPath) {
+    try {
+        const entries = await fs.readdir(dirPath, { withFileTypes: true });
+        for (const entry of entries) {
+            if (entry.isFile() && entry.name.endsWith('.mdc')) {
+                const mdcPath = path.join(dirPath, entry.name);
+                const content = await fs.readFile(mdcPath, 'utf8');
+                const { frontmatter } = (0, FrontmatterParser_1.parseFrontmatter)(content);
+                if (frontmatter?.alwaysApply === true) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Checks if a directory is a grouping directory (contains subdirectories with SKILL.md).
  */
@@ -121,8 +147,12 @@ async function walkSkillsTree(root) {
                     await walk(entryPath, entryRelativePath, depth + 1);
                 }
                 else {
-                    // This is neither a skill nor a grouping directory - warn about it
-                    warnings.push(`Directory '${entryRelativePath}' in .claude/skills has no SKILL.md and contains no sub-skills. It may be malformed or stray.`);
+                    // Check if this is a valid alwaysApply directory (no SKILL.md expected)
+                    const hasAlwaysApply = await hasAlwaysApplyMdc(entryPath);
+                    if (!hasAlwaysApply) {
+                        // This is neither a skill nor a grouping directory - warn about it
+                        warnings.push(`Directory '${entryRelativePath}' in .claude/skills has no SKILL.md and contains no sub-skills. It may be malformed or stray.`);
+                    }
                 }
             }
         }

package/dist/lib.js

@@ -102,12 +102,11 @@ async function applyAllAgentConfigs(projectRoot, includedAgents, configPath, cli
         (0, constants_1.logVerbose)(`Selected ${selectedAgents.length} agents: ${selectedAgents.map((a) => a.getName()).join(', ')}`, verbose);
         // Propagate skills (or cleanup if disabled) - do this for each nested directory
         const skillsEnabledResolved = resolveSkillsEnabled(skillsEnabled, rootConfig.skills?.enabled);
-        const { propagateSkills, copySkillFoldersFromRules, copyMdcFilesFromRules, } = await Promise.resolve().then(() => __importStar(require('./core/SkillsProcessor')));
-        // Copy skill folders and .mdc files from rules to skills
+        const { propagateSkills, migrateRulesToSkills } = await Promise.resolve().then(() => __importStar(require('./core/SkillsProcessor')));
+        // Migrate content from .claude/rules to .claude/skills (only if rules exists)
         if (skillsEnabledResolved) {
             for (const configEntry of hierarchicalConfigs) {
-                await copySkillFoldersFromRules(configEntry.skillerDir, verbose, dryRun);
-                await copyMdcFilesFromRules(configEntry.skillerDir, verbose, dryRun);
+                await migrateRulesToSkills(configEntry.skillerDir, verbose, dryRun);
             }
         }
         // Propagate skills for each nested .claude directory (or cleanup if disabled)
@@ -131,11 +130,10 @@ async function applyAllAgentConfigs(projectRoot, includedAgents, configPath, cli
         (0, constants_1.logVerbose)(`Selected ${selectedAgents.length} agents: ${selectedAgents.map((a) => a.getName()).join(', ')}`, verbose);
         // Propagate skills (or cleanup if disabled)
         const skillsEnabledResolved = resolveSkillsEnabled(skillsEnabled, singleConfig.config.skills?.enabled);
-        const { propagateSkills, copySkillFoldersFromRules, copyMdcFilesFromRules, } = await Promise.resolve().then(() => __importStar(require('./core/SkillsProcessor')));
-        // Copy skill folders and .mdc files from rules to skills
+        const { propagateSkills, migrateRulesToSkills } = await Promise.resolve().then(() => __importStar(require('./core/SkillsProcessor')));
+        // Migrate content from .claude/rules to .claude/skills (only if rules exists)
         if (skillsEnabledResolved) {
-            await copySkillFoldersFromRules(singleConfig.skillerDir, verbose, dryRun);
-            await copyMdcFilesFromRules(singleConfig.skillerDir, verbose, dryRun);
+            await migrateRulesToSkills(singleConfig.skillerDir, verbose, dryRun);
         }
         // Always call propagateSkills - it handles cleanup when disabled
         await propagateSkills(projectRoot, selectedAgents, skillsEnabledResolved, verbose, dryRun, singleConfig.skillerDir);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "skiller",
-	"version": "0.7.2",
+	"version": "0.7.3",
 	"description": "Skiller — apply the same rules to all coding agents",
 	"main": "dist/lib.js",
 	"publishConfig": {