ruby_llm-agents 1.0.0 → 1.2.0

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

@@ -2,262 +2,21 @@
 
 module RubyLLM
   module Agents
-    # Database-backed budget configuration for multi-tenant environments
+    # @deprecated Use {Tenant} instead. This class will be removed in a future major version.
     #
-    # Stores per-tenant budget limits that override the global configuration.
-    # Supports runtime updates without application restarts.
-    # Supports cost-based (USD), token-based, and execution-based limits.
+    # TenantBudget is now an alias to Tenant for backward compatibility.
+    # All functionality has been moved to the Tenant model with organized concerns.
     #
-    # @!attribute [rw] tenant_id
-    #   @return [String] Unique identifier for the tenant
-    # @!attribute [rw] name
-    #   @return [String, nil] Human-readable name for the tenant
-    # @!attribute [rw] daily_limit
-    #   @return [BigDecimal, nil] Daily budget limit in USD
-    # @!attribute [rw] monthly_limit
-    #   @return [BigDecimal, nil] Monthly budget limit in USD
-    # @!attribute [rw] daily_token_limit
-    #   @return [Integer, nil] Daily token limit (across all models)
-    # @!attribute [rw] monthly_token_limit
-    #   @return [Integer, nil] Monthly token limit (across all models)
-    # @!attribute [rw] daily_execution_limit
-    #   @return [Integer, nil] Daily execution/call limit
-    # @!attribute [rw] monthly_execution_limit
-    #   @return [Integer, nil] Monthly execution/call limit
-    # @!attribute [rw] per_agent_daily
-    #   @return [Hash] Per-agent daily cost limits: { "AgentName" => limit }
-    # @!attribute [rw] per_agent_monthly
-    #   @return [Hash] Per-agent monthly cost limits: { "AgentName" => limit }
-    # @!attribute [rw] enforcement
-    #   @return [String] Enforcement mode: "none", "soft", or "hard"
-    # @!attribute [rw] inherit_global_defaults
-    #   @return [Boolean] Whether to fall back to global config for unset limits
-    # @!attribute [rw] tenant_record
-    #   @return [ActiveRecord::Base, nil] Polymorphic association to tenant model
+    # @example Migration path
+    #   # Old usage (still works)
+    #   TenantBudget.for_tenant("acme_corp")
+    #   TenantBudget.create!(tenant_id: "acme", daily_limit: 100)
     #
-    # @example Creating a tenant budget with cost, token, and execution limits
-    #   TenantBudget.create!(
-    #     tenant_id: "acme_corp",
-    #     name: "Acme Corporation",
-    #     daily_limit: 50.0,              # USD
-    #     monthly_limit: 500.0,           # USD
-    #     daily_token_limit: 1_000_000,
-    #     monthly_token_limit: 10_000_000,
-    #     daily_execution_limit: 500,
-    #     monthly_execution_limit: 10_000,
-    #     enforcement: "hard"
-    #   )
+    #   # New usage (preferred)
+    #   Tenant.for("acme_corp")
+    #   Tenant.create!(tenant_id: "acme", daily_limit: 100)
     #
-    # @example Fetching budget for a tenant object
-    #   budget = TenantBudget.for_tenant(organization)
-    #   budget.effective_daily_limit           # => 50.0 (cost)
-    #   budget.effective_daily_token_limit     # => 1_000_000 (tokens)
-    #   budget.effective_daily_execution_limit # => 500 (executions)
-    #
-    # @see RubyLLM::Agents::BudgetTracker
-    # @see RubyLLM::Agents::LLMTenant
-    # @api public
-    class TenantBudget < ::ActiveRecord::Base
-      self.table_name = "ruby_llm_agents_tenant_budgets"
-
-      # Valid enforcement modes
-      ENFORCEMENT_MODES = %w[none soft hard].freeze
-
-      # Polymorphic association to the tenant model (e.g., Organization, Account)
-      belongs_to :tenant_record, polymorphic: true, optional: true
-
-      # Validations
-      validates :tenant_id, presence: true, uniqueness: true
-      validates :enforcement, inclusion: { in: ENFORCEMENT_MODES }, allow_nil: true
-      validates :daily_limit, :monthly_limit,
-                numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
-      validates :daily_token_limit, :monthly_token_limit,
-                numericality: { greater_than_or_equal_to: 0, only_integer: true }, allow_nil: true
-      validates :daily_execution_limit, :monthly_execution_limit,
-                numericality: { greater_than_or_equal_to: 0, only_integer: true }, allow_nil: true
-
-      # Finds a budget for the given tenant
-      #
-      # @param tenant [String, Object] The tenant identifier string or object with llm_tenant_id
-      # @return [TenantBudget, nil] The budget record or nil if not found
-      def self.for_tenant(tenant)
-        return nil if tenant.blank?
-
-        if tenant.respond_to?(:llm_tenant_id)
-          # Object with llm_tenant DSL - try polymorphic first, then tenant_id
-          find_by(tenant_record: tenant) || find_by(tenant_id: tenant.llm_tenant_id)
-        else
-          # String tenant_id
-          find_by(tenant_id: tenant.to_s)
-        end
-      end
-
-      # Finds or creates a budget for the given tenant
-      #
-      # @param tenant_id [String] The tenant identifier
-      # @param name [String, nil] Optional human-readable name
-      # @return [TenantBudget] The budget record
-      def self.for_tenant!(tenant_id, name: nil)
-        find_or_create_by!(tenant_id: tenant_id) do |budget|
-          budget.name = name
-        end
-      end
-
-      # Returns the display name (name or tenant_id fallback)
-      #
-      # @return [String] The name to display
-      def display_name
-        name.presence || tenant_id
-      end
-
-      # Returns the effective daily limit, considering inheritance
-      #
-      # @return [Float, nil] The daily limit or nil if not set
-      def effective_daily_limit
-        return daily_limit if daily_limit.present?
-        return nil unless inherit_global_defaults
-
-        global_config&.dig(:global_daily)
-      end
-
-      # Returns the effective monthly limit, considering inheritance
-      #
-      # @return [Float, nil] The monthly limit or nil if not set
-      def effective_monthly_limit
-        return monthly_limit if monthly_limit.present?
-        return nil unless inherit_global_defaults
-
-        global_config&.dig(:global_monthly)
-      end
-
-      # Returns the effective per-agent daily limit
-      #
-      # @param agent_type [String] The agent class name
-      # @return [Float, nil] The limit or nil if not set
-      def effective_per_agent_daily(agent_type)
-        limit = per_agent_daily&.dig(agent_type)
-        return limit if limit.present?
-        return nil unless inherit_global_defaults
-
-        global_config&.dig(:per_agent_daily, agent_type)
-      end
-
-      # Returns the effective per-agent monthly limit
-      #
-      # @param agent_type [String] The agent class name
-      # @return [Float, nil] The limit or nil if not set
-      def effective_per_agent_monthly(agent_type)
-        limit = per_agent_monthly&.dig(agent_type)
-        return limit if limit.present?
-        return nil unless inherit_global_defaults
-
-        global_config&.dig(:per_agent_monthly, agent_type)
-      end
-
-      # Returns the effective daily token limit, considering inheritance
-      #
-      # @return [Integer, nil] The daily token limit or nil if not set
-      def effective_daily_token_limit
-        return daily_token_limit if daily_token_limit.present?
-        return nil unless inherit_global_defaults
-
-        global_config&.dig(:global_daily_tokens)
-      end
-
-      # Returns the effective monthly token limit, considering inheritance
-      #
-      # @return [Integer, nil] The monthly token limit or nil if not set
-      def effective_monthly_token_limit
-        return monthly_token_limit if monthly_token_limit.present?
-        return nil unless inherit_global_defaults
-
-        global_config&.dig(:global_monthly_tokens)
-      end
-
-      # Returns the effective daily execution limit, considering inheritance
-      #
-      # @return [Integer, nil] The daily execution limit or nil if not set
-      def effective_daily_execution_limit
-        return daily_execution_limit if daily_execution_limit.present?
-        return nil unless inherit_global_defaults
-
-        global_config&.dig(:global_daily_executions)
-      end
-
-      # Returns the effective monthly execution limit, considering inheritance
-      #
-      # @return [Integer, nil] The monthly execution limit or nil if not set
-      def effective_monthly_execution_limit
-        return monthly_execution_limit if monthly_execution_limit.present?
-        return nil unless inherit_global_defaults
-
-        global_config&.dig(:global_monthly_executions)
-      end
-
-      # Returns the effective enforcement mode
-      #
-      # @return [Symbol] :none, :soft, or :hard
-      def effective_enforcement
-        return enforcement.to_sym if enforcement.present?
-        return :soft unless inherit_global_defaults
-
-        RubyLLM::Agents.configuration.budget_enforcement
-      end
-
-      # Checks if budget enforcement is enabled for this tenant
-      #
-      # @return [Boolean] true if enforcement is :soft or :hard
-      def budgets_enabled?
-        effective_enforcement != :none
-      end
-
-      # Returns a hash suitable for BudgetTracker
-      #
-      # @return [Hash] Budget configuration hash
-      def to_budget_config
-        {
-          enabled: budgets_enabled?,
-          enforcement: effective_enforcement,
-          # Cost limits
-          global_daily: effective_daily_limit,
-          global_monthly: effective_monthly_limit,
-          per_agent_daily: merged_per_agent_daily,
-          per_agent_monthly: merged_per_agent_monthly,
-          # Token limits
-          global_daily_tokens: effective_daily_token_limit,
-          global_monthly_tokens: effective_monthly_token_limit,
-          # Execution limits
-          global_daily_executions: effective_daily_execution_limit,
-          global_monthly_executions: effective_monthly_execution_limit
-        }
-      end
-
-      private
-
-      # Returns the global budgets configuration
-      #
-      # @return [Hash, nil] Global budget config
-      def global_config
-        RubyLLM::Agents.configuration.budgets
-      end
-
-      # Merges per-agent daily limits with global defaults
-      #
-      # @return [Hash] Merged per-agent daily limits
-      def merged_per_agent_daily
-        return per_agent_daily || {} unless inherit_global_defaults
-
-        (global_config&.dig(:per_agent_daily) || {}).merge(per_agent_daily || {})
-      end
-
-      # Merges per-agent monthly limits with global defaults
-      #
-      # @return [Hash] Merged per-agent monthly limits
-      def merged_per_agent_monthly
-        return per_agent_monthly || {} unless inherit_global_defaults
-
-        (global_config&.dig(:per_agent_monthly) || {}).merge(per_agent_monthly || {})
-      end
-    end
+    # @see Tenant
+    TenantBudget = Tenant
   end
 end

data/app/services/ruby_llm/agents/agent_registry.rb

@@ -21,6 +21,12 @@ module RubyLLM
     #
     # @api public
     class AgentRegistry
+      # Base workflow classes to exclude from listings
+      # These are abstract parent classes, not concrete workflows
+      BASE_WORKFLOW_CLASSES = [
+        "RubyLLM::Agents::Workflow"
+      ].freeze
+
       class << self
         # Returns all unique agent type names
         #
@@ -72,7 +78,10 @@ module RubyLLM
           transcribers = RubyLLM::Agents::Transcriber.descendants.map(&:name).compact
           image_generators = RubyLLM::Agents::ImageGenerator.descendants.map(&:name).compact
 
-          (agents + workflows + embedders + moderators + speakers + transcribers + image_generators).uniq
+          all_agents = (agents + workflows + embedders + moderators + speakers + transcribers + image_generators).uniq
+
+          # Filter out base workflow classes
+          all_agents.reject { |name| BASE_WORKFLOW_CLASSES.include?(name) }
         rescue StandardError => e
           Rails.logger.error("[RubyLLM::Agents] Error loading agents from file system: #{e.message}")
           []
@@ -90,10 +99,13 @@ module RubyLLM
 
         # Eager loads all agent and workflow files to register descendants
         #
+        # Uses the configured autoload paths from RubyLLM::Agents.configuration
+        # to ensure agents are discovered in the correct directories.
+        #
         # @return [void]
         def eager_load_agents!
-          %w[agents workflows embedders moderators speakers transcribers image_generators].each do |dir|
-            path = Rails.root.join("app", dir)
+          RubyLLM::Agents.configuration.all_autoload_paths.each do |relative_path|
+            path = Rails.root.join(relative_path)
             next unless path.exist?
 
             Dir.glob(path.join("**", "*.rb")).each do |file|
@@ -207,18 +219,12 @@ module RubyLLM
         # Detects the specific workflow type from class hierarchy
         #
         # @param agent_class [Class, nil] The agent class
-        # @return [String, nil] "pipeline", "parallel", "router", or nil
+        # @return [String, nil] "workflow" for DSL workflows, or nil
         def detect_workflow_type(agent_class)
           return nil unless agent_class
 
-          ancestors = agent_class.ancestors.map { |a| a.name.to_s }
-
-          if ancestors.include?("RubyLLM::Agents::Workflow::Pipeline")
-            "pipeline"
-          elsif ancestors.include?("RubyLLM::Agents::Workflow::Parallel")
-            "parallel"
-          elsif ancestors.include?("RubyLLM::Agents::Workflow::Router")
-            "router"
+          if agent_class.respond_to?(:step_configs) && agent_class.step_configs.any?
+            "workflow"
           end
         end
 

data/app/views/layouts/ruby_llm/agents/application.html.erb

@@ -215,10 +215,9 @@
               nav_items = [
                 { path: ruby_llm_agents.root_path, label: "Dashboard", icon: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" />' },
                 { path: ruby_llm_agents.agents_path, label: "Agents", icon: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" />' },
+                { path: ruby_llm_agents.workflows_path, label: "Workflows", icon: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 5a1 1 0 011-1h14a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V5zm0 8a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H5a1 1 0 01-1-1v-6zm12 0a1 1 0 011-1h2a1 1 0 011 1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-6z"/>' },
                 { path: ruby_llm_agents.executions_path, label: "Executions", icon: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01" />' },
-                { path: ruby_llm_agents.tenants_path, label: "Tenants", icon: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="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" />' },
-                { path: ruby_llm_agents.system_config_path, label: "System Config", icon: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" /><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />' },
-                { path: ruby_llm_agents.api_configuration_path, label: "API Keys", icon: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z" />' }
+                { path: ruby_llm_agents.tenants_path, label: "Tenants", icon: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="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" />' }
               ]
             %>
             <nav class="hidden md:flex items-center space-x-1">
@@ -234,56 +233,55 @@
               dark:text-gray-400
             "
           >
-            <%# Tenant Selector Dropdown %>
-            <% if tenant_filter_enabled? && available_tenants.any? %>
-              <div x-data="{ open: false }" class="relative">
-                <button
-                  @click="open = !open"
-                  @click.outside="open = false"
-                  type="button"
-                  class="flex items-center gap-1.5 px-2.5 py-1.5 text-xs font-medium rounded-md border transition-colors
-                         <%= current_tenant_id.present? ?
-                           'bg-blue-50 dark:bg-blue-900/30 border-blue-200 dark:border-blue-800 text-blue-700 dark:text-blue-300' :
-                           'bg-white dark:bg-gray-700 border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-600' %>"
-                >
-                  <svg class="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="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" />
+            <%# Settings Dropdown %>
+            <div x-data="{ settingsOpen: false }" class="relative hidden md:block">
+              <button
+                @click="settingsOpen = !settingsOpen"
+                @click.outside="settingsOpen = false"
+                type="button"
+                class="p-2 rounded-md text-gray-500 hover:text-gray-700 hover:bg-gray-100 dark:text-gray-400 dark:hover:text-gray-200 dark:hover:bg-gray-700 transition-colors"
+                aria-label="Settings"
+              >
+                <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"/>
+                  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"/>
+                </svg>
+              </button>
+
+              <div
+                x-show="settingsOpen"
+                x-cloak
+                x-transition:enter="transition ease-out duration-100"
+                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 right-0 mt-2 w-48 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-lg z-50 py-1"
+              >
+                <a href="<%= ruby_llm_agents.system_config_path %>"
+                   class="flex items-center gap-2 px-4 py-2 text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 <%= 'bg-gray-100 dark:bg-gray-700' if request.path == ruby_llm_agents.system_config_path %>">
+                  <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6V4m0 2a2 2 0 100 4m0-4a2 2 0 110 4m-6 8a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4m6 6v10m6-2a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4"/>
                   </svg>
-                  <span class="hidden sm:inline"><%= current_tenant_id.present? ? current_tenant_id : 'All Tenants' %></span>
-                  <svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                  System Config
+                </a>
+                <a href="<%= ruby_llm_agents.api_configuration_path %>"
+                   class="flex items-center gap-2 px-4 py-2 text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 <%= 'bg-gray-100 dark:bg-gray-700' if request.path == ruby_llm_agents.api_configuration_path %>">
+                  <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z"/>
                   </svg>
-                </button>
-
-                <div
-                  x-show="open"
-                  x-cloak
-                  x-transition:enter="transition ease-out duration-100"
-                  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 right-0 mt-1 w-48 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-lg z-50 py-1"
-                >
-                  <a
-                    href="<%= all_tenants_url %>"
-                    class="block px-3 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 <%= 'bg-blue-50 dark:bg-blue-900/30 text-blue-700 dark:text-blue-300' if current_tenant_id.blank? %>"
-                  >
-                    All Tenants
-                  </a>
-                  <div class="border-t border-gray-100 dark:border-gray-700 my-1"></div>
-                  <% available_tenants.each do |tenant| %>
-                    <a
-                      href="<%= url_for(request.query_parameters.merge(tenant_id: tenant)) %>"
-                      class="block px-3 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 <%= 'bg-blue-50 dark:bg-blue-900/30 text-blue-700 dark:text-blue-300' if tenant == current_tenant_id %>"
-                    >
-                      <%= tenant %>
-                    </a>
-                  <% end %>
-                </div>
+                  API Keys
+                </a>
+                <div class="border-t border-gray-100 dark:border-gray-700 my-1"></div>
+                <a href="#" class="flex items-center gap-2 px-4 py-2 text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700">
+                  <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"/>
+                  </svg>
+                  Logout
+                </a>
               </div>
-            <% end %>
+            </div>
 
             <!-- Mobile menu button -->
             <button
@@ -340,35 +338,33 @@
           <% nav_items.each do |item| %>
             <%= render "ruby_llm/agents/shared/nav_link", path: item[:path], label: item[:label], icon: item[:icon], mobile: true %>
           <% end %>
-        </nav>
-      </div>
-    </header>
 
-    <%# Tenant Context Badge - shows when viewing specific tenant %>
-    <% if tenant_filter_enabled? && current_tenant_id.present? %>
-      <div class="bg-blue-50 dark:bg-blue-900/20 border-b border-blue-100 dark:border-blue-900/50">
-        <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-2">
-          <div class="flex items-center justify-between">
-            <div class="flex items-center gap-2 text-sm text-blue-700 dark:text-blue-300">
-              <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="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" />
-              </svg>
-              <span>Viewing tenant:</span>
-              <span class="font-semibold"><%= current_tenant_id %></span>
-            </div>
-            <a
-              href="<%= url_for(request.query_parameters.except('tenant_id')) %>"
-              class="flex items-center gap-1 text-sm text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-200"
-            >
-              <span>Clear filter</span>
-              <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
-              </svg>
-            </a>
+          <%# Settings section divider %>
+          <div class="border-t border-gray-200 dark:border-gray-700 my-2 pt-2">
+            <span class="px-3 text-xs font-semibold text-gray-400 dark:text-gray-500 uppercase tracking-wider">Settings</span>
           </div>
-        </div>
+
+          <%= render "ruby_llm/agents/shared/nav_link",
+                     path: ruby_llm_agents.system_config_path,
+                     label: "System Config",
+                     icon: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6V4m0 2a2 2 0 100 4m0-4a2 2 0 110 4m-6 8a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4m6 6v10m6-2a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4"/>',
+                     mobile: true %>
+
+          <%= render "ruby_llm/agents/shared/nav_link",
+                     path: ruby_llm_agents.api_configuration_path,
+                     label: "API Keys",
+                     icon: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z"/>',
+                     mobile: true %>
+
+          <a href="#" class="flex items-center px-3 py-2 text-sm font-medium text-gray-600 dark:text-gray-300 hover:text-gray-900 dark:hover:text-gray-100 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-md">
+            <svg class="w-5 h-5 mr-3 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"/>
+            </svg>
+            Logout
+          </a>
+        </nav>
       </div>
-    <% end %>
+    </header>
 
     <!-- Main content -->
     <main class="max-w-7xl w-full mx-auto px-4 sm:px-6 lg:px-8 py-8 h-full">

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

@@ -16,18 +16,6 @@
         <% else %>
           <span class="inline-flex items-center px-1.5 py-0.5 rounded text-[10px] font-medium bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-400">Deleted</span>
         <% end %>
-        <% if agent[:agent_type] && agent[:agent_type] != "agent" %>
-          <span class="inline-flex items-center px-1.5 py-0.5 rounded text-[10px] font-medium
-            <%= case agent[:agent_type]
-                when 'embedder' then 'bg-purple-100 dark:bg-purple-900/50 text-purple-800 dark:text-purple-300'
-                when 'moderator' then 'bg-orange-100 dark:bg-orange-900/50 text-orange-800 dark:text-orange-300'
-                when 'speaker' then 'bg-green-100 dark:bg-green-900/50 text-green-800 dark:text-green-300'
-                when 'transcriber' then 'bg-pink-100 dark:bg-pink-900/50 text-pink-800 dark:text-pink-300'
-                else ''
-                end %>">
-            <%= agent[:agent_type].capitalize %>
-          </span>
-        <% end %>
       </div>
       <!-- Desktop: model -->
       <span class="hidden sm:block text-sm text-gray-500 dark:text-gray-400"><%= agent[:model] %></span>

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

@@ -0,0 +1,56 @@
+<%#
+  Sortable column header component for agents table
+
+  Creates a clickable table header that toggles sort direction and
+  displays visual feedback for the current sort state.
+
+  Usage:
+    render "ruby_llm/agents/agents/sortable_header",
+      column: "name",
+      label: "Name",
+      current_sort: @sort_params[:column],
+      current_direction: @sort_params[:direction],
+      align: "right",
+      th_class: "hidden lg:table-cell"
+
+  Parameters:
+    column           - (String) The column name used in sort URL parameter
+    label            - (String) Display text for the header
+    current_sort     - (String) Currently active sort column
+    current_direction - (String) Current sort direction ('asc' or 'desc')
+    align            - (String) Text alignment: 'left' (default), 'center', or 'right'
+    th_class         - (String) Additional CSS classes for the th element (e.g., responsive hiding)
+%>
+<%
+  align = local_assigns[:align] || "left"
+  th_class = local_assigns[:th_class] || ""
+  is_active = column == current_sort
+  next_direction = is_active && current_direction == "asc" ? "desc" : "asc"
+  sort_url = url_for(request.query_parameters.merge(sort: column, direction: next_direction))
+
+  align_class = case align
+                when "right" then "text-right justify-end"
+                when "center" then "text-center justify-center"
+                else "text-left justify-start"
+                end
+%>
+<th scope="col" class="px-4 py-3 <%= th_class %>">
+  <a href="<%= sort_url %>"
+     class="group inline-flex items-center gap-1 <%= align_class %> w-full
+            text-xs font-semibold uppercase tracking-wider
+            <%= is_active ? 'text-blue-600 dark:text-blue-400' : 'text-gray-500 dark:text-gray-400' %>
+            hover:text-blue-600 dark:hover:text-blue-400 transition-colors">
+    <span><%= label %></span>
+    <span class="<%= is_active ? 'opacity-100' : 'opacity-0 group-hover:opacity-50' %> transition-opacity">
+      <% if is_active && current_direction == "asc" %>
+        <svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 15l7-7 7 7"/>
+        </svg>
+      <% else %>
+        <svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"/>
+        </svg>
+      <% end %>
+    </span>
+  </a>
+</th>

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

@@ -1,27 +1,17 @@
 <%
-  workflow_colors = {
-    "pipeline" => { border: "border-l-indigo-500", icon_bg: "bg-indigo-100 dark:bg-indigo-900/50", icon_text: "text-indigo-600 dark:text-indigo-300" },
-    "parallel" => { border: "border-l-cyan-500", icon_bg: "bg-cyan-100 dark:bg-cyan-900/50", icon_text: "text-cyan-600 dark:text-cyan-300" },
-    "router" => { border: "border-l-amber-500", icon_bg: "bg-amber-100 dark:bg-amber-900/50", icon_text: "text-amber-600 dark:text-amber-300" }
-  }
-  colors = workflow_colors[workflow[:workflow_type]] || { border: "border-l-gray-400", icon_bg: "bg-gray-100", icon_text: "text-gray-600" }
-
-  child_label = case workflow[:workflow_type]
-    when "pipeline" then "steps"
-    when "parallel" then "branches"
-    when "router" then "routes"
-    else "children"
-  end
+  # All workflows use unified emerald color scheme
+  colors = { border: "border-l-emerald-500", icon_bg: "bg-emerald-100 dark:bg-emerald-900/50", icon_text: "text-emerald-600 dark:text-emerald-300" }
+  child_label = "steps"
 %>
 
 <div x-data="{ expanded: false }" class="block bg-white dark:bg-gray-800 rounded-lg shadow hover:shadow-md transition-shadow border-l-4 <%= colors[:border] %>">
-  <%= link_to ruby_llm_agents.workflow_path(ERB::Util.url_encode(workflow[:name]), tab: local_assigns[:current_tab], subtab: local_assigns[:current_subtab]), class: "block p-4 sm:p-5 relative z-10", data: { turbo: false }, style: "pointer-events: auto;" do %>
+  <%= link_to ruby_llm_agents.workflow_path(ERB::Util.url_encode(workflow[:name]), tab: local_assigns[:current_tab]), class: "block p-4 sm:p-5 relative z-10", data: { turbo: false }, style: "pointer-events: auto;" do %>
     <!-- Header Row -->
     <div class="flex items-center justify-between gap-2">
       <div class="flex items-center gap-2 min-w-0">
         <%= render "ruby_llm/agents/shared/workflow_type_badge", workflow_type: workflow[:workflow_type], size: :sm %>
         <h3 class="font-semibold text-gray-900 dark:text-gray-100 truncate">
-          <% name_parts = workflow[:name].gsub(/Workflow$/, '').gsub(/Pipeline$|Parallel$|Router$/, '').split('::') %>
+          <% name_parts = workflow[:name].split('::') %>
           <% if name_parts.length > 1 %>
             <span class="text-gray-400 dark:text-gray-500 font-normal"><%= name_parts[0..-2].join('::') %>::</span>
           <% end %>