skillfish 1.0.21 → 1.0.23

package/dist/commands/add.js

@@ -9,7 +9,7 @@ import pc from 'picocolors';
 import { printBanner } from '../lib/banner.js';
 import { trackInstall } from '../telemetry.js';
 import { isValidPath, parseFrontmatter, deriveSkillName, toTitleCase, truncate, batchMap, createJsonOutput, isInputTTY, isTTY, } from '../utils.js';
-import { getDetectedAgents, AGENT_CONFIGS } from '../lib/agents.js';
+import { getDetectedAgentsForLocation, AGENT_CONFIGS, } from '../lib/agents.js';
 import { findAllSkillMdFiles, fetchSkillMdContent, fetchDefaultBranch, fetchTreeSha, getSkillSha, SKILL_FILENAME, RateLimitError, RepoNotFoundError, NetworkError, GitHubApiError, } from '../lib/github.js';
 import { installSkill } from '../lib/installer.js';
 import { EXIT_CODES, isValidName } from '../lib/constants.js';
@@ -77,6 +77,10 @@ Examples:
     const projectFlag = options.project ?? false;
     const globalFlag = options.global ?? false;
     let explicitPath = options.path ?? null;
+    // Validate flag conflicts
+    if (projectFlag && globalFlag) {
+        exitWithError('Cannot use both --project and --global. Choose one.', EXIT_CODES.INVALID_ARGS);
+    }
     // Validate --path if provided
     if (explicitPath !== null) {
         if (!isValidPath(explicitPath)) {
@@ -144,17 +148,26 @@ Examples:
     }
     const { paths: skillPaths, branch: discoveredBranch, sha: discoveredSha, tree: discoveredTree, } = discoveryResult;
     // 2. Determine install location (global vs project)
-    const baseDir = await selectInstallLocation(projectFlag, globalFlag, jsonMode);
-    // 3. Select agents to install to
-    const detected = getDetectedAgents();
+    const { baseDir, location } = await selectInstallLocation(projectFlag, globalFlag, jsonMode);
+    const isLocal = location === 'project';
+    // 3. Select agents to install to (location-aware detection)
+    const detected = getDetectedAgentsForLocation(location, process.cwd());
     if (detected.length === 0) {
-        const errorMsg = 'No agents detected. Install Claude Code, Cursor, or another supported agent first.';
+        // No agents detected for this location - provide helpful guidance
+        const locationLabel = isLocal ? 'this project' : 'your system';
+        const errorMsg = `No agents detected in ${locationLabel}.`;
+        const hint = isLocal
+            ? 'Create an agent directory (e.g., .claude/) or use --global to install globally.'
+            : 'Install Claude Code, Cursor, or another supported agent first.';
         if (jsonMode) {
-            addError(errorMsg);
+            addError(`${errorMsg} ${hint}`);
             outputJsonAndExit(EXIT_CODES.GENERAL_ERROR);
         }
         p.log.error(errorMsg);
-        p.outro(pc.dim('https://skill.fish/agents'));
+        p.log.info(pc.dim(hint));
+        if (!isLocal) {
+            p.outro(pc.dim('https://skill.fish/agents'));
+        }
         process.exit(EXIT_CODES.GENERAL_ERROR);
     }
     let targetAgents;
@@ -167,7 +180,6 @@ Examples:
     }
     else {
         // Interactive: let user choose from detected agents
-        const isLocal = baseDir !== homedir();
         targetAgents = await selectAgents(detected, isLocal, jsonMode);
     }
     // Install each selected skill
@@ -226,7 +238,6 @@ Examples:
             continue;
         }
         // Log installed/skipped for this skill
-        const isLocal = baseDir !== homedir();
         const pathPrefix = isLocal ? '.' : '~';
         for (const installed of result.installed) {
             if (!jsonMode) {
@@ -275,27 +286,26 @@ Examples:
     }
     process.exit(EXIT_CODES.SUCCESS);
 });
-// === Helper Functions ===
 async function selectInstallLocation(projectFlag, globalFlag, jsonMode) {
     // If flag specified, use it
     if (projectFlag) {
         if (!jsonMode) {
             p.log.info(`Location: ${pc.cyan('Project')} ${pc.dim('(./')}${pc.dim(AGENT_CONFIGS[0].dir)}${pc.dim(')')}`);
         }
-        return process.cwd();
+        return { baseDir: process.cwd(), location: 'project' };
     }
     if (globalFlag) {
         if (!jsonMode) {
             p.log.info(`Location: ${pc.cyan('Global')} ${pc.dim('(~/')}${pc.dim(AGENT_CONFIGS[0].dir)}${pc.dim(')')}`);
         }
-        return homedir();
+        return { baseDir: homedir(), location: 'global' };
     }
     // Non-TTY or JSON mode defaults to global
     if (!isInputTTY() || jsonMode) {
-        return homedir();
+        return { baseDir: homedir(), location: 'global' };
     }
     // Interactive selection
-    const location = await p.select({
+    const locationChoice = await p.select({
         message: 'Install location',
         options: [
             {
@@ -310,11 +320,13 @@ async function selectInstallLocation(projectFlag, globalFlag, jsonMode) {
             },
         ],
     });
-    if (p.isCancel(location)) {
+    if (p.isCancel(locationChoice)) {
         p.cancel('Cancelled');
         process.exit(EXIT_CODES.SUCCESS);
     }
-    return location === 'project' ? process.cwd() : homedir();
+    return locationChoice === 'project'
+        ? { baseDir: process.cwd(), location: 'project' }
+        : { baseDir: homedir(), location: 'global' };
 }
 async function selectAgents(agents, isLocal, jsonMode) {
     const pathPrefix = isLocal ? '.' : '~';

package/dist/commands/init.js

@@ -8,7 +8,7 @@ import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import * as p from '@clack/prompts';
 import pc from 'picocolors';
 import { printBanner } from '../lib/banner.js';
-import { getDetectedAgents, getAgentSkillDir } from '../lib/agents.js';
+import { getDetectedAgentsForLocation, getAgentSkillDir, } from '../lib/agents.js';
 import { SKILL_FILENAME } from '../lib/github.js';
 import { EXIT_CODES } from '../lib/constants.js';
 import { isInputTTY, isTTY } from '../utils.js';
@@ -294,17 +294,26 @@ Examples:
         }
     }
     // 5. Determine install location (global vs project)
-    const baseDir = await selectInstallLocation(projectFlag, globalFlag, jsonMode);
-    // 6. Select agents to create skill for
-    const detected = getDetectedAgents();
+    const { baseDir, location } = await selectInstallLocation(projectFlag, globalFlag, jsonMode);
+    const isLocal = location === 'project';
+    // 6. Select agents to create skill for (location-aware detection)
+    const detected = getDetectedAgentsForLocation(location, process.cwd());
     if (detected.length === 0) {
-        const errorMsg = 'No agents detected. Install Claude Code, Cursor, or another supported agent first.';
+        // No agents detected for this location - provide helpful guidance
+        const locationLabel = isLocal ? 'this project' : 'your system';
+        const errorMsg = `No agents detected in ${locationLabel}.`;
+        const hint = isLocal
+            ? 'Create an agent directory (e.g., .claude/) or use --global to create globally.'
+            : 'Install Claude Code, Cursor, or another supported agent first.';
         if (jsonMode) {
-            addError(errorMsg);
+            addError(`${errorMsg} ${hint}`);
             outputJsonAndExit(EXIT_CODES.GENERAL_ERROR);
         }
         p.log.error(errorMsg);
-        p.outro(pc.dim('https://skill.fish/agents'));
+        p.log.info(pc.dim(hint));
+        if (!isLocal) {
+            p.outro(pc.dim('https://skill.fish/agents'));
+        }
         process.exit(EXIT_CODES.GENERAL_ERROR);
     }
     let targetAgents;
@@ -317,7 +326,6 @@ Examples:
     }
     else {
         // Interactive: let user choose from detected agents
-        const isLocal = baseDir !== homedir();
         targetAgents = await selectAgents(detected, isLocal, jsonMode);
     }
     // 7. Create the skill
@@ -329,7 +337,6 @@ Examples:
         license,
     };
     const skillContent = generateSkillMd(skillMeta, optionalDirs);
-    const isLocal = baseDir !== homedir();
     const pathPrefix = isLocal ? '.' : '~';
     if (!jsonMode) {
         p.log.step(`Creating ${pc.bold(skillName)}`);
@@ -419,27 +426,26 @@ Examples:
     }
     process.exit(created > 0 || skipped > 0 ? EXIT_CODES.SUCCESS : EXIT_CODES.GENERAL_ERROR);
 });
-// === Helper Functions ===
 async function selectInstallLocation(projectFlag, globalFlag, jsonMode) {
     // If flag specified, use it
     if (projectFlag) {
         if (!jsonMode) {
             p.log.info(`Location: ${pc.cyan('Project')} ${pc.dim('(current directory)')}`);
         }
-        return process.cwd();
+        return { baseDir: process.cwd(), location: 'project' };
     }
     if (globalFlag) {
         if (!jsonMode) {
             p.log.info(`Location: ${pc.cyan('Global')} ${pc.dim('(home directory)')}`);
         }
-        return homedir();
+        return { baseDir: homedir(), location: 'global' };
     }
     // Non-TTY or JSON mode defaults to project (more common for init)
     if (!isInputTTY() || jsonMode) {
-        return process.cwd();
+        return { baseDir: process.cwd(), location: 'project' };
     }
     // Interactive selection
-    const location = await p.select({
+    const locationChoice = await p.select({
         message: 'Install location',
         options: [
             {
@@ -454,11 +460,13 @@ async function selectInstallLocation(projectFlag, globalFlag, jsonMode) {
             },
         ],
     });
-    if (p.isCancel(location)) {
+    if (p.isCancel(locationChoice)) {
         p.cancel('Cancelled');
         process.exit(EXIT_CODES.SUCCESS);
     }
-    return location === 'project' ? process.cwd() : homedir();
+    return locationChoice === 'project'
+        ? { baseDir: process.cwd(), location: 'project' }
+        : { baseDir: homedir(), location: 'global' };
 }
 async function selectAgents(agents, isLocal, jsonMode) {
     const pathPrefix = isLocal ? '.' : '~';

package/dist/commands/list.js

@@ -7,7 +7,7 @@ import { join } from 'path';
 import * as p from '@clack/prompts';
 import pc from 'picocolors';
 import { printBanner } from '../lib/banner.js';
-import { getDetectedAgents, getAgentSkillDir } from '../lib/agents.js';
+import { getDetectedAgentsForLocation, getAgentSkillDir, } from '../lib/agents.js';
 import { listInstalledSkillsInDir } from '../lib/installer.js';
 import { EXIT_CODES } from '../lib/constants.js';
 import { isTTY, isInputTTY } from '../utils.js';
@@ -56,14 +56,38 @@ Examples:
         p.log.error(message);
         process.exit(exitCode);
     }
+    // Validate flag conflicts
+    if (projectFlag && globalFlag) {
+        exitWithError('Cannot use both --project and --global. Choose one.', EXIT_CODES.INVALID_ARGS, {
+            installed: [],
+            agents_detected: [],
+        });
+    }
     // Determine which locations to check
     // By default, check both global and project. Flags narrow it down.
     const checkGlobal = !projectFlag; // Check global unless --project is set
     const checkProject = !globalFlag; // Check project unless --global is set
-    // Detect agents
-    const detected = getDetectedAgents();
+    // Determine detection location based on flags
+    const detectionLocation = projectFlag && !globalFlag ? 'project' : globalFlag && !projectFlag ? 'global' : 'both';
+    // Detect agents for the appropriate location
+    const detected = getDetectedAgentsForLocation(detectionLocation, process.cwd());
+    // When a specific location flag is used and no agents found, return empty results (not an error)
+    // Only error when no flags specified (location='both') and no agents found anywhere
     if (detected.length === 0) {
-        exitWithError('No agents detected. Install Claude Code, Cursor, or another supported agent first.', EXIT_CODES.GENERAL_ERROR, { installed: [], agents_detected: [] });
+        if (detectionLocation === 'both') {
+            exitWithError('No agents detected. Install Claude Code, Cursor, or another supported agent first.', EXIT_CODES.GENERAL_ERROR, { installed: [], agents_detected: [] });
+        }
+        // For --project or --global with no agents, return success with empty list
+        if (jsonMode) {
+            outputJsonAndExit(EXIT_CODES.SUCCESS, { installed: [], agents_detected: [] });
+        }
+        if (isTTY()) {
+            printBanner();
+        }
+        p.intro(`${pc.bgCyan(pc.black(' skillfish '))} ${pc.dim('Installed skills')}`);
+        const locationLabel = detectionLocation === 'project' ? 'project' : 'globally';
+        p.outro(pc.dim(`No agents configured ${locationLabel}`));
+        process.exit(EXIT_CODES.SUCCESS);
     }
     // Helper to collect skills for given agents
     function collectSkills(agents) {
@@ -185,76 +209,85 @@ Examples:
             agents_detected: detected.map((a) => a.name),
         });
     }
-    // Interactive mode: show agent selector
+    // Interactive mode: location-first flow
     if (isInputTTY()) {
         if (isTTY() && !jsonMode) {
             printBanner();
         }
         p.intro(`${pc.bgCyan(pc.black(' skillfish '))} ${pc.dim('Installed skills')}`);
-        // Step 1: Build options with skill counts in label (always visible)
-        const agentOptions = detected.map((agent) => {
-            const { installed } = collectSkills([agent]);
-            const count = installed.length;
-            return {
-                value: agent.name,
-                label: `${agent.name} ${pc.dim(`(${count})`)}`,
-            };
-        });
-        const selected = await p.select({
-            message: 'Select an agent',
-            options: agentOptions,
+        // Step 1: Choose location first
+        const locationChoice = await p.select({
+            message: 'View skills in',
+            options: [
+                { value: 'global', label: 'Global', hint: 'Skills in ~/' },
+                { value: 'project', label: 'Project', hint: 'Skills in ./' },
+            ],
         });
-        if (p.isCancel(selected)) {
+        if (p.isCancel(locationChoice)) {
             p.cancel('Cancelled');
             process.exit(EXIT_CODES.SUCCESS);
         }
-        const selectedAgent = detected.find((a) => a.name === selected);
-        if (!selectedAgent) {
+        // Step 2: Detect agents for the chosen location
+        const locationAgents = getDetectedAgentsForLocation(locationChoice, process.cwd());
+        const isLocal = locationChoice === 'project';
+        const locationLabel = isLocal ? 'Project (./)' : 'Global (~/)';
+        if (locationAgents.length === 0) {
+            const hint = isLocal
+                ? 'No agents configured in this project.'
+                : 'No agents installed globally.';
+            p.log.info(pc.dim(hint));
+            p.outro(pc.dim('Done'));
             process.exit(EXIT_CODES.SUCCESS);
         }
-        // Step 2: Get skills for selected agent
-        const { globalSkills, projectSkills } = collectSkills([selectedAgent]);
-        const hasBothLocations = globalSkills.length > 0 && projectSkills.length > 0;
-        if (globalSkills.length === 0 && projectSkills.length === 0) {
-            p.log.info(`No skills installed for ${pc.cyan(selectedAgent.name)}`);
+        // Step 3: Collect skills for this location only
+        const collectSkillsForLocation = (agents) => {
+            const skills = [];
+            const baseDir = isLocal ? process.cwd() : homedir();
+            for (const agent of agents) {
+                const skillDir = getAgentSkillDir(agent, baseDir);
+                const installed = listInstalledSkillsInDir(skillDir);
+                for (const skill of installed) {
+                    skills.push({
+                        agent: agent.name,
+                        skill,
+                        path: join(skillDir, skill),
+                        location: locationChoice,
+                    });
+                }
+            }
+            return skills;
+        };
+        const allSkills = collectSkillsForLocation(locationAgents);
+        if (allSkills.length === 0) {
+            p.log.info(`No skills installed in ${locationLabel}`);
             p.outro(pc.dim('Done'));
             process.exit(EXIT_CODES.SUCCESS);
         }
-        // Step 3: If both locations have skills, let user choose location
-        let skillsToShow;
-        let locationLabel;
-        if (hasBothLocations) {
-            const locationOptions = [
-                { value: 'global', label: `Global (~/) ${pc.dim(`(${globalSkills.length})`)}` },
-                {
-                    value: 'project',
-                    label: `Project (./) ${pc.dim(`(${projectSkills.length})`)}`,
-                },
-            ];
-            const selectedLocation = await p.select({
-                message: 'Select location',
-                options: locationOptions,
-            });
-            if (p.isCancel(selectedLocation)) {
-                p.cancel('Cancelled');
-                process.exit(EXIT_CODES.SUCCESS);
-            }
-            skillsToShow = selectedLocation === 'global' ? globalSkills : projectSkills;
-            locationLabel = selectedLocation === 'global' ? 'Global (~/)' : 'Project (./)';
+        // Step 4: If multiple agents have skills, let user select one (or show all)
+        const agentSkillCounts = new Map();
+        for (const skill of allSkills) {
+            agentSkillCounts.set(skill.agent, (agentSkillCounts.get(skill.agent) || 0) + 1);
         }
-        else {
-            // Only one location has skills, use that
-            if (globalSkills.length > 0) {
-                skillsToShow = globalSkills;
-                locationLabel = 'Global (~/)';
-            }
-            else {
-                skillsToShow = projectSkills;
-                locationLabel = 'Project (./)';
-            }
+        if (agentSkillCounts.size === 1) {
+            // Only one agent has skills, show them directly
+            displaySkillsForLocation(allSkills, locationLabel);
+            process.exit(EXIT_CODES.SUCCESS);
+        }
+        // Multiple agents - let user choose
+        const agentOptions = Array.from(agentSkillCounts.entries()).map(([name, count]) => ({
+            value: name,
+            label: `${name} ${pc.dim(`(${count})`)}`,
+        }));
+        const selectedAgent = await p.select({
+            message: 'Select an agent',
+            options: agentOptions,
+        });
+        if (p.isCancel(selectedAgent)) {
+            p.cancel('Cancelled');
+            process.exit(EXIT_CODES.SUCCESS);
         }
-        // Step 4: Display skills for selected location
-        displaySkillsForLocation(skillsToShow, locationLabel);
+        const filteredSkills = allSkills.filter((s) => s.agent === selectedAgent);
+        displaySkillsForLocation(filteredSkills, locationLabel);
         process.exit(EXIT_CODES.SUCCESS);
     }
     // Non-interactive mode: display all agents with skills

package/dist/commands/remove.js

@@ -8,7 +8,7 @@ import { existsSync, rmSync } from 'fs';
 import * as p from '@clack/prompts';
 import pc from 'picocolors';
 import { printBanner } from '../lib/banner.js';
-import { getDetectedAgents, getAgentSkillDir } from '../lib/agents.js';
+import { getDetectedAgentsForLocation, getAgentSkillDir, } from '../lib/agents.js';
 import { listInstalledSkillsInDir } from '../lib/installer.js';
 import { isTTY, isInputTTY } from '../utils.js';
 import { EXIT_CODES } from '../lib/constants.js';
@@ -72,14 +72,28 @@ Examples:
     const projectFlag = options.project ?? false;
     const globalFlag = options.global ?? false;
     const targetAgentName = options.agent;
+    // Validate flag conflicts
+    if (projectFlag && globalFlag) {
+        exitWithError('Cannot use both --project and --global. Choose one.', EXIT_CODES.INVALID_ARGS, true);
+    }
     // Determine which locations to check
     // By default, check both global and project. Flags narrow it down.
     const checkGlobal = !projectFlag; // Check global unless --project is set
     const checkProject = !globalFlag; // Check project unless --global is set
-    // Detect agents
-    const detected = getDetectedAgents();
+    // Determine detection location based on flags
+    const detectionLocation = projectFlag && !globalFlag ? 'project' : globalFlag && !projectFlag ? 'global' : 'both';
+    // Detect agents for the appropriate location
+    const detected = getDetectedAgentsForLocation(detectionLocation, process.cwd());
     if (detected.length === 0) {
-        exitWithError('No agents detected. Install Claude Code, Cursor, or another supported agent first.', EXIT_CODES.GENERAL_ERROR, true);
+        const locationHint = detectionLocation === 'project'
+            ? 'No agents configured in this project.'
+            : detectionLocation === 'global'
+                ? 'No agents installed globally.'
+                : 'No agents detected.';
+        const suggestion = detectionLocation === 'project'
+            ? ' Create an agent directory (e.g., .claude/) or use --global.'
+            : ' Install Claude Code, Cursor, or another supported agent first.';
+        exitWithError(locationHint + suggestion, EXIT_CODES.GENERAL_ERROR, true);
     }
     // Filter to target agent if specified
     let targetAgents = detected;

package/dist/commands/update.js

@@ -7,7 +7,7 @@ import { join } from 'path';
 import * as p from '@clack/prompts';
 import pc from 'picocolors';
 import { printBanner } from '../lib/banner.js';
-import { getDetectedAgents, getAgentSkillDir } from '../lib/agents.js';
+import { getDetectedAgentsForLocation, getAgentSkillDir } from '../lib/agents.js';
 import { listInstalledSkillsInDir, installSkill } from '../lib/installer.js';
 import { readManifest } from '../lib/manifest.js';
 import { fetchRecursiveTree, getSkillSha, RateLimitError, RepoNotFoundError, NetworkError, GitHubApiError, } from '../lib/github.js';
@@ -58,8 +58,8 @@ Examples:
         printBanner();
         p.intro(`${pc.bgCyan(pc.black(' skillfish '))} ${pc.dim(`v${version}`)}`);
     }
-    // Detect agents
-    const detected = getDetectedAgents();
+    // Detect agents (check both global and project for updates)
+    const detected = getDetectedAgentsForLocation('both', process.cwd());
     if (detected.length === 0) {
         exitWithError('No agents detected. Install Claude Code, Cursor, or another supported agent first.', EXIT_CODES.GENERAL_ERROR);
     }

package/dist/lib/agents.d.ts

@@ -14,10 +14,18 @@ export interface AgentConfig {
 }
 export declare const AGENT_CONFIGS: readonly AgentConfig[];
 /**
- * Check if an agent is detected on the system.
- * Checks home directory paths first, then current working directory paths.
+ * Check if an agent is installed globally (in home directory).
  */
-export declare function detectAgent(config: AgentConfig, baseDir?: string): boolean;
+export declare function detectAgentGlobally(config: AgentConfig): boolean;
+/**
+ * Check if an agent is configured in a specific project directory.
+ */
+export declare function detectAgentInProject(config: AgentConfig, projectDir: string): boolean;
+/**
+ * Check if an agent is detected (globally OR in project).
+ * Use this for combined detection when location hasn't been chosen yet.
+ */
+export declare function detectAgent(config: AgentConfig, projectDir?: string): boolean;
 /**
  * Runtime agent type with detect function.
  */
@@ -27,13 +35,16 @@ export interface Agent {
     readonly detect: () => boolean;
 }
 /**
- * Build AGENTS array from config (preserves existing API).
+ * Location context for agent detection.
  */
-export declare function buildAgents(baseDir?: string): readonly Agent[];
+export type DetectionLocation = 'global' | 'project' | 'both';
 /**
- * Get all detected agents.
+ * Get detected agents for a specific location context.
+ * - 'global': Only agents installed globally (homePaths)
+ * - 'project': Only agents configured in the project (cwdPaths)
+ * - 'both': Agents detected in either location (current behavior)
  */
-export declare function getDetectedAgents(baseDir?: string): readonly Agent[];
+export declare function getDetectedAgentsForLocation(location: DetectionLocation, projectDir?: string): readonly Agent[];
 /**
  * Get the skill directory path for an agent.
  */

package/dist/lib/agents.js

@@ -113,30 +113,48 @@ export const AGENT_CONFIGS = [
     },
 ];
 /**
- * Check if an agent is detected on the system.
- * Checks home directory paths first, then current working directory paths.
+ * Check if an agent is installed globally (in home directory).
  */
-export function detectAgent(config, baseDir) {
+export function detectAgentGlobally(config) {
     const home = homedir();
-    const cwd = baseDir ?? process.cwd();
-    return (config.homePaths.some((p) => existsSync(join(home, p))) ||
-        config.cwdPaths.some((p) => existsSync(join(cwd, p))));
+    return config.homePaths.some((p) => existsSync(join(home, p)));
 }
 /**
- * Build AGENTS array from config (preserves existing API).
+ * Check if an agent is configured in a specific project directory.
  */
-export function buildAgents(baseDir) {
-    return AGENT_CONFIGS.map((config) => ({
-        name: config.name,
-        dir: config.dir,
-        detect: () => detectAgent(config, baseDir),
-    }));
+export function detectAgentInProject(config, projectDir) {
+    return config.cwdPaths.some((p) => existsSync(join(projectDir, p)));
 }
 /**
- * Get all detected agents.
+ * Check if an agent is detected (globally OR in project).
+ * Use this for combined detection when location hasn't been chosen yet.
  */
-export function getDetectedAgents(baseDir) {
-    return buildAgents(baseDir).filter((a) => a.detect());
+export function detectAgent(config, projectDir) {
+    const cwd = projectDir ?? process.cwd();
+    return detectAgentGlobally(config) || detectAgentInProject(config, cwd);
+}
+/**
+ * Get detected agents for a specific location context.
+ * - 'global': Only agents installed globally (homePaths)
+ * - 'project': Only agents configured in the project (cwdPaths)
+ * - 'both': Agents detected in either location (current behavior)
+ */
+export function getDetectedAgentsForLocation(location, projectDir) {
+    const cwd = projectDir ?? process.cwd();
+    return AGENT_CONFIGS.filter((config) => {
+        switch (location) {
+            case 'global':
+                return detectAgentGlobally(config);
+            case 'project':
+                return detectAgentInProject(config, cwd);
+            case 'both':
+                return detectAgent(config, cwd);
+        }
+    }).map((config) => ({
+        name: config.name,
+        dir: config.dir,
+        detect: () => detectAgent(config, cwd),
+    }));
 }
 /**
  * Get the skill directory path for an agent.

package/dist/lib/registry.js

@@ -105,6 +105,7 @@ export async function searchSkillsInRegistry(query, limit = 5) {
     try {
         const params = new URLSearchParams({
             q: query,
+            type: 'skills',
             limit: String(limit),
         });
         const res = await fetchWithRetry(`${REGISTRY_SEARCH_URL}?${params.toString()}`, {
@@ -134,7 +135,7 @@ export async function searchSkillsInRegistry(query, limit = 5) {
                 error: data.error || `Registry error: ${res.status}`,
             };
         }
-        if (!data.tools || !Array.isArray(data.tools)) {
+        if (!data.skills || !Array.isArray(data.skills)) {
             return {
                 success: true,
                 results: [],
@@ -143,16 +144,16 @@ export async function searchSkillsInRegistry(query, limit = 5) {
         }
         // Validate and transform API response to our SearchResult format
         // Filter out malformed items that are missing required string fields
-        const results = data.tools
+        const results = data.skills
             .filter((item) => typeof item.name === 'string' &&
             typeof item.slug === 'string' &&
             typeof item.github === 'string')
             .map((item) => ({
             name: item.name,
             slug: item.slug,
-            type: item.type,
-            owner: item.owner_name ?? '',
-            ownerUrl: item.owner_url ?? '',
+            type: 'skill',
+            owner: item.owner?.name ?? '',
+            ownerUrl: item.owner?.url ?? '',
             github: item.github,
             description: item.description ?? '',
             stars: item.github_stars ?? 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillfish",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "All in one Skill manager for AI coding agents. Install, update, and sync Skills across Claude Code, Cursor, Copilot + more.",
   "type": "module",
   "bin": {