ask-skills 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c089659a27fb3e462fcf4646f9f5492854f353520f11fe999a7cf48fa11fe39
-  data.tar.gz: 534b8f2e8a85d4ebcd603da0811c3b950e17d6f2ffceca7672c3988cb4a56e87
+  metadata.gz: c738f9a0a38e5b4cd6b21fb83d2870a099a740fd2b13dfed9c80cd07b7750e96
+  data.tar.gz: 4d7572316e077d1ca5d81b71c9cb6159e18411e0e730ee83491c6e7e3aea5569
 SHA512:
-  metadata.gz: 1859bd5cd03315a118305b1446e0d562c9a4e3611894e07462e76f67ba2cede6e92f9ad09599e72cf955163a4d7b5413f6fafbc6c17c07df83d549ee397d57bb
-  data.tar.gz: 5cbe3c7442cebebdc12410df4836ec99d7beb9379c31dcfc79790fd2914fb25a6bac19a556a00512fcdc1fe92875e92287213d911446457a8179825d1cb9a8d4
+  metadata.gz: 0be67d737827e139c109af737800bab4d76fca2488162a9327bbb04c304f0d76c6f6cc891b8f57752af0ce778c623db65e55aa9e3466a82fd830d73d103095fa
+  data.tar.gz: d2624c7c105319a4eaa9df7364f3fec95bd68440ada85960da0c3983bc99cee36a7f2029cc92b0744b7fea49cf2501a23e5237095a9c4150ea4cbca3af32e6de

data/lib/ask/skills/registry.rb

@@ -36,15 +36,68 @@ module Ask
           source.load.each do |skill|
             next unless skill
             if @skills.key?(skill.name)
-              # First-wins collision: log diagnostic but keep first
+              existing = @skills[skill.name]
+              if skill_equivalent?(existing, skill)
+                # Exact duplicate (e.g. local + installed gem copy) — skip silently
+                next
+              end
+              # Same gem identity (e.g. local sibling gem vs installed gem of
+              # the same name) — expected duplicate source, not a collision.
+              next if same_gem?(existing, skill)
+
               warn "[ask-skills] Collision: skill '#{skill.name}' already loaded from " \
-                   "#{@skills[skill.name].source}, skipping #{skill.source}"
+                   "#{existing.source}, skipping #{skill.source}"
             else
               @skills[skill.name] = skill
             end
           end
         end
       end
+
+      # Two skills are equivalent when they share the same description and
+      # instructions (the two fields that matter for prompt entry and loading).
+      # Different sources (local vs gem) for the exact same content are
+      # silently deduplicated.
+      def skill_equivalent?(a, b)
+        a.description == b.description && a.instructions == b.instructions
+      end
+
+      # Two skills belong to the same gem when their source paths share a
+      # common ask-* gem directory (e.g. local sibling gem vs installed gem
+      # of the same name).  Returns +nil+ when no gem name can be extracted.
+      def same_gem?(a, b)
+        a_name = extract_gem_name(a.source)
+        b_name = extract_gem_name(b.source)
+        return false if a_name.nil? || b_name.nil?
+
+        a_name == b_name
+      end
+
+      # Extract the gem directory name from a source path.  Checks the
+      # immediate parent directory first, then walks up ancestors only if
+      # the parent is not an ask-* directory.  This prevents false matches
+      # when an ask-* directory is nested inside another ask-* directory
+      # (e.g. +ask-x/ask-y/SKILL.md+ → +ask-y+, not +ask-x+).
+      # Strips version suffixes (e.g. +ask-skills-0.5.1+ → +ask-skills+).
+      def extract_gem_name(path)
+        return nil unless path
+        dir = File.dirname(path)
+        # Check immediate parent first — the most specific ask-* ancestor
+        parent = File.basename(dir)
+        if parent.match?(/\Aask-\w/)
+          return parent.sub(/-[\d.]+$/, "")
+        end
+        # Walk up ancestors until we find an ask-* directory
+        parent = File.dirname(dir)
+        while parent != File.dirname(parent)
+          component = File.basename(parent)
+          if component.match?(/\Aask-\w/)
+            return component.sub(/-[\d.]+$/, "")
+          end
+          parent = File.dirname(parent)
+        end
+        nil
+      end
     end
   end
 end

data/lib/ask/skills/sources/filesystem.rb

@@ -93,7 +93,7 @@ module Ask
           current_value = nil
 
           yaml_str.split("\n").each do |line|
-            if (m = line.match(/\A(\w[\w_]*):\s*(.*)\z/))
+            if (m = line.match(/\A(\w*):\s*(.*)\z/))
               # Store previous key if any
               if current_key
                 yaml[current_key] = process_value(current_value.strip)

data/lib/ask/skills/version.rb

@@ -1,5 +1,5 @@
 module Ask
   module Skills
-    VERSION = "0.5.3"
+    VERSION = "0.5.4"
   end
 end

data/lib/ask/skills.rb

@@ -68,7 +68,7 @@ module Ask
         current_value = nil
 
         yaml_str.split("\n").each do |line|
-          if (m = line.match(/\A(\w[\w_]*):\s*(.*)\z/))
+          if (m = line.match(/\A(\w*):\s*(.*)\z/))
             if current_key
               yaml[current_key] = process_metadata_value(current_value.strip)
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-skills
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Kaka Ruto