brute 6.0.0 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fec1b76713fc59a69f9f826eec8ed9cdaa79a7c5cebbb82087ce00f15dccb138
-  data.tar.gz: 54f48b286b30e133c59bfebdbf4689f57d09b84d7c3eaf3512ddb17dbcfa81c4
+  metadata.gz: 4197c46dd001a197da4f187e2729c21dc462355def0d458deb3a6341196fec67
+  data.tar.gz: 27453e69fbeff9fa2958502ea366843466c9347335127f593b76f2cd60ea1629
 SHA512:
-  metadata.gz: bff875db4f34842415b8e31e50d9fabffa92867d278549a44e36e85bc00f31ad6b23543a780b85158f702e3b35a2130403a2a391f655b7bfcfaef0ccee85809d
-  data.tar.gz: 105b8f5e04fd82ac2af37451cfccd5f086b3da1bb35681f7ab36fd0620e12d2cd391ce372381c7633aa133b2f7fd51f58355c2afa576339ec09845c475979795
+  metadata.gz: bcb85717124bd3b7f4272eb7809a51d240adbcb1ad27aff3e5b67de53b4b1088ba14d7becdeb658b349f350f5247c82119c6e024799ab36ffc38f7fd74630ddf
+  data.tar.gz: 46dbd653dbde8e6edea254440b6b793d99766567402164181e7c4b9b780ed28aa85602a6ae8033febedb5858a75659278b69878782beab0a10d30ee9d8ec7668

data/lib/brute/eval/transcript.rb

@@ -60,7 +60,7 @@ module Brute
         if @env[:messages].nil?
           ""
         else
-          @env.extend(Brute::Env).reply&.content.to_s
+          @env.reply&.content.to_s
         end
       end
 

data/lib/brute/hooks.rb

@@ -46,7 +46,10 @@ module Brute
     TOOL_FAILURE_EVENT = :tool_failure
 
     # The env, wrapped, for as long as one call lasts. Everything emitted
-    # through it carries that call's id, and a call opened inside another
+    # through it carries the trace itself as its last argument -- so a
+    # subscriber that wants the call's identity asks it for an id, and one
+    # that wants anything else about the call has it -- and a call opened
+    # inside another
     # delegates to it -- so the wrapper is the parent and unwrapping ends the
     # call. It is still the env: SimpleDelegator forwards the rest.
     class Trace < SimpleDelegator
@@ -64,11 +67,17 @@ module Brute
 
       def current_trace = self
 
+      # The trace this one was opened inside, if any: emit_trace wraps, so the
+      # thing wrapped is the call that was already running.
+      def parent
+        __getobj__ if __getobj__.is_a?(Trace)
+      end
+
       def emit(event, *extras, &work) = @hooks.emit(
         event,
         self,
         *extras,
-        @id,
+        self,
         &work
       )
 

data/lib/brute/turn/agent_pipeline.rb

@@ -58,7 +58,7 @@ module Brute
           metadata:          {},
           current_iteration: 1,
           commands:          @commands || [],
-        }.tap do |turn|
+        }.extend(Brute::Env).tap do |turn|
           Brute::Hooks::Trace.new(turn, hooks: hooks).emit_trace do |env|
             env.emit(TURN_START_EVENT)
             begin

data/lib/brute/turn/pipeline.rb

@@ -180,15 +180,21 @@ describe "brute/turn/pipeline" do
     end
 
     pipeline = Brute::Turn::Pipeline.new
-    pipeline.on(:ping) { |env, extra, id| seen << [env[:said], extra, id] }
+    pipeline.on(:ping) { |env, extra, trace| seen << [env, extra, trace] }
     pipeline.use quiet
     pipeline.run Object.new.tap { |o| o.define_singleton_method(:call) { |env| env } }
     pipeline.call({ said: "hello" })
 
-    said, extra, id = seen.first
-    said.should == "hello"
+    env, extra, trace = seen.first
+    env[:said].should == "hello"
     extra.should == :from_layer
-    id.should.not.be.nil
+
+    # The trace itself comes last, not just its id: a subscriber that wants
+    # the call's identity asks it for one, and everything else about the call
+    # is on the same object -- which is the env it was handed first.
+    trace.id.should.not.be.nil
+    trace.__getobj__.should == { said: "hello" }
+    trace.__id__.should == env.__id__
 
     # A lambda is a layer like any other now: it is handed the trace as its env.
     answered = []

data/lib/brute/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Brute
-  VERSION = "6.0.0"
+  VERSION = "6.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brute
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.2
 platform: ruby
 authors:
 - Brute Contributors