brute 2.0.6 → 3.0.1

data/lib/brute/middleware/{070_tool_call.rb → 070_tool_pipeline.rb}

@@ -54,16 +54,21 @@ module Brute
     #   one fiber runs at a time within a Sync block). No mutex needed.
     #
     # - FileMutationQueue compatibility — tools that mutate files use
-    #   Brute::Queue::FileMutationQueue.serialize, which uses Ruby 3.4's
+    #   Brute::Tools::FS::FileMutationQueue.serialize, which uses Ruby 3.4's
     #   fiber-scheduler-aware Mutex. Operations on the same file are serialized;
     #   operations on different files proceed in parallel.
     #
-    class ToolCall
-      def initialize(app)
-        @app = app
+    class ToolPipeline
+      def initialize(app, tools: [])
+        @app   = app
+        @tools = tools
       end
 
+      # in  -> advertise the tools to the turn (env[:tools], which the LLM-call
+      #        proc reads to tell the model what it can call)
+      # out <- execute the tool calls the model made and append :tool results
       def call(env)
+        env[:tools] = @tools
         @app.call(env)
 
         tools_to_run = pending_tool_calls(env[:messages].last)
@@ -76,13 +81,13 @@ module Brute
           Sync do
             barrier = Async::Barrier.new
 
-            tools_to_run.each do |id, tool_call|
+            tools_to_run.each do |tool_call|
               barrier.async do
                 tool = available_tools[tool_call.name.to_sym]
                 result = tool.call(tool_call.arguments)
 
-                # Coerce to String so RubyLLM::Message doesn't treat Hash results
-                # (e.g. Shell's {stdout:, stderr:, exit_code:}) as attachments.
+                # Coerce to String so Hash results (e.g. Shell's
+                # {stdout:, stderr:, exit_code:}) serialize predictably.
                 content = result.is_a?(String) ? result : result.to_s
 
                 # Universal truncation safety net — skip if already truncated
@@ -90,13 +95,13 @@ module Brute
                   content = Brute::Truncation.truncate(content)
                 end
 
-                results << [id, tool_call, content]
+                results << [tool_call, content]
               rescue => e
                 # Capture the error as a tool result so the LLM can see it
                 # and reason about the failure, rather than crashing the
                 # entire middleware chain.
                 env[:events] << { type: :error, data: { error: e, message: e.message } }
-                results << [id, tool_call, "Error: #{e.class}: #{e.message}"]
+                results << [tool_call, "Error: #{e.class}: #{e.message}"]
               end
             end
 
@@ -107,12 +112,11 @@ module Brute
 
           # Append events and messages in the original tool_call order so the
           # LLM sees a deterministic sequence regardless of completion order.
-          order = tools_to_run.keys
-          results.sort_by! { |id, _, _| order.index(id) }
+          results.sort_by! { |tool_call, _| tools_to_run.index(tool_call) }
 
-          results.each do |_id, tool_call, content|
+          results.each do |tool_call, content|
             env[:events] << { type: :tool_result, data: { name: tool_call.name, content: content } }
-            env[:messages] << RubyLLM::Message.new(role: :tool, content: content, tool_call_id: tool_call.id)
+            env[:messages] << Brute::Message.new(role: :tool, content: content, tool_call_id: tool_call.id)
           end
         end
 
@@ -121,22 +125,24 @@ module Brute
 
       private
 
+        # The last message's pending tool calls as a flat list. Duck-typed:
+        # tool_calls may be an Array (Brute::ToolCall) or an id-keyed Hash
+        # (some libraries' native shape); each entry needs #id, #name and
+        # #arguments.
         def pending_tool_calls(message)
-          message.tool_calls.to_h.reject { |_id, tc| tc.name == "question" }
+          calls = message.respond_to?(:tool_calls) ? message.tool_calls : nil
+          calls = calls.values if calls.respond_to?(:values)
+          Array(calls).reject { |tc| tc.name == "question" }
         end
 
         def resolve_tools(tools)
-          tools.each_with_object({}) do |tool, hash|
-            instance = tool.is_a?(Class) ? tool.new : tool
-            instance = instance.to_ruby_llm if instance.respond_to?(:to_ruby_llm)
-            hash[instance.name.to_sym] = instance
-          end
+          Brute::Tools::Adapter.wrap_all(tools)
         end
 
         def on_tool_call_start_event(pending_tools)
           {
             type: :tool_call_start,
-            data: pending_tools.map { |_id, tc|
+            data: pending_tools.map { |tc|
               {
                 name: tc.name,
                 call_id: tc.id,
@@ -149,18 +155,19 @@ module Brute
   end
 end
 
-test do
-  require "brute/session"
+__END__
+
+describe "brute/middleware/070_tool_pipeline" do
+  require "brute/messages"
   require "brute/truncation"
 
   it "passes through when no tool calls pending" do
     inner = ->(env) {
-      env[:messages] << RubyLLM::Message.new(role: :assistant, content: "hi")
+      env[:messages] << Brute::Message.new(role: :assistant, content: "hi")
     }
-    mw = Brute::Middleware::ToolCall.new(inner)
+    mw = Brute::Middleware::ToolPipeline.new(inner, tools: [])
     env = {
-      messages: Brute::Session.new,
-      tools: [],
+      messages: Brute.log,
       events: [],
     }
     env[:messages].user("hello")
@@ -168,11 +175,22 @@ test do
     env[:messages].last.content.should == "hi"
   end
 
+  it "advertises its tools on env[:tools] on the way in" do
+    seen = nil
+    inner = ->(env) { seen = env[:tools] }
+    tool = { name: "echo", description: "", execute: ->(**) { "ok" } }
+    mw = Brute::Middleware::ToolPipeline.new(inner, tools: [tool])
+    env = { messages: Brute.log, events: [] }
+    env[:messages].user("hi")
+    mw.call(env)
+    seen.should == [tool]
+  end
+
   # --- Universal output truncation ---
 
   it "truncates large tool results via Truncation" do
     # A fake tool that returns a huge string
-    big_tool = Class.new(RubyLLM::Tool) do
+    big_tool = Class.new(Brute::Tool) do
       description "test tool"
       param :input, type: "string", desc: "input"
       def name; "big_tool"; end
@@ -181,22 +199,20 @@ test do
       end
     end
 
-    call_id = "tc_1"
-    tool_calls = {
-      call_id => RubyLLM::ToolCall.new(
-        id: call_id,
+    tool_calls = [
+      Brute::ToolCall.new(
+        id: "tc_1",
         name: "big_tool",
         arguments: { "input" => "go" },
       )
-    }
+    ]
 
     inner = ->(env) {
-      env[:messages] << RubyLLM::Message.new(role: :assistant, content: "", tool_calls: tool_calls)
+      env[:messages] << Brute::Message.new(role: :assistant, content: "", tool_calls: tool_calls)
     }
-    mw = Brute::Middleware::ToolCall.new(inner)
+    mw = Brute::Middleware::ToolPipeline.new(inner, tools: [big_tool])
     env = {
-      messages: Brute::Session.new,
-      tools: [big_tool],
+      messages: Brute.log,
       events: [],
     }
     env[:messages].user("hello")
@@ -211,7 +227,7 @@ test do
 
   it "does not double-truncate already-truncated output" do
     # A fake tool that returns output already containing the truncation marker
-    pre_truncated_tool = Class.new(RubyLLM::Tool) do
+    pre_truncated_tool = Class.new(Brute::Tool) do
       description "test tool"
       param :input, type: "string", desc: "input"
       def name; "pre_truncated_tool"; end
@@ -220,22 +236,20 @@ test do
       end
     end
 
-    call_id = "tc_2"
-    tool_calls = {
-      call_id => RubyLLM::ToolCall.new(
-        id: call_id,
+    tool_calls = [
+      Brute::ToolCall.new(
+        id: "tc_2",
         name: "pre_truncated_tool",
         arguments: { "input" => "go" },
       )
-    }
+    ]
 
     inner = ->(env) {
-      env[:messages] << RubyLLM::Message.new(role: :assistant, content: "", tool_calls: tool_calls)
+      env[:messages] << Brute::Message.new(role: :assistant, content: "", tool_calls: tool_calls)
     }
-    mw = Brute::Middleware::ToolCall.new(inner)
+    mw = Brute::Middleware::ToolPipeline.new(inner, tools: [pre_truncated_tool])
     env = {
-      messages: Brute::Session.new,
-      tools: [pre_truncated_tool],
+      messages: Brute.log,
       events: [],
     }
     env[:messages].user("hello")

data/lib/brute/middleware/073_otel_tool_call.rb

@@ -44,6 +44,8 @@ module Brute
   end
 end
 
-test do
+__END__
+
+describe "brute/middleware/073_otel_tool_call" do
   # not implemented
 end

data/lib/brute/middleware/075_otel_tool_results.rb

@@ -41,6 +41,8 @@ module Brute
   end
 end
 
-test do
+__END__
+
+describe "brute/middleware/075_otel_tool_results" do
   # not implemented
 end

data/lib/brute/middleware/event_handler.rb

@@ -20,6 +20,8 @@ module Brute
   end
 end
 
-test do
+__END__
+
+describe "brute/middleware/event_handler" do
   # not implemented
 end

data/lib/brute/middleware/user_queue.rb

@@ -30,6 +30,8 @@ module Brute
   end
 end
 
-test do
+__END__
+
+describe "brute/middleware/user_queue" do
   # not implemented
 end

data/lib/brute/prompts/autonomy.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module Autonomy

data/lib/brute/prompts/base.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     TEXT_DIR = File.expand_path("text", __dir__)

data/lib/brute/prompts/build_switch.rb

@@ -21,7 +21,9 @@ module Brute
   end
 end
 
-test do
+__END__
+
+describe "brute/prompts/build_switch" do
   it "returns a string" do
     Brute::Prompts::BuildSwitch.call({}).should.be.kind_of(String)
   end

data/lib/brute/prompts/code_references.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module CodeReferences

data/lib/brute/prompts/code_style.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module CodeStyle

data/lib/brute/prompts/conventions.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module Conventions

data/lib/brute/prompts/doing_tasks.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module DoingTasks

data/lib/brute/prompts/editing_approach.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module EditingApproach

data/lib/brute/prompts/editing_constraints.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module EditingConstraints

data/lib/brute/prompts/environment.rb

@@ -27,7 +27,9 @@ module Brute
   end
 end
 
-test do
+__END__
+
+describe "brute/prompts/environment" do
   require "tmpdir"
   require "fileutils"
 

data/lib/brute/prompts/frontend_tasks.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module FrontendTasks

data/lib/brute/prompts/git_safety.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module GitSafety

data/lib/brute/prompts/identity.rb

@@ -13,7 +13,9 @@ module Brute
   end
 end
 
-test do
+__END__
+
+describe "brute/prompts/identity" do
   it "returns a string for anthropic" do
     Brute::Prompts::Identity.call(provider_name: "anthropic").should.be.kind_of(String)
   end

data/lib/brute/prompts/instructions.rb

@@ -20,7 +20,9 @@ module Brute
   end
 end
 
-test do
+__END__
+
+describe "brute/prompts/instructions" do
   it "returns nil when custom_rules is nil" do
     Brute::Prompts::Instructions.call(custom_rules: nil).should.be.nil
   end

data/lib/brute/prompts/max_steps.rb

@@ -32,7 +32,9 @@ module Brute
   end
 end
 
-test do
+__END__
+
+describe "brute/prompts/max_steps" do
   it "returns a string" do
     Brute::Prompts::MaxSteps.call({}).should.be.kind_of(String)
   end

data/lib/brute/prompts/objectivity.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module Objectivity

data/lib/brute/prompts/plan_reminder.rb

@@ -42,7 +42,9 @@ module Brute
   end
 end
 
-test do
+__END__
+
+describe "brute/prompts/plan_reminder" do
   it "returns a string" do
     Brute::Prompts::PlanReminder.call({}).should.be.kind_of(String)
   end

data/lib/brute/prompts/proactiveness.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module Proactiveness

data/lib/brute/prompts/security_and_safety.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module SecurityAndSafety

data/lib/brute/prompts/skills.rb

@@ -15,7 +15,9 @@ module Brute
 
         <<~TXT
           Skills provide specialized instructions and workflows for specific tasks.
-          When a task matches a skill's description, load the skill to get detailed guidance.
+          Use the skill tool to load a skill when a task matches its description. The tool
+          returns the skill's full instructions plus a base directory whose bundled files
+          (scripts, references, assets) you can read or run by relative path.
 
           #{listing}
         TXT
@@ -24,7 +26,9 @@ module Brute
   end
 end
 
-test do
+__END__
+
+describe "brute/prompts/skills" do
   require "tmpdir"
 
   it "returns nil when no skills are found" do

data/lib/brute/prompts/task_management.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module TaskManagement

data/lib/brute/prompts/tone_and_style.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module ToneAndStyle

data/lib/brute/prompts/tool_usage.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
+require "brute"
+
 module Brute
   module Prompts
     module ToolUsage

data/lib/brute/prompts.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "brute"
+
 require 'brute/prompts/base'
 require 'brute/prompts/identity'
 require 'brute/prompts/tone_and_style'