brute 4.3.2 → 5.0.0

data/lib/brute/usage_detection/llmrb.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "brute"
+require "brute/usage_detection/usage"
+
+module Brute
+  module UsageDetection
+    # llm.rb models usage as its own LLM::Usage value object. Note it answers
+    # 0, not nil, for anything the provider left out — that is llm.rb's
+    # reading of the response and it is reported as given.
+    module LLMrb
+      def self.detect(response)
+        return nil unless response.respond_to?(:usage)
+
+        usage = response.usage
+        return nil if usage.nil?
+
+        Usage.new(
+          input:       read(usage, :input_tokens),
+          output:      read(usage, :output_tokens),
+          total:       read(usage, :total_tokens),
+          reasoning:   read(usage, :reasoning_tokens),
+          cache_read:  read(usage, :cache_read_tokens),
+          cache_write: read(usage, :cache_write_tokens),
+          raw:         usage,
+        )
+      end
+
+      def self.read(usage, name) = usage.respond_to?(name) ? usage.public_send(name) : nil
+    end
+  end
+end
+
+__END__
+
+describe "brute/usage_detection/llmrb" do
+  LLMrbUsage = Struct.new(:input_tokens, :output_tokens, :total_tokens, :reasoning_tokens,
+                          :cache_read_tokens, :cache_write_tokens) unless defined?(LLMrbUsage)
+  LLMrbResponse = Struct.new(:usage) unless defined?(LLMrbResponse)
+
+  it "reports LLM::Usage as given, and answers nil when there is no usage to read" do
+    usage = Brute::UsageDetection::LLMrb.detect(LLMrbResponse.new(LLMrbUsage.new(10, 5, 15, 0, 0, 0)))
+
+    usage.input.should == 10
+    usage.output.should == 5
+    usage.total.should == 15
+    usage.reasoning.should == 0 # llm.rb's own zero, reported as given
+
+    Brute::UsageDetection::LLMrb.detect(LLMrbResponse.new(nil)).should.be.nil
+    Brute::UsageDetection::LLMrb.detect(Object.new).should.be.nil
+  end
+end

data/lib/brute/usage_detection/open_router.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "brute"
+require "brute/usage_detection/usage"
+
+module Brute
+  module UsageDetection
+    # OpenRouter reports usage as the provider's raw hash on the response,
+    # in OpenAI's wire shape. Reasoning tokens, when the model reports them,
+    # arrive nested under completion_tokens_details.
+    module OpenRouter
+      def self.detect(response)
+        return nil unless response.respond_to?(:usage)
+
+        usage = response.usage
+        return nil if usage.nil?
+
+        usage = usage.to_h
+        details = (usage["completion_tokens_details"] || usage[:completion_tokens_details] || {}).to_h
+
+        Usage.new(
+          input:     field(usage, "prompt_tokens"),
+          output:    field(usage, "completion_tokens"),
+          total:     field(usage, "total_tokens"),
+          reasoning: field(details, "reasoning_tokens"),
+          cache_read: field(usage, "cached_tokens"),
+          cost:      field(usage, "cost"),
+          raw:       usage,
+        )
+      end
+
+      # OpenRouter hands back string keys; a hand-built response may not.
+      def self.field(hash, key) = hash[key] || hash[key.to_sym]
+    end
+  end
+end
+
+__END__
+
+describe "brute/usage_detection/open_router" do
+  Response = Struct.new(:usage) unless defined?(Response)
+
+  it "reads the OpenAI-shaped hash, string or symbol keys, and answers nil for no usage" do
+    usage = Brute::UsageDetection::OpenRouter.detect(Response.new({
+      "prompt_tokens" => 10, "completion_tokens" => 5, "total_tokens" => 15,
+      "completion_tokens_details" => { "reasoning_tokens" => 4 },
+    }))
+    usage.input.should == 10
+    usage.output.should == 5
+    usage.total.should == 15
+    usage.reasoning.should == 4
+
+    symbols = Brute::UsageDetection::OpenRouter.detect(Response.new({ prompt_tokens: 1, completion_tokens: 2 }))
+    symbols.input.should == 1
+    symbols.output.should == 2
+    symbols.total.should.be.nil
+
+    Brute::UsageDetection::OpenRouter.detect(Response.new(nil)).should.be.nil
+    Brute::UsageDetection::OpenRouter.detect(Object.new).should.be.nil
+  end
+end

data/lib/brute/usage_detection/ruby_llm.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "brute"
+require "brute/usage_detection/usage"
+
+module Brute
+  module UsageDetection
+    # ruby_llm hangs usage off the *message*, not the response: a Tokens
+    # object with input/output/cache_read/cache_write/thinking, plus the
+    # provider's own reported_cost when it gives one.
+    module RubyLLM
+      def self.detect(message)
+        return nil unless message.respond_to?(:tokens)
+
+        tokens = message.tokens
+        return nil if tokens.nil?
+
+        Usage.new(
+          input:       read(tokens, :input),
+          output:      read(tokens, :output),
+          reasoning:   read(tokens, :thinking),
+          cache_read:  read(tokens, :cache_read),
+          cache_write: read(tokens, :cache_write),
+          cost:        read(tokens, :reported_cost),
+          raw:         tokens,
+        )
+      end
+
+      def self.read(tokens, name) = tokens.respond_to?(name) ? tokens.public_send(name) : nil
+    end
+  end
+end
+
+__END__
+
+describe "brute/usage_detection/ruby_llm" do
+  FakeTokens = Struct.new(:input, :output, :cache_read, :cache_write, :thinking, :reported_cost) unless defined?(FakeTokens)
+  FakeMessage = Struct.new(:tokens) unless defined?(FakeMessage)
+
+  it "reads Tokens off the message, maps thinking to reasoning, and answers nil for no usage" do
+    usage = Brute::UsageDetection::RubyLLM.detect(FakeMessage.new(FakeTokens.new(10, 5, 2, 1, 4, 0.002)))
+
+    usage.input.should == 10
+    usage.output.should == 5
+    usage.total.should.be.nil # ruby_llm reports parts, not a total
+    usage.reasoning.should == 4
+    usage.cache_read.should == 2
+    usage.cache_write.should == 1
+    usage.cost.should == 0.002
+
+    Brute::UsageDetection::RubyLLM.detect(FakeMessage.new(nil)).should.be.nil
+    Brute::UsageDetection::RubyLLM.detect(Object.new).should.be.nil
+  end
+end

data/lib/brute/usage_detection/usage.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "brute"
+
+module Brute
+  # What the provider reported, normalised. Every library reports usage
+  # differently —
+  # OpenRouter as a raw hash on the response, ruby_llm as a Tokens object on
+  # the *message*, llm.rb as an LLM::Usage, langchainrb as per-provider
+  # methods digging their own raw shape — so each strategy here reads one of
+  # them and answers the same Usage.
+  #
+  #   Brute::UsageDetection::OpenRouter.detect(response)
+  #   # => #<data Brute::UsageDetection::Usage input=10, output=5, total=15, ...>
+  #
+  # A strategy reads one response and answers what that provider said —
+  # nothing more. It does not derive, sum or accumulate: running totals for a
+  # turn are the env's business, not the reader's. A strategy answers nil when
+  # the provider reported nothing at all.
+  module UsageDetection
+    Usage = Data.define(:input, :output, :total, :reasoning, :cache_read, :cache_write, :cost, :raw) do
+      def initialize(input: nil, output: nil, total: nil, reasoning: nil,
+                     cache_read: nil, cache_write: nil, cost: nil, raw: nil)
+        super
+      end
+
+      # What a provider did not report stays out, so a reader sees the counts
+      # that are real rather than a row of nils.
+      def to_h = super.compact
+
+      def empty? = [input, output, total].all?(&:nil?)
+    end
+  end
+end
+
+__END__
+
+describe "brute/usage_detection/usage" do
+  it "reports only what it was given, and drops what was never reported" do
+    # No derivation: a provider that reports parts and no total has no total.
+    usage = Brute::UsageDetection::Usage.new(input: 10, output: 5)
+    usage.total.should.be.nil
+    usage.to_h.should == { input: 10, output: 5 }
+
+    Brute::UsageDetection::Usage.new(input: 10, output: 5, total: 99).total.should == 99
+
+    Brute::UsageDetection::Usage.new.empty?.should.be.true
+    Brute::UsageDetection::Usage.new(total: 3).empty?.should.be.false
+  end
+end

data/lib/brute/version.rb

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

data/lib/brute.rb

@@ -87,8 +87,100 @@ module Brute
   end
 end
 
-Dir.glob("#{__dir__}/brute/**/*.rb").sort.each do |path|
-  require path
-end
+# Explicit, in dependency order: Hooks and Middleware::Base are included and
+# inherited at load time, so they cannot be left to a sorted glob that happens
+# to reach completion/ before hooks.
+require_relative "brute/version"
+require_relative "brute/hooks"
+require_relative "brute/messages"
+require_relative "brute/middleware/000_base"
+require_relative "brute/completion/async_faraday"
+require_relative "brute/completion/open_router"
+require_relative "brute/completion/lang_chain"
+require_relative "brute/completion/llmrb"
+require_relative "brute/completion/ruby_llm"
+require_relative "brute/usage_detection/usage"
+require_relative "brute/usage_detection/open_router"
+require_relative "brute/usage_detection/ruby_llm"
+require_relative "brute/usage_detection/llmrb"
+require_relative "brute/usage_detection/lang_chain"
+require_relative "brute/contrib/log_file"
+require_relative "brute/contrib/otel"
+require_relative "brute/events/handler"
+require_relative "brute/events/prefixed_terminal_output"
+require_relative "brute/events/terminal_output_handler"
+require_relative "brute/message_transport"
+require_relative "brute/message_transport/anthropic"
+require_relative "brute/message_transport/llm"
+require_relative "brute/message_transport/open_router"
+require_relative "brute/message_transport/openai"
+require_relative "brute/message_transport/ruby_llm"
+require_relative "brute/message_transport/ruby_open_ai"
+require_relative "brute/message_transport/lang_chain"
+require_relative "brute/middleware/002_session_log"
+require_relative "brute/middleware/004_summarize"
+require_relative "brute/middleware/005_tracing"
+require_relative "brute/middleware/006_loop"
+require_relative "brute/middleware/008_checkpoint"
+require_relative "brute/middleware/010_max_iterations"
+require_relative "brute/middleware/020_system_prompt"
+require_relative "brute/middleware/025_skills"
+require_relative "brute/middleware/040_compaction_check"
+require_relative "brute/middleware/060_questions"
+require_relative "brute/middleware/070_tool_pipeline"
+require_relative "brute/middleware/event_handler"
+require_relative "brute/middleware/user_queue"
+require_relative "brute/prompt_template"
+require_relative "brute/prompts"
+require_relative "brute/prompts/autonomy"
+require_relative "brute/prompts/base"
+require_relative "brute/prompts/build_switch"
+require_relative "brute/prompts/code_references"
+require_relative "brute/prompts/code_style"
+require_relative "brute/prompts/conventions"
+require_relative "brute/prompts/doing_tasks"
+require_relative "brute/prompts/editing_approach"
+require_relative "brute/prompts/editing_constraints"
+require_relative "brute/prompts/environment"
+require_relative "brute/prompts/frontend_tasks"
+require_relative "brute/prompts/git_safety"
+require_relative "brute/prompts/identity"
+require_relative "brute/prompts/instructions"
+require_relative "brute/prompts/max_steps"
+require_relative "brute/prompts/objectivity"
+require_relative "brute/prompts/plan_reminder"
+require_relative "brute/prompts/proactiveness"
+require_relative "brute/prompts/security_and_safety"
+require_relative "brute/prompts/skills"
+require_relative "brute/prompts/task_management"
+require_relative "brute/prompts/tone_and_style"
+require_relative "brute/prompts/tool_usage"
+require_relative "brute/rack/adapter"
+require_relative "brute/skill"
+require_relative "brute/system_prompt"
+require_relative "brute/tool"
+require_relative "brute/tools"
+require_relative "brute/tools/adapter"
+require_relative "brute/tools/fs/file_mutation_queue"
+require_relative "brute/tools/fs/snapshot_store"
+require_relative "brute/tools/fs_patch"
+require_relative "brute/tools/fs_read"
+require_relative "brute/tools/fs_remove"
+require_relative "brute/tools/fs_search"
+require_relative "brute/tools/fs_undo"
+require_relative "brute/tools/fs_write"
+require_relative "brute/tools/net_fetch"
+require_relative "brute/tools/question"
+require_relative "brute/tools/shell"
+require_relative "brute/tools/skill_load"
+require_relative "brute/tools/sub_agent"
+require_relative "brute/tools/todo_list/store"
+require_relative "brute/tools/todo_read"
+require_relative "brute/tools/todo_write"
+require_relative "brute/truncation"
+require_relative "brute/turn/agent_pipeline"
+require_relative "brute/turn/pipeline"
+require_relative "brute/turn/tool_pipeline"
+require_relative "brute/utils/diff"
 
 # gangsta g-dogg bruh...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brute
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Brute Contributors
@@ -107,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: async-http-faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json_schemer
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +163,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: ruby_llm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: open_router_enhanced
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: llm.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: langchainrb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -212,39 +282,39 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/brute.rb
-- lib/brute/changelog.rb
+- lib/brute/completion/async_faraday.rb
+- lib/brute/completion/lang_chain.rb
+- lib/brute/completion/llmrb.rb
 - lib/brute/completion/open_router.rb
+- lib/brute/completion/ruby_llm.rb
 - lib/brute/contrib/log_file.rb
-- lib/brute/deprecate.rb
+- lib/brute/contrib/otel.rb
 - lib/brute/events/handler.rb
 - lib/brute/events/prefixed_terminal_output.rb
 - lib/brute/events/terminal_output_handler.rb
 - lib/brute/hooks.rb
 - lib/brute/message_transport.rb
 - lib/brute/message_transport/anthropic.rb
+- lib/brute/message_transport/lang_chain.rb
 - lib/brute/message_transport/llm.rb
 - lib/brute/message_transport/open_router.rb
 - lib/brute/message_transport/openai.rb
 - lib/brute/message_transport/ruby_llm.rb
 - lib/brute/message_transport/ruby_open_ai.rb
 - lib/brute/messages.rb
-- lib/brute/middleware/001_otel_span.rb
+- lib/brute/middleware/000_base.rb
 - lib/brute/middleware/002_session_log.rb
 - lib/brute/middleware/004_summarize.rb
 - lib/brute/middleware/005_tracing.rb
 - lib/brute/middleware/006_loop.rb
 - lib/brute/middleware/008_checkpoint.rb
 - lib/brute/middleware/010_max_iterations.rb
-- lib/brute/middleware/015_otel_token_usage.rb
 - lib/brute/middleware/020_system_prompt.rb
 - lib/brute/middleware/025_skills.rb
 - lib/brute/middleware/040_compaction_check.rb
 - lib/brute/middleware/060_questions.rb
 - lib/brute/middleware/070_tool_pipeline.rb
-- lib/brute/middleware/073_otel_tool_call.rb
-- lib/brute/middleware/075_otel_tool_results.rb
 - lib/brute/middleware/event_handler.rb
-- lib/brute/middleware/open_router.rb
 - lib/brute/middleware/user_queue.rb
 - lib/brute/prompt_template.rb
 - lib/brute/prompts.rb
@@ -316,6 +386,11 @@ files:
 - lib/brute/turn/agent_pipeline.rb
 - lib/brute/turn/pipeline.rb
 - lib/brute/turn/tool_pipeline.rb
+- lib/brute/usage_detection/lang_chain.rb
+- lib/brute/usage_detection/llmrb.rb
+- lib/brute/usage_detection/open_router.rb
+- lib/brute/usage_detection/ruby_llm.rb
+- lib/brute/usage_detection/usage.rb
 - lib/brute/utils/diff.rb
 - lib/brute/version.rb
 - lib/brute/version.rb.erb