riffer-rig 0.7.0 → 0.9.0

data/lib/riffer/rig/terminal/renderer.rb

@@ -1,32 +1,47 @@
 # frozen_string_literal: true
 
+require 'io/console'
 require 'json'
 
 class Riffer::Rig::Terminal::Renderer
   RESULT_PREVIEW_LIMIT = 200 #: Integer
 
+  ARGUMENT_PREVIEW_LIMIT = 60 #: Integer
+
+  PROSE_INDENT = 2 #: Integer
+
+  TOOL_CALL_INDENT = 4 #: Integer
+
+  TOOL_RESULT_INDENT = 6 #: Integer
+
   # @rbs @io: IO
   # @rbs @theme: Riffer::Rig::Terminal::Theme
   # @rbs @smoother: Riffer::Rig::Terminal::Smoother | PassThroughSmoother
   # @rbs @cursor: Riffer::Rig::Terminal::Cursor
   # @rbs @prose_gap_pending: bool
+  # @rbs @width: Integer?
+  # @rbs @wrapper: Riffer::Rig::Terminal::Wrapper
 
   # @rbs io: IO
   # @rbs theme: Riffer::Rig::Terminal::Theme
   # @rbs smoother: Riffer::Rig::Terminal::Smoother | PassThroughSmoother
   # @rbs cursor: Riffer::Rig::Terminal::Cursor
+  # @rbs width: Integer?
   # @rbs return: void
   def initialize(
     io: $stdout,
     theme: Riffer::Rig::Terminal::Theme.for(io),
     smoother: PassThroughSmoother.new(io),
-    cursor: Riffer::Rig::Terminal::Cursor.new(io: io, theme: theme)
+    cursor: Riffer::Rig::Terminal::Cursor.new(io: io, theme: theme),
+    width: nil
   )
     @io = io
     @theme = theme
     @smoother = smoother
     @cursor = cursor
     @prose_gap_pending = false
+    @width = width
+    @wrapper = new_wrapper
   end
 
   # @rbs event: Riffer::StreamEvents::TextDelta | Riffer::StreamEvents::ToolCallDone | Riffer::StreamEvents::Interrupt
@@ -36,7 +51,7 @@ class Riffer::Rig::Terminal::Renderer
     when Riffer::StreamEvents::TextDelta
       render_prose(event.content)
     when Riffer::StreamEvents::ToolCallDone
-      render_tool_activity(2) { @theme.cyan("⚙ #{event.name}(#{format_arguments(event.arguments)})") }
+      render_tool_activity(TOOL_CALL_INDENT) { "⚙ #{event.name}(#{format_arguments(event.arguments)})" }
     when Riffer::StreamEvents::Interrupt
       render_block(0) { @theme.dim("[interrupted: #{event.reason}]") }
     end
@@ -73,7 +88,12 @@ class Riffer::Rig::Terminal::Renderer
   def usage(usage, session)
     return unless usage && session
 
-    render_block(0) { @theme.dim(usage_line(usage, session)) }
+    flush_prose
+    @prose_gap_pending = true
+    @io.puts
+    text = (@wrapper << usage_line(usage, session)) + @wrapper.flush
+    @io.print(@theme.dim(text)) unless text.empty?
+    @io.flush
   end
 
   # @rbs return: void
@@ -115,13 +135,14 @@ class Riffer::Rig::Terminal::Renderer
 
   # @rbs return: void
   def end_turn
+    flush_prose
     @smoother.finish
     @cursor.show
   end
 
   # @rbs return: void
   def drain
-    @smoother.drain
+    flush_prose
   end
 
   # @rbs message: Riffer::Messages::Base
@@ -130,9 +151,9 @@ class Riffer::Rig::Terminal::Renderer
     return unless message.is_a?(Riffer::Messages::Tool)
 
     open_tool_activity
-    line = "↳ #{preview(message.content)}"
+    line = fit("↳ #{preview(message.content)}", TOOL_RESULT_INDENT)
     styled = message.error? ? @theme.red(line) : @theme.dim(line)
-    @io.print("    #{styled}\n")
+    @io.print("#{' ' * TOOL_RESULT_INDENT}#{styled}\n")
     @io.flush
   end
 
@@ -167,7 +188,7 @@ class Riffer::Rig::Terminal::Renderer
   # @rbs &block: () -> String
   # @rbs return: void
   def render_block(indent, &)
-    drain
+    flush_prose
     @io.puts
     @prose_gap_pending = true
     @io.puts((' ' * indent) + yield)
@@ -182,8 +203,10 @@ class Riffer::Rig::Terminal::Renderer
     if @prose_gap_pending
       @prose_gap_pending = false
       @io.print("\n")
+      @wrapper = new_wrapper
     end
-    @smoother << content
+    emit = @wrapper << content
+    @smoother << emit unless emit.empty?
   end
 
   # @rbs indent: Integer
@@ -191,7 +214,7 @@ class Riffer::Rig::Terminal::Renderer
   # @rbs return: void
   def render_tool_activity(indent, &)
     open_tool_activity
-    @io.puts((' ' * indent) + yield)
+    @io.puts((' ' * indent) + @theme.cyan(fit(yield, indent)))
     @io.flush
   end
 
@@ -201,7 +224,7 @@ class Riffer::Rig::Terminal::Renderer
     # group; the group stays open so the prose after it pays the closing gap.
     return if @prose_gap_pending
 
-    drain
+    flush_prose
     @io.puts
     @prose_gap_pending = true
   end
@@ -224,7 +247,7 @@ class Riffer::Rig::Terminal::Renderer
   # @rbs return: String
   def format_arguments(arguments)
     parsed = JSON.parse(arguments)
-    parsed.map { |key, value| "#{key}: #{value.inspect}" }.join(', ')
+    parsed.map { |key, value| "#{key}: #{elide(value.inspect, ARGUMENT_PREVIEW_LIMIT)}" }.join(', ')
   rescue JSON::ParserError
     arguments
   end
@@ -233,8 +256,58 @@ class Riffer::Rig::Terminal::Renderer
   # @rbs return: String
   def preview(content)
     first_line = content.to_s.lines.first.to_s.chomp
-    return first_line if first_line.length <= RESULT_PREVIEW_LIMIT
+    elide(first_line, RESULT_PREVIEW_LIMIT)
+  end
+
+  # @rbs text: String
+  # @rbs limit: Integer
+  # @rbs return: String
+  def elide(text, limit)
+    return text if text.length <= limit
+    return '…' if limit < 1
+
+    "#{text[0, limit - 1]}…"
+  end
+
+  # Truncation is what keeps an indented line from wrapping: a wrapped
+  # continuation starts at column zero and destroys the prose > tool nesting.
+  # @rbs text: String
+  # @rbs indent: Integer
+  # @rbs return: String
+  def fit(text, indent)
+    width = detect_width
+    return text unless width
+
+    elide(text, width - indent)
+  end
+
+  # @rbs return: void
+  def flush_prose
+    emit = @wrapper.flush
+    @smoother << emit unless emit.empty?
+    @smoother.drain
+  end
+
+  # @rbs return: Riffer::Rig::Terminal::Wrapper
+  def new_wrapper
+    Riffer::Rig::Terminal::Wrapper.new(width: detect_width, indent: PROSE_INDENT)
+  end
+
+  # @rbs return: Integer?
+  def detect_width
+    @width || detected_width
+  end
 
-    "#{first_line[0, RESULT_PREVIEW_LIMIT]}…"
+  # winsize raises on ttys with no queryable window size and some pty
+  # wrappers report zero columns; either way the real width is unknowable,
+  # and nil leaves every consumer un-fitted rather than mis-fitted.
+  # @rbs return: Integer?
+  def detected_width
+    return nil unless @io.tty?
+
+    width = @io.winsize[1]
+    width.positive? ? width : nil
+  rescue SystemCallError
+    nil
   end
 end

data/lib/riffer/rig/terminal/wrapper.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+class Riffer::Rig::Terminal::Wrapper
+  # @rbs @width: Integer?
+  # @rbs @indent: Integer
+  # @rbs @line: String
+
+  # @rbs width: Integer?
+  # @rbs indent: Integer
+  # @rbs return: void
+  def initialize(width:, indent:)
+    @width = width
+    @indent = indent
+    @line = +''
+  end
+
+  # @rbs text: String
+  # @rbs return: String
+  def <<(text)
+    @line << text
+    out = +''
+    while (logical = take_line)
+      out << physical_lines(logical)
+    end
+    out
+  end
+
+  # @rbs return: String
+  def flush
+    out = +''
+    out << physical_lines(@line) unless @line.strip.empty?
+    @line = +''
+    out
+  end
+
+  private
+
+  # @rbs return: String?
+  def take_line
+    if (index = @line.index("\n"))
+      @line.slice!(0, index + 1).to_s.chomp
+    elsif overfull?
+      take_overfull_head
+    end
+  end
+
+  # @rbs return: bool
+  def overfull?
+    width = @width
+    return false unless width
+
+    @line.length > width - @indent
+  end
+
+  # @rbs return: String
+  def take_overfull_head
+    limit = (@width || 0) - @indent
+    head = @line[0, limit].to_s
+    if (space = head.rindex(' '))
+      @line.slice!(0, space + 1)
+      head[0, space].to_s
+    else
+      @line.slice!(0, limit).to_s
+    end
+  end
+
+  # @rbs logical: String
+  # @rbs return: String
+  def physical_lines(logical)
+    return "\n" if logical.empty?
+
+    wrap_words(logical).map { |line| "#{indent}#{line}\n" }.join
+  end
+
+  # @rbs return: String
+  def indent
+    ' ' * @indent
+  end
+
+  # @rbs text: String
+  # @rbs return: Array[String]
+  def wrap_words(text)
+    width = @width
+    limit = width ? width - @indent : nil
+    return [text] unless limit
+
+    out = [] #: Array[String]
+    current = nil #: String?
+    text.split.each do |word|
+      if current
+        if current.length + 1 + word.length <= limit
+          current = "#{current} #{word}"
+          next
+        end
+        out << current
+      end
+      out << word.slice!(0, limit).to_s while word.length > limit
+      current = word unless word.empty?
+    end
+    out << current if current
+    out
+  end
+end

data/lib/riffer/rig/trust.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'fileutils'
+
+module Riffer::Rig::Trust
+  extend self
+
+  # @rbs path: String
+  # @rbs return: Hash[String, bool]
+  def read(path)
+    return {} unless File.file?(path)
+
+    source = JSON.parse(File.read(path))
+    source.is_a?(Hash) ? source.select { |_file, decision| [true, false].include?(decision) } : {}
+  rescue JSON::ParserError
+    {}
+  end
+
+  # @rbs path: String
+  # @rbs file: String
+  # @rbs decision: bool
+  # @rbs return: void
+  def store(path, file, decision)
+    write(path, read(path).merge(file => decision))
+  end
+
+  private
+
+  # @rbs path: String
+  # @rbs document: Hash[String, bool]
+  # @rbs return: void
+  def write(path, document)
+    FileUtils.mkdir_p(File.dirname(path), mode: 0o700)
+    File.write(path, JSON.pretty_generate(document))
+  end
+end

data/lib/riffer/rig/version.rb

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

data/lib/riffer/rig.rb

@@ -6,7 +6,7 @@ require_relative 'rig/version'
 
 loader = Zeitwerk::Loader.for_gem_extension(Riffer)
 loader.ignore("#{__dir__}/rig/version.rb")
-loader.inflector.inflect('cli' => 'CLI')
+loader.inflector.inflect('cli' => 'CLI', 'sdk' => 'SDK', 'jsonl' => 'JSONL')
 loader.setup
 
 module Riffer::Rig
@@ -28,6 +28,12 @@ module Riffer::Rig
     @extensions.dup
   end
 
+  # @rbs identifier: String | Symbol
+  # @rbs return: Hash[Symbol, String]?
+  def self.credentials(identifier)
+    Credentials.read(identifier)
+  end
+
   # @rbs name: Symbol?
   # @rbs return: Riffer::Rig::Extension | Array[Riffer::Rig::Extension]
   def self.bundled(name = nil)

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

@@ -3,7 +3,7 @@
 class Riffer::Rig::CLI::Flags
   BANNER: String
 
-  # @dynamic model, extensions, skills, agents_md, tools, max_steps, help
+  # @dynamic model, extensions, skills, agents_md, tools, max_steps, help, save
   attr_reader model: String?
 
   attr_reader extensions: bool
@@ -18,6 +18,8 @@ class Riffer::Rig::CLI::Flags
 
   attr_reader max_steps: Integer?
 
+  attr_reader save: bool
+
   # @rbs argv: Array[String]
   # @rbs return: Riffer::Rig::CLI::Flags | String
   def self.parse: (Array[String] argv) -> (Riffer::Rig::CLI::Flags | String)
@@ -34,7 +36,8 @@ class Riffer::Rig::CLI::Flags
   # @rbs agents_md: bool
   # @rbs tools: Array[String]?
   # @rbs max_steps: Integer?
+  # @rbs save: bool
   # @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
+  def initialize: (?model: String?, ?extensions: bool, ?skills: bool, ?agents_md: bool, ?tools: Array[String]?, ?max_steps: Integer?, ?save: bool, ?help: bool) -> void
 end

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

@@ -0,0 +1,35 @@
+# Generated from lib/riffer/rig/commands/auth.rb with RBS::Inline
+
+module Riffer::Rig::Commands::Auth
+  USAGE: 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 return: String
+  def hint: () -> String
+
+  # @rbs return: String
+  def list: () -> String
+
+  # @rbs ctx: Riffer::Rig::Command::Context
+  # @rbs identifier: String
+  # @rbs return: void
+  def rerun: (Riffer::Rig::Command::Context ctx, String identifier) -> void
+
+  # @rbs ctx: Riffer::Rig::Command::Context
+  # @rbs identifier: String
+  # @rbs return: void
+  def remove: (Riffer::Rig::Command::Context ctx, String identifier) -> void
+
+  # @rbs provider: Symbol
+  # @rbs missing: Array[Symbol]
+  # @rbs return: String
+  def refusal: (Symbol provider, Array[Symbol] missing) -> String
+end

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

@@ -1,9 +1,7 @@
 # Generated from lib/riffer/rig/commands/model.rb with RBS::Inline
 
 module Riffer::Rig::Commands::Model
-  HINT: String
-
-  SAVE_UNAVAILABLE: ::String
+  SAVE: String
 
   # @rbs return: Riffer::Rig::Command
   def command: () -> Riffer::Rig::Command
@@ -14,14 +12,28 @@ module Riffer::Rig::Commands::Model
 
   private
 
+  # @rbs return: String
+  def hint: () -> String
+
+  # The same setup flows the Loader runs when it builds a Runtime: the
+  # provider's SDK gem, then its credentials, asked for when the host can ask.
+  # @rbs ctx: Riffer::Rig::Command::Context
   # @rbs model: String
   # @rbs provider: String
-  # @rbs missing: Array[Symbol]
-  # @rbs return: String
-  def refusal: (String model, String provider, Array[Symbol] missing) -> String
+  # @rbs return: bool
+  def ready?: (Riffer::Rig::Command::Context ctx, String model, String provider) -> bool
+
+  # @rbs ctx: Riffer::Rig::Command::Context
+  # @rbs model: String
+  # @rbs provider: String
+  # @rbs setup: Riffer::Rig::ProviderSetup
+  # @rbs return: bool
+  def credentials_ready?: (Riffer::Rig::Command::Context ctx, String model, String provider, Riffer::Rig::ProviderSetup setup) -> bool
 
+  # @rbs ctx: Riffer::Rig::Command::Context
+  # @rbs model: 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]
+  # @rbs missing: Array[Symbol]
+  # @rbs return: void
+  def refuse: (Riffer::Rig::Command::Context ctx, String model, String provider, Array[Symbol] missing) -> void
 end

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

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

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

@@ -5,6 +5,8 @@ module Riffer::Rig::Credentials
 
   ENTRY_TYPE: ::String
 
+  @applied: Hash[Symbol, Hash[Symbol, String]]
+
   # @rbs identifier: String | Symbol
   # @rbs host: Riffer::Rig::Hosts::_Host
   # @rbs setup: Riffer::Rig::ProviderSetup
@@ -14,12 +16,18 @@ module Riffer::Rig::Credentials
   # @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
 
+  # A registered extension provider has no Riffer::Config member, so the
+  # assignment stays built-ins-only.
   # @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 return: Hash[Symbol, String]?
+  def read: (String | Symbol identifier) -> Hash[Symbol, String]?
+
   # @rbs identifier: String | Symbol
   # @rbs values: Hash[Symbol, String]
   # @rbs setup: Riffer::Rig::ProviderSetup

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

@@ -29,6 +29,10 @@ class Riffer::Rig::Extension
   # @rbs return: void
   def run: (Riffer::Rig::Registrar registrar) -> void
 
+  # @rbs registrar: Riffer::Rig::Registrar
+  # @rbs return: StandardError?
+  def load_into: (Riffer::Rig::Registrar registrar) -> StandardError?
+
   private
 
   # @rbs requirement: Gem::Requirement?