studio-engine 0.29.1 → 0.31.0

data/app/controllers/magic_links_controller.rb

@@ -1,24 +1,21 @@
-# Unified create-or-login email magic link (the passwordless email path).
+# Requesting a magic link — the passwordless email path's front door.
 #
-#   POST /magic_link        — request a link (email [, return_to])
-#   GET  /magic_link/:token — "Confirm sign-in" interstitial (does NOT consume)
-#   POST /magic_link/:token — consume it: log in OR create the account
+#   POST /magic_link — request a link (email [, return_to])
 #
-# create-or-login: clicking the link IS proof of email ownership, so an email
-# that collides with a Google/wallet-only account that was never email-verified
-# is safely logged in here and stamped email_verified_at (unlike from_omniauth,
-# which refuses that collision precisely because it lacked this proof).
+# That is the whole controller. The token-bearing half lives at /l/<token>
+# (Studio::LinksController): one token format, one place it burns. Before
+# 0.31.0 this class also owned a /magic_link/:token confirm+consume pair for
+# the retired :signed store, which was a second door onto the same lock.
 #
-# This is the engine's GENERIC base. Apps that need richer post-consume routing
-# (e.g. turf-monster's contest landing + picks rehydration + entry-tokens upsell)
-# OVERRIDE this controller in the app and reuse the MagicLink service + the
-# sign_in_existing / sign_up_new building blocks.
+# create-or-login: clicking the emailed link IS proof of email ownership, so an
+# email that collides with a Google/wallet-only account that was never
+# email-verified is safely signed in at consume time and stamped
+# email_verified_at (unlike from_omniauth, which refuses that collision
+# precisely because it lacked this proof).
 class MagicLinksController < ApplicationController
-  include Studio::LinkConsumption
   include Studio::MagicLinkIssuing
 
   skip_before_action :require_authentication
-  layout false, only: :confirm
 
   # Respond uniformly for any well-formed email. Under create-or-login every
   # address is "valid" (it logs in or signs up), so there is nothing to
@@ -26,7 +23,7 @@ class MagicLinksController < ApplicationController
   def create
     email = params[:email].to_s.strip.downcase
     if email.match?(URI::MailTo::EMAIL_REGEXP)
-      token = issue_magic_link(email, safe_path(params[:return_to]))
+      token = issue_magic_link(email, Studio::LinkToken.sanitize_path(params[:return_to]))
       Studio::Email.deliver(UserMailer, :magic_link, email, token, to: email)
     end
     respond_to do |format|
@@ -35,31 +32,7 @@ class MagicLinksController < ApplicationController
     end
   end
 
-  # GET /magic_link/:token is deliberately inert. Email link scanners and link
-  # preview clients frequently prefetch emailed URLs with GET/HEAD; if GET burned
-  # the token, the human's first real click could already be invalid. The page
-  # renders a CSRF-protected form that a browser auto-POSTs to #consume.
-  def confirm
-    # strict-origin strips the token-bearing path from subresource Referer
-    # headers while preserving a usable Origin header for Rails' CSRF origin
-    # check on the consume POST.
-    response.set_header("Referrer-Policy", "strict-origin")
-    @token = params[:token]
-  end
-
-  # POST /magic_link/:token is the authoritative consume. This is the only place
-  # the single-use token is burned.
-  def consume
-    response.set_header("Referrer-Policy", "strict-origin")
-    result = MagicLink.consume(params[:token])
-    user = User.find_by(email: result.email)
-    user ? sign_in_existing(user, result) : sign_up_new(result)
-  rescue MagicLink::InvalidToken
-    redirect_to login_path, alert: "That sign-in link is invalid or has expired. Request a fresh one below."
-  end
-
-  # issue_magic_link (mint in the configured store) comes from
+  # issue_magic_link (mint a Studio::Link row) comes from
   # Studio::MagicLinkIssuing, shared with UserMailer — which builds the URL that
   # consumes it — so the mint and its landing URL cannot drift apart.
-  # sign_in_existing / sign_up_new / safe_path come from Studio::LinkConsumption.
 end

data/app/controllers/registrations_controller.rb

@@ -1,4 +1,6 @@
 class RegistrationsController < ApplicationController
+  include Studio::MagicLinkIssuing
+
   skip_before_action :require_authentication
 
   def new
@@ -13,7 +15,7 @@ class RegistrationsController < ApplicationController
     unless Studio.auth_method?(:password)
       email = (params.dig(:user, :email) || params[:email]).to_s.strip.downcase
       if email.match?(URI::MailTo::EMAIL_REGEXP)
-        token = MagicLink.generate(email: email)
+        token = issue_magic_link(email, nil)
         Studio::Email.deliver(UserMailer, :magic_link, email, token, to: email)
       end
       return redirect_to login_path, notice: "Check your inbox — we just emailed you a sign-in link."

data/app/controllers/studio/links_controller.rb

@@ -1,6 +1,6 @@
 module Studio
-  # The unified short-token link entry point — GET/POST /l/<token>. Dispatches by
-  # Studio::Link#kind:
+  # The short-token link entry point — GET/POST /l/<token>, the only magic-link
+  # door the engine draws. Dispatches by Studio::Link#kind:
   #
   #   magic_link → scanner-safe confirm interstitial (GET, inert) that auto-POSTs
   #                to #consume, the ONLY place the single-use token is burned +
@@ -9,6 +9,10 @@ module Studio
   #                the link's target (or root). Reusable + safe to prefetch, so
   #                GET does the work (no POST step).
   #
+  # Every decision about what a magic-link click DOES lives in
+  # Studio::LinkConsumption / Studio::LinkResolution, not here — including the
+  # invariant that a dead link leaves the visitor's session untouched.
+  #
   # Namespaced (not top-level Links) because mcritchie-studio already owns a
   # public /links linktree (top-level LinksController). Apps needing richer
   # post-consume routing (contest landing, picks rehydration, age-gate) define
@@ -25,30 +29,24 @@ module Studio
       response.set_header("Referrer-Policy", "strict-origin")
       @link = Studio::Link.find_by(token: params[:token])
 
-      case @link&.kind
-      when "magic_link"
-        @token = params[:token]
-        render :confirm
-      when "referral"
+      if @link&.kind == "referral"
         capture_referral(@link)
-        redirect_to(@link.target || root_path)
-      else
-        redirect_to login_path, alert: "That link is invalid or has expired. Request a fresh one below."
+        return redirect_to(@link.target || root_path)
       end
+
+      # A magic link, or a token with no row behind it. preview_magic_link is
+      # inert — it never burns — and settles a dead link itself rather than
+      # sending the visitor through a spinner that only POSTs to learn the same.
+      @token = params[:token]
+      render :confirm if preview_magic_link(@link&.kind == "magic_link" ? @link : nil) == :live
     end
 
     # POST /l/:token — authoritative magic-link consume. Only magic_link kinds are
-    # consumable here; referral links are reusable and handled entirely on GET.
+    # consumable here; referral links are reusable and handled entirely on GET,
+    # so a referral token scoped out below reads as an unknown token.
     def consume
       response.set_header("Referrer-Policy", "strict-origin")
-      link = Studio::Link.find_by(token: params[:token])
-      raise Studio::Link::InvalidToken, "not a magic link" unless link&.kind == "magic_link"
-
-      link.consume! # burns the single-use token; raises if already used / expired
-      user = User.find_by(email: link.email)
-      user ? sign_in_existing(user, link) : sign_up_new(link)
-    rescue Studio::Link::InvalidToken
-      redirect_to login_path, alert: "That sign-in link is invalid or has expired. Request a fresh one below."
+      consume_magic_link(Studio::Link.magic_links.find_by(token: params[:token]))
     end
 
     private

data/app/controllers/studio/local_reviews_controller.rb

@@ -30,10 +30,10 @@ module Studio
       email = Studio::LinkToken.normalize_email(params[:email])
       return redirect_to(login_path, alert: MISSING_EMAIL) unless email.match?(URI::MailTo::EMAIL_REGEXP)
 
-      # return_to is passed through raw: BOTH stores sanitize it to a same-origin
-      # path on the way in (Studio::Link.create_magic_link and MagicLink.generate
-      # each call Studio::LinkToken.sanitize_path). Re-sanitizing here would be a
-      # second spelling of a rule that already has one owner — and a mutation run
+      # return_to is passed through raw: the store sanitizes it to a same-origin
+      # path on the way in (Studio::Link.create_magic_link calls
+      # Studio::LinkToken.sanitize_path). Re-sanitizing here would be a second
+      # spelling of a rule that already has one owner — and a mutation run
       # confirmed it guards nothing the store does not already guard.
       token = issue_magic_link(email, params[:return_to])
       redirect_to magic_link_url_for(token), allow_other_host: false

data/app/helpers/studio_sidebar_helper.rb

@@ -0,0 +1,22 @@
+# The link-sidebar's view seam. Exposed to host views automatically (the
+# engine is non-isolated), so the navbar and any host layout can gate on
+# studio_sidebar? without wiring. Sections resolve once per render pass —
+# the resolver may call a host lambda that walks models or routes.
+module StudioSidebarHelper
+  def studio_sidebar_sections
+    @studio_sidebar_sections ||= Studio.sidebar_sections_for(self)
+  end
+
+  def studio_sidebar?
+    studio_sidebar_sections.any?
+  end
+
+  # The admin dropdown and the sidebar trigger share the cog glyph — showing
+  # both reads as a double gear. When the viewer's resolved sections carry an
+  # admin-flagged entry, the sidebar IS the admin menu (its title says so) and
+  # the engine components skip the dropdown. Declaring only public sections
+  # keeps the dropdown, so admins never lose Theme/Navbar/Error Logs.
+  def studio_sidebar_replaces_admin_menu?
+    studio_sidebar_sections.any? { |section| section[:admin] }
+  end
+end

data/app/mailers/user_mailer.rb

@@ -1,8 +1,7 @@
 class UserMailer < ApplicationMailer
-  # magic_link_url_for — the URL that consumes the token, matched to
-  # Studio.magic_link_store. Shared with the issuers that MINT the token
-  # (MagicLinksController, Studio::LocalReviewsController) so the two halves
-  # cannot drift apart.
+  # magic_link_url_for — the URL that consumes the token. Shared with the
+  # issuers that MINT it (MagicLinksController, RegistrationsController,
+  # Studio::LocalReviewsController) so the two halves cannot drift apart.
   include Studio::MagicLinkIssuing
 
   # Branded shell (banner + card) for engine-sent UserMailer emails. An app with
@@ -10,9 +9,11 @@ class UserMailer < ApplicationMailer
   layout "branded_mailer"
 
   # Passwordless sign-in link. `email` is a raw string (the recipient may not
-  # have an account yet). Token is a signed MagicLink payload (email + return_to
-  # + jti, single-use). Clicking the link logs the recipient in or creates their
-  # account. App-name-aware so the same template serves every Studio app.
+  # have an account yet). The token is a Studio::Link row's short token — 16
+  # URL-safe characters, single-use, expiring — and the email + return_to it
+  # stands for stay in the row, off the wire. Clicking the link logs the
+  # recipient in or creates their account. App-name-aware so the same template
+  # serves every Studio app.
   #
   # Engine GENERIC base. An app needing richer copy (e.g. turf-monster's
   # contest-aware variant) defines its own UserMailer, which wins.

data/app/models/studio/link.rb

@@ -11,13 +11,20 @@ module Studio
   # discriminator. Replaces the engine's stateless MessageVerifier MagicLink
   # service for mcritchie-studio so both apps share one short-token scheme.
   #
-  # Like Studio::EmailDelivery, the table lives in each consumer app (copy the
-  # reference migration in db/migrate); this model is shipped by the gem.
+  # Like Studio::EmailDelivery, the table lives in each consumer app — installed
+  # by `bin/rails studio_engine:install:migrations`, never hand-copied (a hand
+  # copy collides with the task's own copy on `class CreateStudioLinks`). This
+  # model is shipped by the gem.
   class Link < ApplicationRecord
     self.table_name = "studio_links"
 
     class InvalidToken < StandardError; end
 
+    # The app enabled :magic_link but never installed the table. Raised in place
+    # of a bare PG::UndefinedTable so the first person to hit it reads the fix
+    # instead of an adapter error — see mint!.
+    class MissingTable < StandardError; end
+
     belongs_to :linkable, polymorphic: true, optional: true
 
     validates :kind, inclusion: { in: Studio::LinkToken::KINDS }
@@ -76,6 +83,16 @@ module Studio
 
       # create! with a fresh random token, retrying the (astronomically rare)
       # unique-index collision a couple of times before surfacing the error.
+      #
+      # The MissingTable rescue exists because every consumer pins the engine as
+      # `~> 0.x`, which admits any release below 1.0 — so an app that never
+      # installed this table picks up the row store on its next `bundle update`
+      # whether or not anyone adopted it deliberately. Its boot is fine (nothing
+      # touches the table until someone signs in), and the failure then lands as
+      # a bare PG::UndefinedTable on a real person's sign-in. Naming the fix
+      # there is the difference between a five-minute repair and an outage
+      # nobody can read. The check is `table_exists?`, not a message match, so
+      # it holds on any adapter and never swallows an unrelated failure.
       def mint!(attrs)
         3.times do
           return create!(attrs.merge(token: Studio::LinkToken.generate))
@@ -83,6 +100,14 @@ module Studio
           next
         end
         create!(attrs.merge(token: Studio::LinkToken.generate))
+      rescue ActiveRecord::StatementInvalid
+        raise if table_exists?
+
+        raise MissingTable,
+              "studio-engine magic links need the studio_links table, and #{Studio.app_name} has no " \
+              "such table. Run `bin/rails studio_engine:install:migrations && bin/rails db:migrate` " \
+              "(install ALL of them). Do not hand-copy the migration — it collides with the task's " \
+              "own copy on `class CreateStudioLinks`."
       end
     end
 
@@ -106,6 +131,34 @@ module Studio
       self
     end
 
+    # The non-raising sibling of #consume!, and the one the click flow uses.
+    # Returns whether THIS caller won the burn — false for a link that was
+    # already used, has expired, or lost the atomic race to a concurrent click.
+    #
+    # Why a boolean and not the exception: "the link was dead" is not an error
+    # here, it is one of the two normal outcomes, and the branch it feeds
+    # (Studio::LinkResolution) needs the answer as data. Reloads on a loss so
+    # the caller reads the row's settled state (consumed_at / expires_at) rather
+    # than the copy it held before the race.
+    def burn
+      consume!
+      true
+    rescue InvalidToken
+      reload
+      false
+    end
+
+    # How a failed burn should be described. Only meaningful once #burn has
+    # returned false (or on a link that was never burned at all).
+    def dead_status
+      return :used if single_use? && consumed?
+      return :expired if expired?
+
+      # Neither flag is set but the burn did not land: a concurrent click won
+      # it between our read and our write. Same story for the reader.
+      :used
+    end
+
     def single_use?
       Studio::LinkToken.single_use?(kind)
     end

data/app/views/components/_link_sidebar.html.erb

@@ -0,0 +1,179 @@
+<%# The link sidebar — the engine's out-of-the-box navigation panel (lifted
+    from the mcritchie-studio hub). Renders the host's Studio.sidebar_sections
+    as a slide-out link tree in dual desktop/mobile panels, and carries its
+    own store bridge so a single render is self-sufficient. Render it once,
+    outside any sticky/backdrop-filter header (a fixed panel inside one
+    positions against the header, not the viewport); the engine navbar does
+    this automatically when sections are declared. %>
+<% sections = studio_sidebar_sections %>
+<% sidebar_admin = respond_to?(:admin?) && admin? %>
+<% close_action = "$store.sidebars.linkTreeOpen = false" %>
+
+<style>
+  /* Clip horizontal overflow so the off-canvas start/end frame of the slide
+     never flashes a scrollbar. `clip` (not `hidden`) does not create a scroll
+     container, so sticky headers keep working. Scoped here — not engine.css —
+     so apps that declare no sections get zero global CSS change. */
+  html { overflow-x: clip; }
+</style>
+
+<script>
+  // Store bridge (engine-owned): registers the Alpine `sidebars` store and
+  // keeps it healthy across Turbo navigations and bfcache restores. The
+  // panel's open/closed state is driven ENTIRELY by the store flag via
+  // x-show + x-transition — this bridge only flips the flag, never `display`
+  // directly, because an imperative display:none bakes an inline style that
+  // makes Alpine skip its enter transition (the panel pops instead of
+  // sliding). On turbo:before-cache / bfcache the flag drops so a restored
+  // page is closed. The document-level capture handlers make the trigger
+  // work even for clicks that land before Alpine initializes.
+  (function () {
+    function ensureLinkSidebarStore() {
+      if (!window.Alpine) return null;
+
+      var sidebars = Alpine.store('sidebars');
+      if (!sidebars) {
+        Alpine.store('sidebars', { linkTreeOpen: false });
+        return Alpine.store('sidebars');
+      }
+
+      if (typeof sidebars.linkTreeOpen === 'undefined') {
+        sidebars.linkTreeOpen = false;
+      }
+
+      return sidebars;
+    }
+
+    function setLinkSidebarOpen(open) {
+      var sidebars = ensureLinkSidebarStore();
+      if (sidebars) sidebars.linkTreeOpen = open;
+    }
+
+    function closeLinkSidebar() {
+      setLinkSidebarOpen(false);
+    }
+
+    function handleLinkSidebarClick(event) {
+      var closeTrigger = event.target.closest('[data-link-sidebar-close]');
+      if (closeTrigger) {
+        event.preventDefault();
+        event.stopPropagation();
+        event.stopImmediatePropagation();
+        closeLinkSidebar();
+        return;
+      }
+
+      var trigger = event.target.closest('[data-link-sidebar-trigger], [data-username-display], [data-profile-image-toggle]');
+      if (trigger && trigger.matches('[aria-controls~="studio-link-sidebar"]')) {
+        var sidebars = ensureLinkSidebarStore();
+        if (!sidebars) return;
+
+        event.preventDefault();
+        event.stopPropagation();
+        event.stopImmediatePropagation();
+        sidebars.linkTreeOpen = !sidebars.linkTreeOpen;
+        return;
+      }
+
+      var sidebars = ensureLinkSidebarStore();
+      if (!sidebars || !sidebars.linkTreeOpen) return;
+      if (event.target.closest('#studio-link-sidebar, #studio-link-sidebar-mobile')) return;
+
+      closeLinkSidebar();
+    }
+
+    function handleLinkSidebarKeydown(event) {
+      if (event.key === 'Escape') closeLinkSidebar();
+    }
+
+    if (!window.__studioLinkSidebarBridge) {
+      window.__studioLinkSidebarBridge = true;
+      document.addEventListener('alpine:init', ensureLinkSidebarStore);
+      document.addEventListener('turbo:load', ensureLinkSidebarStore);
+      document.addEventListener('turbo:before-cache', closeLinkSidebar);
+      window.addEventListener('pageshow', function (event) {
+        if (event.persisted) closeLinkSidebar();
+      });
+      document.addEventListener('click', handleLinkSidebarClick, true);
+      document.addEventListener('keydown', handleLinkSidebarKeydown, true);
+    }
+
+    ensureLinkSidebarStore();
+  })();
+</script>
+
+<% body_html = capture do %>
+  <nav class="flex-1 min-h-0 overflow-y-auto py-2" aria-label="Studio links">
+    <% sections.each do |section| %>
+      <div class="px-4 pt-4 pb-1 label-upper font-bold text-muted flex items-center gap-2">
+        <span><%= section[:title] %></span>
+        <% if section[:admin] %>
+          <span class="rounded border border-primary/20 bg-primary/10 px-1.5 py-0.5 text-[10px] font-mono text-primary">ADMIN</span>
+        <% end %>
+      </div>
+
+      <% section[:links].each do |link| %>
+        <% target = link[:target].presence %>
+        <%= link_to link[:href],
+              class: "group flex items-start gap-3 px-4 py-3 text-sm text-body hover:text-heading hover:bg-surface-alt focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/40 focus-visible:ring-inset transition",
+              target: target,
+              rel: target == "_blank" ? "noopener" : nil,
+              "@click": close_action do %>
+          <% if link[:hover_emoji].present? %>
+            <%= render "components/emoji_swap",
+                  base: link[:emoji],
+                  hover: link[:hover_emoji],
+                  class_name: "text-lg leading-none" %>
+          <% else %>
+            <span class="text-lg leading-none flex-shrink-0"><%= link[:emoji] %></span>
+          <% end %>
+          <span class="min-w-0">
+            <span class="block font-medium truncate"><%= link[:label] %></span>
+            <% if link[:desc].present? %>
+              <span class="block text-xs text-muted leading-snug mt-0.5"><%= link[:desc] %></span>
+            <% end %>
+          </span>
+        <% end %>
+      <% end %>
+    <% end %>
+  </nav>
+<% end %>
+
+<% footer_html = capture do %>
+  <% if logged_in? %>
+    <div class="border-t border-subtle p-2">
+      <%= link_to logout_path,
+            class: "flex items-center gap-3 rounded-md px-4 py-3 text-sm text-body hover:text-heading hover:bg-surface-alt focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/40 transition",
+            "@click": close_action do %>
+        <span>👋</span><span>Log out</span>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
+
+<%= render "components/sidebar_panel",
+      id: "studio-link-sidebar",
+      title: sidebar_admin ? "Admin Menu" : "Links",
+      open: "$store.sidebars.linkTreeOpen",
+      body_html: body_html,
+      footer_html: footer_html,
+      close_action: close_action,
+      outside_action: close_action,
+      escape_action: close_action,
+      display_class: "hidden md:flex",
+      role: "navigation",
+      aria_label: sidebar_admin ? "Admin menu" : "Links menu" %>
+
+<%= render "components/sidebar_panel",
+      id: "studio-link-sidebar-mobile",
+      title: sidebar_admin ? "Admin Menu" : "Links",
+      open: "$store.sidebars.linkTreeOpen",
+      body_html: body_html,
+      footer_html: footer_html,
+      close_action: close_action,
+      outside_action: close_action,
+      escape_action: close_action,
+      display_class: "flex md:hidden",
+      width_class: "w-full",
+      role: "navigation",
+      aria_label: sidebar_admin ? "Admin menu" : "Links menu" %>

data/app/views/components/_link_sidebar_trigger.html.erb

@@ -0,0 +1,21 @@
+<%# Link-sidebar toggle button. `class_name` prepends responsive placement
+    classes (the navbar mounts one instance `hidden md:inline-flex` in the
+    desktop icon rail and one in the mobile sub-navbar row). The click is
+    handled twice on purpose: the Alpine @click for normal operation, and the
+    document-level capture bridge in _link_sidebar for pre-Alpine clicks. %>
+<% extra_classes = local_assigns.fetch(:class_name, "") %>
+<% sidebar_admin = respond_to?(:admin?) && admin? %>
+<button type="button"
+        @click.stop="$store.sidebars.linkTreeOpen = !$store.sidebars.linkTreeOpen"
+        class="<%= "#{extra_classes} " if extra_classes.present? %>inline-flex h-9 w-9 items-center justify-center rounded-md text-secondary hover:text-heading hover:bg-surface-alt focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/40 transition"
+        title="<%= sidebar_admin ? 'Admin Menu' : 'Links' %>"
+        aria-label="<%= sidebar_admin ? 'Toggle admin menu' : 'Toggle links menu' %>"
+        aria-controls="studio-link-sidebar studio-link-sidebar-mobile"
+        aria-haspopup="dialog"
+        :aria-expanded="$store.sidebars && $store.sidebars.linkTreeOpen ? 'true' : 'false'"
+        data-link-sidebar-trigger="true">
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+    <path stroke-linecap="round" stroke-linejoin="round" d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.325.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 0 1 1.37.49l1.296 2.247a1.125 1.125 0 0 1-.26 1.431l-1.003.827c-.293.241-.438.613-.43.992a7.723 7.723 0 0 1 0 .255c-.008.378.137.75.43.991l1.004.827c.424.35.534.955.26 1.43l-1.298 2.247a1.125 1.125 0 0 1-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.47 6.47 0 0 1-.22.128c-.331.183-.581.495-.644.869l-.213 1.281c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.019-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 0 1-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 0 1-1.369-.49l-1.297-2.247a1.125 1.125 0 0 1 .26-1.431l1.004-.827c.292-.24.437-.613.43-.991a6.932 6.932 0 0 1 0-.255c.007-.38-.138-.751-.43-.992l-1.004-.827a1.125 1.125 0 0 1-.26-1.43l1.297-2.247a1.125 1.125 0 0 1 1.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.086.22-.128.332-.183.582-.495.644-.869l.214-1.28Z" />
+    <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
+  </svg>
+</button>

data/app/views/components/_sidebar_panel.html.erb

@@ -0,0 +1,63 @@
+<%# Shared fixed right-sidebar shell (lifted from the mcritchie-studio hub).
+    Alpine-driven: `open` is an Alpine expression; the panel slides in from
+    off-screen right under x-transition and positions beneath the sticky
+    header via the --nav-h custom property _head.html.erb publishes. %>
+<% id             = local_assigns.fetch(:id, nil) %>
+<% title          = local_assigns.fetch(:title, nil) %>
+<% open           = local_assigns.fetch(:open) %>
+<% actions_html   = local_assigns.fetch(:actions_html, nil) %>
+<% body_html      = local_assigns.fetch(:body_html, nil) %>
+<% footer_html    = local_assigns.fetch(:footer_html, nil) %>
+<% close_action   = local_assigns.fetch(:close_action, nil) %>
+<% outside_action = local_assigns.fetch(:outside_action, nil) %>
+<% escape_action  = local_assigns.fetch(:escape_action, nil) %>
+<% display_class  = local_assigns.fetch(:display_class, "hidden md:flex") %>
+<% width_class    = local_assigns.fetch(:width_class, "w-80 max-w-full") %>
+<% z_class        = local_assigns.fetch(:z_class, "studio-link-sidebar-layer") %>
+<% panel_class    = local_assigns.fetch(:panel_class, "") %>
+<% role           = local_assigns.fetch(:role, "complementary") %>
+<% aria_label     = local_assigns.fetch(:aria_label, title) %>
+<% labelledby     = id.present? && title.present? ? "#{id}-title" : nil %>
+
+<aside
+  <% if id.present? %>id="<%= id %>"<% end %>
+  x-cloak
+  x-show="<%= open %>"
+  <%= %(#{outside_action.present? ? "@click.outside=\"#{outside_action}\"" : ""}).html_safe %>
+  <%= %(#{escape_action.present? ? "@keydown.escape.window=\"#{escape_action}\"" : ""}).html_safe %>
+  <%= %(#{close_action.present? ? "@turbo:before-cache.window=\"#{close_action}\"" : ""}).html_safe %>
+  x-transition:enter="transition ease-out duration-300"
+  x-transition:enter-start="translate-x-full"
+  x-transition:enter-end="translate-x-0"
+  x-transition:leave="transition ease-in duration-200"
+  x-transition:leave-start="translate-x-0"
+  x-transition:leave-end="translate-x-full"
+  class="<%= display_class %> fixed right-0 <%= width_class %> bg-surface border-l border-subtle shadow-2xl <%= z_class %> flex-col <%= panel_class %>"
+  style="top:var(--nav-h, 6rem);height:calc(100% - var(--nav-h, 6rem))"
+  role="<%= role %>"
+  <% if labelledby %>aria-labelledby="<%= labelledby %>"<% elsif aria_label.present? %>aria-label="<%= aria_label %>"<% end %>>
+  <div class="flex flex-col h-full">
+    <% if title.present? || actions_html.present? || close_action.present? %>
+      <div class="flex items-center justify-between p-4 border-b border-subtle">
+        <% if title.present? %>
+          <h3 <% if labelledby %>id="<%= labelledby %>"<% end %> class="text-lg font-bold text-heading"><%= title %></h3>
+        <% end %>
+        <div class="flex items-center gap-2 ml-auto">
+          <%= actions_html if actions_html.present? %>
+          <% if close_action.present? %>
+            <button type="button"
+                    @click="<%= close_action %>"
+                    class="flex items-center justify-center w-8 h-8 rounded-full text-secondary hover:text-heading hover:bg-surface-alt focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/40 transition"
+                    aria-label="Close sidebar"
+                    data-link-sidebar-close="true">
+              <span class="text-xl leading-none">&times;</span>
+            </button>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+    <%= body_html if body_html.present? %>
+    <%= footer_html if footer_html.present? %>
+  </div>
+</aside>

data/app/views/components/_user_nav.html.erb

@@ -56,7 +56,9 @@
         <%= studio_nav_slot.call(balance_slot, balance_html) %>
         <div class="flex items-center gap-2 ml-auto self-end">
           <%= studio_nav_slot.call(extra_icons_slot, extra_icons_html) %>
-          <%= render "components/admin_dropdown" %>
+          <%# Skipped when the link sidebar carries the admin menu — two cog
+              glyphs side by side read as a double gear. %>
+          <%= render "components/admin_dropdown" unless respond_to?(:studio_sidebar_replaces_admin_menu?) && studio_sidebar_replaces_admin_menu? %>
           <%= render "components/theme_toggle_morph" %>
         </div>
         <% account_link = defined?(account_path) ? account_path : "#" %>
@@ -65,12 +67,16 @@
         <% end %>
       </div>
       <% div2_content = studio_nav_slot.call(div2_slot, div2_html) %>
+      <% server_level = current_user.respond_to?(:level) && current_user.level.present? ? current_user.level : nil %>
+      <% wallet_connected = current_user.respond_to?(:truncated_solana) && current_user.try(:solana_connected?) %>
       <% if div2_content.present? %>
         <%# Div 2 replaced by the consumer's slot (div2_slot or legacy div2_html). %>
         <%= div2_content %>
-      <% else %>
-        <%# Div 2 (Smaller): wallet address (left) + level (right) with progress bar %>
-        <% server_level = current_user.respond_to?(:level) && current_user.level.present? ? current_user.level : nil %>
+      <% elsif server_level || wallet_connected || show_logout_link %>
+        <%# Div 2 (Smaller): wallet address (left) + level (right) with progress
+            bar. Renders only when it has something to show — an off-chain,
+            level-less user without a logout link gets NO second row, so the
+            nav collapses to one line instead of an empty progress strip. %>
         <div x-data="{
                barWidth: 0,
                displayLevel: <%= server_level || 1 %>,
@@ -123,7 +129,7 @@
           <%# Text layer 1: muted (visible outside bar) %>
           <div class="absolute inset-0 flex items-center justify-between px-1.5 font-mono text-muted z-[1] nav-bar-text">
             <span>
-              <% if current_user.respond_to?(:truncated_solana) && current_user.try(:solana_connected?) %>
+              <% if wallet_connected %>
                 <%= current_user.truncated_solana %>
               <% end %>
             </span>
@@ -136,7 +142,7 @@
           <%# Text layer 2: white (clip-path reveals where bar covers) %>
           <div class="absolute inset-0 flex items-center justify-between px-1.5 font-mono text-white z-[2] nav-bar-text" :style="{ 'clip-path': 'inset(0 ' + (100 - barWidth) + '% 0 0)' }">
             <span>
-              <% if current_user.respond_to?(:truncated_solana) && current_user.try(:solana_connected?) %>
+              <% if wallet_connected %>
                 <%= current_user.truncated_solana %>
               <% end %>
             </span>
@@ -167,7 +173,7 @@
       <%= render "components/avatar", user: current_user, size: "nav" %>
     <% end %>
   <% else %>
-    <%= render "components/admin_dropdown" %>
+    <%= render "components/admin_dropdown" unless respond_to?(:studio_sidebar_replaces_admin_menu?) && studio_sidebar_replaces_admin_menu? %>
     <%= render "components/theme_toggle_morph" %>
     <div class="flex items-center gap-3 ml-auto">
       <%= link_to "Log in", login_path, class: "text-heading hover:text-primary text-sm font-semibold transition" %>