skillfish 1.0.4 → 1.0.5

package/dist/commands/add.js

@@ -16,6 +16,7 @@ import { EXIT_CODES, isValidName } from '../lib/constants.js';
 export const addCommand = new Command('add')
     .description('Install a skill from a GitHub repository')
     .argument('<repo>', 'GitHub repository (owner/repo or owner/repo/plugin/skill)')
+    .argument('[skill-name]', 'Install a specific skill by name (from SKILL.md frontmatter)')
     .option('--force', 'Overwrite existing skills without prompting')
     .option('-y, --yes', 'Skip all confirmation prompts')
     .option('--all', 'Install all skills found in the repository')
@@ -26,11 +27,12 @@ export const addCommand = new Command('add')
     .addHelpText('after', `
 Examples:
   $ skillfish add owner/repo                  Install from a repository
+  $ skillfish add owner/repo my-skill         Install skill by name
   $ skillfish add owner/repo --all            Install all skills in repo
-  $ skillfish add owner/repo/plugin/skill     Install a specific skill
+  $ skillfish add owner/repo/plugin/skill     Install a specific skill by path
   $ skillfish add owner/repo --path path/to   Install skill at specific path
   $ skillfish add owner/repo --project        Install to current project only`)
-    .action(async (repoArg, options, command) => {
+    .action(async (repoArg, skillNameArg, options, command) => {
     const jsonMode = command.parent?.opts().json ?? false;
     const jsonOutput = createJsonOutput();
     const version = command.parent?.opts().version ?? '0.0.0';
@@ -84,29 +86,28 @@ Examples:
             exitWithError('Invalid --path value. Path must be relative and contain only safe characters.', EXIT_CODES.INVALID_ARGS);
         }
     }
-    // Parse repo format - supports both owner/repo and owner/repo/plugin/skill
+    // Parse repo format - supports owner/repo and owner/repo/path/to/skill
     const parts = repoArg.split('/');
     let owner;
     let repo;
-    if (parts.length === 2) {
-        [owner, repo] = parts;
-    }
-    else if (parts.length === 4) {
-        const [o, r, plugin, skill] = parts;
-        owner = o;
-        repo = r;
-        // Security: validate plugin and skill names
-        if (!isValidName(plugin) || !isValidName(skill)) {
-            exitWithError('Invalid plugin or skill name. Use only alphanumeric characters, dots, hyphens, and underscores.', EXIT_CODES.INVALID_ARGS);
-        }
-        explicitPath = explicitPath || `plugins/${plugin}/skills/${skill}`;
+    if (parts.length < 2) {
+        exitWithError('Invalid format. Use: owner/repo or owner/repo/path/to/skill', EXIT_CODES.INVALID_ARGS);
+    }
+    [owner, repo] = parts;
+    // If path components exist after owner/repo, use them as the skill path
+    if (parts.length > 2) {
+        const pathParts = parts.slice(2);
+        // Security: validate each path component
+        for (const part of pathParts) {
+            if (!isValidName(part)) {
+                exitWithError('Invalid path component. Use only alphanumeric characters, dots, hyphens, and underscores.', EXIT_CODES.INVALID_ARGS);
+            }
+        }
+        explicitPath = explicitPath || pathParts.join('/');
         if (!jsonMode) {
-            console.log(`Installing skill from: ${plugin}/${skill}`);
+            console.log(`Installing skill from: ${explicitPath}`);
         }
     }
-    else {
-        exitWithError('Invalid format. Use: owner/repo or owner/repo/plugin/skill', EXIT_CODES.INVALID_ARGS);
-    }
     // Validate owner/repo (security: prevent injection)
     if (!owner || !repo || !isValidName(owner) || !isValidName(repo)) {
         exitWithError('Invalid repository format. Use: owner/repo', EXIT_CODES.INVALID_ARGS);
@@ -114,7 +115,7 @@ Examples:
     // 1. Discover or select skills
     const skillPaths = explicitPath
         ? [explicitPath]
-        : await discoverSkillPaths(owner, repo, installAll, jsonMode, jsonOutput);
+        : await discoverSkillPaths(owner, repo, installAll, jsonMode, jsonOutput, skillNameArg);
     if (!skillPaths || skillPaths.length === 0) {
         if (jsonMode) {
             outputJsonAndExit(EXIT_CODES.NOT_FOUND);
@@ -224,10 +225,7 @@ Examples:
         totalSkipped += result.skipped.length;
         // Track successful installs (telemetry with timeout)
         if (result.installed.length > 0) {
-            // Construct github value to match skills.github column format: owner/repo/path/to/skill
-            const skillDir = skillPath.replace(/\/?SKILL\.md$/i, '').replace(/^\.?\/?/, '');
-            const github = skillDir ? `${owner}/${repo}/${skillDir}` : `${owner}/${repo}`;
-            telemetryPromises.push(trackInstall(github));
+            telemetryPromises.push(trackInstall(owner, repo, skillName));
         }
     }
     // Wait for telemetry to complete (with timeout built into trackInstall)
@@ -325,7 +323,7 @@ async function selectAgents(agents, isLocal, jsonMode) {
     }
     return agents.filter((a) => selected.includes(a.name));
 }
-async function discoverSkillPaths(owner, repo, installAll, jsonMode, jsonOutput) {
+async function discoverSkillPaths(owner, repo, installAll, jsonMode, jsonOutput, targetSkillName) {
     let skillPaths;
     try {
         skillPaths = await findAllSkillMdFiles(owner, repo);
@@ -397,6 +395,35 @@ async function discoverSkillPaths(owner, repo, installAll, jsonMode, jsonOutput)
     }
     // Store found skills in JSON output
     jsonOutput.skills_found = skills.map((s) => s.name);
+    // If a specific skill name was requested, find and return it
+    if (targetSkillName) {
+        const normalizedTarget = targetSkillName.toLowerCase();
+        const matchedSkill = skills.find((s) => s.name.toLowerCase() === normalizedTarget);
+        if (matchedSkill) {
+            const displayName = toTitleCase(matchedSkill.name);
+            const desc = matchedSkill.description ? truncate(matchedSkill.description, 60) : '';
+            if (!jsonMode) {
+                p.log.info(`${pc.bold(displayName)}${desc ? pc.dim(` - ${desc}`) : ''}`);
+            }
+            return [matchedSkill.dir];
+        }
+        // Skill not found - show available skills
+        const errorMsg = `Skill "${targetSkillName}" not found in repository`;
+        if (jsonMode) {
+            jsonOutput.errors.push(errorMsg);
+            jsonOutput.success = false;
+        }
+        else {
+            p.log.error(errorMsg);
+            console.log(`\nAvailable skills in ${owner}/${repo}:`);
+            for (const skill of skills) {
+                const displayName = toTitleCase(skill.name);
+                const desc = skill.description ? pc.dim(` - ${truncate(skill.description, 80)}`) : '';
+                console.log(`  - ${pc.cyan(skill.name)} ${displayName}${desc}`);
+            }
+        }
+        return null;
+    }
     if (skills.length === 1) {
         const skill = skills[0];
         const displayName = toTitleCase(skill.name);
@@ -424,7 +451,7 @@ async function discoverSkillPaths(owner, repo, installAll, jsonMode, jsonOutput)
         }
         // Otherwise, list skills and exit with guidance
         if (jsonMode) {
-            jsonOutput.errors.push('Multiple skills found. Use --path or --all to specify which one(s).');
+            jsonOutput.errors.push('Multiple skills found. Specify skill name, use --path, or --all.');
             jsonOutput.success = false;
         }
         else {
@@ -432,9 +459,9 @@ async function discoverSkillPaths(owner, repo, installAll, jsonMode, jsonOutput)
             for (const skill of skills) {
                 const displayName = toTitleCase(skill.name);
                 const desc = skill.description ? pc.dim(` - ${truncate(skill.description, 80)}`) : '';
-                console.log(`  - ${displayName}${desc}`);
+                console.log(`  - ${pc.cyan(skill.name)} ${displayName}${desc}`);
             }
-            console.error('\nMultiple skills found. Use --path or --all to specify which one(s) (non-interactive mode).');
+            console.error('\nMultiple skills found. Specify skill name, use --path, or --all (non-interactive mode).');
         }
         return null;
     }

package/dist/telemetry.d.ts

@@ -2,7 +2,9 @@
  * Track a skill install. Returns a promise that resolves when the request
  * completes (or times out). Never rejects.
  *
- * @param github Full GitHub path (e.g., owner/repo/path/to/skill)
+ * @param owner GitHub repository owner
+ * @param repo GitHub repository name
+ * @param skillName Name of the skill being installed
  * @returns Promise that resolves when telemetry is sent (or times out)
  */
-export declare function trackInstall(github: string): Promise<void>;
+export declare function trackInstall(owner: string, repo: string, skillName: string): Promise<void>;

package/dist/telemetry.js

@@ -1,34 +1,39 @@
 const TELEMETRY_URL = 'https://mcpmarket.com/api/telemetry';
 /** Timeout for telemetry requests (ms) */
-const TELEMETRY_TIMEOUT = 2000;
+const TELEMETRY_TIMEOUT = 5000;
 /**
  * Track a skill install. Returns a promise that resolves when the request
  * completes (or times out). Never rejects.
  *
- * @param github Full GitHub path (e.g., owner/repo/path/to/skill)
+ * @param owner GitHub repository owner
+ * @param repo GitHub repository name
+ * @param skillName Name of the skill being installed
  * @returns Promise that resolves when telemetry is sent (or times out)
  */
-export function trackInstall(github) {
+export function trackInstall(owner, repo, skillName) {
     try {
         if (process.env.DO_NOT_TRACK === '1' || process.env.CI === 'true') {
             return Promise.resolve();
         }
-        if (!github || github.length > 500) {
+        if (!owner || !repo || !skillName) {
             return Promise.resolve();
         }
-        // Race between the fetch and a timeout to ensure we don't block the CLI
-        const fetchPromise = fetch(TELEMETRY_URL, {
+        // Use AbortController to properly timeout the request
+        // This ensures the fetch actually completes (or aborts) before we return
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), TELEMETRY_TIMEOUT);
+        const body = JSON.stringify({ owner, repo, skillName });
+        return fetch(TELEMETRY_URL, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ github }),
-        }).then(() => { }).catch(() => { });
-        const timeoutPromise = new Promise((resolve) => {
-            setTimeout(resolve, TELEMETRY_TIMEOUT);
-        });
-        return Promise.race([fetchPromise, timeoutPromise]);
+            body,
+            signal: controller.signal,
+        })
+            .then(() => { })
+            .catch(() => { })
+            .finally(() => clearTimeout(timeoutId));
     }
     catch {
-        // Telemetry should never throw
         return Promise.resolve();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillfish",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Install AI agent skills from GitHub with a single command",
   "type": "module",
   "bin": {