smoodly 0.0.24 → 0.0.26

package/dist/admin/editor/InsertPicker.d.ts

@@ -1,11 +1,25 @@
 import type { ZonePolicy } from "../../zones.ts";
 import type { AdminRegistry, AdminSection, AdminGlobal } from "../serialize.ts";
+/** Where the "+" put the panel: `y` is 12px under the button's centre (EditorView). */
 export type PickerAt = {
     zone: string;
     index: number;
     x: number;
     y: number;
 };
+export type PickerPlace = {
+    left: number;
+    top?: number;
+    bottom?: number;
+    maxHeight?: number;
+};
+/** Where the panel sits, given its natural height and the viewport: under the
+ *  anchor when it fits there, above it when that side has more room, and never
+ *  taller than the room on its side (the panel scrolls). Pure. */
+export declare function placePicker(at: PickerAt, height: number, viewport: {
+    width: number;
+    height: number;
+}): PickerPlace;
 export declare function InsertPicker({ at, policy, registry, globalIds, onInsert, onInsertGlobal, onInsertCustom, onClose }: {
     at: PickerAt;
     policy: ZonePolicy | undefined;

package/dist/admin/editor/InsertPicker.js

@@ -1,20 +1,50 @@
 "use client";
 import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+// The insert picker a "+" opens: the sections the zone's policy allows,
+// then the Custom section where the zone allows it (spec 2026-09-14 §6),
+// then the global items that can be placed there, or a note that the
+// zone takes nothing. Clicking outside closes it. The panel hangs under
+// the "+" when it fits, opens upward when there is more room above, and
+// scrolls inside the room it has (2026-09-25) — a long section list near
+// the bottom of the window used to run off screen.
+import { useLayoutEffect, useRef, useState } from "react";
 import { allowedSections, allowedGlobals } from "../tree-ops.js";
 import { allowsCustom } from "../custom-section.js";
 import { SectionLabel } from "../ui/primitives.js";
-/** Keep the panel on screen; a static render (no window) leaves it where it was asked. */
-function clamp(at) {
+const PICKER_W = 300;
+const MARGIN = 12;
+/** From `y` back up to the panel's bottom edge when it opens upward: the 12px the
+ *  anchor sits under the button's centre, and the same 12px above it. */
+const ABOVE_GAP = 24;
+/** Where the panel sits, given its natural height and the viewport: under the
+ *  anchor when it fits there, above it when that side has more room, and never
+ *  taller than the room on its side (the panel scrolls). Pure. */
+export function placePicker(at, height, viewport) {
+    const left = Math.max(MARGIN, Math.min(at.x, viewport.width - PICKER_W - MARGIN));
+    const below = viewport.height - MARGIN - at.y;
+    const above = at.y - ABOVE_GAP - MARGIN;
+    if (height <= below || below >= above)
+        return { left, top: at.y, maxHeight: Math.max(below, 0) };
+    return { left, bottom: viewport.height - (at.y - ABOVE_GAP), maxHeight: above };
+}
+/** The first paint, before the panel is measured; a static render (no window) leaves it where it was asked. */
+function firstPlace(at) {
     if (typeof window === "undefined")
         return { left: at.x, top: at.y };
-    return {
-        left: Math.max(12, Math.min(at.x, window.innerWidth - 320)),
-        top: Math.min(at.y, Math.max(12, window.innerHeight - 240)),
-    };
+    return placePicker(at, 0, { width: window.innerWidth, height: window.innerHeight });
 }
 export function InsertPicker({ at, policy, registry, globalIds, onInsert, onInsertGlobal, onInsertCustom, onClose }) {
     const sections = allowedSections(policy, registry.sections);
     const globals = allowedGlobals(policy, registry.globals, globalIds);
     const custom = allowsCustom(policy);
-    return (_jsx("div", { style: { position: "fixed", inset: 0, zIndex: 60 }, onClick: onClose, children: _jsxs("div", { className: "sm-picker", onClick: (e) => e.stopPropagation(), style: { position: "absolute", ...clamp(at) }, children: [_jsxs(SectionLabel, { mono: true, style: { padding: "6px 8px 8px" }, children: ["Add to ", at.zone] }), sections.map((section) => (_jsxs("button", { type: "button", className: "sm-picker__item", onClick: () => onInsert(section), children: [_jsx("span", { className: "sm-picker__icon", children: section.icon ?? "▤" }), _jsxs("span", { style: { minWidth: 0 }, children: [_jsx("span", { style: { display: "block", fontWeight: 600 }, children: section.title }), section.description && (_jsx("span", { style: { display: "block", fontSize: "var(--text-sm)", color: "var(--text-muted)" }, children: section.description }))] })] }, section.name))), custom && (_jsxs("button", { type: "button", className: "sm-picker__item", onClick: onInsertCustom, children: [_jsx("span", { className: "sm-picker__icon", children: "\u25A6" }), _jsxs("span", { style: { minWidth: 0 }, children: [_jsx("span", { style: { display: "block", fontWeight: 600 }, children: registry.custom.title }), _jsx("span", { style: { display: "block", fontSize: "var(--text-sm)", color: "var(--text-muted)" }, children: registry.custom.description })] })] })), globals.length > 0 && (_jsxs(_Fragment, { children: [_jsx(SectionLabel, { mono: true, style: { padding: "8px 8px 4px" }, children: "Global" }), globals.map((item) => (_jsxs("button", { type: "button", className: "sm-picker__item", onClick: () => onInsertGlobal(item), children: [_jsx("span", { className: "sm-picker__icon", children: "\u26D3" }), _jsxs("span", { style: { minWidth: 0 }, children: [_jsx("span", { style: { display: "block", fontWeight: 600 }, children: item.title }), _jsx("span", { style: { display: "block", fontSize: "var(--text-sm)", color: "var(--text-muted)" }, children: "Global \u00B7 edited in one place" })] })] }, `global-${item.name}`)))] })), sections.length === 0 && globals.length === 0 && !custom && (_jsx("p", { style: { color: "var(--text-muted)", padding: 10 }, children: "This zone doesn't accept insertions." }))] }) }));
+    const panel = useRef(null);
+    const [place, setPlace] = useState(() => firstPlace(at));
+    // Measure the panel's full height (scrollHeight ignores a max-height already set), then place it.
+    useLayoutEffect(() => {
+        const el = panel.current;
+        if (!el)
+            return;
+        setPlace(placePicker(at, el.scrollHeight + 2, { width: window.innerWidth, height: window.innerHeight }));
+    }, [at]);
+    return (_jsx("div", { style: { position: "fixed", inset: 0, zIndex: 60 }, onClick: onClose, children: _jsxs("div", { ref: panel, className: "sm-picker", onClick: (e) => e.stopPropagation(), style: { position: "absolute", overflowY: "auto", ...place }, children: [_jsxs(SectionLabel, { caps: true, style: { padding: "6px 8px 8px" }, children: ["Add to ", at.zone] }), sections.map((section) => (_jsxs("button", { type: "button", className: "sm-picker__item", onClick: () => onInsert(section), children: [_jsx("span", { className: "sm-picker__icon", children: section.icon ?? "▤" }), _jsxs("span", { style: { minWidth: 0 }, children: [_jsx("span", { style: { display: "block", fontWeight: 600 }, children: section.title }), section.description && (_jsx("span", { style: { display: "block", fontSize: "var(--text-sm)", color: "var(--text-muted)" }, children: section.description }))] })] }, section.name))), custom && (_jsxs("button", { type: "button", className: "sm-picker__item", onClick: onInsertCustom, children: [_jsx("span", { className: "sm-picker__icon", children: "\u25A6" }), _jsxs("span", { style: { minWidth: 0 }, children: [_jsx("span", { style: { display: "block", fontWeight: 600 }, children: registry.custom.title }), _jsx("span", { style: { display: "block", fontSize: "var(--text-sm)", color: "var(--text-muted)" }, children: registry.custom.description })] })] })), globals.length > 0 && (_jsxs(_Fragment, { children: [_jsx(SectionLabel, { caps: true, style: { padding: "8px 8px 4px" }, children: "Site" }), globals.map((item) => (_jsxs("button", { type: "button", className: "sm-picker__item", onClick: () => onInsertGlobal(item), children: [_jsx("span", { className: "sm-picker__icon", children: "\u26D3" }), _jsxs("span", { style: { minWidth: 0 }, children: [_jsx("span", { style: { display: "block", fontWeight: 600 }, children: item.title }), _jsx("span", { style: { display: "block", fontSize: "var(--text-sm)", color: "var(--text-muted)" }, children: "Global \u00B7 edited in one place" })] })] }, `global-${item.name}`)))] })), sections.length === 0 && globals.length === 0 && !custom && (_jsx("p", { style: { color: "var(--text-muted)", padding: 10 }, children: "This zone doesn't accept insertions." }))] }) }));
 }

package/dist/admin/editor/InspectorFields.js

@@ -17,6 +17,6 @@ export function InspectorFields({ groups, values, render }) {
             const entries = visibleEntries(g.entries, values);
             if (entries.length === 0)
                 return null;
-            return (_jsxs("div", { className: "sm-inspector__group", children: [g.title && _jsx(SectionLabel, { mono: true, children: g.title }), entries.map((e) => render(e, { emptyLabel: e.ns === "styles" ? "Default" : undefined, scope }))] }, g.title ?? i));
+            return (_jsxs("div", { className: "sm-inspector__group", children: [g.title && _jsx(SectionLabel, { caps: true, children: g.title }), entries.map((e) => render(e, { emptyLabel: e.ns === "styles" ? "Default" : undefined, scope }))] }, g.title ?? i));
         }) }));
 }

package/dist/admin/editor/Outline.js

@@ -10,6 +10,6 @@ function OutlineZone({ zone, locked, canTake, nodes, selectedId, onSelect, onAdd
         count: locked ? 0 : nodes.length,
         onDrop: (from, to) => onMoveTo(nodes[from].node.id, to),
     });
-    return (_jsxs("div", { style: { display: "flex", flexDirection: "column", gap: 4 }, children: [_jsxs(SectionLabel, { mono: true, children: [zone, locked && " · locked"] }), nodes.length === 0 && (_jsxs("div", { className: cx("sm-outline-row", "sm-outline-row--empty", canTake && "sm-outline-row--clickable"), onClick: () => { if (canTake)
-                    onAddFirst(zone); }, children: [_jsx("span", { className: "sm-outline-row__label", children: "Empty" }), canTake && _jsx("span", { className: "sm-outline-row__add", children: "+ Add" })] })), locked && nodes.map(({ node, label }) => (_jsxs("div", { className: "sm-outline-row sm-outline-row--locked sm-outline-row--clickable", onClick: () => onSelect(node.id), children: [_jsx("span", { className: "sm-outline-row__label", children: label }), _jsx("span", { className: "sm-outline-row__note", children: "Locked" })] }, node.id))), !locked && nodes.length > 0 && (_jsx("div", { ref: sortable.containerRef, style: { display: "flex", flexDirection: "column", gap: 4 }, children: nodes.map(({ node, label }, i) => (_jsxs("div", { onClick: () => onSelect(node.id), style: sortable.rowStyle(i), className: cx("sm-outline-row", "sm-outline-row--clickable", "sm-outline-row--grip", node.id === selectedId && "sm-outline-row--selected", sortable.rowClass(i)), children: [_jsx(Grip, { ...sortable.handleProps(i) }), _jsx("span", { className: "sm-outline-row__label", children: label }), _jsx(IconButton, { label: "Remove", size: 22, onClick: (e) => { e.stopPropagation(); onRemove(node.id); }, children: "\u00D7" })] }, node.id))) }))] }));
+    return (_jsxs("div", { style: { display: "flex", flexDirection: "column", gap: 4 }, children: [_jsxs(SectionLabel, { caps: true, children: [zone, locked && " · locked"] }), nodes.length === 0 && (_jsxs("div", { className: cx("sm-outline-row", "sm-outline-row--empty", canTake && "sm-outline-row--clickable"), onClick: () => { if (canTake)
+                    onAddFirst(zone); }, children: [_jsx("span", { className: "sm-outline-row__label", children: "Empty" }), canTake && _jsx("span", { className: "sm-outline-row__add", children: "+ Add" })] })), locked && nodes.map(({ node, label }) => (_jsxs("div", { className: "sm-outline-row sm-outline-row--locked sm-outline-row--clickable", "data-testid": "outline-row", onClick: () => onSelect(node.id), children: [_jsx("span", { className: "sm-outline-row__label", children: label }), _jsx("span", { className: "sm-outline-row__note", children: "Locked" })] }, node.id))), !locked && nodes.length > 0 && (_jsx("div", { ref: sortable.containerRef, style: { display: "flex", flexDirection: "column", gap: 4 }, children: nodes.map(({ node, label }, i) => (_jsxs("div", { onClick: () => onSelect(node.id), style: sortable.rowStyle(i), "data-testid": "outline-row", className: cx("sm-outline-row", "sm-outline-row--clickable", "sm-outline-row--grip", node.id === selectedId && "sm-outline-row--selected", sortable.rowClass(i)), children: [_jsx(Grip, { ...sortable.handleProps(i) }), _jsx("span", { className: "sm-outline-row__label", children: label }), _jsx(IconButton, { label: "Remove", size: 22, onClick: (e) => { e.stopPropagation(); onRemove(node.id); }, children: "\u00D7" })] }, node.id))) }))] }));
 }

package/dist/admin/editor/PageSettings.js

@@ -32,7 +32,7 @@ export function PageSettings({ record, locale, registry, path, fixed, onRename }
             return;
         }
         // A published slug is a live URL: one confirm, Cancel restores the input (members management §5).
-        if (key === "slug" && !confirmLiveUrl({ status: row.status, from: row.slug, to: next })) {
+        if (key === "slug" && !(await confirmLiveUrl({ status: row.status, from: row.slug, to: next }, { name: row.title, path }))) {
             setDraft((d) => ({ ...d, slug: row.slug }));
             return;
         }

package/dist/admin/editor/SeoSettings.js

@@ -11,5 +11,5 @@ function Counter({ n, max }) {
 export function SeoSettings({ meta, onPatch }) {
     const title = str(meta.title);
     const description = str(meta.description);
-    return (_jsxs("div", { style: { display: "flex", flexDirection: "column", gap: 14 }, children: [_jsx(Field, { label: "Title", counter: _jsx(Counter, { n: title.length, max: SEO_TITLE_MAX }), hint: "Used in search results and link previews. Empty: the page title.", children: _jsx("input", { className: "sm-input", value: title, onChange: (e) => onPatch("title", e.target.value) }) }), _jsx(Field, { label: "Description", counter: _jsx(Counter, { n: description.length, max: SEO_DESCRIPTION_MAX }), children: _jsx("textarea", { className: "sm-textarea", rows: 3, value: description, onChange: (e) => onPatch("description", e.target.value) }) }), _jsx(Field, { label: "Social image", hint: "1200\u00D7630 recommended", asDiv: true, children: _jsx(MediaWidget, { descriptor: { type: "image" }, value: meta.ogImage, onChange: (v) => onPatch("ogImage", v) }) }), _jsx(Field, { label: "Hide from search engines", asDiv: true, children: _jsx(Switch, { checked: meta.noindex === true, onChange: (v) => onPatch("noindex", v), label: "Hide from search engines" }) })] }));
+    return (_jsxs("div", { style: { display: "flex", flexDirection: "column", gap: 14 }, children: [_jsx(Field, { label: "Title", counter: _jsx(Counter, { n: title.length, max: SEO_TITLE_MAX }), hint: "Used in search results and link previews. Empty: the page title.", children: _jsx("input", { className: "sm-input", value: title, onChange: (e) => onPatch("title", e.target.value) }) }), _jsx(Field, { label: "Description", counter: _jsx(Counter, { n: description.length, max: SEO_DESCRIPTION_MAX }), children: _jsx("textarea", { className: "sm-textarea", rows: 3, value: description, onChange: (e) => onPatch("description", e.target.value) }) }), _jsx(MediaWidget, { descriptor: { type: "image" }, value: meta.ogImage, onChange: (v) => onPatch("ogImage", v), label: "Social image", hint: "1200\u00D7630 recommended" }), _jsx(Field, { label: "Hide from search engines", asDiv: true, children: _jsx(Switch, { checked: meta.noindex === true, onChange: (v) => onPatch("noindex", v), label: "Hide from search engines" }) })] }));
 }

package/dist/admin/editor/autosave.d.ts

@@ -1,5 +1,5 @@
 import type { OpResult } from "../ops.ts";
-export type SaveState = "saved" | "saving" | "error";
+export type SaveState = "saved" | "saving" | "error" | "stale";
 export type DraftAutosave = {
     /** Record a local change; a debounced save follows. */
     mark(): void;
@@ -11,6 +11,8 @@ export type DraftAutosave = {
     subscribe(listener: () => void): () => void;
     /** Cancel pending timers; call on unmount. */
     dispose(): void;
+    /** Leave `stale` after the record was reloaded: timers cleared, the reloaded value counts as saved. */
+    reset(): void;
 };
 export declare function createDraftAutosave<T>(opts: {
     read: () => T | null;
@@ -28,4 +30,5 @@ export declare function useDraftAutosave<T>(opts: DraftAutosaveOptions<T>): {
     saveState: SaveState;
     mark: () => void;
     flush: () => Promise<boolean>;
+    reset: () => void;
 };

package/dist/admin/editor/autosave.js

@@ -46,6 +46,12 @@ export function createDraftAutosave(opts) {
             opts.onSaved?.();
             return true;
         }
+        else if (result.code === "conflict" && result.stale) {
+            // The guard refused (spec 2026-09-26 concurrency §4): terminal, never retried —
+            // the view freezes and only a reload (reset) brings the controller back.
+            setState("stale");
+            return false;
+        }
         else {
             // Keep local state; retry with a doubling, capped delay.
             setState("error");
@@ -62,12 +68,16 @@ export function createDraftAutosave(opts) {
             return () => { listeners.delete(listener); };
         },
         mark() {
+            if (state === "stale")
+                return;
             revision += 1;
             if (debounceTimer)
                 clearTimeout(debounceTimer);
             debounceTimer = setTimeout(() => { debounceTimer = null; void save(); }, debounceMs);
         },
         flush() {
+            if (state === "stale")
+                return Promise.resolve(false);
             if (revision === savedRevision)
                 return Promise.resolve(true);
             if (debounceTimer) {
@@ -86,6 +96,19 @@ export function createDraftAutosave(opts) {
                 retryTimer = null;
             }
         },
+        reset() {
+            if (debounceTimer) {
+                clearTimeout(debounceTimer);
+                debounceTimer = null;
+            }
+            if (retryTimer) {
+                clearTimeout(retryTimer);
+                retryTimer = null;
+            }
+            savedRevision = revision;
+            retryDelay = retryBaseMs;
+            setState("saved");
+        },
     };
 }
 /** React glue: one controller per mount, always calling the latest
@@ -104,5 +127,5 @@ export function useDraftAutosave(opts) {
     }));
     useEffect(() => () => controller.dispose(), [controller]);
     const saveState = useSyncExternalStore(controller.subscribe, controller.getState, controller.getState);
-    return { saveState, mark: controller.mark, flush: controller.flush };
+    return { saveState, mark: controller.mark, flush: controller.flush, reset: controller.reset };
 }

package/dist/admin/editor/global-edit.d.ts

@@ -1,6 +1,7 @@
 import type { EntryRecord, EntryUsage } from "../../entry-store.ts";
 import type { AdminOps, OpResult } from "../ops.ts";
 import { type SaveState } from "./autosave.ts";
+import { type StaleInfo } from "../shell/stale.ts";
 export type GlobalEditItem = {
     name: string;
     locale: string;
@@ -15,6 +16,8 @@ export type GlobalEditState = {
     items: Record<string, GlobalEditItem>;
     saveState: SaveState;
     loadError: string | null;
+    /** The guard's refusal (spec 2026-09-26 concurrency §4): set once, cleared only by reset(). */
+    stale: StaleInfo | null;
 };
 export type GlobalEdit = {
     getState(): GlobalEditState;
@@ -32,7 +35,8 @@ export type GlobalEdit = {
 };
 export declare function createGlobalEdit(opts: {
     ops: Pick<AdminOps, "globals">;
-    onSaved?: () => void;
+    /** Per saved item, with its name (presence announces each; spec 2026-09-26 concurrency §5). */
+    onSaved?: (name: string) => void;
     debounceMs?: number;
     retryBaseMs?: number;
     retryCapMs?: number;

package/dist/admin/editor/global-edit.js

@@ -1,8 +1,11 @@
 import { setAtPath } from "../field-paths.js";
 import { createDraftAutosave } from "./autosave.js";
+import { draftToken } from "../../draft-token.js";
+import { isStale, staleInfoOf } from "../shell/stale.js";
 export function createGlobalEdit(opts) {
     let items = {};
     let loadError = null;
+    let stale = null;
     let generation = 0;
     const loading = new Set();
     const rev = new Map();
@@ -20,7 +23,7 @@ export function createGlobalEdit(opts) {
                 const at = rev.get(item.name) ?? 0;
                 let r;
                 try {
-                    r = await opts.ops.globals.save(item.name, item.locale, item.fields);
+                    r = await opts.ops.globals.save(item.name, item.locale, item.fields, draftToken(item.record.locales[item.locale]));
                 }
                 catch {
                     r = { ok: false, code: "internal", message: "Couldn't reach the server." };
@@ -30,8 +33,11 @@ export function createGlobalEdit(opts) {
                     savedRev.set(item.name, at);
                     if (current)
                         items = { ...items, [item.name]: { ...current, record: r.data, errors: {} } };
+                    opts.onSaved?.(item.name);
                 }
                 else {
+                    if (isStale(r))
+                        stale = staleInfoOf(r);
                     failed ?? (failed = r);
                     if (current) {
                         items = { ...items, [item.name]: { ...current, errors: Object.fromEntries((r.fields ?? []).map((f) => [f.field, f.message])) } };
@@ -41,13 +47,12 @@ export function createGlobalEdit(opts) {
             emit();
             return failed ?? { ok: true, data: null };
         },
-        onSaved: opts.onSaved,
         debounceMs: opts.debounceMs,
         retryBaseMs: opts.retryBaseMs,
         retryCapMs: opts.retryCapMs,
     });
     autosave.subscribe(emit);
-    const getState = () => (snapshot ?? (snapshot = { items, saveState: autosave.getState(), loadError }));
+    const getState = () => (snapshot ?? (snapshot = { items, saveState: autosave.getState(), loadError, stale }));
     return {
         getState,
         subscribe(listener) {
@@ -98,7 +103,7 @@ export function createGlobalEdit(opts) {
             }
             let r;
             try {
-                r = await opts.ops.globals.setStatus(name, item.locale, status);
+                r = await opts.ops.globals.setStatus(name, item.locale, status, draftToken(item.record.locales[item.locale]));
             }
             catch {
                 r = { ok: false, code: "internal", message: "Couldn't reach the server." };
@@ -107,6 +112,10 @@ export function createGlobalEdit(opts) {
                 items = { ...items, [name]: { ...items[name], record: r.data } };
                 emit();
             }
+            else if (isStale(r)) {
+                stale = staleInfoOf(r);
+                emit();
+            }
             return r;
         },
         reset() {
@@ -116,7 +125,8 @@ export function createGlobalEdit(opts) {
             savedRev.clear();
             loading.clear();
             loadError = null;
-            autosave.dispose();
+            stale = null;
+            autosave.reset(); // timers cleared, and a stale controller comes back for the new canvas
             emit();
         },
         dispose: autosave.dispose,

package/dist/admin/editor/locale-url.d.ts

@@ -1,12 +1,15 @@
 import type { AdminRegistry } from "../serialize.ts";
 type Locales = AdminRegistry["locales"];
-/** A supported ?locale from the query string, else the default. */
-export declare function localeFromSearch(search: string, locales: Locales): string;
+/** A supported ?locale from the query string, else the fallback (the default). */
+export declare function localeFromSearch(search: string, locales: Locales, fallback?: string): string;
 /** The same URL pointed at a locale, keeping the rest of the query
  *  string — a bare `?locale=…` would drop every other param. */
 export declare function withLocale(href: string, next: string): string;
+/** The URL's locale, else the remembered one, else the default — and
+ *  remembered from here on. Read once per screen, not per render. */
 export declare function localeFromUrl(registry: AdminRegistry): string;
-/** Point the current URL at a locale in place. A replace, so the router
- *  never asks the leave guard — the form's own confirm covers a switch. */
+/** Point the current URL at a locale in place, remembering it. A replace,
+ *  so the router never asks the leave guard — the form's own confirm
+ *  covers a switch. */
 export declare function writeLocaleToUrl(next: string): void;
 export {};

package/dist/admin/editor/locale-url.js

@@ -1,8 +1,9 @@
 import { navigate } from "../shell/router.js";
-/** A supported ?locale from the query string, else the default. */
-export function localeFromSearch(search, locales) {
+import { rememberLocale, rememberedLocale } from "../shell/locale-memory.js";
+/** A supported ?locale from the query string, else the fallback (the default). */
+export function localeFromSearch(search, locales, fallback = locales.default) {
     const l = new URLSearchParams(search).get("locale");
-    return l && locales.supported.includes(l) ? l : locales.default;
+    return l && locales.supported.includes(l) ? l : fallback;
 }
 /** The same URL pointed at a locale, keeping the rest of the query
  *  string — a bare `?locale=…` would drop every other param. */
@@ -11,20 +12,26 @@ export function withLocale(href, next) {
     u.searchParams.set("locale", next);
     return u.toString();
 }
+/** The URL's locale, else the remembered one, else the default — and
+ *  remembered from here on. Read once per screen, not per render. */
 export function localeFromUrl(registry) {
     try {
-        return localeFromSearch(window.location.search, registry.locales);
+        const locale = localeFromSearch(window.location.search, registry.locales, rememberedLocale(registry.locales));
+        rememberLocale(locale);
+        return locale;
     }
     catch {
         // no window — the default is fine
         return registry.locales.default;
     }
 }
-/** Point the current URL at a locale in place. A replace, so the router
- *  never asks the leave guard — the form's own confirm covers a switch. */
+/** Point the current URL at a locale in place, remembering it. A replace,
+ *  so the router never asks the leave guard — the form's own confirm
+ *  covers a switch. */
 export function writeLocaleToUrl(next) {
+    rememberLocale(next);
     try {
-        navigate(withLocale(window.location.href, next), { replace: true });
+        void navigate(withLocale(window.location.href, next), { replace: true });
     }
     catch {
         // no window (or no history) — the URL is cosmetic here

package/dist/admin/editor/useGlobalEdit.d.ts

@@ -2,5 +2,5 @@ import type { AdminOps } from "../ops.ts";
 import { type GlobalEdit, type GlobalEditState } from "./global-edit.ts";
 export declare function useGlobalEdit({ ops, onSaved }: {
     ops: Pick<AdminOps, "globals">;
-    onSaved?: () => void;
+    onSaved?: (name: string) => void;
 }): GlobalEditState & Pick<GlobalEdit, "load" | "patch" | "flush" | "setStatus" | "reset">;

package/dist/admin/editor/useGlobalEdit.js

@@ -7,7 +7,7 @@ import { createGlobalEdit } from "./global-edit.js";
 export function useGlobalEdit({ ops, onSaved }) {
     const latest = useRef(onSaved);
     latest.current = onSaved;
-    const [controller] = useState(() => createGlobalEdit({ ops, onSaved: () => latest.current?.() }));
+    const [controller] = useState(() => createGlobalEdit({ ops, onSaved: (name) => latest.current?.(name) }));
     useEffect(() => () => { void controller.flush(); controller.dispose(); }, [controller]);
     const state = useSyncExternalStore(controller.subscribe, controller.getState, controller.getState);
     return {

package/dist/admin/editor/usePageLocale.js

@@ -5,6 +5,7 @@
 import { useState } from "react";
 import { sourceLocaleOf } from "../shell/pages-tree.js";
 import { localeFromUrl, writeLocaleToUrl } from "./locale-url.js";
+import { confirm } from "../ui/confirm.js";
 export function usePageLocale({ registry, ops, id, record, setRecord, flush, fail, clearBanner, reload }) {
     const [locale, setLocale] = useState(() => localeFromUrl(registry));
     const [adding, setAdding] = useState(false);
@@ -59,7 +60,14 @@ export function usePageLocale({ registry, ops, id, record, setRecord, flush, fai
         const remaining = Object.keys(record.locales).filter((l) => l !== locale);
         if (remaining.length === 0)
             return;
-        if (!window.confirm(`Remove this page from ${locale}? Its ${locale} content and history are deleted.`))
+        const ok = await confirm({
+            title: `Remove this page from ${locale}?`,
+            body: `Its ${locale} content and history are deleted. Other languages are not affected.`,
+            confirmLabel: `Remove from ${locale}`,
+            destructive: true,
+            subject: { name: record.locales[locale]?.title ?? id },
+        });
+        if (!ok)
             return;
         // Let a pending save land before the row goes, so no save races the
         // delete — and if it cannot land, stop: a retry mid-flight would

package/dist/admin/forms/CropEditor.d.ts

@@ -1,10 +1,12 @@
 import { type ReactElement } from "react";
 import type { AssetRecord, ImageValue } from "../../media.ts";
 import type { AdminField } from "../serialize.ts";
-export declare function CropEditor({ asset, descriptor, value, onSave, onClose }: {
+export declare function CropEditor({ asset, descriptor, value, caption, onSave, onClose }: {
     asset: AssetRecord;
     descriptor: AdminField;
     value: ImageValue;
-    onSave(next: ImageValue): void;
+    /** Given, a Caption field is shown and its text handed back beside the value. */
+    caption?: string;
+    onSave(next: ImageValue, caption?: string): void;
     onClose(): void;
 }): ReactElement;

package/dist/admin/forms/CropEditor.js

@@ -5,6 +5,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 // switch when several), a draggable hotspot, the per-use alt override
 // and a live preview at the chosen aspect. Pointer deltas become image
 // fractions through the stage's width; the math is in crop-editor.ts.
+// A richtext image card passes its `caption` too (2026-09-25): the card
+// shows no inputs, so the modal is where both texts are edited.
 import { useRef, useState } from "react";
 import { parseAspect } from "../../media.js";
 import { frameFor } from "../../image/crop-math.js";
@@ -12,7 +14,7 @@ import { Button, Field, Segmented } from "../ui/primitives.js";
 import { Modal } from "../ui/Modal.js";
 import { initialState, moveCrop, placeHotspot, relock, resizeCrop } from "./crop-editor.js";
 const pct = (n) => `${n * 100}%`;
-export function CropEditor({ asset, descriptor, value, onSave, onClose }) {
+export function CropEditor({ asset, descriptor, value, caption, onSave, onClose }) {
     const declared = descriptor.aspect;
     const options = Array.isArray(declared) ? declared : typeof declared === "string" ? [declared] : [];
     const width = asset.width ?? 1, height = asset.height ?? 1;
@@ -21,6 +23,7 @@ export function CropEditor({ asset, descriptor, value, onSave, onClose }) {
     const aspect = chosen ? parseAspect(chosen) : undefined;
     const [state, setState] = useState(() => initialState(value, aspect, imageAspect));
     const [alt, setAlt] = useState(value.alt ?? "");
+    const [cap, setCap] = useState(caption ?? "");
     const stage = useRef(null);
     const drag = useRef(null);
     const pick = (next) => { setChosen(next); setState((s) => relock(s, parseAspect(next), imageAspect)); };
@@ -56,6 +59,6 @@ export function CropEditor({ asset, descriptor, value, onSave, onClose }) {
         ...value, crop, hotspot,
         ...(alt.trim() ? { alt: alt.trim() } : { alt: undefined }),
         ...(options.length > 1 && chosen ? { aspect: chosen } : { aspect: undefined }),
-    });
-    return (_jsx(Modal, { title: "Crop and focus", width: 900, onClose: onClose, footer: _jsxs(_Fragment, { children: [_jsx(Button, { variant: "secondary", onClick: onClose, children: "Cancel" }), _jsx(Button, { onClick: save, children: "Save" })] }), children: _jsxs("div", { className: "sm-crop", children: [_jsxs("div", { className: "sm-crop__stage", ref: stage, onPointerMove: move, onPointerUp: end, onPointerCancel: end, children: [_jsx("img", { src: asset.url, alt: "", draggable: false }), _jsx("div", { className: "sm-crop__shade", style: { clipPath: `polygon(0 0, 100% 0, 100% 100%, 0 100%, 0 ${pct(crop.top)}, ${pct(crop.left)} ${pct(crop.top)}, ${pct(crop.left)} ${pct(crop.top + crop.height)}, ${pct(crop.left + crop.width)} ${pct(crop.top + crop.height)}, ${pct(crop.left + crop.width)} ${pct(crop.top)}, 0 ${pct(crop.top)})` } }), _jsx("div", { className: "sm-crop__rect", style: { left: pct(crop.left), top: pct(crop.top), width: pct(crop.width), height: pct(crop.height) }, onPointerDown: begin("move"), children: ["nw", "ne", "sw", "se"].map((h) => (_jsx("span", { className: `sm-crop__handle sm-crop__handle--${h}`, onPointerDown: begin(h) }, h))) }), _jsx("div", { className: "sm-crop__hotspot", title: "Focus point", style: { left: pct(hotspot.x), top: pct(hotspot.y) }, onPointerDown: begin("hotspot") })] }), _jsxs("div", { className: "sm-crop__side", children: [options.length > 1 && (_jsx(Field, { label: "Aspect", asDiv: true, children: _jsx(Segmented, { options: options, value: chosen ?? options[0], onChange: pick }) })), _jsx(Field, { label: "Preview", asDiv: true, children: _jsx("div", { className: "sm-crop__preview", style: { aspectRatio: String(previewAspect) }, children: _jsx("img", { src: asset.url, alt: "", style: { left: `${frame.left}%`, top: `${frame.top}%`, width: `${frame.width}%`, height: `${frame.height}%` } }) }) }), _jsx(Field, { label: "Alt text for this use", hint: "Empty uses the asset's own alt.", children: _jsx("input", { className: "sm-input", value: alt, placeholder: asset.alt ?? "", onChange: (e) => setAlt(e.target.value) }) })] })] }) }));
+    }, caption === undefined ? undefined : cap);
+    return (_jsx(Modal, { title: "Crop and focus", width: 900, onClose: onClose, footer: _jsxs(_Fragment, { children: [_jsx(Button, { variant: "secondary", onClick: onClose, children: "Cancel" }), _jsx(Button, { onClick: save, children: "Save" })] }), children: _jsxs("div", { className: "sm-crop", children: [_jsxs("div", { className: "sm-crop__stage", ref: stage, onPointerMove: move, onPointerUp: end, onPointerCancel: end, children: [_jsx("img", { src: asset.url, alt: "", draggable: false }), _jsx("div", { className: "sm-crop__shade", style: { clipPath: `polygon(0 0, 100% 0, 100% 100%, 0 100%, 0 ${pct(crop.top)}, ${pct(crop.left)} ${pct(crop.top)}, ${pct(crop.left)} ${pct(crop.top + crop.height)}, ${pct(crop.left + crop.width)} ${pct(crop.top + crop.height)}, ${pct(crop.left + crop.width)} ${pct(crop.top)}, 0 ${pct(crop.top)})` } }), _jsx("div", { className: "sm-crop__rect", style: { left: pct(crop.left), top: pct(crop.top), width: pct(crop.width), height: pct(crop.height) }, onPointerDown: begin("move"), children: ["nw", "ne", "sw", "se"].map((h) => (_jsx("span", { className: `sm-crop__handle sm-crop__handle--${h}`, onPointerDown: begin(h) }, h))) }), _jsx("div", { className: "sm-crop__hotspot", title: "Focus point", style: { left: pct(hotspot.x), top: pct(hotspot.y) }, onPointerDown: begin("hotspot") })] }), _jsxs("div", { className: "sm-crop__side", children: [options.length > 1 && (_jsx(Field, { label: "Aspect", asDiv: true, children: _jsx(Segmented, { options: options, value: chosen ?? options[0], onChange: pick }) })), _jsx(Field, { label: "Preview", asDiv: true, children: _jsx("div", { className: "sm-crop__preview", style: { aspectRatio: String(previewAspect) }, children: _jsx("img", { src: asset.url, alt: "", style: { left: `${frame.left}%`, top: `${frame.top}%`, width: `${frame.width}%`, height: `${frame.height}%` } }) }) }), _jsx(Field, { label: "Alt text for this use", hint: "Empty uses the asset's own alt.", children: _jsx("input", { className: "sm-input", value: alt, placeholder: asset.alt ?? "", onChange: (e) => setAlt(e.target.value) }) }), caption !== undefined && (_jsx(Field, { label: "Caption", hint: "Shown under the image.", children: _jsx("input", { className: "sm-input", value: cap, onChange: (e) => setCap(e.target.value) }) }))] })] }) }));
 }

package/dist/admin/forms/DatePicker.d.ts

@@ -0,0 +1,9 @@
+export declare function DatePicker({ kind, value, onChange, label, initialOpen }: {
+    kind: "date" | "datetime";
+    value: unknown;
+    onChange(value: unknown): void;
+    /** Accessible name of the text box; "Date" when absent. */
+    label?: string;
+    /** Start open: static-markup tests. */
+    initialOpen?: boolean;
+}): import("react").JSX.Element;