@biggora/claude-plugins 1.2.0 → 1.3.0

package/src/commands/skills/add.js

@@ -2,9 +2,10 @@ import { execFileSync } from 'node:child_process';
 import { existsSync, readFileSync, readdirSync, cpSync, rmSync, mkdirSync, writeFileSync, statSync } from 'node:fs';
 import { join, basename } from 'node:path';
 import { tmpdir } from 'node:os';
-import { getSkillsDir } from '../../config.js';
+import { getSkillsDir, getPluginsDir } from '../../config.js';
 import { fetchRegistry, findPlugin } from '../../registry.js';
 import { log, spinner } from '../../utils.js';
+import { hasPluginComponents, detectComponents, findInstalledSkill } from './resolve.js';
 
 export function parseFrontmatter(content) {
   const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
@@ -142,18 +143,30 @@ export async function add(source, options = {}) {
   const frontmatter = parseFrontmatter(skillMd);
   const skillName = frontmatter.name || options.skill || basename(targetDir === tmpDir ? repoUrl.replace(/\.git$/, '').split('/').pop() : targetDir);
 
-  const skillsDir = getSkillsDir();
-  const dest = join(skillsDir, skillName);
+  // Detect plugin components (commands, hooks, agents) alongside SKILL.md
+  const components = detectComponents(targetDir);
+  const installAsPlugin = hasPluginComponents(targetDir);
 
-  if (existsSync(dest)) {
-    log.warn(`Skill "${skillName}" is already installed at ${dest}`);
+  const destDir = installAsPlugin ? getPluginsDir() : getSkillsDir();
+  const dest = join(destDir, skillName);
+
+  // Check both locations for existing installation
+  const existing = findInstalledSkill(skillName);
+  if (existing) {
+    log.warn(`Skill "${skillName}" is already installed at ${existing.dir}`);
     log.dim(`Run "claude-plugins skills update ${skillName}" to update it`);
     rmSync(tmpDir, { recursive: true, force: true });
     return;
   }
 
-  // Copy skill files
-  const spin2 = spinner(`Installing skill "${skillName}"...`);
+  if (existsSync(dest)) {
+    log.warn(`"${skillName}" already exists at ${dest}`);
+    rmSync(tmpDir, { recursive: true, force: true });
+    return;
+  }
+
+  const label = installAsPlugin ? 'skill + components' : 'skill';
+  const spin2 = spinner(`Installing ${label} "${skillName}"...`);
   spin2.start();
 
   try {
@@ -165,6 +178,25 @@ export async function add(source, options = {}) {
       rmSync(gitInDest, { recursive: true, force: true });
     }
 
+    // Generate .claude-plugin/plugin.json if installing as plugin and none exists
+    if (installAsPlugin && !existsSync(join(dest, '.claude-plugin', 'plugin.json'))) {
+      const pluginDir = join(dest, '.claude-plugin');
+      mkdirSync(pluginDir, { recursive: true });
+
+      const pluginJson = {
+        name: skillName,
+        version: '1.0.0',
+        description: frontmatter.description || `Skill: ${skillName}`,
+        commands: listCommandFiles(dest),
+        _generatedBy: 'claude-plugins skills add',
+      };
+
+      writeFileSync(
+        join(pluginDir, 'plugin.json'),
+        JSON.stringify(pluginJson, null, 2)
+      );
+    }
+
     // Write origin metadata
     writeFileSync(
       join(dest, '.origin.json'),
@@ -172,6 +204,8 @@ export async function add(source, options = {}) {
         {
           repository: repoUrl,
           skill: options.skill || null,
+          installedAs: installAsPlugin ? 'plugin-skill' : 'skill',
+          components,
           installedAt: new Date().toISOString(),
         },
         null,
@@ -184,6 +218,13 @@ export async function add(source, options = {}) {
     if (frontmatter.description) {
       log.dim(`  ${frontmatter.description}`);
     }
+
+    if (installAsPlugin) {
+      const extras = components.filter((c) => c !== 'skill');
+      log.info(`Detected: ${components.join(', ')}`);
+      log.dim(`Installed as plugin so Claude Code discovers ${extras.join(', ')}`);
+    }
+
     log.dim('\nRestart Claude Code to load the skill.');
   } catch (err) {
     spin2.fail(`Failed to install skill "${skillName}"`);
@@ -192,3 +233,18 @@ export async function add(source, options = {}) {
     rmSync(tmpDir, { recursive: true, force: true });
   }
 }
+
+/**
+ * List command file names (without extension) from a commands/ directory.
+ */
+function listCommandFiles(dir) {
+  const cmdsDir = join(dir, 'commands');
+  if (!existsSync(cmdsDir)) return [];
+  try {
+    return readdirSync(cmdsDir)
+      .filter((f) => f.endsWith('.md'))
+      .map((f) => `/${f.replace(/\.md$/, '')}`);
+  } catch {
+    return [];
+  }
+}

package/src/commands/skills/list.js

@@ -1,52 +1,23 @@
-import { readdirSync, existsSync, readFileSync } from 'node:fs';
-import { join } from 'node:path';
-import chalk from 'chalk';
-import { getSkillsDir } from '../../config.js';
-import { log, formatTable, truncate } from '../../utils.js';
-import { parseFrontmatter } from './add.js';
-
-export async function list() {
-  const skillsDir = getSkillsDir();
-  const entries = readdirSync(skillsDir, { withFileTypes: true }).filter(
-    (e) => e.isDirectory()
-  );
-
-  if (!entries.length) {
-    log.info('No skills installed');
-    log.dim('Run "claude-plugins skills add <source>" to install a skill');
-    return;
-  }
-
-  console.log(chalk.bold(`\n  ${entries.length} skill${entries.length === 1 ? '' : 's'} installed\n`));
-
-  const rows = entries.map((entry) => {
-    const dir = join(skillsDir, entry.name);
-    const skillMdPath = join(dir, 'SKILL.md');
-    const originPath = join(dir, '.origin.json');
-    let description = '';
-    let repo = '-';
-
-    if (existsSync(skillMdPath)) {
-      try {
-        const fm = parseFrontmatter(readFileSync(skillMdPath, 'utf-8'));
-        description = fm.description || '';
-      } catch {
-        // ignore
-      }
-    }
-
-    if (existsSync(originPath)) {
-      try {
-        const origin = JSON.parse(readFileSync(originPath, 'utf-8'));
-        repo = origin.repository || '-';
-      } catch {
-        // ignore
-      }
-    }
-
-    return [entry.name, truncate(description, 50), truncate(repo, 40)];
-  });
-
-  formatTable(rows, ['Name', 'Description', 'Repository']);
-  console.log();
-}
+import chalk from 'chalk';
+import { log, formatTable, truncate } from '../../utils.js';
+import { listAllSkills } from './resolve.js';
+
+export async function list() {
+  const skills = listAllSkills();
+
+  if (!skills.length) {
+    log.info('No skills installed');
+    log.dim('Run "claude-plugins skills add <source>" to install a skill');
+    return;
+  }
+
+  console.log(chalk.bold(`\n  ${skills.length} skill${skills.length === 1 ? '' : 's'} installed\n`));
+
+  const rows = skills.map(({ name, meta, location }) => {
+    const type = location === 'plugins' ? chalk.cyan('plugin') : chalk.dim('skill');
+    return [name, truncate(meta.description, 45), type, truncate(meta.repository, 35)];
+  });
+
+  formatTable(rows, ['Name', 'Description', 'Type', 'Repository']);
+  console.log();
+}

package/src/commands/skills/remove.js

@@ -1,27 +1,26 @@
-import { existsSync, rmSync } from 'node:fs';
-import { join } from 'node:path';
-import { getSkillsDir } from '../../config.js';
-import { log, spinner } from '../../utils.js';
-
-export async function remove(name) {
-  const dest = join(getSkillsDir(), name);
-
-  if (!existsSync(dest)) {
-    log.error(`Skill "${name}" is not installed`);
-    log.dim('Run "claude-plugins skills list" to see installed skills');
-    process.exit(1);
-  }
-
-  const spin = spinner(`Removing skill "${name}"...`);
-  spin.start();
-
-  try {
-    rmSync(dest, { recursive: true, force: true });
-    spin.succeed(`Removed skill "${name}"`);
-    log.dim('Restart Claude Code to apply changes.');
-  } catch (err) {
-    spin.fail(`Failed to remove skill "${name}"`);
-    log.error(err.message);
-    process.exit(1);
-  }
-}
+import { rmSync } from 'node:fs';
+import { log, spinner } from '../../utils.js';
+import { findInstalledSkill } from './resolve.js';
+
+export async function remove(name) {
+  const found = findInstalledSkill(name);
+
+  if (!found) {
+    log.error(`Skill "${name}" is not installed`);
+    log.dim('Run "claude-plugins skills list" to see installed skills');
+    process.exit(1);
+  }
+
+  const spin = spinner(`Removing skill "${name}"...`);
+  spin.start();
+
+  try {
+    rmSync(found.dir, { recursive: true, force: true });
+    spin.succeed(`Removed skill "${name}" from ${found.location}`);
+    log.dim('Restart Claude Code to apply changes.');
+  } catch (err) {
+    spin.fail(`Failed to remove skill "${name}"`);
+    log.error(err.message);
+    process.exit(1);
+  }
+}

package/src/commands/skills/resolve.js

@@ -0,0 +1,155 @@
+import { existsSync, readFileSync, readdirSync } from 'node:fs';
+import { join } from 'node:path';
+import { getSkillsDir, getPluginsDir } from '../../config.js';
+import { parseFrontmatter } from './add.js';
+
+/**
+ * Plugin component directories that Claude Code auto-discovers.
+ * When a skill repo contains any of these, it must be installed
+ * as a plugin so Claude Code can find them.
+ */
+export const PLUGIN_COMPONENT_DIRS = ['commands', 'hooks', 'agents'];
+
+/**
+ * Check if a directory contains plugin components (commands, hooks, agents)
+ * beyond just SKILL.md + references.
+ */
+export function hasPluginComponents(dir) {
+  return PLUGIN_COMPONENT_DIRS.some((name) => {
+    const p = join(dir, name);
+    return existsSync(p);
+  });
+}
+
+/**
+ * Detect which plugin components exist in a directory.
+ * Returns an array of found component names.
+ */
+export function detectComponents(dir) {
+  const found = [];
+  if (existsSync(join(dir, 'SKILL.md'))) found.push('skill');
+  for (const name of PLUGIN_COMPONENT_DIRS) {
+    if (existsSync(join(dir, name))) found.push(name);
+  }
+  return found;
+}
+
+/**
+ * Read .origin.json from a skill/plugin directory.
+ */
+export function readOrigin(dir) {
+  const originPath = join(dir, '.origin.json');
+  if (!existsSync(originPath)) return null;
+  try {
+    return JSON.parse(readFileSync(originPath, 'utf-8'));
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Read skill metadata from a directory (SKILL.md frontmatter + .origin.json).
+ */
+export function readSkillMeta(dir, dirName) {
+  const skillMdPath = join(dir, 'SKILL.md');
+  const meta = { name: dirName, description: '', repository: '-' };
+
+  if (existsSync(skillMdPath)) {
+    try {
+      const fm = parseFrontmatter(readFileSync(skillMdPath, 'utf-8'));
+      meta.name = fm.name || dirName;
+      meta.description = fm.description || '';
+    } catch {
+      // ignore
+    }
+  }
+
+  const origin = readOrigin(dir);
+  if (origin) {
+    meta.repository = origin.repository || '-';
+    meta.installedAs = origin.installedAs || 'skill';
+    meta.skill = origin.skill || null;
+  }
+
+  return meta;
+}
+
+/**
+ * Find a skill by name across both ~/.claude/skills/ and ~/.claude/plugins/.
+ * Returns { dir, location } or null.
+ */
+export function findInstalledSkill(name) {
+  const skillsDir = getSkillsDir();
+  const pluginsDir = getPluginsDir();
+
+  // Check ~/.claude/skills/ first
+  const skillPath = join(skillsDir, name);
+  if (existsSync(skillPath) && existsSync(join(skillPath, 'SKILL.md'))) {
+    return { dir: skillPath, location: 'skills' };
+  }
+
+  // Check ~/.claude/plugins/ for skills installed as plugins
+  const pluginPath = join(pluginsDir, name);
+  if (existsSync(pluginPath)) {
+    const origin = readOrigin(pluginPath);
+    if (origin && origin.installedAs === 'plugin-skill') {
+      return { dir: pluginPath, location: 'plugins' };
+    }
+    // Also check if it has a SKILL.md (might be installed via skills add)
+    if (existsSync(join(pluginPath, 'SKILL.md'))) {
+      return { dir: pluginPath, location: 'plugins' };
+    }
+  }
+
+  return null;
+}
+
+/**
+ * List all installed skills from both directories.
+ * Returns array of { name, dir, location, meta }.
+ */
+export function listAllSkills() {
+  const skillsDir = getSkillsDir();
+  const pluginsDir = getPluginsDir();
+  const results = [];
+
+  // Skills from ~/.claude/skills/
+  try {
+    const entries = readdirSync(skillsDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const dir = join(skillsDir, entry.name);
+      if (!existsSync(join(dir, 'SKILL.md'))) continue;
+      results.push({
+        name: entry.name,
+        dir,
+        location: 'skills',
+        meta: readSkillMeta(dir, entry.name),
+      });
+    }
+  } catch {
+    // directory might not exist yet
+  }
+
+  // Skills from ~/.claude/plugins/ (installed as plugin-skill)
+  try {
+    const entries = readdirSync(pluginsDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const dir = join(pluginsDir, entry.name);
+      const origin = readOrigin(dir);
+      if (origin && origin.installedAs === 'plugin-skill') {
+        results.push({
+          name: entry.name,
+          dir,
+          location: 'plugins',
+          meta: readSkillMeta(dir, entry.name),
+        });
+      }
+    }
+  } catch {
+    // directory might not exist yet
+  }
+
+  return results;
+}

package/src/commands/skills/update.js

@@ -1,74 +1,58 @@
-import { existsSync, readFileSync, readdirSync } from 'node:fs';
-import { join } from 'node:path';
-import { getSkillsDir } from '../../config.js';
-import { log, spinner } from '../../utils.js';
-import { add } from './add.js';
-import { remove } from './remove.js';
-
-function readOrigin(skillDir) {
-  const originPath = join(skillDir, '.origin.json');
-  if (!existsSync(originPath)) return null;
-  try {
-    return JSON.parse(readFileSync(originPath, 'utf-8'));
-  } catch {
-    return null;
-  }
-}
-
-async function updateOne(name) {
-  const skillsDir = getSkillsDir();
-  const dest = join(skillsDir, name);
-
-  if (!existsSync(dest)) {
-    log.error(`Skill "${name}" is not installed`);
-    return false;
-  }
-
-  const origin = readOrigin(dest);
-  if (!origin || !origin.repository) {
-    log.warn(`Skill "${name}" has no origin metadata, skipping`);
-    return false;
-  }
-
-  const spin = spinner(`Updating skill "${name}"...`);
-  spin.start();
-  spin.stop();
-
-  try {
-    // Remove and re-add
-    await remove(name);
-    await add(origin.repository, { skill: origin.skill || undefined });
-    return true;
-  } catch (err) {
-    log.error(`Failed to update skill "${name}": ${err.message}`);
-    return false;
-  }
-}
-
-export async function update(name) {
-  if (name) {
-    await updateOne(name);
-    return;
-  }
-
-  const skillsDir = getSkillsDir();
-  const entries = readdirSync(skillsDir, { withFileTypes: true }).filter(
-    (e) => e.isDirectory()
-  );
-
-  if (!entries.length) {
-    log.info('No skills installed');
-    return;
-  }
-
-  log.info(`Updating ${entries.length} skill${entries.length === 1 ? '' : 's'}...\n`);
-
-  let updated = 0;
-  for (const entry of entries) {
-    if (await updateOne(entry.name)) updated++;
-  }
-
-  console.log();
-  log.success(`${updated}/${entries.length} skills updated`);
-  log.dim('Restart Claude Code to apply changes.');
-}
+import { log, spinner } from '../../utils.js';
+import { findInstalledSkill, listAllSkills, readOrigin } from './resolve.js';
+import { add } from './add.js';
+import { remove } from './remove.js';
+
+async function updateOne(name) {
+  const found = findInstalledSkill(name);
+
+  if (!found) {
+    log.error(`Skill "${name}" is not installed`);
+    return false;
+  }
+
+  const origin = readOrigin(found.dir);
+  if (!origin || !origin.repository) {
+    log.warn(`Skill "${name}" has no origin metadata, skipping`);
+    return false;
+  }
+
+  const spin = spinner(`Updating skill "${name}"...`);
+  spin.start();
+  spin.stop();
+
+  try {
+    // Remove and re-add
+    await remove(name);
+    await add(origin.repository, { skill: origin.skill || undefined });
+    return true;
+  } catch (err) {
+    log.error(`Failed to update skill "${name}": ${err.message}`);
+    return false;
+  }
+}
+
+export async function update(name) {
+  if (name) {
+    await updateOne(name);
+    return;
+  }
+
+  const skills = listAllSkills();
+
+  if (!skills.length) {
+    log.info('No skills installed');
+    return;
+  }
+
+  log.info(`Updating ${skills.length} skill${skills.length === 1 ? '' : 's'}...\n`);
+
+  let updated = 0;
+  for (const skill of skills) {
+    if (await updateOne(skill.name)) updated++;
+  }
+
+  console.log();
+  log.success(`${updated}/${skills.length} skills updated`);
+  log.dim('Restart Claude Code to apply changes.');
+}