skillhub 0.1.7 → 0.1.9

package/dist/index.js

@@ -135,6 +135,7 @@ async function trackInstall(skillId, platform, method = "cli") {
 
 // src/utils/github.ts
 import { Octokit } from "@octokit/rest";
+import https2 from "https";
 var octokit = null;
 function getOctokit() {
   if (!octokit) {
@@ -149,25 +150,73 @@ function getOctokit() {
   }
   return octokit;
 }
+async function fetchRawFile(owner, repo, path3, branch) {
+  return new Promise((resolve, reject) => {
+    const url = `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${path3}`;
+    https2.get(url, { timeout: 1e4 }, (res) => {
+      if (res.statusCode === 404) {
+        reject(new Error("File not found"));
+        return;
+      }
+      if (res.statusCode !== 200) {
+        reject(new Error(`HTTP ${res.statusCode}`));
+        return;
+      }
+      let data = "";
+      res.on("data", (chunk) => data += chunk);
+      res.on("end", () => resolve(data));
+    }).on("error", (err) => {
+      reject(err);
+    }).on("timeout", () => {
+      reject(new Error("Request timeout"));
+    });
+  });
+}
 async function fetchSkillContent(owner, repo, skillPath, branch = "main") {
   const client = getOctokit();
   const skillMdPath = skillPath ? `${skillPath}/SKILL.md` : "SKILL.md";
   let skillMdResponse;
-  try {
-    skillMdResponse = await client.repos.getContent({
-      owner,
-      repo,
-      path: skillMdPath,
-      ref: branch
-    });
-  } catch (error) {
-    if (error.status === 404) {
-      throw new Error(`SKILL.md not found at ${owner}/${repo}/${skillMdPath}`);
-    }
-    if (error.message?.includes("timeout")) {
-      throw new Error(`GitHub request timeout. Check your internet connection or try again later.`);
+  let lastError;
+  const pathsToTry = [
+    skillMdPath,
+    // Common skill directories
+    ...skillPath && !skillPath.startsWith("skills/") ? [`skills/${skillPath}/SKILL.md`] : [],
+    ...skillPath && !skillPath.startsWith(".claude/") ? [`.claude/skills/${skillPath}/SKILL.md`] : [],
+    ...skillPath && !skillPath.startsWith(".github/") ? [`.github/skills/${skillPath}/SKILL.md`] : []
+  ];
+  for (const pathToTry of pathsToTry) {
+    try {
+      skillMdResponse = await client.repos.getContent({
+        owner,
+        repo,
+        path: pathToTry,
+        ref: branch
+      });
+      break;
+    } catch (error) {
+      lastError = error;
+      if (error.message?.includes("timeout") || error.message?.includes("network")) {
+        try {
+          const rawContent = await fetchRawFile(owner, repo, pathToTry, branch);
+          skillMdResponse = {
+            data: {
+              content: Buffer.from(rawContent).toString("base64"),
+              encoding: "base64"
+            }
+          };
+          break;
+        } catch (rawError) {
+          throw new Error(`GitHub API timeout. Try using --no-api flag or check your network connection.`);
+        }
+      }
+      if (error.status === 404) {
+        continue;
+      }
+      throw new Error(`Failed to fetch from GitHub: ${error.message}`);
     }
-    throw new Error(`Failed to fetch from GitHub: ${error.message}`);
+  }
+  if (!skillMdResponse) {
+    throw new Error(`SKILL.md not found at ${owner}/${repo} (tried ${pathsToTry.length} paths)`);
   }
   if (!("content" in skillMdResponse.data)) {
     throw new Error("SKILL.md not found");
@@ -322,6 +371,28 @@ async function install(skillId, options) {
     }
     const actualName = parsed.metadata.name || skillName;
     const installPath = getSkillPath(options.platform, actualName, options.project);
+    const metadataPath = path.join(installPath, ".skillhub.json");
+    if (await fs.pathExists(metadataPath)) {
+      try {
+        const existingMetadata = await fs.readJson(metadataPath);
+        if (existingMetadata.skillId && existingMetadata.skillId !== skillId) {
+          spinner.warn(`Name collision detected!`);
+          console.log(chalk.yellow(`
+A different skill is already installed with the name "${actualName}":`));
+          console.log(chalk.dim(`  Existing: ${existingMetadata.skillId}`));
+          console.log(chalk.dim(`  New:      ${skillId}`));
+          console.log();
+          if (!options.force) {
+            console.log(chalk.red("Installation cancelled to prevent overwriting."));
+            console.log(chalk.dim("Use --force to overwrite the existing skill."));
+            process.exit(1);
+          } else {
+            console.log(chalk.yellow("Overwriting existing skill (--force flag used).\n"));
+          }
+        }
+      } catch {
+      }
+    }
     if (installed && options.force) {
       await fs.remove(installPath);
     }
@@ -589,9 +660,11 @@ var pkg = require2("../package.json");
 var VERSION = pkg.version;
 var program = new Command();
 program.name("skillhub").description("CLI for managing AI Agent skills").version(VERSION);
-program.command("install <skill-id>").description("Install a skill from the registry").option("-p, --platform <platform>", "Target platform (claude, codex, copilot, cursor, windsurf)", "claude").option("--project", "Install in the current project instead of globally").option("-f, --force", "Overwrite existing skill").option("--no-api", "Skip API lookup and fetch directly from GitHub").action(async (skillId, options) => {
+program.command("install <skill-id>").description("Install a skill from the registry").option("-p, --platform <platform>", "Target platform (claude, codex, copilot, cursor, windsurf)").option("--project", "Install in the current project instead of globally").option("-f, --force", "Overwrite existing skill").option("--no-api", "Skip API lookup and fetch directly from GitHub").action(async (skillId, options) => {
+  const userConfig = await loadConfig();
+  const platform = options.platform || userConfig.defaultPlatform || "claude";
   await install(skillId, {
-    platform: options.platform,
+    platform,
     project: options.project,
     force: options.force,
     noApi: !options.api
@@ -607,31 +680,35 @@ program.command("list").description("List installed skills").option("-p, --platf
 program.command("config").description("Manage CLI configuration").option("--set <key=value>", "Set a configuration value").option("--get <key>", "Get a configuration value").option("--list", "List all configuration values").action(async (options) => {
   await config(options);
 });
-program.command("uninstall <skill-name>").description("Uninstall a skill").option("-p, --platform <platform>", "Target platform", "claude").option("--project", "Uninstall from project instead of globally").action(async (skillName, options) => {
+program.command("uninstall <skill-name>").description("Uninstall a skill").option("-p, --platform <platform>", "Target platform").option("--project", "Uninstall from project instead of globally").action(async (skillName, options) => {
   const fs3 = await import("fs-extra");
   const { getSkillPath: getSkillPath2, isSkillInstalled: isSkillInstalled2 } = await import("./paths-BVI5WSHE.js");
-  const installed = await isSkillInstalled2(options.platform, skillName, options.project);
+  const userConfig = await loadConfig();
+  const platform = options.platform || userConfig.defaultPlatform || "claude";
+  const installed = await isSkillInstalled2(platform, skillName, options.project);
   if (!installed) {
     console.log(chalk5.yellow(`Skill ${skillName} is not installed.`));
     process.exit(1);
   }
-  const skillPath = getSkillPath2(options.platform, skillName, options.project);
+  const skillPath = getSkillPath2(platform, skillName, options.project);
   await fs3.default.remove(skillPath);
   console.log(chalk5.green(`Skill ${skillName} uninstalled successfully.`));
 });
-program.command("update [skill-name]").description("Update installed skills").option("-p, --platform <platform>", "Target platform", "claude").option("--all", "Update all installed skills").action(async (skillName, options) => {
+program.command("update [skill-name]").description("Update installed skills").option("-p, --platform <platform>", "Target platform").option("--all", "Update all installed skills").action(async (skillName, options) => {
   const fsExtra = await import("fs-extra");
   const pathModule = await import("path");
   const { getSkillsPath: getSkillsPath2, getSkillPath: getSkillPath2 } = await import("./paths-BVI5WSHE.js");
+  const userConfig = await loadConfig();
+  const platform = options.platform || userConfig.defaultPlatform || "claude";
   const ALL_PLATFORMS2 = ["claude", "codex", "copilot", "cursor", "windsurf"];
   if (options.all) {
     console.log(chalk5.cyan("\nUpdating all installed skills...\n"));
-    const platforms = options.platform ? [options.platform] : ALL_PLATFORMS2;
+    const platforms = options.platform ? [platform] : ALL_PLATFORMS2;
     let updated = 0;
     let failed = 0;
     let skipped = 0;
-    for (const platform of platforms) {
-      const skillsPath = getSkillsPath2(platform);
+    for (const p of platforms) {
+      const skillsPath = getSkillsPath2(p);
       if (!await fsExtra.default.pathExists(skillsPath)) {
         continue;
       }
@@ -655,7 +732,7 @@ program.command("update [skill-name]").description("Update installed skills").op
           }
           console.log(chalk5.dim(`  Updating ${entry.name}...`));
           await install(skillId, {
-            platform,
+            platform: p,
             force: true
           });
           updated++;
@@ -675,7 +752,7 @@ program.command("update [skill-name]").description("Update installed skills").op
     console.log(chalk5.red("Please specify a skill name or use --all."));
     process.exit(1);
   }
-  const skillPath = getSkillPath2(options.platform, skillName);
+  const skillPath = getSkillPath2(platform, skillName);
   const metadataPath = pathModule.join(skillPath, ".skillhub.json");
   if (!await fsExtra.default.pathExists(metadataPath)) {
     console.log(chalk5.yellow(`Skill ${skillName} was not installed via CLI.`));
@@ -691,7 +768,7 @@ program.command("update [skill-name]").description("Update installed skills").op
     }
     console.log(chalk5.dim(`Updating ${skillName}...`));
     await install(skillId, {
-      platform: options.platform,
+      platform,
       force: true
     });
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillhub",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "CLI tool for managing AI Agent skills - search, install, and update skills for Claude, Codex, Copilot, and more",
   "author": "SkillHub Contributors",
   "license": "MIT",