Merge remote-tracking branch 'origin/main' into seya/saml-relay-state

Author: eld120

.claude/skills/pr/SKILL.md

@@ -26,7 +26,7 @@ The workflow below (steps 0–3) always runs and creates or updates the PR. When
 
 Invoke the `/simplify` command to review the changed code for reuse, simplification, and efficiency cleanups and apply them. Do this first, before writing the PR up, so the body describes the diff's final shape rather than a first draft. It's quality-only — it won't touch correctness — so it's safe to run unattended here; if it reports nothing to clean up, move on.
 
-Then run `bin/lint` to auto-format the code (it also picks up whatever `/simplify` just changed). Always use `bin/lint`, never another formatter or `standardrb` directly. Scope it to the branch's files rather than walking the whole repo — `bin/lint $(git diff --name-only --diff-filter=d "origin/$BASE"...HEAD)`; `--diff-filter=d` drops deleted paths so they don't show up as "Not found". Files with no linter (`.haml`, `.scss`, `.md`) are skipped, so a branch that touches none of the lintable types exits cleanly rather than looking like a lint failure. It takes directories too, so `bin/lint app/components/foo` works while you're still iterating.
+Then run `bin/lint` to auto-format the code (it also picks up whatever `/simplify` just changed). Always use `bin/lint`, never another formatter or `standardrb` directly. Scope it to the branch's files rather than walking the whole repo — `bin/lint $(git diff --name-only --diff-filter=d "origin/$BASE"...HEAD)`; `--diff-filter=d` drops deleted paths so they don't show up as "Not found". Files with no linter (`.haml`, `.scss`, `.md`) are skipped, so a branch that touches none of the lintable types exits cleanly rather than looking like a lint failure. It takes directories too, so `bin/lint app/components/foo` works while you're still iterating. Never revert what the linter wrote — if a too-broad run reformats files outside the branch, those fixes stay in the diff.
 
 Scope specs the same way — the ones covering what the branch changed, never a bare `bundle exec rspec` or a whole top-level directory (see the `rspec-testing` skill). CI runs the full suite; a green PR isn't your job to prove locally.
 

AGENTS.md

@@ -12,6 +12,8 @@ Run `bin/lint` to automatically format the code. Always use `bin/lint`, don't us
 
 **Pass it the files or directories you changed** — `bin/lint app/components/ui/table app/models/bike.rb`. A bare `bin/lint` walks the whole repo, which is slow and reformats files you aren't working on. Save it for a final check before pushing.
 
+**Never revert what the linter wrote.** If a too-broad `bin/lint` reformats files outside your change, leave those fixes in the diff — don't `git checkout` them away. Scope the next run more tightly instead.
+
 ### Code guidelines:
 
 - Code in a functional way. Avoid mutation (side effects) when you can.
@@ -21,8 +23,10 @@ Run `bin/lint` to automatically format the code. Always use `bin/lint`, don't us
 - Omit named arguments' values from hashes (ie prefer `{x:, y:}` instead of `{x: x, y: y}`)
 - Prefer less code, by character count (excluding whitespace and comments). Use `bin/char_count {FILE OR FOLDER}` to get the non-whitespace character count
 - prefer un-abbreviated variable names
+- Use full class/module names everywhere — `UI::Forms::Combobox::Component`, not the `Combobox::Component` that lexical scope also resolves from inside `UI::Forms`
 - Keep comments pithy — often they aren't necessary. Explain *why* only where a reader would otherwise get it wrong; don't narrate the change that introduced the code, and don't defend a choice against an edit nobody would make — a failing test already defends it
-- **Service objects** (`app/services/`): a stateless service is a `module` with `extend Functionable` (see the `functionable` gem) — inputs passed as args, no instance state, private methods via `conceal` + a `# private below here` block. Reach for a `class` only when the object genuinely holds instance state across methods (e.g. a multi-step builder/updater). Don't write a stateless service as a `class` with `def self.` methods.
+- **Prefer composition over inheritance and `include`.** Share behavior by calling an object that owns it, not by mixing a module into several classes or adding a base class. A `module` extracted only to be `include`d in two classes is usually one of those classes with a parameter — pass the difference in as an argument instead. Rails' own extension points (`ApplicationRecord`, `ApplicationJob`, `ActiveSupport::Concern` for controller filters) are fine; new mixins of our own are what to avoid.
+- **Service objects** (`app/services/`): a stateless service is a `module` with `extend Functionable` (see the `functionable` gem) — inputs passed as args, no instance state, private methods via `conceal` + a `# private below here` block. Don't write a stateless service as a `class` with `def self.` methods.
 
 ## Subagents
 

Gemfile.lock

@@ -137,7 +137,7 @@ GEM
     bcrypt (3.1.22)
     benchmark (0.5.0)
     bigdecimal (4.1.2)
-    binxtils (0.5.2)
+    binxtils (0.6.0)
       functionable
       loofah
       rails
@@ -244,7 +244,7 @@ GEM
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
     equalizer (0.0.11)
-    erb (6.0.6)
+    erb (6.0.7)
     erubi (1.13.1)
     excon (0.76.0)
     execjs (2.7.0)
@@ -438,7 +438,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.21.1)
+    json (2.21.2)
     jwt (3.2.0)
       base64
     knapsack_pro (10.0.1)
@@ -674,7 +674,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (4.1.0)
+    rbs (4.1.2)
       logger
       prism (>= 1.6.0)
       tsort
@@ -900,7 +900,7 @@ GEM
       nokogiri (~> 1.8)
     yaml (0.4.0)
     yard (0.9.44)
-    zeitwerk (2.8.2)
+    zeitwerk (2.8.3)
 
 PLATFORMS
   arm64-darwin

app/components/emails/partial_register_confirmation/component.en.yml

@@ -0,0 +1,15 @@
+---
+en:
+  components:
+    emails:
+      partial_register_confirmation:
+        click_below_to_pick_up_where_you_left_off: Click below to confirm this email
+          address and pick up where you left off.
+        confirm_and_continue: Confirm my email
+        confirm_your_email: Confirm your email
+        link_signs_you_in: >-
+          This link signs you in to Bike Index, so don't forward it. It works for
+          %{days} days.
+        we_saved_your_registration_html: >-
+          We saved your registration for a <strong>%{color_and_brand}</strong> on
+          the world's most comprehensive bike registry.

app/components/emails/partial_register_confirmation/component.html.erb

@@ -0,0 +1,11 @@
+<h1><%= translation("confirm_your_email") %></h1>
+
+<p>
+  <%= translation("we_saved_your_registration_html", color_and_brand: @b_param.color_and_brand) %>
+</p>
+
+<p><%= translation("click_below_to_pick_up_where_you_left_off") %></p>
+
+<%= link_to translation("confirm_and_continue"), tokenized_url, "data-pm-no-track" => true, class: "binx-button" %>
+
+<p><%= translation("link_signs_you_in", days: expiration_days) %></p>

app/components/emails/partial_register_confirmation/component.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Emails
+  module PartialRegisterConfirmation
+    class Component < ApplicationComponent
+      def initialize(b_param:)
+        @b_param = b_param
+      end
+
+      private
+
+      def expiration_days
+        BParam::TOKEN_EXPIRATION.in_days.to_i
+      end
+
+      def tokenized_url
+        confirm_register_url(b_param_token: @b_param.id_token,
+          confirmation_token: @b_param.email_confirmation_token)
+      end
+    end
+  end
+end

app/components/emails/partial_registration/component.html.erb

@@ -1,7 +1,7 @@
 <h1><%= translation("youre_almost_done") %></h1>
 
 <p>
-  <%= translation("just_a_few_steps_away_html", color_and_brand: color_and_brand) %>
+  <%= translation("just_a_few_steps_away_html", color_and_brand: @b_param.color_and_brand) %>
 </p>
 
 <% if organization_snippet_body.present? %>

app/components/emails/partial_registration/component.rb

@@ -18,10 +18,6 @@ def organization
         @b_param.creation_organization
       end
 
-      def color_and_brand
-        [@b_param.primary_frame_color.presence, @b_param.mnfg_name].compact.join(" ")
-      end
-
       def tokenized_url
         @email_preview ? OrganizedServices::EmailPreview::TOKEN_PATH : new_bike_url(b_param_token: @b_param.id_token)
       end

app/components/register/confirm/component.en.yml

@@ -0,0 +1,8 @@
+---
+en:
+  components:
+    register:
+      confirm:
+        confirming_your_email: Confirming your email
+        continue: Continue
+        this_only_takes_a_moment: Hang on, we're picking up where you left off.

app/components/register/confirm/component.html.erb

@@ -0,0 +1,15 @@
+<%= render Register::Page::Component.new do %>
+  <div class="tw:px-1 tw:py-6 tw:text-center">
+    <%= render UI::Header::Component.new(text: translation(".confirming_your_email"),
+        subtitle: translation(".this_only_takes_a_moment")) %>
+
+    <%= form_with(url: confirm_email_register_path, method: :post,
+        data: {controller: "auto-submit"}) do %>
+      <%= hidden_field_tag :b_param_token, @b_param.id_token %>
+      <%= hidden_field_tag :confirmation_token, @token %>
+
+      <%= render UI::Button::Component.new(text: translation(".continue"), color: :primary, size: :lg,
+          kind: :submit, spinner: true, html_class: "tw:w-full") %>
+    <% end %>
+  </div>
+<% end %>