@spardutti/claude-skills 1.9.0 → 1.10.0

package/bin/cli.mjs

@@ -5,9 +5,9 @@ import chalk from "chalk";
 import { readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { dirname, join } from "node:path";
-import { fetchSkills } from "../lib/github.mjs";
-import { promptSkillSelection } from "../lib/prompt.mjs";
-import { installSkills } from "../lib/install.mjs";
+import { fetchSkills, fetchCommands } from "../lib/github.mjs";
+import { promptSkillSelection, promptCommandSelection } from "../lib/prompt.mjs";
+import { installSkills, installCommands } from "../lib/install.mjs";
 import { setupHook } from "../lib/setup-hook.mjs";
 import { setupClaudeMd } from "../lib/setup-claude-md.mjs";
 
@@ -17,37 +17,56 @@ const pkg = JSON.parse(readFileSync(join(__dirname, "..", "package.json"), "utf-
 async function main() {
   console.log(`\n  ${chalk.bold.cyan("Claude Skills Installer")} ${chalk.dim(`v${pkg.version}`)}\n`);
 
-  console.log(chalk.dim("  Fetching available skills...\n"));
-  const skills = await fetchSkills();
+  console.log(chalk.dim("  Fetching available skills and commands...\n"));
+  const [skills, commands] = await Promise.all([fetchSkills(), fetchCommands()]);
 
+  // --- Skills ---
+  let selectedSkills = [];
   if (skills.length === 0) {
     console.log("  No skills found.");
-    process.exit(0);
+  } else {
+    selectedSkills = await promptSkillSelection(skills);
+    if (selectedSkills.length > 0) {
+      console.log();
+      await installSkills(selectedSkills);
+    }
   }
 
-  const selected = await promptSkillSelection(skills);
+  // --- Commands ---
+  let selectedCommands = [];
+  if (commands.length > 0) {
+    console.log();
+    selectedCommands = await promptCommandSelection(commands);
+    if (selectedCommands.length > 0) {
+      console.log();
+      await installCommands(selectedCommands);
+    }
+  }
 
-  if (selected.length === 0) {
-    console.log("\n  No skills selected.");
+  if (selectedSkills.length === 0 && selectedCommands.length === 0) {
+    console.log("\n  Nothing selected.");
     process.exit(0);
   }
 
-  console.log();
-  await installSkills(selected);
-
-  console.log();
-  const shouldSetup = await confirm({
-    message: "Set up skill evaluation hook + CLAUDE.md rule? (Recommended)",
-    default: true,
-  });
-
-  if (shouldSetup) {
+  // --- Hook setup (only if skills were installed) ---
+  if (selectedSkills.length > 0) {
     console.log();
-    await setupHook();
-    await setupClaudeMd();
+    const shouldSetup = await confirm({
+      message: "Set up skill evaluation hook + CLAUDE.md rule? (Recommended)",
+      default: true,
+    });
+
+    if (shouldSetup) {
+      console.log();
+      await setupHook();
+      await setupClaudeMd();
+    }
   }
 
-  console.log(`\n  ${chalk.green("✔")} ${chalk.bold(`${selected.length} skill(s) installed successfully.`)}\n`);
+  const parts = [];
+  if (selectedSkills.length > 0) parts.push(`${selectedSkills.length} skill(s)`);
+  if (selectedCommands.length > 0) parts.push(`${selectedCommands.length} command(s)`);
+  console.log(`\n  ${chalk.green("✔")} ${chalk.bold(`${parts.join(" and ")} installed successfully.`)}\n`);
 }
 
 main().catch((err) => {

package/lib/github.mjs

@@ -3,7 +3,9 @@ import { execSync } from "node:child_process";
 const REPO_OWNER = "Spardutti";
 const REPO_NAME = "claude-skills";
 const CONTENTS_API = `https://api.github.com/repos/${REPO_OWNER}/${REPO_NAME}/contents/skills`;
+const COMMANDS_API = `https://api.github.com/repos/${REPO_OWNER}/${REPO_NAME}/contents/commands`;
 const RAW_BASE = `https://raw.githubusercontent.com/${REPO_OWNER}/${REPO_NAME}/main/skills`;
+const RAW_COMMANDS_BASE = `https://raw.githubusercontent.com/${REPO_OWNER}/${REPO_NAME}/main/commands`;
 
 function getAuthHeaders() {
   const headers = { "User-Agent": "claude-skills-cli" };
@@ -72,6 +74,49 @@ export async function fetchSkills() {
   return results.filter(Boolean);
 }
 
+export async function fetchCommands() {
+  const headers = getAuthHeaders();
+
+  const res = await fetch(COMMANDS_API, { headers });
+
+  if (!res.ok) {
+    if (res.status === 404) {
+      return [];
+    }
+    if (res.status === 403 || res.status === 429) {
+      throw new Error("GitHub API rate limit exceeded. Try again later or install gh CLI (https://cli.github.com).");
+    }
+    throw new Error(`Failed to list commands: ${res.status} ${res.statusText}`);
+  }
+
+  const entries = await res.json();
+  const files = entries.filter((e) => e.type === "file" && e.name.endsWith(".md"));
+
+  const results = await Promise.all(
+    files.map(async (file) => {
+      try {
+        const url = `${RAW_COMMANDS_BASE}/${file.name}`;
+        const r = await fetch(url, { headers });
+
+        if (!r.ok) {
+          console.warn(`  Warning: Failed to fetch command ${file.name}, skipping`);
+          return null;
+        }
+
+        const content = await r.text();
+        const { name, description, category } = parseFrontmatter(content, file.name.replace(/\.md$/, ""));
+
+        return { fileName: file.name, name, description, category, content };
+      } catch {
+        console.warn(`  Warning: Failed to fetch ${file.name}, skipping`);
+        return null;
+      }
+    })
+  );
+
+  return results.filter(Boolean);
+}
+
 function parseFrontmatter(content, fallbackName) {
   const match = content.match(/^---\s*\n([\s\S]*?)\n---/);
   if (!match) {

package/lib/install.mjs

@@ -18,3 +18,13 @@ export async function installSkills(skills, targetDir = process.cwd()) {
     console.log(`  ${chalk.green("✔")} ${chalk.bold(humanName(skill))} ${chalk.dim(`→ .claude/skills/${skill.dirName}/`)}`);
   }
 }
+
+export async function installCommands(commands, targetDir = process.cwd()) {
+  const baseDir = join(targetDir, ".claude", "commands");
+  await mkdir(baseDir, { recursive: true });
+
+  for (const cmd of commands) {
+    await writeFile(join(baseDir, cmd.fileName), cmd.content);
+    console.log(`  ${chalk.green("✔")} ${chalk.bold(humanName(cmd))} ${chalk.dim(`→ .claude/commands/${cmd.fileName}`)}`);
+  }
+}

package/lib/prompt.mjs

@@ -2,6 +2,7 @@ import { checkbox, Separator } from "@inquirer/prompts";
 import chalk from "chalk";
 
 const CATEGORY_ORDER = ["Frontend", "TypeScript", "Backend", "Quality", "General"];
+const COMMAND_CATEGORY_ORDER = ["Workflow", "General"];
 
 function humanName(skill) {
   return skill.name
@@ -51,3 +52,48 @@ export async function promptSkillSelection(skills) {
 
   return selected;
 }
+
+export async function promptCommandSelection(commands) {
+  const grouped = new Map();
+  for (const cat of COMMAND_CATEGORY_ORDER) {
+    const items = commands.filter((c) => c.category === cat);
+    if (items.length > 0) grouped.set(cat, items);
+  }
+
+  // Include any categories not in the order list
+  for (const cmd of commands) {
+    if (!COMMAND_CATEGORY_ORDER.includes(cmd.category)) {
+      if (!grouped.has(cmd.category)) grouped.set(cmd.category, []);
+      grouped.get(cmd.category).push(cmd);
+    }
+  }
+
+  const choices = [];
+  for (const [category, items] of grouped) {
+    choices.push(new Separator(`── ${category} ${"─".repeat(35 - category.length)}`));
+    for (const cmd of items) {
+      choices.push({
+        name: chalk.bold(humanName(cmd)),
+        value: cmd,
+        description: chalk.dim(stripQuotes(cmd.description)),
+      });
+    }
+  }
+
+  const theme = {
+    icon: { cursor: ">" },
+    style: {
+      highlight: (text) => chalk.cyan(text),
+      renderSelectedChoices: (selected) =>
+        selected.map((s) => chalk.cyan(humanName(s))).join(", "),
+    },
+  };
+
+  const selected = await checkbox({
+    message: "Select commands to install:",
+    choices,
+    theme,
+  });
+
+  return selected;
+}

package/lib/setup-hook.mjs

@@ -6,7 +6,10 @@ const HOOK_SCRIPT = `#!/bin/bash
 
 cat > /dev/null
 
-DIR="\${CLAUDE_PROJECT_DIR:-.}"
+# Derive project root from the hook's own location
+# .claude/hooks/script.sh → go up two levels → project root
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
 
 # Build skill list from project skills
 SKILL_LIST=""
@@ -67,8 +70,9 @@ export async function setupHook(targetDir = process.cwd()) {
   }
 
   // --- UserPromptSubmit hook (forced eval via command) ---
+  const relativeHookPath = `.claude/hooks/${HOOK_FILENAME}`;
   const promptHookEntry = {
-    hooks: [{ type: "command", command: hookPath }],
+    hooks: [{ type: "command", command: relativeHookPath }],
   };
 
   if (Array.isArray(settings.hooks.UserPromptSubmit)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spardutti/claude-skills",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "CLI to install Claude Code skills from the claude-skills collection",
   "type": "module",
   "bin": {