ruby_llm 2.1.1 → 2.2.0

data/lib/generators/ruby_llm/chat_ui/templates/test/system/chats_test.rb.tt

@@ -0,0 +1,240 @@
+require "application_system_test_case"
+require "ruby_llm/test_helper"
+
+class <%= chat_controller_class_name.delete_suffix("Controller") %>Test < ApplicationSystemTestCase
+  include RubyLLM::TestHelper
+
+  driven_by :selenium, using: :headless_chrome
+
+  setup do
+    @queue_adapter = <%= chat_job_class_name %>.queue_adapter
+    <%= chat_job_class_name %>.queue_adapter = :async
+  end
+
+  teardown { <%= chat_job_class_name %>.queue_adapter = @queue_adapter }
+
+  class BookFlight < RubyLLM::Tool
+    description "Books a flight"
+    parameter :destination, description: "The city to fly to"
+    requires_approval
+
+    def execute(destination:)
+      "Booked a #{ask("Window or aisle?", choices: %w[window aisle])} seat to #{destination}"
+    end
+  end
+
+  test "streaming a reply and showing its cost" do
+    stub_replies "Hello from the model", cost: 0.01
+
+    start_chat
+
+    assert_text "Hello from the model"
+    assert_text "$0.0100"
+  end
+
+  test "stopping a reply keeps what it showed" do
+    stub_replies (1..200).map { |word| "word#{word}" }.join(" "), interval: 0.05
+
+    start_chat
+    assert_text "word1"
+    click_on "Stop"
+
+    assert_no_selector "[data-streaming]", wait: 5
+    assert_no_button "Stop"
+    assert_text "word1"
+    assert_no_text "word200"
+  end
+
+  test "answering a message sent right after a reply" do
+    stub_replies "First reply", "Second reply"
+
+    start_chat
+    assert_text "First reply"
+    fill_in "<%= message_variable_name %>[content]", with: "And another thing"
+    click_on "Send <%= message_table_name.singularize.humanize.downcase %>"
+
+    assert_text "Second reply", wait: 5
+  end
+
+  test "answering a message sent right after Stop" do
+    stub_replies (1..200).map { |word| "word#{word}" }.join(" "), "Answered after stopping", interval: 0.05
+
+    start_chat
+    assert_text "word1"
+    click_on "Stop"
+    fill_in "<%= message_variable_name %>[content]", with: "One more thing"
+    click_on "Send <%= message_table_name.singularize.humanize.downcase %>"
+
+    assert_text "Answered after stopping", wait: 5
+  end
+
+  test "keeping what a person is typing when the page refreshes" do
+    stub_replies "Hello"
+
+    start_chat
+    assert_text "Hello"
+    fill_in "<%= message_variable_name %>[content]", with: "Half a thought"
+    refresh_page
+
+    assert_field "<%= message_variable_name %>[content]", with: "Half a thought"
+
+    fill_in "<%= message_variable_name %>[content]", with: "For this chat only"
+    start_chat
+    assert_field "<%= message_variable_name %>[content]", with: ""
+  end
+
+  test "keeping every field a person changed when the page refreshes, and sending them" do
+    sent = []
+    subscriber = ActiveSupport::Notifications.subscribe("start_processing.action_controller") do |event|
+      sent << event.payload[:params] if event.payload[:controller] == "<%= message_controller_class_name %>"
+    end
+    stub_replies "Hello", "Noted"
+
+    with_extra_message_fields do
+      start_chat
+      choose "Length B"
+      assert_text "Hello"
+      assert_select "History", options: [ "2 messages" ]
+      assert_checked_field "Length B"
+      select "Formal", from: "Tone"
+      fill_in "Note", with: "Keep it short"
+      refresh_page
+
+      assert_equal "Formal", find_field("Tone").value
+      assert_field "Note", with: "Keep it short"
+
+      fill_in "<%= message_variable_name %>[content]", with: "Thanks"
+      click_on "Send <%= message_table_name.singularize.humanize.downcase %>"
+      assert_text "Noted"
+      assert_equal "Casual", find_field("Tone").value
+      assert_field "Note", with: ""
+    end
+
+    assert_equal({ "tone" => "Formal", "note" => "Keep it short", "length" => "b" },
+      sent.last["<%= message_variable_name %>"].slice("tone", "note", "length"))
+  ensure
+    ActiveSupport::Notifications.unsubscribe(subscriber)
+  end
+
+  test "switching the model mid-conversation" do
+    stub_replies "Hello", "Hello again"
+    default = RubyLLM.models.find(RubyLLM.config.default_model)
+    model = RubyLLM.models.chat_models.by_provider(default.provider).all.find { |candidate| candidate.id != default.id }
+    choice = "#{model.provider}:#{model.id}"
+
+    start_chat
+    assert_text "Hello"
+    find_field("Select AI model:").find("option[value='#{choice}']").select_option
+    refresh_page
+    assert_equal choice, find_field("Select AI model:").value
+
+    fill_in "<%= message_variable_name %>[content]", with: "And now?"
+    click_on "Send <%= message_table_name.singularize.humanize.downcase %>"
+    assert_text "Hello again"
+    visit current_path
+
+    assert_equal choice, find_field("Select AI model:").value
+    replies = <%= chat_model_name %>.last.<%= message_table_name %>.where(role: "assistant")
+    assert_equal [ default.id, model.id ], replies.map(&:model_id)
+  end
+
+  test "showing a sent message before its reply starts" do
+    stub_replies "Hello"
+    <%= chat_job_class_name %>.queue_adapter = :test
+
+    start_chat
+    fill_in "<%= message_variable_name %>[content]", with: "Are you there?"
+    click_on "Send <%= message_table_name.singularize.humanize.downcase %>"
+
+    assert_text "Are you there?"
+    assert_field "<%= message_variable_name %>[content]", with: ""
+  end
+
+  test "showing an error when a reply fails, until the next reply starts" do
+    stub_replies RubyLLM::ServerError.new("The provider is down"), "Back again"
+
+    start_chat
+    assert_text "The reply failed", wait: 5
+    assert_no_text "Thinking…"
+
+    visit current_path
+    assert_text "The reply failed"
+
+    fill_in "<%= message_variable_name %>[content]", with: "Try again"
+    click_on "Send <%= message_table_name.singularize.humanize.downcase %>"
+    assert_text "Back again"
+    assert_no_text "The reply failed"
+  end
+
+  test "answering an approval and the question a tool asks" do
+    stub_replies tool_call(BookFlight.tool_name, destination: "Lisbon"), "Your flight is booked."
+
+    with_tools BookFlight do
+      start_chat
+      assert_text "Lisbon"
+      click_on "Approve"
+      assert_text "Window or aisle?", wait: 5
+      click_on "window"
+
+      assert_text "Booked a window seat to Lisbon", wait: 5
+      assert_text "Your flight is booked."
+    end
+  end
+
+  test "saying so when the model returns no reply" do
+    stub_replies ""
+
+    start_chat
+
+    assert_text "The model returned no reply"
+  end
+
+  private
+
+  def refresh_page
+    find("h1").click
+    page.execute_script("Turbo.visit(location.href, { action: 'replace' })")
+    assert_no_selector "html[aria-busy]"
+  end
+
+  # Renders the message form with two fields of the app's own, as a model
+  # picker or an option would add.
+  def with_extra_message_fields
+    views = Rails.root.join("tmp/system_test_views")
+    form = Rails.root.join("app/views/<%= message_model_name.underscore.pluralize %>/_form.html.erb").read
+    fields = <<~'ERB'
+      <%%= label_tag :<%= message_variable_name %>_tone, "Tone" %>
+      <%%= select_tag "<%= message_variable_name %>[tone]", options_for_select(%w[Casual Formal]) %>
+      <%%= label_tag :<%= message_variable_name %>_note, "Note" %>
+      <%%= text_field_tag "<%= message_variable_name %>[note]" %>
+      <%%= label_tag :<%= message_variable_name %>_history, "History" %>
+      <%%= select_tag "<%= message_variable_name %>[history]", options_for_select(["#{<%= chat_variable_name %>.<%= message_table_name %>.count} messages"]) %>
+      <%% %w[a b c].each do |length| %>
+        <%%= radio_button_tag "<%= message_variable_name %>[length]", length, length == (<%= chat_variable_name %>.<%= message_table_name %>.count == 1 ? "a" : "c") %>
+        <%%= label_tag "<%= message_variable_name %>_length_#{length}", "Length #{length.upcase}" %>
+      <%% end %>
+    ERB
+    views.join("<%= message_model_name.underscore.pluralize %>").mkpath
+    views.join("<%= message_model_name.underscore.pluralize %>/_form.html.erb").write(form.sub(/do \|form\| %>\n/) { |line| line + fields })
+    original = ApplicationController.view_paths
+    ApplicationController.prepend_view_path(views)
+    yield
+  ensure
+    ApplicationController.view_paths = original if original
+  end
+
+  # Gives the chat agent +tools+ while the block runs.
+  def with_tools(*tools)
+    declared = <%= chat_agent_class_name %>.tools
+    <%= chat_agent_class_name %>.tools(*tools)
+    yield
+  ensure
+    declared.is_a?(Proc) ? <%= chat_agent_class_name %>.tools(&declared) : <%= chat_agent_class_name %>.tools(declared)
+  end
+
+  def start_chat
+    visit new_<%= chat_variable_name %>_path
+    fill_in "<%= chat_variable_name %>_prompt", with: "Hi"
+    click_on "Start new <%= chat_table_name.singularize.humanize.downcase %>"
+  end
+end

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

@@ -0,0 +1,6 @@
+<%%= turbo_stream.replace "<%= chat_variable_name %>_#{@<%= chat_variable_name %>.id}_questions",
+  partial: "<%= chat_model_name.underscore.pluralize %>/questions",
+  locals: { <%= chat_model_name.demodulize.underscore %>: @<%= chat_variable_name %> } %>
+<%% unless @<%= chat_variable_name %>.pending_questions.any? %>
+  <%%= turbo_stream.update "new_<%= message_variable_name %>", "Continuing the conversation." %>
+<%% end %>

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

@@ -0,0 +1,15 @@
+<%%# The files every store of the chat sees. Files a store wrote for an owner stay theirs: add them with .or(...where(owner: Current.user)). %>
+<%% files = <%= chat_model_name.demodulize.underscore %>.ruby_llm_chat_files.where(owner_id: nil).with_attached_file %>
+<%% if files.any? %>
+  <section id="<%= chat_variable_name %>_<%%= <%= chat_model_name.demodulize.underscore %>.id %>_files">
+    <h2>Files</h2>
+    <ul>
+      <%% files.each do |file| %>
+        <li>
+          <%%= link_to file.path, rails_blob_path(file.file, disposition: "attachment") %>
+          (<%%= number_to_human_size(file.byte_size) %>)
+        </li>
+      <%% end %>
+    </ul>
+  </section>
+<%% end %>

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

@@ -11,18 +11,16 @@
     </div>
   <%% end %>
 
-  <div>
-    <%%= form.label :model, "Select AI model:", style: "display: block" %>
-    <%%= form.select :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>
+  <%%= render "<%= chat_model_name.underscore.pluralize %>/model_select", form: form, selected: @selected_model %>
 
   <div style="margin-top: 15px;">
     <%%= form.text_field :prompt, style: "width: 100%; max-width: 600px;", placeholder: "What would you like to discuss?", autofocus: true %>
   </div>
 
+  <div>
+    <%%= form.file_field :attachments, multiple: true %>
+  </div>
+
   <div>
     <%%= form.submit "Start new <%= chat_table_name.singularize.humanize.downcase %>" %>
   </div>

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

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

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

@@ -0,0 +1,13 @@
+<%% questions = <%= chat_model_name.demodulize.underscore %>.pending_questions %>
+<div id="<%= chat_variable_name %>_<%%= <%= chat_model_name.demodulize.underscore %>.id %>_questions">
+  <%% if questions.any?(&:approval?) %>
+    <style>
+      <%% questions.select(&:approval?).each do |question| %>
+        [id="<%= message_variable_name %>_tool_call_<%%= question.tool_call.id %>"] { display: none; }
+      <%% end %>
+    </style>
+  <%% end %>
+  <%% questions.each do |question| %>
+    <%%= render "<%= question_view_path %>/question", question: question, <%= chat_model_name.demodulize.underscore %>: <%= chat_model_name.demodulize.underscore %> %>
+  <%% end %>
+</div>

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

@@ -2,7 +2,8 @@
   <p style="color: green"><%%= notice %></p>
 <%% end %>
 
-<%%= turbo_stream_from "<%= chat_variable_name %>_#{@<%= chat_variable_name %>.id}" %>
+<%% turbo_refreshes_with method: :morph, scroll: :preserve %>
+<%%= turbo_stream_from @<%= chat_variable_name %>, data: { chat_stream: true } %>
 
 <%% content_for :title, "<%= chat_model_name %>" %>
 
@@ -10,14 +11,39 @@
 
 <p>Using <strong><%%= @<%= chat_variable_name %>.model&.label || default_model_display_name %></strong></p>
 
+<%% if @<%= chat_variable_name %>.cost.total&.positive? %>
+  <p>Cost so far: <%%= cost_label(@<%= chat_variable_name %>.cost) %></p>
+<%% end %>
+
 <div id="<%= message_table_name %>">
-  <%% @<%= chat_variable_name %>.<%= message_table_name %>.each do |<%= message_variable_name %>| %>
+  <%% @<%= chat_variable_name %>.<%= message_table_name %>.includes(:ruby_llm_usages).each do |<%= message_variable_name %>| %>
     <%%= render <%= message_variable_name %> %>
   <%% end %>
 </div>
 
+<div id="queued_<%= message_table_name %>">
+  <%% @<%= chat_variable_name %>.queued_messages.each do |queued_message| %>
+    <%%= render "<%= message_model_name.underscore.pluralize %>/queued_message",
+      queued_message: queued_message, <%= chat_model_name.demodulize.underscore %>: @<%= chat_variable_name %> %>
+  <%% end %>
+</div>
+
+<%%= render "<%= chat_model_name.underscore.pluralize %>/questions", <%= chat_model_name.demodulize.underscore %>: @<%= chat_variable_name %> %>
+
+<%%= render "<%= chat_model_name.underscore.pluralize %>/files", <%= chat_model_name.demodulize.underscore %>: @<%= chat_variable_name %> %>
+
+<%% if @<%= chat_variable_name %>.reply_error.present? %>
+  <p id="reply_error" style="color: red"><%%= @<%= chat_variable_name %>.reply_error %></p>
+<%% end %>
+
+<%% if @<%= chat_variable_name %>.running? %>
+  <%%= button_to "Stop", cancel_<%= chat_variable_name %>_path(@<%= chat_variable_name %>) %>
+<%% end %>
+
 <div style="margin-top: 30px;">
-  <%%= render "<%= message_model_name.underscore.pluralize %>/form", <%= chat_variable_name %>: @<%= chat_variable_name %>, <%= message_variable_name %>: @<%= message_variable_name %> %>
+  <%%= turbo_frame_tag "<%= message_variable_name %>_form" do %>
+    <%%= render "<%= message_model_name.underscore.pluralize %>/form", <%= chat_variable_name %>: @<%= chat_variable_name %>, <%= message_variable_name %>: @<%= message_variable_name %> %>
+  <%% end %>
 </div>
 
 <div style="margin-top: 20px;">

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

@@ -1,9 +1,23 @@
 <%% assistant ||= local_assigns[:<%= message_model_name.demodulize.underscore %>] %>
-<div id="<%= message_variable_name %>_<%%= assistant.id %>" class="<%= message_variable_name %>"
+<%% streaming = assistant.content.blank? && assistant.<%= chat_table_name.singularize %>.running? %>
+<div id="<%%= dom_id(assistant, (:text if local_assigns[:nested])) %>" class="<%= message_variable_name %>"<%%= " data-streaming" if streaming %>
+     data-controller="chat-message" data-action="turbo:morph-element->chat-message#restore"
      style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #28a745;">
   <div style="font-weight: bold; margin-bottom: 5px;">Assistant</div>
-  <div id="<%= message_variable_name %>_<%%= assistant.id %>_content" style="white-space: pre-wrap;"><%%= assistant.content %></div>
+  <div id="<%%= dom_id(assistant) %>_<%%= streaming ? "stream" : "content" %>" data-chat-message-target="source" style="white-space: pre-wrap;"><%%= assistant.content %></div>
+  <%% if streaming %>
+    <div class="thinking" style="color: #666;">Thinking…</div>
+    <style>#<%%= dom_id(assistant) %>_stream:not(:empty) ~ .thinking { display: none; }</style>
+  <%% end %>
+  <div data-chat-message-target="output"></div>
+  <%% if assistant.content.blank? && !streaming && assistant.tool_calls.none? && !assistant.attachments.attached? %>
+    <p style="color: #666;">The model returned no reply.</p>
+  <%% end %>
+  <%%= render "<%= message_model_name.underscore.pluralize %>/attachments", message: assistant %>
   <div style="font-size: 0.85em; color: #666; margin-top: 5px;">
     <%%= assistant.created_at&.strftime("%I:%M %p") %>
+    <%% if assistant.cost.total&.positive? %>
+      · <%%= cost_label(assistant.cost) %>
+    <%% end %>
   </div>
 </div>

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

@@ -0,0 +1,14 @@
+<%% if message.respond_to?(:attachments) && message.attachments.attached? %>
+  <div style="display: flex; flex-wrap: wrap; gap: 10px; margin-top: 10px;">
+    <%% message.attachments.each do |attachment| %>
+      <%% if ActiveStorage.web_image_content_types.include?(attachment.content_type) %>
+        <%%= link_to image_tag(attachment, alt: attachment.filename.to_s, style: "display: block; max-width: 100%; max-height: 320px;"), rails_blob_path(attachment) %>
+      <%% else %>
+        <div>
+          <%%= link_to attachment.filename.to_s, rails_blob_path(attachment, disposition: "attachment") %>
+          (<%%= number_to_human_size(attachment.byte_size) %>)
+        </div>
+      <%% end %>
+    <%% end %>
+  </div>
+<%% end %>

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

@@ -1,4 +1,4 @@
-<div id="<%= message_variable_name %>_<%%= <%= message_model_name.demodulize.underscore %>.id %>" class="<%= message_variable_name %>"
+<div id="<%%= dom_id(<%= message_model_name.demodulize.underscore %>) %>" class="<%= message_variable_name %>"
      style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #dc2626; background: #fef2f2;">
   <div style="font-weight: bold; margin-bottom: 5px; color: #b91c1c;"><%%= title.presence || "Error" %></div>
   <pre style="white-space: pre-wrap; margin: 0; color: #7f1d1d;"><%%= error_message %></pre>

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

@@ -1,21 +1,31 @@
-<%%= form_with(model: <%= message_variable_name %>, url: <%= chat_model_name.include?('::') ? "#{chat_model_name.split('::').first.underscore}_#{chat_model_name.demodulize.underscore}_#{message_model_name.demodulize.underscore.pluralize}_path(@#{chat_variable_name})" : "[@#{chat_variable_name}, #{message_variable_name}]" %>, id: "new_<%= message_variable_name %>") do |form| %>
-  <%% if <%= message_variable_name %>.errors.any? %>
-    <div style="color: red">
-      <h2><%%= pluralize(<%= message_variable_name %>.errors.count, "error") %> prohibited this <%= message_table_name.singularize.humanize.downcase %> from being saved:</h2>
+<%% if <%= chat_variable_name %>.pending_questions.any? %>
+  <p id="new_<%= message_variable_name %>" style="margin: 0;">Answer the questions above to continue.</p>
+<%% else %>
+  <%%= form_with(model: <%= message_variable_name %>, url: <%= chat_model_name.include?('::') ? "#{chat_variable_name}_#{message_model_name.demodulize.underscore.pluralize}_path(#{chat_variable_name})" : "[#{chat_variable_name}, #{message_variable_name}]" %>, id: "new_<%= message_variable_name %>", data: { chat_draft: true }) do |form| %>
+    <%% if <%= message_variable_name %>.errors.any? %>
+      <div style="color: red">
+        <h2><%%= pluralize(<%= message_variable_name %>.errors.count, "error") %> prohibited this <%= message_table_name.singularize.humanize.downcase %> from being saved:</h2>
 
-      <ul>
-        <%% <%= message_variable_name %>.errors.each do |error| %>
-          <li><%%= error.full_message %></li>
-        <%% end %>
-      </ul>
+        <ul>
+          <%% <%= message_variable_name %>.errors.each do |error| %>
+            <li><%%= error.full_message %></li>
+          <%% end %>
+        </ul>
+      </div>
+    <%% end %>
+
+    <%%= render "<%= chat_model_name.underscore.pluralize %>/model_select", form: form, selected: [ <%= chat_variable_name %>.provider, <%= chat_variable_name %>.model_id ].compact.join(":") %>
+
+    <div>
+      <%%= form.text_field :content, style: "width: 100%; max-width: 600px;", placeholder: "Message...", autofocus: true %>
     </div>
-  <%% end %>
 
-  <div>
-    <%%= form.text_field :content, style: "width: 100%; max-width: 600px;", placeholder: "Message...", autofocus: true %>
-  </div>
+    <div>
+      <%%= form.file_field :attachments, multiple: true %>
+    </div>
 
-  <div>
-    <%%= form.submit "Send <%= message_table_name.singularize.humanize.downcase %>" %>
-  </div>
+    <div>
+      <%%= form.submit "Send <%= message_table_name.singularize.humanize.downcase %>" %>
+    </div>
+  <%% end %>
 <%% end %>

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

@@ -0,0 +1,8 @@
+<div id="queued_message_<%%= queued_message.id %>" class="queued-<%= message_variable_name %>"
+     style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #007bff; opacity: 0.6;">
+  <div style="font-weight: bold; margin-bottom: 5px;">User <span style="font-weight: normal; color: #666;">(queued)</span></div>
+  <div style="white-space: pre-wrap;"><%%= queued_message.content %></div>
+  <%%= render "<%= message_model_name.underscore.pluralize %>/attachments", message: queued_message %>
+  <%%= button_to "Cancel", <%= chat_variable_name %>_queued_message_path(<%= chat_model_name.demodulize.underscore %>, queued_message),
+    method: :delete, form: { style: "display: inline-block; margin-top: 5px;" } %>
+</div>

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

@@ -1,5 +1,5 @@
 <%% system ||= local_assigns[:<%= message_model_name.demodulize.underscore %>] %>
-<div id="<%= message_variable_name %>_<%%= system.id %>" class="<%= message_variable_name %>"
+<div id="<%%= dom_id(system) %>" 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>
   <div style="white-space: pre-wrap; color: #4b5563;"><%%= system.content %></div>

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

@@ -1,5 +1,8 @@
 <%% message = local_assigns[:<%= message_model_name.demodulize.underscore %>] || tool_calls %>
-<div id="<%= message_variable_name %>_<%%= message.id %>">
+<div id="<%%= dom_id(message) %>">
+  <%% if message.content.present? %>
+    <%%= render "<%= message_model_name.underscore.pluralize %>/assistant", assistant: message, nested: true %>
+  <%% end %>
   <%% message.<%= tool_call_variable_name.pluralize %>.each_value do |tool_call| %>
     <%%= render tool_call_partial(tool_call), message: message, tool_call: tool_call %>
   <%% end %>

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

@@ -1,8 +1,9 @@
 <%% user ||= local_assigns[:<%= message_model_name.demodulize.underscore %>] %>
-<div id="<%= message_variable_name %>_<%%= user.id %>" class="<%= message_variable_name %>"
+<div id="<%%= dom_id(user) %>" 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>
-  <div id="<%= message_variable_name %>_<%%= user.id %>_content" style="white-space: pre-wrap;"><%%= user.content %></div>
+  <div style="white-space: pre-wrap;"><%%= user.content %></div>
+  <%%= render "<%= message_model_name.underscore.pluralize %>/attachments", message: user %>
   <div style="font-size: 0.85em; color: #666; margin-top: 5px;">
     <%%= user.created_at&.strftime("%I:%M %p") %>
   </div>

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

@@ -3,3 +3,4 @@
     <%= chat_variable_name %>: @<%= chat_variable_name %>,
     <%= message_variable_name %>: @<%= chat_variable_name %>.<%= message_table_name %>.build %>
 <%% end %>
+<%%= turbo_stream.refresh request_id: nil %>

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

@@ -1,6 +1,6 @@
 <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>
+  <div style="font-weight: bold; margin-bottom: 5px;"><%%= tool_label(tool_call.name) %> 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;">
     <%%= message.created_at&.strftime("%I:%M %p") %>

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

@@ -5,10 +5,11 @@
     title: "Tool Result Error",
     error_message: error_message %>
 <%% else %>
-  <div id="<%= message_variable_name %>_<%%= tool.id %>" class="<%= message_variable_name %>"
+  <div id="<%%= dom_id(tool) %>" 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</div>
+    <div style="font-weight: bold; margin-bottom: 5px;"><%%= tool_result_label(tool) %> result</div>
     <pre style="white-space: pre-wrap; margin: 0;"><%%= tool.content.presence || "(no output)" %></pre>
+    <%%= render "<%= message_model_name.underscore.pluralize %>/attachments", message: tool %>
     <div style="font-size: 0.85em; color: #666; margin-top: 5px;">
       <%%= tool.created_at&.strftime("%I:%M %p") %>
     </div>

data/lib/generators/ruby_llm/chat_ui/templates/views/questions/_question.html.erb.tt

@@ -0,0 +1,78 @@
+<%% answers_path = <%= chat_variable_name %>_answers_path(<%= chat_model_name.demodulize.underscore %>) %>
+<%% card = "question_#{question.id.parameterize}" %>
+<%% single = question.fields.first if question.fields.one? %>
+<%% choices = single&.choices&.to_h { |choice| [choice, choice] } %>
+<%% choices = { "Yes" => true, "No" => false } if single&.type == "boolean" %>
+<%% steps = { "integer" => 1, "number" => "any" } %>
+<div id="<%%= card %>" class="question"
+     style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #d97706; background: #fffbeb;">
+  <%% if question.approval? %>
+    <%% arguments = question.tool_call.arguments %>
+    <%% sandbox = arguments["sandbox"].presence if question.tool_call.name == "run_code" %>
+    <div style="font-weight: bold; margin-bottom: 5px;">Approve <%%= question.tool_call.name %>?</div>
+    <%% if sandbox %>
+      <p style="margin: 0 0 5px;"><%%= arguments["reason"] %></p>
+      <pre style="white-space: pre-wrap; margin: 0 0 5px;"><%%= arguments["code"] %></pre>
+      <p style="margin: 0 0 10px;">Runs in the <strong><%%= sandbox %></strong> sandbox. <%%= <%= chat_model_name.demodulize.underscore %>.tools[:run_code]&.summary(sandbox) %></p>
+    <%% else %>
+      <dl style="margin: 0 0 10px;">
+        <%% arguments.each do |name, value| %>
+          <dt style="font-weight: bold; margin-top: 5px;"><%%= name.to_s.humanize %></dt>
+          <dd style="margin: 0;"><pre style="white-space: pre-wrap; margin: 0;"><%%= value.is_a?(String) ? value : value.to_json %></pre></dd>
+        <%% end %>
+      </dl>
+    <%% end %>
+    <%%= button_to "Approve", answers_path, params: { question_id: question.id }, form: { style: "display: inline-block;" } %>
+    <%%= button_to "Deny", answers_path, params: { question_id: question.id, decline: true }, form: { style: "display: inline-block;" } %>
+  <%% else %>
+    <div style="font-weight: bold; margin-bottom: 5px;"><%%= question.message %></div>
+    <%% if question.form? && !choices %>
+      <%%= form_with url: answers_path do |form| %>
+        <%%= form.hidden_field :question_id, value: question.id %>
+        <%% if question.fields.one? %>
+          <%%= form.text_field :answer, value: single.default, required: single.required?, id: "#{card}_answer",
+            type: steps.key?(single.type) ? "number" : "text", step: steps[single.type], "aria-label": question.message %>
+          <%% if single.description %>
+            <div style="margin: 5px 0; font-size: 0.875em; color: #6b7280;"><%%= single.description %></div>
+          <%% end %>
+        <%% else %>
+          <%% question.fields.each do |field| %>
+            <%% field_id = "#{card}_#{field.name.to_s.parameterize(separator: "_")}" %>
+            <%% caption = field.title || field.name.to_s.humanize %>
+            <%% list = field.type == "array" %>
+            <div style="margin-bottom: 10px;">
+              <%% if field.type == "boolean" %>
+                <%%= form.check_box "answer[#{field.name}]", { checked: field.default, id: field_id }, "true", "false" %>
+                <%%= label_tag field_id, caption %>
+              <%% else %>
+                <%%= label_tag field_id, caption, style: "display: block;" %>
+                <%% if field.choices %>
+                  <%%= form.select "answer[#{field.name}]", field.choices, { selected: field.default, include_blank: !field.required? && !list },
+                    id: field_id, multiple: list, required: list && field.required? %>
+                <%% else %>
+                  <%%= form.text_field "answer[#{field.name}]", value: field.default, required: field.required?, id: field_id,
+                    type: steps.key?(field.type) ? "number" : "text", step: steps[field.type] %>
+                <%% end %>
+              <%% end %>
+              <%% if field.description %>
+                <div style="font-size: 0.875em; color: #6b7280;"><%%= field.description %></div>
+              <%% end %>
+            </div>
+          <%% end %>
+        <%% end %>
+        <%%= form.submit "Send" %>
+        <%%= form.button "Decline", name: :decline, value: true, formnovalidate: true %>
+      <%% end %>
+    <%% else %>
+      <%% if question.url? %>
+        <p style="margin: 0 0 10px; overflow-wrap: anywhere;"><%%= link_to question.url, question.url, target: "_blank", rel: "noopener noreferrer" %></p>
+        <%%= button_to "Done", answers_path, params: { question_id: question.id }, form: { style: "display: inline-block;" } %>
+      <%% else %>
+        <%% choices.each do |label, value| %>
+          <%%= button_to label, answers_path, params: { question_id: question.id, answer: value }, form: { style: "display: inline-block;" } %>
+        <%% end %>
+      <%% end %>
+      <%%= button_to "Decline", answers_path, params: { question_id: question.id, decline: true }, form: { style: "display: inline-block;" } %>
+    <%% end %>
+  <%% end %>
+</div>