riffer-rig 0.5.0 → 0.7.0

data/lib/riffer/rig/tools/bash.rb

@@ -5,7 +5,7 @@ require 'open3'
 class Riffer::Rig::Tools::Bash < Riffer::Tool
   identifier 'bash'
   description 'Run a shell command in the working directory and return its combined stdout/stderr and exit status. ' \
-              'Use this for listing, searching (rg/grep/find), running tests, git, etc.'
+              'Use this for exploring and running things: ls, rg or grep, find, tests, git, package managers.'
 
   timeout 600
 
@@ -13,6 +13,8 @@ class Riffer::Rig::Tools::Bash < Riffer::Tool
 
   MAX_OUTPUT_BYTES = 30_000 #: Integer
 
+  POLL_SECONDS = 0.1 #: Float
+
   params do
     required :command, String, description: 'The shell command to run'
     optional :timeout_ms,
@@ -26,7 +28,9 @@ class Riffer::Rig::Tools::Bash < Riffer::Tool
   # @rbs timeout_ms: Integer
   # @rbs return: Riffer::Tools::Response
   def call(context:, command:, timeout_ms: DEFAULT_TIMEOUT_MS)
-    output, status = run(command, timeout_ms / 1000.0)
+    cancel_flag = context&.[](:cancel_flag) #: Riffer::Rig::Runtime::CancelFlag?
+    cwd = context&.[](:cwd) #: String
+    output, status = run(command, cwd, timeout_ms / 1000.0, cancel_flag)
     output = truncate(output.rstrip)
 
     return error("Command exited with status #{status}\n#{output}", type: :command_failed) unless status.zero?
@@ -37,24 +41,43 @@ class Riffer::Rig::Tools::Bash < Riffer::Tool
   private
 
   # @rbs command: String
+  # @rbs cwd: String
   # @rbs timeout_seconds: Float
+  # @rbs cancel_flag: Riffer::Rig::Runtime::CancelFlag?
   # @rbs return: [String, Integer]
-  def run(command, timeout_seconds)
-    stdin, stdout_and_stderr, wait_thread = Open3.popen2e(command, chdir: Dir.pwd, pgroup: true)
+  def run(command, cwd, timeout_seconds, cancel_flag)
+    stdin, stdout_and_stderr, wait_thread = Open3.popen2e(command, chdir: cwd, pgroup: true)
     stdin.close
 
-    joined = wait_thread.join(timeout_seconds) #: Thread?
+    ending = await(wait_thread, monotonic_now + timeout_seconds, cancel_flag)
+    kill_group(wait_thread.pid) unless ending == :exited
+    output = stdout_and_stderr.read
+    stdout_and_stderr.close
 
-    unless joined
-      kill_group(wait_thread.pid)
-      output = stdout_and_stderr.read
-      stdout_and_stderr.close
-      return ["#{output}\n[timed out after #{timeout_seconds.round}s]", 124]
+    case ending
+    when :timed_out then ["#{output}\n[timed out after #{timeout_seconds.round}s]", 124]
+    when :cancelled then ["#{output}\n[cancelled]", 130]
+    else [output, wait_thread.value.exitstatus || 1]
     end
+  end
 
-    output = stdout_and_stderr.read
-    stdout_and_stderr.close
-    [output, wait_thread.value.exitstatus || 1]
+  # @rbs wait_thread: Process::Waiter
+  # @rbs deadline: Float
+  # @rbs cancel_flag: Riffer::Rig::Runtime::CancelFlag?
+  # @rbs return: Symbol
+  def await(wait_thread, deadline, cancel_flag)
+    # Upstream candidate: a cancel token on riffer's run loop would reach a
+    # running tool directly; until then the flag is polled from the context.
+    until wait_thread.join(POLL_SECONDS)
+      return :cancelled if cancel_flag&.set?
+      return :timed_out if monotonic_now >= deadline
+    end
+    :exited
+  end
+
+  # @rbs return: Float
+  def monotonic_now
+    Process.clock_gettime(Process::CLOCK_MONOTONIC)
   end
 
   # @rbs pid: Integer

data/lib/riffer/rig/tools/edit.rb

@@ -3,7 +3,8 @@
 class Riffer::Rig::Tools::Edit < Riffer::Tool
   identifier 'edit'
   description 'Replace an exact string in a file. By default old_string must occur exactly once; ' \
-              'set replace_all to replace every occurrence.'
+              'set replace_all to replace every occurrence. ' \
+              'Prefer this over write for existing files; pass enough surrounding text to make old_string unique.'
 
   params do
     required :path, String, description: 'Path to the file (absolute, or relative to the working directory)'
@@ -22,7 +23,7 @@ class Riffer::Rig::Tools::Edit < Riffer::Tool
   # @rbs replace_all: bool
   # @rbs return: Riffer::Tools::Response
   def call(context:, path:, old_string:, new_string:, replace_all: false)
-    resolved = File.expand_path(path, Dir.pwd)
+    resolved = File.expand_path(path, context&.[](:cwd))
     return error("File not found: #{path}", type: :not_found) unless File.file?(resolved)
 
     content = File.read(resolved)

data/lib/riffer/rig/tools/read.rb

@@ -3,7 +3,8 @@
 class Riffer::Rig::Tools::Read < Riffer::Tool
   identifier 'read'
   description 'Read a file from the filesystem. Returns its contents with line numbers. ' \
-              'Use offset/limit to read a slice of a large file.'
+              'Use offset/limit to read a slice of a large file. ' \
+              'Read a file before editing it, and read rather than guess what a file contains.'
 
   DEFAULT_LIMIT = 2000 #: Integer
 
@@ -19,7 +20,7 @@ class Riffer::Rig::Tools::Read < Riffer::Tool
   # @rbs limit: Integer
   # @rbs return: Riffer::Tools::Response
   def call(context:, path:, offset: nil, limit: DEFAULT_LIMIT)
-    resolved = File.expand_path(path, Dir.pwd)
+    resolved = File.expand_path(path, context&.[](:cwd))
     return error("File not found: #{path}", type: :not_found) unless File.file?(resolved)
     return error('offset must be >= 1', type: :invalid_argument) if offset && offset < 1
 

data/lib/riffer/rig/tools/write.rb

@@ -4,7 +4,8 @@ require 'fileutils'
 
 class Riffer::Rig::Tools::Write < Riffer::Tool
   identifier 'write'
-  description 'Write content to a file, creating it (and any parent directories) or overwriting it.'
+  description 'Write content to a file, creating it (and any parent directories) or overwriting it. ' \
+              'Use this for new files or full rewrites; prefer edit for changes to an existing file.'
 
   params do
     required :path, String, description: 'Path to the file (absolute, or relative to the working directory)'
@@ -16,7 +17,7 @@ class Riffer::Rig::Tools::Write < Riffer::Tool
   # @rbs content: String
   # @rbs return: Riffer::Tools::Response
   def call(context:, path:, content:)
-    resolved = File.expand_path(path, Dir.pwd)
+    resolved = File.expand_path(path, context&.[](:cwd))
     FileUtils.mkdir_p(File.dirname(resolved))
     File.write(resolved, content)
 

data/lib/riffer/rig/version.rb

@@ -2,6 +2,6 @@
 
 module Riffer
   module Rig
-    VERSION = '0.5.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/riffer/rig.rb

@@ -6,36 +6,31 @@ require_relative 'rig/version'
 
 loader = Zeitwerk::Loader.for_gem_extension(Riffer)
 loader.ignore("#{__dir__}/rig/version.rb")
-loader.inflector.inflect('cli' => 'CLI', 'repl' => 'REPL', 'ui' => 'UI')
+loader.inflector.inflect('cli' => 'CLI')
 loader.setup
 
 module Riffer::Rig
   # @rbs self.@extensions: Hash[String, Riffer::Rig::Extension]
   @extensions = {} #: Hash[String, Riffer::Rig::Extension]
 
-  # Records an extension block in the process registry and returns the
-  # extension object. Re-recording a name replaces the block.
-  #
-  #   Riffer::Rig.extension('git') do |rig|
-  #     rig.tool GitLog
-  #   end
-  #
   # @rbs name: String
   # @rbs requires: String?
   # @rbs &block: (::Riffer::Rig::Registrar) -> void
   # @rbs return: Riffer::Rig::Extension
   def self.extension(name, requires: nil, &)
-    ext = Extension.new(name, requires: requires, &)
-    if ext.requires && !ext.requires.satisfied_by?(Gem::Version.new(Riffer::Rig::VERSION))
-      raise Riffer::ArgumentError,
-            "extension #{name} requires riffer-rig #{ext.requires}, found #{Riffer::Rig::VERSION}"
-    end
-
-    @extensions[name] = ext
+    # Keyed by name so reloading a file replaces its block rather than
+    # duplicating it.
+    @extensions[name] = Extension.new(name, requires: requires, &)
   end
 
   # @rbs return: Hash[String, Riffer::Rig::Extension]
   def self.extensions
     @extensions.dup
   end
+
+  # @rbs name: Symbol?
+  # @rbs return: Riffer::Rig::Extension | Array[Riffer::Rig::Extension]
+  def self.bundled(name = nil)
+    name ? Bundled::BY_NAME.fetch(name) : Bundled::BY_NAME.values
+  end
 end

data/sig/generated/riffer/rig/bundled/agents_md.rbs

@@ -0,0 +1,5 @@
+# Generated from lib/riffer/rig/bundled/agents_md.rb with RBS::Inline
+
+module Riffer::Rig::Bundled
+  AgentsMd: Riffer::Rig::Extension
+end

data/sig/generated/riffer/rig/bundled/bash.rbs

@@ -0,0 +1,5 @@
+# Generated from lib/riffer/rig/bundled/bash.rb with RBS::Inline
+
+module Riffer::Rig::Bundled
+  Bash: Riffer::Rig::Extension
+end

data/sig/generated/riffer/rig/bundled/edit.rbs

@@ -0,0 +1,5 @@
+# Generated from lib/riffer/rig/bundled/edit.rb with RBS::Inline
+
+module Riffer::Rig::Bundled
+  Edit: Riffer::Rig::Extension
+end

data/sig/generated/riffer/rig/bundled/mcp.rbs

@@ -0,0 +1,5 @@
+# Generated from lib/riffer/rig/bundled/mcp.rb with RBS::Inline
+
+module Riffer::Rig::Bundled
+  Mcp: Riffer::Rig::Extension
+end

data/sig/generated/riffer/rig/bundled/read.rbs

@@ -0,0 +1,5 @@
+# Generated from lib/riffer/rig/bundled/read.rb with RBS::Inline
+
+module Riffer::Rig::Bundled
+  Read: Riffer::Rig::Extension
+end

data/sig/generated/riffer/rig/bundled/skills.rbs

@@ -0,0 +1,5 @@
+# Generated from lib/riffer/rig/bundled/skills.rb with RBS::Inline
+
+module Riffer::Rig::Bundled
+  Skills: Riffer::Rig::Extension
+end

data/sig/generated/riffer/rig/bundled/write.rbs

@@ -0,0 +1,5 @@
+# Generated from lib/riffer/rig/bundled/write.rb with RBS::Inline
+
+module Riffer::Rig::Bundled
+  Write: Riffer::Rig::Extension
+end

data/sig/generated/riffer/rig/bundled.rbs

@@ -0,0 +1,5 @@
+# Generated from lib/riffer/rig/bundled.rb with RBS::Inline
+
+module Riffer::Rig::Bundled
+  BY_NAME: Hash[Symbol, Riffer::Rig::Extension]
+end

data/sig/generated/riffer/rig/cli/flags.rbs

@@ -0,0 +1,40 @@
+# Generated from lib/riffer/rig/cli/flags.rb with RBS::Inline
+
+class Riffer::Rig::CLI::Flags
+  BANNER: String
+
+  # @dynamic model, extensions, skills, agents_md, tools, max_steps, help
+  attr_reader model: String?
+
+  attr_reader extensions: bool
+
+  attr_reader skills: bool
+
+  attr_reader agents_md: bool
+
+  attr_reader help: bool
+
+  attr_reader tools: Array[String]?
+
+  attr_reader max_steps: Integer?
+
+  # @rbs argv: Array[String]
+  # @rbs return: Riffer::Rig::CLI::Flags | String
+  def self.parse: (Array[String] argv) -> (Riffer::Rig::CLI::Flags | String)
+
+  # @rbs return: String
+  def self.usage: () -> String
+
+  # @rbs return: OptionParser
+  def self.parser: () -> OptionParser
+
+  # @rbs model: String?
+  # @rbs extensions: bool
+  # @rbs skills: bool
+  # @rbs agents_md: bool
+  # @rbs tools: Array[String]?
+  # @rbs max_steps: Integer?
+  # @rbs help: bool
+  # @rbs return: void
+  def initialize: (?model: String?, ?extensions: bool, ?skills: bool, ?agents_md: bool, ?tools: Array[String]?, ?max_steps: Integer?, ?help: bool) -> void
+end

data/sig/generated/riffer/rig/cli.rbs

@@ -1,41 +1,44 @@
 # Generated from lib/riffer/rig/cli.rb with RBS::Inline
 
 module Riffer::Rig::CLI
-  PROVIDER_URLS: Hash[String, String]
+  PRINT_FLAGS: Array[String]
 
-  # @rbs output: IO
+  ACP_COMMAND: ::String
+
+  USAGE_ERROR: ::Integer
+
+  # @rbs argv: Array[String]
   # @rbs input: IO
+  # @rbs output: IO
+  # @rbs error: IO
+  # @rbs env: Riffer::Rig::Env | Riffer::Rig::Env::Invalid
+  # @rbs cwd: String
+  # @rbs home: String
   # @rbs return: Integer
-  def start: (?output: IO, ?input: IO) -> Integer
+  def start: (?Array[String] argv, ?input: IO, ?output: IO, ?error: IO, ?env: Riffer::Rig::Env | Riffer::Rig::Env::Invalid, ?cwd: String, ?home: String) -> Integer
 
   private
 
-  # @rbs provider: String?
-  # @rbs api_key: String
-  # @rbs return: void
-  def configure_provider: (String? provider, String api_key) -> void
-
-  # @rbs provider: String?
-  # @rbs theme: Riffer::Rig::UI::Theme
-  # @rbs output: IO
+  # @rbs flags: Riffer::Rig::CLI::Flags
   # @rbs input: IO
-  # @rbs return: String?
-  def onboard: (String? provider, Riffer::Rig::UI::Theme theme, output: IO, input: IO) -> String?
-
-  # @rbs provider: String?
-  # @rbs return: String
-  def env_var_for: (String? provider) -> String
+  # @rbs output: IO
+  # @rbs env: Riffer::Rig::Env | Riffer::Rig::Env::Invalid
+  # @rbs cwd: String
+  # @rbs home: String
+  # @rbs return: Integer
+  def terminal: (Riffer::Rig::CLI::Flags flags, input: IO, output: IO, env: Riffer::Rig::Env | Riffer::Rig::Env::Invalid, cwd: String, home: String) -> Integer
 
-  # @rbs input: IO
-  # @rbs return: String?
-  def read_secret: (IO input) -> String?
+  # @rbs name: String
+  # @rbs error: IO
+  # @rbs return: Integer
+  def unavailable: (String name, IO error) -> Integer
 
-  # @rbs theme: Riffer::Rig::UI::Theme
-  # @rbs animator: Riffer::Rig::UI::Animator
-  # @rbs model: String
-  # @rbs return: void
-  def reveal_banner: (Riffer::Rig::UI::Theme theme, Riffer::Rig::UI::Animator animator, String model) -> void
+  # @rbs message: String
+  # @rbs error: IO
+  # @rbs return: Integer
+  def refuse: (String message, IO error) -> Integer
 
-  # @rbs return: String
-  def count_skills: () -> String
+  # @rbs output: IO
+  # @rbs return: Integer
+  def help: (IO output) -> Integer
 end

data/sig/generated/riffer/rig/command/context.rbs

@@ -0,0 +1,50 @@
+# Generated from lib/riffer/rig/command/context.rb with RBS::Inline
+
+class Riffer::Rig::Command::Context
+  @command: String
+
+  @emit: ^(Riffer::Rig::Events::_Event) -> void
+
+  @turn: ^(String) -> void
+
+  # @dynamic args, runtime, host, settings
+  attr_reader args: String
+
+  attr_reader runtime: Riffer::Rig::Runtime
+
+  attr_reader host: Riffer::Rig::Hosts::_Host
+
+  attr_reader settings: Hash[Symbol, untyped]
+
+  # @rbs command: String
+  # @rbs args: String
+  # @rbs runtime: Riffer::Rig::Runtime
+  # @rbs host: Riffer::Rig::Hosts::_Host
+  # @rbs settings: Hash[Symbol, untyped]
+  # @rbs emit: ^(Riffer::Rig::Events::_Event) -> void
+  # @rbs turn: ^(String) -> void
+  # @rbs return: void
+  def initialize: (String command, String args, runtime: Riffer::Rig::Runtime, host: Riffer::Rig::Hosts::_Host, settings: Hash[Symbol, untyped], emit: ^(Riffer::Rig::Events::_Event) -> void, turn: ^(String) -> void) -> void
+
+  # @rbs text: String
+  # @rbs return: nil
+  def say: (String text) -> nil
+
+  # @rbs event: Riffer::Rig::Events::_Event
+  # @rbs return: nil
+  def emit: (Riffer::Rig::Events::_Event event) -> nil
+
+  # @rbs text: String
+  # @rbs return: nil
+  def prompt: (String text) -> nil
+
+  # @rbs question: String?
+  # @rbs options: Array[String]?
+  # @rbs secret: bool
+  # @rbs return: String?
+  def ask: (?String? question, ?options: Array[String]?, ?secret: bool) -> String?
+
+  # @rbs question: String?
+  # @rbs return: bool
+  def confirm: (?String? question) -> bool
+end

data/sig/generated/riffer/rig/command.rbs

@@ -0,0 +1,23 @@
+# Generated from lib/riffer/rig/command.rb with RBS::Inline
+
+class Riffer::Rig::Command
+  @block: ^(Riffer::Rig::Command::Context) -> void
+
+  # @dynamic name, description, extension
+  attr_reader name: String
+
+  attr_reader description: String
+
+  attr_reader extension: String
+
+  # @rbs name: String
+  # @rbs description: String
+  # @rbs extension: String
+  # @rbs &block: (Riffer::Rig::Command::Context) -> void
+  # @rbs return: void
+  def initialize: (String name, description: String, extension: String) { (Riffer::Rig::Command::Context) -> void } -> void
+
+  # @rbs ctx: Riffer::Rig::Command::Context
+  # @rbs return: void
+  def call: (Riffer::Rig::Command::Context ctx) -> void
+end

data/sig/generated/riffer/rig/commands/model.rbs

@@ -0,0 +1,27 @@
+# Generated from lib/riffer/rig/commands/model.rb with RBS::Inline
+
+module Riffer::Rig::Commands::Model
+  HINT: String
+
+  SAVE_UNAVAILABLE: ::String
+
+  # @rbs return: Riffer::Rig::Command
+  def command: () -> Riffer::Rig::Command
+
+  # @rbs ctx: Riffer::Rig::Command::Context
+  # @rbs return: void
+  def run: (Riffer::Rig::Command::Context ctx) -> void
+
+  private
+
+  # @rbs model: String
+  # @rbs provider: String
+  # @rbs missing: Array[Symbol]
+  # @rbs return: String
+  def refusal: (String model, String provider, Array[Symbol] missing) -> String
+
+  # @rbs provider: String
+  # @rbs credentials: Hash[Symbol, Hash[Symbol, String]]
+  # @rbs return: Array[Symbol]
+  def missing_credentials: (String provider, Hash[Symbol, Hash[Symbol, String]] credentials) -> Array[Symbol]
+end

data/sig/generated/riffer/rig/commands/skill.rbs

@@ -0,0 +1,12 @@
+# Generated from lib/riffer/rig/commands/skill.rb with RBS::Inline
+
+module Riffer::Rig::Commands::Skill
+  # @rbs skill: Riffer::Skills::Frontmatter
+  # @rbs return: Riffer::Rig::Command
+  def command: (Riffer::Skills::Frontmatter skill) -> Riffer::Rig::Command
+
+  # @rbs ctx: Riffer::Rig::Command::Context
+  # @rbs skill: Riffer::Skills::Frontmatter
+  # @rbs return: void
+  def run: (Riffer::Rig::Command::Context ctx, Riffer::Skills::Frontmatter skill) -> void
+end

data/sig/generated/riffer/rig/commands.rbs

@@ -0,0 +1,4 @@
+# Generated from lib/riffer/rig/commands.rb with RBS::Inline
+
+module Riffer::Rig::Commands
+end

data/sig/generated/riffer/rig/credentials/resolution.rbs

@@ -0,0 +1,13 @@
+# Generated from lib/riffer/rig/credentials/resolution.rb with RBS::Inline
+
+class Riffer::Rig::Credentials::Resolution
+  # @dynamic values, missing
+  attr_reader values: Hash[Symbol, String]
+
+  attr_reader missing: Array[Symbol]
+
+  # @rbs values: Hash[Symbol, String]
+  # @rbs missing: Array[Symbol]
+  # @rbs return: void
+  def initialize: (values: Hash[Symbol, String], missing: Array[Symbol]) -> void
+end

data/sig/generated/riffer/rig/credentials.rbs

@@ -1,56 +1,85 @@
 # Generated from lib/riffer/rig/credentials.rb with RBS::Inline
 
-# Reads and writes API keys for each supported provider in
-# <tt>~/.riffer/auth.json</tt>.
-#
-# Keys are stored under the provider name, e.g.:
-#
-#   {
-#     "anthropic": "sk-ant-...",
-#     "openai": "sk-...",
-#     "gemini": "...",
-#     "openrouter": "sk-or-..."
-#   }
-#
-# The environment variable checked per provider:
-#
-#   anthropic  → ANTHROPIC_API_KEY
-#   openai     → OPENAI_API_KEY
-#   gemini     → GEMINI_API_KEY
-#   openrouter → OPENROUTER_API_KEY
 module Riffer::Rig::Credentials
   PATH: String
 
-  PROVIDER_ENV_VARS: Hash[String, String]
+  ENTRY_TYPE: ::String
 
-  # Returns the API key for +provider+, checking the environment variable first,
-  # then the stored file. Returns +nil+ if no key is available.
-  #
-  # @rbs provider: String?
-  # @rbs path: String
-  # @rbs return: String?
-  def api_key_for: (String? provider, ?path: String) -> String?
+  # @rbs identifier: String | Symbol
+  # @rbs host: Riffer::Rig::Hosts::_Host
+  # @rbs setup: Riffer::Rig::ProviderSetup
+  # @rbs env: Riffer::Rig::Env
+  # @rbs auth_path: String
+  # @rbs settings_path: String
+  # @rbs return: Resolution
+  def resolve: (String | Symbol identifier, host: Riffer::Rig::Hosts::_Host, ?setup: Riffer::Rig::ProviderSetup, ?env: Riffer::Rig::Env, ?auth_path: String, ?settings_path: String) -> Resolution
 
-  # Saves an API key for +provider+ to the auth file with 0600 permissions.
-  #
-  # @rbs provider: String
-  # @rbs key: String
-  # @rbs path: String
-  # @rbs return: String
-  def save_api_key: (String provider, String key, ?path: String) -> String
+  # @rbs identifier: String | Symbol
+  # @rbs values: Hash[Symbol, String]
+  # @rbs config: Riffer::Config
+  # @rbs return: void
+  def apply: (String | Symbol identifier, Hash[Symbol, String] values, ?config: Riffer::Config) -> void
+
+  # @rbs identifier: String | Symbol
+  # @rbs values: Hash[Symbol, String]
+  # @rbs setup: Riffer::Rig::ProviderSetup
+  # @rbs auth_path: String
+  # @rbs settings_path: String
+  # @rbs return: void
+  def store: (String | Symbol identifier, Hash[Symbol, String] values, ?setup: Riffer::Rig::ProviderSetup, ?auth_path: String, ?settings_path: String) -> void
+
+  # @rbs identifier: String | Symbol
+  # @rbs auth_path: String
+  # @rbs settings_path: String
+  # @rbs return: void
+  def remove: (String | Symbol identifier, ?auth_path: String, ?settings_path: String) -> void
+
+  # @rbs identifier: String | Symbol
+  # @rbs setup: Riffer::Rig::ProviderSetup
+  # @rbs env: Riffer::Rig::Env
+  # @rbs auth_path: String
+  # @rbs return: :env | :stored | :chain | :missing
+  def status: (String | Symbol identifier, ?setup: Riffer::Rig::ProviderSetup, ?env: Riffer::Rig::Env, ?auth_path: String) -> (:env | :stored | :chain | :missing)
 
   private
 
-  # @rbs provider: String?
-  # @rbs path: String
+  # @rbs fields: Array[Riffer::Rig::ProviderSetup::Field]
+  # @rbs identifier: String | Symbol
+  # @rbs host: Riffer::Rig::Hosts::_Host
+  # @rbs return: Hash[Symbol, String]
+  def ask_for: (Array[Riffer::Rig::ProviderSetup::Field] fields, String | Symbol identifier, Riffer::Rig::Hosts::_Host host) -> Hash[Symbol, String]
+
+  # @rbs field: Riffer::Rig::ProviderSetup::Field
+  # @rbs secrets: Hash[String, String]
+  # @rbs plain: Hash[String, String]
+  # @rbs env: Riffer::Rig::Env
+  # @rbs return: String?
+  def stored_value: (Riffer::Rig::ProviderSetup::Field field, Hash[String, String] secrets, Hash[String, String] plain, Riffer::Rig::Env env) -> String?
+
+  # @rbs value: String?
+  # @rbs env: Riffer::Rig::Env
+  # @rbs return: String?
+  def expand: (String? value, Riffer::Rig::Env env) -> String?
+
+  # @rbs command: String
+  # @rbs return: String?
+  def run: (String command) -> String?
+
+  # @rbs value: String?
   # @rbs return: String?
-  def key_from_file: (String? provider, String path) -> String?
+  def presence: (String? value) -> String?
 
-  # The parsed auth file, or an empty hash when the file is absent or
-  # malformed. Non-string values can't be keys, so they're dropped here rather
-  # than re-checked by every reader.
-  #
+  # @rbs identifier: String | Symbol
   # @rbs path: String
   # @rbs return: Hash[String, String]
-  def read: (String path) -> Hash[String, String]
+  def stored_secrets: (String | Symbol identifier, String path) -> Hash[String, String]
+
+  # @rbs path: String
+  # @rbs return: Hash[String, Hash[String, String]]
+  def read_auth: (String path) -> Hash[String, Hash[String, String]]
+
+  # @rbs path: String
+  # @rbs entries: Hash[String, Hash[String, String]]
+  # @rbs return: void
+  def write_auth: (String path, Hash[String, Hash[String, String]] entries) -> void
 end

data/sig/generated/riffer/rig/directories.rbs

@@ -0,0 +1,11 @@
+# Generated from lib/riffer/rig/directories.rb with RBS::Inline
+
+module Riffer::Rig::Directories
+  # @rbs dir: String
+  # @rbs return: Array[String]
+  def ancestors: (String dir) -> Array[String]
+
+  # @rbs cwd: String
+  # @rbs return: Array[String]
+  def up_to_repo_root: (String cwd) -> Array[String]
+end

data/sig/generated/riffer/rig/env/invalid.rbs

@@ -0,0 +1,10 @@
+# Generated from lib/riffer/rig/env/invalid.rb with RBS::Inline
+
+class Riffer::Rig::Env::Invalid
+  # @dynamic message
+  attr_reader message: String
+
+  # @rbs message: String
+  # @rbs return: void
+  def initialize: (String message) -> void
+end