girb-ruby_llm 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfe19c19205f70c38e3f95b1fca105e6c3c5d5c3398871e1a43cf5310e7bfb7a
-  data.tar.gz: 52dcce3593879b4bd66864f8928e5b7eb0aa1f4adc186c62bc665bfc217c1fd5
+  metadata.gz: 53c8af5d1f30750451fed2b555cd064e492468da3e7954cf5976443374eb4d4d
+  data.tar.gz: '0149788d1aa79cd0de9bd0531ca8e855e4934c7e3b63a2fa59000ba2469e6048'
 SHA512:
-  metadata.gz: e030b3dd7df74d07d15b6bfef72e61c7f5c1d9c6d8aa093eed9440855960c8e0773bb3046461a8d05e496e07d8891d6366a4e17bac299cb74d4d8da3bfb5fc2b
-  data.tar.gz: eb256345ace0da90621bd10069a4b0ed3dc94bc72b768d5da79cfd3cf4f558250fae6d9aa0aa3782aa66c632c86783931cf025739dab8dd6e1826b6010dca17f
+  metadata.gz: 78f109efbd1bb1a677295a8de6bc319f5dbd979df13bac7222cdf8015468b3973b88322bf7ca1cfb528b91d35ed1c2b220ca689eaa04147621dd18ae5abe1c35
+  data.tar.gz: 7770dbb62a2f71cf5197bb0db15a4b526824cf6d4f5a1a410170672dce64cb92251efcefabc71d851f75ab1b8d719a98b974cbea9e5c8d3fbbd964bbc891ee37

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.2.0] - 2026-02-05
+
+### Added
+
+- Debug gem (rdbg) support for AI-assisted debugging
+
 ## [0.1.2] - 2026-02-03
 
 ### Fixed

data/lib/girb/providers/ruby_llm.rb

@@ -6,23 +6,11 @@ require "girb/providers/base"
 module Girb
   module Providers
     class RubyLlm < Base
-      # Thread-local storage for current binding
-      def self.current_binding=(binding)
-        Thread.current[:girb_ruby_llm_binding] = binding
-      end
-
-      def self.current_binding
-        Thread.current[:girb_ruby_llm_binding]
-      end
-
       def initialize(model: nil)
         @model = model
       end
 
       def chat(messages:, system_prompt:, tools:, binding: nil)
-        # Store binding for tool execution
-        self.class.current_binding = binding
-
         # Use specified model or RubyLLM's default
         chat_options = @model ? { model: @model } : {}
         ruby_llm_chat = ::RubyLLM.chat(**chat_options)
@@ -30,31 +18,41 @@ module Girb
         # Set system prompt
         ruby_llm_chat.with_instructions(system_prompt) if system_prompt && !system_prompt.empty?
 
-        # Add tools
+        # Add tool schemas (for API payload generation only, not auto-executed)
         tool_instances = build_tools(tools)
         tool_instances.each { |tool| ruby_llm_chat.with_tool(tool) }
 
-        # Add messages except the last user message
-        add_messages_to_chat(ruby_llm_chat, messages[0..-2])
+        # Add all messages to the chat
+        add_messages_to_chat(ruby_llm_chat, messages)
 
-        # Get the last user message
-        last_message = messages.last
-        last_content = extract_content(last_message)
-
-        # Send the request - RubyLLM will auto-execute tools
-        response = ruby_llm_chat.ask(last_content)
+        # Get raw response without auto-executing tools
+        response = raw_complete(ruby_llm_chat)
 
         parse_response(response)
       rescue Faraday::BadRequestError => e
         Response.new(error: "API Error: #{e.message}")
       rescue StandardError => e
         Response.new(error: "Error: #{e.message}")
-      ensure
-        self.class.current_binding = nil
       end
 
       private
 
+      # Call provider.complete() directly, bypassing RubyLLM's handle_tool_calls.
+      # This returns the raw response so the caller can handle tool execution.
+      def raw_complete(chat)
+        provider = chat.instance_variable_get(:@provider)
+        provider.complete(
+          chat.messages,
+          tools: chat.tools,
+          temperature: chat.instance_variable_get(:@temperature),
+          model: chat.model,
+          params: chat.params,
+          headers: chat.headers,
+          schema: chat.schema,
+          thinking: chat.instance_variable_get(:@thinking)
+        )
+      end
+
       def add_messages_to_chat(chat, messages)
         messages.each do |msg|
           case msg[:role]
@@ -63,13 +61,13 @@ module Girb
           when :assistant
             chat.add_message(role: :assistant, content: msg[:content])
           when :tool_call
-            # Add as assistant message with tool_calls
+            id = msg[:id] || "call_#{SecureRandom.hex(12)}"
             chat.add_message(
               role: :assistant,
               content: nil,
               tool_calls: {
-                msg[:name] => ::RubyLLM::ToolCall.new(
-                  id: msg[:id] || "call_#{SecureRandom.hex(12)}",
+                id => ::RubyLLM::ToolCall.new(
+                  id: id,
                   name: msg[:name],
                   arguments: msg[:args]
                 )
@@ -85,15 +83,6 @@ module Girb
         end
       end
 
-      def extract_content(message)
-        case message[:role]
-        when :user, :assistant
-          message[:content]
-        else
-          message[:content].to_s
-        end
-      end
-
       def build_tools(tools)
         return [] if tools.nil? || tools.empty?
 
@@ -107,11 +96,10 @@ module Girb
         tool_description = tool_def[:description]
         tool_parameters = tool_def[:parameters] || {}
 
-        # Create a dynamic tool class
+        # Create a dynamic tool class for schema generation only
         tool_class = Class.new(::RubyLLM::Tool) do
           description tool_description
 
-          # Define parameters
           properties = tool_parameters[:properties] || {}
           required_params = tool_parameters[:required] || []
 
@@ -122,41 +110,11 @@ module Girb
                   required: required_params.include?(prop_name.to_s) || required_params.include?(prop_name)
           end
 
-          # Store tool_name for execute method and override name for RubyLLM
-          define_method(:girb_tool_name) { tool_name }
           define_method(:name) { tool_name }
 
-          # Execute method - actually execute the girb tool
-          define_method(:execute) do |**args|
-            tool_name_for_log = girb_tool_name
-
-            if Girb.configuration&.debug
-              args_str = args.map { |k, v| "#{k}: #{v.inspect}" }.join(", ")
-              puts "[girb] Tool: #{tool_name_for_log}(#{args_str})"
-            end
-
-            binding = Girb::Providers::RubyLlm.current_binding
-            girb_tool_class = Girb::Tools.find_tool(tool_name_for_log)
-
-            unless girb_tool_class
-              return { error: "Unknown tool: #{tool_name_for_log}" }
-            end
-
-            girb_tool = girb_tool_class.new
-
-            result = if binding
-                       girb_tool.execute(binding, **args)
-                     else
-                       { error: "No binding available for tool execution" }
-                     end
-
-            if Girb.configuration&.debug && result.is_a?(Hash) && result[:error]
-              puts "[girb] Tool error: #{result[:error]}"
-            end
-
-            result
-          rescue StandardError => e
-            { error: "Tool execution failed: #{e.class} - #{e.message}" }
+          # Not used — tool execution is handled by the caller's tool loop
+          define_method(:execute) do |**_args|
+            raise "Tool execution should be handled by the caller, not by the provider"
           end
         end
 
@@ -177,6 +135,7 @@ module Girb
 
         response.tool_calls.map do |_id, tool_call|
           {
+            id: tool_call.id,
             name: tool_call.name.to_s,
             args: tool_call.arguments || {}
           }

data/lib/girb-ruby_llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GirbRubyLlm
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girb-ruby_llm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - rira100000000