layered-assistant-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c09f437cf1d50e987e065bab63c5a974c569511d6095a09e0fb5e3072119d08b
-  data.tar.gz: 24476722cc3bf5d342cd308974e0fb888f059fd838cb406215e6772211dde587
+  metadata.gz: ff9af0132fa23f11eae8703acf4b0cfd2c893389fa0237e2883f09a6fa3080b3
+  data.tar.gz: 5a2e46ba572593219180533800eca8f69e78712a03bb521886f017c07a3b0a15
 SHA512:
-  metadata.gz: f26719babe3ba1885f3f96021f5900d202d9aa4ba70353477f6559ac8b04871a5d7bd24d81be0cd3b93866bf8d3e2d7cb83c5fab3b354c618e45555fe96476d4
-  data.tar.gz: 25fcf070c6222f1fca1234939f7f283cdabe0fd232ea407c704c2a8f270ae9ac2caaf57fb775f7d35a15d83c4c3a5921d616a847adf200190c5ecaf4e2bf5017
+  metadata.gz: b418c0f1b88ad608bfc07447b5227f5cdc499267c15810fccc0b7e97650a3d53476c6778fd1921438b280177ce677ccbcd492918738f070647146de51c908f6b
+  data.tar.gz: 5b3e1061ab08cd17abc131a909a39127e1adbe98c080e29cd3da4040172fab9e0f6978e72c1760a798b1dcd90a8a09c8608a361591f9632f81bc3a6672f090fe

data/AGENTS.md

@@ -53,7 +53,7 @@ It has its own `AGENTS.md` file — inspect it for context on the apps's convent
 
 ## Conventions
 
-- Use "layered-ui-assistant" not "Layered UI" when referring to the project
+- Use "layered-assistant-rails" not "Layered Assistant Rails" when referring to the project
 - Use normal dashes '-' not long ones '—'
 - Locale: Favour en-GB (British English), unless terms are defined by technical standards (e.g. LICENSE, COLOR).
 - Titles: capitalise first word only (e.g. "This title")

data/README.md

@@ -102,6 +102,40 @@ The `l_assistant_accessible?` helper evaluates the authorize block without side
 <% end %>
 ```
 
+## Record scoping
+
+By default, all records are visible to any authorised user. If your application is multi-tenant or you need to restrict which records a user can see, configure a `scope` block in the initialiser.
+
+The block receives the model class, runs in controller context, and must return an `ActiveRecord::Relation`. The following models are passed through the scope block:
+
+| Model | Description |
+|---|---|
+| `Layered::Assistant::Conversation` | User conversations (has polymorphic `owner`) |
+| `Layered::Assistant::Assistant` | Assistant configurations (has polymorphic `owner`) |
+| `Layered::Assistant::Provider` | API provider credentials (has polymorphic `owner`) |
+
+### Scope all owned resources to the current user
+
+```ruby
+Layered::Assistant.scope do |model_class|
+  model_class.where(owner: current_user)
+end
+```
+
+### Scope conversations only
+
+```ruby
+Layered::Assistant.scope do |model_class|
+  if model_class == Layered::Assistant::Conversation
+    model_class.where(owner: current_user)
+  else
+    model_class.all
+  end
+end
+```
+
+When no scope block is configured, queries are unscoped. Record-level access control is the host application's responsibility; the scope block is the integration point for it.
+
 ## Panel helpers
 
 The engine provides two convenience helpers for wiring the layered-ui panel to the assistant. Use them inside `content_for` blocks in your application layout:
@@ -131,12 +165,22 @@ Both helpers accept keyword arguments that are forwarded as HTML attributes to t
 
 ## Configuration
 
-### Environment Variables
+Optional settings can be added to your initialiser (`config/initializers/layered_assistant.rb`):
+
+```ruby
+# Log API errors to stdout (default: false)
+Layered::Assistant.log_errors = true
+
+# Total timeout in seconds for API requests, including the full streaming response (default: 210).
+# Increase for models with high max_tokens limits or slow providers.
+Layered::Assistant.api_request_timeout = 210
+
+# Disable Active Record Encryption on Provider#secret.
+# Only use this in development/test environments without encryption keys configured.
+Layered::Assistant.skip_db_encryption = true
+```
 
-| Variable | Default | Description |
-|---|---|---|
-| `LAYERED_ASSISTANT_DANGEROUSLY_SKIP_DB_ENCRYPTION` | `nil` | Set to `"yes"` to skip Active Record Encryption on `Provider#secret`. Only for development/test environments without encryption keys configured |
-| `LAYERED_ASSISTANT_LOG_ERRORS` | `nil` | Set to `"yes"` to enable error logging from the AI API clients |
+Note: `skip_db_encryption` is read at class load time, so it must be set before `Layered::Assistant::Provider` is first loaded. A standard Rails initialiser satisfies this requirement.
 
 ## Demo
 

data/app/controllers/concerns/layered/assistant/message_creation.rb

@@ -15,10 +15,7 @@ module Layered
         return { message: message } unless message.persisted?
 
         conversation.update_name_from_content!(content)
-        message.broadcast_created
 
-        models = Model.available
-        selected_model_id = model_id
         assistant_message = nil
         error = nil
 
@@ -28,8 +25,9 @@ module Layered
             content: nil,
             model_id: model_id
           )
-          assistant_message.broadcast_created
 
+          message.broadcast_created
+          assistant_message.broadcast_created
           Messages::ResponseJob.perform_later(assistant_message.id)
         rescue => e
           Rails.logger.error("Assistant response failed: #{e.message}")
@@ -39,8 +37,6 @@ module Layered
         {
           message: message,
           assistant_message: assistant_message,
-          models: models,
-          selected_model_id: selected_model_id,
           error: error
         }
       end

data/app/controllers/concerns/layered/assistant/public/session_conversations.rb

@@ -6,41 +6,40 @@ module Layered
 
         private
 
-        def session_conversation_ids
-          session[:layered_assistant_conversation_ids] ||= []
+        def session_conversation_uids
+          session[:layered_assistant_conversation_uids] ||= []
         end
 
         MAX_SESSION_CONVERSATIONS = 50
 
         def add_conversation_to_session(conversation)
-          ids = session_conversation_ids
-          ids << conversation.id unless ids.include?(conversation.id)
-          ids.shift while ids.size > MAX_SESSION_CONVERSATIONS
+          uids = session_conversation_uids
+          uids << conversation.uid unless uids.include?(conversation.uid)
+          uids.shift while uids.size > MAX_SESSION_CONVERSATIONS
         end
 
-        def find_session_conversation(id)
-          id = id.to_i
-          unless session_conversation_ids.include?(id)
+        def find_session_conversation(uid)
+          unless session_conversation_uids.include?(uid)
             raise ActiveRecord::RecordNotFound, "Conversation not found in session"
           end
 
-          Conversation.joins(:assistant).merge(Assistant.publicly_available).find(id)
+          Conversation.joins(:assistant).merge(Assistant.publicly_available).find_by!(uid: uid)
         rescue ActiveRecord::RecordNotFound
-          remove_conversation_from_session(id)
+          remove_conversation_from_session(uid)
           raise
         end
 
-        def remove_conversation_from_session(id)
-          session_conversation_ids.delete(id.to_i)
+        def remove_conversation_from_session(uid)
+          session_conversation_uids.delete(uid)
         end
 
         def existing_session_conversation_for(assistant)
-          return nil if session_conversation_ids.empty?
+          return nil if session_conversation_uids.empty?
 
           Conversation
             .joins(:assistant)
             .merge(Assistant.publicly_available)
-            .where(id: session_conversation_ids, assistant: assistant)
+            .where(uid: session_conversation_uids, assistant: assistant)
             .order(created_at: :desc)
             .first
         end

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

@@ -20,6 +20,18 @@ module Layered
 
         instance_exec(&block)
       end
+
+      def scoped(model_class)
+        block = Layered::Assistant.scope_block
+        return model_class.all unless block
+
+        result = instance_exec(model_class, &block)
+        unless result.is_a?(ActiveRecord::Relation)
+          raise ArgumentError,
+            "Layered::Assistant.scope must return an ActiveRecord::Relation, got #{result.class}"
+        end
+        result
+      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Layered
 
       def index
         @page_title = "Assistants"
-        @pagy, @assistants = pagy(Assistant.by_name)
+        @pagy, @assistants = pagy(scoped(Assistant).by_name)
       end
 
       def new
@@ -44,7 +44,7 @@ module Layered
       private
 
       def set_assistant
-        @assistant = Assistant.find(params[:id])
+        @assistant = scoped(Assistant).find(params[:id])
       end
 
       def set_models

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

@@ -8,12 +8,12 @@ module Layered
 
       def index
         if params[:assistant_id]
-          @assistant = Assistant.find(params[:assistant_id])
+          @assistant = scoped(Assistant).find(params[:assistant_id])
           @page_title = "Conversations - #{@assistant.name}"
-          @pagy, @conversations = pagy(@assistant.conversations.includes(:owner).by_created_at)
+          @pagy, @conversations = pagy(@assistant.conversations.merge(scoped(Conversation)).includes(:owner).by_created_at)
         else
           @page_title = "Conversations"
-          @pagy, @conversations = pagy(Conversation.includes(:assistant, :owner).by_created_at)
+          @pagy, @conversations = pagy(scoped(Conversation).includes(:assistant, :owner).by_created_at)
         end
       end
 
@@ -60,11 +60,11 @@ module Layered
       private
 
       def set_conversation
-        @conversation = Conversation.find(params[:id])
+        @conversation = scoped(Conversation).find_by!(uid: params[:id])
       end
 
       def set_assistants
-        @assistants = Assistant.by_name
+        @assistants = scoped(Assistant).by_name
       end
 
       def conversation_params

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

@@ -8,7 +8,7 @@ module Layered
 
       def index
         @page_title = "Messages"
-        @pagy, @messages = pagy(@conversation.messages.by_created_at)
+        @pagy, @messages = pagy(@conversation.messages.includes(:model).by_created_at)
       end
 
       def create
@@ -24,8 +24,8 @@ module Layered
         end
 
         @assistant_message = result[:assistant_message]
-        @models = result[:models]
-        @selected_model_id = result[:selected_model_id]
+        @models = Model.available
+        @selected_model_id = message_params[:model_id]
         @error = result[:error]
 
         respond_to do |format|
@@ -42,7 +42,7 @@ module Layered
       private
 
       def set_conversation
-        @conversation = Conversation.find(params[:conversation_id])
+        @conversation = scoped(Conversation).find_by!(uid: params[:conversation_id])
       end
 
       def set_message

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

@@ -46,7 +46,7 @@ module Layered
       private
 
       def set_provider
-        @provider = Provider.find(params[:provider_id])
+        @provider = scoped(Provider).find(params[:provider_id])
       end
 
       def set_model

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

@@ -42,15 +42,15 @@ module Layered
         private
 
         def set_conversation
-          @conversation = Conversation.find(params[:id])
+          @conversation = scoped(Conversation).find_by!(uid: params[:id])
         end
 
         def set_assistants
-          @assistants = Assistant.by_name
+          @assistants = scoped(Assistant).by_name
         end
 
         def set_conversations
-          scope = Conversation.by_created_at
+          scope = scoped(Conversation).by_created_at
           scope = scope.where(assistant_id: params[:assistant_id]) if params[:assistant_id].present?
           @conversations = scope.limit(20)
         end

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

@@ -20,8 +20,8 @@ module Layered
           end
 
           @assistant_message = result[:assistant_message]
-          @models = result[:models]
-          @selected_model_id = result[:selected_model_id]
+          @models = Model.available
+          @selected_model_id = message_params[:model_id]
           @error = result[:error]
 
           respond_to do |format|
@@ -32,7 +32,7 @@ module Layered
         private
 
         def set_conversation
-          @conversation = Conversation.find(params[:conversation_id])
+          @conversation = scoped(Conversation).find_by!(uid: params[:conversation_id])
         end
 
         def message_params

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

@@ -5,7 +5,7 @@ module Layered
 
       def index
         @page_title = "Providers"
-        @pagy, @providers = pagy(Provider.sorted)
+        @pagy, @providers = pagy(scoped(Provider).sorted)
       end
 
       def new
@@ -44,7 +44,7 @@ module Layered
       private
 
       def set_provider
-        @provider = Provider.find(params[:id])
+        @provider = scoped(Provider).find(params[:id])
       end
 
       def provider_params

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

@@ -36,7 +36,7 @@ module Layered
           def set_conversation
             @conversation = find_session_conversation(params[:id])
           rescue ActiveRecord::RecordNotFound
-            assistant = Conversation.find_by(id: params[:id])&.assistant
+            assistant = Conversation.find_by(uid: params[:id])&.assistant
             if assistant&.public?
               redirect_to layered_assistant.public_panel_conversations_path(assistant_id: assistant.id)
             else
@@ -46,9 +46,9 @@ module Layered
 
           def set_session_conversations
             assistant_id = @conversation&.assistant_id || @assistant&.id
-            @conversations = if session_conversation_ids.any?
+            @conversations = if session_conversation_uids.any?
               scope = Conversation.joins(:assistant).merge(Assistant.publicly_available)
-                .where(id: session_conversation_ids)
+                .where(uid: session_conversation_uids)
                 .by_created_at
               scope = scope.where(assistant_id: assistant_id) if assistant_id
               scope.limit(20)

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

@@ -32,7 +32,7 @@ module Layered
           def set_conversation
             @conversation = find_session_conversation(params[:conversation_id])
           rescue ActiveRecord::RecordNotFound
-            assistant = Conversation.find_by(id: params[:conversation_id])&.assistant
+            assistant = Conversation.find_by(uid: params[:conversation_id])&.assistant
             if assistant&.public?
               redirect_to layered_assistant.new_public_panel_conversation_path(assistant_id: assistant.id)
             else

data/app/helpers/layered/assistant/access_helper.rb

@@ -31,11 +31,11 @@ module Layered
         private
 
         def method_missing(method, ...)
-          @context.send(method, ...)
+          @context.public_send(method, ...)
         end
 
         def respond_to_missing?(method, include_private = false)
-          @context.respond_to?(method, include_private)
+          @context.respond_to?(method, false)
         end
       end
 

data/app/helpers/layered/assistant/messages_helper.rb

@@ -15,6 +15,23 @@ module Layered
 
       ALLOWED_ATTRIBUTES = %w[href title class].freeze
 
+      MIN_RESPONSE_MS_FOR_TPS = 100
+
+      def message_metadata_title(message)
+        total_tokens = message.input_tokens.to_i + message.output_tokens.to_i
+        parts = []
+        if total_tokens > 0
+          prefix = message.tokens_estimated? ? "~" : ""
+          parts << "#{prefix}#{number_with_delimiter(total_tokens)} tokens"
+        end
+        if message.output_tokens.to_i > 0 && message.response_ms.to_i >= MIN_RESPONSE_MS_FOR_TPS
+          tps = (message.output_tokens * 1000.0 / message.response_ms).round(1)
+          parts << "#{tps} tok/s"
+        end
+        parts << "#{message.ttft_ms}ms TTFT" if message.ttft_ms
+        parts.join(" · ")
+      end
+
       def render_message_content(message)
         return if message.content.blank?
 
@@ -24,7 +41,7 @@ module Layered
           syntax_highlighter: nil
         ).to_html
 
-        sanitize(html, tags: ALLOWED_TAGS, attributes: ALLOWED_ATTRIBUTES).html_safe
+        sanitize(html, tags: ALLOWED_TAGS, attributes: ALLOWED_ATTRIBUTES)
       end
 
       private

data/app/javascript/layered_assistant/composer_controller.js

@@ -107,6 +107,9 @@ export default class extends Controller {
   _resetRespondingTimeout() {
     if (!this.respondingValue) return
     clearTimeout(this._respondingTimeout)
-    this._respondingTimeout = setTimeout(() => { this.respondingValue = false }, 60000)
+    this._respondingTimeout = setTimeout(() => {
+      this.respondingValue = false
+      document.dispatchEvent(new CustomEvent("assistant:response-timeout"))
+    }, 30000)
   }
 }

data/app/javascript/layered_assistant/messages_controller.js

@@ -9,14 +9,29 @@ export default class extends Controller {
     this._userInitiated = false
 
     this._markUser = () => { this._userInitiated = true }
+    this._onTimeout = () => {
+      this.listTarget.querySelectorAll(".l-ui-typing-indicator").forEach(el => {
+        const body = el.closest(".l-ui-message__body")
+        el.remove()
+        if (body && body.children.length === 0) {
+          body.insertAdjacentHTML("beforeend", '<div class="l-ui-notice--error" role="status">The response could not be completed.</div>')
+        }
+      })
+    }
     this.element.addEventListener("wheel", this._markUser, { passive: true })
     this.element.addEventListener("touchmove", this._markUser, { passive: true })
     this.element.addEventListener("scroll", this._onScroll, { passive: true })
+    document.addEventListener("assistant:response-timeout", this._onTimeout)
 
     this.scrollToBottom()
 
-    this.observer = new MutationObserver(() => {
+    this.observer = new MutationObserver((mutations) => {
       if (this._pinned) this.scrollToBottom()
+
+      const hasNewChildren = mutations.some(m =>
+        m.type === "childList" && m.target === this.listTarget && m.addedNodes.length > 0
+      )
+      if (hasNewChildren) this._sortMessages()
     })
     this.observer.observe(this.listTarget, { childList: true, subtree: true })
   }
@@ -25,6 +40,7 @@ export default class extends Controller {
     this.element.removeEventListener("wheel", this._markUser)
     this.element.removeEventListener("touchmove", this._markUser)
     this.element.removeEventListener("scroll", this._onScroll)
+    document.removeEventListener("assistant:response-timeout", this._onTimeout)
     this.observer.disconnect()
   }
 
@@ -59,4 +75,18 @@ export default class extends Controller {
   isNearBottom() {
     return this.element.scrollHeight - this.element.scrollTop - this.element.clientHeight <= 32
   }
+
+  _sortMessages() {
+    const children = Array.from(this.listTarget.children)
+    const sorted = children.slice().sort((a, b) => {
+      const aTime = parseInt(a.dataset.createdAt || "0", 10)
+      const bTime = parseInt(b.dataset.createdAt || "0", 10)
+      return aTime - bTime
+    })
+    if (sorted.some((el, i) => el !== children[i])) {
+      this.observer.disconnect()
+      sorted.forEach(el => this.listTarget.appendChild(el))
+      this.observer.observe(this.listTarget, { childList: true, subtree: true })
+    }
+  }
 }

data/app/jobs/layered/assistant/messages/response_job.rb

@@ -22,6 +22,7 @@ module Layered
           end
 
           begin
+            chunk_service.mark_started!
             ClientService.new.call(message: message, stream_proc: stream_proc)
           rescue => e
             Rails.logger.error("Response generation failed: #{e.message}")

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

@@ -17,6 +17,10 @@ module Layered
       scope :by_name, -> { order(name: :asc, created_at: :desc) }
       scope :by_created_at, -> { order(created_at: :desc) }
 
+      def to_param
+        uid
+      end
+
       # Name
       def update_token_totals!
         input = messages.sum(:input_tokens)
@@ -29,15 +33,24 @@ module Layered
       end
 
       def stop_response!
-        message = messages.where(role: :assistant, stopped: false).order(created_at: :desc).first
-        return false unless message
+        with_lock do
+          message = messages.where(role: :assistant, stopped: false).order(created_at: :desc).first
+          return false unless message
+
+          attrs = {
+            stopped: true,
+            output_tokens: TokenEstimator.estimate(message.content) || 0,
+            tokens_estimated: true
+          }
 
-        message.with_lock do
-          return false if message.stopped?
+          if message.input_tokens.nil?
+            prior_content = messages.where("created_at < ?", message.created_at).pluck(:content).compact.join(" ")
+            attrs[:input_tokens] = TokenEstimator.estimate(prior_content) || 0
+          end
 
-          estimated = TokenEstimator.estimate(message.content) || 0
-          message.update!(stopped: true, output_tokens: estimated, tokens_estimated: true)
+          message.update!(attrs)
           update_token_totals!
+          message.reload
           message.broadcast_updated
           message.broadcast_response_complete
         end

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

@@ -22,7 +22,7 @@ module Layered
       belongs_to :model, optional: true, counter_cache: true
 
       # Scopes
-      scope :by_created_at, -> { order(created_at: :asc) }
+      scope :by_created_at, -> { order(created_at: :asc, id: :asc) }
 
       # Broadcasting
       def broadcast_created

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

@@ -13,12 +13,12 @@ module Layered
 
       # Enums
       enum :protocol, {
-        anthropic: "Anthropic",
-        openai: "OpenAI"
+        anthropic: "anthropic",
+        openai: "openai"
       }
 
       # Encryption
-      unless ENV["LAYERED_ASSISTANT_DANGEROUSLY_SKIP_DB_ENCRYPTION"] == "yes"
+      unless Layered::Assistant.skip_db_encryption
         encrypts :secret
       end
 

data/app/services/layered/assistant/chunk_parser.rb

@@ -0,0 +1,46 @@
+module Layered
+  module Assistant
+    class ChunkParser
+      def initialize(protocol)
+        @openai = protocol == "openai"
+      end
+
+      def text(chunk)
+        t = if @openai
+          chunk.dig("choices", 0, "delta", "content")
+        else
+          chunk.dig("delta", "text") if chunk["type"] == "content_block_delta"
+        end
+        t unless t.nil? || t.empty?
+      end
+
+      def finished?(chunk)
+        if @openai
+          chunk.dig("choices", 0, "finish_reason").present?
+        else
+          chunk["type"] == "message_stop"
+        end
+      end
+
+      def usage_ready?(chunk)
+        @openai && chunk["usage"].present? && chunk.dig("choices")&.empty?
+      end
+
+      def input_tokens(chunk)
+        if @openai
+          chunk.dig("usage", "prompt_tokens")&.to_i if usage_ready?(chunk)
+        elsif chunk["type"] == "message_start"
+          chunk.dig("message", "usage", "input_tokens")&.to_i
+        end
+      end
+
+      def output_tokens(chunk)
+        if @openai
+          chunk.dig("usage", "completion_tokens")&.to_i if usage_ready?(chunk)
+        elsif chunk["type"] == "message_delta"
+          chunk.dig("usage", "output_tokens")&.to_i
+        end
+      end
+    end
+  end
+end

data/app/services/layered/assistant/chunk_service.rb

@@ -3,34 +3,49 @@ module Layered
     class ChunkService
       STOP_CHECK_INTERVAL = 25
 
-      def initialize(message, provider:)
+      def initialize(message, provider:, started_at: nil)
         @message = message
-        @provider = provider
+        @parser = ChunkParser.new(provider.protocol)
+        @timer = ResponseTimer.new
+        @timer.start! if started_at
         @input_tokens = 0
         @output_tokens = 0
         @chunk_count = 0
         @stopped = false
       end
 
+      def mark_started!
+        @timer.start!
+      end
+
       def call(chunk)
         return if @stopped
 
         @chunk_count += 1
         if @chunk_count % STOP_CHECK_INTERVAL == 0
           @stopped = @message.reload.stopped?
-          return if @stopped
+          if @stopped
+            attrs = @timer.timing_attrs
+            unless attrs.empty?
+              @message.update!(attrs)
+              @message.broadcast_updated
+            end
+            return
+          end
         end
 
         Rails.logger.debug { "[ChunkService] #{chunk.inspect}" }
-        text = extract_text(chunk)
-        extract_usage(chunk)
+        text = @parser.text(chunk)
+        @input_tokens  = @parser.input_tokens(chunk)  || @input_tokens
+        @output_tokens = @parser.output_tokens(chunk) || @output_tokens
 
         if text
-          @message.update(content: (@message.content || "") + text)
+          @timer.record_first_token!
+          @message.update!(content: (@message.content || "") + text)
           @message.broadcast_chunk(text)
         end
 
-        if chunk_finished?(chunk) || usage_chunk?(chunk)
+        if @parser.finished?(chunk) || @parser.usage_ready?(chunk)
           save_token_usage
           @message.broadcast_updated
         end
@@ -38,51 +53,15 @@ module Layered
 
       private
 
-      def extract_text(chunk)
-        text = if @provider.protocol == "openai"
-          chunk.dig("choices", 0, "delta", "content")
-        else
-          chunk.dig("delta", "text") if chunk["type"] == "content_block_delta"
-        end
-        text unless text.nil? || text.empty?
-      end
-
-      def chunk_finished?(chunk)
-        if @provider.protocol == "openai"
-          chunk.dig("choices", 0, "finish_reason").present?
-        else
-          chunk["type"] == "message_stop"
-        end
-      end
-
-      def usage_chunk?(chunk)
-        @provider.protocol == "openai" && chunk["usage"].present? && chunk.dig("choices")&.empty?
-      end
-
-      def extract_usage(chunk)
-        if @provider.protocol == "openai"
-          if (usage = chunk["usage"])
-            @input_tokens = usage["prompt_tokens"].to_i
-            @output_tokens = usage["completion_tokens"].to_i
-          end
-        else
-          if chunk["type"] == "message_start" && (usage = chunk.dig("message", "usage"))
-            @input_tokens = usage["input_tokens"].to_i
-          end
-          if chunk["type"] == "message_delta" && (usage = chunk["usage"])
-            @output_tokens = usage["output_tokens"].to_i
-          end
-        end
-      end
-
       def save_token_usage
+        timing = @timer.timing_attrs
         if @input_tokens == 0 && @output_tokens == 0
           estimated = TokenEstimator.estimate(@message.content)
           return unless estimated
 
-          @message.update!(output_tokens: estimated, tokens_estimated: true)
+          @message.update!(output_tokens: estimated, tokens_estimated: true, **timing)
         else
-          @message.update!(input_tokens: @input_tokens, output_tokens: @output_tokens)
+          @message.update!(input_tokens: @input_tokens, output_tokens: @output_tokens, **timing)
         end
 
         @message.conversation.update_token_totals!

data/app/services/layered/assistant/clients/anthropic.rb

@@ -8,14 +8,15 @@ module Layered
           parameters = {
             model: model,
             messages: formatted[:messages],
-            max_tokens: 4096,
+            max_tokens: 8192,
             stream: stream_proc
           }
           parameters[:system] = formatted[:system] if formatted[:system].present?
 
           ::Anthropic::Client.new(
             access_token: @api_key,
-            log_errors: ENV.fetch("LAYERED_ASSISTANT_LOG_ERRORS", "no") == "yes"
+            log_errors: Layered::Assistant.log_errors,
+            request_timeout: Layered::Assistant.api_request_timeout
           ).messages(parameters: parameters)
         end
       end

data/app/services/layered/assistant/clients/openai.rb

@@ -7,7 +7,8 @@ module Layered
 
           client_options = {
             access_token: @api_key,
-            log_errors: ENV.fetch("LAYERED_ASSISTANT_LOG_ERRORS", "no") == "yes"
+            log_errors: Layered::Assistant.log_errors,
+            request_timeout: Layered::Assistant.api_request_timeout
           }
           if @provider.url.present?
             client_options[:uri_base] = @provider.url.sub(/\/\z/, "")
@@ -15,7 +16,7 @@ module Layered
           end
 
           ::OpenAI::Client.new(**client_options) do |f|
-            if ENV.fetch("LAYERED_ASSISTANT_LOG_ERRORS", "no") == "yes"
+            if Layered::Assistant.log_errors
               f.response :logger, Logger.new($stdout), bodies: true
             end
           end.chat(

data/app/services/layered/assistant/response_timer.rb

@@ -0,0 +1,31 @@
+module Layered
+  module Assistant
+    class ResponseTimer
+      def initialize
+        @started_at = nil
+        @first_token_at = nil
+      end
+
+      def start!
+        @started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+
+      def record_first_token!
+        @first_token_at ||= Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+
+      def timing_attrs
+        return {} unless @started_at
+
+        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        attrs = { response_ms: ((now - @started_at) * 1000).round }
+        attrs[:ttft_ms] = ((@first_token_at - @started_at) * 1000).round if @first_token_at
+        attrs
+      end
+
+      def started?
+        !@started_at.nil?
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-<%= form_with(model: assistant, url: url, html: { class: "l-ui-form l-ui-utility--mt-2xl" }) do |f| %>
+<%= form_with(model: assistant, url: url, html: { class: "l-ui-form" }) do |f| %>
   <%= render "layered_ui/shared/form_errors", item: assistant %>
 
   <div class="l-ui-form__group">

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

@@ -1,4 +1,4 @@
-<%= form_with(model: conversation, url: url, html: { class: "l-ui-form l-ui-utility--mt-2xl" }) do |f| %>
+<%= 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? %>

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

@@ -1,4 +1,4 @@
-<%= tag.div id: dom_id(message), class: "#{dom_id(message)} #{message.user? ? "l-ui-message--sent" : "l-ui-message"}" do %>
+<%= tag.div id: dom_id(message), data: { created_at: (message.created_at.to_f * 1000).to_i }, class: "#{dom_id(message)} #{message.user? ? "l-ui-message--sent" : "l-ui-message"}" do %>
   <div class="l-ui-message__bubble">
     <% unless message.user? %>
       <div class="l-ui-message__author"><%= message.role.capitalize %></div>
@@ -18,9 +18,9 @@
       <% end %>
     </div>
     <div class="l-ui-message__footer">
-      <% total_tokens = message.input_tokens.to_i + message.output_tokens.to_i %>
-      <% if message.model || total_tokens > 0 %>
-        <span class="l-ui-message__metadata"><%= [message.model&.name, total_tokens > 0 ? "#{message.tokens_estimated? ? "~" : ""}#{number_with_delimiter(total_tokens)} tokens" : nil].compact.join(" · ") %></span>
+      <% if message.model %>
+        <% title = message_metadata_title(message) %>
+        <span class="l-ui-message__metadata"<%= " title=\"#{title}\"".html_safe if title.present? %>><%= message.model.name %></span>
       <% end %>
       <span class="l-ui-message__timestamp"><%= message.created_at.to_fs(:short) %></span>
     </div>

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

@@ -10,7 +10,10 @@
       <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--action">Actions</th>
       </tr>
@@ -25,9 +28,23 @@
           <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 %>
-            <%= number_with_delimiter(total) || 0 %>
+            <% 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) %>

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

@@ -1,4 +1,4 @@
-<%= form_with(model: model, url: url, html: { class: "l-ui-form l-ui-utility--mt-2xl" }) do |f| %>
+<%= form_with(model: model, url: url, html: { class: "l-ui-form" }) do |f| %>
   <%= render "layered_ui/shared/form_errors", item: model %>
 
   <div class="l-ui-form__group">

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

@@ -1,4 +1,4 @@
-<%= form_with(model: provider, url: url, html: { class: "l-ui-form l-ui-utility--mt-2xl" }) do |f| %>
+<%= form_with(model: provider, url: url, html: { class: "l-ui-form" }) do |f| %>
   <%= render "layered_ui/shared/form_errors", item: provider %>
 
   <div data-controller="provider-template" data-provider-template-templates-value="<%= Layered::Assistant::Provider::TEMPLATES.values.flatten.to_json %>">
@@ -27,7 +27,7 @@
 
     <div class="l-ui-form__group">
       <%= render "layered_ui/shared/label", form: f, field: :protocol, required: true %>
-      <%= f.select :protocol, Layered::Assistant::Provider.protocols.map { |k, v| [v, k] }, { include_blank: "Select:" }, { class: "l-ui-select", data: { provider_template_target: "protocol" } } %>
+      <%= f.select :protocol, Layered::Assistant::Provider.protocols.keys.map { |k| [I18n.t("layered_assistant.protocols.#{k}"), k] }, { include_blank: "Select:" }, { class: "l-ui-select", data: { provider_template_target: "protocol" } } %>
       <%= render "layered_ui/shared/field_error", object: provider, field: :protocol %>
     </div>
 

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

@@ -23,7 +23,7 @@
             <%= provider.name %>
           </td>
           <td class="l-ui-table__cell">
-            <%= Layered::Assistant::Provider.protocols[provider.protocol] %>
+            <%= I18n.t("layered_assistant.protocols.#{provider.protocol}") %>
           </td>
           <td class="l-ui-table__cell">
             <%= link_to provider.models_count, layered_assistant.provider_models_path(provider) %>

data/app/views/layered/assistant/setup/_setup.html.erb

@@ -51,6 +51,62 @@ end</code></pre>
   &lt;%= link_to "Assistant", layered_assistant.root_path %&gt;
 &lt;% end %&gt;</code></pre>
 
+<h2 class="l-ui-utility--mt-xl">Record scoping</h2>
+<p class="l-ui-utility--mt-md">
+  By default, all records are visible to any authorised user. If your application is
+  multi-tenant or you need to restrict which records a user can see, configure a
+  <code>scope</code> block in the initialiser.
+</p>
+<p class="l-ui-utility--mt-md">
+  The block receives the model class, runs in controller context, and must return an
+  <code>ActiveRecord::Relation</code>. The following models are passed through the scope block:
+</p>
+
+<div class="l-ui-container--table l-ui-utility--mt-lg">
+  <table class="l-ui-table">
+    <caption class="l-ui-sr-only">Scopeable models reference</caption>
+    <thead class="l-ui-table__header">
+      <tr>
+        <th class="l-ui-table__header-cell" scope="col">Model</th>
+        <th class="l-ui-table__header-cell" scope="col">Description</th>
+      </tr>
+    </thead>
+    <tbody class="l-ui-table__body">
+      <tr>
+        <th class="l-ui-table__cell--primary" scope="row"><code>Layered::Assistant::Conversation</code></th>
+        <td class="l-ui-table__cell">User conversations (has polymorphic <code>owner</code>)</td>
+      </tr>
+      <tr>
+        <th class="l-ui-table__cell--primary" scope="row"><code>Layered::Assistant::Assistant</code></th>
+        <td class="l-ui-table__cell">Assistant configurations (has polymorphic <code>owner</code>)</td>
+      </tr>
+      <tr>
+        <th class="l-ui-table__cell--primary" scope="row"><code>Layered::Assistant::Provider</code></th>
+        <td class="l-ui-table__cell">API provider credentials (has polymorphic <code>owner</code>)</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<h3 class="l-ui-utility--mt-lg">Scope all owned resources to the current user</h3>
+<pre class="l-ui-surface l-ui-utility--mt-md"><code>Layered::Assistant.scope do |model_class|
+  model_class.where(owner: current_user)
+end</code></pre>
+
+<h3 class="l-ui-utility--mt-lg">Scope conversations only</h3>
+<pre class="l-ui-surface l-ui-utility--mt-md"><code>Layered::Assistant.scope do |model_class|
+  if model_class == Layered::Assistant::Conversation
+    model_class.where(owner: current_user)
+  else
+    model_class.all
+  end
+end</code></pre>
+
+<p class="l-ui-utility--mt-md">
+  When no scope block is configured, queries are unscoped. Record-level access control
+  is the host application's responsibility; the scope block is the integration point for it.
+</p>
+
 <h2 class="l-ui-utility--mt-xl">Panel helpers</h2>
 <p class="l-ui-utility--mt-md">
   Two helpers are available to wire the <code>layered-ui</code> panel to the assistant engine.
@@ -90,6 +146,39 @@ end</code></pre>
   </table>
 </div>
 
+<h2 class="l-ui-utility--mt-xl">Configuration</h2>
+<p class="l-ui-utility--mt-md">
+  Optional settings can be added to your initialiser (<code>config/initializers/layered_assistant.rb</code>):
+</p>
+
+<div class="l-ui-container--table l-ui-utility--mt-lg">
+  <table class="l-ui-table">
+    <caption class="l-ui-sr-only">Configuration options reference</caption>
+    <thead class="l-ui-table__header">
+      <tr>
+        <th class="l-ui-table__header-cell" scope="col">Option</th>
+        <th class="l-ui-table__header-cell" scope="col">Default</th>
+        <th class="l-ui-table__header-cell" scope="col">Description</th>
+      </tr>
+    </thead>
+    <tbody class="l-ui-table__body">
+      <tr>
+        <th class="l-ui-table__cell--primary" scope="row"><code>log_errors</code></th>
+        <td class="l-ui-table__cell"><code>false</code></td>
+        <td class="l-ui-table__cell">Log API errors to stdout from the AI API clients</td>
+      </tr>
+      <tr>
+        <th class="l-ui-table__cell--primary" scope="row"><code>skip_db_encryption</code></th>
+        <td class="l-ui-table__cell"><code>false</code></td>
+        <td class="l-ui-table__cell">Disable Active Record Encryption on <code>Provider#secret</code>. Only for development/test environments without encryption keys configured</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<pre class="l-ui-surface l-ui-utility--mt-lg"><code>Layered::Assistant.log_errors = true
+Layered::Assistant.skip_db_encryption = true</code></pre>
+
 <h2 class="l-ui-utility--mt-xl">Getting started</h2>
 <ol class="l-ui-list l-ui-utility--mt-md">
   <li><%= link_to "Create a provider", layered_assistant.new_provider_path %> (e.g. Anthropic or OpenAI) with your API key</li>

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  layered_assistant:
+    protocols:
+      anthropic: "Anthropic"
+      openai: "OpenAI"

data/db/migrate/20260315100000_add_response_timing_to_layered_assistant_messages.rb

@@ -0,0 +1,6 @@
+class AddResponseTimingToLayeredAssistantMessages < ActiveRecord::Migration[8.1]
+  def change
+    add_column :layered_assistant_messages, :ttft_ms, :integer
+    add_column :layered_assistant_messages, :response_ms, :integer
+  end
+end

data/db/migrate/20260317000000_normalise_provider_protocol_values.rb

@@ -0,0 +1,11 @@
+class NormaliseProviderProtocolValues < ActiveRecord::Migration[8.1]
+  def up
+    execute "UPDATE layered_assistant_providers SET protocol = 'anthropic' WHERE protocol = 'Anthropic'"
+    execute "UPDATE layered_assistant_providers SET protocol = 'openai' WHERE protocol = 'OpenAI'"
+  end
+
+  def down
+    execute "UPDATE layered_assistant_providers SET protocol = 'Anthropic' WHERE protocol = 'anthropic'"
+    execute "UPDATE layered_assistant_providers SET protocol = 'OpenAI' WHERE protocol = 'openai'"
+  end
+end

data/lib/generators/layered/assistant/templates/initializer.rb

@@ -24,3 +24,37 @@
 # Layered::Assistant.authorize do
 #   head :forbidden unless current_user&.admin?
 # end
+
+# Configure record scoping for layered-assistant-rails.
+# By default, all records are visible to any authorised user. Use the scope
+# block to restrict which records are returned from the engine's controllers.
+#
+# The block receives the model class and runs in controller context, so you
+# have access to current_user and other helpers. Return an ActiveRecord
+# relation (e.g. model_class.where(...) or model_class.all).
+#
+# Models passed through the scope block:
+#   - Layered::Assistant::Conversation (has polymorphic owner)
+#   - Layered::Assistant::Assistant    (has polymorphic owner)
+#   - Layered::Assistant::Provider     (has polymorphic owner)
+#
+# Scope all owned resources to the current user:
+#
+# Layered::Assistant.scope do |model_class|
+#   model_class.where(owner: current_user)
+# end
+#
+# Scope conversations only, leave others unscoped:
+#
+# Layered::Assistant.scope do |model_class|
+#   if model_class == Layered::Assistant::Conversation
+#     model_class.where(owner: current_user)
+#   else
+#     model_class.all
+#   end
+# end
+
+# Optional settings (uncomment to enable):
+# Layered::Assistant.log_errors = true              # log API errors to stdout
+# Layered::Assistant.api_request_timeout = 210      # total API timeout in seconds, including full streaming response (default: 210)
+# Layered::Assistant.skip_db_encryption = true      # skip encryption on Provider#secret (dev/test only)

data/lib/layered/assistant/version.rb

@@ -1,5 +1,5 @@
 module Layered
   module Assistant
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/layered/assistant.rb

@@ -11,9 +11,17 @@ require "layered/assistant/engine"
 module Layered
   module Assistant
     mattr_reader :authorize_block
+    mattr_reader :scope_block
+    mattr_accessor :log_errors, default: false
+    mattr_accessor :api_request_timeout, default: 210
+    mattr_accessor :skip_db_encryption, default: false
 
     def self.authorize(&block)
       @@authorize_block = block
     end
+
+    def self.scope(&block)
+      @@scope_block = block
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: layered-assistant-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - layered.ai
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-15 00:00:00.000000000 Z
+date: 2026-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -340,6 +340,7 @@ files:
 - app/models/layered/assistant/message.rb
 - app/models/layered/assistant/model.rb
 - app/models/layered/assistant/provider.rb
+- app/services/layered/assistant/chunk_parser.rb
 - app/services/layered/assistant/chunk_service.rb
 - app/services/layered/assistant/client_service.rb
 - app/services/layered/assistant/clients/anthropic.rb
@@ -347,6 +348,7 @@ files:
 - app/services/layered/assistant/clients/openai.rb
 - app/services/layered/assistant/messages_service.rb
 - app/services/layered/assistant/models/create_service.rb
+- app/services/layered/assistant/response_timer.rb
 - app/services/layered/assistant/token_estimator.rb
 - app/views/layered/assistant/assistants/_form.html.erb
 - app/views/layered/assistant/assistants/edit.html.erb
@@ -393,10 +395,13 @@ files:
 - app/views/layouts/layered/assistant/_host_navigation.html.erb
 - app/views/layouts/layered/assistant/application.html.erb
 - config/importmap.rb
+- config/locales/en.yml
 - config/routes.rb
 - data/models.json
 - db/migrate/20260312000000_create_layered_assistant_tables.rb
 - db/migrate/20260315000000_add_stopped_to_layered_assistant_messages.rb
+- db/migrate/20260315100000_add_response_timing_to_layered_assistant_messages.rb
+- db/migrate/20260317000000_normalise_provider_protocol_values.rb
 - lib/generators/layered/assistant/install_generator.rb
 - lib/generators/layered/assistant/migrations_generator.rb
 - lib/generators/layered/assistant/templates/initializer.rb