layered-assistant-rails 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c052e155f7489ab469b2fe1cc4a59b9285fceaaf2595c5947287a95f31a1ed
-  data.tar.gz: 8449a3ab76b185cae858779e37fe6888679a1d9f96b76717871acf3fa5b49443
+  metadata.gz: 8c4d53502a7e91e56f50420d3d16830d3441a49a3a6a5a399be405d10e0c05b4
+  data.tar.gz: 6155fe4297f73702449ac22e099692cc17d6582c697f68c0e7b9df8f0f3bc96f
 SHA512:
-  metadata.gz: 614f4ec4a6e1a592604a9f98572a61cd39808bd47dbcc9e2fcc8d80532dedb378f708877770aef11aaed25f9838be1a867b844b170efbdcb7be6a30dadb7d8b5
-  data.tar.gz: 2655b683321d5e9a191106d8e20ab887b679d1b524e504a165a399dd30ef94874078908112ae6481c6bcbc7f2e00df07b9c3ea842e05313c7b9f3bd57b4eff74
+  metadata.gz: 8131ee6e51b4f9417501de38b88af330e1dbd6b0603e4284e56900e37b41c549265d56821b6518846e1d1c95382d4fe186fca8c2d5a450c7c4a17f2a5ac79266
+  data.tar.gz: 9ff9c8b830ee1cabaeed1da03332e57f5622ce79104f3d0f2e760be19d2dc503adcc0195bb3eb0d877b9b4a656a8556e6596301b087eb9fb805d619291978e18

data/AGENTS.md

@@ -39,6 +39,10 @@ You can run the tests with: `bundle exec rake test`
 - Tables prefixed `layered_assistant_`
 - Models inherit from `Layered::Assistant::ApplicationRecord`
 
+### Ownership and scoping
+
+Ownership is enforced at the controller layer via `scoped()`, not with model validations. When a controller action accepts a foreign key for a scoped model (e.g. `persona_id`, `assistant_id`), look up the record through `scoped(Model).find(params[:id])` so that out-of-scope IDs return 404. Do not add model-level validations that duplicate this scoping logic.
+
 ### Generators
 
 Verify dependencies before modifying host app files. Use `inject_into_file` for safe insertion. Check for existing imports to ensure idempotency.

data/README.md

@@ -106,13 +106,7 @@ The `l_assistant_accessible?` helper evaluates the authorize block without side
 
 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`) |
+The block receives the model class, runs in controller context, and must return an `ActiveRecord::Relation`. All engine models with a polymorphic `owner` association are passed through the scope block.
 
 ### Scope all owned resources to the current user
 

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

@@ -3,6 +3,7 @@ module Layered
     class AssistantsController < ApplicationController
       before_action :set_assistant, only: [:edit, :update, :destroy]
       before_action :set_models, only: [:new, :create, :edit, :update]
+      before_action :set_personas, only: [:new, :create, :edit, :update]
 
       def index
         @page_title = "Assistants"
@@ -15,8 +16,9 @@ module Layered
       end
 
       def create
-        @assistant = Assistant.new(assistant_params)
+        @assistant = Assistant.new(assistant_params.except(:persona_id))
         @assistant.owner = l_ui_current_user
+        @assistant.persona = scoped(Persona).find(assistant_params[:persona_id]) if assistant_params[:persona_id].present?
 
         if @assistant.save
           redirect_to layered_assistant.assistants_path, notice: "Assistant was successfully created."
@@ -30,7 +32,11 @@ module Layered
       end
 
       def update
-        if @assistant.update(assistant_params)
+        if assistant_params.key?(:persona_id)
+          @assistant.persona = assistant_params[:persona_id].present? ? scoped(Persona).find(assistant_params[:persona_id]) : nil
+        end
+
+        if @assistant.update(assistant_params.except(:persona_id))
           redirect_to layered_assistant.assistants_path, notice: "Assistant was successfully updated."
         else
           render :edit, status: :unprocessable_entity
@@ -52,8 +58,12 @@ module Layered
         @models = Model.available
       end
 
+      def set_personas
+        @personas = scoped(Persona).by_name
+      end
+
       def assistant_params
-        params.require(:assistant).permit(:name, :description, :system_prompt, :default_model_id, :public)
+        params.require(:assistant).permit(:name, :description, :instructions, :default_model_id, :persona_id, :public)
       end
     end
   end

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

@@ -0,0 +1,60 @@
+module Layered
+  module Assistant
+    class PersonasController < ApplicationController
+      before_action :set_persona, only: [:edit, :update, :destroy]
+
+      def index
+        @page_title = "Personas"
+        @pagy, @personas = pagy(scoped(Persona).by_name)
+      end
+
+      def new
+        @page_title = "New persona"
+        @persona = Persona.new
+      end
+
+      def create
+        @persona = Persona.new(persona_params)
+        @persona.owner = l_ui_current_user
+
+        if @persona.save
+          redirect_to layered_assistant.personas_path, notice: "Persona was successfully created."
+        else
+          render :new, status: :unprocessable_entity
+        end
+      end
+
+      def edit
+        @page_title = "Edit persona"
+      end
+
+      def update
+        if @persona.update(persona_params)
+          redirect_to layered_assistant.personas_path, notice: "Persona was successfully updated."
+        else
+          render :edit, status: :unprocessable_entity
+        end
+      end
+
+      def destroy
+        if @persona.destroy
+          redirect_to layered_assistant.personas_path, notice: "Persona was successfully deleted."
+        else
+          redirect_to layered_assistant.personas_path, alert: "Persona could not be deleted: #{@persona.errors.full_messages.to_sentence}."
+        end
+      rescue ActiveRecord::InvalidForeignKey
+        redirect_to layered_assistant.personas_path, alert: "Persona could not be deleted because it is assigned to assistants."
+      end
+
+      private
+
+      def set_persona
+        @persona = scoped(Persona).find(params[:id])
+      end
+
+      def persona_params
+        params.require(:persona).permit(:name, :description, :instructions)
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ module Layered
       # Associations
       belongs_to :owner, polymorphic: true, optional: true
       belongs_to :default_model, class_name: "Layered::Assistant::Model", optional: true, counter_cache: :assistants_count
+      belongs_to :persona, optional: true, counter_cache: :assistants_count
       has_many :conversations, dependent: :destroy
 
       # Validations

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

@@ -10,6 +10,9 @@ module Layered
       belongs_to :subject, polymorphic: true, optional: true
       has_many :messages, dependent: :destroy
 
+      # Callbacks
+      after_create :create_system_message
+
       # Validations
       validates :name, presence: true
 
@@ -73,6 +76,13 @@ module Layered
 
       private
 
+      def create_system_message
+        prompt = SystemPromptService.new.call(assistant: assistant)
+        return if prompt.blank?
+
+        messages.create!(role: :system, content: prompt)
+      end
+
       def broadcast_name_updated(old_name)
         css_class = "#{ActionView::RecordIdentifier.dom_id(self)}_name"
         Turbo::StreamsChannel.broadcast_action_to(

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

@@ -0,0 +1,20 @@
+module Layered
+  module Assistant
+    class Persona < ApplicationRecord
+      # UID
+      has_secure_token :uid
+
+      # Associations
+      belongs_to :owner, polymorphic: true, optional: true
+      has_many :assistants, dependent: :restrict_with_error
+
+      # Validations
+      validates :name, presence: true
+      validates :instructions, presence: true
+
+      # Scopes
+      scope :by_name, -> { order(name: :asc, created_at: :desc) }
+      scope :by_created_at, -> { order(created_at: :desc) }
+    end
+  end
+end

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

@@ -4,13 +4,11 @@ module Layered
       def call(message:, stream_proc:)
         provider = message.model.provider
         client = Clients::Base.for(provider)
-        system_prompt = message.conversation.assistant.system_prompt
 
         client.chat(
           messages: message.conversation.messages,
           model: message.model.identifier,
-          stream_proc: stream_proc,
-          system_prompt: system_prompt
+          stream_proc: stream_proc
         )
       end
     end

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

@@ -2,8 +2,8 @@ module Layered
   module Assistant
     module Clients
       class Anthropic < Base
-        def chat(messages:, model:, stream_proc:, system_prompt: nil)
-          formatted = MessagesService.new.format(messages, provider: @provider, system_prompt: system_prompt)
+        def chat(messages:, model:, stream_proc:)
+          formatted = MessagesService.new.format(messages, provider: @provider)
 
           parameters = {
             model: model,

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

@@ -9,7 +9,7 @@ module Layered
           raise StandardError, "API key is not set for provider #{provider.name}" if @api_key.blank?
         end
 
-        def chat(messages:, model:, stream_proc:, system_prompt: nil)
+        def chat(messages:, model:, stream_proc:)
           raise NotImplementedError
         end
 

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

@@ -2,8 +2,8 @@ module Layered
   module Assistant
     module Clients
       class OpenAI < Base
-        def chat(messages:, model:, stream_proc:, system_prompt: nil)
-          formatted = MessagesService.new.format(messages, provider: @provider, system_prompt: system_prompt)
+        def chat(messages:, model:, stream_proc:)
+          formatted = MessagesService.new.format(messages, provider: @provider)
 
           client_options = {
             access_token: @api_key,

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

@@ -1,21 +1,20 @@
 module Layered
   module Assistant
     class MessagesService
-      def format(messages, provider: nil, system_prompt: nil)
+      def format(messages, provider: nil)
         protocol = provider&.protocol
 
         if protocol == "openai"
-          format_openai(messages, system_prompt: system_prompt)
+          format_openai(messages)
         else
-          format_anthropic(messages, system_prompt: system_prompt)
+          format_anthropic(messages)
         end
       end
 
       private
 
-      def format_anthropic(messages, system_prompt: nil)
+      def format_anthropic(messages)
         system_messages = []
-        system_messages << system_prompt if system_prompt.present?
         regular_messages = []
 
         messages.by_created_at.each do |message|
@@ -35,9 +34,8 @@ module Layered
         result
       end
 
-      def format_openai(messages, system_prompt: nil)
+      def format_openai(messages)
         formatted = []
-        formatted << { role: "system", content: system_prompt } if system_prompt.present?
 
         messages.by_created_at.each do |message|
           case message.role

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

@@ -0,0 +1,17 @@
+module Layered
+  module Assistant
+    class SystemPromptService
+      def call(assistant:)
+        parts = []
+
+        if assistant.persona&.instructions.present?
+          parts << "**Persona**\n\n#{assistant.persona.instructions}"
+        end
+
+        parts << assistant.instructions if assistant.instructions.present?
+
+        parts.join("\n\n").presence
+      end
+    end
+  end
+end

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

@@ -14,9 +14,15 @@
   </div>
 
   <div class="l-ui-form__group">
-    <%= render "layered_ui/shared/label", form: f, field: :system_prompt, name: "System prompt", required: false %>
-    <%= f.text_area :system_prompt, class: "l-ui-form__field", rows: 5 %>
-    <%= render "layered_ui/shared/field_error", object: assistant, field: :system_prompt %>
+    <%= render "layered_ui/shared/label", form: f, field: :instructions, required: false %>
+    <%= f.text_area :instructions, class: "l-ui-form__field", rows: 5 %>
+    <%= render "layered_ui/shared/field_error", object: assistant, field: :instructions %>
+  </div>
+
+  <div class="l-ui-form__group">
+    <%= render "layered_ui/shared/label", form: f, field: :persona_id, name: "Persona", required: false %>
+    <%= f.select :persona_id, @personas.map { |p| [p.name, p.id] }, { include_blank: "None" }, class: "l-ui-select" %>
+    <%= render "layered_ui/shared/field_error", object: assistant, field: :persona_id %>
   </div>
 
   <div class="l-ui-form__group">

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

@@ -8,7 +8,6 @@
 
   <div class="l-ui-conversation__messages" data-controller="messages">
     <div id="<%= dom_id(@conversation) %>_messages" class="<%= dom_id(@conversation) %>_messages l-ui-conversation" aria-live="polite" data-messages-target="list">
-      <%= render "layered/assistant/messages/system_prompt", conversation: @conversation %>
       <%= render partial: "layered/assistant/messages/message", collection: @messages, as: :message %>
     </div>
 

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

@@ -6,7 +6,6 @@
 
     <div class="l-ui-conversation__messages" data-controller="messages">
       <div id="panel_<%= dom_id(@conversation) %>_messages" class="<%= dom_id(@conversation) %>_messages l-ui-conversation" aria-live="polite" data-messages-target="list">
-        <%= render "layered/assistant/messages/system_prompt", conversation: @conversation %>
         <%= render partial: "layered/assistant/messages/message", collection: @messages, as: :message %>
       </div>
 

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

@@ -0,0 +1,31 @@
+<%= form_with(model: persona, url: url, html: { class: "l-ui-form" }) do |f| %>
+  <%= render "layered_ui/shared/form_errors", item: persona %>
+
+  <div class="l-ui-form__group">
+    <%= render "layered_ui/shared/label", form: f, field: :name, required: true %>
+    <%= f.text_field :name, class: "l-ui-form__field" %>
+    <%= render "layered_ui/shared/field_error", object: persona, field: :name %>
+  </div>
+
+  <div class="l-ui-form__group">
+    <%= render "layered_ui/shared/label", form: f, field: :description, required: false %>
+    <%= f.text_area :description, class: "l-ui-form__field", rows: 3 %>
+    <%= render "layered_ui/shared/field_error", object: persona, field: :description %>
+  </div>
+
+  <div class="l-ui-form__group">
+    <%= render "layered_ui/shared/label", form: f, field: :instructions, required: true %>
+    <%= f.text_area :instructions, class: "l-ui-form__field", rows: 5 %>
+    <p class="l-ui-form__hint">Shape the personality and tone of conversations, used alongside the assistant's own instructions. e.g. "Reply in British English with a formal tone"</p>
+    <%= render "layered_ui/shared/field_error", object: persona, field: :instructions %>
+  </div>
+
+  <div class="l-ui-container--spread l-ui-utility--mt-2xl">
+    <% if persona.persisted? %>
+      <%= link_to "Delete", layered_assistant.persona_path(persona), class: "l-ui-button--outline-danger", data: { turbo_method: :delete, turbo_confirm: "Are you sure?" } %>
+    <% else %>
+      <span></span>
+    <% end %>
+    <%= f.submit persona.new_record? ? "Create" : "Update", class: "l-ui-button--primary" %>
+  </div>
+<% end %>

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

@@ -0,0 +1,2 @@
+<h1>Edit persona</h1>
+<%= render "form", persona: @persona, url: layered_assistant.persona_path(@persona) %>

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

@@ -0,0 +1,41 @@
+<div class="l-ui-container--spread">
+  <h1>Personas</h1>
+  <%= link_to "New", layered_assistant.new_persona_path, class: "l-ui-button--primary" %>
+</div>
+
+<div class="l-ui-container--table l-ui-utility--mt-lg">
+  <table class="l-ui-table">
+    <caption class="l-ui-sr-only">Personas</caption>
+    <thead class="l-ui-table__header">
+      <tr>
+        <th scope="col" class="l-ui-table__header-cell">Name</th>
+        <th scope="col" class="l-ui-table__header-cell">Description</th>
+        <th scope="col" class="l-ui-table__header-cell">Assistants</th>
+        <th scope="col" class="l-ui-table__header-cell--action">Actions</th>
+      </tr>
+    </thead>
+
+    <tbody class="l-ui-table__body">
+      <% @personas.each do |persona| %>
+        <tr>
+          <th scope="row" class="l-ui-table__cell--primary">
+            <%= persona.name %>
+          </th>
+          <td class="l-ui-table__cell">
+            <%= truncate(persona.description, length: 60) %>
+          </td>
+          <td class="l-ui-table__cell">
+            <%= persona.assistants_count %>
+          </td>
+          <td class="l-ui-table__cell--action">
+            <%= link_to "Edit", layered_assistant.edit_persona_path(persona) %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+  <div class="l-ui-utility--mt-lg">
+    <%= l_ui_pagy(@pagy) %>
+  </div>
+</div>

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

@@ -0,0 +1,2 @@
+<h1>New persona</h1>
+<%= render "form", persona: @persona, url: layered_assistant.personas_path %>

data/app/views/layouts/layered/assistant/application.html.erb

@@ -9,6 +9,7 @@
   <% if l_assistant_accessible? %>
     <%= l_ui_navigation_item "Setup", layered_assistant.root_path %>
     <%= l_ui_navigation_item "Providers", layered_assistant.providers_path %>
+    <%= l_ui_navigation_item "Personas", layered_assistant.personas_path %>
     <%= l_ui_navigation_item "Assistants", layered_assistant.assistants_path %>
     <%= l_ui_navigation_item "Conversations", layered_assistant.conversations_path %>
   <% else %>

data/config/routes.rb

@@ -1,5 +1,6 @@
 Layered::Assistant::Engine.routes.draw do
   root "setup#index"
+  resources :personas, except: [:show]
   resources :assistants, except: [:show] do
     resources :conversations, only: [:index]
   end

data/db/migrate/20260403000000_create_layered_assistant_personas.rb

@@ -0,0 +1,13 @@
+class CreateLayeredAssistantPersonas < ActiveRecord::Migration[8.0]
+  def change
+    create_table :layered_assistant_personas, if_not_exists: true do |t|
+      t.string :uid, null: false, index: { unique: true }
+      t.references :owner, polymorphic: true
+      t.string :name, null: false
+      t.text :description
+      t.text :instructions
+      t.bigint :assistants_count, default: 0, null: false
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20260403000001_add_persona_to_layered_assistant_assistants.rb

@@ -0,0 +1,5 @@
+class AddPersonaToLayeredAssistantAssistants < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :layered_assistant_assistants, :persona, foreign_key: { to_table: :layered_assistant_personas }
+  end
+end

data/db/migrate/20260406000000_rename_system_prompt_to_instructions.rb

@@ -0,0 +1,5 @@
+class RenameSystemPromptToInstructions < ActiveRecord::Migration[8.0]
+  def change
+    rename_column :layered_assistant_assistants, :system_prompt, :instructions
+  end
+end

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

@@ -33,10 +33,8 @@
 # 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)
+# All engine models with a polymorphic owner association are passed through
+# the scope block.
 #
 # Scope all owned resources to the current user:
 #

data/lib/layered/assistant/version.rb

@@ -1,5 +1,5 @@
 module Layered
   module Assistant
-    VERSION = "0.2.2"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: layered-assistant-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - layered.ai
@@ -313,6 +313,7 @@ files:
 - app/controllers/layered/assistant/models_controller.rb
 - app/controllers/layered/assistant/panel/conversations_controller.rb
 - app/controllers/layered/assistant/panel/messages_controller.rb
+- app/controllers/layered/assistant/personas_controller.rb
 - app/controllers/layered/assistant/providers_controller.rb
 - app/controllers/layered/assistant/public/application_controller.rb
 - app/controllers/layered/assistant/public/assistants_controller.rb
@@ -339,6 +340,7 @@ files:
 - app/models/layered/assistant/conversation.rb
 - app/models/layered/assistant/message.rb
 - app/models/layered/assistant/model.rb
+- app/models/layered/assistant/persona.rb
 - app/models/layered/assistant/provider.rb
 - app/services/layered/assistant/chunk_parser.rb
 - app/services/layered/assistant/chunk_service.rb
@@ -349,6 +351,7 @@ files:
 - 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/system_prompt_service.rb
 - app/services/layered/assistant/token_estimator.rb
 - app/views/layered/assistant/assistants/_form.html.erb
 - app/views/layered/assistant/assistants/edit.html.erb
@@ -362,7 +365,6 @@ files:
 - 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/_system_prompt.html.erb
 - app/views/layered/assistant/messages/create.turbo_stream.erb
 - app/views/layered/assistant/messages/index.html.erb
 - app/views/layered/assistant/models/_form.html.erb
@@ -375,6 +377,10 @@ files:
 - app/views/layered/assistant/panel/conversations/show.html.erb
 - app/views/layered/assistant/panel/messages/_composer.html.erb
 - app/views/layered/assistant/panel/messages/create.turbo_stream.erb
+- app/views/layered/assistant/personas/_form.html.erb
+- app/views/layered/assistant/personas/edit.html.erb
+- app/views/layered/assistant/personas/index.html.erb
+- app/views/layered/assistant/personas/new.html.erb
 - app/views/layered/assistant/providers/_form.html.erb
 - app/views/layered/assistant/providers/edit.html.erb
 - app/views/layered/assistant/providers/index.html.erb
@@ -401,6 +407,9 @@ files:
 - 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
+- db/migrate/20260403000000_create_layered_assistant_personas.rb
+- db/migrate/20260403000001_add_persona_to_layered_assistant_assistants.rb
+- db/migrate/20260406000000_rename_system_prompt_to_instructions.rb
 - lib/generators/layered/assistant/install_generator.rb
 - lib/generators/layered/assistant/migrations_generator.rb
 - lib/generators/layered/assistant/templates/initializer.rb

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

@@ -1,10 +0,0 @@
-<% if conversation.assistant.system_prompt.present? %>
-  <div class="l-ui-message">
-    <div class="l-ui-message__bubble">
-      <div class="l-ui-message__author">System</div>
-      <div class="l-ui-message__body">
-        <%= conversation.assistant.system_prompt %>
-      </div>
-    </div>
-  </div>
-<% end %>