ruby_llm 2.0.0.rc3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf1e2bc13df637c93268a6ee20e52c704c47f942be416c4d6728882ae2cc35bf
-  data.tar.gz: b63c7e4eef810843ad1bcb91a8ad55413f90764ba7e984d310c8a6b4bec3bec0
+  metadata.gz: 42dd9dfdb910f8e5df4eb6114ed59586a13e4a51797173d3f3bdb13b6d59c28b
+  data.tar.gz: fa4e0aa374c915ab5e97146bcacb438fc2c3fca0c029ed51c1aea6c934769da8
 SHA512:
-  metadata.gz: 030126750af8dea0303a81093d415e361fdfb7335620d8e84da3fd024acba2e5323bb7fcbd47530a6a3d5cbc24ba3c2f771db431aabd8011502bd19b9b68aa71
-  data.tar.gz: c783cfc4c121db83f4e05867893b7b822ffeddb53010eb22a5053d37eca7a539ee26dc6181b669ac5b2fac856464a18cc8929303127c1e5ae1f1fe28f9c1f373
+  metadata.gz: 3e5489b6fdd071de5c4281c9cc8eff9d345dd10876cb6773144873d2e58c3ec400109d208706d4c04c12d93328f5864f839907521fd751accc29aa9a5a753602
+  data.tar.gz: 19c33af936f0626262ad3e469c955b98aee8599b15fe088ba745e31584f91ebbf166cabc981bef4bef526f6e6c96800aebe07dc133ca732313ca58598aa6273f

data/.rdoc_options

@@ -17,8 +17,8 @@ exclude:
   - \.json$
 footer_content:
   Documentation:
-    Guides: https://rubyllm.com/next/
-    Upgrading: https://rubyllm.com/next/upgrading/
+    Guides: https://rubyllm.com/
+    Upgrading: https://rubyllm.com/upgrading/
   Resources:
     GitHub: https://github.com/crmne/ruby_llm
     Issues: https://github.com/crmne/ruby_llm/issues

data/README.md

@@ -7,7 +7,9 @@
 
 <strong>Build AI features the Ruby way</strong>
 
-<p>The Ruby-native AI framework. Build with chats, tools, agents, images, audio, and video through one consistent API, in plain Ruby or Rails.</p>
+<p>RubyLLM is the Ruby-native AI framework. Work with models, tools, and agents through one consistent API, in plain Ruby or Rails.</p>
+
+[Website](https://rubyllm.com/) · [Getting Started](https://rubyllm.com/getting-started/) · [What's New in 2.0](https://rubyllm.com/whats-new-in-2-0/)
 
 Battle tested at [<picture><source media="(prefers-color-scheme: dark)" srcset="https://chatwithwork.com/logotype-dark.svg"><img src="https://chatwithwork.com/logotype.svg" alt="Chat with Work" height="30" align="absmiddle"></picture>](https://chatwithwork.com) - *Fully private work AI*
 
@@ -24,26 +26,19 @@ Battle tested at [<picture><source media="(prefers-color-scheme: dark)" srcset="
 
 ---
 
-Work with OpenAI, xAI, Anthropic, Google, AWS, local models, and more. Seventeen providers are built in, and you can connect an OpenAI-compatible endpoint directly.
-
-## Build a working Ruby AI chat in two minutes
-
-https://github.com/user-attachments/assets/65422091-9338-47da-a303-92b918bd1345
-
-## Why RubyLLM?
+## 17 providers. One Ruby API.
 
-Use the same Ruby methods across providers. Add files to a conversation, give an agent tools, generate media, or build a search feature with embeddings and reranking. Read response text, generated files, and usage through Ruby objects.
+Build with the models you want. Move between hosted and local providers without rewriting your application, or connect an OpenAI-compatible endpoint.
 
-In Rails, the API works on your own Chat and Message records, with Active Storage attachments, Hotwire streaming, and background jobs. RubyLLM maintains the supporting model registry, tool calls, usage ledger, and batches. A handful of small dependencies keeps it easy to bring into an existing application.
+[Browse models and pricing](https://rubyllm.com/available-models/) · [Connect a provider](https://rubyllm.com/configuration-providers/)
 
-## Show me the code
+## Start with one line. Add files, tools, and agents
 
-These examples use **2.0.0.rc3**. Follow [Getting Started](https://rubyllm.com/next/getting-started/) to install it and configure the providers you want to try.
+These examples use **2.0.0**. Follow [Getting Started](https://rubyllm.com/getting-started/) to install it and configure the providers you want to try. For 1.x, use the [1.x docs](https://rubyllm.com/v1/).
 
 ```ruby
-# Just ask questions
-chat = RubyLLM.chat
-chat.ask "What's the best way to learn Ruby?"
+# Just ask
+RubyLLM.chat.ask "What's the best way to learn Ruby?"
 ```
 
 ```ruby
@@ -155,7 +150,9 @@ response = chat.with_schema(ProductSchema).ask "Analyze this product", with: "pr
 response.parsed
 ```
 
-## Features
+## A complete AI framework for Ruby
+
+Agents, workflows, RAG, images, audio, and video. Built in, with usage tracking and Rails integration to bring them into your app.
 
 * **Chat:** Conversational AI with `RubyLLM.chat`
 * **Vision:** Analyze images and videos
@@ -170,7 +167,7 @@ response.parsed
 * **Tools:** Let AI call your Ruby methods
 * **Tool approval:** Park a run until a human approves with `requires_approval`
 * **The agentic loop:** Drive it yourself with `ask_later`, `step`, and `complete?`
-* **Server tools:** Web search, code execution, and MCP connectors with `with_server_tools`
+* **Provider tools:** Web search, code execution, and MCP connectors with `with_provider_tools`
 * **Agents:** Reusable assistants with `RubyLLM::Agent`
 * **Prompt templates:** ERB prompts in `app/prompts`, rendered with `RubyLLM.render_prompt`
 * **Workflows:** Correlate multi-agent runs in your telemetry with `RubyLLM.workflow`
@@ -192,10 +189,10 @@ response.parsed
 
 ## Installation
 
-Install the 2.0 release candidate:
+Install RubyLLM 2.0:
 
 ```bash
-bundle add ruby_llm --version 2.0.0.rc3
+bundle add ruby_llm --version 2.0.0
 ```
 
 Configure a provider in your script, or in `config/initializers/ruby_llm.rb` in Rails:
@@ -208,9 +205,13 @@ RubyLLM.configure do |config|
 end
 ```
 
-Configure the other providers used by the examples as needed: Gemini for files, xAI for video, Mistral for OCR, and Cohere for reranking. [Getting Started](https://rubyllm.com/next/getting-started/) shows each setup beside its example. If your app uses 1.16, follow the [upgrade guide](https://rubyllm.com/next/upgrading/) before deploying 2.0.
+Configure the other providers used by the examples as needed: Gemini for files, xAI for video, Mistral for OCR, and Cohere for reranking. [Getting Started](https://rubyllm.com/getting-started/) shows each setup beside its example. If your app uses 1.16, follow the [upgrade guide](https://rubyllm.com/upgrading/) before deploying 2.0.
 
-## Rails
+## Feels at home in Rails
+
+Save conversations with Active Record and stream replies with Hotwire. The generators give you a working chat UI. Watch the two-minute demo.
+
+https://github.com/user-attachments/assets/65422091-9338-47da-a303-92b918bd1345
 
 ```bash
 # Install Rails Integration
@@ -231,11 +232,21 @@ chat = Chat.create! model: "gpt-5.6-luna"
 chat.ask "What's in this file?", with: "report.pdf"
 ```
 
-Visit `http://localhost:3000/chats` for a ready-to-use chat interface!
+Start your Rails server and visit `http://localhost:3000/chats` to try the chat interface. See the [Rails guide](https://rubyllm.com/rails/) for persistence, streaming, and background jobs.
+
+## AI coding assistants
+
+Give your coding assistant the RubyLLM API and documentation that match your application. From your application directory, install the skill packaged with your gem:
+
+```bash
+npx skills add "$(bundle show ruby_llm)" --skill rubyllm
+```
+
+Choose your coding assistant and installation scope when prompted. See [AI Coding Assistants](https://rubyllm.com/ai-coding-assistants/) for setup and updates.
 
 ## Documentation
 
-[Guides](https://rubyllm.com/next/getting-started/) · [API reference](https://rubyllm.com/next/api/) · [Models](https://rubyllm.com/available-models/) · [Upgrading](https://rubyllm.com/next/upgrading/)
+[Guides](https://rubyllm.com/getting-started/) · [API reference](https://rubyllm.com/api/) · [Models](https://rubyllm.com/available-models/) · [Upgrading](https://rubyllm.com/upgrading/) · [1.x docs](https://rubyllm.com/v1/)
 
 ## Contributing
 

data/lib/generators/ruby_llm/generator_helpers.rb

@@ -138,7 +138,10 @@ module RubyLLM
       end
 
       def reference_type
-        Rails.application.config.generators.options.dig(:active_record, :primary_key_type) || :bigint
+        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)

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

@@ -1,6 +1,6 @@
 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

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

@@ -1,6 +1,6 @@
 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

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

@@ -1,6 +1,6 @@
-class CreateRubyLlmRecords < ActiveRecord::Migration<%= migration_version %>
+class <%= create_migration_class_name('ruby_llm_records') %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :ruby_llm_models do |t|
+    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
@@ -37,7 +37,7 @@ class CreateRubyLlmRecords < ActiveRecord::Migration<%= migration_version %>
 <% end -%>
     end
 
-    create_table :ruby_llm_tool_calls do |t|
+    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
@@ -60,7 +60,7 @@ class CreateRubyLlmRecords < ActiveRecord::Migration<%= migration_version %>
       t.index :name
     end
 
-    create_table :ruby_llm_usages do |t|
+    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
@@ -87,7 +87,7 @@ class CreateRubyLlmRecords < ActiveRecord::Migration<%= migration_version %>
       t.check_constraint "status IN (<%= usage_statuses_sql %>)"
     end
 
-    create_table :ruby_llm_batches do |t|
+    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

data/lib/generators/ruby_llm/upgrade/online_copy_migration/data.rb

@@ -63,6 +63,15 @@ module RubyLLM
           end
         end
 
+        def discard_incomplete_tool_calls
+          source = records(configuration.fetch('tool_call_table'))
+          result_key = configuration.fetch('tool_call_foreign_key')
+          results = messages.where.not(result_key => nil).select(result_key)
+          owners = legacy_messages.select(messages.primary_key)
+          source.where(configuration.fetch('message_foreign_key') => owners)
+                .where.not(source.primary_key => results).delete_all
+        end
+
         def catch_up(passes: nil)
           sync_models
           pass = 0

data/lib/generators/ruby_llm/upgrade/online_copy_migration.rb

@@ -47,7 +47,7 @@ module RubyLLM
         end
       end
 
-      def finish
+      def finish(discard_incomplete_tool_calls: false)
         with_migration_lock do
           state = states.first!
           return if state.active_version == 2 && state.status == 'active' && data.finished?
@@ -55,6 +55,10 @@ module RubyLLM
           raise 'Run the copy backfill before finish' unless data.completed?
 
           pause(state, from: 1, statuses: %w[preparing active finishing])
+          if discard_incomplete_tool_calls
+            discarded = data.discard_incomplete_tool_calls
+            ::ActiveRecord::Migration.say "Discarded #{discarded} incomplete legacy tool calls"
+          end
           data.catch_up
           data.verify
           verify_completed_work

data/lib/generators/ruby_llm/upgrade/templates/backfill_v2_data.rb.tt

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-require 'generators/ruby_llm/upgrade/legacy_content_sql'
 <% if copy_mode? -%>
-
 require 'generators/ruby_llm/upgrade/upgrade_migration'
+<% else -%>
+require 'generators/ruby_llm/upgrade/legacy_content_sql'
 <% end -%>
 
 class <%= backfill_migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   disable_ddl_transaction!
 
+<% unless copy_mode? -%>
   BATCH_SIZE = 10_000
+<% end -%>
   PROGRESS_TABLE = :ruby_llm_v2_backfills
 
   def up
@@ -46,6 +48,7 @@ class <%= backfill_migration_class_name %> < ActiveRecord::Migration<%= migratio
     raise 'The RubyLLM 2.0 upgrade is already finished. Do not run the backfill again.'
   end
 
+<% unless copy_mode? -%>
   def backfill_required_defaults
     {
       <%= chat_table_name %>: {cancelled: false},
@@ -453,6 +456,7 @@ class <%= backfill_migration_class_name %> < ActiveRecord::Migration<%= migratio
     yield
   end
 
+<% end -%>
   def progress_records = migration_record(PROGRESS_TABLE)
 
   def migration_record(table)

data/lib/generators/ruby_llm/upgrade/templates/finish_v2_upgrade.rb.tt

@@ -13,7 +13,7 @@ class <%= finish_migration_class_name %> < ActiveRecord::Migration<%= migration_
   def up
 <% if copy_mode? -%>
     RubyLLM::Generators::UpgradeMigration.for.verify_settings(<%= copy_upgrade_settings.inspect %>)
-    RubyLLM::Generators::UpgradeMigration.for.finish do
+    RubyLLM::Generators::UpgradeMigration.for.finish<% if discard_incomplete_tool_calls? %>(discard_incomplete_tool_calls: true)<% end %> do
       verify_completed_backfills
       enforce_required_defaults
       relax_legacy_message_constraints
@@ -113,6 +113,7 @@ class <%= finish_migration_class_name %> < ActiveRecord::Migration<%= migration_
     raise "RubyLLM 2.0 backfills are incomplete: #{missing.join(', ')}"
   end
 
+<% unless copy_mode? -%>
   def verify_message_content
     return unless column_exists?(:<%= message_table_name %>, :content_raw)
 
@@ -220,17 +221,22 @@ class <%= finish_migration_class_name %> < ActiveRecord::Migration<%= migration_
 <% end -%>
   end
 
+<% end -%>
   def with_upgrade_safety(&)
     return safety_assured(&) if respond_to?(:safety_assured, true)
 
     yield
   end
 
-  def message_value(column) = "legacy_messages.#{quote_column(column)}"
   def column_definition(table, column) = connection.columns(table).find { |candidate| candidate.name == column.to_s }
+<% unless copy_mode? -%>
+  def message_value(column) = "legacy_messages.#{quote_column(column)}"
   def quoted_primary_key(table) = quote_column(connection.primary_key(table))
   def quote_table(table) = connection.quote_table_name(table)
+<% end -%>
+<% if postgresql? || !copy_mode? -%>
   def quote_column(column) = connection.quote_column_name(column)
+<% end -%>
 
   def migration_record(table)
     Class.new(ActiveRecord::Base) do

data/lib/generators/ruby_llm/upgrade/templates/prepare_v2_upgrade.rb.tt

@@ -382,7 +382,7 @@ class <%= prepare_migration_class_name %> < ActiveRecord::Migration<%= migration
 
   def create_usages
     unless table_exists?(:ruby_llm_usages)
-      create_table :ruby_llm_usages do |table|
+      create_table :ruby_llm_usages, id: :<%= reference_type %> do |table|
         table.references :chat, polymorphic: true, null: false,
                                 type: reference_type_for(:<%= chat_table_name %>), index: false
         table.references :message, polymorphic: true,
@@ -417,7 +417,7 @@ class <%= prepare_migration_class_name %> < ActiveRecord::Migration<%= migration
 
   def create_batches
     unless table_exists?(:ruby_llm_batches)
-      create_table :ruby_llm_batches do |table|
+      create_table :ruby_llm_batches, id: :<%= reference_type %> do |table|
         table.string :provider_batch_id, null: false
         table.string :provider, null: false
         table.string :status, null: false

data/lib/generators/ruby_llm/upgrade/templates/ruby_llm_upgrade.rb.tt

@@ -15,7 +15,7 @@ module RubyLLMUpgrade # :nodoc: all
       self.enumerate_columns_in_select_statements = true
       default_scope { RubyLLMUpgrade.visible(self) }
       after_initialize { @ruby_llm_upgrade_epoch = RubyLLMUpgrade.epoch }
-      around_save :guard_ruby_llm_upgrade, prepend: true
+      around_save :guard_ruby_llm_upgrade
       around_destroy :guard_ruby_llm_upgrade, prepend: true
       before_save { RubyLLMUpgrade.prepare_model(self) if ruby_llm_upgrade_kind == :chat }
     end

data/lib/generators/ruby_llm/upgrade/templates/upgrade_initializer.rb.tt

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'active_record/base'
 require Rails.root.join('app/models/concerns/ruby_llm_upgrade')
 
 Rails.application.config.to_prepare do
+  require 'active_record/base'
   tool_call = if Gem::Version.new(RubyLLM::VERSION).segments.first >= 2
                 RubyLLM::ActiveRecord::ToolCall
               else

data/lib/generators/ruby_llm/upgrade/upgrade_generator.rb

@@ -26,6 +26,8 @@ module RubyLLM
                            desc: 'Generate one upgrade phase; cleanup runs in a later deployment'
       class_option :mode, type: :string, enum: %w[rename copy], default: 'rename',
                           desc: 'Copy prepares and backfills online, with protected 1.16 rollback until cleanup'
+      class_option :discard_incomplete_tool_calls, type: :boolean, default: false,
+                                                   desc: 'Discard all incomplete legacy tool calls at copy finish'
 
       argument :model_mappings,
                type: :array,
@@ -39,6 +41,7 @@ module RubyLLM
       end
 
       def create_migration_files
+        validate_cleanup_options
         parse_model_mappings(allowed_types: MODEL_MAPPING_TYPES, defaults: MODEL_MAPPING_DEFAULTS)
         say_status :models, resolved_model_mappings
 
@@ -132,6 +135,14 @@ module RubyLLM
       private
 
       def copy_mode? = options[:mode] == 'copy'
+      def discard_incomplete_tool_calls? = options[:discard_incomplete_tool_calls]
+
+      def validate_cleanup_options
+        return unless discard_incomplete_tool_calls?
+        return if copy_mode? && options[:phase].in?([nil, 'finish'])
+
+        raise Thor::Error, 'Discard incomplete tool calls only with --mode copy and the finish phase'
+      end
 
       def copy_upgrade_settings
         {

data/lib/generators/ruby_llm/upgrade/upgrade_migration.rb

@@ -248,7 +248,8 @@ module RubyLLM
         calls = records(:ruby_llm_tool_calls).where(message_type: configuration.fetch('message_class'), result_id: nil)
         return unless calls.exists?
 
-        raise 'Finish pending tool calls and approvals before switching versions'
+        raise 'Finish pending tool calls and approvals before switching versions. ' \
+              'For abandoned legacy calls, see https://rubyllm.com/upgrading/#incomplete-tool-calls'
       end
 
       def reconcile

data/lib/ruby_llm/active_record/attachment_helpers.rb

@@ -58,18 +58,96 @@ module RubyLLM
       end
 
       def plain_text_content(content_value)
+        return action_text_plain_text(content_value) if action_text_content?(content_value)
         return content_value.to_plain_text if content_value.respond_to?(:to_plain_text)
 
         content_value
       end
 
       def action_text_attachment_sources(content_value)
-        return [] unless content_value.respond_to?(:body)
+        return [] unless action_text_content?(content_value)
 
+        action_text_attachables(content_value).flat_map do |attachable|
+          action_text_attachable_sources(attachable)
+        end.compact
+      end
+
+      def action_text_content?(content_value)
+        content_value.respond_to?(:body) && action_text_body?(content_value.body)
+      end
+
+      def preload_action_text_embeds(messages)
+        return unless defined?(ActionText::Attachment)
+
+        rich_texts = messages.filter_map do |message|
+          rich_text = message.rich_text_content
+          body = rich_text&.body
+          rich_text if action_text_body?(body) && action_text_embeds?(body)
+        end
+        return if rich_texts.empty?
+
+        ::ActiveRecord::Associations::Preloader.new(
+          records: rich_texts,
+          associations: { embeds_attachments: :blob }
+        ).call
+      end
+
+      def action_text_embeds?(body)
+        body.fragment.find_all(ActionText::Attachment.tag_name).any? { |node| action_text_blob_id(node) }
+      end
+
+      def action_text_body?(body)
+        defined?(ActionText::Attachment) && body.respond_to?(:fragment) && body.respond_to?(:attachables) &&
+          body.respond_to?(:sanitize_content_attachment)
+      end
+
+      def action_text_plain_text(content_value)
+        body = content_value.body
+        preloaded_blobs = action_text_preloaded_blobs(content_value).index_by { |blob| blob.id.to_s }
+        rendered = body.fragment.replace(ActionText::Attachment.tag_name) do |node|
+          if node.key?('content')
+            sanitized_content = body.sanitize_content_attachment(node.remove_attribute('content').to_s)
+            node['content'] = sanitized_content if sanitized_content.present?
+          end
+
+          attachable = action_text_attachable_for_node(node, preloaded_blobs)
+          ActionText::Attachment.from_node(node, attachable).to_plain_text
+        end
+
+        ActionText::Content.new(rendered, canonicalize: false).fragment.to_plain_text
+      end
+
+      def action_text_attachables(content_value)
         body = content_value.body
-        return [] unless body.respond_to?(:attachables)
+        preloaded_blobs = action_text_preloaded_blobs(content_value).index_by { |blob| blob.id.to_s }
+        body.fragment.find_all(ActionText::Attachment.tag_name).map do |node|
+          action_text_attachable_for_node(node, preloaded_blobs)
+        end
+      end
 
-        body.attachables.flat_map { |attachable| action_text_attachable_sources(attachable) }.compact
+      def action_text_attachable_for_node(node, preloaded_blobs)
+        preloaded_blobs[action_text_blob_id(node)] || ActionText::Attachable.from_node(node)
+      end
+
+      def action_text_blob_id(node)
+        sgid = node['sgid']
+        gid = SignedGlobalID.parse(sgid, for: ActionText::Attachable::LOCATOR_NAME) if sgid
+        return unless gid && gid.app == GlobalID.app && gid.model_name == ActiveStorage::Blob.name
+
+        gid.model_id.to_s
+      end
+
+      def action_text_preloaded_blobs(content_value)
+        return [] unless content_value.class.respond_to?(:reflect_on_association) &&
+                         content_value.class.reflect_on_association(:embeds_attachments)
+
+        association = content_value.association(:embeds_attachments)
+        return [] unless association.loaded?
+
+        content_value.embeds_attachments.filter_map do |attachment|
+          blob_association = attachment.association(:blob)
+          blob_association.target if blob_association.loaded?
+        end
       end
 
       def action_text_attachable_sources(attachable)

data/lib/ruby_llm/active_record/chat_methods.rb

@@ -212,7 +212,7 @@ module RubyLLM
       # RubyLLM::Chat. Each behaves exactly as documented on RubyLLM::Chat,
       # then returns the record so calls chain.
       CHAINABLE_CHAT_DELEGATES = %i[
-        with_tools with_tool_options with_server_tools with_fallbacks with_temperature
+        with_tools with_tool_options with_provider_tools with_fallbacks with_temperature
         with_max_output_tokens with_thinking with_citations with_caching
         with_end_user with_compaction
         with_provider_options with_headers with_schema
@@ -233,10 +233,10 @@ module RubyLLM
       # Applies Chat#with_tool_options and returns this record.
 
       ##
-      # :method: with_server_tools
-      # :call-seq: with_server_tools(*tools, **tools_with_options)
+      # :method: with_provider_tools
+      # :call-seq: with_provider_tools(*tools, **tools_with_options)
       #
-      # Applies Chat#with_server_tools and returns this record.
+      # Applies Chat#with_provider_tools and returns this record.
 
       ##
       # :method: with_fallbacks
@@ -407,10 +407,10 @@ module RubyLLM
       # Delegates to Chat#schema. See that method for arguments and return values.
 
       ##
-      # :method: server_tools
-      # :call-seq: server_tools
+      # :method: provider_tools
+      # :call-seq: provider_tools
       #
-      # Delegates to Chat#server_tools. See that method for arguments and return values.
+      # Delegates to Chat#provider_tools. See that method for arguments and return values.
 
       ##
       # :method: temperature
@@ -449,7 +449,7 @@ module RubyLLM
 
       PASSTHROUGH_CHAT_DELEGATES = %i[
         caching citations compaction concurrency end_user fallbacks headers max_output_tokens provider_options
-        schema server_tools temperature thinking tool_options tools
+        schema provider_tools temperature thinking tool_options tools
         add_completion count_tokens each render
       ].freeze
 
@@ -778,8 +778,11 @@ module RubyLLM
 
         associations = %i[ruby_llm_tool_calls ruby_llm_parent_tool_call ruby_llm_usages]
         associations << { attachments_attachments: :blob } if attachment_association?(assoc.klass)
+        rich_text_reflection = assoc.klass.reflect_on_association(:rich_text_content)
+        associations << :rich_text_content if rich_text_reflection
 
         ::ActiveRecord::Associations::Preloader.new(records: messages, associations: associations).call
+        preload_action_text_embeds(messages) if rich_text_reflection
         messages
       end
 

data/lib/ruby_llm/agent.rb

@@ -44,7 +44,7 @@ module RubyLLM
     DUPED_INHERITED_CONFIG = {
       :@chat_kwargs => {},
       :@tools => [],
-      :@server_tools => [],
+      :@provider_tools => [],
       :@tool_options => {},
       :@caching => nil,
       :@compaction => nil,
@@ -66,7 +66,7 @@ module RubyLLM
 
     # Chat methods that return the wrapped chat so calls can be chained there.
     CHAINABLE_CHAT_DELEGATES = %i[
-      with_instructions with_tools with_server_tools with_tool_options with_model
+      with_instructions with_tools with_provider_tools with_tool_options with_model
       with_temperature with_max_output_tokens with_thinking with_citations
       with_end_user with_compaction with_caching with_context with_provider_options
       with_headers with_schema with_fallbacks
@@ -77,7 +77,7 @@ module RubyLLM
 
     # Chat values and operations whose return values pass through unchanged.
     PASSTHROUGH_CHAT_DELEGATES = %i[
-      model provider messages tools server_tools tool_options provider_options headers schema concurrency
+      model provider messages tools provider_tools tool_options provider_options headers schema concurrency
       caching citations compaction context end_user fallbacks thinking temperature max_output_tokens
       each complete? cancelled? awaiting_approval? pending_approvals
       add_message add_completion tokens cost render
@@ -150,17 +150,17 @@ module RubyLLM
       end
 
       # Enables provider-executed tools for chats this agent builds, applied
-      # via Chat#with_server_tools. Accepts the same aliases, options, and
+      # via Chat#with_provider_tools. Accepts the same aliases, options, and
       # raw Hashes; a block defers evaluation until the chat is built.
       # Called with no arguments, returns the declared entries.
       #
-      #   server_tools :web_search
-      #   server_tools web_search: { allowed_domains: ["ruby-lang.org"] }
+      #   provider_tools :web_search
+      #   provider_tools web_search: { allowed_domains: ["ruby-lang.org"] }
       #
-      def server_tools(*tools, **tools_with_options, &block)
-        return @server_tools || [] if tools.empty? && tools_with_options.empty? && !block_given?
+      def provider_tools(*tools, **tools_with_options, &block)
+        return @provider_tools || [] if tools.empty? && tools_with_options.empty? && !block_given?
 
-        @server_tools = block_given? ? block : RubyLLM::Tools::ServerTools.normalize(tools, tools_with_options)
+        @provider_tools = block_given? ? block : RubyLLM::Tools::ProviderTools.normalize(tools, tools_with_options)
       end
 
       # Adds system instructions for chats this agent builds. Accepts a string,
@@ -667,8 +667,8 @@ module RubyLLM
         options = evaluate(tool_options, runtime)
         chat.with_tool_options(**options) if options && !options.empty?
 
-        server_tools_to_apply = Array(evaluate(server_tools, runtime)).compact
-        chat.with_server_tools(*server_tools_to_apply) if server_tools_to_apply.any?
+        provider_tools_to_apply = Array(evaluate(provider_tools, runtime)).compact
+        chat.with_provider_tools(*provider_tools_to_apply) if provider_tools_to_apply.any?
       end
 
       def apply_passthrough_options(chat)
@@ -873,10 +873,10 @@ module RubyLLM
     # Delegates to Chat#with_tools. See that method for arguments and return values.
 
     ##
-    # :method: with_server_tools
-    # :call-seq: with_server_tools(*tools, **tools_with_options)
+    # :method: with_provider_tools
+    # :call-seq: with_provider_tools(*tools, **tools_with_options)
     #
-    # Delegates to Chat#with_server_tools. See that method for arguments and return values.
+    # Delegates to Chat#with_provider_tools. See that method for arguments and return values.
 
     ##
     # :method: with_tool_options
@@ -1053,10 +1053,10 @@ module RubyLLM
     # Delegates to Chat#tools. See that method for arguments and return values.
 
     ##
-    # :method: server_tools
-    # :call-seq: server_tools
+    # :method: provider_tools
+    # :call-seq: provider_tools
     #
-    # Delegates to Chat#server_tools. See that method for arguments and return values.
+    # Delegates to Chat#provider_tools. See that method for arguments and return values.
 
     ##
     # :method: tool_options