ace-llm 0.36.3 → 0.38.2

data/lib/ace/llm/atoms/provider_config_validator.rb

@@ -11,6 +11,7 @@ module Ace
         # Optional fields with expected types
         OPTIONAL_FIELDS = {
           "models" => Array,
+          "limits" => Hash,
           "api_key" => [Hash, NilClass],
           "capabilities" => Array,
           "default_options" => Hash,
@@ -69,6 +70,7 @@ module Ace
           validate_class(config["class"], errors) if config["class"]
           validate_gem(config["gem"], errors) if config["gem"]
           validate_models(config["models"], warnings) if config["models"]
+          validate_limits(config["limits"], errors, warnings) if config["limits"]
           validate_api_key(config["api_key"], errors, warnings) if config["api_key"]
           validate_capabilities(config["capabilities"], warnings) if config["capabilities"]
           validate_default_options(config["default_options"], warnings) if config["default_options"]
@@ -147,6 +149,57 @@ module Ace
           end
         end
 
+        def validate_limits(limits, errors, warnings)
+          unless limits.is_a?(Hash)
+            errors << "Limits must be a Hash, got #{limits.class}"
+            return
+          end
+
+          valid_limit_keys = %w[default models]
+          unknown_limit_keys = limits.keys - valid_limit_keys
+          unless unknown_limit_keys.empty?
+            warnings << "Unknown limits keys: #{unknown_limit_keys.join(", ")}"
+          end
+
+          validate_limit_entry(limits["default"], "limits.default", errors) if limits["default"]
+
+          return unless limits["models"]
+
+          unless limits["models"].is_a?(Hash)
+            errors << "limits.models must be a Hash, got #{limits["models"].class}"
+            return
+          end
+
+          limits["models"].each do |model_name, entry|
+            if model_name.to_s.strip.empty?
+              errors << "limits.models entries must have non-empty model names"
+              next
+            end
+
+            validate_limit_entry(entry, "limits.models.#{model_name}", errors)
+          end
+        end
+
+        def validate_limit_entry(entry, path, errors)
+          unless entry.is_a?(Hash)
+            errors << "#{path} must be a Hash, got #{entry.class}"
+            return
+          end
+
+          valid_keys = %w[context output]
+          unknown_keys = entry.keys - valid_keys
+          unless unknown_keys.empty?
+            errors << "#{path} contains unknown keys: #{unknown_keys.join(", ")}"
+          end
+
+          entry.each do |field, value|
+            next unless valid_keys.include?(field)
+            next if value.is_a?(Integer) && value >= 0
+
+            errors << "#{path}.#{field} must be a non-negative Integer"
+          end
+        end
+
         # Validate API key configuration
         def validate_api_key(api_key_config, errors, warnings)
           if api_key_config.is_a?(Hash)

data/lib/ace/llm/cli/commands/query.rb

@@ -33,6 +33,8 @@ module Ace
           option :prompt, type: :string, desc: "Prompt text (overrides positional PROMPT)"
           option :force, type: :boolean, default: false, desc: "Force overwrite existing files"
           option :interactive, type: :boolean, default: false, desc: "Start an interactive CLI session instead of one-shot query"
+          option :fallback, type: :boolean, default: true, desc: "Use provider fallback for this query"
+          option :json, type: :boolean, default: false, desc: "Output command results as JSON"
 
           option :version, type: :boolean, desc: "Show version information"
           option :list_providers, type: :boolean, desc: "List available LLM providers"
@@ -55,6 +57,7 @@ module Ace
             end
 
             @prompt = options[:prompt] || prompt_text
+            options[:format] ||= "json" if options[:json]
 
             return show_help if @provider_model.nil? && @prompt.nil?
             return show_provider_help if @prompt.nil? || @prompt.empty?
@@ -90,6 +93,8 @@ module Ace
             puts "      --model MODEL              Model name (overrides PROVIDER[:MODEL])"
             puts "      --prompt PROMPT            Prompt text (overrides positional PROMPT)"
             puts "      --interactive              Start an interactive CLI session"
+            puts "      --no-fallback              Disable provider fallback for this query"
+            puts "      --json                     Output command results as JSON"
             puts "      --force                    Force overwrite existing files"
             puts "  -q, --quiet                    Suppress config summary output"
             puts "  -d, --debug                    Enable debug output"
@@ -104,6 +109,7 @@ module Ace
             puts '  ace-llm claude:sonnet "Hi" --cli-args "dangerously-skip-permissions"'
             puts '  ace-llm claude:sonnet "Hi" --cli-args "--model=claude-sonnet-4-0 --verbose"'
             puts '  ace-llm codex:gpt@yolo "/as-assign-drive abc123@010" --interactive'
+            puts '  ace-llm gemini:pro "ping" --no-fallback --timeout 15 --max-tokens 4'
             puts ""
             puts "Provider Aliases:"
             puts "  Short aliases for common provider:MODEL combinations:"
@@ -136,7 +142,7 @@ module Ace
             return if quiet?(options)
 
             require "ace/core"
-            summary_keys = %w[provider_model preset temperature max_tokens format timeout system_append cli_args]
+            summary_keys = %w[provider_model preset temperature max_tokens format timeout system_append cli_args fallback]
             Ace::Core::Atoms::ConfigSummary.display(
               command: "query",
               config: options.merge(provider_model: @provider_model),
@@ -183,7 +189,8 @@ module Ace
               model: resolved_model_override,
               cli_args: options[:cli_args],
               system_append: system_append_text,
-              preset: options[:preset]
+              preset: options[:preset],
+              fallback: (options[:fallback] == false ? false : nil)
             )
 
             output_response(response, options)
@@ -207,6 +214,7 @@ module Ace
             conflicts << "--max-tokens" unless options[:max_tokens].nil?
             explicit_format = options[:format]
             conflicts << "--format" if explicit_format && explicit_format != "text"
+            conflicts << "--no-fallback" if options[:fallback] == false
             return if conflicts.empty?
 
             raise Ace::Support::Cli::Error, "Interactive mode does not support #{conflicts.join(', ')}"

data/lib/ace/llm/molecules/model_limit_resolver.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require "ace/support/models"
+require_relative "client_registry"
+require_relative "provider_model_parser"
+
+module Ace
+  module LLM
+    module Molecules
+      # Resolves model context/output limits against the expanded concrete target.
+      class ModelLimitResolver
+        DEFAULT_CONTEXT_LIMIT = 200_000
+
+        ResolveResult = Struct.new(
+          :provider,
+          :model,
+          :context_limit,
+          :output_limit,
+          :source,
+          :original_target,
+          keyword_init: true
+        ) do
+          def full_model
+            return nil if provider.to_s.empty? || model.to_s.empty?
+
+            "#{provider}:#{model}"
+          end
+        end
+
+        def self.resolve(target, **kwargs)
+          new(**kwargs).resolve(target)
+        end
+
+        def initialize(registry: nil, parser: nil)
+          @registry = registry || ClientRegistry.new
+          @parser = parser || ProviderModelParser.new(registry: @registry)
+        end
+
+        def resolve(target)
+          original_target = target.to_s
+          return fallback_result(original_target) if original_target.strip.empty?
+
+          parsed = @parser.parse(original_target)
+          return fallback_result(original_target) if parsed.invalid?
+
+          provider_config = @registry.get_provider(parsed.provider)
+          return fallback_result(original_target, provider: parsed.provider, model: parsed.model) unless provider_config
+
+          limits = Ace::Support::Models::Atoms::ProviderConfigReader.extract_limits(provider_config)
+          default_limits = limits["default"] || {}
+          model_limits = limits.dig("models", parsed.model) || {}
+          merged_limits = default_limits.merge(model_limits)
+
+          ResolveResult.new(
+            provider: parsed.provider,
+            model: parsed.model,
+            context_limit: merged_limits["context"] || DEFAULT_CONTEXT_LIMIT,
+            output_limit: merged_limits["output"],
+            source: limit_source(default_limits, model_limits),
+            original_target: original_target
+          )
+        rescue
+          fallback_result(original_target)
+        end
+
+        private
+
+        def limit_source(default_limits, model_limits)
+          return :model_override if model_limits.any?
+          return :provider_default if default_limits.any?
+
+          :fallback
+        end
+
+        def fallback_result(original_target, provider: nil, model: nil)
+          ResolveResult.new(
+            provider: provider,
+            model: model,
+            context_limit: DEFAULT_CONTEXT_LIMIT,
+            output_limit: nil,
+            source: :fallback,
+            original_target: original_target
+          )
+        end
+      end
+    end
+  end
+end

data/lib/ace/llm/version.rb

@@ -2,6 +2,6 @@
 
 module Ace
   module LLM
-    VERSION = '0.36.3'
+    VERSION = '0.38.2'
   end
 end

data/lib/ace/llm.rb

@@ -25,6 +25,7 @@ require_relative "llm/molecules/file_io_handler"
 require_relative "llm/molecules/llm_alias_resolver"
 require_relative "llm/molecules/role_resolver"
 require_relative "llm/molecules/provider_model_parser"
+require_relative "llm/molecules/model_limit_resolver"
 require_relative "llm/molecules/format_handlers"
 require_relative "llm/molecules/client_registry"
 require_relative "llm/molecules/fallback_orchestrator"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ace-llm
 version: !ruby/object:Gem::Version
-  version: 0.36.3
+  version: 0.38.2
 platform: ruby
 authors:
 - Michal Czyz
 bindir: exe
 cert_chain: []
-date: 2026-04-20 00:00:00.000000000 Z
+date: 2026-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-support-cli
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -289,6 +289,7 @@ files:
 - lib/ace/llm/molecules/format_handlers.rb
 - lib/ace/llm/molecules/interactive_command_builder.rb
 - lib/ace/llm/molecules/llm_alias_resolver.rb
+- lib/ace/llm/molecules/model_limit_resolver.rb
 - lib/ace/llm/molecules/openai_compatible_params.rb
 - lib/ace/llm/molecules/preset_loader.rb
 - lib/ace/llm/molecules/provider_loader.rb