reviewzy 0.3.0 → 0.4.0

package/src/dashboard/views.tsx

@@ -1,12 +1,14 @@
 /** @jsxImportSource hono/jsx */
 import { readFileSync } from "node:fs";
 import { raw } from "hono/html";
+import type { Child } from "hono/jsx";
 import type { JSX } from "hono/jsx/jsx-runtime";
 import { listRevisions, parseConstraints, parseEntryImages } from "../db/human-save.ts";
 import type { Constraints, HumanSaveRefusal, RevisionRow, TransitionRefusal } from "../db/human-save.ts";
 import {
   adjacentEntryIds,
   countEntries,
+  countEntriesByStatus,
   listEntries,
   listProjects,
   projectIdBySlug,
@@ -17,6 +19,7 @@ import type { StyleGuideForm, StyleGuideFormRefusal, StyleGuideInput } from "../
 import type { Store } from "../db/store.ts";
 import { parseRepoLink, REPO_ICON } from "./repo-link.ts";
 import { diffWords } from "./word-diff.ts";
+import type { WordDiffToken } from "./word-diff.ts";
 import { NAME } from "../version.ts";
 
 /**
@@ -35,7 +38,7 @@ const PAGE_SIZE = 200;
 
 const STATUSES: readonly EntryStatus[] = ["draft", "approved", "applied", "rejected"];
 
-/** The default Active view: the two statuses that still need a human. */
+/** The default Open view: the two statuses that still need a human. */
 const ACTIVE_STATUSES: readonly EntryStatus[] = ["draft", "approved"];
 
 function isEntryStatus(value: string): value is EntryStatus {
@@ -56,11 +59,20 @@ const STATUS_LABEL: Record<EntryStatus, string> = {
   rejected: "Rejected",
 };
 
-type ProjectBatch = { id: string; entries: EntryRow[] };
-type ProjectGroup = { slug: string; batches: ProjectBatch[] };
+/** The timeline dot variant per revision status, matching the tag's own semantic. */
+const STATUS_DOT: Record<EntryStatus, string> = {
+  draft: "timeline-dot-warning",
+  approved: "timeline-dot-success",
+  applied: "timeline-dot-accent",
+  rejected: "timeline-dot-danger",
+};
+
+type ProjectGroup = { slug: string; entries: EntryRow[] };
 
 export type ListViewModel = {
   readonly total: number;
+  /** The whole store's counts per status; the status tabs read these, never the filtered rows. */
+  readonly counts: Record<EntryStatus, number>;
   readonly shown: number;
   readonly groups: readonly ProjectGroup[];
   readonly projects: readonly { id: string; slug: string }[];
@@ -69,7 +81,7 @@ export type ListViewModel = {
   readonly status: string;
   readonly project: string;
   readonly filtersActive: boolean;
-  /** Whether the default Active view is what hides every match: a filter found rows, but all of them are applied or rejected. */
+  /** Whether the default Open view is what hides every match: a filter found rows, but all of them are applied or rejected. */
   readonly hiddenByActiveView: boolean;
 };
 
@@ -96,63 +108,19 @@ function allEntries(
 }
 
 /**
- * Groups the filtered rows by project (slug order) then batch; within a batch the rows keep the
- * list query's ascending id order. Within a project, batches split into two partitions: any batch
- * holding a draft or approved entry is actionable and leads, terminal-only batches (applied and
- * rejected) follow. Each partition sorts newest batch first, with a deterministic order for
- * batches minted in the same millisecond, so the same filter always renders the same page.
+ * Groups the filtered rows by project, projects in slug order. Within a project the rows keep
+ * the list query's ascending id order: ulids sort chronologically, so the oldest filing leads.
  */
 function groupRows(rows: readonly EntryRow[], slugOf: Map<string, string>): ProjectGroup[] {
   const byProject = new Map<string, EntryRow[]>();
   for (const row of rows) {
     byProject.set(row.project_id, [...(byProject.get(row.project_id) ?? []), row]);
   }
-  const projectIds = [...byProject.keys()].sort((a, b) => (slugOf.get(a) ?? a).localeCompare(slugOf.get(b) ?? b));
-  return projectIds.map((projectId) => {
-    const projectRows = byProject.get(projectId)!;
-    const byBatch = new Map<string, EntryRow[]>();
-    for (const row of projectRows) {
-      byBatch.set(row.batch_id, [...(byBatch.get(row.batch_id) ?? []), row]);
-    }
-    const batches = [...byBatch.keys()].map((batchId) => ({ id: batchId, entries: byBatch.get(batchId)! }));
-    const actionable = batches.filter(isActionableBatch).sort(newestBatchFirst);
-    const terminal = batches.filter((batch) => !isActionableBatch(batch)).sort(newestBatchFirst);
-    return { slug: slugOf.get(projectId) ?? projectId, batches: [...actionable, ...terminal] };
-  });
-}
-
-/** A batch is actionable when any of its entries still needs a human: draft or approved. */
-function isActionableBatch(batch: ProjectBatch): boolean {
-  return batch.entries.some((entry) => entry.status === "draft" || entry.status === "approved");
-}
-
-/** Code-unit descending comparison: ulids are fixed-length Crockford base32, so this equals time order. */
-function compareDesc(a: string, b: string): number {
-  return a < b ? 1 : a > b ? -1 : 0;
-}
-
-/** The newest `created_at` in a batch, walked: a batch can hold thousands of entries, and a spread would overflow the call stack. */
-function maxCreatedAt(batch: ProjectBatch): number {
-  let max = 0;
-  for (const entry of batch.entries) {
-    if (entry.created_at > max) max = entry.created_at;
-  }
-  return max;
-}
-
-/**
- * Newest batch first. Batch ulids share a millisecond timestamp prefix, so a descending id is
- * newest-first; batches minted in the same millisecond tie on that prefix, and the batch's
- * newest `created_at` breaks the tie before the id itself, so a same-ms burst still renders in
- * one fixed order.
- */
-function newestBatchFirst(a: ProjectBatch, b: ProjectBatch): number {
-  const timeCmp = compareDesc(a.id.slice(0, 10), b.id.slice(0, 10));
-  if (timeCmp !== 0) return timeCmp;
-  const aCreated = maxCreatedAt(a);
-  const bCreated = maxCreatedAt(b);
-  if (aCreated !== bCreated) return bCreated - aCreated;
-  return compareDesc(a.id, b.id);
+  const groups = [...byProject].map(([projectId, projectRows]) => ({
+    slug: slugOf.get(projectId) ?? projectId,
+    entries: projectRows,
+  }));
+  return groups.sort((a, b) => a.slug.localeCompare(b.slug));
 }
 
 function loadList(store: Store, params: ListParams): ListViewModel {
@@ -161,8 +129,8 @@ function loadList(store: Store, params: ListParams): ListViewModel {
   const statusRaw = params.status;
   const statusActive = statusRaw !== undefined && statusRaw !== "";
   // `all` is the explicit "every status" filter value; the default (no status param, or an empty
-  // one) is the Active view of draft + approved only, which is not a filter and never renders the
-  // partial header. Both query every status; the Active view narrows the walked rows afterward.
+  // one) is the Open view of draft + approved only, which is not a filter and never renders the
+  // partial header. Both query every status; the Open view narrows the walked rows afterward.
   const allStatuses = statusActive && statusRaw === "all";
   const status = statusActive && !allStatuses && isEntryStatus(statusRaw) ? statusRaw : undefined;
   const projectRaw = params.project;
@@ -178,6 +146,7 @@ function loadList(store: Store, params: ListParams): ListViewModel {
   const slugOf = new Map(projects.map((project) => [project.id, project.slug]));
   return {
     total: countEntries(store),
+    counts: countEntriesByStatus(store),
     shown: rows.length,
     groups: groupRows(rows, slugOf),
     projects,
@@ -207,52 +176,282 @@ function entryTitle(entry: EntryRow): string {
   return fileBasename(entry.file);
 }
 
-/** The batch ulid shortened to head+tail, enough to name each batch's select-all checkbox distinctly for a screen reader. */
-function shortUlid(id: string): string {
-  return `${id.slice(0, 6)}…${id.slice(-6)}`;
+/** Whether the displayed title is the agent-supplied one, so the anchor text it stands in for is otherwise unread in the list. */
+function hasOwnTitle(entry: EntryRow): boolean {
+  const title = entry.title?.trim();
+  return title !== undefined && title !== "";
 }
 
-/** The section the current page belongs to, marking the matching navbar link. */
-type NavSection = "entries" | "style-guide" | "none";
+/** The section the current page belongs to, marking the matching nav link. */
+type NavSection = "entries" | "style-guide";
 
-/** The icon sprite, pasted into every full page's body as its first child, read off the vendored file so the two can never drift. */
+/** The icon sprite, pasted into every full page's body, read off the vendored file so the two can never drift. */
 const ICON_SPRITE = readFileSync(new URL("./static/icons.svg", import.meta.url), "utf8");
 
-function Navbar({ signedIn, active }: { signedIn: boolean; active: NavSection }) {
+/** The theme toggle, once per shell: ui.js's initTheme wires it and owns the pressed state. */
+function ThemeToggle() {
   return (
-    <nav class="navbar">
-      <div class="navbar-inner">
-        <div class="navbar-brand">
-          <div class="logo-name">{NAME}</div>
-        </div>
-        <div class="navbar-nav" id="navbar-nav">
-          <a class={`navbar-link${active === "entries" ? " active" : ""}`} href="/">Entries</a>
-          <a class={`navbar-link${active === "style-guide" ? " active" : ""}`} href="/style-guide">Style guide</a>
-        </div>
-        {signedIn ? (
-          <form method="post" action="/logout" class="navbar-actions">
-            <button class="btn btn-secondary btn-sm" type="submit">Sign out</button>
-          </form>
-        ) : null}
+    <button class="btn btn-icon btn-sm" data-theme-toggle aria-pressed="false" aria-label="Switch to light theme">
+      <svg class="icon-sun" aria-hidden="true"><use href="#i-sun" /></svg>
+      <svg class="icon-moon" aria-hidden="true"><use href="#i-moon" /></svg>
+    </button>
+  );
+}
+
+/**
+ * The queue's draft count. The htmx list fragment re-renders it out of band, so an action round
+ * that moves a draft cannot leave the sidebar stale.
+ */
+function DraftBadge({ count, oob = false }: { count: number; oob?: boolean }) {
+  return (
+    <span class="nav-badge" id="entries-badge" hx-swap-oob={oob ? "true" : undefined}>
+      {count}
+    </span>
+  );
+}
+
+/**
+ * The app shell every full page shares: the mobile topbar and overlay outside the grid, then the
+ * sidebar and the page column. Under 768px the same `.sidebar` element is the drawer, which is
+ * why there is no second navigation tree and why ui.js's drawer and rail controllers both act on
+ * this one node.
+ */
+function Shell({
+  signedIn,
+  active,
+  draftCount,
+  children,
+}: {
+  signedIn: boolean;
+  active: NavSection;
+  draftCount: number;
+  children: Child;
+}) {
+  return (
+    <>
+      <div class="mobile-topbar">
+        <div class="logo-name">{NAME}</div>
+        <button
+          type="button"
+          class="hamburger"
+          id="hamburger-btn"
+          aria-label="Open navigation"
+          aria-expanded="false"
+          aria-controls="sidebar"
+        >
+          <svg aria-hidden="true"><use href="#i-menu" /></svg>
+        </button>
       </div>
-    </nav>
+      <div class="sidebar-overlay" id="sidebar-overlay"></div>
+      <div class="layout">
+        <nav class="sidebar" id="sidebar" aria-label="Dashboard">
+          <div class="sidebar-logo">
+            <div><div class="logo-name">{NAME}</div></div>
+            <button
+              class="sidebar-collapse"
+              type="button"
+              aria-controls="sidebar"
+              aria-expanded="true"
+              aria-label="Collapse sidebar"
+            >
+              <svg aria-hidden="true"><use href="#i-chevron-left" /></svg>
+            </button>
+          </div>
+          <div class="sidebar-nav">
+            <div class="nav-group">
+              <div class="nav-group-label">Queue</div>
+              <a
+                class={`nav-item${active === "entries" ? " active" : ""}`}
+                href="/"
+                aria-current={active === "entries" ? "true" : undefined}
+              >
+                <span>Entries</span>
+                <DraftBadge count={draftCount} />
+              </a>
+            </div>
+            <div class="nav-group">
+              <div class="nav-group-label">Content</div>
+              <a
+                class={`nav-item${active === "style-guide" ? " active" : ""}`}
+                href="/style-guide"
+                aria-current={active === "style-guide" ? "true" : undefined}
+              >
+                <span>Style guide</span>
+              </a>
+            </div>
+          </div>
+          <div class="sidebar-user">
+            <ThemeToggle />
+            {signedIn ? (
+              <form method="post" action="/logout">
+                <button class="btn btn-secondary btn-sm" type="submit">Sign out</button>
+              </form>
+            ) : null}
+          </div>
+        </nav>
+        <main class="page" id="main">{children}</main>
+      </div>
+    </>
+  );
+}
+
+/**
+ * The queue's header meta: the actionable count, the store total, and the project count. The
+ * htmx list fragment re-renders it out of band, so an action round moves the numbers with it.
+ */
+function PageMeta({
+  draftCount,
+  total,
+  projects,
+  oob = false,
+}: {
+  draftCount: number;
+  total: number;
+  projects: number;
+  oob?: boolean;
+}) {
+  return (
+    <div class="page-meta" id="page-meta" hx-swap-oob={oob ? "true" : undefined}>
+      <span class="page-meta-item">
+        <span class="num">{draftCount}</span> {draftCount === 1 ? "draft waiting" : "drafts waiting"}
+      </span>
+      <span class="page-meta-item">
+        <span class="num">{total}</span> {total === 1 ? "entry" : "entries"}
+      </span>
+      <span class="page-meta-item">
+        <span class="num">{projects}</span> {projects === 1 ? "project" : "projects"}
+      </span>
+    </div>
+  );
+}
+
+/**
+ * The one status control: an underline tab strip of submit buttons inside the filters form, so a
+ * click submits the form with its `status` value with or without JS. The Open tab is the default
+ * view (draft + approved) and carries no filter value; the badge counts come off the store's one
+ * grouped read, never the filtered rows. In the htmx fragment the strip rides an out-of-band swap,
+ * since the list region is the only main target.
+ */
+function StatusTabs({ counts, status, oob = false }: { counts: Record<EntryStatus, number>; status: string; oob?: boolean }) {
+  const open = counts.draft + counts.approved;
+  return (
+    <div class="tabs-wrap status-tabs" id="status-tabs" hx-swap-oob={oob ? "true" : undefined}>
+      <div class="tabs" role="group" aria-label="Status">
+        <button
+          class={`tab${status === "" ? " active" : ""}`}
+          type="submit"
+          name="status"
+          value=""
+          aria-current={status === "" ? "true" : undefined}
+        >
+          <span>Open</span><span class="tab-badge num">{open}</span>
+        </button>
+        {STATUSES.map((s) => (
+          <button
+            class={`tab${status === s ? " active" : ""}`}
+            type="submit"
+            name="status"
+            value={s}
+            aria-current={status === s ? "true" : undefined}
+          >
+            <span>{STATUS_LABEL[s]}</span><span class="tab-badge num">{counts[s]}</span>
+          </button>
+        ))}
+      </div>
+    </div>
+  );
+}
+
+/**
+ * The toolbar's count line: the visible rows over the store total, right-aligned on the filter
+ * row, plus the way back to the default view while a filter is active. The htmx fragment
+ * re-renders it out of band with every action round.
+ */
+function ListMeta({ vm, oob = false }: { vm: ListViewModel; oob?: boolean }) {
+  return (
+    <div id="list-meta" class="list-meta" hx-swap-oob={oob ? "true" : undefined}>
+      <span class="pagination-count num">
+        {vm.shown} of {vm.total} {vm.total === 1 ? "entry" : "entries"}
+      </span>
+      {vm.filtersActive ? <a class="btn btn-secondary btn-sm" href="/">Clear filters</a> : null}
+    </div>
   );
 }
 
-function PageHeader({ total }: { total: number }) {
+function PageHeader({ vm }: { vm: ListViewModel }) {
   return (
     <header class="page-header">
       <div class="page-header-body">
         <h1 class="page-title">Entries</h1>
-        <div class="page-meta">
-          <span class="page-meta-item">{total} {total === 1 ? "entry" : "entries"}</span>
-        </div>
+        <PageMeta draftCount={vm.counts.draft} total={vm.total} projects={vm.projects.length} />
       </div>
     </header>
   );
 }
 
+/**
+ * One dropdown filter as the system `.select`: the trigger shows the current label, the menu
+ * carries one option per value, and a hidden input carries the submission. The hidden input ships
+ * disabled with its name already on it, so a no-JS submit reads the `<noscript>` native selects
+ * instead of a stale hidden value; dashboard.js enables the hidden ones once the widgets are live.
+ */
+function FilterSelect({
+  id,
+  label,
+  field,
+  current,
+  options,
+}: {
+  id: string;
+  label: string;
+  field: string;
+  current: string;
+  options: readonly { value: string; label: string }[];
+}) {
+  const currentLabel = options.find((option) => option.value === current)?.label ?? options[0]!.label;
+  return (
+    <>
+      <span class="sr-only" id={`${id}-label`}>{label}</span>
+      <div class="select" data-filter={field}>
+        <button
+          type="button"
+          class="input select-trigger"
+          role="combobox"
+          aria-expanded="false"
+          aria-haspopup="listbox"
+          aria-labelledby={`${id}-label`}
+        >
+          <span class="select-value">{currentLabel}</span>
+          <svg class="select-caret" aria-hidden="true"><use href="#i-chevron-down" /></svg>
+        </button>
+        <div class="select-menu" role="listbox" aria-labelledby={`${id}-label`}>
+          {options.map((option) => (
+            <div
+              class="menu-item"
+              role="option"
+              aria-selected={String(option.value === current)}
+              data-value={option.value}
+            >
+              {option.label}
+            </div>
+          ))}
+        </div>
+      </div>
+      <input type="hidden" name={field} value={current} data-filter-field={field} disabled />
+    </>
+  );
+}
+
+/**
+ * The queue's controls: the status tab strip above the search and project row, and the count line
+ * on the row's end edge. The tabs submit the same form, so one GET request carries whatever the
+ * clicker set.
+ */
 function FilterForm({ vm }: { vm: ListViewModel }) {
+  const projectOptions = [
+    { value: "", label: "All projects" },
+    ...vm.projects.map((project) => ({ value: project.slug, label: project.slug })),
+  ];
   return (
     <form
       id="filters"
@@ -262,83 +461,110 @@ function FilterForm({ vm }: { vm: ListViewModel }) {
       hx-target="#entries-list"
       hx-swap="innerHTML"
       hx-indicator="#entries-loading"
-      class="filters"
     >
-      <div class="field">
-        <label class="field-label" for="q">Search</label>
-        <input
-          class="input"
-          id="q"
-          name="q"
-          type="search"
-          placeholder="Search file, anchor, or text"
-          value={vm.q}
-        />
-      </div>
-      <div class="field">
-        <label class="field-label" for="status">Status</label>
-        <select class="input" id="status" name="status">
-          <option value="" selected={vm.status === ""}>Active</option>
-          <option value="all" selected={vm.status === "all"}>All statuses</option>
-          <option value="draft" selected={vm.status === "draft"}>Draft</option>
-          <option value="approved" selected={vm.status === "approved"}>Approved</option>
-          <option value="applied" selected={vm.status === "applied"}>Applied</option>
-          <option value="rejected" selected={vm.status === "rejected"}>Rejected</option>
-        </select>
+      {/* The form's first submit button is the default for an implicit submit (Enter in the
+          search field without JS): it carries the current status, so Enter never resets the
+          filter to Open. Visually hidden and out of the tab order; dashboard.js drops the name
+          once the widget path owns the status, so only the hidden field ever submits. */}
+      <button class="sr-only" type="submit" name="status" value={vm.status} tabindex={-1} aria-hidden="true">
+        Apply filters
+      </button>
+      {/* The strip's own attributes are the markup contract, so the named scroller that carries
+          the five tabs on a narrow screen is this wrapper: it keeps the scroll position when an
+          action round swaps the strip inside it. */}
+      <div class="status-scroll" data-scroll-fade>
+        <StatusTabs counts={vm.counts} status={vm.status} />
       </div>
-      <div class="field">
-        <label class="field-label" for="project">Project</label>
-        <select class="input" id="project" name="project">
-          <option value="">All projects</option>
-          {vm.projects.map((project) => (
-            <option value={project.slug} selected={vm.project === project.slug}>
-              {project.slug}
-            </option>
-          ))}
-        </select>
+      {/* The selected status the other fields submit under: the tab buttons carry it on a click,
+          and dashboard.js mirrors it here so a search or project change cannot silently drop back
+          to the Open view. Ships disabled so a no-JS submit reads the clicked tab, never a stale
+          hidden value. */}
+      <input type="hidden" name="status" value={vm.status} data-filter-field="status" disabled />
+      <div class="filter-bar">
+        <div class="input-wrap has-icon filter-search">
+          <div class="input-icon">
+            <svg aria-hidden="true"><use href="#i-search" /></svg>
+          </div>
+          <label class="sr-only" for="q">Search</label>
+          <input
+            class="input"
+            id="q"
+            name="q"
+            type="search"
+            placeholder="Search file, anchor, or text"
+            value={vm.q}
+          />
+        </div>
+        <FilterSelect id="filter-project" label="Project" field="project" current={vm.project} options={projectOptions} />
+        {/* The no-JS submit path: a native select carrying the name the hidden input holds, so the
+            filters still work with scripting off. With JS on, this block is not in the DOM. */}
+        <noscript>
+          <label class="sr-only" for="project-native">Project</label>
+          <select class="input" id="project-native" name="project">
+            {projectOptions.map((option) => (
+              <option value={option.value} selected={option.value === vm.project}>{option.label}</option>
+            ))}
+          </select>
+          {/* The explicit submit carries the current status too, since the hidden field above
+              ships disabled without JS. */}
+          <button class="btn btn-primary" type="submit" name="status" value={vm.status}>Apply filters</button>
+        </noscript>
+        <ListMeta vm={vm} />
       </div>
-      <noscript>
-        <button class="btn btn-primary" type="submit">Apply filters</button>
-      </noscript>
     </form>
   );
 }
 
 /**
- * What an action round settles into, rendered above the list region: a single refusal (one entry
- * could not move, why, and the fix) or the batch report (how many moved, each refusal named).
- * The route layer builds these from the store's outcomes; the view owns the shapes.
+ * What an action round settles into, rendered as the page's one banner: a single refusal (one
+ * entry could not move, why, and the fix) or the batch report (how many moved, each refusal
+ * named). The route layer builds these from the store's outcomes; the view owns the shapes.
  */
 export type ListNotice =
   | { readonly kind: "refusal"; readonly title: string; readonly message: string }
   | { readonly kind: "batch"; readonly approved: number; readonly total: number; readonly refused: readonly string[] };
 
-/** The settled rendering of a notice: a success panel when a batch fully moved, an alert otherwise. */
-function NoticeCallout({ notice }: { notice: ListNotice }) {
+/** The banner's one dismiss control; ui.js's initDismiss removes the banner it belongs to. */
+function BannerDismiss() {
+  return (
+    <button type="button" class="close" aria-label="Dismiss">
+      <svg aria-hidden="true"><use href="#i-x" /></svg>
+    </button>
+  );
+}
+
+/** An action round's settled outcome as the page's one banner: a success panel when a batch fully moved, an alert otherwise. */
+function NoticeBanner({ notice }: { notice: ListNotice }) {
   if (notice.kind === "refusal") {
-    return <DangerCallout title={notice.title} body={notice.message} />;
+    return (
+      <div class="banner banner-danger" role="alert" tabindex={-1}>
+        <span class="banner-icon"><svg aria-hidden="true"><use href="#i-error" /></svg></span>
+        <div class="banner-body">
+          <div class="banner-title">{notice.title}</div>
+          <div class="banner-text">{notice.message}</div>
+        </div>
+        <BannerDismiss />
+      </div>
+    );
   }
   if (notice.refused.length === 0) {
     return (
-      <div class="callout callout-success" role="status">
-        <div class="callout-icon">
-          <svg aria-hidden="true"><use href="#i-success" /></svg>
-        </div>
-        <div class="callout-content">
-          <div class="callout-title">
+      <div class="banner banner-success" role="status" tabindex={-1}>
+        <span class="banner-icon"><svg aria-hidden="true"><use href="#i-success" /></svg></span>
+        <div class="banner-body">
+          <div class="banner-title">
             Approved {notice.approved} {notice.approved === 1 ? "entry" : "entries"}
           </div>
         </div>
+        <BannerDismiss />
       </div>
     );
   }
   return (
-    <div class="callout callout-danger" role="alert">
-      <div class="callout-icon">
-        <svg aria-hidden="true"><use href="#i-error" /></svg>
-      </div>
-      <div class="callout-content">
-        <div class="callout-title">
+    <div class="banner banner-danger" role="alert" tabindex={-1}>
+      <span class="banner-icon"><svg aria-hidden="true"><use href="#i-error" /></svg></span>
+      <div class="banner-body">
+        <div class="banner-title">
           Approved {notice.approved} of {notice.total} entries
         </div>
         <ul class="notice-list">
@@ -347,58 +573,46 @@ function NoticeCallout({ notice }: { notice: ListNotice }) {
           ))}
         </ul>
       </div>
+      <BannerDismiss />
+    </div>
+  );
+}
+
+/** The page's one banner slot; the htmx fragment replaces it out of band so a round can set or clear it. */
+function PageBanner({ notice, oob = false }: { notice: ListNotice | undefined; oob?: boolean }) {
+  return (
+    <div id="page-banner" hx-swap-oob={oob ? "true" : undefined}>
+      {notice !== undefined ? <NoticeBanner notice={notice} /> : null}
     </div>
   );
 }
 
-/** The settled list region: success, empty, or partial, with an action round's notice on top. The loading and error states are client-side. */
-function ListRegion({ vm, notice }: { vm: ListViewModel; notice: ListNotice | undefined }) {
+/** The settled list region: the tables, or one of the three empty states. The loading and error states are client-side. */
+function ListRegion({ vm }: { vm: ListViewModel }) {
   if (vm.shown === 0) {
     // Zero entries at all is "no entries yet" even under a filter: nothing exists to filter, and
     // the empty state explains how entries get here. A store with entries but no matches is either
-    // a filter miss or the default Active view over a store full of applied and rejected entries.
-    return (
-      <>
-        {notice !== undefined ? <NoticeCallout notice={notice} /> : null}
-        {vm.total === 0 ? (
-          <EmptyAll />
-        ) : vm.filtersActive ? (
-          <EmptyMatch
-            revealAllHref={
-              vm.hiddenByActiveView
-                ? `/?q=${encodeURIComponent(vm.q)}&project=${encodeURIComponent(vm.project)}&status=all`
-                : undefined
-            }
-          />
-        ) : (
-          <EmptyActive />
-        )}
-      </>
+    // a filter miss or the default Open view over a store full of applied and rejected entries.
+    return vm.total === 0 ? (
+      <EmptyAll />
+    ) : vm.filtersActive ? (
+      <EmptyMatch
+        revealAllHref={
+          vm.hiddenByActiveView
+            ? `/?q=${encodeURIComponent(vm.q)}&project=${encodeURIComponent(vm.project)}&status=all`
+            : undefined
+        }
+      />
+    ) : (
+      <EmptyActive />
     );
   }
-  return (
-    <>
-      {notice !== undefined ? <NoticeCallout notice={notice} /> : null}
-      {vm.filtersActive && vm.shown < vm.total ? <PartialHeader shown={vm.shown} total={vm.total} /> : null}
-      <BatchForm vm={vm} />
-    </>
-  );
-}
-
-function PartialHeader({ shown, total }: { shown: number; total: number }) {
-  return (
-    <div class="partial-header">
-      <span class="partial-count">
-        Showing {shown} of {total} entries
-      </span>
-      <a href="/" class="btn btn-secondary btn-sm">Clear filters</a>
-    </div>
-  );
+  return <BatchForm vm={vm} />;
 }
 
 function EmptyAll() {
   return (
-    <div class="card empty-state">
+    <div class="empty-state">
       <svg aria-hidden="true"><use href="#i-file" /></svg>
       <div class="empty-title">No entries yet</div>
       <div>Agents file text through the reviewzy mcp endpoint. Filed entries appear here.</div>
@@ -407,14 +621,14 @@ function EmptyAll() {
 }
 
 /**
- * The filter-miss state, with a way onward. When the default Active view is what hides the
+ * The filter-miss state, with a way onward. When the default Open view is what hides the
  * matches (a search that only hits applied or rejected rows), the way onward is the all-statuses
- * view under the same filters — clearing the filters alone would land back on the Active view
+ * view under the same filters — clearing the filters alone would land back on the Open view
  * and still show nothing.
  */
 function EmptyMatch({ revealAllHref }: { revealAllHref: string | undefined }) {
   return (
-    <div class="card empty-state">
+    <div class="empty-state">
       <svg aria-hidden="true"><use href="#i-search" /></svg>
       <div class="empty-title">No entries match</div>
       <div>Try different search terms, or clear the filters.</div>
@@ -429,10 +643,10 @@ function EmptyMatch({ revealAllHref }: { revealAllHref: string | undefined }) {
   );
 }
 
-/** The default Active view over a store whose entries are all applied or rejected: nothing to do, no filters to clear. */
+/** The default Open view over a store whose entries are all applied or rejected: nothing to do, no filters to clear. */
 function EmptyActive() {
   return (
-    <div class="card empty-state">
+    <div class="empty-state">
       <svg aria-hidden="true"><use href="#i-success" /></svg>
       <div class="empty-title">Nothing to review</div>
       <div>Every filed entry is applied or rejected. New drafts appear here as agents file them.</div>
@@ -441,11 +655,12 @@ function EmptyActive() {
 }
 
 /**
- * The batch approve form wrapping the whole list region: the checkboxes post as `id`, the hidden
+ * The batch approve form wrapping every project table: the checkboxes post as `id`, the hidden
  * inputs carry the active filters so an action round re-renders the region under the same filter
  * (htmx includes the closest form's inputs for the row buttons too), and the native action keeps
  * no-JS batch approve working. One form per page, never nested: the filters form lives outside the
- * swap region.
+ * swap region. The submit ships ENABLED so the no-JS path can fire it (an empty selection answers
+ * its refusal); dashboard.js disables it at first paint and enables it on a checked box.
  */
 function BatchForm({ vm }: { vm: ListViewModel }) {
   return (
@@ -461,123 +676,92 @@ function BatchForm({ vm }: { vm: ListViewModel }) {
       <input type="hidden" name="q" value={vm.q} />
       <input type="hidden" name="status" value={vm.status} />
       <input type="hidden" name="project" value={vm.project} />
-      <div class="batch-bar">
-        <button class="btn btn-primary btn-sm" type="submit" hx-disabled-elt="this">
+      <div class="toolbar batch-bar section-sticky">
+        <button class="btn btn-fill btn-sm" type="submit" hx-disabled-elt="this">
           Approve selected
         </button>
       </div>
       {vm.groups.map((group) => (
-        <ProjectGroupView key={group.slug} group={group} />
+        <ProjectTable key={group.slug} group={group} />
       ))}
     </form>
   );
 }
 
-function ProjectGroupView({ group }: { group: ProjectGroup }) {
-  const count = group.batches.reduce((n, batch) => n + batch.entries.length, 0);
-  return (
-    <section class="project-group">
-      <header class="project-header">
-        <h2 class="project-name">{group.slug}</h2>
-        <span class="tag tag-data">
-          {count} {count === 1 ? "entry" : "entries"}
-        </span>
-        {/* Every section and batch ships open; dashboard.js collapses the ones this viewer
-            collapsed before (localStorage) and keeps the buttons inert without JS. */}
-        <button
-          type="button"
-          class="btn btn-icon collapse-toggle"
-          aria-expanded="true"
-          aria-controls={`project-batches-${group.slug}`}
-          aria-label={`Toggle ${group.slug} section`}
-          data-collapse-toggle
-          data-collapse-target={`project-batches-${group.slug}`}
-          data-collapse-key={`project:${group.slug}`}
-        >
-          <svg aria-hidden="true"><use href="#i-chevron-down" /></svg>
-        </button>
-      </header>
-      <div id={`project-batches-${group.slug}`}>
-        {group.batches.map((batch) => (
-          <BatchView key={batch.id} batch={batch} />
-        ))}
-      </div>
-    </section>
-  );
-}
-
-function BatchView({ batch }: { batch: ProjectBatch }) {
-  // A batch names its filer in the header only when every entry agrees on one non-null
-  // value; a disagreement leaves the header filer-less and each row names its own inline.
-  const filedBy = batch.entries.map((entry) => entry.filed_by);
-  const allAgree = filedBy.every((filer) => filer === filedBy[0]);
-  const singleFiler = allAgree && filedBy[0] !== null ? filedBy[0] : null;
-  const mixedFilers = !allAgree && filedBy.some((filer) => filer !== null);
+/**
+ * One project's entries as one dense table. The project is a heading, not a disclosure: batches
+ * stay a data concept behind the row selection and the one approve action. The select-all sits in
+ * the header and drives this table's drafts through ui.js's per-wrap state machine.
+ */
+function ProjectTable({ group }: { group: ProjectGroup }) {
+  const count = group.entries.length;
+  const drafts = group.entries.filter((entry) => entry.status === "draft").length;
+  const draftWord = drafts === 1 ? "draft" : "drafts";
+  const entryWord = count === 1 ? "entry" : "entries";
   return (
-    <div class="batch">
-      <div class="batch-header">
-        {/* Select-all toggles only this batch's draft rows. No `name`, so it never submits as
-            an entry id; dashboard.js derives checked/indeterminate from the draft checkboxes. */}
-        <label class="checkbox-label">
-          <input type="checkbox" class="select-all" aria-label={`Select all drafts in batch ${shortUlid(batch.id)}`} />
-        </label>
-        {singleFiler !== null ? <span class="batch-meta">{singleFiler}</span> : null}
-        <button
-          type="button"
-          class="btn btn-icon collapse-toggle"
-          aria-expanded="true"
-          aria-controls={`batch-table-${batch.id}`}
-          aria-label={`Toggle batch ${shortUlid(batch.id)}`}
-          data-collapse-toggle
-          data-collapse-target={`batch-table-${batch.id}`}
-          data-collapse-key={`batch:${batch.id}`}
-        >
-          <svg aria-hidden="true"><use href="#i-chevron-down" /></svg>
-        </button>
+    <section class="project-section">
+      <div class="section-head project-head">
+        <h2 class="section-title project-name">{group.slug}</h2>
+        <p class="section-lede project-meta">
+          {drafts > 0 ? `${drafts} ${draftWord} · ${count} ${entryWord}` : `${count} ${entryWord}`}
+        </p>
       </div>
-      <div class="table-wrap" id={`batch-table-${batch.id}`}>
+      <div class="table-wrap table-dense">
         <table>
           <colgroup>
             <col class="col-select" />
             <col />
             <col class="col-status" />
-            <col class="col-file" />
+            <col class="col-filed" />
             <col class="col-actions" />
           </colgroup>
           <thead>
             <tr>
-              {/* The column header stays in the accessibility tree via the sr-only span; the
-                  checkbox column itself is too narrow for a visible label. */}
-              <th class="cell-select" scope="col"><span class="sr-only">Select</span></th>
-              <th scope="col">Title</th>
+              {/* The select-all lives in the checkbox column: ui.js's initTables owns the
+                  checked and indeterminate state machine for the wrap. No `name`, so it never
+                  submits as an entry id; only the draft checkboxes post as `id`. */}
+              <th class="cell-select" scope="col">
+                <span class="sr-only">Select</span>
+                <label class="checkbox-label">
+                  <input type="checkbox" data-select-all aria-label={`Select all drafts in ${group.slug}`} />
+                </label>
+              </th>
+              <th scope="col">Entry</th>
               <th scope="col">Status</th>
-              <th scope="col">File</th>
+              <th class="cell-filed" scope="col">Filed</th>
               <th scope="col">Actions</th>
             </tr>
           </thead>
           <tbody>
-            {batch.entries.map((entry) => (
-              <EntryRowView key={entry.id} entry={entry} filerInline={mixedFilers} />
+            {group.entries.map((entry) => (
+              <EntryRowView key={entry.id} entry={entry} />
             ))}
           </tbody>
         </table>
       </div>
-    </div>
+    </section>
   );
 }
 
+/** The filed time, absolute and short: UTC date plus minutes, so the stamp reads the same wherever the server runs. */
+function filedStamp(createdAt: number): { iso: string; short: string } {
+  const iso = new Date(createdAt).toISOString();
+  return { iso, short: `${iso.slice(0, 10)} ${iso.slice(11, 16)}` };
+}
+
 /**
- * One row. The checkbox names the entry for the batch form; it exists only on drafts, because an
- * approve on any other status always refuses and a checkbox that can only refuse is noise (races
- * are still reported per entry). The status chip sits beside the title; the three icon action slots
- * always render, inapplicable ones disabled, so a double-click's second click lands on the disabled
- * slot rather than a shifted action. Approve and reject target the list region and include the
- * batch form's hidden filters, so an action round re-renders the region under the same filter; the
- * editor link is always present. When the batch holds mixed filers, the row also names its own
- * filer beside the title.
+ * One row. The Entry cell leads with the title as a link over the file path; the checkbox names
+ * the entry for the batch form (and `data-name` hands it to the selection controller); it exists
+ * only on drafts, because an approve on any other status always refuses and a checkbox that can
+ * only refuse is noise (races are still reported per entry). The status chip sits in its own
+ * column; the three icon action slots always render, inapplicable ones disabled, so a
+ * double-click's second click lands on the disabled slot rather than a shifted action. Approve
+ * and reject target the list region and include the batch form's hidden filters, so an action
+ * round re-renders the region under the same filter; the editor link is always present.
  */
-function EntryRowView({ entry, filerInline }: { entry: EntryRow; filerInline: boolean }) {
+function EntryRowView({ entry }: { entry: EntryRow }) {
   const title = entryTitle(entry);
+  const filed = filedStamp(entry.created_at);
   const approve = entry.status === "draft";
   const reject = entry.status === "draft" || entry.status === "approved";
   return (
@@ -585,26 +769,33 @@ function EntryRowView({ entry, filerInline }: { entry: EntryRow; filerInline: bo
       <td class="cell-select">
         {approve ? (
           <label class="checkbox-label">
-            <input type="checkbox" name="id" value={entry.id} aria-label={`Select ${entry.file}`} />
+            <input type="checkbox" name="id" value={entry.id} data-name={entry.id} aria-label={`Select ${entry.file}`} />
           </label>
         ) : null}
       </td>
-      <td title={`${entry.file} — ${entry.anchor_text}`}>
+      <td>
         <div class="entry-head">
-          <span class="entry-title">{title}</span>
-          {filerInline && entry.filed_by !== null ? <span class="entry-filer"> · {entry.filed_by}</span> : null}
+          <a class="entry-link truncate" href={`/entries/${entry.id}`}>{title}</a>
+          <span class="entry-file truncate">{entry.file}</span>
         </div>
+        {/* A titled entry displays the title in place of the anchor text, so the anchor the entry
+            changes would otherwise reach no one but the editor. */}
+        {hasOwnTitle(entry) ? <span class="sr-only">{entry.anchor_text}</span> : null}
       </td>
       <td>
-        <span class={`tag ${STATUS_TAG[entry.status]}`}>{STATUS_LABEL[entry.status]}</span>
+        <span class={`tag ${STATUS_TAG[entry.status]}`}>
+          <span class="tag-dot"></span>
+          {STATUS_LABEL[entry.status]}
+        </span>
+      </td>
+      <td class="cell-filed">
+        <time class="num" datetime={filed.iso}>{filed.short}</time>
       </td>
-      <td class="cell-file" title={entry.file}>{entry.file}</td>
       <td class="cell-actions">
         {approve ? (
           <button
             type="button"
-            class="btn btn-icon"
-            style="color: var(--success)"
+            class="btn btn-icon action-approve"
             aria-label={`Approve ${entry.file}`}
             hx-post={`/entries/${entry.id}/approve`}
             hx-target="#entries-list"
@@ -617,15 +808,14 @@ function EntryRowView({ entry, filerInline }: { entry: EntryRow; filerInline: bo
         ) : (
           // The approve slot stays occupied on every non-draft row: a double-click's second click
           // lands on the disabled button (pointer-events none) rather than the next slot.
-          <button type="button" class="btn btn-icon" style="color: var(--success)" aria-label={`Approve ${entry.file}`} disabled>
+          <button type="button" class="btn btn-icon action-approve" aria-label={`Approve ${entry.file}`} disabled>
             <svg aria-hidden="true"><use href="#i-check" /></svg>
           </button>
         )}
         {reject ? (
           <button
             type="button"
-            class="btn btn-icon"
-            style="color: var(--danger)"
+            class="btn btn-icon action-reject"
             aria-label={`Reject ${entry.file}`}
             hx-post={`/entries/${entry.id}/reject`}
             hx-target="#entries-list"
@@ -637,7 +827,7 @@ function EntryRowView({ entry, filerInline }: { entry: EntryRow; filerInline: bo
           </button>
         ) : (
           // The reject slot stays occupied on applied and rejected rows for the same guard.
-          <button type="button" class="btn btn-icon" style="color: var(--danger)" aria-label={`Reject ${entry.file}`} disabled>
+          <button type="button" class="btn btn-icon action-reject" aria-label={`Reject ${entry.file}`} disabled>
             <svg aria-hidden="true"><use href="#i-x" /></svg>
           </button>
         )}
@@ -649,26 +839,6 @@ function EntryRowView({ entry, filerInline }: { entry: EntryRow; filerInline: bo
   );
 }
 
-/** The error box htmx failures clone into the list region; the retry button re-submits the form. */
-function ErrorBoxTemplate() {
-  return (
-    <template id="error-box">
-      <div class="callout callout-danger" role="alert">
-        <div class="callout-icon">
-          <svg aria-hidden="true"><use href="#i-error" /></svg>
-        </div>
-        <div class="callout-content">
-          <div class="callout-title">The list could not be loaded</div>
-          <div class="callout-body">The filter request failed. Try it again.</div>
-          <div class="callout-actions">
-            <button class="btn btn-secondary btn-sm" type="button" data-retry>Retry</button>
-          </div>
-        </div>
-      </div>
-    </template>
-  );
-}
-
 /** The saved theme, restored before the stylesheet, or a light-theme visitor sees a dark flash. */
 const THEME_RESTORE = raw(
   'const saved = localStorage.getItem("cloudy-theme"); if (saved) document.documentElement.dataset.theme = saved;',
@@ -694,7 +864,7 @@ function PageHead({ title }: { title: string }) {
   );
 }
 
-/** The sprite as the body's first child; cursor.js creates its own canvas and nothing else may enter that slot. */
+/** The sprite in the body; cursor.js creates its own canvas and nothing else may enter that slot. */
 function IconSprite() {
   return <>{raw(ICON_SPRITE)}</>;
 }
@@ -709,7 +879,7 @@ function PageModules() {
   );
 }
 
-/** The full page for a plain navigation; the mount wraps it in the doctype. `signedIn` is whether the navbar offers sign-out. */
+/** The full page for a plain navigation; the mount wraps it in the doctype. `signedIn` is whether the sidebar offers sign-out. */
 export function dashboardPage(
   store: Store,
   params: ListParams,
@@ -721,11 +891,20 @@ export function dashboardPage(
     <html lang="en" data-theme="dark">
       <PageHead title={`Entries · ${NAME}`} />
       <body>
+        <a class="skip-link" href="#main">Skip to content</a>
         <IconSprite />
-        <div class="app-shell">
-          <Navbar signedIn={signedIn} active="entries" />
-          <main class="main">
-            <PageHeader total={vm.total} />
+        <Shell signedIn={signedIn} active="entries" draftCount={vm.counts.draft}>
+          <PageHeader vm={vm} />
+          <PageBanner notice={notice} />
+          {/* The persistent announcement slot for an action round: the banner may arrive already
+              populated through an out-of-band swap, which a live region does not reliably read. */}
+          <span id="list-live" class="sr-only" aria-live="polite"></span>
+          <section>
+            {/* The eyebrow alone names the section: the page title already reads "Entries",
+                and a second one of the same word stacks two display lines. */}
+            <div class="section-head">
+              <div class="label">Queue</div>
+            </div>
             <FilterForm vm={vm} />
             <div id="entries">
               <div id="entries-loading" class="htmx-indicator" role="status">
@@ -733,12 +912,12 @@ export function dashboardPage(
                 Loading entries
               </div>
               <div id="entries-list">
-                <ListRegion vm={vm} notice={notice} />
+                <ListRegion vm={vm} />
               </div>
             </div>
-            <ErrorBoxTemplate />
-          </main>
-        </div>
+          </section>
+        </Shell>
+        <div class="toast-stack" id="toast-stack"></div>
         <PageModules />
       </body>
     </html>
@@ -746,10 +925,10 @@ export function dashboardPage(
 }
 
 /**
- * The login page: the navbar shell, the page-header triplet, and one centered card holding the
- * password field. `error` is the single failure message, shown as an alert callout; the field
- * itself is always cleared, and `next` rides along as a hidden input so a successful retry still
- * lands where the visitor was going.
+ * The login screen: a viewport-owning page-state with the sign-in card and no shell — the way out
+ * is signing in. `error` is the single failure message, shown as an alert callout inside the
+ * card's flow; the field itself is always cleared, and `next` rides along as a hidden input so a
+ * successful retry still lands where the visitor was going.
  */
 export function loginPage(next: string | undefined, error: string | undefined = undefined): JSX.Element {
   return (
@@ -757,20 +936,21 @@ export function loginPage(next: string | undefined, error: string | undefined =
       <PageHead title={`Sign in · ${NAME}`} />
       <body>
         <IconSprite />
-        <div class="app-shell">
-          <Navbar signedIn={false} active="none" />
-          <main class="main login-main">
-            <header class="page-header">
-              <div class="page-header-body">
-                <div class="label page-eyebrow">Dashboard</div>
-                <h1 class="page-title">Sign in</h1>
-                <p class="page-lede">The dashboard is password protected. Enter the password to continue.</p>
-              </div>
-            </header>
-            {error !== undefined ? <DangerCallout title={error} /> : null}
-            <form method="post" action="/login" class="card login-card">
+        <main class="page-state">
+          <div class="page-state-card">
+            <div class="page-state-brand">
+              <div class="logo-name">{NAME}</div>
+            </div>
+            <form method="post" action="/login" class="card">
               {next !== undefined ? <input type="hidden" name="next" value={next} /> : null}
-              <div class="card-content">
+              <div class="card-header">
+                <div>
+                  <div class="card-title">Sign in</div>
+                  <div class="card-subtitle">The dashboard is password protected. Enter the password to continue.</div>
+                </div>
+              </div>
+              <div class="card-content login-content">
+                {error !== undefined ? <DangerCallout title={error} /> : null}
                 <div class="field">
                   <label class="field-label" for="password">Password</label>
                   <input
@@ -782,32 +962,50 @@ export function loginPage(next: string | undefined, error: string | undefined =
                   />
                 </div>
                 <div class="login-actions">
-                  <button class="btn btn-primary" type="submit">Sign in</button>
+                  <button class="btn btn-fill" type="submit">Sign in</button>
                 </div>
               </div>
             </form>
-          </main>
-        </div>
+          </div>
+        </main>
         <PageModules />
       </body>
     </html>
   );
 }
 
-/** The list region only, for htmx requests; the loading strip and the error template stay in the page. */
+/**
+ * The list region only, for htmx requests. The tabs, the header meta, the count line, the sidebar
+ * badge and the banner sit outside the main swap target, so they ride out-of-band swaps instead of
+ * going stale after an action round.
+ */
 export function entriesFragment(store: Store, params: ListParams, notice: ListNotice | undefined = undefined): JSX.Element {
-  return <ListRegion vm={loadList(store, params)} notice={notice} />;
+  const vm = loadList(store, params);
+  return (
+    <>
+      <DraftBadge count={vm.counts.draft} oob />
+      <PageBanner notice={notice} oob />
+      <StatusTabs counts={vm.counts} status={vm.status} oob />
+      <ListMeta vm={vm} oob />
+      <PageMeta draftCount={vm.counts.draft} total={vm.total} projects={vm.projects.length} oob />
+      <ListRegion vm={vm} />
+    </>
+  );
 }
 
 // ---- Entry editor ----
 
 export type EditorViewModel = {
   readonly entry: EntryRow;
+  /** The entry's project slug, so the header's breadcrumb reads the name the queue groups by. */
+  readonly projectSlug: string;
   readonly revisions: readonly RevisionRow[];
   readonly constraints: Constraints;
   /** The entry immediately before/after in the list's ascending-id walk, or null at the boundary. */
   readonly prevId: string | null;
   readonly nextId: string | null;
+  /** The sidebar's queue badge, read once with the editor's own query. */
+  readonly draftCount: number;
 };
 
 /**
@@ -831,7 +1029,16 @@ export function loadEditor(store: Store, id: string): EditorViewModel | null {
   const entry = getEntry(store, id);
   if (entry === undefined) return null;
   const { prevId, nextId } = adjacentEntryIds(store, id);
-  return { entry, revisions: listRevisions(store, id), constraints: parseConstraints(entry.constraints), prevId, nextId };
+  const projects = listProjects(store);
+  return {
+    entry,
+    projectSlug: projects.find((project) => project.id === entry.project_id)?.slug ?? entry.project_id,
+    revisions: listRevisions(store, id),
+    constraints: parseConstraints(entry.constraints),
+    prevId,
+    nextId,
+    draftCount: countEntriesByStatus(store).draft,
+  };
 }
 
 /** The tolerant parse for `entries.context`, mirroring `parseConstraints`: foreign rows may hold malformed JSON, and unparseable means no context rows, never a 500. */
@@ -850,12 +1057,17 @@ function parseContext(json: string): Record<string, unknown> {
  * The user-facing refusal messages, in the dashboard's own voice: name what failed, then the fix.
  * The store's refusal carries the values; only this function turns them into prose.
  */
+/** A placeholder token as the copy shows it: one pair of braces around the bare name, even when the filed token already carries its own. */
+function bracedPlaceholder(placeholder: string): string {
+  return `{${placeholder.replace(/^\{+|\}+$/g, "")}}`;
+}
+
 export function formatSaveRefusal(refusal: Exclude<HumanSaveRefusal, { kind: "unknown" }>): string {
   switch (refusal.kind) {
     case "max_len":
       return `This text is ${refusal.length} characters; the length limit is ${refusal.maxLen}. Shorten it to ${refusal.maxLen} characters or fewer.`;
     case "placeholder":
-      return `The text is missing the placeholder {${refusal.placeholder}}. Add {${refusal.placeholder}} to the text and save again.`;
+      return `The text is missing the placeholder ${bracedPlaceholder(refusal.placeholder)}. Add ${bracedPlaceholder(refusal.placeholder)} to the text and save again.`;
     case "empty":
       return "Nothing to save. Enter text, or reject the entry.";
     case "status":
@@ -906,245 +1118,483 @@ function DangerCallout({ title, body }: { title: string; body?: string }) {
   );
 }
 
-/**
- * The editor region, swapped wholesale by a save or a transition (form + status tag + history +
- * any refusal). The textarea carries `hx-preserve`, so a swap keeps the user's focus and typing
- * while the server-rendered value stays what the last save left: the submitted text on a refusal.
- * The `view` marker tells the approve and reject routes which region to answer with: this region,
- * or the list's. The buttons carry htmx only; the save button keeps the native submit.
- */
-function EditorRegion({ vm, state }: { vm: EditorViewModel; state: EditorState | undefined }) {
-  const text = state?.submittedText ?? vm.entry.human_text ?? vm.entry.agent_draft ?? "";
-  const approve = vm.entry.status === "draft";
-  const reject = vm.entry.status === "draft" || vm.entry.status === "approved";
-  return (
-    <div id="editor-region">
-      {state?.refusal !== undefined ? (
-        <DangerCallout title={state.refusal.title} body={state.refusal.body} />
-      ) : null}
-      <form
-        id="editor-form"
-        class="card"
-        method="post"
-        action={`/entries/${vm.entry.id}/save`}
-        hx-post={`/entries/${vm.entry.id}/save`}
-        hx-target="#editor-view"
-        hx-swap="outerHTML"
-      >
-        <input type="hidden" name="view" value="editor" />
-        <div class="card-header">
-          <div class="card-title editor-title">{entryTitle(vm.entry)}</div>
-          <span class={`tag ${STATUS_TAG[vm.entry.status]}`}>
-            {STATUS_LABEL[vm.entry.status]}
-          </span>
-        </div>
-        <div class="card-content">
-          <textarea id="editor-text" class="input" name="text" rows={10} aria-label="Entry text" hx-preserve="true">
-            {text}
-          </textarea>
-          <div class="editor-actions">
-            <button class="btn btn-primary" type="submit">Save text</button>
-            {approve ? (
-              <button
-                type="button"
-                class="btn btn-secondary"
-                hx-post={`/entries/${vm.entry.id}/approve`}
-                hx-target="#editor-region"
-                hx-swap="outerHTML"
-                hx-indicator="#editor-action-loading"
-                hx-disabled-elt="this"
-              >
-                Approve draft
-              </button>
-            ) : vm.entry.status === "approved" ? (
-              // Same slot-occupancy guard as the list row: the second click of a double-click on
-              // the just-approving button would otherwise land on the Reject button that shifts
-              // into this slot in the swapped region.
-              <button type="button" class="btn btn-secondary" disabled>
-                Approve draft
-              </button>
-            ) : null}
-            {reject ? (
-              <button
-                type="button"
-                class="btn btn-danger"
-                hx-post={`/entries/${vm.entry.id}/reject`}
-                hx-target="#editor-region"
-                hx-swap="outerHTML"
-                hx-indicator="#editor-action-loading"
-                hx-disabled-elt="this"
-              >
-                Reject
-              </button>
-            ) : null}
-            <span id="editor-action-loading" class="htmx-indicator" role="status">
-              <span class="spinner" aria-hidden="true"></span>
-              Updating entry
-            </span>
-          </div>
-        </div>
-      </form>
-      <RevisionHistory revisions={vm.revisions} />
-    </div>
-  );
-}
-
-function RevisionHistory({ revisions }: { revisions: readonly RevisionRow[] }) {
+function InfoCallout({ title, body }: { title: string; body?: string }) {
   return (
-    <div class="card">
-      <div class="card-header">
-        <div class="card-title">Revision history</div>
+    <div class="callout callout-info">
+      <div class="callout-icon">
+        <svg aria-hidden="true"><use href="#i-info" /></svg>
       </div>
-      <div class="card-content">
-        {revisions.length === 0 ? (
-          <p class="history-empty">No saved revisions yet</p>
-        ) : (
-          <ul class="revision-list">
-            {revisions.map((revision) => (
-              <li class="revision" key={revision.id}>
-                <div class="revision-head">
-                  <span class={`tag tag-data ${STATUS_TAG[revision.status]}`}>{STATUS_LABEL[revision.status]}</span>
-                  <time class="revision-time" datetime={new Date(revision.created_at).toISOString()}>
-                    {new Date(revision.created_at).toLocaleString()}
-                  </time>
-                  <button class="btn btn-secondary btn-sm" type="button" data-use-revision>
-                    Use
-                  </button>
-                </div>
-                <div class="revision-text">{revision.human_text}</div>
-              </li>
-            ))}
-          </ul>
-        )}
+      <div class="callout-content">
+        <div class="callout-title">{title}</div>
+        {body !== undefined ? <div class="callout-body">{body}</div> : null}
       </div>
     </div>
   );
 }
 
-/** The constraint panel: what the entry's save enforces (length, placeholders), plus the display-only tone. The notes moved to their own card, so the enforced fields stay the card's lead. */
-function ConstraintsCard({ constraints, text }: { constraints: Constraints; text: string }) {
-  const maxLen = constraints.maxLen;
-  const placeholders = constraints.placeholders;
-  const tone = constraints.tone;
-  const hasAny = maxLen !== undefined || placeholders.length > 0 || tone !== undefined;
-  if (!hasAny) return null;
+/** The entry's status tag, in the page header; transitions re-render it out of band. */
+function EntryStatusTag({ status, oob = false }: { status: EntryStatus; oob?: boolean }) {
   return (
-    <div class="card">
-      <div class="card-header">
-        <div class="card-title">Constraints</div>
-      </div>
-      <div class="card-content">
-        {maxLen !== undefined ? (
-          <div class="constraint-row">
-            <div class="constraint-label">Length</div>
-            <div class="constraint-value">
-              <span id="char-count" class="num char-count" data-max-len={maxLen}>
-                {text.length} / {maxLen}
-              </span>
-            </div>
-          </div>
-        ) : null}
-        {placeholders.length > 0 ? (
-          <div class="constraint-row">
-            <div class="constraint-label">Placeholders</div>
-            <ul class="placeholder-list">
-              {placeholders.map((placeholder) => {
-                const present = text.includes(placeholder);
-                return (
-                  <li class="placeholder-item" data-placeholder={placeholder} key={placeholder}>
-                    <span class={`placeholder-state${present ? " is-present" : ""}`}>
-                      {present ? "Present" : "Missing"}
-                    </span>
-                    <span class="placeholder-token">{"{" + placeholder + "}"}</span>
-                  </li>
-                );
-              })}
-            </ul>
-          </div>
-        ) : null}
-        {tone !== undefined ? (
-          <div class="constraint-row">
-            <div class="constraint-label">Tone</div>
-            <div class="constraint-value">{tone}</div>
-          </div>
-        ) : null}
-      </div>
-    </div>
+    <span id="entry-status" hx-swap-oob={oob ? "true" : undefined}>
+      <span class={`tag ${STATUS_TAG[status]}`}>
+        <span class="tag-dot"></span>
+        {STATUS_LABEL[status]}
+      </span>
+    </span>
   );
 }
 
-/**
- * The notes card: the agent's notes (from `constraints.notes`, read-only) above the human's own
- * notes as an editable textarea with its own save. The textarea carries `hx-preserve`, so any swap
- * (a text save, an image add) keeps the human's in-progress note; the save targets the whole
- * editor view like the save form, so the saved value re-renders in place. The card always renders:
- * the human's notes need a home even before the agent sent any.
- */
-function NotesCard({ vm }: { vm: EditorViewModel }) {
+/** One header nav control: a secondary button linking to the neighbour, or an inert placeholder at the boundary. */
+function EditorNavButton({ side, targetId }: { side: "prev" | "next"; targetId: string | null }) {
+  const label = side === "prev" ? "Previous entry" : "Next entry";
+  const icon = (
+    <svg aria-hidden="true"><use href={side === "prev" ? "#i-chevron-left" : "#i-chevron-right"} /></svg>
+  );
+  if (targetId === null) {
+    return (
+      <button class="btn btn-secondary" type="button" disabled aria-label={label}>
+        {icon}
+      </button>
+    );
+  }
   return (
-    <div class="card">
+    <a class="btn btn-secondary" href={`/entries/${targetId}`} aria-label={label}>
+      {icon}
+    </a>
+  );
+}
+
+/**
+ * The editor's page header: the breadcrumb on its own line, then the entry title with the status
+ * tag, repo link, file and filed time under it, and the previous/next pair in the actions cell.
+ */
+function EditorHeader({ vm }: { vm: EditorViewModel }) {
+  const entry = vm.entry;
+  const filed = filedStamp(entry.created_at);
+  return (
+    <header class="page-header">
+      <nav class="breadcrumb" aria-label="Breadcrumb">
+        <a class="breadcrumb-item" href="/">Entries</a>
+        <span class="breadcrumb-sep" aria-hidden="true"></span>
+        <span class="breadcrumb-item current">{vm.projectSlug}</span>
+      </nav>
+      <div class="page-header-body">
+        <h1 class="page-title editor-title">{entryTitle(entry)}</h1>
+        <div class="page-meta">
+          <EntryStatusTag status={entry.status} />
+          <span class="page-meta-item"><RepoValue repo={entry.repo} /></span>
+          <span class="page-meta-item"><span class="page-file truncate">{entry.file}</span></span>
+          <span class="page-meta-item">filed <time class="num" datetime={filed.iso}>{filed.short}</time></span>
+        </div>
+      </div>
+      <div class="toolbar">
+        <EditorNavButton side="prev" targetId={vm.prevId} />
+        <EditorNavButton side="next" targetId={vm.nextId} />
+      </div>
+    </header>
+  );
+}
+
+/**
+ * Whether the change touches both sides: a substitution or rewrite then renders two rows, while an
+ * addition-only or removal-only edit stays on the unified line. On one line a substitution reads as
+ * two differently tinted copies of the same word ("`clauth" then "clauth"), so the two whole rows
+ * keep the sentence readable.
+ */
+function hasBothSides(diff: readonly WordDiffToken[]): boolean {
+  return diff.some((token) => token.kind === "removed") && diff.some((token) => token.kind === "added");
+}
+
+/** One side of a two-row change: the anchor without the additions, or the proposal without the removals, each a whole sentence. */
+function diffSide(diff: readonly WordDiffToken[], side: "anchor" | "proposal"): Child[] {
+  const dropped = side === "anchor" ? "added" : "removed";
+  const mark = side === "anchor" ? "diff-remove" : "diff-add";
+  return diff
+    .filter((token) => token.kind !== dropped)
+    .map((token, index) =>
+      token.kind === "same" ? token.text : <span class={mark} key={index}>{token.text}</span>,
+    );
+}
+
+/**
+ * The change card: the anchored snippet with the anchor line marked, diffed against the compare
+ * text when one is given. A one-sided edit renders the unified stream, so the marks sit in place
+ * while the kept words read once; a change on both sides renders the file text and the proposal as
+ * two whole rows. A null or empty compare renders the anchor plain. The diff route re-renders this
+ * card against the textarea's live value.
+ */
+export function currentTextCard(entry: EntryRow, compareText: string | null): JSX.Element {
+  const diff = compareText === null || compareText === "" ? null : diffWords(entry.anchor_text, compareText);
+  const twoRow = diff !== null && hasBothSides(diff);
+  return (
+    <div class="card current-text-card" id="current-text">
       <div class="card-header">
-        <div class="card-title">Notes</div>
+        <div>
+          <div class="card-title">The change</div>
+          <div class="card-subtitle">Removed words tint red; added words tint green.</div>
+        </div>
       </div>
       <div class="card-content">
-        <div class="constraint-row">
-          <div class="constraint-label">Agent's notes</div>
-          <div class="constraint-value">{vm.constraints.notes ?? "None."}</div>
+        <pre class={twoRow ? "diff-code editor-pane diff-rows" : "diff-code editor-pane"}>
+          <span class="diff-line">{entry.anchor_before}</span>
+          <span class="diff-line diff-anchor annot-mark">
+            {diff === null
+              ? entry.anchor_text
+              : twoRow
+                ? diffSide(diff, "anchor")
+                : diff.map((token, index) =>
+                    token.kind === "same" ? (
+                      token.text
+                    ) : (
+                      <span class={token.kind === "removed" ? "diff-remove" : "diff-add"} key={index}>{token.text}</span>
+                    ),
+                  )}
+          </span>
+          <span class="diff-line">{entry.anchor_after}</span>
+          {twoRow && diff !== null ? <span class="diff-line diff-proposed">{diffSide(diff, "proposal")}</span> : null}
+        </pre>
+      </div>
+    </div>
+  );
+}
+
+/** One disclosure section of the editor's single support card. */
+function SupportSection({ label, children }: { label: string; children: Child }) {
+  return (
+    <details class="disclosure support-section" open>
+      <summary>
+        <svg aria-hidden="true"><use href="#i-chevron-right" /></svg>
+        <span>{label}</span>
+      </summary>
+      <div class="disclosure-body">{children}</div>
+    </details>
+  );
+}
+
+/** The entry's provenance rows: file hash, filer, stale note. */
+function ProvenanceTable({ entry }: { entry: EntryRow }) {
+  return (
+    <table class="info-table">
+      <tr>
+        <td>File hash</td>
+        <td>{entry.file_hash}</td>
+      </tr>
+      {entry.filed_by !== null ? (
+        <tr>
+          <td>Filed by</td>
+          <td>{entry.filed_by}</td>
+        </tr>
+      ) : null}
+      {entry.stale_note !== null ? (
+        <tr>
+          <td>Stale note</td>
+          <td>{entry.stale_note}</td>
+        </tr>
+      ) : null}
+    </table>
+  );
+}
+
+/**
+ * The entry's agent-supplied context rows, then the provenance behind a disclosure. An entry
+ * without context rows shows the provenance directly: a section holding only a "More" toggle reads
+ * as an empty card. The anchor, repo, file and filed time live in the page header, so no row here
+ * repeats them.
+ */
+function DetailsSection({ entry }: { entry: EntryRow }) {
+  const context = parseContext(entry.context);
+  const rows = Object.entries(context);
+  return (
+    <SupportSection label="Details">
+      {rows.length === 0 ? (
+        <ProvenanceTable entry={entry} />
+      ) : (
+        <>
+          <table class="info-table">
+            {rows.map(([key, value]) => (
+              <tr key={key}>
+                <td>{key}</td>
+                <td>{typeof value === "string" ? value : JSON.stringify(value)}</td>
+              </tr>
+            ))}
+          </table>
+          <details class="disclosure context-secondary">
+            <summary>
+              <svg aria-hidden="true"><use href="#i-chevron-right" /></svg>
+              <span>More</span>
+            </summary>
+            <div class="disclosure-body">
+              <ProvenanceTable entry={entry} />
+            </div>
+          </details>
+        </>
+      )}
+    </SupportSection>
+  );
+}
+
+/** The audit log of saved revisions: the shipped timeline, one dot per entry. */
+function RevisionHistorySection({ revisions, editable }: { revisions: readonly RevisionRow[]; editable: boolean }) {
+  return (
+    <SupportSection label="Revision history">
+      {revisions.length === 0 ? (
+        <div class="empty-state">
+          <div class="empty-title">No saved revisions yet</div>
         </div>
-        <form
-          id="notes-form"
-          method="post"
-          action={`/entries/${vm.entry.id}/notes`}
-          hx-post={`/entries/${vm.entry.id}/notes`}
-          hx-target="#editor-view"
+      ) : (
+        <ol class="timeline">
+          {revisions.map((revision) => (
+            <li class="timeline-item" key={revision.id}>
+              <span class={`timeline-dot ${STATUS_DOT[revision.status]}`} aria-hidden="true"></span>
+              <div>
+                <div class="timeline-head">
+                  <span class={`tag tag-data ${STATUS_TAG[revision.status]}`}>{STATUS_LABEL[revision.status]}</span>
+                  <time class="timeline-time" datetime={new Date(revision.created_at).toISOString()}>
+                    {new Date(revision.created_at).toLocaleString()}
+                  </time>
+                  {/* A terminal entry has no textarea to load into; the button would be dead. */}
+                  {editable ? (
+                    <button class="btn btn-secondary btn-sm" type="button" data-use-revision>
+                      Use
+                    </button>
+                  ) : null}
+                </div>
+                <div class="timeline-body clamp-2">{revision.human_text}</div>
+              </div>
+            </li>
+          ))}
+        </ol>
+      )}
+    </SupportSection>
+  );
+}
+
+/**
+ * The live metrics under the textarea: the length against the cap, each required placeholder's
+ * present/missing state, and the requested tone. Dashboard.js re-syncs these as the user types.
+ */
+function ConstraintRow({ constraints, text }: { constraints: Constraints; text: string }) {
+  const maxLen = constraints.maxLen;
+  const placeholders = constraints.placeholders;
+  const tone = constraints.tone;
+  const hasAny = maxLen !== undefined || placeholders.length > 0 || tone !== undefined;
+  if (!hasAny) return null;
+  return (
+    <div class="constraint-row">
+      {maxLen !== undefined ? (
+        <span id="char-count" class="num char-count" data-max-len={maxLen}>
+          {text.length} / {maxLen}
+        </span>
+      ) : null}
+      {placeholders.length > 0 ? (
+        <ul class="placeholder-list">
+          {placeholders.map((placeholder) => {
+            const present = text.includes(placeholder);
+            return (
+              <li class="placeholder-item" data-placeholder={placeholder} key={placeholder}>
+                <span class={`placeholder-state${present ? " is-present" : ""}`}>
+                  {present ? "Present" : "Missing"}
+                </span>
+                <span class="tag tag-data">{bracedPlaceholder(placeholder)}</span>
+              </li>
+            );
+          })}
+        </ul>
+      ) : null}
+      {tone !== undefined ? <span class="constraint-tone">Tone: {tone}</span> : null}
+    </div>
+  );
+}
+
+/**
+ * The proposal card for a draft or an approved entry: the textarea prefilled with what agents will
+ * read, the constraints under it, and the one primary action. Saving a draft's text approves it,
+ * so the primary reads "Save and approve" there; the old separate approve button silently discarded
+ * edits and is gone. The textarea carries `hx-preserve`, so a swap keeps the user's focus and
+ * typing while the server-rendered value stays what the last save left: the submitted text on a
+ * refusal. The save button keeps the native submit; the reject button is an htmx transition.
+ */
+function ProposalForm({ vm, state }: { vm: EditorViewModel; state: EditorState | undefined }) {
+  const entry = vm.entry;
+  const text = state?.submittedText ?? entry.human_text ?? entry.agent_draft ?? "";
+  const draft = entry.status === "draft";
+  const reject = entry.status === "draft" || entry.status === "approved";
+  return (
+    <form
+      id="editor-form"
+      class="card"
+      method="post"
+      action={`/entries/${entry.id}/save`}
+      hx-post={`/entries/${entry.id}/save`}
+      hx-target="#editor-view"
+      hx-swap="outerHTML"
+      hx-indicator="#editor-action-loading"
+    >
+      <input type="hidden" name="view" value="editor" />
+      <div class="card-header">
+        <div>
+          <div class="card-title">Proposed text</div>
+          <div class="card-subtitle">
+            {draft
+              ? "Saving the text approves the entry and releases it to agents."
+              : "Saving updates the text agents will apply."}
+          </div>
+        </div>
+      </div>
+      <div class="card-content">
+        <textarea
+          id="editor-text"
+          class="input editor-pane"
+          name="text"
+          aria-label="Entry text"
+          hx-preserve="true"
+          data-autosize
+          hx-post={`/entries/${entry.id}/diff`}
+          hx-trigger="input changed delay:250ms"
+          hx-target="#current-text"
           hx-swap="outerHTML"
+          hx-sync="this:replace"
         >
-          <div class="field notes-field">
-            <label class="field-label" for="editor-notes">Your notes</label>
-            <textarea
-              id="editor-notes"
-              class="input"
-              name="notes"
-              rows={4}
-              aria-label="Your notes"
-              hx-preserve="true"
+          {text}
+        </textarea>
+        <ConstraintRow constraints={vm.constraints} text={text} />
+        <div class="editor-actions">
+          <button class="btn btn-fill" type="submit" hx-disabled-elt="this">
+            {draft ? "Save and approve" : "Save text"}
+          </button>
+          {reject ? (
+            <button
+              type="button"
+              class="btn btn-danger"
+              hx-post={`/entries/${entry.id}/reject`}
+              hx-target="#editor-view"
+              hx-swap="outerHTML"
+              hx-indicator="#editor-action-loading"
+              hx-disabled-elt="this"
             >
-              {vm.entry.human_notes ?? ""}
-            </textarea>
-          </div>
-          <div class="notes-actions">
-            <button class="btn btn-secondary btn-sm" type="submit">Save notes</button>
-          </div>
-        </form>
+              Reject
+            </button>
+          ) : null}
+          <span id="editor-action-loading" class="htmx-indicator" role="status">
+            <span class="spinner" aria-hidden="true"></span>
+            Updating entry
+          </span>
+        </div>
+      </div>
+    </form>
+  );
+}
+
+/** The read-only proposal for a terminal entry: the settled text in the comparison pane. */
+function TerminalTextCard({ entry }: { entry: EntryRow }) {
+  return (
+    <div class="card">
+      <div class="card-header">
+        <div>
+          <div class="card-title">Settled text</div>
+        </div>
+      </div>
+      <div class="card-content">
+        <pre class="diff-code editor-pane">{entry.human_text ?? ""}</pre>
       </div>
     </div>
   );
 }
 
+/**
+ * The proposal pane: the editable card for a draft or approved entry, or the settled text of a
+ * terminal one. A terminal entry has no change card, so the pane spans the full workspace. The
+ * swap region lives here; the refusal and read-only notices sit above the pair.
+ */
+function EditorRegion({ vm, state }: { vm: EditorViewModel; state: EditorState | undefined }) {
+  const terminal = vm.entry.status === "applied" || vm.entry.status === "rejected";
+  return (
+    <div id="editor-region" tabindex={-1} class={terminal ? "editor-region-wide" : undefined}>
+      {terminal ? <TerminalTextCard entry={vm.entry} /> : <ProposalForm vm={vm} state={state} />}
+    </div>
+  );
+}
+
+/**
+ * The notes section: the agent's notes (from `constraints.notes`, read-only) above the human's own
+ * notes as an editable textarea with its own save. The textarea carries `hx-preserve`, so any swap
+ * (a text save, an image add) keeps the human's in-progress note; the save targets the whole
+ * editor view like the save form, so the saved value re-renders in place. The section always
+ * renders: the human's notes need a home even before the agent sent any.
+ */
+function NotesSection({ vm }: { vm: EditorViewModel }) {
+  return (
+    <SupportSection label="Notes">
+      <table class="info-table">
+        <tr>
+          <td>Agent's notes</td>
+          <td>{vm.constraints.notes ?? "None."}</td>
+        </tr>
+      </table>
+      <form
+        id="notes-form"
+        method="post"
+        action={`/entries/${vm.entry.id}/notes`}
+        hx-post={`/entries/${vm.entry.id}/notes`}
+        hx-target="#editor-view"
+        hx-swap="outerHTML"
+      >
+        <div class="field notes-field">
+          <label class="field-label" for="editor-notes">Your notes</label>
+          <textarea
+            id="editor-notes"
+            class="input"
+            name="notes"
+            rows={4}
+            aria-label="Your notes"
+            hx-preserve="true"
+          >
+            {vm.entry.human_notes ?? ""}
+          </textarea>
+        </div>
+        <div class="notes-actions">
+          <button class="btn btn-secondary btn-sm" type="submit">Save notes</button>
+        </div>
+      </form>
+    </SupportSection>
+  );
+}
+
 /** An image item renders only when it still matches the prefixes the wire validated; a foreign row can hold anything, so a non-matching item shows a note instead, never raw. */
 function isRenderableImage(item: string): boolean {
   return item.startsWith("data:image/") || /^https?:\/\//.test(item);
 }
 
 /**
- * The images attached to an entry, one card in the rail: each valid item as a real `img` (sized by
- * css), an invalid one as a "not shown" note, a remove form per image, and the one-file upload
- * form. A card of its own, not a strip in the context card: upload and remove need a stable home,
- * and the context card stays lean for what the human authors against. Both forms target the whole
- * editor view like the save form, so a change re-renders the card in place.
+ * The images attached to an entry, one section: each valid item as a real `img` (sized by css), an
+ * invalid one as a "not shown" note, a remove form per image, and the one-file upload as the
+ * system dropzone. Both forms target the whole editor view like the save form, so a change
+ * re-renders the section in place.
  */
-function ImagesCard({ entry }: { entry: EntryRow }) {
+function ImagesSection({ entry }: { entry: EntryRow }) {
   const images = parseEntryImages(entry.images);
   return (
-    <div class="card">
-      <div class="card-header">
-        <div class="card-title">Images</div>
-      </div>
-      <div class="card-content">
+    <SupportSection label="Images">
+      <div class="dropzone">
+        {/* The native input is the picker and its accessible name; the zone is its paint.
+            It is associated to the submit form by id rather than nested in it, so the zone
+            keeps the direct-child shape the dropzone's own state rules select on. */}
+        <label class="dropzone-target">
+          <svg class="icon" aria-hidden="true"><use href="#i-upload" /></svg>
+          <span class="dropzone-lede">Drop an image, or choose one</span>
+          <input
+            class="dropzone-input"
+            type="file"
+            name="file"
+            accept="image/*"
+            aria-label="Drop an image, or choose one"
+            form="image-upload"
+          />
+        </label>
         {images.length === 0 ? (
           <p class="field-hint">No images yet.</p>
         ) : (
-          <ul class="image-list">
+          <ul class="dropzone-list image-list">
             {images.map((item, index) =>
               isRenderableImage(item) ? (
                 <li key={index}>
@@ -1169,6 +1619,7 @@ function ImagesCard({ entry }: { entry: EntryRow }) {
           </ul>
         )}
         <form
+          id="image-upload"
           class="image-upload"
           method="post"
           action={`/entries/${entry.id}/images`}
@@ -1178,258 +1629,138 @@ function ImagesCard({ entry }: { entry: EntryRow }) {
           hx-target="#editor-view"
           hx-swap="outerHTML"
         >
-          <input class="input" type="file" name="file" accept="image/*" aria-label="Image file" />
           <button class="btn btn-secondary btn-sm" type="submit" hx-disabled-elt="this">Add image</button>
         </form>
       </div>
-    </div>
+    </SupportSection>
   );
 }
 
 /**
  * The repo row's value: a recognized remote renders as its brand icon beside the bare owner/repo
- * path, both linking out to the host; an unrecognized one renders as the raw string as filed.
+ * path, both linking out to the host; an unrecognized one renders as the raw string as filed. The
+ * visible path is the short form, so the full remote rides along for assistive tech.
  */
 function RepoValue({ repo }: { repo: string }) {
   const link = parseRepoLink(repo);
   if (link === null) return <>{repo}</>;
   return (
-    <a class="repo-link" href={link.href} target="_blank" rel="noopener noreferrer" title={repo}>
+    <a class="repo-link" href={link.href} target="_blank" rel="noopener noreferrer">
       <svg class="repo-icon" viewBox="0 0 24 24" aria-hidden="true">
         <path d={REPO_ICON[link.provider]} />
       </svg>
       <span>{link.path}</span>
+      <span class="sr-only">{repo}</span>
     </a>
   );
 }
 
 /**
- * The entry's context JSON plus its anchor metadata, as an info-table readout. The anchor and the
- * agent-supplied context rows lead — they are what the human authors against — then repo and file;
- * the provenance rows (hash, filer, stale note) are secondary and sit collapsed behind a summary.
- */
-function ContextCard({ entry }: { entry: EntryRow }) {
-  const context = parseContext(entry.context);
-  return (
-    <div class="card">
-      <div class="card-header">
-        <div class="card-title">Context</div>
-      </div>
-      <div class="card-content">
-        <table class="info-table">
-          <tr>
-            <td>Anchor</td>
-            <td>{entry.anchor_text}</td>
-          </tr>
-          {Object.entries(context).map(([key, value]) => (
-            <tr key={key}>
-              <td>{key}</td>
-              <td>{typeof value === "string" ? value : JSON.stringify(value)}</td>
-            </tr>
-          ))}
-          <tr>
-            <td>Repo</td>
-            <td><RepoValue repo={entry.repo} /></td>
-          </tr>
-          <tr>
-            <td>File</td>
-            <td>{entry.file}</td>
-          </tr>
-        </table>
-        <details class="context-secondary">
-          <summary>More</summary>
-          <table class="info-table">
-            <tr>
-              <td>File hash</td>
-              <td>{entry.file_hash}</td>
-            </tr>
-            {entry.filed_by !== null ? (
-              <tr>
-                <td>Filed by</td>
-                <td>{entry.filed_by}</td>
-              </tr>
-            ) : null}
-            {entry.stale_note !== null ? (
-              <tr>
-                <td>Stale note</td>
-                <td>{entry.stale_note}</td>
-              </tr>
-            ) : null}
-          </table>
-        </details>
-      </div>
-    </div>
-  );
-}
-
-/**
- * The before-and-after of the entry's text, above the editor: what the anchored region reads now
- * (the anchor visually distinct) and what the entry's text will replace it with. Both sides
- * escape through JSX; the text is the stored bytes, shown as-is. The word-level marks come from
- * the server-side walk: words only the anchor has render red in the before card, words only the proposal
- * has render green in the after card, everything shared stays plain, so an identical pair renders
- * no marks at all.
- */
-function DiffView({ entry }: { entry: EntryRow }) {
-  const after = entry.human_text ?? entry.agent_draft;
-  // No text at all means nothing to compare: a filed entry whose agent never drafted, or an
-  // approved entry whose text was never set.
-  if (after === null) return null;
-  const diff = diffWords(entry.anchor_text, after);
-  return (
-    <div class="diff-grid">
-      <div class="card">
-        <div class="card-header">
-          <div class="card-title">Before</div>
-        </div>
-        <pre class="diff-code">
-          <span class="diff-line">{entry.anchor_before}</span>
-          <span class="diff-line diff-anchor">
-            {diff.before.map((token, index) =>
-              token.kind === "removed" ? (
-                <span class="diff-remove" key={index}>{token.text}</span>
-              ) : (
-                token.text
-              ),
-            )}
-          </span>
-          <span class="diff-line">{entry.anchor_after}</span>
-        </pre>
-      </div>
-      <div class="card">
-        <div class="card-header">
-          <div class="card-title">After</div>
-        </div>
-        <pre class="diff-code">
-          {diff.after.map((token, index) =>
-            token.kind === "added" ? (
-              <span class="diff-add" key={index}>{token.text}</span>
-            ) : (
-              token.text
-            ),
-          )}
-        </pre>
-      </div>
-    </div>
-  );
-}
-
-/**
- * The editor view: the diff above the editor grid, one swap node. A save changes the diff's
- * after-side, so the save form targets this wrapper and its response re-renders the whole view;
- * the transitions target only the region inside (they never change what the diff shows).
+ * The editor view, one swap node: the change card beside the proposal pane, an optional notice
+ * above them, then one support card holding the four sections across the full width. A terminal
+ * entry drops the change card and lets the settled pane span the workspace. A save re-renders the
+ * whole view because the marks follow the text and the status can move; the live diff swaps only
+ * the current-text card.
  */
 function EditorView({ vm, state }: { vm: EditorViewModel; state: EditorState | undefined }) {
-  const text = state?.submittedText ?? vm.entry.human_text ?? vm.entry.agent_draft ?? "";
+  const entry = vm.entry;
+  const terminal = entry.status === "applied" || entry.status === "rejected";
+  const applied = entry.status === "applied";
+  const compareText = state?.submittedText ?? entry.human_text ?? entry.agent_draft;
   return (
     <div id="editor-view">
-      <DiffView entry={vm.entry} />
+      <div id="editor-notice">
+        {state?.refusal !== undefined ? (
+          <DangerCallout title={state.refusal.title} body={state.refusal.body} />
+        ) : terminal ? (
+          <InfoCallout
+            title="Read only"
+            body={
+              applied
+                ? "This entry is already applied, so its text can't be changed here. If the anchor goes stale, the entry returns to approved and can be edited."
+                : "This entry was rejected, so its text can't be changed. A rejected entry stays rejected; file a new entry if the passage still needs changing."
+            }
+          />
+        ) : null}
+      </div>
       <div class="editor-grid">
-        <div class="editor-main">
-          <EditorRegion vm={vm} state={state} />
+        {terminal ? null : currentTextCard(entry, compareText)}
+        <EditorRegion vm={vm} state={state} />
+        <div class="editor-support">
+          <div class="card editor-support-card">
+            <div class="card-content">
+              <DetailsSection entry={entry} />
+              <NotesSection vm={vm} />
+              <ImagesSection entry={entry} />
+              <RevisionHistorySection revisions={vm.revisions} editable={!terminal} />
+            </div>
+          </div>
         </div>
-        <aside class="editor-rail">
-          <ContextCard entry={vm.entry} />
-          <ConstraintsCard constraints={vm.constraints} text={text} />
-          <NotesCard vm={vm} />
-          <ImagesCard entry={vm.entry} />
-        </aside>
       </div>
     </div>
   );
 }
 
-/** The editor's full-height prev/next rails: one fixed strip per side, a link when a neighbour exists. */
-function EditorNav({ prevId, nextId }: { prevId: string | null; nextId: string | null }) {
-  return (
-    <nav class="editor-nav" aria-label="Entry navigation">
-      <EditorNavButton side="prev" targetId={prevId} />
-      <EditorNavButton side="next" targetId={nextId} />
-    </nav>
-  );
-}
-
-/** One rail: a chevron on a full-height strip, or an inert placeholder at the boundary. */
-function EditorNavButton({ side, targetId }: { side: "prev" | "next"; targetId: string | null }) {
-  const label = side === "prev" ? "Previous entry" : "Next entry";
-  const cls = `editor-nav-btn editor-nav-${side}`;
-  const icon = (
-    <svg aria-hidden="true"><use href={side === "prev" ? "#i-chevron-left" : "#i-chevron-right"} /></svg>
-  );
-  if (targetId === null) {
-    return (
-      <span class={`${cls} is-disabled`} aria-hidden="true">
-        {icon}
-      </span>
-    );
-  }
-  return (
-    <a class={cls} href={`/entries/${targetId}`} aria-label={label}>
-      {icon}
-    </a>
-  );
-}
-
-/** The full editor page; the mount wraps it in the doctype. `signedIn` is whether the navbar offers sign-out. */
+/** The full editor page; the mount wraps it in the doctype. `signedIn` is whether the sidebar offers sign-out. */
 export function editorPage(vm: EditorViewModel, state: EditorState | undefined = undefined, signedIn = false): JSX.Element {
   return (
     <html lang="en" data-theme="dark">
       <PageHead title={`Edit entry · ${NAME}`} />
       <body>
+        <a class="skip-link" href="#main">Skip to content</a>
         <IconSprite />
-        <div class="app-shell">
-          <Navbar signedIn={signedIn} active="entries" />
-          <main class="main">
-            <header class="page-header">
-              <div class="page-header-body">
-                <div class="label page-eyebrow">Entry review</div>
-                <h1 class="page-title">Edit entry</h1>
-                <p class="page-lede">Saving the text approves the entry and releases it to agents.</p>
-              </div>
-            </header>
+        <Shell signedIn={signedIn} active="entries" draftCount={vm.draftCount}>
+          {/* The workspace, header and support card share the same designed column, so the
+              comparison and its rows keep a readable measure inside the wider shell track. */}
+          <div class="editor-page">
+            <EditorHeader vm={vm} />
             <EditorView vm={vm} state={state} />
-            <EditorNav prevId={vm.prevId} nextId={vm.nextId} />
             {/* The one live region: announcements on constraint-state flips only, so a screen reader
                 is not flooded with a per-keystroke value. Lives outside the swap region. */}
             <span id="editor-live" class="sr-only" aria-live="polite"></span>
-          </main>
-        </div>
+          </div>
+        </Shell>
+        <div class="toast-stack" id="toast-stack"></div>
         <PageModules />
       </body>
     </html>
   );
 }
 
-/** The editor region only, for htmx transition responses; the page shell, diff, context, and constraints stay put. */
-export function editorFragment(vm: EditorViewModel, state: EditorState | undefined = undefined): JSX.Element {
-  return <EditorRegion vm={vm} state={state} />;
-}
-
-/** The whole editor view (diff + region + rail), for htmx save responses: a save changes the diff's after-side, so the swap must re-render it. */
+/** The whole editor view (columns + region), for htmx save and transition responses: either can move the status, so the swap re-renders the history card's editable state and the header tag with it. */
 export function editorViewFragment(vm: EditorViewModel, state: EditorState | undefined = undefined): JSX.Element {
-  return <EditorView vm={vm} state={state} />;
+  return (
+    <>
+      <DraftBadge count={vm.draftCount} oob />
+      <EntryStatusTag status={vm.entry.status} oob />
+      <EditorView vm={vm} state={state} />
+    </>
+  );
 }
 
-/** The 404 page for an unknown entry id, with the way onward the page-not-found pattern demands. `signedIn` is whether the navbar offers sign-out. */
-export function notFoundPage(signedIn = false): JSX.Element {
+/** The viewport-owning error page for an unknown entry id or route, with the way onward the page-not-found pattern demands. A route that never named an entry has no entry to miss. */
+export function notFoundPage(kind: "entry" | "route"): JSX.Element {
+  const entry = kind === "entry";
   return (
     <html lang="en" data-theme="dark">
-      <PageHead title={`Entry not found · ${NAME}`} />
+      <PageHead title={`${entry ? "Entry" : "Page"} not found · ${NAME}`} />
       <body>
         <IconSprite />
-        <div class="app-shell">
-          <Navbar signedIn={signedIn} active="entries" />
-          <main class="main">
-            <header class="page-header">
-              <div class="page-header-body">
-                <div class="label page-eyebrow">Entry review</div>
-                <h1 class="page-title">Entry not found</h1>
-                <p class="page-lede">This entry doesn't exist. Return to the list to find it.</p>
+        <main class="page-state">
+          <div class="page-state-gap">
+            <div class="page-state-body">
+              <p class="page-state-title">{entry ? "Entry not found" : "Page not found"}</p>
+              <p class="page-state-text">
+                {entry
+                  ? "This entry doesn't exist. Return to the list to find it."
+                  : "Nothing lives at this address."}
+              </p>
+              <div class="page-state-actions">
+                <a href="/" class="btn btn-fill">Back to entries</a>
               </div>
-            </header>
-            <a href="/" class="btn btn-secondary">Back to entries</a>
-          </main>
-        </div>
+            </div>
+          </div>
+        </main>
         <PageModules />
       </body>
     </html>
@@ -1439,7 +1770,7 @@ export function notFoundPage(signedIn = false): JSX.Element {
 /** The htmx fragment for a save on an id that vanished mid-session: htmx will not swap a 4xx, so this is a 200 with the way onward in the editor region itself. */
 export function entryGoneFragment(): JSX.Element {
   return (
-    <div id="editor-region">
+    <div id="editor-region" tabindex={-1}>
       <DangerCallout title="This entry no longer exists" body="Return to the list to find it." />
       <a href="/" class="btn btn-secondary">Back to entries</a>
     </div>
@@ -1464,6 +1795,8 @@ export type StyleGuideViewModel = {
   readonly hasRow: boolean;
   /** The stored section, or the empty defaults when there is no row yet. */
   readonly section: StyleGuideInput;
+  /** The sidebar's queue badge, read with the page's own store access. */
+  readonly draftCount: number;
 };
 
 /** What the last save round settled into, rendered by the swap: the saved notice, the unknown-project notice, or the refusal with its message. The submitted form is kept so a refusal re-renders what the user typed. */
@@ -1487,6 +1820,7 @@ export function loadStyleGuide(store: Store, projectQuery: string | undefined):
     unknown,
     hasRow: section !== null,
     section: section ?? { markdown: "", bannedWords: [], glossary: {} },
+    draftCount: countEntriesByStatus(store).draft,
   };
 }
 
@@ -1513,45 +1847,29 @@ function sectionToForm(section: StyleGuideInput): StyleGuideForm {
   };
 }
 
-function InfoCallout({ title, body }: { title: string; body?: string }) {
-  return (
-    <div class="callout callout-info">
-      <div class="callout-icon">
-        <svg aria-hidden="true"><use href="#i-info" /></svg>
-      </div>
-      <div class="callout-content">
-        <div class="callout-title">{title}</div>
-        {body !== undefined ? <div class="callout-body">{body}</div> : null}
-      </div>
-    </div>
-  );
-}
-
-/** The project selector: the global section plus every known project, as links, with the current one marked. A link list is the whole mechanism; the section never auto-creates a project. */
+/** The project selector: the global section plus every known project, as underline tabs with the current one marked. A link list is the whole mechanism; the section never auto-creates a project. ui.js builds the sliding ink. */
 function StyleGuideProjects({ vm }: { vm: StyleGuideViewModel }) {
   const activeSlug = vm.unknown ? null : vm.projectSlug;
   return (
-    <nav class="style-guide-projects" aria-label="Style guide sections">
-      <ProjectSectionLink href="/style-guide" label="Global" active={activeSlug === null} />
-      {vm.projects.map((project) => (
-        <ProjectSectionLink
-          key={project.slug}
-          href={`/style-guide?project=${project.slug}`}
-          label={project.slug}
-          active={activeSlug === project.slug}
-        />
-      ))}
+    <nav class="tabs-wrap style-guide-projects" data-scroll-fade aria-label="Style guide sections">
+      <div class="tabs">
+        <ProjectSectionLink href="/style-guide" label="Global" active={activeSlug === null} />
+        {vm.projects.map((project) => (
+          <ProjectSectionLink
+            key={project.slug}
+            href={`/style-guide?project=${project.slug}`}
+            label={project.slug}
+            active={activeSlug === project.slug}
+          />
+        ))}
+      </div>
     </nav>
   );
 }
 
 function ProjectSectionLink({ href, label, active }: { href: string; label: string; active: boolean }) {
   return (
-    <a
-      class={`btn btn-sm ${active ? "btn-primary" : "btn-secondary"}`}
-      href={href}
-      aria-current={active ? "page" : undefined}
-    >
+    <a class={`tab${active ? " active" : ""}`} href={href} aria-current={active ? "page" : undefined}>
       {label}
     </a>
   );
@@ -1597,78 +1915,59 @@ function StyleGuideRegion({ vm, state }: { vm: StyleGuideViewModel; state: Style
           body="Your save creates it."
         />
       ) : null}
-      <form
-        id="style-guide-form"
-        class="card style-guide-card"
-        method="post"
-        action="/style-guide/save"
-        hx-post="/style-guide/save"
-        hx-target="#style-guide-region"
-        hx-swap="outerHTML"
-        hx-indicator="#style-guide-loading"
-      >
-        <input type="hidden" name="project" value={vm.projectSlug ?? ""} />
-        <div class="card-header">
-          <div class="card-title">{vm.projectSlug === null ? "Global guide" : `${vm.projectSlug} guide`}</div>
-        </div>
-        <div class="card-content">
-          <div class="field">
-            <label class="field-label" for="style-guide-markdown">Markdown</label>
-            <textarea class="input" id="style-guide-markdown" name="markdown" rows={10} aria-label="Guide markdown">
-              {formValues.markdown}
-            </textarea>
-            {vm.hasRow && vm.section.markdown === "" ? <p class="field-hint">No markdown yet.</p> : null}
-          </div>
-          <div class="field">
-            <label class="field-label" for="style-guide-banned">Banned words</label>
-            <input class="input" id="style-guide-banned" name="banned_words" type="text" value={formValues.bannedWordsCsv} />
-            <p class="field-hint">Comma-separated. Extra whitespace and duplicates are dropped.</p>
-            {vm.hasRow && vm.section.bannedWords.length === 0 ? <p class="field-hint">No banned words yet.</p> : null}
-          </div>
-          <div class="field">
-            <label class="field-label" for="style-guide-glossary">Glossary</label>
-            <textarea class="input" id="style-guide-glossary" name="glossary" rows={6} aria-label="Glossary entries">
-              {formValues.glossaryText}
-            </textarea>
-            <p class="field-hint">One key: value pair per line. A line without a colon is refused.</p>
-            {vm.hasRow && Object.keys(vm.section.glossary).length === 0 ? (
-              <p class="field-hint">No glossary entries yet.</p>
-            ) : null}
-          </div>
-          <div class="editor-actions">
-            <button class="btn btn-primary" type="submit" hx-disabled-elt="this">Save guide</button>
-            <span id="style-guide-loading" class="htmx-indicator" role="status">
-              <span class="spinner" aria-hidden="true"></span>
-              Saving guide
-            </span>
+      <div class="card style-guide-card">
+        <form
+          id="style-guide-form"
+          method="post"
+          action="/style-guide/save"
+          hx-post="/style-guide/save"
+          hx-target="#style-guide-region"
+          hx-swap="outerHTML"
+          hx-indicator="#style-guide-loading"
+        >
+          <input type="hidden" name="project" value={vm.projectSlug ?? ""} />
+          <div class="card-header">
+            <div class="card-title">{vm.projectSlug === null ? "Global guide" : `${vm.projectSlug} guide`}</div>
           </div>
-        </div>
-      </form>
-    </div>
-  );
-}
-
-/** The error box htmx failures clone into the style guide region; the retry button re-submits the save form. */
-function StyleGuideErrorBoxTemplate() {
-  return (
-    <template id="style-guide-error-box">
-      <div class="callout callout-danger" role="alert">
-        <div class="callout-icon">
-          <svg aria-hidden="true"><use href="#i-error" /></svg>
-        </div>
-        <div class="callout-content">
-          <div class="callout-title">The guide could not be saved</div>
-          <div class="callout-body">The save request failed. Try it again.</div>
-          <div class="callout-actions">
-            <button class="btn btn-secondary btn-sm" type="button" data-retry>Retry</button>
+          <div class="card-content style-guide-fields">
+            <div class="field">
+              <label class="field-label" for="style-guide-markdown">Markdown</label>
+              <textarea class="input" id="style-guide-markdown" name="markdown" rows={10} aria-label="Guide markdown" data-autosize data-scroll-fade>
+                {formValues.markdown}
+              </textarea>
+              {vm.hasRow && vm.section.markdown === "" ? <p class="field-hint">No markdown yet.</p> : null}
+            </div>
+            <div class="field">
+              <label class="field-label" for="style-guide-banned">Banned words</label>
+              <input class="input" id="style-guide-banned" name="banned_words" type="text" value={formValues.bannedWordsCsv} />
+              <p class="field-hint">Comma-separated. Extra whitespace and duplicates are dropped.</p>
+              {vm.hasRow && vm.section.bannedWords.length === 0 ? <p class="field-hint">No banned words yet.</p> : null}
+            </div>
+            <div class="field">
+              <label class="field-label" for="style-guide-glossary">Glossary</label>
+              <textarea class="input" id="style-guide-glossary" name="glossary" rows={6} aria-label="Glossary entries" data-autosize data-scroll-fade>
+                {formValues.glossaryText}
+              </textarea>
+              <p class="field-hint">One key: value pair per line. A line without a colon is refused.</p>
+              {vm.hasRow && Object.keys(vm.section.glossary).length === 0 ? (
+                <p class="field-hint">No glossary entries yet.</p>
+              ) : null}
+            </div>
+            <div class="editor-actions">
+              <button class="btn btn-fill" type="submit" hx-disabled-elt="this">Save guide</button>
+              <span id="style-guide-loading" class="htmx-indicator" role="status">
+                <span class="spinner" aria-hidden="true"></span>
+                Saving guide
+              </span>
+            </div>
           </div>
-        </div>
+        </form>
       </div>
-    </template>
+    </div>
   );
 }
 
-/** The full style guide page; the mount wraps it in the doctype. `signedIn` is whether the navbar offers sign-out. */
+/** The full style guide page; the mount wraps it in the doctype. `signedIn` is whether the sidebar offers sign-out. */
 export function styleGuidePage(
   vm: StyleGuideViewModel,
   state: StyleGuideEditorState | undefined = undefined,
@@ -1678,29 +1977,27 @@ export function styleGuidePage(
     <html lang="en" data-theme="dark">
       <PageHead title={`Style guide · ${NAME}`} />
       <body>
+        <a class="skip-link" href="#main">Skip to content</a>
         <IconSprite />
-        <div class="app-shell">
-          <Navbar signedIn={signedIn} active="style-guide" />
-          <main class="main">
-            <header class="page-header">
-              <div class="page-header-body">
-                <div class="label page-eyebrow">Voice</div>
-                <h1 class="page-title">Style guide</h1>
-                <p class="page-lede">The voice agents read before drafting, starting with the global guide and adding each project's own rules below.</p>
-              </div>
-            </header>
-            <StyleGuideProjects vm={vm} />
-            <StyleGuideRegion vm={vm} state={state} />
-            <StyleGuideErrorBoxTemplate />
-          </main>
-        </div>
+        <Shell signedIn={signedIn} active="style-guide" draftCount={vm.draftCount}>
+          <header class="page-header">
+            <div class="page-header-body">
+              <div class="label">Voice</div>
+              <h1 class="page-title">Style guide</h1>
+              <p class="section-lede">The voice agents read before drafting, starting with the global guide and adding each project's own rules below.</p>
+            </div>
+          </header>
+          <StyleGuideProjects vm={vm} />
+          <StyleGuideRegion vm={vm} state={state} />
+        </Shell>
+        <div class="toast-stack" id="toast-stack"></div>
         <PageModules />
       </body>
     </html>
   );
 }
 
-/** The style guide region only, for htmx responses; the selector, the page shell, and the error template stay put. */
+/** The style guide region only, for htmx responses; the selector, the page shell, and the toast stack stay put. */
 export function styleGuideRegionFragment(vm: StyleGuideViewModel, state: StyleGuideEditorState | undefined = undefined): JSX.Element {
   return <StyleGuideRegion vm={vm} state={state} />;
 }