active_harness 0.2.35 → 0.2.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f08d4dd9d2254cb4895919e690fd485cab05d2b89c53786383b0da353aeb5f82
-  data.tar.gz: 1aa9a3e3a7cd8a2e83179b88a9f3623f39b4fa59e7386d43094de2739f44d50a
+  metadata.gz: efbaa37cda4e529d17ba8e6e4757b68f93e08d9f6ffa96b807d29e5f43e7e303
+  data.tar.gz: 7bce0b41461aac9449d4fc31eea1d1f0f0869b31b6304efb8e520707f6ce084e
 SHA512:
-  metadata.gz: 1aa38c722c75fbc04d6d389ebe6d260322eddd1a4d6c5bb9a43117b2b341447bf1883f90beacdcf5c2bc99adc6867a2dc7ee820f3dcd85d44538c5d148953a92
-  data.tar.gz: 146bf3d9516d70dcc45c2b092855b2b6b01543dd3b76e45de250b2b91fecce700cbabf7f492ebbf2e7417dfca22a48c21b2247a361b83eb28a81b001a3ce5999
+  metadata.gz: 810a655970645b7b564fa3d1a8ada69512fc12251861e8f340505d6264cc473d95596c0b466aafa8b08d31fbbb977023d2515fadb9a7e7e4775d1aacffd24b07
+  data.tar.gz: 0f6300b25ec6d4448cde85185f553bd2c8a9ccbbb386f6b6136d8c4a40f23291b734f331003734a1237c74d9bb506e1a1d434f8a15c006bf1080359cd55e486d

data/lib/active_harness/agent/custom_llm_backend.rb

@@ -54,8 +54,8 @@ module ActiveHarness
       chat = backend.call(params)
       chat.with_instructions(system_prompt) if system_prompt
 
-      if @token_stream
-        response = chat.ask(@input) { |chunk| @token_stream.call(chunk.content) if chunk.content }
+      if @token
+        response = chat.ask(@input) { |chunk| @token.call(chunk.content) if chunk.content }
       else
         response = chat.ask(@input)
       end

data/lib/active_harness/agent/hooks.rb

@@ -67,11 +67,9 @@ module ActiveHarness
       run_hooks(@config[:hooks] || {}, event, *args)
     end
 
-    # Unified internal method: fires the DSL hook AND the external event_stream lambda.
-    # Consistent with Tribunal#fire and Pipeline#fire.
     def fire(event, *args)
       run_hook(event, *args)
-      @event_stream&.call(event, *args)
+      @stream&.call(:agent, event, *args)
     rescue IOError, ActionController::Live::ClientDisconnected
     end
   end

data/lib/active_harness/agent/providers.rb

@@ -53,7 +53,7 @@ module ActiveHarness
       messages = build_messages(system_prompt, @input)
       opts = { model: entry[:model], messages: messages }
       opts[:temperature] = entry[:temperature] if entry[:temperature]
-      opts[:stream]      = @token_stream       if @token_stream
+      opts[:stream]      = @token               if @token
       opts[:name]        = entry[:name]        if entry[:name]
       provider.call(**opts)
     end

data/lib/active_harness/agent.rb

@@ -16,7 +16,8 @@ module ActiveHarness
         params:  {},
         memory:  nil,
         models:  nil,
-        streams: {}
+        token:   nil,
+        stream:  nil
       )
         new(
           input:   input,
@@ -24,7 +25,8 @@ module ActiveHarness
           params:  params,
           memory:  memory,
           models:  models,
-          streams: streams
+          token:   token,
+          stream:  stream
         ).call
       end
 
@@ -54,8 +56,8 @@ module ActiveHarness
                   :params,
                   :memory
     attr_reader   :result,
-                  :token_stream,
-                  :event_stream
+                  :token,
+                  :stream
 
     def models=(list)
       @models_override = Array(list)
@@ -68,7 +70,8 @@ module ActiveHarness
       params:  {},
       memory:  nil,
       models:  nil,
-      streams: {}
+      token:   nil,
+      stream:  nil
     )
       @input           = input
       @config          = self.class.agent_config
@@ -77,8 +80,8 @@ module ActiveHarness
       @params          = params
       @memory          = memory
       @models_override = Array(models) if models
-      @token_stream    = streams[:token]
-      @event_stream     = streams[:agent]
+      @token           = token
+      @stream          = stream
       fire(:setup)
     end
 
@@ -88,15 +91,13 @@ module ActiveHarness
     # Optionally accepts input and stream callback inline:
     #   agent.call("What is the capital of Japan?")
     #   agent.call("...", stream: ->(token) { print token })
-    def call(input = nil, streams: nil)
+    def call(input = nil, token: nil, stream: nil)
       if input
         @input = input
         normalize_input!
       end
-      if streams
-        @token_stream = streams[:token] if streams.key?(:token)
-        @event_stream = streams[:agent] if streams.key?(:agent)
-      end
+      @token  = token  if token
+      @stream = stream if stream
       fire(:before_call)
       @system_prompt = resolve_system_prompt
       attempts = []

data/lib/active_harness/pipeline/hooks.rb

@@ -60,15 +60,14 @@ module ActiveHarness
 
     private
 
-    # Fires global hook AND pipeline_event_stream. Consistent with Agent#fire and Tribunal#fire.
     def fire(event, step_name, data, config)
       run_hooks(config[:hooks], event, step_name, data)
-      @pipeline_event_stream&.call(event, step_name, data)
+      @stream&.call(:pipeline, event, step_name, data)
     rescue IOError, ActionController::Live::ClientDisconnected
       nil
     end
 
-    # Per-step hook: receives (data) only — not forwarded to pipeline_event_stream
+    # Per-step hook: receives (data) only — not forwarded to stream
     # (global fire already covers the step event with step_name context).
     def fire_step(event, step_name, data, config)
       run_hooks(config[:step_hooks][step_name] || {}, event, data)

data/lib/active_harness/pipeline.rb

@@ -66,8 +66,7 @@ module ActiveHarness
       # any agent or tribunal executed within this pipeline (including agents
       # running inside tribunals). Multiple blocks can be registered; all fire.
       #
-      # The handler receives the same (event, *args) signature that the runtime
-      # streams: { agent: lambda } would receive.
+      # The handler receives (event, *args) — already scoped to the source.
       #
       #   on_agent_event do |event, result|
       #     Rails.logger.info "[Agent #{event}] #{result.model}" if event == :after_call
@@ -116,24 +115,23 @@ module ActiveHarness
       context: {},
       params:  {},
       memory:  nil,
-      streams: {}
+      token:   nil,
+      stream:  nil
     )
-      @original_input        = input
-      @payload               = input
-      @context               = context.dup
-      @params                = params
-      @memory                = memory
-      @token_stream          = streams[:token]
-      class_streams          = self.class.pipeline_config[:streams] || {}
-      @agent_event_stream    = merge_stream(streams[:agent],    class_streams[:agent])
-      @tribunal_event_stream = merge_stream(streams[:tribunal], class_streams[:tribunal])
-      @pipeline_event_stream = merge_stream(streams[:pipeline], class_streams[:pipeline])
-      @step_results          = {}
-      @stopped               = false
-      @stopped_at            = nil
-      @stop_reason           = nil
-      @execution_time        = nil
-      @output                = nil
+      @original_input = input
+      @payload        = input
+      @context        = context.dup
+      @params         = params
+      @memory         = memory
+      @token          = token
+      class_streams   = self.class.pipeline_config[:streams] || {}
+      @stream         = merge_stream(stream, class_streams)
+      @step_results   = {}
+      @stopped        = false
+      @stopped_at     = nil
+      @stop_reason    = nil
+      @execution_time = nil
+      @output         = nil
     end
 
     def stopped?
@@ -179,7 +177,7 @@ module ActiveHarness
           @stopped_at  = step.name
           @stop_reason = result
           run_hooks(config[:hooks], :stopped, step.name, result)
-          @pipeline_event_stream&.call(:stopped, step.name, result)
+          @stream&.call(:pipeline, :stopped, step.name, result)
           break
         end
       end
@@ -196,7 +194,7 @@ module ActiveHarness
 
         last_result = @step_results[@step_results.keys.last]
         run_hooks(config[:hooks], :complete, last_result)
-        @pipeline_event_stream&.call(:complete, last_result)
+        @stream&.call(:pipeline, :complete, last_result)
       end
 
       self
@@ -204,37 +202,41 @@ module ActiveHarness
 
     private
 
-    # Combines a runtime-passed stream lambda with zero or more class-level handler
-    # blocks registered via on_agent_event / on_tribunal_event / on_pipeline_event.
-    # Returns nil when there are no handlers at all, preserving the existing
-    # "no stream" fast path in agents and tribunals.
+    # Combines a runtime-passed stream lambda with class-level handler blocks
+    # registered via on_agent_event / on_tribunal_event / on_pipeline_event.
+    # Returns nil when there are no handlers at all.
     #
-    # Each class-level handler is evaluated via instance_exec so that blocks
-    # written in the pipeline class body can access pipeline instance variables
-    # (e.g. @otel_pipeline_span, @params) and call pipeline instance methods.
+    # Class-level handlers receive (event, *args) — already scoped to source.
+    # Runtime lambda receives (source, event, *args).
+    # instance_exec lets class-level blocks access pipeline instance variables.
     def merge_stream(passed_in, class_handlers)
-      class_handlers = Array(class_handlers).compact
-      return passed_in if class_handlers.empty?
+      agent_handlers    = Array(class_handlers[:agent]).compact
+      tribunal_handlers = Array(class_handlers[:tribunal]).compact
+      pipeline_handlers = Array(class_handlers[:pipeline]).compact
+
+      has_class_handlers = agent_handlers.any? || tribunal_handlers.any? || pipeline_handlers.any?
+      return passed_in unless has_class_handlers
 
       pipeline_instance = self
-      ->(event, *args) {
-        class_handlers.each { |h| pipeline_instance.instance_exec(event, *args, &h) }
-        passed_in&.call(event, *args)
+      ->(source, event, *args) {
+        handlers = case source
+                   when :agent    then agent_handlers
+                   when :tribunal then tribunal_handlers
+                   when :pipeline then pipeline_handlers
+                   else                []
+                   end
+        handlers.each { |h| pipeline_instance.instance_exec(event, *args, &h) }
+        passed_in&.call(source, event, *args)
       }
     end
 
     def execute_step(step)
-      streams = {
-        token:    @token_stream,
-        agent:    @agent_event_stream,
-        tribunal: @tribunal_event_stream,
-        pipeline: @pipeline_event_stream
-      }.compact
       step.agent_class.new(
         input:   @payload,
         context: @context.dup,
         params:  @params,
-        streams: streams
+        token:   @token,
+        stream:  @stream
       ).call.result
     end
   end

data/lib/active_harness/tribunal/hooks.rb

@@ -72,10 +72,9 @@ module ActiveHarness
       run_hooks(@hooks, event, *args)
     end
 
-    # Fire the DSL-registered hook AND the external tribunal_event_stream lambda (if set).
     def fire(event, *args)
       run_hook(event, *args)
-      @tribunal_event_stream&.call(event, *args)
+      @stream&.call(:tribunal, event, *args)
     rescue IOError, ActionController::Live::ClientDisconnected
       nil
     end

data/lib/active_harness/tribunal.rb

@@ -55,9 +55,8 @@ module ActiveHarness
                   :verdict,
                   :execution_time,
                   :agent_execution_times,
-                  :token_stream,
-                  :agent_event_stream,
-                  :tribunal_event_stream
+                  :token,
+                  :stream
 
     def initialize(
       input:    nil,
@@ -66,7 +65,8 @@ module ActiveHarness
       memory:   nil,
       agents:   nil,
       timeout:  7,
-      streams:  {},
+      token:    nil,
+      stream:   nil,
       may_fail: :_unset
     )
       config = self.class.tribunal_config
@@ -82,9 +82,8 @@ module ActiveHarness
       @evaluate_block        = config[:evaluate_block]
       @may_fail              = may_fail == :_unset ? config[:may_fail] : may_fail
       @hooks                 = config[:hooks].transform_values { |v| Array(v).dup }
-      @token_stream          = streams[:token]
-      @agent_event_stream    = streams[:agent]
-      @tribunal_event_stream = streams[:tribunal]
+      @token                 = token
+      @stream                = stream
       @results               = []
       @errors                = []
       @verdict               = nil
@@ -181,14 +180,13 @@ module ActiveHarness
     end
 
     def resolve_agents
-      agent_streams = { token: @token_stream, agent: @agent_event_stream }.compact
       @agents.map do |agent|
         if agent.is_a?(Class)
-          agent.new(input: @input, context: @context.dup, params: @params, streams: agent_streams)
+          agent.new(input: @input, context: @context.dup, params: @params, token: @token, stream: @stream)
         else
           agent.input = @input if @input
-          agent.instance_variable_set(:@token_stream, @token_stream) if @token_stream
-          agent.instance_variable_set(:@event_stream, @agent_event_stream) if @agent_event_stream
+          agent.instance_variable_set(:@token,  @token)  if @token
+          agent.instance_variable_set(:@stream, @stream) if @stream
           agent
         end
       end

data/lib/active_harness.rb

@@ -34,7 +34,7 @@ require_relative "active_harness/pipeline"
 require_relative "active_harness/railtie" if defined?(Rails::Railtie)
 
 module ActiveHarness
-  VERSION = "0.2.35"
+  VERSION = "0.2.36"
 
   class << self
     # Configure ActiveHarness.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_harness
 version: !ruby/object:Gem::Version
-  version: 0.2.35
+  version: 0.2.36
 platform: ruby
 authors:
 - the-teacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-06-13 00:00:00.000000000 Z
+date: 2026-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby