plutonium 0.48.0 → 0.49.1

data/docs/superpowers/plans/2026-05-06-multi-invite-model-support.md.tasks.json

@@ -0,0 +1,15 @@
+{
+  "planPath": "docs/superpowers/plans/2026-05-06-multi-invite-model-support.md",
+  "tasks": [
+    {"id": 1, "subject": "Task 1: PendingInviteCheck — multi-class support", "status": "completed"},
+    {"id": 2, "subject": "Task 2: Auto append_view_path in invites concerns + qualify flash partial", "status": "completed"},
+    {"id": 3, "subject": "Task 3: Plutonium::Invites::Controller — overridable invitation_path", "status": "completed"},
+    {"id": 4, "subject": "Task 4: install_generator — --invite_model option + naming helpers", "status": "completed"},
+    {"id": 5, "subject": "Task 5: Parameterize all templates by invite model name", "status": "completed", "blockedBy": [4]},
+    {"id": 6, "subject": "Task 6: Scope routes per invite type with idempotent re-run", "status": "completed", "blockedBy": [4]},
+    {"id": 7, "subject": "Task 7: Welcome controller — multi-class integration on re-run", "status": "completed", "blockedBy": [1, 4]},
+    {"id": 8, "subject": "Task 8: End-to-end dual-invocation generator test", "status": "completed", "blockedBy": [5, 6, 7]},
+    {"id": 9, "subject": "Task 9: Update skill + guide docs", "status": "completed", "blockedBy": [8]}
+  ],
+  "lastUpdated": "2026-05-06T14:00:00Z"
+}

data/gemfiles/rails_7.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    plutonium (0.45.3)
+    plutonium (0.49.0)
       action_policy (~> 0.7.0)
       listen (~> 3.8)
       pagy (~> 43.0)
@@ -100,6 +100,8 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ansi (1.5.0)
     appraisal (2.5.0)
       bundler
@@ -118,6 +120,15 @@ GEM
     bundler-audit (0.9.3)
       bundler (>= 1.2.0)
       thor (~> 1.0)
+    capybara (3.40.0)
+      addressable
+      matrix
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.11)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
     cgi (0.5.1)
     chunky_png (1.4.0)
     combustion (1.5.0)
@@ -174,6 +185,7 @@ GEM
       net-pop
       net-smtp
     marcel (1.1.0)
+    matrix (0.4.3)
     mini_mime (1.1.5)
     minitest (6.0.2)
       drb (~> 2.0)
@@ -265,6 +277,7 @@ GEM
     psych (5.3.1)
       date
       stringio
+    public_suffix (7.0.5)
     puma (7.2.0)
       nio4r (~> 2.0)
     rabl (0.17.0)
@@ -325,6 +338,7 @@ GEM
     regexp_parser (2.11.3)
     reline (0.6.3)
       io-console (~> 0.5)
+    rexml (3.4.4)
     roda (3.102.0)
       rack
     rodauth (2.42.0)
@@ -362,7 +376,14 @@ GEM
       rubocop-ast (>= 1.47.1, < 2.0)
     ruby-next-core (1.2.0)
     ruby-progressbar (1.13.0)
+    rubyzip (3.2.2)
     securerandom (0.4.1)
+    selenium-webdriver (4.43.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 4.0)
+      websocket (~> 1.0)
     semantic_range (3.1.1)
     sequel (5.102.0)
       bigdecimal
@@ -419,11 +440,14 @@ GEM
     unicode-emoji (4.2.0)
     uri (1.1.1)
     useragent (0.16.11)
+    websocket (1.2.11)
     websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wisper (2.0.1)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
     yaml (0.4.0)
     zeitwerk (2.7.5)
 
@@ -442,6 +466,7 @@ DEPENDENCIES
   bcrypt
   brakeman
   bundle-audit
+  capybara
   combustion
   importmap-rails
   minitest
@@ -454,6 +479,7 @@ DEPENDENCIES
   rodauth-rails
   rotp
   rqrcode
+  selenium-webdriver
   sequel-activerecord_connection
   sqlite3
   standard

data/gemfiles/rails_8.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    plutonium (0.45.3)
+    plutonium (0.49.0)
       action_policy (~> 0.7.0)
       listen (~> 3.8)
       pagy (~> 43.0)
@@ -98,6 +98,8 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ansi (1.5.0)
     appraisal (2.5.0)
       bundler
@@ -116,6 +118,15 @@ GEM
     bundler-audit (0.9.3)
       bundler (>= 1.2.0)
       thor (~> 1.0)
+    capybara (3.40.0)
+      addressable
+      matrix
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.11)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
     chunky_png (1.4.0)
     combustion (1.5.0)
       activesupport (>= 3.0.0)
@@ -164,6 +175,7 @@ GEM
       net-pop
       net-smtp
     marcel (1.1.0)
+    matrix (0.4.3)
     mini_mime (1.1.5)
     minitest (6.0.2)
       drb (~> 2.0)
@@ -241,6 +253,7 @@ GEM
     psych (5.3.1)
       date
       stringio
+    public_suffix (7.0.5)
     puma (7.2.0)
       nio4r (~> 2.0)
     rabl (0.17.0)
@@ -300,6 +313,7 @@ GEM
     regexp_parser (2.11.3)
     reline (0.6.3)
       io-console (~> 0.5)
+    rexml (3.4.4)
     roda (3.102.0)
       rack
     rodauth (2.42.0)
@@ -337,7 +351,14 @@ GEM
       rubocop-ast (>= 1.47.1, < 2.0)
     ruby-next-core (1.2.0)
     ruby-progressbar (1.13.0)
+    rubyzip (3.2.2)
     securerandom (0.4.1)
+    selenium-webdriver (4.43.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 4.0)
+      websocket (~> 1.0)
     semantic_range (3.1.1)
     sequel (5.102.0)
       bigdecimal
@@ -387,11 +408,14 @@ GEM
     unicode-emoji (4.2.0)
     uri (1.1.1)
     useragent (0.16.11)
+    websocket (1.2.11)
     websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wisper (2.0.1)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
     yaml (0.4.0)
     zeitwerk (2.7.5)
 
@@ -403,6 +427,7 @@ DEPENDENCIES
   bcrypt
   brakeman
   bundle-audit
+  capybara
   combustion
   importmap-rails
   minitest
@@ -415,6 +440,7 @@ DEPENDENCIES
   rodauth-rails
   rotp
   rqrcode
+  selenium-webdriver
   sequel-activerecord_connection
   sqlite3
   standard

data/gemfiles/rails_8.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    plutonium (0.47.0)
+    plutonium (0.49.0)
       action_policy (~> 0.7.0)
       listen (~> 3.8)
       pagy (~> 43.0)

data/lib/generators/pu/gem/actual_db_schema/actual_db_schema_generator.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative "../../lib/plutonium_generators"
+
+module Pu
+  module Gem
+    # Installs actual_db_schema, which tracks phantom migrations across git
+    # branches so switching branches with diverging migration sets doesn't
+    # leave db/schema.rb out of sync.
+    #
+    # https://github.com/share-group/actual_db_schema
+    class ActualDbSchemaGenerator < Rails::Generators::Base
+      include PlutoniumGenerators::Generator
+
+      desc "Install the actual_db_schema gem"
+
+      def start
+        bundle "actual_db_schema", group: %i[development test]
+      rescue => e
+        exception "#{self.class} failed:", e
+      end
+    end
+  end
+end

data/lib/generators/pu/invites/install_generator.rb

@@ -21,6 +21,9 @@ module Pu
       class_option :user_model, type: :string, default: "User",
         desc: "The user model name"
 
+      class_option :invite_model, type: :string, default: nil,
+        desc: "The invite model class name. Defaults to <EntityModel><UserModel>Invite (e.g., OrganizationUserInvite). Override for separate flows in multi-entity apps."
+
       class_option :membership_model, type: :string,
         desc: "The membership model name (defaults to <Entity><User>)"
 
@@ -72,44 +75,80 @@ module Pu
 
       def create_user_invites_migration
         migration_template "db/migrate/create_user_invites.rb",
-          "db/migrate/create_user_invites.rb"
+          "db/migrate/create_#{invite_table}.rb"
       end
 
       def create_model
         template "packages/invites/app/models/invites/user_invite.rb",
-          "packages/invites/app/models/invites/user_invite.rb"
+          "packages/invites/app/models/invites/#{invite_underscore}.rb"
       end
 
       def create_mailer
         template "packages/invites/app/mailers/invites/user_invite_mailer.rb",
-          "packages/invites/app/mailers/invites/user_invite_mailer.rb"
+          "packages/invites/app/mailers/invites/#{invite_underscore}_mailer.rb"
 
         template "packages/invites/app/views/invites/user_invite_mailer/invitation.html.erb",
-          "packages/invites/app/views/invites/user_invite_mailer/invitation.html.erb"
+          "packages/invites/app/views/invites/#{invite_underscore}_mailer/invitation.html.erb"
 
         template "packages/invites/app/views/invites/user_invite_mailer/invitation.text.erb",
-          "packages/invites/app/views/invites/user_invite_mailer/invitation.text.erb"
+          "packages/invites/app/views/invites/#{invite_underscore}_mailer/invitation.text.erb"
       end
 
       def create_controllers
         template "packages/invites/app/controllers/invites/user_invitations_controller.rb",
-          "packages/invites/app/controllers/invites/user_invitations_controller.rb"
+          "packages/invites/app/controllers/invites/#{invitations_path}_controller.rb"
+
+        # Welcome controller is a one-shot — only generate if it doesn't exist yet.
+        welcome_path = "packages/invites/app/controllers/invites/welcome_controller.rb"
+        unless File.exist?(Rails.root.join(welcome_path))
+          template "packages/invites/app/controllers/invites/welcome_controller.rb",
+            welcome_path
+        end
+      end
+
+      def add_welcome_invite_class
+        welcome_path = "packages/invites/app/controllers/invites/welcome_controller.rb"
+        return unless File.exist?(Rails.root.join(welcome_path))
 
-        template "packages/invites/app/controllers/invites/welcome_controller.rb",
-          "packages/invites/app/controllers/invites/welcome_controller.rb"
+        content = File.read(Rails.root.join(welcome_path))
+        new_class = "::Invites::#{invite_model}"
+
+        # Already present? bail. Use a non-word lookahead so we don't match
+        # `::Invites::FunderInvite` when looking for `::Invites::Funder`.
+        return if content =~ /#{Regexp.escape(new_class)}(?!\w)/
+
+        # Find `def invite_classes` block; inject before the closing `]`.
+        injection = content.sub(/(\bdef invite_classes\b.*?\[)([^\]]*)(\])/m) do
+          before, list, after = Regexp.last_match[1], Regexp.last_match[2], Regexp.last_match[3]
+          existing = list.strip
+          new_list = existing.empty? ? new_class : "#{existing.chomp(",").strip}, #{new_class}"
+          "#{before}#{new_list}#{after}"
+        end
+
+        if injection != content
+          File.write(Rails.root.join(welcome_path), injection)
+          say_status :inject, "Added #{new_class} to welcome controller's invite_classes", :green
+        end
       end
 
       def create_views
         %w[landing show signup error].each do |view|
           template "packages/invites/app/views/invites/user_invitations/#{view}.html.erb",
-            "packages/invites/app/views/invites/user_invitations/#{view}.html.erb"
+            "packages/invites/app/views/invites/#{invitations_path}/#{view}.html.erb"
         end
 
-        template "packages/invites/app/views/invites/welcome/pending_invitation.html.erb",
-          "packages/invites/app/views/invites/welcome/pending_invitation.html.erb"
+        # Welcome view is a one-shot too.
+        pending_path = "packages/invites/app/views/invites/welcome/pending_invitation.html.erb"
+        unless File.exist?(Rails.root.join(pending_path))
+          template "packages/invites/app/views/invites/welcome/pending_invitation.html.erb",
+            pending_path
+        end
 
-        template "packages/invites/app/views/layouts/invites/invitation.html.erb",
-          "packages/invites/app/views/layouts/invites/invitation.html.erb"
+        layout_path = "packages/invites/app/views/layouts/invites/invitation.html.erb"
+        unless File.exist?(Rails.root.join(layout_path))
+          template "packages/invites/app/views/layouts/invites/invitation.html.erb",
+            layout_path
+        end
       end
 
       def create_interactions
@@ -122,17 +161,17 @@ module Pu
 
       def create_definition
         template "packages/invites/app/definitions/invites/user_invite_definition.rb",
-          "packages/invites/app/definitions/invites/user_invite_definition.rb"
+          "packages/invites/app/definitions/invites/#{invite_underscore}_definition.rb"
       end
 
       def create_policy
         template "packages/invites/app/policies/invites/user_invite_policy.rb",
-          "packages/invites/app/policies/invites/user_invite_policy.rb"
+          "packages/invites/app/policies/invites/#{invite_underscore}_policy.rb"
       end
 
       def add_entity_association
         inject_into_file entity_model_path,
-          "  has_many :user_invites, class_name: \"Invites::UserInvite\", dependent: :destroy\n",
+          "  has_many :#{invite_table}, class_name: \"Invites::#{invite_model}\", dependent: :destroy\n",
           before: /^\s*# add has_many associations above\.\n/
       end
 
@@ -203,31 +242,47 @@ module Pu
 
       def add_routes
         routes_content = File.read(Rails.root.join("config/routes.rb"))
-        if routes_content.include?("# User invitation routes")
-          say_status :skip, "Invitation routes already present", :yellow
-          return
-        end
+        flow_marker = "# Invitation routes for #{invite_model}"
+
+        if routes_content.include?(flow_marker)
+          say_status :skip, "Invitation routes for #{invite_model} already present", :yellow
+        else
+          welcome_present = routes_content.include?("# Invitation welcome routes")
 
-        route_code = <<-RUBY
+          welcome_block = if welcome_present
+            ""
+          else
+            <<-RUBY
 
-  # User invitation routes
+  # Invitation welcome routes (shared across all invite flows)
   scope module: :invites do
     get "invitations/welcome", to: "welcome#index", as: :invites_welcome_check
     delete "invitations/welcome", to: "welcome#skip", as: :invites_welcome_skip
-    get "invitations/:token", to: "user_invitations#show", as: :invitation
-    post "invitations/:token/accept", to: "user_invitations#accept", as: :accept_invitation
-    get "invitations/:token/signup", to: "user_invitations#signup", as: :invitation_signup
-    post "invitations/:token/signup", to: "user_invitations#signup"
   end
-        RUBY
+            RUBY
+          end
+
+          flow_block = <<-RUBY
+
+  #{flow_marker}
+  scope module: :invites do
+    get "#{invitations_path}/:token", to: "#{invitations_path}#show", as: :#{invite_route_prefix}_invitation
+    post "#{invitations_path}/:token/accept", to: "#{invitations_path}#accept", as: :accept_#{invite_route_prefix}_invitation
+    get "#{invitations_path}/:token/signup", to: "#{invitations_path}#signup", as: :#{invite_route_prefix}_invitation_signup
+    post "#{invitations_path}/:token/signup", to: "#{invitations_path}#signup"
+  end
+          RUBY
 
-        inject_into_file "config/routes.rb",
-          route_code,
-          before: /^end\s*\z/
+          inject_into_file "config/routes.rb",
+            welcome_block + flow_block,
+            before: /^end\s*\z/
+        end
 
         # If no main WelcomeController exists, add /welcome route pointing to
         # Invites::WelcomeController so Rodauth's login_redirect "/welcome" works.
-        unless File.exist?(Rails.root.join("app/controllers/welcome_controller.rb"))
+        routes_content = File.read(Rails.root.join("config/routes.rb"))
+        unless File.exist?(Rails.root.join("app/controllers/welcome_controller.rb")) ||
+            routes_content.include?(%(get "welcome", to: "invites/welcome#index"))
           welcome_route = <<-RUBY
 
   # Welcome route (handled by invites package — replace with pu:saas:welcome for full onboarding)
@@ -236,7 +291,7 @@ module Pu
 
           inject_into_file "config/routes.rb",
             welcome_route,
-            before: /^\s*# User invitation routes/
+            before: /^\s*# Invitation welcome routes/
         end
       end
 
@@ -342,11 +397,23 @@ module Pu
           "    return redirect_to(invites_welcome_check_path) if pending_invite\n\n",
           after: /def index\n/
 
-        # Add invite_class method if not present
-        unless file_content.include?("def invite_class")
+        # Add invite_classes method if neither it nor invite_class is present
+        if file_content !~ /def invite_classes\b/ && file_content !~ /def invite_class\b/
           inject_into_file relative_path,
-            "\n  def invite_class\n    ::Invites::UserInvite\n  end\n",
+            "\n  def invite_classes\n    [::Invites::#{invite_model}]\n  end\n",
             before: /^end\s*\z/
+        else
+          # Inject this invite_model into the existing invite_classes array if missing.
+          host_content = File.read(Rails.root.join(relative_path))
+          if host_content =~ /def invite_classes\b/ && host_content !~ /::Invites::#{invite_model}\b/
+            updated = host_content.sub(/(\bdef invite_classes\b.*?\[)([^\]]*)(\])/m) do
+              before, list, after = Regexp.last_match[1], Regexp.last_match[2], Regexp.last_match[3]
+              existing = list.strip
+              new_list = existing.empty? ? "::Invites::#{invite_model}" : "#{existing.chomp(",").strip}, ::Invites::#{invite_model}"
+              "#{before}#{new_list}#{after}"
+            end
+            File.write(Rails.root.join(relative_path), updated)
+          end
         end
 
         # Update Invites::WelcomeController to redirect to /welcome (the main hub)
@@ -437,6 +504,40 @@ module Pu
         "app/policies/#{user_table}_policy.rb"
       end
 
+      def invite_model
+        return options[:invite_model].camelize if options[:invite_model].present?
+
+        # Flatten "::" so namespaced entities like Blogging::Post produce a
+        # valid (single-segment) class name: BloggingPostUserInvite.
+        entity_part = entity_model.delete(":")
+        user_part = user_model.delete(":")
+        "#{entity_part}#{user_part}Invite"
+      end
+
+      def invite_underscore
+        invite_model.underscore
+      end
+
+      def invite_table
+        invite_model.tableize
+      end
+
+      # e.g. UserInvite -> UserInvitationsController, FunderInvite -> FunderInvitationsController.
+      # If the input ends in "Invite", swap to "Invitations"; else append "Invitations".
+      def invitations_controller_class
+        base = invite_model.sub(/Invite\z/, "")
+        "#{base}InvitationsController"
+      end
+
+      def invitations_path
+        invitations_controller_class.sub(/Controller\z/, "").underscore
+      end
+
+      # Route helper prefix: "user" for UserInvite, "funder" for FunderInvite.
+      def invite_route_prefix
+        invite_model.sub(/Invite\z/, "").underscore.presence || "invite"
+      end
+
       def membership_model
         options[:membership_model] || "#{entity_model}#{user_model}"
       end

data/lib/generators/pu/invites/templates/app/interactions/invite_user_interaction.rb.tt

@@ -6,11 +6,17 @@ class <%= entity_model %>::InviteUserInteraction < Plutonium::Resource::Interact
   presents label: "Invite <%= user_model.underscore.humanize.titleize %>", icon: Phlex::TablerIcons::Mail
 
   attribute :role
-  input :role, as: :select, choices: Invites::UserInvite.roles.keys.excluding("owner")
-<% if membership_model != "EntityUser" || user_model != "User" -%>
+  input :role, as: :select, choices: Invites::<%= invite_model %>.roles.keys.excluding("owner")
+<% if membership_model != "EntityUser" || user_model != "User" || entity_association_name != "entity" -%>
 
   private
 <% end -%>
+<% if entity_association_name != "entity" -%>
+
+  def invite_entity_attribute
+    :<%= entity_association_name %>
+  end
+<% end -%>
 <% if membership_model != "EntityUser" -%>
 
   def membership_class

data/lib/generators/pu/invites/templates/app/interactions/user_invite_user_interaction.rb.tt

@@ -6,13 +6,19 @@ class <%= user_model %>::InviteUserInteraction < Plutonium::Resource::Interactio
   presents label: "Invite <%= user_model.underscore.humanize.titleize %>", icon: Phlex::TablerIcons::Mail
 
   attribute :role
-  input :role, as: :select, choices: Invites::UserInvite.roles.keys.excluding("owner")
+  input :role, as: :select, choices: Invites::<%= invite_model %>.roles.keys.excluding("owner")
 
   private
 
   def entity
     current_scoped_entity
   end
+<% if entity_association_name != "entity" -%>
+
+  def invite_entity_attribute
+    :<%= entity_association_name %>
+  end
+<% end -%>
 <% if membership_model != "EntityUser" -%>
 
   def membership_class

data/lib/generators/pu/invites/templates/db/migrate/create_user_invites.rb.tt

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-class CreateUserInvites < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+class Create<%= invite_table.camelize %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
-    create_table :user_invites do |t|
+    create_table :<%= invite_table %> do |t|
       # Entity association
       t.belongs_to :<%= entity_association_name %>, null: false, foreign_key: true
 
@@ -35,13 +35,13 @@ class CreateUserInvites < ActiveRecord::Migration[<%= ActiveRecord::Migration.cu
 
       # Only one pending invite per email per entity
       t.index [:<%= entity_association_name %>_id, :email], unique: true, where: "state = 0",
-        name: "index_user_invites_on_entity_email_pending"
+        name: "index_<%= invite_table %>_on_entity_email_pending"
 
       # Only one pending invite per invitable (when invitable is present)
       t.index [:invitable_type, :invitable_id],
         unique: true,
         where: "state = 0 AND invitable_id IS NOT NULL",
-        name: "index_user_invites_on_invitable_pending"
+        name: "index_<%= invite_table %>_on_invitable_pending"
     end
   end
 end

data/lib/generators/pu/invites/templates/packages/invites/app/controllers/invites/user_invitations_controller.rb.tt

@@ -1,20 +1,23 @@
 # frozen_string_literal: true
 
 module Invites
-  class UserInvitationsController < ApplicationController
+  class <%= invitations_controller_class %> < ApplicationController
 <% if rodauth? -%>
     include Plutonium::Auth::Rodauth(:<%= rodauth_config %>)
 <% end -%>
     include Plutonium::Invites::Controller
 
-    prepend_view_path Invites::Engine.root.join("app/views")
     layout "invites/invitation"
     helper_method :login_path
 
     private
 
     def invite_class
-      ::Invites::UserInvite
+      ::Invites::<%= invite_model %>
+    end
+
+    def invitation_path_for(token)
+      <%= invite_route_prefix %>_invitation_path(token: token)
     end
 
     def user_class
@@ -68,7 +71,9 @@ module Invites
 
     def sign_in_user(user)
       rodauth.account_from_login(user.email)
-      rodauth.login("signup")
+      # login_session just persists the session; `login` would redirect to
+      # rodauth.login_redirect and short-circuit our post-accept redirect.
+      rodauth.login_session("signup")
     end
 <% else -%>
     def create_user_for_signup(email, password)

data/lib/generators/pu/invites/templates/packages/invites/app/controllers/invites/welcome_controller.rb.tt

@@ -32,8 +32,8 @@ module Invites
 
     private
 
-    def invite_class
-      ::Invites::UserInvite
+    def invite_classes
+      [::Invites::<%= invite_model %>]
     end
 
     # Returns the path to redirect to after the welcome flow completes.

data/lib/generators/pu/invites/templates/packages/invites/app/definitions/invites/user_invite_definition.rb.tt

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Invites
-  class UserInviteDefinition < Invites::ResourceDefinition
+  class <%= invite_model %>Definition < Invites::ResourceDefinition
     action :resend, interaction: Invites::ResendInviteInteraction, collection_record_action: false
     action :cancel, interaction: Invites::CancelInviteInteraction, collection_record_action: false