kungeskill 0.3.1 → 0.4.1

package/README.md

@@ -37,6 +37,19 @@ kungeskill add openspec-explore
 | `kungeskill update` | Update marketplace cache to latest |
 | `kungeskill doctor` | Check symlink health and detect broken links |
 
+### Uninstall
+
+```bash
+# Remove a skill from your project
+kungeskill remove openspec-explore
+
+# Uninstall kungeskill CLI globally
+npm uninstall -g kungeskill
+
+# (Optional) Clean up marketplace cache
+rm -rf ~/.kungeskills
+```
+
 ### Option 2: Claude Code Plugin Marketplace
 
 Install skills via Claude Code's built-in plugin system.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kungeskill",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "Manage Claude Code skills via symlinks — install, remove, update skills from a marketplace cache",
   "main": "src/cli.js",
   "bin": {

package/src/commands/add.js

@@ -2,8 +2,8 @@
 
 const fs = require('fs');
 const path = require('path');
-const { getMarketplaceSourceDir, isCacheValid, hasBundledPlugins } = require('../core/cache');
-const { parseMarketplace, findSkill } = require('../core/registry');
+const { getMarketplaceSourceDir, isCacheValid, hasBundledPlugins, getAllMarketplaceDirs } = require('../core/cache');
+const { findSkillMerged } = require('../core/registry');
 const { createSkillSymlink, canCreateJunction, copyDirRecursive } = require('../core/symlink');
 const { findProjectSkillsDir } = require('./shared');
 const logger = require('../utils/logger');
@@ -18,16 +18,10 @@ async function cmdAdd(skillName, opts) {
     await cmdInit();
   }
 
-  const cacheDir = getMarketplaceSourceDir();
-  const marketplace = parseMarketplace(cacheDir);
+  // Find the skill across all sources (git cache + bundled)
+  const sourceDirs = getAllMarketplaceDirs();
+  const skill = findSkillMerged(sourceDirs, skillName);
 
-  if (!marketplace) {
-    logger.error('Invalid marketplace manifest.');
-    process.exit(1);
-  }
-
-  // Find the skill in the marketplace
-  const skill = findSkill(marketplace, cacheDir, skillName);
   if (!skill) {
     logger.error(`Skill '${skillName}' not found in marketplace.`);
     logger.info('Run "kungeskill list" to see available skills.');

package/src/commands/list.js

@@ -2,8 +2,8 @@
 
 const fs = require('fs');
 const path = require('path');
-const { getMarketplaceSourceDir, isCacheValid, hasBundledPlugins } = require('../core/cache');
-const { parseMarketplace, listAllSkills } = require('../core/registry');
+const { getMarketplaceSourceDir, isCacheValid, hasBundledPlugins, getAllMarketplaceDirs } = require('../core/cache');
+const { parseMarketplace, listAllSkillsMerged } = require('../core/registry');
 const { findProjectSkillsDir } = require('./shared');
 const logger = require('../utils/logger');
 
@@ -13,14 +13,6 @@ function cmdList(opts) {
     process.exit(1);
   }
 
-  const cacheDir = getMarketplaceSourceDir();
-  const marketplace = parseMarketplace(cacheDir);
-
-  if (!marketplace) {
-    logger.error('Invalid marketplace manifest. Run "kungeskill init" to reinitialize.');
-    process.exit(1);
-  }
-
   const showInstalled = opts.installed;
 
   if (showInstalled) {
@@ -48,8 +40,9 @@ function cmdList(opts) {
     return;
   }
 
-  // Show all available skills grouped by plugin
-  const skills = listAllSkills(marketplace, cacheDir);
+  // Show all available skills merged from all sources (git cache + bundled)
+  const sourceDirs = getAllMarketplaceDirs();
+  const skills = listAllSkillsMerged(sourceDirs);
 
   if (skills.length === 0) {
     logger.info('No skills found in marketplace.');

package/src/commands/shared.js

@@ -5,7 +5,8 @@ const path = require('path');
 
 /**
  * Find the project's .claude/skills/ directory.
- * Walks up from cwd until it finds one, or creates it at cwd.
+ * Walks up from cwd until it finds a .git boundary or existing .claude/skills/.
+ * Will not cross project boundaries (stops at .git root).
  *
  * @param {string} [cwd] - Starting directory (defaults to process.cwd())
  * @returns {string} Absolute path to .claude/skills/
@@ -15,17 +16,27 @@ function findProjectSkillsDir(cwd) {
   let dir = path.resolve(cwd);
   const root = path.parse(dir).root;
 
-  while (dir !== root) {
-    const skillsDir = path.join(dir, '.claude', 'skills');
-    if (fs.existsSync(skillsDir)) {
-      return skillsDir;
+  // First pass: find the project root (directory with .git)
+  let projectRoot = null;
+  let searchDir = dir;
+  while (searchDir !== root) {
+    if (fs.existsSync(path.join(searchDir, '.git'))) {
+      projectRoot = searchDir;
+      break;
     }
-    dir = path.dirname(dir);
+    searchDir = path.dirname(searchDir);
   }
 
-  // Not found — create at current working directory
-  const skillsDir = path.join(cwd, '.claude', 'skills');
-  fs.mkdirSync(skillsDir, { recursive: true });
+  // If no .git found, use cwd as project root
+  if (!projectRoot) {
+    projectRoot = cwd;
+  }
+
+  // Use .claude/skills/ at the project root
+  const skillsDir = path.join(projectRoot, '.claude', 'skills');
+  if (!fs.existsSync(skillsDir)) {
+    fs.mkdirSync(skillsDir, { recursive: true });
+  }
   return skillsDir;
 }
 

package/src/core/cache.js

@@ -57,11 +57,31 @@ function getMarketplaceSourceDir() {
   return getCacheDir();
 }
 
+/**
+ * Get all marketplace source directories (for merging skills from multiple sources).
+ * Returns both git cache and bundled if both exist.
+ * @returns {string[]}
+ */
+function getAllMarketplaceDirs() {
+  const dirs = [];
+  if (isCacheValid()) {
+    dirs.push(getCacheDir());
+  }
+  if (hasBundledPlugins()) {
+    const bundled = getBundledDir();
+    if (!dirs.includes(bundled)) {
+      dirs.push(bundled);
+    }
+  }
+  return dirs;
+}
+
 module.exports = {
   getCacheDir,
   ensureCacheDir,
   isCacheValid,
   hasBundledPlugins,
   getBundledDir,
-  getMarketplaceSourceDir
+  getMarketplaceSourceDir,
+  getAllMarketplaceDirs
 };

package/src/core/registry.js

@@ -4,12 +4,12 @@ const fs = require('fs');
 const path = require('path');
 
 /**
- * Parse marketplace.json from the cache directory.
- * @param {string} cacheDir - Path to the marketplace cache root
+ * Parse marketplace.json from a source directory.
+ * @param {string} sourceDir - Path to the marketplace source root
  * @returns {object|null} Parsed marketplace data or null
  */
-function parseMarketplace(cacheDir) {
-  const manifestPath = path.join(cacheDir, '.claude-plugin', 'marketplace.json');
+function parseMarketplace(sourceDir) {
+  const manifestPath = path.join(sourceDir, '.claude-plugin', 'marketplace.json');
   if (!fs.existsSync(manifestPath)) {
     return null;
   }
@@ -18,24 +18,23 @@ function parseMarketplace(cacheDir) {
 }
 
 /**
- * List all skills from a parsed marketplace manifest.
+ * List all skills from a single source directory.
  * @param {object} marketplace - Parsed marketplace.json
- * @param {string} cacheDir - Path to the marketplace cache root (for resolving source paths)
+ * @param {string} sourceDir - Path to the marketplace source root
  * @returns {Array<{skillName: string, pluginName: string, sourcePath: string}>}
  */
-function listAllSkills(marketplace, cacheDir) {
+function listSkillsFromSource(marketplace, sourceDir) {
   if (!marketplace || !marketplace.plugins) return [];
 
   const skills = [];
   for (const plugin of marketplace.plugins) {
-    const skillsDir = path.resolve(cacheDir, plugin.source, 'skills');
+    const skillsDir = path.resolve(sourceDir, plugin.source, 'skills');
     if (!fs.existsSync(skillsDir)) continue;
 
     const entries = fs.readdirSync(skillsDir, { withFileTypes: true });
     for (const entry of entries) {
       if (entry.isDirectory()) {
         const skillPath = path.join(skillsDir, entry.name);
-        // Verify it has SKILL.md
         if (fs.existsSync(path.join(skillPath, 'SKILL.md'))) {
           skills.push({
             skillName: entry.name,
@@ -50,7 +49,60 @@ function listAllSkills(marketplace, cacheDir) {
 }
 
 /**
- * Find a specific skill by name.
+ * List all skills from a parsed marketplace manifest (single source).
+ * @param {object} marketplace - Parsed marketplace.json
+ * @param {string} cacheDir - Path to the marketplace cache root (for resolving source paths)
+ * @returns {Array<{skillName: string, pluginName: string, sourcePath: string}>}
+ */
+function listAllSkills(marketplace, cacheDir) {
+  return listSkillsFromSource(marketplace, cacheDir);
+}
+
+/**
+ * List all skills merged from multiple source directories.
+ * Later sources add skills not already found in earlier sources (no duplicates).
+ * @param {string[]} sourceDirs - Array of marketplace source directories
+ * @returns {Array<{skillName: string, pluginName: string, sourcePath: string}>}
+ */
+function listAllSkillsMerged(sourceDirs) {
+  const seen = new Set();
+  const merged = [];
+
+  for (const dir of sourceDirs) {
+    const marketplace = parseMarketplace(dir);
+    if (!marketplace) continue;
+
+    const skills = listSkillsFromSource(marketplace, dir);
+    for (const skill of skills) {
+      if (!seen.has(skill.skillName)) {
+        seen.add(skill.skillName);
+        merged.push(skill);
+      }
+    }
+  }
+  return merged;
+}
+
+/**
+ * Find a specific skill by name across multiple sources.
+ * @param {string[]} sourceDirs - Array of marketplace source directories
+ * @param {string} skillName - Skill name to find
+ * @returns {object|null} { skillName, pluginName, sourcePath } or null
+ */
+function findSkillMerged(sourceDirs, skillName) {
+  for (const dir of sourceDirs) {
+    const marketplace = parseMarketplace(dir);
+    if (!marketplace) continue;
+
+    const skills = listSkillsFromSource(marketplace, dir);
+    const found = skills.find(s => s.skillName === skillName);
+    if (found) return found;
+  }
+  return null;
+}
+
+/**
+ * Find a specific skill by name (single source).
  * @param {object} marketplace - Parsed marketplace.json
  * @param {string} cacheDir - Path to the marketplace cache root
  * @param {string} skillName - Skill name to find
@@ -64,5 +116,7 @@ function findSkill(marketplace, cacheDir, skillName) {
 module.exports = {
   parseMarketplace,
   listAllSkills,
-  findSkill
+  listAllSkillsMerged,
+  findSkill,
+  findSkillMerged
 };