llm_meta_client 1.4.0 → 1.6.0

data/lib/generators/llm_meta_client/scaffold/templates/app/views/chats/create.turbo_stream.erb

@@ -28,6 +28,11 @@
   <%%= render partial: "chats/chat_sidebar", locals: { chat: @chat } %>
 <%% end %>
 
+<%% # Reveal/refresh the "New Chat" header button now that the chat has content %>
+<%%= turbo_stream.replace "new-chat-button-slot" do %>
+  <%%= render partial: "layouts/new_chat_button" %>
+<%% end %>
+
 <%% # Update history sidebar - replace entire content to ensure update %>
 <%% if @prompt_execution %>
   <%%= turbo_stream.replace "history-sidebar" do %>
@@ -66,6 +71,16 @@
           messageInput.focus();
         }
 
+        // Clear the image-preview box + file input now that the multipart
+        // form has been sent. Doing it in the JS submit handler would empty
+        // the file input before the browser serialized the POST body.
+        const imagePreview = document.querySelector('[data-chats-form-target="imagePreview"]');
+        if (imagePreview) imagePreview.style.display = 'none';
+        const imageThumbnail = document.querySelector('[data-chats-form-target="imageThumbnail"]');
+        if (imageThumbnail) imageThumbnail.src = '';
+        const imageInput = document.querySelector('[data-chats-form-target="imageInput"]');
+        if (imageInput) imageInput.value = '';
+
         // Update submit button state
         const form = document.querySelector('[data-controller="chats-form"]');
         if (form && messageInput) {
@@ -79,6 +94,22 @@
           branchField.value = '<%%= @prompt_execution&.execution_id %>';
         }
 
+        // Make this tab's chat identity URL-local so cross-tab navigation
+        // can't silently re-target subsequent prompts. After the first POST
+        // /chats, swap the URL bar to /chats/<uuid> and point the form at
+        // /chats/<uuid>/add_prompt for all subsequent prompts.
+        const chatUuid = '<%%= @chat&.uuid %>';
+        if (chatUuid) {
+          const desiredPath = `/chats/${chatUuid}`;
+          if (window.location.pathname !== desiredPath) {
+            history.replaceState({}, '', desiredPath);
+          }
+          const chatForm = document.querySelector('.chat-form');
+          if (chatForm) {
+            chatForm.action = `/chats/${chatUuid}/add_prompt`;
+          }
+        }
+
         // Scroll to bottom
         const chatMessages = document.getElementById('chat-messages');
         if (chatMessages) {

data/lib/generators/llm_meta_client/scaffold/templates/app/views/chats/destroy.turbo_stream.erb

@@ -0,0 +1,3 @@
+<%%= turbo_stream.replace "chat-sidebar" do %>
+  <%%= render partial: "chats/chat_sidebar", locals: { chat: nil } %>
+<%% end %>

data/lib/generators/llm_meta_client/scaffold/templates/app/views/chats/edit.html.erb

@@ -8,30 +8,33 @@
   </div>
 
   <div class="chat-input-container">
-    <%%= form_with url: chat_path(@chat), method: :patch, class: "chat-form", data: { controller: "chats-form llm-selector", guest: current_user.nil?, action: "submit->chats-form#submit llm-selector:changed->chats-form#updateSubmitButton" } do |f| %>
-      <%% if @llm_families.present? %>
-        <div class="llm-selector-wrapper">
-          <%%= render "shared/family_field", llm_families: @llm_families, stimulus_controller: "llm-selector" %>
-          <%%= render "shared/api_key_field", stimulus_controller: "llm-selector" %>
-          <%%= render "shared/model_field", stimulus_controller: "llm-selector" %>
-        </div>
-        <%% if user_signed_in? %>
-          <%%= render "shared/tool_selector_field", stimulus_controller: "tool-selector" %>
-        <%% end %>
-        <%%= render "shared/generation_settings_field", stimulus_controller: "generation-settings" %>
-      <%% end %>
+    <%%= form_with url: add_prompt_chat_path(@chat.uuid), method: :post, class: "chat-form", data: { controller: "chats-form model-picker", guest: current_user.nil?, action: "submit->chats-form#submit model-picker:changed->chats-form#updateSubmitButton dragover->chats-form#onDragOver dragleave->chats-form#onDragLeave drop->chats-form#onDrop" } do |f| %>
+      <div class="image-preview" data-chats-form-target="imagePreview" style="display: none;">
+        <img data-chats-form-target="imageThumbnail" alt="Attached image preview" />
+        <button type="button" class="image-clear-button" title="Remove image"
+                data-action="click->chats-form#clearImage">
+          <i class="bi bi-x-circle"></i>
+        </button>
+      </div>
       <div class="input-wrapper">
         <%%= f.text_area :message,
             placeholder: "Enter your message...",
             class: "chat-input",
-            rows: 3,
+            rows: 2,
             autofocus: true,
             required: true,
             id: "message-input",
-            data: { "chats-form-target": "prompt", action: "input->chats-form#updateSubmitButton" } %>
-      </div>
-      <%%= f.hidden_field :branch_from_uuid, value: @branch_from_uuid || params.dig(:chat, :branch_from_uuid) %>
-      <div class="button-wrapper">
+            data: { "chats-form-target": "prompt", action: "input->chats-form#updateSubmitButton keydown->chats-form#onPromptKeydown paste->chats-form#onPaste" } %>
+        <button type="button" class="attach-button" disabled
+                title="Attach image"
+                data-chats-form-target="attachButton"
+                data-action="click->chats-form#openImagePicker">
+          <i class="bi bi-paperclip"></i>
+        </button>
+        <%%= f.file_field :image, accept: "image/*",
+            data: { "chats-form-target": "imageInput",
+                    action: "change->chats-form#onImageSelected" },
+            style: "display: none;" %>
         <%%= f.button type: "submit",
             class: "send-button",
             disabled: true,
@@ -41,6 +44,39 @@
           <i class="bi bi-send-fill"></i>
         <%% end %>
       </div>
+      <%% if @llm_families.present? %>
+        <%%= render "shared/quick_picks", llm_families: @llm_families, stimulus_controller: "model-picker" %>
+
+        <%%# Pre-populate from the chat's most recent execution so the picker
+            opens on the model the chat was last using rather than the system
+            default. JS treats a non-blank `model` value as the initial pick. %>
+        <%%= hidden_field_tag :family, @prompt_execution&.llm_platform.to_s, data: { "model-picker-target": "family" } %>
+        <%%= hidden_field_tag :api_key_uuid, @prompt_execution&.llm_uuid.to_s, data: { "model-picker-target": "apiKey" } %>
+        <%%= hidden_field_tag :model, @prompt_execution&.model.to_s, data: { "model-picker-target": "model" }, required: true %>
+
+        <div class="input-controls" data-controller="input-controls">
+          <div class="input-controls-buttons">
+            <div class="llm-toggle-field" data-controller="llm-toggle">
+              <button type="button"
+                      class="llm-toggle-button"
+                      data-llm-toggle-target="toggleButton"
+                      data-action="click->llm-toggle#toggle">
+                <i class="bi bi-grid-3x3-gap"></i>
+                <span data-llm-toggle-target="label">Other models</span>
+                <i class="bi bi-chevron-up toggle-icon" data-llm-toggle-target="toggleIcon"></i>
+              </button>
+              <div class="llm-toggle-panel" data-llm-toggle-target="panel" style="display: none;">
+                <%%= render "shared/model_grid", llm_families: @llm_families, stimulus_controller: "model-picker" %>
+              </div>
+            </div>
+            <%% if user_signed_in? %>
+              <%%= render "shared/tool_selector_field", stimulus_controller: "tool-selector" %>
+            <%% end %>
+            <%%= render "shared/generation_settings_field", stimulus_controller: "generation-settings" %>
+          </div>
+        </div>
+      <%% end %>
+      <%%= f.hidden_field :branch_from_uuid, value: @branch_from_uuid || params.dig(:chat, :branch_from_uuid) %>
     <%% end %>
   </div>
 </div>

data/lib/generators/llm_meta_client/scaffold/templates/app/views/chats/new.html.erb

@@ -8,30 +8,33 @@
   </div>
 
   <div class="chat-input-container">
-    <%%= form_with url: chats_path, method: :post, class: "chat-form", data: { controller: "chats-form llm-selector", guest: current_user.nil?, action: "submit->chats-form#submit llm-selector:changed->chats-form#updateSubmitButton" } do |f| %>
-      <%% if @llm_families.present? %>
-        <div class="llm-selector-wrapper">
-          <%%= render "shared/family_field", llm_families: @llm_families, stimulus_controller: "llm-selector" %>
-          <%%= render "shared/api_key_field", stimulus_controller: "llm-selector" %>
-          <%%= render "shared/model_field", stimulus_controller: "llm-selector" %>
-        </div>
-        <%% if user_signed_in? %>
-          <%%= render "shared/tool_selector_field", stimulus_controller: "tool-selector" %>
-        <%% end %>
-        <%%= render "shared/generation_settings_field", stimulus_controller: "generation-settings" %>
-      <%% end %>
+    <%%= form_with url: chats_path, method: :post, class: "chat-form", data: { controller: "chats-form model-picker", guest: current_user.nil?, action: "submit->chats-form#submit model-picker:changed->chats-form#updateSubmitButton dragover->chats-form#onDragOver dragleave->chats-form#onDragLeave drop->chats-form#onDrop" } do |f| %>
+      <div class="image-preview" data-chats-form-target="imagePreview" style="display: none;">
+        <img data-chats-form-target="imageThumbnail" alt="Attached image preview" />
+        <button type="button" class="image-clear-button" title="Remove image"
+                data-action="click->chats-form#clearImage">
+          <i class="bi bi-x-circle"></i>
+        </button>
+      </div>
       <div class="input-wrapper">
         <%%= f.text_area :message,
             placeholder: "Enter your message...",
             class: "chat-input",
-            rows: 3,
+            rows: 2,
             autofocus: true,
             required: true,
             id: "message-input",
-            data: { "chats-form-target": "prompt", action: "input->chats-form#updateSubmitButton" } %>
-      </div>
-      <%%= f.hidden_field :branch_from_uuid, value: @branch_from_uuid || params.dig(:chat, :branch_from_uuid) %>
-      <div class="button-wrapper">
+            data: { "chats-form-target": "prompt", action: "input->chats-form#updateSubmitButton keydown->chats-form#onPromptKeydown paste->chats-form#onPaste" } %>
+        <button type="button" class="attach-button" disabled
+                title="Attach image"
+                data-chats-form-target="attachButton"
+                data-action="click->chats-form#openImagePicker">
+          <i class="bi bi-paperclip"></i>
+        </button>
+        <%%= f.file_field :image, accept: "image/*",
+            data: { "chats-form-target": "imageInput",
+                    action: "change->chats-form#onImageSelected" },
+            style: "display: none;" %>
         <%%= f.button type: "submit",
             class: "send-button",
             disabled: true,
@@ -41,6 +44,36 @@
           <i class="bi bi-send-fill"></i>
         <%% end %>
       </div>
+      <%% if @llm_families.present? %>
+        <%%= render "shared/quick_picks", llm_families: @llm_families, stimulus_controller: "model-picker" %>
+
+        <%%= hidden_field_tag :family, "", data: { "model-picker-target": "family" } %>
+        <%%= hidden_field_tag :api_key_uuid, "", data: { "model-picker-target": "apiKey" } %>
+        <%%= hidden_field_tag :model, "", data: { "model-picker-target": "model" }, required: true %>
+
+        <div class="input-controls" data-controller="input-controls">
+          <div class="input-controls-buttons">
+            <div class="llm-toggle-field" data-controller="llm-toggle">
+              <button type="button"
+                      class="llm-toggle-button"
+                      data-llm-toggle-target="toggleButton"
+                      data-action="click->llm-toggle#toggle">
+                <i class="bi bi-grid-3x3-gap"></i>
+                <span data-llm-toggle-target="label">Other models</span>
+                <i class="bi bi-chevron-up toggle-icon" data-llm-toggle-target="toggleIcon"></i>
+              </button>
+              <div class="llm-toggle-panel" data-llm-toggle-target="panel" style="display: none;">
+                <%%= render "shared/model_grid", llm_families: @llm_families, stimulus_controller: "model-picker" %>
+              </div>
+            </div>
+            <%% if user_signed_in? %>
+              <%%= render "shared/tool_selector_field", stimulus_controller: "tool-selector" %>
+            <%% end %>
+            <%%= render "shared/generation_settings_field", stimulus_controller: "generation-settings" %>
+          </div>
+        </div>
+      <%% end %>
+      <%%= f.hidden_field :branch_from_uuid, value: @branch_from_uuid || params.dig(:chat, :branch_from_uuid) %>
     <%% end %>
   </div>
 </div>

data/lib/generators/llm_meta_client/scaffold/templates/app/views/layouts/_header.html.erb

@@ -4,11 +4,7 @@
       <%%= link_to "LLM Meta Client", root_path %>
     </div>
     <div class="header-right">
-      <%% if @messages.present? %>
-        <%%= button_to start_new_chats_path, method: :post, class: "new-text-button" do %>
-          <i class="fa-solid fa-plus"></i> New Chat
-        <%% end %>
-      <%% end %>
+      <%%= render partial: "layouts/new_chat_button" %>
       <%% if user_signed_in? %>
         <div class="user-menu">
           <button popovertarget="user-menu-popover" class="user-menu-toggle" type="button">

data/lib/generators/llm_meta_client/scaffold/templates/app/views/layouts/_new_chat_button.html.erb

@@ -0,0 +1,7 @@
+<div id="new-chat-button-slot" class="new-chat-button-slot">
+  <%% if @messages.present? || @user_message.present? %>
+    <%%= button_to start_new_chats_path, method: :post, class: "new-text-button" do %>
+      <i class="fa-solid fa-plus"></i> New Chat
+    <%% end %>
+  <%% end %>
+</div>

data/lib/generators/llm_meta_client/scaffold/templates/app/views/layouts/application.html.erb

@@ -32,7 +32,7 @@
   <%% if user_signed_in? %>
     <div class="sidebar sidebar-left">
       <div id="chat-sidebar">
-        <%%= chat_list(->(id) { chat_path(id) }, active_uuid: @active_chat_uuid, download_csv_path: ->(id) { download_csv_chat_path(id) }, download_all_csv_path: download_all_csv_chats_path) %>
+        <%%= chat_list(->(id) { chat_path(id) }, active_uuid: @active_chat_uuid, download_csv_path: ->(id) { download_csv_chat_path(id) }, delete_path: ->(id) { chat_path(id) }, batch_delete_path: batch_destroy_chats_path, batch_download_csv_path: download_selected_csv_chats_path) %>
       </div>
     </div>
   <%% end %>
@@ -51,7 +51,7 @@
   </div>
   <div class="sidebar sidebar-right">
     <div id="history-sidebar">
-      <%%= history_list(->(execution_id) { prompt_path(execution_id) }, active_uuid: @active_message_uuid) %>
+      <%%= history_list(->(execution_id) { prompt_path(execution_id) }, active_uuid: @active_message_uuid, delete_path: ->(execution_id) { prompt_path(execution_id) }) %>
     </div>
   </div>
 </div>

data/lib/generators/llm_meta_client/scaffold/templates/app/views/shared/_generation_settings_field.html.erb

@@ -8,8 +8,9 @@
             data-<%%= stimulus_controller %>-target="toggleButton"
             data-action="click-><%%= stimulus_controller %>#toggle">
       <i class="bi bi-sliders"></i>
-      Generation Settings
-      <i class="bi bi-chevron-down toggle-icon" data-<%%= stimulus_controller %>-target="toggleIcon"></i>
+      Settings
+      <span class="tool-count-badge" data-<%%= stimulus_controller %>-target="countBadge" style="display: none;">0</span>
+      <i class="bi bi-chevron-up toggle-icon" data-<%%= stimulus_controller %>-target="toggleIcon"></i>
     </button>
   </div>
   <div class="generation-settings-panel" data-<%%= stimulus_controller %>-target="panel" style="display: none;">
@@ -18,13 +19,14 @@
     </label>
     <textarea name="generation_settings_json" id="generation_settings_json"
               class="generation-settings-json-input"
-              rows="8"
-              placeholder='{"temperature": 0.7, "top_k": 40, "top_p": 0.9, "max_tokens": 4096, "repeat_penalty": 1.1}'
+              rows="3"
+              placeholder='{"temperature": 0.7, "max_tokens": 4096, "think": true, "options": {"num_ctx": 8192}}'
               data-<%%= stimulus_controller %>-target="jsonInput"
               data-action="input-><%%= stimulus_controller %>#validate"></textarea>
     <div class="generation-settings-error" data-<%%= stimulus_controller %>-target="error" style="display: none;"></div>
     <div class="generation-settings-hint">
-      Available keys: temperature, top_k, top_p, max_tokens, repeat_penalty
+      Any JSON keys/values — passed through to the provider. Common keys:
+      temperature, top_k, top_p, max_tokens, repeat_penalty, think, options.
     </div>
   </div>
 </div>

data/lib/generators/llm_meta_client/scaffold/templates/app/views/shared/_model_grid.html.erb

@@ -0,0 +1,88 @@
+<%%
+  llm_families = local_assigns[:llm_families] || []
+  stimulus_controller = local_assigns[:stimulus_controller] || "model-picker"
+
+  # Build one column per (family × api_key) tuple. "Free" (Ollama) is
+  # always shown first when available; brand-named columns follow.
+  brand_names = { "anthropic" => "Claude", "google" => "Gemini", "openai" => "GPT" }
+  ordered_families = [
+    llm_families.find { |f| f[:llm_type] == "ollama" }
+  ] + brand_names.keys.map { |t| llm_families.find { |f| f[:llm_type] == t } }
+
+  columns = ordered_families.compact.flat_map do |fam|
+    Array(fam[:api_keys]).map do |key|
+      base_title = (fam[:llm_type] == "ollama") ? "Free" : brand_names.fetch(fam[:llm_type], fam[:name].to_s)
+      # Strip the "[Provider] " prefix that the meta-server adds to the
+      # description so the column header reads cleanly.
+      desc = key[:description].to_s.sub(/\A\[[^\]]*\]\s*/, "")
+      multiple_keys = Array(fam[:api_keys]).size > 1
+      title = (multiple_keys && desc.present?) ? "#{base_title} (#{desc})" : base_title
+      {
+        title:        title,
+        family:       fam[:llm_type],
+        api_key_uuid: key[:uuid],
+        models:       Array(key[:available_models])
+      }
+    end
+  end
+%>
+
+<div class="model-grid">
+  <%% if columns.any? %>
+    <div class="model-grid-columns" style="--cols: <%%= columns.size %>;">
+      <%% columns.each do |col| %>
+        <div class="model-grid-column">
+          <div class="model-grid-header"><%%= col[:title] %></div>
+          <ul class="model-grid-list">
+            <%% col[:models].each do |m| %>
+              <li>
+                <button type="button"
+                        class="model-grid-cell"
+                        title="<%%= m['value'] %>"
+                        data-family="<%%= col[:family] %>"
+                        data-api-key-uuid="<%%= col[:api_key_uuid] %>"
+                        data-model="<%%= m['value'] %>"
+                        data-supports-vision="<%%= m['supports_vision'] %>"
+                        data-action="click-><%%= stimulus_controller %>#pick">
+                  <span class="model-grid-label"><%%= m['label'] %></span>
+                  <span class="model-grid-badges">
+                    <%% if m['kind'].to_s == "image" %>
+                      <i class="bi bi-image model-badge model-badge-image" title="Image generation"></i>
+                    <%% end %>
+                    <%% if m['supports_vision'] %>
+                      <i class="bi bi-eye model-badge model-badge-vision" title="Vision input"></i>
+                    <%% end %>
+                    <%% if m['supports_tools'] %>
+                      <i class="bi bi-tools model-badge model-badge-tools" title="Tool / function calling"></i>
+                    <%% end %>
+                    <%% if m['favorite'] %>
+                      <i class="bi bi-star-fill model-badge model-badge-favorite" title="One of your favorites"></i>
+                    <%% end %>
+                    <%% if m['default'] %>
+                      <i class="bi bi-bookmark-star-fill model-badge model-badge-default" title="Your default model"></i>
+                    <%% end %>
+                  </span>
+                </button>
+              </li>
+            <%% end %>
+          </ul>
+        </div>
+      <%% end %>
+    </div>
+  <%% else %>
+    <p class="model-grid-empty">No models available.</p>
+  <%% end %>
+
+  <p class="model-grid-footer">
+    <i class="bi bi-info-circle"></i>
+    <%% if user_signed_in? %>
+      Access
+      <%%= link_to "hub.AIbranch",
+                  Rails.configuration.llm_service_public_url,
+                  target: "_blank", rel: "noopener" %>
+      to unlock more models by registering your API keys.
+    <%% else %>
+      Sign in to add API keys, favorites, and set a personal default model.
+    <%% end %>
+  </p>
+</div>

data/lib/generators/llm_meta_client/scaffold/templates/app/views/shared/_quick_picks.html.erb

@@ -0,0 +1,67 @@
+<%%
+  llm_families = local_assigns[:llm_families] || []
+  stimulus_controller = local_assigns[:stimulus_controller] || "model-picker"
+
+  # Flatten every (family × api_key × model) combination so the picker
+  # can find both the user's default and their favorites in one pass.
+  all_options = llm_families.flat_map do |fam|
+    Array(fam[:api_keys]).flat_map do |key|
+      Array(key[:available_models]).map do |m|
+        {
+          family:          fam[:llm_type],
+          api_key_uuid:    key[:uuid],
+          meta_id:         m["value"],
+          label:           m["label"],
+          favorite:        m["favorite"] == true,
+          default:         m["default"] == true,
+          supports_vision: m["supports_vision"] == true,
+          kind:            m["kind"]
+        }
+      end
+    end
+  end
+
+  # The user's per-user default (set on the meta-server's /models page) wins.
+  # If they haven't set one, fall back to the system-wide default from config.
+  system_default_meta = Rails.configuration.default_model
+  default_option = all_options.find { |o| o[:default] } ||
+                   all_options.find { |o| o[:meta_id] == system_default_meta }
+
+  # Favorites that aren't already the default (to avoid showing the same
+  # model twice in the row). Anonymous visitors have no favorites — they
+  # only see the free (Ollama) family — so promote every available model
+  # to a quick-pick for them, since picking from the grid would be the
+  # only other option.
+  favorite_options = all_options.reject { |o| o[:meta_id] == default_option&.dig(:meta_id) }
+                                .select  { |o| user_signed_in? ? o[:favorite] : true }
+%>
+
+<%%# Always render the container so model-picker can append a transient
+    quick-pick when the user picks an off-row model from the grid. %>
+<div class="quick-picks" data-<%%= stimulus_controller %>-target="quickPicks">
+  <%% if default_option %>
+    <button type="button"
+            class="quick-pick-button is-default"
+            title="Your default model"
+            data-family="<%%= default_option[:family] %>"
+            data-api-key-uuid="<%%= default_option[:api_key_uuid] %>"
+            data-model="<%%= default_option[:meta_id] %>"
+            data-supports-vision="<%%= default_option[:supports_vision] %>"
+            data-action="click-><%%= stimulus_controller %>#pick">
+      <%%= default_option[:label] %>
+    </button>
+  <%% end %>
+
+  <%% favorite_options.each do |o| %>
+    <button type="button"
+            class="quick-pick-button"
+            title="<%%= o[:meta_id] %>"
+            data-family="<%%= o[:family] %>"
+            data-api-key-uuid="<%%= o[:api_key_uuid] %>"
+            data-model="<%%= o[:meta_id] %>"
+            data-supports-vision="<%%= o[:supports_vision] %>"
+            data-action="click-><%%= stimulus_controller %>#pick">
+      <%%= o[:label] %>
+    </button>
+  <%% end %>
+</div>

data/lib/generators/llm_meta_client/scaffold/templates/app/views/shared/_tool_selector_field.html.erb

@@ -10,7 +10,7 @@
       <i class="bi bi-tools"></i>
       Tools
       <span class="tool-count-badge" data-<%%= stimulus_controller %>-target="countBadge" style="display: none;">0</span>
-      <i class="bi bi-chevron-down toggle-icon" data-<%%= stimulus_controller %>-target="toggleIcon"></i>
+      <i class="bi bi-chevron-up toggle-icon" data-<%%= stimulus_controller %>-target="toggleIcon"></i>
     </button>
   </div>
   <div class="tool-selector-panel" data-<%%= stimulus_controller %>-target="panel" style="display: none;">

data/lib/llm_meta_client/helpers.rb

@@ -2,5 +2,23 @@ module LlmMetaClient
   module Helpers
     include PromptNavigator::Helpers
     include ChatManager::Helpers
+
+    # Pull a leading `![](data:mime;base64,DATA)` image off a user prompt
+    # so it can be rendered as a plain <img> while the remaining text stays
+    # plain. Returns [img_html_safe_or_nil, remaining_text]. Emits the tag
+    # directly (no markdown helper required) so this works in any host.
+    ATTACHED_IMAGE_HEAD = /\A!\[[^\]]*\]\(data:([^;]+);base64,([^\)]+)\)\s*\n*/m
+
+    def split_attached_image_html(text)
+      s = text.to_s
+      m = s.match(ATTACHED_IMAGE_HEAD)
+      return [ nil, s ] unless m
+      img = tag.img(
+        src: "data:#{m[1]};base64,#{m[2]}",
+        alt: "",
+        class: "user-attached-image"
+      )
+      [ img, s.sub(ATTACHED_IMAGE_HEAD, "") ]
+    end
   end
 end

data/lib/llm_meta_client/server_query.rb

@@ -12,13 +12,28 @@ module LlmMetaClient
     # Returns the final assistant content. If tool calls fired, the returned
     # string mirrors the synchronous #call format (response + markdown
     # "Tool calls" section appended) so persistence stays consistent.
-    def stream(id_token, api_key_uuid, model_id, context, user_content, tool_ids: [], generation_settings: {})
-      context_and_user_content = "Context:#{context}, User Prompt: #{user_content}"
-      debug_log "Streaming request to LLM: \n===>\n#{context_and_user_content}\n===>"
-
-      body = { prompt: context_and_user_content }
+    def stream(id_token, api_key_uuid, model_id, context, user_content, tool_ids: [], generation_settings: {}, image_context: nil, image: nil, images: nil, document: nil)
+      if image_context.present?
+        prompt_text = user_content.is_a?(Hash) ? (user_content[:prompt] || user_content["prompt"]).to_s : user_content.to_s
+        debug_log "Streaming image request to LLM: \n===>\n#{prompt_text}\n(with #{image_context.size} prior turn(s))\n===>"
+        body = { prompt: prompt_text, image_context: image_context }
+      else
+        context_and_user_content = "Context:#{context}, User Prompt: #{user_content}"
+        debug_log "Streaming request to LLM: \n===>\n#{context_and_user_content}\n===>"
+        body = { prompt: context_and_user_content }
+      end
       body[:tool_ids] = tool_ids if tool_ids.present?
       body[:generation_settings] = generation_settings if generation_settings.present?
+      # images: ordered chronologically with the current turn's image last.
+      # Legacy single `image:` is forwarded as a fallback for older callers.
+      if images.present?
+        body[:images] = images
+      elsif image.present?
+        body[:image] = image
+      end
+      # document: single-attachment PDF for the current turn. Server enforces
+      # MIME (application/pdf) and a 10 MB cap; we just forward the payload.
+      body[:document] = document if document.present?
 
       assembled = +""
       collected_tool_calls = []
@@ -30,6 +45,11 @@ module LlmMetaClient
         when "tool_calls"
           collected_tool_calls = event[:data]["tool_calls"] || []
           yield event if block_given?
+        when "thinking"
+          # Thinking-mode deltas (Ollama hybrid models): forwarded to the
+          # caller for live rendering, but NOT folded into `assembled` —
+          # only the final content is persisted as the assistant message.
+          yield event if block_given?
         when "done"
           # End-of-stream marker from upstream; no-op here.
         when "error"
@@ -42,12 +62,12 @@ module LlmMetaClient
       collected_tool_calls.any? ? combine_with_tool_calls(assembled, collected_tool_calls) : assembled
     end
 
-    def call(id_token, api_key_uuid, model_id, context, user_content, tool_ids: [], generation_settings: {})
+    def call(id_token, api_key_uuid, model_id, context, user_content, tool_ids: [], generation_settings: {}, document: nil)
       debug_log "Context: #{context}"
       context_and_user_content = "Context:#{context}, User Prompt: #{user_content}"
       debug_log "Request to LLM: \n===>\n#{context_and_user_content}\n===>"
 
-      response = request(api_key_uuid, id_token, model_id, context_and_user_content, tool_ids, generation_settings)
+      response = request(api_key_uuid, id_token, model_id, context_and_user_content, tool_ids, generation_settings, document: document)
 
       unless response.success?
         raise Exceptions::ServerError, build_error_message(response.code.to_i, response.parsed_response)
@@ -96,13 +116,14 @@ module LlmMetaClient
       lines.join("\n")
     end
 
-    def request(api_key_uuid, id_token, model_id, user_content, tool_ids, generation_settings)
+    def request(api_key_uuid, id_token, model_id, user_content, tool_ids, generation_settings, document: nil)
       headers = { "Content-Type" => "application/json" }
       headers["Authorization"] = "Bearer #{id_token}" if id_token.present?
 
       body = { prompt: user_content.to_s }
       body[:tool_ids] = tool_ids if tool_ids.present?
       body[:generation_settings] = generation_settings if generation_settings.present?
+      body[:document] = document if document.present?
 
       HTTParty.post(
         url(api_key_uuid, model_id),
@@ -138,7 +159,7 @@ module LlmMetaClient
 
           buffer = +""
           response.read_body do |chunk|
-            buffer << chunk
+            buffer << chunk.force_encoding("UTF-8")
             while (boundary = buffer.index("\n\n"))
               raw_event = buffer.slice!(0, boundary + 2)
               parsed = parse_sse_event(raw_event)
@@ -173,6 +194,7 @@ module LlmMetaClient
       if body.is_a?(Hash)
         err = body["error"]
         msg = body["message"]
+        return "Your sign-in expired. Please sign in again." if err.to_s.match?(/token has expired/i)
         return "#{err}: #{msg}" if err.present? && msg.present?
         return err if err.present?
         return msg if msg.present?

data/lib/llm_meta_client/version.rb

@@ -1,3 +1,3 @@
 module LlmMetaClient
-  VERSION = "1.4.0"
+  VERSION = "1.6.0"
 end