ask-tools 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aff9f4752095dc3224f21ed08a1bc6768ff211af1f48dcfc51bb1b7c41cab0e3
-  data.tar.gz: acccd4fc9f40e57520e51c55cb71faf302dfd05fa4c7ca4159ffacf4da8b8d19
+  metadata.gz: b7722a402e1411950d63a055707c676b7c68af27550284f56a7d3cb5b316af78
+  data.tar.gz: 19012fdeba501720ae891cc7b62b1a797482170a3ccbfef5cee59218d8446c59
 SHA512:
-  metadata.gz: 5f37ccab34db3b16d504eb980830dae8ae1acb27c9de568fd3654a4da8604efcf5e27d6b917f280a74c4e6d3815862d54ebcd4bb6e9d2395ecbde0c3aa5730f3
-  data.tar.gz: ca97d4e8122b3d3ae161318f23780b0539c64d450d746a05e88fe56ab32a791ed3d161568ad8288d3d8ef4913a0b7e3bc7812e9c90ab68bb87df1630634bd20c
+  metadata.gz: 18cc40a7fe9902a71b658aa857693f1734d25456dc1c03d38334596e1b840e80b605f0401a3237a7009423903c890a577a2829c12a59dfea2debc22d832823b4
+  data.tar.gz: 5a9c6578a61fed0c87210332be3efe8d3d98a1fa2a16bfa0546bba6a0de8b713c1ab5eacdb6bedc8883451a9f911ca6eee0a12733cdb37af90f21cbfe2060a20

data/lib/ask/tools/tool.rb

@@ -99,8 +99,32 @@ module Ask
         @params_schema_definition = schema || block
       end
 
+      # The tool's declared parameters — or, when none are declared,
+      # inferred from the execute signature so a tool is never silently
+      # uncallable: a tool whose execute takes keyword arguments but
+      # declares no params would otherwise reject every call ("unknown
+      # parameters"). Inference is a fallback, never an override: an
+      # explicit `params`/`param` declaration wins.
       def parameters
         @parameters ||= {}
+        if @parameters.empty? && @params_schema_definition.nil? && !@parameters_inferred
+          infer_parameters_from_execute
+        end
+        @parameters
+      end
+
+      # Derive parameters from `def execute(project_id:, title:, ...)`:
+      # required keywords become required string parameters. Ruby types
+      # aren't introspectable, so everything infers as string (JSON
+      # numbers coerce); tools that need real types declare `params`.
+      def infer_parameters_from_execute
+        @parameters_inferred = true
+        instance_method(:execute).parameters.each do |kind, name|
+          next unless %i[keyreq key opt].include?(kind)
+          next if name.nil? || name == :_abort_controller
+
+          @parameters[name] = Parameter.new(name: name, type: "string", required: kind == :keyreq)
+        end
       end
 
       def provider_params
@@ -111,7 +135,7 @@ module Ask
         @params_schema ||= begin
           if @params_schema_definition
             deep_stringify_keys(resolve_params_schema(@params_schema_definition))
-          elsif @parameters && @parameters.any?
+          elsif parameters.any?
             build_schema_from_params
           else
             nil
@@ -245,8 +269,42 @@ module Ask
       "#<#{self.class.name} name=#{name.inspect}>"
     end
 
+    # Validate normalized (symbol-keyed) arguments. Returns nil when
+    # valid, or an actionable message — one that names what was expected
+    # — so the model (or a repair pass) can correct the call instead of
+    # guessing. Public: ask-agent's tool-call repair validates through
+    # this. Tools with a declared `params` block validate against the
+    # resolved schema (required keys + unknown keys when strict).
+    def validate(normalized)
+      return validate_against_schema(normalized) if params_schema_definition
+
+      expected = self.class.parameters.keys
+      missing = expected.select { |name| self.class.parameters[name].required && !normalized.key?(name) }
+      return "missing required parameters: #{missing.map(&:inspect).join(', ')} — expected: #{expected.map(&:inspect).join(', ')}" unless missing.empty?
+
+      unknown = normalized.keys - expected
+      return "unknown parameters: #{unknown.map(&:inspect).join(', ')} — expected: #{expected.map(&:inspect).join(', ')}" unless unknown.empty?
+
+      nil
+    end
+
     private
 
+    def validate_against_schema(normalized)
+      schema = params_schema || {}
+      expected = Array(schema["required"])
+      missing = expected - normalized.keys.map(&:to_s)
+      return "missing required parameters: #{missing.map(&:inspect).join(', ')} — expected: #{expected.map(&:inspect).join(', ')}" unless missing.empty?
+
+      properties = schema["properties"] || {}
+      if schema["additionalProperties"] == false
+        unknown = normalized.keys.map(&:to_s) - properties.keys
+        return "unknown parameters: #{unknown.map(&:inspect).join(', ')} — expected: #{properties.keys.map(&:inspect).join(', ')}" unless unknown.empty?
+      end
+
+      nil
+    end
+
     def params_schema_definition
       self.class.instance_variable_get(:@params_schema_definition)
     end
@@ -294,15 +352,6 @@ module Ask
       args.respond_to?(:transform_keys) ? args.transform_keys(&:to_sym) : {}
     end
 
-    def validate(normalized)
-      return nil if params_schema_definition
-      missing = self.class.parameters.select { |_, p| p.required && !normalized.key?(p.name) }
-      return "missing required parameters: #{missing.keys.map(&:inspect).join(', ')}" unless missing.empty?
-      unknown = normalized.keys - self.class.parameters.keys
-      return "unknown parameters: #{unknown.map(&:inspect).join(', ')}" unless unknown.empty?
-      nil
-    end
-
     VALID_JSON_SCHEMA_TYPES = %i[string integer number boolean array object].freeze
 
     class Parameter

data/lib/ask/version.rb

@@ -2,6 +2,6 @@
 
 module Ask
   module Tools
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-tools
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Kaka Ruto
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Tool framework for the ask-rb ecosystem
 test_files: []