plutonium 0.48.0 → 0.49.1

data/lib/generators/pu/invites/templates/packages/invites/app/mailers/invites/user_invite_mailer.rb.tt

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 module Invites
-  class UserInviteMailer < ApplicationMailer
+  class <%= invite_model %>Mailer < ApplicationMailer
     prepend_view_path Invites::Engine.root.join("app/views")
 
-    def invitation(user_invite)
-      @user_invite = user_invite
-      @invitation_url = invitation_url(token: user_invite.token)
+    def invitation(invite)
+      @invite = invite
+      @invitation_url = <%= invite_route_prefix %>_invitation_url(token: invite.token)
 
       mail(
-        to: user_invite.email,
+        to: invite.email,
         subject: invitation_subject,
         template_name: invitation_template_name
       )
@@ -18,14 +18,14 @@ module Invites
     private
 
     def invitation_subject
-      "You've been invited to join #{@user_invite.entity.to_label}"
+      "You've been invited to join #{@invite.entity.to_label}"
     end
 
     def invitation_template_name
-      return "invitation" unless @user_invite.invitable_type.present?
+      return "invitation" unless @invite.invitable_type.present?
 
       # e.g., "TenantProfile" -> "invitation_tenant_profile"
-      template = "invitation_#{@user_invite.invitable_type.underscore}"
+      template = "invitation_#{@invite.invitable_type.underscore}"
       template_exists?(template) ? template : "invitation"
     end
 

data/lib/generators/pu/invites/templates/packages/invites/app/models/invites/user_invite.rb.tt

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Invites
-  class UserInvite < Invites::ResourceRecord
+  class <%= invite_model %> < Invites::ResourceRecord
     include Plutonium::Invites::Concerns::InviteToken
 
     enum :role, <%= membership_model %>.roles
@@ -18,7 +18,7 @@ module Invites
     # Implement required methods from InviteToken concern
 
     def invitation_mailer
-      Invites::UserInviteMailer
+      Invites::<%= invite_model %>Mailer
     end
 
     def enforce_domain
@@ -30,11 +30,20 @@ module Invites
     end
 
     def create_membership_for(user)
-      <%= membership_model %>.create!(<%= entity_association_name %>: <%= entity_association_name %>, user: user, role: role)
+      <%= membership_model %>.create!(<%= entity_association_name %>: <%= entity_association_name %>, <%= user_association_name %>: user, role: role)
     end
+<% if user_table != "user" -%>
+
+    # InviteToken concern updates `user_attribute => user` when accepting.
+    # Our invite model uses `belongs_to :<%= user_table %>` instead.
+    def user_attribute
+      :<%= user_table %>
+    end
+<% end -%>
 <% if entity_association_name != "entity" -%>
 
-    # Alias for InviteToken concern compatibility
+    # Alias for InviteToken concern compatibility (used by views/mailers
+    # that read `@invite.entity.to_label`).
     alias_method :entity, :<%= entity_association_name %>
 <% end -%>
   end

data/lib/generators/pu/invites/templates/packages/invites/app/policies/invites/user_invite_policy.rb.tt

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Invites
-  class UserInvitePolicy < Invites::ResourcePolicy
+  class <%= invite_model %>Policy < Invites::ResourcePolicy
     def create?
       false # Created via InviteUserInteraction
     end
@@ -19,11 +19,11 @@ module Invites
     end
 
     def permitted_attributes_for_create
-      [:entity, :email, :role, :invited_by, :expires_at]
+      [:<%= entity_association_name %>, :email, :role, :invited_by, :expires_at]
     end
 
     def permitted_attributes_for_read
-      [:entity, :email, :role, :state, :invited_by, :expires_at, :accepted_at, :<%= user_table %>]
+      [:<%= entity_association_name %>, :email, :role, :state, :invited_by, :expires_at, :accepted_at, :<%= user_table %>]
     end
 
     def permitted_associations

data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invitations/landing.html.erb.tt

@@ -22,7 +22,7 @@
     <p class="text-[var(--pu-text-muted)] mb-4">To accept this invitation, please:</p>
   </div>
 
-  <%%= link_to "Create Account", invitation_signup_path(token: params[:token]),
+  <%%= link_to "Create Account", <%= invite_route_prefix %>_invitation_signup_path(token: params[:token]),
       class: "w-full block pu-btn pu-btn-md pu-btn-primary text-center" %>
 
   <div class="text-center">

data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invitations/show.html.erb.tt

@@ -29,7 +29,7 @@
   <%% end %>
 
   <div class="space-y-3 pt-4">
-    <%%= form_with url: accept_invitation_path(token: params[:token]), method: :post, local: true do |form| %>
+    <%%= form_with url: accept_<%= invite_route_prefix %>_invitation_path(token: params[:token]), method: :post, local: true do |form| %>
       <%%= form.submit "Accept Invitation",
           class: "w-full pu-btn pu-btn-md pu-btn-primary cursor-pointer" %>
     <%% end %>

data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invitations/signup.html.erb.tt

@@ -10,7 +10,7 @@
   Create Your Account
 </h1>
 
-<%%= form_with url: invitation_signup_path(token: @invite.token), method: :post, local: true, class: "space-y-4", data: { turbo: false } do |form| %>
+<%%= form_with url: <%= invite_route_prefix %>_invitation_signup_path(token: @invite.token), method: :post, local: true, class: "space-y-4", data: { turbo: false } do |form| %>
   <div>
     <label for="email" class="pu-label">Email</label>
     <%% if @invite.enforce_email? %>
@@ -43,7 +43,7 @@
   <div class="space-y-3 pt-4">
     <%%= form.submit "Create Account",
         class: "w-full pu-btn pu-btn-md pu-btn-primary cursor-pointer" %>
-    <%%= link_to "Back", invitation_path(token: @invite.token),
+    <%%= link_to "Back", <%= invite_route_prefix %>_invitation_path(token: @invite.token),
         class: "w-full block pu-btn pu-btn-md pu-btn-outline text-center" %>
   </div>
 <%% end %>

data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invite_mailer/invitation.html.erb.tt

@@ -22,11 +22,11 @@
   </head>
   <body>
     <div class="email-container">
-      <h2>You've been invited to <%%= @user_invite.entity.to_label %></h2>
+      <h2>You've been invited to <%%= @invite.entity.to_label %></h2>
 
       <p>Hi there,</p>
 
-      <p><%%= @user_invite.invited_by.email %> has invited you to join <%%= @user_invite.entity.to_label %> as a <%%= @user_invite.role %>.</p>
+      <p><%%= @invite.invited_by.email %> has invited you to join <%%= @invite.entity.to_label %> as a <%%= @invite.role %>.</p>
 
       <p>Click the link below to accept your invitation:</p>
 
@@ -35,8 +35,8 @@
       <p>Or copy and paste this URL into your browser:</p>
       <p><%%= @invitation_url %></p>
 
-      <%% if @user_invite.expires_at.present? %>
-        <p><small>This invitation will expire on <%%= @user_invite.expires_at.strftime("%B %d, %Y at %l:%M %p") %></small></p>
+      <%% if @invite.expires_at.present? %>
+        <p><small>This invitation will expire on <%%= @invite.expires_at.strftime("%B %d, %Y at %l:%M %p") %></small></p>
       <%% end %>
 
       <p>If you didn't expect this invitation, you can safely ignore this email.</p>

data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invite_mailer/invitation.text.erb.tt

@@ -1,15 +1,15 @@
-You've been invited to <%%= @user_invite.entity.to_label %>
+You've been invited to <%%= @invite.entity.to_label %>
 ======================================================
 
 Hi there,
 
-<%%= @user_invite.invited_by.email %> has invited you to join <%%= @user_invite.entity.to_label %> as a <%%= @user_invite.role %>.
+<%%= @invite.invited_by.email %> has invited you to join <%%= @invite.entity.to_label %> as a <%%= @invite.role %>.
 
 Accept your invitation by visiting this link:
 <%%= @invitation_url %>
 
-<%% if @user_invite.expires_at.present? %>
-This invitation will expire on <%%= @user_invite.expires_at.strftime("%B %d, %Y at %l:%M %p") %>
+<%% if @invite.expires_at.present? %>
+This invitation will expire on <%%= @invite.expires_at.strftime("%B %d, %Y at %l:%M %p") %>
 <%% end %>
 
 If you didn't expect this invitation, you can safely ignore this email.

data/lib/generators/pu/invites/templates/packages/invites/app/views/layouts/invites/invitation.html.erb.tt

@@ -7,7 +7,11 @@
   <meta name="csrf-param" content="authenticity_token" />
   <meta name="csrf-token" content="<%%= form_authenticity_token %>" />
   <%%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-  <%%= javascript_importmap_tags %>
+  <%% if defined?(Importmap) %>
+    <%%= javascript_importmap_tags %>
+  <%% else %>
+    <%%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
+  <%% end %>
 </head>
 <body class="antialiased min-h-screen bg-[var(--pu-body)]">
   <main class="p-4 min-h-screen flex flex-col items-center justify-center gap-2 px-6 py-8 mx-auto lg:py-0">

data/lib/generators/pu/lib/plutonium_generators/concerns/configures_sqlite.rb

@@ -55,7 +55,7 @@ module PlutoniumGenerators
           end.compact!
         end
 
-        def new_database(name, migrations_paths: nil)
+        def new_database(name, migrations_paths: nil, schema_dump: nil)
           migrations_paths ||= "db/#{name}_migrate"
           db = Psych::Nodes::Mapping.new(name)
           db.children.concat [
@@ -66,6 +66,12 @@ module PlutoniumGenerators
             Psych::Nodes::Scalar.new("database"),
             Psych::Nodes::Scalar.new("storage/<%= Rails.env %>-#{name}.sqlite3")
           ]
+          unless schema_dump.nil?
+            db.children.concat [
+              Psych::Nodes::Scalar.new("schema_dump"),
+              Psych::Nodes::Scalar.new(schema_dump.to_s)
+            ]
+          end
           "\n" + emit_pair(Psych::Nodes::Scalar.new(name), db)
         end
 
@@ -91,10 +97,10 @@ module PlutoniumGenerators
         @database_yaml ||= DatabaseYAML.new(path: File.expand_path("config/database.yml", destination_root))
       end
 
-      def add_sqlite_database(name, migrations_paths: nil)
+      def add_sqlite_database(name, migrations_paths: nil, schema_dump: nil)
         # Define the new database configuration
         insert_into_file "config/database.yml",
-          database_yaml.new_database(name, migrations_paths: migrations_paths) + "\n",
+          database_yaml.new_database(name, migrations_paths: migrations_paths, schema_dump: schema_dump) + "\n",
           after: database_yaml.database_def_regex("default"),
           verbose: false,
           force: false

data/lib/generators/pu/lite/rails_pulse/rails_pulse_generator.rb

@@ -51,10 +51,13 @@ module Pu
         end
 
         # Then add database config
-        add_sqlite_database(@db_name, migrations_paths: "db/rails_pulse_migrate")
+        add_sqlite_database(@db_name, migrations_paths: "db/rails_pulse_migrate", schema_dump: false)
 
-        # Finally prepare the database (runs migration that loads schema)
-        prepare_database(@db_name)
+        # rails_pulse ships a callable schema lambda; load it idempotently
+        # against the rails_pulse connection.
+        Bundler.with_unbundled_env do
+          run "bin/rails db:schema:load_rails_pulse"
+        end
       end
 
       def mount_rails_pulse_engine

data/lib/generators/pu/lite/rails_pulse/templates/config/initializers/rails_pulse.rb.tt

@@ -6,6 +6,24 @@ RailsPulse.configure do |config|
 
   # Asset tracking (disable to reduce noise)
   config.track_assets = false
+
+  # Background job tracking (off by default in the gem; enabling mounts /jobs)
+  config.track_jobs = true
+
+  # Don't capture job arguments — they may contain sensitive data
+  config.capture_job_arguments = false
+
+  # Match the engine mount so Pulse doesn't self-track its own dashboard
+  config.mount_path = "<%= options[:route] %>"
+
+  # Auth is handled upstream by ManagementConstraint in routes.rb;
+  # disable the gem's built-in auth to avoid double prompts.
+  config.authentication_enabled = false
+
+  # Skip Rails' default health check and other mounted management engines
+  # (mission_control-jobs, solid_errors, litestream, etc.) so they don't
+  # pollute the application route list.
+  config.ignored_routes = ["/up", "/cable", %r{^/manage/}]
 <%- if options[:database] -%>
 
   # Use separate database for performance data

data/lib/generators/pu/saas/welcome/templates/app/views/layouts/welcome.html.erb.tt

@@ -7,7 +7,11 @@
   <meta name="csrf-param" content="authenticity_token" />
   <meta name="csrf-token" content="<%%= form_authenticity_token %>" />
   <%%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-  <%%= javascript_importmap_tags %>
+  <%% if defined?(Importmap) %>
+    <%%= javascript_importmap_tags %>
+  <%% else %>
+    <%%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
+  <%% end %>
 </head>
 <body class="antialiased min-h-screen bg-[var(--pu-body)]">
   <main class="p-4 min-h-screen flex flex-col items-center justify-center gap-2 px-6 py-8 mx-auto lg:py-0">

data/lib/plutonium/core/controller.rb

@@ -18,7 +18,14 @@ module Plutonium
               raise exception
             end
             format.any do
-              @errors = ActiveModel::Errors.new(exception.policy.record)
+              # ActionPolicy stores the policy *class* on the exception
+              # (see ActionPolicy::Unauthorized#initialize), so reach for the
+              # live policy instance instead. Its record may itself be a Class
+              # for collection actions where no record is loaded — instantiate
+              # so ActiveModel::Errors has a real model instance to work with.
+              record = current_policy.record
+              record = record.new if record.is_a?(Class)
+              @errors = ActiveModel::Errors.new(record)
               @errors.add(:base, :unauthorized, message: exception.result.message)
               render "errors", status: :forbidden
             end
@@ -248,8 +255,8 @@ module Plutonium
         end
 
         # Build named route helper, mirroring the pattern used by build_nested_resource_url_args.
-        # e.g., "organization_scope_widgets" (collection), "organization_scope_widget" (member),
-        #        "edit_organization_scope_widget" (edit action)
+        # e.g., "organization_scoped_widgets" (collection), "organization_scoped_widget" (member),
+        #        "edit_organization_scoped_widget" (edit action)
         is_collection_action = action == :index || action == :create || (no_record && action != :new)
         helper_base = if is_singular || is_collection_action
           model_class.model_name.plural

data/lib/plutonium/engine.rb

@@ -19,7 +19,7 @@ module Plutonium
         # time — they're stable strings and don't depend on the live class
         # identity, so caching them is safe.
         resolved = @scoped_entity_class_name.constantize
-        @scoped_entity_param_key = param_key || :"#{resolved.model_name.singular_route_key}_scope"
+        @scoped_entity_param_key = param_key || :"#{resolved.model_name.singular_route_key}_scoped"
         @scoped_entity_route_key = route_key || resolved.model_name.singular.to_sym
       end
 

data/lib/plutonium/invites/concerns/invite_token.rb

@@ -125,9 +125,9 @@ module Plutonium
 
           transaction do
             update!(
-              state: :accepted,
-              accepted_at: Time.current,
-              user: user
+              :state => :accepted,
+              :accepted_at => Time.current,
+              user_attribute => user
             )
 
             create_membership_for(user)
@@ -135,6 +135,14 @@ module Plutonium
           end
         end
 
+        # Override to specify the user association name on the invite model.
+        # Defaults to :user. Override when the invite model's `belongs_to`
+        # uses a different name (e.g., :spender_account, :staff_user).
+        # @return [Symbol]
+        def user_attribute
+          :user
+        end
+
         # Override this method to specify the mailer class.
         #
         # @return [Class] the mailer class for sending invitation emails

data/lib/plutonium/invites/concerns/invite_user.rb

@@ -37,12 +37,12 @@ module Plutonium
 
         def execute
           attrs = {
-            entity: entity,
             email: email,
             role: role,
             invited_by: current_user,
             **additional_invite_attributes
           }
+          attrs[invite_entity_attribute] = entity
           attrs[:invitable] = invitable if invitable.present?
 
           invite_class.create!(attrs)
@@ -109,6 +109,15 @@ module Plutonium
           entity.class.name.underscore.to_sym
         end
 
+        # Override to specify the entity association name on the invite model.
+        # Defaults to :entity, matching the convention documented on InviteToken.
+        # When the invite model uses a concrete `belongs_to :<entity_name>`
+        # instead, override this to return that association name.
+        # @return [Symbol]
+        def invite_entity_attribute
+          :entity
+        end
+
         def role_is_present
           errors.add(:role, :blank) if role.blank?
         end
@@ -130,9 +139,9 @@ module Plutonium
           return unless email.present? && entity.present?
 
           pending = invite_class.find_by(
-            entity: entity,
-            email: email,
-            state: :pending
+            invite_entity_attribute => entity,
+            :email => email,
+            :state => :pending
           )
           errors.add(:email, "already has a pending invitation") if pending
         end

data/lib/plutonium/invites/controller.rb

@@ -35,6 +35,7 @@ module Plutonium
       extend ActiveSupport::Concern
 
       included do
+        append_view_path File.expand_path("app/views", Plutonium.root)
         helper_method :current_user if respond_to?(:helper_method)
       end
 
@@ -72,7 +73,7 @@ module Plutonium
         return unless (@invite = load_and_validate_invite(params[:token]))
 
         unless current_user
-          redirect_to invitation_path(token: params[:token]),
+          redirect_to invitation_path_for(params[:token]),
             alert: "Please sign in to accept this invitation"
           return
         end
@@ -174,6 +175,18 @@ module Plutonium
         raise NotImplementedError, "#{self.class}#invite_class must return the invite model class"
       end
 
+      # Override to customize the invitation URL helper.
+      # Default uses Rails' `invitation_path(token:)` helper, which is what
+      # `pu:invites:install` generates for single-flow apps. Multi-flow apps
+      # whose generator scoped the route as `<prefix>_invitation_path` should
+      # override this.
+      #
+      # @param token [String] the invitation token
+      # @return [String] the URL path
+      def invitation_path_for(token)
+        invitation_path(token: token)
+      end
+
       # Override to specify the user model class.
       #
       # @return [Class] the user model class

data/lib/plutonium/invites/pending_invite_check.rb

@@ -8,39 +8,34 @@ module Plutonium
     # (e.g., WelcomeController, DashboardController) to check for
     # pending invitations stored in cookies.
     #
-    # @example Basic usage
-    #   class WelcomeController < ApplicationController
-    #     include Plutonium::Invites::PendingInviteCheck
+    # Hosts may override either `invite_classes` (preferred — returns
+    # an Array of invite classes to check, in priority order) or
+    # `invite_class` (single class, kept for backward compatibility).
     #
-    #     def index
-    #       return if redirect_to_pending_invite!
-    #
-    #       # Normal post-login flow...
-    #       redirect_to dashboard_path
-    #     end
-    #
-    #     private
-    #
-    #     def invite_class
-    #       Invites::UserInvite
-    #     end
+    # @example Single invite class
+    #   def invite_class
+    #     ::Invites::UserInvite
     #   end
     #
+    # @example Multiple invite classes
+    #   def invite_classes
+    #     [::Invites::FunderInvite, ::Invites::SpenderInvite]
+    #   end
     module PendingInviteCheck
       extend ActiveSupport::Concern
 
+      included do
+        append_view_path File.expand_path("app/views", Plutonium.root)
+      end
+
       private
 
       # Check for a pending invitation and redirect if found.
-      #
-      # @return [Boolean] true if redirected, false otherwise
       def redirect_to_pending_invite!
         token = cookies.encrypted[:pending_invitation]
         return false unless token
 
-        invite = invite_class.find_for_acceptance(token)
-
-        if invite
+        if find_pending_invite(token)
           redirect_to invitation_path(token: token)
           true
         else
@@ -49,14 +44,12 @@ module Plutonium
         end
       end
 
-      # Returns the pending invite if one exists.
-      #
-      # @return [Object, nil] the pending invite or nil
+      # Returns the pending invite if one exists across any invite_classes.
       def pending_invite
         token = cookies.encrypted[:pending_invitation]
         return nil unless token
 
-        invite = invite_class.find_for_acceptance(token)
+        invite = find_pending_invite(token)
         unless invite
           cookies.delete(:pending_invitation)
           return nil
@@ -65,11 +58,27 @@ module Plutonium
         invite
       end
 
-      # Override to specify the invite model class.
-      #
-      # @return [Class] the invite model class
+      # Override to specify multiple invite model classes (preferred).
+      # Defaults to `[invite_class]` for backward compatibility.
+      # @return [Array<Class>]
+      def invite_classes
+        [invite_class]
+      end
+
+      # Override to specify a single invite model class. Maintained for
+      # backward compatibility; prefer `invite_classes` for multi-flow apps.
+      # @return [Class]
       def invite_class
-        raise NotImplementedError, "#{self.class}#invite_class must return the invite model class"
+        raise NotImplementedError,
+          "#{self.class}#invite_class or #invite_classes must return the invite model class(es)"
+      end
+
+      def find_pending_invite(token)
+        invite_classes.each do |klass|
+          invite = klass.find_for_acceptance(token)
+          return invite if invite
+        end
+        nil
       end
     end
   end

data/lib/plutonium/resource/controllers/interactive_actions.rb

@@ -29,7 +29,7 @@ module Plutonium
         # GET /resources/1/record_actions/:interactive_action
         def interactive_record_action
           build_interactive_record_action_interaction
-          render :interactive_record_action, layout: modal_layout, formats: [:html]
+          render :interactive_record_action, formats: [:html], **modal_render_options
         end
 
         # POST /resources/1/record_actions/:interactive_action
@@ -62,7 +62,7 @@ module Plutonium
                 end
               else
                 format.any(:html, :turbo_stream) do
-                  render :interactive_record_action, layout: modal_layout, formats: [:html], status: :unprocessable_content
+                  render :interactive_record_action, formats: [:html], content_type: "text/html", **modal_render_options, status: :unprocessable_content
                 end
                 format.any do
                   @errors = @interaction.errors
@@ -77,7 +77,7 @@ module Plutonium
         def interactive_resource_action
           skip_verify_current_authorized_scope!
           build_interactive_resource_action_interaction
-          render :interactive_resource_action, layout: modal_layout, formats: [:html]
+          render :interactive_resource_action, formats: [:html], **modal_render_options
         end
 
         # POST /resources/resource_actions/:interactive_action
@@ -111,7 +111,7 @@ module Plutonium
                 end
               else
                 format.any(:html, :turbo_stream) do
-                  render :interactive_resource_action, layout: modal_layout, formats: [:html], status: :unprocessable_content
+                  render :interactive_resource_action, formats: [:html], content_type: "text/html", **modal_render_options, status: :unprocessable_content
                 end
                 format.any do
                   @errors = @interaction.errors
@@ -125,7 +125,7 @@ module Plutonium
         # GET /resources/bulk_actions/:interactive_action?ids[]=1&ids[]=2
         def interactive_bulk_action
           build_interactive_bulk_action_interaction
-          render :interactive_bulk_action, layout: modal_layout, formats: [:html]
+          render :interactive_bulk_action, formats: [:html], **modal_render_options
         end
 
         # POST /resources/bulk_actions/:interactive_action?ids[]=1&ids[]=2
@@ -158,7 +158,7 @@ module Plutonium
                 end
               else
                 format.any(:html, :turbo_stream) do
-                  render :interactive_bulk_action, layout: modal_layout, formats: [:html], status: :unprocessable_content
+                  render :interactive_bulk_action, formats: [:html], content_type: "text/html", **modal_render_options, status: :unprocessable_content
                 end
                 format.any do
                   @errors = @interaction.errors
@@ -171,9 +171,13 @@ module Plutonium
 
         private
 
-        # Returns false for modal requests (skip layout), nil otherwise (use default layout)
-        def modal_layout
-          helpers.current_turbo_frame.present? ? false : nil
+        # Render options for modal-aware actions. Returns `{ layout: false }` for
+        # turbo-frame requests so the bare frame is rendered, and an empty hash
+        # for top-level requests so the controller's default layout proc applies.
+        # (Passing `layout: nil` explicitly is treated as "no layout" by Rails,
+        # which is why we omit the key entirely on the default path.)
+        def modal_render_options
+          helpers.current_turbo_frame.present? ? {layout: false} : {}
         end
 
         def current_interactive_action