@acms-subir/core 0.3.40 → 0.3.42

package/src/lib/repo/sql.ts

@@ -212,9 +212,14 @@ function rowToBooking(r: Row): Booking {
     formResponse: r.form_response ? json(r.form_response, undefined) : undefined,
     answers: json(r.answers, {}), notes: r.notes ?? '', manageToken: r.manage_token ?? '', source: r.source ?? 'web', locale: r.locale ?? '',
     notificationVersion: Number(r.notification_version ?? 0), reminderSentAt: r.reminder_sent_at === null || r.reminder_sent_at === undefined ? null : Number(r.reminder_sent_at),
+    holdUntil: r.hold_until === null || r.hold_until === undefined ? null : Number(r.hold_until),
     createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
   });
 }
+// RSVP statuses that take seats (a held offer too), and those that are the
+// address's RSVP for a date (a place in line too)
+const SEATED = "('pending','confirmed','offered')";
+const RSVP_ACTIVE = "('pending','confirmed','offered','waitlisted')";
 function rowToApiKey(r: Row): ApiKey {
   return ApiKey.parse({
     id: r.id, name: r.name, prefix: r.prefix, scopes: json(r.scopes, []),
@@ -446,7 +451,7 @@ export class SqlRepository implements ContentRepository {
     await this.ready;
     // One SELECT snapshots bookings and their retry ledger together. No UI
     // list limit; include tombstones for deleted bookings as well.
-    const columns = ['id','kind','resource_id','link_id','event_id','status','start_at','end_at','hold_start','hold_end','timezone','name','email','phone','seats','answers','form_response','notes','manage_token','source','locale','reminder_sent_at','notification_version','created_at','updated_at'];
+    const columns = ['id','kind','resource_id','link_id','event_id','status','start_at','end_at','hold_start','hold_end','timezone','name','email','phone','seats','answers','form_response','notes','manage_token','source','locale','reminder_sent_at','hold_until','notification_version','created_at','updated_at'];
     const rows = await this.driver.all(`SELECT 'booking' AS type, json_object(${columns.map(c => `'${c}',${c}`).join(',')}) AS data FROM bookings
       UNION ALL SELECT 'request', json_object('keyHash',key_hash,'requestHash',request_hash,'bookingId',booking_id,'createdAt',created_at) FROM mobile_booking_requests`);
     return {
@@ -917,6 +922,13 @@ export class SqlRepository implements ContentRepository {
           start_at=CASE WHEN ? THEN (SELECT start_at FROM events WHERE id=?) ELSE start_at END,
           end_at=CASE WHEN ? THEN (SELECT end_at FROM events WHERE id=?) ELSE end_at END
           WHERE event_id=? AND kind='rsvp' AND status IN ('pending','confirmed')`,args:[id,siteTimezone,cancelled?1:0,single?1:0,id,single?1:0,id,id]},
+        // places in line and held spots move with the date too; only its cancellation emails them
+        {sql:`UPDATE bookings SET notification_version=notification_version+?,
+          timezone=COALESCE(NULLIF((SELECT timezone FROM events WHERE id=?),''),?),
+          status=CASE WHEN ? THEN 'cancelled' ELSE status END,
+          start_at=CASE WHEN ? THEN (SELECT start_at FROM events WHERE id=?) ELSE start_at END,
+          end_at=CASE WHEN ? THEN (SELECT end_at FROM events WHERE id=?) ELSE end_at END
+          WHERE event_id=? AND kind='rsvp' AND status IN ('waitlisted','offered')`,args:[cancelled?1:0,id,siteTimezone,cancelled?1:0,single?1:0,id,single?1:0,id,id]},
         ...notifications]);
     } else await this.driver.batch([eventWrite]);
     await this.syncEventIndex(id);
@@ -948,7 +960,7 @@ export class SqlRepository implements ContentRepository {
     const mutation = crypto.randomUUID();
     const notifications = bookingJobs(id,'cancelled',undefined,false,mutation).map(s=>({...s,sql:s.sql.replace('b.id = ?',"b.event_id = ? AND b.kind='rsvp'")}));
     await this.driver.batch([
-      {sql:"UPDATE bookings SET status='cancelled',notification_version=notification_version+1,email_mutation=?,reminder_sent_at=NULL,updated_at=? WHERE event_id=? AND kind='rsvp' AND start_at=? AND status IN ('pending','confirmed')",args:[mutation,Date.now(),id,start]},
+      {sql:`UPDATE bookings SET status='cancelled',notification_version=notification_version+1,email_mutation=?,reminder_sent_at=NULL,updated_at=? WHERE event_id=? AND kind='rsvp' AND start_at=? AND status IN ${RSVP_ACTIVE}`,args:[mutation,Date.now(),id,start]},
       ...notifications,
     ]);
     return Number((await this.first("SELECT COUNT(*) AS n FROM bookings WHERE event_id=? AND kind='rsvp' AND email_mutation=?", [id, mutation]))?.n ?? 0);
@@ -972,7 +984,7 @@ export class SqlRepository implements ContentRepository {
     const mutation = crypto.randomUUID();
     const notifications = bookingJobs(id,'cancelled',undefined,false,mutation).map(s=>({...s,sql:s.sql.replace('b.id = ?',"b.event_id = ? AND b.kind='rsvp'")}));
     await this.driver.batch([
-      {sql:"UPDATE bookings SET status='cancelled',notification_version=notification_version+1,email_mutation=?,reminder_sent_at=NULL WHERE event_id=? AND kind='rsvp' AND status IN ('pending','confirmed')",args:[mutation,id]},
+      {sql:`UPDATE bookings SET status='cancelled',notification_version=notification_version+1,email_mutation=?,reminder_sent_at=NULL WHERE event_id=? AND kind='rsvp' AND status IN ${RSVP_ACTIVE}`,args:[mutation,id]},
       ...notifications,
       { sql: 'DELETE FROM events WHERE id = ?', args: [id] },
       { sql: "DELETE FROM search_index WHERE kind = 'event' AND ref_id = ?", args: [id] },
@@ -1078,9 +1090,9 @@ export class SqlRepository implements ContentRepository {
   private bookingInsert(b: Booking): SqlStatement {
     return {
       sql: `INSERT INTO bookings (id, kind, resource_id, link_id, event_id, status, start_at, end_at, hold_start, hold_end, timezone, name, email, phone,
-        seats, answers, notes, manage_token, source, reminder_sent_at, created_at, updated_at, notification_version, form_response, locale) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        seats, answers, notes, manage_token, source, reminder_sent_at, created_at, updated_at, notification_version, form_response, locale, hold_until) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       args: [b.id, b.kind, b.resourceId, b.linkId, b.eventId, b.status, b.start, b.end, b.holdStart, b.holdEnd, b.timezone, b.name, b.email, b.phone,
-        b.seats, JSON.stringify(b.answers), b.notes, b.manageToken, b.source, b.reminderSentAt, b.createdAt, b.updatedAt, b.notificationVersion, b.formResponse ? JSON.stringify(b.formResponse) : null, b.locale],
+        b.seats, JSON.stringify(b.answers), b.notes, b.manageToken, b.source, b.reminderSentAt, b.createdAt, b.updatedAt, b.notificationVersion, b.formResponse ? JSON.stringify(b.formResponse) : null, b.locale, b.holdUntil],
     };
   }
   async listResources() {
@@ -1221,12 +1233,13 @@ export class SqlRepository implements ContentRepository {
     const holds = b.status === 'pending' || b.status === 'confirmed';
     let write = { sql: `INSERT INTO bookings ${cols} SELECT ${ins.args!.map(() => '?').join(', ')} WHERE 1=1`, args: ins.args };
     if (b.kind === 'rsvp') {
-      const cap = guard.capacity ?? 0;
+      // a place in line takes no seats
+      const cap = holds ? guard.capacity ?? 0 : 0;
       write = { sql: `INSERT INTO bookings ${cols} SELECT ${ins.args!.map(() => '?').join(', ')}
-        WHERE (? = 0 OR (SELECT COALESCE(SUM(seats),0) FROM bookings WHERE kind='rsvp' AND event_id=? AND start_at=? AND status IN ('pending','confirmed')) + ? <= ?)`,
+        WHERE (? = 0 OR (SELECT COALESCE(SUM(seats),0) FROM bookings WHERE kind='rsvp' AND event_id=? AND start_at=? AND status IN ${SEATED}) + ? <= ?)`,
         args: [...ins.args!,cap,b.eventId,b.start,b.seats,cap] };
       // same statement, so two at once from one address can't both get in
-      if (guard.oncePerEmail && holds && b.email) write = { sql: write.sql + ` AND NOT EXISTS (SELECT 1 FROM bookings WHERE kind='rsvp' AND event_id=? AND start_at=? AND email=? AND status IN ('pending','confirmed'))`,
+      if (guard.oncePerEmail && (holds || b.status === 'waitlisted') && b.email) write = { sql: write.sql + ` AND NOT EXISTS (SELECT 1 FROM bookings WHERE kind='rsvp' AND event_id=? AND start_at=? AND email=? AND status IN ${RSVP_ACTIVE})`,
         args: [...write.args!,b.eventId,b.start,b.email] };
     } else if (holds && b.resourceId) {
       write = { sql: `INSERT INTO bookings ${cols} SELECT ${ins.args!.map(() => '?').join(', ')} WHERE NOT EXISTS (
@@ -1241,7 +1254,7 @@ export class SqlRepository implements ContentRepository {
         SELECT ?,?,id,? FROM bookings WHERE id=?`, args: [keyHash, requestHash, now, b.id] });
     }
     // Booking, retry ledger and email outbox commit together on D1 and libSQL.
-    await this.driver.batch([write, ...ledger, ...bookingJobs(b.id, b.status === 'confirmed' ? 'confirmed' : 'received', 0, true), ...rsvpStaffJobs(b.id, 'staff-rsvp', guard.staff, 0)]);
+    await this.driver.batch([write, ...ledger, ...bookingJobs(b.id, b.status === 'confirmed' ? 'confirmed' : b.status === 'waitlisted' ? 'waitlisted' : 'received', 0, true), ...rsvpStaffJobs(b.id, 'staff-rsvp', guard.staff, 0)]);
     return this.getBooking(b.id);
   }
   async moveBooking(id: string, t: { start: number; end: number; holdStart: number; holdEnd: number }) {
@@ -1276,10 +1289,37 @@ export class SqlRepository implements ContentRepository {
     if (data.answers !== undefined) { sets.push('answers = ?'); args.push(JSON.stringify(data.answers)); }
     if (data.reminderSentAt !== undefined) { sets.push('reminder_sent_at = ?'); args.push(data.reminderSentAt); }
     args.push(id);
-    const kind = data.status === 'confirmed' ? 'confirmed' : data.status === 'declined' ? 'declined' : data.status === 'pending' ? 'received' : 'cancelled';
-    await this.driver.batch([{sql:`UPDATE bookings SET ${sets.join(', ')} WHERE id = ? AND notification_version = ?`,args:[...args,current.notificationVersion]},
-      ...(changed ? bookingJobs(id,kind,current.notificationVersion+1,false,mutation,data.notificationMessage) : []),
-      ...(changed && data.status === 'cancelled' ? rsvpStaffJobs(id,'staff-rsvp-cancelled',data.staff,current.notificationVersion+1,mutation) : [])]);
+    if (data.from && data.from !== current.status) return;
+    // the guest's email: leaving the line (or a held spot) isn't a cancelled RSVP; a spot that ran out sends none
+    const waiting = current.status === 'waitlisted' || current.status === 'offered';
+    const kind = data.status === 'confirmed' ? 'confirmed' : data.status === 'declined' ? 'declined' : data.status === 'pending' ? 'received'
+      : data.status === 'offered' ? 'offered' : data.status === 'expired' ? '' : waiting ? 'left' : 'cancelled';
+    // staff: a confirmed offer is a new RSVP to them
+    const staff = data.status === 'cancelled' ? 'staff-rsvp-cancelled' as const : data.status === 'confirmed' || data.status === 'pending' ? 'staff-rsvp' as const : null;
+    await this.driver.batch([{sql:`UPDATE bookings SET ${sets.join(', ')} WHERE id = ? AND notification_version = ?${data.from ? ' AND status = ?' : ''}`,args:[...args,current.notificationVersion,...(data.from ? [data.from] : [])]},
+      ...(changed && kind ? bookingJobs(id,kind,current.notificationVersion+1,false,mutation,data.notificationMessage) : []),
+      ...(changed && staff ? rsvpStaffJobs(id,staff,data.staff,current.notificationVersion+1,mutation) : [])]);
+  }
+  // waitlisted → offered only while its seats still fit: the seat count is in
+  // the same statement, like createBooking's, so two offers (or an offer and a
+  // new RSVP) can't both take the last seats. The email is queued with it.
+  async offerBooking(id: string, holdUntil: number, capacity: number) {
+    await this.ready;
+    const mutation = crypto.randomUUID();
+    await this.driver.batch([
+      { sql: `UPDATE bookings SET status='offered',hold_until=?,notification_version=notification_version+1,email_mutation=?,reminder_sent_at=NULL,updated_at=?
+        WHERE id=? AND kind='rsvp' AND status='waitlisted' AND (? = 0 OR (SELECT COALESCE(SUM(t.seats),0) FROM bookings t WHERE t.kind='rsvp' AND t.event_id=bookings.event_id AND t.start_at=bookings.start_at AND t.status IN ${SEATED}) + seats <= ?)`,
+        args: [holdUntil, mutation, Date.now(), id, capacity, capacity] },
+      ...bookingJobs(id, 'offered', undefined, false, mutation),
+    ]);
+    return !!await this.first('SELECT id FROM bookings WHERE id=? AND email_mutation=?', [id, mutation]);
+  }
+  async expireBooking(id: string, now: number) {
+    await this.ready;
+    const mutation = crypto.randomUUID();
+    await this.driver.run(`UPDATE bookings SET status='expired',notification_version=notification_version+1,email_mutation=?,updated_at=?
+      WHERE id=? AND kind='rsvp' AND status='offered' AND hold_until <= ?`, [mutation, Date.now(), id, now]);
+    return !!await this.first('SELECT id FROM bookings WHERE id=? AND email_mutation=?', [id, mutation]);
   }
   async deleteBooking(id: string) {
     await this.ready;
@@ -1668,7 +1708,10 @@ export class SqlRepository implements ContentRepository {
   }
   async deleteUser(id: string) {
     await this.ready;
-    await this.guardedUserWrite([...this.ownerGuard(id), { sql: 'DELETE FROM users WHERE id = ?', args: [id] }]);
+    await this.guardedUserWrite([...this.ownerGuard(id), { sql: 'DELETE FROM users WHERE id = ?', args: [id] },
+      // their test phones stop getting tests, and a waiting link code stops working
+      { sql: 'UPDATE push_devices SET staff_user_id = NULL, staff_linked_at = NULL WHERE staff_user_id = ?', args: [id] },
+      { sql: 'DELETE FROM push_link_codes WHERE user_id = ?', args: [id] }]);
   }
   async getUserAuth(email: string) {
     await this.ready;

package/src/lib/repo/types.ts

@@ -198,15 +198,22 @@ export interface ContentRepository {
   getBookingByToken(token: string): Promise<Booking | null>;
   // bookings + RSVPs (never staff blocks) this address made since `since`
   countBookingsByEmail(email: string, since: number): Promise<number>;
-  // locale: the booker's language; '' (the main language) when left out
+  // locale: the booker's language; '' (the main language) when left out.
+  // A waitlisted RSVP takes no seats, so only oncePerEmail guards it.
   createBooking(
-    data: Omit<Booking, 'id' | 'createdAt' | 'updatedAt' | 'reminderSentAt' | 'notificationVersion' | 'locale'> & { locale?: string },
+    data: Omit<Booking, 'id' | 'createdAt' | 'updatedAt' | 'reminderSentAt' | 'notificationVersion' | 'locale' | 'holdUntil'> & { locale?: string },
     guard?: { capacity?: number; oncePerEmail?: boolean; idempotency?: { keyHash: string; requestHash: string }; staff?: RsvpStaffNotice }
   ): Promise<Booking | null>;
   // moves a booking only if the new held range is free (reschedule)
   moveBooking(id: string, times: { start: number; end: number; holdStart: number; holdEnd: number }): Promise<boolean>;
-  // staff: who hears that the person cancelled their RSVP (status → cancelled only)
-  updateBooking(id: string, data: Partial<Pick<Booking, 'status' | 'notes' | 'name' | 'email' | 'phone' | 'answers' | 'reminderSentAt'>> & { notificationMessage?: string; staff?: RsvpStaffNotice }): Promise<void>;
+  // staff: who hears that the person cancelled their RSVP, or confirmed a spot
+  // offered from the waitlist; from: change it only if it still has that status
+  updateBooking(id: string, data: Partial<Pick<Booking, 'status' | 'notes' | 'name' | 'email' | 'phone' | 'answers' | 'reminderSentAt'>> & { from?: BookingStatus; notificationMessage?: string; staff?: RsvpStaffNotice }): Promise<void>;
+  // a waitlisted RSVP becomes offered (held until holdUntil, its email queued
+  // with it) only if its seats still fit `capacity` (0 = no limit); false when they don't
+  offerBooking(id: string, holdUntil: number, capacity: number): Promise<boolean>;
+  // an offered RSVP whose hold ended by `now` becomes expired (no email); false when it wasn't
+  expireBooking(id: string, now: number): Promise<boolean>;
   deleteBooking(id: string): Promise<void>;
   // confirmed bookings starting in [from, to) that haven't had a reminder
   listDueReminders(from: number, to: number): Promise<Booking[]>;

package/src/lib/scheduler.ts

@@ -2,7 +2,7 @@ import { syncDueLive } from './live/service';
 import type { ContentRepository } from './repo/types';
 import { processDueDeliveries } from './webhooks';
 import { dispatchEmail } from './email/service';
-import { decideOverdue, sendDueReminders } from './booking/service';
+import { decideOverdue, sendDueReminders, sweepWaitlist } from './booking/service';
 import { runPushJobs } from './push/service';
 import { runAnnouncementJobs } from './announcements/service';
 import { GUEST_IDLE_MS } from './mobile/guest-store';
@@ -21,6 +21,8 @@ export async function runScheduledTasks(repo: ContentRepository, locals?: unknow
     reminders: () => sendDueReminders(repo, { origin: settings.siteUrl, locals, now: startedAt }),
     // pending bookings past their approval deadline (Calendar settings → Bookings)
     approvals: () => decideOverdue(repo, { origin: settings.siteUrl, locals, now: startedAt }),
+    // held waitlist spots that ran out, and freed seats offered to those in line (before email, so offers go out in this run)
+    waitlist: () => sweepWaitlist(repo, { origin: settings.siteUrl, locals, now: startedAt }),
     email: () => dispatchEmail(repo, locals, 10),
     live: () => syncDueLive(repo, locals),
     // scheduled announcements go up (with their push) and ended ones come down

package/src/lib/schema.ts

@@ -419,7 +419,9 @@ export const CalEvent = z.object({
   // (wall time in the event's zone, like start; every date), else closeBefore
   // minutes before each date's start, else when the date ends. notifyStaff:
   // the hosts (else the church's contact email) hear about each new RSVP and
-  // each one the person cancels (lib/booking/service.ts rsvpStaff).
+  // each one the person cancels (lib/booking/service.ts rsvpStaff). waitlist:
+  // a full date takes places in line, and freed seats are offered in turn
+  // (lib/booking/service.ts offerWaitlist); only with a capacity.
   rsvp: z.object({
     enabled: z.boolean().default(false),
     capacity: z.number().int().default(0),
@@ -428,6 +430,7 @@ export const CalEvent = z.object({
     closesAt: z.string().nullable().default(null),
     closeBefore: z.number().int().default(0),
     notifyStaff: z.boolean().default(true),
+    waitlist: z.boolean().default(false),
     form: FormDefinition.optional(),
   }).default({}),
   // rooms/people this event uses: they can't be booked while it happens (or
@@ -653,7 +656,10 @@ export const BookingLink = z.object({
 });
 export type BookingLink = z.infer<typeof BookingLink>;
 
-export const BookingStatus = z.enum(['pending', 'confirmed', 'declined', 'cancelled']);
+// RSVPs only: waitlisted = in line for a full date (takes no seats); offered =
+// a freed spot held for them until holdUntil (takes its seats); expired = they
+// didn't confirm it in time
+export const BookingStatus = z.enum(['pending', 'confirmed', 'declined', 'cancelled', 'waitlisted', 'offered', 'expired']);
 export type BookingStatus = z.infer<typeof BookingStatus>;
 
 export const Booking = z.object({
@@ -685,6 +691,8 @@ export const Booking = z.object({
   // emails and links speak it. '' = the site's main language, as on page rows
   locale: z.string().default(''),
   reminderSentAt: z.number().nullable().default(null),
+  // an offered spot is theirs until then (ms)
+  holdUntil: z.number().nullable().default(null),
   notificationVersion: z.number().default(0),
   createdAt: z.number(),
   updatedAt: z.number(),

package/src/pages/admin/calendar/bookings.astro

@@ -19,7 +19,9 @@ import { forbiddenUnless } from '../../../lib/permissions/access';
 
 // Bookings (mockup I): Cal.com-style tabs, an agenda by day with pending
 // requests first, a Day view with one column per resource, a details panel
-// (?b=<id>) with private notes, plus Block time and Add booking.
+// (?b=<id>) with private notes, plus Block time and Add booking. RSVPs on a
+// full date's waitlist (in line, or a spot offered and held) list apart from
+// the confirmed ones, under Waitlist.
 if (!CALENDAR.enabled) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 { const denied = await forbiddenUnless(Astro.request, Astro.cookies, repo, 'schedule.bookings'); if (denied) return denied; }
@@ -108,7 +110,7 @@ if (Astro.request.method === 'POST') {
 }
 
 // ---- data ----
-const tab = (['upcoming', 'unconfirmed', 'past', 'cancelled'] as const).find((t) => t === Astro.url.searchParams.get('tab')) ?? 'upcoming';
+const tab = (['upcoming', 'unconfirmed', 'waitlist', 'past', 'cancelled'] as const).find((t) => t === Astro.url.searchParams.get('tab')) ?? 'upcoming';
 const view = Astro.url.searchParams.get('view') === 'day' ? 'day' : 'agenda';
 const eventFilter = Astro.url.searchParams.get('event') ?? '';
 const resFilter = Astro.url.searchParams.get('r') ?? '';
@@ -119,7 +121,7 @@ const titleOf = (b: Booking) =>
   : b.kind === 'rsvp' ? b.name
   : b.name || 'Booking';
 const contextOf = (b: Booking) =>
-  b.kind === 'rsvp' ? `RSVP · ${evById.get(b.eventId)?.title ?? 'event'}${b.seats > 1 ? ` · ${b.seats} seats` : ''}`
+  b.kind === 'rsvp' ? [`RSVP · ${evById.get(b.eventId)?.title ?? 'event'}`, ...(b.seats > 1 ? [`${b.seats} seats`] : []), ...(waiting(b) ? [waitOf(b)] : [])].join(' · ')
   : [linkById.get(b.linkId)?.name, ...Object.values(b.answers).slice(0, 2)].filter(Boolean).join(' · ');
 const where = (b: Booking) => (b.kind === 'rsvp' ? evById.get(b.eventId)?.location.name || 'Event' : resById.get(b.resourceId)?.name ?? '—');
 const matches = (b: Booking) =>
@@ -127,17 +129,31 @@ const matches = (b: Booking) =>
   (!resFilter || b.resourceId === resFilter) &&
   (!q || `${b.name} ${b.email} ${b.phone} ${where(b)} ${contextOf(b)}`.toLowerCase().includes(q));
 const active = (b: Booking) => b.status === 'pending' || b.status === 'confirmed';
+// in line for a full date, or a spot offered and held for them
+const waiting = (b: Booking) => b.status === 'waitlisted' || b.status === 'offered';
 const counts = {
   upcoming: all.filter((b) => active(b) && b.end > now && matches(b)).length,
   unconfirmed: all.filter((b) => b.status === 'pending' && b.end > now && matches(b)).length,
+  waitlist: all.filter((b) => waiting(b) && b.end > now && matches(b)).length,
   past: all.filter((b) => active(b) && b.end <= now && matches(b)).length,
-  cancelled: all.filter((b) => !active(b) && matches(b)).length,
+  cancelled: all.filter((b) => !active(b) && !waiting(b) && matches(b)).length,
 };
 const list = all
   .filter(matches)
-  .filter((b) => tab === 'upcoming' ? active(b) && b.end > now : tab === 'unconfirmed' ? b.status === 'pending' && b.end > now : tab === 'past' ? active(b) && b.end <= now : !active(b))
-  .sort((a, b) => (tab === 'past' || tab === 'cancelled' ? b.start - a.start : a.start - b.start))
+  .filter((b) => tab === 'upcoming' ? (active(b) || waiting(b)) && b.end > now : tab === 'unconfirmed' ? b.status === 'pending' && b.end > now
+    : tab === 'waitlist' ? waiting(b) && b.end > now : tab === 'past' ? active(b) && b.end <= now : !active(b) && !waiting(b))
+  .sort((a, b) => (tab === 'past' || tab === 'cancelled' ? b.start - a.start : a.start - b.start || a.createdAt - b.createdAt))
   .slice(0, 300);
+// each date's line: who joined first, then by id (lib/booking/service.ts waitlistLine)
+const lines = new Map<string, Booking[]>();
+for (const b of all.filter((x) => x.status === 'waitlisted').sort((a, b) => a.createdAt - b.createdAt || (a.id < b.id ? -1 : 1))) {
+  const k = `${b.eventId}:${b.start}`;
+  lines.set(k, [...(lines.get(k) ?? []), b]);
+}
+const placeOf = (b: Booking) => (lines.get(`${b.eventId}:${b.start}`) ?? []).findIndex((x) => x.id === b.id) + 1;
+const heldUntil = (b: Booking) => (b.holdUntil ? `${f.day.format(b.holdUntil)} ${f.time.format(b.holdUntil)}` : '');
+// "#2 in line" / "held until Fri, Oct 24 9:00 PM"
+const waitOf = (b: Booking) => (b.status === 'waitlisted' ? `#${placeOf(b)} in line` : b.status === 'offered' ? `held until ${heldUntil(b)}` : '');
 if (Astro.url.searchParams.get('format') === 'csv') {
   const iso = (ms: number) => new Date(ms).toISOString();
   const keys = [...new Set(list.flatMap((b) => Object.keys(b.answers)))];
@@ -150,7 +166,9 @@ if (Astro.url.searchParams.get('format') === 'csv') {
   });
 }
 const pending = tab === 'upcoming' ? list.filter((b) => b.status === 'pending') : [];
-const agendaItems = tab === 'upcoming' ? list.filter((b) => b.status !== 'pending') : list;
+// on Upcoming, the waitlist is a group of its own (like requests to approve), apart from those going
+const queued = tab === 'upcoming' ? list.filter(waiting) : [];
+const agendaItems = tab === 'upcoming' ? list.filter((b) => b.status !== 'pending' && !waiting(b)) : list;
 const days = new Map<string, Booking[]>();
 for (const b of agendaItems) {
   const k = ymd(b.start, tz);
@@ -183,8 +201,13 @@ const emailNotice = !emailConfig.config.enabled || emailConfig.config.provider =
   ? 'Emails are turned off. Enable email so guests can receive confirmations and reminders.'
   : !emailStatus.configured ? `Email needs attention: ${emailStatus.error || 'Choose a provider in Email settings.'}`
   : emailStatus.linkError;
-const TABS = [['upcoming', 'Upcoming'], ['unconfirmed', 'Needs approval'], ['past', 'Past'], ['cancelled', 'Cancelled']] as const;
-const statusLabel = (b: Booking) => (b.kind === 'block' ? 'Blocked' : b.status[0].toUpperCase() + b.status.slice(1));
+const TABS = [['upcoming', 'Upcoming'], ['unconfirmed', 'Needs approval'], ['waitlist', 'Waitlist'], ['past', 'Past'], ['cancelled', 'Cancelled']] as const;
+const LABELS: Partial<Record<Booking['status'], string>> = { waitlisted: 'Waitlist', offered: 'Spot offered', expired: 'Hold expired' };
+const statusLabel = (b: Booking) => (b.kind === 'block' ? 'Blocked' : LABELS[b.status] ?? b.status[0].toUpperCase() + b.status.slice(1));
+// an event's registrations: "40 going · 3 waiting" across its upcoming dates
+const evUpcoming = eventFilter ? all.filter((b) => b.kind === 'rsvp' && b.eventId === eventFilter && b.end > now) : [];
+const evWaiting = evUpcoming.filter((b) => b.status === 'waitlisted').length, evOffered = evUpcoming.filter((b) => b.status === 'offered').length;
+const evCounts = [`${evUpcoming.filter(active).reduce((n, b) => n + b.seats, 0)} going`, ...(evWaiting ? [`${evWaiting} waiting`] : []), ...(evOffered ? [`${evOffered} ${evOffered === 1 ? 'spot' : 'spots'} offered`] : [])].join(' · ');
 // where it was made: the website, an app (/api/v1/bookings), staff, an API key or the booking agent
 const SOURCES: Record<Booking['source'], string> = { web: 'Website', app: 'App', admin: 'Staff', api: 'API', agent: 'Agent' };
 const whenOf = (b: Booking) => (b.end - b.start >= 86_400_000 - 3_600_000 && ymd(b.start, tz) !== ymd(b.end - 1, tz)
@@ -204,7 +227,7 @@ const activeLinks = links.filter((l) => l.active && resById.has(l.resourceId));
     <a class="btn" href={keep({ format: 'csv', b: null, notice: null })}>Export</a>
   </BookingsHead>
   {notice && <p class="notice" role="status">{notice}</p>}
-  {eventFilter && <p class="notice">Registrations for {evById.get(eventFilter)?.title ?? 'this event'} · <a href={keep({ event: null })}>Show all bookings</a></p>}
+  {eventFilter && <p class="notice">Registrations for {evById.get(eventFilter)?.title ?? 'this event'} · {evCounts} · <a href={keep({ event: null })}>Show all bookings</a></p>}
   {error && <p class="notice warn" role="alert">{error}</p>}
   {emailNotice && <p class="notice warn"><span>{emailNotice} <a href={emailStatus.configured && emailStatus.linkError ? '/admin/settings#site' : '/admin/email'}>{emailStatus.configured && emailStatus.linkError ? 'Site settings' : 'Email settings'}</a></span></p>}
 
@@ -227,7 +250,7 @@ const activeLinks = links.filter((l) => l.active && resById.has(l.resourceId));
       <div class="list-lead">
         {view === 'agenda' ? (
           <nav class="seg" aria-label="Show">
-            {TABS.map(([k, l]) => <a class={tab === k ? 'on' : ''} href={keep({ tab: k === 'upcoming' ? null : k, b: null })}>{l}{counts[k] > 0 && k === 'unconfirmed' ? ` · ${counts[k]}` : ''}</a>)}
+            {TABS.map(([k, l]) => <a class={tab === k ? 'on' : ''} href={keep({ tab: k === 'upcoming' ? null : k, b: null })}>{l}{counts[k] > 0 && (k === 'unconfirmed' || k === 'waitlist') ? ` · ${counts[k]}` : ''}</a>)}
           </nav>
         ) : (
           <nav class="seg" aria-label="Day">
@@ -295,6 +318,19 @@ const activeLinks = links.filter((l) => l.active && resById.has(l.resourceId));
                 ))}
               </section>
             )}
+            {queued.length > 0 && (
+              <section class="card bk-group">
+                <div class="bk-dayh"><b>Waitlist</b><span>{queued.length}</span></div>
+                {queued.map((b) => (
+                  <a class={`bk-row${selected?.id === b.id ? ' is-sel' : ''}`} href={keep({ b: b.id })}>
+                    <span class="bk-when">{f.day.format(b.start)}<small>{whenOf(b)}</small></span>
+                    <span class="bk-who"><b>{titleOf(b)}</b><small>{contextOf(b)}</small></span>
+                    <span class="bk-res">{where(b)}</span>
+                    <span class={`status bk-st is-${b.status}`}>{statusLabel(b)}</span>
+                  </a>
+                ))}
+              </section>
+            )}
             {[...days.entries()].map(([k, items]) => (
               <section class="card bk-group">
                 <div class="bk-dayh"><b>{k === today ? 'Today · ' : ''}{f.dayLong.format(items[0].start)}</b><span>{items.length}</span></div>
@@ -308,7 +344,7 @@ const activeLinks = links.filter((l) => l.active && resById.has(l.resourceId));
                 ))}
               </section>
             ))}
-            {!list.length && <p class="hint" style="padding:24px 8px">{tab === 'unconfirmed' ? 'Nothing waiting — auto-confirm links never land here.' : 'No bookings here.'}</p>}
+            {!list.length && <p class="hint" style="padding:24px 8px">{tab === 'unconfirmed' ? 'Nothing waiting — auto-confirm links never land here.' : tab === 'waitlist' ? 'No one is waiting. People can join a waitlist when an event that offers one is full.' : 'No bookings here.'}</p>}
           </>
         )}
       </div>
@@ -328,6 +364,8 @@ const activeLinks = links.filter((l) => l.active && resById.has(l.resourceId));
               {b.phone && <div><dt>Phone</dt><dd><a href={`tel:${b.phone}`}>{b.phone}</a></dd></div>}
               <div><dt>{ev ? 'Event' : 'Where'}</dt><dd>{ev ? <a href={eventUrl(ev.slug)} target="_blank" rel="noopener">{ev.title}</a> : r?.name ?? '—'}{l ? ` · ${l.name}` : ''}</dd></div>
               {b.seats > 1 && <div><dt>Seats</dt><dd>{b.seats}</dd></div>}
+              {b.status === 'waitlisted' && <div><dt>Waitlist</dt><dd>#{placeOf(b)} in line</dd></div>}
+              {b.status === 'offered' && <div><dt>Spot held</dt><dd>Until {heldUntil(b)} · they confirm it from their email</dd></div>}
               {Object.entries(b.answers).map(([k, v]) => <div><dt>{k}</dt><dd>{v}</dd></div>)}
               <div><dt>Booked</dt><dd>{f.day.format(b.createdAt)} · {SOURCES[b.source] ?? b.source}</dd></div>
             </dl>
@@ -361,7 +399,13 @@ const activeLinks = links.filter((l) => l.active && resById.has(l.resourceId));
                 </form>
               </>
             )}
-            {(b.kind === 'block' || !(b.status === 'pending' || b.status === 'confirmed')) && (
+            {waiting(b) && b.end > now && (
+              <form method="post">
+                <input type="hidden" name="op" value="status" /><input type="hidden" name="id" value={b.id} /><input type="hidden" name="to" value="cancelled" />
+                <button class="btn sm danger ghost" type="submit" data-confirm={b.status === 'offered' ? 'Take back the held spot and email them? It goes to the next person in line.' : 'Remove them from the waitlist and email them?'}>{b.status === 'offered' ? 'Take back the spot' : 'Remove from waitlist'}</button>
+              </form>
+            )}
+            {(b.kind === 'block' || !(b.status === 'pending' || b.status === 'confirmed' || waiting(b))) && (
               <form method="post">
                 <input type="hidden" name="op" value="delete" /><input type="hidden" name="id" value={b.id} />
                 <button class="btn sm danger ghost" type="submit" data-confirm="Remove this entry for good?">{b.kind === 'block' ? 'Remove block' : 'Delete record'}</button>

package/src/pages/api/announcements.ts

@@ -26,7 +26,7 @@ export const POST: APIRoute = async ({ request, cookies, locals, url }) => {
     const input = AdminAnnouncementAction.parse(await readJson(request, 100_000));
     const id = await validateRequestSession(request, cookies, repo);
     const author = id === OWNER_ENV ? 'Owner' : (await repo.getUser(id ?? ''))?.name ?? '';
-    const result = await adminAnnouncementAction(repo, input, { url, author, locals, waitUntil: waitUntilFrom(locals), fallbackOrigin: url.origin });
-    return json({ ...result, state: input.action === 'count' ? undefined : await adminAnnouncementsState(repo, url) });
+    const result = await adminAnnouncementAction(repo, input, { url, author, userId: id ?? '', locals, waitUntil: waitUntilFrom(locals), fallbackOrigin: url.origin });
+    return json({ ...result, state: input.action === 'count' || input.action === 'test' ? undefined : await adminAnnouncementsState(repo, url) });
   } catch (e) { return apiError(e); }
 };

package/src/pages/api/calendar/bookings/index.ts

@@ -56,7 +56,7 @@ export const POST: APIRoute = async ({ request, locals, url }) => {
       const day = new Date(start).toISOString().slice(0, 10);
       const occ = featuredOccurrence(e, settings, Date.now(), day);
       if (!occ || Math.abs(occ.start - start) > 60_000) throw new ApiError(400, 'That start time isn’t an occurrence of this event.');
-      const b = await createRsvp(repo, { event: e, start: occ.start, end: occ.end, seats: Number(body.seats) || 1, booker, source }, flow);
+      const b = await createRsvp(repo, { event: e, start: occ.start, end: occ.end, seats: Number(body.seats) || 1, booker, source, waitlist: body.waitlist === true }, flow);
       return withCors(json({ booking: bookingJson(b), manageToken: b.manageToken }, 201));
     }
     const resource = await repo.getResourceBySlug(String(body.resource ?? ''));

package/src/pages/api/calendar/docs.ts

@@ -45,8 +45,8 @@ POST /api/calendar/bookings              (no key needed — same rules as the bo
        "name": "Maria Delgado", "email": "maria@example.com", "phone": "", "answers": { "Expected guests": "60" } }
      RSVP to an event occurrence: { "event": "<slug>", "start": "<occurrence ISO>", "seats": 2, "name": "…", "email": "…" }
      → 201 { booking, manageToken }  status "confirmed" (auto-confirm links) or "pending" (approval)
-     → 409 if the time was just taken
-GET   /api/calendar/bookings?status=pending&resource=<slug>&from=…&to=…   (bookings:read)
+     → 409 if the time was just taken (a full date: add "waitlist": true to join its waitlist, status "waitlisted", when the event keeps one)
+GET   /api/calendar/bookings?status=pending&resource=<slug>&from=…&to=…   (bookings:read; RSVP statuses also waitlisted, offered, expired)
 GET   /api/calendar/bookings/<id>                                        (bookings:read)
 PATCH /api/calendar/bookings/<id> { "status": "confirmed" | "declined" | "cancelled", "start": "<ISO>", "notes": "…", "message": "…" }  (bookings:write)
 Guests manage their own booking at ${o}${CALENDAR.bookBase}/manage/<manageToken>.

package/src/pages/api/push/admin.ts

@@ -23,7 +23,7 @@ export const POST: APIRoute = async ({ request, cookies, locals, url }) => {
     const input = AdminPushInput.parse(await readJson(request, 20_000));
     const id = await validateRequestSession(request, cookies, repo);
     const author = id === OWNER_ENV ? 'Owner' : (await repo.getUser(id ?? ''))?.name ?? '';
-    const result = await adminPushAction(repo, input, { url, locals, author });
+    const result = await adminPushAction(repo, input, { url, locals, author, userId: id ?? '' });
     return json({ ...result, state: input.action === 'count' ? undefined : await adminPushState(repo, url, locals) });
   } catch (e) { return apiError(e); }
 };

package/src/pages/api/push/phones.ts

@@ -0,0 +1,25 @@
+import type { APIRoute } from 'astro';
+import { getRepo } from '../../../lib/repo';
+import { ApiError, apiError, json, readJson } from '../../../lib/api';
+import { requirePermission } from '../../../lib/permissions/access';
+import { TestPhonesInput, testPhonesAction, testPhonesState } from '../../../lib/push/staff';
+
+// Test phones (Admin → Announcements and Admin → Mobile app; registered only
+// when push is enabled): each person links and removes their own phones.
+export const GET: APIRoute = async ({ request, cookies, locals }) => {
+  try {
+    const repo = await getRepo(locals);
+    const access = await requirePermission(request, cookies, repo, 'services.manage');
+    return json(await testPhonesState(repo, access.userId));
+  } catch (e) { return apiError(e); }
+};
+export const POST: APIRoute = async ({ request, cookies, locals, url }) => {
+  try {
+    const repo = await getRepo(locals);
+    const access = await requirePermission(request, cookies, repo, 'services.manage');
+    // a link code gets this person's test pushes: only from this site's admin
+    if (request.headers.get('origin') !== url.origin) throw new ApiError(403, 'Change this from this site’s admin.');
+    const input = TestPhonesInput.parse(await readJson(request, 2_000));
+    return json(await testPhonesAction(repo, input, access.userId));
+  } catch (e) { return apiError(e); }
+};

package/src/pages/api/v1/bookings/manage/confirm.ts

@@ -0,0 +1,6 @@
+import { confirmManaged } from '../../../../../lib/mobile/manage';
+import { privateRoute } from '../../../../../lib/mobile/route';
+import { methodNotAllowed } from '../../../../../lib/mobile/http';
+export { preflight as OPTIONS } from '../../../../../lib/mobile/http';
+export const POST = privateRoute(confirmManaged, { write: true });
+export const ALL = () => methodNotAllowed('POST, OPTIONS');

package/src/pages/api/v1/devices/[token]/staff-link.ts

@@ -0,0 +1,20 @@
+import type { APIRoute } from 'astro';
+import { getRepo } from '../../../../../lib/repo';
+import { linkDevice, unlinkDevice } from '../../../../../lib/push/api';
+import { failure, limitRequest, methodNotAllowed, response } from '../../../../../lib/mobile/http';
+export { preflight as OPTIONS } from '../../../../../lib/mobile/http';
+// POST: link this phone to a staff member (a code from the admin's Test phones) for test pushes. DELETE: unlink (idempotent).
+function handler(run: (repo: Awaited<ReturnType<typeof getRepo>>, request: Request, token: string, address: string, locals: unknown) => Promise<unknown>): APIRoute {
+  return async context => {
+    try {
+      const repo = await getRepo(context.locals);
+      let address = 'unknown';
+      try { address = context.clientAddress || address; } catch { /* shared fallback bucket */ }
+      await limitRequest(repo, address, true);
+      return response(await run(repo, context.request, context.params.token ?? '', address, context.locals));
+    } catch (error) { return failure(error); }
+  };
+}
+export const POST = handler((repo, request, token, address, locals) => linkDevice(repo, request, token, address, locals));
+export const DELETE = handler((repo, _request, token) => unlinkDevice(repo, token));
+export const ALL = () => methodNotAllowed('POST, DELETE, OPTIONS');