riffer-rig 0.8.0 → 0.9.0

data/lib/riffer/rig/loader.rb

@@ -3,24 +3,24 @@
 class Riffer::Rig::Loader
   class ConfigurationError < StandardError; end
 
-  PROVIDER_LIST = Riffer::Rig::Settings::PROVIDERS.join(', ') #: String
-
-  ONBOARDING_QUESTION = 'Which model should riffer use? Enter provider/name, ' \
-                        "with a provider from: #{PROVIDER_LIST}".freeze #: String
-
-  NO_MODEL = 'No model is set: pass --model provider/name, set RIFFER_MODEL, or set "model" in ' \
-             "~/.riffer/settings.json, with a provider from: #{PROVIDER_LIST}".freeze #: String
+  # Raised by a strict load: the reload abandons instead of continuing.
+  class AbandonedError < StandardError; end
 
   EXTENSION_FEATURE = 'riffer/rig/extension' #: String
 
-  private_constant :EXTENSION_FEATURE, :PROVIDER_LIST, :ONBOARDING_QUESTION, :NO_MODEL
+  private_constant :EXTENSION_FEATURE
 
   # @rbs @cwd: String
   # @rbs @host: Riffer::Rig::Hosts::_Host
   # @rbs @env: Riffer::Rig::Env
   # @rbs @home: String
   # @rbs @riffer_config: Riffer::Config
+  # @rbs @store: Riffer::Rig::Stores::_Store | nil
   # @rbs @tracked_files: Array[String]
+  # @rbs @stripped: Array[Symbol]
+  # @rbs @extensions_enabled: bool
+  # @rbs @gem_extensions: Array[Riffer::Rig::Extension]
+  # @rbs @file_state: Hash[String, Time?]?
 
   # @dynamic tracked_files
   attr_reader :tracked_files #: Array[String]
@@ -36,6 +36,7 @@ class Riffer::Rig::Loader
   # @rbs agents_md: bool
   # @rbs tools: Array[String]?
   # @rbs max_steps: Integer?
+  # @rbs store: Riffer::Rig::Stores::_Store | nil
   # @rbs return: Riffer::Rig::Runtime
   def self.runtime(
     cwd:,
@@ -48,9 +49,11 @@ class Riffer::Rig::Loader
     skills: true,
     agents_md: true,
     tools: nil,
-    max_steps: Riffer::Rig::Runtime::DEFAULT_MAX_STEPS
+    max_steps: Riffer::Rig::Runtime::DEFAULT_MAX_STEPS,
+    store: Riffer::Rig::Stores::JSONL.new
   )
-    new(cwd:, host:, env:, home:, riffer_config:).runtime(model:, extensions:, skills:, agents_md:, tools:, max_steps:)
+    new(cwd:, host:, env:, home:, riffer_config:, store:)
+      .runtime(model:, extensions:, skills:, agents_md:, tools:, max_steps:)
   end
 
   # @rbs cwd: String
@@ -58,8 +61,16 @@ class Riffer::Rig::Loader
   # @rbs env: Riffer::Rig::Env | Riffer::Rig::Env::Invalid
   # @rbs home: String
   # @rbs riffer_config: Riffer::Config
+  # @rbs store: Riffer::Rig::Stores::_Store | nil
   # @rbs return: void
-  def initialize(cwd:, host:, env: Riffer::Rig::Env.load, home: Dir.home, riffer_config: Riffer.config)
+  def initialize(
+    cwd:,
+    host:,
+    store: Riffer::Rig::Stores::JSONL.new,
+    env: Riffer::Rig::Env.load,
+    home: Dir.home,
+    riffer_config: Riffer.config
+  )
     raise ConfigurationError, env.message if env.is_a?(Riffer::Rig::Env::Invalid)
 
     @cwd = cwd
@@ -67,7 +78,12 @@ class Riffer::Rig::Loader
     @env = env
     @home = home
     @riffer_config = riffer_config
+    @store = store
     @tracked_files = []
+    @stripped = []
+    @extensions_enabled = true
+    @gem_extensions = []
+    @file_state = nil
   end
 
   # @rbs model: String?
@@ -85,19 +101,23 @@ class Riffer::Rig::Loader
     tools: nil,
     max_steps: Riffer::Rig::Runtime::DEFAULT_MAX_STEPS
   )
-    settings = Riffer::Rig::Settings.merge(
-      Riffer::Rig::Settings.read(home_settings_path),
-      Riffer::Rig::Settings.read(File.join(@cwd, '.riffer', 'settings.json'))
-    )
+    settings = merged_settings
     document = Riffer::Rig::Settings::Document.new(settings)
     selected = select_model(model || @env.model || document.model)
     provider = Riffer::Rig::Settings.provider_for(selected).to_s
+    ensure_sdk(provider)
     credentials = { provider.to_sym => credentials_for(provider) }
-    stripped = { skills: skills, agents_md: agents_md }.reject { |_name, kept| kept }.keys
-    loaded = Riffer::Rig::Bundled::BY_NAME.except(*document.disabled.map(&:to_sym), *stripped).values
+    @extensions_enabled = extensions
+    @stripped = { skills: skills, agents_md: agents_md }.reject { |_name, kept| kept }.keys
+    loaded = Riffer::Rig::Bundled::BY_NAME.except(*document.disabled.map(&:to_sym), *@stripped).values
+    @tracked_files = []
+    @gem_extensions = []
     loaded += load_rig_files(document.autoload) if extensions
 
-    Riffer::Rig::Runtime.new(
+    recorder = recorder_for(document)
+    loaded << Riffer::Rig::Stores::Recorder.extension(recorder) if recorder
+
+    built = Riffer::Rig::Runtime.new(
       selected,
       extensions: loaded,
       tools: tools,
@@ -108,20 +128,180 @@ class Riffer::Rig::Loader
       credentials: credentials,
       pricing: document.models,
       riffer_config: @riffer_config,
-      model_options: Riffer::Rig::Settings.model_options(selected, document.reasoning)
+      model_options: Riffer::Rig::Settings.model_options(selected, document.reasoning),
+      native_tools: document.native_tools
     )
+    built.install_command(Riffer::Rig::Commands::Reload.command(self))
+    @file_state = file_state
+    recorder&.attach(built)
+    built
+  end
+
+  # Without force, a no-op while the tracked file set and the two rig.rb paths
+  # look as the last discovery left them — the entry point the automatic
+  # trigger (#133) calls. The snapshot advances on every attempt, failed ones
+  # included, so a failure does not retry every request. Failures are notified
+  # once and reported as the message, the way Settings.rejection reports a
+  # rejection; the Runtime is the success value.
+  # @rbs runtime: Riffer::Rig::Runtime
+  # @rbs force: bool
+  # @rbs return: (Riffer::Rig::Runtime | String)
+  def reload(runtime, force: false)
+    return runtime if !force && file_state == @file_state
+
+    outcome = perform_reload(runtime)
+    @file_state = file_state
+    outcome
   end
 
   private
 
+  # @rbs return: Hash[Symbol, untyped]
+  def merged_settings
+    Riffer::Rig::Settings.merge(
+      Riffer::Rig::Settings.read(home_settings_path),
+      Riffer::Rig::Settings.read(File.join(@cwd, '.riffer', 'settings.json'))
+    )
+  end
+
+  # Notifies every failure once and reports its message; a rebuilt Runtime is
+  # the success value.
+  # @rbs runtime: Riffer::Rig::Runtime
+  # @rbs return: (Riffer::Rig::Runtime | String)
+  def perform_reload(runtime)
+    settings = merged_settings
+    document = Riffer::Rig::Settings::Document.new(settings)
+    begin
+      extensions = reload_extensions(document, settings)
+    rescue AbandonedError => e
+      return notify_failure(e.message)
+    end
+
+    failure = reload_credentials(runtime)
+    return notify_failure(failure) if failure
+
+    begin
+      runtime.rebuild(extensions: validated(extensions, settings), settings: settings)
+    rescue StandardError => e
+      return notify_failure(e.message)
+    end
+    runtime
+  end
+
+  # @rbs message: String
+  # @rbs return: String
+  def notify_failure(message)
+    @host.notify(message, level: :error)
+    message
+  end
+
+  # @rbs document: Riffer::Rig::Settings::Document
+  # @rbs settings: Hash[Symbol, untyped]
+  # @rbs return: Array[Riffer::Rig::Extension]
+  def reload_extensions(document, settings)
+    candidates = Riffer::Rig::Bundled::BY_NAME.except(*document.disabled.map(&:to_sym), *@stripped).values
+    return validated(candidates, settings) unless @extensions_enabled
+
+    scrub_tracked_features
+    @tracked_files = []
+    candidates.concat(@gem_extensions, rig_recordings)
+    validated(candidates, settings)
+  end
+
+  # @rbs return: Array[Riffer::Rig::Extension]
+  def rig_recordings
+    recorded = [] #: Array[Riffer::Rig::Extension]
+    recorded.concat(load_rig_file(home_rig_path, confirm_trust: false))
+    recorded.concat(load_rig_file(project_rig_path, confirm_trust: true))
+    recorded
+  end
+
+  # @rbs path: String
+  # @rbs confirm_trust: bool
+  # @rbs return: Array[Riffer::Rig::Extension]
+  def load_rig_file(path, confirm_trust:)
+    return [] unless File.file?(path)
+    return [] if confirm_trust && !trusted?(path)
+
+    load_file(path, track: true, strict: true)
+  end
+
+  # @rbs return: void
+  def scrub_tracked_features
+    @tracked_files.each { |path| $LOADED_FEATURES.delete(path) }
+  end
+
+  # Runs each extension against a throwaway registrar so that a failing block
+  # is skipped and reported instead of aborting the rebuild.
+  # @rbs extensions: Array[Riffer::Rig::Extension]
+  # @rbs settings: Hash[Symbol, untyped]
+  # @rbs return: Array[Riffer::Rig::Extension]
+  def validated(extensions, settings)
+    extensions.select do |extension|
+      registrar = Riffer::Rig::Registrar.new(extension.name, settings[extension.name.to_sym] || {})
+      error = extension.load_into(registrar)
+      next true unless error
+
+      @host.notify("Extension #{extension.name} failed to load: #{error.message}", level: :error)
+      false
+    end
+  end
+
+  # @rbs runtime: Riffer::Rig::Runtime
+  # @rbs return: String?
+  def reload_credentials(runtime)
+    provider = runtime.model.partition('/').first
+    resolution = Riffer::Rig::Credentials.resolve(
+      provider,
+      host: asking_host,
+      env: @env,
+      auth_path: File.join(@home, '.riffer', 'auth.json'),
+      settings_path: home_settings_path
+    )
+    return missing_credentials(provider, resolution.missing) unless resolution.missing.empty?
+
+    Riffer::Rig::Credentials.apply(provider, resolution.values, config: @riffer_config)
+    runtime.merge_credentials(provider.to_sym, resolution.values)
+    nil
+  end
+
+  # @rbs return: Hash[String, Time?]
+  def file_state
+    (@tracked_files + rig_paths).uniq.to_h { |path| [path, stamp(path)] }
+  end
+
+  # @rbs return: Array[String]
+  def rig_paths
+    return [] unless @extensions_enabled
+
+    [home_rig_path, project_rig_path]
+  end
+
+  # @rbs path: String
+  # @rbs return: Time?
+  def stamp(path)
+    File.file?(path) ? File.mtime(path) : nil
+  end
+
+  # @rbs return: String
+  def home_rig_path
+    File.expand_path(File.join(@home, '.riffer', 'rig.rb'))
+  end
+
+  # @rbs return: String
+  def project_rig_path
+    File.expand_path(File.join(@cwd, '.riffer', 'rig.rb'))
+  end
+
   # @rbs autoload: bool
   # @rbs return: Array[Riffer::Rig::Extension]
   def load_rig_files(autoload)
-    recorded = gem_extension_files(autoload).flat_map { |file| load_file(File.expand_path(file), track: false) }
-    home = File.expand_path(File.join(@home, '.riffer', 'rig.rb'))
-    recorded.concat(load_file(home, track: true)) if File.file?(home)
-    project = File.expand_path(File.join(@cwd, '.riffer', 'rig.rb'))
-    recorded.concat(load_file(project, track: true)) if File.file?(project) && trusted?(project)
+    @gem_extensions = gem_extension_files(autoload).flat_map { |file| load_file(File.expand_path(file), track: false) }
+    recorded = @gem_extensions.dup
+    recorded.concat(load_file(home_rig_path, track: true)) if File.file?(home_rig_path)
+    if File.file?(project_rig_path) && trusted?(project_rig_path)
+      recorded.concat(load_file(project_rig_path, track: true))
+    end
     recorded
   end
 
@@ -150,17 +330,25 @@ class Riffer::Rig::Loader
     File.join(@home, '.riffer', 'trust.json')
   end
 
+  # Loads one file and returns the extensions it recorded. A tracked load adds
+  # the features the load added to the tracked file set. A failure is reported
+  # to the host and yields nothing, unless strict: then it propagates as
+  # AbandonedError for the reload to abandon on.
   # @rbs path: String
   # @rbs track: bool
+  # @rbs strict: bool
   # @rbs return: Array[Riffer::Rig::Extension]
-  def load_file(path, track:)
+  def load_file(path, track:, strict: false)
     before = Riffer::Rig.extensions
     before_features = $LOADED_FEATURES.dup
     begin
       load path
     rescue StandardError => e
       track_loaded(before_features, path) if track
-      @host.notify("#{path} failed to load: #{e.message}", level: :error)
+      message = "#{path} failed to load: #{e.message}"
+      raise AbandonedError, message if strict
+
+      @host.notify(message, level: :error)
       return []
     end
     track_loaded(before_features, path) if track
@@ -195,12 +383,40 @@ class Riffer::Rig::Loader
 
   # @rbs return: String
   def ask_for_model
-    answer = asking_host.ask(ONBOARDING_QUESTION).to_s.strip
-    raise ConfigurationError, NO_MODEL if answer.empty?
+    answer = asking_host.ask(onboarding_question).to_s.strip
+    raise ConfigurationError, no_model if answer.empty?
 
     answer
   end
 
+  # @rbs return: String
+  def onboarding_question
+    'Which model should riffer use? Enter provider/name, ' \
+      "with a provider from: #{provider_list}"
+  end
+
+  # @rbs return: String
+  def no_model
+    'No model is set: pass --model provider/name, set RIFFER_MODEL, or set "model" in ' \
+      "~/.riffer/settings.json, with a provider from: #{provider_list}"
+  end
+
+  # @rbs return: String
+  def provider_list
+    Riffer::Rig::Settings.providers.join(', ')
+  end
+
+  # @rbs provider: String
+  # @rbs return: void
+  def ensure_sdk(provider)
+    sdk = Riffer::Rig::ProviderSetup.for(provider).sdk
+    return unless sdk
+
+    gem, requirement = sdk
+    message = Riffer::Rig::SDK.ensure(gem, requirement, host: asking_host)
+    raise ConfigurationError, message if message
+  end
+
   # @rbs provider: String
   # @rbs return: Hash[Symbol, String]
   def credentials_for(provider)
@@ -222,9 +438,8 @@ class Riffer::Rig::Loader
   # @rbs return: String
   def missing_credentials(provider, missing)
     setup = Riffer::Rig::ProviderSetup.for(provider)
-    fields = setup.fields.select { |field| missing.include?(field.name) }
-    wanted = fields.map { |field| "#{field.name} (#{field.env.join(' or ')})" }.join(', ')
-    "#{provider} has no #{wanted}; set it in the environment or run riffer interactively to paste it" \
+    "#{provider} has no #{setup.missing_fields(missing)}; " \
+      'set it in the environment or run riffer interactively to paste it' \
       "#{" (create one at #{setup.url})" if setup.url}"
   end
 
@@ -237,4 +452,16 @@ class Riffer::Rig::Loader
   def home_settings_path
     File.join(@home, '.riffer', 'settings.json')
   end
+
+  # The store records unless it was declined with store: nil or globally with
+  # "sessions": {"save": false}.
+  # @rbs document: Riffer::Rig::Settings::Document
+  # @rbs return: Riffer::Rig::Stores::Recorder?
+  def recorder_for(document)
+    store = @store
+    return nil unless document.save
+    return nil unless store
+
+    Riffer::Rig::Stores::Recorder.new(store: store)
+  end
 end

data/lib/riffer/rig/provider_setup.rb

@@ -1,18 +1,21 @@
 # frozen_string_literal: true
 
 class Riffer::Rig::ProviderSetup
-  # @dynamic url, chain, fields
+  # @dynamic url, chain, sdk, fields
   attr_reader :url #: String?
   attr_reader :chain #: bool
+  attr_reader :sdk #: [String, String]?
   attr_reader :fields #: Array[Riffer::Rig::ProviderSetup::Field]
 
   # @rbs fields: Array[Riffer::Rig::ProviderSetup::Field]
   # @rbs url: String?
   # @rbs chain: bool
+  # @rbs sdk: [String, String]?
   # @rbs return: void
-  def initialize(fields:, url: nil, chain: false)
+  def initialize(fields:, url: nil, chain: false, sdk: nil)
     @url = url
     @chain = chain
+    @sdk = sdk&.freeze
     @fields = fields.freeze
     freeze
   end
@@ -24,15 +27,17 @@ class Riffer::Rig::ProviderSetup
     nil
   end #: ^() -> String?
 
-  # Upstream candidate: each riffer provider could declare its own credential
-  # fields, and this table would go.
+  # Upstream candidate: riffer's providers could declare their own SDK gem and
+  # credential fields, and this table would go.
   TABLE = {
     anthropic: new(
       url: 'https://console.anthropic.com/settings/keys',
+      sdk: ['anthropic', '~> 1.69'],
       fields: [Field.new(name: :api_key, env: ['ANTHROPIC_API_KEY'], secret: true, required: true)]
     ),
     openai: new(
       url: 'https://platform.openai.com/api-keys',
+      sdk: ['openai', '~> 0.80'],
       fields: [
         Field.new(name: :api_key, env: ['OPENAI_API_KEY'], secret: true, required: true),
         Field.new(name: :base_url, env: ['OPENAI_BASE_URL'], secret: false, required: false)
@@ -44,10 +49,12 @@ class Riffer::Rig::ProviderSetup
     ),
     openrouter: new(
       url: 'https://openrouter.ai/keys',
+      sdk: ['openai', '~> 0.80'],
       fields: [Field.new(name: :api_key, env: ['OPENROUTER_API_KEY'], secret: true, required: true)]
     ),
     azure_openai: new(
       url: 'https://portal.azure.com',
+      sdk: ['openai', '~> 0.80'],
       fields: [
         Field.new(name: :endpoint, env: ['AZURE_OPENAI_ENDPOINT'], secret: false, required: true),
         Field.new(name: :api_key, env: ['AZURE_OPENAI_API_KEY'], secret: true, required: true)
@@ -56,6 +63,7 @@ class Riffer::Rig::ProviderSetup
     amazon_bedrock: new(
       url: 'https://console.aws.amazon.com/bedrock',
       chain: true,
+      sdk: ['aws-sdk-bedrockruntime', '~> 1.0'],
       fields: [
         Field.new(
           name: :region,
@@ -69,10 +77,33 @@ class Riffer::Rig::ProviderSetup
     )
   }.freeze #: Hash[Symbol, Riffer::Rig::ProviderSetup]
 
+  # @rbs missing: Array[Symbol]
+  # @rbs return: String
+  def missing_fields(missing)
+    fields.select { |field| missing.include?(field.name) }
+          .map { |field| "#{field.name} (#{field.env.join(' or ')})" }
+          .join(', ')
+  end
+
+  # @rbs hash: Hash[Symbol, untyped]
+  # @rbs return: Riffer::Rig::ProviderSetup
+  def self.from(hash)
+    fields = hash.fetch(:fields).map do |field|
+      Field.new(
+        name: field.fetch(:name),
+        env: field.fetch(:env),
+        secret: field.fetch(:secret, false),
+        required: field.fetch(:required, false),
+        fallback: field[:fallback]
+      )
+    end
+    new(fields: fields, url: hash[:url], chain: hash.fetch(:chain, false), sdk: hash[:sdk])
+  end
+
   # @rbs identifier: String | Symbol
   # @rbs return: Riffer::Rig::ProviderSetup?
   def self.[](identifier)
-    TABLE[identifier.to_sym]
+    Riffer::Rig::Providers.setup(identifier) || TABLE[identifier.to_sym]
   end
 
   # @rbs identifier: String | Symbol

data/lib/riffer/rig/providers.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Riffer::Rig::Providers
+  extend self
+
+  # Upstream candidate: riffer's Repository exposes no listing of extension
+  # registrations and stores no credential setups, so this registry mirrors
+  # what the provider seam registers.
+  # @rbs @setups: Hash[Symbol, Riffer::Rig::ProviderSetup?]
+  @setups = {} #: Hash[Symbol, Riffer::Rig::ProviderSetup?]
+
+  # @rbs identifier: String | Symbol
+  # @rbs setup: Riffer::Rig::ProviderSetup | Hash[Symbol, untyped]?
+  # @rbs &block: () -> singleton(::Riffer::Providers::Base)
+  # @rbs return: void
+  def register(identifier, setup: nil, &)
+    ::Riffer::Providers::Repository.register(identifier, &)
+    @setups[identifier.to_sym] = setup && normalize(setup)
+    nil
+  end
+
+  # @rbs identifier: String | Symbol
+  # @rbs return: void
+  def unregister(identifier)
+    ::Riffer::Providers::Repository.unregister(identifier)
+    @setups.delete(identifier.to_sym)
+    nil
+  end
+
+  # @rbs identifier: String | Symbol
+  # @rbs return: Riffer::Rig::ProviderSetup?
+  def setup(identifier)
+    @setups[identifier.to_sym]
+  end
+
+  # @rbs return: Array[Symbol]
+  def identifiers
+    (::Riffer::Providers::Repository::REPO.keys - [:mock]) | @setups.keys
+  end
+
+  private
+
+  # @rbs setup: Riffer::Rig::ProviderSetup | Hash[Symbol, untyped]
+  # @rbs return: Riffer::Rig::ProviderSetup
+  def normalize(setup)
+    setup.is_a?(::Riffer::Rig::ProviderSetup) ? setup : ::Riffer::Rig::ProviderSetup.from(setup)
+  end
+end

data/lib/riffer/rig/registrar.rb

@@ -88,6 +88,14 @@ class Riffer::Rig::Registrar
     @mcp_servers[name] = Riffer::Rig::Mcp::Declaration.new(url: url, headers: headers)
   end
 
+  # @rbs prefix: String | Symbol
+  # @rbs setup: Riffer::Rig::ProviderSetup | Hash[Symbol, untyped]?
+  # @rbs &block: () -> singleton(::Riffer::Providers::Base)
+  # @rbs return: void
+  def provider(prefix, setup: nil, &)
+    Riffer::Rig::Providers.register(prefix, setup:, &)
+  end
+
   # @rbs event: Symbol
   # @rbs &block: (Riffer::Rig::Events::_Event | ::Riffer::StreamEvents::Base) -> untyped
   # @rbs return: void