@acms-subir/core 0.1.0 → 0.2.0

package/src/lib/dynamicBlocks.ts

@@ -14,8 +14,9 @@ import { renderCalendarBlock } from './calendar/render';
 //        data-layout="grid" data-limit="3" data-show-image="1" data-show-excerpt="1"></div>
 //   <div data-dyn="calendar" data-sources="[…ics urls]" data-view="month"
 //        data-title="…" data-subtitle="…" data-limit="6" data-open-link="1"></div>
+//   <div data-dyn="toc" data-title="In this article"></div>
 
-const PLACEHOLDER = /<div[^>]*data-dyn="(?:post-list|calendar)"[^>]*>\s*<\/div>/g;
+const PLACEHOLDER = /<div[^>]*data-dyn="(?:post-list|calendar|toc)"[^>]*>\s*<\/div>/g;
 
 const esc = (s: string) =>
   s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
@@ -51,6 +52,41 @@ function renderList(posts: Post[], layout: string, showImage: boolean, showExcer
   return `<section class="dyn-postlist" data-layout="${esc(layout)}">${items}</section>`;
 }
 
+// Heading anchors: body h1–h3 get stable slugified ids so sections are
+// deep-linkable and the TOC block has targets. Headings that already carry an
+// id (e.g. hand-written in an HTML card) are left alone.
+export function stampHeadingAnchors(html: string): string {
+  const seen = new Map<string, number>();
+  return html.replace(/<h([1-3])(\s[^>]*)?>([\s\S]*?)<\/h\1>/g, (m, lvl: string, attrs: string | undefined, inner: string) => {
+    if (attrs && /\bid=/.test(attrs)) return m;
+    const text = inner.replace(/<[^>]+>/g, '').replace(/&amp;/g, '&').replace(/&#0?39;|&apos;/g, "'");
+    const base = slugify(text);
+    const n = (seen.get(base) ?? 0) + 1;
+    seen.set(base, n);
+    const id = n > 1 ? `${base}-${n}` : base;
+    return `<h${lvl}${attrs ?? ''} id="${id}">${inner}</h${lvl}>`;
+  });
+}
+
+// Table of contents: rebuilt from the body's (already anchored) headings on
+// every request, so it can never go stale. Depth is relative to the shallowest
+// heading present.
+function renderToc(html: string, title: string): string {
+  const items: { level: number; id: string; text: string }[] = [];
+  const re = /<h([1-3])[^>]*\bid="([^"]+)"[^>]*>([\s\S]*?)<\/h\1>/g;
+  let m: RegExpExecArray | null;
+  while ((m = re.exec(html))) {
+    const text = m[3].replace(/<[^>]+>/g, '').trim();
+    if (text) items.push({ level: Number(m[1]), id: m[2], text });
+  }
+  if (!items.length) return '';
+  const min = Math.min(...items.map((i) => i.level));
+  const links = items
+    .map((i) => `<a class="pc-toc-link" data-depth="${i.level - min}" href="#${esc(i.id)}">${i.text}</a>`)
+    .join('');
+  return `<nav class="pc-toc">${title ? `<span class="pc-toc-title">${esc(title)}</span>` : ''}${links}</nav>`;
+}
+
 function calendarAttrs(tag: string) {
   let sources: string[] = [];
   try {
@@ -71,9 +107,11 @@ function calendarAttrs(tag: string) {
 }
 
 export async function expandDynamicBlocks(html: string, repo: ContentRepository): Promise<string> {
+  html = stampHeadingAnchors(html);
   const hasPostList = html.includes('data-dyn="post-list"');
   const hasCalendar = html.includes('data-dyn="calendar"');
-  if (!hasPostList && !hasCalendar) return html;
+  const hasToc = html.includes('data-dyn="toc"');
+  if (!hasPostList && !hasCalendar && !hasToc) return html;
   const [posts, settings] = await Promise.all([
     hasPostList ? repo.listPublishedPosts() : Promise.resolve([] as Post[]), // newest first; shared by all blocks on the page
     repo.getSettings(),
@@ -83,15 +121,17 @@ export async function expandDynamicBlocks(html: string, repo: ContentRepository)
   // rendered up front, then spliced in during the synchronous pass.
   const calendarHtml = new Map<string, string>();
   if (hasCalendar) {
-    const tags = [...new Set((html.match(PLACEHOLDER) ?? []).filter((t) => t.includes('data-dyn="calendar"')))];
+    const tags = [...new Set((html.match(PLACEHOLDER) ?? ([] as string[])).filter((t) => t.includes('data-dyn="calendar"')))];
     const now = Date.now();
     await Promise.all(
       tags.map(async (tag) => calendarHtml.set(tag, await renderCalendarBlock(calendarAttrs(tag), settings, now)))
     );
   }
 
+  const anchored = html;
   return html.replace(PLACEHOLDER, (tag) => {
     if (tag.includes('data-dyn="calendar"')) return calendarHtml.get(tag) ?? '';
+    if (tag.includes('data-dyn="toc"')) return renderToc(anchored, attr(tag, 'title'));
     const source = attr(tag, 'source') || 'latest';
     const tagName = attr(tag, 'tag');
     // which collection the block draws from; 'posts' unless the card says otherwise

package/src/lib/repo/migrations.ts

@@ -241,6 +241,43 @@ export const MIGRATIONS: Migration[] = [
       )`,
     ],
   },
+  {
+    // Manual publish: live (published/scheduled) documents stage their edits
+    // in a `draft` JSON snapshot; the live columns only change when the user
+    // hits Update. NULL = no pending edits.
+    version: 22,
+    statements: [
+      `ALTER TABLE posts ADD COLUMN draft TEXT`,
+      `ALTER TABLE pages ADD COLUMN draft TEXT`,
+    ],
+  },
+  {
+    // Manual publish for the Design screen: theme/token/logo changes stage in
+    // a `draft_design` JSON snapshot (previewed with ?designPreview=1) until
+    // the user hits Publish design. NULL = no staged design.
+    version: 23,
+    statements: [`ALTER TABLE settings ADD COLUMN draft_design TEXT`],
+  },
+  {
+    // Snippets: named, reusable fragments of editor content ("Save as
+    // snippet" on a selection; re-inserted from the "/" menu).
+    version: 24,
+    statements: [
+      `CREATE TABLE IF NOT EXISTS snippets (
+        id TEXT PRIMARY KEY,
+        name TEXT NOT NULL,
+        content_json TEXT NOT NULL,
+        created_at INTEGER NOT NULL
+      )`,
+    ],
+  },
+  {
+    // Analytics providers (Umami, Meta Pixel, TikTok Pixel): structured
+    // per-provider settings rendered into the public <head>. JSON object,
+    // '{}' = every provider disabled (schema defaults).
+    version: 25,
+    statements: [`ALTER TABLE settings ADD COLUMN analytics TEXT DEFAULT '{}'`],
+  },
 ];
 
 export const LATEST_VERSION = MIGRATIONS[MIGRATIONS.length - 1].version;

package/src/lib/repo/sql.ts

@@ -1,5 +1,6 @@
 import type { ContentRepository, SearchResults, Stats } from './types';
-import { Page, Post, Link, Media, NavItem, Redirect, Settings, Tag, User, isInternalTag, normalizeRedirectPath, publicTags, slugify, type WidgetInstance } from '../schema';
+import { Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, isInternalTag, normalizeRedirectPath, publicTags, slugify, type WidgetInstance } from '../schema';
+import { pickDesignDraft, pickPageDraft, pickPostDraft } from '../drafts';
 import { MIGRATIONS, MIGRATIONS_TABLE } from './migrations';
 import { htmlToPlaintext } from '../plaintext';
 import { SEED } from '../brand';
@@ -24,6 +25,17 @@ export interface SqlDriver {
   batch(stmts: SqlStatement[]): Promise<void>;
 }
 
+// a corrupt snapshot must never make the whole row unreadable
+function parseDraft(raw: unknown): Record<string, unknown> | null {
+  if (!raw) return null;
+  try {
+    const d = JSON.parse(String(raw));
+    return d && typeof d === 'object' && !Array.isArray(d) ? d : null;
+  } catch {
+    return null;
+  }
+}
+
 function rowToPage(r: Row): Page {
   return Page.parse({
     id: r.id, slug: r.slug, title: r.title, status: r.status,
@@ -31,7 +43,7 @@ function rowToPage(r: Row): Page {
     blocks: JSON.parse(String(r.blocks ?? '[]')),
     bodyJson: r.body_json ?? '', bodyHtml: r.body_html ?? '',
     seoTitle: r.seo_title ?? '', seoDesc: r.seo_desc ?? '',
-    template: r.template ?? '',
+    template: r.template ?? '', draft: parseDraft(r.draft),
     createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
   });
 }
@@ -43,12 +55,17 @@ function rowToPost(r: Row, authorIds?: string[]): Post {
     seoTitle: r.seo_title ?? '', seoDesc: r.seo_desc ?? '', status: r.status,
     featured: Boolean(r.featured), authorId: r.author_id ?? null,
     authorIds: authorIds ?? (r.author_id ? [String(r.author_id)] : []),
-    template: r.template ?? '',
+    template: r.template ?? '', draft: parseDraft(r.draft),
     publishedAt: r.published_at === null ? null : Number(r.published_at),
     scheduledAt: r.scheduled_at === null ? null : Number(r.scheduled_at),
     createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
   });
 }
+function rowToSnippet(r: Row): Snippet {
+  return Snippet.parse({
+    id: r.id, name: r.name, contentJson: r.content_json ?? '[]', createdAt: Number(r.created_at),
+  });
+}
 function rowToTag(r: Row): Tag {
   return Tag.parse({ id: r.id, name: r.name, slug: r.slug, description: r.description ?? '' });
 }
@@ -258,7 +275,9 @@ export class SqlRepository implements ContentRepository {
   }
   async updatePage(id: string, data: Parameters<ContentRepository['updatePage']>[1]) {
     await this.ready;
-    const sets: string[] = ['updated_at = ?'];
+    // a direct live write supersedes any staged edits (applyPageDraft routes
+    // through here too, so applying clears the snapshot in the same UPDATE)
+    const sets: string[] = ['updated_at = ?', 'draft = NULL'];
     const args: unknown[] = [Date.now()];
     if (data.title !== undefined) { sets.push('title = ?'); args.push(data.title); }
     if (data.slug !== undefined) { sets.push('slug = ?'); args.push(data.slug); }
@@ -286,6 +305,29 @@ export class SqlRepository implements ContentRepository {
     await this.driver.run(`UPDATE pages SET ${sets.join(', ')} WHERE id = ?`, args);
     await this.syncPageIndex(id);
   }
+  // stage edits on a live page: only the `draft` JSON changes — live columns,
+  // updated_at (public auto-nav order) and the search index stay untouched
+  async savePageDraft(id: string, data: Parameters<ContentRepository['savePageDraft']>[1]) {
+    await this.ready;
+    const r = await this.first('SELECT draft FROM pages WHERE id = ?', [id]);
+    if (!r) return;
+    const merged: Record<string, unknown> = parseDraft(r.draft) ?? {};
+    for (const [k, v] of Object.entries(data)) if (v !== undefined) merged[k] = v;
+    merged.savedAt = Date.now();
+    await this.driver.run('UPDATE pages SET draft = ? WHERE id = ?', [JSON.stringify(merged), id]);
+  }
+  async applyPageDraft(id: string) {
+    await this.ready;
+    const r = await this.first('SELECT draft FROM pages WHERE id = ?', [id]);
+    const draft = parseDraft(r?.draft);
+    if (!draft) return;
+    // updatePage handles is_home displacement, FTS sync and clears the draft
+    await this.updatePage(id, pickPageDraft(draft));
+  }
+  async discardPageDraft(id: string) {
+    await this.ready;
+    await this.driver.run('UPDATE pages SET draft = NULL WHERE id = ?', [id]);
+  }
   async deletePage(id: string) {
     await this.ready;
     await this.driver.batch([
@@ -356,7 +398,9 @@ export class SqlRepository implements ContentRepository {
     await this.ready;
     const current = await this.getPost(id);
     if (!current) return;
-    const sets: string[] = ['updated_at = ?'];
+    // a direct live write supersedes any staged edits (applyPostDraft routes
+    // through here too, so applying clears the snapshot in the same UPDATE)
+    const sets: string[] = ['updated_at = ?', 'draft = NULL'];
     const args: unknown[] = [Date.now()];
     if (data.title !== undefined) { sets.push('title = ?'); args.push(data.title); }
     if (data.slug !== undefined) { sets.push('slug = ?'); args.push(data.slug); }
@@ -404,6 +448,29 @@ export class SqlRepository implements ContentRepository {
     }
     await this.syncPostIndex(id);
   }
+  // stage edits on a live post: only the `draft` JSON changes — live columns,
+  // author joins and the search index stay untouched until Update
+  async savePostDraft(id: string, data: Parameters<ContentRepository['savePostDraft']>[1]) {
+    await this.ready;
+    const r = await this.first('SELECT draft FROM posts WHERE id = ?', [id]);
+    if (!r) return;
+    const merged: Record<string, unknown> = parseDraft(r.draft) ?? {};
+    for (const [k, v] of Object.entries(data)) if (v !== undefined) merged[k] = v;
+    merged.savedAt = Date.now();
+    await this.driver.run('UPDATE posts SET draft = ? WHERE id = ?', [JSON.stringify(merged), id]);
+  }
+  async applyPostDraft(id: string) {
+    await this.ready;
+    const r = await this.first('SELECT draft FROM posts WHERE id = ?', [id]);
+    const draft = parseDraft(r?.draft);
+    if (!draft) return;
+    // updatePost handles author joins, FTS sync and clears the draft
+    await this.updatePost(id, pickPostDraft(draft));
+  }
+  async discardPostDraft(id: string) {
+    await this.ready;
+    await this.driver.run('UPDATE posts SET draft = NULL WHERE id = ?', [id]);
+  }
   async deletePost(id: string) {
     await this.ready;
     await this.driver.batch([
@@ -564,6 +631,26 @@ export class SqlRepository implements ContentRepository {
     }
   }
 
+  // ---- snippets ----
+  async listSnippets() {
+    await this.ready;
+    const rows = await this.driver.all('SELECT * FROM snippets ORDER BY name COLLATE NOCASE ASC');
+    return rows.map(rowToSnippet);
+  }
+  async createSnippet({ name, contentJson }: { name: string; contentJson: string }) {
+    await this.ready;
+    const id = crypto.randomUUID();
+    await this.driver.run('INSERT INTO snippets (id, name, content_json, created_at) VALUES (?, ?, ?, ?)', [
+      id, name, contentJson, Date.now(),
+    ]);
+    const r = await this.first('SELECT * FROM snippets WHERE id = ?', [id]);
+    return rowToSnippet(r!);
+  }
+  async deleteSnippet(id: string) {
+    await this.ready;
+    await this.driver.run('DELETE FROM snippets WHERE id = ?', [id]);
+  }
+
   // ---- users ----
   async listUsers() {
     await this.ready;
@@ -728,14 +815,14 @@ export class SqlRepository implements ContentRepository {
       // p.locale defaults to '' via the zod schema, so pre-v20 backups
       // restore cleanly as default-locale pages
       ...content.pages.map((p) => ({
-        sql: 'INSERT INTO pages (id, slug, title, status, is_home, locale, blocks, body_json, body_html, seo_title, seo_desc, template, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
-        args: [p.id, p.slug, p.title, p.status, p.isHome ? 1 : 0, p.locale, JSON.stringify(p.blocks), p.bodyJson, p.bodyHtml, p.seoTitle, p.seoDesc, p.template, p.createdAt, p.updatedAt],
+        sql: 'INSERT INTO pages (id, slug, title, status, is_home, locale, blocks, body_json, body_html, seo_title, seo_desc, template, draft, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+        args: [p.id, p.slug, p.title, p.status, p.isHome ? 1 : 0, p.locale, JSON.stringify(p.blocks), p.bodyJson, p.bodyHtml, p.seoTitle, p.seoDesc, p.template, p.draft ? JSON.stringify(p.draft) : null, p.createdAt, p.updatedAt],
       })),
       // p.collection defaults to 'posts' via the zod schema, so pre-v19
       // backups restore cleanly into the built-in collection
       ...content.posts.map((p) => ({
-        sql: 'INSERT INTO posts (id, collection, slug, title, body, body_json, body_html, excerpt, tags, cover, cover_alt, seo_title, seo_desc, status, featured, author_id, template, published_at, scheduled_at, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
-        args: [p.id, p.collection, p.slug, p.title, p.body, p.bodyJson, p.bodyHtml, p.excerpt, JSON.stringify(p.tags), p.cover, p.coverAlt, p.seoTitle, p.seoDesc, p.status, p.featured ? 1 : 0, p.authorIds[0] ?? p.authorId, p.template, p.publishedAt, p.scheduledAt, p.createdAt, p.updatedAt],
+        sql: 'INSERT INTO posts (id, collection, slug, title, body, body_json, body_html, excerpt, tags, cover, cover_alt, seo_title, seo_desc, status, featured, author_id, template, draft, published_at, scheduled_at, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+        args: [p.id, p.collection, p.slug, p.title, p.body, p.bodyJson, p.bodyHtml, p.excerpt, JSON.stringify(p.tags), p.cover, p.coverAlt, p.seoTitle, p.seoDesc, p.status, p.featured ? 1 : 0, p.authorIds[0] ?? p.authorId, p.template, p.draft ? JSON.stringify(p.draft) : null, p.publishedAt, p.scheduledAt, p.createdAt, p.updatedAt],
       })),
       ...content.posts.flatMap((p) =>
         (p.authorIds.length ? p.authorIds : p.authorId ? [p.authorId] : []).map((aid, i) => ({
@@ -816,17 +903,23 @@ export class SqlRepository implements ContentRepository {
       siteLogo: r?.site_logo ?? '',
       siteUrl: r?.site_url ?? '', siteFavicon: r?.site_favicon ?? '', siteCover: r?.site_cover ?? '',
       announcement: JSON.parse(String(r?.announcement ?? '{}')),
+      analytics: JSON.parse(String(r?.analytics ?? '{}')),
       headCode: r?.head_code ?? '', footerCode: r?.footer_code ?? '',
       timezone: r?.timezone ?? '', locale: r?.locale ?? '',
       draftsApiKey: r?.drafts_api_key ?? '',
       draftsAllowedOrigins: JSON.parse(String(r?.drafts_allowed_origins ?? '[]')),
+      draftDesign: parseDraft(r?.draft_design),
     });
   }
   async updateSettings(data: Partial<Settings>) {
     await this.ready;
     const current = await this.getSettings();
+    // draft_design: undefined = leave the staged design alone (a settings
+    // save must not clobber it); null/value = explicit write (restore)
+    const draftDesign =
+      data.draftDesign === undefined ? current.draftDesign : data.draftDesign;
     await this.driver.run(
-      'UPDATE settings SET site_title = ?, tagline = ?, footer_text = ?, links_name = ?, links_bio = ?, links_avatar = ?, active_theme = ?, design_overrides = ?, site_logo = ?, site_url = ?, site_favicon = ?, site_cover = ?, announcement = ?, head_code = ?, footer_code = ?, timezone = ?, locale = ?, drafts_api_key = ?, drafts_allowed_origins = ? WHERE id = 1',
+      'UPDATE settings SET site_title = ?, tagline = ?, footer_text = ?, links_name = ?, links_bio = ?, links_avatar = ?, active_theme = ?, design_overrides = ?, site_logo = ?, site_url = ?, site_favicon = ?, site_cover = ?, announcement = ?, analytics = ?, head_code = ?, footer_code = ?, timezone = ?, locale = ?, drafts_api_key = ?, drafts_allowed_origins = ?, draft_design = ? WHERE id = 1',
       [
         data.siteTitle ?? current.siteTitle, data.tagline ?? current.tagline,
         data.footerText ?? current.footerText,
@@ -839,15 +932,39 @@ export class SqlRepository implements ContentRepository {
         data.siteFavicon ?? current.siteFavicon,
         data.siteCover ?? current.siteCover,
         JSON.stringify(data.announcement ?? current.announcement),
+        JSON.stringify(data.analytics ?? current.analytics),
         data.headCode ?? current.headCode,
         data.footerCode ?? current.footerCode,
         data.timezone ?? current.timezone,
         data.locale ?? current.locale,
         data.draftsApiKey ?? current.draftsApiKey,
         JSON.stringify(data.draftsAllowedOrigins ?? current.draftsAllowedOrigins),
+        draftDesign ? JSON.stringify(draftDesign) : null,
       ]
     );
   }
+  // Design-screen staging: only the draft_design JSON changes on save — the
+  // live design columns wait for applyDesignDraft ("Publish design").
+  async saveDesignDraft(data: Parameters<ContentRepository['saveDesignDraft']>[0]) {
+    await this.ready;
+    const r = await this.first('SELECT draft_design FROM settings WHERE id = 1');
+    const merged: Record<string, unknown> = parseDraft(r?.draft_design) ?? {};
+    for (const [k, v] of Object.entries(data)) if (v !== undefined) merged[k] = v;
+    merged.savedAt = Date.now();
+    await this.driver.run('UPDATE settings SET draft_design = ? WHERE id = 1', [JSON.stringify(merged)]);
+  }
+  async applyDesignDraft() {
+    await this.ready;
+    const r = await this.first('SELECT draft_design FROM settings WHERE id = 1');
+    const draft = parseDraft(r?.draft_design);
+    if (!draft) return;
+    await this.updateSettings(pickDesignDraft(draft));
+    await this.discardDesignDraft();
+  }
+  async discardDesignDraft() {
+    await this.ready;
+    await this.driver.run('UPDATE settings SET draft_design = NULL WHERE id = 1');
+  }
   async getStats(): Promise<Stats> {
     await this.ready;
     const r = await this.first(`SELECT

package/src/lib/repo/types.ts

@@ -1,4 +1,4 @@
-import type { Page, Post, Link, Media, NavItem, Redirect, Settings, Tag, User, Role, WidgetInstance } from '../schema';
+import type { Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, Role, WidgetInstance } from '../schema';
 
 export interface Stats {
   publishedPages: number;
@@ -36,6 +36,12 @@ export interface ContentRepository {
       blocks?: WidgetInstance[];
     }
   ): Promise<void>;
+  // pending edits on a live page: save stages into the `draft` JSON column
+  // (live columns untouched), apply copies staged → live and clears, discard
+  // just clears. See lib/drafts.ts for the snapshot shape.
+  savePageDraft(id: string, data: Omit<Parameters<ContentRepository['updatePage']>[1], 'status'>): Promise<void>;
+  applyPageDraft(id: string): Promise<void>;
+  discardPageDraft(id: string): Promise<void>;
   deletePage(id: string): Promise<void>;
 
   // posts
@@ -60,6 +66,10 @@ export interface ContentRepository {
       >
     >
   ): Promise<void>;
+  // pending edits on a live post — same contract as the page variants above
+  savePostDraft(id: string, data: Omit<Parameters<ContentRepository['updatePost']>[1], 'status' | 'scheduledAt'>): Promise<void>;
+  applyPostDraft(id: string): Promise<void>;
+  discardPostDraft(id: string): Promise<void>;
   deletePost(id: string): Promise<void>;
   // flips scheduled posts whose time has passed to published; returns count
   publishDuePosts(now: number): Promise<number>;
@@ -98,6 +108,11 @@ export interface ContentRepository {
   // auto-register any names missing from the registry (called on post save)
   ensureTags(names: string[]): Promise<void>;
 
+  // snippets — named, reusable editor-content fragments
+  listSnippets(): Promise<Snippet[]>;
+  createSnippet(data: { name: string; contentJson: string }): Promise<Snippet>;
+  deleteSnippet(id: string): Promise<void>;
+
   // users — passHash stays inside the repo; getUserAuth is for login only
   listUsers(): Promise<User[]>;
   getUser(id: string): Promise<User | null>;
@@ -144,5 +159,10 @@ export interface ContentRepository {
   // settings & dashboard
   getSettings(): Promise<Settings>;
   updateSettings(data: Partial<Settings>): Promise<void>;
+  // Design-screen staging: save stages into settings.draftDesign, apply
+  // copies staged → live design fields and clears, discard just clears
+  saveDesignDraft(data: Partial<Pick<Settings, 'activeTheme' | 'designOverrides' | 'siteLogo' | 'siteFavicon' | 'siteCover'>>): Promise<void>;
+  applyDesignDraft(): Promise<void>;
+  discardDesignDraft(): Promise<void>;
   getStats(): Promise<Stats>;
 }

package/src/lib/schema.ts

@@ -78,6 +78,8 @@ export const Page = z.object({
   seoDesc: z.string().default(''),
   // theme template name (templates/page-<name>.astro); empty = default layout
   template: z.string().default(''),
+  // pending edits on a live page (see lib/drafts.ts); null = none staged
+  draft: z.record(z.any()).nullable().default(null),
   createdAt: z.number(),
   updatedAt: z.number(),
 });
@@ -110,6 +112,8 @@ export const Post = z.object({
   authorIds: z.array(z.string()).default([]),
   // theme template name (templates/post-<name>.astro); empty = default layout
   template: z.string().default(''),
+  // pending edits on a live post (see lib/drafts.ts); null = none staged
+  draft: z.record(z.any()).nullable().default(null),
   publishedAt: z.number().nullable(),
   scheduledAt: z.number().nullable().default(null),
   createdAt: z.number(),
@@ -152,6 +156,17 @@ export const Tag = z.object({
 });
 export type Tag = z.infer<typeof Tag>;
 
+// Snippets: named, reusable fragments of editor content, saved from a
+// selection and re-inserted from the "/" menu. contentJson is a JSON array of
+// ProseMirror nodes.
+export const Snippet = z.object({
+  id: z.string(),
+  name: z.string(),
+  contentJson: z.string(),
+  createdAt: z.number(),
+});
+export type Snippet = z.infer<typeof Snippet>;
+
 export const Role = z.enum(['owner', 'editor']);
 export type Role = z.infer<typeof Role>;
 
@@ -268,11 +283,49 @@ export const Settings = z.object({
       dismissible: z.boolean().default(true),
     })
     .default({}),
+  // analytics providers, rendered into the public <head> by lib/analytics.ts
+  // (owner-only; IDs are re-validated there before any markup is built)
+  analytics: z
+    .object({
+      umami: z
+        .object({
+          enabled: z.boolean().default(false),
+          websiteId: z.string().default(''),
+          scriptUrl: z.string().default('https://cloud.umami.is/script.js'),
+          // session replay (Umami v3.1+): a second recorder.js tag, derived
+          // from scriptUrl. Defaults mirror Umami's own dashboard defaults.
+          replay: z
+            .object({
+              enabled: z.boolean().default(false),
+              sampleRate: z.number().min(0.01).max(1).default(0.15),
+              maskLevel: z.enum(['moderate', 'strict']).default('moderate'),
+              maxDuration: z.number().int().positive().default(300000),
+            })
+            .default({}),
+        })
+        .default({}),
+      metaPixel: z
+        .object({
+          enabled: z.boolean().default(false),
+          pixelId: z.string().default(''),
+        })
+        .default({}),
+      // experimental: same code path as the others, but not verified live yet
+      tiktokPixel: z
+        .object({
+          enabled: z.boolean().default(false),
+          pixelId: z.string().default(''),
+        })
+        .default({}),
+    })
+    .default({}),
   // external drafts API: bearer key for POST /api/drafts (empty = endpoint
   // off) and the browser origins allowed to call it ('*' entry allows all,
   // 'http://localhost:*' matches any port). Managed in /admin/settings.
   draftsApiKey: z.string().default(''),
   draftsAllowedOrigins: z.array(z.string()).default([]),
+  // staged Design-screen changes (see lib/drafts.ts); null = none pending
+  draftDesign: z.record(z.any()).nullable().default(null),
 });
 export type Settings = z.infer<typeof Settings>;
 

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

@@ -6,6 +6,7 @@ import { verifySessionToken, SESSION_COOKIE } from '../lib/auth';
 import { expandDynamicBlocks } from '../lib/dynamicBlocks';
 import { highlightCodeHtml } from '../lib/highlightCode';
 import { resolveDesign } from '../lib/theme';
+import { effectiveSettings } from '../lib/designPreview';
 
 const { slug } = Astro.params;
 const repo = await getRepo(Astro.locals);
@@ -17,7 +18,8 @@ if (!page || (page.status !== 'published' && !isAdmin)) {
   return new Response(null, { status: 404, statusText: 'Not found' });
 }
 const bodyHtml = page.bodyHtml ? highlightCodeHtml(await expandDynamicBlocks(page.bodyHtml, repo)) : '';
-const settings = await repo.getSettings();
+// ?designPreview=1 (admin-only) renders the staged Design-screen changes
+const settings = effectiveSettings(await repo.getSettings(), Astro.url, Astro.cookies);
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const PageTemplate = (page.template ? resolveDesign(settings).theme.pageTemplates[page.template] : null) as any;
 ---

package/src/pages/admin/c/[collection]/[id].astro

@@ -5,7 +5,8 @@ import { createPreviewToken } from '../../../../lib/preview';
 import { resolveDesign } from '../../../../lib/theme';
 import { env } from '../../../../lib/env';
 import { BRAND } from '../../../../lib/brand';
-import { CONTENT } from '../../../../lib/content';
+import { CONTENT, collectionUrl } from '../../../../lib/content';
+import { mergePostDraft } from '../../../../lib/drafts';
 import PostEditor from '../../../../components/editor/PostEditor';
 import '../../../../styles/admin.css';
 import '../../../../styles/editor.css';
@@ -22,9 +23,14 @@ const post = await repo.getPost(id);
 if (!post) return new Response(null, { status: 404 });
 if (post.collection !== key) return Astro.redirect(`/admin/c/${post.collection}/${post.id}`);
 
+// The editor hydrates from the pending draft when one exists (live posts
+// stage their edits until Update); the live URL stays on the live slug.
+const editable = mergePostDraft(post);
+const livePath = collectionUrl(post.collection, post.slug);
+
 // Canonical content is the TipTap doc (as HTML). Legacy markdown posts are
 // converted on first open and become rich content on next save.
-const initialHTML = post.bodyHtml || (post.body ? renderMarkdown(post.body) : '');
+const initialHTML = editable.bodyHtml || (editable.body ? renderMarkdown(editable.body) : '');
 const previewPath = `/preview/post/${post.id}`;
 const sharePath = `${previewPath}?token=${createPreviewToken('post', post.id)}`;
 const unsplashEnabled = Boolean(env('UNSPLASH_ACCESS_KEY'));
@@ -45,11 +51,12 @@ const templates = Object.keys(resolveDesign(settings).theme.postTemplates);
   <body>
     <PostEditor
       client:only="react"
-      post={post}
+      post={editable}
       initialHTML={initialHTML}
       unsplashEnabled={unsplashEnabled}
       previewPath={previewPath}
       sharePath={sharePath}
+      livePath={livePath}
       templates={templates}
     />
   </body>

package/src/pages/admin/c/[collection]/index.astro

@@ -116,6 +116,7 @@ const filterHref = (patch: Record<string, string>) => {
             </td>
             <td>
               <span class={`pill ${p.status}`}>{p.status}</span>
+              {p.draft && <span class="pill edited" title="Has pending edits — press Update in the editor to push them live">edited</span>}
               {p.status === 'scheduled' && p.scheduledAt && (
                 <div class="t-sub" style="margin-top:2px">
                   {new Date(p.scheduledAt).toLocaleString('en-US', { month: 'short', day: 'numeric', hour: 'numeric', minute: '2-digit' })}

package/src/pages/admin/design.astro

@@ -4,12 +4,16 @@ import { getRepo } from '../../lib/repo';
 import { env } from '../../lib/env';
 import DesignManager from '../../components/DesignManager';
 import { listThemes, FONT_PAIRINGS } from '../../lib/theme';
+import { mergeDesignDraft } from '../../lib/drafts';
 import { postUrl } from '../../lib/content';
 // ImagePicker (logo upload) styles live in editor.css
 import '../../styles/editor.css';
 
 const repo = await getRepo(Astro.locals);
-const settings = await repo.getSettings();
+const liveSettings = await repo.getSettings();
+// the manager edits the staged design when one exists; visitors keep the live one
+const settings = mergeDesignDraft(liveSettings);
+const pendingDesign = Boolean(liveSettings.draftDesign);
 // most recent published post powers the preview's "Post" tab
 const [latestPost] = await repo.listPublishedPosts();
 const postPreviewPath = latestPost ? postUrl(latestPost.slug) : null;
@@ -34,6 +38,7 @@ const unsplashEnabled = Boolean(env('UNSPLASH_ACCESS_KEY'));
   <DesignManager
     client:only="react"
     settings={{ ...settings, draftsApiKey: '' }}
+    pendingDesign={pendingDesign}
     themes={themes}
     pairings={[...FONT_PAIRINGS]}
     unsplashEnabled={unsplashEnabled}

package/src/pages/admin/index.astro

@@ -85,9 +85,12 @@ function ago(ts: number) {
         }
       } catch { return; }
       const lt = (a: string, b: string) => {
-        const pa = a.split('.').map(Number), pb = b.split('.').map(Number);
+        // prerelease-blind on purpose except for the base-equal case: a site
+        // pinned to a canary (0.1.1-next.x) should be nudged once the real
+        // 0.1.1 lands on the latest tag, and never before
+        const pa = a.split('-')[0].split('.').map(Number), pb = b.split('-')[0].split('.').map(Number);
         for (let i = 0; i < 3; i++) { if ((pa[i] ?? 0) < (pb[i] ?? 0)) return true; if ((pa[i] ?? 0) > (pb[i] ?? 0)) return false; }
-        return false;
+        return a.includes('-') && !b.includes('-');
       };
       if (!latest || !lt(current, latest)) return;
       try { if (localStorage.getItem(DISMISSED) === latest) return; } catch {}