brute 0.4.0 → 1.0.0

data/lib/brute/tools/fs_patch.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Tools
     class FSPatch < LLM::Tool
@@ -14,13 +17,13 @@ module Brute
 
       def call(file_path:, old_string:, new_string:, replace_all: false)
         path = File.expand_path(file_path)
-        Brute::FileMutationQueue.serialize(path) do
+        Brute::Queue::FileMutationQueue.serialize(path) do
           raise "File not found: #{path}" unless File.exist?(path)
 
           original = File.read(path)
           raise "old_string not found in #{path}" unless original.include?(old_string)
 
-          Brute::SnapshotStore.save(path)
+          Brute::Store::SnapshotStore.save(path)
 
           updated = if replace_all
                       original.gsub(old_string, new_string)
@@ -37,3 +40,52 @@ module Brute
     end
   end
 end
+
+test do
+  require "tmpdir"
+
+  it "replaces old_string with new_string" do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, "test.rb")
+      File.write(path, "hello world\n")
+      result = Brute::Tools::FSPatch.new.call(file_path: path, old_string: "world", new_string: "ruby")
+      File.read(path).should == "hello ruby\n"
+    end
+  end
+
+  it "returns a unified diff" do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, "test.rb")
+      File.write(path, "line1\nold line\nline3\n")
+      result = Brute::Tools::FSPatch.new.call(file_path: path, old_string: "old line", new_string: "new line")
+      result[:diff].should =~ /\-old line/
+    end
+  end
+
+  it "raises when file not found" do
+    Dir.mktmpdir do |dir|
+      lambda {
+        Brute::Tools::FSPatch.new.call(file_path: File.join(dir, "nope.rb"), old_string: "a", new_string: "b")
+      }.should.raise(RuntimeError)
+    end
+  end
+
+  it "raises when old_string not found" do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, "test.rb")
+      File.write(path, "hello\n")
+      lambda {
+        Brute::Tools::FSPatch.new.call(file_path: path, old_string: "missing", new_string: "new")
+      }.should.raise(RuntimeError)
+    end
+  end
+
+  it "supports replace_all" do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, "test.rb")
+      File.write(path, "aaa bbb aaa\n")
+      result = Brute::Tools::FSPatch.new.call(file_path: path, old_string: "aaa", new_string: "ccc", replace_all: true)
+      result[:replacements].should == 2
+    end
+  end
+end

data/lib/brute/tools/fs_read.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+if __FILE__ == $0
+  require "bundler/setup"
+  require "brute"
+end
+
 module Brute
   module Tools
     class FSRead < LLM::Tool

data/lib/brute/tools/fs_remove.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+if __FILE__ == $0
+  require "bundler/setup"
+  require "brute"
+end
+
 require "fileutils"
 
 module Brute
@@ -12,10 +17,10 @@ module Brute
 
       def call(path:)
         target = File.expand_path(path)
-        Brute::FileMutationQueue.serialize(target) do
+        Brute::Queue::FileMutationQueue.serialize(target) do
           raise "Path not found: #{target}" unless File.exist?(target)
 
-          Brute::SnapshotStore.save(target) if File.file?(target)
+          Brute::Store::SnapshotStore.save(target) if File.file?(target)
 
           if File.directory?(target)
             Dir.rmdir(target)

data/lib/brute/tools/fs_search.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+if __FILE__ == $0
+  require "bundler/setup"
+  require "brute"
+end
+
 require "open3"
 
 module Brute

data/lib/brute/tools/fs_undo.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+if __FILE__ == $0
+  require "bundler/setup"
+  require "brute"
+end
+
 module Brute
   module Tools
     class FSUndo < LLM::Tool
@@ -11,8 +16,8 @@ module Brute
 
       def call(path:)
         target = File.expand_path(path)
-        Brute::FileMutationQueue.serialize(target) do
-          snapshot = Brute::SnapshotStore.pop(target)
+        Brute::Queue::FileMutationQueue.serialize(target) do
+          snapshot = Brute::Store::SnapshotStore.pop(target)
           raise "No undo history available for: #{target}" unless snapshot
 
           if snapshot == :did_not_exist

data/lib/brute/tools/fs_write.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
 require 'fileutils'
 
 module Brute
@@ -14,9 +16,9 @@ module Brute
 
       def call(file_path:, content:)
         path = File.expand_path(file_path)
-        Brute::FileMutationQueue.serialize(path) do
+        Brute::Queue::FileMutationQueue.serialize(path) do
           old_content = File.exist?(path) ? File.read(path) : ''
-          Brute::SnapshotStore.save(path)
+          Brute::Store::SnapshotStore.save(path)
           FileUtils.mkdir_p(File.dirname(path))
           File.write(path, content)
           diff = Brute::Diff.unified(old_content, content)
@@ -26,3 +28,39 @@ module Brute
     end
   end
 end
+
+test do
+  require "tmpdir"
+
+  it "writes content to a new file" do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, "new.rb")
+      Brute::Tools::FSWrite.new.call(file_path: path, content: "hello\n")
+      File.read(path).should == "hello\n"
+    end
+  end
+
+  it "returns a diff for new files" do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, "new.rb")
+      result = Brute::Tools::FSWrite.new.call(file_path: path, content: "line1\nline2\n")
+      result[:diff].should =~ /\+line1/
+    end
+  end
+
+  it "creates parent directories" do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, "deep", "nested", "file.rb")
+      result = Brute::Tools::FSWrite.new.call(file_path: path, content: "nested\n")
+      result[:success].should.be.true
+    end
+  end
+
+  it "returns byte count" do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, "test.rb")
+      result = Brute::Tools::FSWrite.new.call(file_path: path, content: "hello")
+      result[:bytes].should == 5
+    end
+  end
+end

data/lib/brute/tools/net_fetch.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+if __FILE__ == $0
+  require "bundler/setup"
+  require "brute"
+end
+
 require "net/http"
 require "uri"
 

data/lib/brute/tools/question.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+if __FILE__ == $0
+  require "bundler/setup"
+  require "brute"
+end
+
 module Brute
   module Tools
     class Question < LLM::Tool

data/lib/brute/tools/shell.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+if __FILE__ == $0
+  require "bundler/setup"
+  require "brute"
+end
+
 require "open3"
 
 module Brute

data/lib/brute/tools/todo_read.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+if __FILE__ == $0
+  require "bundler/setup"
+  require "brute"
+end
+
 module Brute
   module Tools
     class TodoRead < LLM::Tool
@@ -8,7 +13,7 @@ module Brute
       param :_placeholder, String, "Unused, pass any value"
 
       def call(_placeholder: nil)
-        {todos: Brute::TodoStore.all}
+        {todos: Brute::Store::TodoStore.all}
       end
     end
   end

data/lib/brute/tools/todo_write.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+if __FILE__ == $0
+  require "bundler/setup"
+  require "brute"
+end
+
 module Brute
   module Tools
     class TodoWrite < LLM::Tool
@@ -24,7 +29,7 @@ module Brute
           t = t.transform_keys(&:to_sym) if t.is_a?(Hash)
           {id: t[:id], content: t[:content], status: t[:status]}
         end
-        Brute::TodoStore.replace(items)
+        Brute::Store::TodoStore.replace(items)
         {success: true, count: items.size}
       end
     end

data/lib/brute/tools.rb

@@ -0,0 +1,31 @@
+require_relative 'tools/fs_read'
+require_relative 'tools/fs_write'
+require_relative 'tools/fs_patch'
+require_relative 'tools/fs_remove'
+require_relative 'tools/fs_search'
+require_relative 'tools/fs_undo'
+require_relative 'tools/shell'
+require_relative 'tools/net_fetch'
+require_relative 'tools/todo_write'
+require_relative 'tools/todo_read'
+require_relative 'tools/delegate'
+require_relative 'tools/question'
+
+module Brute
+  module Tools
+    ALL = [
+      Tools::FSRead,
+      Tools::FSWrite,
+      Tools::FSPatch,
+      Tools::FSRemove,
+      Tools::FSSearch,
+      Tools::FSUndo,
+      Tools::Shell,
+      Tools::NetFetch,
+      Tools::TodoWrite,
+      Tools::TodoRead,
+      Tools::Delegate,
+      Tools::Question
+    ].freeze
+  end
+end

data/lib/brute/version.rb

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

data/lib/brute.rb

@@ -3,6 +3,7 @@
 require 'llm'
 require 'timeout'
 require 'logger'
+require 'scampi/kernel_ext'
 
 # Brute — a coding agent built on llm.rb
 #
@@ -11,220 +12,55 @@ require 'logger'
 #
 #   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'
 
 module Brute
-  module Tools; end
-  module Hooks; end
-  module Middleware; end
+  def self.provider
+    @provider ||= Brute::Providers.guess_from_env
+  end
+
+  def self.provider=(p)
+    @provider = p
+  end
 end
 
-# Infrastructure
 require_relative 'brute/diff'
-require_relative 'brute/snapshot_store'
-require_relative 'brute/todo_store'
-require_relative 'brute/file_mutation_queue'
-require_relative 'brute/doom_loop'
-require_relative 'brute/hooks'
-require_relative 'brute/compactor'
-require_relative 'brute/prompts/base'
-require_relative 'brute/prompts/identity'
-require_relative 'brute/prompts/tone_and_style'
-require_relative 'brute/prompts/objectivity'
-require_relative 'brute/prompts/task_management'
-require_relative 'brute/prompts/doing_tasks'
-require_relative 'brute/prompts/tool_usage'
-require_relative 'brute/prompts/conventions'
-require_relative 'brute/prompts/git_safety'
-require_relative 'brute/prompts/code_references'
-require_relative 'brute/prompts/environment'
-require_relative 'brute/prompts/instructions'
-require_relative 'brute/prompts/editing_approach'
-require_relative 'brute/prompts/autonomy'
-require_relative 'brute/prompts/editing_constraints'
-require_relative 'brute/prompts/frontend_tasks'
-require_relative 'brute/prompts/proactiveness'
-require_relative 'brute/prompts/code_style'
-require_relative 'brute/prompts/security_and_safety'
-require_relative 'brute/prompts/skills'
-require_relative 'brute/prompts/plan_reminder'
-require_relative 'brute/prompts/max_steps'
-require_relative 'brute/prompts/build_switch'
 require_relative 'brute/skill'
+require_relative 'brute/prompts'
 require_relative 'brute/system_prompt'
-require_relative 'brute/message_store'
-require_relative 'brute/session'
 require_relative 'brute/pipeline'
-require_relative 'brute/agent_stream'
+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'
 
-# Provider patches
 require_relative 'brute/patches/anthropic_tool_role'
 require_relative 'brute/patches/buffer_nil_guard'
 
-# Middleware (Rack-style)
-require_relative 'brute/middleware/base'
-require_relative 'brute/middleware/llm_call'
-require_relative 'brute/middleware/retry'
-require_relative 'brute/middleware/doom_loop_detection'
-require_relative 'brute/middleware/token_tracking'
-require_relative 'brute/middleware/compaction_check'
-require_relative 'brute/middleware/session_persistence'
-require_relative 'brute/middleware/message_tracking'
-require_relative 'brute/middleware/tracing'
-require_relative 'brute/middleware/tool_error_tracking'
-require_relative 'brute/middleware/reasoning_normalizer'
-require_relative "brute/middleware/tool_use_guard"
-require_relative "brute/middleware/otel"
-
-# Tools
-require_relative 'brute/tools/fs_read'
-require_relative 'brute/tools/fs_write'
-require_relative 'brute/tools/fs_patch'
-require_relative 'brute/tools/fs_remove'
-require_relative 'brute/tools/fs_search'
-require_relative 'brute/tools/fs_undo'
-require_relative 'brute/tools/shell'
-require_relative 'brute/tools/net_fetch'
-require_relative 'brute/tools/todo_write'
-require_relative 'brute/tools/todo_read'
-require_relative 'brute/tools/delegate'
-require_relative 'brute/tools/question'
-
-# Providers
-require_relative 'brute/providers/shell_response'
-require_relative 'brute/providers/shell'
-require_relative 'brute/providers/models_dev'
-require_relative 'brute/providers/opencode_zen'
-require_relative 'brute/providers/opencode_go'
-
-# Orchestrator (depends on tools, middleware, and infrastructure)
-require_relative 'brute/orchestrator'
-
-module Brute
-  # The complete set of tools available to the agent.
-  TOOLS = [
-    Tools::FSRead,
-    Tools::FSWrite,
-    Tools::FSPatch,
-    Tools::FSRemove,
-    Tools::FSSearch,
-    Tools::FSUndo,
-    Tools::Shell,
-    Tools::NetFetch,
-    Tools::TodoWrite,
-    Tools::TodoRead,
-    Tools::Delegate,
-    Tools::Question
-  ].freeze
-
-  # Default provider, resolved from environment.
-  def self.provider
-    @provider ||= resolve_provider
-  end
-
-  def self.provider=(p)
-    @provider = p
-  end
-
-  # Create a new orchestrator with sensible defaults.
-  def self.agent(cwd: Dir.pwd, model: nil, tools: TOOLS, session: nil, reasoning: {}, agent_name: nil, **callbacks)
-    Orchestrator.new(
-      provider: provider,
-      model: model,
-      tools: tools,
-      cwd: cwd,
-      session: session,
-      reasoning: reasoning,
-      agent_name: agent_name,
-      **callbacks
-    )
-  end
-
-  PROVIDERS = {
-    'anthropic' => ->(key) { LLM.anthropic(key: key).tap { Patches::AnthropicToolRole.apply! } },
-    'openai' => ->(key) { LLM.openai(key: key) },
-    'google' => ->(key) { LLM.google(key: key) },
-    'deepseek' => ->(key) { LLM.deepseek(key: key) },
-    'ollama' => ->(key) { LLM.ollama(key: key) },
-    'xai' => ->(key) { LLM.xai(key: key) },
-    'opencode_zen' => ->(key) { LLM::OpencodeZen.new(key: key) },
-    'opencode_go' => ->(key) { LLM::OpencodeGo.new(key: key) },
-    'shell' => ->(_key) { Providers::Shell.new },
-  }.freeze
-
-  # List provider names that have API keys configured in the environment.
-  # The shell provider is always available (no key needed).
-  def self.configured_providers
-    PROVIDERS.keys.select { |name| api_key_for(name) }
-  end
-
-  # Build a provider instance for the given name using available API keys.
-  # Returns nil if no key is found.
-  def self.provider_for(name)
-    key = api_key_for(name)
-    return nil unless key
-
-    factory = PROVIDERS[name]
-    return nil unless factory
-
-    factory.call(key)
-  end
-
-  # Look up the API key for a given provider name.
-  def self.api_key_for(name)
-    # Shell provider needs no key.
-    return "none" if name == "shell"
-
-    # OpenCode providers: check OPENCODE_API_KEY, fall back to "public" for anonymous access.
-    if name == "opencode_zen" || name == "opencode_go"
-      return ENV["OPENCODE_API_KEY"] || "public"
-    end
-
-    # Explicit generic key always works
-    return ENV["LLM_API_KEY"] if ENV["LLM_API_KEY"]
-
-    case name
-    when "anthropic" then ENV["ANTHROPIC_API_KEY"]
-    when "openai"    then ENV["OPENAI_API_KEY"]
-    when "google"    then ENV["GOOGLE_API_KEY"]
-    end
-  end
-
-  # Resolve the LLM provider from environment variables.
-  #
-  # Checks in order:
-  #   1. LLM_API_KEY + LLM_PROVIDER (explicit)
-  #   2. ANTHROPIC_API_KEY (implicit: provider = anthropic)
-  #   3. OPENAI_API_KEY   (implicit: provider = openai)
-  #   4. GOOGLE_API_KEY   (implicit: provider = google)
-  #   5. OPENCODE_API_KEY  (implicit: provider = opencode_zen)
-  #
-  # Returns nil if no key is found. Error is deferred to Orchestrator#run.
-  def self.resolve_provider
-    if ENV['LLM_API_KEY']
-      key = ENV['LLM_API_KEY']
-      name = ENV.fetch('LLM_PROVIDER', 'anthropic').downcase
-    elsif ENV['ANTHROPIC_API_KEY']
-      key = ENV['ANTHROPIC_API_KEY']
-      name = 'anthropic'
-    elsif ENV['OPENAI_API_KEY']
-      key = ENV['OPENAI_API_KEY']
-      name = 'openai'
-    elsif ENV['GOOGLE_API_KEY']
-      key = ENV['GOOGLE_API_KEY']
-      name = 'google'
-    elsif ENV['OPENCODE_API_KEY']
-      key = ENV['OPENCODE_API_KEY']
-      name = 'opencode_zen'
-    else
-      return nil
-    end
-
-    factory = PROVIDERS[name]
-    raise "Unknown LLM provider: #{name}. Available: #{PROVIDERS.keys.join(', ')}" unless factory
-
-    factory.call(key)
-  end
-
-  private_class_method :resolve_provider
-end
+require_relative 'brute/middleware'
+require_relative 'brute/tools'
+require_relative 'brute/providers'