studio-engine 0.127.0 → 0.129.0

data/app/javascript/studio/loader.js

@@ -9,6 +9,15 @@
 //                 data-studio-loader-overlay, outlasts the overlay's data-delay
 //                 ms; hidden when the page arrives. Its role=status label is
 //                 announced: the overlay never marks itself aria-busy.
+//   the pace      one standard for every app: a visit under data-delay ms shows no
+//                 overlay and waits for nothing; once the overlay of a visit has
+//                 shown, it stays data-min-show ms. Turbo's hook for a pause,
+//                 turbo:before-render, comes AFTER a view transition took the old
+//                 page's picture, with rendering paused, so a hold there would
+//                 freeze the loader and carry it out in that picture. So the wait
+//                 is on the response, ahead of all of that: see holdVisitResponse.
+//   the door      a host need not render the overlay. layouts/studio/_head carries
+//                 it in a <template>, and this module adds it to the body at need.
 //   pending       a button holding studio_loader_pending. Turbo marks a
 //                 submitting form aria-busy itself; for a form Turbo does not
 //                 drive, the submitter is marked here, and cleared on pagehide
@@ -20,10 +29,13 @@
 //                 clears at once, on turbo:reload.
 //   the API       window.StudioLoader.show(caption) / hide() for any other long
 //                 wait, and setPercent(el, n) for a loader drawn with percent:.
+//                 hide() is immediate. It ends any wait, because the caller owns
+//                 that moment, and a caller's show() has no minimum.
 //
 // The logic is exported for test/javascript/loader.test.mjs.
 
 export var DEFAULT_DELAY_MS = 350
+export var DEFAULT_MIN_SHOW_MS = 750
 export var MAX_WAIT_MS = 15000
 
 // Only a visit the user started earns the overlay: a click or Turbo.visit
@@ -39,6 +51,11 @@ export function overlayDelay(overlay) {
   return value >= 0 ? value : DEFAULT_DELAY_MS
 }
 
+export function overlayMinShow(overlay) {
+  var value = overlay ? parseInt(overlay.getAttribute('data-min-show'), 10) : NaN
+  return value >= 0 ? value : DEFAULT_MIN_SHOW_MS
+}
+
 // The percent a caller handed setPercent, clamped to a number in 0..100.
 export function clampPercent(value) {
   var n = Number(value)
@@ -58,6 +75,97 @@ function findOverlay(doc) {
 var pendingTimer = null
 var capTimer = null
 var autoShown = false
+var shownAt = null
+var deferredHide = null
+var releaseHold = null
+var visitSignal = null
+
+// The host's own overlay, else the one layouts/studio/_head carries. Added once:
+// querySelector cannot see into a <template>.
+function ensureOverlay(doc) {
+  var overlay = findOverlay(doc)
+  if (overlay || !doc.body) return overlay
+  var template = doc.querySelector('template[data-studio-loader-overlay-template]')
+  if (!template) return null
+  doc.body.appendChild(doc.importNode(template.content, true))
+  return findOverlay(doc)
+}
+
+// What is left of the minimum for an overlay a visit showed. Zero for one that is
+// not showing, and for one a caller opened with show().
+export function minShowLeft(overlay, now) {
+  if (!overlay || overlay.hidden || shownAt === null) return 0
+  return Math.max(0, overlayMinShow(overlay) - (now - shownAt))
+}
+
+// A page that must stay its own document answers this way. Turbo loads it again by
+// a full load, so this response paints nothing, and a wait here would only delay it.
+export function answersWithFullLoad(html) {
+  return /<meta[^>]*(turbo-visit-control[^>]*reload|reload[^>]*turbo-visit-control)/i.test(html || '')
+}
+
+export function noteVisitRequest(event, doc) {
+  if (event.target === doc.documentElement) visitSignal = event.detail.fetchOptions.signal
+}
+
+function endHold() {
+  if (releaseHold) releaseHold()
+}
+
+// Turbo reads response.responseHTML, and only then records the response, caches the
+// page and opens its view transition. So this is the last moment the page is live
+// with the response in hand. The rest of the minimum runs here and the overlay goes,
+// so the old picture has no overlay in it. It always ends: at the timer, at hide(),
+// or at the next visit. A later hold (the transition's wait for images) comes after
+// this one has ended, inside the render, so neither can cut the other short. Turbo
+// renders even a cancelled visit's response, so that HTML never goes: a Back must win.
+//
+// Only a visit's own good HTML waits. A frame, a form and a prefetch have another
+// target. A failure and a download pass straight through.
+export function holdVisitResponse(event, doc) {
+  doc = doc || document
+  if (event.target !== doc.documentElement) return false
+  clearTimeout(pendingTimer)
+  pendingTimer = null
+  var response = event.detail && event.detail.fetchResponse
+  // A body that fails after its headers rejects here, and Turbo fires nothing for it.
+  if (response) Promise.resolve(response.responseHTML).catch(function () { hide(doc) })
+  if (!response || !response.succeeded || !response.isHTML) return false
+  var overlay = findOverlay(doc)
+  if (minShowLeft(overlay, Date.now()) <= 0) return false
+  var signal = visitSignal
+  var held = Promise.resolve(response.responseHTML).then(function (html) {
+    if (answersWithFullLoad(html)) return html
+    var left = minShowLeft(overlay, Date.now())
+    if (left <= 0) return html
+    return new Promise(function (resolve) {
+      var done = function (value) { if (!signal || !signal.aborted) resolve(value) }
+      var timer = setTimeout(function () {
+        releaseHold = null
+        hide(doc)
+        done(html)
+      }, left)
+      releaseHold = function () {
+        clearTimeout(timer)
+        releaseHold = null
+        done(html)
+      }
+    })
+  })
+  Object.defineProperty(response, 'responseHTML', { configurable: true, value: held })
+  return true
+}
+
+// A form's overlay ends with its submit, and no render waits on it, so this only
+// keeps the overlay up for the rest of its minimum.
+export function hideAfterMinimum(doc) {
+  doc = doc || document
+  var left = minShowLeft(findOverlay(doc), Date.now())
+  if (left <= 0) return hide(doc)
+  clearTimeout(deferredHide)
+  deferredHide = setTimeout(function () { hide(doc) }, left)
+  return true
+}
 
 // The overlay's status is a live region; rewriting its label after the overlay
 // unhides makes a screen reader say it, where text already present when a
@@ -77,8 +185,11 @@ export function show(caption, doc) {
   doc = doc || document
   clearTimeout(pendingTimer)
   pendingTimer = null
+  clearTimeout(deferredHide)
+  deferredHide = null
   autoShown = false
-  var overlay = findOverlay(doc)
+  shownAt = null
+  var overlay = ensureOverlay(doc)
   if (!overlay) return false
   var line = overlay.querySelector('[data-studio-loader-caption]')
   if (line) line.textContent = caption || ''
@@ -94,6 +205,10 @@ export function hide(doc) {
   doc = doc || document
   clearTimeout(pendingTimer)
   pendingTimer = null
+  clearTimeout(deferredHide)
+  deferredHide = null
+  shownAt = null
+  endHold()
   var overlay = findOverlay(doc)
   if (!overlay) return false
   overlay.removeAttribute('data-state')
@@ -134,10 +249,14 @@ function armCap(doc) {
 // slow Turbo visit keeps its overlay until the page arrives.
 export function showSoon(caption, doc) {
   doc = doc || document
-  var overlay = findOverlay(doc)
+  var overlay = ensureOverlay(doc)
   if (!overlay || !overlay.hidden) return
   clearTimeout(pendingTimer)
-  pendingTimer = setTimeout(function () { show(caption, doc); autoShown = true }, overlayDelay(overlay))
+  pendingTimer = setTimeout(function () {
+    show(caption, doc)
+    autoShown = true
+    shownAt = Date.now()
+  }, overlayDelay(overlay))
 }
 
 export function markBusy(button, doc) {
@@ -168,7 +287,13 @@ export function installStudioLoader(doc) {
   if (installed) return
   installed = true
 
-  doc.addEventListener('turbo:visit', function (event) { if (userVisit(event)) showSoon('', doc) })
+  doc.addEventListener('turbo:visit', function (event) {
+    // The response a hold still waits on belongs to a visit that is over.
+    endHold()
+    if (userVisit(event)) showSoon('', doc)
+  })
+  doc.addEventListener('turbo:before-fetch-request', function (event) { noteVisitRequest(event, doc) })
+  doc.addEventListener('turbo:before-fetch-response', function (event) { holdVisitResponse(event, doc) })
   // turbo:reload: the response was not HTML (a download), or the visit failed,
   // and Turbo hands the URL to the browser; no page may ever replace this one.
   ;['turbo:load', 'turbo:render', 'turbo:before-cache', 'turbo:fetch-request-error', 'turbo:frame-load', 'turbo:reload'].forEach(function (name) {
@@ -189,7 +314,7 @@ export function installStudioLoader(doc) {
   })
   doc.addEventListener('turbo:submit-end', function (event) {
     var form = event.target
-    if (form && form.hasAttribute && form.hasAttribute('data-studio-loader-overlay')) hide(doc)
+    if (form && form.hasAttribute && form.hasAttribute('data-studio-loader-overlay')) hideAfterMinimum(doc)
   })
 
   // A form Turbo does not drive navigates away on its own; mark the button and,

data/app/javascript/studio/microphone_chip.js

@@ -55,6 +55,7 @@ export function mountMicrophoneChip(root, { win = window } = {}) {
   let silentLabel = null
   let lastTakeSilent = false
   let helpSession = null
+  let keysDown = new Set()
   let permission = null
   let destroyed = false
 
@@ -296,6 +297,7 @@ export function mountMicrophoneChip(root, { win = window } = {}) {
     root.dataset.microphoneHelp = kind
 
     if (dialog.open) return
+    keysDown = new Set()
     helpSession = { returnFocus: returnTo || doc.activeElement, done: false }
     if (typeof dialog.showModal === "function") dialog.showModal()
     else dialog.setAttribute("open", "")
@@ -318,6 +320,20 @@ export function mountMicrophoneChip(root, { win = window } = {}) {
     if (target) target.focus()
   }
 
+  // A key held on the talk button when a refusal opens the dialog lands on Close, the
+  // focused button: its repeats would press Close (Enter), and its keyup would finish
+  // the press (Space). Only a key pressed since the dialog opened counts. Mouse and
+  // touch are not keys, and Esc is not one of these two.
+  function onDialogKey(event) {
+    if (event.key !== " " && event.key !== "Enter") return
+    if (event.type === "keydown") {
+      if (event.repeat) event.preventDefault()
+      else keysDown.add(event.key)
+    } else if (!keysDown.delete(event.key)) {
+      event.preventDefault()
+    }
+  }
+
   // ---- Wiring --------------------------------------------------------------
 
   function onClick(event) {
@@ -342,6 +358,8 @@ export function mountMicrophoneChip(root, { win = window } = {}) {
     if (event.key !== "Escape") return
     if (dialog && dialog.contains(event.target)) return
     if (!panel || panel.hidden) return
+    // The list's Esc, not a modal's or a page's around the chip.
+    event.stopPropagation()
     closePanel()
     if (chip) chip.focus()
   }
@@ -352,7 +370,11 @@ export function mountMicrophoneChip(root, { win = window } = {}) {
   listeners.forEach(([name, fn]) => win.addEventListener(name, fn))
   root.addEventListener("click", onClick)
   root.addEventListener("keydown", onKey)
-  if (dialog) dialog.addEventListener("close", onDialogClose)
+  if (dialog) {
+    dialog.addEventListener("close", onDialogClose)
+    dialog.addEventListener("keydown", onDialogKey, true)
+    dialog.addEventListener("keyup", onDialogKey, true)
+  }
   if (media && media.addEventListener) media.addEventListener("devicechange", onDeviceChange)
   watchPermission()
   refresh()
@@ -365,7 +387,11 @@ export function mountMicrophoneChip(root, { win = window } = {}) {
       listeners.forEach(([name, fn]) => win.removeEventListener(name, fn))
       root.removeEventListener("click", onClick)
       root.removeEventListener("keydown", onKey)
-      if (dialog) dialog.removeEventListener("close", onDialogClose)
+      if (dialog) {
+        dialog.removeEventListener("close", onDialogClose)
+        dialog.removeEventListener("keydown", onDialogKey, true)
+        dialog.removeEventListener("keyup", onDialogKey, true)
+      }
       if (media && media.removeEventListener) media.removeEventListener("devicechange", onDeviceChange)
       if (permission) permission.onchange = null
       if (dialog && dialog.open) dialog.close()

data/app/javascript/studio/page_transitions.js

@@ -1,5 +1,5 @@
-// studio/page_transitions: the app-to-app page transition (Studio.page_transition_direction,
-// docs/PAGE_TRANSITIONS.md). Loaded by its own tag in layouts/studio/_head, only with the
+// studio/page_transitions: the app-to-app page transition (Studio.page_transition_direction and
+// Studio.page_transition_style, docs/PAGE_TRANSITIONS.md). Loaded by its own tag in layouts/studio/_head, only with the
 // setting on. It names a style on <html>, and engine.css draws it. It imports nothing.
 //
 // Turbo calls document.startViewTransition BEFORE turbo:before-render, and the browser takes
@@ -8,17 +8,20 @@
 // turbo:visit and from the response, never first at before-render.
 //
 // A full load is the other path to the same look. The new document draws the motion, so the old
-// one only plans it: at pageswap it names what it holds, draws the style here, and leaves it for
+// one only plans it: at pageswap it names what it holds, reads the style here, and leaves it for
 // studio/page_transition_reveal, the classic script that applies it at pagereveal.
 //
 // The effects are from the Codrops Page Transitions demo; the keyframes were written fresh.
 
-export const DIRECTIONS = Object.freeze({
-  left: Object.freeze(["fade-left", "unfold-right"]),
-  right: Object.freeze(["fade-right", "unfold-left"]),
-  top: Object.freeze(["fade-top", "unfold-bottom"]),
-  bottom: Object.freeze(["fade-bottom", "unfold-top"]),
+// The move each pair of settings plays: the first key is Studio.page_transition_style, the second
+// is Studio.page_transition_direction. An unfold is named for the way the new page turns, which
+// is the opposite of the way the page leaves.
+export const STYLES = Object.freeze({
+  slide: Object.freeze({ left: "slide-left", right: "slide-right", top: "slide-top", bottom: "slide-bottom" }),
+  unfold: Object.freeze({ left: "unfold-right", right: "unfold-left", top: "unfold-bottom", bottom: "unfold-top" }),
 })
+// Mirrors the default in lib/studio.rb, for a page with no style meta.
+export const DEFAULT_STYLE = "slide"
 
 // A same-page visit (a refresh, a poll, the second half of a redirect): the transition still
 // runs, and draws nothing.
@@ -29,31 +32,31 @@ export const FULL_LOAD_STYLE_KEY = "studio-page-transition-style"
 const MAX_READY_IMAGES = 12
 const REDUCED_MOTION = "(prefers-reduced-motion: reduce)"
 
-export function pickStyle(direction, random = Math.random) {
-  if (!Object.hasOwn(DIRECTIONS, direction)) return null
-  const pair = DIRECTIONS[direction]
-  return pair[Math.floor(random() * pair.length)]
+export function styleFor(direction, style) {
+  const moves = STYLES[Object.hasOwn(STYLES, style) ? style : DEFAULT_STYLE]
+  return Object.hasOwn(moves, direction) ? moves[direction] : null
 }
 
 // The style for one visit, STILL, or null to leave the swap alone (the engine's fade plays,
 // and a morph between two pages stands). An advance visit to the same path can bring a new
 // page, as a launch panel does when it gives way to the chat at its own address, so a name
 // the two share still morphs. A refresh replaces, and stays silent.
-export function planVisit({ direction, from, to, transitions, sharedName, advance }, random = Math.random) {
-  if (!transitions || !from || !to || !Object.hasOwn(DIRECTIONS, direction)) return null
+export function planVisit({ direction, style, from, to, transitions, sharedName, advance }) {
+  const move = styleFor(direction, style)
+  if (!transitions || !from || !to || !move) return null
   if (from === to) return advance && sharedName ? null : STILL
-  return sharedName ? null : pickStyle(direction, random)
+  return sharedName ? null : move
 }
 
 // The style a full load should play, or null for a plain load: planVisit's own rule, so the
 // two paths cannot differ. No morph, since the old page cannot read the new page's names
 // before its picture, and a browser with no activation entry has nothing to compare.
-export function planFullLoad({ direction, from, activation }, random = Math.random) {
+export function planFullLoad({ direction, style, from, activation }) {
   const url = activation && activation.entry && activation.entry.url
   if (!url) return null
   const to = new URL(url).pathname
-  const style = planVisit({ direction, from, to, transitions: true, sharedName: false }, random)
-  return style === STILL ? null : style
+  const move = planVisit({ direction, style, from, to, transitions: true, sharedName: false })
+  return move === STILL ? null : move
 }
 
 // Hands the style to the next document. Storage can refuse, and then the load is plain.
@@ -129,6 +132,11 @@ function readDirection(doc) {
   return meta ? meta.content : null
 }
 
+function readStyle(doc) {
+  const meta = doc.querySelector('meta[name="page-transition-style"]')
+  return meta ? meta.content : null
+}
+
 let installed = false
 
 export function installPageTransitions(doc) {
@@ -193,6 +201,7 @@ export function installPageTransitions(doc) {
     const sharedName = shareName(morphNames(doc), names)
     const style = planVisit({
       direction: readDirection(doc),
+      style: readStyle(doc),
       from,
       to: target,
       transitions: !!doc.startViewTransition && !win.matchMedia(REDUCED_MOTION).matches,
@@ -235,7 +244,7 @@ export function installPageTransitions(doc) {
   // The last moment on the old document. The browser takes its picture after this.
   win.addEventListener("pageswap", (event) => {
     const transition = event.viewTransition
-    const style = transition && planFullLoad({ direction: readDirection(doc), from, activation: event.activation })
+    const style = transition && planFullLoad({ direction: readDirection(doc), style: readStyle(doc), from, activation: event.activation })
     const left = leaveStyle(win, style)
     if (!transition) return
     if (!left) {

data/app/javascript/studio/survey.js

@@ -9,7 +9,8 @@
 //
 // AUTOSAVE IS BEST EFFORT: the final Submit posts the whole form, so a failed
 // autosave loses nothing. Without this module the page is the plain form, every
-// question on one page, and it submits the same answers.
+// question on one page, and it submits the same answers. So a submit cancels every
+// save still in flight: one left running could reach the server after the POST.
 //
 // It imports nothing; test/javascript/survey.test.mjs loads it as a data:
 // module. Bound to the page by the survey controller.
@@ -84,6 +85,7 @@ export function enhanceSurvey(root, win = window, doc = document) {
   var reduce = win.matchMedia && win.matchMedia("(prefers-reduced-motion: reduce)").matches;
   var saved = {};
   var timers = {};
+  var requests = [];
   var current = -1;
   var pointerPick = false;
   var submitting = false;
@@ -121,12 +123,20 @@ export function enhanceSurvey(root, win = window, doc = document) {
     }
     var url = root.dataset.answerBase + encodeURIComponent(key);
     status.textContent = "Saving…";
+    var request = new win.AbortController();
+    requests.push(request);
     return win.fetch(url, {
       method: "PATCH",
       body: body,
       credentials: "same-origin",
+      signal: request.signal,
       headers: { "Accept": "application/json", "X-CSRF-Token": csrf }
     }).then(function (res) {
+      // Completed elsewhere, such as in a second tab. There is nothing to fix here.
+      if (res.status === 409) {
+        status.textContent = "";
+        return false;
+      }
       // fetch resolves on a 4xx/5xx — the status is the only signal.
       if (!res.ok) {
         return res.json().catch(function () { return {}; }).then(function (data) {
@@ -139,6 +149,8 @@ export function enhanceSurvey(root, win = window, doc = document) {
       status.textContent = "Saved";
       return true;
     }).catch(function () {
+      // The submit cancelled it, which is not the visitor being offline.
+      if (submitting) return false;
       status.textContent = "Offline? Your answers still go in when you submit.";
       return false;
     });
@@ -196,8 +208,8 @@ export function enhanceSurvey(root, win = window, doc = document) {
       setError(step, "");
     }
     if (current === steps.length - 1) {
-      // No autosave here: the POST carries every answer, and a PATCH racing
-      // it would land after completion and be refused.
+      // No autosave here: the POST carries every answer. The submit handler
+      // cancels any earlier save still in flight.
       submitForm();
     } else {
       if (step.dataset.key) save(step);
@@ -222,6 +234,7 @@ export function enhanceSurvey(root, win = window, doc = document) {
     }
     Object.keys(timers).forEach(function (key) { win.clearTimeout(timers[key]); });
     submitting = true;
+    requests.forEach(function (request) { request.abort(); });
     submit.disabled = true;
     submit.textContent = "Sending…";
   });

data/app/javascript/studio/theme_editor.js

@@ -82,7 +82,11 @@ export function dsThemeEditor(seed) {
     }, seed || {}),
     saving: false,
 
+    // The preview block shows once a role has been edited: before that it only repeats the page.
+    edited: false,
+
     updatePreview() {
+      this.edited = true
       applyProperties(document.documentElement.style, stylePreviewProperties(this.colors))
     },
 

data/app/javascript/studio/voice_recorder.js

@@ -14,9 +14,9 @@
 //   </div>
 //
 // STATES, on data-voice-recorder-state: idle -> starting -> recording ->
-// captured | silent | failed, plus denied (the microphone was refused) and
-// unsupported (no MediaRecorder). Any of idle, captured, silent, failed and
-// denied takes a new press.
+// captured | silent | failed, plus denied (the microphone was refused),
+// unsupported (no MediaRecorder) and, in hold mode, tapped (let go too soon to be a
+// take). Any of idle, captured, silent, failed, denied and tapped takes a new press.
 //
 // EVENTS, dispatched on the root (they bubble):
 //   studio:voice-recorder:take    detail { blob, mimeType, durationMs, peakRms, microphone: { label, deviceId } }
@@ -49,7 +49,12 @@ export const MIME_CANDIDATES = [
   "audio/ogg;codecs=opus"
 ]
 
-export const READY = ["idle", "captured", "silent", "failed", "denied"]
+export const READY = ["idle", "captured", "silent", "failed", "denied", "tapped"]
+
+// Hold mode: a take shorter than this is a tap, not a hold. It says how to use the
+// button and tells the chip nothing: the frames a tap records are too few to judge
+// the microphone by, and two silent takes in a row would open the help.
+export const TAP_MS = 300
 
 // How long a take may stay silent before the status asks whether the
 // microphone is on.
@@ -66,6 +71,7 @@ export const COPY = {
             missing: "I couldn't find a microphone. Plug one in and try again.",
             busy: "Your microphone is busy in another app. Close it there, then try again." },
   denied: { button: "Record", status: "Allow the microphone to record." },
+  tapped: { button: "Record", status: "Hold the button while you talk, then let go." },
   unsupported: { button: "Record", status: "This browser can't record here. Try Safari or Chrome." }
 }
 
@@ -83,8 +89,9 @@ export function formatElapsed(ms) {
 
 // The line for a microphone that would not open (NotAllowedError is "denied",
 // not this). NotReadableError is a microphone another app holds (Chrome's
-// older name, TrackStartError); everything else reads as no microphone found.
-export const BUSY_ERRORS = ["NotReadableError", "TrackStartError"]
+// older name, TrackStartError; Firefox can say AbortError); everything else
+// reads as no microphone found.
+export const BUSY_ERRORS = ["NotReadableError", "TrackStartError", "AbortError"]
 
 export function failedLine(error, copy = COPY) {
   const busy = !!error && BUSY_ERRORS.includes(error.name)
@@ -216,7 +223,7 @@ export function mountVoiceRecorder(root, { win = window, open = openMicrophone,
     // Destroyed, or let go of (hold mode) before the microphone opened.
     if (destroyed || stopWanted) {
       release()
-      if (!destroyed) setState("idle")
+      if (!destroyed) setState(mode === "hold" ? "tapped" : "idle")
       return
     }
     chunks = []
@@ -275,6 +282,10 @@ export function mountVoiceRecorder(root, { win = window, open = openMicrophone,
     recorder = null
     release()
     if (destroyed) return
+    if (mode === "hold" && durationMs < TAP_MS) {
+      setState("tapped")
+      return
+    }
     if (blob.size === 0 || !heard) {
       setState("silent", silentMessage(copy.silent.named, microphone.label))
       announce(MICROPHONE_EVENTS.silent, { label: microphone.label }, win)

data/app/models/studio/survey_response.rb

@@ -87,25 +87,32 @@ module Studio
 
     # Stores one answer (or clears it, for a blank). Returns [ok, error]. Never
     # touches a completed response: a finished survey is a record, not a draft.
+    #
+    # THE ROW LOCK IS THE GUARD, not the loaded copy. This writes the whole answers
+    # hash, so a copy loaded before a submit completed the row would put its stale
+    # hash over the finished answers, and two saves at once would lose each other's
+    # keys. with_lock reloads under the lock, so both checks read the row as it is.
     def record_answer(question, raw)
-      return [false, "This survey is already complete."] if completed?
-
-      value, error = question.normalize(raw)
-      return [false, error] if error
-
-      next_answers = (answers || {}).dup
-      if value.nil?
-        next_answers.delete(question.key)
-      else
-        next_answers[question.key] = {
-          "value" => value, "label" => question.label, "type" => question.type.to_s,
-          "display" => question.display(value), "answered_at" => Time.current.utc.iso8601
-        }
+      with_lock do
+        next [false, "This survey is already complete."] if completed?
+
+        value, error = question.normalize(raw)
+        next [false, error] if error
+
+        next_answers = (answers || {}).dup
+        if value.nil?
+          next_answers.delete(question.key)
+        else
+          next_answers[question.key] = {
+            "value" => value, "label" => question.label, "type" => question.type.to_s,
+            "display" => question.display(value), "answered_at" => Time.current.utc.iso8601
+          }
+        end
+        self.answers = next_answers
+        self.current_key = question.key
+        save!
+        [true, nil]
       end
-      self.answers = next_answers
-      self.current_key = question.key
-      save!
-      [true, nil]
     end
 
     def missing_required(survey)

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

@@ -88,6 +88,7 @@
       <%= link_to admin_geo_path,
             class: "group flex items-center 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",
             "data-sidebar-row-described": "",
+            "aria-current": (Studio.sidebar_style == :glass && respond_to?(:request) && request&.path == admin_geo_path ? "page" : nil),
             "@click": geo_close do %>
         <span class="studio-emoji-box text-lg leading-none flex-shrink-0">🌍</span>
         <span class="relative min-w-0 flex-1">