@acms-subir/core 0.3.40 → 0.3.42

package/src/lib/content-service.ts

@@ -8,6 +8,7 @@ import { CONTENT, collectionUrl } from './content';
 import { CALENDAR } from './calendar/config';
 import { formatWall, isValidTimeZone, normalizeEventTimes, parseWall } from './calendar/events';
 import { eventChanged } from './calendar/hooks';
+import { offerEventWaitlist } from './booking/service';
 import { normalizePageLocale } from './i18n';
 import { siteOrigin } from './seo';
 import { waitUntilFrom } from './webhooks';
@@ -37,10 +38,10 @@ export type PageSave = Omit<Parameters<ContentRepository['updatePage']>[1], 'blo
 // location (see mergeLocationInput) — older clients send name/address/url only
 // cancelledDates is left out: single dates are cancelled at once through
 // cancelOccurrence/restoreOccurrence (lib/calendar/schedule.ts), never staged
-// rsvp may leave out the deadline and notifyStaff (older clients): the current ones stay
+// rsvp may leave out the deadline, notifyStaff and waitlist (older clients): the current ones stay
 export type EventSave = Partial<Omit<CalEvent, 'id' | 'draft' | 'startAt' | 'endAt' | 'createdAt' | 'updatedAt' | 'sourceUid' | 'publishedAt' | 'location' | 'cancelledDates' | 'rsvp'>> & {
   location?: Partial<EventLocation>;
-  rsvp?: Omit<CalEvent['rsvp'], 'closesAt' | 'closeBefore' | 'notifyStaff'> & Partial<Pick<CalEvent['rsvp'], 'closesAt' | 'closeBefore' | 'notifyStaff'>>;
+  rsvp?: Omit<CalEvent['rsvp'], 'closesAt' | 'closeBefore' | 'notifyStaff' | 'waitlist'> & Partial<Pick<CalEvent['rsvp'], 'closesAt' | 'closeBefore' | 'notifyStaff' | 'waitlist'>>;
 };
 type EventClean = Omit<EventSave, 'location' | 'rsvp'> & { location?: EventLocation; rsvp?: CalEvent['rsvp'] };
 
@@ -136,11 +137,11 @@ export async function cleanEventInput(repo: ContentRepository, data: EventSave,
   const out: EventClean = { ...rest };
   if (rsvp) {
     // Older editor clients resend the original RSVP shape. Omission must not
-    // erase questions, a deadline or the staff emails setting that were
-    // authored in a newer editor.
+    // erase questions, a deadline, the staff emails setting or the waitlist
+    // that were authored in a newer editor.
     const previous = mergeEventDraft(before).rsvp;
     const next: CalEvent['rsvp'] = { ...rsvp, closesAt: rsvp.closesAt === undefined ? previous.closesAt ?? null : rsvp.closesAt || null, closeBefore: rsvp.closeBefore ?? previous.closeBefore ?? 0,
-      notifyStaff: rsvp.notifyStaff ?? previous.notifyStaff ?? true };
+      notifyStaff: rsvp.notifyStaff ?? previous.notifyStaff ?? true, waitlist: rsvp.waitlist ?? previous.waitlist ?? false };
     if (!Object.hasOwn(rsvp, 'form') && previous.form) next.form = previous.form;
     if (next.form !== undefined) {
       const form = FormDefinition.safeParse(next.form);
@@ -156,6 +157,7 @@ export async function cleanEventInput(repo: ContentRepository, data: EventSave,
       throw new ApiError(400, 'The RSVP deadline can be at most 60 days before each date (closeBefore: 0–86400 minutes).');
     }
     if (typeof next.notifyStaff !== 'boolean') throw new ApiError(400, 'rsvp.notifyStaff must be true or false.');
+    if (typeof next.waitlist !== 'boolean') throw new ApiError(400, 'rsvp.waitlist must be true or false.');
     out.rsvp = next;
   }
   if (location !== undefined) out.location = mergeLocationInput(mergeEventDraft(before).location, location);
@@ -219,9 +221,12 @@ export async function cleanEventInput(repo: ContentRepository, data: EventSave,
 
 export async function eventSideEffects(repo: ContentRepository, hooks: SaveHooks, before: CalEvent, after: CalEvent, applied = false) {
   const settings = await repo.getSettings();
+  const origin = siteOrigin(settings, hooks.url);
   await eventChanged(repo, before, after, {
-    origin: siteOrigin(settings, hooks.url), waitUntil: waitUntilFrom(hooks.locals), applied, onRedirect: hooks.onRedirect,
+    origin, waitUntil: waitUntilFrom(hooks.locals), applied, onRedirect: hooks.onRedirect,
   });
+  // seats an edit freed (a higher capacity) go to those in line now, not at the next sweep
+  if (after.rsvp.waitlist) await offerEventWaitlist(repo, after.id, { origin, locals: hooks.locals, waitUntil: waitUntilFrom(hooks.locals) });
 }
 
 export async function saveEvent(repo: ContentRepository, id: string, data: EventSave, hooks: SaveHooks): Promise<CalEvent> {

package/src/lib/drafts.ts

@@ -52,8 +52,8 @@ export function pickEventDraft(draft: Record<string, unknown>): Partial<Pick<Cal
     const loc = EventLocation.safeParse(out.location);
     if (loc.success) out.location = loc.data; else delete out.location;
   }
-  // and before RSVP deadlines: none; before staff RSVP emails: on
-  if (out.rsvp) out.rsvp = { ...out.rsvp, closesAt: out.rsvp.closesAt ?? null, closeBefore: out.rsvp.closeBefore ?? 0, notifyStaff: out.rsvp.notifyStaff ?? true };
+  // and before RSVP deadlines: none; before staff RSVP emails: on; before waitlists: off
+  if (out.rsvp) out.rsvp = { ...out.rsvp, closesAt: out.rsvp.closesAt ?? null, closeBefore: out.rsvp.closeBefore ?? 0, notifyStaff: out.rsvp.notifyStaff ?? true, waitlist: out.rsvp.waitlist ?? false };
   return out;
 }
 export function pickPageDraft(draft: Record<string, unknown>): Partial<Pick<Page, PageDraftKey>> {

package/src/lib/editor/bookings.ts

@@ -11,10 +11,12 @@ import { pageQuery } from '../mobile/http';
 // Bookings inbox for editor apps: the same status changes as Admin →
 // Bookings (confirm, decline, cancel; the guest is emailed, webhooks fire),
 // available to every signed-in owner or editor exactly like the web page.
+// RSVPs on a full date's waitlist are waitlisted (in line) or offered (a spot
+// held for them); cancel takes them off it.
 
 export const InboxQuery = z.object({
-  /** active = pending + confirmed (default); pending requests always sort first */
-  status: z.enum(['active', 'pending', 'confirmed', 'declined', 'cancelled', 'all']).default('active'),
+  /** active = pending + confirmed (default); waitlist = waitlisted + offered; pending requests always sort first */
+  status: z.enum(['active', 'pending', 'confirmed', 'waitlist', 'waitlisted', 'offered', 'expired', 'declined', 'cancelled', 'all']).default('active'),
   from: z.string().datetime({ offset: true }).optional(),
   ...pageQuery,
 }).strict();
@@ -26,7 +28,7 @@ export function requireBookings() {
 
 export async function inbox(repo: ContentRepository, q: z.infer<typeof InboxQuery>, now = Date.now()) {
   requireBookings();
-  const statuses: BookingStatus[] | undefined = q.status === 'all' ? undefined : q.status === 'active' ? ['pending', 'confirmed'] : [q.status];
+  const statuses: BookingStatus[] | undefined = q.status === 'all' ? undefined : q.status === 'active' ? ['pending', 'confirmed'] : q.status === 'waitlist' ? ['waitlisted', 'offered'] : [q.status];
   const [list, resources, events] = await Promise.all([
     repo.listBookings({ from: q.from ? Date.parse(q.from) : now - 86_400_000, statuses, kinds: ['booking', 'rsvp'] }),
     repo.listResources(), repo.listEvents(),

package/src/lib/editor/documents.ts

@@ -161,9 +161,10 @@ export const EventFields = z.object({ ...common, excerpt: text(1000), tags: z.ar
   cta: z.object({ label: text(120), href: text(1000), style: z.enum(['primary', 'outline']) }).strict(),
   calendarIds: z.array(text(100)).max(50), fields: z.record(text(2000)),
   // closesAt: wall time in the event's zone ('YYYY-MM-DDTHH:mm'); closeBefore: minutes before each date;
-  // notifyStaff: the hosts get an email about each new or cancelled RSVP. Left out = kept
+  // notifyStaff: the hosts get an email about each new or cancelled RSVP; waitlist: a full date
+  // takes places in line (with a capacity). Left out = kept
   rsvp: z.object({ enabled: z.boolean(), capacity: z.number().int().min(0).max(100000), autoConfirm: z.boolean(), maxSeats: z.number().int().min(1).max(50),
-    closesAt: text(40).nullable().optional(), closeBefore: z.number().int().min(0).max(86400).optional(), notifyStaff: z.boolean().optional(), form: FormDefinition.optional() }).strict(),
+    closesAt: text(40).nullable().optional(), closeBefore: z.number().int().min(0).max(86400).optional(), notifyStaff: z.boolean().optional(), waitlist: z.boolean().optional(), form: FormDefinition.optional() }).strict(),
 }).partial().strict();
 export const SaveInput = z.object({ revision: z.string().max(60), fields: z.record(z.unknown()) }).strict();
 

package/src/lib/editor/schemas.ts

@@ -47,7 +47,7 @@ export const EditorDocument = EditorDocumentSummary.extend({
   event: z.object({
     start: str, end: str, allDay: bool, timezone: str, rrule: str, exdates: z.array(str), cancelled: bool,
     location: z.object({ name: str, address: str, url: str, lat: num.nullable(), lng: num.nullable(), placeId: str, showMap: bool, mapImage: str, mapImageDark: str }), cta: z.object({ label: str, href: str, style: z.enum(['primary', 'outline']) }),
-    calendarIds: z.array(str), fields: z.record(str), rsvp: z.object({ enabled: bool, capacity: num, autoConfirm: bool, maxSeats: num, closesAt: str.nullable(), closeBefore: num, notifyStaff: bool, form: FormDefinition.optional() }),
+    calendarIds: z.array(str), fields: z.record(str), rsvp: z.object({ enabled: bool, capacity: num, autoConfirm: bool, maxSeats: num, closesAt: str.nullable(), closeBefore: num, notifyStaff: bool, waitlist: bool, form: FormDefinition.optional() }),
   }).nullable(),
   languages: z.array(str),
 });

package/src/lib/email/booking-words.ts

@@ -3,10 +3,12 @@
 // (book/manage; an RSVP's page words are in calendar/rsvp-words.ts). Emails
 // say usted in Spanish, like the privacy notice; the website's pages say tú,
 // like the RSVP words. Plain strings with {name}, {title}, {when}, {ref},
-// {url} and {hours} slots (live/words.ts `fill`). `rsvp` rewords a few
+// {url} and {hours} slots, and {position} and {until} for the waitlist
+// (live/words.ts `fill`). `rsvp` rewords a few
 // messages for a seat at an event (English says "booking" for both). Staff
 // emails use the site's main language. Other languages fall back to English.
-export type GuestMail = 'received' | 'confirmed' | 'declined' | 'cancelled' | 'updated' | 'rescheduled' | 'reminder' | 'link';
+// waitlisted, offered, left: an RSVP's waitlist (events only), worded for it
+export type GuestMail = 'received' | 'confirmed' | 'declined' | 'cancelled' | 'updated' | 'rescheduled' | 'reminder' | 'link' | 'waitlisted' | 'offered' | 'left';
 export interface MailCopy { subject: string; heading: string; intro: string }
 
 export interface BookingStrings {
@@ -14,6 +16,8 @@ export interface BookingStrings {
   /** the button to the booking's own page */
   manage: string;
   rsvp: { manage: string } & Partial<Record<GuestMail, Partial<MailCopy>>>;
+  /** the waitlist emails' buttons: the place in line (where they can leave it), and taking a held spot */
+  waitlist: { manage: string; confirm: string };
   /** the details table */
   what: string;
   when: string;
@@ -71,8 +75,12 @@ const STRINGS: Record<string, BookingStrings> = {
       rescheduled: { subject: 'New time: {title} — {when}', heading: 'Booking moved', intro: 'Your booking has a new time. Import the attached calendar file to update your calendar.' },
       reminder: { subject: 'Reminder: {title} — {when}', heading: 'Coming up soon', intro: 'A quick reminder about your booking.' },
       link: { subject: 'Your booking: {title}', heading: 'You already have this booking', intro: 'We got another request for this date with your email address, so nothing changed. To see or change your booking, use the button below.' },
+      waitlisted: { subject: 'You’re on the waitlist: {title}', heading: 'You’re on the waitlist', intro: 'You’re #{position} in line. If a spot opens, we’ll email you and hold it for {hours} hours.' },
+      offered: { subject: 'A spot opened: {title}', heading: 'A spot opened for {title}', intro: 'We’re holding it for you until {until}. Confirm it before then, or it goes to the next person in line.' },
+      left: { subject: 'Off the waitlist: {title}', heading: 'You’re off the waitlist', intro: 'You’re no longer on the waitlist for this date.' },
     },
     manage: 'View or change your booking', rsvp: { manage: 'View or change your booking' },
+    waitlist: { manage: 'See your place or leave the waitlist', confirm: 'Confirm my spot' },
     what: 'What', when: 'When', where: 'Where', seats: 'Seats', reference: 'Reference {ref}', icsManage: 'Manage: {url}',
     lateDecline: 'We weren’t able to confirm this booking in time. Please pick another time.',
     staff: { pending: 'New request to approve', booked: 'New booking', review: 'Review in the admin', open: 'Open in the admin', pendingSubject: 'Approve: {title} — {when}', bookedSubject: 'New booking: {title} — {when}' },
@@ -103,6 +111,9 @@ const STRINGS: Record<string, BookingStrings> = {
       rescheduled: { subject: 'Nuevo horario: {title} — {when}', heading: 'Su reservación cambió de horario', intro: 'Su reservación tiene un nuevo horario. Importe el archivo de calendario adjunto para actualizar su calendario.' },
       reminder: { subject: 'Recordatorio: {title} — {when}', heading: 'Ya casi es la fecha', intro: 'Un breve recordatorio de su reservación.' },
       link: { subject: 'Su reservación: {title}', heading: 'Ya tiene esta reservación', intro: 'Recibimos otra solicitud para este horario con su correo, así que no cambió nada. Para ver o cambiar su reservación, use el botón de abajo.' },
+      waitlisted: { subject: 'Está en la lista de espera: {title}', heading: 'Está en la lista de espera', intro: 'Tiene el lugar #{position} en la fila. Si se libera un lugar, le escribiremos y se lo apartaremos {hours} horas.' },
+      offered: { subject: 'Se liberó un lugar: {title}', heading: 'Se liberó un lugar para {title}', intro: 'Se lo apartamos hasta el {until}. Confírmelo antes, o pasará a la siguiente persona en la fila.' },
+      left: { subject: 'Fuera de la lista de espera: {title}', heading: 'Ya no está en la lista de espera', intro: 'Ya no está en la lista de espera para esta fecha.' },
     },
     manage: 'Ver o cambiar su reservación',
     rsvp: {
@@ -114,6 +125,7 @@ const STRINGS: Record<string, BookingStrings> = {
       reminder: { intro: 'Un breve recordatorio: tiene un lugar apartado.' },
       link: { subject: 'Su confirmación para {title}', heading: 'Ya tiene una confirmación', intro: 'Recibimos otra confirmación para esta fecha con su correo, así que no cambió nada. Para cambiar la suya, o agregar lugares, use el botón de abajo.' },
     },
+    waitlist: { manage: 'Ver su lugar o salir de la lista', confirm: 'Confirmar mi lugar' },
     what: 'Qué', when: 'Cuándo', where: 'Dónde', seats: 'Lugares', reference: 'Referencia {ref}', icsManage: 'Ver o cambiar: {url}',
     lateDecline: 'No pudimos confirmar esta reservación a tiempo. Por favor, elija otro horario.',
     staff: { pending: 'Nueva solicitud por aprobar', booked: 'Nueva reservación', review: 'Revisar en el panel', open: 'Abrir en el panel', pendingSubject: 'Por aprobar: {title} — {when}', bookedSubject: 'Nueva reservación: {title} — {when}' },
@@ -144,6 +156,9 @@ const STRINGS: Record<string, BookingStrings> = {
       rescheduled: { subject: 'Nouvel horaire : {title} — {when}', heading: 'Réservation déplacée', intro: 'Votre réservation a un nouvel horaire. Importez le fichier de calendrier joint pour mettre à jour votre calendrier.' },
       reminder: { subject: 'Rappel : {title} — {when}', heading: 'C’est bientôt', intro: 'Un petit rappel de votre réservation.' },
       link: { subject: 'Votre réservation : {title}', heading: 'Vous avez déjà cette réservation', intro: 'Nous avons reçu une autre demande pour ce créneau avec votre adresse e-mail, donc rien n’a changé. Pour voir ou modifier votre réservation, utilisez le bouton ci-dessous.' },
+      waitlisted: { subject: 'Vous êtes sur la liste d’attente : {title}', heading: 'Vous êtes sur la liste d’attente', intro: 'Vous êtes n° {position} dans la file. Si une place se libère, nous vous écrirons et vous la garderons {hours} heures.' },
+      offered: { subject: 'Une place s’est libérée : {title}', heading: 'Une place s’est libérée pour {title}', intro: 'Nous vous la gardons jusqu’au {until}. Confirmez-la d’ici là, sinon elle ira à la personne suivante dans la file.' },
+      left: { subject: 'Hors de la liste d’attente : {title}', heading: 'Vous n’êtes plus sur la liste d’attente', intro: 'Vous n’êtes plus sur la liste d’attente pour cette date.' },
     },
     manage: 'Voir ou modifier votre réservation',
     rsvp: {
@@ -155,6 +170,7 @@ const STRINGS: Record<string, BookingStrings> = {
       reminder: { intro: 'Un petit rappel de votre inscription.' },
       link: { subject: 'Votre inscription : {title}', heading: 'Vous avez déjà une inscription', intro: 'Nous avons reçu une autre inscription pour cette date avec votre adresse e-mail, donc rien n’a changé. Pour modifier la vôtre ou ajouter des places, utilisez le bouton ci-dessous.' },
     },
+    waitlist: { manage: 'Voir votre place ou quitter la liste', confirm: 'Confirmer ma place' },
     what: 'Quoi', when: 'Quand', where: 'Où', seats: 'Places', reference: 'Référence {ref}', icsManage: 'Gérer : {url}',
     lateDecline: 'Nous n’avons pas pu confirmer cette réservation à temps. Veuillez choisir un autre horaire.',
     staff: { pending: 'Nouvelle demande à valider', booked: 'Nouvelle réservation', review: 'Examiner dans l’administration', open: 'Ouvrir dans l’administration', pendingSubject: 'À valider : {title} — {when}', bookedSubject: 'Nouvelle réservation : {title} — {when}' },
@@ -185,6 +201,9 @@ const STRINGS: Record<string, BookingStrings> = {
       rescheduled: { subject: 'Neuer Termin: {title} — {when}', heading: 'Buchung verschoben', intro: 'Ihre Buchung hat einen neuen Termin. Importieren Sie die angehängte Kalenderdatei, um Ihren Kalender zu aktualisieren.' },
       reminder: { subject: 'Erinnerung: {title} — {when}', heading: 'Bald ist es so weit', intro: 'Eine kurze Erinnerung an Ihre Buchung.' },
       link: { subject: 'Ihre Buchung: {title}', heading: 'Sie haben diese Buchung schon', intro: 'Wir haben eine weitere Anfrage für diesen Termin mit Ihrer E-Mail-Adresse erhalten, es hat sich also nichts geändert. Über den Button unten sehen oder ändern Sie Ihre Buchung.' },
+      waitlisted: { subject: 'Sie stehen auf der Warteliste: {title}', heading: 'Sie stehen auf der Warteliste', intro: 'Sie sind Nr. {position} auf der Warteliste. Wird ein Platz frei, schreiben wir Ihnen und halten ihn {hours} Stunden für Sie frei.' },
+      offered: { subject: 'Ein Platz ist frei geworden: {title}', heading: 'Ein Platz für {title} ist frei geworden', intro: 'Wir halten ihn bis {until} für Sie frei. Bestätigen Sie ihn bis dahin, sonst geht er an die nächste Person auf der Warteliste.' },
+      left: { subject: 'Nicht mehr auf der Warteliste: {title}', heading: 'Sie stehen nicht mehr auf der Warteliste', intro: 'Sie stehen für diesen Termin nicht mehr auf der Warteliste.' },
     },
     manage: 'Buchung ansehen oder ändern',
     rsvp: {
@@ -196,6 +215,7 @@ const STRINGS: Record<string, BookingStrings> = {
       reminder: { intro: 'Eine kurze Erinnerung an Ihre Anmeldung.' },
       link: { subject: 'Ihre Anmeldung: {title}', heading: 'Sie sind schon angemeldet', intro: 'Wir haben eine weitere Anmeldung für diesen Termin mit Ihrer E-Mail-Adresse erhalten, es hat sich also nichts geändert. Über den Button unten ändern Sie Ihre Anmeldung oder fügen Plätze hinzu.' },
     },
+    waitlist: { manage: 'Platz ansehen oder Warteliste verlassen', confirm: 'Platz bestätigen' },
     what: 'Was', when: 'Wann', where: 'Wo', seats: 'Plätze', reference: 'Referenz {ref}', icsManage: 'Verwalten: {url}',
     lateDecline: 'Wir konnten diese Buchung nicht rechtzeitig bestätigen. Bitte wählen Sie einen anderen Termin.',
     staff: { pending: 'Neue Anfrage zur Freigabe', booked: 'Neue Buchung', review: 'In der Verwaltung prüfen', open: 'In der Verwaltung öffnen', pendingSubject: 'Freigeben: {title} — {when}', bookedSubject: 'Neue Buchung: {title} — {when}' },
@@ -226,6 +246,9 @@ const STRINGS: Record<string, BookingStrings> = {
       rescheduled: { subject: 'Novo horário: {title} — {when}', heading: 'Reserva remarcada', intro: 'Sua reserva tem um novo horário. Importe o arquivo de calendário anexo para atualizar seu calendário.' },
       reminder: { subject: 'Lembrete: {title} — {when}', heading: 'Está chegando', intro: 'Um lembrete rápido sobre sua reserva.' },
       link: { subject: 'Sua reserva: {title}', heading: 'Você já tem esta reserva', intro: 'Recebemos outro pedido para este horário com seu e-mail, então nada mudou. Para ver ou alterar sua reserva, use o botão abaixo.' },
+      waitlisted: { subject: 'Você está na lista de espera: {title}', heading: 'Você está na lista de espera', intro: 'Você é o nº {position} da fila. Se uma vaga abrir, vamos avisar por e-mail e guardá-la por {hours} horas.' },
+      offered: { subject: 'Abriu uma vaga: {title}', heading: 'Abriu uma vaga em {title}', intro: 'Vamos guardá-la para você até {until}. Confirme antes disso, ou ela passa para a próxima pessoa da fila.' },
+      left: { subject: 'Fora da lista de espera: {title}', heading: 'Você não está mais na lista de espera', intro: 'Você não está mais na lista de espera desta data.' },
     },
     manage: 'Ver ou alterar sua reserva',
     rsvp: {
@@ -237,6 +260,7 @@ const STRINGS: Record<string, BookingStrings> = {
       reminder: { intro: 'Um lembrete rápido sobre sua inscrição.' },
       link: { subject: 'Sua inscrição em {title}', heading: 'Você já tem uma inscrição', intro: 'Recebemos outra inscrição para esta data com seu e-mail, então nada mudou. Para alterar a sua, ou adicionar vagas, use o botão abaixo.' },
     },
+    waitlist: { manage: 'Ver sua posição ou sair da lista', confirm: 'Confirmar minha vaga' },
     what: 'O quê', when: 'Quando', where: 'Onde', seats: 'Vagas', reference: 'Referência {ref}', icsManage: 'Gerenciar: {url}',
     lateDecline: 'Não conseguimos confirmar esta reserva a tempo. Por favor, escolha outro horário.',
     staff: { pending: 'Novo pedido para aprovar', booked: 'Nova reserva', review: 'Revisar no painel', open: 'Abrir no painel', pendingSubject: 'Aprovar: {title} — {when}', bookedSubject: 'Nova reserva: {title} — {when}' },

package/src/lib/email/service.ts

@@ -1,8 +1,9 @@
 import type { ContentRepository } from '../repo/types';
 import { resolveConfig, decrypt, encrypt, runtimeValue } from './config';
 import { sendWithProvider } from './providers';
-import { accountMail, canonicalOrigin, eventRequestMail, guestCodeMail, EmailLinkError } from './templates';
-import { formatDate } from '../dates';
+import { accountMail, canonicalOrigin, eventRequestMail, guestCodeMail, phoneLinkedMail, EmailLinkError } from './templates';
+import { formatDate, siteLang } from '../dates';
+import { I18N } from '../i18n';
 import { bookingMail } from '../booking/service';
 import type { EmailJob, Mail } from './types';
 
@@ -16,6 +17,17 @@ async function render(repo: ContentRepository, job: EmailJob, locals?: unknown,
     if (!current || current.createdAt !== payload.issuedAt || current.expiresAt <= Date.now()) return null;
     return guestCodeMail(job.recipient, settings.siteTitle, decrypt<string>(payload.code, `guest-code:${job.dedupe}`, locals));
   }
+  if (job.kind === 'phone-linked') {
+    const p = JSON.parse(job.payload) as { platform: 'ios' | 'android'; at: number; path: string };
+    const lang = (I18N.enabled && I18N.defaultLocale) || siteLang(settings);
+    let when: string;
+    try { when = new Intl.DateTimeFormat(lang, { dateStyle: 'long', timeStyle: 'short', timeZone: settings.timezone || 'UTC' }).format(p.at); }
+    catch { when = new Date(p.at).toISOString().slice(0, 16).replace('T', ' ') + ' UTC'; }
+    // a security notice still goes out without the link while Site URL is unset
+    let origin = '';
+    try { origin = canonicalOrigin(settings.siteUrl); } catch { /* text names the panel instead */ }
+    return phoneLinkedMail(job.recipient, settings.siteTitle, lang, p.platform, when, origin ? `${origin}${p.path}` : '');
+  }
   const origin = canonicalOrigin(settings.siteUrl);
   if (job.kind === 'booking') {
     const payload = JSON.parse(job.payload);

package/src/lib/email/store.ts

@@ -27,7 +27,7 @@ export function bookingJobs(id: string, kind: string, version?: number, staff =
 }
 // Staff hear about an RSVP (new, or cancelled by the person) at the addresses
 // the caller picked, in the same batch and only if the change landed.
-// `taken` is the date's seat count right after it.
+// `taken` is the date's seat count right after it (held waitlist spots too).
 export function rsvpStaffJobs(id: string, kind: 'staff-rsvp' | 'staff-rsvp-cancelled', notice: RsvpStaffNotice | undefined, version: number, mutation = ''): SqlStatement[] {
   if (!notice?.to.length) return [];
   const now = Date.now();
@@ -35,7 +35,7 @@ export function rsvpStaffJobs(id: string, kind: 'staff-rsvp' | 'staff-rsvp-cance
     sql: `INSERT OR IGNORE INTO email_jobs (id,dedupe,kind,recipient,payload,config_version,next_at,expires_at,created_at,updated_at)
       SELECT lower(hex(randomblob(16))), b.id || ':' || b.notification_version || ':' || ? || ':' || lower(j.value), 'booking', lower(j.value),
       json_object('bookingId',b.id,'version',b.notification_version,'kind',?,'why',?,'via',?,
-        'taken',(SELECT COALESCE(SUM(seats),0) FROM bookings WHERE kind='rsvp' AND event_id=b.event_id AND start_at=b.start_at AND status IN ('pending','confirmed'))),
+        'taken',(SELECT COALESCE(SUM(seats),0) FROM bookings WHERE kind='rsvp' AND event_id=b.event_id AND start_at=b.start_at AND status IN ('pending','confirmed','offered'))),
       COALESCE((SELECT MAX(version) FROM email_configs),0), ?, NULL, ?, ?
       FROM bookings b, json_each(?) j WHERE b.id = ? AND b.kind = 'rsvp' AND j.value != '' AND b.notification_version = ? ${mutation ? 'AND b.email_mutation = ?' : ''}`,
     args: [kind, kind, notice.why, notice.via, now, now, now, JSON.stringify(notice.to), id, version, ...(mutation ? [mutation] : [])],
@@ -128,6 +128,10 @@ export class EmailStore {
       count=CASE WHEN expires_at <= ? THEN 1 ELSE count+1 END, expires_at=CASE WHEN expires_at <= ? THEN ? ELSE expires_at END RETURNING count`, [key,now+windowMs,now,now,now+windowMs]);
     return Number(rows[0].count) <= max;
   }
+  /** gives one hit back (an attempt counted up front that turned out fine) */
+  async rateRefund(key: string): Promise<void> {
+    await (await this.getDriver()).run('UPDATE email_rate_limits SET count=count-1 WHERE key=? AND count>0 AND expires_at>?', [key, Date.now()]);
+  }
   /** true when key's current window already holds max hits (checks without counting) */
   async rateLimited(key: string, max: number): Promise<boolean> {
     const rows = await (await this.getDriver()).all('SELECT count FROM email_rate_limits WHERE key=? AND expires_at > ?', [key, Date.now()]);

package/src/lib/email/templates.ts

@@ -41,3 +41,23 @@ export function canonicalOrigin(value: string): string {
   if ((url.protocol !== 'https:' && !(url.protocol === 'http:' && loopback)) || url.username || url.password || url.search || url.hash || url.pathname !== '/') throw new EmailLinkError('Site URL in Settings → General must use HTTPS (HTTP is allowed for localhost), without a path, credentials or query.');
   return url.origin;
 }
+// "A phone was linked" (lib/push/staff.ts): a security notice to the staff
+// member, in the site's main language (usted in Spanish, like other emails)
+const PHONE_LINKED: Record<string, { subject: string; intro: (phone: string, site: string, when: string) => string; notYou: string; button: string; noLink: string; ios: string; android: string }> = {
+  en: { subject: 'A phone was linked to your account', intro: (p, s, w) => `A phone (${p}) was linked to your account at ${s} on ${w}. It gets the test notifications you send from the admin.`,
+    notYou: 'If this wasn’t you, remove it in the admin', button: 'Test phones', noLink: 'If this wasn’t you, remove it in the admin under Test phones.', ios: 'iPhone or iPad', android: 'Android' },
+  es: { subject: 'Se vinculó un teléfono a su cuenta', intro: (p, s, w) => `Se vinculó un teléfono (${p}) a su cuenta de ${s} el ${w}. Recibe las notificaciones de prueba que usted envía desde el panel.`,
+    notYou: 'Si no fue usted, quítelo en el panel', button: 'Teléfonos de prueba', noLink: 'Si no fue usted, quítelo en el panel, en Teléfonos de prueba.', ios: 'iPhone o iPad', android: 'Android' },
+  fr: { subject: 'Un téléphone a été associé à votre compte', intro: (p, s, w) => `Un téléphone (${p}) a été associé à votre compte sur ${s} le ${w}. Il reçoit les notifications de test que vous envoyez depuis l’administration.`,
+    notYou: 'Si ce n’était pas vous, retirez-le dans l’administration', button: 'Téléphones de test', noLink: 'Si ce n’était pas vous, retirez-le dans l’administration, sous Téléphones de test.', ios: 'iPhone ou iPad', android: 'Android' },
+  de: { subject: 'Ein Telefon wurde mit Ihrem Konto verknüpft', intro: (p, s, w) => `Ein Telefon (${p}) wurde am ${w} mit Ihrem Konto bei ${s} verknüpft. Es erhält die Testbenachrichtigungen, die Sie im Adminbereich senden.`,
+    notYou: 'Wenn Sie das nicht waren, entfernen Sie es im Adminbereich', button: 'Testtelefone', noLink: 'Wenn Sie das nicht waren, entfernen Sie es im Adminbereich unter Testtelefone.', ios: 'iPhone oder iPad', android: 'Android' },
+  pt: { subject: 'Um telefone foi vinculado à sua conta', intro: (p, s, w) => `Um telefone (${p}) foi vinculado à sua conta em ${s} em ${w}. Ele recebe as notificações de teste que você envia pelo painel.`,
+    notYou: 'Se não foi você, remova-o no painel', button: 'Telefones de teste', noLink: 'Se não foi você, remova-o no painel, em Telefones de teste.', ios: 'iPhone ou iPad', android: 'Android' },
+};
+export function phoneLinkedMail(to: string, site: string, lang: string, platform: 'ios' | 'android', when: string, url: string): Mail {
+  const w = PHONE_LINKED[lang.toLowerCase().split('-')[0]] ?? PHONE_LINKED.en;
+  const intro = w.intro(platform === 'ios' ? w.ios : w.android, site, when);
+  return { to, subject: `${w.subject} · ${site}`, text: [w.subject, '', intro, '', url ? `${w.notYou}: ${url}` : w.noLink].join('\n'),
+    html: `<!doctype html><html><body style="margin:0;background:#f6f5f2;color:#24211c;font:16px/1.6 system-ui,sans-serif"><div style="max-width:520px;margin:auto;padding:32px 24px"><p style="color:#7d776e">${escape(site)}</p><h1 style="font-size:24px">${escape(w.subject)}</h1><p>${escape(intro)}</p>${url ? `<p>${escape(w.notYou)}:</p><p><a style="display:inline-block;background:#ee5d20;color:#fff;padding:10px 18px;border-radius:8px;text-decoration:none" href="${escape(url)}">${escape(w.button)}</a></p>` : `<p>${escape(w.noLink)}</p>`}</div></body></html>` };
+}

package/src/lib/forms/events.ts

@@ -17,7 +17,9 @@ export async function prepareLegacyEventForm(event: CalEvent, start: number, dat
   }
 }
 
-// locale: the page's language, so the RSVP's emails and links speak it
+// locale: the page's language, so the RSVP's emails and links speak it. A
+// form with waitlist=1 (a full date's "Join the waitlist") takes a place in
+// line when there's no room
 export async function submitEventForm(repo: ContentRepository, event: CalEvent, occurrence: { start: number; end: number }, data: FormData, requestId: string, flow: Parameters<typeof createRsvp>[2], locale = '') {
   if (event.status !== 'published') throw new ApiError(404, 'Event not found.');
   if (Number(data.get('occurrence')) !== occurrence.start) throw new ApiError(409, 'The event time has changed. Review the date and try again.');
@@ -37,6 +39,6 @@ export async function submitEventForm(repo: ContentRepository, event: CalEvent,
   const existing = await replay(); if (existing) return existing;
   await collectResponse(definition, booker.answers, booker.formVersion);
   // the language isn't part of the retry check: it doesn't change what was asked for
-  try { return await createRsvp(repo, { event, ...occurrence, seats, booker: { ...booker, locale } }, { ...flow, idempotency }); }
+  try { return await createRsvp(repo, { event, ...occurrence, seats, booker: { ...booker, locale }, waitlist: data.get('waitlist') === '1' }, { ...flow, idempotency }); }
   catch (e) { const existing = await replay(); if (existing) return existing; throw e; }
 }

package/src/lib/legal/app-privacy.ts

@@ -10,8 +10,8 @@ export interface AppPrivacyAnswers { rows: StoreRow[]; tracking: string; notes:
 
 export function appPrivacyAnswers(f: LegalFacts, privacyUrl: string): AppPrivacyAnswers {
   const rows: StoreRow[] = [];
-  // apps can RSVP wherever the calendar is on; room bookings need bookings too
-  const contact = [...(f.bookings ? ['bookings'] : []), ...(f.calendar ? ['RSVPs'] : []), ...(f.appForms ? ['forms'] : [])];
+  // apps can RSVP (or join a full date's waitlist) wherever the calendar is on; room bookings need bookings too
+  const contact = [...(f.bookings ? ['bookings'] : []), ...(f.calendar ? ['RSVPs (including waitlist requests)'] : []), ...(f.appForms ? ['forms'] : [])];
   const sends = contact.length > 1 ? `${contact.slice(0, -1).join(', ')} or ${contact.at(-1)}` : contact[0];
   if (contact.length) {
     rows.push({
@@ -32,8 +32,8 @@ export function appPrivacyAnswers(f: LegalFacts, privacyUrl: string): AppPrivacy
   });
   if (f.push.enabled) rows.push({
     data: 'Push token, platform, language, chosen topics and Android notification channels', when: 'When someone turns on notifications',
-    apple: 'Identifiers → Device ID. Purpose: App Functionality. Linked to the user. Not used for tracking.',
-    google: 'Device or other IDs. Collected, not shared (Expo, Apple and Google deliver on your behalf). Purpose: App functionality, Developer communications. Optional.',
+    apple: 'Identifiers → Device ID. Purpose: App Functionality. Linked to the user (to a staff member’s identity only when they link their own phone for test notifications). Not used for tracking.',
+    google: 'Device or other IDs. Collected, not shared (Expo, Apple and Google deliver on your behalf). Purpose: App functionality, Developer communications. Optional. Linked to a staff member’s account only when they link their own phone for test notifications.',
   });
   rows.push({
     data: 'IP address', when: 'Every request (rate limiting only)',

package/src/lib/legal/text-en.ts

@@ -42,7 +42,7 @@ export function privacyEn(f: LegalFacts, country: string): PolicySection[] {
     ] },
   ];
   if (f.calendar) s.push({ id: 'bookings', title: f.bookings ? 'Bookings and RSVPs' : 'Event RSVPs', text: [
-    `When you ${f.bookings ? 'book a time or ' : ''}RSVP to an event, we store your name, email address, any phone number and answers you give, the date and time, the number of seats and the status. We use them to manage your request, prevent duplicate submissions, and email you confirmations, changes and a reminder. Staff who manage the calendar can see them${f.bookings ? ', and the people a room or service notifies receive new bookings by email' : ''}. When you RSVP or cancel an RSVP, the event’s hosts (or our staff) get an email with your RSVP details.`,
+    `When you ${f.bookings ? 'book a time or ' : ''}RSVP to an event, we store your name, email address, any phone number and answers you give, the date and time, the number of seats and the status. We use them to manage your request, prevent duplicate submissions, and email you confirmations, changes and a reminder. Staff who manage the calendar can see them${f.bookings ? ', and the people a room or service notifies receive new bookings by email' : ''}. When you RSVP or cancel an RSVP, the event’s hosts (or our staff) get an email with your RSVP details. If a date is full and you join its waitlist, we keep your request like an RSVP and email you if a spot opens; we hold that spot for 24 hours.`,
     'Each booking has a private link to see, change or cancel it. Keep it private: anyone with the link can use it.',
   ] });
   s.push({ id: 'forms', title: 'Forms', text: [
@@ -52,7 +52,7 @@ export function privacyEn(f: LegalFacts, country: string): PolicySection[] {
     'To see your bookings in our app, you can sign in with your email address. We email you a six-digit code that expires after 10 minutes. We keep your email address and that sign-in on your device until you sign out or don’t use it for 90 days.',
   ] });
   if (f.push.enabled) s.push({ id: 'push', title: 'Our app and notifications', text: [
-    'If you turn on notifications in our app, we store a push token for your device (an identifier that lets Apple or Google deliver notifications to it), whether it’s iOS or Android, your language, the topics you choose and, on Android, which notification channels the app created (such as one for urgent notices). We use them only to send the notifications you asked for, in your language. Notifications are delivered through Expo’s push service (expo.dev), Apple Push Notification service and Firebase Cloud Messaging.',
+    'If you turn on notifications in our app, we store a push token for your device (an identifier that lets Apple or Google deliver notifications to it), whether it’s iOS or Android, your language, the topics you choose and, on Android, which notification channels the app created (such as one for urgent notices). We use them only to send the notifications you asked for, in your language. Notifications are delivered through Expo’s push service (expo.dev), Apple Push Notification service and Firebase Cloud Messaging. Our staff can link their own phone to their account to receive test notifications; that link is removed when they remove it or turn notifications off.',
     `You choose the topics in the app and can change them at any time; we never add a topic without asking you. ${f.announcements ? 'Urgent announcements, such as cancellations, go to every device with notifications turned on, whatever topics it chose.' : 'Important notices, such as cancellations, may go to every device with notifications turned on, whatever topics it chose.'} To stop, turn notifications off in the app or in your phone’s settings. Turning them off in the app removes your device from our list right away. Devices that haven’t opened the app for ${days(f.push.retentionDays)}, and devices whose app was removed, are deleted automatically. We keep a record of each notification sent (its text, link and number of recipients, not who received it) for one year. The app works fully without notifications.`,
   ] });
   if (f.email) s.push({ id: 'email', title: 'Email', text: [

package/src/lib/legal/text-es.ts

@@ -43,7 +43,7 @@ export function privacyEs(f: LegalFacts, country: string): PolicySection[] {
     ] },
   ];
   if (f.calendar) s.push({ id: 'bookings', title: f.bookings ? 'Reservaciones y registros' : 'Registros a eventos', text: [
-    `Cuando ${f.bookings ? 'reserva un horario o ' : ''}se registra a un evento, guardamos su nombre, su correo electrónico, el teléfono y las respuestas que nos dé, la fecha y hora, el número de lugares y el estado. Los usamos para gestionar su solicitud, evitar envíos duplicados y enviarle por correo confirmaciones, cambios y un recordatorio. El personal que administra el calendario puede verlos${f.bookings ? ', y las personas a las que avisa una sala o un servicio reciben las reservaciones nuevas por correo' : ''}. Cuando se registra a un evento o cancela su registro, los organizadores del evento (o nuestro personal) reciben un correo con los datos de su registro.`,
+    `Cuando ${f.bookings ? 'reserva un horario o ' : ''}se registra a un evento, guardamos su nombre, su correo electrónico, el teléfono y las respuestas que nos dé, la fecha y hora, el número de lugares y el estado. Los usamos para gestionar su solicitud, evitar envíos duplicados y enviarle por correo confirmaciones, cambios y un recordatorio. El personal que administra el calendario puede verlos${f.bookings ? ', y las personas a las que avisa una sala o un servicio reciben las reservaciones nuevas por correo' : ''}. Cuando se registra a un evento o cancela su registro, los organizadores del evento (o nuestro personal) reciben un correo con los datos de su registro. Si una fecha está llena y usted se une a su lista de espera, guardamos su solicitud como un registro y le escribimos si se libera un lugar; se lo apartamos 24 horas.`,
     'Cada reservación tiene un enlace privado para verla, cambiarla o cancelarla. Manténgalo en privado: cualquiera que lo tenga puede usarlo.',
   ] });
   s.push({ id: 'forms', title: 'Formularios', text: [
@@ -53,7 +53,7 @@ export function privacyEs(f: LegalFacts, country: string): PolicySection[] {
     'Para ver sus reservaciones en nuestra app, puede iniciar sesión con su correo electrónico. Le enviamos un código de seis dígitos que vence a los 10 minutos. Guardamos su correo y esa sesión en su dispositivo hasta que la cierre o pasen 90 días sin usarla.',
   ] });
   if (f.push.enabled) s.push({ id: 'push', title: 'Nuestra app y las notificaciones', text: [
-    'Si activa las notificaciones en nuestra app, guardamos un identificador de notificaciones de su dispositivo (que permite a Apple o Google entregárselas), si es iOS o Android, su idioma, los temas que elija y, en Android, qué canales de notificación creó la app (por ejemplo, uno para avisos urgentes). Solo los usamos para enviarle las notificaciones que pidió, en su idioma. Las notificaciones se entregan a través del servicio de Expo (expo.dev), Apple Push Notification service y Firebase Cloud Messaging.',
+    'Si activa las notificaciones en nuestra app, guardamos un identificador de notificaciones de su dispositivo (que permite a Apple o Google entregárselas), si es iOS o Android, su idioma, los temas que elija y, en Android, qué canales de notificación creó la app (por ejemplo, uno para avisos urgentes). Solo los usamos para enviarle las notificaciones que pidió, en su idioma. Las notificaciones se entregan a través del servicio de Expo (expo.dev), Apple Push Notification service y Firebase Cloud Messaging. Las personas de nuestro equipo pueden vincular su propio teléfono a su cuenta del sitio para recibir notificaciones de prueba; ese vínculo se elimina cuando lo quitan o desactivan las notificaciones.',
     `Usted elige los temas en la app y puede cambiarlos cuando quiera; nunca agregamos un tema sin preguntarle. ${f.announcements ? 'Los anuncios urgentes, como una cancelación, llegan a todos los dispositivos con las notificaciones activadas, sin importar los temas que eligieron.' : 'Los avisos importantes, como una cancelación, pueden llegar a todos los dispositivos con las notificaciones activadas, sin importar los temas que eligieron.'} Para dejar de recibirlas, desactive las notificaciones en la app o en los ajustes de su teléfono. Al desactivarlas en la app, su dispositivo se elimina de nuestra lista de inmediato. Los dispositivos que no han abierto la app en ${days(f.push.retentionDays)}, y aquellos en los que se borró la app, se eliminan automáticamente. Guardamos un registro de cada notificación enviada (su texto, su enlace y el número de destinatarios, no quiénes la recibieron) durante un año. La app funciona por completo sin notificaciones.`,
   ] });
   if (f.email) s.push({ id: 'email', title: 'Correo electrónico', text: [

package/src/lib/mobile/bookings.ts

@@ -23,8 +23,9 @@ export const bookingInput = z.union([
   z.object({ ...common, resource: z.string().min(1).max(200), link: z.string().min(1).max(200),
     minutes: z.number().int().min(1).max(44640).optional(),
   }).strict(),
-  // formVersion: from GET /events/{slug}/rsvp; required when the event asks questions
-  z.object({ ...common, event: z.string().min(1).max(200), seats: z.number().int().min(1).max(1000).default(1), formVersion: z.string().max(100).optional() }).strict(),
+  // formVersion: from GET /events/{slug}/rsvp; required when the event asks questions.
+  // waitlist: a full date takes a place in line instead (when the event keeps a waitlist)
+  z.object({ ...common, event: z.string().min(1).max(200), seats: z.number().int().min(1).max(1000).default(1), formVersion: z.string().max(100).optional(), waitlist: z.boolean().optional() }).strict(),
 ]);
 function canonical(value: unknown): string {
   if (value && typeof value === 'object' && !Array.isArray(value)) return `{${Object.entries(value).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([k,v]) => `${JSON.stringify(k)}:${canonical(v)}`).join(',')}}`;
@@ -67,7 +68,7 @@ export async function submitBooking(repo: ContentRepository, request: Request, l
       // the app must have seen the current questions: a changed form then answers 409, as on the website
       // (closed dates fall through to createRsvp's own answer)
       if (!body.formVersion && rsvpQuestions(event) && !rsvpClosed(occurrence, settings)) throw new ApiError(400, 'This event asks questions. Send formVersion from GET /api/v1/events/{slug}/rsvp with the answers.');
-      booking = await createRsvp(repo, { event, start, end: occurrence.end, seats: body.seats, booker, source: 'app' }, flow);
+      booking = await createRsvp(repo, { event, start, end: occurrence.end, seats: body.seats, booker, source: 'app', waitlist: body.waitlist }, flow);
     } else {
       const resource = await repo.getResourceBySlug(body.resource);
       const link = resource ? await repo.getBookingLinkBySlug(resource.id, body.link) : null;

package/src/lib/mobile/guest.ts

@@ -44,7 +44,8 @@ async function requireGuest(c: PublicContext) {
 }
 const emailField = z.string().trim().toLowerCase().max(254).refine(validAddress, 'Enter a valid email address.');
 const hash = (email: string, code: string) => sha256Hex(`guest-code:${email}:${code}`);
-function sixDigits() {
+/** A random 6-digit code (guest sign-in, staff phone links). */
+export function sixDigits() {
   // rejection sampling keeps every code equally likely
   const buf = new Uint32Array(1);
   do crypto.getRandomValues(buf); while (buf[0] >= 4_294_000_000);

package/src/lib/mobile/manage.ts

@@ -6,7 +6,7 @@ import { eventTimeZone, locationLine } from '../calendar/events';
 import { resourceZone, linkLengths } from '../booking/availability';
 import { bookingIcs, bookingLanguage, bookingManagePath } from '../booking/emails';
 import { localePath } from '../i18n';
-import { guestCancel, guestChanges, guestMoveLink, guestReschedule } from '../booking/service';
+import { confirmOffer, guestCancel, guestChanges, guestMoveLink, guestReschedule, waitlistPosition } from '../booking/service';
 import { siteOrigin } from '../seo';
 import { waitUntilFrom } from '../webhooks';
 import { isoDay, queryParams } from './http';
@@ -44,7 +44,8 @@ async function managed(c: PublicContext): Promise<Managed> {
   return { booking, settings, resource, link, event, origin: siteOrigin(settings, c.url) };
 }
 
-function view(m: Managed, booking = m.booking) {
+// position: a waitlisted RSVP's place in line (view() can't query)
+function view(m: Managed, booking = m.booking, position: number | null = null) {
   const { resource, link, event, settings, origin } = m;
   const can = guestChanges(booking, link);
   return {
@@ -55,6 +56,8 @@ function view(m: Managed, booking = m.booking) {
       timezone: event ? eventTimeZone(event, settings) : resource ? resourceZone(resource, settings.timezone) : settings.timezone || 'UTC',
       seats: booking.seats, name: booking.name, email: booking.email, phone: booking.phone, answers: booking.answers,
       createdAt: new Date(booking.createdAt).toISOString(),
+      // in line: its place (1 = next); a held spot: until when
+      position, holdUntil: booking.status === 'offered' && booking.holdUntil !== null ? new Date(booking.holdUntil).toISOString() : null,
     },
     title: event ? event.title : [resource?.name, link?.name].filter(Boolean).join(' · ') || 'Booking',
     location: event ? locationLine(event.location) : resource?.name ?? '',
@@ -71,13 +74,24 @@ function view(m: Managed, booking = m.booking) {
 }
 const flow = (m: Managed, c: PublicContext) => ({ origin: m.origin, locals: c.locals, waitUntil: waitUntilFrom(c.locals) });
 
-export const getManaged = async (c: PublicContext) => view(await managed(c));
+const placed = async (c: PublicContext, m: Managed, booking = m.booking) => view(m, booking, await waitlistPosition(c.repo, booking));
+
+export async function getManaged(c: PublicContext) {
+  const m = await managed(c);
+  return placed(c, m);
+}
 
 export async function cancelManaged(c: PublicContext) {
   const m = await managed(c);
   return view(m, await guestCancel(c.repo, m.booking, flow(m, c), 'app'));
 }
 
+// take the spot the waitlist offered them; past its hold, 410 and it goes to the next person
+export async function confirmManaged(c: PublicContext) {
+  const m = await managed(c);
+  return view(m, await confirmOffer(c.repo, m.booking, flow(m, c), 'app'));
+}
+
 export const manageAvailabilityQuery = z.object({
   from: isoDay.optional(), days: z.coerce.number().int().min(1).max(31).default(7), minutes: z.coerce.number().int().min(1).max(44640).optional(),
 }).strict();

package/src/lib/mobile/openapi.ts

@@ -10,7 +10,7 @@ import { searchQuery } from './search';
 import { manageAvailabilityQuery, rescheduleInput } from './manage';
 import { formResponseInput } from './forms';
 import { codeInput, tokenInput, myBookingsQuery } from './guest';
-import { deviceInput, deviceUpdate } from '../push/api';
+import { deviceInput, deviceUpdate, staffLinkInput } from '../push/api';
 import { announcementsQuery } from '../announcements/api';
 import { localeOnlyQuery } from './locale';
 import { pageQuery, queryParams } from './http';
@@ -80,7 +80,7 @@ export async function getOpenApi(_repo: ContentRepository, url: URL) {
   paths['/api/v1/bookings'] = {
     post: {
       summary: 'Create a guest booking or an RSVP, or replay an existing request; RSVPs require calendar, room bookings also bookings',
-      description: '20 attempts/minute/client address. JSON body up to 50,000 bytes. Responses use no-store. Reuse a random UUID v4 once per booking intent. Checkbox groups send a list of answers. An RSVP to an event with questions needs formVersion from GET /events/{slug}/rsvp; a changed form answers 409. An RSVP from an email that already has one for that date answers 409 with code duplicate (and emails that RSVP’s link again); past the event’s RSVP deadline, 410.',
+      description: '20 attempts/minute/client address. JSON body up to 50,000 bytes. Responses use no-store. Reuse a random UUID v4 once per booking intent. Checkbox groups send a list of answers. An RSVP to an event with questions needs formVersion from GET /events/{slug}/rsvp; a changed form answers 409. An RSVP from an email that already has one for that date (a place on its waitlist too) answers 409 with code duplicate (and emails that RSVP’s link again); past the event’s RSVP deadline, 410. A full date answers 409, unless the event keeps a waitlist (RsvpStatus.waitlist.enabled) and the RSVP sends waitlist: true: then it takes a place in line (status waitlisted, no seats) and is emailed when a spot opens.',
       parameters: [{ name: 'Idempotency-Key', in: 'header', required: true, schema: { type: 'string', format: 'uuid', pattern: '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$' } }],
       requestBody: { required: true, content: media(jsonSchema(bookingInput)) },
       responses: { ...errors,
@@ -104,7 +104,9 @@ export async function getOpenApi(_repo: ContentRepository, url: URL) {
   const cors = { options: { summary: 'Public CORS preflight', responses: { 204: { description: 'No body.' } } } };
   const manageNote = 'Requires the calendar and the owner switch bookingChanges. Same rules and emails as the booking’s web page; a booking type’s change cutoff closes guest changes that many hours before the start.';
   paths['/api/v1/bookings/manage'] = { get: priv('The booker’s own booking: status, time, place, what they may still change', ref('ManagedBooking'), { header: bookingToken, description: manageNote }), ...cors };
-  paths['/api/v1/bookings/manage/cancel'] = { post: priv('Cancel the booking (repeating is harmless)', ref('ManagedBooking'), { header: bookingToken, write: true, description: manageNote }), ...cors };
+  paths['/api/v1/bookings/manage/cancel'] = { post: priv('Cancel the booking (repeating is harmless); for an RSVP on the waitlist, leave it or release a held spot', ref('ManagedBooking'), { header: bookingToken, write: true, description: manageNote }), ...cors };
+  paths['/api/v1/bookings/manage/confirm'] = { post: priv('Take a spot the waitlist offered (status offered, can.confirm): confirmed, or pending when the event approves RSVPs; repeating is harmless', ref('ManagedBooking'), { header: bookingToken, write: true,
+    description: `${manageNote} Past its holdUntil the spot was released (410) and goes to the next person in line; a booking with no held spot answers 409.` }), ...cors };
   paths['/api/v1/bookings/manage/availability'] = { get: priv('Open times for moving the booking (its own time counts as free)', ref('Availability'), { header: bookingToken, query: manageAvailabilityQuery, description: manageNote }), ...cors };
   paths['/api/v1/bookings/manage/reschedule'] = { post: priv('Move the booking to a new start (room bookings, not RSVPs)', ref('ManagedBooking'), { header: bookingToken, body: rescheduleInput, write: true, description: manageNote }), ...cors };
   paths['/api/v1/bookings/manage/ics'] = { get: { summary: 'Calendar file for the booking (text/calendar, no v1 envelope)', parameters: [bookingToken],
@@ -127,7 +129,7 @@ export async function getOpenApi(_repo: ContentRepository, url: URL) {
   paths['/api/v1/devices'] = {
     post: {
       summary: 'Register or refresh this device for push notifications; requires push',
-      description: `${pushNote} Call on every app start: it refreshes lastSeenAt (devices unseen for the retention period, default 270 days, are removed). topics replaces the device's topics; omit it to keep them. Stores the token, platform, language and topics only.`,
+      description: `${pushNote} Call on every app start: it refreshes lastSeenAt (devices unseen for the retention period, default 270 days, are removed). topics replaces the device's topics; omit it to keep them. Stores the token, platform, language and topics only (plus, for a staff member's own test phone, who linked it). device.staff names that staff member, or is null.`,
       requestBody: { required: true, content: media(jsonSchema(deviceInput)) },
       responses: { ...writeErrors, ...Object.fromEntries([200, 201].map(code => [code, { description: code === 201 ? 'Registered.' : 'Refreshed.', headers: noStore, content: media(envelope(ref('DeviceRegistration'))) }])) },
     },
@@ -140,12 +142,27 @@ export async function getOpenApi(_repo: ContentRepository, url: URL) {
       responses: { ...writeErrors, 200: { description: 'Updated.', headers: noStore, content: media(envelope(ref('Device'))) } },
     },
     delete: {
-      summary: 'Opt this device out of push notifications (idempotent); requires push', description: 'Removes the token. Unknown tokens also succeed.',
+      summary: 'Opt this device out of push notifications (idempotent); requires push', description: 'Removes the token, and a test-phone link with it. Unknown tokens also succeed.',
       parameters: [tokenParam],
       responses: { ...writeErrors, 200: { description: 'Removed.', headers: noStore, content: media(envelope(ref('DeviceRemoved'))) } },
     },
     options: { summary: 'Public CORS preflight', responses: { 204: { description: 'No body.' } } },
   };
+  const staffNote = 'Requires push; 404 when off. A staff member gets a one-time 6-digit code in the admin (Test phones; 10 minutes, single use) and types it in the app, so this registered device gets their "Send test to my phone" pushes (data.test = true). staff carries their display name only.';
+  paths['/api/v1/devices/{token}/staff-link'] = {
+    post: {
+      summary: 'Link this registered device to a staff member for test pushes; requires push',
+      description: `${staffNote} 404 for an unregistered device. A wrong, used or expired code answers 400 with the same message. Tries are capped (429 with Retry-After): 5 per device token and 5 per client address in 10 minutes, and 20 failures across the site void every waiting code.`,
+      parameters: [tokenParam], requestBody: { required: true, content: media(jsonSchema(staffLinkInput)) },
+      responses: { ...writeErrors, 429: { ...writeErrors[429], description: 'Write limit, or too many link tries (see above).' }, 200: { description: 'Linked.', headers: noStore, content: media(envelope(ref('StaffLink'))) } },
+    },
+    delete: {
+      summary: 'Unlink this device from a staff member (idempotent); requires push', description: `${staffNote} Turning notifications off (DELETE /devices/{token}) also unlinks it.`,
+      parameters: [tokenParam],
+      responses: { ...writeErrors, 200: { description: 'Unlinked.', headers: noStore, content: media(envelope(ref('StaffLink'))) } },
+    },
+    options: { summary: 'Public CORS preflight', responses: { 204: { description: 'No body.' } } },
+  };
   Object.assign(paths, editorPaths(jsonSchema));
   return {
     openapi: '3.1.0', info: { title: 'ACMS Mobile API', version: '1.0.0', description: 'Public API: no authentication, except a booking’s own routes (/bookings/manage/*: its private token in the Booking-Token header) and guest sign-in (/guest/*: a guest token from an emailed code). Owner switches in Admin → Mobile app turn app features off (404). Disabled modules are not registered. Unknown or duplicate query parameters are rejected. locale selects translated words with main-language fallback; unknown locales return 400. Editor API (tag Editor): /api/v1/auth/* and /api/v1/admin/*, registered only when acms({ mobile: { editor } }) is configured; staff sign in through the browser (OAuth 2.0 authorization code + PKCE) and send the device access token as a Bearer header. Cookies never authenticate it.' },