activeagent 1.2.0 → 1.3.1

data/lib/active_agent/providers/open_ai/chat_provider.rb

@@ -26,6 +26,15 @@ module ActiveAgent
 
         protected
 
+        # Chat Completions reports a streamed request's token usage on a final
+        # chunk, and only when the request opts in.
+        #
+        # @return [Hash]
+        # @see Base#api_stream_usage_parameters
+        def api_stream_usage_parameters
+          { stream_options: { include_usage: true } }
+        end
+
         # @return [OpenAI::Client::Completions] the API client for chat completions
         # @see Base#api_prompt_executer
         def api_prompt_executer
@@ -100,7 +109,12 @@ module ActiveAgent
           # Called Multiple Times: [Chunk<T>, T]<Content, ToolsCall>
           case api_response_event.type
           when :chunk
+            # The usage chunk carries usage and an empty choices array, so it
+            # must be read before choices.first is dereferenced below.
+            record_stream_usage(api_response_event.chunk.try(:usage))
+
             api_message = api_response_event.chunk.choices.first
+            return if api_message.nil?
 
             # If we have a delta, we need to update a message in the stack
             message = find_or_create_message(api_message.index)
@@ -118,8 +132,13 @@ module ActiveAgent
             # Returns the full content when complete
             # => {type: :"content.done", content: "Hi there! How can I help you today?", parsed: nil}
 
-            # Once we are finished, close out and run tooling callbacks (Recursive)
-            process_prompt_finished
+            # Close out and run tooling callbacks (Recursive) — but not here.
+            # The usage chunk is emitted *after* content.done, and finishing
+            # at this point builds the response from a usage_stack that has
+            # not received it yet, so a streamed generation reports zero
+            # tokens. Deferred to stream_finished!, which the base provider
+            # calls once the stream has drained.
+            self.stream_completion_pending = true
           when :"tool_calls.function.arguments.delta"
             # => {type: :"tool_calls.function.arguments.delta", name: "get_current_weather", index: 0, arguments: "", parsed: nil, arguments_delta: ""}
           when :"tool_calls.function.arguments.done"

data/lib/active_agent/telemetry/instrumentation.rb

@@ -94,12 +94,24 @@ module ActiveAgent
                 prompt_span.set_attribute("prompt.input.tools", JSON.generate(roster)) if roster.any?
               end
 
-              if (outbound = prompt_options[:messages]).present?
+              # prompt_options[:messages] holds the turns a caller passed
+              # explicitly. An agent that renders its user turn from the
+              # action's template — the idiomatic form, `instructions:` plus
+              # `locals:` — has none at this point: the rendering happens
+              # later, in prepare_prompt_parameters. Falling back to it means
+              # the message the model actually received is on the trace either
+              # way, which is what an evaluation scores.
+              outbound = prompt_options[:messages]
+              outbound = rendered_prompt_messages if outbound.blank?
+
+              if outbound.present?
                 serialized = Array(outbound).map { |message|
                   if message.is_a?(Hash)
                     role = message[:role] || message["role"] || "user"
                     content = message[:content] || message["content"]
                     { role: role.to_s, content: telemetry_truncate(content) }
+                  elsif message.respond_to?(:content)
+                    { role: (message.try(:role) || "user").to_s, content: telemetry_truncate(message.content) }
                   else
                     { role: "user", content: telemetry_truncate(message) }
                   end
@@ -257,6 +269,27 @@ module ActiveAgent
         # tool loop) can't bloat the trace payload.
         TELEMETRY_ATTRIBUTE_MAX_CHARS = 4_000
 
+        # The turns this generation will actually send, for an agent that
+        # renders its user message from the action's template rather than
+        # passing `messages:`. prepare_prompt_parameters is a pure function of
+        # prompt_options — it deep_dups its input and mutates no instance
+        # state — so calling it here is a read, not a side effect. It does
+        # re-render the templates, which is why it is only reached when there
+        # are no explicit messages to record.
+        #
+        # Never raises: a provider that builds parameters differently, or an
+        # agent whose templates need context this call does not have, must
+        # cost the generation nothing more than an absent attribute.
+        def rendered_prompt_messages
+          return unless respond_to?(:prepare_prompt_parameters, true)
+
+          parameters = prepare_prompt_parameters
+          parameters[:messages] || parameters["messages"]
+        rescue StandardError => e
+          logger&.debug { "[ActiveAgent::Telemetry] could not read rendered messages: #{e.class}: #{e.message}" }
+          nil
+        end
+
         def telemetry_truncate(value)
           text = value.to_s
           return text if text.length <= TELEMETRY_ATTRIBUTE_MAX_CHARS

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "1.2.0"
+  VERSION = "1.3.1"
 end

data/lib/active_agent.rb

@@ -93,6 +93,7 @@ module ActiveAgent
   # These components are loaded on-demand when first referenced.
   autoload :Base
   autoload :Callbacks, "active_agent/concerns/callbacks"
+  autoload :Delegation, "active_agent/concerns/delegation"
   autoload :Streaming, "active_agent/concerns/streaming"
   autoload :InlinePreviewInterceptor
   autoload :Generation

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Justin Bowen
@@ -410,6 +410,7 @@ files:
 - lib/active_agent/base.rb
 - lib/active_agent/collector.rb
 - lib/active_agent/concerns/callbacks.rb
+- lib/active_agent/concerns/delegation.rb
 - lib/active_agent/concerns/observers.rb
 - lib/active_agent/concerns/parameterized.rb
 - lib/active_agent/concerns/preview.rb
@@ -420,6 +421,14 @@ files:
 - lib/active_agent/concerns/tooling.rb
 - lib/active_agent/concerns/view.rb
 - lib/active_agent/configuration.rb
+- lib/active_agent/delegation/backend.rb
+- lib/active_agent/delegation/budget.rb
+- lib/active_agent/delegation/contract.rb
+- lib/active_agent/delegation/definition.rb
+- lib/active_agent/delegation/ledger.rb
+- lib/active_agent/delegation/pricing.rb
+- lib/active_agent/delegation/runner.rb
+- lib/active_agent/delegation/schema.rb
 - lib/active_agent/deprecator.rb
 - lib/active_agent/generation.rb
 - lib/active_agent/generation_job.rb