skiller 0.7.22 → 0.8.0

package/README.md

@@ -37,7 +37,7 @@ npx skiller@latest apply
 | `agentsmd`    | AgentsMd (pseudo) | `AGENTS.md`                                              | -                              | -                 |
 | `copilot`     | GitHub Copilot    | `AGENTS.md`                                              | `.vscode/mcp.json` (`servers`) | `.claude/skills`  |
 | `claude`      | Claude Code       | `CLAUDE.md` (`@file` refs)                               | `.mcp.json`                    | `.claude/skills`  |
-| `codex`       | OpenAI Codex CLI  | `AGENTS.md`, `.codex/config.toml`                        | `.codex/config.toml`           | `.codex/skills`   |
+| `codex`       | OpenAI Codex CLI  | `AGENTS.md`, `.codex/config.toml`                        | `.codex/config.toml`           | `.agents/skills`  |
 | `cursor`      | Cursor            | `AGENTS.md`                                              | `.cursor/mcp.json`             | `.cursor/skills`  |
 | `windsurf`    | Windsurf          | `AGENTS.md`                                              | `.windsurf/mcp_config.json`    | -                 |
 | `cline`       | Cline             | `.clinerules`                                            | -                              | -                 |

package/dist/agents/CodexCliAgent.js

@@ -143,7 +143,7 @@ class CodexCliAgent {
         return true;
     }
     getSkillsPath(projectRoot) {
-        return path.join(projectRoot, '.codex/skills');
+        return path.join(projectRoot, '.agents/skills');
     }
 }
 exports.CodexCliAgent = CodexCliAgent;

package/dist/core/ClaudePluginSync.js

@@ -792,6 +792,7 @@ async function syncClaudePluginsToSkillsDirs(args) {
                 continue;
             const desiredPrefix = pluginNamespacePrefixByPluginId.get(item.pluginId) ??
                 sanitizeId(item.pluginId);
+            const currentNamespacedBase = `${desiredPrefix}-${item.baseName}`;
             // Migration: previous versions used `${pluginId}__${name}`, then
             // `${pluginId}-${name}`. If we changed the namespace prefix (for example
             // to omit marketplace), don't preserve the old destination so the item
@@ -801,6 +802,13 @@ async function syncClaudePluginsToSkillsDirs(args) {
             if (prev.startsWith(`${sanitizeId(item.pluginId)}-`) &&
                 desiredPrefix !== sanitizeId(item.pluginId))
                 continue;
+            // If the item was previously namespaced only because its base name was
+            // unavailable, drop that sticky destination once the base name is free.
+            if ((prev === currentNamespacedBase ||
+                prev.startsWith(`${currentNamespacedBase}-`)) &&
+                !taken.has(item.baseName)) {
+                continue;
+            }
             if (taken.has(prev))
                 continue;
             assignedDestByItemKey.set(item.itemKey, prev);

package/dist/core/SkillsProcessor.js

@@ -49,6 +49,8 @@ const yaml = __importStar(require("js-yaml"));
 const constants_1 = require("../constants");
 const SkillsUtils_1 = require("./SkillsUtils");
 const FrontmatterParser_1 = require("./FrontmatterParser");
+const LEGACY_CODEX_SKILLS_PATH = path.join('.codex', 'skills');
+const UNIVERSAL_AGENTS_SKILLS_PATH = path.join('.agents', 'skills');
 /**
  * For non-Claude agents, compile a wrapper SKILL.md (body is a single @reference)
  * into a standalone SKILL.md with the referenced file's body inlined.
@@ -570,6 +572,45 @@ function getSkillsGitignorePaths(projectRoot, agents) {
  * This function now only discovers and validates skills.
  */
 async function propagateSkills(projectRoot, agents, skillsEnabled, verbose, dryRun, skillerDir) {
+    async function migrateLegacyCodexSkillsDir(destinationPaths) {
+        const universalSkillsDir = path.join(projectRoot, UNIVERSAL_AGENTS_SKILLS_PATH);
+        const legacyCodexSkillsDir = path.join(projectRoot, LEGACY_CODEX_SKILLS_PATH);
+        if (!destinationPaths.has(universalSkillsDir))
+            return;
+        try {
+            await fs.access(legacyCodexSkillsDir);
+        }
+        catch {
+            return;
+        }
+        (0, constants_1.logVerboseInfo)(dryRun
+            ? `DRY RUN: Would migrate legacy Codex skills from ${legacyCodexSkillsDir} to ${universalSkillsDir}`
+            : `Migrating legacy Codex skills from ${legacyCodexSkillsDir} to ${universalSkillsDir}`, verbose, dryRun);
+        if (dryRun)
+            return;
+        await fs.mkdir(path.dirname(universalSkillsDir), { recursive: true });
+        try {
+            await fs.access(universalSkillsDir);
+            const entries = await fs.readdir(legacyCodexSkillsDir, {
+                withFileTypes: true,
+            });
+            for (const entry of entries) {
+                const sourcePath = path.join(legacyCodexSkillsDir, entry.name);
+                const targetPath = path.join(universalSkillsDir, entry.name);
+                try {
+                    await fs.access(targetPath);
+                    await fs.rm(sourcePath, { recursive: true, force: true });
+                }
+                catch {
+                    await fs.rename(sourcePath, targetPath);
+                }
+            }
+            await fs.rmdir(legacyCodexSkillsDir).catch(() => undefined);
+        }
+        catch {
+            await fs.rename(legacyCodexSkillsDir, universalSkillsDir);
+        }
+    }
     if (!skillsEnabled) {
         (0, constants_1.logVerboseInfo)('Skills support disabled', verbose, dryRun);
         return;
@@ -589,6 +630,7 @@ async function propagateSkills(projectRoot, agents, skillsEnabled, verbose, dryR
             }
         }
     }
+    await migrateLegacyCodexSkillsDir(destinationPaths);
     // Check if skills directory exists
     let skillsDirExists = true;
     try {

package/package.json

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