ruby_llm-skills 0.3.0 → 0.4.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '048ac6f6a76a7fd48994d208799b967754b25ecc3959acd56d44f5ab707f9f8d'
-  data.tar.gz: 268827da6d73359d9451b159b1abe68dea7881419df6b473cceeb2d8c74bc073
+  metadata.gz: ebbccd1655baa8f141a020e2a32fdad03f8c6ddc7cd8929cb6b35cee8e4fc488
+  data.tar.gz: b1d175a5fc1ec6c7603318a42fdb34d44f25680da95fa21a2b3f042621644641
 SHA512:
-  metadata.gz: febe501ab666f7e1cdf06e043ab44305ea065ffe561508b6fdcb9a959a90eabad8d2cb9fcc90384536eaf0871f73f2e52c3c9e93b8d883fbe8823274f547f0f3
-  data.tar.gz: 73226c3f1eb42ba6073dbfdcccb9f334896e078ca04ab1814260feb4218d432a83cf92817a32bb6c1abe847cf7fcd0098259aa2bab5886ce933d2c258d4ae8f1
+  metadata.gz: 1b39b6966015406944f68897ed6170bce39cbd6f36ad6d363e650a1dbfc160a99a532e728b1e599d3b5243a4323db6c24220e79c20f796efa3c714a45126140d
+  data.tar.gz: eb71f38a6faa4c75faf675f9c6ce7ac7ae835db82a1a58c1d1c5c2b5ec5511426fc7c5e770ec91e1ad1019e8868c81a49ef65ae254e8cf4256e66f0348c87d41

data/CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.0.pre1] - 2026-09-10
+
+### Changed
+
+- **Breaking:** requires RubyLLM 2.0 (`ruby_llm >= 2.0.0.rc2, < 3`); 1.x users should stay on 0.3.x
+- `SkillTool` declares parameters with the 2.0 `parameter`/`description:` DSL, exposes `parameters_schema`, and sets its name through `tool_name`
+- `Chat#with_skills` registers the skill tool via `Chat#with_tools` (2.0 removed `Chat#with_tool`)
+- `AgentExtensions` hooks the 2.0 `Agent.apply_configuration(chat, input_values:, persist_instructions:)` signature and applies skills to the chat or `acts_as_chat` record it receives
+- Integration tests pin `openai_protocol = :chat_completions` and match VCR cassettes on method and URI so the recorded 1.x interactions replay under 2.0
+
+### Removed
+
+- Global `Module#delegate` fallback and its compatibility test (2.0's `Agent` uses `Forwardable`)
+- Dependency on the removed `Agent.llm_chat_for` hook
+
+### Fixed
+
+- StandardRB `Layout/EmptyLinesAroundModuleBody` offense in `chat_extensions.rb` that failed CI
+
 ## [0.3.0] - 2026-02-17
 
 ### Added

data/README.md

@@ -9,9 +9,12 @@ Agent Skills for [RubyLLM](https://github.com/crmne/ruby_llm). Teach your AI how
 ## Installation
 
 ```ruby
-gem "ruby_llm-skills"
+gem "ruby_llm", "2.0.0.rc2"
+gem "ruby_llm-skills", "0.4.0.pre1"
 ```
 
+Requires RubyLLM 2.0 (`>= 2.0.0.rc2`). If you are still on RubyLLM 1.x, stay on `ruby_llm-skills ~> 0.3.0` and follow the [RubyLLM 2.0 upgrade guide](https://rubyllm.com/next/upgrading/) before upgrading both gems together.
+
 ## Quick Start
 
 ```ruby
@@ -31,7 +34,7 @@ chat.with_skills("app/skills", "app/commands") # multiple paths
 chat.with_skills("app/skills", user.skills)   # with database records
 ```
 
-### With RubyLLM::Agent (v1.12+)
+### With RubyLLM::Agent
 
 ```ruby
 class SupportAgent < RubyLLM::Agent
@@ -127,7 +130,7 @@ bin/setup
 ### Running Tests
 
 ```bash
-bundle exec rake test        # Unit tests (151 tests)
+bundle exec rake test        # Unit tests (177 tests)
 bundle exec rake test_rails  # Rails integration tests (25+ tests)
 bundle exec rake test_all    # Both
 bundle exec rake             # Tests + linting

data/lib/ruby_llm/skills/agent_extensions.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "source_detection"
+
 module RubyLLM
   module Skills
     # Extensions for RubyLLM::Agent to enable declarative skill configuration.
@@ -16,9 +18,11 @@ module RubyLLM
     #   end
     #
     module AgentExtensions
-      REQUIRED_AGENT_SINGLETON_METHODS = %i[apply_configuration runtime_context llm_chat_for].freeze
+      REQUIRED_AGENT_SINGLETON_METHODS = %i[apply_configuration runtime_context].freeze
 
       module ClassMethods
+        include SourceDetection
+
         def self.extended(base)
           base.instance_variable_set(:@skill_sources, nil)
           base.instance_variable_set(:@skill_only, nil)
@@ -60,19 +64,11 @@ module RubyLLM
           return [] if source.nil?
           return [source] if source.is_a?(String)
           return [source] if loader_source?(source)
-          return [source] if database_collection_source?(source)
+          return source.empty? ? [] : [source] if database_collection_source?(source)
           return source.flat_map { |item| flatten_skill_sources(item) } if source.is_a?(Array)
 
           [source]
         end
-
-        def loader_source?(source)
-          source.respond_to?(:list) && source.respond_to?(:find)
-        end
-
-        def database_collection_source?(source)
-          source.respond_to?(:to_a) && source.first&.respond_to?(:name) && source.first.respond_to?(:content)
-        end
       end
 
       module InstanceMethods
@@ -88,16 +84,21 @@ module RubyLLM
       end
 
       module ConfigurationPatch
-        private
-
-        def apply_configuration(chat_object, **kwargs)
+        # RubyLLM 2.0 passes either a RubyLLM::Chat or an acts_as_chat record.
+        # Both respond to #with_skills (ChatExtensions / ActiveRecordExtensions),
+        # so skills apply directly to whatever the agent configured.
+        #
+        # apply_configuration is a :nodoc: hook; **options forwards any keyword a
+        # later 2.x release adds so the patch fails at super, not before it.
+        def apply_configuration(chat, input_values: {}, **options)
           super
-          input_values = kwargs[:input_values] || {}
-          runtime = runtime_context(chat: chat_object, inputs: input_values)
-          apply_skills(llm_chat_for(chat_object), runtime)
+          runtime = runtime_context(chat: chat, inputs: input_values)
+          apply_skills(chat, runtime)
         end
 
-        def apply_skills(llm_chat, runtime)
+        private
+
+        def apply_skills(chat, runtime)
           config = skills
           sources = config[:sources]
           return if sources.nil?
@@ -112,7 +113,7 @@ module RubyLLM
           return if normalized_sources.empty?
 
           validate_skill_sources!(normalized_sources)
-          llm_chat.with_skills(*normalized_sources, only: config[:only])
+          chat.with_skills(*normalized_sources, only: config[:only])
         end
 
         def validate_skill_sources!(sources)

data/lib/ruby_llm/skills/chat_extensions.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "source_detection"
 require_relative "skill_tool"
 
 module RubyLLM
@@ -19,6 +20,8 @@ module RubyLLM
     #   chat.with_skills(only: [:pdf_report])
     #
     module ChatExtensions
+      include SourceDetection
+
       # Add skills to this chat.
       #
       # @param sources [Array] skill sources - auto-detects type (directory, zip, collection)
@@ -32,7 +35,7 @@ module RubyLLM
         loader = FilteredLoader.new(loader, only) if only
 
         skill_tool = RubyLLM::Skills::SkillTool.new(loader)
-        with_tool(skill_tool)
+        with_tools(skill_tool)
       end
 
       private
@@ -50,14 +53,6 @@ module RubyLLM
             "Invalid skill source: #{source.class}. Expected String path, Loader, or record collection."
         end
       end
-
-      def loader_source?(source)
-        source.respond_to?(:list) && source.respond_to?(:find)
-      end
-
-      def database_collection_source?(source)
-        source.respond_to?(:to_a) && source.first&.respond_to?(:name) && source.first.respond_to?(:content)
-      end
     end
 
     # Simple wrapper that filters skills by name.

data/lib/ruby_llm/skills/skill_tool.rb

@@ -27,15 +27,22 @@ module RubyLLM
     #
     class SkillTool < RubyLLM::Tool
       description "Execute a skill within the main conversation."
-      param :command, type: "string",
-        desc: "The skill name (e.g., 'pdf' or 'write-poem')"
-      param :arguments, type: "string", required: false,
-        desc: "Arguments passed after the command (e.g., '/write-poem about robots' passes 'about robots')"
-      param :resource, type: "string", required: false,
-        desc: "Optional resource path to load (e.g., 'scripts/helper.rb', 'references/guide.md')"
+      parameter :command, type: "string",
+        description: "The skill name (e.g., 'pdf' or 'write-poem')"
+      parameter :arguments, type: "string", required: false,
+        description: "Arguments passed after the command (e.g., '/write-poem about robots' passes 'about robots')"
+      parameter :resource, type: "string", required: false,
+        description: "Optional resource path to load (e.g., 'scripts/helper.rb', 'references/guide.md')"
 
       attr_reader :loader
 
+      # Tool name for RubyLLM.
+      #
+      # @return [String] "skill"
+      def self.tool_name
+        "skill"
+      end
+
       # Initialize with a skill loader.
       #
       # @param loader [Loader] any loader (FilesystemLoader, ZipLoader, etc.)
@@ -43,13 +50,6 @@ module RubyLLM
         @loader = loader
       end
 
-      # Tool name for RubyLLM.
-      #
-      # @return [String] "skill"
-      def name
-        "skill"
-      end
-
       # Dynamic description including available skills.
       #
       # @return [String] tool description with embedded skill metadata
@@ -98,7 +98,7 @@ module RubyLLM
         {
           name: name,
           description: description,
-          parameters: params_schema
+          parameters: parameters_schema
         }
       end
 

data/lib/ruby_llm/skills/source_detection.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module Skills
+    # Shared duck-typing predicates for classifying skill sources.
+    # Used by both AgentExtensions and ChatExtensions.
+    module SourceDetection
+      private
+
+      def loader_source?(source)
+        source.respond_to?(:list) && source.respond_to?(:find)
+      end
+
+      def database_collection_source?(source)
+        return false unless source.respond_to?(:to_a)
+
+        # ActiveRecord relations/CollectionProxy: recognizable even when empty
+        return true if source.respond_to?(:klass) && source.respond_to?(:where_values_hash)
+
+        first = source.first
+        first&.respond_to?(:name) && first.respond_to?(:content)
+      end
+    end
+  end
+end

data/lib/ruby_llm/skills/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLLM
   module Skills
-    VERSION = "0.3.0"
+    VERSION = "0.4.0.pre1"
   end
 end

data/lib/ruby_llm/skills.rb

@@ -1,50 +1,5 @@
 # frozen_string_literal: true
 
-# RubyLLM 1.12.0 Agent uses `delegate` but doesn't require ActiveSupport.
-# Provide a minimal fallback for plain Ruby environments.
-unless Module.method_defined?(:delegate)
-  class Module
-    def delegate(*methods, to:, prefix: nil, allow_nil: false, private: false, **_options)
-      target_method = to.to_sym
-
-      methods.each do |method_name|
-        delegated_method = delegated_method_name(method_name, target_method, prefix)
-
-        define_method(delegated_method) do |*args, **kwargs, &block|
-          target = public_send(target_method)
-          if target.nil?
-            return nil if allow_nil
-
-            raise NoMethodError,
-              "#{self.class}##{delegated_method} delegated to ##{target_method}, but ##{target_method} is nil"
-          end
-
-          if kwargs.empty?
-            target.public_send(method_name, *args, &block)
-          else
-            target.public_send(method_name, *args, **kwargs, &block)
-          end
-        end
-
-        private delegated_method if binding.local_variable_get(:private)
-      end
-    end
-
-    private
-
-    def delegated_method_name(method_name, target_method, prefix)
-      case prefix
-      when true
-        :"#{target_method}_#{method_name}"
-      when String, Symbol
-        :"#{prefix}_#{method_name}"
-      else
-        method_name
-      end
-    end
-  end
-end
-
 require "ruby_llm"
 
 require_relative "skills/version"

metadata

@@ -1,28 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm-skills
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0.pre1
 platform: ruby
 authors:
 - Kieran Klaassen
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-17 00:00:00.000000000 Z
+date: 2026-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_llm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.0.0.rc2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '3'
 description: Load, validate, and integrate Agent Skills with RubyLLM. Supports the
   open Agent Skills specification for progressive skill discovery and loading from
   filesystem, zip archives, and databases.
@@ -50,6 +57,7 @@ files:
 - lib/ruby_llm/skills/railtie.rb
 - lib/ruby_llm/skills/skill.rb
 - lib/ruby_llm/skills/skill_tool.rb
+- lib/ruby_llm/skills/source_detection.rb
 - lib/ruby_llm/skills/tasks/skills.rake
 - lib/ruby_llm/skills/validator.rb
 - lib/ruby_llm/skills/version.rb
@@ -61,6 +69,7 @@ metadata:
   source_code_uri: https://github.com/kieranklaassen/ruby_llm-skills
   changelog_uri: https://github.com/kieranklaassen/ruby_llm-skills/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -71,11 +80,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Agent Skills extension for RubyLLM
 test_files: []