ruby_llm-agents 3.12.0 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e29829dcedb6a67dd1d9e55c7a45ead560e5da2fc0f75ffd04c97026e8d5b90
-  data.tar.gz: 9c2981a6eed9459f2c7d56c47f6ff5ddcdd282bc90729ace04b8eca4f83e9e55
+  metadata.gz: d974a549e2d99bbcd16c8345547d16c16aff7ae602da503974d9db1f32be8ce6
+  data.tar.gz: 9947da35f39521706e7c7bef349dcf9f6a63f5f732409ff1774ce0607bd6429e
 SHA512:
-  metadata.gz: 86ed72b1e799b64259b83588ac9c9111d04539eb7225e65d517332d22ed671436214255ec0127fdcff4ef65fe283683219e88b67a956c6270a7b6a0140937a27
-  data.tar.gz: b532f5a4a47814ed19a9929b06e506b56af651d8d1be65348c68b61aa78dc48f771c89c8d667dac06860d88283fee3a890b8d39afc4d11f5e6905ceca396c136
+  metadata.gz: 8aa785d541d2e00d237a71d5a652643e7e2da83750f8264d754c00fce6c2e33fc7d6d47caa75c1ac94659fd05703a9c488a229064cd1d01157b6845e4ef3970e
+  data.tar.gz: 89bf72286b0a6e70418268457beea87df58bb16514a170730518adeadae84eac6d6ff6553e9726e481b00c2358ad9d909c9f20170bcf41224eb7efdaf3d7f1ac

data/README.md

@@ -317,7 +317,7 @@ mount RubyLLM::Agents::Engine => "/agents"
 
 - **Ruby** >= 3.1.0
 - **Rails** >= 7.0
-- **RubyLLM** >= 1.12.0
+- **RubyLLM** >= 1.16.0
 
 ## Contributing
 

data/app/controllers/ruby_llm/agents/analytics_controller.rb

@@ -35,6 +35,7 @@ module RubyLLM
         @days = range_to_days(@selected_range)
         parse_custom_dates if @selected_range == "custom"
 
+        set_active_filters
         current_scope = apply_filters(time_scoped(tenant_scoped_executions))
         prior_scope = apply_filters(prior_period_scope(tenant_scoped_executions))
 
@@ -114,6 +115,13 @@ module RubyLLM
           []
         end
 
+        set_active_filters
+      end
+
+      # Resolves the active agent/model/tenant filters from request params.
+      # Shared by index (which also loads dropdown options) and chart_data
+      # (JSON only) so apply_filters behaves consistently on both endpoints.
+      def set_active_filters
         @filter_agent = params[:agent].presence
         @filter_model = params[:model].presence
         @filter_tenant = params[:filter_tenant].presence

data/app/controllers/ruby_llm/agents/executions_controller.rb

@@ -203,14 +203,20 @@ module RubyLLM
         model_ids = parse_array_param(:model_ids)
         scope = scope.where(model_id: model_ids) if model_ids.any?
 
+        # Apply tenant filter (multi-select). Narrows further within any
+        # auto-scope already applied by tenant_scoped_executions.
+        tenant_ids = parse_array_param(:tenant_ids)
+        scope = scope.where(tenant_id: tenant_ids) if tenant_ids.any?
+
         # Apply retries filter (show only executions with multiple attempts)
         scope = scope.where("attempts_count > 1") if params[:has_retries].present?
 
         # Only show root executions - children are nested under parents
         scope = scope.where(parent_execution_id: nil)
 
-        # Eager load children for grouping
-        scope.includes(:child_executions)
+        # Eager load children for grouping and detail for error_message, which
+        # the list renders per row (otherwise an N+1 on error rows).
+        scope.includes(:child_executions, :detail)
       end
 
       # Checks whether turbo-rails is available in the host application

data/app/controllers/ruby_llm/agents/tenants_controller.rb

@@ -19,7 +19,9 @@ module RubyLLM
       # @return [void]
       def index
         @sort_params = parse_tenant_sort_params
-        scope = TenantBudget.all
+        # Eager-load tenant_record so display_name's live name resolution does
+        # not issue a query per row.
+        scope = TenantBudget.all.includes(:tenant_record)
 
         if params[:q].present?
           @search_query = params[:q].to_s.strip
@@ -67,7 +69,11 @@ module RubyLLM
       # @return [void]
       def update
         @tenant = TenantBudget.find(params[:id])
-        if @tenant.update(tenant_params)
+        attrs = tenant_params
+        # Linked tenants derive their name live from the host record, so ignore
+        # any submitted name — it would be overwritten on the next record sync.
+        attrs = attrs.except(:name) if @tenant.linked?
+        if @tenant.update(attrs)
           redirect_to tenant_path(@tenant), notice: "Tenant updated successfully"
         else
           render :edit, status: :unprocessable_entity

data/app/models/ruby_llm/agents/execution.rb

@@ -79,12 +79,24 @@ module RubyLLM
         foreign_key: :execution_id, dependent: :destroy
 
       # Delegations so existing code keeps working transparently
-      delegate :system_prompt, :user_prompt, :assistant_prompt, :response, :error_message,
+      delegate :system_prompt, :user_prompt, :assistant_prompt, :response,
         :messages_summary, :tool_calls, :attempts, :fallback_chain,
         :parameters, :routed_to, :classification_result,
         :cached_at, :cache_creation_tokens,
         to: :detail, prefix: false, allow_nil: true
 
+      # Error message reader that survives soft purge.
+      #
+      # Prefers detail.error_message when the detail row still exists, otherwise
+      # falls back to the truncated copy stored in metadata by the retention
+      # job. This lets error-rate trend analysis continue working past the
+      # soft-purge window.
+      #
+      # @return [String, nil]
+      def error_message
+        detail&.error_message || metadata&.dig("error_message")
+      end
+
       # Validations
       validates :agent_type, :model_id, :started_at, presence: true
       validates :status, inclusion: {in: statuses.keys}
@@ -95,7 +107,13 @@ module RubyLLM
       validates :finish_reason, inclusion: {in: FINISH_REASONS}, allow_nil: true
 
       before_save :calculate_total_tokens, if: -> { input_tokens_changed? || output_tokens_changed? }
-      before_save :calculate_total_cost, if: -> { input_cost_changed? || output_cost_changed? }
+      # Derive total_cost from its components only when the caller did not set an
+      # explicit total in the same save. The pipeline records a
+      # cache/reasoning-aware total alongside input_cost/output_cost, and that
+      # richer value must not be overwritten with the text-only input+output sum.
+      # (Deriving from metadata is unsafe — metadata merges user-supplied agent
+      # data and a colliding key would corrupt the total.)
+      before_save :calculate_total_cost, if: -> { (input_cost_changed? || output_cost_changed?) && !total_cost_changed? }
 
       # Aggregates costs from all attempts using each attempt's model pricing
       #
@@ -215,6 +233,44 @@ module RubyLLM
         metadata&.dig("rate_limited") == true
       end
 
+      # Returns the response payload as a Hash, regardless of how agents wrote it.
+      #
+      # The `execution_details.response` column is declared as JSON, but agents
+      # may write plain strings (chat text), arrays (embeddings), or nil. Views
+      # that want to look up specific keys (audio_url, image_url, etc.) need a
+      # Hash they can safely `.dig` into. This reader returns an empty hash when
+      # the stored response isn't a Hash, so callers don't need type guards.
+      #
+      # @return [Hash] Parsed response hash, or empty hash if not hash-shaped
+      def response_hash
+        raw = response
+        raw.is_a?(Hash) ? raw : {}
+      end
+
+      # Returns whether this execution has had its detail payload soft-purged.
+      #
+      # Soft-purged executions retain all analytics columns (cost, tokens,
+      # timing, status) but the large payloads (prompts, responses, tool
+      # calls, attempts) stored in execution_details and tool_executions
+      # have been destroyed by the retention job.
+      #
+      # @return [Boolean] true if the retention job has soft-purged this execution
+      def soft_purged?
+        metadata&.key?("soft_purged_at") == true
+      end
+
+      # Returns when this execution was soft-purged, if ever.
+      #
+      # @return [Time, nil] Parsed timestamp or nil if not soft-purged
+      def soft_purged_at
+        raw = metadata&.dig("soft_purged_at")
+        return nil if raw.blank?
+
+        Time.iso8601(raw)
+      rescue ArgumentError
+        nil
+      end
+
       # Convenience accessors for niche fields stored in metadata JSON
       %w[span_id response_cache_key fallback_reason].each do |field|
         define_method(field) { metadata&.dig(field) }
@@ -424,7 +480,11 @@ module RubyLLM
         self.total_tokens = (input_tokens || 0) + (output_tokens || 0)
       end
 
-      # Calculates and sets total_cost from input and output costs
+      # Calculates and sets total_cost from input and output costs.
+      #
+      # Only runs when the caller did not provide an explicit total_cost (see
+      # the before_save guard), so a cache/reasoning-aware total supplied by the
+      # pipeline is preserved rather than collapsed to the text-only sum.
       #
       # @return [BigDecimal] The calculated total
       def calculate_total_cost

data/app/models/ruby_llm/agents/tenant.rb

@@ -145,11 +145,17 @@ module RubyLLM
         alias_method :for_tenant!, :for!
       end
 
-      # Display name (name or tenant_id fallback)
+      # Display name.
+      #
+      # For tenants linked to a host model (Account, Organization, ...) the name
+      # is resolved live from that record, so a renamed record is reflected
+      # immediately instead of showing the snapshot taken when the tenant was
+      # created. Unlinked (string-id) tenants fall back to the stored name
+      # column, and tenant_id is the final fallback so this is never blank.
       #
       # @return [String]
       def display_name
-        name.presence || tenant_id
+        linked_record_name.presence || name.presence || tenant_id
       end
 
       # Check if tenant is linked to a user model
@@ -179,6 +185,28 @@ module RubyLLM
       def activate!
         update!(active: true)
       end
+
+      private
+
+      # Live display name from the linked host record (Account/Organization),
+      # or nil when this tenant is unlinked or the record is unavailable.
+      # Prefers the model's llm_tenant_name (which honours the configured name
+      # method), falling back to a plain #name. Never raises — name resolution
+      # must not break rendering.
+      #
+      # @return [String, nil]
+      def linked_record_name
+        record = tenant_record
+        return nil unless record
+
+        if record.respond_to?(:llm_tenant_name)
+          record.llm_tenant_name
+        elsif record.respond_to?(:name)
+          record.name
+        end
+      rescue
+        nil
+      end
     end
   end
 end

data/app/views/ruby_llm/agents/agents/_config_agent.html.erb

@@ -111,12 +111,16 @@
 
           <div class="flex items-center gap-2 pt-2">
             <button type="submit" class="text-[10px] px-2 py-0.5 rounded bg-gray-800 dark:bg-gray-200 text-white dark:text-gray-900 hover:bg-gray-700 dark:hover:bg-gray-300 transition-colors">save overrides</button>
-            <% if has_overrides %>
-              <%= link_to "reset all", ruby_llm_agents.reset_overrides_agent_path(@agent_type),
-                    method: :delete,
-                    class: "text-[10px] text-red-500 hover:text-red-400 transition-colors",
-                    data: { confirm: "Remove all dashboard overrides for this agent?" } %>
-            <% end %>
+          </div>
+        <% end %>
+
+        <% if has_overrides %>
+          <div class="mt-1.5">
+            <%= button_to "reset all", ruby_llm_agents.reset_overrides_agent_path(@agent_type),
+                  method: :delete,
+                  class: "text-[10px] text-red-500 hover:text-red-400 transition-colors",
+                  form: { style: "display:inline" },
+                  data: { turbo_confirm: "Remove all dashboard overrides for this agent?" } %>
           </div>
         <% end %>
       </div>

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

@@ -8,10 +8,11 @@
   <div class="flex items-center gap-2 px-3 py-1.5 mb-4 rounded border border-yellow-300 dark:border-yellow-700 bg-yellow-50 dark:bg-yellow-900/20 font-mono text-xs text-yellow-700 dark:text-yellow-400">
     <svg class="w-3.5 h-3.5 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L4.082 16.5c-.77.833.192 2.5 1.732 2.5z"></path></svg>
     <span>dashboard overrides active: <strong><%= @config[:active_overrides].keys.join(", ") %></strong></span>
-    <%= link_to "reset", ruby_llm_agents.reset_overrides_agent_path(@agent_type),
+    <%= button_to "reset", ruby_llm_agents.reset_overrides_agent_path(@agent_type),
           method: :delete,
           class: "ml-auto text-yellow-600 dark:text-yellow-500 hover:text-yellow-800 dark:hover:text-yellow-300",
-          data: { confirm: "Remove all dashboard overrides?" } %>
+          form: { style: "display:inline" },
+          data: { turbo_confirm: "Remove all dashboard overrides?" } %>
   </div>
 <% end %>
 
@@ -293,8 +294,8 @@
   <% end %>
 <% end %>
 
-<!-- ── config (non-agent types only) ── -->
-<% if @config && @agent_type_kind && @agent_type_kind != "agent" %>
+<!-- ── config ── -->
+<% if @config && @agent_type_kind %>
   <div class="flex items-center gap-3 mt-6 mb-3">
     <span class="text-[10px] font-medium text-gray-400 dark:text-gray-600 uppercase tracking-widest font-mono">config</span>
     <div class="flex-1 border-t border-gray-200 dark:border-gray-800"></div>

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

@@ -1,5 +1,5 @@
 <%
-  response = @execution.response || {}
+  response = @execution.response_hash
   audio_src = response["audio_url"] || response[:audio_url] ||
               response["audio_data_uri"] || response[:audio_data_uri]
   audio_format = response["format"] || response[:format] ||

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

@@ -3,14 +3,15 @@
   selected_agents = params[:agent_types].present? ? (params[:agent_types].is_a?(Array) ? params[:agent_types] : params[:agent_types].split(",")) : []
   selected_statuses = params[:statuses].present? ? (params[:statuses].is_a?(Array) ? params[:statuses] : params[:statuses].split(",")) : []
   selected_models = params[:model_ids].present? ? (params[:model_ids].is_a?(Array) ? params[:model_ids] : params[:model_ids].split(",")) : []
+  selected_tenants = params[:tenant_ids].present? ? (params[:tenant_ids].is_a?(Array) ? params[:tenant_ids] : params[:tenant_ids].split(",")) : []
 
-  has_filters = selected_agents.any? || selected_statuses.any? || params[:days].present? || selected_models.any? || params[:tenant_id].present?
+  has_filters = selected_agents.any? || selected_statuses.any? || params[:days].present? || selected_models.any? || selected_tenants.any?
   active_filter_count = [
     selected_agents.any? ? 1 : 0,
     selected_statuses.any? ? 1 : 0,
     params[:days].present? ? 1 : 0,
     selected_models.any? ? 1 : 0,
-    params[:tenant_id].present? ? 1 : 0
+    selected_tenants.any? ? 1 : 0
   ].sum
 
   status_options = [
@@ -89,11 +90,14 @@
         <%# Tenant Filter %>
         <% if tenant_filter_enabled? && available_tenants.any? %>
           <div class="md:w-auto">
-            <%= render "ruby_llm/agents/shared/select_dropdown",
-                name: "tenant_id",
-                filter_id: "tenant_id",
-                options: [{ value: "", label: "All Tenants" }] + available_tenants.map { |t| { value: t, label: t.truncate(15) } },
-                selected: params[:tenant_id],
+            <%= render "ruby_llm/agents/shared/filter_dropdown",
+                name: "tenant_ids[]",
+                filter_id: "tenant_ids",
+                label: "Tenants",
+                all_label: "All Tenants",
+                options: available_tenants,
+                selected: selected_tenants,
+                searchable: true,
                 icon: "M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4",
                 width: "w-40",
                 full_width: true %>
@@ -173,7 +177,7 @@
               <span class="md:hidden">Clear</span>
             <% end %>
           <% end %>
-          <%= link_to ruby_llm_agents.export_executions_path(agent_types: selected_agents.presence, statuses: selected_statuses.presence, days: params[:days].presence, model_ids: selected_models.presence, tenant_id: params[:tenant_id].presence),
+          <%= link_to ruby_llm_agents.export_executions_path(agent_types: selected_agents.presence, statuses: selected_statuses.presence, days: params[:days].presence, model_ids: selected_models.presence, tenant_ids: selected_tenants.presence),
               class: "flex-1 md:flex-initial flex items-center justify-center gap-2 px-3 py-2 md:p-2 text-sm md:text-base text-gray-600 md:text-gray-400 dark:text-gray-300 md:dark:text-gray-400 bg-gray-50 md:bg-transparent dark:bg-gray-700 md:dark:bg-transparent hover:text-gray-600 md:hover:text-gray-600 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-600 md:dark:hover:bg-gray-700 rounded-lg transition-colors",
               title: "Export CSV" do %>
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">

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

@@ -57,6 +57,16 @@
   </div>
 <% end %>
 
+<!-- Soft-purge banner -->
+<% if @execution.soft_purged? %>
+  <div class="flex items-start gap-2 bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-800 rounded px-3 py-2 mb-2">
+    <span class="text-amber-600 dark:text-amber-400 text-xs font-mono leading-5">
+      &#9888; Execution details were purged<% if @execution.soft_purged_at %> on <%= @execution.soft_purged_at.strftime("%b %d, %Y") %><% end %>.
+      Cost, token, and timing analytics are preserved.
+    </span>
+  </div>
+<% end %>
+
 <!-- Stats inline row -->
 <div class="flex flex-wrap items-center gap-x-4 gap-y-1 font-mono text-xs text-gray-400 dark:text-gray-500 mb-2">
   <span><span class="text-gray-800 dark:text-gray-200"><%= number_to_human_short(@execution.duration_ms || 0) %>ms</span> duration</span>
@@ -70,8 +80,8 @@
 <!-- ── audio player ──────────────────── -->
 <% if @execution.agent_type.to_s.match?(/Speaker|Narrator|Transcriber/i) ||
       @execution.metadata&.dig("audio_duration_seconds").present? ||
-      @execution.response&.dig("audio_data_uri").present? ||
-      @execution.response&.dig("audio_url").present? %>
+      @execution.response_hash["audio_data_uri"].present? ||
+      @execution.response_hash["audio_url"].present? %>
   <%= render "ruby_llm/agents/executions/audio_player" %>
 <% end %>
 
@@ -254,16 +264,18 @@
 <% end %>
 
 <!-- ── parameters ──────────────────── -->
-<div class="flex items-center gap-3 mt-6 mb-3">
-  <span class="text-[10px] font-medium text-gray-400 dark:text-gray-600 uppercase tracking-widest font-mono">parameters</span>
-  <div class="flex-1 border-t border-gray-200 dark:border-gray-800"></div>
-  <button
-    type="button"
-    data-copy-json="<%= Base64.strict_encode64(JSON.pretty_generate(@execution.parameters || {})) %>"
-    class="copy-json-btn font-mono text-xs text-gray-400 dark:text-gray-500 hover:text-gray-700 dark:hover:text-gray-300"
-  >copy</button>
-</div>
-<pre class="bg-gray-50 dark:bg-gray-900 text-gray-900 dark:text-gray-100 rounded p-4 text-xs overflow-x-auto font-mono"><%= highlight_json(@execution.parameters || {}) %></pre>
+<% if @execution.detail && @execution.parameters.present? %>
+  <div class="flex items-center gap-3 mt-6 mb-3">
+    <span class="text-[10px] font-medium text-gray-400 dark:text-gray-600 uppercase tracking-widest font-mono">parameters</span>
+    <div class="flex-1 border-t border-gray-200 dark:border-gray-800"></div>
+    <button
+      type="button"
+      data-copy-json="<%= Base64.strict_encode64(JSON.pretty_generate(@execution.parameters)) %>"
+      class="copy-json-btn font-mono text-xs text-gray-400 dark:text-gray-500 hover:text-gray-700 dark:hover:text-gray-300"
+    >copy</button>
+  </div>
+  <pre class="bg-gray-50 dark:bg-gray-900 text-gray-900 dark:text-gray-100 rounded p-4 text-xs overflow-x-auto font-mono"><%= highlight_json(@execution.parameters) %></pre>
+<% end %>
 
 <!-- ── response ──────────────────────── -->
 <% if @execution.response.present? %>
@@ -280,6 +292,7 @@
 <% end %>
 
 <!-- ── tool calls ──────────────────── -->
+<% if @execution.detail %>
 <% tool_calls = @execution.tool_calls || [] %>
 <% tool_call_count = tool_calls.size %>
 <div x-data="{ expanded: <%= tool_call_count <= 3 && tool_call_count > 0 %> }">
@@ -374,6 +387,7 @@
     <p class="text-xs text-gray-400 dark:text-gray-600 font-mono italic">no tool calls</p>
   <% end %>
 </div>
+<% end %>
 
 <!-- ── metadata ──────────────────────── -->
 <% if @execution.metadata.present? && @execution.metadata.any? %>

data/app/views/ruby_llm/agents/shared/_filter_dropdown.html.erb

@@ -10,11 +10,13 @@
   #       { value: "success", label: "Success", color: "bg-green-500" },
   #       { value: "error", label: "Error", color: "bg-red-500" }
   #     ],
-  #     selected: ["success"]
+  #     selected: ["success"],
+  #     searchable: true # renders a client-side search input above the options
 
   selected = local_assigns[:selected] || []
   show_all = local_assigns.fetch(:show_all_option, true)
   all_label = local_assigns[:all_label] || "All"
+  searchable = local_assigns.fetch(:searchable, false)
 
   current_label = if selected.empty?
     label
@@ -32,8 +34,31 @@
 
   has_selection = selected.any?
 %>
-<div class="relative" x-data="{ open: false }" @click.outside="open = false" data-filter="<%= filter_id %>">
-  <button type="button" @click="open = !open"
+<%#
+  Multi-select behavior:
+  - Checkbox click: toggle that option, mark dirty, keep dropdown open.
+  - Label click: clear other selections, check only this one, close, submit.
+  - Close dropdown (outside click, button toggle, Escape): if dirty, submit.
+  This batches checkbox picks into a single request when the user closes
+  the dropdown — no reliance on persisting open state across reload.
+%>
+<div class="relative"
+     x-data="{
+       open: false,
+       query: '',
+       dirty: false,
+       closeAndApply() {
+         this.open = false;
+         if (this.dirty) {
+           this.dirty = false;
+           this.$el.closest('form').requestSubmit();
+         }
+       }
+     }"
+     @click.outside="closeAndApply()"
+     @keydown.escape.window="if (open) closeAndApply()"
+     data-filter="<%= filter_id %>">
+  <button type="button" @click="open ? closeAndApply() : open = true"
     class="flex items-center gap-1.5 px-2 py-1 font-mono text-xs rounded
            hover:bg-gray-100 dark:hover:bg-gray-800/50 transition-colors
            <%= has_selection ? 'text-gray-900 dark:text-gray-100' : 'text-gray-400 dark:text-gray-500' %>">
@@ -50,7 +75,19 @@
        x-transition:enter-start="opacity-0 scale-95" x-transition:enter-end="opacity-100 scale-100"
        x-transition:leave="transition ease-in duration-75"
        x-transition:leave-start="opacity-100 scale-100" x-transition:leave-end="opacity-0 scale-95"
-       class="absolute z-20 mt-1 min-w-max bg-white dark:bg-gray-800 rounded-lg shadow-lg border border-gray-200 dark:border-gray-700 py-1 max-h-64 overflow-y-auto">
+       class="absolute z-20 mt-1 min-w-max w-56 bg-white dark:bg-gray-800 rounded-lg shadow-lg border border-gray-200 dark:border-gray-700 py-1">
+
+    <% if searchable %>
+      <div class="px-2 py-1.5 border-b border-gray-100 dark:border-gray-700 sticky top-0 bg-white dark:bg-gray-800">
+        <input type="text" x-model="query" @click.stop
+               placeholder="Search…"
+               x-ref="<%= filter_id %>_search"
+               x-effect="if (open) $nextTick(() => $refs['<%= filter_id %>_search']?.focus())"
+               class="w-full px-2 py-1 text-xs font-mono rounded border border-gray-200 dark:border-gray-700 bg-transparent text-gray-900 dark:text-gray-100 focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500">
+      </div>
+    <% end %>
+
+    <div class="max-h-56 overflow-y-auto">
 
     <% if show_all %>
       <div class="px-3 py-1.5 border-b border-gray-100 dark:border-gray-700">
@@ -60,7 +97,7 @@
                  <%= selected.empty? ? 'checked' : '' %>
                  @change="
                    $el.closest('[data-filter]').querySelectorAll('.filter-cb').forEach(c => c.checked = false);
-                   $el.closest('form').requestSubmit();
+                   dirty = true;
                  ">
           <span class="text-gray-700 dark:text-gray-200"><%= all_label %></span>
         </label>
@@ -68,13 +105,14 @@
     <% end %>
 
     <% options.each do |option| %>
-      <div class="flex items-center gap-2 px-3 py-1.5 font-mono text-xs text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700">
+      <div class="flex items-center gap-2 px-3 py-1.5 font-mono text-xs text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700"
+           <% if searchable %>x-show="query === '' || '<%= j(option[:label].to_s.downcase) %>'.includes(query.toLowerCase())"<% end %>>
         <input type="checkbox"
                name="<%= name %>"
                value="<%= option[:value] %>"
                class="filter-cb rounded border-gray-300 dark:border-gray-600 text-blue-600 focus:ring-blue-500 dark:bg-gray-700"
                <%= selected.include?(option[:value].to_s) ? 'checked' : '' %>
-               @change="$el.closest('form').requestSubmit()">
+               @change="dirty = true">
         <span class="flex-1 flex items-center gap-1.5 cursor-pointer"
               @click.prevent="
                 $el.closest('[data-filter]').querySelectorAll('.filter-cb').forEach(c => c.checked = false);
@@ -89,5 +127,6 @@
         </span>
       </div>
     <% end %>
+    </div>
   </div>
 </div>

data/app/views/ruby_llm/agents/shared/_tenant_filter.html.erb

@@ -6,8 +6,8 @@
               class="bg-transparent border border-gray-200 dark:border-gray-800 rounded px-2 py-0.5 text-xs font-mono text-gray-900 dark:text-gray-100 focus:ring-1 focus:ring-gray-400 dark:focus:ring-gray-600 focus:border-gray-400 dark:focus:border-gray-600">
         <option value="">all tenants</option>
         <% available_tenants.each do |tenant| %>
-          <option value="<%= tenant %>" <%= 'selected' if tenant == current_tenant_id %>>
-            <%= tenant %>
+          <option value="<%= tenant[:value] %>" <%= 'selected' if tenant[:value] == current_tenant_id %>>
+            <%= tenant[:label] %>
           </option>
         <% end %>
       </select>

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

@@ -51,8 +51,12 @@
     <span class="badge badge-sm <%= @config.async_logging ? 'badge-success' : 'badge-timeout' %>"><%= @config.async_logging ? 'on' : 'off' %></span>
   </div>
   <div class="flex items-center gap-3 py-0.5">
-    <span class="w-36 flex-shrink-0 text-gray-500 dark:text-gray-400">retention</span>
-    <span class="text-gray-900 dark:text-gray-200"><%= @config.retention_period.inspect %></span>
+    <span class="w-36 flex-shrink-0 text-gray-500 dark:text-gray-400">soft purge after</span>
+    <span class="text-gray-900 dark:text-gray-200"><%= @config.soft_purge_after ? @config.soft_purge_after.inspect : "disabled" %></span>
+  </div>
+  <div class="flex items-center gap-3 py-0.5">
+    <span class="w-36 flex-shrink-0 text-gray-500 dark:text-gray-400">hard purge after</span>
+    <span class="text-gray-900 dark:text-gray-200"><%= @config.hard_purge_after ? @config.hard_purge_after.inspect : "disabled" %></span>
   </div>
   <div class="flex items-center gap-3 py-0.5">
     <span class="w-36 flex-shrink-0 text-gray-500 dark:text-gray-400">job retries</span>

data/app/views/ruby_llm/agents/tenants/_form.html.erb

@@ -17,13 +17,22 @@
 
     <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
       <div>
-        <%= f.label :name, "display name", class: "block text-xs font-mono text-gray-500 dark:text-gray-400 mb-1" %>
-        <%= f.text_field :name,
-            class: "w-full px-3 py-2 bg-transparent border border-gray-200 dark:border-gray-800 rounded text-sm font-mono text-gray-900 dark:text-gray-100 focus:ring-1 focus:ring-gray-400 dark:focus:ring-gray-600 focus:border-gray-400 dark:focus:border-gray-600 placeholder-gray-400 dark:placeholder-gray-600",
-            placeholder: "e.g., Acme Corporation" %>
-        <p class="mt-1 text-[10px] font-mono text-gray-400 dark:text-gray-600">
-          Falls back to tenant ID if not set.
-        </p>
+        <label class="block text-xs font-mono text-gray-500 dark:text-gray-400 mb-1">display name</label>
+        <% if tenant.linked? %>
+          <p class="w-full px-3 py-2 bg-gray-50 dark:bg-gray-900 border border-gray-200 dark:border-gray-800 rounded text-sm font-mono text-gray-500 dark:text-gray-400">
+            <%= tenant.display_name %>
+          </p>
+          <p class="mt-1 text-[10px] font-mono text-gray-400 dark:text-gray-600">
+            Managed by the linked <%= tenant.tenant_record_type %>. Renaming it updates this automatically.
+          </p>
+        <% else %>
+          <%= f.text_field :name,
+              class: "w-full px-3 py-2 bg-transparent border border-gray-200 dark:border-gray-800 rounded text-sm font-mono text-gray-900 dark:text-gray-100 focus:ring-1 focus:ring-gray-400 dark:focus:ring-gray-600 focus:border-gray-400 dark:focus:border-gray-600 placeholder-gray-400 dark:placeholder-gray-600",
+              placeholder: "e.g., Acme Corporation" %>
+          <p class="mt-1 text-[10px] font-mono text-gray-400 dark:text-gray-600">
+            Falls back to tenant ID if not set.
+          </p>
+        <% end %>
       </div>
 
       <div>

data/lib/generators/ruby_llm_agents/templates/initializer.rb.tt

@@ -67,7 +67,33 @@ RubyLLM::Agents.configure do |config|
   # Number of retry attempts for the async logging job on failure
   # config.job_retry_attempts = 3
 
-  # Retention period for execution records (used by cleanup tasks)
+  # ============================================
+  # Data Retention
+  # ============================================
+  #
+  # Two-tier purge of execution records. Run the retention job on a schedule
+  # (e.g. daily via cron, sidekiq-cron, or the `whenever` gem):
+  #
+  #   RubyLLM::Agents::RetentionJob.perform_later
+  #   # or: rake ruby_llm_agents:purge
+  #
+  # Soft purge: deletes prompts, responses, tool calls, attempts, and other
+  # large payloads in execution_details and tool_executions. The executions
+  # row is preserved so cost, token, and latency analytics stay intact. A
+  # truncated copy of error_message is kept in executions.metadata.
+  #
+  # Hard purge: deletes the executions row entirely (cascades remove any
+  # remaining dependents). Use a longer window — this removes the execution
+  # from analytics.
+  #
+  # Set either to nil to disable that tier. soft_purge_after must be less
+  # than hard_purge_after when both are set.
+  #
+  # config.soft_purge_after = 30.days
+  # config.hard_purge_after = 365.days
+
+  # Deprecated: retention_period is an alias for hard_purge_after. Prefer the
+  # two-tier settings above.
   # config.retention_period = 30.days
 
   # ============================================