@acms-subir/core 0.3.7 → 0.3.8

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @acms-subir/core
 
+## 0.3.8
+
+### Patch Changes
+
+- Read saved email-provider settings on the bookings screen so configured Mailgun and SES connections are recognized. Show actionable Site URL setup warnings separately from provider readiness, report specific booking email preparation errors, and clarify that a successful connection test does not validate email links.
+
+  Allow HTTP email links for explicitly configured localhost and loopback development URLs, preserving the port. Public sites still require HTTPS.
+
+  Offer custom booking lengths with hours and minutes, either as one fixed duration or an editable list of choices. Validate lengths before saving and preserve existing duration settings.
+
 ## 0.3.7
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "publishConfig": {
     "access": "public"
   },

package/src/components/EmailSettings.tsx

@@ -278,6 +278,12 @@ export default function EmailSettings() {
 
   return (
     <div className="ems">
+      {data.linkError && !savedOff && (
+        <p className="notice warn" role="status">
+          {data.linkError} A connection test can succeed before this is set.{' '}
+          <a href="/admin/settings#site">Open site settings</a>
+        </p>
+      )}
       <div className="seg ems-tabs" role="tablist" aria-label="Email settings">
         {TABS.map((t, i) => (
           <button key={t.id} ref={(el) => { tabRefs.current[i] = el; }} type="button" role="tab" id={id(`tab-${t.id}`)}

package/src/components/booking/DurationEditor.astro

@@ -0,0 +1,156 @@
+---
+// Booking lengths as Hours + Minutes. "One length" is a single pair; "Several
+// lengths" is a list of pairs people pick from (add/remove rows, plus a few
+// common presets). Each block carries data-mode so the page can show/disable
+// it with the mode switch. Rows are raw text so a failed save shows what was typed.
+import type { DurationRow } from '../../lib/booking/forms';
+import { describeLength } from '../../lib/booking/availability';
+interface Props { single: DurationRow; singleError?: string; several: DurationRow[]; severalError?: string }
+const { single, singleError = '', several, severalError = '' } = Astro.props;
+const PRESETS = [30, 60, 90, 120, 150, 180, 240];
+const rows = several.length ? several : [{ h: '1', m: '0' }];
+---
+
+<div class="dur" data-mode="slots" data-dur-single>
+  <fieldset aria-describedby={singleError ? 'dur-one-err' : undefined}>
+    <legend>Length</legend>
+    <div class="dur-row">
+      <label class="dur-part"><input type="number" name="durH" min="0" max="24" step="1" inputmode="numeric" value={single.h} aria-invalid={singleError ? 'true' : undefined} /> <span>hours</span></label>
+      <label class="dur-part"><input type="number" name="durM" min="0" max="59" step="1" inputmode="numeric" value={single.m} aria-invalid={singleError ? 'true' : undefined} /> <span>min</span></label>
+    </div>
+    {singleError && <p class="dur-err" id="dur-one-err" role="alert">{singleError}</p>}
+    <div class="dur-presets" role="group" aria-label="Common lengths">
+      {PRESETS.map((n) => <button type="button" class="btn sm" data-preset={n}>{describeLength(n)}</button>)}
+    </div>
+  </fieldset>
+</div>
+
+<div class="dur" data-mode="range" data-dur-several>
+  <fieldset aria-describedby={`dur-many-hint${severalError ? ' dur-many-err' : ''}`}>
+    <legend>Lengths people can pick</legend>
+    <ol class="dur-list" data-dur-list>
+      {rows.map((r, i) => (
+        <li class="dur-item">
+          <div class="dur-row">
+            <label class="dur-part"><input type="number" name="lenH" min="0" max="24" step="1" inputmode="numeric" value={r.h} aria-label={`Length ${i + 1}, hours`} aria-invalid={r.error ? 'true' : undefined} aria-describedby={r.error ? `dur-row-err-${i}` : undefined} /> <span aria-hidden="true">hours</span></label>
+            <label class="dur-part"><input type="number" name="lenM" min="0" max="59" step="1" inputmode="numeric" value={r.m} aria-label={`Length ${i + 1}, minutes`} aria-invalid={r.error ? 'true' : undefined} aria-describedby={r.error ? `dur-row-err-${i}` : undefined} /> <span aria-hidden="true">min</span></label>
+            <button type="button" class="icon-btn" data-dur-remove aria-label={`Remove length ${i + 1}`} title="Remove" disabled={rows.length === 1}>×</button>
+          </div>
+          {r.error && <p class="dur-err" id={`dur-row-err-${i}`}>{r.error}</p>}
+        </li>
+      ))}
+    </ol>
+    <template data-dur-row>
+      <li class="dur-item">
+        <div class="dur-row">
+          <label class="dur-part"><input type="number" name="lenH" min="0" max="24" step="1" inputmode="numeric" /> <span aria-hidden="true">hours</span></label>
+          <label class="dur-part"><input type="number" name="lenM" min="0" max="59" step="1" inputmode="numeric" /> <span aria-hidden="true">min</span></label>
+          <button type="button" class="icon-btn" data-dur-remove title="Remove">×</button>
+        </div>
+      </li>
+    </template>
+    {severalError && <p class="dur-err" id="dur-many-err" role="alert">{severalError}</p>}
+    <div class="dur-presets" role="group" aria-label="Add a common length">
+      <button type="button" class="btn sm" data-dur-add>+ Add a length</button>
+      {PRESETS.map((n) => <button type="button" class="btn sm ghost" data-preset={n}>+ {describeLength(n)}</button>)}
+    </div>
+    <p class="hint" id="dur-many-hint">People pick one of these when they book. Duplicates are merged and the list is sorted when you save.</p>
+  </fieldset>
+</div>
+
+<style>
+  .dur { margin-bottom: 14px; }
+  .dur fieldset { border: 0; padding: 0; margin: 0; min-width: 0; }
+  .dur legend { padding: 0; font-size: 12px; color: var(--muted); margin-bottom: 5px; font-weight: 500; }
+  .dur-row { display: flex; align-items: center; gap: 10px; flex-wrap: wrap; }
+  .dur-part { display: inline-flex; align-items: center; gap: 6px; font-size: 13px; color: var(--muted); }
+  .dur-part input { width: 84px; }
+  .dur [aria-invalid='true'] { border-color: var(--red); }
+  .dur-err { color: var(--red); font-size: 12.5px; margin: 5px 0 0; }
+  .dur-list { list-style: none; margin: 0; padding: 0; display: grid; gap: 8px; }
+  .dur-item .icon-btn:disabled { opacity: 0.35; cursor: default; }
+  .dur-presets { display: flex; flex-wrap: wrap; gap: 6px; margin-top: 10px; }
+  .dur .hint { margin: 8px 0 0; }
+  @media (max-width: 480px) {
+    .dur-part input { width: 72px; }
+  }
+</style>
+
+<script>
+  const minutesOf = (h: string, m: string) => (Number(h) || 0) * 60 + (Number(m) || 0);
+  const clearError = (scope: Element) => {
+    scope.querySelectorAll('[aria-invalid]').forEach((i) => i.removeAttribute('aria-invalid'));
+    scope.querySelectorAll('.dur-err').forEach((p) => p.remove());
+  };
+
+  document.querySelectorAll<HTMLElement>('[data-dur-single]').forEach((root) => {
+    const [h, m] = root.querySelectorAll<HTMLInputElement>('input[type=number]');
+    root.addEventListener('input', () => clearError(root));
+    root.addEventListener('click', (e) => {
+      const b = (e.target as Element).closest<HTMLElement>('[data-preset]');
+      if (!b) return;
+      const n = Number(b.dataset.preset);
+      h.value = String(Math.floor(n / 60));
+      m.value = String(n % 60);
+      clearError(root);
+      h.dispatchEvent(new Event('change', { bubbles: true }));
+    });
+  });
+
+  document.querySelectorAll<HTMLElement>('[data-dur-several]').forEach((root) => {
+    const list = root.querySelector<HTMLOListElement>('[data-dur-list]')!;
+    const tpl = root.querySelector<HTMLTemplateElement>('template[data-dur-row]')!;
+    const addBtn = root.querySelector<HTMLButtonElement>('[data-dur-add]')!;
+    const items = () => [...list.querySelectorAll<HTMLLIElement>(':scope > li')];
+    const parts = (li: Element) => li.querySelectorAll<HTMLInputElement>('input[type=number]');
+    const renumber = () => {
+      const all = items();
+      all.forEach((li, i) => {
+        const [h, m] = parts(li);
+        h.setAttribute('aria-label', `Length ${i + 1}, hours`);
+        m.setAttribute('aria-label', `Length ${i + 1}, minutes`);
+        const x = li.querySelector<HTMLButtonElement>('[data-dur-remove]')!;
+        x.setAttribute('aria-label', `Remove length ${i + 1}`);
+        x.disabled = all.length === 1;
+      });
+    };
+    const add = (n: number) => {
+      const li = tpl.content.firstElementChild!.cloneNode(true) as HTMLLIElement;
+      const [h, m] = parts(li);
+      h.value = String(Math.floor(n / 60));
+      m.value = String(n % 60);
+      list.append(li);
+      renumber();
+      return li;
+    };
+    list.addEventListener('input', (e) => { const li = (e.target as Element).closest('li'); if (li) clearError(li); });
+    root.addEventListener('click', (e) => {
+      const t = e.target as Element;
+      if (t.closest('[data-dur-add]')) {
+        const last = items().at(-1);
+        const prev = last ? minutesOf(parts(last)[0].value, parts(last)[1].value) : 0;
+        // a new row starts an hour past the last one (or at 1 h)
+        add(prev ? Math.min(1440, prev + 60) : 60).querySelector('input')!.focus();
+        return;
+      }
+      const preset = t.closest<HTMLElement>('[data-preset]');
+      if (preset) {
+        const n = Number(preset.dataset.preset);
+        const hit = items().find((li) => minutesOf(parts(li)[0].value, parts(li)[1].value) === n);
+        (hit ?? add(n)).querySelector('input')!.focus();
+        return;
+      }
+      const rm = t.closest<HTMLButtonElement>('[data-dur-remove]');
+      if (rm && !rm.disabled) {
+        const all = items();
+        const i = all.indexOf(rm.closest('li')!);
+        all[i].remove();
+        renumber();
+        const next = items()[Math.min(i, items().length - 1)];
+        (next?.querySelector<HTMLButtonElement>('[data-dur-remove]:not(:disabled)') ?? addBtn).focus();
+        const msg = root.querySelector('#dur-many-err');
+        if (msg && !list.querySelector('[aria-invalid]')) msg.remove();
+      }
+    });
+  });
+</script>

package/src/lib/booking/forms.ts

@@ -71,6 +71,73 @@ export const int = (v: FormDataEntryValue | null, min: number, max: number, fall
   const n = Math.round(Number(v));
   return Number.isFinite(n) ? Math.min(max, Math.max(min, n)) : fallback;
 };
+
+// Booking lengths as Hours + Minutes: `durH`/`durM` for a fixed length, and
+// repeated `lenH`/`lenM` rows for the lengths people choose from. The older
+// `duration` (minutes) and `lengths` (comma-separated decimal hours) fields
+// are still read when the new ones are absent. Rows keep the raw text so a
+// failed save can put back exactly what was typed.
+export const LENGTH_MIN = 5;
+export const LENGTH_MAX = 1440;
+export type DurationRow = { h: string; m: string; error?: string };
+export const durationRow = (minutes: number): DurationRow => ({ h: String(Math.floor(minutes / 60)), m: String(minutes % 60) });
+
+const bounded = (minutes: number): string | undefined =>
+  minutes < LENGTH_MIN ? `Make it at least ${LENGTH_MIN} minutes.` : minutes > LENGTH_MAX ? 'Keep it to 24 hours or less.' : undefined;
+
+export function partsToMinutes(h: string, m: string): { minutes: number } | { error: string } {
+  const hs = h.trim(), ms = m.trim();
+  if (!hs && !ms) return { error: 'Enter a length.' };
+  if (!/^\d{0,4}$/.test(hs) || !/^\d{0,4}$/.test(ms)) return { error: 'Use whole numbers for hours and minutes.' };
+  const minutes = Number(hs || 0) * 60 + Number(ms || 0);
+  const error = bounded(minutes);
+  return error ? { error } : { minutes };
+}
+
+const str = (v: FormDataEntryValue | null | undefined) => (typeof v === 'string' ? v : '');
+
+export function durationFromForm(form: FormData): { minutes: number | null; row: DurationRow; error?: string } {
+  if (!form.has('durH') && !form.has('durM') && form.has('duration')) {
+    const raw = str(form.get('duration')).trim();
+    if (!/^\d{1,5}$/.test(raw)) return { minutes: null, row: { h: '', m: raw }, error: raw ? 'Length must be whole minutes.' : 'Enter a length.' };
+    const error = bounded(Number(raw));
+    return error ? { minutes: null, row: { h: '', m: raw }, error } : { minutes: Number(raw), row: durationRow(Number(raw)) };
+  }
+  const row = { h: str(form.get('durH')), m: str(form.get('durM')) };
+  const r = partsToMinutes(row.h, row.m);
+  return 'error' in r ? { minutes: null, row, error: r.error } : { minutes: r.minutes, row };
+}
+
+export function lengthsFromForm(form: FormData): { minutes: number[]; rows: DurationRow[]; error?: string } {
+  let rows: DurationRow[];
+  const found: number[] = [];
+  if (!form.has('lenH') && !form.has('lenM') && form.has('lengths')) {
+    rows = list(str(form.get('lengths'))).map((x) => {
+      const n = Number(x) * 60;
+      if (!/^\d*\.?\d+$/.test(x) || Math.abs(n - Math.round(n)) > 1e-6) return { h: x, m: '', error: `“${x}” isn’t a length in hours.` };
+      const error = bounded(Math.round(n));
+      if (error) return { h: x, m: '', error };
+      found.push(Math.round(n));
+      return durationRow(Math.round(n));
+    });
+  } else {
+    const hs = form.getAll('lenH').map(str), ms = form.getAll('lenM').map(str);
+    rows = Array.from({ length: Math.max(hs.length, ms.length) }, (_, i) => {
+      const row: DurationRow = { h: hs[i] ?? '', m: ms[i] ?? '' };
+      const r = partsToMinutes(row.h, row.m);
+      if ('error' in r) return { ...row, error: r.error };
+      found.push(r.minutes);
+      return row;
+    });
+  }
+  const minutes = [...new Set(found)].sort((a, b) => a - b);
+  const bad = rows.filter((r) => r.error).length;
+  const error = !rows.length ? 'Add at least one length.'
+    : bad ? (bad === 1 ? 'One length needs fixing.' : `${bad} lengths need fixing.`)
+    : undefined;
+  return error ? { minutes: [], rows, error } : { minutes, rows };
+}
+
 export const DEFAULT_HOURS: WeeklyHours = {
   su: [], mo: [{ start: '09:00', end: '17:00' }], tu: [{ start: '09:00', end: '17:00' }], we: [{ start: '09:00', end: '17:00' }],
   th: [{ start: '09:00', end: '17:00' }], fr: [{ start: '09:00', end: '17:00' }], sa: [],

package/src/lib/email/readiness.ts

@@ -0,0 +1,14 @@
+import { encryptionAvailable } from './config';
+import { canonicalOrigin } from './templates';
+import type { ResolvedConfig } from './types';
+
+// Transport readiness and readiness for messages containing links are separate:
+// a successful connection test does not validate the canonical site address.
+export function emailReadiness(resolved: ResolvedConfig, siteUrl: string, locals?: unknown) {
+  const encrypted = encryptionAvailable(locals);
+  const error = resolved.error || (!encrypted ? 'Configure EMAIL_ENCRYPTION_KEY for protected email delivery.' : '');
+  const configured = !error && resolved.provider !== 'none' && resolved.config.enabled;
+  let linkError = '';
+  try { canonicalOrigin(siteUrl); } catch (e) { linkError = (e as Error).message; }
+  return { configured, error, encryptionAvailable: encrypted, linksReady: configured && !linkError, linkError };
+}

package/src/lib/email/service.ts

@@ -1,7 +1,7 @@
 import type { ContentRepository } from '../repo/types';
 import { resolveConfig, decrypt, encrypt, runtimeValue } from './config';
 import { sendWithProvider } from './providers';
-import { accountMail, canonicalOrigin } from './templates';
+import { accountMail, canonicalOrigin, EmailLinkError } from './templates';
 import { bookingMail } from '../booking/service';
 import type { EmailJob, Mail } from './types';
 
@@ -33,6 +33,7 @@ export async function dispatchEmail(repo: ContentRepository, locals?: unknown, l
   for (let i=0;i<limit;i++) {
     const j = await repo.email.claim(); if (!j) break;
     let handedToProvider = false;
+    let preparationError = 'Unable to prepare email. Check the message details and Email settings.';
     try {
       let config = await repo.email.config(j.configVersion || undefined);
       const resolved = resolveConfig(config, locals);
@@ -40,6 +41,9 @@ export async function dispatchEmail(repo: ContentRepository, locals?: unknown, l
       if (!current.config.enabled || current.config.provider === 'none') {
         await repo.email.finish(j,{state:'cancelled',error:'Email is disabled.'}); continue;
       }
+      if (resolved.error) {
+        await repo.email.finish(j,{state:'failed',error:resolved.error}); continue;
+      }
       if (j.fingerprint && j.fingerprint !== resolved.fingerprint) {
         await repo.email.finish(j,{state:'failed',error:'Provider configuration changed. Restore the original environment credentials before retrying this job.'}); continue;
       }
@@ -56,6 +60,7 @@ export async function dispatchEmail(repo: ContentRepository, locals?: unknown, l
       // Retries must reuse exactly the same request body, including calendar
       // timestamps, for Resend's idempotency key to remain valid. Encrypt the
       // snapshot because account and booking links are bearer credentials.
+      preparationError = 'Unable to protect email content. Check EMAIL_ENCRYPTION_KEY and retain any older keys needed for retries.';
       const frozen = j.rendered ? decrypt<Mail>(j.rendered,`job:${j.id}`,locals) : mail;
       if (!await repo.email.prepare(j,j.rendered || encrypt(frozen,`job:${j.id}`,locals))) continue;
       handedToProvider = true;
@@ -64,8 +69,8 @@ export async function dispatchEmail(repo: ContentRepository, locals?: unknown, l
       // Purge the recoverable raw account token once the provider accepted it.
       // The verifier hash remains so the recipient can redeem the link.
       if (result.state === 'accepted') processed++;
-    } catch {
-      await repo.email.finish(j,{state:handedToProvider?'unknown':'failed',error:handedToProvider?'Provider handoff could not be recorded. Review delivery before retrying.':'Unable to prepare email. Check canonical site URL and encryption configuration.'});
+    } catch (error) {
+      await repo.email.finish(j,{state:handedToProvider?'unknown':'failed',error:handedToProvider?'Provider handoff could not be recorded. Review delivery before retrying.':error instanceof EmailLinkError ? error.message : preparationError});
     }
   }
   await repo.email.reconcile();

package/src/lib/email/templates.ts

@@ -11,8 +11,14 @@ export function accountMail(kind: 'invite'|'reset'|'welcome'|'password-changed'|
   return { to, subject: `${copy[0]} · ${site}`, text: [copy[0], '', copy[1], ...(url ? ['',`${copy[2]}: ${url}`] : [])].join('\n'),
     html: `<!doctype html><html><body style="margin:0;background:#f6f5f2;color:#24211c;font:16px/1.6 system-ui,sans-serif"><div style="max-width:520px;margin:auto;padding:32px 24px"><p style="color:#7d776e">${escape(site)}</p><h1 style="font-size:24px">${escape(copy[0])}</h1><p>${escape(copy[1])}</p>${url ? `<p><a style="display:inline-block;background:#ee5d20;color:#fff;padding:10px 18px;border-radius:8px;text-decoration:none" href="${escape(url)}">${escape(copy[2])}</a></p>` : ''}</div></body></html>` };
 }
+export class EmailLinkError extends Error {}
 export function canonicalOrigin(value: string): string {
-  let url: URL; try { url = new URL(value); } catch { throw new Error('Set the canonical site URL in Settings before sending email links.'); }
-  if (url.protocol !== 'https:' || url.username || url.password || url.search || url.hash || url.pathname !== '/') throw new Error('The canonical site URL must be an HTTPS origin, without a path, credentials or query.');
+  const raw = value.trim();
+  if (!raw) throw new EmailLinkError('Set Site URL in Settings → General before sending booking or account emails. Use HTTPS for public sites, or HTTP for localhost development.');
+  // Match the site settings form's support for a bare domain, while retaining
+  // the stricter origin checks needed for links containing bearer tokens.
+  let url: URL; try { url = new URL(raw.includes('://') ? raw : `https://${raw}`); } catch { throw new EmailLinkError('Set a valid Site URL in Settings → General before sending booking or account emails.'); }
+  const loopback = url.hostname === 'localhost' || url.hostname.endsWith('.localhost') || url.hostname === '[::1]' || /^127\.(?:\d{1,3}\.){2}\d{1,3}$/.test(url.hostname);
+  if ((url.protocol !== 'https:' && !(url.protocol === 'http:' && loopback)) || url.username || url.password || url.search || url.hash || url.pathname !== '/') throw new EmailLinkError('Site URL in Settings → General must use HTTPS (HTTP is allowed for localhost), without a path, credentials or query.');
   return url.origin;
 }

package/src/lib/email/types.ts

@@ -25,6 +25,7 @@ export interface Invitation { id: string; email: string; name: string; role: Rol
 export interface PublicEmailSettings {
   version: number; config: EmailConfig; provider: Provider | 'none'; configured: boolean; error: string;
   encryptionAvailable: boolean; environmentLocked: boolean; credentialFields: string[];
+  linksReady: boolean; linkError: string;
   activity: Omit<EmailJob, 'payload' | 'lease' | 'fingerprint' | 'rendered'>[]; heartbeat: number | null;
 }
 export const DEFAULT_EMAIL_CONFIG: EmailConfig = {

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

@@ -11,7 +11,8 @@ import { CALENDAR, bookingsEnabled, eventUrl } from '../../../lib/calendar/confi
 import { createBlock, createResourceBooking, rescheduleBooking, setBookingStatus, BookingError } from '../../../lib/booking/service';
 import { addDaysYmd, localMidnight, ymd } from '../../../lib/booking/availability';
 import { fmt } from '../../../lib/booking/view';
-import { emailProvider } from '../../../lib/email';
+import { resolveConfig } from '../../../lib/email/config';
+import { emailReadiness } from '../../../lib/email/readiness';
 import { siteOrigin } from '../../../lib/seo';
 import { waitUntilFrom } from '../../../lib/webhooks';
 
@@ -54,7 +55,7 @@ if (Astro.request.method === 'POST') {
       const b = await repo.getBooking(id);
       if (!b) throw new BookingError(404, 'Booking not found.');
       await setBookingStatus(repo, b, String(form.get('to')) as BookingStatus, flow, String(form.get('message') || '') || undefined);
-      return Astro.redirect(keep({ notice: form.get('to') === 'confirmed' ? 'Confirmed — it’s on the calendar and the guest was emailed.' : 'Updated.' }));
+      return Astro.redirect(keep({ notice: form.get('to') === 'confirmed' ? 'Confirmed — it’s on the calendar. Check Email → Activity for notification status.' : 'Updated.' }));
     }
     if (op === 'notes') {
       await repo.updateBooking(id, { notes: String(form.get('notes') || '').slice(0, 4000) });
@@ -70,7 +71,7 @@ if (Astro.request.method === 'POST') {
       const start = toMs(String(form.get('date')), String(form.get('time')));
       if (Number.isNaN(start)) throw new BookingError(400, 'Pick a date and time.');
       await rescheduleBooking(repo, b, start, start + (b.end - b.start), { ...flow, skipRules: true });
-      return Astro.redirect(keep({ notice: 'Moved, and the guest was emailed.' }));
+      return Astro.redirect(keep({ notice: 'Moved. Check Email → Activity for notification status.' }));
     }
     if (op === 'block') {
       const r = resById.get(String(form.get('resourceId')));
@@ -174,7 +175,12 @@ const pos = (b: Booking) => {
 };
 
 const selected = Astro.url.searchParams.get('b') ? await repo.getBooking(Astro.url.searchParams.get('b')!) : null;
-const provider = emailProvider(Astro.locals);
+const emailConfig = resolveConfig(await repo.email.config(), Astro.locals);
+const emailStatus = emailReadiness(emailConfig, settings.siteUrl, Astro.locals);
+const emailNotice = !emailConfig.config.enabled || emailConfig.config.provider === 'none'
+  ? '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 whenOf = (b: Booking) => (b.end - b.start >= 86_400_000 - 3_600_000 && ymd(b.start, tz) !== ymd(b.end - 1, tz)
@@ -196,7 +202,7 @@ const activeLinks = links.filter((l) => l.active && resById.has(l.resourceId));
   {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>}
   {error && <p class="notice warn" role="alert">{error}</p>}
-  {provider === 'none' && <p class="notice"><span>Emails are off — set <code>EMAIL_FROM</code> plus <code>RESEND_API_KEY</code> (or a Cloudflare <code>send_email</code> binding named EMAIL) so guests get confirmations and reminders.</span></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>}
 
   {resources.length === 0 && !all.length ? (
     <div class="empty-state">

package/src/pages/admin/calendar/resources/link.astro

@@ -1,10 +1,11 @@
 ---
 import Admin from '../../../../layouts/Admin.astro';
 import HoursEditor from '../../../../components/booking/HoursEditor.astro';
+import DurationEditor from '../../../../components/booking/DurationEditor.astro';
 import { getRepo } from '../../../../lib/repo';
-import { slugify, QUESTION_TYPES, type BookingMode } from '../../../../lib/schema';
+import { slugify, QUESTION_TYPES, type BookingLink, type BookingMode } from '../../../../lib/schema';
 import { bookingLinkUrl, bookingsEnabled } from '../../../../lib/calendar/config';
-import { hoursFromForm, int, list, questionsFromForm } from '../../../../lib/booking/forms';
+import { durationFromForm, durationRow, hoursFromForm, int, lengthsFromForm, questionsFromForm } from '../../../../lib/booking/forms';
 import { describeLink } from '../../../../lib/booking/availability';
 import { siteOrigin } from '../../../../lib/seo';
 import { APPROVAL_LABEL, linkApproval, siteApproval } from '../../../../lib/booking/approval';
@@ -21,6 +22,13 @@ if (!resource || !link || link.resourceId !== resource.id) return new Response(n
 const settings = await repo.getSettings();
 const origin = siteOrigin(settings, Astro.url);
 let notice = '';
+let failed = false;
+// what the form shows: the saved link, or the submitted values after a failed save
+let view: BookingLink = link;
+let single = durationRow(link.duration);
+let singleError = '';
+let several = (link.lengths.length ? link.lengths : [link.duration]).map(durationRow);
+let severalError = '';
 
 if (Astro.request.method === 'POST') {
   const form = await Astro.request.formData();
@@ -35,7 +43,22 @@ if (Astro.request.method === 'POST') {
   let slug = base;
   for (let n = 2; ; n++) { const hit = await repo.getBookingLinkBySlug(resource.id, slug); if (!hit || hit.id === link.id) break; slug = `${base}-${n}`; }
   const mode = (['slots', 'range', 'day'] as const).find((m) => m === form.get('mode')) ?? 'slots';
-  const lengths = list(String(form.get('lengths') || '')).map((x) => Math.round(Number(x) * 60)).filter((n) => n >= 15 && n <= 1440);
+  // only the active mode's length is read; the other keeps its saved value
+  // (hidden mode inputs are disabled, so they aren't submitted)
+  let duration = link.duration;
+  let lengths = link.lengths;
+  if (mode === 'slots') {
+    const d = durationFromForm(form);
+    single = d.row;
+    singleError = d.error ?? '';
+    if (d.minutes !== null) duration = d.minutes;
+  } else if (mode === 'range') {
+    const l = lengthsFromForm(form);
+    several = l.rows;
+    severalError = l.error ?? '';
+    if (!l.error) lengths = l.minutes;
+  }
+  const minDays = int(form.get('minDays'), 1, 60, link.minDays);
   const approval = (['default', 'auto', 'rules', 'manual'] as const).find((m) => m === form.get('approval')) ?? 'default';
   const approvalRules = ApprovalRules.parse({
     longerThan: form.has('ruleLonger') ? int(form.get('longerThanHours'), 1, 24 * 60, 4) * 60 : 0,
@@ -44,14 +67,14 @@ if (Astro.request.method === 'POST') {
     deadlineHours: form.has('deadline') ? int(form.get('deadlineHours'), 1, 24 * 60, 48) : 0,
     deadlineAction: form.get('deadlineAction') === 'decline' ? 'decline' : 'approve',
   });
-  await repo.updateBookingLink(link.id, {
+  const patch: Partial<BookingLink> = {
     name, slug, mode: mode as BookingMode,
     description: String(form.get('description') || '').slice(0, 1000),
-    duration: int(form.get('duration'), 5, 1440, 60),
+    duration,
     lengths,
-    minDays: int(form.get('minDays'), 1, 60, 1),
-    maxDays: Math.max(int(form.get('minDays'), 1, 60, 1), int(form.get('maxDays'), 1, 60, 1)),
-    step: int(form.get('step'), 5, 240, 30),
+    minDays,
+    maxDays: Math.max(minDays, int(form.get('maxDays'), 1, 60, link.maxDays)),
+    step: int(form.get('step'), 5, 240, link.step),
     bufferBefore: int(form.get('bufferBefore'), 0, 480, 0),
     bufferAfter: int(form.get('bufferAfter'), 0, 480, 0),
     minNotice: int(form.get('minNoticeH'), 0, 24 * 60, 2) * 60,
@@ -67,17 +90,28 @@ if (Astro.request.method === 'POST') {
     confirmMessage: String(form.get('confirmMessage') || '').slice(0, 1000),
     redirectUrl: /^https?:\/\//.test(String(form.get('redirectUrl') || '')) ? String(form.get('redirectUrl')) : '',
     active: Boolean(form.get('active')),
-  });
-  link = (await repo.getBookingLink(link.id))!;
-  notice = 'Saved.';
+  };
+  if (singleError || severalError) {
+    // nothing saved: show everything as submitted, with the length errors inline
+    view = { ...link, ...patch };
+    failed = true;
+    notice = 'Not saved — fix the booking length below.';
+    Astro.response.status = 422;
+  } else {
+    await repo.updateBookingLink(link.id, patch);
+    link = view = (await repo.getBookingLink(link.id))!;
+    single = durationRow(link.duration);
+    several = (link.lengths.length ? link.lengths : [link.duration]).map(durationRow);
+    notice = 'Saved.';
+  }
 }
 const publicUrl = origin + bookingLinkUrl(resource.slug, link.slug);
 const embed = `<iframe src="${origin}/embed/book/${resource.slug}/${link.slug}" style="width:100%;height:620px;border:0" title="${link.name}"></iframe>`;
-const qRows = [...link.questions, ...Array.from({ length: 2 }, () => ({ id: '', label: '', type: 'text' as const, required: false, options: [] as string[], help: '' }))];
-const hours = (link.hours ?? resource.hours);
+const qRows = [...view.questions, ...Array.from({ length: 2 }, () => ({ id: '', label: '', type: 'text' as const, required: false, options: [] as string[], help: '' }))];
+const hours = (view.hours ?? resource.hours);
 const site = siteApproval(settings);
-const own = link.approval === 'default' ? site.rules : link.approvalRules;
-const effective = linkApproval(link, settings).mode;
+const own = view.approval === 'default' ? site.rules : view.approvalRules;
+const effective = linkApproval(view, settings).mode;
 ---
 
 <Admin title={link.name} section="calendar:bookings">
@@ -92,7 +126,7 @@ const effective = linkApproval(link, settings).mode;
       <button class="btn primary" type="submit" form="link-form">Save</button>
     </div>
   </div>
-  {notice && <p class="notice" role="status">{notice}</p>}
+  {notice && (failed ? <p class="notice warn" role="alert">{notice}</p> : <p class="notice" role="status">{notice}</p>)}
 
   <form method="post" id="link-form" class="res-grid">
     <input type="hidden" name="op" value="save" />
@@ -100,22 +134,22 @@ const effective = linkApproval(link, settings).mode;
       <section class="card card-pad appr" data-approval>
         <div class="card-head"><b>Approval</b><span class="hint">What happens when someone books this link</span></div>
         <div class="appr-choices" role="radiogroup" aria-label="Approval">
-          <label class="appr-choice"><input type="radio" name="approval" value="default" checked={link.approval === 'default'} />
+          <label class="appr-choice"><input type="radio" name="approval" value="default" checked={view.approval ==='default'} />
             <span><b>Use the site setting</b><small>Currently: {APPROVAL_LABEL[site.mode]}. <a href="/admin/calendar/settings#bookings">Change it</a></small></span></label>
-          <label class="appr-choice"><input type="radio" name="approval" value="auto" checked={link.approval === 'auto'} />
+          <label class="appr-choice"><input type="radio" name="approval" value="auto" checked={view.approval ==='auto'} />
             <span><b>{APPROVAL_LABEL.auto}</b><small>Booked means confirmed. It shows on your Schedule right away.</small></span></label>
-          <label class="appr-choice"><input type="radio" name="approval" value="rules" checked={link.approval === 'rules'} />
+          <label class="appr-choice"><input type="radio" name="approval" value="rules" checked={view.approval ==='rules'} />
             <span><b>{APPROVAL_LABEL.rules}</b><small>Confirm most bookings at once; hold unusual ones for you.</small></span></label>
-          <label class="appr-choice"><input type="radio" name="approval" value="manual" checked={link.approval === 'manual'} />
+          <label class="appr-choice"><input type="radio" name="approval" value="manual" checked={view.approval ==='manual'} />
             <span><b>{APPROVAL_LABEL.manual}</b><small>Every booking waits under Needs approval.</small></span></label>
         </div>
-        <fieldset class="appr-rules" data-rules hidden={link.approval !== 'rules'}>
+        <fieldset class="appr-rules" data-rules hidden={view.approval !== 'rules'}>
           <legend>Ask me first when a booking is…</legend>
           <label class="appr-check"><input type="checkbox" name="ruleLonger" checked={own.longerThan > 0} /> longer than <input type="number" name="longerThanHours" min="1" max="1440" value={own.longerThan ? Math.round(own.longerThan / 60) : 4} /> hours</label>
           <label class="appr-check"><input type="checkbox" name="ruleFirst" checked={own.firstTime} /> the first booking from that email address</label>
           <label class="appr-check"><input type="checkbox" name="ruleSeats" checked={own.moreSeats > 0} /> for more than <input type="number" name="moreSeats" min="1" max="100000" value={own.moreSeats || 20} /> people</label>
         </fieldset>
-        <div class="appr-deadline" data-deadline hidden={link.approval === 'default' || link.approval === 'auto'}>
+        <div class="appr-deadline" data-deadline hidden={view.approval === 'default' || view.approval === 'auto'}>
           <label class="appr-check"><input type="checkbox" name="deadline" checked={own.deadlineHours > 0} /> If I haven’t answered in <input type="number" name="deadlineHours" min="1" max="1440" value={own.deadlineHours || 48} /> hours,</label>
           <select name="deadlineAction" aria-label="What happens then">
             <option value="approve" selected={own.deadlineAction === 'approve'}>approve it</option>
@@ -127,39 +161,43 @@ const effective = linkApproval(link, settings).mode;
 
       <section class="card card-pad">
         <div class="card-head"><b>How people book</b></div>
-        <div class="seg block mode-seg" role="radiogroup">
-          {[['slots', 'Fixed length'], ['range', 'Choose a length'], ['day', 'Whole days']].map(([v, l]) => (
-            <label class={link.mode === v ? 'on' : ''}><input type="radio" name="mode" value={v} checked={link.mode === v} /> {l}</label>
+        <div class="seg block mode-seg" role="radiogroup" aria-label="How people book">
+          {[['slots', 'One length'], ['range', 'Several lengths'], ['day', 'Whole days']].map(([v, l]) => (
+            <label class={view.mode === v ? 'on' : ''}><input type="radio" name="mode" value={v} checked={view.mode === v} /> {l}</label>
           ))}
         </div>
-        <div class="field-row three mode-fields">
-          <label class="field" data-mode="slots"><span>Length (minutes)</span><input type="number" name="duration" min="5" max="1440" value={link.duration} /></label>
-          <label class="field" data-mode="range"><span>Lengths offered (hours)</span><input type="text" name="lengths" value={link.lengths.map((n) => n / 60).join(', ')} placeholder="4, 5, 6, 8" /></label>
-          <label class="field" data-mode="day"><span>Min days</span><input type="number" name="minDays" min="1" max="60" value={link.minDays} /></label>
-          <label class="field" data-mode="day"><span>Max days</span><input type="number" name="maxDays" min="1" max="60" value={link.maxDays} /></label>
-          <label class="field" data-mode="slots range"><span>Start every (minutes)</span><input type="number" name="step" min="5" max="240" value={link.step} /></label>
+        <div class="mode-fields">
+          <p class="hint mode-help" data-mode="slots">Every booking is the same length.</p>
+          <p class="hint mode-help" data-mode="range">People choose one of the lengths you offer.</p>
+          <p class="hint mode-help" data-mode="day">People book one or more whole days.</p>
+          <DurationEditor single={single} singleError={singleError} several={several} severalError={severalError} />
+          <div class="field-row three">
+            <label class="field" data-mode="day"><span>Min days</span><input type="number" name="minDays" min="1" max="60" value={view.minDays} /></label>
+            <label class="field" data-mode="day"><span>Max days</span><input type="number" name="maxDays" min="1" max="60" value={view.maxDays} /></label>
+            <label class="field" data-mode="slots range"><span>Start every (minutes)</span><input type="number" name="step" min="5" max="240" value={view.step} /></label>
+          </div>
         </div>
         <div class="field-row three">
-          <label class="field"><span>Setup before (min)</span><input type="number" name="bufferBefore" min="0" max="480" value={link.bufferBefore} /></label>
-          <label class="field"><span>Cleanup after (min)</span><input type="number" name="bufferAfter" min="0" max="480" value={link.bufferAfter} /></label>
-          <label class="field"><span>Max per day <em class="hint">0 = no limit</em></span><input type="number" name="perDayCap" min="0" max="100" value={link.perDayCap} /></label>
-          <label class="field"><span>Book at least (hours ahead)</span><input type="number" name="minNoticeH" min="0" max="1440" value={Math.round(link.minNotice / 60)} /></label>
-          <label class="field"><span>Book up to (days ahead)</span><input type="number" name="maxAdvance" min="1" max="730" value={link.maxAdvance} /></label>
+          <label class="field"><span>Setup before (min)</span><input type="number" name="bufferBefore" min="0" max="480" value={view.bufferBefore} /></label>
+          <label class="field"><span>Cleanup after (min)</span><input type="number" name="bufferAfter" min="0" max="480" value={view.bufferAfter} /></label>
+          <label class="field"><span>Max per day <em class="hint">0 = no limit</em></span><input type="number" name="perDayCap" min="0" max="100" value={view.perDayCap} /></label>
+          <label class="field"><span>Book at least (hours ahead)</span><input type="number" name="minNoticeH" min="0" max="1440" value={Math.round(view.minNotice / 60)} /></label>
+          <label class="field"><span>Book up to (days ahead)</span><input type="number" name="maxAdvance" min="1" max="730" value={view.maxAdvance} /></label>
         </div>
       </section>
 
       <section class="card card-pad">
         <div class="card-head"><b>Hours for this link</b></div>
-        <label class="check-row"><input type="checkbox" name="customHours" checked={Boolean(link.hours)} data-toggle="lh-box" /> Narrow the {resource.name.toLowerCase()} hours for this link</label>
-        <div id="lh-box" hidden={!link.hours}>
+        <label class="check-row"><input type="checkbox" name="customHours" checked={Boolean(view.hours)} data-toggle="lh-box" /> Narrow the {resource.name.toLowerCase()} hours for this link</label>
+        <div id="lh-box" hidden={!view.hours}>
           <HoursEditor hours={hours} prefix="lh" bounds={resource.hours} note={`Green = this link, grey = when ${resource.name} is open. The link can only narrow those hours.`} />
         </div>
-        {!link.hours && <p class="hint">Uses {resource.name}’s open hours.</p>}
+        {!view.hours && <p class="hint">Uses {resource.name}’s open hours.</p>}
       </section>
 
       <section class="card card-pad">
         <div class="card-head"><b>Questions</b><span class="hint">Name and email are always asked</span></div>
-        <label class="check-row"><input type="checkbox" name="askPhone" checked={link.askPhone} /> Ask for a phone number</label>
+        <label class="check-row"><input type="checkbox" name="askPhone" checked={view.askPhone} /> Ask for a phone number</label>
         <div class="q-list">
           {qRows.map((q, i) => (
             <div class={`q-row${q.label ? '' : ' is-blank'}`}>
@@ -178,22 +216,22 @@ const effective = linkApproval(link, settings).mode;
     <div class="res-side">
       <section class="card card-pad">
         <div class="card-head"><b>Link</b></div>
-        <label class="field"><span>Name</span><input type="text" name="name" value={link.name} required /></label>
-        <label class="field"><span>URL name</span><input type="text" class="mono" name="slug" value={link.slug} /></label>
-        <label class="field"><span>Description</span><textarea name="description" rows="3" placeholder="What this booking is for">{link.description}</textarea></label>
+        <label class="field"><span>Name</span><input type="text" name="name" value={view.name} required /></label>
+        <label class="field"><span>URL name</span><input type="text" class="mono" name="slug" value={view.slug} /></label>
+        <label class="field"><span>Description</span><textarea name="description" rows="3" placeholder="What this booking is for">{view.description}</textarea></label>
         <label class="field">
           <span>Who can find it</span>
           <select name="visibility">
-            <option value="public" selected={link.visibility === 'public'}>Listed on the {resource.name} page</option>
-            <option value="unlisted" selected={link.visibility === 'unlisted'}>Unlisted — share the link directly</option>
+            <option value="public" selected={view.visibility === 'public'}>Listed on the {resource.name} page</option>
+            <option value="unlisted" selected={view.visibility === 'unlisted'}>Unlisted — share the link directly</option>
           </select>
         </label>
-        <label class="check-row"><input type="checkbox" name="active" checked={link.active} /> Taking bookings</label>
+        <label class="check-row"><input type="checkbox" name="active" checked={view.active} /> Taking bookings</label>
       </section>
       <section class="card card-pad">
         <div class="card-head"><b>After booking</b></div>
-        <label class="field"><span>Confirmation message</span><textarea name="confirmMessage" rows="3" placeholder="Shown on the confirmation page and in the email">{link.confirmMessage}</textarea></label>
-        <label class="field"><span>Redirect to <em class="hint">optional</em></span><input type="text" class="mono" name="redirectUrl" value={link.redirectUrl} placeholder="https://…" /></label>
+        <label class="field"><span>Confirmation message</span><textarea name="confirmMessage" rows="3" placeholder="Shown on the confirmation page and in the email">{view.confirmMessage}</textarea></label>
+        <label class="field"><span>Redirect to <em class="hint">optional</em></span><input type="text" class="mono" name="redirectUrl" value={view.redirectUrl} placeholder="https://…" /></label>
       </section>
       <section class="card card-pad">
         <div class="card-head"><b>Share</b></div>
@@ -206,12 +244,20 @@ const effective = linkApproval(link, settings).mode;
   </form>
 </Admin>
 
+<style>
+  .mode-help { margin: -6px 4px 12px; }
+</style>
+
 <script>
   const form = document.getElementById('link-form') as HTMLFormElement;
   const sync = () => {
     const mode = (form.querySelector<HTMLInputElement>('input[name=mode]:checked')?.value) ?? 'slots';
     form.querySelectorAll<HTMLElement>('.mode-seg label').forEach((l) => l.classList.toggle('on', l.querySelector('input')?.checked ?? false));
-    form.querySelectorAll<HTMLElement>('.mode-fields [data-mode]').forEach((el) => { el.hidden = !(el.dataset.mode ?? '').split(' ').includes(mode); });
+    form.querySelectorAll<HTMLElement>('.mode-fields [data-mode]').forEach((el) => {
+      el.hidden = !(el.dataset.mode ?? '').split(' ').includes(mode);
+      // hidden modes don't submit (or block submit with their own min/max)
+      el.querySelectorAll<HTMLInputElement>('input, select, textarea').forEach((i) => (i.disabled = el.hidden));
+    });
     const appr = (form.querySelector<HTMLInputElement>('input[name=approval]:checked')?.value) ?? 'default';
     const rules = form.querySelector<HTMLElement>('[data-rules]');
     const deadline = form.querySelector<HTMLElement>('[data-deadline]');

package/src/pages/admin/settings.astro

@@ -288,7 +288,7 @@ const groups = [
           <label class="field">
             <span>Site URL</span>
             <input type="text" name="siteUrl" value={settings.siteUrl} placeholder="https://example.com" inputmode="url" />
-            <small class="hint">Builds canonical URLs, the sitemap, RSS and social previews. Empty = whatever address the site is served from.</small>
+            <small class="hint">Use your public HTTPS address, or HTTP on localhost for development. Required for booking and account email links; also used for canonical URLs, the sitemap, RSS and social previews. When empty, only website links fall back to the serving address.</small>
           </label>
           <label class="field">
             <span>Footer</span>

package/src/pages/api/email/settings.ts

@@ -6,6 +6,7 @@ import { validateSession, SESSION_COOKIE } from '../../../lib/auth';
 import { reauthenticate } from '../../../lib/email/accounts';
 import { decrypt, encrypt, encryptionAvailable, resolveConfig, runtimeValue } from '../../../lib/email/config';
 import { dispatchEmail } from '../../../lib/email/service';
+import { emailReadiness } from '../../../lib/email/readiness';
 import type { ContentRepository } from '../../../lib/repo/types';
 import type { Credentials, PublicEmailSettings } from '../../../lib/email/types';
 const Config = z.object({provider:z.enum(['auto','none','resend','mailgun','ses','cloudflare']),source:z.enum(['env','encrypted']),from:z.string().trim().max(320),replyTo:z.string().trim().max(320),domain:z.string().trim().max(253),region:z.string().trim().max(40),configurationSet:z.string().trim().max(200),snsTopicArn:z.string().trim().max(300),enabled:z.boolean(),reminders:z.boolean(),staffNotifications:z.boolean()}).strict();
@@ -17,7 +18,7 @@ const Input = z.discriminatedUnion('action',[
 ]);
 export async function publicSettings(repo:ContentRepository,locals?:unknown):Promise<PublicEmailSettings> {
   const record=await repo.email.config(),c=resolveConfig(record,locals);
-  return {version:c.version,config:c.config,provider:c.provider,configured:!c.error&&c.provider!=='none'&&c.config.enabled&&encryptionAvailable(locals),error:c.error||(!encryptionAvailable(locals)?'Configure EMAIL_ENCRYPTION_KEY for protected email delivery.':''),encryptionAvailable:encryptionAvailable(locals),environmentLocked:!!runtimeValue('EMAIL_PROVIDER',locals),credentialFields:Object.entries(c.credentials).filter(([,v])=>!!v).map(([k])=>k),activity:(await repo.email.list()).map(({payload,lease,fingerprint,rendered,...safe})=>safe),heartbeat:await repo.email.heartbeat()};
+  return {version:c.version,config:c.config,provider:c.provider,...emailReadiness(c,(await repo.getSettings()).siteUrl,locals),environmentLocked:!!runtimeValue('EMAIL_PROVIDER',locals),credentialFields:Object.entries(c.credentials).filter(([,v])=>!!v).map(([k])=>k),activity:(await repo.email.list()).map(({payload,lease,fingerprint,rendered,...safe})=>safe),heartbeat:await repo.email.heartbeat()};
 }
 export const GET:APIRoute=async({request,cookies,locals})=>{
   try{const repo=await getRepo(locals);await requireSession(request,cookies,repo,true);return json(await publicSettings(repo,locals));}catch(e){return apiError(e);}
@@ -56,6 +57,7 @@ export const POST:APIRoute=async({request,cookies,locals})=>{
     await repo.email.enqueue({id,dedupe:`test:${id}`,kind:'test',recipient:input.to,payload:'{}',configVersion:c.version,expiresAt:Date.now()+3600000});
     await dispatchEmail(repo,locals,5);
     const job=await repo.email.get(id);
-    return json({message:job?.state==='accepted'?'Test accepted by the provider. Delivery has not yet been confirmed.':`Test status: ${job?.state || 'queued'}. ${job?.error||''}`});
+    const readiness=emailReadiness(c,(await repo.getSettings()).siteUrl,locals);
+    return json({message:job?.state==='accepted'?`Test accepted by the provider. Delivery has not yet been confirmed.${readiness.linkError ? ` Booking and account emails still need setup: ${readiness.linkError}` : ''}`:`Test status: ${job?.state || 'queued'}. ${job?.error||''}`});
   }catch(e){return apiError(e);}
 };