@acms-subir/core 0.3.40 → 0.3.41

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/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/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/book/manage/[token].astro

@@ -2,16 +2,16 @@
 import Site from '../../../layouts/Site.astro';
 import { getRepo } from '../../../lib/repo';
 import { CALENDAR, bookingLinkUrl, bookingsEnabled, eventUrl, resourceUrl } from '../../../lib/calendar/config';
-import { guestCancel, guestChanges, BookingError } from '../../../lib/booking/service';
+import { confirmOffer, guestCancel, guestChanges, waitlistPosition, BookingError, WAITLIST_HOLD } from '../../../lib/booking/service';
 import { bookingIcs, whenText } from '../../../lib/booking/emails';
 import { resourceZone } from '../../../lib/booking/availability';
 import { eventTimeZone, locationLine } from '../../../lib/calendar/events';
 import { siteOrigin } from '../../../lib/seo';
 import { waitUntilFrom } from '../../../lib/webhooks';
 import { I18N, localePath, requestLocale } from '../../../lib/i18n';
-import { siteLang } from '../../../lib/dates';
+import { siteLang, siteLocale } from '../../../lib/dates';
 import { isExtraLocale, localizeDoc } from '../../../lib/translations';
-import { rsvpStrings } from '../../../lib/calendar/rsvp-words';
+import { deadlineParts, rsvpStrings } from '../../../lib/calendar/rsvp-words';
 import { bookingStrings } from '../../../lib/email/booking-words';
 import { fill } from '../../../lib/live/words';
 
@@ -21,7 +21,10 @@ import { fill } from '../../../lib/live/words';
 // speaks the request's language, for RSVPs and room bookings alike
 // (/es/book/manage/… in Spanish, as the emails of a booking made in Spanish
 // link it); opened without the prefix it shows the main language, with no
-// redirect. The room booking flow it links back to stays in English.
+// redirect. The room booking flow it links back to stays in English. An RSVP
+// on a full date's waitlist shows its place in line ("#3 in line · 2 seats")
+// or the spot held for it ("A spot is yours until …", Confirm my spot), and
+// can leave the line or release the spot.
 if (!CALENDAR.enabled) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 const booking = await repo.getBookingByToken(Astro.params.token ?? '');
@@ -52,31 +55,62 @@ if (Astro.url.searchParams.get('ics')) {
 }
 let error = '';
 let current = booking;
+// what this request just did: left the line (or released a held spot), or took the spot
+let left = false, took = false;
 if (Astro.request.method === 'POST') {
   const form = await Astro.request.formData();
-  if (form.get('op') === 'cancel' && (booking.status === 'pending' || booking.status === 'confirmed')) {
+  const flow = { origin, locals: Astro.locals, waitUntil: waitUntilFrom(Astro.locals) };
+  if (form.get('op') === 'cancel' && ['pending', 'confirmed', 'waitlisted', 'offered'].includes(booking.status)) {
     try {
-      current = await guestCancel(repo, booking, { origin, locals: Astro.locals, waitUntil: waitUntilFrom(Astro.locals) });
+      current = await guestCancel(repo, booking, flow);
+      left = booking.status === 'waitlisted' || booking.status === 'offered';
     } catch (err) {
       error = err instanceof BookingError ? err.message : w.cancelError;
     }
   }
+  if (form.get('op') === 'confirm' && booking.status === 'offered') {
+    try {
+      current = await confirmOffer(repo, booking, flow);
+      took = true;
+    } catch (err) {
+      current = (await repo.getBooking(booking.id)) ?? booking;
+      // released: the page says so in its own words
+      error = current.status === 'expired' ? '' : err instanceof BookingError ? err.message : w.confirmError;
+    }
+  }
 }
 const tz = event ? eventTimeZone(event, settings) : resource ? resourceZone(resource, settings.timezone) : settings.timezone || 'UTC';
-const when = whenText(current, tz, isExtraLocale(locale) ? { ...settings, locale } : settings, link?.mode === 'day' || event?.allDay);
-const active = current.status === 'pending' || current.status === 'confirmed';
+const dateSettings = isExtraLocale(locale) ? { ...settings, locale } : settings;
+const when = whenText(current, tz, dateSettings, link?.mode === 'day' || event?.allDay);
+const waiting = current.status === 'waitlisted' || current.status === 'offered';
+const active = current.status === 'pending' || current.status === 'confirmed' || waiting;
 const upcoming = current.end > Date.now();
 const can = guestChanges(current, link);
-const isNew = Astro.url.searchParams.has('new');
+const isNew = Astro.url.searchParams.has('new') || took;
 const moved = Astro.url.searchParams.has('moved');
-const heading = current.status === 'cancelled' ? w.cancelledTitle
+const hours = String(WAITLIST_HOLD / 3_600_000);
+// "#3 in line · 2 seats"; "A spot is yours until Fri, Oct 24 at 9 PM"
+const position = await waitlistPosition(repo, current);
+const inLine = position === null ? '' : fill(w.inLine, { position: String(position), seats: fill(current.seats === 1 ? w.seat : w.seats, { count: String(current.seats) }) });
+const holdUntil = current.status === 'offered' && current.holdUntil !== null ? deadlineParts(current.holdUntil, tz, siteLocale(dateSettings)) : null;
+const heading = current.status === 'cancelled' ? (left ? w.offWaitlist : w.cancelledTitle)
   : current.status === 'declined' ? w.notAvailable
+  : current.status === 'waitlisted' ? w.onWaitlist
+  : current.status === 'offered' ? w.spotOpened
+  : current.status === 'expired' ? w.released
   : current.status === 'pending' ? (isNew ? w.requestSent : w.awaitingApproval)
   : moved ? bw.moved : isNew ? w.booked : w.yours;
 const lede = current.status === 'pending' ? fill(w.emailWhenApproved, { email: current.email })
   : current.status === 'confirmed' ? (current.formResponse?.definition.confirmation || link?.confirmMessage || fill(w.confirmationOnItsWay, { email: current.email }))
   : current.status === 'declined' ? w.declined
-  : w.cancelledText;
+  : current.status === 'waitlisted' ? fill(w.waitlistPromise, { hours })
+  : current.status === 'offered' ? (holdUntil ? fill(w.spotYours, holdUntil) : '')
+  : current.status === 'expired' ? fill(w.releasedText, { hours })
+  : left ? w.offWaitlistText : w.cancelledText;
+// a room booking's own words list only its four statuses
+const statusLabel = (w.statuses as Record<string, string>)[current.status] ?? rsvpStrings(lang).statuses[current.status];
+const cancelLabel = current.status === 'waitlisted' ? w.leaveWaitlist : current.status === 'offered' ? w.releaseSpot : w.cancel;
+const cancelAsk = `return confirm(${JSON.stringify(current.status === 'waitlisted' ? w.leaveConfirm : current.status === 'offered' ? w.releaseConfirm : w.cancelConfirm)})`;
 const cutoff = fill(bw.cutoff, { hours: String(can.cutoffHours) });
 const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchParams({ action: 'TEMPLATE', text: title, dates: `${new Date(current.start).toISOString().replace(/[-:]|\.\d{3}/g, '')}/${new Date(current.end).toISOString().replace(/[-:]|\.\d{3}/g, '')}`, details: url, location })}`;
 ---
@@ -85,10 +119,12 @@ const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchPa
   <div class="pc-manage">
     <div class={`pc-manage-icon is-${current.status}`} aria-hidden="true">
       {current.status === 'confirmed' ? <svg viewBox="0 0 24 24"><path d="M5 12l5 5L19 7" /></svg>
-        : current.status === 'pending' ? <svg viewBox="0 0 24 24"><circle cx="12" cy="12" r="8" /><path d="M12 8v4l3 2" /></svg>
+        : current.status === 'pending' || current.status === 'offered' ? <svg viewBox="0 0 24 24"><circle cx="12" cy="12" r="8" /><path d="M12 8v4l3 2" /></svg>
+        : current.status === 'waitlisted' ? <svg viewBox="0 0 24 24"><path d="M5 7h14M5 12h14M5 17h8" /></svg>
         : <svg viewBox="0 0 24 24"><path d="M7 7l10 10M17 7 7 17" /></svg>}
     </div>
     <h1>{heading}</h1>
+    {inLine && <p class="pc-manage-wait">{inLine}</p>}
     <p class="pc-manage-lede">{lede}</p>
     {error && <p class="pc-bk-error">{error}</p>}
     <dl class="pc-manage-card">
@@ -96,7 +132,7 @@ const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchPa
       <div><dt>{w.when}</dt><dd>{when}</dd></div>
       {location && <div><dt>{w.where}</dt><dd>{location}</dd></div>}
       {current.seats > 1 && <div><dt>{w.seatsField}</dt><dd>{current.seats}</dd></div>}
-      <div><dt>{w.status}</dt><dd class={`pc-manage-status is-${current.status}`}>{w.statuses[current.status]}</dd></div>
+      <div><dt>{w.status}</dt><dd class={`pc-manage-status is-${current.status}`}>{statusLabel}</dd></div>
       <div><dt>{w.reference}</dt><dd class="mono">{current.id.slice(0, 8).toUpperCase()}</dd></div>
     </dl>
     {active && upcoming && (
@@ -111,13 +147,19 @@ const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchPa
             </div>
           </details>
         )}
+        {can.confirm && (
+          <form method="post">
+            <input type="hidden" name="op" value="confirm" />
+            <button class="pc-manage-btn is-primary" type="submit">{w.confirmSpot}</button>
+          </form>
+        )}
         {resource && link && can.reschedule && (
           <a class="pc-manage-btn" href={`${bookingLinkUrl(resource.slug, link.slug)}?reschedule=${encodeURIComponent(current.manageToken)}`}>{bw.reschedule}</a>
         )}
         {can.cancel && (
-          <form method="post" onsubmit={`return confirm(${JSON.stringify(w.cancelConfirm)})`}>
+          <form method="post" onsubmit={cancelAsk}>
             <input type="hidden" name="op" value="cancel" />
-            <button class="pc-manage-btn is-danger" type="submit">{w.cancel}</button>
+            <button class="pc-manage-btn is-danger" type="submit">{cancelLabel}</button>
           </form>
         )}
       </div>

package/src/pages/events/[slug].astro

@@ -22,7 +22,7 @@ import { CALENDAR, eventUrl, withoutPrivateFields } from '../../lib/calendar/con
 import { eventIsPublic, featuredOccurrence, rsvpDeadline } from '../../lib/calendar/events';
 import { eventJsonLd } from '../../lib/calendar/seo';
 import { upcomingEvents } from '../../lib/calendar/cards';
-import { seatsTaken, BookingError } from '../../lib/booking/service';
+import { seatsTaken, waitlistOn, BookingError } from '../../lib/booking/service';
 import { manageUrl } from '../../lib/calendar/config';
 import { waitUntilFrom } from '../../lib/webhooks';
 
@@ -77,9 +77,10 @@ const formHtml = hiddenFields(await formVersion(definition), requestId) + `<inpu
 const taken = event.rsvp.enabled ? await seatsTaken(repo, event.id, occurrence.start) : 0;
 // the event's RSVP deadline for this date (null: open until it ends)
 const closesAt = event.rsvp.enabled ? rsvpDeadline(occurrence, settings) : null;
+// waitlist: a full date offers "Join the waitlist" (the same form, posting waitlist=1)
 const rsvp = event.rsvp.enabled
   ? { going: taken, left: event.rsvp.capacity ? Math.max(0, event.rsvp.capacity - taken) : null, maxSeats: event.rsvp.maxSeats, error: rsvpError, duplicate: rsvpDuplicate, formHtml, fieldsHtml: renderFields(definition, formValues, 'event-registration'), values: coreValues,
-    open: occurrence.end > now && !occurrence.cancelled && !(closesAt !== null && closesAt <= now), closesAt }
+    open: occurrence.end > now && !occurrence.cancelled && !(closesAt !== null && closesAt <= now), closesAt, waitlist: waitlistOn(event) }
   : null;
 const calendars = event.calendarIds.map((id) => calMap.get(id)).filter((c): c is NonNullable<typeof c> => Boolean(c) && c!.visibility !== 'private');
 const html = highlightCodeHtml(await expandDynamicBlocks(event.bodyHtml, repo));

package/src/styles/admin.css

@@ -1476,7 +1476,9 @@ a.bk-row:hover, .bk-row.is-sel { background: var(--hover); }
 .bk-st { font-size: 12px; font-weight: 600; white-space: nowrap; }
 .bk-st.is-confirmed { color: var(--green); }
 .bk-st.is-pending { color: var(--amber); }
-.bk-st.is-cancelled, .bk-st.is-declined, .bk-st.is-block { color: var(--muted); }
+.bk-st.is-cancelled, .bk-st.is-declined, .bk-st.is-block, .bk-st.is-expired { color: var(--muted); }
+.bk-st.is-waitlisted { color: var(--text-2); }
+.bk-st.is-offered { color: var(--accent); }
 .bk-panel { padding: 16px 18px; position: sticky; top: 64px; }
 .bk-panel-head { display: flex; justify-content: space-between; align-items: center; }
 .bk-panel h2 { font-size: 18px; margin: 6px 0 2px; }

package/src/styles/site.css

@@ -1119,7 +1119,9 @@ li::marker { color: var(--muted); }
   .pc-manage-icon svg { width: 26px; height: 26px; fill: none; stroke: currentColor; stroke-width: 2.4; stroke-linecap: round; stroke-linejoin: round; }
   .pc-manage-icon.is-confirmed { background: color-mix(in srgb, var(--success) 14%, var(--panel)); color: var(--success); }
   .pc-manage-icon.is-pending { background: color-mix(in srgb, var(--warning) 14%, var(--panel)); color: var(--warning); }
-  .pc-manage-icon.is-cancelled, .pc-manage-icon.is-declined { background: var(--soft); color: var(--muted); }
+  .pc-manage-icon.is-cancelled, .pc-manage-icon.is-declined, .pc-manage-icon.is-expired { background: var(--soft); color: var(--muted); }
+  .pc-manage-icon.is-waitlisted { background: var(--soft); color: var(--ink); }
+  .pc-manage-icon.is-offered { background: color-mix(in srgb, var(--success) 14%, var(--panel)); color: var(--success); }
   .pc-manage h1 { font-size: 30px; margin: 0 0 8px; }
   .pc-manage-lede { color: var(--muted); margin: 0 0 18px; }
   .pc-manage-card { text-align: left; background: var(--panel); border: 1px solid var(--line); border-radius: var(--r); margin: 0; padding: 4px 18px; box-shadow: var(--sh-1); }
@@ -1130,12 +1132,17 @@ li::marker { color: var(--muted); }
   .pc-manage-card .mono { font-family: var(--font-mono); font-size: 13px; }
   .pc-manage-status.is-confirmed { color: var(--success); font-weight: 600; }
   .pc-manage-status.is-pending { color: var(--warning); font-weight: 600; }
+  .pc-manage-status.is-waitlisted { font-weight: 600; }
+  .pc-manage-status.is-offered { color: var(--success); font-weight: 600; }
+  .pc-manage-wait { font-weight: 600; margin: 0 0 6px; }
   .pc-manage-actions { display: flex; gap: 8px; justify-content: center; flex-wrap: wrap; margin-top: 16px; }
   .pc-manage-actions .pc-ev-add { margin: 0; }
   .pc-manage-actions .pc-ev-add > summary { width: auto; }
   .pc-manage-btn { display: inline-flex; align-items: center; height: 40px; padding: 0 14px; border: 1px solid var(--line-2); border-radius: 12px; background: var(--panel); font: 550 14px/1.2 var(--font-body); color: var(--ink); text-decoration: none; cursor: pointer; }
   .pc-manage-btn:hover { background: var(--soft); }
   .pc-manage-btn.is-danger { color: var(--danger); }
+  .pc-manage-btn.is-primary { background: var(--btn); color: var(--btn-ink); border-color: transparent; }
+  .pc-manage-btn.is-primary:hover { background: var(--btn); filter: brightness(1.08); }
   .pc-manage-note { font-size: 12.5px; color: var(--muted); margin-top: 22px; }
 
   /* RSVP on the event page */
@@ -1149,6 +1156,8 @@ li::marker { color: var(--muted); }
   .pc-ev-full { font-size: 14px; font-weight: 600; color: var(--muted); }
   .pc-ev-closes { font-size: 13.5px; color: var(--muted); margin: 0 0 10px; }
   .pc-ev-full + .pc-ev-closes { margin-top: 4px; }
+  .pc-ev-full.is-waitlist { color: var(--ink); margin: 0 0 2px; }
+  .pc-ev-waitlist { font-size: 13.5px; color: var(--muted); margin: 0 0 10px; }
   .pc-ev-notice { font-size: 14px; line-height: 1.5; background: var(--soft); border-radius: var(--r-sm); padding: 9px 12px; margin: 0 0 14px; }
 
   @media (max-width: 860px) {

package/src/theme-sdk/index.ts

@@ -11,7 +11,7 @@ export interface HomeProps { settings: Settings; page: Page | null; posts: Post[
 export interface PageProps { settings: Settings; page: Page; html: string }
 export interface PostProps { settings: Settings; post: Post; html: string; authors: User[]; related: Post[] }
 import type { Occurrence } from '../lib/calendar/events';
-export interface EventProps { settings: Settings; event: CalEvent; html: string; calendars: Calendar[]; origin: string; occurrence: Occurrence; upcoming: Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days'>[]; preview?: boolean; rsvp?: {going:number;left:number|null;maxSeats:number;error:string;open:boolean;closesAt?:number|null;duplicate?:boolean}|null }
+export interface EventProps { settings: Settings; event: CalEvent; html: string; calendars: Calendar[]; origin: string; occurrence: Occurrence; upcoming: Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days'>[]; preview?: boolean; rsvp?: {going:number;left:number|null;maxSeats:number;error:string;open:boolean;closesAt?:number|null;duplicate?:boolean;waitlist?:boolean}|null }
 /**
  * Props for a coded section. `data` holds resolved values: link fields arrive
  * as LinkValue, lists as row arrays, source fields as fresh item arrays