brute 0.4.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87cc119e0dc26d2499af1ceab1fe26c0ea2a6b9685c2acb9718a29d155959971
-  data.tar.gz: 7887f2d6d2a3680cf660c93bbd64999f45e28afcf1f86fbd4fe52605fc0fae28
+  metadata.gz: 2ac58cb8a6e1a4e7d08ba8f9de933e03f0d9d0889b91aee1126962d1adb3c419
+  data.tar.gz: ff083ed2d8ba6485468d664238ab9e52782d03d7fed353ae3ce5456dc86f3c55
 SHA512:
-  metadata.gz: 4b04baad572cd024f4e7cf0b6b42fb3b8794e773918e3d4ee21d751ec0a296e4047903fdf290c68dc54aa9faf0556363b216c3e8f1eb23ce11c6e646bd7f14ca
-  data.tar.gz: c719e091120b55f5f0f93149c0502dc39cfdb984ae141a71260d1f1a8116824a6718e63639a092726bc83fe199c65b2cf1f98412c82991b13e06d297b488f092
+  metadata.gz: 628b77901e56dc1641350fdf3a55467ea66fa77354f3a01b8caa66f1a3c2c0df3a37b0a3f9e03e417746d132208e8cc7a34ed2925b9b842dca05f405d7dd8b4b
+  data.tar.gz: ab80c56ce002184c9bf04ae8a197f6695e053103a7443440ea2a8f659f6731253263b263be4c6c795a4e50c4cf10ea63f891ce11f184ca6444dfe2e1e60283d9

data/lib/brute/agent.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Brute
+  class Agent
+    attr_reader :provider, :model, :tools, :system_prompt
+
+    def initialize(provider:, model:, tools: Brute::Tools::ALL, system_prompt: nil)
+      @provider = provider
+      @model = model
+      @tools = tools
+      @system_prompt = system_prompt
+    end
+  end
+end

data/lib/brute/diff.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
 require 'diff/lcs'
 require 'diff/lcs/hunk'
 
@@ -25,36 +27,24 @@ module Brute
   end
 end
 
-if __FILE__ == $0
-  require_relative "../../spec/spec_helper"
-
-  RSpec.describe Brute::Diff do
-    describe ".unified" do
-      it "generates a unified diff for changed content" do
-        old = "line1\nold\nline3\n"
-        new_text = "line1\nnew\nline3\n"
-        diff = described_class.unified(old, new_text)
-        expect(diff).to include("-old")
-        expect(diff).to include("+new")
-        expect(diff).to include("@@")
-      end
+test do
+  it "generates a unified diff for changed content" do
+    Brute::Diff.unified("line1\nold\nline3\n", "line1\nnew\nline3\n").should =~ /\-old/
+  end
 
-      it "returns empty string for identical content" do
-        text = "same\ncontent\n"
-        expect(described_class.unified(text, text)).to eq("")
-      end
+  it "includes additions in diff" do
+    Brute::Diff.unified("line1\nold\nline3\n", "line1\nnew\nline3\n").should =~ /\+new/
+  end
 
-      it "handles empty old content (new file)" do
-        diff = described_class.unified("", "new\ncontent\n")
-        expect(diff).to include("+new")
-        expect(diff).to include("+content")
-      end
+  it "returns empty string for identical content" do
+    Brute::Diff.unified("same\ncontent\n", "same\ncontent\n").should == ""
+  end
 
-      it "handles empty new content (deleted file)" do
-        diff = described_class.unified("old\ncontent\n", "")
-        expect(diff).to include("-old")
-        expect(diff).to include("-content")
-      end
-    end
+  it "handles empty old content (new file)" do
+    Brute::Diff.unified("", "new\ncontent\n").should =~ /\+new/
+  end
+
+  it "handles empty new content (deleted file)" do
+    Brute::Diff.unified("old\ncontent\n", "").should =~ /\-old/
   end
 end

data/lib/brute/loop/agent_stream.rb

@@ -0,0 +1,118 @@
+# 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