brute 5.1.0 → 6.0.0

data/lib/brute/utils/diff.rb

@@ -12,17 +12,25 @@ module Brute
       old_lines = old_text.lines
       new_lines = new_text.lines
       diffs = ::Diff::LCS.diff(old_lines, new_lines)
-      return '' if diffs.empty?
-
-      output = +''
-      file_length_difference = 0
-      diffs.each do |piece|
-        hunk = ::Diff::LCS::Hunk.new(old_lines, new_lines, piece, context, file_length_difference)
-        file_length_difference = hunk.file_length_difference
-        output << hunk.diff(:unified)
-        output << "\n"
+      if diffs.empty?
+        ''
+      else
+        output = +''
+        file_length_difference = 0
+        diffs.each do |piece|
+          hunk = ::Diff::LCS::Hunk.new(
+            old_lines,
+            new_lines,
+            piece,
+            context,
+            file_length_difference,
+          )
+          file_length_difference = hunk.file_length_difference
+          output << hunk.diff(:unified)
+          output << "\n"
+        end
+        output
       end
-      output
     end
   end
 end

data/lib/brute/version.rb

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

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
@@ -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
@@ -132,11 +134,8 @@ 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_default_compaction_pipeline"
-require_relative "brute/middleware/040_compaction_check"
 require_relative "brute/middleware/060_questions"
 require_relative "brute/middleware/070_default_tool_pipeline"
-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"

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.1.0
+  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
@@ -322,12 +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_default_tool_pipeline.rb
-- lib/brute/middleware/070_tool_pipeline.rb
-- lib/brute/middleware/event_handler.rb
 - lib/brute/middleware/user_queue.rb
 - lib/brute/prompt_template.rb
 - lib/brute/prompts.rb
@@ -415,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,73 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "brute"
-require "gem_kit"
-
-module Brute
-  module Middleware
-    # The old compaction trigger, kept working while it is deprecated.
-    # DefaultCompactionPipeline is the layer that does the job.
-    #
-    # It passes the turn through and compacts nothing, which is what it always
-    # did -- and it is deliberately not a subclass of its replacement, because
-    # inheriting would make a layer that did nothing suddenly start giving up
-    # context. A deprecation warns about a name; it does not change what the
-    # code under that name does.
-    #
-    # Whatever it was configured with is accepted and ignored, so existing
-    # `use` lines keep parsing until they are moved over:
-    #
-    #   use Brute::Middleware::DefaultCompactionPipeline,
-    #     window:     200_000,
-    #     summariser: Brute::Completion::OpenRouter.new(config: { access_token: key })
-    #
-    class CompactionCheck < Brute::Middleware::Base
-      extend GemKit::Deprecate
-      superseded_by "Brute::Middleware::DefaultCompactionPipeline", "6.0"
-
-      def initialize(app, **_options)
-        @app = app
-      end
-
-      def call(env) = @app.call(env)
-    end
-  end
-end
-
-__END__
-
-describe "brute/middleware/040_compaction_check" do
-  it "passes the turn through as it always did, and says what to use instead" do
-    warned = []
-    original = GemKit::Deprecate.method(:warn)
-    GemKit::Deprecate.define_singleton_method(:warn) { |message| warned << message }
-
-    begin
-      # Whatever it was configured with is taken and ignored, so an existing
-      # `use` line keeps parsing.
-      layer = Brute::Middleware::CompactionCheck.new(
-        ->(env) { env[:messages].assistant("answered") },
-        system_prompt: "you are helpful",
-        token_threshold: 100
-      )
-
-      env = { messages: Brute.log }
-      layer.call(env)
-      env[:messages].last.content.should == "answered"
-    ensure
-      GemKit::Deprecate.define_singleton_method(:warn, original)
-    end
-
-    # Not a subclass of its replacement: a layer that compacted nothing must
-    # not start compacting because its name was deprecated.
-    Brute::Middleware::CompactionCheck.ancestors
-      .should.not.include Brute::Middleware::DefaultCompactionPipeline
-
-    warned.first.should.include "Brute::Middleware::DefaultCompactionPipeline"
-
-    declared = GemKit::Deprecate.registry.find { |entry| entry.name == "Brute::Middleware::CompactionCheck" }
-    declared.replacement.should == "Brute::Middleware::DefaultCompactionPipeline"
-    declared.removed_in.should == Gem::Version.new("6.0")
-  end
-end

data/lib/brute/middleware/070_tool_pipeline.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "brute"
-require "gem_kit"
-
-module Brute
-  module Middleware
-    # The old name for DefaultToolPipeline, kept working while it is
-    # deprecated. The middleware is one particular wiring of tool dispatch and
-    # the name now says so, leaving Brute::Turn::ToolPipeline as the mechanism
-    # to compose when that wiring is not what you want.
-    #
-    #   use Brute::Middleware::DefaultToolPipeline, tools: tools
-    #
-    class ToolPipeline < DefaultToolPipeline
-      extend GemKit::Deprecate
-      superseded_by "Brute::Middleware::DefaultToolPipeline", "6.0"
-    end
-  end
-end
-
-__END__
-
-describe "brute/middleware/070_tool_pipeline" do
-  it "still dispatches tools under the old name, and says what to use instead" do
-    warned = []
-    original = GemKit::Deprecate.method(:warn)
-    GemKit::Deprecate.define_singleton_method(:warn) { |message| warned << message }
-
-    begin
-      tool = Brute::Turn::ToolPipeline.new(name: "echo", description: "echo") do
-        run ->(env) { env[:result] = "echoed" }
-      end
-
-      agent = Brute.agent
-        .use(Brute::Middleware::ToolPipeline, tools: [tool])
-        .run(
-          ->(env) {
-            env[:messages] << Brute::Message.new(
-              role: :assistant,
-              content: "",
-              tool_calls: [{ id: "1", name: "echo", arguments: {} }]
-            )
-          }
-        )
-
-      agent.start("go")[:messages].last.content.should == "echoed"
-    ensure
-      GemKit::Deprecate.define_singleton_method(:warn, original)
-    end
-
-    Brute::Middleware::ToolPipeline.ancestors.should.include Brute::Middleware::DefaultToolPipeline
-    warned.first.should.include "Brute::Middleware::DefaultToolPipeline"
-    warned.first.should.include "6.0"
-
-    declared = GemKit::Deprecate.registry.find { |entry| entry.name == "Brute::Middleware::ToolPipeline" }
-    declared.replacement.should == "Brute::Middleware::DefaultToolPipeline"
-    declared.removed_in.should == Gem::Version.new("6.0")
-  end
-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