riffer 0.50.1 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6bfdc8b4676c2d368fd17ff5b709e802549a01580845e9c12c9f352d395e128
-  data.tar.gz: 1567b5498abacc5fe2c820dee04d18bee016465108eea6c1172f03954359bdc6
+  metadata.gz: 3a69720c69304a2b2ac26a5b03a3fa0866a58434687fc5745563a6a4dd0afc7c
+  data.tar.gz: aa9b4937c096c1e152b941f426b7f6b119d6b90d45935a57a42e9fd0f19ac0bd
 SHA512:
-  metadata.gz: 78c30c4798848f219b2c10f756d2c0caca5a95f2ab705660789a5e557284aa275e9d203a18e37427be63d8cee6858d90a88cb3da7aaf59abff2271a532ed65ec
-  data.tar.gz: a8e8b4a891b42b3b1f83ba50a4fe6affe3f9ecf78a158de8d6696c89ed71c88a2549b5a6f72c134743914abb69e0a34d88e953b700d166be6626d8b92b6a139d
+  metadata.gz: 169697ebceedccc7be95b4f98ddee84a93f48b330b1fe71a1207ad98d79822298e0432e7bb9ab4696ffa2e2709c8df4f795fbd2e6fd33a1643147be2f2cf8870
+  data.tar.gz: eb1eab78a9d50a63ea156b53c951e500944d5ef8ec622811dead87c0427198de9d979a31ec60b0de006d8c6409424d73b605ff7ddf997a88de55bd37eea3d3b1

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.50.1"
+  ".": "0.52.0"
 }

data/CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.52.0](https://github.com/janeapp/riffer/compare/riffer/v0.51.0...riffer/v0.52.0) (2026-10-08)
+
+
+### Features
+
+* **structured_output:** add experimental prompted strategy ([#477](https://github.com/janeapp/riffer/issues/477)) ([f517fe1](https://github.com/janeapp/riffer/commit/f517fe19788fe34167515998a7ac2870605b2228))
+
+## [0.51.0](https://github.com/janeapp/riffer/compare/riffer/v0.50.1...riffer/v0.51.0) (2026-10-07)
+
+
+### Features
+
+* **structured_output:** recover objects wrapped in code fences or prose ([#473](https://github.com/janeapp/riffer/issues/473)) ([59a6d40](https://github.com/janeapp/riffer/commit/59a6d40b08b9f18fcb4ebac24598925f94a9acea))
+
+
+### Bug Fixes
+
+* **agent:** apply the max_steps cap per run, not per conversation ([#478](https://github.com/janeapp/riffer/issues/478)) ([4948e6b](https://github.com/janeapp/riffer/commit/4948e6b9769df084bed8c8a29862067560f800bc))
+
 ## [0.50.1](https://github.com/janeapp/riffer/compare/riffer/v0.50.0...riffer/v0.50.1) (2026-10-02)
 
 

data/docs/AGENTS.md

@@ -168,7 +168,9 @@ end
 
 The LLM response is automatically parsed and validated against the schema. Access the result via `response.structured_output`.
 
-When the response is not valid JSON or does not satisfy the schema, `response.structured_output` is `nil`, `response.outcome.reason` is `:invalid_structured_output`, and `response.outcome.detail` carries the parse or validation message:
+If the response is not valid JSON on its own, Riffer recovers a JSON object wrapped in a code fence (```` ```json ````), surrounded by prose (`Here is the data: {...}`), or wrapped in formatting (`**{...}**`). It parses the span from the first `{` to the last `}`, so a reply whose surrounding text contains other braces, or that holds more than one object, is still rejected; `response.content` keeps the raw text.
+
+When the response contains no well-formed JSON object or does not satisfy the schema, `response.structured_output` is `nil`, `response.outcome.reason` is `:invalid_structured_output`, and `response.outcome.detail` carries the parse or validation message:
 
 ```ruby
 response = SentimentAgent.generate('Analyze: "I love this!"')
@@ -181,6 +183,29 @@ else
 end
 ```
 
+#### Structured output strategy (experimental)
+
+By default Riffer sends the schema through each provider's native structured-output field. Some models reject that field, accept it without enforcing it, or behave differently with it enabled (for example, skipping tool calls). For those, opt the agent into the **experimental** prompted strategy:
+
+```ruby
+class SentimentAgent < Riffer::Agent
+  model 'amazon_bedrock/my-model'
+  instructions 'Analyze the sentiment of the given text.'
+  structured_output strategy: :prompted do
+    required :sentiment, String, description: "positive, negative, or neutral"
+  end
+end
+```
+
+With `strategy: :prompted`, the provider never receives its native structured-output field. Instead, an instruction carrying the JSON Schema is appended to the system instructions on every request of the run (it is not stored in `session.messages`), and the reply is parsed and validated exactly as above: `response.content` is the reply text, `response.structured_output` holds the validated object, and a reply that fails parsing or validation ends with `:invalid_structured_output`. Because nothing forces the model to comply, expect more `:invalid_structured_output` outcomes than with the native strategy.
+
+| Strategy            | Behavior                                                        |
+| ------------------- | --------------------------------------------------------------- |
+| `:native` (default) | Schema sent through the provider's structured-output field      |
+| `:prompted`         | Schema sent in the system prompt; experimental, may change      |
+
+Riffer does not pick a strategy per model — the choice is always yours. The strategy is copied to subclasses and survives [serialization](SERIALIZATION.md). An unknown value raises `Riffer::ArgumentError`. `strategy:` can also be passed with a `Riffer::Params` instance: `structured_output params, strategy: :prompted`.
+
 #### Nested Objects
 
 Use `Hash` with a block to define nested object schemas:

data/docs/AGENT_LIFECYCLE.md

@@ -351,7 +351,7 @@ end
 
 ### response.structured_output
 
-When structured output is configured, the LLM response is parsed as JSON and validated against the schema. The validated result is available as `response.structured_output`:
+When structured output is configured, the LLM response is parsed as JSON and validated against the schema. A JSON object wrapped in a code fence, prose, or formatting is recovered (see [Agents — structured_output](AGENTS.md#structured_output)). The validated result is available as `response.structured_output`:
 
 ```ruby
 response = SentimentAgent.generate('Analyze: "I love this!"')

data/docs/AGENT_LOOP.md

@@ -72,12 +72,12 @@ response = agent.generate('Approved, continue')  # continues where it left off
 
 ### Max Steps Limit
 
-The `max_steps` class method caps the number of LLM call steps in the tool-use loop. When the step count reaches the limit, the loop interrupts automatically with reason `:max_steps`.
+The `max_steps` class method caps the number of LLM call steps in the tool-use loop of a single run. Steps are counted from the last user message in the session, so each new user message starts a fresh budget — prior turns' assistant messages in the history do not count against it. When the step count reaches the limit, the loop interrupts automatically with reason `:max_steps`.
 
 - **When to use:** Safety net to prevent runaway tool-use loops — useful when agents have access to many tools or operate autonomously.
 - **Response:** `response.outcome.reason` is `:max_steps`.
 - **Streaming:** Yields an `Interrupt` event with `reason: :max_steps`.
-- **Resumable:** Yes. Call `generate('Continue')` or `stream('Continue')` on the same agent instance to resume. For cross-process resume, pass persisted messages as an array to a new agent. Pending tool calls are automatically executed before the LLM loop resumes.
+- **Resumable:** Yes. Call `generate('Continue')` or `stream('Continue')` on the same agent instance to resume with a fresh budget, or call `generate` / `stream` with no prompt to resume against the remaining budget. For cross-process resume, pass persisted messages as an array to a new agent; the same rule applies. Pending tool calls are automatically executed before the LLM loop resumes.
 
 ```ruby
 class MyAgent < Riffer::Agent

data/docs/SERIALIZATION.md

@@ -45,6 +45,7 @@ The session is used **as-is**: the rebuilt agent does not prepend anything to it
   model_options:     { temperature: 0.2 },
   max_steps:         8,                        # integer; -1 = unlimited (see below)
   structured_output: { type: "object", … },   # JSON Schema, or null
+  structured_output_strategy: :native,        # :native or :prompted ("native"/"prompted" over JSON)
   tools: [ { name:, description:, parameters_schema:, timeout: }, … ]
 }
 ```
@@ -57,6 +58,8 @@ The session is used **as-is**: the rebuilt agent does not prepend anything to it
 
 Structured output crosses as **provider-neutral JSON Schema** (`Riffer::Params#to_json_schema`), never a provider-rendered schema. `from_h` rebuilds a validating `Riffer::Params` via `Riffer::Params.from_json_schema`, so the rebuilt agent both constrains the model and can `parse_and_validate` responses — rendering provider-correct bytes at call time, the same way an in-code agent does.
 
+`structured_output_strategy` carries the [strategy](AGENTS.md#structured-output-strategy-experimental) the agent was configured with, so a `:prompted` agent rebuilds as `:prompted`. A hash without the key decodes as `:native`.
+
 ## Reconstructing tools
 
 Tools cross as `{name, description, parameters_schema, timeout}` descriptors — never code. How a descriptor becomes a runnable tool is controlled by the `tool_resolver:` you pass to `from_h`. The two common shapes:

data/lib/riffer/agent/config.rb

@@ -3,6 +3,7 @@
 
 class Riffer::Agent::Config
   DEFAULT_MAX_STEPS = 16 #: Integer
+  STRUCTURED_OUTPUT_STRATEGIES = %i[native prompted].freeze #: Array[Symbol]
 
   # @rbs @tool_runtime: (singleton(Riffer::Tools::Runtime) | Riffer::Tools::Runtime | Proc)?
 
@@ -11,6 +12,7 @@ class Riffer::Agent::Config
   attr_reader :instructions #: (String | Proc)? # @dynamic instructions
   attr_accessor :model_options #: Hash[Symbol, untyped] # @dynamic model_options, model_options=
   attr_reader :structured_output #: Riffer::Params? # @dynamic structured_output
+  attr_reader :structured_output_strategy #: Symbol # @dynamic structured_output_strategy
   attr_accessor :max_steps #: Numeric? # @dynamic max_steps, max_steps=
   attr_accessor :tools_config #: (Array[singleton(Riffer::Tool)] | Proc)? # @dynamic tools_config, tools_config=
   attr_reader :mcp_configs #: Array[Hash[Symbol, untyped]] # @dynamic mcp_configs
@@ -24,6 +26,7 @@ class Riffer::Agent::Config
   #    ?instructions: (String | Proc)?,
   #    ?model_options: Hash[Symbol, untyped],
   #    ?structured_output: Riffer::Params?,
+  #    ?structured_output_strategy: Symbol,
   #    ?max_steps: Numeric?,
   #    ?tools_config: (Array[singleton(Riffer::Tool)] | Proc)?,
   #    ?mcp_configs: Array[Hash[Symbol, untyped]],
@@ -37,6 +40,7 @@ class Riffer::Agent::Config
     instructions: nil,
     model_options: {},
     structured_output: nil,
+    structured_output_strategy: :native,
     max_steps: DEFAULT_MAX_STEPS,
     tools_config: nil,
     mcp_configs: [],
@@ -54,6 +58,7 @@ class Riffer::Agent::Config
     self.model = model
     self.instructions = instructions
     self.structured_output = structured_output
+    self.structured_output_strategy = structured_output_strategy
     self.tool_runtime = tool_runtime if tool_runtime
   end
 
@@ -73,6 +78,17 @@ class Riffer::Agent::Config
     @structured_output = value
   end
 
+  #--
+  #: (Symbol) -> Symbol
+  def structured_output_strategy=(value)
+    unless STRUCTURED_OUTPUT_STRATEGIES.include?(value)
+      raise Riffer::ArgumentError,
+            "structured_output_strategy must be one of #{STRUCTURED_OUTPUT_STRATEGIES.inspect}, got #{value.inspect}"
+    end
+
+    @structured_output_strategy = value
+  end
+
   #--
   #: () -> (singleton(Riffer::Tools::Runtime) | Riffer::Tools::Runtime | Proc)
   def tool_runtime

data/lib/riffer/agent/run.rb

@@ -68,7 +68,7 @@ module Riffer::Agent::Run
     end
 
     begin
-      step = agent.session.steps
+      step = agent.session.steps_since_last_user_message
 
       reason = catch(:riffer_interrupt) do
         execute_pending_tool_calls(agent, tags)

data/lib/riffer/agent/serializer.rb

@@ -27,6 +27,7 @@ module Riffer::Agent::Serializer
       model_options: config.model_options,
       max_steps: encode_max_steps(config.max_steps),
       structured_output: config.structured_output&.to_json_schema(strict: false),
+      structured_output_strategy: config.structured_output_strategy,
       tools: agent.tools.map { |tool_class| tool_descriptor(tool_class) },
     }
   end
@@ -76,6 +77,7 @@ module Riffer::Agent::Serializer
       instructions: hash[:instructions],
       model_options: hash[:model_options] || {},
       structured_output: decode_structured_output(hash[:structured_output]),
+      structured_output_strategy: (hash[:structured_output_strategy] || :native).to_sym,
       max_steps: decode_max_steps(hash),
       tools_config: tools,
     } #: Hash[Symbol, untyped]

data/lib/riffer/agent/session.rb

@@ -143,6 +143,13 @@ class Riffer::Agent::Session
     @messages.count { |m| m.is_a?(Riffer::Messages::Assistant) }
   end
 
+  #--
+  #: () -> Integer
+  def steps_since_last_user_message
+    since_last_user = @messages.reverse_each.take_while { |m| !m.is_a?(Riffer::Messages::User) }
+    since_last_user.count { |m| m.is_a?(Riffer::Messages::Assistant) }
+  end
+
   #--
   #: () -> Riffer::Messages::Assistant?
   def final_assistant_message

data/lib/riffer/agent/structured_output/parser.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+# rbs_inline: enabled
+
+require "json"
+
+module Riffer::Agent::StructuredOutput::Parser
+  extend self
+
+  #--
+  #: (String) -> Hash[Symbol, untyped]?
+  def parse(content)
+    parse_object(content) || outermost_object(content)
+  end
+
+  private
+
+  #--
+  #: (String) -> Hash[Symbol, untyped]?
+  def outermost_object(content)
+    start = content.index("{")
+    stop = content.rindex("}")
+    return unless start && stop
+
+    parse_object(content[start..stop].to_s)
+  end
+
+  #--
+  #: (String) -> Hash[Symbol, untyped]?
+  def parse_object(json)
+    parsed = JSON.parse(json, symbolize_names: true)
+    parsed if parsed.is_a?(Hash)
+  rescue JSON::ParserError
+    nil
+  end
+end

data/lib/riffer/agent/structured_output.rb

@@ -5,11 +5,19 @@ require "json"
 
 class Riffer::Agent::StructuredOutput
   attr_reader :params #: Riffer::Params # @dynamic params
+  attr_reader :strategy #: Symbol # @dynamic strategy
 
   #--
-  #: (Riffer::Params) -> void
-  def initialize(params)
+  #: (Riffer::Params, ?strategy: Symbol) -> void
+  def initialize(params, strategy: :native)
     @params = params
+    @strategy = strategy
+  end
+
+  #--
+  #: () -> bool
+  def prompted?
+    @strategy == :prompted
   end
 
   #--
@@ -18,14 +26,23 @@ class Riffer::Agent::StructuredOutput
     @params.to_json_schema(strict: strict)
   end
 
+  # Worded for the final answer only, so the model can still call tools first.
+  #--
+  #: () -> String
+  def prompt_instructions
+    "When you give your final answer, respond with only a JSON object that conforms to " \
+      "the following JSON Schema, with no other text before or after it:\n\n" \
+      "#{JSON.generate(json_schema)}"
+  end
+
   #--
   #: (String) -> Riffer::Agent::StructuredOutput::Result
   def parse_and_validate(json_string)
-    parsed = JSON.parse(json_string, symbolize_names: true)
+    parsed = Riffer::Agent::StructuredOutput::Parser.parse(json_string)
+    return Result.new(error: "JSON parse error: no JSON object found in the response") if parsed.nil?
+
     validated = @params.validate(parsed)
     Result.new(object: validated)
-  rescue JSON::ParserError => e
-    Result.new(error: "JSON parse error: #{e.message}")
   rescue Riffer::ValidationError => e
     Result.new(error: "Validation error: #{e.message}")
   end

data/lib/riffer/agent.rb

@@ -53,13 +53,14 @@ class Riffer::Agent
   end
 
   #--
-  #: (?Riffer::Params?) ?{ (Riffer::Params) [self: Riffer::Params] -> void } -> Riffer::Params?
-  def self.structured_output(params = nil, &block)
+  #: (?Riffer::Params?, ?strategy: Symbol?) ?{ (Riffer::Params) [self: Riffer::Params] -> void } -> Riffer::Params?
+  def self.structured_output(params = nil, strategy: nil, &block)
     if block
       params = Riffer::Params.new
       params.instance_eval(&block)
     end
     config.structured_output = params if params
+    config.structured_output_strategy = strategy if strategy
     config.structured_output
   end
 
@@ -328,7 +329,7 @@ class Riffer::Agent
   #: () -> Riffer::Agent::StructuredOutput?
   def resolve_structured_output
     params = @config.structured_output
-    params ? Riffer::Agent::StructuredOutput.new(params) : nil
+    params ? Riffer::Agent::StructuredOutput.new(params, strategy: @config.structured_output_strategy) : nil
   end
 
   #--

data/lib/riffer/providers/base.rb

@@ -38,8 +38,8 @@ class Riffer::Providers::Base
     messages = normalize_messages(prompt: prompt, system: system, messages: messages, files: files)
     validate_normalized_messages!(messages)
     Riffer::Files::Resolver.new(provider: self).resolve!(messages)
-    messages = merge_consecutive_messages(messages)
-    params = build_request_params(messages, model, options)
+    messages = merge_consecutive_messages(with_structured_output_prompt(messages, options[:structured_output]))
+    params = build_request_params(messages, model, request_options(options))
 
     in_chat_span(model, messages, options) do |span|
       response = execute_generate(params)
@@ -76,8 +76,8 @@ class Riffer::Providers::Base
     messages = normalize_messages(prompt: prompt, system: system, messages: messages, files: files)
     validate_normalized_messages!(messages)
     Riffer::Files::Resolver.new(provider: self).resolve!(messages)
-    messages = merge_consecutive_messages(messages)
-    params = build_request_params(messages, model, options)
+    messages = merge_consecutive_messages(with_structured_output_prompt(messages, options[:structured_output]))
+    params = build_request_params(messages, model, request_options(options))
 
     # The enumerator body runs in its own fiber, where the fiber-local OTEL
     # context is empty — capture here so the chat span parents to the caller's
@@ -360,9 +360,7 @@ class Riffer::Providers::Base
   #--
   #: (String) -> Hash[Symbol, untyped]?
   def parse_structured_output(content)
-    JSON.parse(content, symbolize_names: true)
-  rescue JSON::ParserError
-    nil
+    Riffer::Agent::StructuredOutput::Parser.parse(content)
   end
 
   #--
@@ -373,6 +371,26 @@ class Riffer::Providers::Base
     JSON.parse(arguments)
   end
 
+  #--
+  #: (Array[Riffer::Messages::Base], Riffer::Agent::StructuredOutput?) -> Array[Riffer::Messages::Base]
+  def with_structured_output_prompt(messages, structured_output)
+    return messages unless structured_output&.prompted?
+
+    # After the leading system messages, so merge_consecutive_messages folds it into the system prompt.
+    leading_system = messages.take_while { |m| m.is_a?(Riffer::Messages::System) }
+    [
+      *leading_system,
+      Riffer::Messages::System.new(structured_output.prompt_instructions),
+      *messages.drop(leading_system.length),
+    ]
+  end
+
+  #--
+  #: (Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
+  def request_options(options)
+    options[:structured_output]&.prompted? ? options.except(:structured_output) : options
+  end
+
   #--
   #: (Array[Riffer::Messages::Base]) -> Array[Riffer::Messages::Base]
   def merge_consecutive_messages(messages)

data/lib/riffer/version.rb

@@ -2,5 +2,5 @@
 # rbs_inline: enabled
 
 module Riffer
-  VERSION = "0.50.1" #: String
+  VERSION = "0.52.0" #: String
 end

data/rbs_collection.lock.yaml

@@ -10,7 +10,7 @@ gems:
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: anthropic
-  version: 1.71.0
+  version: 1.76.0
   source:
     type: rubygems
 - name: ast
@@ -170,7 +170,7 @@ gems:
   source:
     type: stdlib
 - name: openai
-  version: 0.91.0
+  version: 0.97.0
   source:
     type: rubygems
 - name: openssl

data/sig/generated/riffer/agent/config.rbs

@@ -3,6 +3,8 @@
 class Riffer::Agent::Config
   DEFAULT_MAX_STEPS: Integer
 
+  STRUCTURED_OUTPUT_STRATEGIES: Array[Symbol]
+
   @tool_runtime: (singleton(Riffer::Tools::Runtime) | Riffer::Tools::Runtime | Proc)?
 
   attr_reader identifier: String?
@@ -15,6 +17,8 @@ class Riffer::Agent::Config
 
   attr_reader structured_output: Riffer::Params?
 
+  attr_reader structured_output_strategy: Symbol
+
   attr_accessor max_steps: Numeric?
 
   attr_accessor tools_config: (Array[singleton(Riffer::Tool)] | Proc)?
@@ -32,6 +36,7 @@ class Riffer::Agent::Config
   #     ?instructions: (String | Proc)?,
   #     ?model_options: Hash[Symbol, untyped],
   #     ?structured_output: Riffer::Params?,
+  #     ?structured_output_strategy: Symbol,
   #     ?max_steps: Numeric?,
   #     ?tools_config: (Array[singleton(Riffer::Tool)] | Proc)?,
   #     ?mcp_configs: Array[Hash[Symbol, untyped]],
@@ -39,7 +44,7 @@ class Riffer::Agent::Config
   #     ?skills_config: Riffer::Skills::Config?,
   #     ?guardrails: Hash[Symbol, Array[Hash[Symbol, untyped]]]
   #   ) -> void
-  def initialize: (?identifier: String?, ?model: (String | Proc)?, ?instructions: (String | Proc)?, ?model_options: Hash[Symbol, untyped], ?structured_output: Riffer::Params?, ?max_steps: Numeric?, ?tools_config: (Array[singleton(Riffer::Tool)] | Proc)?, ?mcp_configs: Array[Hash[Symbol, untyped]], ?tool_runtime: (singleton(Riffer::Tools::Runtime) | Riffer::Tools::Runtime | Proc)?, ?skills_config: Riffer::Skills::Config?, ?guardrails: Hash[Symbol, Array[Hash[Symbol, untyped]]]) -> void
+  def initialize: (?identifier: String?, ?model: (String | Proc)?, ?instructions: (String | Proc)?, ?model_options: Hash[Symbol, untyped], ?structured_output: Riffer::Params?, ?structured_output_strategy: Symbol, ?max_steps: Numeric?, ?tools_config: (Array[singleton(Riffer::Tool)] | Proc)?, ?mcp_configs: Array[Hash[Symbol, untyped]], ?tool_runtime: (singleton(Riffer::Tools::Runtime) | Riffer::Tools::Runtime | Proc)?, ?skills_config: Riffer::Skills::Config?, ?guardrails: Hash[Symbol, Array[Hash[Symbol, untyped]]]) -> void
 
   # --
   # : (untyped) -> String?
@@ -49,6 +54,10 @@ class Riffer::Agent::Config
   # : (Riffer::Params?) -> Riffer::Params?
   def structured_output=: (Riffer::Params?) -> Riffer::Params?
 
+  # --
+  # : (Symbol) -> Symbol
+  def structured_output_strategy=: (Symbol) -> Symbol
+
   # --
   # : () -> (singleton(Riffer::Tools::Runtime) | Riffer::Tools::Runtime | Proc)
   def tool_runtime: () -> (singleton(Riffer::Tools::Runtime) | Riffer::Tools::Runtime | Proc)

data/sig/generated/riffer/agent/session.rbs

@@ -57,6 +57,10 @@ class Riffer::Agent::Session
   # : () -> Integer
   def steps: () -> Integer
 
+  # --
+  # : () -> Integer
+  def steps_since_last_user_message: () -> Integer
+
   # --
   # : () -> Riffer::Messages::Assistant?
   def final_assistant_message: () -> Riffer::Messages::Assistant?

data/sig/generated/riffer/agent/structured_output/parser.rbs

@@ -0,0 +1,17 @@
+# Generated from lib/riffer/agent/structured_output/parser.rb with RBS::Inline
+
+module Riffer::Agent::StructuredOutput::Parser
+  # --
+  # : (String) -> Hash[Symbol, untyped]?
+  def parse: (String) -> Hash[Symbol, untyped]?
+
+  private
+
+  # --
+  # : (String) -> Hash[Symbol, untyped]?
+  def outermost_object: (String) -> Hash[Symbol, untyped]?
+
+  # --
+  # : (String) -> Hash[Symbol, untyped]?
+  def parse_object: (String) -> Hash[Symbol, untyped]?
+end

data/sig/generated/riffer/agent/structured_output.rbs

@@ -3,14 +3,25 @@
 class Riffer::Agent::StructuredOutput
   attr_reader params: Riffer::Params
 
+  attr_reader strategy: Symbol
+
+  # --
+  # : (Riffer::Params, ?strategy: Symbol) -> void
+  def initialize: (Riffer::Params, ?strategy: Symbol) -> void
+
   # --
-  # : (Riffer::Params) -> void
-  def initialize: (Riffer::Params) -> void
+  # : () -> bool
+  def prompted?: () -> bool
 
   # --
   # : (?strict: bool) -> Hash[Symbol, untyped]
   def json_schema: (?strict: bool) -> Hash[Symbol, untyped]
 
+  # Worded for the final answer only, so the model can still call tools first.
+  # --
+  # : () -> String
+  def prompt_instructions: () -> String
+
   # --
   # : (String) -> Riffer::Agent::StructuredOutput::Result
   def parse_and_validate: (String) -> Riffer::Agent::StructuredOutput::Result

data/sig/generated/riffer/agent.rbs

@@ -32,8 +32,8 @@ class Riffer::Agent
   def self.model_options: (?Hash[Symbol, untyped]?) -> Hash[Symbol, untyped]
 
   # --
-  # : (?Riffer::Params?) ?{ (Riffer::Params) [self: Riffer::Params] -> void } -> Riffer::Params?
-  def self.structured_output: (?Riffer::Params?) ?{ (Riffer::Params) [self: Riffer::Params] -> void } -> Riffer::Params?
+  # : (?Riffer::Params?, ?strategy: Symbol?) ?{ (Riffer::Params) [self: Riffer::Params] -> void } -> Riffer::Params?
+  def self.structured_output: (?Riffer::Params?, ?strategy: Symbol?) ?{ (Riffer::Params) [self: Riffer::Params] -> void } -> Riffer::Params?
 
   # --
   # : (*Numeric?) -> Numeric?

data/sig/generated/riffer/providers/base.rbs

@@ -146,6 +146,14 @@ class Riffer::Providers::Base
   # : (String) -> Hash[String, untyped]
   def parse_tool_arguments: (String) -> Hash[String, untyped]
 
+  # --
+  # : (Array[Riffer::Messages::Base], Riffer::Agent::StructuredOutput?) -> Array[Riffer::Messages::Base]
+  def with_structured_output_prompt: (Array[Riffer::Messages::Base], Riffer::Agent::StructuredOutput?) -> Array[Riffer::Messages::Base]
+
+  # --
+  # : (Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
+  def request_options: (Hash[Symbol, untyped]) -> Hash[Symbol, untyped]
+
   # --
   # : (Array[Riffer::Messages::Base]) -> Array[Riffer::Messages::Base]
   def merge_consecutive_messages: (Array[Riffer::Messages::Base]) -> Array[Riffer::Messages::Base]

data/sig/manual/riffer/agent/structured_output/parser.rbs

@@ -0,0 +1,5 @@
+# `Riffer::Agent::StructuredOutput::Parser` uses `extend self`; rbs-inline doesn't emit that,
+# so re-extend here to expose its instance methods as singleton methods.
+module Riffer::Agent::StructuredOutput::Parser
+  extend ::Riffer::Agent::StructuredOutput::Parser
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riffer
 version: !ruby/object:Gem::Version
-  version: 0.50.1
+  version: 0.52.0
 platform: ruby
 authors:
 - Jake Bottrall
@@ -117,6 +117,7 @@ files:
 - lib/riffer/agent/session.rb
 - lib/riffer/agent/session/repair.rb
 - lib/riffer/agent/structured_output.rb
+- lib/riffer/agent/structured_output/parser.rb
 - lib/riffer/agent/structured_output/result.rb
 - lib/riffer/config.rb
 - lib/riffer/config/amazon_bedrock.rb
@@ -265,6 +266,7 @@ files:
 - sig/generated/riffer/agent/session.rbs
 - sig/generated/riffer/agent/session/repair.rbs
 - sig/generated/riffer/agent/structured_output.rbs
+- sig/generated/riffer/agent/structured_output/parser.rbs
 - sig/generated/riffer/agent/structured_output/result.rbs
 - sig/generated/riffer/config.rbs
 - sig/generated/riffer/config/amazon_bedrock.rbs
@@ -390,6 +392,7 @@ files:
 - sig/manual/riffer/agent/run.rbs
 - sig/manual/riffer/agent/serializer.rbs
 - sig/manual/riffer/agent/session/repair.rbs
+- sig/manual/riffer/agent/structured_output/parser.rbs
 - sig/manual/riffer/evals/evaluator_runner.rbs
 - sig/manual/riffer/helpers/boolean.rbs
 - sig/manual/riffer/helpers/call_or_value.rbs