layered-assistant-rails 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c4266f3d5e33f449619fe77a6e9b0819bcc22c038ffe3498c96ea56549faa80
-  data.tar.gz: 6b4e8a671a99e0e0cfd987b631dc316616743f5b3dbe3b2d3370d8c0a7f1a614
+  metadata.gz: c87ef1f390a6a4c102682cb4befebc1950f8566552f5213075a9d9f2ac4c7b49
+  data.tar.gz: 0d289b5e1f05d1f696ae8e37053ec75b51b3bf3c280091ceb33d836c0f06678b
 SHA512:
-  metadata.gz: '0681356f7a030b95dcc62e0b589647b4e4c650fa1683dbf2b98ddceefd89cb74ea1b73578053de064c32420faefd21c2bd28cd7ef5ffc1660d39cd991d954713'
-  data.tar.gz: df9c6fde84b9897e4833fd7beedcb0557c319f6603b663af10f9fa1b4ce1c69ddf4041dd9aa7aea335c09b2b26764aecf53fdbb3ac21d3871796f11fdcc0bc28
+  metadata.gz: 68cb5c184761c2ef7de4bf43cc6b84a32dfbe2b8cfd434cb3562c72265e7d9640bd3ad41f965a1c4cc04fec13c02b314cacf5780e1d779f2d08fec87aefa260a
+  data.tar.gz: 8f9cc996f9de499fa6d7c9afaf8f607eed0ea9c06c0f78f3e2ff8aeac67580a8a897002c0b5c350c668d76920311c9c2cbae10c2d11b452b99cd89a3c9c70533

data/README.md

@@ -434,16 +434,17 @@ Then visit `http://localhost:3000`.
 
 ### Deploying the dummy app
 
-The dummy app can be deployed with [Kamal](https://kamal-deploy.org). Set the required environment variables and deploy from `test/dummy`:
+The dummy app can be deployed with [Kamal](https://kamal-deploy.org). Copy `.env.deploy.example` to `.env.deploy` and fill in the target, then deploy with `bin/deploy`:
 
 ```bash
-cd test/dummy
-export KAMAL_DEPLOY_IP=<server-ip>
-export KAMAL_DEPLOY_DOMAIN=<domain>
-export KAMAL_SSH_KEY=<path-to-ssh-key>
-kamal deploy
+cp .env.deploy.example .env.deploy
+bin/deploy           # kamal deploy
+bin/deploy setup     # first run on a new server
+bin/deploy logs      # any other kamal subcommand passes straight through
 ```
 
+`.env.deploy` is gitignored, so the server address stays out of the repo. The script reads it, checks the three `KAMAL_*` variables are set, and runs Kamal from `test/dummy`, where `config/deploy.yml` lives.
+
 ## Testing
 
 Run the gem tests from the root directory:

data/app/controllers/layered/assistant/conversations_controller.rb

@@ -1,80 +1,60 @@
 module Layered
   module Assistant
-    class ConversationsController < ApplicationController
+    # Conversations are a layered resource for listing, starting, renaming
+    # and deleting them; only `show` - the conversation itself - and `stop`
+    # are this engine's own.
+    class ConversationsController < ResourcesController
       include StoppableResponse
 
-      before_action :set_conversation, only: [ :show, :edit, :update, :destroy, :stop ]
-      before_action :set_assistants, only: [ :new, :create ]
-
-      def index
-        if params[:assistant_id]
-          @assistant = scoped(Assistant).find(params[:assistant_id])
-          @page_title = "Conversations - #{@assistant.name}"
-          @pagy, @conversations = pagy(@assistant.conversations.merge(scoped(Conversation)).includes(:owner, :user).by_created_at)
-        else
-          @page_title = "Conversations"
-          @pagy, @conversations = pagy(scoped(Conversation).includes(:assistant, :owner, :user).by_created_at)
-        end
-      end
+      before_action :set_conversation, only: [ :stop ]
+      before_action :drop_assistant_column, only: [ :index ], if: -> { params[:assistant_id] }
+      before_action :scope_choice_fields, only: [ :new, :create, :edit, :update ]
 
       def show
-        @page_title = @conversation.name
+        super
+        @conversation = @record
         @messages = @conversation.messages.includes(:model).by_created_at
         @models = scoped_models
         @selected_model_id = @messages.last&.model_id || @conversation.assistant.default_model_id || @models.first&.id
       end
 
-      def new
-        @page_title = "New conversation"
-        @conversation = Conversation.new(params.permit(conversation: [ :assistant_id ])[:conversation])
-      end
+      private
 
-      def create
-        @conversation = Conversation.new(conversation_params)
-        @conversation.owner = current_owner!
-        @conversation.user = current_conversation_user
-        @conversation.assistant = scoped(Assistant).find(conversation_params[:assistant_id]) if conversation_params[:assistant_id].present?
-        @conversation.name = Conversation.default_name if @conversation.name.blank?
-        if @conversation.save
-          redirect_to layered_assistant.conversation_path(@conversation)
-        else
-          render :new, status: :unprocessable_entity
-        end
+      # `stop` is a custom member action, so the gem has loaded @record.
+      def set_conversation
+        @conversation = @record
       end
 
-      def edit
-        @page_title = "Edit conversation"
+      # Listed under an assistant, every row would name the same one.
+      def drop_assistant_column
+        @columns = @columns.reject { |column| column[:attribute] == :assistant_id }
       end
 
-      def update
-        if @conversation.update(conversation_params)
-          redirect_to layered_assistant.conversations_path, notice: "Conversation was successfully updated."
+      # The assistant is chosen once, when the conversation is started, and
+      # only from the owner's own.
+      def scope_choice_fields
+        if action_name.in?(%w[new create])
+          assistants = scoped(Assistant).by_name.map { |assistant| [ assistant.name, assistant.id ] }
+          @fields = @fields.map { |field| field[:attribute] == :assistant_id ? field.merge(collection: assistants) : field }
         else
-          render :edit, status: :unprocessable_entity
+          @fields = @fields.reject { |field| field[:attribute] == :assistant_id }
         end
       end
 
-      def destroy
-        @conversation.destroy
-        redirect_to layered_assistant.conversations_path, notice: "Conversation was successfully deleted."
-      end
-
-      private
-
-      def set_conversation
-        @conversation = scoped(Conversation).find_by!(uid: params[:id])
-      end
-
-      def set_assistants
-        @assistants = scoped(Assistant).by_name
-      end
+      # An out-of-scope assistant 404s rather than being silently dropped,
+      # matching how a record itself is looked up. A blank one leaves any
+      # assistant the route already chose in place.
+      def layered_resource_params
+        attributes = super
+        return attributes.except(:assistant_id) unless action_name == "create"
 
-      def conversation_params
-        if action_name == "create"
-          params.require(:conversation).permit(:name, :assistant_id)
+        if attributes[:assistant_id].present?
+          attributes[:assistant_id] = scoped(Assistant).find(attributes[:assistant_id]).id
         else
-          params.require(:conversation).permit(:name)
+          attributes.delete(:assistant_id)
         end
+        attributes[:name] = Conversation.default_name if attributes[:name].blank?
+        attributes
       end
     end
   end

data/app/controllers/layered/assistant/messages_controller.rb

@@ -1,15 +1,14 @@
 module Layered
   module Assistant
-    class MessagesController < ApplicationController
+    # Messages are a layered resource for listing and deleting them; only
+    # `create` - the composer posting a message - is this engine's own.
+    class MessagesController < ResourcesController
       include MessageCreation
 
-      before_action :set_conversation
-      before_action :set_message, only: [ :destroy ]
-
-      def index
-        @page_title = "Messages"
-        @pagy, @messages = pagy(@conversation.messages.includes(:model).by_created_at)
-      end
+      # Messages have no fields, which the gem reads as having no form, but
+      # `create` is the composer's rather than the gem's.
+      skip_before_action :require_layered_fields, only: [ :create ]
+      before_action :set_conversation, only: [ :create, :destroy ]
 
       def create
         model_id = scoped_model_id(message_params[:model_id])
@@ -37,9 +36,8 @@ module Layered
       end
 
       def destroy
-        @message.destroy
+        super
         @conversation.update_token_totals!
-        redirect_to layered_assistant.conversation_messages_path(@conversation), notice: "Message was successfully deleted."
       end
 
       private
@@ -48,10 +46,6 @@ module Layered
         @conversation = scoped(Conversation).find_by!(uid: params[:conversation_id])
       end
 
-      def set_message
-        @message = @conversation.messages.find(params[:id])
-      end
-
       def message_params
         params.require(:message).permit(:content, :model_id)
       end

data/app/layered_resources/layered/assistant/conversation_resource.rb

@@ -0,0 +1,87 @@
+module Layered
+  module Assistant
+    class ConversationResource < Layered::Resource::Base
+      model Conversation
+
+      # Conversations are addressed by uid, not id.
+      lookup_attribute :uid
+
+      columns [
+        # The name links to the conversation itself, not its edit form.
+        { attribute: :name, primary: true, link: false,
+          render: ->(record, view) {
+            view.link_to(record.name, view.layered_assistant.conversation_path(record),
+                         data: { turbo_frame: "_top" })
+          } },
+        { attribute: :assistant_id, label: "Assistant", sortable: false,
+          render: ->(record, view) {
+            view.link_to(record.assistant.name,
+                         view.layered_assistant.assistant_conversations_path(record.assistant),
+                         data: { turbo_frame: "_top" })
+          } },
+        { attribute: :messages_count, label: "Messages",
+          render: ->(record, view) {
+            view.link_to(record.messages_count.to_i,
+                         view.layered_assistant.conversation_messages_path(record),
+                         data: { turbo_frame: "_top" })
+          } },
+        { attribute: :token_estimate, label: "Tokens",
+          render: ->(record, view) { view.number_with_delimiter(record.token_estimate.to_i) } },
+        # The person who did the talking, which is the owner itself until an
+        # owner block scopes ownership elsewhere. Neither is set for an
+        # anonymous visitor on a public assistant.
+        { attribute: :user_id, label: "User", sortable: false,
+          render: ->(record) { record.user.try(:name) || record.owner.try(:name) || "Guest" } },
+        { attribute: :created_at, label: "Created",
+          render: ->(record) { record.created_at.to_fs(:short) } }
+      ]
+
+      search_fields [ :name ]
+
+      default_sort attribute: :created_at, direction: :desc
+
+      # `assistant_id` carries no collection here: the options have to be
+      # scoped to the owner, which only the controller can resolve.
+      # ConversationsController fills them in per request, and drops the
+      # field once the conversation exists - its assistant is fixed.
+      fields [
+        { attribute: :assistant_id, label: "Assistant", as: :select, include_blank: "Select an assistant:", required: true },
+        # Left blank, the name is set from the first message, so the form
+        # must not insist on one even though the model does.
+        { attribute: :name, required: false, hint: "Auto-set from first message if left blank" }
+      ]
+
+      # Nested under an assistant, only that assistant's conversations are
+      # listed, and an out-of-scope assistant 404s before any are reached.
+      def self.scope(controller)
+        scope = controller.send(:scoped, Conversation)
+        if (assistant_id = controller.params[:assistant_id])
+          scope = scope.where(assistant: controller.send(:scoped, Assistant).find(assistant_id))
+        end
+        scope.includes(:assistant, :owner, :user)
+      end
+
+      # Started from an assistant's conversations, the assistant is chosen
+      # already - resolved through `scoped` so an out-of-scope one 404s.
+      def self.build_record(controller)
+        assistant_id = controller.params[:assistant_id]
+
+        Conversation.new(
+          owner: controller.send(:current_owner!),
+          user: controller.send(:current_conversation_user),
+          assistant: (controller.send(:scoped, Assistant).find(assistant_id) if assistant_id)
+        )
+      end
+
+      # A new conversation opens straight into the chat; edits and deletes
+      # return to the list they were made from.
+      def self.after_save_path(controller, record)
+        if controller.action_name == "create"
+          controller.layered_assistant.conversation_path(record)
+        else
+          controller.layered_assistant.conversations_path
+        end
+      end
+    end
+  end
+end

data/app/layered_resources/layered/assistant/message_resource.rb

@@ -0,0 +1,44 @@
+module Layered
+  module Assistant
+    # Messages are listed and deleted here; they are written through the
+    # composer, so there are no fields and no form.
+    class MessageResource < Layered::Resource::Base
+      model Message
+
+      columns [
+        { attribute: :role, primary: true },
+        { attribute: :content, sortable: false,
+          render: ->(record, view) { view.truncate(record.content, length: 100) } },
+        { attribute: :model_id, label: "Model", sortable: false,
+          render: ->(record) { record.model&.name } },
+        { attribute: :tokens, label: "Tokens", sortable: false,
+          render: ->(record, view) {
+            total = record.input_tokens.to_i + record.output_tokens.to_i
+            "#{'~' if record.tokens_estimated?}#{view.number_with_delimiter(total)}" if total > 0
+          } },
+        { attribute: :tokens_per_second, label: "Tok/s", sortable: false,
+          render: ->(record) {
+            if record.output_tokens.to_i > 0 && record.response_ms.to_i >= MessagesHelper::MIN_RESPONSE_MS_FOR_TPS
+              (record.output_tokens * 1000.0 / record.response_ms).round(1)
+            end
+          } },
+        { attribute: :ttft_ms, label: "TTFT",
+          render: ->(record) { "#{record.ttft_ms}ms" if record.ttft_ms } },
+        { attribute: :created_at, label: "Created",
+          render: ->(record) { record.created_at.to_fs(:short) } }
+      ]
+
+      search_fields [ :content ]
+
+      default_sort attribute: :created_at, direction: :asc
+
+      # The conversation is resolved through the engine's own scoping, so an
+      # out-of-scope one 404s before any message is reached.
+      def self.scope(controller)
+        controller.send(:scoped, Conversation)
+          .find_by!(uid: controller.params[:conversation_id])
+          .messages.includes(:model)
+      end
+    end
+  end
+end

data/app/models/layered/assistant/provider.rb

@@ -38,8 +38,9 @@ module Layered
           { key: "openai", name: "OpenAI", description: "GPT family of models. Requires an API key.", protocol: "openai", url: "https://api.openai.com/v1", keys_url: "https://platform.openai.com/api-keys" },
           { key: "gemini", name: "Gemini", description: "Google Gemini family of models. Requires an API key.", protocol: "openai", url: "https://generativelanguage.googleapis.com/v1beta/openai/", keys_url: "https://aistudio.google.com/api-keys" },
           { key: "mistral", name: "Mistral", description: "Mistral's own frontier models. Requires an API key.", protocol: "openai", url: "https://api.mistral.ai/v1", keys_url: "https://admin.mistral.ai/organization/api-keys" },
-          { key: "groq", name: "Groq", description: "Low-latency inference for popular open-weight models. Requires an API key.", protocol: "openai", url: "https://api.groq.com/openai/v1", keys_url: "https://console.groq.com/keys" },
           { key: "openrouter", name: "OpenRouter", description: "Access hundreds of models through a single API. Requires an API key.", protocol: "openai", url: "https://openrouter.ai/api/v1/", keys_url: "https://openrouter.ai/settings/keys" },
+          { key: "together", name: "Together AI", description: "Serverless inference for open-weight models. Requires an API key.", protocol: "openai", url: "https://api.together.ai/v1", keys_url: "https://api.together.ai/settings/projects/~current/api-keys" },
+          { key: "groq", name: "Groq", description: "Low-latency inference for popular open-weight models. Requires an API key.", protocol: "openai", url: "https://api.groq.com/openai/v1", keys_url: "https://console.groq.com/keys" },
           { key: "fireworks", name: "Fireworks", description: "Serverless inference for open-weight models. Requires an API key.", protocol: "openai", url: "https://api.fireworks.ai/inference/v1", keys_url: "https://app.fireworks.ai/settings/users/api-keys" }
         ],
         "Local" => [

data/app/views/layered/assistant/panel/conversations/index.html.erb

@@ -1,46 +1,15 @@
 <%= render "layered/assistant/panel/conversations/header", assistants: @assistants, conversations: @conversations, selected: layered_assistant.panel_conversations_path %>
 
 <%= turbo_frame_tag "assistant_panel" do %>
-  <div class="l-ui-table-container">
-      <table class="l-ui-table l-ui-mt-0">
-        <caption class="l-ui-sr-only">Conversations in panel</caption>
-        <thead class="l-ui-table__header">
-          <tr>
-            <th scope="col" class="l-ui-table__header-cell">Created</th>
-            <th scope="col" class="l-ui-table__header-cell">Name</th>
-            <th scope="col" class="l-ui-table__header-cell">Messages</th>
-            <th scope="col" class="l-ui-table__header-cell">Tokens</th>
-            <th scope="col" class="l-ui-table__header-cell l-ui-table__header-cell--action">Actions</th>
-          </tr>
-        </thead>
-
-        <tbody class="l-ui-table__body">
-          <% if @conversations.any? %>
-            <% @conversations.each do |conversation| %>
-              <tr>
-                <td class="l-ui-table__cell">
-                  <%= conversation.created_at.to_fs(:short) %>
-                </td>
-                <th scope="row" class="l-ui-table__cell l-ui-table__cell--primary">
-                  <%= link_to conversation.name, layered_assistant.panel_conversation_path(conversation), data: { turbo_frame: "assistant_panel" } %>
-                </th>
-                <td class="l-ui-table__cell">
-                  <%= link_to conversation.messages_count || 0, layered_assistant.conversation_messages_path(conversation), data: { turbo_frame: "_top" } %>
-                </td>
-                <td class="l-ui-table__cell">
-                  <%= number_with_delimiter(conversation.token_estimate.to_i) %>
-                </td>
-                <td class="l-ui-table__cell l-ui-table__cell--action">
-                  <%= button_to "Delete", layered_assistant.panel_conversation_path(conversation), method: :delete, class: "l-ui-table__action l-ui-table__action--danger", data: { turbo_confirm: "Delete this conversation?" } %>
-                </td>
-              </tr>
-            <% end %>
-          <% else %>
-            <tr>
-              <td class="l-ui-table__cell" colspan="5">No conversations yet.</td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-  </div>
+  <%= l_ui_table(@conversations,
+        caption: "Conversations in panel",
+        columns: [
+          { attribute: :created_at, label: "Created", render: ->(c) { c.created_at.to_fs(:short) } },
+          { attribute: :name, primary: true, render: ->(c) { link_to c.name, layered_assistant.panel_conversation_path(c), data: { turbo_frame: "assistant_panel", turbo_prefetch: false } } },
+          { attribute: :messages_count, label: "Messages", render: ->(c) { link_to c.messages_count || 0, layered_assistant.conversation_messages_path(c), data: { turbo_frame: "_top", turbo_prefetch: false } } },
+          { attribute: :token_estimate, label: "Tokens", render: ->(c) { number_with_delimiter(c.token_estimate.to_i) } }
+        ],
+        actions: ->(c) { button_to "Delete", layered_assistant.panel_conversation_path(c), method: :delete, class: "l-ui-table__action l-ui-table__action--danger", data: { turbo_confirm: "Delete this conversation?" } },
+        floating_actions: true
+      ) %>
 <% end %>

data/app/views/layered/assistant/providers/new.html.erb

@@ -37,7 +37,8 @@
 <div class="l-ui-spread">
   <div>
     <%= l_ui_breadcrumbs do %>
-      <%= l_ui_breadcrumb_item @model.model_name.human.pluralize, layered_collection_path %>
+      <%= layered_breadcrumb_item @model.model_name.human.pluralize, layered_collection_path %>
+      <%= layered_breadcrumb_item "New", current: true %>
     <% end %>
 
     <h1 class="l-ui-heading">New <%= @model.model_name.human.downcase %></h1>

data/app/views/layered/assistant/public/panel/conversations/index.html.erb

@@ -9,34 +9,14 @@
     <% end %>
 
     <% if @conversations.any? %>
-      <div class="l-ui-table-container">
-        <table class="l-ui-table l-ui-mt-0">
-          <caption class="l-ui-sr-only">Your conversations</caption>
-          <thead class="l-ui-table__header">
-            <tr>
-              <th scope="col" class="l-ui-table__header-cell">Created</th>
-              <th scope="col" class="l-ui-table__header-cell">Name</th>
-              <th scope="col" class="l-ui-table__header-cell">Messages</th>
-            </tr>
-          </thead>
-
-          <tbody class="l-ui-table__body">
-            <% @conversations.each do |conversation| %>
-              <tr>
-                <td class="l-ui-table__cell">
-                  <%= conversation.created_at.to_fs(:short) %>
-                </td>
-                <th scope="row" class="l-ui-table__cell l-ui-table__cell--primary">
-                  <%= link_to conversation.name, layered_assistant.public_panel_conversation_path(conversation), data: { turbo_frame: "assistant_panel" } %>
-                </th>
-                <td class="l-ui-table__cell">
-                  <%= conversation.messages_count || 0 %>
-                </td>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </div>
+      <%= l_ui_table(@conversations,
+            caption: "Your conversations",
+            columns: [
+              { attribute: :created_at, label: "Created", render: ->(c) { c.created_at.to_fs(:short) } },
+              { attribute: :name, primary: true, render: ->(c) { link_to c.name, layered_assistant.public_panel_conversation_path(c), data: { turbo_frame: "assistant_panel", turbo_prefetch: false } } },
+              { attribute: :messages_count, label: "Messages", render: ->(c) { c.messages_count || 0 } }
+            ]
+          ) %>
     <% end %>
 
     <%= form_with url: layered_assistant.public_panel_conversations_path(assistant_id: @assistant.id), method: :post do |f| %>

data/config/routes.rb

@@ -4,15 +4,19 @@ Layered::Assistant::Engine.routes.draw do
   layered_resources :skills, namespace: "Layered::Assistant", except: [ :show ]
   layered_resources :assistants, namespace: "Layered::Assistant", controller: "assistants", except: [ :show ]
   resources :assistants, only: [] do
-    resources :conversations, only: [ :index ]
+    layered_resources :conversations, namespace: "Layered::Assistant", controller: "conversations", only: [ :index, :new, :create ]
   end
   layered_resources :providers, namespace: "Layered::Assistant", controller: "providers", except: [ :show ]
   resources :providers, only: [] do
     layered_resources :models, namespace: "Layered::Assistant", except: [ :show ]
   end
-  resources :conversations, only: [ :index, :show, :new, :create, :edit, :update, :destroy ] do
-    patch :stop, on: :member
-    resources :messages, only: [ :index, :create, :destroy ]
+  layered_resources :conversations, namespace: "Layered::Assistant", controller: "conversations" do
+    member do
+      patch :stop
+    end
+  end
+  resources :conversations, only: [] do
+    layered_resources :messages, namespace: "Layered::Assistant", controller: "messages", only: [ :index, :create, :destroy ]
     # Approving a tool call is the same act wherever it is rendered, and the
     # partial carrying the buttons is broadcast rather than requested, so it
     # cannot know which namespace it landed in. One route serves them all.

data/data/models.json

@@ -1,55 +1,66 @@
 {
   "Anthropic": [
+    { "name": "Claude Opus 5.5", "identifier": "claude-opus-5-5" },
+    { "name": "Claude Sonnet 5.5", "identifier": "claude-sonnet-5-5" },
+    { "name": "Claude Fable 5.1", "identifier": "claude-fable-5-1" },
     { "name": "Claude Opus 5", "identifier": "claude-opus-5" },
-    { "name": "Claude Sonnet 5", "identifier": "claude-sonnet-5" },
-    { "name": "Claude Fable 5", "identifier": "claude-fable-5" },
-    { "name": "Claude Opus 4.8", "identifier": "claude-opus-4-8" },
     { "name": "Claude Haiku 4.5", "identifier": "claude-haiku-4-5" }
   ],
   "OpenAI": [
-    { "name": "GPT-5.6 Sol", "identifier": "gpt-5.6-sol" },
-    { "name": "GPT-5.6 Terra", "identifier": "gpt-5.6-terra" },
-    { "name": "GPT-5.6 Luna", "identifier": "gpt-5.6-luna" },
-    { "name": "GPT-5.5 Pro", "identifier": "gpt-5.5-pro" }
+    { "name": "GPT-6 Astra", "identifier": "gpt-6-astra" },
+    { "name": "GPT-6.1 Sol", "identifier": "gpt-6.1-sol" },
+    { "name": "GPT-6 Luna", "identifier": "gpt-6-luna" },
+    { "name": "GPT-5.6 Sol", "identifier": "gpt-5.6-sol" }
   ],
   "Gemini": [
+    { "name": "Gemini 3.8 Flash", "identifier": "gemini-3.8-flash" },
+    { "name": "Gemini 3.7 Flash", "identifier": "gemini-3.7-flash" },
     { "name": "Gemini 3.6 Flash", "identifier": "gemini-3.6-flash" },
     { "name": "Gemini 3.5 Flash", "identifier": "gemini-3.5-flash" },
     { "name": "Gemini 3.5 Flash-Lite", "identifier": "gemini-3.5-flash-lite" },
     { "name": "Gemini 3.1 Pro Preview", "identifier": "gemini-3.1-pro-preview" },
-    { "name": "Gemini 3.1 Flash-Lite", "identifier": "gemini-3.1-flash-lite" },
-    { "name": "Gemini 2.5 Pro", "identifier": "gemini-2.5-pro" },
-    { "name": "Gemini 2.5 Flash", "identifier": "gemini-2.5-flash" },
-    { "name": "Gemini 2.5 Flash-Lite", "identifier": "gemini-2.5-flash-lite" }
+    { "name": "Gemini 3.1 Flash-Lite", "identifier": "gemini-3.1-flash-lite" }
   ],
   "OpenRouter": [
     { "name": "Auto Router (Beta)", "identifier": "openrouter/auto-beta" },
-    { "name": "Qwen3.8 Max", "identifier": "qwen/qwen3.8-max" },
-    { "name": "DeepSeek V4 Flash 0731", "identifier": "deepseek/deepseek-v4-flash-0731" },
+    { "name": "Qwen3.8 Max (0902)", "identifier": "qwen/qwen3.8-max-0902" },
+    { "name": "DeepSeek V4.1 Flash", "identifier": "deepseek/deepseek-v4.1-flash" },
+    { "name": "Grok 4.7", "identifier": "x-ai/grok-4.7" },
+    { "name": "GLM 5.3", "identifier": "z-ai/glm-5.3" },
     { "name": "Kimi K3", "identifier": "moonshotai/kimi-k3" },
-    { "name": "Grok 4.5", "identifier": "x-ai/grok-4.5" },
-    { "name": "GLM-5.2", "identifier": "z-ai/glm-5.2" },
     { "name": "Kimi K2.7 Code", "identifier": "moonshotai/kimi-k2.7-code" },
     { "name": "MiniMax M3", "identifier": "minimax/minimax-m3" },
-    { "name": "DeepSeek V4 Pro", "identifier": "deepseek/deepseek-v4-pro" }
+    { "name": "DeepSeek V4 Pro 0813", "identifier": "deepseek/deepseek-v4-pro-0813" }
   ],
   "Groq": [
-    { "name": "Qwen3.6 27B", "identifier": "qwen/qwen3.6-27b" },
+    { "name": "Qwen3.8 27B", "identifier": "qwen/qwen3.8-27b" },
     { "name": "GPT-OSS 120B", "identifier": "openai/gpt-oss-120b" },
     { "name": "GPT-OSS 20B", "identifier": "openai/gpt-oss-20b" },
-    { "name": "Compound", "identifier": "groq/compound" },
-    { "name": "Compound Mini", "identifier": "groq/compound-mini" }
+    { "name": "Llama 3.3 70B", "identifier": "llama-3.3-70b-versatile" }
   ],
   "Fireworks": [
-    { "name": "DeepSeek V4 Flash 0731", "identifier": "accounts/fireworks/models/deepseek-v4-flash-0731" },
+    { "name": "Ember-1", "identifier": "accounts/fireworks/models/ember-1" },
+    { "name": "DeepSeek V4.1 Flash", "identifier": "accounts/fireworks/models/deepseek-v4p1-flash" },
+    { "name": "GLM 5.3", "identifier": "accounts/fireworks/models/glm-5p3" },
+    { "name": "GLM 5.3 Flash", "identifier": "accounts/fireworks/models/glm-5p3-flash" },
     { "name": "Kimi K3", "identifier": "accounts/fireworks/models/kimi-k3" },
-    { "name": "GLM 5.2", "identifier": "accounts/fireworks/models/glm-5p2" },
-    { "name": "Qwen3.7 Plus", "identifier": "accounts/fireworks/models/qwen3p7-plus" },
+    { "name": "Qwen3.8 Max", "identifier": "accounts/fireworks/models/qwen3p8-max" },
     { "name": "Kimi K2.7 Code", "identifier": "accounts/fireworks/models/kimi-k2p7-code" },
     { "name": "MiniMax M3", "identifier": "accounts/fireworks/models/minimax-m3" },
-    { "name": "DeepSeek V4 Pro", "identifier": "accounts/fireworks/models/deepseek-v4-pro" },
     { "name": "GPT-OSS 120B", "identifier": "accounts/fireworks/models/gpt-oss-120b" }
   ],
+  "Together AI": [
+    { "name": "Qwen3.8 2.4T A95B", "identifier": "Qwen/Qwen3.8-2.4T-A95B" },
+    { "name": "DeepSeek V4.1 Flash", "identifier": "deepseek-ai/DeepSeek-V4.1-Flash" },
+    { "name": "Kimi K3", "identifier": "moonshotai/Kimi-K3" },
+    { "name": "GLM 5.3", "identifier": "zai-org/GLM-5.3" },
+    { "name": "GLM 5.3 Flash", "identifier": "zai-org/GLM-5.3-Flash" },
+    { "name": "Qwen3.7 Max", "identifier": "Qwen/Qwen3.7-Max" },
+    { "name": "MiniMax M3", "identifier": "MiniMaxAI/MiniMax-M3" },
+    { "name": "DeepSeek V4 Pro 0813", "identifier": "deepseek-ai/DeepSeek-V4-Pro-0813" },
+    { "name": "GPT-OSS 120B", "identifier": "openai/gpt-oss-120b" },
+    { "name": "Llama 3.3 70B Instruct Turbo", "identifier": "meta-llama/Llama-3.3-70B-Instruct-Turbo" }
+  ],
   "Mistral": [
     { "name": "Mistral Medium 3.5", "identifier": "mistral-medium-2604" },
     { "name": "Mistral Small 4", "identifier": "mistral-small-2603" },

data/lib/layered/assistant/version.rb

@@ -1,5 +1,5 @@
 module Layered
   module Assistant
-    VERSION = "0.8.0"
+    VERSION = "0.9.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: layered-assistant-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - layered.ai
@@ -85,28 +85,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: layered-resource-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: propshaft
   requirement: !ruby/object:Gem::Requirement
@@ -349,6 +349,8 @@ files:
 - app/jobs/layered/assistant/messages/response_job.rb
 - app/jobs/layered/assistant/messages/tool_call_job.rb
 - app/layered_resources/layered/assistant/assistant_resource.rb
+- app/layered_resources/layered/assistant/conversation_resource.rb
+- app/layered_resources/layered/assistant/message_resource.rb
 - app/layered_resources/layered/assistant/model_resource.rb
 - app/layered_resources/layered/assistant/persona_resource.rb
 - app/layered_resources/layered/assistant/provider_resource.rb
@@ -380,17 +382,12 @@ files:
 - app/services/layered/assistant/tool_registry.rb
 - app/services/layered/assistant/tool_runner_service.rb
 - app/tools/layered/assistant/tool.rb
-- app/views/layered/assistant/conversations/_form.html.erb
-- app/views/layered/assistant/conversations/edit.html.erb
-- app/views/layered/assistant/conversations/index.html.erb
-- app/views/layered/assistant/conversations/new.html.erb
 - app/views/layered/assistant/conversations/show.html.erb
 - app/views/layered/assistant/messages/_composer.html.erb
 - app/views/layered/assistant/messages/_composer_fields.html.erb
 - app/views/layered/assistant/messages/_message.html.erb
 - app/views/layered/assistant/messages/_tool_message.html.erb
 - app/views/layered/assistant/messages/create.turbo_stream.erb
-- app/views/layered/assistant/messages/index.html.erb
 - app/views/layered/assistant/panel/conversations/_header.html.erb
 - app/views/layered/assistant/panel/conversations/index.html.erb
 - app/views/layered/assistant/panel/conversations/new.html.erb
@@ -480,7 +477,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Open source, multi-provider, streaming AI assistant engine for Rails 8+ built
   on `layered-ui-rails`.

data/app/views/layered/assistant/conversations/_form.html.erb

@@ -1,29 +0,0 @@
-<%= form_with(model: conversation, url: url, html: { class: "l-ui-form" }) do |f| %>
-  <%= render "layered_ui/shared/form_errors", item: conversation %>
-
-  <% if conversation.new_record? %>
-    <div class="l-ui-form__group">
-      <%= render "layered_ui/shared/label", form: f, field: :assistant_id, name: "Assistant", required: true %>
-      <%= f.select :assistant_id, @assistants.map { |a| [a.name, a.id] }, { include_blank: "Select an assistant:" }, class: "l-ui-select" %>
-      <%= render "layered_ui/shared/field_error", object: conversation, field: :assistant %>
-    </div>
-  <% end %>
-
-  <div class="l-ui-form__group">
-    <%= render "layered_ui/shared/label", form: f, field: :name, required: false %>
-    <%= f.text_field :name, class: "l-ui-form__field" %>
-    <% if conversation.new_record? %>
-      <p class="l-ui-form__hint">Auto-set from first message if left blank</p>
-    <% end %>
-    <%= render "layered_ui/shared/field_error", object: conversation, field: :name %>
-  </div>
-
-  <div class="l-ui-spread l-ui-mt-8">
-    <% if conversation.persisted? %>
-      <%= link_to "Delete", layered_assistant.conversation_path(conversation), class: "l-ui-button l-ui-button--outline-danger", data: { turbo_method: :delete, turbo_confirm: "Are you sure?" } %>
-    <% else %>
-      <span></span>
-    <% end %>
-    <%= f.submit conversation.new_record? ? "Create" : "Update", class: "l-ui-button l-ui-button--primary" %>
-  </div>
-<% end %>

data/app/views/layered/assistant/conversations/edit.html.erb

@@ -1,6 +0,0 @@
-<%= l_ui_title_bar(
-  title: "Edit conversation",
-  breadcrumbs: [["Conversations", layered_assistant.conversations_path]]
-) %>
-
-<%= render "form", conversation: @conversation, url: layered_assistant.conversation_path(@conversation) %>

data/app/views/layered/assistant/conversations/index.html.erb

@@ -1,62 +0,0 @@
-<%= l_ui_title_bar(
-  title: @assistant ? "Conversations - #{@assistant.name}" : "Conversations",
-  breadcrumbs: @assistant ? [["Assistants", layered_assistant.assistants_path]] : []
-) do %>
-  <%= link_to "New", layered_assistant.new_conversation_path(conversation: @assistant ? { assistant_id: @assistant.id } : {}), class: "l-ui-button l-ui-button--primary" %>
-<% end %>
-
-<div class="l-ui-table-container l-ui-mt-4">
-  <table class="l-ui-table">
-    <caption class="l-ui-sr-only"><%= @assistant ? "Conversations for #{@assistant.name}" : "Conversations" %></caption>
-    <thead class="l-ui-table__header">
-      <tr>
-        <th scope="col" class="l-ui-table__header-cell">Name</th>
-        <% unless @assistant %>
-          <th scope="col" class="l-ui-table__header-cell">Assistant</th>
-        <% end %>
-        <th scope="col" class="l-ui-table__header-cell">Messages</th>
-        <th scope="col" class="l-ui-table__header-cell">Tokens</th>
-        <th scope="col" class="l-ui-table__header-cell">User</th>
-        <th scope="col" class="l-ui-table__header-cell">Created</th>
-        <th scope="col" class="l-ui-table__header-cell l-ui-table__header-cell--action">Actions</th>
-      </tr>
-    </thead>
-
-    <tbody class="l-ui-table__body">
-      <% @conversations.each do |conversation| %>
-        <tr>
-          <th scope="row" class="l-ui-table__cell l-ui-table__cell--primary">
-            <%= link_to conversation.name, layered_assistant.conversation_path(conversation) %>
-          </th>
-          <% unless @assistant %>
-            <td class="l-ui-table__cell">
-              <%= link_to conversation.assistant.name, layered_assistant.assistant_conversations_path(conversation.assistant) %>
-            </td>
-          <% end %>
-          <td class="l-ui-table__cell">
-            <%= link_to conversation.messages_count.to_i, layered_assistant.conversation_messages_path(conversation) %>
-          </td>
-          <td class="l-ui-table__cell">
-            <%= number_with_delimiter(conversation.token_estimate.to_i) %>
-          </td>
-          <td class="l-ui-table__cell">
-            <%# The person who did the talking, which is the owner itself
-                until an owner block scopes ownership elsewhere. Neither is
-                set for an anonymous visitor on a public assistant. %>
-            <%= conversation.user.try(:name) || conversation.owner.try(:name) || "Guest" %>
-          </td>
-          <td class="l-ui-table__cell">
-            <%= conversation.created_at.to_fs(:short) %>
-          </td>
-          <td class="l-ui-table__cell l-ui-table__cell--action">
-            <%= link_to "Edit", layered_assistant.edit_conversation_path(conversation), class: "l-ui-table__action" %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-
-  <div class="l-ui-mt-4">
-    <%= l_ui_pagy(@pagy) %>
-  </div>
-</div>

data/app/views/layered/assistant/conversations/new.html.erb

@@ -1,6 +0,0 @@
-<%= l_ui_title_bar(
-  title: "New conversation",
-  breadcrumbs: [["Conversations", layered_assistant.conversations_path]]
-) %>
-
-<%= render "form", conversation: @conversation, url: layered_assistant.conversations_path %>

data/app/views/layered/assistant/messages/index.html.erb

@@ -1,63 +0,0 @@
-<%= l_ui_title_bar(
-  title: "Messages",
-  breadcrumbs: [["Conversations", layered_assistant.conversations_path]]
-) %>
-
-<div class="l-ui-table-container l-ui-mt-4">
-  <table class="l-ui-table">
-    <caption class="l-ui-sr-only">Messages</caption>
-    <thead class="l-ui-table__header">
-      <tr>
-        <th scope="col" class="l-ui-table__header-cell">Role</th>
-        <th scope="col" class="l-ui-table__header-cell">Content</th>
-        <th scope="col" class="l-ui-table__header-cell">Model</th>
-        <th scope="col" class="l-ui-table__header-cell">Tokens</th>
-        <th scope="col" class="l-ui-table__header-cell">Tok/s</th>
-        <th scope="col" class="l-ui-table__header-cell">TTFT</th>
-        <th scope="col" class="l-ui-table__header-cell">Created</th>
-        <th scope="col" class="l-ui-table__header-cell l-ui-table__header-cell--action">Actions</th>
-      </tr>
-    </thead>
-
-    <tbody class="l-ui-table__body">
-      <% @messages.each do |message| %>
-        <tr>
-          <th scope="row" class="l-ui-table__cell l-ui-table__cell--primary">
-            <%= message.role %>
-          </th>
-          <td class="l-ui-table__cell">
-            <%= truncate(message.content, length: 100) %>
-          </td>
-          <td class="l-ui-table__cell">
-            <%= message.model&.name %>
-          </td>
-          <td class="l-ui-table__cell">
-            <% total = message.input_tokens.to_i + message.output_tokens.to_i %>
-            <% if total > 0 %>
-              <% prefix = message.tokens_estimated? ? "~" : "" %>
-              <%= "#{prefix}#{number_with_delimiter(total)}" %>
-            <% end %>
-          </td>
-          <td class="l-ui-table__cell">
-            <% if message.output_tokens.to_i > 0 && message.response_ms.to_i >= Layered::Assistant::MessagesHelper::MIN_RESPONSE_MS_FOR_TPS %>
-              <%= (message.output_tokens * 1000.0 / message.response_ms).round(1) %>
-            <% end %>
-          </td>
-          <td class="l-ui-table__cell">
-            <%= "#{message.ttft_ms}ms" if message.ttft_ms %>
-          </td>
-          <td class="l-ui-table__cell">
-            <%= message.created_at.to_fs(:short) %>
-          </td>
-          <td class="l-ui-table__cell l-ui-table__cell--action">
-            <%= link_to "Delete", layered_assistant.conversation_message_path(@conversation, message), class: "l-ui-table__action l-ui-table__action--danger", data: { turbo_method: :delete, turbo_confirm: "Are you sure?" } %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-
-  <div class="l-ui-mt-4">
-    <%= l_ui_pagy(@pagy) %>
-  </div>
-</div>