ruby_llm-agents 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5396493167b6da5bcc4fd878d502efdf7269246374ea30ef8d5ce25423f3868a
-  data.tar.gz: 2e80ab75249560be31be4e1a9aa8c78efd6b0d6e2c692f391962a20b7ea98a5b
+  metadata.gz: fa47482df367b7b0cb59f616a7aecebeed440a97aa95df73f185c988cbcc8220
+  data.tar.gz: 005d587ed60cfc76e6e14baaca2dbf6dcf166c9e8e1a9e2291732cf2054ed8d2
 SHA512:
-  metadata.gz: 2943372fc8709cef913eba67f491431b96e96b5ba4cc43338eabbfaee291fa53434e55fc1db7b7d0ab19b7d05e54c0b228c0799d73a5570f9dd9a18881fb9b7a
-  data.tar.gz: b442321d5323899962a6fab0ec998fd5616339bd46428c4198291c611eb2741fc9c3f78080f90fdb055654b16ef491d903caddff5d95394c87c72f84e900fe06
+  metadata.gz: 5e06dfba78ef9f8d87f100addc95b3fce4f7ca41af017e00c3bc4bae27c1b82a0ba55365279768d1b85eb06f34447fbdf3e3872d54a9b00f538f7cf44655097e
+  data.tar.gz: 7f6da9cdc2cd776e08ca827a8575591789e814f01bd9e66e0ffd75ff1c2f1f8a1aded511bb2728b729322a805ef425655904f1679c501ea71b34dca937ba7f8d

data/app/views/ruby_llm/agents/executions/show.html.erb

@@ -613,41 +613,86 @@
   </div>
 
   <% if tool_call_count > 0 %>
-    <div class="space-y-4" x-show="expanded" <%= tool_call_count > 3 ? 'x-cloak' : '' %>>
+    <div class="space-y-4" x-show="expanded" x-cloak>
       <% tool_calls.each_with_index do |tool_call, index| %>
         <%
-          # Handle both symbol and string keys
+          # Handle both symbol and string keys for backward compatibility
           tool_id = tool_call['id'] || tool_call[:id]
           tool_name = tool_call['name'] || tool_call[:name]
           tool_args = tool_call['arguments'] || tool_call[:arguments] || {}
+          tool_result = tool_call['result'] || tool_call[:result]
+          tool_status = tool_call['status'] || tool_call[:status] || 'unknown'
+          tool_error = tool_call['error_message'] || tool_call[:error_message]
+          tool_duration = tool_call['duration_ms'] || tool_call[:duration_ms]
+          tool_called_at = tool_call['called_at'] || tool_call[:called_at]
+
+          # Status badge styling
+          status_badge_class = case tool_status
+            when 'success' then 'bg-green-100 dark:bg-green-900/50 text-green-700 dark:text-green-300'
+            when 'error' then 'bg-red-100 dark:bg-red-900/50 text-red-700 dark:text-red-300'
+            else 'bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-300'
+          end
         %>
         <div class="border border-gray-100 dark:border-gray-700 rounded-lg overflow-hidden">
           <!-- Tool Call Header -->
-          <div class="bg-gray-50 dark:bg-gray-900/50 px-4 py-3 flex items-center justify-between">
-            <div class="flex items-center gap-3">
-              <span class="inline-flex items-center justify-center w-6 h-6 rounded-full bg-blue-100 dark:bg-blue-900/50 text-blue-700 dark:text-blue-300 text-xs font-medium">
-                <%= index + 1 %>
-              </span>
-              <code class="text-sm font-semibold text-gray-900 dark:text-gray-100"><%= tool_name %></code>
+          <div class="bg-gray-50 dark:bg-gray-900/50 px-4 py-3">
+            <div class="flex items-center justify-between">
+              <div class="flex items-center gap-3">
+                <span class="inline-flex items-center justify-center w-6 h-6 rounded-full bg-blue-100 dark:bg-blue-900/50 text-blue-700 dark:text-blue-300 text-xs font-medium">
+                  <%= index + 1 %>
+                </span>
+                <code class="text-sm font-semibold text-gray-900 dark:text-gray-100"><%= tool_name %></code>
+                <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium <%= status_badge_class %>">
+                  <%= tool_status %>
+                </span>
+                <% if tool_duration.present? %>
+                  <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-purple-100 dark:bg-purple-900/50 text-purple-700 dark:text-purple-300">
+                    <%= tool_duration %>ms
+                  </span>
+                <% end %>
+              </div>
+              <div class="flex items-center gap-3 text-xs text-gray-400 dark:text-gray-500">
+                <% if tool_called_at.present? %>
+                  <span class="font-mono" title="Called at"><%= Time.parse(tool_called_at).strftime("%H:%M:%S.%L") rescue tool_called_at %></span>
+                <% end %>
+                <% if tool_id.present? %>
+                  <span class="font-mono truncate max-w-[120px]" title="<%= tool_id %>">
+                    <%= tool_id.to_s.truncate(16) %>
+                  </span>
+                <% end %>
+              </div>
             </div>
-            <% if tool_id.present? %>
-              <span class="text-xs text-gray-400 dark:text-gray-500 font-mono truncate max-w-xs" title="<%= tool_id %>">
-                <%= tool_id.to_s.truncate(24) %>
-              </span>
-            <% end %>
           </div>
 
           <!-- Tool Call Arguments -->
           <% if tool_args.present? && tool_args.any? %>
-            <div class="px-4 py-3">
+            <div class="px-4 py-3 border-t border-gray-100 dark:border-gray-700">
               <p class="text-xs text-gray-500 dark:text-gray-400 uppercase tracking-wide mb-2">Arguments</p>
               <pre class="bg-gray-50 dark:bg-gray-900 text-gray-900 dark:text-gray-100 rounded-lg p-3 text-sm overflow-x-auto font-mono"><%= highlight_json(tool_args) %></pre>
             </div>
           <% else %>
-            <div class="px-4 py-3">
+            <div class="px-4 py-3 border-t border-gray-100 dark:border-gray-700">
               <p class="text-xs text-gray-400 dark:text-gray-500 italic">No arguments</p>
             </div>
           <% end %>
+
+          <!-- Tool Call Result (NEW) -->
+          <% if tool_result.present? %>
+            <div class="px-4 py-3 border-t border-gray-100 dark:border-gray-700">
+              <p class="text-xs text-gray-500 dark:text-gray-400 uppercase tracking-wide mb-2">Result</p>
+              <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-3 max-h-48 overflow-y-auto">
+                <pre class="text-sm text-gray-900 dark:text-gray-100 font-mono whitespace-pre-wrap break-words"><%= tool_result.is_a?(String) ? tool_result : JSON.pretty_generate(tool_result) rescue tool_result.to_s %></pre>
+              </div>
+            </div>
+          <% end %>
+
+          <!-- Tool Call Error (NEW) -->
+          <% if tool_status == 'error' && tool_error.present? %>
+            <div class="px-4 py-3 border-t border-red-100 dark:border-red-900/50 bg-red-50 dark:bg-red-900/20">
+              <p class="text-xs text-red-600 dark:text-red-400 uppercase tracking-wide mb-2">Error</p>
+              <pre class="text-sm text-red-700 dark:text-red-300 font-mono whitespace-pre-wrap break-words"><%= tool_error %></pre>
+            </div>
+          <% end %>
         </div>
       <% end %>
     </div>

data/lib/ruby_llm/agents/base_agent.rb

@@ -212,7 +212,9 @@ module RubyLLM
       #   @return [Float] The temperature setting
       # @!attribute [r] client
       #   @return [RubyLLM::Chat] The configured RubyLLM client
-      attr_reader :model, :temperature, :client
+      # @!attribute [r] tracked_tool_calls
+      #   @return [Array<Hash>] Tool calls tracked during execution with results, timing, and status
+      attr_reader :model, :temperature, :client, :tracked_tool_calls
 
       # Creates a new agent instance
       #
@@ -223,6 +225,8 @@ module RubyLLM
         @model = model
         @temperature = temperature
         @options = options
+        @tracked_tool_calls = []
+        @pending_tool_call = nil
         validate_required_params!
       end
 
@@ -485,6 +489,7 @@ module RubyLLM
         client = client.with_instructions(system_prompt) if system_prompt
         client = client.with_schema(schema) if schema
         client = client.with_tools(*resolved_tools) if resolved_tools.any?
+        client = setup_tool_tracking(client) if resolved_tools.any?
         client = apply_messages(client, resolved_messages) if resolved_messages.any?
         client = client.with_thinking(**resolved_thinking) if resolved_thinking
 
@@ -543,6 +548,9 @@ module RubyLLM
         # finish_reason may not be available on all RubyLLM::Message versions
         context.finish_reason = response.respond_to?(:finish_reason) ? response.finish_reason : nil
 
+        # Store tracked tool calls in context for instrumentation
+        context[:tool_calls] = @tracked_tool_calls if @tracked_tool_calls.any?
+
         calculate_costs(response, context) if context.input_tokens
       end
 
@@ -670,6 +678,122 @@ module RubyLLM
         end
         client
       end
+
+      # Sets up tool call tracking callbacks on the client
+      #
+      # @param client [RubyLLM::Chat] The chat client
+      # @return [RubyLLM::Chat] Client with tracking callbacks
+      def setup_tool_tracking(client)
+        client
+          .on_tool_call { |tool_call| start_tracking_tool_call(tool_call) }
+          .on_tool_result { |result| complete_tool_call_tracking(result) }
+      end
+
+      # Starts tracking a tool call
+      #
+      # @param tool_call [Object] The tool call object from RubyLLM
+      def start_tracking_tool_call(tool_call)
+        @pending_tool_call = {
+          id: extract_tool_call_value(tool_call, :id),
+          name: extract_tool_call_value(tool_call, :name),
+          arguments: extract_tool_call_value(tool_call, :arguments) || {},
+          called_at: Time.current.iso8601(3),
+          started_at: Time.current
+        }
+      end
+
+      # Completes tracking for the pending tool call with result
+      #
+      # @param result [Object] The tool result (string, hash, or object)
+      def complete_tool_call_tracking(result)
+        return unless @pending_tool_call
+
+        completed_at = Time.current
+        started_at = @pending_tool_call.delete(:started_at)
+        duration_ms = started_at ? ((completed_at - started_at) * 1000).to_i : nil
+
+        result_data = extract_tool_result(result)
+
+        tracked_call = @pending_tool_call.merge(
+          result: truncate_tool_result(result_data[:content]),
+          status: result_data[:status],
+          error_message: result_data[:error_message],
+          duration_ms: duration_ms,
+          completed_at: completed_at.iso8601(3)
+        )
+
+        @tracked_tool_calls << tracked_call
+        @pending_tool_call = nil
+      end
+
+      # Extracts result data from various tool result formats
+      #
+      # @param result [Object] The tool result
+      # @return [Hash] Hash with :content, :status, :error_message keys
+      def extract_tool_result(result)
+        content = nil
+        status = "success"
+        error_message = nil
+
+        if result.is_a?(Exception)
+          content = result.message
+          status = "error"
+          error_message = "#{result.class}: #{result.message}"
+        elsif result.respond_to?(:error?) && result.error?
+          content = result.respond_to?(:content) ? result.content : result.to_s
+          status = "error"
+          error_message = result.respond_to?(:error_message) ? result.error_message : content
+        elsif result.respond_to?(:content)
+          content = result.content
+        elsif result.is_a?(Hash)
+          content = result[:content] || result["content"] || result.to_json
+          if result[:error] || result["error"]
+            status = "error"
+            error_message = result[:error] || result["error"]
+          end
+        else
+          content = result.to_s
+        end
+
+        { content: content, status: status, error_message: error_message }
+      end
+
+      # Truncates tool result if it exceeds the configured max length
+      #
+      # @param result [String, Object] The result to truncate
+      # @return [String] The truncated result
+      def truncate_tool_result(result)
+        return nil if result.nil?
+
+        result_str = result.is_a?(String) ? result : result.to_json
+        max_length = tool_result_max_length
+
+        return result_str if result_str.length <= max_length
+
+        result_str[0, max_length - 15] + "... [truncated]"
+      end
+
+      # Returns the configured max length for tool results
+      #
+      # @return [Integer] Max length
+      def tool_result_max_length
+        RubyLLM::Agents.configuration.tool_result_max_length || 10_000
+      rescue StandardError
+        10_000
+      end
+
+      # Extracts a value from a tool call object (supports both hash and object access)
+      #
+      # @param tool_call [Hash, Object] The tool call
+      # @param key [Symbol] The key to extract
+      # @return [Object, nil] The value or nil
+      def extract_tool_call_value(tool_call, key)
+        if tool_call.respond_to?(key)
+          tool_call.send(key)
+        elsif tool_call.respond_to?(:[])
+          tool_call[key] || tool_call[key.to_s]
+        end
+      end
     end
   end
 end

data/lib/ruby_llm/agents/core/configuration.rb

@@ -369,6 +369,13 @@ module RubyLLM
       #   @example No namespace (default)
       #     config.root_namespace = nil   # app/agents/embedders -> Embedders
 
+      # @!attribute [rw] tool_result_max_length
+      #   Maximum character length for tool call results stored in execution records.
+      #   Results exceeding this length will be truncated with "... [truncated]".
+      #   @return [Integer] Max length for tool results (default: 10000)
+      #   @example
+      #     config.tool_result_max_length = 5000
+
       # Attributes without validation (simple accessors)
       attr_accessor :default_model,
                     :async_logging,
@@ -429,7 +436,8 @@ module RubyLLM
                     :default_background_remover_model,
                     :default_background_output_format,
                     :root_directory,
-                    :root_namespace
+                    :root_namespace,
+                    :tool_result_max_length
 
       # Attributes with validation (readers only, custom setters below)
       attr_reader :default_temperature,
@@ -704,6 +712,9 @@ module RubyLLM
         # Directory structure defaults
         @root_directory = "agents"  # Root directory under app/
         @root_namespace = nil  # No namespace (top-level classes)
+
+        # Tool tracking defaults
+        @tool_result_max_length = 10_000
       end
 
       # Returns the configured cache store, falling back to Rails.cache

data/lib/ruby_llm/agents/core/version.rb

@@ -4,6 +4,6 @@ module RubyLLM
   module Agents
     # Current version of the RubyLLM::Agents gem
     # @return [String] Semantic version string
-    VERSION = "1.2.3"
+    VERSION = "1.3.0"
   end
 end

data/lib/ruby_llm/agents/pipeline/middleware/instrumentation.rb

@@ -226,6 +226,12 @@ module RubyLLM
             # Add custom metadata
             data[:metadata] = context.metadata if context.metadata.any?
 
+            # Add enhanced tool calls if present
+            if context[:tool_calls].present?
+              data[:tool_calls] = context[:tool_calls]
+              data[:tool_calls_count] = context[:tool_calls].size
+            end
+
             data
           end
 
@@ -292,6 +298,12 @@ module RubyLLM
             # Add sanitized parameters
             data[:parameters] = sanitize_parameters(context)
 
+            # Add enhanced tool calls if present
+            if context[:tool_calls].present?
+              data[:tool_calls] = context[:tool_calls]
+              data[:tool_calls_count] = context[:tool_calls].size
+            end
+
             data
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm-agents
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - adham90