@acms-subir/core 0.3.6 → 0.3.7

package/src/pages/admin/forms/[id]/submissions.astro

@@ -0,0 +1,143 @@
+---
+import Admin from '../../../../layouts/Admin.astro';
+import FormHeader from '../../../../components/forms/FormHeader.astro';
+import { ResponsesTable, type ResponseRow } from '../../../../components/forms/ResponsesTable';
+import { getRepo } from '../../../../lib/repo';
+import { readForm } from '../../../../lib/forms/http';
+import { csv, displayAnswers, formVersion } from '../../../../lib/forms/service';
+import { answerFields, relativeTime, versionLabeler, wideRows } from '../../../../lib/forms/export';
+import type { FormSubmission } from '../../../../lib/forms/schema';
+import '../../../../styles/forms-admin.css';
+
+const repo = await getRepo(Astro.locals);
+const form = await repo.forms.get(Astro.params.id || '');
+if (!form || form.kind !== 'form') return new Response(null, { status: 404 });
+Astro.response.headers.set('Cache-Control', 'private, no-store');
+
+const DAY = 86_400_000;
+const range = (['7', '30'] as const).find(r => r === Astro.url.searchParams.get('range')) ?? '';
+const q = (Astro.url.searchParams.get('q') ?? '').trim().slice(0, 100);
+const since = range ? Date.now() - Number(range) * DAY : undefined;
+const [versions, current] = await Promise.all([repo.forms.versions(form.id), formVersion(form.definition)]);
+const version = versionLabeler(versions, current);
+const download = (rows: FormSubmission[]) => {
+  const slug = form.name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '').slice(0, 60) || 'form';
+  return new Response(csv(wideRows(form.definition.fields, rows, version)), { headers: { 'Content-Type': 'text/csv; charset=utf-8', 'Content-Disposition': `attachment; filename="${slug}-responses.csv"`, 'Cache-Control': 'private, no-store' } });
+};
+
+let error = '';
+if (Astro.request.method === 'POST') {
+  try {
+    const data = await readForm(Astro.request);
+    const op = String(data.get('op') || 'delete');
+    const ids = data.getAll('ids').map(String).filter(Boolean).slice(0, 500);
+    if (op === 'export') return download(await repo.forms.searchSubmissions(form.id, { ids, limit: 500 }));
+    if (op === 'bulkDelete') await repo.forms.deleteSubmissions(form.id, ids);
+    else if (op === 'delete') await repo.forms.deleteSubmission(form.id, String(data.get('id') || ''));
+    else throw new Error('Unknown action.');
+    const n = op === 'bulkDelete' ? ids.length : 1;
+    const back = new URL(Astro.url); back.searchParams.set('notice', `${n} response${n === 1 ? '' : 's'} deleted.`);
+    return Astro.redirect(back.pathname + back.search, 303);
+  } catch (e) { error = e instanceof Error ? e.message : 'Could not update responses.'; }
+}
+
+const page = Math.max(0, Math.floor(Number(Astro.url.searchParams.get('page')) || 0));
+if (Astro.url.searchParams.has('export')) {
+  const rows = await repo.forms.searchSubmissions(form.id, { since, q, limit: 10001 });
+  if (rows.length > 10000) return new Response('Export is limited to 10,000 responses. Use a content backup for the complete archive.', { status: 413 });
+  return download(rows);
+}
+const [rows, stats, settings] = await Promise.all([
+  repo.forms.searchSubmissions(form.id, { since, q, limit: 101, offset: page * 100 }),
+  repo.forms.submissionStats(form.id, Date.now() - 7 * DAY),
+  repo.getSettings(),
+]);
+const tz = settings.timezone || undefined;
+const notice = Astro.url.searchParams.get('notice')?.slice(0, 120) ?? '';
+const columns = answerFields(form.definition.fields).map(f => ({ id: f.id, label: f.label }));
+const currentIds = new Set(columns.map(c => c.id));
+const fmt = (ts: number, o: Intl.DateTimeFormatOptions) => { try { return new Date(ts).toLocaleString('en-US', { ...o, timeZone: tz }); } catch { return new Date(ts).toLocaleString('en-US', o); } };
+const shortWhen = (ts: number) => {
+  const day = (t: number) => fmt(t, { year: 'numeric', month: 'numeric', day: 'numeric' });
+  const time = fmt(ts, { hour: 'numeric', minute: '2-digit' });
+  if (day(ts) === day(Date.now())) return `Today ${time}`;
+  if (day(ts) === day(Date.now() - DAY)) return `Yesterday ${time}`;
+  return fmt(ts, { month: 'short', day: 'numeric', ...(new Date(ts).getFullYear() !== new Date().getFullYear() ? { year: 'numeric' } : {}) });
+};
+// displayAnswers owns per-type formatting; call it on subsets of the snapshot.
+const show = (r: FormSubmission, keep: (id: string) => boolean) => {
+  const fields = answerFields(r.response.definition.fields).filter(f => keep(f.id));
+  return fields.length ? Object.entries(displayAnswers({ ...r.response, definition: { ...r.response.definition, fields } })) : [];
+};
+const data: ResponseRow[] = rows.slice(0, 100).map(r => ({
+  id: r.id,
+  when: shortWhen(r.createdAt),
+  full: fmt(r.createdAt, { weekday: 'short', month: 'short', day: 'numeric', year: 'numeric', hour: 'numeric', minute: '2-digit' }),
+  version: version(r.response.version),
+  cells: columns.map(c => r.response.definition.fields.some(f => f.id === c.id) ? (show(r, id => id === c.id)[0]?.[1] ?? '') : ''),
+  answers: show(r, id => currentIds.has(id)),
+  older: show(r, id => !currentIds.has(id)),
+}));
+const keep = (patch: Record<string, string | null>) => {
+  const u = new URL(Astro.url); u.searchParams.delete('notice');
+  for (const [k, v] of Object.entries(patch)) v === null ? u.searchParams.delete(k) : u.searchParams.set(k, v);
+  return u.pathname + u.search;
+};
+const filtered = !!(q || range);
+---
+<Admin title={`${form.name} · Responses`} section="forms" wide>
+  <FormHeader form={form} active="responses" responses={stats.total}>
+    <a slot="actions" class="btn" href={keep({ export: '1', page: null })} download>Export CSV</a>
+  </FormHeader>
+  {error && <p class="notice warn" role="alert">{error}</p>}
+  {notice && <p class="notice" role="status">{notice}</p>}
+
+  {!stats.total ? (
+    <div class="empty-state">
+      <b>No responses yet</b>
+      <p>{form.status === 'published' ? 'Share the form or add it to a page. New responses show up here.' : 'Publish the form so people can respond.'}</p>
+      <a class="btn primary" href={form.status === 'published' ? `/admin/forms/${form.id}/share` : `/admin/forms/${form.id}`}>{form.status === 'published' ? 'Share form' : 'Open builder'}</a>
+    </div>
+  ) : (
+    <>
+      <div class="kpis fr-kpis">
+        <div class="kpi"><small>Responses</small><b>{stats.total.toLocaleString('en-US')}</b></div>
+        <div class="kpi"><small>Last 7 days</small><b>{stats.recent.toLocaleString('en-US')}</b></div>
+        <div class="kpi"><small>Latest</small><b>{stats.last ? relativeTime(stats.last, Date.now(), tz) : '—'}</b></div>
+        <div class="kpi"><small>Current version</small><b>{version(current)}</b></div>
+      </div>
+
+      <form method="get" class="fr-tools" role="search">
+        <label class="fr-search">
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" aria-hidden="true"><path d="M11 4a7 7 0 1 0 0 14 7 7 0 0 0 0-14zM20 20l-4-4" /></svg>
+          <input type="search" name="q" value={q} placeholder="Search responses" aria-label="Search responses" maxlength="100" />
+        </label>
+        <select name="range" aria-label="Date range" data-autosubmit>
+          <option value="" selected={!range}>All time</option>
+          <option value="7" selected={range === '7'}>Last 7 days</option>
+          <option value="30" selected={range === '30'}>Last 30 days</option>
+        </select>
+        <noscript><button class="btn" type="submit">Apply</button></noscript>
+        {filtered && <a class="btn ghost sm" href={keep({ q: null, range: null, page: null })}>Clear</a>}
+        <span class="fr-count">{filtered ? `${rows.length > 100 ? '100+' : data.length} matching` : `${stats.total.toLocaleString('en-US')} total`}</span>
+      </form>
+
+      {data.length ? (
+        <ResponsesTable client:load columns={columns} rows={data} formName={form.name} />
+      ) : (
+        <p class="fr-none hint">No responses match. <a href={keep({ q: null, range: null, page: null })}>Clear filters</a></p>
+      )}
+      {(page > 0 || rows.length > 100) && (
+        <nav class="fr-pager" aria-label="Pages">
+          {page > 0 ? <a class="btn sm" href={keep({ page: page > 1 ? String(page - 1) : null })}>‹ Newer</a> : <span />}
+          <span class="hint">Page {page + 1}</span>
+          {rows.length > 100 ? <a class="btn sm" href={keep({ page: String(page + 1) })}>Older ›</a> : <span />}
+        </nav>
+      )}
+    </>
+  )}
+</Admin>
+
+<script>
+  document.querySelector<HTMLSelectElement>('[data-autosubmit]')?.addEventListener('change', (e) => (e.target as HTMLSelectElement).form?.requestSubmit());
+</script>

package/src/pages/admin/forms/[id].astro

@@ -0,0 +1,27 @@
+---
+import Admin from '../../../layouts/Admin.astro';
+import FormHeader from '../../../components/forms/FormHeader.astro';
+import FormBuildPage from '../../../components/forms/FormBuildPage';
+import { getRepo } from '../../../lib/repo';
+import '../../../styles/forms.css';
+// Build tab. Edits autosave as a draft through the `forms.save` action;
+// "Publish changes" makes them live. See components/forms/FormBuildPage.tsx.
+const repo = await getRepo(Astro.locals);
+const form = await repo.forms.get(Astro.params.id || '');
+if (!form) return new Response(null, { status: 404 });
+Astro.response.headers.set('Cache-Control', 'private, no-store');
+const responses = form.kind === 'form' && form.purpose === 'general' ? (await repo.forms.submissions(form.id, 1)).length : 0;
+---
+<Admin title={form.name} section="forms" wide>
+  <FormHeader form={form} active="build">
+    <div slot="actions" id="fb-actions" class="fb-actions-slot"></div>
+  </FormHeader>
+  {form.status === 'archived' && <p class="notice warn">This form is archived and doesn’t accept responses. You can still edit it.</p>}
+  <noscript><p class="notice warn">Enable JavaScript to edit this form.</p></noscript>
+  <FormBuildPage
+    client:load
+    form={{ id: form.id, name: form.name, kind: form.kind, purpose: form.purpose, status: form.status, revision: form.revision, hasDraft: Boolean(form.draft) }}
+    definition={form.draft ?? form.definition}
+    responses={responses}
+  />
+</Admin>

package/src/pages/admin/forms/index.astro

@@ -0,0 +1,198 @@
+---
+import Admin from '../../../layouts/Admin.astro';
+import Modal from '../../../components/Modal.astro';
+import { getRepo } from '../../../lib/repo';
+import { FormDefinition, starter, type SavedForm } from '../../../lib/forms/schema';
+import { readForm } from '../../../lib/forms/http';
+import { relativeTime } from '../../../lib/forms/export';
+import '../../../styles/forms-admin.css';
+
+const repo = await getRepo(Astro.locals);
+Astro.response.headers.set('Cache-Control', 'private, no-store');
+const BLANK = { title: '', intro: '', submitLabel: '', confirmation: 'Thank you. Your response has been received.', fields: [] };
+const STARTERS = [
+  { key: 'contact', name: 'Contact', desc: 'Name, email, message', def: starter('contact') },
+  { key: 'interest', name: 'Interest sign-up', desc: 'Name, email', def: starter('interest') },
+  { key: 'blank', name: 'Blank', desc: 'Start empty', def: FormDefinition.parse(BLANK) },
+  { key: 'simple', name: 'Simple RSVP', desc: 'Event template · name, email, seats', def: starter('simple') },
+  { key: 'event', name: 'Event registration', desc: 'Event template · phone, dietary, notes', def: starter('event') },
+];
+let error = '';
+if (Astro.request.method === 'POST') {
+  try {
+    const data = await readForm(Astro.request);
+    const op = String(data.get('op') || 'create');
+    if (op === 'archive' || op === 'restore') {
+      const form = await repo.forms.get(String(data.get('id') || ''));
+      if (!form) throw new Error('Form not found.');
+      if (op === 'archive') await repo.forms.save(form.id, form.revision, form.name, form.draft ?? form.definition, 'archive');
+      else await repo.forms.restore(form.id);
+      return Astro.redirect(op === 'archive' ? '/admin/forms?tab=archived' : `/admin/forms${form.kind === 'template' ? '?tab=templates' : ''}`, 303);
+    }
+    // The gallery posts `pick` = starter:<key> | source:<id>; row menus post `source`.
+    const pick = String(data.get('pick') || '');
+    const sourceId = pick.startsWith('source:') ? pick.slice(7) : String(data.get('source') || '');
+    const source = sourceId ? await repo.forms.get(sourceId) : null;
+    if (sourceId && !source) throw new Error('That template no longer exists.');
+    const key = pick.startsWith('starter:') ? pick.slice(8) : String(data.get('starter') || 'contact');
+    const kind = data.get('kind') === 'template' ? 'template' : 'form';
+    const purpose = source?.purpose ?? (['simple', 'event'].includes(key) ? 'event' : 'general');
+    const definition = source ? (source.draft ?? source.definition) : key === 'blank' ? FormDefinition.parse(BLANK) : starter(key);
+    const created = await repo.forms.create(String(data.get('name') || '').trim() || source?.name || 'Untitled form', definition, purpose === 'event' ? 'template' : kind, purpose);
+    return Astro.redirect(`/admin/forms/${created.id}`, 303);
+  } catch (e) { error = e instanceof Error ? e.message : 'Could not create the form.'; }
+}
+
+const settings = await repo.getSettings();
+const tz = settings.timezone || undefined;
+const [forms, stats] = await Promise.all([repo.forms.list(), repo.forms.stats()]);
+const groups = {
+  forms: forms.filter(f => f.kind === 'form' && f.status !== 'archived'),
+  templates: forms.filter(f => f.kind === 'template' && f.status !== 'archived'),
+  archived: forms.filter(f => f.status === 'archived'),
+};
+const tab = (['templates', 'archived'] as const).find(t => t === Astro.url.searchParams.get('tab')) ?? 'forms';
+const rows = groups[tab];
+const templates = groups.templates;
+const openNew = Astro.url.searchParams.has('new') || (!!error && Astro.request.method === 'POST');
+const status = (f: SavedForm) => f.status === 'archived' ? ['Archived', 'muted'] : f.status === 'published' ? (f.draft ? ['Edited', 'amber'] : ['Published', 'green']) : ['Draft', 'muted'];
+const questions = (f: SavedForm) => { const n = (f.draft ?? f.definition).fields.length; return `${n} question${n === 1 ? '' : 's'}`; };
+const sub = (f: SavedForm) => f.kind === 'template'
+  ? `${f.purpose === 'event' ? 'Event' : 'General'} template · ${questions(f)}`
+  : f.draft ? 'Unpublished changes' : f.status === 'published' ? `/forms/${f.id}` : f.status === 'archived' ? 'Not accepting responses' : `Not published yet · ${questions(f)}`;
+const skeleton = (def: FormDefinition) => def.fields.filter(f => (f.type as string) !== 'heading').slice(0, 3).map(f => f.type === 'textarea' ? 'tall' : f.type === 'checkbox' ? 'check' : 'line');
+const EMPTY = {
+  forms: { title: 'No forms yet', text: 'Start from Contact or Interest sign-up, or a blank form, then publish it and add it to a page.' },
+  templates: { title: 'No templates yet', text: 'Templates are starting points. Event templates appear in Events → Registration. Save any form as a template from its Build tab.' },
+  archived: { title: 'Nothing archived', text: 'Archived forms stop accepting responses. Their responses are kept.' },
+};
+const dots = 'M5 12h.01M12 12h.01M19 12h.01';
+---
+<Admin title="Forms" section="forms">
+  <div class="page-head">
+    <div><h1>Forms</h1><p class="sub">Collect sign-ups, messages and requests. Publish a form, then share its link or add it to a page.</p></div>
+    <div class="page-actions"><a class="btn primary" href="?new=1" data-modal="fl-new" data-fl-open>+ New form</a></div>
+  </div>
+  {error && <p class="notice warn" role="alert">{error}</p>}
+  <nav class="ptabs" aria-label="Forms">
+    <a href="/admin/forms" aria-current={tab === 'forms' ? 'page' : undefined}>Forms<small>{groups.forms.length}</small></a>
+    <a href="/admin/forms?tab=templates" aria-current={tab === 'templates' ? 'page' : undefined}>Templates<small>{groups.templates.length}</small></a>
+    <a href="/admin/forms?tab=archived" aria-current={tab === 'archived' ? 'page' : undefined}>Archived{groups.archived.length > 0 && <small>{groups.archived.length}</small>}</a>
+  </nav>
+
+  {!rows.length ? (
+    <div class="empty-state">
+      <b>{EMPTY[tab].title}</b>
+      <p>{EMPTY[tab].text}</p>
+      {tab !== 'archived' && <a class="btn primary" href="?new=1" data-modal="fl-new" data-fl-open>New form</a>}
+    </div>
+  ) : (
+    <div class="fl" role="table" aria-label={tab === 'templates' ? 'Templates' : 'Forms'}>
+      <div class="fl-head" role="row">
+        <span role="columnheader">Name</span><span role="columnheader">{tab === 'templates' ? 'Use' : 'Status'}</span>
+        <span role="columnheader" class="fl-num">Responses</span><span role="columnheader">Last response</span><span />
+      </div>
+      {rows.map(f => {
+        const [label, tone] = f.kind === 'template' && f.status !== 'archived' ? [f.purpose === 'event' ? 'Event' : 'General', 'muted'] : status(f);
+        const st = stats.get(f.id);
+        const isForm = f.kind === 'form';
+        return (
+          <div class="fl-row" role="row">
+            <a class="fl-main" href={`/admin/forms/${f.id}`} role="cell">
+              <b>{f.name}</b>
+              <small class={f.draft && f.kind === 'form' ? 'is-attn' : ''}>{sub(f)}</small>
+            </a>
+            <span role="cell" class={`fst fst-${tone}`}><i aria-hidden="true" />{label}</span>
+            <span role="cell" class="fl-num fl-meta">{isForm ? (st ? st.count.toLocaleString('en-US') : '0') : '—'}</span>
+            <span role="cell" class="fl-meta">{st?.last ? <time datetime={new Date(st.last).toISOString()} title={new Date(st.last).toLocaleString('en-US', { timeZone: tz })}>{relativeTime(st.last, Date.now(), tz)}</time> : '—'}</span>
+            <details class="rmenu fl-menu" role="cell">
+              <summary class="icon-btn" title="More actions" aria-label={`Actions for ${f.name}`}>
+                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.6" stroke-linecap="round"><path d={dots} /></svg>
+              </summary>
+              <div class="rmenu-pop">
+                <a class="menu-item" href={`/admin/forms/${f.id}`}>Open</a>
+                <form method="post">
+                  <input type="hidden" name="source" value={f.id} />
+                  <input type="hidden" name="name" value={f.kind === 'template' ? f.name.replace(/ template$/i, '').slice(0, 120) : `${f.name.slice(0, 115)} copy`} />
+                  <input type="hidden" name="kind" value="form" />
+                  <button class="menu-item" type="submit">{f.kind === 'template' ? 'Use template' : 'Duplicate'}</button>
+                </form>
+                {isForm && <a class="menu-item" href={`/admin/forms/${f.id}/submissions`}>Responses</a>}
+                {isForm && f.status !== 'archived' && <a class="menu-item" href={`/admin/forms/${f.id}/share`}>Share</a>}
+                <div class="menu-sep" />
+                <form method="post">
+                  <input type="hidden" name="id" value={f.id} />
+                  {f.status === 'archived'
+                    ? <button class="menu-item" name="op" value="restore">Restore as draft</button>
+                    : <button class="menu-item danger" name="op" value="archive">Archive</button>}
+                </form>
+              </div>
+            </details>
+          </div>
+        );
+      })}
+    </div>
+  )}
+
+  <Modal id="fl-new" title="Start a form" open={openNew}>
+    <form method="post" class="fl-new">
+      <input type="hidden" name="op" value="create" />
+      <fieldset class="fl-gallery">
+        <legend class="sr-only">Start with</legend>
+        {STARTERS.slice(0, 3).map((s, i) => (
+          <label class="fl-tile">
+            <input type="radio" name="pick" value={`starter:${s.key}`} checked={i === 0} data-name={s.key === 'blank' ? '' : s.def.title} />
+            <span class={`fl-skel${s.key === 'blank' ? ' is-blank' : ''}`} aria-hidden="true">{s.key === 'blank' ? <em>+</em> : <>{skeleton(s.def).map(k => <i class={k} />)}<u /></>}</span>
+            <b>{s.name}</b><small>{s.desc}</small>
+          </label>
+        ))}
+      </fieldset>
+      <p class="fl-gallery-title">Event templates <small>Used in Events → Registration; responses land in Bookings.</small></p>
+      <fieldset class="fl-gallery">
+        <legend class="sr-only">Event templates</legend>
+        {STARTERS.slice(3).map(s => (
+          <label class="fl-tile">
+            <input type="radio" name="pick" value={`starter:${s.key}`} data-name={`${s.name} template`} />
+            <span class="fl-skel" aria-hidden="true">{(s.key === 'simple' ? ['line', 'line'] : skeleton(s.def)).map(k => <i class={k} />)}<u /></span>
+            <b>{s.name}</b><small>{s.desc}</small>
+          </label>
+        ))}
+        {templates.map(t => (
+          <label class="fl-tile">
+            <input type="radio" name="pick" value={`source:${t.id}`} data-name={t.purpose === 'event' ? `${t.name} copy` : t.name.replace(/ template$/i, '')} />
+            <span class="fl-skel" aria-hidden="true">{skeleton(t.draft ?? t.definition).map(k => <i class={k} />)}<u /></span>
+            <b>{t.name}</b><small>Your {t.purpose === 'event' ? 'event' : ''} template · {questions(t)}</small>
+          </label>
+        ))}
+      </fieldset>
+      <label class="field fl-name"><span>Name</span><input type="text" name="name" required maxlength="120" placeholder="Contact us" autocomplete="off" /></label>
+      <div class="modal-foot">
+        <button class="btn" type="button" data-close>Cancel</button>
+        <button class="btn primary" type="submit">Create form</button>
+      </div>
+    </form>
+  </Modal>
+</Admin>
+
+<script>
+  // Progressive enhancement: the link works without JS (?new=1 renders the
+  // dialog open); with JS it opens in place.
+  document.addEventListener('click', (e) => {
+    const a = e.target instanceof Element ? e.target.closest('a[data-fl-open]') : null;
+    if (a) e.preventDefault();
+    document.querySelectorAll<HTMLDetailsElement>('details.rmenu[open]').forEach((d) => {
+      if (!(e.target instanceof Node && d.contains(e.target))) d.open = false;
+    });
+  });
+  // Suggest a name from the chosen starter until the user types one.
+  const name = document.querySelector<HTMLInputElement>('.fl-new input[name=name]');
+  const suggest = (r: HTMLInputElement | null) => {
+    if (!name || !r || name.dataset.touched) return;
+    name.value = r.dataset.name ?? '';
+  };
+  name?.addEventListener('input', () => { name.dataset.touched = name.value ? '1' : ''; });
+  document.querySelector('.fl-new')?.addEventListener('change', (e) => {
+    if (e.target instanceof HTMLInputElement && e.target.name === 'pick') suggest(e.target);
+  });
+  suggest(document.querySelector<HTMLInputElement>('.fl-new input[name=pick]:checked'));
+</script>

package/src/pages/admin/integrations.astro

@@ -9,6 +9,8 @@ import { issueApiKey } from '../../lib/api-keys';
 import { attemptDelivery, generateWebhookSecret, validateWebhookUrl } from '../../lib/webhooks';
 import { resolveConfig } from '../../lib/email/config';
 import { env } from '../../lib/env';
+import { mapsStatus, MAPS_SETUP } from '../../lib/maps/config';
+import { PROVIDERS } from '../../lib/maps/providers';
 
 // Site-wide integrations. Owners manage keys and webhook subscriptions;
 // calendar-specific feeds and API help appear only when enabled.
@@ -79,6 +81,8 @@ const ago = (ts: number | null) => {
   const s = Math.floor((Date.now() - ts) / 1000);
   return s < 60 ? 'just now' : s < 3600 ? `${Math.floor(s / 60)} min ago` : s < 86400 ? `${Math.floor(s / 3600)} h ago` : `${Math.floor(s / 86400)} d ago`;
 };
+const maps = mapsStatus(Astro.locals);
+const mapsNeeds = maps.provider ? (PROVIDERS[maps.provider].selfHosted ? 'MAPS_URL' : 'MAPS_API_KEY') : '';
 const SCOPE_LABEL: Record<string, string> = {
   'events:read': 'Read events (incl. private calendars)', 'events:write': 'Create and edit events',
   'bookings:read': 'Read bookings and guest details', 'bookings:write': 'Create, confirm and cancel bookings',
@@ -179,6 +183,34 @@ const SCOPE_LABEL: Record<string, string> = {
           <p class="hint">Choose Resend, Mailgun, Amazon SES or Cloudflare in <a href="/admin/email">Email settings</a>. Configure a sender and review delivery activity there.</p>
         ) : <p class="hint">Sending as <code>{emailConfig.config.from}</code>. Guests get confirmations, updates and a reminder the day before.</p>}
       </section>
+      {CALENDAR.enabled && <section class="card card-pad int-maps">
+        <div class="card-head"><b>Maps</b><span class={`int-status ${maps.enabled ? 'ok' : 'bad'}`}>{maps.enabled ? `${maps.label} · Connected` : maps.provider ? `${maps.label} · Not set up` : 'Not set up'}</span></div>
+        {maps.enabled ? (
+          <ul class="int-list">
+            <li><b>Address suggestions</b> while typing an event’s place</li>
+            <li><b>{maps.staticMaps ? 'Map images' : 'No map images'}</b> {maps.staticMaps ? 'on event pages, made once per place' : `— ${maps.label} doesn’t draw maps`}</li>
+          </ul>
+        ) : (
+          <p class="hint">Bring your own maps provider for address suggestions and a map on event pages. Without one, saved places and pasted map links still work.</p>
+        )}
+        {!maps.enabled && maps.provider && <p class="hint">Set <code>{mapsNeeds}</code> in the environment to finish connecting {maps.label}.</p>}
+        <details class="int-log">
+          <summary>{maps.enabled ? 'Change provider' : 'How to set it up'}</summary>
+          <p class="hint">Name the provider in <code>astro.config</code> and put the key in the environment (a Worker secret or your server’s <code>.env</code>). Keys stay on the server.</p>
+          <pre class="int-code">{`acms({ maps: { provider: 'geoapify' } })
+MAPS_API_KEY=…`}</pre>
+          <ul class="int-providers">
+            {MAPS_SETUP.map((p) => <li><b>{PROVIDERS[p.id].label}</b> <code>{p.id}</code> · <code>{p.env}</code>{PROVIDERS[p.id].staticMaps ? '' : ' · suggestions only'}</li>)}
+          </ul>
+          <p class="hint">Self-hosted Photon, Nominatim or Pelias: set <code>MAPS_URL</code> to your server. Don’t use the public nominatim.openstreetmap.org — its rules forbid suggestions-as-you-type.</p>
+        </details>
+        {maps.enabled && (
+          <div class="int-test">
+            <button class="btn sm" type="button" data-maps-test>Test</button>
+            <span class="hint" data-maps-result role="status"></span>
+          </div>
+        )}
+      </section>}
       {CALENDAR.enabled && <section class="card card-pad">
         <div class="card-head"><b>Calendar share links</b></div>
         <p class="hint">The .ics links people paste into Google, Apple or Outlook live in one place.</p>
@@ -218,7 +250,32 @@ const SCOPE_LABEL: Record<string, string> = {
   </Modal>
 </Admin>
 
+<style>
+  .int-maps .card-head { flex-wrap: wrap; gap: 6px 10px; }
+  .int-list { margin: 0 0 10px; padding: 0; list-style: none; display: flex; flex-direction: column; gap: 4px; font-size: 13px; color: var(--text-2); }
+  .int-list li::before { content: ''; display: inline-block; width: 6px; height: 6px; border-radius: 2px; background: var(--green); margin-right: 8px; vertical-align: 2px; }
+  .int-code { margin: 8px 0; padding: 8px 10px; border: 1px solid var(--line); border-radius: 8px; background: var(--bg); font-size: 12px; overflow-x: auto; white-space: pre; }
+  .int-providers { margin: 6px 0 8px; padding: 0; list-style: none; display: flex; flex-direction: column; gap: 3px; font-size: 12.5px; color: var(--text-2); }
+  .int-providers code { font-size: 11.5px; }
+  .int-test { display: flex; align-items: center; gap: 10px; flex-wrap: wrap; margin-top: 10px; }
+  .int-test .hint { min-width: 0; overflow-wrap: anywhere; }
+</style>
+
 <script>
+  import { actions } from 'astro:actions';
+
+  // Maps → Test: one real suggestion request through the configured provider
+  document.querySelector<HTMLButtonElement>('[data-maps-test]')?.addEventListener('click', async (e) => {
+    const b = e.currentTarget as HTMLButtonElement;
+    const out = document.querySelector<HTMLElement>('[data-maps-result]')!;
+    b.disabled = true;
+    out.textContent = 'Searching for “Eiffel Tower”…';
+    const { data, error } = await actions.maps.search({ q: 'Eiffel Tower, Paris' });
+    b.disabled = false;
+    const first = data?.results[0];
+    out.textContent = error ? error.message : first ? `Working — first result: ${[first.name, first.address].filter(Boolean).join(', ')}` : 'The provider answered, but found nothing. Check the key’s permissions.';
+  });
+
   document.addEventListener('click', async (e) => {
     const c = e.target instanceof Element ? e.target.closest<HTMLElement>('[data-confirm]') : null;
     if (c && !confirm(c.dataset.confirm)) { e.preventDefault(); return; }

package/src/pages/api/agent/index.ts

@@ -16,6 +16,6 @@ export const POST: APIRoute = async ({ request, locals, url }) => {
   try {
     const repo = await getRepo(locals);
     const agent = await requireAgent(request, repo);
-    return json(await runAgentTool(repo, await readJson(request), agent.allowPublish, { origin: url.origin, waitUntil: waitUntilFrom(locals) }));
+    return json(await runAgentTool(repo, await readJson(request), agent.allowPublish, { origin: url.origin, waitUntil: waitUntilFrom(locals), locals }));
   } catch (error) { return apiError(error); }
 };

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

@@ -26,6 +26,8 @@ POST /api/calendar/events                (events:write) → creates a DRAFT
        "content": "Markdown…", "excerpt": "…", "location": { "name": "Back lawn", "address": "…", "url": "" },
        "cta": { "label": "Volunteer", "href": "https://…", "style": "primary" },
        "rrule": "FREQ=WEEKLY;BYDAY=TU", "calendars": ["community"], "tags": ["family"], "publish": false }
+     location also takes "lat"/"lng" (a pin: map image + GEO in feeds), "placeId" (a saved place,
+     copied in) and "showMap": false (hide the map image). Unchanged text on PATCH keeps the pin.
 PATCH  /api/calendar/events/<id|slug>    (events:write) same fields; live events stage edits unless "publish": true
 DELETE /api/calendar/events/<id|slug>    (events:write)
 GET  /api/calendar/calendars             → calendars + subscribe feed URLs

package/src/pages/api/calendar/events/[id].ts

@@ -43,7 +43,7 @@ export const PATCH: APIRoute = async ({ request, locals, url, params }) => {
     const e = await find(repo, params.id!);
     if (!e) throw new ApiError(404, 'Event not found.');
     const { publish, ...body } = (await readJson(request)) as Record<string, unknown>;
-    const ctx = { origin: siteOrigin(await repo.getSettings(), url), waitUntil: waitUntilFrom(locals) };
+    const ctx = { origin: siteOrigin(await repo.getSettings(), url), waitUntil: waitUntilFrom(locals), locals };
     if (Object.keys(body).length) await runAgentTool(repo, { tool: 'update_event', arguments: { ...body, id: e.id } }, true, ctx);
     if (publish === true) await runAgentTool(repo, { tool: 'publish_event', arguments: { id: e.id } }, true, ctx);
     return withCors(json(await runAgentTool(repo, { tool: 'get_event', arguments: { id: e.id } }, true, ctx)));

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

@@ -102,7 +102,7 @@ export const POST: APIRoute = async ({ request, locals, url }) => {
     const repo = await getRepo(locals);
     await requireScope(request, repo, 'events:write');
     const { publish, ...body } = (await readJson(request)) as Record<string, unknown>;
-    const ctx = { origin: siteOrigin(await repo.getSettings(), url), waitUntil: waitUntilFrom(locals) };
+    const ctx = { origin: siteOrigin(await repo.getSettings(), url), waitUntil: waitUntilFrom(locals), locals };
     const created = (await runAgentTool(repo, { tool: 'create_event', arguments: body }, true, ctx)) as { id: string };
     if (publish === true) await runAgentTool(repo, { tool: 'publish_event', arguments: { id: created.id } }, true, ctx);
     return withCors(json(await runAgentTool(repo, { tool: 'get_event', arguments: { id: created.id } }, true, ctx), 201));

package/src/pages/api/mcp.ts

@@ -43,7 +43,7 @@ export const POST: APIRoute = async ({ request, locals }) => {
       if (!params.success) return error(-32602, 'Invalid tool parameters');
       if (!agentTools(agent.allowPublish, agent.allowSections).some((t) => t.name === params.data.name)) return error(-32602, 'Unknown or unavailable tool');
       try {
-        const value = await runAgentTool(repo, { tool: params.data.name, arguments: params.data.arguments }, agent.allowPublish, { origin: new URL(request.url).origin, waitUntil: waitUntilFrom(locals) });
+        const value = await runAgentTool(repo, { tool: params.data.name, arguments: params.data.arguments }, agent.allowPublish, { origin: new URL(request.url).origin, waitUntil: waitUntilFrom(locals), locals });
         return result({ content: [{ type: 'text', text: JSON.stringify(value) }], isError: false });
       } catch (cause) {
         const response = await apiError(cause).json() as { error: string };

package/src/pages/book/manage/[token].astro

@@ -1,7 +1,7 @@
 ---
 import Site from '../../../layouts/Site.astro';
 import { getRepo } from '../../../lib/repo';
-import { bookingLinkUrl, bookingsEnabled, eventUrl, resourceUrl } from '../../../lib/calendar/config';
+import { CALENDAR, bookingLinkUrl, bookingsEnabled, eventUrl, resourceUrl } from '../../../lib/calendar/config';
 import { setBookingStatus, BookingError } from '../../../lib/booking/service';
 import { bookingIcs, whenText } from '../../../lib/booking/emails';
 import { resourceZone } from '../../../lib/booking/availability';
@@ -12,10 +12,10 @@ import { waitUntilFrom } from '../../../lib/webhooks';
 // The booker's own page, reached from the confirmation and every email: see
 // the status, add it to a calendar, move it or cancel it. The token in the
 // URL is the only credential — it's long and random, and never listed.
-if (!bookingsEnabled()) return new Response(null, { status: 404 });
+if (!CALENDAR.enabled) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 const booking = await repo.getBookingByToken(Astro.params.token ?? '');
-if (!booking) return new Response(null, { status: 404, statusText: 'Not found' });
+if (!booking || (!bookingsEnabled() && booking.kind !== 'rsvp')) return new Response(null, { status: 404, statusText: 'Not found' });
 const settings = await repo.getSettings();
 const origin = siteOrigin(settings, Astro.url);
 const [resource, link, event] = await Promise.all([
@@ -55,7 +55,7 @@ const heading = current.status === 'cancelled' ? 'Booking cancelled'
   : current.status === 'pending' ? (isNew ? 'Request sent' : 'Waiting for approval')
   : moved ? 'Booking moved' : isNew ? 'You’re booked' : 'Your booking';
 const lede = current.status === 'pending' ? `We’ll email ${current.email} once it’s approved.`
-  : current.status === 'confirmed' ? (link?.confirmMessage || `A confirmation is on its way to ${current.email}.`)
+  : current.status === 'confirmed' ? (current.formResponse?.definition.confirmation || link?.confirmMessage || `A confirmation is on its way to ${current.email}.`)
   : current.status === 'declined' ? 'Sorry — this time couldn’t be confirmed. You’re welcome to pick another.'
   : 'This booking is cancelled.';
 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 })}`;

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

@@ -1,4 +1,10 @@
 ---
+import { ApiError } from '../../lib/api';
+import { starter } from '../../lib/forms/schema';
+import { formVersion } from '../../lib/forms/service';
+import { renderFields, hiddenFields } from '../../lib/forms/render';
+import { readForm, readAnswers, submissionGuard } from '../../lib/forms/http';
+import { submitEventForm, prepareLegacyEventForm } from '../../lib/forms/events';
 import { requestLocale } from '../../lib/i18n';
 import { localizeDoc, isExtraLocale } from '../../lib/translations';
 import Site from '../../layouts/Site.astro';
@@ -14,7 +20,7 @@ import { CALENDAR, eventUrl } from '../../lib/calendar/config';
 import { eventIsPublic, featuredOccurrence } from '../../lib/calendar/events';
 import { eventJsonLd } from '../../lib/calendar/seo';
 import { upcomingEvents } from '../../lib/calendar/cards';
-import { createRsvp, seatsTaken, BookingError } from '../../lib/booking/service';
+import { seatsTaken, BookingError } from '../../lib/booking/service';
 import { manageUrl } from '../../lib/calendar/config';
 import { waitUntilFrom } from '../../lib/webhooks';
 
@@ -40,21 +46,29 @@ if (!occurrence) return new Response(null, { status: 404, statusText: 'Not found
 const origin = siteOrigin(settings, Astro.url);
 // RSVP: "Save my seat" posts back here and lands on the manage page
 let rsvpError = '';
-if (Astro.request.method === 'POST' && event.rsvp.enabled && event.status === 'published') {
-  const form = await Astro.request.formData();
+let formValues: Record<string,string> = {};
+let coreValues = { name: '', email: '', seats: '1' };
+let requestId: string = crypto.randomUUID();
+const definition = event.rsvp.form ?? starter('simple');
+if (event.rsvp.enabled) Astro.response.headers.set('Cache-Control', 'private, no-store');
+if (Astro.request.method === 'POST' && event.rsvp.enabled) {
   try {
-    const b = await createRsvp(repo, {
-      event, start: occurrence.start, end: occurrence.end, seats: Number(form.get('seats')) || 1,
-      booker: { name: String(form.get('name') ?? ''), email: String(form.get('email') ?? '') },
-    }, { origin, locals: Astro.locals, waitUntil: waitUntilFrom(Astro.locals) });
-    return Astro.redirect(`${manageUrl(b.manageToken)}?new=1`);
+    if (!eventIsPublic(event, calMap)) throw new ApiError(404, 'Event not found.');
+    const form = await readForm(Astro.request);
+    await prepareLegacyEventForm(event, occurrence.start, form);
+    requestId = await submissionGuard(repo, form, Astro.clientAddress, `event:${event.id}`);
+    formValues = readAnswers(form, definition);
+    coreValues = { name: String(form.get('name') || '').slice(0,120), email: String(form.get('email') || '').slice(0,200), seats: String(form.get('seats') || '1') };
+    const booking = await submitEventForm(repo, event, occurrence, form, requestId, { origin, locals: Astro.locals, waitUntil: waitUntilFrom(Astro.locals) });
+    return Astro.redirect(`${manageUrl(booking.manageToken)}?new=1`, 303);
   } catch (err) {
-    rsvpError = err instanceof BookingError ? err.message : 'Couldn’t save your RSVP. Please try again.';
+    rsvpError = err instanceof BookingError || err instanceof ApiError ? err.message : 'Couldn’t save your RSVP. Please try again.';
   }
 }
+const formHtml = hiddenFields(await formVersion(definition), requestId) + `<input type="hidden" name="occurrence" value="${occurrence.start}">`;
 const taken = event.rsvp.enabled ? await seatsTaken(repo, event.id, occurrence.start) : 0;
 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, open: occurrence.end > now && !event.cancelled }
+  ? { going: taken, left: event.rsvp.capacity ? Math.max(0, event.rsvp.capacity - taken) : null, maxSeats: event.rsvp.maxSeats, error: rsvpError, formHtml, fieldsHtml: renderFields(definition, formValues, 'event-registration'), values: coreValues, open: occurrence.end > now && !event.cancelled }
   : 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));