brute 1.0.1 → 2.0.1

data/lib/brute.rb

@@ -1,66 +1,103 @@
 # frozen_string_literal: true
 
-require 'llm'
+require 'ruby_llm'
 require 'timeout'
 require 'logger'
 require 'scampi/kernel_ext'
+require 'colorize_extended'
+require 'active_support/all'
 
-# Brute — a coding agent built on llm.rb
+# Brute — a coding agent built on ruby_llm
 #
 # Cross-cutting concerns are implemented as Rack-style middleware in a
 # Pipeline that wraps every LLM call:
 #
 #   Tracing → Retry → Session → Tokens → Compaction → ToolErrors → DoomLoop → Reasoning → [LLM Call]
 #
-# Entry point:
-#
-#   agent = Brute::Agent.new(provider:, model:, tools:, system_prompt:)
-#   step  = Brute::Loop::AgentTurn.perform(agent:, session:, pipeline:, input:)
-#
-require_relative 'brute/version'
+
+require 'brute/version'
 
 module Brute
-  def self.provider
-    @provider ||= Brute::Providers.guess_from_env
+  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' 
+  LOGO
+
+  def self.config
+    @config ||= begin
+      RubyLLM.configure do |config|
+        # Anthropic
+        config.anthropic_api_key = ENV['ANTHROPIC_API_KEY']
+        config.anthropic_api_base = ENV['ANTHROPIC_API_BASE'] # Available in v1.13.0+ (optional custom Anthropic endpoint)
+      
+        # Azure
+        config.azure_api_base = ENV['AZURE_API_BASE'] # Microsoft Foundry project endpoint
+        config.azure_api_key = ENV['AZURE_API_KEY'] # use this or
+        config.azure_ai_auth_token = ENV['AZURE_AI_AUTH_TOKEN'] # this
+      
+        # Bedrock
+        config.bedrock_api_key = ENV['AWS_ACCESS_KEY_ID']
+        config.bedrock_secret_key = ENV['AWS_SECRET_ACCESS_KEY']
+        config.bedrock_region = ENV['AWS_REGION'] # Required for Bedrock
+        config.bedrock_session_token = ENV['AWS_SESSION_TOKEN'] # For temporary credentials
+      
+        # DeepSeek
+        config.deepseek_api_key = ENV['DEEPSEEK_API_KEY']
+        config.deepseek_api_base = ENV['DEEPSEEK_API_BASE'] # Available in v1.13.0+ (optional custom DeepSeek endpoint)
+      
+        # Gemini
+        config.gemini_api_key = ENV['GEMINI_API_KEY']
+        config.gemini_api_base = ENV['GEMINI_API_BASE'] # Available in v1.9.0+ (optional API version override)
+      
+        # GPUStack
+        config.gpustack_api_base = ENV['GPUSTACK_API_BASE']
+        config.gpustack_api_key = ENV['GPUSTACK_API_KEY']
+      
+        # Mistral
+        config.mistral_api_key = ENV['MISTRAL_API_KEY']
+      
+        # Ollama
+        config.ollama_api_base = 'http://localhost:11434/v1'
+        config.ollama_api_key = ENV['OLLAMA_API_KEY'] # Available in v1.13.0+ (optional for authenticated/remote Ollama endpoints)
+      
+        # OpenAI
+        config.openai_api_key = ENV['OPENAI_API_KEY']
+        config.openai_api_base = ENV['OPENAI_API_BASE'] # Optional custom OpenAI-compatible endpoint
+      
+        # OpenRouter
+        config.openrouter_api_key = ENV['OPENROUTER_API_KEY']
+        config.openrouter_api_base = ENV['OPENROUTER_API_BASE'] # Available in v1.13.0+ (optional custom OpenRouter endpoint)
+      
+        # Perplexity
+        config.perplexity_api_key = ENV['PERPLEXITY_API_KEY']
+      
+        # Vertex AI
+        config.vertexai_project_id = ENV['GOOGLE_CLOUD_PROJECT'] # Available in v1.7.0+
+        config.vertexai_location = ENV['GOOGLE_CLOUD_LOCATION']
+        config.vertexai_service_account_key = ENV['VERTEXAI_SERVICE_ACCOUNT_KEY'] # Optional: service account JSON key
+      
+        # xAI
+        config.xai_api_key = ENV['XAI_API_KEY'] # Available in v1.11.0+
+      end
+      RubyLLM.config
+    end
   end
 
+  def self.provider
+    @provider ||= :anthropic
+  end
+  
   def self.provider=(p)
-    @provider = p
+    @provider = p.to_sym
   end
 end
 
-require_relative 'brute/diff'
-require_relative 'brute/skill'
-require_relative 'brute/prompts'
-require_relative 'brute/system_prompt'
-require_relative 'brute/pipeline'
-require_relative 'brute/agent'
-
-# Brute::Store
-require_relative 'brute/store/snapshot_store'
-require_relative 'brute/store/todo_store'
-require_relative 'brute/store/message_store'
-require_relative 'brute/store/session'
-
-# Brute::Loop (before Queue — queue tests reference Loop::Step)
-require_relative 'brute/loop/doom_loop'
-require_relative 'brute/loop/compactor'
-require_relative 'brute/loop/agent_stream'
-require_relative 'brute/loop/step'
-require_relative 'brute/loop/tool_call_step'
-
-# Brute::Queue
-require_relative 'brute/queue/file_mutation_queue'
-require_relative 'brute/queue/base_queue'
-require_relative 'brute/queue/sequential_queue'
-require_relative 'brute/queue/parallel_queue'
-
-# Brute::Loop (agent_turn depends on Queue)
-require_relative 'brute/loop/agent_turn'
-
-require_relative 'brute/patches/anthropic_tool_role'
-require_relative 'brute/patches/buffer_nil_guard'
+Dir.glob("#{__dir__}/brute/**/*.rb").sort.each do |path|
+  require path
+end
 
-require_relative 'brute/middleware'
-require_relative 'brute/tools'
-require_relative 'brute/providers'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brute
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Brute Contributors
@@ -38,19 +38,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: llm.rb
+  name: ruby_llm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.11'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: scampi
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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: colorize-extended
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,34 +115,24 @@ extra_rdoc_files: []
 files:
 - lib/brute.rb
 - lib/brute/agent.rb
-- lib/brute/diff.rb
-- lib/brute/loop/agent_stream.rb
-- lib/brute/loop/agent_turn.rb
-- lib/brute/loop/compactor.rb
-- lib/brute/loop/doom_loop.rb
-- lib/brute/loop/step.rb
-- lib/brute/loop/tool_call_step.rb
-- lib/brute/middleware.rb
-- lib/brute/middleware/base.rb
-- lib/brute/middleware/compaction_check.rb
-- lib/brute/middleware/doom_loop_detection.rb
-- lib/brute/middleware/llm_call.rb
-- lib/brute/middleware/message_tracking.rb
-- lib/brute/middleware/otel.rb
-- lib/brute/middleware/otel/span.rb
-- lib/brute/middleware/otel/token_usage.rb
-- lib/brute/middleware/otel/tool_calls.rb
-- lib/brute/middleware/otel/tool_results.rb
-- lib/brute/middleware/reasoning_normalizer.rb
-- lib/brute/middleware/retry.rb
-- lib/brute/middleware/session_persistence.rb
-- lib/brute/middleware/token_tracking.rb
-- lib/brute/middleware/tool_error_tracking.rb
-- lib/brute/middleware/tool_use_guard.rb
-- lib/brute/middleware/tracing.rb
-- lib/brute/orchestrator/turn.rb
-- lib/brute/patches/anthropic_tool_role.rb
-- lib/brute/patches/buffer_nil_guard.rb
+- lib/brute/events/handler.rb
+- lib/brute/events/prefixed_terminal_output.rb
+- lib/brute/events/terminal_output_handler.rb
+- lib/brute/middleware/001_otel_span.rb
+- lib/brute/middleware/003_tool_result_loop.rb
+- lib/brute/middleware/004_summarize.rb
+- lib/brute/middleware/005_tracing.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/040_compaction_check.rb
+- lib/brute/middleware/060_questions.rb
+- lib/brute/middleware/070_tool_call.rb
+- lib/brute/middleware/073_otel_tool_call.rb
+- lib/brute/middleware/075_otel_tool_results.rb
+- lib/brute/middleware/100_llm_call.rb
+- lib/brute/middleware/event_handler.rb
+- lib/brute/middleware/user_queue.rb
 - lib/brute/pipeline.rb
 - lib/brute/prompts.rb
 - lib/brute/prompts/autonomy.rb
@@ -158,23 +176,16 @@ files:
 - lib/brute/prompts/text/tool_usage/google.txt
 - lib/brute/prompts/tone_and_style.rb
 - lib/brute/prompts/tool_usage.rb
-- lib/brute/providers.rb
-- lib/brute/providers/models_dev.rb
-- lib/brute/providers/ollama.rb
-- lib/brute/providers/opencode_go.rb
-- lib/brute/providers/opencode_zen.rb
 - lib/brute/providers/shell.rb
 - lib/brute/providers/shell_response.rb
-- lib/brute/queue/base_queue.rb
 - lib/brute/queue/file_mutation_queue.rb
-- lib/brute/queue/parallel_queue.rb
-- lib/brute/queue/sequential_queue.rb
+- lib/brute/session.rb
 - lib/brute/skill.rb
-- lib/brute/store/message_store.rb
-- lib/brute/store/session.rb
 - lib/brute/store/snapshot_store.rb
 - lib/brute/store/todo_store.rb
+- lib/brute/sub_agent.rb
 - lib/brute/system_prompt.rb
+- lib/brute/tool.rb
 - lib/brute/tools.rb
 - lib/brute/tools/delegate.rb
 - lib/brute/tools/fs_patch.rb
@@ -188,6 +199,8 @@ files:
 - lib/brute/tools/shell.rb
 - lib/brute/tools/todo_read.rb
 - lib/brute/tools/todo_write.rb
+- lib/brute/truncation.rb
+- lib/brute/utils/diff.rb
 - lib/brute/version.rb
 licenses:
 - MIT
@@ -199,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -208,5 +221,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.7.2
 specification_version: 4
-summary: A coding agent built on llm.rb
+summary: A coding agent built on ruby_llm
 test_files: []

data/lib/brute/loop/agent_stream.rb

@@ -1,118 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "brute"
-
-module Brute
-  module Loop
-  # Bridges llm.rb's streaming callbacks to the host application.
-  #
-  # Text and reasoning chunks fire immediately as the LLM generates them.
-  # Tool calls are collected but NOT executed — execution is deferred to the
-  # agent loop after the stream completes. This ensures text is never
-  # concurrent with tool execution.
-  #
-  # After the stream finishes, the agent loop reads +pending_tools+ to
-  # dispatch all tool calls concurrently, then fires +on_tool_call_start+
-  # once with the full batch.
-  #
-  class AgentStream < LLM::Stream
-    # Tool call metadata recorded during streaming, used by ToolUseGuard
-    # when ctx.functions is empty (nil-choice bug in llm.rb).
-    attr_reader :pending_tool_calls
-
-    # Deferred tool/error pairs: [(LLM::Function, error_or_nil), ...]
-    # The agent loop reads these after the stream completes.
-    attr_reader :pending_tools
-
-    def initialize(on_content: nil, on_reasoning: nil, on_question: nil)
-      @on_content = on_content
-      @on_reasoning = on_reasoning
-      @on_question = on_question
-      @pending_tool_calls = []
-      @pending_tools = []
-    end
-
-    # The on_question callback, needed by the agent loop to set
-    # thread/fiber-locals before tool execution.
-    attr_reader :on_question
-
-    def on_content(text)
-      @on_content&.call(text)
-    end
-
-    def on_reasoning_content(text)
-      @on_reasoning&.call(text)
-    end
-
-    # Called by llm.rb per tool as it arrives during streaming.
-    # Records only — no execution, no threads, no queue pushes.
-    def on_tool_call(tool, error)
-      @pending_tool_calls << { id: tool.id, name: tool.name, arguments: tool.arguments }
-      @pending_tools << [tool, error]
-    end
-
-    # Clear only the tool call metadata (used by ToolUseGuard after it
-    # has consumed the data for synthetic message injection).
-    def clear_pending_tool_calls!
-      @pending_tool_calls.clear
-    end
-
-    # Clear the deferred execution queue after the agent loop has
-    # consumed and dispatched all tool calls.
-    def clear_pending_tools!
-      @pending_tools.clear
-    end
-  end
-  end
-end
-
-test do
-  FakeTool = Struct.new(:id, :name, :arguments, keyword_init: true)
-
-  it "records tool in pending_tools" do
-    stream = Brute::Loop::AgentStream.new
-    tool = FakeTool.new(id: "toolu_1", name: "read", arguments: {})
-    stream.on_tool_call(tool, nil)
-    stream.pending_tools.size.should == 1
-  end
-
-  it "records tool call metadata" do
-    stream = Brute::Loop::AgentStream.new
-    tool = FakeTool.new(id: "toolu_abc", name: "read", arguments: { "file_path" => "test.rb" })
-    stream.on_tool_call(tool, nil)
-    stream.pending_tool_calls.first[:id].should == "toolu_abc"
-  end
-
-  it "records multiple tool calls" do
-    stream = Brute::Loop::AgentStream.new
-    t1 = FakeTool.new(id: "toolu_1", name: "read", arguments: {})
-    t2 = FakeTool.new(id: "toolu_2", name: "write", arguments: {})
-    stream.on_tool_call(t1, nil)
-    stream.on_tool_call(t2, nil)
-    stream.pending_tool_calls.size.should == 2
-  end
-
-  it "clears pending tool calls and tools" do
-    stream = Brute::Loop::AgentStream.new
-    tool = FakeTool.new(id: "toolu_1", name: "read", arguments: {})
-    stream.on_tool_call(tool, nil)
-    stream.clear_pending_tool_calls!
-    stream.clear_pending_tools!
-    stream.pending_tool_calls.should.be.empty
-  end
-
-  it "fires the content callback" do
-    received = nil
-    stream = Brute::Loop::AgentStream.new(on_content: ->(text) { received = text })
-    stream.on_content("hello")
-    received.should == "hello"
-  end
-
-  it "fires the reasoning callback" do
-    received = nil
-    stream = Brute::Loop::AgentStream.new(on_reasoning: ->(text) { received = text })
-    stream.on_reasoning_content("thinking...")
-    received.should == "thinking..."
-  end
-end