@acms-subir/core 0.3.3 → 0.3.4

package/src/lib/mobile/calendar.ts

@@ -8,9 +8,10 @@ import { availabilityContext } from '../booking/service';
 import { addDaysYmd, describeLink, linkLengths, localMidnight, slotsForDay, ymd } from '../booking/availability';
 import { siteOrigin } from '../seo';
 import { safeUrl } from './content';
-import { pageQuery, isoDay, queryParams } from './http';
+import { pageQuery, isoDay, isoDayOrInstant, queryParams } from './http';
 import { localizeDoc } from '../translations';
 import { localeQuery, mobileLocale, localizedUrl } from './locale';
+import { confirmsInstantly, linkApproval } from '../booking/approval';
 
 export function requireCalendar(bookings = false) {
   if (!CALENDAR.enabled || (bookings && !bookingsEnabled())) throw new ApiError(404, 'This feature is disabled.');
@@ -21,7 +22,7 @@ export async function listCalendars(repo: ContentRepository, url: URL) {
   const origin = siteOrigin(await repo.getSettings(), url);
   return { calendars: (await repo.listCalendars()).filter(c => c.visibility === 'public').map(c => calendarToJson(c, origin)) };
 }
-export const eventsQuery = z.object({ ...pageQuery, locale: localeQuery, from: isoDay.optional(), to: isoDay.optional(), calendar: z.string().min(1).max(200).optional(), q: z.string().max(100).optional() }).strict();
+export const eventsQuery = z.object({ ...pageQuery, locale: localeQuery, from: isoDayOrInstant.optional(), to: isoDayOrInstant.optional(), calendar: z.string().min(1).max(200).optional(), q: z.string().max(100).optional() }).strict();
 export async function listEvents(repo: ContentRepository, url: URL) {
   requireCalendar();
   const q = eventsQuery.parse(queryParams(url));
@@ -29,8 +30,11 @@ export async function listEvents(repo: ContentRepository, url: URL) {
   const [settings, calendars, events] = await Promise.all([repo.getSettings(), repo.listCalendars(), repo.listPublishedEvents()]);
   // days are the site's calendar days (a New York site's "today" starts at midnight there, not UTC)
   const tz = settings.timezone || 'UTC';
-  const from = localMidnight(q.from ?? ymd(Date.now(), tz), tz);
-  const to = q.to ? localMidnight(q.to, tz) : localMidnight(addDaysYmd(q.from ?? ymd(Date.now(), tz), 30), tz);
+  // a plain day is the site's midnight; a date-time is that exact instant
+  const at = (v: string) => (v.length === 10 ? localMidnight(v, tz) : Date.parse(v));
+  const fromDay = q.from ?? ymd(Date.now(), tz);
+  const from = at(fromDay);
+  const to = q.to ? at(q.to) : fromDay.length === 10 ? localMidnight(addDaysYmd(fromDay, 30), tz) : from + 30 * 86400000;
   if (to <= from || to - from > 90 * 86400000 + 3600000) throw new ApiError(400, 'Use an event window of 1 to 90 days.');
   const all = new Map(calendars.map(c => [c.id, c]));
   const cal = q.calendar ? calendars.find(c => c.slug === q.calendar && c.visibility !== 'private') : null;
@@ -67,7 +71,7 @@ export async function listResources(repo: ContentRepository, url: URL) {
     photo: safeUrl(r.photo, origin), timezone: r.timezone || settings.timezone || 'UTC', url: origin + resourceUrl(r.slug),
     links: links.filter(l => l.resourceId === r.id && l.active && l.visibility === 'public').map(l => ({
       id: l.id, slug: l.slug, name: l.name, description: l.description, mode: l.mode, lengths: linkLengths(l), rules: describeLink(l),
-      askPhone: l.askPhone, autoConfirm: l.autoConfirm, url: origin + bookingLinkUrl(r.slug, l.slug),
+      askPhone: l.askPhone, autoConfirm: confirmsInstantly(linkApproval(l, settings)), url: origin + bookingLinkUrl(r.slug, l.slug),
       questions: l.questions.map(({ id, label, type, required, options }) => ({ id, label, type, required, options })),
     })),
   })), pagination: { page: q.page, limit: q.limit, nextPage: visible.length > start + q.limit ? q.page + 1 : null } };
@@ -85,7 +89,7 @@ export async function getAvailability(repo: ContentRepository, url: URL) {
   const ctx = await availabilityContext(repo, resource, link, settings);
   const timezone = resource.timezone || settings.timezone || 'UTC';
   const from = q.from ?? ymd(Date.now(), timezone);
-  return { timezone, mode: link.mode, lengths: linkLengths(link), autoConfirm: link.autoConfirm,
+  return { timezone, mode: link.mode, lengths: linkLengths(link), autoConfirm: confirmsInstantly(linkApproval(link, settings)),
     days: Array.from({ length: q.days }, (_, i) => addDaysYmd(from, i)).map(date => ({ date,
       slots: slotsForDay(ctx, date, q.minutes).map(s => ({ start: new Date(s.start).toISOString(), end: new Date(s.end).toISOString(), minutes: s.minutes })),
     })),

package/src/lib/mobile/http.ts

@@ -57,6 +57,12 @@ export const pageQuery = {
 export const isoDay = z.string().regex(/^\d{4}-\d{2}-\d{2}$/).refine((s) => {
   const n = Date.parse(s); return Number.isFinite(n) && new Date(n).toISOString().slice(0, 10) === s;
 }, 'Use a valid calendar date.');
+// a site-local day ("2026-10-01" = midnight in the site timezone) or an exact
+// ISO 8601 instant with a zone ("2026-10-01T18:00:00Z", "…T13:00:00-05:00")
+export const isoDayOrInstant = z.string().max(40).refine((s) => {
+  if (/^\d{4}-\d{2}-\d{2}$/.test(s)) return isoDay.safeParse(s).success;
+  return /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2}(\.\d{1,3})?)?(Z|[+-]\d{2}:\d{2})$/.test(s) && Number.isFinite(Date.parse(s));
+}, 'Use a date (YYYY-MM-DD) or an ISO date-time with a timezone (2026-10-01T18:00:00Z).');
 
 export function methodNotAllowed(allow = 'GET, HEAD, OPTIONS') {
   const res = failure(new ApiError(405, 'Method not allowed.'));

package/src/lib/repo/migrations.ts

@@ -4,6 +4,7 @@ import { EMAIL_MIGRATION } from '../email/migration';
 import { WEBHOOK_MIGRATION } from '../webhook-sql';
 import { PUSH_MIGRATION } from '../push/migration';
 import { EDITOR_MIGRATION, EDITOR_GRACE_MIGRATION } from '../editor/migration';
+import { CALENDAR_SETTINGS_MIGRATION, ROOM_HOLD_MIGRATION } from '../calendar/migration';
 // Versioned schema migrations shared by the two SQLite-dialect adapters
 // (D1 and libSQL). Applied versions are recorded in the `migrations` table;
 // each adapter's runner applies whatever is newer, in order, at startup.
@@ -512,6 +513,8 @@ export const MIGRATIONS: Migration[] = [
   PUSH_MIGRATION,
   EDITOR_MIGRATION,
   EDITOR_GRACE_MIGRATION,
+  CALENDAR_SETTINGS_MIGRATION,
+  ROOM_HOLD_MIGRATION,
 ];
 
 export const LATEST_VERSION = MIGRATIONS[MIGRATIONS.length - 1].version;

package/src/lib/repo/sql.ts

@@ -144,7 +144,7 @@ function rowToEvent(r: Row): CalEvent {
     start: r.starts, end: r.ends ?? '', allDay: Boolean(r.all_day), timezone: r.timezone ?? '',
     rrule: r.rrule ?? '', exdates: json(r.exdates, []), cancelled: Boolean(r.cancelled),
     location: json(r.location, {}), cta: json(r.cta, {}), calendarIds: json(r.calendar_ids, []),
-    fields: json(r.fields, {}), sourceUid: r.source_uid ?? '', rsvp: json(r.rsvp, {}),
+    fields: json(r.fields, {}), sourceUid: r.source_uid ?? '', rsvp: json(r.rsvp, {}), roomHold: json(r.room_hold, {}),
     startAt: Number(r.start_at), endAt: Number(r.end_at), draft: parseDraft(r.draft), translations: parseTranslations(r.translations),
     publishedAt: r.published_at === null || r.published_at === undefined ? null : Number(r.published_at),
     scheduledAt: r.scheduled_at === null || r.scheduled_at === undefined ? null : Number(r.scheduled_at),
@@ -161,6 +161,14 @@ function rowToResource(r: Row): Resource {
     createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
   });
 }
+// Callers that still speak the old on/off flag (REST, agent tools, older
+// code) set autoConfirm without an approval mode: map it so "off" really
+// holds bookings. On create, "on" follows the site default (which starts as
+// automatic); on update it pins the link to automatic.
+function legacyApproval<T extends { autoConfirm?: boolean; approval?: BookingLink['approval'] }>(data: T, update = false): T {
+  if (data.approval !== undefined || data.autoConfirm === undefined) return data;
+  return { ...data, approval: data.autoConfirm ? (update ? 'auto' : 'default') : 'manual' };
+}
 function rowToLink2(r: Row): BookingLink {
   return BookingLink.parse({
     id: r.id, resourceId: r.resource_id, slug: r.slug, name: r.name, description: r.description ?? '', mode: r.mode ?? 'slots',
@@ -168,6 +176,7 @@ function rowToLink2(r: Row): BookingLink {
     step: Number(r.step), bufferBefore: Number(r.buffer_before), bufferAfter: Number(r.buffer_after),
     minNotice: Number(r.min_notice), maxAdvance: Number(r.max_advance), perDayCap: Number(r.per_day_cap),
     hours: r.hours ? json(r.hours, null) : null, autoConfirm: Boolean(r.auto_confirm), visibility: r.visibility ?? 'public',
+    approval: r.approval ?? 'default', approvalRules: json(r.approval_rules, {}),
     askPhone: Boolean(r.ask_phone), questions: json(r.questions, []), confirmMessage: r.confirm_message ?? '',
     redirectUrl: r.redirect_url ?? '', active: Boolean(r.active), order: Number(r.ord ?? 0),
     createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
@@ -811,8 +820,8 @@ export class SqlRepository implements ContentRepository {
     await this.driver.run(
       `INSERT INTO events (id, slug, title, body_json, body_html, excerpt, cover, cover_alt, seo_title, seo_desc, status, featured, tags, template,
         starts, ends, all_day, timezone, rrule, exdates, cancelled, location, cta, calendar_ids, fields, source_uid, start_at, end_at,
-        published_at, scheduled_at, created_at, updated_at, rsvp)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        published_at, scheduled_at, created_at, updated_at, rsvp, room_hold)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       [
         id, data.slug, data.title, data.bodyJson ?? '', data.bodyHtml ?? '', data.excerpt ?? '', data.cover ?? '', data.coverAlt ?? '',
         data.seoTitle ?? '', data.seoDesc ?? '', data.status ?? 'draft', data.featured ? 1 : 0, JSON.stringify(data.tags ?? []), data.template ?? '',
@@ -820,7 +829,7 @@ export class SqlRepository implements ContentRepository {
         data.cancelled ? 1 : 0, JSON.stringify(data.location ?? {}), JSON.stringify(data.cta ?? {}), JSON.stringify(data.calendarIds ?? []),
         JSON.stringify(data.fields ?? {}), data.sourceUid ?? '', startAt, endAt,
         data.publishedAt ?? (data.status === 'published' ? now : null), data.scheduledAt ?? null, now, now,
-        JSON.stringify(data.rsvp ?? {}),
+        JSON.stringify(data.rsvp ?? {}), JSON.stringify(data.roomHold ?? {}),
       ]
     );
     await this.syncEventIndex(id);
@@ -845,7 +854,7 @@ export class SqlRepository implements ContentRepository {
       if (v !== undefined) { sets.push(`${col} = ?`); args.push(v); }
     }
     const jsonCols: Record<string, string> = {
-      tags: 'tags', exdates: 'exdates', location: 'location', cta: 'cta', calendarIds: 'calendar_ids', fields: 'fields', rsvp: 'rsvp', translations: 'translations',
+      tags: 'tags', exdates: 'exdates', location: 'location', cta: 'cta', calendarIds: 'calendar_ids', fields: 'fields', rsvp: 'rsvp', translations: 'translations', roomHold: 'room_hold',
     };
     for (const [k, col] of Object.entries(jsonCols)) {
       const v = (data as Record<string, unknown>)[k];
@@ -936,10 +945,11 @@ export class SqlRepository implements ContentRepository {
     return {
       sql: `INSERT INTO booking_links (id, resource_id, slug, name, description, mode, duration, lengths, min_days, max_days, step, buffer_before,
         buffer_after, min_notice, max_advance, per_day_cap, hours, auto_confirm, visibility, ask_phone, questions, confirm_message, redirect_url,
-        active, ord, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        active, ord, created_at, updated_at, approval, approval_rules) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       args: [l.id, l.resourceId, l.slug, l.name, l.description, l.mode, l.duration, JSON.stringify(l.lengths), l.minDays, l.maxDays, l.step,
         l.bufferBefore, l.bufferAfter, l.minNotice, l.maxAdvance, l.perDayCap, l.hours ? JSON.stringify(l.hours) : null, l.autoConfirm ? 1 : 0,
-        l.visibility, l.askPhone ? 1 : 0, JSON.stringify(l.questions), l.confirmMessage, l.redirectUrl, l.active ? 1 : 0, l.order, l.createdAt, l.updatedAt],
+        l.visibility, l.askPhone ? 1 : 0, JSON.stringify(l.questions), l.confirmMessage, l.redirectUrl, l.active ? 1 : 0, l.order, l.createdAt, l.updatedAt,
+        l.approval, JSON.stringify(l.approvalRules)],
     };
   }
   private bookingInsert(b: Booking): SqlStatement {
@@ -1017,7 +1027,7 @@ export class SqlRepository implements ContentRepository {
     await this.ready;
     const now = Date.now();
     const next = await this.first('SELECT COALESCE(MAX(ord), -1) + 1 AS n FROM booking_links WHERE resource_id = ?', [data.resourceId]);
-    const l = BookingLink.parse({ ...data, id: crypto.randomUUID(), order: Number(next?.n ?? 0), createdAt: now, updatedAt: now });
+    const l = BookingLink.parse({ ...legacyApproval(data), id: crypto.randomUUID(), order: Number(next?.n ?? 0), createdAt: now, updatedAt: now });
     const st = this.linkInsert(l);
     await this.driver.run(st.sql, st.args);
     return l;
@@ -1026,14 +1036,14 @@ export class SqlRepository implements ContentRepository {
     await this.ready;
     const cur = await this.getBookingLink(id);
     if (!cur) return;
-    const l = BookingLink.parse({ ...cur, ...data, id, updatedAt: Date.now() });
+    const l = BookingLink.parse({ ...cur, ...legacyApproval(data, true), id, updatedAt: Date.now() });
     await this.driver.run(
       `UPDATE booking_links SET slug = ?, name = ?, description = ?, mode = ?, duration = ?, lengths = ?, min_days = ?, max_days = ?, step = ?,
         buffer_before = ?, buffer_after = ?, min_notice = ?, max_advance = ?, per_day_cap = ?, hours = ?, auto_confirm = ?, visibility = ?,
-        ask_phone = ?, questions = ?, confirm_message = ?, redirect_url = ?, active = ?, ord = ?, updated_at = ? WHERE id = ?`,
+        ask_phone = ?, questions = ?, confirm_message = ?, redirect_url = ?, active = ?, ord = ?, updated_at = ?, approval = ?, approval_rules = ? WHERE id = ?`,
       [l.slug, l.name, l.description, l.mode, l.duration, JSON.stringify(l.lengths), l.minDays, l.maxDays, l.step, l.bufferBefore, l.bufferAfter,
         l.minNotice, l.maxAdvance, l.perDayCap, l.hours ? JSON.stringify(l.hours) : null, l.autoConfirm ? 1 : 0, l.visibility, l.askPhone ? 1 : 0,
-        JSON.stringify(l.questions), l.confirmMessage, l.redirectUrl, l.active ? 1 : 0, l.order, l.updatedAt, id]
+        JSON.stringify(l.questions), l.confirmMessage, l.redirectUrl, l.active ? 1 : 0, l.order, l.updatedAt, l.approval, JSON.stringify(l.approvalRules), id]
     );
   }
   async deleteBookingLink(id: string) {
@@ -1048,6 +1058,7 @@ export class SqlRepository implements ContentRepository {
     const args: unknown[] = [];
     if (filter.resourceId) { where.push('resource_id = ?'); args.push(filter.resourceId); }
     if (filter.eventId) { where.push('event_id = ?'); args.push(filter.eventId); }
+    if (filter.email) { where.push('email = ?'); args.push(filter.email.toLowerCase()); }
     if (filter.from !== undefined) { where.push('end_at > ?'); args.push(filter.from); }
     if (filter.to !== undefined) { where.push('start_at < ?'); args.push(filter.to); }
     if (filter.statuses?.length) { where.push(`status IN (${filter.statuses.map(() => '?').join(', ')})`); args.push(...filter.statuses); }
@@ -1614,14 +1625,14 @@ export class SqlRepository implements ContentRepository {
       ...(content.events ?? []).map((e) => ({
         sql: `INSERT INTO events (id, slug, title, body_json, body_html, excerpt, cover, cover_alt, seo_title, seo_desc, status, featured, tags, template,
           starts, ends, all_day, timezone, rrule, exdates, cancelled, location, cta, calendar_ids, fields, source_uid, start_at, end_at,
-          draft, published_at, scheduled_at, created_at, updated_at, rsvp)
-          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+          draft, published_at, scheduled_at, created_at, updated_at, rsvp, room_hold)
+          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
         args: [
           e.id, e.slug, e.title, e.bodyJson, e.bodyHtml, e.excerpt, e.cover, e.coverAlt, e.seoTitle, e.seoDesc, e.status, e.featured ? 1 : 0,
           JSON.stringify(e.tags), e.template, e.start, e.end, e.allDay ? 1 : 0, e.timezone, e.rrule, JSON.stringify(e.exdates),
           e.cancelled ? 1 : 0, JSON.stringify(e.location), JSON.stringify(e.cta), JSON.stringify(e.calendarIds), JSON.stringify(e.fields),
           e.sourceUid, e.startAt, e.endAt, e.draft ? JSON.stringify(e.draft) : null, e.publishedAt, e.scheduledAt, e.createdAt, e.updatedAt,
-          JSON.stringify(e.rsvp ?? {}),
+          JSON.stringify(e.rsvp ?? {}), JSON.stringify(e.roomHold ?? {}),
         ],
       })),
       ...(content.resources ?? []).map((r) => this.resourceInsert(r)),
@@ -1836,6 +1847,7 @@ export class SqlRepository implements ContentRepository {
       ai: JSON.parse(String(r?.ai ?? '{}')),
       live: JSON.parse(String(r?.live ?? '{}')),
       push: JSON.parse(String(r?.push ?? '{}')),
+      calendar: JSON.parse(String(r?.calendar ?? '{}')),
       agent: JSON.parse(String(r?.agent ?? '{}')),
       draftsApiKey: r?.drafts_api_key ?? '',
       draftsAllowedOrigins: JSON.parse(String(r?.drafts_allowed_origins ?? '[]')),
@@ -1852,9 +1864,9 @@ export class SqlRepository implements ContentRepository {
       siteTitle:'site_title', tagline:'tagline', footerText:'footer_text', linksName:'links_name', linksBio:'links_bio', linksAvatar:'links_avatar',
       activeTheme:'active_theme', designOverrides:'design_overrides', sectionPages:'section_pages', siteLogo:'site_logo', siteUrl:'site_url', siteFavicon:'site_favicon', siteCover:'site_cover',
       announcement:'announcement', analytics:'analytics', headCode:'head_code', footerCode:'footer_code', timezone:'timezone', locale:'locale',
-      draftsApiKey:'drafts_api_key', draftsAllowedOrigins:'drafts_allowed_origins', draftDesign:'draft_design', ai:'ai', agent:'agent', live:'live', push:'push',
+      draftsApiKey:'drafts_api_key', draftsAllowedOrigins:'drafts_allowed_origins', draftDesign:'draft_design', ai:'ai', agent:'agent', live:'live', push:'push', calendar:'calendar',
     };
-    const jsonKeys = new Set(['designOverrides','sectionPages','announcement','analytics','draftsAllowedOrigins','draftDesign','ai','agent','live','push']);
+    const jsonKeys = new Set(['designOverrides','sectionPages','announcement','analytics','draftsAllowedOrigins','draftDesign','ai','agent','live','push','calendar']);
     const entries = Object.entries(data).filter(([k,v]) => columns[k] && v !== undefined);
     if (!entries.length) return;
     const design = entries.some(([k]) => ['activeTheme','designOverrides','sectionPages','siteLogo','siteFavicon','siteCover','draftDesign'].includes(k));

package/src/lib/repo/types.ts

@@ -39,7 +39,7 @@ export type EventUpdate = Partial<
     | 'title' | 'slug' | 'bodyJson' | 'bodyHtml' | 'excerpt' | 'cover' | 'coverAlt'
     | 'seoTitle' | 'seoDesc' | 'status' | 'featured' | 'tags' | 'template'
     | 'start' | 'end' | 'allDay' | 'timezone' | 'rrule' | 'exdates' | 'cancelled'
-    | 'location' | 'cta' | 'calendarIds' | 'fields' | 'sourceUid' | 'rsvp' | 'translations'
+    | 'location' | 'cta' | 'calendarIds' | 'fields' | 'sourceUid' | 'rsvp' | 'translations' | 'roomHold'
     | 'publishedAt' | 'scheduledAt'
   >
 >;
@@ -152,7 +152,7 @@ export interface ContentRepository {
   // write that can fail on a race: it inserts atomically only if the held
   // range is still free (resource bookings) or seats remain (RSVPs), and
   // returns null when it lost.
-  listBookings(filter?: { resourceId?: string; eventId?: string; from?: number; to?: number; statuses?: BookingStatus[]; kinds?: Booking['kind'][] }): Promise<Booking[]>;
+  listBookings(filter?: { resourceId?: string; eventId?: string; email?: string; from?: number; to?: number; statuses?: BookingStatus[]; kinds?: Booking['kind'][] }): Promise<Booking[]>;
   getBooking(id: string): Promise<Booking | null>;
   getBookingByToken(token: string): Promise<Booking | null>;
   createBooking(

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 { sendDueReminders } from './booking/service';
+import { decideOverdue, sendDueReminders } from './booking/service';
 import { runPushJobs } from './push/service';
 
 // All work is awaited on both hosts. Traffic-triggered fallbacks do not mark
@@ -14,6 +14,8 @@ export async function runScheduledTasks(repo: ContentRepository, locals?: unknow
     publish: () => repo.publishDuePosts(startedAt),
     webhooks: () => processDueDeliveries(repo),
     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 }),
     email: () => dispatchEmail(repo, locals, 10),
     live: () => syncDueLive(repo, locals),
     // queued first-publish notices, starting-soon reminders, receipts, retention

package/src/lib/schema.ts

@@ -314,6 +314,17 @@ export const EventCta = z.object({
 });
 export type EventCta = z.infer<typeof EventCta>;
 
+export const RoomHold = z.object({
+  resourceIds: z.array(z.string()).default([]),
+  span: z.enum(['event', 'day']).default('event'),
+  before: z.number().int().min(0).max(1440).default(0), // setup minutes
+  after: z.number().int().min(0).max(1440).default(0), // cleanup minutes
+  whileDraft: z.boolean().default(false),
+  // bookings you chose to keep (share the room): no longer flagged as conflicts
+  keep: z.array(z.string()).default([]),
+});
+export type RoomHold = z.infer<typeof RoomHold>;
+
 export const CalEvent = z.object({
   id: z.string(),
   slug: z.string(),
@@ -355,6 +366,10 @@ export const CalEvent = z.object({
     autoConfirm: z.boolean().default(true),
     maxSeats: z.number().int().default(4),
   }).default({}),
+  // rooms/people this event uses: they can't be booked while it happens (or
+  // all day). Computed into availability, never stored as bookings. Drafts
+  // only hold when whileDraft is on; cancelled events never hold.
+  roomHold: RoomHold.default({}),
   startAt: z.number(),
   endAt: z.number(),
   translations: DocTranslations,
@@ -444,6 +459,36 @@ export type BookingQuestion = z.infer<typeof BookingQuestion>;
 export const BookingMode = z.enum(['slots', 'range', 'day']);
 export type BookingMode = z.infer<typeof BookingMode>;
 
+// Booking approval: "auto" confirms at once, "manual" holds every booking for
+// a decision, "rules" confirms unless one of the rules flags it. A link can
+// follow the site default ("default") or pick its own. The deadline decides
+// pending bookings nobody answered (0 hours = keep waiting).
+export const ApprovalMode = z.enum(['auto', 'rules', 'manual']);
+export type ApprovalMode = z.infer<typeof ApprovalMode>;
+export const ApprovalRules = z.object({
+  // 0 = rule off
+  longerThan: z.number().int().min(0).default(0), // minutes
+  firstTime: z.boolean().default(false),
+  moreSeats: z.number().int().min(0).default(0),
+  deadlineHours: z.number().int().min(0).max(24 * 60).default(0),
+  deadlineAction: z.enum(['approve', 'decline']).default('approve'),
+});
+export type ApprovalRules = z.infer<typeof ApprovalRules>;
+
+// Site-wide calendar preferences (Calendar settings → Defaults / Bookings)
+export const CalendarSettings = z.object({
+  // first column of every month grid: 0 = Sunday, 1 = Monday
+  weekStart: z.union([z.literal(0), z.literal(1)]).default(0),
+  // calendar new events land in (quick add, New event); '' = none
+  defaultCalendarId: z.string().default(''),
+  // '' = not chosen in the admin yet → acms({ calendar.bookings.approval }) → auto
+  approval: z.union([ApprovalMode, z.literal('')]).default(''),
+  approvalRules: ApprovalRules.default({}),
+  // show bookings on the Schedule grid
+  showBookings: z.boolean().default(true),
+});
+export type CalendarSettings = z.infer<typeof CalendarSettings>;
+
 export const BookingLink = z.object({
   id: z.string(),
   resourceId: z.string(),
@@ -466,6 +511,9 @@ export const BookingLink = z.object({
   hours: WeeklyHours.nullable().default(null),
   // confirmed at once (and on the calendar) vs. held as pending for approval
   autoConfirm: z.boolean().default(true),
+  // supersedes autoConfirm: 'default' follows Calendar settings → Bookings
+  approval: z.union([ApprovalMode, z.literal('default')]).default('default'),
+  approvalRules: ApprovalRules.default({}),
   visibility: z.enum(['public', 'unlisted']).default('public'),
   askPhone: z.boolean().default(false),
   questions: z.array(BookingQuestion).default([]),
@@ -584,6 +632,7 @@ export function normalizeRedirectPath(input: string): string {
 
 export const Settings = z.object({
   live: LiveConfig.default({}),
+  calendar: CalendarSettings.default({}),
   // push notification automation (lib/push); the feature itself is acms({ mobile: { push } })
   push: PushSettings.default({}),
   siteTitle: z.string().default('My Site'),

package/src/lib/sections.ts

@@ -1,10 +1,12 @@
 import sanitizeHtml from 'sanitize-html';
 import type { z } from 'zod';
 import type { ContentRepository } from './repo/types';
-import type { Settings } from './schema';
+import { authorSlug, type Settings, type User } from './schema';
+import { htmlToPlaintext } from './plaintext';
 import type { SectionInstance as SectionInstanceSchema, SectionDefinition } from '../theme-sdk/contract.mjs';
 import { normalizeData, safeUrl, SOURCE_LIMIT_MAX, isEmptyValue, safeFocus, focusKey } from '../theme-sdk/fields.mjs';
 import type { Theme } from './theme';
+import { themeAssetUrl } from './theme-assets';
 import { CONTENT, collectionUrl } from './content';
 import { formatDate, siteLocale } from './dates';
 import { upcomingEvents } from './calendar/cards';
@@ -33,7 +35,9 @@ export interface EventItem {
   /** "11:00 AM – 1:00 PM EDT" */ time: string; month: string; day: string; weekday: string;
   cta: { label: string; href: string } | null;
 }
-export interface PostItem { title: string; url: string; excerpt: string; image: string; imageAlt: string; date: string; publishedAt: number | null; tags: string[] }
+export interface PostAuthor { name: string; url: string; avatar: string }
+// excerpt: the post's own, else the first ~160 characters of its text
+export interface PostItem { title: string; url: string; excerpt: string; image: string; imageAlt: string; date: string; publishedAt: number | null; tags: string[]; authors: PostAuthor[] }
 export interface BookingItem { title: string; url: string; description: string; resource: string; minutes: number }
 
 /** apply a theme migration when the stored instance is older than the definition */
@@ -103,10 +107,14 @@ function resolveLink(value: unknown, refs: RefMap, lp: Lp = same): LinkValue {
   return { label: String(v.label ?? ''), href, external: /^https?:\/\//i.test(href) };
 }
 
-function resolveScalar(field: FieldDef, value: unknown, refs: RefMap, lp: Lp = same): unknown {
+type Asset = (path: string) => string;
+const noAsset: Asset = () => '';
+function resolveScalar(field: FieldDef, value: unknown, refs: RefMap, lp: Lp = same, asset: Asset = noAsset): unknown {
   switch (field.type) {
     case 'richtext': return sanitizeRichText(String(value ?? ''));
-    case 'url': case 'image': return safeUrl(value);
+    // images may name a file the theme ships: "assets/hero.jpg" → its built URL
+    case 'image': return typeof value === 'string' && /^(\.\/)?assets\//.test(value) ? asset(value) : safeUrl(value);
+    case 'url': return safeUrl(value);
     case 'link': return resolveLink(value, refs, lp);
     default: return value;
   }
@@ -145,9 +153,15 @@ async function resolveSource(field: Extract<FieldDef, { type: 'source' }>, value
     const collection = cfg.collection && CONTENT.collections[cfg.collection] ? cfg.collection : 'posts';
     let posts = await repo.listPublishedPosts(collection);
     if (cfg.tag) posts = posts.filter((p) => p.tags.some((t) => t.toLowerCase() === cfg.tag!.toLowerCase()));
-    return posts.slice(0, limit).map((raw): PostItem => { const p = lang ? localizeDoc(raw, lang) : raw; return {
-      title: p.title, url: lp(collectionUrl(p.collection, p.slug)), excerpt: p.excerpt, image: safeUrl(p.cover), imageAlt: p.coverAlt,
+    const shown = posts.slice(0, limit);
+    // public byline only: name, profile URL, avatar — never emails or roles
+    const users = shown.some((p) => p.authorIds.length || p.authorId) ? new Map((await repo.listUsers()).map((u) => [u.id, u])) : new Map();
+    return shown.map((raw): PostItem => { const p = lang ? localizeDoc(raw, lang) : raw; return {
+      title: p.title, url: lp(collectionUrl(p.collection, p.slug)), excerpt: p.excerpt || autoExcerpt(p.bodyHtml), image: safeUrl(p.cover), imageAlt: p.coverAlt,
       date: formatDate(p.publishedAt, settings, 'short'), publishedAt: p.publishedAt ?? null, tags: p.tags,
+      authors: (raw.authorIds.length ? raw.authorIds : raw.authorId ? [raw.authorId] : [])
+        .map((id) => users.get(id)).filter((u): u is User => Boolean(u))
+        .map((u) => ({ name: u.name, url: lp(`/author/${authorSlug(u)}`), avatar: safeUrl(u.avatar) })),
     }; });
   }
   if (!bookingsEnabled()) return [];
@@ -160,6 +174,15 @@ async function resolveSource(field: Extract<FieldDef, { type: 'source' }>, value
   });
 }
 
+// first ~160 characters of the body, cut at a word, for posts without an excerpt
+export function autoExcerpt(html: string, max = 160): string {
+  const text = htmlToPlaintext(html);
+  if (text.length <= max) return text;
+  const cut = text.slice(0, max + 1);
+  const at = cut.lastIndexOf(' ');
+  return `${(at > max * 0.6 ? cut.slice(0, at) : text.slice(0, max)).replace(/[\s,.;:!?—–-]+$/, '')}…`;
+}
+
 export interface ResolveContext { repo: ContentRepository; settings: Settings; now: number }
 
 /** stored data → component props: defaults filled, refs/sources resolved, richtext sanitized */
@@ -170,6 +193,8 @@ export async function resolveSectionData(def: Definition, stored: Record<string,
   const refMap = refs.size ? await resolveRefs(refs, ctx.repo) : new Map<string, string>();
   const lang = isExtraLocale(ctx.settings.locale) ? ctx.settings.locale : '';
   const lp: Lp = lang ? (p) => localePath(p, lang) : same;
+  // 'ink' = DEFAULT_THEME (importing it would load every theme template)
+  const asset: Asset = (p) => themeAssetUrl(ctx.settings.activeTheme || 'ink', p);
   const out: Record<string, unknown> = {};
   await Promise.all(Object.entries(def.fields).map(async ([key, field]) => {
     const value = data[key];
@@ -178,13 +203,13 @@ export async function resolveSectionData(def: Definition, stored: Record<string,
       out[key] = (value as Record<string, unknown>[]).map((row) => {
         const item: Record<string, unknown> = {};
         for (const [k, sub] of Object.entries(field.fields)) {
-          item[k] = resolveScalar(sub as FieldDef, row[k], refMap, lp);
+          item[k] = resolveScalar(sub as FieldDef, row[k], refMap, lp, asset);
           if (sub.type === 'image') item[`${k}Focus`] = safeFocus(row[focusKey(k)]);
         }
         return item;
       });
     } else {
-      out[key] = resolveScalar(field, value, refMap, lp);
+      out[key] = resolveScalar(field, value, refMap, lp, asset);
       // images also hand over their focal point, ready for object-position
       if (field.type === 'image') out[`${key}Focus`] = safeFocus(stored[focusKey(key)]);
     }

package/src/lib/site-chrome.ts

@@ -0,0 +1,34 @@
+// The `site` prop given to a theme's templates/header.astro and
+// templates/footer.astro. Everything is resolved for the current request:
+// links are already localized, `current` marks the page you're on, languages
+// carry their own names ("Español"), and social links carry inline SVG icons.
+//
+// Core behaviors keep working inside a custom header through data hooks:
+//   [data-search-open]   opens the search dialog (when site.search is set)
+//   [data-scheme-toggle] flips light/dark (when site.schemeToggle is true)
+//   [data-menu-open]     opens the phone menu sheet (built from site.links)
+//   [data-live-header]   (hidden) becomes the "Live" link during a stream
+export interface ChromeLink {
+  label: string;
+  url: string;
+  current: boolean;
+  external: boolean;
+}
+
+export interface SiteChrome {
+  title: string;
+  tagline: string;
+  logo: string; // '' when the site has no logo
+  homeUrl: string;
+  links: ChromeLink[]; // header navigation
+  footerLinks: ChromeLink[];
+  social: (ChromeLink & { icon: string })[]; // icon: inline SVG ('' = text link)
+  readLinks: ChromeLink[]; // collections, search, RSS
+  footerHtml: string; // Settings → footer text, rendered
+  languages: { code: string; label: string; url: string; current: boolean }[]; // [] when single-language
+  search: { url: string; label: string } | null;
+  schemeToggle: boolean;
+  liveHeader: boolean;
+  headerStyle: string; // theme token `header`
+  footerStyle: string; // theme token `footer`
+}

package/src/lib/theme-assets.ts

@@ -0,0 +1,16 @@
+// Files a theme ships under assets/, as built URLs. Kept apart from theme.ts
+// (which loads every .astro template) so section data resolution can use it
+// without pulling the templates in.
+import * as user from 'virtual:acms-user-themes';
+
+const builtin = import.meta.glob(['../themes/*/assets/**/*', '!**/.img-subir-originals/**'], { eager: true, query: '?url', import: 'default' }) as Record<string, string>;
+
+// "assets/hero.jpg" (relative to the theme folder) → the built asset URL, so
+// section image fields and defaults can point at files the theme ships.
+// '' when the theme has no such file. Project themes win over built-ins.
+export function themeAssetUrl(slug: string, path: string): string {
+  const file = path.replace(/^\.\//, '');
+  if (!/^assets\/[^?#]+$/.test(file) || file.includes('..')) return '';
+  const all = { ...builtin, ...((user as { assets?: Record<string, string> }).assets ?? {}) };
+  return Object.entries(all).find(([p]) => p.endsWith(`/themes/${slug}/${file}`))?.[1] ?? '';
+}

package/src/lib/theme.ts

@@ -83,6 +83,10 @@ export interface Theme {
   pageTemplates: Record<string, unknown>;
   // templates/event.astro replaces the built-in event page layout
   EventTemplate: unknown | null;
+  // templates/header.astro / footer.astro replace the site header and footer;
+  // they receive a `site` prop (lib/site-chrome.ts) with links already resolved
+  HeaderTemplate: unknown | null;
+  FooterTemplate: unknown | null;
 }
 
 interface ThemeJson { sections?: Record<string, unknown>; version?: string; name?: string; description?: string; tokens?: Record<string, unknown>; post?: Record<string, unknown> }
@@ -100,6 +104,8 @@ const homes = import.meta.glob('../themes/*/templates/home.astro', { eager: true
 const postTpls = import.meta.glob('../themes/*/templates/post-*.astro', { eager: true }) as Record<string, { default: unknown }>;
 const pageTpls = import.meta.glob('../themes/*/templates/page-*.astro', { eager: true }) as Record<string, { default: unknown }>;
 const eventTpls = import.meta.glob('../themes/*/templates/event.astro', { eager: true }) as Record<string, { default: unknown }>;
+const headerTpls = import.meta.glob('../themes/*/templates/header.astro', { eager: true }) as Record<string, { default: unknown }>;
+const footerTpls = import.meta.glob('../themes/*/templates/footer.astro', { eager: true }) as Record<string, { default: unknown }>;
 const migrationMods = {
   ...(import.meta.glob('../themes/*/migrations/*.mjs', { eager: true }) as Record<string, { default?: unknown }>),
   ...((user as { migrations?: Record<string, { default?: unknown }> }).migrations ?? {}),
@@ -126,7 +132,9 @@ function buildThemes(
   homeMap: Record<string, { default: unknown }>,
   postMap: Record<string, { default: unknown }>,
   pageMap: Record<string, { default: unknown }>,
-  eventMap: Record<string, { default: unknown }> = {}
+  eventMap: Record<string, { default: unknown }> = {},
+  headerMap: Record<string, { default: unknown }> = {},
+  footerMap: Record<string, { default: unknown }> = {}
 ): Theme[] {
   return Object.entries(jsonMap).map(([path, raw]) => {
     const slug = slugOf(path);
@@ -157,18 +165,22 @@ function buildThemes(
       postTemplates: templatesFor(slug, postMap, 'post'),
       pageTemplates: templatesFor(slug, pageMap, 'page'),
       EventTemplate: Object.entries(eventMap).find(([p]) => slugOf(p) === slug)?.[1]?.default ?? null,
+      HeaderTemplate: Object.entries(headerMap).find(([p]) => slugOf(p) === slug)?.[1]?.default ?? null,
+      FooterTemplate: Object.entries(footerMap).find(([p]) => slugOf(p) === slug)?.[1]?.default ?? null,
     };
   });
 }
 
-const builtins = buildThemes(jsons, csses, homes, postTpls, pageTpls, eventTpls);
+const builtins = buildThemes(jsons, csses, homes, postTpls, pageTpls, eventTpls, headerTpls, footerTpls);
 const projectThemes = buildThemes(
   user.jsons as Record<string, ThemeJson>,
   user.csses,
   user.homes,
   user.postTpls,
   user.pageTpls,
-  (user as { eventTpls?: Record<string, { default: unknown }> }).eventTpls ?? {}
+  (user as { eventTpls?: Record<string, { default: unknown }> }).eventTpls ?? {},
+  (user as { headerTpls?: Record<string, { default: unknown }> }).headerTpls ?? {},
+  (user as { footerTpls?: Record<string, { default: unknown }> }).footerTpls ?? {}
 );
 const projectSlugs = new Set(projectThemes.map((t) => t.slug));
 
@@ -176,6 +188,8 @@ const themes: Theme[] = [...builtins.filter((t) => !projectSlugs.has(t.slug)), .
   (a, b) => (a.slug === DEFAULT_THEME ? -1 : b.slug === DEFAULT_THEME ? 1 : a.name.localeCompare(b.name))
 );
 
+export { themeAssetUrl } from './theme-assets';
+
 export function listThemes(): Theme[] {
   return themes;
 }

package/src/middleware.ts

@@ -5,7 +5,7 @@ import { getRepo } from './lib/repo';
 import { CONTENT } from './lib/content';
 import { processDueDeliveries, waitUntilFrom } from './lib/webhooks';
 import { dispatchEmail } from './lib/email/service';
-import { sendDueReminders } from './lib/booking/service';
+import { decideOverdue, sendDueReminders } from './lib/booking/service';
 import { PUSH } from './lib/push/config';
 import { processPushQueue, runPushJobs } from './lib/push/service';
 import { previewParamRedirect, hasPreviewCookie } from './lib/designPreview';
@@ -110,7 +110,11 @@ export const onRequest = defineMiddleware(async (context, next) => {
       if (wait) wait(retries); else await retries;
       // booking reminders (Node has no cron): site URL, else this request's origin
       const reminders = repo.getSettings()
-        .then((s) => sendDueReminders(repo, { origin: s.siteUrl.replace(/\/+$/, '') || context.url.origin, locals: context.locals, now }))
+        .then(async (s) => {
+          const flow = { origin: s.siteUrl.replace(/\/+$/, '') || context.url.origin, locals: context.locals, now };
+          await sendDueReminders(repo, flow);
+          await decideOverdue(repo, flow);
+        })
         .catch(() => {});
       if (wait) wait(reminders); else await reminders;
       // push jobs (Node has no cron): never awaited here, errors are logged