ruby_llm 1.16.0 → 2.0.0

data/lib/generators/ruby_llm/chat_ui/templates/tailwind/views/models/show.html.erb.tt

@@ -1,16 +1,16 @@
-<%% content_for :title, "Showing <%= model_table_name.singularize.humanize.downcase %>" %>
+<%% content_for :title, "Showing <%= model_resource_name.singularize.humanize.downcase %>" %>
 
 <div class="md:w-2/3 w-full">
   <%% if notice.present? %>
     <p class="py-2 px-3 bg-green-50 mb-5 text-green-500 font-medium rounded-md inline-block" id="notice"><%%= notice %></p>
   <%% end %>
 
-  <h1 class="font-bold text-4xl">Showing <%= model_table_name.singularize.humanize.downcase %></h1>
+  <h1 class="font-bold text-4xl">Showing <%= model_resource_name.singularize.humanize.downcase %></h1>
 
   <div class="my-5 space-y-3">
     <p><strong class="block font-medium mb-1">Provider:</strong> <%%= @<%= model_variable_name %>.provider_class&.name || @<%= model_variable_name %>.provider %></p>
     <p><strong class="block font-medium mb-1">Model:</strong> <%%= @<%= model_variable_name %>.name %></p>
-    <p><strong class="block font-medium mb-1">ID:</strong> <%%= @<%= model_variable_name %>.model_id %></p>
+    <p><strong class="block font-medium mb-1">ID:</strong> <%%= @<%= model_variable_name %>.id %></p>
     <p><strong class="block font-medium mb-1">Context Window:</strong> <%%= number_with_delimiter(@<%= model_variable_name %>.context_window) if @<%= model_variable_name %>.context_window %></p>
     <p><strong class="block font-medium mb-1">Max Output Tokens:</strong> <%%= number_with_delimiter(@<%= model_variable_name %>.max_output_tokens) if @<%= model_variable_name %>.max_output_tokens %></p>
   </div>
@@ -22,6 +22,6 @@
     </div>
   <%% end %>
 
-  <%%= link_to "Start <%= chat_table_name.singularize.humanize.downcase %> with this model", new_<%= chat_variable_name %>_path(model: @<%= model_variable_name %>.model_id), class: "w-full sm:w-auto text-center rounded-md px-3.5 py-2.5 bg-gray-100 hover:bg-gray-50 inline-block font-medium" %>
-  <%%= link_to "All <%= model_table_name.humanize.downcase %>", <%= model_table_name %>_path, class: "w-full sm:w-auto text-center mt-2 sm:mt-0 sm:ml-2 rounded-md px-3.5 py-2.5 bg-gray-100 hover:bg-gray-50 inline-block font-medium" %>
+  <%%= link_to "Start <%= chat_table_name.singularize.humanize.downcase %> with this model", new_<%= chat_variable_name %>_path(model: [@<%= model_variable_name %>.provider, @<%= model_variable_name %>.id].join(":")), class: "w-full sm:w-auto text-center rounded-md px-3.5 py-2.5 bg-gray-100 hover:bg-gray-50 inline-block font-medium" %>
+  <%%= link_to "All <%= model_resource_name.humanize.downcase %>", <%= model_resource_name %>_path, class: "w-full sm:w-auto text-center mt-2 sm:mt-0 sm:ml-2 rounded-md px-3.5 py-2.5 bg-gray-100 hover:bg-gray-50 inline-block font-medium" %>
 </div>

data/lib/generators/ruby_llm/chat_ui/templates/views/chats/_chat.html.erb.tt

@@ -1,7 +1,7 @@
 <div id="<%%= dom_id <%= chat_model_name.demodulize.underscore %> %>">
   <div>
     <strong>Model:</strong>
-    <%%= <%= chat_model_name.demodulize.underscore %>.<%= model_table_name.singularize %>&.label || default_model_display_name %>
+    <%%= <%= chat_model_name.demodulize.underscore %>.model&.label || default_model_display_name %>
   </div>
 
   <div>

data/lib/generators/ruby_llm/chat_ui/templates/views/chats/_form.html.erb.tt

@@ -14,7 +14,7 @@
   <div>
     <%%= form.label :model, "Select AI model:", style: "display: block" %>
     <%%= form.select :model,
-        options_for_select(@chat_models.map { |model| [model.label, model.id] }.unshift([default_model_display_name, nil]), @selected_model),
+        options_for_select(@chat_models.map { |model| [model.label, [model.provider, model.id].join(":")] }.unshift([default_model_display_name, nil]), @selected_model),
         {},
         style: "width: 100%; max-width: 600px; padding: 5px;" %>
   </div>

data/lib/generators/ruby_llm/chat_ui/templates/views/chats/index.html.erb.tt

@@ -6,7 +6,7 @@
 
 <h1><%= chat_model_name.pluralize %></h1>
 <p>
-  <%%= link_to "<%= model_model_name.pluralize %>", <%= model_table_name %>_path %>
+  <%%= link_to "<%= model_model_name.pluralize %>", <%= model_resource_name %>_path %>
 </p>
 
 <div id="<%= chat_table_name %>">

data/lib/generators/ruby_llm/chat_ui/templates/views/chats/show.html.erb.tt

@@ -8,10 +8,10 @@
 
 <h1><%= chat_model_name %> <%%= @<%= chat_variable_name %>.id %></h1>
 
-<p>Using <strong><%%= @<%= chat_variable_name %>.<%= model_table_name.singularize %>&.label || default_model_display_name %></strong></p>
+<p>Using <strong><%%= @<%= chat_variable_name %>.model&.label || default_model_display_name %></strong></p>
 
 <div id="<%= message_table_name %>">
-  <%% @<%= chat_variable_name %>.<%= message_table_name %>.where.not(id: nil).each do |<%= message_variable_name %>| %>
+  <%% @<%= chat_variable_name %>.<%= message_table_name %>.each do |<%= message_variable_name %>| %>
     <%%= render <%= message_variable_name %> %>
   <%% end %>
 </div>

data/lib/generators/ruby_llm/chat_ui/templates/views/messages/_assistant.html.erb.tt

@@ -1,4 +1,4 @@
-<%% assistant ||= local_assigns[:message] %>
+<%% assistant ||= local_assigns[:<%= message_model_name.demodulize.underscore %>] %>
 <div id="<%= message_variable_name %>_<%%= assistant.id %>" class="<%= message_variable_name %>"
      style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #28a745;">
   <div style="font-weight: bold; margin-bottom: 5px;">Assistant</div>

data/lib/generators/ruby_llm/chat_ui/templates/views/messages/_system.html.erb.tt

@@ -1,4 +1,4 @@
-<%% system ||= local_assigns[:message] %>
+<%% system ||= local_assigns[:<%= message_model_name.demodulize.underscore %>] %>
 <div id="<%= message_variable_name %>_<%%= system.id %>" class="<%= message_variable_name %>"
      style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
   <div style="font-weight: bold; margin-bottom: 5px; color: #374151;">System</div>

data/lib/generators/ruby_llm/chat_ui/templates/views/messages/_tool.html.erb.tt

@@ -1,2 +1,2 @@
-<%% tool ||= local_assigns[:message] %>
+<%% tool ||= local_assigns[:<%= message_model_name.demodulize.underscore %>] %>
 <%%= render tool_result_partial(tool), tool: tool %>

data/lib/generators/ruby_llm/chat_ui/templates/views/messages/_tool_calls.html.erb.tt

@@ -1,4 +1,6 @@
-<%% tool_calls ||= local_assigns[:message] %>
-<%% tool_calls.<%= tool_call_variable_name.pluralize %>.each do |tool_call| %>
-  <%%= render tool_call_partial(tool_call), tool_calls: tool_calls, tool_call: tool_call %>
-<%% end %>
+<%% message = local_assigns[:<%= message_model_name.demodulize.underscore %>] || tool_calls %>
+<div id="<%= message_variable_name %>_<%%= message.id %>">
+  <%% message.<%= tool_call_variable_name.pluralize %>.each_value do |tool_call| %>
+    <%%= render tool_call_partial(tool_call), message: message, tool_call: tool_call %>
+  <%% end %>
+</div>

data/lib/generators/ruby_llm/chat_ui/templates/views/messages/_user.html.erb.tt

@@ -1,4 +1,4 @@
-<%% user ||= local_assigns[:message] %>
+<%% user ||= local_assigns[:<%= message_model_name.demodulize.underscore %>] %>
 <div id="<%= message_variable_name %>_<%%= user.id %>" class="<%= message_variable_name %>"
      style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #007bff;">
   <div style="font-weight: bold; margin-bottom: 5px;">User</div>

data/lib/generators/ruby_llm/chat_ui/templates/views/messages/create.turbo_stream.erb.tt

@@ -1,7 +1,5 @@
-<%% if defined?(@<%= chat_variable_name %>) && @<%= chat_variable_name %>.present? %>
-  <%%= turbo_stream.replace "new_<%= message_variable_name %>" do %>
-    <%%= render "<%= message_model_name.underscore.pluralize %>/form",
-      <%= chat_variable_name %>: @<%= chat_variable_name %>,
-      <%= message_variable_name %>: @<%= chat_variable_name %>.<%= message_table_name %>.build %>
-  <%% end %>
+<%%= turbo_stream.replace "new_<%= message_variable_name %>" do %>
+  <%%= render "<%= message_model_name.underscore.pluralize %>/form",
+    <%= chat_variable_name %>: @<%= chat_variable_name %>,
+    <%= message_variable_name %>: @<%= chat_variable_name %>.<%= message_table_name %>.build %>
 <%% end %>

data/lib/generators/ruby_llm/chat_ui/templates/views/messages/tool_calls/_default.html.erb.tt

@@ -1,8 +1,8 @@
-<div id="<%= message_variable_name %>_<%%= tool_calls.id %>" class="<%= message_variable_name %>"
+<div id="<%= message_variable_name %>_tool_call_<%%= tool_call.id %>" class="<%= message_variable_name %>"
      style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
   <div style="font-weight: bold; margin-bottom: 5px;">Tool Call</div>
   <pre style="white-space: pre-wrap; margin: 0;"><%%= tool_call.name %>(<%%= tool_call.arguments.map { |k, v| "#{k}: #{v.inspect}" }.join(", ") %>)</pre>
   <div style="font-size: 0.85em; color: #666; margin-top: 5px;">
-    <%%= tool_calls.created_at&.strftime("%I:%M %p") %>
+    <%%= message.created_at&.strftime("%I:%M %p") %>
   </div>
 </div>

data/lib/generators/ruby_llm/chat_ui/templates/views/models/_model.html.erb.tt

@@ -1,15 +1,14 @@
-<%% model_id = <%= model_model_name.demodulize.underscore %>.respond_to?(:model_id) ? <%= model_model_name.demodulize.underscore %>.model_id : <%= model_model_name.demodulize.underscore %>.id %>
-<%% row_id = [<%= model_model_name.demodulize.underscore %>.provider, model_id].join("_").parameterize(separator: "_") %>
+<%% row_id = [<%= model_model_name.demodulize.underscore %>.provider, <%= model_model_name.demodulize.underscore %>.id].join("_").parameterize(separator: "_") %>
 <tr id="model_<%%= row_id %>">
   <td><%%= <%= model_model_name.demodulize.underscore %>.provider_class&.name || <%= model_model_name.demodulize.underscore %>.provider %></td>
-  <td><%%= <%= model_model_name.demodulize.underscore %>.respond_to?(:display_name) ? <%= model_model_name.demodulize.underscore %>.display_name : <%= model_model_name.demodulize.underscore %>.name %></td>
+  <td><%%= <%= model_model_name.demodulize.underscore %>.name %></td>
   <td><%%= number_with_delimiter(<%= model_model_name.demodulize.underscore %>.context_window) if <%= model_model_name.demodulize.underscore %>.context_window %></td>
   <td>
-    <%% input = <%= model_model_name.demodulize.underscore %>.input_price_per_million %>
-    <%% output = <%= model_model_name.demodulize.underscore %>.output_price_per_million %>
+    <%% input = <%= model_model_name.demodulize.underscore %>.price(:input) %>
+    <%% output = <%= model_model_name.demodulize.underscore %>.price(:output) %>
     <%% if input && output %>
       $<%%= "%.2f" % input %> / $<%%= "%.2f" % output %>
     <%% end %>
   </td>
-  <td><%%= link_to "Start <%= chat_table_name.singularize.humanize.downcase %>", new_<%= chat_variable_name %>_path(model: model_id) %></td>
+  <td><%%= link_to "Start <%= chat_table_name.singularize.humanize.downcase %>", new_<%= chat_variable_name %>_path(model: [<%= model_model_name.demodulize.underscore %>.provider, <%= model_model_name.demodulize.underscore %>.id].join(":")) %></td>
 </tr>

data/lib/generators/ruby_llm/chat_ui/templates/views/models/index.html.erb.tt

@@ -10,10 +10,10 @@
 </p>
 
 <p>
-  <%%= button_to "Refresh <%= model_model_name.pluralize %>", refresh_<%= model_table_name %>_path, method: :post %>
+  <%%= button_to "Refresh <%= model_model_name.pluralize %>", refresh_<%= model_resource_name %>_path, method: :post %>
 </p>
 
-<div id="<%= model_table_name %>">
+<div id="<%= model_resource_name %>">
   <%% if @<%= model_variable_name.pluralize %>.any? %>
     <table>
       <thead>

data/lib/generators/ruby_llm/chat_ui/templates/views/models/show.html.erb.tt

@@ -2,7 +2,7 @@
 
 <h1><%%= @<%= model_variable_name %>.name %></h1>
 
-<p><strong>ID:</strong> <%%= @<%= model_variable_name %>.model_id %></p>
+<p><strong>ID:</strong> <%%= @<%= model_variable_name %>.id %></p>
 <p><strong>Provider:</strong> <%%= @<%= model_variable_name %>.provider_class&.name || @<%= model_variable_name %>.provider %></p>
 <p><strong>Context Window:</strong> <%%= number_with_delimiter(@<%= model_variable_name %>.context_window) %> tokens</p>
 <p><strong>Max Output:</strong> <%%= number_with_delimiter(@<%= model_variable_name %>.max_output_tokens) %> tokens</p>
@@ -12,6 +12,6 @@
 <%% end %>
 
 <p>
-  <%%= link_to "Start chat with this model", new_<%= chat_variable_name %>_path(model: @<%= model_variable_name %>.model_id) %> |
-  <%%= link_to "All models", <%= model_table_name %>_path %>
+  <%%= link_to "Start chat with this model", new_<%= chat_variable_name %>_path(model: [@<%= model_variable_name %>.provider, @<%= model_variable_name %>.id].join(":")) %> |
+  <%%= link_to "All models", <%= model_resource_name %>_path %>
 </p>

data/lib/generators/ruby_llm/generator_helpers.rb

@@ -4,25 +4,36 @@ module RubyLLM
   module Generators
     # Shared helpers for RubyLLM generators
     module GeneratorHelpers
-      def parse_model_mappings
-        @model_names = {
-          chat: 'Chat',
-          message: 'Message',
-          tool_call: 'ToolCall',
-          model: 'Model'
-        }
+      APPLICATION_MODEL_TYPES = %w[chat message].freeze
+      DEFAULT_MODEL_NAMES = {
+        chat: 'Chat',
+        message: 'Message'
+      }.freeze
+
+      def parse_model_mappings(allowed_types: APPLICATION_MODEL_TYPES, defaults: DEFAULT_MODEL_NAMES)
+        @model_names = defaults.dup
+        @explicit_model_mappings = []
 
         model_mappings.each do |mapping|
-          if mapping.include?(':')
-            key, value = mapping.split(':', 2)
-            @model_names[key.to_sym] = value.classify
-          end
+          key, value = mapping.split(':', 2)
+          validate_model_mapping!(mapping, key, value, allowed_types)
+          raise Thor::Error, "Duplicate model mapping: #{key}" if @explicit_model_mappings.include?(key.to_sym)
+
+          @explicit_model_mappings << key.to_sym
+          @model_names[key.to_sym] = value.classify
         end
 
         @model_names
       end
 
-      %i[chat message tool_call model].each do |type|
+      def validate_model_mapping!(mapping, key, value, allowed_types)
+        return if allowed_types.include?(key) && value.present?
+
+        expected = allowed_types.map { |type| "#{type}:ModelName" }.join(', ')
+        raise Thor::Error, "Invalid model mapping #{mapping.inspect}. Expected one of: #{expected}"
+      end
+
+      %i[chat message].each do |type|
         define_method("#{type}_model_name") do
           @model_names ||= parse_model_mappings
           @model_names[type]
@@ -35,18 +46,41 @@ module RubyLLM
         define_method("#{type}_variable_name") do
           variable_name_for(send("#{type}_model_name"))
         end
+      end
 
-        define_method("#{type}_controller_class_name") do
-          controller_class_name_for(send("#{type}_model_name"))
-        end
+      # Models remain a UI resource even though RubyLLM owns their persistence.
+      # Keep that resource beside a namespaced chat without implying that the
+      # application has a corresponding ActiveRecord model.
+      def model_model_name
+        return 'Model' unless chat_model_name.include?('::')
 
-        define_method("#{type}_job_class_name") do
-          "#{variable_name_for(send("#{type}_model_name")).camelize}ResponseJob"
-        end
+        "#{chat_model_name.deconstantize}::Model"
+      end
 
-        define_method("#{type}_partial") do
-          partial_path_for(send("#{type}_model_name"))
-        end
+      # Routes, view paths and DOM ids for the models UI. Deliberately not a
+      # table name: models live in ruby_llm_models whatever the app calls this
+      # resource, and they are reached through the :model association.
+      def model_resource_name = table_name_for(model_model_name)
+      def model_variable_name = variable_name_for(model_model_name)
+
+      def usage_operations_sql = sql_string_list(::RubyLLM::Accounting::Usage::Entry::OPERATIONS)
+      def usage_statuses_sql = sql_string_list(::RubyLLM::Accounting::Usage::Entry::STATUSES)
+      def tool_call_variable_name = 'tool_call'
+
+      def chat_controller_class_name
+        controller_class_name_for(chat_model_name)
+      end
+
+      def message_controller_class_name
+        controller_class_name_for(message_model_name)
+      end
+
+      def model_controller_class_name
+        controller_class_name_for(model_model_name)
+      end
+
+      def chat_job_class_name
+        "#{chat_variable_name.camelize}ResponseJob"
       end
 
       def acts_as_chat_declaration
@@ -54,9 +88,6 @@ module RubyLLM
 
         add_association_params(params, :messages, message_table_name, message_model_name,
                                owner_table: chat_table_name, owner_model_name: chat_model_name, plural: true)
-        add_association_params(params, :model, model_table_name, model_model_name,
-                               owner_table: chat_table_name, owner_model_name: chat_model_name)
-
         "acts_as_chat#{" #{params.join(', ')}" if params.any?}"
       end
 
@@ -65,37 +96,13 @@ module RubyLLM
 
         add_association_params(params, :chat, chat_table_name, chat_model_name,
                                owner_table: message_table_name, owner_model_name: message_model_name)
-        add_association_params(params, :tool_calls, tool_call_table_name, tool_call_model_name,
-                               owner_table: message_table_name, owner_model_name: message_model_name, plural: true)
-        add_association_params(params, :model, model_table_name, model_model_name,
-                               owner_table: message_table_name, owner_model_name: message_model_name)
-
         "acts_as_message#{" #{params.join(', ')}" if params.any?}"
       end
 
-      def acts_as_model_declaration
-        params = []
-
-        add_association_params(params, :chats, chat_table_name, chat_model_name,
-                               owner_table: model_table_name, owner_model_name: model_model_name, plural: true)
-
-        "acts_as_model#{" #{params.join(', ')}" if params.any?}"
-      end
-
-      def acts_as_tool_call_declaration
-        params = []
-
-        add_association_params(params, :message, message_table_name, message_model_name,
-                               owner_table: tool_call_table_name, owner_model_name: tool_call_model_name)
-        add_result_foreign_key_param(params)
-
-        "acts_as_tool_call#{" #{params.join(', ')}" if params.any?}"
-      end
-
       def create_namespace_modules
         namespaces = []
 
-        [chat_model_name, message_model_name, tool_call_model_name, model_model_name].each do |model_name|
+        [chat_model_name, message_model_name].each do |model_name|
           if model_name.include?('::')
             namespace = model_name.split('::').first
             namespaces << namespace unless namespaces.include?(namespace)
@@ -122,6 +129,21 @@ module RubyLLM
         "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
       end
 
+      # Rack 3.1 renamed the 422 symbol and Rails mirrors the rename from 7.2 on.
+      def unprocessable_content_status
+        constants = ::ActionDispatch::Constants
+        return :unprocessable_entity unless constants.const_defined?(:UNPROCESSABLE_CONTENT)
+
+        constants::UNPROCESSABLE_CONTENT
+      end
+
+      def reference_type
+        application = Rails.application if Rails.respond_to?(:application)
+        return :bigint unless application
+
+        application.config.generators.options.dig(:active_record, :primary_key_type) || :bigint
+      end
+
       def create_migration_class_name(table_name)
         "create_#{table_name}".camelize
       end
@@ -144,9 +166,44 @@ module RubyLLM
         false
       end
 
+      def ui_variant
+        @ui_variant ||= case options[:ui]
+                        when 'tailwind'
+                          :tailwind
+                        when 'auto'
+                          tailwind_available? ? :tailwind : :scaffold
+                        else
+                          :scaffold
+                        end
+      end
+
+      def ui_template(template_path)
+        return template_path unless ui_variant == :tailwind
+
+        # Keep Tailwind templates as a separate set so we can mirror Rails/Tailwind
+        # scaffold conventions without complicating scaffold templates.
+        tailwind_template = "tailwind/#{template_path}"
+        File.exist?(File.join(self.class.source_root, "#{tailwind_template}.tt")) ? tailwind_template : template_path
+      end
+
+      def tailwind_available?
+        Rails.root.join('app/assets/tailwind/application.css').exist? ||
+          Rails.root.join('config/tailwind.config.js').exist? ||
+          gem_in_bundle?('tailwindcss-rails') ||
+          gem_in_bundle?('cssbundling-rails')
+      end
+
+      def gem_in_bundle?(gem_name)
+        gemfile_path = Rails.root.join('Gemfile')
+        lockfile_path = Rails.root.join('Gemfile.lock')
+
+        [gemfile_path, lockfile_path].any? do |path|
+          path.exist? && path.read.include?(gem_name)
+        end
+      end
+
       private
 
-      # rubocop:disable Metrics/ParameterLists
       def add_association_params(params, default_assoc, table_name, model_name,
                                  owner_table:, owner_model_name:, plural: false)
         assoc = plural ? table_name.to_sym : table_name.singularize.to_sym
@@ -158,7 +215,6 @@ module RubyLLM
         params << "#{default_assoc.to_s.singularize}_class: '#{model_name}'" if model_name != assoc.to_s.classify
         params << "#{default_assoc}_foreign_key: :#{foreign_key}" if foreign_key != default_foreign_key
       end
-      # rubocop:enable Metrics/ParameterLists
 
       def collection_association?(default_assoc, plural)
         plural || default_assoc.to_s.pluralize == default_assoc.to_s
@@ -179,11 +235,8 @@ module RubyLLM
         "#{owner_model_name.demodulize.underscore}_id"
       end
 
-      def add_result_foreign_key_param(params)
-        foreign_key = "#{tool_call_table_name.singularize}_id"
-        default_foreign_key = "#{tool_call_model_name.demodulize.underscore}_id"
-
-        params << "result_foreign_key: :#{foreign_key}" if foreign_key != default_foreign_key
+      def sql_string_list(values)
+        values.map { |value| "'#{value}'" }.join(', ')
       end
 
       # Convert namespaced model names to proper table names
@@ -211,12 +264,6 @@ module RubyLLM
           "#{model_name.pluralize}Controller"
         end
       end
-
-      # Convert model name to partial path
-      # e.g., "LLM::Message" -> "llm/message" (not "llm_message")
-      def partial_path_for(model_name)
-        "#{model_name.underscore.pluralize}/#{model_name.demodulize.underscore}"
-      end
     end
   end
 end

data/lib/generators/ruby_llm/install/install_generator.rb

@@ -28,17 +28,12 @@ module RubyLLM
       end
 
       def create_migration_files
+        migration_template 'create_ruby_llm_records_migration.rb.tt',
+                           'db/migrate/create_ruby_llm_records.rb'
         migration_template 'create_chats_migration.rb.tt',
                            "db/migrate/create_#{chat_table_name}.rb"
         migration_template 'create_messages_migration.rb.tt',
                            "db/migrate/create_#{message_table_name}.rb"
-        migration_template 'create_tool_calls_migration.rb.tt',
-                           "db/migrate/create_#{tool_call_table_name}.rb"
-        migration_template 'create_models_migration.rb.tt',
-                           "db/migrate/create_#{model_table_name}.rb"
-        migration_template 'add_references_to_chats_tool_calls_and_messages_migration.rb.tt',
-                           'db/migrate/add_references_to_' \
-                           "#{chat_table_name}_#{tool_call_table_name}_and_#{message_table_name}.rb"
       end
 
       def create_model_files
@@ -46,9 +41,6 @@ module RubyLLM
 
         template 'chat_model.rb.tt', "app/models/#{chat_model_name.underscore}.rb"
         template 'message_model.rb.tt', "app/models/#{message_model_name.underscore}.rb"
-        template 'tool_call_model.rb.tt', "app/models/#{tool_call_model_name.underscore}.rb"
-
-        template 'model_model.rb.tt', "app/models/#{model_model_name.underscore}.rb"
       end
 
       def create_initializer
@@ -79,7 +71,7 @@ module RubyLLM
         say '     2. Run: bin/rails ruby_llm:load_models'
         say '     3. Set your API keys in config/initializers/ruby_llm.rb'
 
-        say "     4. Start chatting: #{chat_model_name}.create!(model: 'gpt-5-nano').ask('Hello!')"
+        say "     4. Start chatting: #{chat_model_name}.create!(model: 'gpt-5.6-luna').ask('Hello!')"
         say "     5. Optional UI: #{chat_ui_generator_command}"
 
         if options[:skip_active_storage]

data/lib/generators/ruby_llm/install/templates/create_chats_migration.rb.tt

@@ -1,6 +1,8 @@
 class <%= create_migration_class_name(chat_table_name) %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :<%= chat_table_name %> do |t|
+    create_table :<%= chat_table_name %>, id: :<%= reference_type %> do |t|
+      t.references :ruby_llm_model, null: false, foreign_key: { to_table: :ruby_llm_models }, type: :<%= reference_type %>
+      t.boolean :cancelled, null: false, default: false
       t.timestamps
     end
   end

data/lib/generators/ruby_llm/install/templates/create_messages_migration.rb.tt

@@ -1,19 +1,25 @@
 class <%= create_migration_class_name(message_table_name) %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :<%= message_table_name %> do |t|
+    create_table :<%= message_table_name %>, id: :<%= reference_type %> do |t|
+      t.references :<%= chat_table_name.singularize %>, null: false, foreign_key: { to_table: :<%= chat_table_name %> }, type: :<%= reference_type %>
       t.string :role, null: false
       t.text :content
-      t.json :content_raw
+      t.boolean :cache_until_here, null: false, default: false
       t.text :thinking_text
       t.text :thinking_signature
-      t.integer :thinking_tokens
-      t.integer :input_tokens
-      t.integer :output_tokens
-      t.integer :cached_tokens
-      t.integer :cache_creation_tokens
+<% if postgresql? %>
+      t.jsonb :citations
+      t.jsonb :server_tool_calls
+      t.jsonb :raw_content
+      t.jsonb :raw_reasoning
+<% else %>
+      t.json :citations
+      t.json :server_tool_calls
+      t.json :raw_content
+      t.json :raw_reasoning
+<% end %>
+      t.string :finish_reason
       t.timestamps
     end
-
-    add_index :<%= message_table_name %>, :role
   end
 end

data/lib/generators/ruby_llm/install/templates/create_ruby_llm_records_migration.rb.tt

@@ -0,0 +1,117 @@
+class <%= create_migration_class_name('ruby_llm_records') %> < ActiveRecord::Migration<%= migration_version %>
+  def change
+    create_table :ruby_llm_models, id: :<%= reference_type %> do |t|
+      t.string :model_id, null: false
+      t.string :name, null: false
+      t.string :provider, null: false
+      t.string :family
+      t.datetime :model_created_at
+      t.integer :context_window
+      t.integer :max_output_tokens
+      t.date :knowledge_cutoff
+      t.datetime :unlisted_at
+<% if postgresql? %>
+      t.jsonb :modalities, default: {}
+      t.jsonb :capabilities, default: []
+      t.jsonb :pricing, default: {}
+      t.jsonb :metadata, default: {}
+<% elsif mysql? %>
+      t.json :modalities
+      t.json :capabilities
+      t.json :pricing
+      t.json :metadata
+<% else %>
+      t.json :modalities, default: {}
+      t.json :capabilities, default: []
+      t.json :pricing, default: {}
+      t.json :metadata, default: {}
+<% end %>
+      t.timestamps
+
+      t.index [ :provider, :model_id ], unique: true
+      t.index :provider
+      t.index :family
+<% if postgresql? -%>
+      t.index :capabilities, using: :gin
+      t.index :modalities, using: :gin
+<% end -%>
+    end
+
+    create_table :ruby_llm_tool_calls, id: :<%= reference_type %> do |t|
+      t.references :message, polymorphic: true, null: false, type: :<%= reference_type %>, index: false
+      t.references :result, polymorphic: true, type: :<%= reference_type %>, index: false
+      t.string :tool_call_id, null: false
+      t.string :name, null: false
+      t.text :thought_signature
+      t.string :approval
+      t.boolean :remote, default: false, null: false
+<% if postgresql? %>
+      t.jsonb :arguments, default: {}
+<% elsif mysql? %>
+      t.json :arguments
+<% else %>
+      t.json :arguments, default: {}
+<% end %>
+      t.timestamps
+
+      t.index [ :message_type, :message_id ]
+      t.index [ :result_type, :result_id ]
+      t.index :tool_call_id, unique: true
+      t.index :name
+    end
+
+    create_table :ruby_llm_usages, id: :<%= reference_type %> do |t|
+      t.references :chat, polymorphic: true, null: false, type: :<%= reference_type %>, index: false
+      t.references :message, polymorphic: true, type: :<%= reference_type %>, index: false
+      t.string :operation, null: false
+      t.string :provider, null: false
+      t.string :model, null: false
+      t.string :status, null: false
+      t.integer :input_tokens
+      t.integer :output_tokens
+      t.integer :cache_read_tokens
+      t.integer :cache_write_tokens
+      t.integer :thinking_tokens
+      t.decimal :input_cost, precision: 16, scale: 10
+      t.decimal :output_cost, precision: 16, scale: 10
+      t.decimal :cache_read_cost, precision: 16, scale: 10
+      t.decimal :cache_write_cost, precision: 16, scale: 10
+      t.decimal :thinking_cost, precision: 16, scale: 10
+      t.decimal :total_cost, precision: 16, scale: 10
+      t.timestamps
+
+      t.index [ :chat_type, :chat_id ]
+      t.index [ :message_type, :message_id ]
+      t.index :status
+      t.check_constraint "operation IN (<%= usage_operations_sql %>)"
+      t.check_constraint "status IN (<%= usage_statuses_sql %>)"
+    end
+
+    create_table :ruby_llm_batches, id: :<%= reference_type %> do |t|
+      t.string :provider_batch_id, null: false
+      t.string :provider, null: false
+      t.string :status, null: false
+      t.string :raw_status
+      t.boolean :completed, null: false, default: false
+      t.string :chat_type
+      t.string :batch_protocol
+<% if postgresql? %>
+      t.jsonb :chat_ids, default: []
+      t.jsonb :request_counts
+      t.jsonb :reported_cost
+<% elsif mysql? %>
+      t.json :chat_ids
+      t.json :request_counts
+      t.json :reported_cost
+<% else %>
+      t.json :chat_ids, default: []
+      t.json :request_counts
+      t.json :reported_cost
+<% end %>
+      t.timestamps
+
+      t.index [ :provider, :provider_batch_id ], unique: true
+      t.index :status
+    end
+  end
+end