reskill 1.10.0 → 1.11.1

package/dist/core/config-loader.d.ts

@@ -97,6 +97,10 @@ export declare class ConfigLoader {
      * @param updates - Partial defaults to merge
      */
     updateDefaults(updates: Partial<SkillsDefaults>): void;
+    /**
+     * Get all configured registries (custom + default).
+     */
+    getRegistries(): Record<string, string>;
     /**
      * Get registry URL by name
      *

package/dist/core/config-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../../src/core/config-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAiCpE;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAGrD,CAAC;AAMF;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,MAAM,CAA2B;gBAE7B,WAAW,CAAC,EAAE,MAAM;IAShC;;OAEG;IACH,cAAc,IAAI,MAAM;IAIxB;;OAEG;IACH,aAAa,IAAI,MAAM;IAIvB;;OAEG;IACH,aAAa,IAAI,MAAM;IASvB;;OAEG;IACH,MAAM,IAAI,OAAO;IAIjB;;;;OAIG;IACH,IAAI,IAAI,UAAU;IAiBlB;;OAEG;IACH,MAAM,IAAI,UAAU;IAKpB;;;;;OAKG;IACH,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI;IAS/B;;;;OAIG;IACH,YAAY,IAAI,OAAO;IAQvB;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU;IAwBjD;;;;;;OAMG;IACH,WAAW,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,iBAAiB,CAAC,GAAG;QACjE,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;KACrC;IAYD;;;;;;OAMG;IACH,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAKxC;;;;;;OAMG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI;IAgBtD;;;;;;;OAOG;IACH,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAiB5C;;;;;;;;OAQG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IA2BnD;;;;;;;;;OASG;IACH,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAoBtC;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAuCzB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA8B1B;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAgBzC;;;;;;;;;;OAUG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAiB5C;;;;;;;OAOG;IACH,OAAO,CAAC,sBAAsB;IAa9B;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAWlC;;OAEG;IACH,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAUnC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAK/B;;OAEG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAS7C;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAU1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;CAK3B;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../../src/core/config-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAiCpE;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAGrD,CAAC;AAMF;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,MAAM,CAA2B;gBAE7B,WAAW,CAAC,EAAE,MAAM;IAShC;;OAEG;IACH,cAAc,IAAI,MAAM;IAIxB;;OAEG;IACH,aAAa,IAAI,MAAM;IAIvB;;OAEG;IACH,aAAa,IAAI,MAAM;IASvB;;OAEG;IACH,MAAM,IAAI,OAAO;IAIjB;;;;OAIG;IACH,IAAI,IAAI,UAAU;IAiBlB;;OAEG;IACH,MAAM,IAAI,UAAU;IAKpB;;;;;OAKG;IACH,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI;IAS/B;;;;OAIG;IACH,YAAY,IAAI,OAAO;IAQvB;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU;IAwBjD;;;;;;OAMG;IACH,WAAW,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,iBAAiB,CAAC,GAAG;QACjE,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;KACrC;IAYD;;;;;;OAMG;IACH,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAKxC;;;;;;OAMG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI;IAgBtD;;OAEG;IACH,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAQvC;;;;;;;OAOG;IACH,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAiB5C;;;;;;;;OAQG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IA2BnD;;;;;;;;;OASG;IACH,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAoBtC;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAuCzB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA8B1B;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAgBzC;;;;;;;;;;OAUG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAiB5C;;;;;;;OAOG;IACH,OAAO,CAAC,sBAAsB;IAa9B;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAWlC;;OAEG;IACH,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAUnC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAK/B;;OAEG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAS7C;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAU1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;CAK3B;AAED,eAAe,YAAY,CAAC"}

package/dist/core/lock-manager.d.ts

@@ -50,6 +50,7 @@ export declare class LockManager {
         ref: string;
         resolved: string;
         commit: string;
+        registry?: string;
     }): LockedSkill;
     /**
      * Get all locked skills

package/dist/core/lock-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lock-manager.d.ts","sourceRoot":"","sources":["../../src/core/lock-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAQjE;;;;GAIG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAA2B;gBAE/B,WAAW,CAAC,EAAE,MAAM;IAKhC;;OAEG;IACH,WAAW,IAAI,MAAM;IAIrB;;OAEG;IACH,MAAM,IAAI,OAAO;IAIjB;;OAEG;IACH,IAAI,IAAI,UAAU;IAsBlB;;OAEG;IACH,MAAM,IAAI,UAAU;IAKpB;;OAEG;IACH,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI;IASnC;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAK1C;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI;IAM3C;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAU7B;;OAEG;IACH,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;KAChB,GACA,WAAW;IAcd;;OAEG;IACH,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;IAKrC;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAK1B;;OAEG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO;IAQtD;;OAEG;IACH,KAAK,IAAI,IAAI;IAQb;;OAEG;IACH,MAAM,IAAI,IAAI;CAOf;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"lock-manager.d.ts","sourceRoot":"","sources":["../../src/core/lock-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAQjE;;;;GAIG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAA2B;gBAE/B,WAAW,CAAC,EAAE,MAAM;IAKhC;;OAEG;IACH,WAAW,IAAI,MAAM;IAIrB;;OAEG;IACH,MAAM,IAAI,OAAO;IAIjB;;OAEG;IACH,IAAI,IAAI,UAAU;IAsBlB;;OAEG;IACH,MAAM,IAAI,UAAU;IAKpB;;OAEG;IACH,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI;IASnC;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAK1C;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI;IAM3C;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAU7B;;OAEG;IACH,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GACA,WAAW;IAmBd;;OAEG;IACH,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;IAKrC;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAK1B;;OAEG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO;IAQtD;;OAEG;IACH,KAAK,IAAI,IAAI;IAQb;;OAEG;IACH,MAAM,IAAI,IAAI;CAOf;AAED,eAAe,WAAW,CAAC"}

package/dist/core/skill-manager.d.ts

@@ -7,7 +7,7 @@ import { type ParsedSkillWithPath } from './skill-parser.js';
  * SkillManager configuration options
  */
 export interface SkillManagerOptions {
-    /** Global mode, install to ~/.claude/skills */
+    /** Global mode, install to ~/.agents/skills/ */
     global?: boolean;
 }
 /**
@@ -17,8 +17,8 @@ export interface SkillManagerOptions {
  * Provides complete skill installation, update, and uninstall functionality
  *
  * Installation directories:
- * - Project mode (default): .skills/ or directory configured in skills.json
- * - Global mode (-g): ~/.claude/skills/
+ * - Project mode (default): .agents/skills/ (canonical) or .skills/ (legacy)
+ * - Global mode (-g): ~/.agents/skills/
  */
 export declare class SkillManager {
     private projectRoot;
@@ -41,7 +41,7 @@ export declare class SkillManager {
     /**
      * Get legacy installation directory (for backward compatibility)
      *
-     * - Global mode: ~/.claude/skills/
+     * - Global mode: ~/.agents/skills/ (canonical)
      * - Project mode: .skills/ or directory configured in skills.json
      */
     getInstallDir(): string;
@@ -113,12 +113,46 @@ export declare class SkillManager {
      * Update skill
      */
     update(name?: string): Promise<InstalledSkill[]>;
+    /**
+     * Resolve registry URL for a skill reference.
+     *
+     * Resolution order:
+     * 1. Explicit CLI override (options.registry)
+     * 2. Scoped skills → getRegistryUrl(scope)
+     * 3. Unscoped skills → lock file registry (O(1), no network)
+     * 4. Unscoped skills → probe skills.json registries (non-git-host, network)
+     * 5. Default → PUBLIC_REGISTRY
+     */
+    private resolveRegistryUrl;
+    /**
+     * Check if a registry entry is a git host (github, gitlab, etc.)
+     * Git hosts are not skill registries and should be skipped during probe.
+     */
+    private isGitHostRegistry;
+    /**
+     * Derive a registry name from a URL for storing in skills.json.registries.
+     * Returns null for git hosts (already in DEFAULT_REGISTRIES).
+     */
+    private deriveRegistryName;
+    /**
+     * Install skill for update flow. Uses installToAgents so registry refs are
+     * routed correctly (Registry > HTTP > Git).
+     */
+    private installForUpdate;
     /**
      * List installed skills
      *
      * Checks both canonical (.agents/skills/) and legacy (.skills/) locations.
      */
     list(): InstalledSkill[];
+    /**
+     * Detect which agents have a skill installed (symlink or copy)
+     *
+     * Scans all known agent directories to check if the skill exists there.
+     * Excludes the canonical directory (.agents/skills/) to avoid false positives
+     * from agents whose skillsDir overlaps with the canonical path (e.g. amp).
+     */
+    private detectSkillAgents;
     /**
      * Get installed skill information from a specific path
      */
@@ -209,6 +243,23 @@ export declare class SkillManager {
      * - local: downloads tarball via Registry API
      */
     private installFromWebPublished;
+    /**
+     * Build a Git ref for web-published github/gitlab skills.
+     *
+     * When `skillPath` is provided (multi-skill repo), constructs a shorthand ref
+     * like `github:owner/repo/skills/my-skill` so that only the sub-directory is
+     * cached and installed.
+     *
+     * Fallback: if `parseGitUrl` fails (non-standard URL), appends `#shortName`
+     * as a skill-name selector. The `#` fragment is extracted by
+     * `GitResolver.parseRef()` as `parsed.skillName`, then matched against
+     * SKILL.md `name` fields via `resolveSourcePath` / `discoverSkillsInDir`.
+     * This differs from the subPath approach (directory-based) but works because
+     * skill names typically match their directory basenames.
+     *
+     * Returns the raw `sourceUrl` when no `skillPath` is available.
+     */
+    private buildGitRefForWebPublished;
     /**
      * Install a skill published via "local folder" mode.
      *

package/dist/core/skill-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skill-manager.d.ts","sourceRoot":"","sources":["../../src/core/skill-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"skill-manager.d.ts","sourceRoot":"","sources":["../../src/core/skill-manager.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -297,13 +297,6 @@ var external_node_fs_ = __webpack_require__("node:fs");
  */ function getHomeDir() {
     return process.env.HOME || process.env.USERPROFILE || '';
 }
-/**
- * Get global skills installation directory (~/.claude/skills)
- * @deprecated Use getAgentGlobalSkillsDir from agent-registry instead
- */ function getGlobalSkillsDir() {
-    const home = getHomeDir();
-    return __WEBPACK_EXTERNAL_MODULE_node_path__.join(home, '.claude', 'skills');
-}
 // ============================================================================
 // Multi-Agent path utilities
 // ============================================================================
@@ -1994,6 +1987,15 @@ ${CURSOR_BRIDGE_MARKER}
     // Registry Management
     // ==========================================================================
     /**
+   * Get all configured registries (custom + default).
+   */ getRegistries() {
+        const config = this.getConfigOrDefault();
+        return {
+            ...DEFAULT_REGISTRIES,
+            ...config.registries
+        };
+    }
+    /**
    * Get registry URL by name
    *
    * Resolution order:
@@ -2835,6 +2837,8 @@ ${CURSOR_BRIDGE_MARKER}
             commit: options.commit,
             installedAt: new Date().toISOString()
         };
+        // Only persist registry URL for registry-sourced skills
+        if (options.registry) lockedSkill.registry = options.registry;
         this.set(name, lockedSkill);
         return lockedSkill;
     }
@@ -2899,6 +2903,23 @@ ${CURSOR_BRIDGE_MARKER}
     // Local development
     'http://localhost:3000': '@kanyun-test'
 };
+/**
+ * Get the scope for a given registry URL
+ *
+ * @param registry - Registry URL
+ * @returns Scope string (e.g., "@kanyun") or null if not found
+ *
+ * @example
+ * getScopeForRegistry('https://rush-test.zhenguanyu.com') // '@kanyun'
+ * getScopeForRegistry('https://unknown.com') // null
+ */ function getScopeForRegistry(registry) {
+    if (!registry) return null;
+    // Try exact match first
+    if (REGISTRY_SCOPE_MAP[registry]) return REGISTRY_SCOPE_MAP[registry];
+    // Try with/without trailing slash
+    const normalized = registry.endsWith('/') ? registry.slice(0, -1) : `${registry}/`;
+    return REGISTRY_SCOPE_MAP[normalized] || null;
+}
 /**
  * Get the registry URL for a given scope (reverse lookup)
  *
@@ -3736,8 +3757,8 @@ class RegistryResolver {
  * Provides complete skill installation, update, and uninstall functionality
  *
  * Installation directories:
- * - Project mode (default): .skills/ or directory configured in skills.json
- * - Global mode (-g): ~/.claude/skills/
+ * - Project mode (default): .agents/skills/ (canonical) or .skills/ (legacy)
+ * - Global mode (-g): ~/.agents/skills/
  */ class SkillManager {
     projectRoot;
     resolver;
@@ -3771,10 +3792,10 @@ class RegistryResolver {
     /**
    * Get legacy installation directory (for backward compatibility)
    *
-   * - Global mode: ~/.claude/skills/
+   * - Global mode: ~/.agents/skills/ (canonical)
    * - Project mode: .skills/ or directory configured in skills.json
    */ getInstallDir() {
-        if (this.isGlobal) return getGlobalSkillsDir();
+        if (this.isGlobal) return this.getCanonicalSkillsDir();
         return this.config.getInstallDir();
     }
     /**
@@ -3990,8 +4011,11 @@ class RegistryResolver {
    */ async installAll(options = {}) {
         const skills = this.config.getSkills();
         const installed = [];
+        const targetAgents = await detectInstalledAgents();
         for (const [name, ref] of Object.entries(skills))try {
-            const skill = await this.install(ref, {
+            // Use installToAgents (not install) to correctly route registry refs
+            // resolveRegistryUrl inside handles lock file / registries probe fallback
+            const { skill } = await this.installToAgents(ref, targetAgents, {
                 ...options,
                 save: false
             });
@@ -4037,6 +4061,7 @@ class RegistryResolver {
    * Update skill
    */ async update(name) {
         const updated = [];
+        const targetAgents = await detectInstalledAgents();
         if (name) {
             // Update single skill
             const ref = this.config.getSkillRef(name);
@@ -4044,9 +4069,10 @@ class RegistryResolver {
                 logger_logger.error(`Skill ${name} not found in skills.json`);
                 return [];
             }
-            // Check if update is needed (skip check for HTTP sources - always re-download)
-            if (this.isHttpSource(ref)) // For HTTP sources, log that we're re-downloading
-            logger_logger.info(`${name} is from HTTP source, re-downloading...`);
+            // Check if update is needed (skip for HTTP and Registry - always re-download/reinstall)
+            const isRegistry = this.isRegistrySource(ref);
+            if (isRegistry) logger_logger.info(`${name} is from registry, re-installing...`);
+            else if (this.isHttpSource(ref)) logger_logger.info(`${name} is from HTTP source, re-downloading...`);
             else {
                 const resolved = await this.resolver.resolve(ref);
                 const remoteCommit = await this.cache.getRemoteCommit(resolved.repoUrl, resolved.ref);
@@ -4055,7 +4081,7 @@ class RegistryResolver {
                     return [];
                 }
             }
-            const skill = await this.install(ref, {
+            const skill = await this.installForUpdate(ref, targetAgents, {
                 force: true,
                 save: false
             });
@@ -4064,8 +4090,9 @@ class RegistryResolver {
             // Update all
             const skills = this.config.getSkills();
             for (const [skillName, ref] of Object.entries(skills))try {
-                // Check if update is needed (skip check for HTTP sources)
-                if (this.isHttpSource(ref)) logger_logger.info(`${skillName} is from HTTP source, re-downloading...`);
+                // Check if update is needed (skip for HTTP and Registry)
+                if (this.isRegistrySource(ref)) logger_logger.info(`${skillName} is from registry, re-installing...`);
+                else if (this.isHttpSource(ref)) logger_logger.info(`${skillName} is from HTTP source, re-downloading...`);
                 else {
                     const resolved = await this.resolver.resolve(ref);
                     const remoteCommit = await this.cache.getRemoteCommit(resolved.repoUrl, resolved.ref);
@@ -4074,7 +4101,7 @@ class RegistryResolver {
                         continue;
                     }
                 }
-                const skill = await this.install(ref, {
+                const skill = await this.installForUpdate(ref, targetAgents, {
                     force: true,
                     save: false
                 });
@@ -4086,6 +4113,70 @@ class RegistryResolver {
         return updated;
     }
     /**
+   * Resolve registry URL for a skill reference.
+   *
+   * Resolution order:
+   * 1. Explicit CLI override (options.registry)
+   * 2. Scoped skills → getRegistryUrl(scope)
+   * 3. Unscoped skills → lock file registry (O(1), no network)
+   * 4. Unscoped skills → probe skills.json registries (non-git-host, network)
+   * 5. Default → PUBLIC_REGISTRY
+   */ async resolveRegistryUrl(ref, explicitRegistry) {
+        if (explicitRegistry) return explicitRegistry;
+        const parsed = parseSkillIdentifier(ref);
+        if (parsed.scope) return getRegistryUrl(parsed.scope);
+        // Fast path: lock file has registry URL
+        const locked = this.lockManager.get(parsed.name);
+        if (locked?.registry) return locked.registry;
+        // Slow path: probe configured registries (skip git hosts)
+        const registries = this.config.getRegistries();
+        for (const [name, url] of Object.entries(registries))if (!this.isGitHostRegistry(name, url)) try {
+            const client = new RegistryClient({
+                registry: url
+            });
+            await client.getSkillInfo(parsed.fullName);
+            return url; // Found it
+        } catch  {}
+        return getRegistryUrl(null); // PUBLIC_REGISTRY
+    }
+    /**
+   * Check if a registry entry is a git host (github, gitlab, etc.)
+   * Git hosts are not skill registries and should be skipped during probe.
+   */ isGitHostRegistry(name, url) {
+        const gitHostNames = new Set(Object.keys(DEFAULT_REGISTRIES));
+        if (gitHostNames.has(name)) return true;
+        const gitHostPatterns = [
+            'github.com',
+            'gitlab.com'
+        ];
+        const normalizedUrl = url.toLowerCase();
+        return gitHostPatterns.some((pattern)=>normalizedUrl.includes(pattern));
+    }
+    /**
+   * Derive a registry name from a URL for storing in skills.json.registries.
+   * Returns null for git hosts (already in DEFAULT_REGISTRIES).
+   */ deriveRegistryName(registryUrl) {
+        // Skip git hosts
+        if (this.isGitHostRegistry('', registryUrl)) return null;
+        // Try known scope mapping first (e.g., kanyun registries)
+        const scope = getScopeForRegistry(registryUrl);
+        if (scope) return scope;
+        // Use hostname as registry name
+        try {
+            const url = new URL(registryUrl);
+            return url.hostname;
+        } catch  {
+            return null;
+        }
+    }
+    /**
+   * Install skill for update flow. Uses installToAgents so registry refs are
+   * routed correctly (Registry > HTTP > Git).
+   */ async installForUpdate(ref, targetAgents, options) {
+        const { skill } = await this.installToAgents(ref, targetAgents, options);
+        return skill;
+    }
+    /**
    * List installed skills
    *
    * Checks both canonical (.agents/skills/) and legacy (.skills/) locations.
@@ -4126,6 +4217,24 @@ class RegistryResolver {
         return skills;
     }
     /**
+   * Detect which agents have a skill installed (symlink or copy)
+   *
+   * Scans all known agent directories to check if the skill exists there.
+   * Excludes the canonical directory (.agents/skills/) to avoid false positives
+   * from agents whose skillsDir overlaps with the canonical path (e.g. amp).
+   */ detectSkillAgents(skillName) {
+        const canonicalDir = this.getCanonicalSkillsDir();
+        const installed = [];
+        for (const [type, config] of Object.entries(agents)){
+            const agentBase = this.isGlobal ? config.globalSkillsDir : __WEBPACK_EXTERNAL_MODULE_node_path__.join(this.projectRoot, config.skillsDir);
+            // Skip agents whose skillsDir is the canonical directory itself
+            if (__WEBPACK_EXTERNAL_MODULE_node_path__.resolve(agentBase) === __WEBPACK_EXTERNAL_MODULE_node_path__.resolve(canonicalDir)) continue;
+            const agentSkillDir = __WEBPACK_EXTERNAL_MODULE_node_path__.join(agentBase, skillName);
+            if (exists(agentSkillDir)) installed.push(type);
+        }
+        return installed;
+    }
+    /**
    * Get installed skill information from a specific path
    */ getInstalledSkillFromPath(name, skillPath) {
         if (!exists(skillPath)) return null;
@@ -4140,7 +4249,8 @@ class RegistryResolver {
             path: skillPath,
             version,
             source: isLinked ? getRealPath(skillPath) : locked?.source || '',
-            isLinked
+            isLinked,
+            agents: this.detectSkillAgents(name)
         };
     }
     /**
@@ -4333,7 +4443,7 @@ class RegistryResolver {
     /**
    * Install skill from Git to multiple agents
    */ async installToAgentsFromGit(ref, targetAgents, options = {}) {
-        const { save = true, mode = 'symlink' } = options;
+        const { save = true, mode = 'symlink', registryContext } = options;
         // Parse reference
         const resolved = await this.resolver.resolve(ref);
         const { parsed, repoUrl } = resolved;
@@ -4351,7 +4461,8 @@ class RegistryResolver {
         const sourcePath = this.resolveSourcePath(cachePath, parsed);
         // Get the real skill name from SKILL.md in cache
         const metadata = this.getSkillMetadataFromDir(sourcePath);
-        const skillName = metadata?.name ?? fallbackName;
+        // Priority: registryContext name > SKILL.md name > fallback from Git URL
+        const skillName = registryContext?.skillName ?? metadata?.name ?? fallbackName;
         const semanticVersion = metadata?.version ?? gitRef;
         logger_logger["package"](`Installing ${skillName}@${gitRef} to ${targetAgents.length} agent(s)...`);
         // Create Installer with custom installDir from config
@@ -4366,19 +4477,22 @@ class RegistryResolver {
             mode: mode
         });
         // Update lock file (project mode only)
-        if (!this.isGlobal) this.lockManager.lockSkill(skillName, {
-            source: `${parsed.registry}:${parsed.owner}/${parsed.repo}${parsed.subPath ? `/${parsed.subPath}` : ''}`,
-            version: semanticVersion,
-            ref: gitRef,
-            resolved: repoUrl,
-            commit: cacheResult.commit
-        });
+        if (!this.isGlobal) {
+            const lockSource = registryContext?.lockSource ?? `${parsed.registry}:${parsed.owner}/${parsed.repo}${parsed.subPath ? `/${parsed.subPath}` : ''}`;
+            this.lockManager.lockSkill(skillName, {
+                source: lockSource,
+                version: semanticVersion,
+                ref: gitRef,
+                resolved: repoUrl,
+                commit: cacheResult.commit,
+                registry: registryContext?.registryUrl
+            });
+        }
         // Update skills.json (project mode only)
         if (!this.isGlobal && save) {
             this.config.ensureExists();
-            // Normalize the reference to use registry shorthand if possible
-            const normalizedRef = this.config.normalizeSkillRef(ref);
-            this.config.addSkill(skillName, normalizedRef);
+            const configRef = registryContext?.configRef ?? this.config.normalizeSkillRef(ref);
+            this.config.addSkill(skillName, configRef);
         }
         // Count results
         const successCount = Array.from(results.values()).filter((r)=>r.success).length;
@@ -4401,7 +4515,7 @@ class RegistryResolver {
     /**
    * Install skill from HTTP/OSS to multiple agents
    */ async installToAgentsFromHttp(ref, targetAgents, options = {}) {
-        const { save = true, mode = 'symlink' } = options;
+        const { save = true, mode = 'symlink', registryContext } = options;
         // Parse HTTP reference
         const resolved = await this.httpResolver.resolve(ref);
         const { parsed, repoUrl, httpInfo } = resolved;
@@ -4418,7 +4532,8 @@ class RegistryResolver {
         const sourcePath = this.cache.getCachePath(parsed, version);
         // Get the real skill name from SKILL.md in cache
         const metadata = this.getSkillMetadataFromDir(sourcePath);
-        const skillName = metadata?.name ?? fallbackName;
+        // Priority: registryContext name > SKILL.md name > fallback from URL
+        const skillName = registryContext?.skillName ?? metadata?.name ?? fallbackName;
         const semanticVersion = metadata?.version ?? version;
         logger_logger["package"](`Installing ${skillName}@${version} from ${httpInfo.host} to ${targetAgents.length} agent(s)...`);
         // Create Installer with custom installDir from config
@@ -4433,17 +4548,22 @@ class RegistryResolver {
             mode: mode
         });
         // Update lock file (project mode only)
-        if (!this.isGlobal) this.lockManager.lockSkill(skillName, {
-            source: `http:${httpInfo.host}/${skillName}`,
-            version: semanticVersion,
-            ref: version,
-            resolved: repoUrl,
-            commit: cacheResult.commit
-        });
+        if (!this.isGlobal) {
+            const lockSource = registryContext?.lockSource ?? `http:${httpInfo.host}/${skillName}`;
+            this.lockManager.lockSkill(skillName, {
+                source: lockSource,
+                version: semanticVersion,
+                ref: version,
+                resolved: repoUrl,
+                commit: cacheResult.commit,
+                registry: registryContext?.registryUrl
+            });
+        }
         // Update skills.json (project mode only)
         if (!this.isGlobal && save) {
             this.config.ensureExists();
-            this.config.addSkill(skillName, ref);
+            const configRef = registryContext?.configRef ?? ref;
+            this.config.addSkill(skillName, configRef);
         }
         // Count results
         const successCount = Array.from(results.values()).filter((r)=>r.success).length;
@@ -4474,7 +4594,7 @@ class RegistryResolver {
         const { force = false, save = true, mode = 'symlink' } = options;
         // Parse skill identifier and resolve registry URL once (single source of truth)
         const parsed = parseSkillIdentifier(ref);
-        const registryUrl = options.registry || getRegistryUrl(parsed.scope);
+        const registryUrl = await this.resolveRegistryUrl(ref, options.registry);
         const client = new RegistryClient({
             registry: registryUrl
         });
@@ -4561,13 +4681,22 @@ class RegistryResolver {
                 version,
                 ref: version,
                 resolved: resolvedRegistryUrl,
-                commit: resolved.integrity
+                commit: resolved.integrity,
+                registry: resolvedRegistryUrl
             });
             // 8. Update skills.json (project mode only)
             if (!this.isGlobal && save) {
                 this.config.ensureExists();
                 // Save with full name for registry skills
                 this.config.addSkill(shortName, ref);
+                // Save custom registry to skills.json.registries (for reinstall without lock file)
+                if (options.registry) {
+                    const registryName = this.deriveRegistryName(options.registry);
+                    if (registryName) {
+                        this.config.addRegistry(registryName, options.registry);
+                        this.config.save();
+                    }
+                }
             }
             // 9. Count results and log
             const successCount = Array.from(results.values()).filter((r)=>r.success).length;
@@ -4607,16 +4736,41 @@ class RegistryResolver {
         if (parsed.version && 'latest' !== parsed.version) throw new Error(`Version specifier not supported for web-published skills.\n'${parsed.fullName}' was published via web and does not support versioning.\nUse: reskill install ${parsed.fullName}`);
         if (!source_url) throw new Error(`Missing source_url for web-published skill: ${parsed.fullName}`);
         logger_logger["package"](`Installing ${parsed.fullName} from ${source_type} source...`);
+        // Build registry context so downstream methods use the registry name
+        // instead of deriving from the source URL (e.g., Git repo name)
+        const shortName = getShortName(parsed.fullName);
+        const registryUrl = await this.resolveRegistryUrl(parsed.fullName, options.registry);
+        const registryContext = {
+            skillName: shortName,
+            configRef: parsed.fullName,
+            lockSource: `registry:${parsed.fullName}`,
+            registryUrl
+        };
+        const optionsWithContext = {
+            ...options,
+            registryContext
+        };
+        // Save custom registry to skills.json.registries (for reinstall without lock file)
+        if (!this.isGlobal && options.registry) {
+            const registryName = this.deriveRegistryName(options.registry);
+            if (registryName) {
+                this.config.ensureExists();
+                this.config.load();
+                this.config.addRegistry(registryName, options.registry);
+                this.config.save();
+            }
+        }
         switch(source_type){
             case 'github':
             case 'gitlab':
-                // source_url is a full Git URL (includes ref and path)
-                // Reuse existing Git installation logic
-                return this.installToAgentsFromGit(source_url, targetAgents, options);
+                {
+                    const gitRef = this.buildGitRefForWebPublished(source_type, source_url, skillInfo.skill_path, parsed);
+                    return this.installToAgentsFromGit(gitRef, targetAgents, optionsWithContext);
+                }
             case 'oss_url':
             case 'custom_url':
                 // Direct download URL
-                return this.installToAgentsFromHttp(source_url, targetAgents, options);
+                return this.installToAgentsFromHttp(source_url, targetAgents, optionsWithContext);
             case 'local':
                 // Download tarball via Registry API
                 return this.installFromRegistryLocal(parsed, targetAgents, options);
@@ -4625,13 +4779,36 @@ class RegistryResolver {
         }
     }
     /**
+   * Build a Git ref for web-published github/gitlab skills.
+   *
+   * When `skillPath` is provided (multi-skill repo), constructs a shorthand ref
+   * like `github:owner/repo/skills/my-skill` so that only the sub-directory is
+   * cached and installed.
+   *
+   * Fallback: if `parseGitUrl` fails (non-standard URL), appends `#shortName`
+   * as a skill-name selector. The `#` fragment is extracted by
+   * `GitResolver.parseRef()` as `parsed.skillName`, then matched against
+   * SKILL.md `name` fields via `resolveSourcePath` / `discoverSkillsInDir`.
+   * This differs from the subPath approach (directory-based) but works because
+   * skill names typically match their directory basenames.
+   *
+   * Returns the raw `sourceUrl` when no `skillPath` is available.
+   */ buildGitRefForWebPublished(sourceType, sourceUrl, skillPath, parsed) {
+        if (!skillPath) return sourceUrl;
+        const urlParsed = parseGitUrl(sourceUrl);
+        if (urlParsed) return `${sourceType}:${urlParsed.owner}/${urlParsed.repo}/${skillPath}`;
+        const shortName = getShortName(parsed.fullName);
+        if (shortName) return `${sourceUrl}#${shortName}`;
+        return sourceUrl;
+    }
+    /**
    * Install a skill published via "local folder" mode.
    *
    * Downloads tarball via RegistryClient (handles 302 redirects to signed OSS URLs),
    * then extracts and installs using the same flow as registry source_type.
    */ async installFromRegistryLocal(parsed, targetAgents, options = {}) {
         const { save = true, mode = 'symlink' } = options;
-        const registryUrl = options.registry || getRegistryUrl(parsed.scope);
+        const registryUrl = await this.resolveRegistryUrl(parsed.fullName, options.registry);
         const shortName = getShortName(parsed.fullName);
         const version = 'latest';
         // Download tarball via RegistryClient (handles auth + 302 redirect to signed URL)
@@ -4667,12 +4844,21 @@ class RegistryResolver {
                 version: semanticVersion,
                 ref: version,
                 resolved: registryUrl,
-                commit: ''
+                commit: '',
+                registry: registryUrl
             });
             // Update skills.json (project mode only)
             if (!this.isGlobal && save) {
                 this.config.ensureExists();
                 this.config.addSkill(skillName, parsed.fullName);
+                // Save custom registry to skills.json.registries (for reinstall without lock file)
+                if (options.registry) {
+                    const registryName = this.deriveRegistryName(options.registry);
+                    if (registryName) {
+                        this.config.addRegistry(registryName, options.registry);
+                        this.config.save();
+                    }
+                }
             }
             return {
                 skill: {