brute 5.0.5 → 6.0.0

data/lib/brute.rb

@@ -12,13 +12,13 @@ require_relative 'brute/version'
 
 module Brute
   LOGO = <<-LOGO
- .o8                                .             
-"888                              .o8             
- 888oooo.  oooo d8b oooo  oooo  .o888oo  .ooooo.  
- d88' `88b `888""8P `888  `888    888   d88' `88b 
- 888   888  888      888   888    888   888ooo888 
- 888   888  888      888   888    888 . 888    .o 
- `Y8bod8P' d888b     `V88V"V8P'   "888" `Y8bod8P' 
+ .o8                                .
+"888                              .o8
+ 888oooo.  oooo d8b oooo  oooo  .o888oo  .ooooo.
+ d88' `88b `888""8P `888  `888    888   d88' `88b
+ 888   888  888      888   888    888   888ooo888
+ 888   888  888      888   888    888 . 888    .o
+ `Y8bod8P' d888b     `V88V"V8P'   "888" `Y8bod8P'
   LOGO
 
   # NOTE: Brute owns no LLM configuration and no LLM library. All
@@ -42,7 +42,7 @@ module Brute
   #
   #   agent = Brute.agent
   #     .use(Brute::Middleware::SystemPrompt)
-  #     .use(Brute::Middleware::ToolPipeline, tools: Brute::Tools::ALL)
+  #     .use(Brute::Middleware::DefaultToolPipeline, tools: Brute::Tools::ALL)
   #     .run ->(env) { ... }      # the LLM-call proc (provider/model/creds here)
   #
   #   agent.start("what changed?")
@@ -68,7 +68,9 @@ module Brute
   #
   def self.load_agent(path = "agent.ru")
     path = File.expand_path(path)
-    raise ArgumentError, "no such agent file: #{path}" unless File.file?(path)
+    unless File.file?(path)
+      raise ArgumentError, "no such agent file: #{path}"
+    end
 
     Brute::Turn::AgentPipeline.parse_file(path)
   end
@@ -93,7 +95,14 @@ end
 require_relative "brute/version"
 require_relative "brute/hooks"
 require_relative "brute/messages"
+require_relative "brute/env"
 require_relative "brute/middleware/000_base"
+require_relative "brute/compaction"
+require_relative "brute/compaction/transcript"
+require_relative "brute/compaction/middleware/strategy"
+require_relative "brute/compaction/middleware/tool_results"
+require_relative "brute/compaction/middleware/sliding_window"
+require_relative "brute/compaction/summarize"
 require_relative "brute/completion/open_router"
 require_relative "brute/completion/lang_chain"
 require_relative "brute/completion/llmrb"
@@ -124,10 +133,9 @@ 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/040_default_compaction_pipeline"
 require_relative "brute/middleware/060_questions"
-require_relative "brute/middleware/070_tool_pipeline"
-require_relative "brute/middleware/event_handler"
+require_relative "brute/middleware/070_default_tool_pipeline"
 require_relative "brute/middleware/user_queue"
 require_relative "brute/prompt_template"
 require_relative "brute/prompts"
@@ -157,6 +165,9 @@ require_relative "brute/prompts/tool_usage"
 require_relative "brute/rack/adapter"
 require_relative "brute/skill"
 require_relative "brute/system_prompt"
+require_relative "brute/token_counter"
+require_relative "brute/token_counter/approximate"
+require_relative "brute/token_counter/tiktoken"
 require_relative "brute/tool"
 require_relative "brute/tools"
 require_relative "brute/tools/adapter"
@@ -179,7 +190,9 @@ 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/compaction_pipeline"
 require_relative "brute/turn/tool_pipeline"
+require_relative "brute/eval"
 require_relative "brute/utils/diff"
 
 # gangsta g-dogg bruh...

data/lib/brute_cli/providers/shell.rb

@@ -44,12 +44,13 @@ module BruteCLI
 
         # nil text means we received tool results (second call) —
         # return an empty assistant response so the agent loop exits.
-        return ShellResponse.new(model: model, tools: tools) if text.nil?
-
-        wrap    = INTERPRETERS.fetch(model, INTERPRETERS["bash"])
-        command = wrap.call(text)
-
-        ShellResponse.new(command: command, model: model, tools: tools)
+        if text.nil?
+          ShellResponse.new(model: model, tools: tools)
+        else
+          wrap    = INTERPRETERS.fetch(model, INTERPRETERS["bash"])
+          command = wrap.call(text)
+          ShellResponse.new(command: command, model: model, tools: tools)
+        end
       end
 
       # For the REPL model picker: provider.models.all.select(&:chat?)
@@ -61,38 +62,40 @@ module BruteCLI
 
       private
 
-      # Extract the user's text from the messages array.
-      # Returns nil when the messages contain tool results (the second
-      # round-trip) so #complete knows to return an empty response.
-      def extract_text(prompt)
-        case prompt
-        when String
-          prompt
-        when ::Array
-          return nil if prompt.any? { |m| m.respond_to?(:role) && m.role == :tool }
-
-          user_msg = prompt.reverse_each.find { |m| m.respond_to?(:role) && m.role == :user }
-          user_msg&.content.to_s
-        else
-          prompt.to_s
+        # Extract the user's text from the messages array.
+        # Returns nil when the messages contain tool results (the second
+        # round-trip) so #complete knows to return an empty response.
+        def extract_text(prompt)
+          case prompt
+          when String
+            prompt
+          when ::Array
+            if prompt.any? { |m| m.respond_to?(:role) && m.role == :tool }
+              nil
+            else
+              user_msg = prompt.reverse_each.find { |m| m.respond_to?(:role) && m.role == :user }
+              user_msg&.content.to_s
+            end
+          else
+            prompt.to_s
+          end
         end
-      end
 
       # ── ModelList ──────────────────────────────────────────────────
 
       # Minimal object that quacks like provider.models so the REPL's
       # fetch_models can call provider.models.all.select(&:chat?).
-      class ModelList
-        ModelEntry = Struct.new(:id, :chat?, keyword_init: true)
+        class ModelList
+          ModelEntry = Struct.new(:id, :chat?, keyword_init: true)
 
-        def initialize(names)
-          @entries = names.map { |n| ModelEntry.new(id: n, chat?: true) }
-        end
+          def initialize(names)
+            @entries = names.map { |n| ModelEntry.new(id: n, chat?: true) }
+          end
 
-        def all
-          @entries
+          def all
+            @entries
+          end
         end
-      end
     end
   end
 end

data/lib/brute_cli/providers/shell_response.rb

@@ -25,22 +25,24 @@ module BruteCLI
       end
 
       def messages
-        return [empty_assistant] if @command.nil?
-
-        call_id = "shell_#{SecureRandom.hex(8)}"
-        tool_calls = [
-          Brute::ToolCall.new(
-            id: call_id,
-            name: "shell",
-            arguments: { "command" => @command },
+        if @command.nil?
+          [empty_assistant]
+        else
+          call_id = "shell_#{SecureRandom.hex(8)}"
+          tool_calls = [
+            Brute::ToolCall.new(
+              id:        call_id,
+              name:      "shell",
+              arguments: { "command" => @command },
+            )
+          ]
+          [Brute::Message.new(
+            role:       :assistant,
+            content:    "",
+            tool_calls: tool_calls,
           )
-        ]
-
-        [Brute::Message.new(
-          role: :assistant,
-          content: "",
-          tool_calls: tool_calls,
-        )]
+  ]
+        end
       end
       alias_method :choices, :messages
 
@@ -83,9 +85,9 @@ module BruteCLI
 
       private
 
-      def empty_assistant
-        Brute::Message.new(role: :assistant, content: "")
-      end
+        def empty_assistant
+          Brute::Message.new(role: :assistant, content: "")
+        end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brute
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 6.0.0
 platform: ruby
 authors:
 - Brute Contributors
@@ -219,6 +219,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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
@@ -233,6 +247,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: scampi
   requirement: !ruby/object:Gem::Requirement
@@ -282,12 +310,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/brute.rb
+- lib/brute/compaction.rb
+- lib/brute/compaction/middleware/sliding_window.rb
+- lib/brute/compaction/middleware/strategy.rb
+- lib/brute/compaction/middleware/tool_results.rb
+- lib/brute/compaction/summarize.rb
+- lib/brute/compaction/transcript.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/contrib/otel.rb
+- lib/brute/env.rb
+- lib/brute/eval.rb
+- lib/brute/eval/case.rb
+- lib/brute/eval/suite.rb
+- lib/brute/eval/transcript.rb
+- lib/brute/eval/world.rb
 - lib/brute/events/handler.rb
 - lib/brute/events/prefixed_terminal_output.rb
 - lib/brute/events/terminal_output_handler.rb
@@ -310,10 +350,9 @@ files:
 - lib/brute/middleware/010_max_iterations.rb
 - lib/brute/middleware/020_system_prompt.rb
 - lib/brute/middleware/025_skills.rb
-- lib/brute/middleware/040_compaction_check.rb
+- lib/brute/middleware/040_default_compaction_pipeline.rb
 - lib/brute/middleware/060_questions.rb
-- lib/brute/middleware/070_tool_pipeline.rb
-- lib/brute/middleware/event_handler.rb
+- lib/brute/middleware/070_default_tool_pipeline.rb
 - lib/brute/middleware/user_queue.rb
 - lib/brute/prompt_template.rb
 - lib/brute/prompts.rb
@@ -362,6 +401,9 @@ files:
 - lib/brute/rack/adapter.rb
 - lib/brute/skill.rb
 - lib/brute/system_prompt.rb
+- lib/brute/token_counter.rb
+- lib/brute/token_counter/approximate.rb
+- lib/brute/token_counter/tiktoken.rb
 - lib/brute/tool.rb
 - lib/brute/tools.rb
 - lib/brute/tools/adapter.rb
@@ -383,6 +425,7 @@ files:
 - lib/brute/tools/todo_write.rb
 - lib/brute/truncation.rb
 - lib/brute/turn/agent_pipeline.rb
+- lib/brute/turn/compaction_pipeline.rb
 - lib/brute/turn/pipeline.rb
 - lib/brute/turn/tool_pipeline.rb
 - lib/brute/usage_detection/lang_chain.rb
@@ -397,7 +440,7 @@ files:
 - lib/brute_cli/providers/shell_response.rb
 homepage: https://github.com/general-intelligence-systems/brute
 licenses:
-- MIT
+- Apache-2.0
 metadata:
   documentation_uri: https://general-intelligence-systems.github.io/brute/
 rdoc_options: []

data/lib/brute/middleware/040_compaction_check.rb

@@ -1,157 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "brute"
-
-module Brute
-  module Middleware
-    # Checks context size after each LLM call and triggers compaction
-    # when thresholds are exceeded.
-    #
-    # It should add a compaction event to the logs with the context token
-    # total listed... this way a model that supports extra context can
-    # include the compaction as well as the previous messages...
-    #
-    # Or an LLM that doesn't support it can just use the messages
-    # that come after the compaction
-    #
-    class CompactionCheck < Brute::Middleware::Base
-      def initialize(app, compactor: nil, system_prompt:, **compactor_opts)
-        @app = app
-        @compactor = compactor
-        @compactor_opts = compactor_opts
-        @system_prompt = system_prompt
-      end
-
-      def call(env)
-        #@compactor ||= Compactor.new(env[:provider], **@compactor_opts)
-
-        #messages = env[:messages]
-        #usage = env[:metadata].dig(:tokens, :last_call)
-
-        #if @compactor.should_compact?(messages, usage: usage)
-        #  result = @compactor.compact(messages)
-        #  if result
-        #    summary_text, _recent = result
-        #    env[:metadata][:compaction] = {
-        #      messages_before: messages.size,
-        #      timestamp: Time.now.iso8601,
-        #    }
-        #    # Replace the message history with the summary
-        #    env[:messages] = [
-        #      Brute::Message.new(role: :system, content: @system_prompt),
-        #      Brute::Message.new(role: :user, content: "[Previous conversation summary]\n\n#{summary_text}"),
-        #    ]
-        #  end
-        #end
-
-        @app.call(env)
-      end
-
-      # Context compaction service. When the conversation grows past configurable
-      # thresholds, older messages are summarized into a condensed form and the
-      # original messages are dropped, keeping the context window manageable.
-      class Compactor
-        DEFAULTS = {
-          token_threshold: 100_000,   # Compact when estimated tokens exceed this
-          message_threshold: 200,     # Compact when message count exceeds this
-          retention_window: 6,        # Minimum recent messages to always keep
-          summary_model: nil,         # Model for summarization (uses agent's model if nil)
-        }.freeze
-
-        attr_reader :config
-
-        def initialize(provider, **opts)
-          @provider = provider
-          @config = DEFAULTS.merge(opts)
-        end
-
-        # Check whether compaction should run based on current context state.
-        def should_compact?(messages, usage: nil)
-          return true if messages.size > @config[:message_threshold]
-          return true if usage && (usage[:total] || 0) > @config[:token_threshold]
-          false
-        end
-
-        # Compact the message history by summarizing older messages.
-        #
-        # Returns [summary_message, kept_messages] — the caller rebuilds
-        # the context from these.
-        def compact(messages)
-          total = messages.size
-          keep_count = [@config[:retention_window], total].min
-          return nil if total <= keep_count
-
-          old_messages = messages[0...(total - keep_count)]
-          recent_messages = messages[(total - keep_count)..]
-
-          summary_text = summarize(old_messages)
-
-          [summary_text, recent_messages]
-        end
-
-        private
-
-        def summarize(messages)
-          # Build a condensed representation of the conversation for the summarizer
-          conversation_text = messages.map { |m|
-            role = if m.respond_to?(:role)
-              m.role.to_s
-            else
-              "unknown"
-            end
-            content = if m.respond_to?(:content)
-              m.content.to_s[0..1000]
-            else
-              m.to_s[0..1000]
-            end
-
-            # Include tool call info for assistant messages
-            tool_info = ""
-            if m.respond_to?(:functions) && m.functions&.any?
-              calls = m.functions.map { |f| "#{f.name}(#{f.arguments.to_s[0..200]})" }
-              tool_info = " [tools: #{calls.join(", ")}]"
-            end
-
-            "#{role}:#{tool_info} #{content}"
-          }.join("\n---\n")
-
-          prompt = <<~PROMPT
-            Summarize this conversation history for context continuity. The summary will replace
-            these messages in the context window, so include everything the agent needs to continue
-            working effectively.
-
-            Structure your summary as:
-            ## Goal
-            What the user asked for.
-
-            ## Progress
-            - Files read, created, or modified (list paths)
-            - Commands executed and their outcomes
-            - Key decisions made
-
-            ## Current State
-            Where things stand right now — what's done and what remains.
-
-            ## Next Steps
-            What should happen next based on the conversation.
-
-            ---
-            CONVERSATION:
-            #{conversation_text}
-          PROMPT
-
-          model = @config[:summary_model] || "claude-sonnet-4-20250514"
-          res = @provider.complete(prompt, model: model)
-          res.content
-        end
-      end
-    end
-  end
-end
-
-__END__
-
-describe "brute/middleware/040_compaction_check" do
-  # not implemented
-end

data/lib/brute/middleware/event_handler.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'brute'
-
-module Brute
-  module Middleware
-    class EventHandler < Brute::Middleware::Base
-      def initialize(app, handler_class:, **opts)
-        @app = app
-        @handler_class = handler_class
-        @opts = opts
-      end
-
-      def call(env)
-        env[:events] = @handler_class.new(env[:events], **@opts)
-        @app.call(env)
-      end
-    end
-  end
-end
-
-__END__
-
-describe "brute/middleware/event_handler" do
-  # not implemented
-end