@pigcloud/skills 1.0.4 → 1.0.5

package/bin/cli.js

@@ -14,6 +14,8 @@ const CODEX_HOME = process.env.CODEX_HOME || path.join(os.homedir(), '.codex');
 const COMMAND_PACK_NAME = 'codex-commands';
 const COMMAND_PACK_SOURCE = path.join(PACKAGE_ROOT, COMMAND_PACK_NAME);
 const CODEX_HOME_SKILLS_DIR = path.join(CODEX_HOME, 'skills');
+const CODEX_HOME_SKILLS_NAMESPACE = 'pigcloud';
+const CODEX_HOME_SKILLS_NAMESPACE_DIR = path.join(CODEX_HOME_SKILLS_DIR, CODEX_HOME_SKILLS_NAMESPACE);
 const CODEX_PLUGINS_DIR = path.join(CODEX_HOME, 'plugins');
 const CODEX_MARKETPLACE_FILE = path.join(CODEX_PLUGINS_DIR, 'marketplace.json');
 const INSTALL_ROOT = path.resolve(process.env.INIT_CWD || process.cwd());
@@ -58,8 +60,8 @@ const SKILLS = [
 ];
 
 const TOOL_CONFIGS = {
-  codex: { dir: '.codex/skills', rootFile: '.codex/AGENTS.md', markers: ['.codex/AGENTS.md', '.codex'] },
-  opencode: { dir: '.codex/skills', rootFile: '.codex/AGENTS.md', markers: ['.codex/AGENTS.md', '.codex'] },
+  codex: { dir: '.codex/skills/pigcloud', rootFile: '.codex/AGENTS.md', markers: ['.codex/AGENTS.md', '.codex'] },
+  opencode: { dir: '.codex/skills/pigcloud', rootFile: '.codex/AGENTS.md', markers: ['.codex/AGENTS.md', '.codex'] },
   claude: { dir: '.claude/skills', rootFile: '.claude/CLAUDE.md', markers: ['.claude/CLAUDE.md', '.claude'] },
   claude_code: { dir: '.claude/skills', rootFile: '.claude/CLAUDE.md', markers: ['.claude/CLAUDE.md', '.claude'] },
   trae: { dir: '.trae/skills', rootFile: '.trae/AGENTS.md', markers: ['.trae/AGENTS.md', '.trae'] },
@@ -252,17 +254,29 @@ async function writeRootFile(tool, cwd = process.cwd()) {
   }
 }
 
-async function copySkillToCodexHome(skillName) {
-  const skill = normalizeSkillName(skillName);
-  if (!getSkillInfo(skill)) {
-    throw new Error(`Unknown skill: ${skillName}`);
-  }
-
-  const sourceDir = path.join(SKILLS_DIR, skill);
-  const destDir = path.join(CODEX_HOME_SKILLS_DIR, skill);
-  await ensureDir(CODEX_HOME_SKILLS_DIR);
-  await copyDirectory(sourceDir, destDir);
-}
+async function copySkillToCodexHome(skillName) {
+  const skill = normalizeSkillName(skillName);
+  if (!getSkillInfo(skill)) {
+    throw new Error(`Unknown skill: ${skillName}`);
+  }
+
+  const sourceDir = path.join(SKILLS_DIR, skill);
+  const destDir = path.join(CODEX_HOME_SKILLS_NAMESPACE_DIR, skill);
+  await removePath(path.join(CODEX_HOME_SKILLS_DIR, skill));
+  await removePath(destDir);
+  await ensureDir(CODEX_HOME_SKILLS_NAMESPACE_DIR);
+  await copyDirectory(sourceDir, destDir);
+}
+
+async function clearCodexPersonalSkillsNamespace() {
+  await removePath(CODEX_HOME_SKILLS_NAMESPACE_DIR);
+}
+
+async function clearCodexLegacyFlatSkills(skillNames) {
+  for (const skillName of skillNames) {
+    await removePath(path.join(CODEX_HOME_SKILLS_DIR, normalizeSkillName(skillName)));
+  }
+}
 
 function buildMarketplaceEntry(pluginName) {
   return {
@@ -324,13 +338,18 @@ async function installSharedWorkspaceAssets(cwd = getInstallRoot()) {
   }
 }
 
-async function installSkills(skills, tool, cwd = getInstallRoot()) {
-  await installSharedWorkspaceAssets(cwd);
-  for (const skill of skills) {
-    await copySkill(skill, tool, cwd);
-  }
-  await writeRootFile(tool, cwd);
-  if (tool === 'codex') {
+async function installSkills(skills, tool, cwd = getInstallRoot(), options = {}) {
+  const { resetCodexNamespace = false } = options;
+  await installSharedWorkspaceAssets(cwd);
+  if (tool === 'codex' && resetCodexNamespace) {
+    await clearCodexPersonalSkillsNamespace();
+    await clearCodexLegacyFlatSkills(skills);
+  }
+  for (const skill of skills) {
+    await copySkill(skill, tool, cwd);
+  }
+  await writeRootFile(tool, cwd);
+  if (tool === 'codex') {
     for (const skill of skills) {
       await copySkillToCodexHome(skill);
     }
@@ -338,16 +357,16 @@ async function installSkills(skills, tool, cwd = getInstallRoot()) {
   }
 }
 
-async function installSkillsForTools(skills, tools, cwd = getInstallRoot()) {
-  const uniqueTools = [...new Set(tools.filter(Boolean))];
-  if (uniqueTools.length === 0) {
-    throw new Error('Unable to resolve any install targets.');
-  }
-
-  for (const tool of uniqueTools) {
-    await installSkills(skills, tool, cwd);
-  }
-}
+async function installSkillsForTools(skills, tools, cwd = getInstallRoot(), options = {}) {
+  const uniqueTools = [...new Set(tools.filter(Boolean))];
+  if (uniqueTools.length === 0) {
+    throw new Error('Unable to resolve any install targets.');
+  }
+
+  for (const tool of uniqueTools) {
+    await installSkills(skills, tool, cwd, options);
+  }
+}
 
 function parseArgs(argv) {
   const positionals = [];
@@ -464,10 +483,10 @@ async function run() {
   if (command === 'init') {
     const skills = getSelectedSkills(options.skills, options.all || !options.skills);
     try {
-      await ensureRuntimeForInstall();
-      const tools = resolveRequestedTools(options.tool);
-      await installSkillsForTools(skills, tools);
-      console.log(chalk.green(`Installed ${skills.length} skills for ${tools.join(', ')}`));
+      await ensureRuntimeForInstall();
+      const tools = resolveRequestedTools(options.tool);
+      await installSkillsForTools(skills, tools, getInstallRoot(), { resetCodexNamespace: true });
+      console.log(chalk.green(`Installed ${skills.length} skills for ${tools.join(', ')}`));
     } catch (error) {
       console.error(chalk.red(error.message));
       process.exitCode = 1;
@@ -478,10 +497,10 @@ async function run() {
   if (command === 'auto') {
     const skills = getSelectedSkills(options.skills, options.all || !options.skills);
     try {
-      await ensureRuntimeForInstall();
-      const tools = resolveRequestedTools('auto');
-      await installSkillsForTools(skills, tools);
-      console.log(chalk.green(`Auto-installed ${skills.length} skills for ${tools.join(', ')}`));
+      await ensureRuntimeForInstall();
+      const tools = resolveRequestedTools('auto');
+      await installSkillsForTools(skills, tools, getInstallRoot(), { resetCodexNamespace: true });
+      console.log(chalk.green(`Auto-installed ${skills.length} skills for ${tools.join(', ')}`));
     } catch (error) {
       console.error(chalk.red(error.message));
       process.exitCode = 1;
@@ -492,9 +511,9 @@ async function run() {
   if (command === 'codex') {
     const skills = getSelectedSkills(options.skills, options.all || !options.skills);
     try {
-      await ensureRuntimeForInstall();
-      await installSkills(skills, 'codex');
-      console.log(chalk.green(`Synced ${skills.length} skills into Codex`));
+      await ensureRuntimeForInstall();
+      await installSkills(skills, 'codex', getInstallRoot(), { resetCodexNamespace: true });
+      console.log(chalk.green(`Synced ${skills.length} skills into Codex`));
       console.log(chalk.green(`Installed Codex command pack: ${COMMAND_PACK_NAME}`));
     } catch (error) {
       console.error(chalk.red(error.message));
@@ -569,11 +588,11 @@ async function run() {
       await installSharedWorkspaceAssets();
       for (const tool of tools) {
         await copySkill(skillName, tool);
-        await writeRootFile(tool);
-        if (tool === 'codex') {
-          await copySkillToCodexHome(skillName);
-          await installCodexCommandPack();
-        }
+        await writeRootFile(tool);
+        if (tool === 'codex') {
+          await copySkillToCodexHome(skillName);
+          await installCodexCommandPack();
+        }
       }
       console.log(chalk.green(`Installed: ${normalizeSkillName(skillName)} -> ${tools.join(', ')}`));
     } catch (error) {
@@ -598,12 +617,19 @@ async function run() {
       for (const tool of tools) {
         const targetSkillDir = getTargetSkillDir(tool);
         if (!targetSkillDir) continue;
-        const skillDir = path.join(targetSkillDir, normalizedSkill);
-        if (await pathExists(skillDir)) {
-          await removePath(skillDir);
-          removedAny = true;
-        }
-      }
+        const skillDir = path.join(targetSkillDir, normalizedSkill);
+        if (await pathExists(skillDir)) {
+          await removePath(skillDir);
+          removedAny = true;
+        }
+        if (tool === 'codex') {
+          const legacySkillDir = path.join(CODEX_HOME_SKILLS_DIR, normalizedSkill);
+          if (await pathExists(legacySkillDir)) {
+            await removePath(legacySkillDir);
+            removedAny = true;
+          }
+        }
+      }
       console.log(removedAny
         ? chalk.green(`Removed: ${normalizedSkill}`)
         : chalk.yellow(`Skill not found: ${normalizedSkill}`));
@@ -639,10 +665,10 @@ async function run() {
 
   if (command === 'update') {
     try {
-      await ensureRuntimeForInstall();
-      const tools = resolveRequestedTools(options.tool);
-      await installSkillsForTools(SKILLS.map(skill => skill.name), tools);
-      console.log(chalk.green(`Updated ${SKILLS.length} skills for ${tools.join(', ')}`));
+      await ensureRuntimeForInstall();
+      const tools = resolveRequestedTools(options.tool);
+      await installSkillsForTools(SKILLS.map(skill => skill.name), tools, getInstallRoot(), { resetCodexNamespace: true });
+      console.log(chalk.green(`Updated ${SKILLS.length} skills for ${tools.join(', ')}`));
     } catch (error) {
       console.error(chalk.red(error.message));
       process.exitCode = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pigcloud/skills",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "AI skills pack with client-aware installation, shared skills and rules, Codex command entries, and Pig Cloud-specific overlays for requirements, implementation, and knowledge curation.",
   "author": "Pig Skills Maintainers",
   "license": "MIT",

package/scripts/validate-skills.ps1

@@ -6,12 +6,12 @@ $ErrorActionPreference = 'Stop'
 $repoRoot = (Resolve-Path -LiteralPath (Join-Path $PSScriptRoot '..')).Path
 $python = Join-Path $repoRoot '.tools\python.cmd'
 if (-not $SkillsRoot) {
-    if (Test-Path -LiteralPath (Join-Path $repoRoot 'skills')) {
-        $SkillsRoot = Join-Path $repoRoot 'skills'
-    } else {
-        $SkillsRoot = Join-Path $repoRoot '.agents\skills'
-    }
-}
+    if (Test-Path -LiteralPath (Join-Path $repoRoot 'skills')) {
+        $SkillsRoot = Join-Path $repoRoot 'skills'
+    } else {
+        $SkillsRoot = Join-Path $repoRoot '.codex\skills\pigcloud'
+    }
+}
 $codexHome = $env:CODEX_HOME
 if (-not $codexHome) {
     $codexHome = Join-Path $HOME '.codex'

package/scripts/validate-skills.sh

@@ -7,11 +7,11 @@ codex_home="${CODEX_HOME:-$HOME/.codex}"
 validator="$codex_home/skills/.system/skill-creator/scripts/quick_validate.py"
 if [ -n "${1:-}" ]; then
   skills_root="$1"
-elif [ -d "$repo_root/skills" ]; then
-  skills_root="$repo_root/skills"
-else
-  skills_root="$repo_root/.agents/skills"
-fi
+elif [ -d "$repo_root/skills" ]; then
+  skills_root="$repo_root/skills"
+else
+  skills_root="$repo_root/.codex/skills/pigcloud"
+fi
 
 if [ ! -f "$validator" ]; then
   echo "Validator not found: $validator" >&2