fix(tours): a hike over several days reaches the router without its stage ends

The router checks its request against the strict plan point, which has no
stage_end, so every hike with a stage end was refused with "Unrecognized
key: stage_end" before a way was planned. The points go to the router with
their position, name and kind only.

client/src/components/Assistant/AssistantChangeCard.tsx

@@ -1,10 +1,11 @@
-import { Check, LoaderCircle, MapPin, Undo2 } from 'lucide-react';
+import { Check, CheckCheck, ListChecks, LoaderCircle, MapPin, Undo2 } from 'lucide-react';
 import { type ReactNode, useEffect, useMemo, useState } from 'react';
 
 import { useTranslation } from '../../i18n';
 import { blockKeyOf } from '../../store/assistantMapModel';
 import { chatOf, useAssistantStore } from '../../store/assistantStore';
 import { useTripStore } from '../../store/tripStore';
+import { DialogButton, NEUTRAL_TINT } from '../shared/DialogShell';
 import { useToast } from '../shared/Toast';
 import { Tooltip } from '../shared/Tooltip';
 import AssistantCompareSwitch from './AssistantCompareSwitch';
@@ -13,6 +14,8 @@ import AssistantWeekOverview from './AssistantWeekOverview';
 import { type ChangeItem, undoLeftMs } from './assistantParts';
 import { useAssistantView } from './assistantViewContext';
 import { ChangeRows } from './cards/ChangeCardSlots';
+import CardHeader from './cards/parts/CardHeader';
+import { CardFoot } from './cards/parts/CardSection';
 import { ICON_BUTTON } from './cards/parts/assistantTones';
 import { useChangeExclusions } from './cards/useChangeExclusions';
 import { changePoints, type DayChange } from './dayAfterModel';
@@ -60,6 +63,9 @@ function undoableNow(item: ChangeItem, undone: Readonly<Record<string, true>>, n
   );
 }
 
+/** The band of a card whose changes are all decided: the green of a done booking. */
+const DONE_TINT = 'color-mix(in srgb, var(--success) 9%, transparent)';
+
 /** The waiting changes the user left on that touch the day plan. */
 function dayChangesOf(items: readonly ChangeItem[], excluded: ReadonlySet<string>): DayChange[] {
   return items.flatMap((i) =>
@@ -69,17 +75,18 @@ function dayChangesOf(items: readonly ChangeItem[], excluded: ReadonlySet<string
   );
 }
 
-/** The card's head: what the card is, what can be done with it as a whole, and how many changes it holds. */
+/** The change card's band: tinted green once everything in it is decided, what it holds and its actions. */
 function CardHead({ open, count, actions }: { open: boolean; count: number; actions?: ReactNode }) {
   const { t } = useTranslation();
   return (
-    <div className="mb-1 flex min-h-7 items-center gap-2">
-      <span className="min-w-0 flex-1 truncate text-caption font-semibold text-content-secondary">
-        {t(open ? 'assistant.change.title' : 'assistant.change.doneTitle')}
-      </span>
-      {actions}
-      <span className="text-caption tabular-nums text-content-faint">{count}</span>
-    </div>
+    <CardHeader
+      icon={open ? ListChecks : CheckCheck}
+      tone={open ? 'info' : 'success'}
+      tint={open ? NEUTRAL_TINT : DONE_TINT}
+      title={t(open ? 'assistant.change.title' : 'assistant.change.doneTitle')}
+      count={count}
+      actions={actions}
+    />
   );
 }
 
@@ -224,7 +231,7 @@ export default function AssistantChangeCard({ items }: { items: ChangeItem[] })
 
   const open = pending.length > 0;
   return (
-    <section className="trek-popover-enter rounded-xl border border-edge-faint bg-surface-card px-3 pb-2 pt-2.5 shadow-card">
+    <section className="trek-popover-enter overflow-hidden rounded-[16px] border border-edge-faint bg-surface-card px-3.5 pb-3 pt-3 shadow-card">
       <CardHead
         open={open}
         count={items.length}
@@ -257,25 +264,19 @@ export default function AssistantChangeCard({ items }: { items: ChangeItem[] })
           <p className="sr-only" role="status">
             {t('assistant.change.pending', { count: pending.length })}
           </p>
-          <div className="flex justify-end gap-2 border-t border-edge-faint pt-2.5">
-            <button
-              type="button"
-              disabled={isRunning}
-              onClick={() => void submit(false)}
-              className="rounded-lg px-3 py-1.5 text-body text-content-secondary hover:bg-surface-hover hover:text-content disabled:opacity-50"
-            >
+          <CardFoot>
+            <DialogButton disabled={isRunning} onClick={() => void submit(false)}>
               {t('assistant.change.discard')}
-            </button>
-            <button
-              type="button"
+            </DialogButton>
+            <DialogButton
+              variant="primary"
               disabled={isRunning || chosen === 0}
               onClick={() => void submit(true)}
-              className="inline-flex items-center gap-1.5 rounded-lg bg-accent px-3 py-1.5 text-body font-medium text-accent-text hover:bg-accent-hover disabled:opacity-50"
+              icon={<Check size={14} aria-hidden="true" />}
             >
-              <Check size={14} aria-hidden="true" />
               {pending.length === 1 ? t('assistant.change.apply') : t('assistant.change.applyN', { count: chosen })}
-            </button>
-          </div>
+            </DialogButton>
+          </CardFoot>
         </>
       )}
     </section>

client/src/components/Assistant/AssistantHost.tsx

@@ -2,6 +2,7 @@ import { useCallback, useMemo } from 'react';
 import { useLocation, useMatch, useNavigate } from 'react-router';
 
 import { rememberListsSubTab } from '../../hooks/useListsSubTab';
+import { useAssistantStore } from '../../store/assistantStore';
 import { useTripStore } from '../../store/tripStore';
 import AssistantWindow from './AssistantWindow';
 import { plannerSearchOf } from './assistantShowOnMap';
@@ -22,7 +23,7 @@ function useRouteTripId(): number | null {
  * notification opens a place, a tab of the trip opens as `?tab=` (a list's
  * own tab remembered first), and another page is simply navigated to. A day
  * picked in the chat (its weather) selects that day the same way, and "On
- * map" on a card brings the planner's map back first.
+ * map" on a card brings the planner's map back first from a tab without one.
  */
 export default function AssistantHost() {
   const navigate = useNavigate();
@@ -54,8 +55,12 @@ export default function AssistantHost() {
     [navigate, openPlanner, tripId]
   );
   const focusDay = useCallback((dayId: number) => openPlanner(`?day=${dayId}`), [openPlanner]);
-  // "On map" from another tab of the planner (Tours, Costs, ...) first brings the map back.
-  const revealMap = useCallback(() => openPlanner('?tab=plan'), [openPlanner]);
+  // "On map" from a tab without a map (Costs, Lists, ...) first brings the plan's map back; the Tours tab
+  // shows the route on its own map. A map on screen tells the assistant its view, which is how it is known.
+  const revealMap = useCallback(() => {
+    if (useAssistantStore.getState().mapView?.tripId === tripId) return;
+    openPlanner('?tab=plan');
+  }, [openPlanner, tripId]);
 
   return <AssistantWindow trip={trip} onOpen={open} onFocusDay={focusDay} onRevealMap={revealMap} />;
 }

client/src/components/Assistant/assistantFollowUpRules.test.ts

@@ -111,6 +111,14 @@ describe('the questions an answer offers', () => {
 
   it('FE-AI-FOLLOW-007: an answer that asks the user something waits for their answer, not for "tell me more"', () => {
     expect(followUpsFor(of([{ type: 'text', text: 'Should I plan it anyway?' }]), true)).toEqual([]);
+    // Not the found places' chips either, but the model's own answers to its question.
+    const asked = of([
+      { type: 'data-trek-places', data: { toolCallId: 's', places: [], more: 0 } },
+      { type: 'text', text: 'Shall I plan it there?' },
+    ]);
+    expect(followUpsFor(asked, true)).toEqual([]);
+    const offered = of([...asked.parts, { type: 'data-trek-follow-ups', data: { questions: ['Yes, plan it'] } }]);
+    expect(followUpsFor(offered, true).map((f) => f.text)).toEqual(['Yes, plan it']);
     expect(followUpsFor(of([{ type: 'text', text: 'Here it is.' }]), true).map((f) => f.id)).toEqual(['more', 'next']);
   });
 });

client/src/components/Assistant/assistantFollowUpRules.ts

@@ -126,11 +126,12 @@ export function followUpsFor(message: AssistantMessage, canEdit: boolean): reado
   if (fromModel.length > 0) return fromModel;
   const fromCards = cardFollowUps(message, canEdit);
   if (fromCards.length > 0) return fromCards;
+  // An answer that asks the user something waits for their answer: only the model's own offer fits it.
+  if (endsWithQuestion(message)) return [];
   const fromChanges = changeFollowUps(message, canEdit);
   if (fromChanges !== null) return fromChanges.length > 0 ? fromChanges : GENERAL;
   const types = new Set(message.parts.map((part) => part.type));
   if (types.has('data-trek-places')) return PLACES;
   if (types.has('data-trek-weather')) return WEATHER;
-  // An answer that asks the user something waits for their answer, not for "tell me more".
-  return types.has('text') && !endsWithQuestion(message) ? GENERAL : [];
+  return types.has('text') ? GENERAL : [];
 }

client/src/components/Assistant/cards/ChangeCardSlots.tsx

@@ -134,7 +134,7 @@ function BodySlot({ item, settled }: { item: ChangeItem; settled: boolean }) {
   const view = item.card ? viewOf(item.card) : null;
   if (!view?.Body || !item.card) return null;
   return (
-    <div className={`pb-1.5 ps-[38px] ${settled ? 'opacity-60' : ''}`}>
+    <div className={`mt-1.5 pb-1.5 ${view.wideBody ? '' : 'ps-[38px]'} ${settled ? 'opacity-60' : ''}`}>
       <Slot item={item} view={view} name="Body" />
     </div>
   );

client/src/components/Assistant/cards/atlas/AtlasCountryCard.tsx

@@ -1,5 +1,5 @@
 import type { AssistantMessage, AtlasCountryCard as CountryCard } from '@trek/shared';
-import { Briefcase, MapPin, Radio } from 'lucide-react';
+import { Briefcase, Globe2, MapPin, Radio } from 'lucide-react';
 
 import { useTranslation } from '../../../../i18n';
 import { SoftPill, WhiteBadge } from '../../../Planner/planParts';
@@ -8,8 +8,10 @@ import type { ChangeItem } from '../../assistantParts';
 import type { CardEntry } from '../cardTypes';
 import { CardFacts } from '../parts/CardFacts';
 import CardFrame from '../parts/CardFrame';
+import CardHeader from '../parts/CardHeader';
 import { CardOpenButton } from '../parts/CardOpen';
 import { CardMore } from '../parts/CardRows';
+import { CardFoot } from '../parts/CardSection';
 import { CONTINENT_LABEL, continentOf, shortDay, STATUS_LOOK } from './atlasCardModel';
 import { ATLAS_PAGE } from './atlasPage';
 import { ChangeFlag, FlagTile, StatusFact } from './AtlasParts';
@@ -112,14 +114,15 @@ export default function AtlasCountryBlock({ cards }: { cards: readonly CardEntry
   if (countries.length === 0) return null;
   return (
     <CardFrame label={t('assistant.domain.atlas')}>
+      <CardHeader icon={Globe2} tone="info" title={t('assistant.domain.atlas')} />
       {countries.map((entry, index) => (
         <div key={entry.toolCallId} className={index > 0 ? 'mt-2 border-t border-edge-faint pt-2' : ''}>
           {entry.card.kind === 'atlasCountry' && <CountrySection card={entry.card} />}
         </div>
       ))}
-      <div className="mt-1 flex justify-end">
+      <CardFoot>
         <CardOpenButton target={ATLAS_PAGE} labelKey="assistant.card.atlas.open" />
-      </div>
+      </CardFoot>
     </CardFrame>
   );
 }

client/src/components/Assistant/cards/budget/ExpenseChange.tsx

@@ -78,7 +78,6 @@ export function ExpenseFacts({ card }: SlotProps) {
     <>
       <CategoryFact row={row} />
       <DateFact row={row} />
-      {row.place && <PlaceFact place={row.place} />}
       {split && (
         <FactChange
           icon={Tag}
@@ -92,13 +91,16 @@ export function ExpenseFacts({ card }: SlotProps) {
   );
 }
 
-/** The split under the row, and the expense's note under it: too long for the faint line beside the icons. */
+/** Under the row: the place it belongs to beside the split, and the expense's note under them. */
 export function ExpenseBody({ card }: SlotProps) {
   const row = card.rows[0];
   if (!row) return null;
   return (
-    <span className="flex flex-col items-start gap-1">
-      <SplitLine row={row} />
+    <span className="flex flex-col items-start gap-1.5">
+      <span className="flex flex-wrap items-center gap-1.5">
+        {row.place && <PlaceFact place={row.place} />}
+        <SplitLine row={row} />
+      </span>
       {row.note && <NotePill note={row.note} />}
     </span>
   );

client/src/components/Assistant/cards/budget/ExpensesCard.test.tsx

@@ -121,8 +121,7 @@ describe('an expense in a change row', () => {
     expect(screen.getByText(money(84))).toHaveClass('line-through');
   });
 
-  it('FE-AI-CARD-BUD-012: the facts name the category, day and place, and what an update changes', () => {
-    const onOpen = vi.fn();
+  it('FE-AI-CARD-BUD-012: the facts name the category and day, and what an update changes', () => {
     const update = expense({
       category: 'transport',
       date: '2026-06-05',
@@ -132,7 +131,7 @@ describe('an expense in a change row', () => {
       split: 'equal',
       before: { name: null, amount: null, category: 'food', date: '2026-06-03', split: 'custom' },
     });
-    inView(<ExpenseFacts card={expenses([update])} item={changeItem('a', null)} />, { onOpen });
+    inView(<ExpenseFacts card={expenses([update])} item={changeItem('a', null)} />);
     expect(screen.getByText('Food & drink')).toHaveClass('line-through');
     expect(screen.getByText('Transport')).toBeInTheDocument();
     expect(screen.getByText('Split unevenly')).toHaveClass('line-through');
@@ -140,6 +139,14 @@ describe('an expense in a change row', () => {
     expect(screen.getByText('1 receipt')).toBeInTheDocument();
     // The note is too long for the faint line beside the row's buttons: it sits under the row.
     expect(screen.queryByText('Window table')).toBeNull();
+    // The place sits under the row, beside the split.
+    expect(screen.queryByText('Lokanta')).toBeNull();
+  });
+
+  it('FE-AI-CARD-BUD-012c: the place sits under the row beside the split, and opens on the map', () => {
+    const onOpen = vi.fn();
+    const row = expense({ place: { id: 12, name: 'Lokanta' } });
+    inView(<ExpenseBody card={expenses([row])} item={changeItem('a', null)} />, { onOpen });
     fireEvent.click(screen.getByRole('button', { name: /Lokanta/ }));
     expect(onOpen).toHaveBeenCalledWith({ kind: 'map', placeId: 12, dayId: null });
   });

client/src/components/Assistant/cards/cardTypes.ts

@@ -126,6 +126,8 @@ export interface CardView<K extends TrekCardKind> {
   Facts?: ComponentType<CardSlotProps<K>>;
   Body?: ComponentType<CardSlotProps<K>>;
   ownsSubject?: boolean;
+  /** The body runs the whole width of the change card instead of under the row's text (a tour's drawing). */
+  wideBody?: boolean;
   Group?: ComponentType<CardRunProps & { place: 'head' | 'foot' }>;
   Run?: ComponentType<CardRunProps>;
   runnable?(card: TrekCardOf<K>): boolean;

client/src/components/Assistant/cards/journey/JourneyEntriesBlock.tsx

@@ -1,15 +1,16 @@
 import type { AssistantMessage, JourneyEntryLook } from '@trek/shared';
-import { ArrowUpRight } from 'lucide-react';
+import { ArrowUpRight, BookOpen } from 'lucide-react';
 import { useMemo } from 'react';
 
 import { useTranslation } from '../../../../i18n';
 import { DAY_COLORS } from '../../../Journey/dayColors';
 import { cardTitle } from '../../../Journey/journeyCard';
 import JourneyEntryCover from '../../../Journey/JourneyEntryCover';
-import { LinkedJournalIcon } from '../../../Trips/LinkedJournalIcon';
 import { useAssistantView } from '../../assistantViewContext';
 import type { CardEntry } from '../cardTypes';
 import CardFrame from '../parts/CardFrame';
+import CardHeader from '../parts/CardHeader';
+import { CardFoot } from '../parts/CardSection';
 import CardStrip from '../parts/CardStrip';
 import { type JournalEntries, coverEntryOf, mergeJournalCards, titleSourceOf } from './journeyCardModel';
 import { EntryMarks, EntryStory, EntryThumb, EntryWhen } from './JourneyEntryParts';
@@ -33,9 +34,6 @@ const TITLE_BUTTON =
   'block w-full rounded-md text-start outline-none hover:underline focus-visible:ring-2 focus-visible:ring-accent';
 /** The phone's taller target, the title still at the top of the row. */
 const TITLE_BUTTON_TALL = `${TITLE_BUTTON} min-h-10`;
-const FOOTER = 'mt-1 flex items-center gap-2 border-t border-edge-faint pt-2 text-caption';
-const FOOTER_TITLE = 'min-w-0 flex-1 truncate text-content-muted';
-const FAINT = 'text-content-faint';
 const OPEN = 'inline-flex flex-none items-center gap-1 font-medium text-accent hover:underline';
 const OPEN_TALL = 'inline-flex h-10 flex-none items-center gap-1 font-medium text-accent hover:underline';
 /** The size and corners of the journal's own tile, so the count stands in the row like one more entry. */
@@ -47,29 +45,40 @@ const TILE = 'flex-none snap-start';
 
 type Open = ((entryId: number | null) => void) | null;
 
-/** The journal's name and the way into it, under the card. */
-function JournalFooter({ journal, open }: { journal: JournalEntries; open: Open }) {
+/**
+ * The way into the journal under its entries: in the foot bar of the card, or
+ * under the strip of tiles with how many entries it holds, which the strip
+ * has no band to say.
+ */
+function JournalFooter({ open, count }: { open: Open; count?: number }) {
   const { t } = useTranslation();
   const { variant } = useAssistantView();
-  const title = journal.journalTitle ?? t('assistant.card.journey.label');
-  const count = journal.entries.length + journal.more;
+  const button = open && (
+    <button type="button" onClick={() => open(null)} className={variant === 'fullscreen' ? OPEN_TALL : OPEN}>
+      {t('assistant.card.journey.open')}
+      <ArrowUpRight size={12} aria-hidden="true" className="rtl:-scale-x-100" />
+    </button>
+  );
+  if (count === undefined) return button ? <CardFoot>{button}</CardFoot> : null;
   return (
-    <div className={FOOTER}>
-      <LinkedJournalIcon size={12} className={FAINT} />
-      <span title={title} className={FOOTER_TITLE}>
-        <bdi>{title}</bdi>
-        {count > 2 && <span className="ms-1.5 tabular-nums">{t('assistant.card.journey.entries', { count })}</span>}
+    <div className="mt-1 flex items-center gap-2 text-caption">
+      <span className="min-w-0 flex-1 truncate tabular-nums text-content-muted">
+        {t('assistant.card.journey.entries', { count })}
       </span>
-      {open && (
-        <button type="button" onClick={() => open(null)} className={variant === 'fullscreen' ? OPEN_TALL : OPEN}>
-          {t('assistant.card.journey.open')}
-          <ArrowUpRight size={12} aria-hidden="true" className="rtl:-scale-x-100" />
-        </button>
-      )}
+      {button}
     </div>
   );
 }
 
+/** The band of the entries: the journal's name, and how many entries it holds once there are more than two. */
+function JournalHead({ journal }: { journal: JournalEntries }) {
+  const { t } = useTranslation();
+  const title = journal.journalTitle ?? t('assistant.card.journey.label');
+  const count = journal.entries.length + journal.more;
+  const meta = count > 2 ? t('assistant.card.journey.entries', { count }) : undefined;
+  return <CardHeader icon={BookOpen} tone="info" title={title} meta={meta} />;
+}
+
 /** One entry as a row: its photo, its title (the way to it), its facts and the start of its text. */
 function EntryRow({
   look,
@@ -116,10 +125,11 @@ function JournalRows({ journal, fallbackRef }: { journal: JournalEntries; fallba
   const hover = useEntryHover(journal.journeyId, fallbackRef);
   return (
     <CardFrame label={t('assistant.card.journey.label')}>
+      <JournalHead journal={journal} />
       {journal.entries.map((look, index) => (
         <EntryRow key={look.entryId ?? `new-${index}`} look={look} divided={index > 0} open={open} hover={hover} />
       ))}
-      <JournalFooter journal={journal} open={open} />
+      <JournalFooter open={open} />
     </CardFrame>
   );
 }
@@ -152,7 +162,7 @@ function JournalStrip({ journal, fallbackRef }: { journal: JournalEntries; fallb
           </li>
         )}
       </CardStrip>
-      <JournalFooter journal={journal} open={open} />
+      <JournalFooter open={open} count={journal.entries.length + journal.more} />
     </div>
   );
 }

client/src/components/Assistant/cards/packing/PackingListCard.tsx

@@ -1,14 +1,16 @@
 import type { PackingListCard as PackingCard, PackingCardGroup } from '@trek/shared';
-import { Check } from 'lucide-react';
+import { Backpack, Check } from 'lucide-react';
 
 import { useTranslation } from '../../../../i18n';
 import { SoftPill } from '../../../Planner/planParts';
-import { PackedBar, PackTile } from '../../../Tours/packing/packingLinkParts';
+import { PackedBar } from '../../../Tours/packing/packingLinkParts';
 import AssistantChangeFields from '../../AssistantChangeFields';
 import type { ChangeItem } from '../../assistantParts';
 import type { CardEntry, EntityTarget } from '../cardTypes';
 import CardFrame from '../parts/CardFrame';
-import { isRunnable, mergePackingCards, packingColorOf, rowCount } from './checklistModel';
+import CardHeader from '../parts/CardHeader';
+import { CardFoot } from '../parts/CardSection';
+import { isRunnable, mergePackingCards, rowCount } from './checklistModel';
 import { ChecklistFoot, ChecklistRun, type RunEntry, type RunProps } from './checklistParts';
 import { PackingGroup, PackingRowAside, PackingRowFacts } from './packingParts';
 
@@ -62,7 +64,7 @@ function useTitle(card: PackingCard): string {
     : t('assistant.card.packing.title');
 }
 
-/** The head of an answer: the tile with the count, the title, how much is packed, and "All packed" once it is. */
+/** The head band of an answer: the backpack, the title, how much is packed with its bar, and "All packed" once it is. */
 function PackingHead({ card }: { card: PackingCard }) {
   const { t } = useTranslation();
   const title = useTitle(card);
@@ -73,50 +75,46 @@ function PackingHead({ card }: { card: PackingCard }) {
   if (source.type === 'tour') caption = t('assistant.card.packing.forTour');
   else if (source.type === 'template') caption = t('assistant.card.packing.templateAdds', { count: source.itemCount });
   else if (card.progress && total > 0) caption = t('tours.packing.packed', { packed, count: total });
-  const first = card.groups[0]?.key;
-  const color =
-    source.type === 'tour' && source.category !== null && first?.by === 'category'
-      ? packingColorOf(first.slot, source.category)
-      : null;
+  const done = card.progress !== null && total > 0 && packed === total;
   return (
-    <div className="flex min-w-0 items-center gap-2.5">
-      <PackTile count={source.type === 'template' ? source.itemCount : total} color={color} />
-      <div className="min-w-0 flex-1">
-        <p title={title} className="m-0 line-clamp-2 text-body font-semibold leading-tight text-content">
-          {title}
-        </p>
-        {caption && (
-          <p title={caption} className="m-0 truncate text-caption text-content-faint">
-            {caption}
-          </p>
-        )}
-      </div>
-      {card.progress && total > 0 && packed === total && (
-        <SoftPill tone="success" icon={<Check size={11} strokeWidth={2.4} className="flex-none" />}>
-          {t('tours.packing.allPacked')}
-        </SoftPill>
+    <CardHeader
+      icon={Backpack}
+      tone={done ? 'success' : 'info'}
+      title={title}
+      count={source.type === 'template' ? source.itemCount : total}
+      meta={caption ?? undefined}
+      actions={
+        done ? (
+          <SoftPill tone="success" icon={<Check size={11} strokeWidth={2.4} className="flex-none" />}>
+            {t('tours.packing.allPacked')}
+          </SoftPill>
+        ) : undefined
+      }
+    >
+      {card.progress && card.progress.total > 0 && (
+        <div className="mt-2.5">
+          <PackedBar packed={card.progress.packed} total={card.progress.total} />
+        </div>
       )}
-    </div>
+    </CardHeader>
   );
 }
 
 /** One answer card. */
 function PackingAnswer({ card }: { card: PackingCard }) {
   const title = useTitle(card);
-  const progress = card.progress;
   return (
     <CardFrame label={title}>
-      <div className="flex min-w-0 flex-col gap-2.5">
-        <PackingHead card={card} />
-        {progress && progress.total > 0 && <PackedBar packed={progress.packed} total={progress.total} />}
-        <PackingGroups card={card} inChange={false} />
+      <PackingHead card={card} />
+      <PackingGroups card={card} inChange={false} />
+      <CardFoot>
         <ChecklistFoot
           more={card.moreGroups}
           moreKey={MORE_GROUPS[card.groupBy].labelKey}
           target={PACKING_TARGET}
           openKey="tours.packing.open"
         />
-      </div>
+      </CardFoot>
     </CardFrame>
   );
 }

client/src/components/Assistant/cards/packing/TodoListCard.tsx

@@ -6,14 +6,15 @@ import { type PillTone, SoftPill, WhiteBadge } from '../../../Planner/planParts'
 import { localToday } from '../../../Planner/today';
 import { Tooltip } from '../../../shared/Tooltip';
 import { PRIO_CONFIG } from '../../../Todo/todoListModel';
-import { PackTile } from '../../../Tours/packing/packingLinkParts';
 import AssistantChangeFields from '../../AssistantChangeFields';
 import type { ChangeItem } from '../../assistantParts';
 import { useAssistantView } from '../../assistantViewContext';
 import type { CardEntry, EntityTarget } from '../cardTypes';
 import { ChangeMark, FactChange, NoLonger } from '../parts/CardFacts';
 import CardFrame from '../parts/CardFrame';
+import CardHeader from '../parts/CardHeader';
 import { PersonFace } from '../parts/CardPeople';
+import { CardFoot } from '../parts/CardSection';
 import { useCardFormat } from '../parts/useCardFormat';
 import { isRunnable, mergeTodoCards, todoColorOf } from './checklistModel';
 import {
@@ -204,27 +205,30 @@ function TodoAnswer({ card }: { card: TodoCard }) {
   const title = t('assistant.card.todo.title');
   return (
     <CardFrame label={title}>
-      <div className="flex min-w-0 flex-col gap-2.5">
-        <div className="flex min-w-0 flex-wrap items-center gap-2.5">
-          <PackTile count={progress?.open ?? 0} color={null} icon={ListTodo} />
-          <p className="m-0 text-body font-semibold leading-tight text-content">{title}</p>
-          {progress && <SoftPill>{t('assistant.card.todo.openCount', { count: progress.open })}</SoftPill>}
-          {progress && progress.overdue > 0 && (
+      <CardHeader
+        icon={ListTodo}
+        tone={progress && progress.overdue > 0 ? 'danger' : 'info'}
+        title={title}
+        meta={progress ? t('assistant.card.todo.openCount', { count: progress.open }) : undefined}
+        actions={
+          progress && progress.overdue > 0 ? (
             <SoftPill tone="danger">{t('assistant.card.todo.overdueCount', { count: progress.overdue })}</SoftPill>
-          )}
-        </div>
-        <div className="flex min-w-0 flex-col gap-1.5">
-          {card.groups.map((group) => (
-            <TodoGroup key={group.category ?? ''} group={group} inChange={false} />
-          ))}
-        </div>
+          ) : undefined
+        }
+      />
+      <div className="flex min-w-0 flex-col gap-1.5">
+        {card.groups.map((group) => (
+          <TodoGroup key={group.category ?? ''} group={group} inChange={false} />
+        ))}
+      </div>
+      <CardFoot>
         <ChecklistFoot
           more={card.moreGroups}
           moreKey="assistant.card.todo.moreLists"
           target={TODO_TARGET}
           openKey="assistant.card.todo.open"
         />
-      </div>
+      </CardFoot>
     </CardFrame>
   );
 }

client/src/components/Assistant/cards/packing/checklistParts.tsx

@@ -90,7 +90,7 @@ export function ChecklistRow({
           >
             {name}
           </bdi>
-          {aside && <span className="flex flex-none flex-wrap items-center justify-end gap-1">{aside}</span>}
+          {aside && <span className="flex flex-none flex-wrap items-center justify-end gap-x-2 gap-y-1">{aside}</span>}
         </div>
         {under}
       </div>

client/src/components/Assistant/cards/packing/packingParts.tsx

@@ -7,7 +7,6 @@ import { formatWeight } from '../../../Packing/packingListModel';
 import { bagFillPct } from '../../../Packing/packingListPanel.helpers';
 import { SoftPill, WhiteBadge } from '../../../Planner/planParts';
 import { Tooltip } from '../../../shared/Tooltip';
-import { CountBadge } from '../../../Tours/packing/packingLinkParts';
 import { ChangeMark, FactChange, NoLonger } from '../parts/CardFacts';
 import { PeopleStack, PersonFace } from '../parts/CardPeople';
 import { packingColorOf } from './checklistModel';
@@ -56,15 +55,31 @@ function BagSwatch({ bag, size = 'row' }: { bag: PackingCardBag | undefined; siz
  * What a row says at its end: how many, how many packed, its weight, its tier
  * and its bag. A bag the card does not carry draws nothing rather than "Unassigned".
  */
+/** A row's quantity and weight: quiet figures at its end, no frame each. */
+const QUIET = 'text-caption tabular-nums text-content-muted';
+
+/** How many rows a group holds, quiet beside its name. */
+function GroupCount({ count }: { count: number }) {
+  const { t } = useTranslation();
+  return (
+    <span
+      aria-label={t('tours.packing.items', { count })}
+      className="flex-none text-caption tabular-nums text-content-faint"
+    >
+      {count}
+    </span>
+  );
+}
+
 export function PackingRowAside({ row, bag }: { row: PackingCardItem; bag: PackingCardBag | undefined }) {
   const { t } = useTranslation();
   const personal = t('assistant.card.packing.tierPersonal');
   const partial = !row.checked && row.packed > 0 && row.packed < row.quantity;
   return (
     <>
-      {row.quantity > 1 && <WhiteBadge>×{row.quantity}</WhiteBadge>}
-      {partial && <WhiteBadge>{`${row.packed}/${row.quantity}`}</WhiteBadge>}
-      {row.weightGrams !== null && <WhiteBadge>{formatWeight(row.weightGrams)}</WhiteBadge>}
+      {row.quantity > 1 && <span className={QUIET}>×{row.quantity}</span>}
+      {partial && <span className={QUIET}>{`${row.packed}/${row.quantity}`}</span>}
+      {row.weightGrams !== null && <span className={QUIET}>{formatWeight(row.weightGrams)}</span>}
       {row.tier === 'personal' && (
         <Tooltip label={personal}>
           <span role="img" aria-label={personal} className="flex text-content-faint">
@@ -216,7 +231,7 @@ function BagHead({
 }) {
   const { t } = useTranslation();
   if (!bag) {
-    const badge = inChange ? undefined : <CountBadge count={group.count} />;
+    const badge = inChange ? undefined : <GroupCount count={group.count} />;
     const lead = <BagSwatch bag={undefined} size="head" />;
     return <ChecklistHead color="" name={t('packing.noBag')} lead={lead} badge={badge} />;
   }
@@ -283,7 +298,7 @@ export function PackingGroup({
       <ChecklistHead
         color={packingColorOf(key.slot, name)}
         name={name}
-        badge={inChange ? undefined : <CountBadge count={group.count} />}
+        badge={inChange ? undefined : <GroupCount count={group.count} />}
         people={group.assignees}
         removed={group.assigneesRemoved}
       />

client/src/components/Assistant/cards/parts/CardFrame.tsx

@@ -2,7 +2,7 @@ import type { ReactNode } from 'react';
 
 /**
  * The frame every answer card sits in, the same as the change card's: a
- * rounded card on the chat. A waiting change shows its frame dashed, a
+ * rounded card on the chat whose head band (CardHeader) runs to its edges. A waiting change shows its frame dashed, a
  * removed one faded, a settled one (discarded, expired, undone) fainter
  * still. The chat card (a message in the trip chat) sits on the quieter
  * secondary surface.
@@ -32,7 +32,7 @@ export default function CardFrame({
   return (
     <section
       aria-label={label}
-      className={`trek-assistant-enter rounded-xl border px-3 pb-2 pt-2.5 shadow-card ${STATE[state]} ${
+      className={`trek-assistant-enter overflow-hidden rounded-[16px] border px-3.5 pb-3 pt-3 shadow-card ${STATE[state]} ${
         surface === 'secondary' ? 'bg-surface-secondary' : 'bg-surface-card'
       }`}
     >

client/src/components/Assistant/cards/parts/CardHeader.tsx

@@ -1,43 +1,94 @@
 import type { LucideIcon } from 'lucide-react';
 import type { ReactNode } from 'react';
 
-import { WhiteBadge } from '../../../Planner/planParts';
+import { fs, NEUTRAL_TINT } from '../../../shared/DialogShell';
 import type { Tone } from './assistantTones';
-import KindTile from './KindTile';
 
 /**
- * The head of an answer card: its tile, what it is about (wrapping to two
- * lines at most, the whole title in its tooltip), how many it holds, one
- * quiet line of context under it, and its actions at the end.
+ * The head band of an answer card, as the trip's dialogs and booking cards
+ * wear it: a tinted band across the card's top, a raised white tile with the
+ * icon of what the card is about in its tone, an eyebrow naming the kind,
+ * the title, one quiet line under it, a count, and the card's actions at the
+ * end. It reaches the card's edges, so a card that opens with it needs no
+ * other head.
  */
+
+/** The icon's colour on the white tile, per tone. */
+const GLYPH: Record<Tone, string> = {
+  success: 'text-success',
+  info: 'text-info',
+  warning: 'text-warning',
+  danger: 'text-danger',
+};
+
 export default function CardHeader({
-  icon,
+  icon: Icon,
   tone,
   title,
+  eyebrow,
   count,
   meta,
   actions,
+  tile,
+  tint = NEUTRAL_TINT,
+  children,
 }: {
   icon: LucideIcon;
   tone: Tone;
   title: string;
+  /** The kind above the title ("PACKING LIST"); none when the title says it. */
+  eyebrow?: string;
   count?: number;
   meta?: ReactNode;
   actions?: ReactNode;
+  /** In place of the icon tile: a drawing of what the card shows (a route's sketch). */
+  tile?: ReactNode;
+  tint?: string;
+  /** Under the title row, on the band: a progress bar, a row of pills. */
+  children?: ReactNode;
 }) {
   return (
-    <div className="flex items-start gap-2.5">
-      <KindTile icon={icon} tone={tone} size="sm" />
-      <div className="min-w-0 flex-1">
-        <div className="flex min-w-0 items-center gap-1.5">
-          <bdi title={title} className="line-clamp-2 text-body font-semibold leading-tight text-content">
-            {title}
-          </bdi>
-          {count !== undefined && <WhiteBadge>{count}</WhiteBadge>}
+    <div className="-mx-3.5 -mt-3 mb-3 px-3.5 pb-3 pt-3" style={{ background: tint }}>
+      <div className={`flex gap-3 ${meta ? 'items-start' : 'items-center'}`}>
+        {tile ?? (
+          <span
+            aria-hidden="true"
+            className={`grid h-10 w-10 flex-none place-items-center rounded-[12px] bg-surface-card shadow-sm ${GLYPH[tone]}`}
+          >
+            <Icon size={18} strokeWidth={2} />
+          </span>
+        )}
+        <div className="min-w-0 flex-1">
+          {eyebrow && (
+            <div
+              className="truncate font-geist font-bold uppercase tracking-[.08em] text-content-muted"
+              style={fs(9.5)}
+            >
+              {eyebrow}
+            </div>
+          )}
+          <div className="flex min-w-0 items-center gap-2">
+            <bdi
+              title={title}
+              className="line-clamp-2 min-w-0 font-bold leading-tight tracking-[-0.01em] text-content"
+              style={fs(15, 'body')}
+            >
+              {title}
+            </bdi>
+            {count !== undefined && (
+              <span
+                className="inline-flex h-5 flex-none items-center rounded-full bg-surface-card px-2 font-semibold tabular-nums text-content-secondary shadow-sm"
+                style={fs(11)}
+              >
+                {count}
+              </span>
+            )}
+          </div>
+          {meta && <div className="mt-0.5 font-geist text-caption text-content-muted">{meta}</div>}
         </div>
-        {meta && <div className="mt-0.5 text-caption text-content-muted">{meta}</div>}
+        {actions && <div className="flex flex-none items-center gap-1">{actions}</div>}
       </div>
-      {actions && <div className="flex flex-none items-center gap-1">{actions}</div>}
+      {children}
     </div>
   );
 }

client/src/components/Assistant/cards/parts/CardRows.tsx

@@ -44,7 +44,11 @@ export function CardRow({
         <span className="block text-body font-semibold leading-tight text-content">{title}</span>
         {facts}
       </span>
-      {aside && <span className="flex-none text-caption tabular-nums text-content-secondary">{aside}</span>}
+      {aside && (
+        <span className="flex flex-none items-center gap-2 text-caption tabular-nums text-content-secondary">
+          {aside}
+        </span>
+      )}
     </>
   );
   const hover = onHover

client/src/components/Assistant/cards/parts/CardSection.tsx

@@ -0,0 +1,49 @@
+import type { ReactNode } from 'react';
+
+import { Eyebrow, Field } from '../../../Planner/bookings/bookingParts';
+
+/**
+ * The body of an answer card in the trip dialogs' look: sections under an
+ * eyebrow of their own, figures as framed fields with their label over them
+ * (the field every booking card is made of), and a foot bar for the card's
+ * ways onward, set off by a line across the card.
+ */
+
+/** One part of a card under its eyebrow, with room for something on the right of the label. */
+export function CardSection({ label, aside, children }: { label: string; aside?: ReactNode; children: ReactNode }) {
+  return (
+    <section className="mt-3 first:mt-0">
+      <div className="mb-1.5 flex min-h-4 items-center gap-2">
+        <Eyebrow>{label}</Eyebrow>
+        {aside && <span className="ms-auto flex items-center gap-1">{aside}</span>}
+      </div>
+      {children}
+    </section>
+  );
+}
+
+/** A card's figures, side by side in framed fields: as many columns as figures, at most four. */
+export function CardFields({ fields }: { fields: readonly { key: string; label: string; value: ReactNode }[] }) {
+  if (fields.length === 0) return null;
+  const columns = ['grid-cols-1', 'grid-cols-2', 'grid-cols-3', 'grid-cols-4'][Math.min(fields.length, 4) - 1];
+  return (
+    <div className={`grid gap-1.5 ${columns}`}>
+      {fields.map((field) => (
+        <div key={field.key} className="min-w-0" data-field={field.key}>
+          <Field label={field.label} tabular>
+            {field.value}
+          </Field>
+        </div>
+      ))}
+    </div>
+  );
+}
+
+/** The foot of a card: its actions at the end, under a line that runs to the card's edges. */
+export function CardFoot({ children }: { children: ReactNode }) {
+  return (
+    <div className="-mx-3.5 -mb-3 mt-3 flex flex-wrap items-center justify-end gap-1.5 border-t border-edge-faint bg-surface-secondary px-3.5 py-2.5">
+      {children}
+    </div>
+  );
+}

client/src/components/Assistant/cards/tour/TourFigureLine.tsx

@@ -0,0 +1,46 @@
+import { Clock, MoveHorizontal, TrendingUp } from 'lucide-react';
+import type { ReactNode } from 'react';
+
+import type { DistanceUnit } from '../../../../types';
+import { formatDistance, formatElevation } from '../../../../utils/units';
+import type { LegVariant } from '../../../Tours/planner/legVariants';
+import { formatTourDuration } from '../../../Tours/planner/tourDurationInput';
+
+/**
+ * A way's length, climb and time as one quiet line of glyphs and values,
+ * without a frame around each: what a choice of ways and a change row show
+ * where framed fields would crowd the row.
+ */
+
+/** One figure of a way: its glyph and its value, quiet, in a line of them. */
+function Figure({ name, icon, children }: { name: string; icon: ReactNode; children: ReactNode }) {
+  return (
+    <span className="inline-flex items-center gap-1 whitespace-nowrap" data-figure={name}>
+      {icon}
+      <span className="tabular-nums">{children}</span>
+    </span>
+  );
+}
+
+const GLYPH = { size: 11, strokeWidth: 2.2, 'aria-hidden': true, className: 'flex-none text-content-faint' } as const;
+
+/** A way's length, climb and time in one quiet line. */
+export default function WayFigures({ way, unit }: { way: LegVariant; unit: DistanceUnit }) {
+  return (
+    <span className="flex flex-wrap items-center gap-x-3 gap-y-0.5 text-caption text-content-secondary">
+      <Figure name="distance" icon={<MoveHorizontal {...GLYPH} />}>
+        {formatDistance(way.distanceM / 1000, unit)}
+      </Figure>
+      {way.gainM !== null && (
+        <Figure name="ascent" icon={<TrendingUp {...GLYPH} />}>
+          {formatElevation(way.gainM, unit)}
+        </Figure>
+      )}
+      {way.minutes !== null && (
+        <Figure name="time" icon={<Clock {...GLYPH} />}>
+          {formatTourDuration(way.minutes)}
+        </Figure>
+      )}
+    </span>
+  );
+}

client/src/components/Assistant/cards/tour/TourRouteActions.tsx

@@ -5,6 +5,7 @@ import { useTranslation } from '../../../../i18n';
 import { SoftPill } from '../../../Planner/planParts';
 import { useAssistantView } from '../../assistantViewContext';
 import { CardOpenButton } from '../parts/CardOpen';
+import { CardFoot } from '../parts/CardSection';
 import { tourTarget } from './tourLook';
 import { useTakeProposal } from './useTourRouteCard';
 
@@ -58,7 +59,7 @@ export default function TourRouteActions({
   if (take.state === 'failed') caption = t('assistant.card.tour.askAgain');
   else if (take.state !== 'taken' && take.reasonKey) caption = t(take.reasonKey);
   return (
-    <div className="mt-2.5 flex flex-col items-end gap-1">
+    <CardFoot>
       <div className="flex flex-wrap items-center justify-end gap-1.5">
         <button
           type="button"
@@ -92,10 +93,10 @@ export default function TourRouteActions({
         )}
       </div>
       {take.visible && caption && (
-        <p className="m-0 text-end text-caption text-content-muted" role="status">
+        <p className="m-0 basis-full text-end text-caption text-content-muted" role="status">
           {caption}
         </p>
       )}
-    </div>
+    </CardFoot>
   );
 }

client/src/components/Assistant/cards/tour/TourRouteCard.test.tsx

@@ -115,11 +115,11 @@ afterEach(() => {
 });
 
 describe('TourRouteCard', () => {
-  it('FE-AI-TOUR-021: states the name, the figures as badges, the day and the hardest grade, uncertain when little is graded', () => {
+  it('FE-AI-TOUR-021: states the name, the figures as framed fields, the day and the hardest grade, uncertain when little is graded', () => {
     const { container } = renderCard(HIKE);
     expect(screen.getByText('Hochfelln from Bergen')).toBeInTheDocument();
     for (const figure of ['time', 'distance', 'ascent', 'descent']) {
-      expect(container.querySelector(`[data-figure="${figure}"]`)).not.toBeNull();
+      expect(container.querySelector(`[data-field="${figure}"]`)).not.toBeNull();
     }
     expect(screen.getByText('8.2 km')).toBeInTheDocument();
     expect(screen.getAllByText('640 m')).toHaveLength(2);
@@ -159,7 +159,7 @@ describe('TourRouteCard', () => {
 
   it('FE-AI-TOUR-024: a stop chip moves the spot in focus to the stop while pointed at', () => {
     renderCard(HIKE);
-    const hut = screen.getByRole('button', { name: 'Strausshütte, 09:40' });
+    const hut = screen.getByRole('button', { name: /^Strausshütte, 09:40/ });
     fireEvent.mouseEnter(hut);
     expect(useAssistantStore.getState().routeFocus?.focus.distanceMeters).toBeCloseTo(2400, 0);
     fireEvent.mouseLeave(hut);
@@ -171,11 +171,11 @@ describe('TourRouteCard', () => {
   it('FE-AI-TOUR-024b: the stops run as a timeline, each walk on the line between two stops and read with the one it leads to', () => {
     renderCard(HIKE);
     const list = screen.getByRole('list', { name: 'Stops along the way' });
-    // One row per stop; the lines between them are not rows.
-    expect(list.querySelectorAll('[role="listitem"]')).toHaveLength(5);
+    // One row per stop; the walks between them are hidden, read with the stop they lead to.
+    expect(list.querySelectorAll('li:not([aria-hidden="true"])')).toHaveLength(5);
     // The place beside the way has no time: the hut measures from the start, then each stop from the last.
-    expect(screen.getAllByText(/from the last stop$/)).toHaveLength(3);
-    const legs = [...list.querySelectorAll('[aria-hidden="true"]')].map((leg) => leg.textContent).filter(Boolean);
+    expect(screen.getAllByRole('button', { name: /from the last stop$/ })).toHaveLength(3);
+    const legs = [...list.querySelectorAll('li[aria-hidden="true"]')].map((leg) => leg.textContent).filter(Boolean);
     expect(legs).toHaveLength(3);
   });
 
@@ -234,18 +234,21 @@ describe('TourRouteCard', () => {
     const decide = vi.fn(async (_key: number, decisions: { toolCallId: string; approved: boolean }[]) => {
       // The server applies the take; the thread shows it applied with the new tour's place.
       const chat = chatOf(useAssistantStore.getState(), TRIP);
-      const applied = heldTake(true);
-      applied.parts.push({
+      // The server sends the answer back with the take joined to it, now applied with the new tour's place.
+      const applied = proposed();
+      applied.parts.push(...heldTake(true).parts, {
         type: 'data-trek-applied',
         data: { toolCallId: decisions[0]?.toolCallId ?? '', entity: 'tour', ids: [77], dayId: 22, undoUntil: null },
       });
-      useAssistantStore.setState({ byTrip: { [TRIP]: { ...chat, messages: [proposed(), applied] } } });
+      useAssistantStore.setState({ byTrip: { [TRIP]: { ...chat, messages: [applied] } } });
     });
     seed([proposed()]);
     useAssistantStore.setState({ decide });
     takeProposal.mockImplementationOnce(async () => {
       const chat = chatOf(useAssistantStore.getState(), TRIP);
-      useAssistantStore.setState({ byTrip: { [TRIP]: { ...chat, messages: [proposed(), heldTake(undefined)] } } });
+      const joined = proposed();
+      joined.parts.push(...heldTake(undefined).parts);
+      useAssistantStore.setState({ byTrip: { [TRIP]: { ...chat, messages: [joined] } } });
       return 'held';
     });
     renderCard(HIKE, { onOpen });
@@ -374,7 +377,7 @@ describe('TourRouteCard', () => {
   it('FE-AI-TOUR-042: the day shows the latest start when none is set, and the walk in the dark in red', () => {
     const schedule = HIKE.schedule as NonNullable<Route['schedule']>;
     renderCard({ ...HIKE, schedule: { ...schedule, start: null, arrive: null, latestStart: '10:30' } });
-    expect(screen.getByText('Start by 10:30 to finish before sunset')).toBeInTheDocument();
+    expect(screen.getByText('Start by 10:30')).toBeInTheDocument();
 
     const { container } = renderCard({
       ...HIKE,
@@ -382,6 +385,6 @@ describe('TourRouteCard', () => {
       schedule: { ...schedule, start: '06:00', arrive: '19:00', latestStart: '10:30' },
     });
     expect(container.querySelectorAll('[data-testid="tour-day"] .bg-danger')).toHaveLength(2);
-    expect(screen.getAllByText('Start by 10:30 to finish before sunset')).toHaveLength(1);
+    expect(screen.getAllByText('Start by 10:30')).toHaveLength(1);
   });
 });

client/src/components/Assistant/cards/tour/TourRouteCard.tsx

@@ -4,11 +4,11 @@ import { useMemo } from 'react';
 import { useTranslation } from '../../../../i18n';
 import type { DistanceIndexedProfileSample } from '../../../../utils/routeGeometry';
 import { variantPaintCss } from '../../../Tours/planner/legVariantPaint';
-import { useAssistantView } from '../../assistantViewContext';
 import CardFrame from '../parts/CardFrame';
+import { CardSection } from '../parts/CardSection';
 import TourRouteActions from './TourRouteActions';
 import TourRouteDay from './TourRouteDay';
-import TourRouteHead from './TourRouteHead';
+import TourRouteHead, { TourRouteFields } from './TourRouteHead';
 import { profileSamples } from './tourRouteModel';
 import { TourRouteProblem, TourRouteWarnings } from './TourRouteNotes';
 import TourRouteProfile from './TourRouteProfile';
@@ -40,19 +40,30 @@ export function TourRouteBody({
   compare?: ReadonlyArray<{ key: string; samples: readonly DistanceIndexedProfileSample[]; color: string }>;
   letter?: string;
 }) {
+  const { t } = useTranslation();
   const samples = useMemo(() => profileSamples(card), [card]);
   return (
     <>
-      <TourRouteProfile
-        toolCallId={toolCallId}
-        card={card}
-        samples={samples}
-        color={color}
-        focus={route.focus}
-        onFocus={route.setFocus}
-        compare={compare}
-      />
-      <TourRouteStops card={card} samples={samples} onFocus={route.setFocus} />
+      <TourRouteFields card={card} />
+      {/* A way drawn straight has neither heights nor the line to say so under: no section at all. */}
+      {(samples.length >= 2 || card.routed) && (
+        <CardSection label={t('tours.planner.inspector.elevation')}>
+          <TourRouteProfile
+            toolCallId={toolCallId}
+            card={card}
+            samples={samples}
+            color={color}
+            focus={route.focus}
+            onFocus={route.setFocus}
+            compare={compare}
+          />
+        </CardSection>
+      )}
+      {card.stops.length > 0 && (
+        <CardSection label={t('assistant.card.tour.stops')}>
+          <TourRouteStops card={card} samples={samples} onFocus={route.setFocus} />
+        </CardSection>
+      )}
       <TourRouteDay card={card} />
       <TourRouteWarnings card={card} />
       <TourRouteProblem card={card} />
@@ -63,12 +74,11 @@ export function TourRouteBody({
 
 export default function TourRouteCard({ toolCallId, card }: { toolCallId: string; card: Route }) {
   const { t } = useTranslation();
-  const { density } = useAssistantView();
   const route = useTourRouteCard(toolCallId, card);
   return (
     <div {...route.handlers} className={`rounded-xl ${route.litFromMap ? 'ring-1 ring-accent' : ''}`}>
       <CardFrame label={routeName(card, t)}>
-        <TourRouteHead card={card} sketchHeight={density === 'roomy' ? 64 : 56} onShow={route.showOnMap} />
+        <TourRouteHead card={card} onShow={route.showOnMap} />
         <TourRouteBody toolCallId={toolCallId} card={card} route={route} color={variantPaintCss('current')} />
       </CardFrame>
     </div>

client/src/components/Assistant/cards/tour/TourRouteDay.tsx

@@ -4,6 +4,7 @@ import { createElement } from 'react';
 
 import { useTranslation } from '../../../../i18n';
 import { SoftPill } from '../../../Planner/planParts';
+import { Tooltip } from '../../../shared/Tooltip';
 import { weatherIconFor } from '../../../Weather/weatherIcons';
 import { useCardFormat } from '../parts/useCardFormat';
 import { type BarSpan, dayBarOf, forecastHours, RAIN_SHOWN_PCT } from './tourRouteDayModel';
@@ -93,9 +94,13 @@ export default function TourRouteDay({ card }: { card: TourRouteCard }) {
       )}
       {!schedule.start && schedule.latestStart && (
         <div className="mt-1 flex">
-          <SoftPill icon={<Clock size={10} strokeWidth={2.2} aria-hidden="true" />}>
-            {t('assistant.card.tour.latestStart', { time: format.clock(schedule.latestStart) })}
-          </SoftPill>
+          <Tooltip label={t('assistant.card.tour.latestStart', { time: format.clock(schedule.latestStart) })}>
+            <span className="inline-flex">
+              <SoftPill icon={<Clock size={10} strokeWidth={2.2} aria-hidden="true" />}>
+                {t('assistant.card.tour.latestStartShort', { time: format.clock(schedule.latestStart) })}
+              </SoftPill>
+            </span>
+          </Tooltip>
         </div>
       )}
       {schedule.weather === 'climate' && (

client/src/components/Assistant/cards/tour/TourRouteHead.tsx

@@ -4,12 +4,14 @@ import { createElement } from 'react';
 
 import { useTranslation } from '../../../../i18n';
 import { SoftPill, WhiteBadge } from '../../../Planner/planParts';
+import { fs, PILL } from '../../../shared/DialogShell';
 import { Tooltip } from '../../../shared/Tooltip';
 import { SacStepChip } from '../../../Tours/hike/SacStepChip';
 import { variantPaintCss } from '../../../Tours/planner/legVariantPaint';
 import { formatTourDuration } from '../../../Tours/planner/tourDurationInput';
 import { tourDayRowIcon } from '../../../Tours/tourDayRowIcon';
-import { CardFacts } from '../parts/CardFacts';
+import CardHeader from '../parts/CardHeader';
+import { CardFields } from '../parts/CardSection';
 import RouteSketch from '../parts/RouteSketch';
 import { useCardFormat } from '../parts/useCardFormat';
 import { factKeysOf, factValue, percentText, type FactKey } from './tourRouteModel';
@@ -89,7 +91,7 @@ export function TourGrade({ card }: { card: TourRouteCard }) {
   );
 }
 
-/** The day a route is planned on, as words: "Day 2, Tue 14 Oct", or the date alone. */
+/** The day a route is planned on, as a white pill on the band: "Day 2, Tue 14 Oct", or the date alone. */
 function DayPill({ card }: { card: TourRouteCard }) {
   const { t } = useTranslation();
   const format = useCardFormat();
@@ -98,7 +100,12 @@ function DayPill({ card }: { card: TourRouteCard }) {
   const date = format.date(schedule.date);
   const text =
     schedule.dayNumber !== null ? `${t('assistant.card.tour.day', { day: schedule.dayNumber })}, ${date}` : date;
-  return <SoftPill icon={<CalendarDays size={10} strokeWidth={2.2} aria-hidden="true" />}>{text}</SoftPill>;
+  return (
+    <span className={PILL} style={fs(11)}>
+      <CalendarDays size={11} strokeWidth={2.2} aria-hidden="true" className="flex-none text-content-faint" />
+      {text}
+    </span>
+  );
 }
 
 /** The route drawn small: a button that shows it on the map. */
@@ -127,35 +134,51 @@ export function TourRouteSketch({
   );
 }
 
-export default function TourRouteHead({
-  card,
-  sketchHeight,
-  onShow,
-}: {
-  card: TourRouteCard;
-  sketchHeight: number;
-  onShow: () => void;
-}) {
+/** The route's figures as framed fields, each under its label: distance, climb, descent and time, as known. */
+export function TourRouteFields({ card }: { card: TourRouteCard }) {
+  const { t } = useTranslation();
+  const format = useCardFormat();
+  const fields = factKeysOf(card).flatMap((key) => {
+    const value = factValue(card, key);
+    if (value === null) return [];
+    // A field's label is short; how the time was reckoned is the figure badges' tooltip.
+    const label = t(FACT_LOOK[key].labelKey ?? 'tours.planner.inspector.duration');
+    let text: string;
+    if (key === 'time') text = formatTourDuration(value);
+    else text = key === 'distance' ? format.distance(value / 1000) : format.elevation(value);
+    return [{ key, label, value: text }];
+  });
+  return <CardFields fields={fields} />;
+}
+
+/**
+ * The head band of a route card: the route drawn small on a raised tile, what
+ * kind of tour it is above its name, the label under it, and its grade and
+ * the day it is planned on as pills on the band.
+ */
+export default function TourRouteHead({ card, onShow }: { card: TourRouteCard; onShow: () => void }) {
   const { t } = useTranslation();
   const name = routeName(card, t);
+  const tile = (
+    <span className="w-14 flex-none overflow-hidden rounded-[12px] bg-surface-card p-1 shadow-sm">
+      <TourRouteSketch card={card} height={48} onShow={onShow} />
+    </span>
+  );
   return (
-    <div className="flex items-start gap-2.5">
-      <div className="w-[72px] flex-none">
-        <TourRouteSketch card={card} height={sketchHeight} onShow={onShow} />
-      </div>
-      <div className="min-w-0 flex-1">
-        <div className="flex min-w-0 items-start gap-2">
-          <bdi title={name} className="line-clamp-2 min-w-0 flex-1 text-body font-semibold leading-tight text-content">
-            {name}
-          </bdi>
-          <TourGrade card={card} />
-        </div>
-        {card.label && <p className="m-0 mt-0.5 truncate text-caption text-content-muted">{card.label}</p>}
-        <CardFacts>
-          <TourRouteFigures card={card} />
+    <CardHeader
+      icon={tourDayRowIcon(card.activity)}
+      tone="info"
+      tile={tile}
+      eyebrow={t(TOUR_TYPE_WORDS[card.activity].labelKey)}
+      title={name}
+      meta={card.label ?? undefined}
+    >
+      {((card.activity === 'hike' && card.grades) || card.schedule) && (
+        <div className="mt-2.5 flex flex-wrap items-center gap-1.5">
+          {card.activity === 'hike' && card.grades && <TourGrade card={card} />}
           <DayPill card={card} />
-        </CardFacts>
-      </div>
-    </div>
+        </div>
+      )}
+    </CardHeader>
   );
 }

client/src/components/Assistant/cards/tour/TourRouteInRow.tsx

@@ -10,7 +10,8 @@ import { tourDayRowIcon } from '../../../Tours/tourDayRowIcon';
 import type { ChangeItem } from '../../assistantParts';
 import { verbLookOf } from '../cardLooks';
 import KindTile from '../parts/KindTile';
-import { TourGrade, TourRouteFigures, TourRouteSketch } from './TourRouteHead';
+import WayFigures from './TourFigureLine';
+import { TourGrade, TourRouteSketch } from './TourRouteHead';
 import { legVariantOf, previousVariantOf, profileBands, profileSamples } from './tourRouteModel';
 import { useTourRouteCard } from './useTourRouteCard';
 
@@ -37,29 +38,33 @@ export default function TourRouteInRow({ card, item }: { card: TourRouteCard; it
   const samples = useMemo(() => profileSamples(card), [card]);
   const previous = previousVariantOf(card);
   const notPlanned = card.problem?.why === 'not_planned';
+  const grades = card.activity === 'hike' ? card.grades : null;
   return (
-    <div className="flex flex-col gap-1.5" data-testid="tour-route-row">
-      <div className="flex items-start gap-2">
-        <div className="w-16 flex-none">
-          <TourRouteSketch card={card} height={40} onShow={showOnMap} />
-        </div>
-        <div className="min-w-0 flex-1">
-          <span className="flex flex-wrap items-center gap-1">
-            <TourRouteFigures card={card} />
-            <TourGrade card={card} />
-            {previous && (
-              <VariantDelta
-                variant={legVariantOf(card, 'current')}
-                current={previous}
-                unit={unit}
-                t={t}
-                hint={t('assistant.card.tour.deltaBefore')}
-              />
-            )}
+    <div
+      className="flex flex-col gap-2 rounded-[12px] border border-edge-faint bg-surface-secondary p-2.5"
+      data-testid="tour-route-row"
+    >
+      <div className="flex items-center gap-2.5">
+        <span className="w-14 flex-none overflow-hidden rounded-[10px] bg-surface-card p-1 shadow-sm">
+          <TourRouteSketch card={card} height={36} onShow={showOnMap} />
+        </span>
+        <div className="flex min-w-0 flex-1 flex-col gap-1">
+          <span className="flex min-w-0 items-center gap-2">
+            <span className="min-w-0 flex-1">
+              <WayFigures way={legVariantOf(card, 'current')} unit={unit} />
+            </span>
+            {grades && grades.highest !== null && <TourGrade card={card} />}
           </span>
-          {notPlanned && (
-            <p className="m-0 mt-1 text-caption text-content-faint">{t('assistant.card.tour.notPlanned')}</p>
+          {previous && (
+            <VariantDelta
+              variant={legVariantOf(card, 'current')}
+              current={previous}
+              unit={unit}
+              t={t}
+              hint={t('assistant.card.tour.deltaBefore')}
+            />
           )}
+          {notPlanned && <p className="m-0 text-caption text-content-faint">{t('assistant.card.tour.notPlanned')}</p>}
         </div>
       </div>
       {!notPlanned && samples.length >= 2 && (

client/src/components/Assistant/cards/tour/TourRouteProfile.tsx

@@ -87,7 +87,7 @@ export default function TourRouteProfile({ toolCallId, card, samples, color, foc
   const bands = useMemo(() => profileBands(card, samples), [card, samples]);
   if (samples.length < 2) {
     if (!card.routed) return null;
-    return <p className="m-0 mt-2 text-caption text-content-faint">{t('assistant.card.tour.noHeights')}</p>;
+    return <p className="m-0 text-caption text-content-faint">{t('assistant.card.tour.noHeights')}</p>;
   }
   const phone = variant === 'fullscreen';
   const focusGrade = focus ? gradeAt(grades, focus.distanceMeters) : null;
@@ -112,7 +112,7 @@ export default function TourRouteProfile({ toolCallId, card, samples, color, foc
   };
 
   return (
-    <div className="mt-2">
+    <div className="rounded-[12px] border border-edge-faint bg-surface-secondary px-2 pb-1.5 pt-2">
       <ElevationProfile
         samples={samples}
         color={color}

client/src/components/Assistant/cards/tour/TourRouteStops.tsx

@@ -1,5 +1,5 @@
 import type { TourRouteCard, TourRouteStop } from '@trek/shared';
-import { AlertTriangle, Flag, MapPin, MountainSnow, type LucideIcon } from 'lucide-react';
+import { AlertTriangle, Clock, Flag, MapPin, MountainSnow, type LucideIcon } from 'lucide-react';
 import { createElement, type ReactNode } from 'react';
 
 import { useTranslation } from '../../../../i18n';
@@ -9,7 +9,7 @@ import {
   type RouteProfileFocus,
 } from '../../../../utils/routeGeometry';
 import { TOUR_POI_LOOKS } from '../../../Map/poiCategories';
-import { SoftPill, WhiteBadge } from '../../../Planner/planParts';
+import { SoftPill } from '../../../Planner/planParts';
 import { Tooltip } from '../../../shared/Tooltip';
 import { StageEndCorner } from '../../../Tours/stages/StageParts';
 import { useCardFormat } from '../parts/useCardFormat';
@@ -18,12 +18,13 @@ import { FLAG_LOOK, stopName } from './tourRouteWords';
 
 /**
  * The stops of a route as a timeline in the order they lie along it: one row
- * per stop (the start and the end, the huts, summits and stations on the way
- * with their clock, what lies a little off the way quieter), joined by a line
- * that carries the walking time of the stretch between two stops, so a time
- * is never read as belonging to the stop beside it. Pointing at a chip or
- * tapping it moves the spot in focus there, on the profile and on the map
- * alike. Past eight the middle ones fold into a count that names them.
+ * per stop on a line down the card (the start and the end filled, the huts,
+ * summits and stations on the way with their glyph, what lies a little off
+ * the way quieter), its name, how far off the way or how long the stay under
+ * it, and its clock at the end; the walk between two stops sits on the line
+ * between their rows, so a time is never read as a stop's own. Pointing at a
+ * row or tapping it moves the spot in focus there, on the profile and on the
+ * map alike. Past eight the middle ones fold into a row that names them.
  */
 
 /** A stop's glyph: the flag at either end, the mountain at the highest point, the place's own for a kind. */
@@ -46,12 +47,31 @@ function focusOf(stop: TourRouteStop, samples: readonly DistanceIndexedProfileSa
   );
 }
 
-function StopChip({
+/** A stop's mark on the line: filled at the start and the end, a ring with its glyph on the way, smaller off it. */
+function Marker({ stop }: { stop: TourRouteStop }) {
+  const end = stop.role === 'start' || stop.role === 'end';
+  const along = stop.role === 'along';
+  const glyph = createElement(iconOf(stop), { size: along ? 9 : 10, strokeWidth: 2.2, 'aria-hidden': true });
+  let look = 'h-5 w-5 bg-surface-card text-content-muted ring-1 ring-inset ring-edge';
+  if (end) look = 'h-5 w-5 bg-accent text-accent-text';
+  else if (along) look = 'h-4 w-4 bg-surface-secondary text-content-faint ring-1 ring-inset ring-edge-faint';
+  return (
+    <span className="relative z-[1] flex w-5 flex-none justify-center">
+      <span className={`grid place-items-center rounded-full ${look}`}>{glyph}</span>
+      {stop.stageEnd && <StageEndCorner />}
+    </span>
+  );
+}
+
+function StopRow({
   stop,
+  leg,
   samples,
   onFocus,
 }: {
   stop: TourRouteStop;
+  /** The walk from the last stop with a time to this one, read with it. */
+  leg: number | null;
   samples: readonly DistanceIndexedProfileSample[];
   onFocus: (focus: RouteProfileFocus | null) => void;
 }) {
@@ -65,44 +85,45 @@ function StopChip({
       : null;
   const stay = stop.stayMinutes ? t('assistant.card.tour.stay', { time: format.minutes(stop.stayMinutes) }) : null;
   const clock = stop.clock ? format.clock(stop.clock) : null;
-  const label = [name, clock, off, stay].filter(Boolean).join(', ');
-  const glyph = createElement(iconOf(stop), {
-    size: 10,
-    strokeWidth: 2.2,
-    'aria-hidden': true,
-    className: 'flex-none text-content-faint',
-  });
-  const body = (
-    <>
-      <bdi className="max-w-[10rem] truncate">{name}</bdi>
-      {clock && <span className="tabular-nums text-content-muted">{clock}</span>}
-      {off && <span className="text-content-faint">{off}</span>}
-    </>
-  );
+  const walked = leg !== null ? t('assistant.card.tour.legTime', { time: format.minutes(leg) }) : null;
+  const label = [name, clock, off, stay, walked].filter(Boolean).join(', ');
+  const point = () => onFocus(focusOf(stop, samples));
+  const under = [off, stay].filter((part): part is string => part !== null);
   return (
-    <span className="inline-flex items-center gap-1">
-      <Tooltip label={label}>
-        <button
-          type="button"
-          aria-label={label}
-          onMouseEnter={() => onFocus(focusOf(stop, samples))}
-          onMouseLeave={() => onFocus(null)}
-          onFocus={() => onFocus(focusOf(stop, samples))}
-          onBlur={() => onFocus(null)}
-          onClick={() => onFocus(focusOf(stop, samples))}
-          className="relative inline-flex rounded-full focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent"
-        >
-          {along ? <WhiteBadge icon={glyph}>{body}</WhiteBadge> : <SoftPill icon={glyph}>{body}</SoftPill>}
-          {stop.stageEnd && <StageEndCorner />}
-        </button>
-      </Tooltip>
-      {stay && <span className="text-caption text-content-faint">{stay}</span>}
-      {stop.flag && (
-        <SoftPill tone="warning" icon={<AlertTriangle size={10} strokeWidth={2.2} aria-hidden="true" />}>
-          {t(FLAG_LOOK[stop.flag].labelKey)}
-        </SoftPill>
-      )}
-    </span>
+    <li className="flex">
+      <button
+        type="button"
+        aria-label={label}
+        onMouseEnter={point}
+        onMouseLeave={() => onFocus(null)}
+        onFocus={point}
+        onBlur={() => onFocus(null)}
+        onClick={point}
+        className="-mx-1.5 flex min-w-0 flex-1 items-center gap-2.5 rounded-[10px] px-1.5 py-1 text-start transition-colors hover:bg-surface-hover focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent"
+      >
+        <Marker stop={stop} />
+        <span className="min-w-0 flex-1">
+          <bdi
+            className={`block truncate leading-tight ${along ? 'text-caption text-content-secondary' : 'text-body font-medium text-content'}`}
+          >
+            {name}
+          </bdi>
+          {(under.length > 0 || stop.flag) && (
+            <span className="mt-0.5 flex flex-wrap items-center gap-x-2 gap-y-1 text-caption text-content-faint">
+              {under.map((part) => (
+                <span key={part}>{part}</span>
+              ))}
+              {stop.flag && (
+                <SoftPill tone="warning" icon={<AlertTriangle size={10} strokeWidth={2.2} aria-hidden="true" />}>
+                  {t(FLAG_LOOK[stop.flag].labelKey)}
+                </SoftPill>
+              )}
+            </span>
+          )}
+        </span>
+        {clock && <span className="flex-none text-caption tabular-nums text-content-muted">{clock}</span>}
+      </button>
+    </li>
   );
 }
 
@@ -112,38 +133,36 @@ function legMinutes(from: TourRouteStop | undefined, to: TourRouteStop): number
   return to.minutes - from.minutes;
 }
 
-/** The line between two rows, with the stretch's walking time on it. */
+/** The walk between two rows, beside the line: read with the row it leads to, so hidden here. */
 function Leg({ minutes }: { minutes: number | null }) {
   const format = useCardFormat();
+  if (minutes === null) return <li aria-hidden="true" className="h-1.5" />;
   return (
-    // Read with the stop it leads to; a list holds only its rows.
-    <span aria-hidden="true" className="flex min-h-[14px] items-stretch gap-2">
-      <span className="flex w-2.5 flex-none justify-center">
-        <span className="w-px bg-edge" />
+    <li aria-hidden="true" className="flex items-center py-0.5 ps-[30px]">
+      <span className="inline-flex items-center gap-1 rounded-full bg-surface-secondary px-2 py-0.5 text-caption tabular-nums text-content-muted">
+        <Clock size={10} strokeWidth={2.2} className="flex-none text-content-faint" />
+        {format.minutes(minutes)}
       </span>
-      {minutes !== null && (
-        <span className="text-caption tabular-nums leading-tight text-content-faint">{format.minutes(minutes)}</span>
-      )}
-    </span>
+    </li>
   );
 }
 
-/** One row of the timeline: its dot on the line, then the stop, read after the walk that leads to it. */
-function Row({ end, leg, children }: { end: boolean; leg?: number | null; children: ReactNode }) {
+/** The middle stops folded into one row past eight, naming them in its tooltip. */
+function FoldedRow({ stops }: { stops: readonly TourRouteStop[] }) {
   const { t } = useTranslation();
-  const format = useCardFormat();
+  const names = stops.map((stop) => stopName(stop, t)).join(', ');
   return (
-    <span role="listitem" className="flex items-center gap-2">
-      {leg != null && (
-        <span className="sr-only">{t('assistant.card.tour.legTime', { time: format.minutes(leg) })}</span>
-      )}
-      <span className="flex w-2.5 flex-none justify-center">
-        <span
-          className={`h-2 w-2 rounded-full ${end ? 'bg-content-muted' : 'border border-content-faint bg-surface-card'}`}
-        />
+    <li className="flex items-center gap-2.5 py-1">
+      <span className="relative z-[1] flex w-5 flex-none justify-center">
+        <span className="h-2 w-2 rounded-full border border-dashed border-content-faint bg-surface-card" />
       </span>
-      <span className="flex min-w-0 flex-wrap items-center gap-1.5">{children}</span>
-    </span>
+      <Tooltip label={names}>
+        <span className="text-caption text-content-muted underline decoration-dotted underline-offset-2">
+          {t('assistant.card.tour.stopsMore', { count: stops.length })}
+          <span className="sr-only">{`: ${names}`}</span>
+        </span>
+      </Tooltip>
+    </li>
   );
 }
 
@@ -159,42 +178,30 @@ export default function TourRouteStops({
   const { t } = useTranslation();
   const { head, folded, tail } = chipStops(card);
   if (head.length === 0) return null;
-  const names = folded.map((stop) => stopName(stop, t)).join(', ');
   // The time is walked from the last stop that has one: a place beside the way has none.
   let walked: TourRouteStop | undefined;
   const rows: ReactNode[] = [];
   const pushStop = (stop: TourRouteStop, key: string) => {
     const leg = legMinutes(walked, stop);
     if (rows.length > 0) rows.push(<Leg key={`${key}-leg`} minutes={leg} />);
-    rows.push(
-      <Row key={key} end={stop.role === 'start' || stop.role === 'end'} leg={leg}>
-        <StopChip stop={stop} samples={samples} onFocus={onFocus} />
-      </Row>
-    );
+    rows.push(<StopRow key={key} stop={stop} leg={leg} samples={samples} onFocus={onFocus} />);
     if (stop.minutes !== null) walked = stop;
   };
   head.forEach((stop, index) => pushStop(stop, `h-${index}`));
   if (folded.length > 0) {
     rows.push(<Leg key="f-leg" minutes={null} />);
-    rows.push(
-      <Row key="f" end={false}>
-        <Tooltip label={names}>
-          <span className="inline-flex">
-            <WhiteBadge>
-              {t('assistant.card.tour.stopsMore', { count: folded.length })}
-              <span className="sr-only">{`: ${names}`}</span>
-            </WhiteBadge>
-          </span>
-        </Tooltip>
-      </Row>
-    );
+    rows.push(<FoldedRow key="f" stops={folded} />);
     // The folded stretch's time is not one leg; the next stop measures from the last folded one.
     walked = [...folded].reverse().find((stop) => stop.minutes !== null) ?? walked;
   }
   tail.forEach((stop, index) => pushStop(stop, `t-${index}`));
   return (
-    <div className="mt-2 flex flex-col" role="list" aria-label={t('assistant.card.tour.stops')}>
-      {rows}
+    <div className="relative">
+      {/* The line down the timeline, from the first mark to the last, under the marks. */}
+      <span aria-hidden="true" className="absolute bottom-3 start-[9.5px] top-3 w-px bg-edge" />
+      <ul className="relative m-0 flex list-none flex-col p-0" aria-label={t('assistant.card.tour.stops')}>
+        {rows}
+      </ul>
     </div>
   );
 }

client/src/components/Assistant/cards/tour/TourWays.tsx

@@ -1,19 +1,128 @@
+import type { TourRouteCard as Route } from '@trek/shared';
+import { Route as RouteIcon } from 'lucide-react';
 import { useMemo } from 'react';
 
 import { useTranslation } from '../../../../i18n';
 import { chatOf, useAssistantStore } from '../../../../store/assistantStore';
 import { useSettingsStore } from '../../../../store/settingsStore';
+import type { DistanceUnit } from '../../../../types';
+import { formatDistance, formatElevation } from '../../../../utils/units';
 import { SacStepChip } from '../../../Tours/hike/SacStepChip';
 import { variantPaintCss } from '../../../Tours/planner/legVariantPaint';
-import { VariantDelta } from '../../../Tours/planner/LegVariantsCard';
-import { VariantFigures, WayChoice } from '../../../Tours/planner/mapCardParts';
+import { type LegVariant, variantDelta } from '../../../Tours/planner/legVariants';
+import { VariantMark } from '../../../Tours/planner/mapCardParts';
+import { formatTourDuration } from '../../../Tours/planner/tourDurationInput';
 import { useAssistantView } from '../../assistantViewContext';
 import CardFrame from '../parts/CardFrame';
+import CardHeader from '../parts/CardHeader';
+import { CardSection } from '../parts/CardSection';
+import WayFigures from './TourFigureLine';
 import { TourRouteBody } from './TourRouteCard';
 import { legVariantOf, profileSamples, type RouteEntry, WAY_KEYS } from './tourRouteModel';
+import { routeName, TOUR_TYPE_WORDS } from './tourRouteWords';
 import { useLineHover, useTourRouteCard } from './useTourRouteCard';
 
-/** The ways of one answer with the chosen one known: its choices, then the chosen way's body. */
+/** A signed difference: a plus for more, a minus sign for less, nothing for none worth printing. */
+function signed(value: number, format: (absolute: number) => string): string | null {
+  const text = format(Math.abs(value));
+  if (Math.abs(value) < 1e-9 || /^0\s/.test(text)) return null;
+  return `${value > 0 ? '+' : '−'}${text}`;
+}
+
+/** How a way differs from the chosen one, as one faint line: "Compared with way A: −4.3 km −178 m −1 h 33 min". */
+function WayDelta({
+  way,
+  chosen,
+  letter,
+  unit,
+}: {
+  way: LegVariant;
+  chosen: LegVariant;
+  letter: string;
+  unit: DistanceUnit;
+}) {
+  const { t } = useTranslation();
+  const delta = variantDelta(way, chosen);
+  const parts = [
+    signed(delta.distanceM / 1000, (km) => formatDistance(km, unit)),
+    delta.gainM === null ? null : signed(delta.gainM, (m) => formatElevation(m, unit)),
+    delta.minutes === null ? null : signed(delta.minutes, formatTourDuration),
+  ].filter((part): part is string => part !== null);
+  if (parts.length === 0) return null;
+  return (
+    <span
+      className="flex flex-wrap items-center gap-x-2 text-caption text-content-faint"
+      data-testid="leg-variant-delta"
+    >
+      <span>{t('assistant.card.tour.deltaTo', { letter })}</span>
+      {parts.map((part) => (
+        <span key={part} className="tabular-nums text-content-muted">
+          {part}
+        </span>
+      ))}
+    </span>
+  );
+}
+
+/** One way to choose: its letter in the colour it is drawn in, its name and grade, its figures, how it differs. */
+function WayOption({
+  entry,
+  index,
+  chosen,
+  chosenWay,
+  chosenLetter,
+  unit,
+  onSelect,
+  onHover,
+}: {
+  entry: RouteEntry;
+  index: number;
+  chosen: boolean;
+  chosenWay: LegVariant;
+  chosenLetter: string;
+  unit: DistanceUnit;
+  onSelect: () => void;
+  onHover: (on: boolean) => void;
+}) {
+  const { t } = useTranslation();
+  const key = WAY_KEYS[index] ?? 'a';
+  const letter = key.toUpperCase();
+  const way = legVariantOf(entry.card, key);
+  const grades = entry.card.grades;
+  const name = entry.card.label ?? t('tours.variants.option', { letter });
+  return (
+    <button
+      type="button"
+      role="radio"
+      aria-checked={chosen}
+      aria-label={name}
+      onClick={onSelect}
+      onMouseEnter={() => onHover(true)}
+      onMouseLeave={() => onHover(false)}
+      onFocus={() => onHover(true)}
+      onBlur={() => onHover(false)}
+      className={`flex w-full items-start gap-2.5 rounded-[12px] border px-2.5 py-2 text-start transition-colors ${
+        chosen
+          ? 'border-accent bg-surface-card shadow-sm'
+          : 'border-edge-faint bg-surface-secondary hover:border-edge hover:bg-surface-card'
+      }`}
+    >
+      <VariantMark variant={way} chosen={chosen} />
+      <span className="flex min-w-0 flex-1 flex-col gap-1">
+        <span className="flex min-w-0 items-center gap-2">
+          <bdi className="min-w-0 flex-1 truncate text-body font-semibold leading-tight text-content">{name}</bdi>
+          {grades && grades.highest !== null && (
+            <SacStepChip step={grades.highest} uncertain={grades.unknownShare >= 0.5} />
+          )}
+        </span>
+        <WayFigures way={way} unit={unit} />
+        {!chosen && <WayDelta way={way} chosen={chosenWay} letter={chosenLetter} unit={unit} />}
+      </span>
+    </button>
+  );
+}
+
+/** The ways of one answer with the chosen one known: the band, the choices, then the chosen way's body. */
 function WaysCard({
   entries,
   chosen,
@@ -44,57 +153,49 @@ function WaysCard({
     [entries, chosenIndex]
   );
 
-  const current = legVariantOf(chosen.card, chosenKey);
+  const chosenWay = legVariantOf(chosen.card, chosenKey);
   // Side by side where the window is roomy; on the phone the ways stay rows, so a finger scrubs the profile freely.
   let columns = '';
   if (density === 'roomy' && variant !== 'fullscreen') columns = entries.length >= 3 ? 'grid-cols-3' : 'grid-cols-2';
   const title = t('assistant.card.tour.ways', { count: entries.length });
+  const card: Route = chosen.card;
   return (
-    <div {...route.handlers} className={`rounded-xl ${route.litFromMap ? 'ring-1 ring-accent' : ''}`}>
+    <div {...route.handlers} className={`rounded-[16px] ${route.litFromMap ? 'ring-1 ring-accent' : ''}`}>
       <CardFrame label={title}>
-        <p className="m-0 text-caption text-content-muted">{title}</p>
-        <div role="radiogroup" aria-label={title} className={`mt-1.5 grid gap-1.5 ${columns}`}>
-          {entries.map((entry, index) => {
-            const key = WAY_KEYS[index] ?? 'a';
-            const letter = key.toUpperCase();
-            const way = legVariantOf(entry.card, key);
-            const grades = entry.card.grades;
-            return (
-              <WayChoice
+        <CardHeader
+          icon={RouteIcon}
+          tone="info"
+          eyebrow={t(TOUR_TYPE_WORDS[card.activity].labelKey)}
+          title={routeName(card, t)}
+          meta={title}
+        />
+        <CardSection label={t('assistant.card.tour.waysPick')}>
+          <div role="radiogroup" aria-label={title} className={`grid gap-1.5 ${columns}`}>
+            {entries.map((entry, index) => (
+              <WayOption
                 key={entry.toolCallId}
-                way={way}
-                name={entry.card.label ?? t('tours.variants.option', { letter })}
+                entry={entry}
+                index={index}
                 chosen={index === chosenIndex}
-                aside={
-                  <>
-                    {index !== chosenIndex && (
-                      <VariantDelta
-                        variant={way}
-                        current={current}
-                        unit={unit}
-                        t={t}
-                        hint={t('assistant.card.tour.deltaTo', { letter: chosenKey.toUpperCase() })}
-                      />
-                    )}
-                    {grades && <SacStepChip step={grades.highest} uncertain={grades.unknownShare >= 0.5} />}
-                  </>
-                }
+                chosenWay={chosenWay}
+                chosenLetter={chosenKey.toUpperCase()}
+                unit={unit}
                 onSelect={() => pick(tripId, blockKey, entry.toolCallId)}
                 onHover={(on) => hover(entry.toolCallId, on)}
-              >
-                <VariantFigures variant={way} unit={unit} t={t} />
-              </WayChoice>
-            );
-          })}
+              />
+            ))}
+          </div>
+        </CardSection>
+        <div className="mt-3">
+          <TourRouteBody
+            toolCallId={chosen.toolCallId}
+            card={chosen.card}
+            route={route}
+            color={variantPaintCss(chosenKey)}
+            compare={compare}
+            letter={chosenKey.toUpperCase()}
+          />
         </div>
-        <TourRouteBody
-          toolCallId={chosen.toolCallId}
-          card={chosen.card}
-          route={route}
-          color={variantPaintCss(chosenKey)}
-          compare={compare}
-          letter={chosenKey.toUpperCase()}
-        />
       </CardFrame>
     </div>
   );
@@ -102,12 +203,12 @@ function WaysCard({
 
 /**
  * Two or three ways of one route an answer proposed, as the planner offers a
- * section's ways: each a choice with its letter in the colour it is drawn in,
- * its own words, how it differs from the chosen one and its hardest grade,
- * its figures below. One profile holds them all, the chosen way filled and
- * the others thin on the same axes; under it the chosen way's stops, day and
- * warnings, and "Plan way B". A choice is kept per answer, and pointing at a
- * way lights its line on the map.
+ * section's ways: a band naming the route, each way a choice with its letter
+ * in the colour it is drawn in, its name and hardest grade, its figures and
+ * how it differs from the chosen one; one profile holds them all, the chosen
+ * way filled and the others thin on the same axes; under it the chosen way's
+ * figures, stops, day and warnings, and "Plan way B". A choice is kept per
+ * answer, and pointing at a way lights its line on the map.
  */
 export default function TourWays({ entries }: { entries: readonly RouteEntry[] }) {
   const { tripId } = useAssistantView();

client/src/components/Assistant/cards/tour/tourTakeModel.test.ts

@@ -67,6 +67,9 @@ describe('takeInThread', () => {
   it('FE-AI-TOUR-048: a take that names its proposal is matched by it, not by its way', () => {
     const other = { ...GENTLE, line: [[47.9, 12.8, 600], ...GENTLE.line.slice(1)] } satisfies TourRouteCard;
     expect(takeInThread([proposal, take(other, {}, 'take_proposal', 'call_1')], 'call_1', HIKE)).toBe('waiting');
+    // The server joins a take to the answer that drew the proposal: found there too.
+    const joined = { ...proposal, parts: [...proposal.parts, ...take(other, {}, 'take_proposal', 'call_1').parts] };
+    expect(takeInThread([joined], 'call_1', HIKE)).toBe('waiting');
     // The same way taken from another proposal leaves this one free.
     expect(
       takeInThread([proposal, take(HIKE, { approved: true }, 'take_proposal', 'call_2')], 'call_1', HIKE)

client/src/components/Assistant/cards/tour/tourTakeModel.ts

@@ -45,7 +45,8 @@ export function takeOfProposal(
 ): { id: string; state: 'waiting' | 'applied'; placeId: number | null } | null {
   const from = proposalIndex(messages, toolCallId);
   if (from < 0) return null;
-  for (const message of messages.slice(from + 1)) {
+  // The server joins a take to the answer that drew its proposal, so that answer is searched as well as the later ones.
+  for (const message of messages.slice(from)) {
     const open = new Map<string, 'waiting' | 'applied'>();
     for (const part of message.parts) {
       if (part.type !== 'tool-call' || part.toolName !== TAKE_TOOL || part.approval?.resolution) continue;

client/src/components/Assistant/cards/tour/tourViews.tsx

@@ -14,6 +14,6 @@ import TourRouteInRow, { TourRouteLead } from './TourRouteInRow';
  * file.
  */
 export const TOUR_VIEWS = {
-  tourRoute: { Block: TourRouteBlock, Lead: TourRouteLead, Body: TourRouteInRow },
+  tourRoute: { Block: TourRouteBlock, Lead: TourRouteLead, Body: TourRouteInRow, wideBody: true },
   tourList: { Block: TourListCard },
 } satisfies { [K in 'tourRoute' | 'tourList']: CardView<K> };

client/src/components/Assistant/cards/vacay/VacayAnswerBlock.tsx

@@ -1,10 +1,14 @@
 import type { CSSProperties } from 'react';
 
+import { Palmtree } from 'lucide-react';
+
 import { useTranslation } from '../../../../i18n';
 import { safeHexColor } from '../../../../utils/safeColor';
 import type { CardEntry } from '../cardTypes';
 import CardFrame from '../parts/CardFrame';
+import CardHeader from '../parts/CardHeader';
 import { CardOpenButton } from '../parts/CardOpen';
+import { CardFoot } from '../parts/CardSection';
 import { useViewerId } from '../parts/useViewerId';
 import VacayBalance from './VacayBalance';
 import { balanceLines, mergeVacayCards, type VacayView } from './vacayCardModel';
@@ -26,7 +30,6 @@ const SQUARE = 'size-2 flex-none rounded-sm';
 const COMPANY = 'size-2 flex-none rounded-sm bg-warning-soft ring-1 ring-inset ring-warning';
 const TRIP = 'size-1.5 flex-none rounded-full bg-info';
 const OTHER = 'mt-1.5 text-caption text-content-muted';
-const FOOT = 'mt-1 flex justify-end';
 
 interface LegendItem {
   key: string;
@@ -79,13 +82,14 @@ export default function VacayAnswerBlock({ cards }: { cards: readonly CardEntry[
   const first = own[0] ?? null;
   return (
     <CardFrame label={t('assistant.card.vacay.label')}>
+      <CardHeader icon={Palmtree} tone="info" title={t('assistant.card.vacay.label')} />
       {view.months.length > 0 && <VacayMonthStrip view={view} placed={[]} labelOf={() => ''} />}
       <Legend view={view} />
       {view.otherDays > 0 && <p className={OTHER}>{t('assistant.card.vacay.otherDays', { count: view.otherDays })}</p>}
       <VacayBalance lines={lines} view={view} mode="read" />
-      <div className={FOOT}>
+      <CardFoot>
         <CardOpenButton target={{ kind: 'page', path: vacayPathOf(first) }} labelKey="assistant.card.vacay.open" />
-      </div>
+      </CardFoot>
     </CardFrame>
   );
 }

client/src/components/Studio/SaveIndicator.tsx

@@ -15,13 +15,15 @@ import type { SaveState } from './useBookStore'
  * which is exactly the wrong habit for the one time it says something else.
  */
 export function SaveIndicator({
-  state, t, onAcceptTheirs, onKeepMine, onRetry,
+  state, t, onAcceptTheirs, onKeepMine, onRetry, onReload = reloadStudio,
 }: {
   state: SaveState
   t: (k: string) => string
   onAcceptTheirs: (current: BookRecord) => void
   onKeepMine: (current: BookRecord) => void
   onRetry: () => void
+  /** Load this Studio again, for a book a newer one saved. A full reload by default. */
+  onReload?: () => void
 }) {
   if (state.status === 'conflict') {
     return (
@@ -43,6 +45,24 @@ export function SaveIndicator({
     )
   }
 
+  if (state.status === 'newer') {
+    /*
+     * The one state with a way out the user has to take themselves: a newer
+     * Studio saved this book, this tab cannot write it without losing what
+     * that one added, and only a reload brings the newer Studio here. Loud
+     * like a conflict, because until then nothing done here is kept.
+     */
+    return (
+      <div className="st-save is-conflict" role="alert">
+        <AlertTriangle size={13} />
+        <span>{t('journey.studio.saveNewer')}</span>
+        <button type="button" onClick={onReload}>
+          {t('journey.studio.saveReload')}
+        </button>
+      </div>
+    )
+  }
+
   if (state.status === 'readonly') {
     /*
      * Not an error and not retryable: this person was invited to read the
@@ -86,3 +106,8 @@ export function SaveIndicator({
 
   return null
 }
+
+/** The default way back to a current Studio: the page again, which loads the newest build. */
+function reloadStudio() {
+  window.location.reload()
+}

client/src/components/Studio/SpreadView.tsx

@@ -260,7 +260,10 @@ function PhotoView({ el, big, print, dropLabel }: {
           src={photoSrc(el.photoId!, big)}
           alt=""
           draggable={false}
-          loading="lazy"
+          // Lazy on the canvas, where a long book scrolls past; eager in print,
+          // where every sheet is laid out at once and a picture the browser put
+          // off is a picture missing from the PDF.
+          loading={print ? 'eager' : 'lazy'}
           style={{
             width: '100%',
             height: '100%',

client/src/components/Studio/iconLibrary.test.ts

@@ -0,0 +1,29 @@
+/**
+ * FE-STUDIO-ICON-001 to FE-STUDIO-ICON-002
+ *
+ * The icons the book engine takes (BOOK_ICON_NAMES in @trek/shared) are the
+ * drawings the Studio's icon tab offers, no more and no fewer: one the engine
+ * took that this lucide does not have would print as the fallback glyph, and
+ * one the tab offers that the engine refused would be a drawing a person can
+ * place and the assistant cannot. When lucide-react moves, run
+ * `node scripts/gen-book-icon-names.mjs` in shared/ and this passes again.
+ */
+import { BOOK_DESIGN_ICONS, BOOK_ICON_NAMES } from '@trek/shared';
+import { describe, expect, it } from 'vitest';
+
+import { FEATURED_ICONS, ICON_NAMES } from './iconLibrary';
+
+describe('the icons the book engine takes', () => {
+  it('FE-STUDIO-ICON-001: are every drawing the icon tab offers, and nothing it does not', () => {
+    // `Icon` is the component every drawing is built on, not a drawing.
+    const offered = ICON_NAMES.filter((name) => name !== 'Icon');
+    const missing = offered.filter((name) => !BOOK_ICON_NAMES.has(name));
+    const extra = [...BOOK_ICON_NAMES].filter((name) => !offered.includes(name));
+    expect({ missing, extra }).toEqual({ missing: [], extra: [] });
+  });
+
+  it('FE-STUDIO-ICON-002: hold the whole travel shelf the tab opens on', () => {
+    expect(BOOK_DESIGN_ICONS.filter((name) => !BOOK_ICON_NAMES.has(name))).toEqual([]);
+    expect(FEATURED_ICONS).toEqual([...BOOK_DESIGN_ICONS]);
+  });
+});

client/src/components/Studio/iconLibrary.ts

@@ -60,9 +60,10 @@ export const ICON_NAMES: string[] = buildNames()
  * of them quietly drops it instead of drawing a fallback in the shelf.
  */
 /*
- * The shelf itself lives in @trek/shared (book-icons.ts), because the book
- * engine places icons from the same list: the assistant may only name a
- * drawing a person could pick here.
+ * The shelf itself lives in @trek/shared (book-icons.ts), beside the whole
+ * list the book engine takes (BOOK_ICON_NAMES): the assistant may name any
+ * drawing a person could pick here, and iconLibrary.test.ts holds that list
+ * to ICON_NAMES.
  */
 const FEATURED: readonly string[] = BOOK_DESIGN_ICONS
 

client/src/components/Studio/printReady.test.ts

@@ -0,0 +1,75 @@
+/**
+ * FE-STUDIO-PRINT-001 to FE-STUDIO-PRINT-004
+ *
+ * When the print view of a book may be printed: every picture in, the SVG
+ * ones too wherever they sit (a map marker, a photo behind a clip path), and
+ * a ceiling that gives a book of many photographs longer before the Save
+ * button gives up waiting.
+ */
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { printReadyCeilingMs, svgImagesToWait, whenReady } from './printReady';
+
+const SVG = 'http://www.w3.org/2000/svg';
+const XLINK = 'http://www.w3.org/1999/xlink';
+
+/** A print document as the frame holds it, built from markup. */
+function printDoc(markup: string): Document {
+  const doc = document.implementation.createHTMLDocument('print');
+  doc.body.innerHTML = markup;
+  return doc;
+}
+
+/** An iframe whose document and window are the given ones, as the print view's frame is once it loaded. */
+function frameOf(doc: Document, win: Partial<Window> = {}): HTMLIFrameElement {
+  const iframe = document.createElement('iframe');
+  Object.defineProperty(iframe, 'contentDocument', { value: doc, configurable: true });
+  Object.defineProperty(iframe, 'contentWindow', { value: win, configurable: true });
+  return iframe;
+}
+
+afterEach(() => {
+  vi.useRealTimers();
+});
+
+describe('the pictures to wait for', () => {
+  it('FE-STUDIO-PRINT-001: finds an SVG image inside a clip path and in the defs, not only a marker photo', () => {
+    const doc = printDoc(
+      `<svg xmlns="${SVG}"><defs><clipPath id="c"><image href="/a.jpg"/></clipPath>` +
+        `<image id="d" href="/b.jpg"/></defs><image href="/c.jpg"/></svg>`
+    );
+    expect(svgImagesToWait(doc).map((el) => el.getAttribute('href'))).toEqual(['/a.jpg', '/b.jpg', '/c.jpg']);
+  });
+
+  it('FE-STUDIO-PRINT-002: takes an xlink source, and leaves out an image that names none and would never load', () => {
+    const doc = printDoc(`<svg xmlns="${SVG}"><image/></svg>`);
+    const linked = doc.createElementNS(SVG, 'image');
+    linked.setAttributeNS(XLINK, 'xlink:href', '/x.jpg');
+    doc.querySelector('svg')?.appendChild(linked);
+    expect(svgImagesToWait(doc)).toEqual([linked]);
+  });
+});
+
+describe('the ceiling', () => {
+  it('FE-STUDIO-PRINT-003: waits eight seconds for an ordinary book and fifteen for one of more than 40 photos', () => {
+    expect(printReadyCeilingMs(0)).toBe(8000);
+    expect(printReadyCeilingMs(40)).toBe(8000);
+    expect(printReadyCeilingMs(41)).toBe(15000);
+  });
+
+  it('FE-STUDIO-PRINT-004: holds a large book past eight seconds while an image is still loading', async () => {
+    vi.useFakeTimers();
+    const many = Array.from({ length: 41 }, (_, i) => `<image href="/p${i}.jpg"/>`).join('');
+    const doc = printDoc(`<svg xmlns="${SVG}">${many}</svg>`);
+    let ready = false;
+    // A window without its own timers: the wait falls back to the global one, which the fake timers drive.
+    void whenReady(frameOf(doc)).then(() => {
+      ready = true;
+    });
+
+    await vi.advanceTimersByTimeAsync(8100);
+    expect(ready).toBe(false);
+    await vi.advanceTimersByTimeAsync(7000);
+    expect(ready).toBe(true);
+  });
+});

client/src/components/Studio/printReady.ts

@@ -0,0 +1,77 @@
+/**
+ * When the print view of a book is actually printable.
+ *
+ * Both halves matter and neither is covered by the load event: a photograph
+ * still decoding prints as an empty box, and a face still loading prints in the
+ * fallback, the exact substitution the bundled typefaces exist to prevent.
+ */
+
+/** How long the print view waits at most, and the photo count past which a book gets the longer wait. */
+const PRINT_READY = {
+  ceilingMs: 8000,
+  largeCeilingMs: 15000,
+  largeBookPhotos: 40,
+} as const;
+
+/**
+ * The longest the Save button stays off for a book of `photos` pictures. A
+ * book of a few dozen photographs from a slow provider can take longer than
+ * eight seconds to decode; one that has not finished must not go to the press.
+ */
+export function printReadyCeilingMs(photos: number): number {
+  return photos > PRINT_READY.largeBookPhotos ? PRINT_READY.largeCeilingMs : PRINT_READY.ceilingMs;
+}
+
+/** What `whenReady` reads off the print document: its `<img>` elements, its SVG and its fonts. */
+interface PrintDocument {
+  images: ArrayLike<Element & { complete?: boolean }>;
+  querySelectorAll?: (selector: string) => ArrayLike<Element>;
+  fonts?: { ready: Promise<unknown> };
+}
+
+const XLINK = 'http://www.w3.org/1999/xlink';
+
+/**
+ * The SVG pictures to wait for: every `<image>` that names a source, wherever
+ * it sits. `doc.images` does not collect them, and they are not only the
+ * photographs in a map's markers: a photo cut to a mask or set behind clipped
+ * type is an `<image>` inside a `<clipPath>` or `<defs>`, which the selector
+ * reaches just the same. One that names no source would never fire an event,
+ * so it is left out rather than left to hold the button until the ceiling.
+ */
+export function svgImagesToWait(doc: PrintDocument): Element[] {
+  const found = Array.from(doc.querySelectorAll?.('image') ?? []);
+  return found.filter((el) => !!(el.getAttribute('href') || el.getAttributeNS(XLINK, 'href')));
+}
+
+/** Resolves when the element has loaded or failed: a picture that will not load must not hold the button hostage. */
+function settle(el: Element): Promise<void> {
+  return new Promise<void>((resolve) => {
+    el.addEventListener('load', () => resolve(), { once: true });
+    el.addEventListener('error', () => resolve(), { once: true });
+  });
+}
+
+/**
+ * Wait until the print view's pictures and faces are in, or until the
+ * ceiling, which rises for a book with many photographs. Without `complete`
+ * on an SVG image there is no way to tell one that is still coming from one
+ * whose events fired before this ran, and a Save button that never enables is
+ * worse than a marker that prints blank.
+ */
+export async function whenReady(iframe: HTMLIFrameElement): Promise<void> {
+  const win = iframe.contentWindow;
+  const doc = iframe.contentDocument as PrintDocument | null;
+  if (!win || !doc) return;
+
+  const imgs = Array.from(doc.images);
+  const svg = svgImagesToWait(doc);
+  const images = imgs.map((img) => (img.complete ? Promise.resolve() : settle(img)));
+
+  const wait = win.setTimeout?.bind(win) ?? setTimeout;
+  const ceiling = new Promise<void>((resolve) => {
+    wait(resolve, printReadyCeilingMs(imgs.length + svg.length));
+  });
+
+  await Promise.race([Promise.all([...images, ...svg.map(settle), doc.fonts?.ready ?? Promise.resolve()]), ceiling]);
+}

client/src/components/Studio/printSheets.ts

@@ -23,6 +23,8 @@
  * standalone PWA. An overlay with a `srcdoc` iframe works everywhere.
  */
 
+import { whenReady } from './printReady'
+
 /*
  * The only literal colours in Studio, and deliberately so.
  *
@@ -254,47 +256,3 @@ ${singleRule(input)}
 
   return close
 }
-
-/**
- * When the document is actually printable.
- *
- * Both halves matter and neither is covered by the load event: a photograph
- * still decoding prints as an empty box, and a face still loading prints in the
- * fallback — the exact substitution the bundled typefaces exist to prevent.
- */
-async function whenReady(iframe: HTMLIFrameElement): Promise<void> {
-  const win = iframe.contentWindow
-  const doc = iframe.contentDocument
-  if (!win || !doc) return
-
-  const settle = (el: Element) => new Promise<void>(resolve => {
-    // A picture that will not load must not hold the button hostage — better a
-    // book with one gap than a dialog that never finishes.
-    el.addEventListener('load', () => resolve(), { once: true })
-    el.addEventListener('error', () => resolve(), { once: true })
-  })
-
-  const images = Array.from(doc.images).map(img => (img.complete ? Promise.resolve() : settle(img)))
-
-  /*
-   * The photographs inside the map's markers are SVG `<image>`, which
-   * `doc.images` does not collect and which has no `complete` to ask, so there
-   * is nothing to do but wait on the events. Missing them meant a book could go
-   * to print with its route beads still blank.
-   */
-  const svgImages = Array.from(doc.querySelectorAll?.('image') ?? []).map(settle)
-
-  /*
-   * And a ceiling over the lot. Without `complete` to fall back on there is no
-   * way to tell a picture that is still coming from one whose events already
-   * fired before this ran, and a Save button that never enables is worse than a
-   * marker that prints blank.
-   */
-  const wait = win.setTimeout?.bind(win) ?? setTimeout
-  const ceiling = new Promise<void>(resolve => { wait(resolve, 8000) })
-
-  await Promise.race([
-    Promise.all([...images, ...svgImages, doc.fonts?.ready ?? Promise.resolve()]),
-    ceiling,
-  ])
-}

client/src/components/Studio/useBookStore.ts

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 import type { BookDocument, BookRecord } from '@trek/shared'
-import { normalizeBookDocument } from '@trek/shared'
+import { BOOK_SCHEMA_NEWER_CODE, readBookDocument, stampBookSchemaRev } from '@trek/shared'
 import { journeyApi } from '../../api/client'
 import { addListener, removeListener } from '../../api/websocket'
 
@@ -54,6 +54,16 @@ import { addListener, removeListener } from '../../api/websocket'
  * either: it is remembered and read once that work has reached the server,
  * because the save response and the broadcast travel on different channels and
  * either can arrive first.
+ *
+ * ── Why a book from a newer Studio is never written ───────────────────────
+ *
+ * A document says which revision of the format wrote it (book-schema-rev.ts).
+ * This build reads a newer one as far as it can, and what it cannot read is
+ * already gone from the copy it holds: saving that copy would delete the rest
+ * for everyone. So such a book is shown and never written, the same way a
+ * viewer's is, until a reload brings the Studio that wrote it. The server
+ * refuses the save as well, which covers a tab that loaded the book before the
+ * newer Studio saved it.
  */
 
 /** How long the document has to stay still before it is written. */
@@ -69,6 +79,8 @@ export type SaveState =
   | { status: 'conflict'; current: BookRecord }
   /** The journey is open to this user, but they may not write it (role 'viewer'). */
   | { status: 'readonly' }
+  /** The book was saved by a newer Studio than this one: shown, never written, until a reload. */
+  | { status: 'newer' }
   | { status: 'error' }
 
 /** What the editor needs to know about a version it is handed from elsewhere. */
@@ -176,7 +188,12 @@ export function useBookStore(
          * agreed document by identity, so a consumer that normalised on its own
          * would hand back a different object and turn every open into a save.
          */
-        const book = res.book ? { ...res.book, document: normalizeBookDocument(res.book.document) } : null
+        const read = res.book ? readBookDocument(res.book.document) : null
+        const book = res.book && read ? { ...res.book, document: read.document } : null
+        if (read?.newer) {
+          blocked.current = true
+          setState({ status: 'newer' })
+        }
         setRecord(book)
         version.current = book?.version ?? null
         bookId.current = book?.id ?? null
@@ -201,7 +218,8 @@ export function useBookStore(
     try {
       const saved = await journeyApi.saveBook(journeyId, {
         title: next.title,
-        document: next.document,
+        // Stamped on the way out only: `synced` below keeps the editor's own object.
+        document: stampBookSchemaRev(next.document),
         baseVersion: version.current ?? undefined,
       })
       setRecord(saved)
@@ -217,8 +235,12 @@ export function useBookStore(
        * not need a second request: the editor can offer to take their version
        * or keep going from here, and either way it can say whose work it is.
        */
-      const res = (err as { response?: { status?: number; data?: { current?: BookRecord } } }).response
-      if (res?.status === 409 && res.data?.current) {
+      const res = (err as { response?: { status?: number; data?: { current?: BookRecord; code?: string } } }).response
+      if (res?.status === 409 && res.data?.code === BOOK_SCHEMA_NEWER_CODE) {
+        // A newer Studio saved the book since this tab read it: nothing here may be written over it.
+        blocked.current = true
+        setState({ status: 'newer' })
+      } else if (res?.status === 409 && res.data?.current) {
         blocked.current = true
         setState({ status: 'conflict', current: res.data.current })
       } else if (res?.status === 403) {
@@ -305,15 +327,15 @@ export function useBookStore(
 
   /** Take the other version, discarding the local one. */
   const acceptTheirs = useCallback((current: BookRecord) => {
-    const document = normalizeBookDocument(current.document)
-    blocked.current = false
+    const { document, newer } = readBookDocument(current.document)
+    blocked.current = newer
     setRecord({ ...current, document })
     version.current = current.version
     bookId.current = current.id
     synced.current = document
     latest.current = document
     pending.current = null
-    setState({ status: 'idle' })
+    setState(newer ? { status: 'newer' } : { status: 'idle' })
     // A save from elsewhere passed over while the conflict was open may be
     // newer than the record it carried.
     catchUp.current()
@@ -388,8 +410,12 @@ export function useBookStore(
           if (sameBook && !isNewer(res.book.version)) return
           // Normalised for the same reason the initial load is: a document
           // written by an older build is missing whatever the contract has
-          // gained since.
-          const document = normalizeBookDocument(res.book.document)
+          // gained since. One written by a newer build is shown and held.
+          const { document, newer } = readBookDocument(res.book.document)
+          if (newer) {
+            blocked.current = true
+            setState({ status: 'newer' })
+          }
           const held = version.current
           const taken = res.book.version
           // Undoable only when every save it folds in, past the version held,

client/src/pages/TripPlannerPage.tsx

@@ -625,7 +625,7 @@ function TripPlannerPageDesktop(): React.ReactElement | null {
             <TourPlannerMapStage
               tripId={tripId} mapTileUrl={mapTileUrl} leftHidden={leftHidden} rightHidden={rightHidden} t={t}
               tourPlanner={tourPlanner} tourMap={tourMap} locationSearch={locationSearch} canPlaceEdit={canPlaceEdit}
-              leftPanelPx={leftPanelPx} rightPanelPx={rightPanelPx}
+              leftPanelPx={leftPanelPx} rightPanelPx={rightPanelPx} assistantRoutes={assistantMap}
               onViewportChange={wandererBrowser.onViewportChange} paddleChecklist={pageState.paddleChecklist}
             />
             <div className="hidden md:block" style={{ position: 'absolute', left: 10, top: 10, bottom: 10, zIndex: 20 }}>

client/src/pages/journeyStudio/useJourneyStudio.test.tsx

@@ -68,7 +68,7 @@ function seedJourney() {
 beforeEach(() => {
   seedJourney()
   buildBook.mockClear()
-  useStudioStore.setState({ doc: null, selection: [], activeSpread: 0, past: [], future: [] })
+  useStudioStore.setState({ doc: null, selection: [], activeSpread: 0, past: [], future: [], readOnly: false })
   vi.spyOn(journeyApi, 'getBook').mockResolvedValue({ book: null } as never)
   vi.spyOn(journeyApi, 'saveBook').mockResolvedValue({} as never)
   vi.spyOn(journeyApi, 'stats').mockResolvedValue(stats() as never)
@@ -295,6 +295,31 @@ describe('pictures and stops', () => {
 
     expect(result.current.canEdit).toBe(false)
   })
+
+  /*
+   * A book a newer Studio saved has already lost, in this copy, what this build
+   * cannot read. It is shown and never changed, for every role, and let go once
+   * Studio closes so the next book opens as it should.
+   */
+  it('FE-STUDIO-REV-001: holds a book a newer Studio saved read-only until Studio closes', async () => {
+    const document = { ...shared.blankBook({ title: 'Iceland' }), schemaRev: shared.BOOK_SCHEMA_REV + 1 }
+    vi.mocked(journeyApi.getBook).mockResolvedValue({
+      book: { id: 3, journeyId: 9, title: 'Iceland', version: 4, updatedAt: '', updatedBy: 1, document },
+    } as never)
+    const { result, unmount } = await mountStudio()
+
+    await waitFor(() => expect(result.current.saveState.status).toBe('newer'))
+    expect(result.current.canEdit).toBe(false)
+    expect(result.current.canUndo).toBe(false)
+    expect(useStudioStore.getState().readOnly).toBe(true)
+    const before = useStudioStore.getState().doc
+    act(() => { useStudioStore.getState().commit(d => ({ ...d, title: 'edited' })) })
+    expect(useStudioStore.getState().doc).toBe(before)
+    expect(journeyApi.saveBook).not.toHaveBeenCalled()
+
+    unmount()
+    expect(useStudioStore.getState().readOnly).toBe(false)
+  })
 })
 
 /**
@@ -355,7 +380,7 @@ describe('saves from elsewhere', () => {
     const { ok } = await openAndFlush()
     expect(ok).toBe(true)
     const calls = vi.mocked(journeyApi.saveBook).mock.calls
-    expect(calls[calls.length - 1][1].document.title).toBe('edited')
+    expect((calls[calls.length - 1][1].document as { title?: string }).title).toBe('edited')
   })
 
   it('FE-STUDIO-WIRE-002: a save of this user keeps the page by its id and is one undo away', async () => {

client/src/pages/journeyStudio/useJourneyStudio.ts

@@ -78,6 +78,7 @@ export function useJourneyStudio() {
   const past = useStudioStore(s => s.past)
   const future = useStudioStore(s => s.future)
   const commit = useStudioStore(s => s.commit)
+  const setReadOnly = useStudioStore(s => s.setReadOnly)
 
   const journeyId = Number(id)
   const backTo = `/journey/${id}`
@@ -117,6 +118,21 @@ export function useJourneyStudio() {
   // every render — depending on that made the save effect fire per render.
   const { queueSave, saveNow, loaded: bookLoaded } = book
 
+  /*
+   * A book a newer Studio saved is shown and never changed here.
+   *
+   * This build read it as far as it could, and what it could not read is gone
+   * from its copy, so an edit made now could only ever be saved by deleting
+   * the rest. The store refuses edits while this holds and the controls that
+   * add to the book go with `canEdit`; the save indicator asks for a reload.
+   * Released when Studio closes, so the next book opens as it should.
+   */
+  const newerBook = book.state.status === 'newer'
+  useEffect(() => {
+    setReadOnly(newerBook)
+    return () => setReadOnly(false)
+  }, [newerBook, setReadOnly])
+
   /*
    * Who else is in here, and where their pointers are.
    *
@@ -595,9 +611,10 @@ export function useJourneyStudio() {
   /*
    * A viewer may open the book and change nothing: not the pages, not the
    * journey behind them. The server refuses either anyway; this keeps the
-   * controls that would only ever answer with a 403 off the screen.
+   * controls that would only ever answer with a 403 off the screen. A book a
+   * newer Studio saved is held the same way, for everyone (see `newerBook`).
    */
-  const canEdit = (journey?.my_role ?? 'owner') !== 'viewer'
+  const canEdit = (journey?.my_role ?? 'owner') !== 'viewer' && !newerBook
   const toast = useToast()
 
   /**
@@ -798,8 +815,8 @@ export function useJourneyStudio() {
 
     undo,
     redo,
-    canUndo: past.length > 0,
-    canRedo: future.length > 0,
+    canUndo: !newerBook && past.length > 0,
+    canRedo: !newerBook && future.length > 0,
 
     pxPerMm: PX_PER_MM,
   }

client/src/pages/tripPlanner/TourPlannerMapStage.tsx

@@ -8,6 +8,7 @@ import { useOutsidePressGuard } from '../../components/Ferratas/useOutsidePressG
 import { MAP_LAYER_SWITCHER_INSET, MAP_ROUND_CONTROL_SIZE } from '../../components/Map/MapLayerSwitcher';
 import { MapUndoHint } from '../../components/Map/MapUndoHint';
 import { MapViewAuto as MapView } from '../../components/Map/MapViewAuto';
+import type { AssistantMapProps } from '../../components/Map/mapViewContract';
 import LocationSelect from '../../components/Planner/LocationSelect';
 import { ChecklistObstaclePanel } from '../../components/Tours/paddle/ObstacleDecisionPanel';
 import PaddleObstacleOverlay from '../../components/Tours/paddle/PaddleObstacleOverlay';
@@ -74,6 +75,11 @@ export interface TourPlannerMapStageProps
   onViewportChange?: (bounds: FerrataBbox) => void;
   /** The open paddle tour's checklist (PAD-06): its part for the picked object rides in the object's map card. */
   paddleChecklist?: PageState['paddleChecklist'];
+  /** The routes the assistant's cards show and its camera, as on the plan's map, so a proposed hike shows here too. */
+  assistantRoutes?: Pick<
+    AssistantMapProps,
+    'assistantCamera' | 'assistantRouteLines' | 'onAssistantRouteHover' | 'onAssistantRoutePoint'
+  >;
 }
 
 /** What the map reads of the tour on screen: a GPX file viewed as it came in has its analysis and no points. */
@@ -104,6 +110,7 @@ export function TourPlannerMapStage({
   rightPanelPx,
   onViewportChange,
   paddleChecklist,
+  assistantRoutes,
 }: Readonly<TourPlannerMapStageProps>): ReactElement {
   const [terrain3d, setTerrain3d] = useState(false);
   // How high the 3D map's controls reach: one row, or two once the grade legend moved above the dock.
@@ -285,6 +292,7 @@ export function TourPlannerMapStage({
             onViewportChange={viewportChanged}
             placeTool={placeTool}
             {...poiMarkers}
+            {...assistantRoutes}
           />
         )}
       </div>

client/src/store/assistantRouteModel.test.ts

@@ -1,5 +1,5 @@
 /**
- * FE-AI-ROUTE-001 to FE-AI-ROUTE-005
+ * FE-AI-ROUTE-001 to FE-AI-ROUTE-006
  *
  * Which routes of the chat's cards the plan's map draws, and how: changes
  * that still stand on the map with the way they replace, the cards of the
@@ -127,6 +127,20 @@ describe('assistantRouteModel', () => {
     expect(refs[1]?.card).toBe(SAVED);
   });
 
+  it('FE-AI-ROUTE-006: once one of the ways is taken into the trip, the answer draws none of them; a discarded take brings them back', () => {
+    const latest = message([...read('call_1', HIKE), ...read('call_2', GENTLE)], 'msg-1');
+    const take = (approval: Approval) => {
+      const parts = held('t1', PENDING, approval);
+      const change = parts[1] as Extract<AssistantMessagePart, { type: 'data-trek-change' }>;
+      change.data = { ...change.data, takenFrom: 'call_2' };
+      return message(parts, 'msg-2');
+    };
+    const waiting = routeRefs([latest, take({})], {}, NOBODY, LOOK, AS_WAYS);
+    expect(waiting.map((ref) => `${ref.toolCallId}:${ref.use}`)).toEqual(['t1:before', 't1:pending']);
+    const discarded = routeRefs([latest, take({ approved: false })], {}, NOBODY, LOOK, AS_WAYS);
+    expect(discarded.map((ref) => ref.toolCallId)).toEqual(['call_1', 'call_2']);
+  });
+
   it("FE-AI-ROUTE-003: lines lie in order (replaced way, others, the chosen way, the lit one) in their ways' colours", () => {
     const previous = { line: flat(HIKE), distanceM: 8000, ascentM: null, minutes: null };
     const messages = [

client/src/store/assistantRouteModel.ts

@@ -101,7 +101,8 @@ function standsOnMap(part: ToolCallPart, receipt: AssistantApplied | undefined,
 /**
  * The cards of the latest answer that draws any, laid out as the chat lays
  * them out: a group of several is a choice of ways, each with its letter, the
- * chosen one (by `picks`, else the first) picked. Older answers drop.
+ * chosen one (by `picks`, else the first) picked. Older answers drop, and so
+ * do the ways of a group once one of them was taken into the trip.
  */
 function lookRefs(
   messages: readonly AssistantMessage[],
@@ -111,6 +112,7 @@ function lookRefs(
   layout: AnswerLayout
 ): RouteRef[] {
   const chosenIds = new Set(Object.values(picks));
+  const taken = takenProposals(messages);
   for (let index = messages.length - 1; index >= 0; index--) {
     const answers = (messages[index]?.parts ?? []).flatMap((part): RouteCardEntry[] =>
       part.type === 'data-trek-card' && part.data.card && !changeIds.has(part.data.toolCallId)
@@ -121,6 +123,7 @@ function lookRefs(
     const drawn = new Set(lined.map((entry) => entry.toolCallId));
     if (drawn.size === 0) continue;
     return layout(answers).flatMap((group) => {
+      if (group.some((entry) => taken.has(entry.toolCallId))) return [];
       const ways = group.length >= 2;
       const chosen = group.find((entry) => chosenIds.has(entry.toolCallId)) ?? group[0];
       return group.flatMap((entry, position): RouteRef[] => {
@@ -133,6 +136,28 @@ function lookRefs(
   return [];
 }
 
+/**
+ * The proposals taken into the trip ("Plan this") and not discarded since:
+ * each stands as its change from then on, so its answer's ways leave the map.
+ */
+function takenProposals(messages: readonly AssistantMessage[]): Set<string> {
+  const dropped = new Set<string>();
+  for (const message of messages) {
+    for (const part of message.parts) {
+      if (part.type !== 'tool-call' || !part.approval) continue;
+      if (part.approval.approved === false || part.approval.resolution) dropped.add(part.toolCallId);
+    }
+  }
+  const taken = new Set<string>();
+  for (const message of messages) {
+    for (const part of message.parts) {
+      if (part.type !== 'data-trek-change' || !part.data.takenFrom) continue;
+      if (!dropped.has(part.data.toolCallId)) taken.add(part.data.takenFrom);
+    }
+  }
+  return taken;
+}
+
 /**
  * Every card of the chat the map draws now, in the part it plays: the
  * changes that still stand on the map (each with the way it replaces), then

client/src/store/studioStore.readOnly.test.ts

@@ -0,0 +1,59 @@
+/**
+ * FE-STUDIO-READONLY-001 to FE-STUDIO-READONLY-002
+ *
+ * A book held as it is (one a newer Studio saved): every edit, undo and redo
+ * is refused while it holds, and a version from elsewhere is still taken, so
+ * the page on screen stays current.
+ */
+import { blankBook, type BookDocument } from '@trek/shared';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+
+import { useStudioStore } from './studioStore';
+
+const STUDIO = useStudioStore.getState();
+
+function book(title = 'Lisbon'): BookDocument {
+  let seq = 0;
+  return blankBook({ title, newId: (prefix) => `${prefix}-${++seq}` });
+}
+
+beforeEach(() => {
+  useStudioStore.setState({ ...STUDIO, doc: null, past: [], future: [], readOnly: false });
+});
+
+afterEach(() => {
+  useStudioStore.getState().setReadOnly(false);
+});
+
+describe('a book held as it is', () => {
+  it('FE-STUDIO-READONLY-001: refuses edits, undo and redo while held, and takes them again once let go', () => {
+    const store = useStudioStore.getState();
+    store.load(book());
+    store.commit((d) => ({ ...d, title: 'one' }));
+    const edited = useStudioStore.getState().doc;
+
+    store.setReadOnly(true);
+    store.commit((d) => ({ ...d, title: 'two' }));
+    store.apply((d) => ({ ...d, title: 'three' }));
+    store.undo();
+    expect(useStudioStore.getState().doc).toBe(edited);
+    expect(useStudioStore.getState().canUndo()).toBe(false);
+
+    store.setReadOnly(false);
+    expect(useStudioStore.getState().canUndo()).toBe(true);
+    store.undo();
+    expect(useStudioStore.getState().doc?.title).toBe('Lisbon');
+    expect(useStudioStore.getState().canRedo()).toBe(true);
+  });
+
+  it('FE-STUDIO-READONLY-002: still takes a version saved elsewhere, so the page shown stays current', () => {
+    const store = useStudioStore.getState();
+    store.load(book());
+    store.setReadOnly(true);
+    const theirs = book('Porto');
+    store.adoptRemote(theirs, { undoable: false });
+    expect(useStudioStore.getState().doc).toBe(theirs);
+    store.load(book('Faro'));
+    expect(useStudioStore.getState().doc?.title).toBe('Faro');
+  });
+});

client/src/store/studioStore.ts

@@ -37,6 +37,15 @@ interface StudioState {
    * 4.2). Not part of the book or its history; opening a book clears it.
    */
   hintSpread: string | null
+  /**
+   * Whether the open book is held as it is. True for a book a newer Studio
+   * saved (useBookStore's `newer`): this build has already dropped what
+   * it cannot read from its copy, so every edit, undo and redo is refused
+   * rather than shown as work that can never be saved. Loading and taking a
+   * remote version still work, so the page stays current while it is shown.
+   */
+  readOnly: boolean
+  setReadOnly: (readOnly: boolean) => void
 
   load: (doc: BookDocument) => void
   /**
@@ -135,7 +144,9 @@ export const useStudioStore = create<StudioState>((set, get) => ({
   gestureBase: null,
   clipboard: null,
   hintSpread: null,
+  readOnly: false,
 
+  setReadOnly: readOnly => set({ readOnly, gestureBase: null }),
   load: doc => set({ doc, selection: [], activeSpread: 0, past: [], future: [], gestureBase: null, hintSpread: null }),
   adoptRemote: (doc, opts) => set(s => {
     if (!s.doc) return { doc, selection: [], activeSpread: 0, past: [], future: [], gestureBase: null }
@@ -180,13 +191,13 @@ export const useStudioStore = create<StudioState>((set, get) => ({
   }),
 
   commit: fn => set(s => {
-    if (!s.doc) return {}
+    if (!s.doc || s.readOnly) return {}
     const next = fn(s.doc)
     if (next === s.doc) return {}
     return { doc: next, past: [...s.past, s.doc].slice(-HISTORY_LIMIT), future: [] }
   }),
 
-  apply: fn => set(s => (s.doc ? { doc: fn(s.doc) } : {})),
+  apply: fn => set(s => (s.doc && !s.readOnly ? { doc: fn(s.doc) } : {})),
 
   updateElement: (spreadIndex, id, patch) => get().apply(doc =>
     replaceSpread(doc, spreadIndex, sp => ({
@@ -420,16 +431,16 @@ export const useStudioStore = create<StudioState>((set, get) => ({
 
   undo: () => set(s => {
     const prev = s.past[s.past.length - 1]
-    if (!prev || !s.doc) return {}
+    if (!prev || !s.doc || s.readOnly) return {}
     return { doc: prev, past: s.past.slice(0, -1), future: [s.doc, ...s.future].slice(0, HISTORY_LIMIT), selection: [] }
   }),
 
   redo: () => set(s => {
     const next = s.future[0]
-    if (!next || !s.doc) return {}
+    if (!next || !s.doc || s.readOnly) return {}
     return { doc: next, future: s.future.slice(1), past: [...s.past, s.doc].slice(-HISTORY_LIMIT), selection: [] }
   }),
 
-  canUndo: () => get().past.length > 0,
-  canRedo: () => get().future.length > 0,
+  canUndo: () => !get().readOnly && get().past.length > 0,
+  canRedo: () => !get().readOnly && get().future.length > 0,
 }))

client/tests/unit/studio/SaveIndicator.test.tsx

@@ -99,3 +99,19 @@ describe('a conflict', () => {
     expect(screen.getByRole('alert')).toBeTruthy()
   })
 })
+
+describe('a book a newer Studio saved', () => {
+  /*
+   * Nothing done in this tab is kept until it reloads, so the state is loud
+   * like a conflict and offers the one way out there is.
+   */
+  it('is announced, says why, and reloads on request', () => {
+    const onReload = vi.fn()
+    draw({ status: 'newer' }, { onReload })
+
+    expect(screen.getByRole('alert')).toBeTruthy()
+    expect(screen.getByText('journey.studio.saveNewer')).toBeTruthy()
+    fireEvent.click(screen.getByText('journey.studio.saveReload'))
+    expect(onReload).toHaveBeenCalledTimes(1)
+  })
+})

client/tests/unit/studio/SpreadView.test.tsx

@@ -121,6 +121,17 @@ describe('photo frames', () => {
     expect(container.querySelector('img')).not.toBeNull()
   })
 
+  /*
+   * The print view lays every sheet out at once; a picture the browser put off
+   * until it scrolled into view is a picture missing from the PDF.
+   */
+  it('loads a photo lazily on the canvas and at once in print', () => {
+    const { container: canvas } = draw([photo()])
+    expect(canvas.querySelector('img')?.getAttribute('loading')).toBe('lazy')
+    const { container: printing } = draw([photo()], { print: true })
+    expect(printing.querySelector('img')?.getAttribute('loading')).toBe('eager')
+  })
+
   it('cuts a masked photo with an objectBoundingBox clip, so it follows a resize', () => {
     const { container } = draw([photo({ mask: 'heart' })])
     const clip = container.querySelector('clipPath')!

client/tests/unit/studio/useBookStore.test.tsx

@@ -776,3 +776,88 @@ describe('unmounting', () => {
     expect(api.saveBook).not.toHaveBeenCalled()
   })
 })
+
+// -- A book a newer Studio saved ----------------------------------------------
+
+/*
+ * This build reads such a book as far as it can, and what it cannot read is
+ * already gone from its copy. Showing it is fine; writing it would delete the
+ * rest for everyone, so nothing is written until a reload.
+ */
+describe('a book a newer Studio saved', () => {
+  const newer = (title = 'newer') => ({ ...doc(title), schemaRev: 99 }) as unknown as BookDocument
+
+  /** A 409 for a book a newer Studio saved since this tab read it. */
+  function newerError() {
+    return Object.assign(new Error('Request failed'), {
+      response: { status: 409, data: { error: 'Book was saved by a newer version of TREK Studio', code: 'book_schema_newer', schemaRev: 2 } },
+    })
+  }
+
+  it('FE-STUDIO-REV-002: opens it, says so, and writes nothing, not even on flush', async () => {
+    api.getBook.mockResolvedValue({ book: record({ version: 5, document: newer() }) })
+    const { result } = await mount()
+
+    expect(result.current.state.status).toBe('newer')
+    expect(result.current.record?.document.title).toBe('newer')
+    act(() => { result.current.queueSave(doc('edited'), 'T') })
+    await tick()
+    let ok: boolean | undefined
+    await act(async () => { ok = await result.current.flush() })
+
+    expect(ok).toBe(false)
+    expect(api.saveBook).not.toHaveBeenCalled()
+  })
+
+  it('FE-STUDIO-REV-003: stops on the server refusing a save over a newer book, and does not try again', async () => {
+    api.saveBook.mockRejectedValue(newerError())
+    const { result } = await mount()
+
+    act(() => { result.current.queueSave(doc('a'), 'T') })
+    await tick()
+    expect(result.current.state.status).toBe('newer')
+
+    act(() => { result.current.queueSave(doc('b'), 'T') })
+    await tick()
+    expect(api.saveBook).toHaveBeenCalledTimes(1)
+  })
+
+  it('FE-STUDIO-REV-004: shows a newer version another editor saved, and holds it the same way', async () => {
+    api.getBook.mockResolvedValue({ book: record({ version: 4, document: doc('ours') }) })
+    const onRemote = vi.fn()
+    const { result } = renderHook(() => useBookStore(9, onRemote))
+    await tick(0)
+    api.getBook.mockResolvedValue({ book: record({ version: 6, document: newer('theirs') }) })
+
+    await remoteSave(6)
+
+    expect(onRemote.mock.calls[0][0].title).toBe('theirs')
+    expect(result.current.state.status).toBe('newer')
+    act(() => { result.current.queueSave(doc('mine'), 'T') })
+    await tick()
+    expect(api.saveBook).not.toHaveBeenCalled()
+  })
+
+  it('FE-STUDIO-REV-005: taking their side of a conflict holds the book when theirs is newer', async () => {
+    const theirs = record({ version: 6, document: newer('theirs') })
+    api.saveBook.mockRejectedValueOnce(conflictError(theirs))
+    const { result } = await mount()
+
+    act(() => { result.current.queueSave(doc('mine'), 'T') })
+    await tick()
+    expect(result.current.state.status).toBe('conflict')
+
+    act(() => { result.current.acceptTheirs(theirs) })
+    expect(result.current.state.status).toBe('newer')
+  })
+
+  /* A book of today goes out exactly as it went out before the revision existed. */
+  it('FE-STUDIO-REV-006: sends a book of today without a revision in it', async () => {
+    const { result } = await mount()
+
+    act(() => { result.current.queueSave(doc('a'), 'T') })
+    await tick()
+
+    expect(api.saveBook.mock.calls[0][1].document).not.toHaveProperty('schemaRev')
+  })
+})

server/src/nest/assistant/assistant-book-design.prompt.ts

@@ -2,17 +2,37 @@
  * How the Studio assistant designs a book (journey-studio-wp13.md 7): the
  * designer's rules it works by, appended to the Studio's standing
  * instructions (studioPrompt). Static, so the prompt cache stays stable.
+ *
+ * Restraint is one way to design a book, not the only one. The print rules
+ * (resolution, fold, trim, bleed, binding, legible words) hold for every
+ * book; how full, layered and loud a page is follows the energy the person
+ * asked for. The type scale is given in points on a 210 mm page, as
+ * design-style.ts sets it, so it scales with the page the same way. The
+ * questions under "Look, judge, revise" are the critique a designer runs on a
+ * proof, answered silently before every proposal.
  */
 export const BOOK_DESIGN_PROMPT = `How you design:
-- Act as a book designer, not a form filler: decide the story first (chapters, pacing), then the pages.
-- Map the person's words to design_book's directives: "calm, lots of white" is style minimal and density airy; "like a magazine" is editorial; "bold" is bold and rich; "scrapbook" is scrapbook; a page count is pages.min and pages.max; "only Portugal" is a scope.
-- Hierarchy: one dominant element per page; heading, then body, then captions; never two equal heroes on a spread.
-- Whitespace is a beat: after a loud spread a quiet one; margins at least the safe area plus 6 mm.
-- Rhythm: vary the beats, never three alike in a row; grids for bursts, a quiet page for a long story.
-- Alignment: everything on the margin grid and the gutter; align and distribute instead of eyeballing.
-- Colour from the photos: one accent, an ink and a paper; at most two typefaces in the whole book.
-- Never upscale: under 200 dpi make the frame smaller; keep the focal point visible; no words on a busy part of a photo without a scrim.
+- Act as a book designer, not a form filler: decide the story first (chapters, pacing), then the energy of the book, then the pages.
+- Map the person's words to design_book's directives: "calm, lots of white" is style minimal and density airy; "like a magazine" is editorial; "bold", "lively" or "loud" is bold and rich; "scrapbook" is scrapbook; a page count is pages.min and pages.max; "only Portugal" is a scope.
+- Before you call design_book, state the brief in one line: the energy (calm, lively or loud), the cover photo, the title words and the look.
+Always, whatever the energy:
+- Never upscale: under 200 dpi make the frame smaller; keep the focal point visible.
+- Nothing that matters in the fold, past the trim or outside the safe area; a picture meant to bleed reaches the bleed; mind the binding on a double spread.
+- Words on a photo sit on a quiet part of it, a scrim or a colour block; running text at 4.5:1 contrast, display type at 3:1.
 - Bound texts keep the journal in sync: prefer bindings over copied words; never invent captions or facts.
-- Check every changed page with describe_book_page and the designId, look at the ones that matter most with preview_book_page and the designId when you can see images, and fix their findings with revise_book_design before you propose.
+The energy decides the rest:
+- Calm: one dominant element per page; heading, then body, then captions; whitespace as a beat after a loud spread; margins at least the safe area plus 6 mm; everything on the margin grid and the gutter; one accent from the photos and two typefaces.
+- Lively: still one hero per page, now layered: a photo over a colour block or a shape, the title over a photo, photos turned 2 to 6 degrees in a white or polaroid frame, oversize display type, colour blocking in the accent.
+- Loud: lively pushed further: bigger type, stronger colour, more layers, a title that fills the cover; never two heroes on one page.
+- A deliberate overlap is a design; an accidental one (two straight photos or texts of a size half over each other) is a fault.
+- Vary the beats, never three alike in a row; a quiet page for a long story, grids for bursts.
+Type scale, in points for a 210 mm page and scaled with the page width:
+- Cover title in a display face, 72 to 180 pt, 12 to 30 % of the page height; title to subtitle at least 3:1. For a big cover raise type.display (up to 6.5, about 180 pt); keep type.scale between 0.9 and 1.1 so body stays 9 to 11 pt.
+- Date lines in spaced caps, 7 to 9 pt, tracking 0.25 to 0.4; an accent word over a title in the contrasting face (playfair italic or display), 1.2 to 1.6 times its cap height, with contrast, an outline or a shadow.
+- Body 9 to 11 pt; captions 6.5 to 8 pt with tracking 0.05 to 0.1; a display face and a body face, two typefaces at most.
+Look, judge, revise:
+- Check every changed page with describe_book_page and the designId, and look at the pages that matter most with preview_book_page and the designId when you can see images; preview the cover at least twice, the first draft and the final one.
+- Before every proposal answer silently: Is there one dominant element? Does the title read at thumbnail size? Does the energy match the brief? Is the palette the book's own? Is anything touching or overlapping by accident? Is text on a busy area without contrast? Does the decoration suit the energy? Does the page differ from the one before? Fix what fails with revise_book_design.
+- Fix every severe finding before you propose; an info finding is context, not a fault.
 - One design, one proposal: apply_book_design for a whole book, never dozens of edit_book_page calls; a single page with edit_book_page.
 - Keep what the person locked or made by hand unless they ask; say which photos you left out and why.`;

server/src/nest/assistant/assistant-tool-offer.ts

@@ -226,9 +226,10 @@ type ToolGroups = Readonly<Record<string, { about: string; controllers: readonly
 const CORE_TOOL_GROUPS: ToolGroups = {
   tours: {
     about:
-      'Tours: hikes, bike tours, city walks, paddling and ski routes; plan, create, change and export them ' +
-      '(hikes with their heights and SAC grades), their packing, the tour library and imports from GPX files ' +
-      'and Google Maps walks.',
+      'Tours: hikes (also over several days in stages), city walks, bike tours, runs, rides, paddling and ski ' +
+      'routes; plan, create, change and export them (hikes with their heights and SAC grades), search along a ' +
+      'tour, check off a city walk under way, the recorded tracks and tour stats, their packing, tours in ' +
+      'collections, the tour library and imports from GPX files and Google Maps walks.',
     controllers: [
       'ToursMcp',
       'CityWalkMcp',

server/src/nest/assistant/assistant.prompt.ts

@@ -34,7 +34,7 @@ How you work:
 - Expenses and their ids come from list_budget_items. Change an existing one with update_budget_item; never add a second entry to correct one. For what each person's share comes to, use get_budget_per_person; for who pays whom, get_settlement_summary.
 - For the wind on a day (a paddle, a sail, a ridge walk), use get_wind_forecast: it has the gusts and the direction hour by hour.
 - End every answer with one suggest_follow_ups call, alone in its step after your text: up to three short messages the user would plausibly send next, about what you just discussed (a hike you planned: an easier variant, what to pack; never the day plan when the answer was not about it). When you asked the user a question, offer its likely answers instead ("Yes, plan it anyway", "Rather in the Harz"). Skip it only while changes wait for the user's decision.
-- If the request is unclear, ask one short question instead of guessing.`;
+- If the request is unclear, ask one short question instead of guessing. A request that names what and roughly where is clear: propose it at once (a proposal saves nothing) and say in a sentence what you assumed, rather than asking whether you may.`;
 
 /** The instructions with the packages' lines about their cards, built once so the provider's cache holds. */
 const STANDING = INSTRUCTIONS + CARD_PROMPT_LINES.map((line) => `\n- ${line}`).join('');
@@ -58,7 +58,7 @@ How you work:
 - Read get_book and describe_book_page before you change a page. Page and element ids come from them and from the book card; never invent one. Photo ids come only from {photoSources}.
 - To change the book, call the tool for the change: the app shows each call to the user as a change card, and nothing happens until they apply it. Do not describe a change in text and ask whether to make it. Make one edit_book_page call per page in a step, with all of that page's operations.
 - Act, don't announce. Make the reads and changes you need in this reply; never end a reply with "I will now ..." and no calls. Never say a change was made unless its result says it was applied.
-- Keep every text inside its frame and nothing important in the fold or past the trim. When a result lists severe findings (overlapping photos, words past their frame, empty frames, content in the fold), fix them with the next change.
+- Keep every text inside its frame and nothing important in the fold or past the trim. When a result lists severe findings (photos or texts overlapping by accident, words past their frame, empty frames, content in the fold), fix them with the next change; a layered page (a title over a photo, a turned photo over a shape) is a design, not a finding to fix.
 - Before you propose an edit_book_page change, look at the page once with preview_book_page and the edit's ops, fix what its findings show, then propose. When a result brings the page as an image, check your work on it too: photos of other contributors are empty frames there on purpose, not missing photos.
 - Never delete pages unless the user asks for it. Never place a photo at a size its resolution cannot print.
 - Picking photos works on what TREK knows about them: the day, the place, bursts and near duplicates, sharpness, resolution and whether a photo is in the book already. Nobody can tell from that who or what is in a photo or whether it is beautiful; only a page image shows the photos themselves. Say so when asked.

server/src/nest/assistant/cards/tour/index.ts

@@ -85,7 +85,7 @@ export const TOUR_CARDS: DomainCards = {
     },
   },
   prompt: [
-    'Hikes: call propose_hike with a name, and day_id and start_time when known; to compare ways, call it up to three times in one step, each with a variant_label and along false. Call create_hike only once the user chose a way.',
-    'The app draws a proposed, planned or saved tour (route, profile, stops, times, weather, warnings) and lists of tours as cards: do not repeat their figures or list them again, say in one sentence what matters.',
+    'Hikes: call propose_hike with a name, and day_id and start_time when known; to compare ways, call it up to three times in one step, each with a variant_label and along false, the way you recommend first (the card shows the first one chosen). Call create_hike only once the user chose a way. A hike over several days is one hike: stage_end on each stop a day ends at (no day_id), then each stage on its day with assign_place_to_day and tourStageKey.',
+    'The app draws a proposed, planned or saved tour (route, profile, stops, times, weather, warnings) and lists of tours as cards: do not repeat their figures or list them again, say in one sentence what matters. Once a tour is planned, offer what goes with it: places along it (search_tour_pois), what to pack (get_tour_packing, link_tour_packing), the GPX file (export_tour_gpx).',
   ],
 };

server/src/nest/assistant/cards/tour/tour-route.cards.ts

@@ -139,11 +139,18 @@ function waypointStops(waypoints: readonly Row[], start: string | null): TourRou
         atM: metresOf(point.at_m) ?? 0,
         minutes,
         clock: clockOf(point.arrival) ?? clockAfter(start, minutes),
+        stageEnd: point.stage_end === true && index > 0 && index < waypoints.length - 1,
       }),
     ];
   });
 }
 
+/** How many stages a proposed hike's stops make; null for a day hike, as a saved tour's card says it. */
+function stagesOf(stops: readonly TourRouteStop[]): number | null {
+  const count = 1 + stops.filter((stop) => stop.stageEnd).length;
+  return count >= 2 ? Math.min(count, 60) : null;
+}
+
 /** The places along a proposed way and its highest point, timed between the points around them. */
 function alongStops(value: Row, own: readonly TourRouteStop[], start: string | null): TourRouteStop[] {
   const along = rowsIn(value.along)
@@ -248,6 +255,7 @@ export function hikeCard(
     line,
     stretches: sacStretches(sac?.segments),
     stops: sortedStops([...own, ...alongStops(plan, own, start)]),
+    stages: stagesOf(own),
     schedule: scheduleOf(plan.schedule, card),
     warnings: warningsOf(plan.warnings),
   });

server/src/nest/journey/journey-book.service.ts

@@ -8,7 +8,14 @@ import { JourneyDomainService } from './journey-domain.service';
 import { InjectRepository } from '@mikro-orm/nestjs';
 import { Injectable } from '@nestjs/common';
 import type { BookDocument, BookRecord, BookSummary } from '@trek/shared';
-import { BOOK_DESIGN_LIMITS, normalizeBookDocument } from '@trek/shared';
+import {
+  BOOK_DESIGN_LIMITS,
+  BOOK_SCHEMA_NEWER_CODE,
+  BOOK_SCHEMA_REV,
+  bookSchemaRev,
+  normalizeBookDocument,
+  stampBookSchemaRev,
+} from '@trek/shared';
 
 /**
  * What an edit of the book hands back to `editBook`: the record's title and
@@ -59,6 +66,15 @@ interface BookEditOptions extends BookWriteOrigin {
  *
  * The alternative — last write wins — is not a simpler version of this. It is
  * the same thing with the failure moved somewhere nobody sees it.
+ *
+ * ── Format revisions ─────────────────────────────────────────────────────
+ *
+ * A book says which revision of the format wrote it (book-schema-rev.ts in
+ * @trek/shared). A save from a writer older than the stored book is refused,
+ * because that writer has already dropped whatever it could not read; so is
+ * one newer than this server, which would drop the same on the way in. The
+ * book tools write only books this server reads whole, and stamp what they
+ * write with its revision.
  */
 @Injectable()
 export class JourneyBookService {
@@ -166,6 +182,7 @@ export class JourneyBookService {
     userId: number,
     input: { title: string; document: unknown; baseVersion?: number },
   ): Promise<{ record: BookRecord } | { conflict: BookRecord }> {
+    refuseNewerThanServer(bookSchemaRev(input.document));
     const document = JSON.stringify(normalizeBookDocument(input.document));
 
     // M1 (rule 11/24) — JB3's existing-link read and JB4's insert are
@@ -187,6 +204,10 @@ export class JourneyBookService {
         return { record: (await this.byId(id))! };
       }
 
+      // An older writer has already lost what it could not read; it does not get to save that loss.
+      const stored = storedSchemaRev(existing.document);
+      if (stored > bookSchemaRev(input.document)) throw newerBook(stored);
+
       /*
        * The version goes in the WHERE clause rather than being checked first.
        * Read-then-write leaves a window between the two in which another save can
@@ -249,11 +270,15 @@ export class JourneyBookService {
       if (options.expectedVersion !== undefined && current?.version !== options.expectedVersion) {
         throw bookMoved(current);
       }
+      // `current` is the book as this server reads it, which for a newer book is the book minus what it dropped.
+      if (row) refuseNewerThanServer(storedSchemaRev(row.document));
       const next = await edit(current);
+      // What the edit hands back is checked too: a kept revision from a newer server, put back after a downgrade, would land stripped yet still stamped newer.
+      refuseNewerThanServer(bookSchemaRev(next.document));
       if (current && next.unchanged) {
         return { record: current, result: next.result, wrote: false, revisionId: null };
       }
-      const document = JSON.stringify(normalizeBookDocument(next.document));
+      const document = JSON.stringify(normalizeBookDocument(stampBookSchemaRev(next.document)));
       if (!row) {
         const id = await this.booksRepo.insertBook(journeyId, next.title, document, userId);
         return { record: await this.written(id), result: next.result, wrote: true, revisionId: null };
@@ -341,6 +366,31 @@ function bookMoved(current: BookRecord | null): DomainError {
   });
 }
 
+/**
+ * The book was written by a newer revision of the format than the writer (or
+ * this server) knows. 409 like a moved book, with the code the Studio reads to
+ * open the book read-only and ask for a reload; no `current`, because there is
+ * nothing here an older writer could safely take.
+ */
+function newerBook(schemaRev: number): DomainError {
+  return new DomainError(409, 'Book was saved by a newer version of TREK Studio', {
+    code: BOOK_SCHEMA_NEWER_CODE,
+    details: { code: BOOK_SCHEMA_NEWER_CODE, schemaRev },
+    mcpMessage:
+      'This book was saved by a newer version of TREK than this server runs. Changing it here would drop what that version added, so it stays as it is.',
+  });
+}
+
+/** Refuse a book written by a revision this server cannot read whole. */
+function refuseNewerThanServer(schemaRev: number): void {
+  if (schemaRev > BOOK_SCHEMA_REV) throw newerBook(schemaRev);
+}
+
+/** The revision a stored row's document says it was written by; broken JSON reads as 1, like its document. */
+function storedSchemaRev(raw: string): number {
+  return bookSchemaRev(safeParse(raw));
+}
+
 /** JSON that will not parse is an empty document, never an exception. */
 function safeParse(raw: string): unknown {
   try {

server/src/nest/tours/hike-plan.helpers.ts

@@ -18,6 +18,7 @@ import {
   type HikeHighPoint,
   type HikePlan,
   type HikePlanPoint,
+  type HikeStop,
   type HikeProposal,
   type HikeProposalSac,
   type HikeProposeRequest,
@@ -39,9 +40,10 @@ import {
  */
 
 /** The points a hike is planned through: as asked, and for a round trip back to its start. */
-export function hikePointsOf(waypoints: readonly HikePlanPoint[], roundTrip: boolean | undefined): HikePlanPoint[] {
+export function hikePointsOf(waypoints: readonly HikeStop[], roundTrip: boolean | undefined): HikeStop[] {
   const [start] = waypoints;
-  return roundTrip === true && start ? [...waypoints, { ...start }] : [...waypoints];
+  // The way back ends where the hike began: the start ends no stage there.
+  return roundTrip === true && start ? [...waypoints, { ...start, stage_end: undefined }] : [...waypoints];
 }
 
 /** Whether the way was planned, and why not, as the answers name it. */
@@ -49,19 +51,29 @@ export function routeOutcomeOf(plan: HikePlan): HikeRouteOutcome {
   return plan.kind === 'routed' ? { planned: true } : { planned: false, why: plan.why, position: plan.position };
 }
 
-/** The points as a tour keeps them: in order, the first the start and the last the end, with their names. */
-export function hikeWaypointsOf(points: readonly HikePlanPoint[]): TourWaypoint[] {
+/**
+ * The points as a tour keeps them: in order, the first the start and the
+ * last the end, with their names, and on a hike over several days the stops
+ * its stages end at.
+ */
+export function hikeWaypointsOf(points: readonly HikeStop[]): TourWaypoint[] {
   const last = points.length - 1;
-  return points.map(({ lat, lng, name, poi_category }, sequence) => ({
+  return points.map(({ lat, lng, name, poi_category, stage_end }, sequence) => ({
     lat,
     lng,
     ...(name ? { name } : {}),
     ...(poi_category ? { poi_category } : {}),
     role: sequence === 0 ? 'start' : sequence === last ? 'end' : 'via',
     sequence,
+    ...(stage_end === true && sequence > 0 && sequence < last ? { stage_end: true } : {}),
   }));
 }
 
+/** How many stages a hike's points make: one for a day hike. */
+export function hikeStagesOf(points: readonly HikeStop[]): number {
+  return 1 + points.filter((point) => point.stage_end === true).length;
+}
+
 /** The way a saved hike keeps from a plan: its whole line and walking time, or none, and how the planning went. */
 export interface KeptWay {
   line: GeometryPoint[] | null;
@@ -93,7 +105,7 @@ export function keptWayOf({ plan, line }: PlannedHike): KeptWay {
  */
 export function hikeCreateCommandOf(
   request: HikeCreateRequest,
-  points: readonly HikePlanPoint[],
+  points: readonly HikeStop[],
   way: KeptWay,
   limit: number,
 ): TourCreateCommand {
@@ -135,13 +147,15 @@ function savedPointAt(point: { lat: number; lng: number }, saved: readonly TourW
  * keeps its link to the trip's place it stands for, and its name where the
  * new one gives none. A saved point no new one stands on goes, with its link.
  */
-export function repointedWaypoints(points: readonly HikePlanPoint[], saved: readonly TourWaypoint[]): TourWaypoint[] {
+export function repointedWaypoints(points: readonly HikeStop[], saved: readonly TourWaypoint[]): TourWaypoint[] {
   return hikeWaypointsOf(points).map((point) => {
     const same = savedPointAt(point, saved);
     if (!same) return point;
     const name = point.name ?? same.name;
+    // Its key too: a stage is put on its day by the key of the stop it starts at.
     return {
       ...point,
+      ...(same.key ? { key: same.key } : {}),
       ...(name ? { name } : {}),
       ...(same.linked_place_id ? { linked_place_id: same.linked_place_id } : {}),
     };
@@ -319,7 +333,7 @@ export interface HikeProposalContext {
  */
 export function hikeProposalOf(
   request: HikeProposeRequest,
-  points: readonly HikePlanPoint[],
+  points: readonly HikeStop[],
   planned: PlannedHike,
   context: HikeProposalContext,
 ): HikeProposal {
@@ -329,8 +343,9 @@ export function hikeProposalOf(
   const heights = routed?.has_heights && line ? heightRangeOf(line) : null;
   const minutes = routed && line && positions ? waypointMinutesOf(line, positions, routed.duration_minutes) : null;
   const arrivals = arrivalsOf(request.start_time ?? null, minutes ?? points.map(() => null));
+  // One day's sun and hours say nothing about a hike over several days.
   const day =
-    routed && context.date
+    routed && context.date && hikeStagesOf(points) === 1
       ? hikeScheduleOf({
           date: context.date,
           dayId: context.dayId,
@@ -357,11 +372,12 @@ export function hikeProposalOf(
       : {}),
     sac: proposalSacOf(routed?.grades ?? null),
     high_point: routed ? highPointOf(line) : null,
-    waypoints: points.map(({ lat, lng, name, poi_category }, index) => ({
+    waypoints: points.map(({ lat, lng, name, poi_category, stage_end }, index) => ({
       lat,
       lng,
       name: name || null,
       poi_category: poi_category ?? null,
+      stage_end: stage_end === true,
       at_m: positions?.[index] ?? null,
       snapped_m: routed ? (planned.snapped?.[index] ?? null) : null,
       minutes: minutes?.[index] ?? null,

server/src/nest/tours/hike-plan.mcp.ts

@@ -55,7 +55,7 @@ export class HikePlanMcp {
   @Tool({
     name: 'propose_hike',
     description:
-      "Plan a hike for a trip and show it to the traveller, without saving anything; give it a name. The way on foot runs through waypoints in order (the start, the points on the way such as a hut or a summit, each with its poi_category where it is one, the end; with round_trip it comes back to the start) and takes no path harder than max_hiking_difficulty on the SAC scale (1 for T1 hiking to 6 for T6 difficult alpine hiking, 2 when left out), avoiding steep climbs, steps or ferries where there is a way round when hiking_preferences asks so. TREK's router plans it as the tour planner does. The answer gives distance_m, ascent_m and descent_m, the walking time without breaks (duration_minutes: by DIN 33466, the rule hiking signposts use, where the heights are known, duration_basis din33466; else the router's, duration_basis router), min_ele_m, max_ele_m and high_point, the SAC grades OpenStreetMap records along the way (sac: highest, the graded stretches in metres along the way, and unknown_share, the part with no grade, which is unknown and never easy), every point with at_m (where it lies along the way), snapped_m (how far it was moved onto a way), minutes from the start and, with start_time, its arrival, and along: summits, huts, water and viewpoints near the way (null with along false or where they could not be searched). With day_id (a day of the trip, whose date it takes) or date, schedule gives the day: the arrival (next_day past midnight), sunrise and sunset, the weather by the hour at the highest point (weather forecast, or climate further out: last year's day) and, without start_time, latest_start to be back half an hour before sunset; warnings name a start before sunrise (dark_start), an arrival after sunset (dark_end) or within the hour before it (dusk), and the first walking hour with thunderstorms (thunder) or likely rain (rain). Where no way was planned, route says why: no_valhalla (this TREK has no router that knows hiking grades), router_unavailable (try again later), no_way (nothing within the limit joins the points: a higher limit or other points may), point_off_the_way (unreachable names the point and how far it is from any way) or too_long (longer than one hike is planned for: split it into shorter hikes). To compare ways, propose each one with its own variant_label, such as 'short and steep' or 'by the lake', and along false. The chat shows the route, its profile, times, weather and warnings as a card: never list coordinates, the hours or the figures, sum the hike up in a sentence and say what matters. Propose first and create the hike with create_hike only after the traveller said yes.",
+      "Plan a hike for a trip and show it to the traveller, without saving anything; give it a name. A hike over several days (a trek from hut to hut) is one hike: mark each stop a day ends at with stage_end, and the card shows its stages. The way on foot runs through waypoints in order (the start, the points on the way such as a hut or a summit, each with its poi_category where it is one, the end; with round_trip it comes back to the start) and takes no path harder than max_hiking_difficulty on the SAC scale (1 for T1 hiking to 6 for T6 difficult alpine hiking, 2 when left out), avoiding steep climbs, steps or ferries where there is a way round when hiking_preferences asks so. TREK's router plans it as the tour planner does. The answer gives distance_m, ascent_m and descent_m, the walking time without breaks (duration_minutes: by DIN 33466, the rule hiking signposts use, where the heights are known, duration_basis din33466; else the router's, duration_basis router), min_ele_m, max_ele_m and high_point, the SAC grades OpenStreetMap records along the way (sac: highest, the graded stretches in metres along the way, and unknown_share, the part with no grade, which is unknown and never easy), every point with at_m (where it lies along the way), snapped_m (how far it was moved onto a way), minutes from the start and, with start_time, its arrival, and along: summits, huts, water and viewpoints near the way (null with along false or where they could not be searched). With day_id (a day of the trip, whose date it takes) or date, schedule gives the day: the arrival (next_day past midnight), sunrise and sunset, the weather by the hour at the highest point (weather forecast, or climate further out: last year's day) and, without start_time, latest_start to be back half an hour before sunset; warnings name a start before sunrise (dark_start), an arrival after sunset (dark_end) or within the hour before it (dusk), and the first walking hour with thunderstorms (thunder) or likely rain (rain). Where no way was planned, route says why: no_valhalla (this TREK has no router that knows hiking grades), router_unavailable (try again later), no_way (nothing within the limit joins the points: a higher limit or other points may), point_off_the_way (unreachable names the point and how far it is from any way) or too_long (longer than one hike is planned for: split it into shorter hikes). To compare ways, propose each one with its own variant_label, such as 'short and steep' or 'by the lake', and along false. The chat shows the route, its profile, times, weather and warnings as a card: never list coordinates, the hours or the figures, sum the hike up in a sentence and say what matters. Propose first and create the hike with create_hike only after the traveller said yes.",
     inputSchema: { tripId: idSchema, ...hikeProposeRequestSchema.shape },
     annotations: TOOL_ANNOTATIONS_READONLY,
     when: addonGate(ADDON_IDS.TOURS),
@@ -69,7 +69,7 @@ export class HikePlanMcp {
   @Tool({
     name: 'create_hike',
     description:
-      "Create a hike in a trip from points the traveller confirmed, usually the name and waypoints of a proposal of propose_hike with its max_hiking_difficulty, hiking_preferences and round_trip. It is saved the way the planner saves a new hike: a tour of type hike with its points in order (start, points on the way, end, with their names and poi_category), the way on foot planned by the same router as the proposal and kept whole (the very line a proposal of the last minutes showed), with its heights where every point has one, its distance, ascent, descent and walking time, its hiking limit and preferences, and planned_duration_minutes (the time out, breaks included) where given. Where the router did not answer, for the way or its heights (route planned false, why router_unavailable), the hike is saved with its points only (route_pending true) and TREK plans the way when someone opens it in the planner; no straight line is stored. Any other reason the proposal names (no_valhalla, no_way, point_off_the_way, too_long) refuses the hike with why, and nothing is saved. With day_id the hike is put on that day of the trip in the same write, start_time kept as the start of that visit (which needs day editing permission too); assignment names the visit, null without a day. The answer is the tour as list_tours reads it (tour.place_id is the tour's id, its revision 1), route and assignment. Put it on a day later with assign_place_to_day, link it to the packing list with link_tour_packing, export it with export_tour_gpx, change it with update_tour. Needs place editing permission on the trip. Create it only after the traveller said yes.",
+      "Create a hike in a trip from points the traveller confirmed, usually the name and waypoints of a proposal of propose_hike with its max_hiking_difficulty, hiking_preferences and round_trip, and its stage_end marks for a hike over several days; then put each stage on its day with assign_place_to_day and tourStageKey (the key of the stop the stage starts at, from the stage_stops list_tours gives); leave day_id out for such a hike, which would put the whole hike on one day. It is saved the way the planner saves a new hike: a tour of type hike with its points in order (start, points on the way, end, with their names and poi_category), the way on foot planned by the same router as the proposal and kept whole (the very line a proposal of the last minutes showed), with its heights where every point has one, its distance, ascent, descent and walking time, its hiking limit and preferences, and planned_duration_minutes (the time out, breaks included) where given. Where the router did not answer, for the way or its heights (route planned false, why router_unavailable), the hike is saved with its points only (route_pending true) and TREK plans the way when someone opens it in the planner; no straight line is stored. Any other reason the proposal names (no_valhalla, no_way, point_off_the_way, too_long) refuses the hike with why, and nothing is saved. With day_id the hike is put on that day of the trip in the same write, start_time kept as the start of that visit (which needs day editing permission too); assignment names the visit, null without a day. The answer is the tour as list_tours reads it (tour.place_id is the tour's id, its revision 1), route and assignment. Put it on a day later with assign_place_to_day, link it to the packing list with link_tour_packing, export it with export_tour_gpx, change it with update_tour. Needs place editing permission on the trip. Create it only after the traveller said yes.",
     inputSchema: { tripId: idSchema.describe('The trip to create the hike in'), ...hikeCreateRequestSchema.shape },
     annotations: TOOL_ANNOTATIONS_NON_IDEMPOTENT,
     when: addonGate(ADDON_IDS.TOURS),
@@ -88,7 +88,7 @@ export class HikePlanMcp {
   @Tool({
     name: 'update_tour',
     description:
-      "Change a saved hike (tour_type hike) against the revision it was read at: expected_revision is tour.revision from get_tour_plan or list_tours. A new name, description or planned_duration_minutes keeps the hike's way. New waypoints (start to end; a round trip ends on its start), a new max_hiking_difficulty or new hiking_preferences plan the way anew as propose_hike plans it, and so does a hike still waiting for its way (route_pending); propose the new way to the traveller first. A hike changed since that revision is refused as a conflict: read it again and show the traveller what changed. Where the new way cannot be planned, or not with its heights, nothing is saved and the hike keeps its way; the error says why. A new point standing where a saved one stood (within 25 m) keeps that point's link to a place of the trip and its name. A hike with a section drawn by hand (a via ferrata, a free line, a ferry) or split into stages takes new points only in the planner, and the hand-drawn one no new limit or preferences either: those changes are refused here. A recorded track without points of its own (an import) takes only new waypoints, which plan it over and keep the recording. Any other type is refused: change a city walk with prepare_tour_change and save_tour_change. The hike stays on its days. The answer is the tour as saved, with its new revision, route and replanned. Needs place editing permission on the trip. Change it only after the traveller said yes.",
+      "Change a saved hike (tour_type hike) against the revision it was read at: expected_revision is tour.revision from get_tour_plan or list_tours. A new name, description or planned_duration_minutes keeps the hike's way. New waypoints (start to end; a round trip ends on its start), a new max_hiking_difficulty or new hiking_preferences plan the way anew as propose_hike plans it, and so does a hike still waiting for its way (route_pending); propose the new way to the traveller first. A hike changed since that revision is refused as a conflict: read it again and show the traveller what changed. Where the new way cannot be planned, or not with its heights, nothing is saved and the hike keeps its way; the error says why. A new point standing where a saved one stood (within 25 m) keeps that point's link to a place of the trip and its name. A hike with a section drawn by hand (a via ferrata, a free line, a ferry) takes new points, a new limit or new preferences only in the planner: those changes are refused here. A hike split into stages takes new points only with stage_end given again on each stop a day ends at, and its stages keep their days where a stop stays where it was. A recorded track without points of its own (an import) takes only new waypoints, which plan it over and keep the recording. Any other type is refused: change a city walk with prepare_tour_change and save_tour_change. The hike stays on its days. The answer is the tour as saved, with its new revision, route and replanned. Needs place editing permission on the trip. Change it only after the traveller said yes.",
     inputSchema: { tripId: idSchema, ...tourUpdateRequestSchema.shape },
     annotations: TOOL_ANNOTATIONS_WRITE,
     when: addonGate(ADDON_IDS.TOURS),

server/src/nest/tours/hike-plan.service.ts

@@ -29,6 +29,7 @@ import {
   HIKE_ALONG_CATEGORIES,
   HIKE_ALONG_CORRIDOR_M,
   HIKE_PLAN_MAX_WAYPOINTS,
+  hikeStageIssues,
   hikingPreferencesOf,
   TOUR_POI_MAX_LINE_POINTS,
   tourGpxImportFieldsSchema,
@@ -37,6 +38,7 @@ import {
   type HikeAlongPlace,
   type HikeCreateRequest,
   type HikePlanPoint,
+  type HikeStop,
   type HikeProposal,
   type HikeProposeRequest,
   type HikingPreferences,
@@ -109,14 +111,21 @@ const HAND_DRAWN =
  * ends of its stages would go with the points they belong to, and a stage
  * that goes would leave its day. Null where new points take nothing away.
  */
-function repointingRefusal(saved: readonly TourWaypoint[]): string | null {
+function repointingRefusal(saved: readonly TourWaypoint[], points: readonly HikeStop[]): string | null {
   if (saved.some((point) => point.fixed_leg)) return HAND_DRAWN;
-  if (saved.some((point) => point.stage_end)) {
-    return 'This hike is split into stages over several days, which new points would end: change its points in the planner. A new limit or new preferences plan it anew here, its stages kept.';
+  // New points carry the stages of the hike themselves; without any, its stages would silently end.
+  if (saved.some((point) => point.stage_end) && !points.some((point) => point.stage_end)) {
+    return 'This hike is split into stages over several days: give stage_end again on each stop a day ends at, or the stages would end. A new limit or new preferences alone plan it anew here, its stages kept.';
   }
   return null;
 }
 
+/** Stage ends that do not hold (at the start or the end, too many stages): refused with their reason. */
+function refuseBadStages(points: readonly HikeStop[], roundTrip: boolean | undefined): void {
+  const issues = hikeStageIssues(points, roundTrip);
+  if (issues.length > 0) throw badRequest(issues.map((issue) => issue.message).join('; '));
+}
+
 /**
  * A hike planned with the traveller over MCP, end to end on the server: the
  * proposal reads only and may be asked for as often as ways are compared;
@@ -149,10 +158,17 @@ export class HikePlanService {
     preferences: HikingPreferences | null | undefined,
     grades: boolean,
   ): Promise<PlannedHike> {
+    // The router takes the points only: where a stage ends is the hike's, not the way's.
+    const waypoints = points.map(({ lat, lng, name, poi_category }) => ({
+      lat,
+      lng,
+      ...(name === undefined ? {} : { name }),
+      ...(poi_category === undefined ? {} : { poi_category }),
+    }));
     return await this.routing.plan(
       userId,
       tripId,
-      { waypoints: points, max_hiking_difficulty: limit, hiking_preferences: preferences },
+      { waypoints, max_hiking_difficulty: limit, hiking_preferences: preferences },
       { grades },
     );
   }
@@ -165,6 +181,7 @@ export class HikePlanService {
    * best effort: without them the proposal still answers.
    */
   async propose(userId: number, tripId: number, request: HikeProposeRequest): Promise<HikeProposal> {
+    refuseBadStages(request.waypoints, request.round_trip);
     const day = await this.dayOf(tripId, request.day_id, request.date);
     const points = hikePointsOf(request.waypoints, request.round_trip);
     const { max_hiking_difficulty: limit, hiking_preferences: preferences } = request;
@@ -231,6 +248,7 @@ export class HikePlanService {
    * drop onto the day tell it.
    */
   async create(userId: number, tripId: number, request: HikeCreateRequest): Promise<HikeCreated> {
+    refuseBadStages(request.waypoints, request.round_trip);
     const day = request.day_id === undefined ? null : await this.dayOf(tripId, request.day_id, undefined);
     const points = hikePointsOf(request.waypoints, request.round_trip);
     const { max_hiking_difficulty: limit, hiking_preferences: preferences } = request;
@@ -295,7 +313,8 @@ export class HikePlanService {
         'This hike is a recorded track without points of its own: give waypoints to plan it over (the recorded track is kept), or rename it with update_place.',
       );
     }
-    const repointing = request.waypoints ? repointingRefusal(saved.waypoints) : null;
+    if (request.waypoints) refuseBadStages(request.waypoints, false);
+    const repointing = request.waypoints ? repointingRefusal(saved.waypoints, request.waypoints) : null;
     if (repointing) throw badRequest(repointing);
     const kept = hikingPreferencesOf(tour.hiking_preferences);
     // A recorded track keeps no limit of its own; planned over, it takes the planner's.

server/tests/e2e/assistant-tours.e2e.test.ts

@@ -202,8 +202,8 @@ function proposalFor(asked: HikeProposeRequest): HikeProposal {
     sac: { segments: [{ from_m: 0, to_m: 1112, sac: 2 }], highest: 2, unknown_share: 0 },
     high_point: { lat: 47.61, lng: 11.3, ele_m: 880, at_m: 1112 },
     waypoints: [
-      { ...WAYPOINTS[0], poi_category: null, at_m: 0, snapped_m: 2, minutes: 0, arrival: null },
-      { ...WAYPOINTS[1], at_m: 1112, snapped_m: 3, minutes: 22, arrival: null },
+      { ...WAYPOINTS[0], poi_category: null, at_m: 0, snapped_m: 2, minutes: 0, arrival: null, stage_end: false },
+      { ...WAYPOINTS[1], at_m: 1112, snapped_m: 3, minutes: 22, arrival: null, stage_end: false },
     ],
     along: null,
     max_hiking_difficulty: 2,

server/tests/e2e/journey-book.e2e.test.ts

@@ -9,14 +9,18 @@
  * viewer's write is refused with the tool's own words, and an operation the
  * engine refuses with the operation it names; a REST save and an MCP write
  * send the same event to the same users, REST leaving out the tab that saved
- * and MCP none; and the tools are gone while the Journey addon is off.
+ * and MCP none; the tools are gone while the Journey addon is off; and a book
+ * a newer Studio wrote is refused with 409 and its code over both, even when
+ * its document holds what this build cannot parse.
  */
 import { ADDON_IDS } from '../../src/addons';
 import { buildApp } from '../../src/bootstrap';
+import { JourneyBooks } from '../../src/db/entities/JourneyBooks.entity';
 import { createLocalMcpServer, McpRegistryService } from '../../src/nest-mcp';
 import { withRequestContext } from '../../src/nest/database/request-context';
 import { authCookie } from '../helpers/auth';
 import { addJourneyContributor, makeJourney } from '../helpers/factories/journeys';
+import { findRow, updateRows } from '../helpers/factories/rows';
 import { setAddonEnabled } from '../helpers/factories/settings';
 import { makeUser } from '../helpers/factories/users';
 import { spyOnRealtime, type RealtimeSpies } from '../helpers/fake-realtime';
@@ -198,4 +202,62 @@ describe('Studio book over MCP and REST', () => {
     expect(names.filter((name) => BOOK_TOOLS.includes(name))).toEqual([]);
     expect(names.length).toBeGreaterThan(0);
   });
+
+  it('JBE2E-005: a book a newer Studio saved refuses a REST save with 409 and its code, and an MCP write in its words', async () => {
+    const { owner, journey, inner } = await journeyWithBook();
+    const before = await request(app.getHttpServer())
+      .get(`/api/journeys/${journey.id}/book`)
+      .set('Cookie', authCookie(owner.id));
+    const row = await findRow(orm, JourneyBooks, { journey: journey.id });
+    const newer = JSON.stringify({ ...JSON.parse(String(row?.document)), schemaRev: 2 });
+    await updateRows(orm, JourneyBooks, { journey: journey.id }, { document: newer });
+
+    const saved = await request(app.getHttpServer())
+      .put(`/api/journeys/${journey.id}/book`)
+      .set('Cookie', authCookie(owner.id))
+      .send({ title: before.body.book.title, document: before.body.book.document, baseVersion: 1 });
+    expect(saved.status).toBe(409);
+    expect(saved.body).toEqual({
+      error: 'Book was saved by a newer version of TREK Studio',
+      code: 'book_schema_newer',
+      schemaRev: 2,
+    });
+
+    const tool = await callTool(owner.id, 'edit_book_page', {
+      journeyId: journey.id,
+      spreadId: inner,
+      ops: [{ op: 'background', color: '#202020' }],
+    });
+    expect(tool).toEqual({
+      error:
+        'This book was saved by a newer version of TREK than this server runs. Changing it here would drop what that version added, so it stays as it is.',
+    });
+    expect(sent()).toEqual([]);
+    const after = await findRow(orm, JourneyBooks, { journey: journey.id });
+    expect([after?.version, after?.document]).toEqual([1, newer]);
+  });
+
+  it('JBE2E-006: a save of a book a newer Studio wrote, with a kind this one cannot read, is a 409 with its code, not a 400', async () => {
+    const { owner, journey } = await journeyWithBook();
+    const before = await request(app.getHttpServer())
+      .get(`/api/journeys/${journey.id}/book`)
+      .set('Cookie', authCookie(owner.id));
+    const document = before.body.book.document as { spreads: Array<{ elements: unknown[] }> };
+    const frame = { x: 10, y: 10, w: 40, h: 40 };
+    document.spreads[0]?.elements.push({ id: 'from-later', kind: 'sticker', frame, stickerId: 'lemon' });
+
+    const saved = await request(app.getHttpServer())
+      .put(`/api/journeys/${journey.id}/book`)
+      .set('Cookie', authCookie(owner.id))
+      .send({ title: before.body.book.title, document: { ...document, schemaRev: 2 }, baseVersion: 1 });
+    expect(saved.status).toBe(409);
+    expect(saved.body).toEqual({
+      error: 'Book was saved by a newer version of TREK Studio',
+      code: 'book_schema_newer',
+      schemaRev: 2,
+    });
+    expect(sent()).toEqual([]);
+    const after = await findRow(orm, JourneyBooks, { journey: journey.id });
+    expect(after?.version).toBe(1);
+  });
 });

server/tests/unit/nest/assistant/cards/book-design/book-design-cards.test.ts

@@ -224,11 +224,42 @@ describe('the designer in the Studio', () => {
   it('ASTBD-008: the Studio instructions end with the design rules, cache-stable and without dashes', () => {
     const prompt = studioPrompt('German', true);
     expect(prompt.endsWith(BOOK_DESIGN_PROMPT)).toBe(true);
-    expect(BOOK_DESIGN_PROMPT.split('\n').length).toBeLessThanOrEqual(14);
+    // The print rules, the energy, the type scale and the critique, on a budget the cache carries every turn.
+    expect(BOOK_DESIGN_PROMPT.split('\n').length).toBeLessThanOrEqual(30);
+    expect(BOOK_DESIGN_PROMPT.length).toBeLessThan(6000);
     for (const tool of ['design_book', 'revise_book_design', 'apply_book_design', 'preview_book_page']) {
       expect(BOOK_DESIGN_PROMPT).toContain(tool);
     }
     expect(BOOK_DESIGN_PROMPT).not.toMatch(/[\u2013\u2014]/);
     expect(studioPrompt('German', true)).toBe(prompt);
   });
+
+  it('ASTBD-009: restraint is one energy among three, beside print rules that hold for every book', () => {
+    for (const rule of ['200 dpi', 'fold', 'trim', 'bleed', 'binding', 'safe area']) {
+      expect(BOOK_DESIGN_PROMPT, rule).toContain(rule);
+    }
+    for (const energy of ['- Calm:', '- Lively:', '- Loud:']) expect(BOOK_DESIGN_PROMPT).toContain(energy);
+    expect(BOOK_DESIGN_PROMPT).toContain('A deliberate overlap is a design');
+  });
+
+  it('ASTBD-010: gives the type scale in numbers against the page, and the critique to answer before a proposal', () => {
+    for (const figure of ['72 to 180 pt', '12 to 30 % of the page height', 'at least 3:1', 'Body 9 to 11 pt']) {
+      expect(BOOK_DESIGN_PROMPT, figure).toContain(figure);
+    }
+    expect(BOOK_DESIGN_PROMPT).toContain('captions 6.5 to 8 pt');
+    // The cover tier carries a big title alone, and the faces named are faces the book has.
+    expect(BOOK_DESIGN_PROMPT).toContain('type.display (up to 6.5');
+    expect(BOOK_DESIGN_PROMPT).toContain('type.scale between 0.9 and 1.1');
+    expect(BOOK_DESIGN_PROMPT).not.toMatch(/script/i);
+    expect(BOOK_DESIGN_PROMPT).toContain('210 mm page and scaled with the page width');
+    const rubric = BOOK_DESIGN_PROMPT.slice(BOOK_DESIGN_PROMPT.indexOf('answer silently'));
+    expect(rubric.slice(0, rubric.indexOf('Fix what fails')).match(/\?/g)).toHaveLength(8);
+    expect(BOOK_DESIGN_PROMPT).toContain('preview the cover at least twice');
+  });
+
+  it('ASTBD-011: the Studio instructions take a layered page for a design and only an accidental overlap for a fault', () => {
+    const prompt = studioPrompt('German', true);
+    expect(prompt).toContain('photos or texts overlapping by accident');
+    expect(prompt).toContain('a layered page (a title over a photo, a turned photo over a shape) is a design');
+  });
 });

server/tests/unit/nest/assistant/cards/tour/tour-route.cards.test.ts

@@ -180,6 +180,16 @@ describe('the card of a proposed hike', () => {
     expect(shown.warnings).toEqual([{ kind: 'thunder', at: '08:00', count: null }]);
   });
 
+  it('ASTCARD-TOUR-001b: a hike over several days counts its stages and marks the stops they end at', () => {
+    const base = proposal();
+    const [start, summit] = base.waypoints as Array<Record<string, unknown>>;
+    const hut = { ...start, lat: 47.605, name: 'Hut', at_m: 556, minutes: 11, arrival: '08:11', stage_end: true };
+    const shown = route(answerCardOf(...input('propose_hike', { ...base, waypoints: [start, hut, summit] })));
+    expect(shown.stages).toBe(2);
+    expect(shown.stops.filter((stop) => stop.stageEnd).map((stop) => stop.name)).toEqual(['Hut']);
+    expect(route(answerCardOf(...input('propose_hike', proposal()))).stages).toBeNull();
+  });
+
   it('ASTCARD-TOUR-002: lists the points and the places along the way in the order walked, timed between', () => {
     const shown = route(answerCardOf(...input('propose_hike', proposal())));
     expect(shown.stops.map((stop) => [stop.role, stop.kind, stop.atM, stop.minutes, stop.clock])).toEqual([

server/tests/unit/nest/hike-plan.helpers.test.ts

@@ -10,6 +10,7 @@ import {
   hikeCreateCommandOf,
   hikePointsOf,
   hikeProposalOf,
+  hikeStagesOf,
   hikeWaypointsOf,
   keptWayOf,
   positionsAlong,
@@ -35,7 +36,7 @@ import {
 
 import { describe, expect, it } from 'vitest';
 
-// HIKE-PLAN-001 to HIKE-PLAN-014
+// HIKE-PLAN-001 to HIKE-PLAN-017
 
 /** A plan with its line, as the router answers it: without the router's legs and snaps unless given. */
 const planned = (
@@ -393,3 +394,52 @@ describe('where and when a proposed hike reaches its points', () => {
     expect(alongPlacesOf([], LINE)).toEqual([]);
   });
 });
+
+describe('a hike over several days', () => {
+  it('HIKE-PLAN-015: keeps a stage end only on a stop between the start and the end, and the way back of a round trip ends none', () => {
+    const hut = { lat: 47.002, lng: 11, name: 'Hut', stage_end: true };
+    expect(hikeWaypointsOf([{ ...START, stage_end: true }, hut, SUMMIT]).map((point) => point.stage_end)).toEqual([
+      undefined,
+      true,
+      undefined,
+    ]);
+    expect(hikeStagesOf([START, hut, SUMMIT])).toBe(2);
+    expect(hikeStagesOf([START, SUMMIT])).toBe(1);
+    const loop = hikePointsOf([START, hut, SUMMIT], true);
+    expect(loop.at(-1)).toMatchObject({ lat: START.lat, lng: START.lng });
+    expect(loop.at(-1)?.stage_end).toBeUndefined();
+  });
+
+  it('HIKE-PLAN-016: a proposal over several days names its stage ends and sets no schedule of a single day', () => {
+    const points = [START, { lat: 47.002, lng: 11, name: 'Hut', stage_end: true }, SUMMIT];
+    const day: HikeProposalContext = { dayId: 3, date: '2027-07-10', along: null, weather: null };
+    const proposal = hikeProposalOf({ name: 'Trek', waypoints: points }, points, planned(ROUTED, LINE), day);
+    expect(proposal.waypoints.map((point) => point.stage_end)).toEqual([false, true, false]);
+    expect(proposal.schedule).toBeNull();
+    expect(hikeProposalSchema.safeParse(proposal).success).toBe(true);
+    const single = hikeProposalOf(
+      { name: 'Day', waypoints: [START, SUMMIT] },
+      [START, SUMMIT],
+      planned(ROUTED, LINE),
+      day,
+    );
+    expect(single.schedule).not.toBeNull();
+  });
+
+  it('HIKE-PLAN-017: new points keep the key of a saved stop they stand on, so a stage keeps its day', () => {
+    const saved = [
+      { lat: 47, lng: 11, role: 'start' as const, sequence: 0, key: 'k-start' },
+      { lat: 47.002, lng: 11, role: 'via' as const, sequence: 1, key: 'k-hut', stage_end: true },
+      { lat: 47.004, lng: 11, role: 'end' as const, sequence: 2, key: 'k-end' },
+    ];
+    const repointed = repointedWaypoints(
+      [START, { lat: 47.002, lng: 11, stage_end: true }, { lat: 47.006, lng: 11 }],
+      saved,
+    );
+    expect(repointed.map((point) => [point.key, point.stage_end])).toEqual([
+      ['k-start', undefined],
+      ['k-hut', true],
+      [undefined, undefined],
+    ]);
+  });
+});

server/tests/unit/nest/hike-plan.mcp.test.ts

@@ -48,6 +48,7 @@ import {
   type TourPoiSearchResponse,
   type UnroutedHikePlan,
   type WeatherResult,
+  hikePlanRequestSchema,
 } from '@trek/shared';
 
 import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -464,6 +465,7 @@ describe('HikePlanMcp: propose_hike', () => {
         snapped_m: 12,
         minutes: 0,
         arrival: '08:30',
+        stage_end: false,
       },
       {
         lat: 47.505,
@@ -474,6 +476,7 @@ describe('HikePlanMcp: propose_hike', () => {
         snapped_m: 3,
         minutes: 26,
         arrival: '08:56',
+        stage_end: false,
       },
       {
         lat: 47.51,
@@ -484,6 +487,7 @@ describe('HikePlanMcp: propose_hike', () => {
         snapped_m: 40,
         minutes: 52,
         arrival: '09:22',
+        stage_end: false,
       },
     ]);
     expect(proposal.high_point).toEqual({ lat: 47.51, lng: 11.1, ele_m: 1000, at_m: 1112 });
@@ -635,6 +639,29 @@ describe('HikePlanMcp: propose_hike', () => {
       ),
     ).rejects.toThrow('Day not found');
   });
+
+  it('HIKE-MCP-022: refuses a stage end at the start or the end of a hike, which ends no day', async () => {
+    const f = await fixture();
+    const [first, ...rest] = WAYPOINTS;
+    await expect(
+      mcp.proposeHike(
+        { tripId: f.trip.id, name: 'Wrong', waypoints: [{ ...first, stage_end: true }, ...rest] },
+        ctx(f.user.id),
+      ),
+    ).rejects.toThrow('a stage ends at a stop between start and end');
+  });
+
+  it('HIKE-MCP-022b: the router gets the points without their stage ends, which its strict request refuses', async () => {
+    const f = await fixture();
+    const [first, middle, last] = WAYPOINTS;
+    await mcp.proposeHike(
+      { tripId: f.trip.id, name: 'Two days', waypoints: [first, { ...middle, stage_end: true }, last] },
+      ctx(f.user.id),
+    );
+    const sent = plan.mock.calls.at(-1)?.[2];
+    expect(sent?.waypoints).toEqual(WAYPOINTS);
+    expect(hikePlanRequestSchema.safeParse(sent).success).toBe(true);
+  });
 });
 
 describe('HikePlanMcp: create_hike', () => {

server/tests/unit/nest/journey-book.service.test.ts

@@ -620,6 +620,116 @@ describe('editBook', () => {
   });
 });
 
+// -- Format revisions ---------------------------------------------------------
+
+/*
+ * A book written by a newer revision of the format than the writer knows. The
+ * older writer has already dropped what it could not read, so its save, from
+ * an old tab or a replayed offline copy, must not land; nor may the book tools
+ * of a server that cannot read the book whole.
+ */
+describe('format revisions', () => {
+  /** A journey whose stored book says it was written by revision `schemaRev`. */
+  async function storedAt(schemaRev: number) {
+    const { user } = createUser(testDb);
+    const journey = createJourney(testDb, user.id);
+    await insertRow(await sharedTestOrm(testDb), JourneyBooks, {
+      journey: journey.id,
+      title: 'T',
+      document: JSON.stringify({ ...doc('newer'), schemaRev }),
+      version: 1,
+    });
+    return { user, journey };
+  }
+
+  const refusalOf = (thrown: unknown) =>
+    thrown instanceof DomainError ? [thrown.getStatus(), thrown.code, thrown.toBody().code] : thrown;
+
+  it('JBOOK-011: refuses a save from a writer older than the stored book with 409 and the code, writing and sending nothing', async () => {
+    const { user, journey } = await storedAt(2);
+    const rec = await recordSends();
+    try {
+      const thrown = await catchDomainError(() =>
+        books.saveBook(journey.id, user.id, { title: 'T', document: doc('older'), baseVersion: 1 }),
+      );
+      expect(refusalOf(thrown)).toEqual([409, 'book_schema_newer', 'book_schema_newer']);
+      expect(thrown instanceof DomainError && thrown.toBody()).toMatchObject({
+        error: 'Book was saved by a newer version of TREK Studio',
+        schemaRev: 2,
+      });
+      expect(rec.sent).toEqual([]);
+      const stored = await books.getBook(journey.id, user.id);
+      expect([stored?.version, stored?.document.title, stored?.document.schemaRev]).toEqual([1, 'newer', 2]);
+    } finally {
+      rec.restore();
+    }
+  });
+
+  it('JBOOK-012: refuses a document newer than this server reads, first save and later save alike', async () => {
+    const { user } = createUser(testDb);
+    const journey = createJourney(testDb, user.id);
+    const ahead = { ...doc('ahead'), schemaRev: 9 };
+    const first = await catchDomainError(() => books.saveBook(journey.id, user.id, { title: 'T', document: ahead }));
+    expect(refusalOf(first)).toEqual([409, 'book_schema_newer', 'book_schema_newer']);
+    expect(await books.getBook(journey.id, user.id)).toBeNull();
+
+    await books.saveBook(journey.id, user.id, { title: 'T', document: doc('one') });
+    const later = await catchDomainError(() =>
+      books.saveBook(journey.id, user.id, { title: 'T', document: ahead, baseVersion: 1 }),
+    );
+    expect(refusalOf(later)).toEqual([409, 'book_schema_newer', 'book_schema_newer']);
+    expect((await books.getBook(journey.id, user.id))?.document.title).toBe('one');
+  });
+
+  it('JBOOK-013: a save at the stored revision or above it lands as before, and a book of today stores no revision', async () => {
+    const { user, journey } = await storedAt(1);
+    const same = await books.saveBook(journey.id, user.id, {
+      title: 'T',
+      document: { ...doc('same'), schemaRev: 1 },
+      baseVersion: 1,
+    });
+    expect(same && 'record' in same && same.record.version).toBe(2);
+
+    const plain = await books.saveBook(journey.id, user.id, { title: 'T', document: doc('plain'), baseVersion: 2 });
+    expect(plain && 'record' in plain && plain.record.version).toBe(3);
+    const row = await findRow(await sharedTestOrm(testDb), JourneyBooks, { journey: journey.id });
+    expect(JSON.parse(String(row?.document))).not.toHaveProperty('schemaRev');
+  });
+
+  it('JBOOK-014: the book tools leave a book this server cannot read whole alone, before any edit runs', async () => {
+    const { user, journey } = await storedAt(2);
+    const rec = await recordSends();
+    try {
+      const edit = vi.fn(() => ({ title: 'T', document: normalizeBookDocument(doc('tool')), result: null }));
+      const thrown = await catchDomainError(() => books.editBook(journey.id, user.id, edit));
+      expect(refusalOf(thrown)).toEqual([409, 'book_schema_newer', 'book_schema_newer']);
+      expect(thrown instanceof DomainError && thrown.mcpMessage).toMatch(/newer version of TREK/);
+      expect(edit).not.toHaveBeenCalled();
+      expect(rec.sent).toEqual([]);
+      expect((await books.getBook(journey.id, user.id))?.document.title).toBe('newer');
+    } finally {
+      rec.restore();
+    }
+  });
+
+  it('JBOOK-015: an edit that hands back a document newer than this server reads is refused, the stored book untouched', async () => {
+    const { user, journey } = await storedAt(1);
+    const rec = await recordSends();
+    try {
+      const ahead = normalizeBookDocument({ ...doc('ahead'), schemaRev: 2 });
+      const thrown = await catchDomainError(() =>
+        books.editBook(journey.id, user.id, () => ({ title: 'T', document: ahead, result: null })),
+      );
+      expect(refusalOf(thrown)).toEqual([409, 'book_schema_newer', 'book_schema_newer']);
+      expect(rec.sent).toEqual([]);
+      const stored = await books.getBook(journey.id, user.id);
+      expect([stored?.version, stored?.document.title, stored?.document.schemaRev]).toEqual([1, 'newer', 1]);
+    } finally {
+      rec.restore();
+    }
+  });
+});
+
 // -- Deleting -----------------------------------------------------------------
 
 describe('deleting', () => {

server/tests/unit/nest/journey/journey-book-design.service.test.ts

@@ -15,7 +15,7 @@
  * stale version, and forgets the draft; a journey without a book gets a new
  * one and no revision; restoring the revision puts the book back only at the
  * version the apply left, and never writes a revision that does not read
- * back; five revisions are kept.
+ * back or that a newer TREK kept; five revisions are kept.
  */
 import { JourneyBookRevisions } from '../../../../src/db/entities/JourneyBookRevisions.entity';
 import { JourneyEntryPhotos } from '../../../../src/db/entities/JourneyEntryPhotos.entity';
@@ -321,6 +321,25 @@ describe('taking a design back', () => {
     expect(told()).toEqual([]);
   });
 
+  it('JBDSN-011: a revision kept by a newer TREK is refused, never put back stripped of what this one cannot read', async () => {
+    const { journey, owner } = await crew();
+    const answer = await designs.design(journey.id, owner.id);
+    const applied = await designs.apply(journey.id, owner.id, { designId: answer.design_id });
+    const revisionId = applied.revision_id ?? 0;
+    const kept = await findRow(orm, JourneyBookRevisions, { id: revisionId });
+    const newer = JSON.stringify({ ...JSON.parse(String(kept?.document)), schemaRev: 2 });
+    await updateRows(orm, JourneyBookRevisions, { id: revisionId }, { document: newer });
+    t.realtime.reset();
+
+    const back = { revisionId, expectedVersion: applied.version };
+    expect(await refusal(() => designs.restoreRevision(journey.id, owner.id, back))).toEqual({
+      status: 409,
+      code: 'book_schema_newer',
+    });
+    expect(await version(journey.id, owner.id)).toBe(applied.version);
+    expect(told()).toEqual([]);
+  });
+
   it('JBDSN-009: a journey keeps its newest five revisions', async () => {
     const { journey, owner } = await crew();
     const books = t.get(JourneyBookService);

shared/scripts/gen-book-icon-names.mjs

@@ -0,0 +1,68 @@
+// Regenerates src/book/book-icon-names-*.data.ts, the lucide drawings the
+// Studio's icon tab offers, from the lucide-react installed at the repo root.
+// Run from shared/: `node scripts/gen-book-icon-names.mjs`.
+//
+// Read from the package's type declarations rather than imported: the shared
+// package has no lucide dependency of its own and must not grow one, the
+// contract layer stays zod only. The names are taken the way the client's
+// iconLibrary.ts takes them from the module: every PascalCase export, less the
+// `Lucide*` and `*Icon` aliases of a name that exists bare, and less `Icon`,
+// the component every drawing is built on. client/src/components/Studio/
+// iconLibrary.test.ts fails when the files and the shipped library drift apart.
+import { readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const here = dirname(fileURLToPath(import.meta.url));
+const lucide = join(here, '..', '..', 'node_modules', 'lucide-react');
+const { version } = JSON.parse(readFileSync(join(lucide, 'package.json'), 'utf8'));
+const declarations = readFileSync(join(lucide, 'dist', 'lucide-react.d.ts'), 'utf8');
+
+/** The last `export { ... };` of the declarations, which names every icon and its aliases. */
+const exportLine = declarations
+  .split('\n')
+  .filter((line) => line.startsWith('export { '))
+  .pop();
+if (!exportLine) throw new Error('no export list in lucide-react.d.ts');
+
+const PASCAL_CASE = /^[A-Z][A-Za-z0-9]*$/;
+const exported = exportLine
+  .replace(/^export \{ /, '')
+  .replace(/ \};\s*$/, '')
+  .split(',')
+  .map((part) =>
+    part
+      .trim()
+      .split(/\s+as\s+/)
+      .pop(),
+  )
+  .filter((name) => PASCAL_CASE.test(name));
+const present = new Set(exported);
+const names = [...present]
+  .filter((name) => !(name.startsWith('Lucide') && present.has(name.slice(6))))
+  .filter((name) => !(name.endsWith('Icon') && present.has(name.slice(0, -4))))
+  .filter((name) => name !== 'Icon')
+  .sort();
+
+/** The three files and the initials each holds, so none of them passes a thousand lines. */
+const PARTS = [
+  { suffix: 'a-e', constant: 'BOOK_ICON_NAMES_A_E', label: 'A to E', test: /^[A-E]/ },
+  { suffix: 'f-p', constant: 'BOOK_ICON_NAMES_F_P', label: 'F to P', test: /^[F-P]/ },
+  { suffix: 'q-z', constant: 'BOOK_ICON_NAMES_Q_Z', label: 'Q to Z', test: /^[Q-Z]/ },
+];
+
+for (const part of PARTS) {
+  const list = names.filter((name) => part.test.test(name));
+  const source = `/**
+ * The lucide drawings the Studio offers, ${part.label}: part of BOOK_ICON_NAMES
+ * (book-icons.ts). Generated from lucide-react ${version} by
+ * scripts/gen-book-icon-names.mjs, never edited by hand; the client's
+ * iconLibrary.test.ts fails when the list and the library it ships drift apart.
+ */
+export const ${part.constant}: readonly string[] = [
+${list.map((name) => `  '${name}',`).join('\n')}
+];
+`;
+  writeFileSync(join(here, '..', 'src', 'book', `book-icon-names-${part.suffix}.data.ts`), source);
+}
+console.log(`wrote ${names.length} icon names from lucide-react ${version}`);

shared/src/book/book-element-ops.schema.ts

@@ -1,17 +1,39 @@
 import { idSchema } from '../common/primitives.schema';
-import { BOOK_DESIGN_ICONS } from './book-icons';
+import {
+  BOOK_BINDING_HINT,
+  bookBadgeStyleSchema,
+  bookBadgeVariantSchema,
+  bookCountriesLayoutSchema,
+  bookFontIdSchema,
+  bookFrameStyleSchema,
+  bookIconNameSchema,
+  bookListLayoutSchema,
+  bookMapClipSchema,
+  bookMapSourceSchema,
+  bookMapStyleSchema,
+  bookMetricSchema,
+  bookPhotoFilterSchema,
+  bookPhotoFitSchema,
+  bookPhotoMaskSchema,
+  bookPinStyleSchema,
+  bookRouteArcSchema,
+  bookRouteDashSchema,
+  bookRouteStyleSchema,
+  bookShapeGradientSchema,
+  bookShapeIdSchema,
+  bookStatsLayoutSchema,
+  bookStrokeStyleSchema,
+  bookTextAlignSchema,
+  bookTypesetFontSchema,
+} from './book-op-enums';
 import { bookElementIdSchema, bookGridIdSchema, bookSpreadIdSchema } from './book-op-ids';
 import {
-  BOOK_BADGES,
-  BOOK_METRICS,
-  BOOK_SHAPES,
   MAX_BOOK_COUNTRIES,
   bookBadgeElementSchema,
   bookCountriesElementSchema,
   bookIconElementSchema,
   bookListElementSchema,
   bookMapElementSchema,
-  bookPhotoElementSchema,
   bookShapeElementSchema,
   bookStatsElementSchema,
   bookTextElementSchema,
@@ -28,7 +50,9 @@ import { z } from 'zod';
  *
  * Same rules as the other operations: strict objects, the fields taken from the
  * document's own shapes with their defaults removed (an omitted field leaves
- * the element as it is), every string, array and number bounded.
+ * the element as it is), every string, array and number bounded. The enums
+ * carry a line each on what their values mean (book-op-enums.ts), since the
+ * tool schema is all a model reads of them.
  */
 
 /** A position in millimetres, inside the bounds the document takes. */
@@ -40,7 +64,6 @@ const ids30 = z.array(bookElementIdSchema).min(1).max(30);
 
 export const bookFrameInSchema = z.strictObject({ x: mmIn, y: mmIn, w: sizeIn, h: sizeIn });
 
-const photo = bookPhotoElementSchema.shape;
 const text = bookTextElementSchema.shape;
 const shape = bookShapeElementSchema.shape;
 const icon = bookIconElementSchema.shape;
@@ -55,7 +78,7 @@ const COMMON = { opacity: unit01.optional() };
 
 /** What the travel kinds share with text: they are typeset. */
 const TYPESET = {
-  font: map.font.unwrap().optional(),
+  font: bookTypesetFontSchema.optional(),
   color: map.color.unwrap().optional(),
   accent: map.accent.unwrap().optional(),
   textScale: map.textScale.unwrap().optional(),
@@ -64,21 +87,21 @@ const TYPESET = {
 
 const PHOTO_PROPS = {
   ...COMMON,
-  fit: photo.fit.unwrap().optional(),
+  fit: bookPhotoFitSchema.optional(),
   focalX: unit01.optional(),
   focalY: unit01.optional(),
-  mask: photo.mask.unwrap().optional(),
-  frameStyle: photo.frameStyle.unwrap().optional(),
-  filter: photo.filter.unwrap().optional(),
+  mask: bookPhotoMaskSchema.optional(),
+  frameStyle: bookFrameStyleSchema.optional(),
+  filter: bookPhotoFilterSchema.optional(),
   radius: z.number().finite().min(0).max(500).optional(),
 };
 /** How a text is set, each field left as it is when not named: the style op's and the page edit's text op's. */
 export const TEXT_STYLE_FIELDS = {
-  font: text.font.unwrap().optional(),
+  font: bookFontIdSchema.optional(),
   size: text.size.unwrap().optional(),
   weight: text.weight.unwrap().optional(),
   italic: text.italic.unwrap().optional(),
-  align: text.align.unwrap().optional(),
+  align: bookTextAlignSchema.optional(),
   leading: text.leading.unwrap().optional(),
   tracking: text.tracking.unwrap().optional(),
   color: text.color.unwrap().optional(),
@@ -87,10 +110,10 @@ const TEXT_PROPS = { ...COMMON, ...TEXT_STYLE_FIELDS };
 const SHAPE_PROPS = {
   ...COMMON,
   fill: shape.fill.unwrap().optional(),
-  gradient: shape.gradient.unwrap().optional(),
+  gradient: bookShapeGradientSchema.optional(),
   stroke: shape.stroke.unwrap().optional(),
   strokeWidth: z.number().finite().min(0).max(20).optional(),
-  strokeStyle: shape.strokeStyle.unwrap().optional(),
+  strokeStyle: bookStrokeStyleSchema.optional(),
   radius: z.number().finite().min(0).max(500).optional(),
 };
 const ICON_PROPS = {
@@ -101,39 +124,39 @@ const ICON_PROPS = {
 const MAP_PROPS = {
   ...COMMON,
   ...TYPESET,
-  style: map.style.unwrap().optional(),
+  style: bookMapStyleSchema.optional(),
   showLand: map.showLand.unwrap().optional(),
   showRoute: map.showRoute.unwrap().optional(),
   showPins: map.showPins.unwrap().optional(),
   showLabels: map.showLabels.unwrap().optional(),
-  routeStyle: map.routeStyle.unwrap().optional(),
-  routeArc: map.routeArc.unwrap().optional(),
-  routeDash: map.routeDash.unwrap().optional(),
-  pinStyle: map.pinStyle.unwrap().optional(),
-  clip: map.clip.unwrap().optional(),
+  routeStyle: bookRouteStyleSchema.optional(),
+  routeArc: bookRouteArcSchema.optional(),
+  routeDash: bookRouteDashSchema.optional(),
+  pinStyle: bookPinStyleSchema.optional(),
+  clip: bookMapClipSchema.optional(),
   fitPadding: map.fitPadding.unwrap().optional(),
   fitToCountries: map.fitToCountries.unwrap().optional(),
 };
 const STATS_PROPS = {
   ...COMMON,
   ...TYPESET,
-  layout: stats.layout.unwrap().optional(),
+  layout: bookStatsLayoutSchema.optional(),
   showIcons: stats.showIcons.unwrap().optional(),
-  units: stats.units.unwrap().optional(),
+  units: stats.units.unwrap().describe('Kilometres (metric) or miles (imperial).').optional(),
 };
 const COUNTRIES_PROPS = {
   ...COMMON,
   ...TYPESET,
-  layout: countries.layout.unwrap().optional(),
+  layout: bookCountriesLayoutSchema.optional(),
   showOutline: countries.showOutline.unwrap().optional(),
   showFlag: countries.showFlag.unwrap().optional(),
   showName: countries.showName.unwrap().optional(),
-  align: countries.align.unwrap().optional(),
+  align: countries.align.unwrap().describe('How the names sit in the frame.').optional(),
 };
 const BADGE_PROPS = {
   ...COMMON,
   ...TYPESET,
-  style: badge.style.unwrap().optional(),
+  style: bookBadgeStyleSchema.optional(),
   showIcon: badge.showIcon.unwrap().optional(),
   showLabel: badge.showLabel.unwrap().optional(),
   autoColor: badge.autoColor.unwrap().optional(),
@@ -143,13 +166,12 @@ const BADGE_PROPS = {
 const LIST_PROPS = {
   ...COMMON,
   ...TYPESET,
-  layout: list.layout.unwrap().optional(),
+  layout: bookListLayoutSchema.optional(),
   showMarks: list.showMarks.unwrap().optional(),
   proLabel: z.string().max(80).optional(),
   conLabel: z.string().max(80).optional(),
 };
-const metric = z.enum(BOOK_METRICS);
-const METRICS = z.array(metric).min(1).max(7);
+const METRICS = z.array(bookMetricSchema).min(1).max(7);
 
 /**
  * The look of an element, per kind, for `style`. Values the journey owns (a
@@ -159,7 +181,7 @@ const METRICS = z.array(metric).min(1).max(7);
 export const bookElementPropsSchema = z.discriminatedUnion('kind', [
   z.strictObject({ kind: z.literal('photo'), ...PHOTO_PROPS }),
   z.strictObject({ kind: z.literal('text'), ...TEXT_PROPS }),
-  z.strictObject({ kind: z.literal('shape'), shape: z.enum(BOOK_SHAPES).optional(), ...SHAPE_PROPS }),
+  z.strictObject({ kind: z.literal('shape'), shape: bookShapeIdSchema.optional(), ...SHAPE_PROPS }),
   z.strictObject({ kind: z.literal('icon'), ...ICON_PROPS }),
   z.strictObject({ kind: z.literal('map'), ...MAP_PROPS }),
   z.strictObject({ kind: z.literal('stats'), metrics: METRICS.optional(), ...STATS_PROPS }),
@@ -189,9 +211,15 @@ export function bindingNamesItsSource(
 const bindingIn = text.binding
   .unwrap()
   .unwrap()
-  .refine(bindingNamesItsSource, { message: 'an entry binding needs its entryId, a photo binding its photoId' });
+  .refine(bindingNamesItsSource, { message: 'an entry binding needs its entryId, a photo binding its photoId' })
+  .describe(BOOK_BINDING_HINT);
 const iso2 = z.string().regex(/^[A-Za-z]{2}$/);
-const listItem = z.strictObject({ text: z.string().max(400), tone: z.enum(['pro', 'con', 'plain']) });
+const listItem = z.strictObject({
+  text: z.string().max(400),
+  tone: z
+    .enum(['pro', 'con', 'plain'])
+    .describe('pro or con sets the line in that column with its mark; plain has none.'),
+});
 
 /**
  * Where a map is of: the whole journey or one trip, the two scopes a stored map
@@ -210,18 +238,21 @@ export const bookNewElementSchema = z.discriminatedUnion('kind', [
   z
     .strictObject({
       kind: z.literal('text'),
-      preset: z.enum(BOOK_TEXT_PRESETS).optional(),
+      preset: z
+        .enum(BOOK_TEXT_PRESETS)
+        .describe('A Studio text preset: heading, subheading, body, caption, or quote (the large quotation mark).')
+        .optional(),
       text: z.string().max(2000).optional(),
       binding: bindingIn.optional(),
       ...TEXT_PROPS,
     })
     .refine((v) => v.text !== undefined || v.binding !== undefined, { message: 'give the words or a binding' }),
-  z.strictObject({ kind: z.literal('shape'), shape: z.enum(BOOK_SHAPES), ...SHAPE_PROPS }),
-  z.strictObject({ kind: z.literal('icon'), name: z.enum(BOOK_DESIGN_ICONS), ...ICON_PROPS }),
+  z.strictObject({ kind: z.literal('shape'), shape: bookShapeIdSchema, ...SHAPE_PROPS }),
+  z.strictObject({ kind: z.literal('icon'), name: bookIconNameSchema, ...ICON_PROPS }),
   z.strictObject({
     kind: z.literal('map'),
     scope: mapScope,
-    source: z.enum(['vector', 'relief', 'satellite']).optional(),
+    source: bookMapSourceSchema.optional(),
     ...MAP_PROPS,
   }),
   z.strictObject({ kind: z.literal('stats'), metrics: METRICS, ...STATS_PROPS }),
@@ -232,7 +263,7 @@ export const bookNewElementSchema = z.discriminatedUnion('kind', [
   }),
   z.strictObject({
     kind: z.literal('badge'),
-    variant: z.enum(BOOK_BADGES),
+    variant: bookBadgeVariantSchema,
     entryId: idSchema.optional(),
     code: z.string().max(24).optional(),
     text: z.string().max(200).optional(),
@@ -274,20 +305,27 @@ export const BOOK_ELEMENT_OP_SCHEMAS = [
   z.strictObject({
     op: z.literal('arrange'),
     elementIds: ids30,
-    to: z.enum(['front', 'forward', 'backward', 'back']),
+    to: z
+      .enum(['front', 'forward', 'backward', 'back'])
+      .describe('front and back go to either end of the paint order; forward and backward one step.'),
   }),
   /** Line elements up on an edge or a centre line of the selection, their page, or its safe area. */
   z.strictObject({
     op: z.literal('align'),
     elementIds: ids30,
-    edge: z.enum(['left', 'center', 'right', 'top', 'middle', 'bottom']),
-    to: z.enum(['selection', 'page', 'safe']).default('selection'),
+    edge: z
+      .enum(['left', 'center', 'right', 'top', 'middle', 'bottom'])
+      .describe('The edge or centre line the elements line up on.'),
+    to: z
+      .enum(['selection', 'page', 'safe'])
+      .describe('Line up within the selection, the page, or its safe area.')
+      .default('selection'),
   }),
   /** Space three or more elements evenly, or by a fixed gap in millimetres. */
   z.strictObject({
     op: z.literal('distribute'),
     elementIds: z.array(bookElementIdSchema).min(3).max(30),
-    axis: z.enum(['horizontal', 'vertical']),
+    axis: z.enum(['horizontal', 'vertical']).describe('Space them out across the page or down it.'),
     gap: z.number().finite().min(0).max(200).optional(),
   }),
   /** Lock or unlock elements: the one operation a locked element accepts. */
@@ -300,7 +338,11 @@ export const BOOK_ELEMENT_OP_SCHEMAS = [
     dy: z.number().finite().min(-500).max(500).optional(),
   }),
   /** The Studio's fill: a photo to the bleed of its page or the spread, unturned, cover, at the back. */
-  z.strictObject({ op: z.literal('fill'), elementId: bookElementIdSchema, scope: z.enum(['page', 'spread']) }),
+  z.strictObject({
+    op: z.literal('fill'),
+    elementId: bookElementIdSchema,
+    scope: z.enum(['page', 'spread']).describe('Fill its own page to the bleed, or both pages of the spread.'),
+  }),
   /** Copy elements of another page onto this one, with new ids; photos are checked against the gallery. */
   z.strictObject({ op: z.literal('copy_from'), spreadId: bookSpreadIdSchema, elementIds: ids30 }),
   /** Bring travel figures up to date with the journey: the named elements, or every one on the page. */

shared/src/book/book-element-ops.spec.ts

@@ -156,13 +156,18 @@ describe('add', () => {
     expect(addRefusal({ kind: 'text', binding: { source: 'photo.caption' }, text: 'x' })).toBe('invalid_op');
   });
 
-  it('BOOKEL-003: adds a rule as a hairline, a banner wide, and an icon from the shelf only', () => {
+  it('BOOKEL-003: adds a rule as a hairline, a banner wide, and any icon the Studio offers, by lucide name only', () => {
     expect(added({ kind: 'shape', shape: 'line' })).toMatchObject({ shape: 'rect', frame: { w: 105, h: 0.5 } });
     const banner = added({ kind: 'shape', shape: 'banner-ribbon', fill: null });
     expect(banner).toMatchObject({ fill: null, frame: { w: 107.1, h: 34.65 } });
     const icon = added({ kind: 'icon', name: 'Compass', color: '#c2410c' });
     expect(icon).toMatchObject({ name: 'Compass', color: '#c2410c', frame: { w: 37.8, h: 37.8 } });
-    expect(addRefusal({ kind: 'icon', name: 'NotAnIcon' } as unknown as NewElement)).toBe('invalid_op');
+    // Past the travel shelf: the whole library, its old names too, as the icon tab lists it.
+    expect(added({ kind: 'icon', name: 'Pizza' })).toMatchObject({ kind: 'icon', name: 'Pizza' });
+    expect(added({ kind: 'icon', name: 'AlertTriangle' })).toMatchObject({ name: 'AlertTriangle' });
+    for (const name of ['NotAnIcon', 'PizzaIcon', 'pizza', 'Icon']) {
+      expect(addRefusal({ kind: 'icon', name } as unknown as NewElement), name).toBe('invalid_op');
+    }
   });
 
   it('BOOKEL-004: adds the travel kinds from the journey, and refuses them without its figures', () => {

shared/src/book/book-findings-design.spec.ts

@@ -129,13 +129,17 @@ describe('book level and the page in words', () => {
     return { ...doc, spreads: [doc.spreads[0] as BookSpread, ...inner, doc.spreads[4] as BookSpread] };
   }
 
-  it('BOOKQA-009: finds more than two typefaces in a book, and says so once', () => {
-    const fonts = ['sans', 'serif', 'bebas'].map((font, i) => [
+  it('BOOKQA-009: finds more than three typefaces in a book, and says so once', () => {
+    const fonts = ['sans', 'serif', 'bebas', 'playfair'].map((font, i) => [
       text(`t-${i}`, 'Hi', { x: 230, y: 20, w: 60, h: 10 }, { font }),
     ]);
     const list = bookLevelFindings(bookOf(fonts));
     expect(list.filter((f) => f.code === 'font_mix')).toHaveLength(1);
-    expect(bookLevelFindings(bookOf(fonts.slice(0, 2)))).toEqual([]);
+    expect(list.find((f) => f.code === 'font_mix')?.message).toMatch(/4 typefaces .*keep to three/);
+    // A display face, a body face and one more is a book, not a sampler.
+    const mixOf = (pages: typeof fonts) => bookLevelFindings(bookOf(pages)).filter((f) => f.code === 'font_mix');
+    expect(mixOf(fonts.slice(0, 3))).toEqual([]);
+    expect(mixOf(fonts.slice(0, 2))).toEqual([]);
   });
 
   it('BOOKQA-010: notes colours outside the book own and the same page three times running', () => {

shared/src/book/book-findings-design.ts

@@ -340,16 +340,25 @@ function signatureOf(spread: BookSpread): string {
   return spread.elements.map((e) => `${e.kind}:${cm(e.frame.x)},${cm(e.frame.y)},${cm(e.frame.w)}`).join('|');
 }
 
+/**
+ * How many typefaces a book may be set in before it reads as a type sampler:
+ * a display face, a body face and one more, a script laid over a title or a
+ * face for figures. Two was the rule while the book had seven faces and no
+ * scripts, and it told every lively book that set its title apart to stop.
+ * Once fonts carry roles, script and mono faces will not count towards it.
+ */
+const MAX_BOOK_FAMILIES = 3;
+
 /** Findings about the book as a whole: typefaces, colours, and the same page three times running. */
 export function bookLevelFindings(doc: BookDocument): BookFinding[] {
   const out: BookFinding[] = [];
   const families = familiesOf(doc);
-  if (families.length > 2) {
+  if (families.length > MAX_BOOK_FAMILIES) {
     out.push({
       code: 'font_mix',
       severity: 'warn',
       elementIds: [],
-      message: `the book is set in ${families.length} typefaces (${families.join(', ')}); keep to two`,
+      message: `the book is set in ${families.length} typefaces (${families.join(', ')}); keep to three: a display face, a body face and one more`,
     });
   }
   const colours = [...coloursOf(doc)].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]));

shared/src/book/book-findings.ts

@@ -145,35 +145,106 @@ const placedPhotos = (spread: BookSpread) => spread.elements.filter((e): e is Bo
 /**
  * A photo under a quarter of the size of the one it lies on is an inset: the
  * auto layout sets a small picture over the hero on purpose. Context, not a
- * fault; two pictures of a size on top of each other are.
+ * fault; two pictures of a size on top of each other are. The same holds for
+ * a small line of type set over display type, never over running text.
  */
 const INSET_RATIO = 0.25;
 
+/**
+ * Under this many degrees off straight an element reads as unturned; past it,
+ * as laid down at an angle on purpose. Above the scrapbook style's own tilt of
+ * 2 degrees, so a page of that style is not layered by its look alone.
+ */
+const TURNED_DEG = 3;
+
+/** Past this share of the smaller one covered, two photos or texts are an accident however they are turned or framed. */
+const LAYERED_MAX_SHARE = 0.5;
+
+/** Display type, which a small line may be set over: a few words at the heading floor of the styles or larger. */
+const DISPLAY_MAX_CHARS = 40;
+const DISPLAY_MIN_PT = 14;
+
+/** The most overlap findings one page reports, the severe ones first. */
+const MAX_OVERLAPS = 6;
+
+/** How far an element is turned from straight, 0 to 180 degrees, whichever way and however many turns. */
+function turnOf(el: BookElement): number {
+  const rest = el.rotation % 360;
+  const turned = rest < 0 ? rest + 360 : rest;
+  return Math.min(turned, 360 - turned);
+}
+
+/**
+ * Whether two elements on top of each other read as layered on purpose: either
+ * of them turned, or the upper one a photo in a frame (a polaroid, a border, a
+ * shadow), which is how a print laid on a page looks. `upper` is the one
+ * painted later.
+ */
+function layered(lower: BookElement, upper: BookElement): boolean {
+  if (turnOf(lower) >= TURNED_DEG || turnOf(upper) >= TURNED_DEG) return true;
+  return upper.kind === 'photo' && upper.frameStyle !== 'none';
+}
+
+/** Whether a text is display type: a few words, set at heading size or larger. */
+function isDisplay(el: BookElement): boolean {
+  return el.kind === 'text' && el.text.trim().length <= DISPLAY_MAX_CHARS && el.size >= DISPLAY_MIN_PT;
+}
+
+/** Whether the smaller of two is an inset on the larger: any small photo, a small text only over display type. */
+function isInset(small: BookElement, large: BookElement, smaller: number, larger: number): boolean {
+  if (smaller >= larger * INSET_RATIO) return false;
+  return small.kind === 'photo' || isDisplay(large);
+}
+
+/**
+ * Two photos or two texts on top of each other, `a` painted under `b`.
+ *
+ * Severe when it looks like an accident: both straight, of a size, the upper
+ * one unframed, or more than half of the smaller one covered whatever the
+ * look. A small one set over a large one, a turned or framed picture laid
+ * partly over another, is how a lively page is made, and is said as context.
+ * A title over a photo or a photo over a shape is never compared at all:
+ * different kinds layered are a design.
+ */
 function overlapFinding(a: BookElement, b: BookElement, ba: Box, bb: Box, shared: number): BookFinding {
   const [small, large] = area(ba) <= area(bb) ? [a, b] : [b, a];
   const smaller = Math.min(area(ba), area(bb));
-  const pct = Math.round((shared / Math.max(smaller, 1)) * 100);
-  if (a.kind === 'photo' && smaller < Math.max(area(ba), area(bb)) * INSET_RATIO) {
+  const share = shared / Math.max(smaller, 1);
+  const pct = Math.round(share * 100);
+  const what = a.kind === 'photo' ? 'photo' : 'text';
+  if (isInset(small, large, smaller, Math.max(area(ba), area(bb)))) {
     return {
       code: 'overlap',
       severity: 'info',
       elementIds: [small.id, large.id],
-      message: `photo ${small.id} is set as an inset over ${large.id} (${pct}% of it on the larger one)`,
+      message: `${what} ${small.id} is set as an inset over ${large.id} (${pct}% of it on the larger one)`,
+    };
+  }
+  if (share <= LAYERED_MAX_SHARE && layered(a, b)) {
+    return {
+      code: 'overlap',
+      severity: 'info',
+      elementIds: [a.id, b.id],
+      message: `${what}s ${a.id} and ${b.id} are layered on purpose, turned or framed (${pct}% of the smaller one covered); check nothing that matters is hidden`,
     };
   }
   return {
     code: 'overlap',
     severity: 'severe',
     elementIds: [a.id, b.id],
-    message: `${a.kind === 'photo' ? 'photos' : 'texts'} ${a.id} and ${b.id} overlap (${pct}% of the smaller one)`,
+    message: `${what}s ${a.id} and ${b.id} overlap (${pct}% of the smaller one)`,
   };
 }
 
+/**
+ * Every pair of photos or texts on top of each other, reported severe first up
+ * to the cap, so pairs layered on purpose never crowd out an accident.
+ */
 function overlaps(ctx: Ctx): void {
   const content = ctx.spread.elements.filter((e) => e.kind === 'photo' || e.kind === 'text');
-  let found = 0;
-  for (let i = 0; i < content.length && found < 6; i++) {
-    for (let j = i + 1; j < content.length && found < 6; j++) {
+  const found: BookFinding[] = [];
+  for (let i = 0; i < content.length; i++) {
+    for (let j = i + 1; j < content.length; j++) {
       const a = content[i] as BookElement;
       const b = content[j] as BookElement;
       if (a.kind !== b.kind) continue;
@@ -181,10 +252,12 @@ function overlaps(ctx: Ctx): void {
       const bb = elementBox(b);
       const shared = overlapArea(ba, bb);
       if (shared < 4 || shared < Math.min(area(ba), area(bb)) * 0.05) continue;
-      found += 1;
-      add(ctx, overlapFinding(a, b, ba, bb, shared));
+      found.push(overlapFinding(a, b, ba, bb, shared));
     }
   }
+  const severe = found.filter((f) => f.severity === 'severe');
+  const context = found.filter((f) => f.severity !== 'severe');
+  for (const f of [...severe, ...context].slice(0, MAX_OVERLAPS)) add(ctx, f);
 }
 
 /**

shared/src/book/book-icon-names-a-e.data.ts

@@ -0,0 +1,667 @@
+/**
+ * The lucide drawings the Studio offers, A to E: part of BOOK_ICON_NAMES
+ * (book-icons.ts). Generated from lucide-react 0.577.0 by
+ * scripts/gen-book-icon-names.mjs, never edited by hand; the client's
+ * iconLibrary.test.ts fails when the list and the library it ships drift apart.
+ */
+export const BOOK_ICON_NAMES_A_E: readonly string[] = [
+  'AArrowDown',
+  'AArrowUp',
+  'ALargeSmall',
+  'Accessibility',
+  'Activity',
+  'ActivitySquare',
+  'AirVent',
+  'Airplay',
+  'AlarmCheck',
+  'AlarmClock',
+  'AlarmClockCheck',
+  'AlarmClockMinus',
+  'AlarmClockOff',
+  'AlarmClockPlus',
+  'AlarmMinus',
+  'AlarmPlus',
+  'AlarmSmoke',
+  'Album',
+  'AlertCircle',
+  'AlertOctagon',
+  'AlertTriangle',
+  'AlignCenter',
+  'AlignCenterHorizontal',
+  'AlignCenterVertical',
+  'AlignEndHorizontal',
+  'AlignEndVertical',
+  'AlignHorizontalDistributeCenter',
+  'AlignHorizontalDistributeEnd',
+  'AlignHorizontalDistributeStart',
+  'AlignHorizontalJustifyCenter',
+  'AlignHorizontalJustifyEnd',
+  'AlignHorizontalJustifyStart',
+  'AlignHorizontalSpaceAround',
+  'AlignHorizontalSpaceBetween',
+  'AlignJustify',
+  'AlignLeft',
+  'AlignRight',
+  'AlignStartHorizontal',
+  'AlignStartVertical',
+  'AlignVerticalDistributeCenter',
+  'AlignVerticalDistributeEnd',
+  'AlignVerticalDistributeStart',
+  'AlignVerticalJustifyCenter',
+  'AlignVerticalJustifyEnd',
+  'AlignVerticalJustifyStart',
+  'AlignVerticalSpaceAround',
+  'AlignVerticalSpaceBetween',
+  'Ambulance',
+  'Ampersand',
+  'Ampersands',
+  'Amphora',
+  'Anchor',
+  'Angry',
+  'Annoyed',
+  'Antenna',
+  'Anvil',
+  'Aperture',
+  'AppWindow',
+  'AppWindowMac',
+  'Apple',
+  'Archive',
+  'ArchiveRestore',
+  'ArchiveX',
+  'AreaChart',
+  'Armchair',
+  'ArrowBigDown',
+  'ArrowBigDownDash',
+  'ArrowBigLeft',
+  'ArrowBigLeftDash',
+  'ArrowBigRight',
+  'ArrowBigRightDash',
+  'ArrowBigUp',
+  'ArrowBigUpDash',
+  'ArrowDown',
+  'ArrowDown01',
+  'ArrowDown10',
+  'ArrowDownAZ',
+  'ArrowDownAz',
+  'ArrowDownCircle',
+  'ArrowDownFromLine',
+  'ArrowDownLeft',
+  'ArrowDownLeftFromCircle',
+  'ArrowDownLeftFromSquare',
+  'ArrowDownLeftSquare',
+  'ArrowDownNarrowWide',
+  'ArrowDownRight',
+  'ArrowDownRightFromCircle',
+  'ArrowDownRightFromSquare',
+  'ArrowDownRightSquare',
+  'ArrowDownSquare',
+  'ArrowDownToDot',
+  'ArrowDownToLine',
+  'ArrowDownUp',
+  'ArrowDownWideNarrow',
+  'ArrowDownZA',
+  'ArrowDownZa',
+  'ArrowLeft',
+  'ArrowLeftCircle',
+  'ArrowLeftFromLine',
+  'ArrowLeftRight',
+  'ArrowLeftSquare',
+  'ArrowLeftToLine',
+  'ArrowRight',
+  'ArrowRightCircle',
+  'ArrowRightFromLine',
+  'ArrowRightLeft',
+  'ArrowRightSquare',
+  'ArrowRightToLine',
+  'ArrowUp',
+  'ArrowUp01',
+  'ArrowUp10',
+  'ArrowUpAZ',
+  'ArrowUpAz',
+  'ArrowUpCircle',
+  'ArrowUpDown',
+  'ArrowUpFromDot',
+  'ArrowUpFromLine',
+  'ArrowUpLeft',
+  'ArrowUpLeftFromCircle',
+  'ArrowUpLeftFromSquare',
+  'ArrowUpLeftSquare',
+  'ArrowUpNarrowWide',
+  'ArrowUpRight',
+  'ArrowUpRightFromCircle',
+  'ArrowUpRightFromSquare',
+  'ArrowUpRightSquare',
+  'ArrowUpSquare',
+  'ArrowUpToLine',
+  'ArrowUpWideNarrow',
+  'ArrowUpZA',
+  'ArrowUpZa',
+  'ArrowsUpFromLine',
+  'Asterisk',
+  'AsteriskSquare',
+  'AtSign',
+  'Atom',
+  'AudioLines',
+  'AudioWaveform',
+  'Award',
+  'Axe',
+  'Axis3D',
+  'Axis3d',
+  'Baby',
+  'Backpack',
+  'Badge',
+  'BadgeAlert',
+  'BadgeCent',
+  'BadgeCheck',
+  'BadgeDollarSign',
+  'BadgeEuro',
+  'BadgeHelp',
+  'BadgeIndianRupee',
+  'BadgeInfo',
+  'BadgeJapaneseYen',
+  'BadgeMinus',
+  'BadgePercent',
+  'BadgePlus',
+  'BadgePoundSterling',
+  'BadgeQuestionMark',
+  'BadgeRussianRuble',
+  'BadgeSwissFranc',
+  'BadgeTurkishLira',
+  'BadgeX',
+  'BaggageClaim',
+  'Balloon',
+  'Ban',
+  'Banana',
+  'Bandage',
+  'Banknote',
+  'BanknoteArrowDown',
+  'BanknoteArrowUp',
+  'BanknoteX',
+  'BarChart',
+  'BarChart2',
+  'BarChart3',
+  'BarChart4',
+  'BarChartBig',
+  'BarChartHorizontal',
+  'BarChartHorizontalBig',
+  'Barcode',
+  'Barrel',
+  'Baseline',
+  'Bath',
+  'Battery',
+  'BatteryCharging',
+  'BatteryFull',
+  'BatteryLow',
+  'BatteryMedium',
+  'BatteryPlus',
+  'BatteryWarning',
+  'Beaker',
+  'Bean',
+  'BeanOff',
+  'Bed',
+  'BedDouble',
+  'BedSingle',
+  'Beef',
+  'Beer',
+  'BeerOff',
+  'Bell',
+  'BellDot',
+  'BellElectric',
+  'BellMinus',
+  'BellOff',
+  'BellPlus',
+  'BellRing',
+  'BetweenHorizonalEnd',
+  'BetweenHorizonalStart',
+  'BetweenHorizontalEnd',
+  'BetweenHorizontalStart',
+  'BetweenVerticalEnd',
+  'BetweenVerticalStart',
+  'BicepsFlexed',
+  'Bike',
+  'Binary',
+  'Binoculars',
+  'Biohazard',
+  'Bird',
+  'Birdhouse',
+  'Bitcoin',
+  'Blend',
+  'Blinds',
+  'Blocks',
+  'Bluetooth',
+  'BluetoothConnected',
+  'BluetoothOff',
+  'BluetoothSearching',
+  'Bold',
+  'Bolt',
+  'Bomb',
+  'Bone',
+  'Book',
+  'BookA',
+  'BookAlert',
+  'BookAudio',
+  'BookCheck',
+  'BookCopy',
+  'BookDashed',
+  'BookDown',
+  'BookHeadphones',
+  'BookHeart',
+  'BookImage',
+  'BookKey',
+  'BookLock',
+  'BookMarked',
+  'BookMinus',
+  'BookOpen',
+  'BookOpenCheck',
+  'BookOpenText',
+  'BookPlus',
+  'BookSearch',
+  'BookTemplate',
+  'BookText',
+  'BookType',
+  'BookUp',
+  'BookUp2',
+  'BookUser',
+  'BookX',
+  'Bookmark',
+  'BookmarkCheck',
+  'BookmarkMinus',
+  'BookmarkPlus',
+  'BookmarkX',
+  'BoomBox',
+  'Bot',
+  'BotMessageSquare',
+  'BotOff',
+  'BottleWine',
+  'BowArrow',
+  'Box',
+  'BoxSelect',
+  'Boxes',
+  'Braces',
+  'Brackets',
+  'Brain',
+  'BrainCircuit',
+  'BrainCog',
+  'BrickWall',
+  'BrickWallFire',
+  'BrickWallShield',
+  'Briefcase',
+  'BriefcaseBusiness',
+  'BriefcaseConveyorBelt',
+  'BriefcaseMedical',
+  'BringToFront',
+  'Brush',
+  'BrushCleaning',
+  'Bubbles',
+  'Bug',
+  'BugOff',
+  'BugPlay',
+  'Building',
+  'Building2',
+  'Bus',
+  'BusFront',
+  'Cable',
+  'CableCar',
+  'Cake',
+  'CakeSlice',
+  'Calculator',
+  'Calendar',
+  'Calendar1',
+  'CalendarArrowDown',
+  'CalendarArrowUp',
+  'CalendarCheck',
+  'CalendarCheck2',
+  'CalendarClock',
+  'CalendarCog',
+  'CalendarDays',
+  'CalendarFold',
+  'CalendarHeart',
+  'CalendarMinus',
+  'CalendarMinus2',
+  'CalendarOff',
+  'CalendarPlus',
+  'CalendarPlus2',
+  'CalendarRange',
+  'CalendarSearch',
+  'CalendarSync',
+  'CalendarX',
+  'CalendarX2',
+  'Calendars',
+  'Camera',
+  'CameraOff',
+  'CandlestickChart',
+  'Candy',
+  'CandyCane',
+  'CandyOff',
+  'Cannabis',
+  'CannabisOff',
+  'Captions',
+  'CaptionsOff',
+  'Car',
+  'CarFront',
+  'CarTaxiFront',
+  'Caravan',
+  'CardSim',
+  'Carrot',
+  'CaseLower',
+  'CaseSensitive',
+  'CaseUpper',
+  'CassetteTape',
+  'Cast',
+  'Castle',
+  'Cat',
+  'Cctv',
+  'ChartArea',
+  'ChartBar',
+  'ChartBarBig',
+  'ChartBarDecreasing',
+  'ChartBarIncreasing',
+  'ChartBarStacked',
+  'ChartCandlestick',
+  'ChartColumn',
+  'ChartColumnBig',
+  'ChartColumnDecreasing',
+  'ChartColumnIncreasing',
+  'ChartColumnStacked',
+  'ChartGantt',
+  'ChartLine',
+  'ChartNetwork',
+  'ChartNoAxesColumn',
+  'ChartNoAxesColumnDecreasing',
+  'ChartNoAxesColumnIncreasing',
+  'ChartNoAxesCombined',
+  'ChartNoAxesGantt',
+  'ChartPie',
+  'ChartScatter',
+  'ChartSpline',
+  'Check',
+  'CheckCheck',
+  'CheckCircle',
+  'CheckCircle2',
+  'CheckLine',
+  'CheckSquare',
+  'CheckSquare2',
+  'ChefHat',
+  'Cherry',
+  'ChessBishop',
+  'ChessKing',
+  'ChessKnight',
+  'ChessPawn',
+  'ChessQueen',
+  'ChessRook',
+  'ChevronDown',
+  'ChevronDownCircle',
+  'ChevronDownSquare',
+  'ChevronFirst',
+  'ChevronLast',
+  'ChevronLeft',
+  'ChevronLeftCircle',
+  'ChevronLeftSquare',
+  'ChevronRight',
+  'ChevronRightCircle',
+  'ChevronRightSquare',
+  'ChevronUp',
+  'ChevronUpCircle',
+  'ChevronUpSquare',
+  'ChevronsDown',
+  'ChevronsDownUp',
+  'ChevronsLeft',
+  'ChevronsLeftRight',
+  'ChevronsLeftRightEllipsis',
+  'ChevronsRight',
+  'ChevronsRightLeft',
+  'ChevronsUp',
+  'ChevronsUpDown',
+  'Chrome',
+  'Chromium',
+  'Church',
+  'Cigarette',
+  'CigaretteOff',
+  'Circle',
+  'CircleAlert',
+  'CircleArrowDown',
+  'CircleArrowLeft',
+  'CircleArrowOutDownLeft',
+  'CircleArrowOutDownRight',
+  'CircleArrowOutUpLeft',
+  'CircleArrowOutUpRight',
+  'CircleArrowRight',
+  'CircleArrowUp',
+  'CircleCheck',
+  'CircleCheckBig',
+  'CircleChevronDown',
+  'CircleChevronLeft',
+  'CircleChevronRight',
+  'CircleChevronUp',
+  'CircleDashed',
+  'CircleDivide',
+  'CircleDollarSign',
+  'CircleDot',
+  'CircleDotDashed',
+  'CircleEllipsis',
+  'CircleEqual',
+  'CircleFadingArrowUp',
+  'CircleFadingPlus',
+  'CircleGauge',
+  'CircleHelp',
+  'CircleMinus',
+  'CircleOff',
+  'CircleParking',
+  'CircleParkingOff',
+  'CirclePause',
+  'CirclePercent',
+  'CirclePile',
+  'CirclePlay',
+  'CirclePlus',
+  'CirclePoundSterling',
+  'CirclePower',
+  'CircleQuestionMark',
+  'CircleSlash',
+  'CircleSlash2',
+  'CircleSlashed',
+  'CircleSmall',
+  'CircleStar',
+  'CircleStop',
+  'CircleUser',
+  'CircleUserRound',
+  'CircleX',
+  'CircuitBoard',
+  'Citrus',
+  'Clapperboard',
+  'Clipboard',
+  'ClipboardCheck',
+  'ClipboardClock',
+  'ClipboardCopy',
+  'ClipboardEdit',
+  'ClipboardList',
+  'ClipboardMinus',
+  'ClipboardPaste',
+  'ClipboardPen',
+  'ClipboardPenLine',
+  'ClipboardPlus',
+  'ClipboardSignature',
+  'ClipboardType',
+  'ClipboardX',
+  'Clock',
+  'Clock1',
+  'Clock10',
+  'Clock11',
+  'Clock12',
+  'Clock2',
+  'Clock3',
+  'Clock4',
+  'Clock5',
+  'Clock6',
+  'Clock7',
+  'Clock8',
+  'Clock9',
+  'ClockAlert',
+  'ClockArrowDown',
+  'ClockArrowUp',
+  'ClockCheck',
+  'ClockFading',
+  'ClockPlus',
+  'ClosedCaption',
+  'Cloud',
+  'CloudAlert',
+  'CloudBackup',
+  'CloudCheck',
+  'CloudCog',
+  'CloudDownload',
+  'CloudDrizzle',
+  'CloudFog',
+  'CloudHail',
+  'CloudLightning',
+  'CloudMoon',
+  'CloudMoonRain',
+  'CloudOff',
+  'CloudRain',
+  'CloudRainWind',
+  'CloudSnow',
+  'CloudSun',
+  'CloudSunRain',
+  'CloudSync',
+  'CloudUpload',
+  'Cloudy',
+  'Clover',
+  'Club',
+  'Code',
+  'Code2',
+  'CodeSquare',
+  'CodeXml',
+  'Codepen',
+  'Codesandbox',
+  'Coffee',
+  'Cog',
+  'Coins',
+  'Columns',
+  'Columns2',
+  'Columns3',
+  'Columns3Cog',
+  'Columns4',
+  'ColumnsSettings',
+  'Combine',
+  'Command',
+  'Compass',
+  'Component',
+  'Computer',
+  'ConciergeBell',
+  'Cone',
+  'Construction',
+  'Contact',
+  'Contact2',
+  'ContactRound',
+  'Container',
+  'Contrast',
+  'Cookie',
+  'CookingPot',
+  'Copy',
+  'CopyCheck',
+  'CopyMinus',
+  'CopyPlus',
+  'CopySlash',
+  'CopyX',
+  'Copyleft',
+  'Copyright',
+  'CornerDownLeft',
+  'CornerDownRight',
+  'CornerLeftDown',
+  'CornerLeftUp',
+  'CornerRightDown',
+  'CornerRightUp',
+  'CornerUpLeft',
+  'CornerUpRight',
+  'Cpu',
+  'CreativeCommons',
+  'CreditCard',
+  'Croissant',
+  'Crop',
+  'Cross',
+  'Crosshair',
+  'Crown',
+  'Cuboid',
+  'CupSoda',
+  'CurlyBraces',
+  'Currency',
+  'Cylinder',
+  'Dam',
+  'Database',
+  'DatabaseBackup',
+  'DatabaseSearch',
+  'DatabaseZap',
+  'DecimalsArrowLeft',
+  'DecimalsArrowRight',
+  'Delete',
+  'Dessert',
+  'Diameter',
+  'Diamond',
+  'DiamondMinus',
+  'DiamondPercent',
+  'DiamondPlus',
+  'Dice1',
+  'Dice2',
+  'Dice3',
+  'Dice4',
+  'Dice5',
+  'Dice6',
+  'Dices',
+  'Diff',
+  'Disc',
+  'Disc2',
+  'Disc3',
+  'DiscAlbum',
+  'Divide',
+  'DivideCircle',
+  'DivideSquare',
+  'Dna',
+  'DnaOff',
+  'Dock',
+  'Dog',
+  'DollarSign',
+  'Donut',
+  'DoorClosed',
+  'DoorClosedLocked',
+  'DoorOpen',
+  'Dot',
+  'DotSquare',
+  'Download',
+  'DownloadCloud',
+  'DraftingCompass',
+  'Drama',
+  'Dribbble',
+  'Drill',
+  'Drone',
+  'Droplet',
+  'DropletOff',
+  'Droplets',
+  'Drum',
+  'Drumstick',
+  'Dumbbell',
+  'Ear',
+  'EarOff',
+  'Earth',
+  'EarthLock',
+  'Eclipse',
+  'Edit',
+  'Edit2',
+  'Edit3',
+  'Egg',
+  'EggFried',
+  'EggOff',
+  'Ellipse',
+  'Ellipsis',
+  'EllipsisVertical',
+  'Equal',
+  'EqualApproximately',
+  'EqualNot',
+  'EqualSquare',
+  'Eraser',
+  'EthernetPort',
+  'Euro',
+  'EvCharger',
+  'Expand',
+  'ExternalLink',
+  'Eye',
+  'EyeClosed',
+  'EyeOff',
+];

shared/src/book/book-icon-names-f-p.data.ts

@@ -0,0 +1,727 @@
+/**
+ * The lucide drawings the Studio offers, F to P: part of BOOK_ICON_NAMES
+ * (book-icons.ts). Generated from lucide-react 0.577.0 by
+ * scripts/gen-book-icon-names.mjs, never edited by hand; the client's
+ * iconLibrary.test.ts fails when the list and the library it ships drift apart.
+ */
+export const BOOK_ICON_NAMES_F_P: readonly string[] = [
+  'Facebook',
+  'Factory',
+  'Fan',
+  'FastForward',
+  'Feather',
+  'Fence',
+  'FerrisWheel',
+  'Figma',
+  'File',
+  'FileArchive',
+  'FileAudio',
+  'FileAudio2',
+  'FileAxis3D',
+  'FileAxis3d',
+  'FileBadge',
+  'FileBadge2',
+  'FileBarChart',
+  'FileBarChart2',
+  'FileBox',
+  'FileBraces',
+  'FileBracesCorner',
+  'FileChartColumn',
+  'FileChartColumnIncreasing',
+  'FileChartLine',
+  'FileChartPie',
+  'FileCheck',
+  'FileCheck2',
+  'FileCheckCorner',
+  'FileClock',
+  'FileCode',
+  'FileCode2',
+  'FileCodeCorner',
+  'FileCog',
+  'FileCog2',
+  'FileDiff',
+  'FileDigit',
+  'FileDown',
+  'FileEdit',
+  'FileExclamationPoint',
+  'FileHeadphone',
+  'FileHeart',
+  'FileImage',
+  'FileInput',
+  'FileJson',
+  'FileJson2',
+  'FileKey',
+  'FileKey2',
+  'FileLineChart',
+  'FileLock',
+  'FileLock2',
+  'FileMinus',
+  'FileMinus2',
+  'FileMinusCorner',
+  'FileMusic',
+  'FileOutput',
+  'FilePen',
+  'FilePenLine',
+  'FilePieChart',
+  'FilePlay',
+  'FilePlus',
+  'FilePlus2',
+  'FilePlusCorner',
+  'FileQuestion',
+  'FileQuestionMark',
+  'FileScan',
+  'FileSearch',
+  'FileSearch2',
+  'FileSearchCorner',
+  'FileSignal',
+  'FileSignature',
+  'FileSliders',
+  'FileSpreadsheet',
+  'FileStack',
+  'FileSymlink',
+  'FileTerminal',
+  'FileText',
+  'FileType',
+  'FileType2',
+  'FileTypeCorner',
+  'FileUp',
+  'FileUser',
+  'FileVideo',
+  'FileVideo2',
+  'FileVideoCamera',
+  'FileVolume',
+  'FileVolume2',
+  'FileWarning',
+  'FileX',
+  'FileX2',
+  'FileXCorner',
+  'Files',
+  'Film',
+  'Filter',
+  'FilterX',
+  'Fingerprint',
+  'FingerprintPattern',
+  'FireExtinguisher',
+  'Fish',
+  'FishOff',
+  'FishSymbol',
+  'FishingHook',
+  'FishingRod',
+  'Flag',
+  'FlagOff',
+  'FlagTriangleLeft',
+  'FlagTriangleRight',
+  'Flame',
+  'FlameKindling',
+  'Flashlight',
+  'FlashlightOff',
+  'FlaskConical',
+  'FlaskConicalOff',
+  'FlaskRound',
+  'FlipHorizontal',
+  'FlipHorizontal2',
+  'FlipVertical',
+  'FlipVertical2',
+  'Flower',
+  'Flower2',
+  'Focus',
+  'FoldHorizontal',
+  'FoldVertical',
+  'Folder',
+  'FolderArchive',
+  'FolderCheck',
+  'FolderClock',
+  'FolderClosed',
+  'FolderCode',
+  'FolderCog',
+  'FolderCog2',
+  'FolderDot',
+  'FolderDown',
+  'FolderEdit',
+  'FolderGit',
+  'FolderGit2',
+  'FolderHeart',
+  'FolderInput',
+  'FolderKanban',
+  'FolderKey',
+  'FolderLock',
+  'FolderMinus',
+  'FolderOpen',
+  'FolderOpenDot',
+  'FolderOutput',
+  'FolderPen',
+  'FolderPlus',
+  'FolderRoot',
+  'FolderSearch',
+  'FolderSearch2',
+  'FolderSymlink',
+  'FolderSync',
+  'FolderTree',
+  'FolderUp',
+  'FolderX',
+  'Folders',
+  'Footprints',
+  'ForkKnife',
+  'ForkKnifeCrossed',
+  'Forklift',
+  'Form',
+  'FormInput',
+  'Forward',
+  'Frame',
+  'Framer',
+  'Frown',
+  'Fuel',
+  'Fullscreen',
+  'FunctionSquare',
+  'Funnel',
+  'FunnelPlus',
+  'FunnelX',
+  'GalleryHorizontal',
+  'GalleryHorizontalEnd',
+  'GalleryThumbnails',
+  'GalleryVertical',
+  'GalleryVerticalEnd',
+  'Gamepad',
+  'Gamepad2',
+  'GamepadDirectional',
+  'GanttChart',
+  'GanttChartSquare',
+  'Gauge',
+  'GaugeCircle',
+  'Gavel',
+  'Gem',
+  'GeorgianLari',
+  'Ghost',
+  'Gift',
+  'GitBranch',
+  'GitBranchMinus',
+  'GitBranchPlus',
+  'GitCommit',
+  'GitCommitHorizontal',
+  'GitCommitVertical',
+  'GitCompare',
+  'GitCompareArrows',
+  'GitFork',
+  'GitGraph',
+  'GitMerge',
+  'GitMergeConflict',
+  'GitPullRequest',
+  'GitPullRequestArrow',
+  'GitPullRequestClosed',
+  'GitPullRequestCreate',
+  'GitPullRequestCreateArrow',
+  'GitPullRequestDraft',
+  'Github',
+  'Gitlab',
+  'GlassWater',
+  'Glasses',
+  'Globe',
+  'Globe2',
+  'GlobeLock',
+  'GlobeOff',
+  'GlobeX',
+  'Goal',
+  'Gpu',
+  'Grab',
+  'GraduationCap',
+  'Grape',
+  'Grid',
+  'Grid2X2',
+  'Grid2X2Check',
+  'Grid2X2Plus',
+  'Grid2X2X',
+  'Grid2x2',
+  'Grid2x2Check',
+  'Grid2x2Plus',
+  'Grid2x2X',
+  'Grid3X3',
+  'Grid3x2',
+  'Grid3x3',
+  'Grip',
+  'GripHorizontal',
+  'GripVertical',
+  'Group',
+  'Guitar',
+  'Ham',
+  'Hamburger',
+  'Hammer',
+  'Hand',
+  'HandCoins',
+  'HandFist',
+  'HandGrab',
+  'HandHeart',
+  'HandHelping',
+  'HandMetal',
+  'HandPlatter',
+  'Handbag',
+  'Handshake',
+  'HardDrive',
+  'HardDriveDownload',
+  'HardDriveUpload',
+  'HardHat',
+  'Hash',
+  'HatGlasses',
+  'Haze',
+  'Hd',
+  'HdmiPort',
+  'Heading',
+  'Heading1',
+  'Heading2',
+  'Heading3',
+  'Heading4',
+  'Heading5',
+  'Heading6',
+  'HeadphoneOff',
+  'Headphones',
+  'Headset',
+  'Heart',
+  'HeartCrack',
+  'HeartHandshake',
+  'HeartMinus',
+  'HeartOff',
+  'HeartPlus',
+  'HeartPulse',
+  'Heater',
+  'Helicopter',
+  'HelpCircle',
+  'HelpingHand',
+  'Hexagon',
+  'Highlighter',
+  'History',
+  'Home',
+  'Hop',
+  'HopOff',
+  'Hospital',
+  'Hotel',
+  'Hourglass',
+  'House',
+  'HouseHeart',
+  'HousePlug',
+  'HousePlus',
+  'HouseWifi',
+  'IceCream',
+  'IceCream2',
+  'IceCreamBowl',
+  'IceCreamCone',
+  'IdCard',
+  'IdCardLanyard',
+  'Image',
+  'ImageDown',
+  'ImageMinus',
+  'ImageOff',
+  'ImagePlay',
+  'ImagePlus',
+  'ImageUp',
+  'ImageUpscale',
+  'Images',
+  'Import',
+  'Inbox',
+  'Indent',
+  'IndentDecrease',
+  'IndentIncrease',
+  'IndianRupee',
+  'Infinity',
+  'Info',
+  'Inspect',
+  'InspectionPanel',
+  'Instagram',
+  'Italic',
+  'IterationCcw',
+  'IterationCw',
+  'JapaneseYen',
+  'Joystick',
+  'Kanban',
+  'KanbanSquare',
+  'KanbanSquareDashed',
+  'Kayak',
+  'Key',
+  'KeyRound',
+  'KeySquare',
+  'Keyboard',
+  'KeyboardMusic',
+  'KeyboardOff',
+  'Lamp',
+  'LampCeiling',
+  'LampDesk',
+  'LampFloor',
+  'LampWallDown',
+  'LampWallUp',
+  'LandPlot',
+  'Landmark',
+  'Languages',
+  'Laptop',
+  'Laptop2',
+  'LaptopMinimal',
+  'LaptopMinimalCheck',
+  'Lasso',
+  'LassoSelect',
+  'Laugh',
+  'Layers',
+  'Layers2',
+  'Layers3',
+  'LayersPlus',
+  'Layout',
+  'LayoutDashboard',
+  'LayoutGrid',
+  'LayoutList',
+  'LayoutPanelLeft',
+  'LayoutPanelTop',
+  'LayoutTemplate',
+  'Leaf',
+  'LeafyGreen',
+  'Lectern',
+  'LensConcave',
+  'LensConvex',
+  'LetterText',
+  'Library',
+  'LibraryBig',
+  'LibrarySquare',
+  'LifeBuoy',
+  'Ligature',
+  'Lightbulb',
+  'LightbulbOff',
+  'LineChart',
+  'LineDotRightHorizontal',
+  'LineSquiggle',
+  'Link',
+  'Link2',
+  'Link2Off',
+  'Linkedin',
+  'List',
+  'ListCheck',
+  'ListChecks',
+  'ListChevronsDownUp',
+  'ListChevronsUpDown',
+  'ListCollapse',
+  'ListEnd',
+  'ListFilter',
+  'ListFilterPlus',
+  'ListIndentDecrease',
+  'ListIndentIncrease',
+  'ListMinus',
+  'ListMusic',
+  'ListOrdered',
+  'ListPlus',
+  'ListRestart',
+  'ListStart',
+  'ListTodo',
+  'ListTree',
+  'ListVideo',
+  'ListX',
+  'Loader',
+  'Loader2',
+  'LoaderCircle',
+  'LoaderPinwheel',
+  'Locate',
+  'LocateFixed',
+  'LocateOff',
+  'LocationEdit',
+  'Lock',
+  'LockKeyhole',
+  'LockKeyholeOpen',
+  'LockOpen',
+  'LogIn',
+  'LogOut',
+  'Logs',
+  'Lollipop',
+  'Luggage',
+  'MSquare',
+  'Magnet',
+  'Mail',
+  'MailCheck',
+  'MailMinus',
+  'MailOpen',
+  'MailPlus',
+  'MailQuestion',
+  'MailQuestionMark',
+  'MailSearch',
+  'MailWarning',
+  'MailX',
+  'Mailbox',
+  'Mails',
+  'Map',
+  'MapMinus',
+  'MapPin',
+  'MapPinCheck',
+  'MapPinCheckInside',
+  'MapPinHouse',
+  'MapPinMinus',
+  'MapPinMinusInside',
+  'MapPinOff',
+  'MapPinPen',
+  'MapPinPlus',
+  'MapPinPlusInside',
+  'MapPinX',
+  'MapPinXInside',
+  'MapPinned',
+  'MapPlus',
+  'Mars',
+  'MarsStroke',
+  'Martini',
+  'Maximize',
+  'Maximize2',
+  'Medal',
+  'Megaphone',
+  'MegaphoneOff',
+  'Meh',
+  'MemoryStick',
+  'Menu',
+  'MenuSquare',
+  'Merge',
+  'MessageCircle',
+  'MessageCircleCheck',
+  'MessageCircleCode',
+  'MessageCircleDashed',
+  'MessageCircleHeart',
+  'MessageCircleMore',
+  'MessageCircleOff',
+  'MessageCirclePlus',
+  'MessageCircleQuestion',
+  'MessageCircleQuestionMark',
+  'MessageCircleReply',
+  'MessageCircleWarning',
+  'MessageCircleX',
+  'MessageSquare',
+  'MessageSquareCheck',
+  'MessageSquareCode',
+  'MessageSquareDashed',
+  'MessageSquareDiff',
+  'MessageSquareDot',
+  'MessageSquareHeart',
+  'MessageSquareLock',
+  'MessageSquareMore',
+  'MessageSquareOff',
+  'MessageSquarePlus',
+  'MessageSquareQuote',
+  'MessageSquareReply',
+  'MessageSquareShare',
+  'MessageSquareText',
+  'MessageSquareWarning',
+  'MessageSquareX',
+  'MessagesSquare',
+  'Metronome',
+  'Mic',
+  'Mic2',
+  'MicOff',
+  'MicVocal',
+  'Microchip',
+  'Microscope',
+  'Microwave',
+  'Milestone',
+  'Milk',
+  'MilkOff',
+  'Minimize',
+  'Minimize2',
+  'Minus',
+  'MinusCircle',
+  'MinusSquare',
+  'MirrorRectangular',
+  'MirrorRound',
+  'Monitor',
+  'MonitorCheck',
+  'MonitorCloud',
+  'MonitorCog',
+  'MonitorDot',
+  'MonitorDown',
+  'MonitorOff',
+  'MonitorPause',
+  'MonitorPlay',
+  'MonitorSmartphone',
+  'MonitorSpeaker',
+  'MonitorStop',
+  'MonitorUp',
+  'MonitorX',
+  'Moon',
+  'MoonStar',
+  'MoreHorizontal',
+  'MoreVertical',
+  'Motorbike',
+  'Mountain',
+  'MountainSnow',
+  'Mouse',
+  'MouseLeft',
+  'MouseOff',
+  'MousePointer',
+  'MousePointer2',
+  'MousePointer2Off',
+  'MousePointerBan',
+  'MousePointerClick',
+  'MousePointerSquareDashed',
+  'MouseRight',
+  'Move',
+  'Move3D',
+  'Move3d',
+  'MoveDiagonal',
+  'MoveDiagonal2',
+  'MoveDown',
+  'MoveDownLeft',
+  'MoveDownRight',
+  'MoveHorizontal',
+  'MoveLeft',
+  'MoveRight',
+  'MoveUp',
+  'MoveUpLeft',
+  'MoveUpRight',
+  'MoveVertical',
+  'Music',
+  'Music2',
+  'Music3',
+  'Music4',
+  'Navigation',
+  'Navigation2',
+  'Navigation2Off',
+  'NavigationOff',
+  'Network',
+  'Newspaper',
+  'Nfc',
+  'NonBinary',
+  'Notebook',
+  'NotebookPen',
+  'NotebookTabs',
+  'NotebookText',
+  'NotepadText',
+  'NotepadTextDashed',
+  'Nut',
+  'NutOff',
+  'Octagon',
+  'OctagonAlert',
+  'OctagonMinus',
+  'OctagonPause',
+  'OctagonX',
+  'Omega',
+  'Option',
+  'Orbit',
+  'Origami',
+  'Outdent',
+  'Package',
+  'Package2',
+  'PackageCheck',
+  'PackageMinus',
+  'PackageOpen',
+  'PackagePlus',
+  'PackageSearch',
+  'PackageX',
+  'PaintBucket',
+  'PaintRoller',
+  'Paintbrush',
+  'Paintbrush2',
+  'PaintbrushVertical',
+  'Palette',
+  'Palmtree',
+  'Panda',
+  'PanelBottom',
+  'PanelBottomClose',
+  'PanelBottomDashed',
+  'PanelBottomInactive',
+  'PanelBottomOpen',
+  'PanelLeft',
+  'PanelLeftClose',
+  'PanelLeftDashed',
+  'PanelLeftInactive',
+  'PanelLeftOpen',
+  'PanelLeftRightDashed',
+  'PanelRight',
+  'PanelRightClose',
+  'PanelRightDashed',
+  'PanelRightInactive',
+  'PanelRightOpen',
+  'PanelTop',
+  'PanelTopBottomDashed',
+  'PanelTopClose',
+  'PanelTopDashed',
+  'PanelTopInactive',
+  'PanelTopOpen',
+  'PanelsLeftBottom',
+  'PanelsLeftRight',
+  'PanelsRightBottom',
+  'PanelsTopBottom',
+  'PanelsTopLeft',
+  'Paperclip',
+  'Parentheses',
+  'ParkingCircle',
+  'ParkingCircleOff',
+  'ParkingMeter',
+  'ParkingSquare',
+  'ParkingSquareOff',
+  'PartyPopper',
+  'Pause',
+  'PauseCircle',
+  'PauseOctagon',
+  'PawPrint',
+  'PcCase',
+  'Pen',
+  'PenBox',
+  'PenLine',
+  'PenOff',
+  'PenSquare',
+  'PenTool',
+  'Pencil',
+  'PencilLine',
+  'PencilOff',
+  'PencilRuler',
+  'Pentagon',
+  'Percent',
+  'PercentCircle',
+  'PercentDiamond',
+  'PercentSquare',
+  'PersonStanding',
+  'PhilippinePeso',
+  'Phone',
+  'PhoneCall',
+  'PhoneForwarded',
+  'PhoneIncoming',
+  'PhoneMissed',
+  'PhoneOff',
+  'PhoneOutgoing',
+  'Pi',
+  'PiSquare',
+  'Piano',
+  'Pickaxe',
+  'PictureInPicture',
+  'PictureInPicture2',
+  'PieChart',
+  'PiggyBank',
+  'Pilcrow',
+  'PilcrowLeft',
+  'PilcrowRight',
+  'PilcrowSquare',
+  'Pill',
+  'PillBottle',
+  'Pin',
+  'PinOff',
+  'Pipette',
+  'Pizza',
+  'Plane',
+  'PlaneLanding',
+  'PlaneTakeoff',
+  'Play',
+  'PlayCircle',
+  'PlaySquare',
+  'Plug',
+  'Plug2',
+  'PlugZap',
+  'PlugZap2',
+  'Plus',
+  'PlusCircle',
+  'PlusSquare',
+  'Pocket',
+  'PocketKnife',
+  'Podcast',
+  'Pointer',
+  'PointerOff',
+  'Popcorn',
+  'Popsicle',
+  'PoundSterling',
+  'Power',
+  'PowerCircle',
+  'PowerOff',
+  'PowerSquare',
+  'Presentation',
+  'Printer',
+  'PrinterCheck',
+  'PrinterX',
+  'Projector',
+  'Proportions',
+  'Puzzle',
+  'Pyramid',
+];

shared/src/book/book-icon-names-q-z.data.ts

@@ -0,0 +1,577 @@
+/**
+ * The lucide drawings the Studio offers, Q to Z: part of BOOK_ICON_NAMES
+ * (book-icons.ts). Generated from lucide-react 0.577.0 by
+ * scripts/gen-book-icon-names.mjs, never edited by hand; the client's
+ * iconLibrary.test.ts fails when the list and the library it ships drift apart.
+ */
+export const BOOK_ICON_NAMES_Q_Z: readonly string[] = [
+  'QrCode',
+  'Quote',
+  'Rabbit',
+  'Radar',
+  'Radiation',
+  'Radical',
+  'Radio',
+  'RadioReceiver',
+  'RadioTower',
+  'Radius',
+  'RailSymbol',
+  'Rainbow',
+  'Rat',
+  'Ratio',
+  'Receipt',
+  'ReceiptCent',
+  'ReceiptEuro',
+  'ReceiptIndianRupee',
+  'ReceiptJapaneseYen',
+  'ReceiptPoundSterling',
+  'ReceiptRussianRuble',
+  'ReceiptSwissFranc',
+  'ReceiptText',
+  'ReceiptTurkishLira',
+  'RectangleCircle',
+  'RectangleEllipsis',
+  'RectangleGoggles',
+  'RectangleHorizontal',
+  'RectangleVertical',
+  'Recycle',
+  'Redo',
+  'Redo2',
+  'RedoDot',
+  'RefreshCcw',
+  'RefreshCcwDot',
+  'RefreshCw',
+  'RefreshCwOff',
+  'Refrigerator',
+  'Regex',
+  'RemoveFormatting',
+  'Repeat',
+  'Repeat1',
+  'Repeat2',
+  'Replace',
+  'ReplaceAll',
+  'Reply',
+  'ReplyAll',
+  'Rewind',
+  'Ribbon',
+  'Rocket',
+  'RockingChair',
+  'RollerCoaster',
+  'Rose',
+  'Rotate3D',
+  'Rotate3d',
+  'RotateCcw',
+  'RotateCcwKey',
+  'RotateCcwSquare',
+  'RotateCw',
+  'RotateCwSquare',
+  'Route',
+  'RouteOff',
+  'Router',
+  'Rows',
+  'Rows2',
+  'Rows3',
+  'Rows4',
+  'Rss',
+  'Ruler',
+  'RulerDimensionLine',
+  'RussianRuble',
+  'Sailboat',
+  'Salad',
+  'Sandwich',
+  'Satellite',
+  'SatelliteDish',
+  'SaudiRiyal',
+  'Save',
+  'SaveAll',
+  'SaveOff',
+  'Scale',
+  'Scale3D',
+  'Scale3d',
+  'Scaling',
+  'Scan',
+  'ScanBarcode',
+  'ScanEye',
+  'ScanFace',
+  'ScanHeart',
+  'ScanLine',
+  'ScanQrCode',
+  'ScanSearch',
+  'ScanText',
+  'ScatterChart',
+  'School',
+  'School2',
+  'Scissors',
+  'ScissorsLineDashed',
+  'ScissorsSquare',
+  'ScissorsSquareDashedBottom',
+  'Scooter',
+  'ScreenShare',
+  'ScreenShareOff',
+  'Scroll',
+  'ScrollText',
+  'Search',
+  'SearchAlert',
+  'SearchCheck',
+  'SearchCode',
+  'SearchSlash',
+  'SearchX',
+  'Section',
+  'Send',
+  'SendHorizonal',
+  'SendHorizontal',
+  'SendToBack',
+  'SeparatorHorizontal',
+  'SeparatorVertical',
+  'Server',
+  'ServerCog',
+  'ServerCrash',
+  'ServerOff',
+  'Settings',
+  'Settings2',
+  'Shapes',
+  'Share',
+  'Share2',
+  'Sheet',
+  'Shell',
+  'ShelvingUnit',
+  'Shield',
+  'ShieldAlert',
+  'ShieldBan',
+  'ShieldCheck',
+  'ShieldClose',
+  'ShieldEllipsis',
+  'ShieldHalf',
+  'ShieldMinus',
+  'ShieldOff',
+  'ShieldPlus',
+  'ShieldQuestion',
+  'ShieldQuestionMark',
+  'ShieldUser',
+  'ShieldX',
+  'Ship',
+  'ShipWheel',
+  'Shirt',
+  'ShoppingBag',
+  'ShoppingBasket',
+  'ShoppingCart',
+  'Shovel',
+  'ShowerHead',
+  'Shredder',
+  'Shrimp',
+  'Shrink',
+  'Shrub',
+  'Shuffle',
+  'Sidebar',
+  'SidebarClose',
+  'SidebarOpen',
+  'Sigma',
+  'SigmaSquare',
+  'Signal',
+  'SignalHigh',
+  'SignalLow',
+  'SignalMedium',
+  'SignalZero',
+  'Signature',
+  'Signpost',
+  'SignpostBig',
+  'Siren',
+  'SkipBack',
+  'SkipForward',
+  'Skull',
+  'Slack',
+  'Slash',
+  'SlashSquare',
+  'Slice',
+  'Sliders',
+  'SlidersHorizontal',
+  'SlidersVertical',
+  'Smartphone',
+  'SmartphoneCharging',
+  'SmartphoneNfc',
+  'Smile',
+  'SmilePlus',
+  'Snail',
+  'Snowflake',
+  'SoapDispenserDroplet',
+  'Sofa',
+  'SolarPanel',
+  'SortAsc',
+  'SortDesc',
+  'Soup',
+  'Space',
+  'Spade',
+  'Sparkle',
+  'Sparkles',
+  'Speaker',
+  'Speech',
+  'SpellCheck',
+  'SpellCheck2',
+  'Spline',
+  'SplinePointer',
+  'Split',
+  'SplitSquareHorizontal',
+  'SplitSquareVertical',
+  'Spool',
+  'Spotlight',
+  'SprayCan',
+  'Sprout',
+  'Square',
+  'SquareActivity',
+  'SquareArrowDown',
+  'SquareArrowDownLeft',
+  'SquareArrowDownRight',
+  'SquareArrowLeft',
+  'SquareArrowOutDownLeft',
+  'SquareArrowOutDownRight',
+  'SquareArrowOutUpLeft',
+  'SquareArrowOutUpRight',
+  'SquareArrowRight',
+  'SquareArrowRightEnter',
+  'SquareArrowRightExit',
+  'SquareArrowUp',
+  'SquareArrowUpLeft',
+  'SquareArrowUpRight',
+  'SquareAsterisk',
+  'SquareBottomDashedScissors',
+  'SquareCenterlineDashedHorizontal',
+  'SquareCenterlineDashedVertical',
+  'SquareChartGantt',
+  'SquareCheck',
+  'SquareCheckBig',
+  'SquareChevronDown',
+  'SquareChevronLeft',
+  'SquareChevronRight',
+  'SquareChevronUp',
+  'SquareCode',
+  'SquareDashed',
+  'SquareDashedBottom',
+  'SquareDashedBottomCode',
+  'SquareDashedKanban',
+  'SquareDashedMousePointer',
+  'SquareDashedTopSolid',
+  'SquareDivide',
+  'SquareDot',
+  'SquareEqual',
+  'SquareFunction',
+  'SquareGanttChart',
+  'SquareKanban',
+  'SquareLibrary',
+  'SquareM',
+  'SquareMenu',
+  'SquareMinus',
+  'SquareMousePointer',
+  'SquareParking',
+  'SquareParkingOff',
+  'SquarePause',
+  'SquarePen',
+  'SquarePercent',
+  'SquarePi',
+  'SquarePilcrow',
+  'SquarePlay',
+  'SquarePlus',
+  'SquarePower',
+  'SquareRadical',
+  'SquareRoundCorner',
+  'SquareScissors',
+  'SquareSigma',
+  'SquareSlash',
+  'SquareSplitHorizontal',
+  'SquareSplitVertical',
+  'SquareSquare',
+  'SquareStack',
+  'SquareStar',
+  'SquareStop',
+  'SquareTerminal',
+  'SquareUser',
+  'SquareUserRound',
+  'SquareX',
+  'SquaresExclude',
+  'SquaresIntersect',
+  'SquaresSubtract',
+  'SquaresUnite',
+  'Squircle',
+  'SquircleDashed',
+  'Squirrel',
+  'Stamp',
+  'Star',
+  'StarHalf',
+  'StarOff',
+  'Stars',
+  'StepBack',
+  'StepForward',
+  'Stethoscope',
+  'Sticker',
+  'StickyNote',
+  'Stone',
+  'StopCircle',
+  'Store',
+  'StretchHorizontal',
+  'StretchVertical',
+  'Strikethrough',
+  'Subscript',
+  'Subtitles',
+  'Sun',
+  'SunDim',
+  'SunMedium',
+  'SunMoon',
+  'SunSnow',
+  'Sunrise',
+  'Sunset',
+  'Superscript',
+  'SwatchBook',
+  'SwissFranc',
+  'SwitchCamera',
+  'Sword',
+  'Swords',
+  'Syringe',
+  'Table',
+  'Table2',
+  'TableCellsMerge',
+  'TableCellsSplit',
+  'TableColumnsSplit',
+  'TableConfig',
+  'TableOfContents',
+  'TableProperties',
+  'TableRowsSplit',
+  'Tablet',
+  'TabletSmartphone',
+  'Tablets',
+  'Tag',
+  'Tags',
+  'Tally1',
+  'Tally2',
+  'Tally3',
+  'Tally4',
+  'Tally5',
+  'Tangent',
+  'Target',
+  'Telescope',
+  'Tent',
+  'TentTree',
+  'Terminal',
+  'TerminalSquare',
+  'TestTube',
+  'TestTube2',
+  'TestTubeDiagonal',
+  'TestTubes',
+  'Text',
+  'TextAlignCenter',
+  'TextAlignEnd',
+  'TextAlignJustify',
+  'TextAlignStart',
+  'TextCursor',
+  'TextCursorInput',
+  'TextInitial',
+  'TextQuote',
+  'TextSearch',
+  'TextSelect',
+  'TextSelection',
+  'TextWrap',
+  'Theater',
+  'Thermometer',
+  'ThermometerSnowflake',
+  'ThermometerSun',
+  'ThumbsDown',
+  'ThumbsUp',
+  'Ticket',
+  'TicketCheck',
+  'TicketMinus',
+  'TicketPercent',
+  'TicketPlus',
+  'TicketSlash',
+  'TicketX',
+  'Tickets',
+  'TicketsPlane',
+  'Timer',
+  'TimerOff',
+  'TimerReset',
+  'ToggleLeft',
+  'ToggleRight',
+  'Toilet',
+  'ToolCase',
+  'Toolbox',
+  'Tornado',
+  'Torus',
+  'Touchpad',
+  'TouchpadOff',
+  'TowelRack',
+  'TowerControl',
+  'ToyBrick',
+  'Tractor',
+  'TrafficCone',
+  'Train',
+  'TrainFront',
+  'TrainFrontTunnel',
+  'TrainTrack',
+  'TramFront',
+  'Transgender',
+  'Trash',
+  'Trash2',
+  'TreeDeciduous',
+  'TreePalm',
+  'TreePine',
+  'Trees',
+  'Trello',
+  'TrendingDown',
+  'TrendingUp',
+  'TrendingUpDown',
+  'Triangle',
+  'TriangleAlert',
+  'TriangleDashed',
+  'TriangleRight',
+  'Trophy',
+  'Truck',
+  'TruckElectric',
+  'TurkishLira',
+  'Turntable',
+  'Turtle',
+  'Tv',
+  'Tv2',
+  'TvMinimal',
+  'TvMinimalPlay',
+  'Twitch',
+  'Twitter',
+  'Type',
+  'TypeOutline',
+  'Umbrella',
+  'UmbrellaOff',
+  'Underline',
+  'Undo',
+  'Undo2',
+  'UndoDot',
+  'UnfoldHorizontal',
+  'UnfoldVertical',
+  'Ungroup',
+  'University',
+  'Unlink',
+  'Unlink2',
+  'Unlock',
+  'UnlockKeyhole',
+  'Unplug',
+  'Upload',
+  'UploadCloud',
+  'Usb',
+  'User',
+  'User2',
+  'UserCheck',
+  'UserCheck2',
+  'UserCircle',
+  'UserCircle2',
+  'UserCog',
+  'UserCog2',
+  'UserKey',
+  'UserLock',
+  'UserMinus',
+  'UserMinus2',
+  'UserPen',
+  'UserPlus',
+  'UserPlus2',
+  'UserRound',
+  'UserRoundCheck',
+  'UserRoundCog',
+  'UserRoundKey',
+  'UserRoundMinus',
+  'UserRoundPen',
+  'UserRoundPlus',
+  'UserRoundSearch',
+  'UserRoundX',
+  'UserSearch',
+  'UserSquare',
+  'UserSquare2',
+  'UserStar',
+  'UserX',
+  'UserX2',
+  'Users',
+  'Users2',
+  'UsersRound',
+  'Utensils',
+  'UtensilsCrossed',
+  'UtilityPole',
+  'Van',
+  'Variable',
+  'Vault',
+  'VectorSquare',
+  'Vegan',
+  'VenetianMask',
+  'Venus',
+  'VenusAndMars',
+  'Verified',
+  'Vibrate',
+  'VibrateOff',
+  'Video',
+  'VideoOff',
+  'Videotape',
+  'View',
+  'Voicemail',
+  'Volleyball',
+  'Volume',
+  'Volume1',
+  'Volume2',
+  'VolumeOff',
+  'VolumeX',
+  'Vote',
+  'Wallet',
+  'Wallet2',
+  'WalletCards',
+  'WalletMinimal',
+  'Wallpaper',
+  'Wand',
+  'Wand2',
+  'WandSparkles',
+  'Warehouse',
+  'WashingMachine',
+  'Watch',
+  'Waves',
+  'WavesArrowDown',
+  'WavesArrowUp',
+  'WavesLadder',
+  'Waypoints',
+  'Webcam',
+  'Webhook',
+  'WebhookOff',
+  'Weight',
+  'WeightTilde',
+  'Wheat',
+  'WheatOff',
+  'WholeWord',
+  'Wifi',
+  'WifiCog',
+  'WifiHigh',
+  'WifiLow',
+  'WifiOff',
+  'WifiPen',
+  'WifiSync',
+  'WifiZero',
+  'Wind',
+  'WindArrowDown',
+  'Wine',
+  'WineOff',
+  'Workflow',
+  'Worm',
+  'WrapText',
+  'Wrench',
+  'X',
+  'XCircle',
+  'XLineTop',
+  'XOctagon',
+  'XSquare',
+  'Youtube',
+  'Zap',
+  'ZapOff',
+  'ZodiacAquarius',
+  'ZodiacAries',
+  'ZodiacCancer',
+  'ZodiacCapricorn',
+  'ZodiacGemini',
+  'ZodiacLeo',
+  'ZodiacLibra',
+  'ZodiacOphiuchus',
+  'ZodiacPisces',
+  'ZodiacSagittarius',
+  'ZodiacScorpio',
+  'ZodiacTaurus',
+  'ZodiacVirgo',
+  'ZoomIn',
+  'ZoomOut',
+];

shared/src/book/book-icons.ts

@@ -1,12 +1,33 @@
+import { BOOK_ICON_NAMES_A_E } from './book-icon-names-a-e.data';
+import { BOOK_ICON_NAMES_F_P } from './book-icon-names-f-p.data';
+import { BOOK_ICON_NAMES_Q_Z } from './book-icon-names-q-z.data';
+
 /**
- * The drawings the assistant may put on a page, by their lucide names.
+ * Every drawing the Studio's icon tab offers, by its lucide name: the
+ * library as the client ships it, its old names included, the way the tab
+ * lists them (client/src/components/Studio/iconLibrary.ts). The book engine
+ * takes a new icon by any of these names, so the assistant may place every
+ * drawing a person could pick by hand.
  *
- * The Studio's icon tab opens on this shelf (client/src/components/Studio/iconLibrary.ts
- * filters it against the lucide version it ships), and the book engine takes a
- * new icon only from it: an icon element stores a free name the renderer
- * resolves, and a model that names a drawing lucide does not have would place
- * the fallback glyph. A curated list keeps the assistant to drawings that exist
- * and that a travel page actually reaches for.
+ * A set of names rather than the enum the contract usually spells: the page
+ * edit's tool schema carries no `$ref`, and some two thousand names written
+ * into it three times over would take it far past its size ceiling. The names
+ * are checked against this set instead, which refuses exactly what an enum
+ * would. A client test holds the set to the lucide version the client runs,
+ * so an icon is never named here that would draw as the fallback glyph.
+ */
+export const BOOK_ICON_NAMES: ReadonlySet<string> = new Set([
+  ...BOOK_ICON_NAMES_A_E,
+  ...BOOK_ICON_NAMES_F_P,
+  ...BOOK_ICON_NAMES_Q_Z,
+]);
+
+/**
+ * The shelf the Studio's icon tab opens on, by lucide name: the drawings a
+ * travel page reaches for first, in the order somebody would look for them
+ * (iconLibrary.ts filters it against the lucide version it ships). The tool
+ * schema names a few of them as examples, so a model starts from a drawing
+ * that belongs on a travel page rather than from the alphabet.
  */
 export const BOOK_DESIGN_ICONS = [
   'Plane',

shared/src/book/book-layouts.parity.spec.ts

@@ -1,5 +1,6 @@
 import { BOOK_GRIDS, bookGridElements, defaultBookGridBox } from './book-grids';
 import { BOOK_COVER_TEMPLATES, BOOK_TEMPLATES, applyBookTemplate, type BookTemplate } from './book-layouts';
+import { normalizeBookDocument } from './book-normalize';
 import {
   applySavedBookLayout,
   bookLayoutFromSpread,
@@ -7,7 +8,7 @@ import {
   bookLayoutRole,
   nextBookLayoutName,
 } from './book-saved-layouts';
-import { normalizeBookDocument, type BookDocument } from './book.schema';
+import type { BookDocument } from './book.schema';
 
 import { createHash } from 'node:crypto';
 import { readFileSync } from 'node:fs';

shared/src/book/book-normalize.ts

@@ -0,0 +1,68 @@
+import {
+  MAX_BOOK_LAYOUTS,
+  MAX_SPREAD_ELEMENTS,
+  bookDocumentSchema,
+  bookElementSchema,
+  bookLayoutSchema,
+  type BookDocument,
+} from './book.schema';
+
+/**
+ * Read a stored document without ever throwing.
+ *
+ * Same shape as `normalizeAppearance`: a book that cannot be parsed must still
+ * open — an editor that refuses to load someone's work because one field drifted
+ * is worse than one that drops the field.
+ *
+ * ── Why there are two attempts ───────────────────────────────────────────
+ *
+ * Dropping *the field* was the intent; dropping the whole book was what the
+ * code did. `elements` is an array of a discriminated union, so one element the
+ * contract cannot read fails its spread, fails the array, fails the document —
+ * and this function then handed back an empty book. It is not hypothetical: a
+ * mood mark carried the journal's key in a field capped at two characters, so
+ * every book with one on a page refused to save, and would have opened blank.
+ * Both the client's load seam and the server's read *and* write path run
+ * through here, which means the empty book was also what got written down.
+ *
+ * So a document that fails whole is tried again with the unreadable elements
+ * removed, and only a document that fails even then is given up on. Losing one
+ * decoration to a version skew is a shrug; losing the book is not.
+ */
+export function normalizeBookDocument(raw: unknown): BookDocument {
+  const parsed = bookDocumentSchema.safeParse(raw);
+  if (parsed.success) return parsed.data;
+
+  const salvaged = bookDocumentSchema.safeParse(withoutUnreadableElements(raw));
+  if (salvaged.success) return salvaged.data;
+
+  return bookDocumentSchema.parse({});
+}
+
+function withoutUnreadableElements(raw: unknown): unknown {
+  if (!raw || typeof raw !== 'object') return raw;
+  const doc = raw as { spreads?: unknown };
+  if (!Array.isArray(doc.spreads)) return raw;
+
+  const readable = (list: unknown) =>
+    Array.isArray(list)
+      ? // Trimmed to the cap as well as filtered: a spread that grew past 60
+        // fails the array the same way an unreadable element fails the union, and
+        // losing the sixty-first decoration beats losing the book.
+        list.filter((el) => bookElementSchema.safeParse(el).success).slice(0, MAX_SPREAD_ELEMENTS)
+      : list;
+
+  const layouts = (doc as { layouts?: unknown }).layouts;
+  return {
+    ...doc,
+    // A saved layout is a convenience: one that no longer reads is dropped, not the book.
+    ...(Array.isArray(layouts)
+      ? { layouts: layouts.filter((l) => bookLayoutSchema.safeParse(l).success).slice(0, MAX_BOOK_LAYOUTS) }
+      : {}),
+    spreads: doc.spreads.map((sp) => {
+      if (!sp || typeof sp !== 'object') return sp;
+      const spread = sp as { elements?: unknown; parked?: unknown };
+      return { ...spread, elements: readable(spread.elements), parked: readable(spread.parked) };
+    }),
+  };
+}

shared/src/book/book-op-enums.spec.ts

@@ -0,0 +1,62 @@
+import { BOOK_DESIGN_ICONS, BOOK_ICON_NAMES } from './book-icons';
+import * as described from './book-op-enums';
+import { bookPageOpSchema } from './book-ops.schema';
+import { BOOK_FONTS_IDS, BOOK_SHAPES, bookPhotoElementSchema } from './book.schema';
+import { bookDesignDirectivesSchema } from './design/design-directives.schema';
+
+import { describe, expect, it } from 'vitest';
+import { z } from 'zod';
+
+// BKENUM-001 to BKENUM-004
+
+/**
+ * The enums the book tools show a model: each says what its values mean, the
+ * values stay the document's own, and an icon is any drawing of the Studio's
+ * icon tab, refused by name exactly as an enum would refuse it.
+ */
+
+const schemas = Object.entries(described as Record<string, unknown>).filter(
+  (entry): entry is [string, z.ZodType] => entry[1] instanceof z.ZodType,
+);
+
+describe('the described enums', () => {
+  it('BKENUM-001: say what their values mean in one line each, without dashes', () => {
+    expect(schemas.length).toBeGreaterThan(20);
+    for (const [name, schema] of schemas) {
+      const text = schema.description ?? '';
+      expect(text.length, name).toBeGreaterThan(10);
+      expect(text, name).not.toMatch(/[\u2013\u2014\n]/);
+    }
+    expect(described.BOOK_BINDING_HINT).not.toMatch(/[\u2013\u2014\n]/);
+  });
+
+  it('BKENUM-002: keep the values of the document they describe', () => {
+    expect(described.bookFontIdSchema.options).toEqual([...BOOK_FONTS_IDS]);
+    expect(described.bookShapeIdSchema.options).toEqual([...BOOK_SHAPES]);
+    const frameStyles = bookPhotoElementSchema.shape.frameStyle.unwrap().options;
+    expect(described.bookFrameStyleSchema.options).toEqual(frameStyles);
+    for (const font of BOOK_FONTS_IDS) expect(String(described.bookFontIdSchema.description)).toContain(font);
+  });
+
+  it('BKENUM-003: carry their meaning into the page edit and the design directives a model reads', () => {
+    const page = JSON.stringify(z.toJSONSchema(bookPageOpSchema, { io: 'input' }));
+    for (const line of [described.bookFontIdSchema, described.bookShapeIdSchema, described.bookFrameStyleSchema]) {
+      expect(page).toContain(String(line.description));
+    }
+    const design = JSON.stringify(z.toJSONSchema(bookDesignDirectivesSchema, { io: 'input' }));
+    expect(design).toContain('Photos per spread: airy 1 to 2');
+    expect(design).toContain(String(described.bookFontIdSchema.description));
+  });
+});
+
+describe('the icon names', () => {
+  it('BKENUM-004: take every drawing of the icon tab, the travel shelf and old names among them, and nothing else', () => {
+    expect(BOOK_ICON_NAMES.size).toBeGreaterThan(1500);
+    for (const name of [...BOOK_DESIGN_ICONS, 'Pizza', 'AlertTriangle', 'ZoomOut']) {
+      expect(described.bookIconNameSchema.safeParse(name).success, name).toBe(true);
+    }
+    for (const name of ['NotAnIcon', 'PizzaIcon', 'LucidePizza', 'Icon', 'pizza', '']) {
+      expect(described.bookIconNameSchema.safeParse(name).success, name).toBe(false);
+    }
+  });
+});

shared/src/book/book-op-enums.ts

@@ -0,0 +1,141 @@
+import { BOOK_ICON_NAMES } from './book-icons';
+import {
+  BOOK_BADGES,
+  BOOK_FONTS_IDS,
+  BOOK_METRICS,
+  BOOK_SHAPES,
+  bookBadgeElementSchema,
+  bookCountriesElementSchema,
+  bookListElementSchema,
+  bookMapElementSchema,
+  bookPageSetupSchema,
+  bookPhotoElementSchema,
+  bookShapeElementSchema,
+  bookStatsElementSchema,
+  bookTextElementSchema,
+} from './book.schema';
+
+import { z } from 'zod';
+
+/**
+ * The enums a model reads in the book tools, each with one line on what its
+ * values mean.
+ *
+ * A JSON schema that lists bare ids leaves the model to guess what `bebas`
+ * sets or what a `seal` draws, and a guess at a typeface is a page set in the
+ * wrong one. The values stay those of the document's own schema; only the
+ * description is added, which changes nothing a parse accepts.
+ *
+ * Short on purpose. The tool schemas carry no `$ref`, so a description is
+ * repeated wherever its field appears, and the page edit's schema is held
+ * under a size ceiling (MCP-SCHEMA-004 on the server). Where a field repeats
+ * on every travel element, a shorter line points back at the full one.
+ */
+
+const photo = bookPhotoElementSchema.shape;
+const text = bookTextElementSchema.shape;
+const shape = bookShapeElementSchema.shape;
+const map = bookMapElementSchema.shape;
+
+/** The book's typefaces, with the face each id sets. */
+export const bookFontIdSchema = z
+  .enum(BOOK_FONTS_IDS)
+  .describe(
+    'Typeface: sans Poppins, inter Inter, serif Lora, garamond EB Garamond, playfair Playfair Display, display MuseoModerno, bebas Bebas Neue (caps, one weight).',
+  );
+/** The typeface of a travel element, where the full line above would repeat ten times. */
+export const bookTypesetFontSchema = z.enum(BOOK_FONTS_IDS).describe('Typeface id, as for text.');
+
+/** Every shape the Studio draws, and so every mask a photo can be cut to. */
+export const bookShapeIdSchema = z
+  .enum(BOOK_SHAPES)
+  .describe(
+    'A filled outline: rect, ellipse, line (a rule), polygons, arch and circle parts, stars, burst, seal, sparkle, arrows, chevrons, speech bubbles, nature and travel motifs, blobs and banners.',
+  );
+
+export const bookPhotoFitSchema = photo.fit
+  .unwrap()
+  .describe('cover fills the frame, cropped at the focal point; contain shows all of it.');
+export const bookPhotoMaskSchema = photo.mask
+  .unwrap()
+  .describe('A shape id to cut the photo to; null is the plain rectangle.');
+export const bookFrameStyleSchema = photo.frameStyle
+  .unwrap()
+  .describe('polaroid (deep bottom border), white border, shadow, film or tape around it; none is a plain print.');
+export const bookPhotoFilterSchema = photo.filter
+  .unwrap()
+  .describe('bw (black and white), warm, cool, fade (lifted blacks) or contrast; none as shot.');
+
+export const bookTextAlignSchema = text.align.unwrap().describe('How the lines sit in the frame.');
+
+export const bookShapeGradientSchema = shape.gradient
+  .unwrap()
+  .describe('Fade the fill out: up is solid at the top, down solid at the bottom; none is one flat fill.');
+export const bookStrokeStyleSchema = shape.strokeStyle.unwrap().describe('A solid, dashed or dotted outline or rule.');
+
+export const bookMapStyleSchema = map.style
+  .unwrap()
+  .describe('The map look: minimal, outline, dark (for a dark page) or paper.');
+export const bookRouteStyleSchema = map.routeStyle
+  .unwrap()
+  .describe('plain is one stroke; drawn is a light line over a dark casing, as in an atlas.');
+export const bookRouteArcSchema = map.routeArc
+  .unwrap()
+  .describe('bow draws the long legs as a curve, the way a flight is shown.');
+export const bookRouteDashSchema = map.routeDash.unwrap().describe('arcs dashes the bowed legs; solid dashes nothing.');
+export const bookPinStyleSchema = map.pinStyle.unwrap().describe('A stop as a dot, or as a small round photo of it.');
+export const bookMapClipSchema = map.clip
+  .unwrap()
+  .describe('rect is a map in a box; country cuts it to the outline of its countries.');
+/** Where a new map's ground comes from. */
+export const bookMapSourceSchema = z
+  .enum(['vector', 'relief', 'satellite'])
+  .describe('vector outlines print sharp at any size; relief and satellite are imagery from the map provider.');
+
+export const bookStatsLayoutSchema = bookStatsElementSchema.shape.layout
+  .unwrap()
+  .describe('The figures in a grid, one row or one column.');
+export const bookCountriesLayoutSchema = bookCountriesElementSchema.shape.layout
+  .unwrap()
+  .describe('The countries as a list, a grid or one column.');
+export const bookBadgeStyleSchema = bookBadgeElementSchema.shape.style
+  .unwrap()
+  .describe('plain words, a chip (filled capsule), an outline, or stacked over its line.');
+export const bookBadgeVariantSchema = z
+  .enum(BOOK_BADGES)
+  .describe(
+    'What the mark shows: a flag, a date, a day counter, coordinates, a country, a distance, weather, altitude or mood.',
+  );
+export const bookListLayoutSchema = bookListElementSchema.shape.layout
+  .unwrap()
+  .describe('columns sets pros beside cons; stacked sets one column with the marks inline.');
+export const bookMetricSchema = z
+  .enum(BOOK_METRICS)
+  .describe(
+    'A travel figure: distance, days, steps (journal entries), photos, countries, places or furthest from the start.',
+  );
+
+/** The page sizes a book is set up in. */
+export const bookPagePresetSchema = bookPageSetupSchema.shape.preset
+  .unwrap()
+  .describe(
+    'The page: square-210 or square-300 (mm), a4-landscape, a4-portrait, a5-landscape; custom keeps its own size.',
+  );
+
+/**
+ * Any drawing the Studio's icon tab offers, by its lucide name. Checked
+ * against the set rather than listed, for the size of the schema; refused
+ * exactly as an enum would refuse a name it does not hold.
+ */
+export const bookIconNameSchema = z
+  .string()
+  .regex(/^[A-Z][A-Za-z0-9]*$/, 'expected a lucide icon name')
+  .max(60)
+  .refine((name) => BOOK_ICON_NAMES.has(name), { message: 'not a lucide icon the Studio offers' })
+  .describe(
+    'A lucide icon name in PascalCase, any the Studio offers: Plane, Compass, MapPin, MountainSnow, Waves, Sun, Camera, Heart, Landmark, Croissant and the rest of lucide.',
+  );
+
+/** What a text's binding means: where its words come from, and what each source needs beside it. */
+export const BOOK_BINDING_HINT =
+  'Words read from the journey and kept in sync: journey.title or journey.subtitle; entry.title, entry.story, entry.location (format dms or decimal for coordinates) or entry.date with entryId; photo.caption with photoId.';

shared/src/book/book-op-ids.ts

@@ -14,4 +14,8 @@ export const bookElementIdSchema = z.string().regex(/^[\w-]{1,40}$/);
 const gridIds = BOOK_GRIDS.map((g) => g.id) as [string, ...string[]];
 
 /** The photo grids, by id. */
-export const bookGridIdSchema = z.enum(gridIds);
+export const bookGridIdSchema = z
+  .enum(gridIds)
+  .describe(
+    'A photo grid by id, named for its cells (two-across, grid-6, hero-three, cols-2-1, filmstrip); its frames come empty.',
+  );

shared/src/book/book-ops.schema.ts

@@ -1,6 +1,15 @@
 import { idSchema } from '../common/primitives.schema';
 import { BOOK_ELEMENT_OP_SCHEMAS, TEXT_STYLE_FIELDS, bindingNamesItsSource } from './book-element-ops.schema';
 import { BOOK_COVER_TEMPLATES, BOOK_TEMPLATES } from './book-layouts';
+import {
+  BOOK_BINDING_HINT,
+  bookFontIdSchema,
+  bookFrameStyleSchema,
+  bookPagePresetSchema,
+  bookPhotoFilterSchema,
+  bookPhotoFitSchema,
+  bookPhotoMaskSchema,
+} from './book-op-enums';
 import { bookElementIdSchema, bookGridIdSchema, bookSpreadIdSchema } from './book-op-ids';
 import {
   MAX_BOOK_TITLE,
@@ -9,7 +18,6 @@ import {
   bookLayoutSchema,
   bookPageNumbersSchema,
   bookPageSetupSchema,
-  bookPhotoElementSchema,
   bookSpreadSchema,
   bookTextElementSchema,
 } from './book.schema';
@@ -52,13 +60,18 @@ export const BOOK_OP_LIMITS = {
 const idsOf = (list: readonly { id: string }[]) => list.map((t) => t.id) as [string, ...string[]];
 
 /** The spread layouts, by id. */
-export const bookTemplateIdSchema = z.enum(idsOf(BOOK_TEMPLATES));
+export const bookTemplateIdSchema = z
+  .enum(idsOf(BOOK_TEMPLATES))
+  .describe('A built-in double page layout by id; list_book_layouts says what each one holds.');
 /** The single-page (cover and back) layouts, by id. */
-export const bookCoverTemplateIdSchema = z.enum(idsOf(BOOK_COVER_TEMPLATES));
+export const bookCoverTemplateIdSchema = z
+  .enum(idsOf(BOOK_COVER_TEMPLATES))
+  .describe('A built-in cover or back layout by id; list_book_layouts says what each one holds.');
 /** Either set: which one fits is the page's question, answered when the operation runs. */
-export const bookAnyTemplateIdSchema = z.enum([...idsOf(BOOK_TEMPLATES), ...idsOf(BOOK_COVER_TEMPLATES)]);
+export const bookAnyTemplateIdSchema = z
+  .enum([...idsOf(BOOK_TEMPLATES), ...idsOf(BOOK_COVER_TEMPLATES)])
+  .describe('A built-in layout by id: the cover-* ones fit a single page, the rest a double page.');
 
-const photo = bookPhotoElementSchema.shape;
 const text = bookTextElementSchema.shape;
 
 /** A position in millimetres, inside the bounds the document takes. */
@@ -107,7 +120,7 @@ export const bookPageOpSchema = z.discriminatedUnion('op', [
       }),
       z.literal('new'),
     ]),
-    fit: photo.fit.unwrap().optional(),
+    fit: bookPhotoFitSchema.optional(),
     focalX: unit01.optional(),
     focalY: unit01.optional(),
   }),
@@ -116,12 +129,12 @@ export const bookPageOpSchema = z.discriminatedUnion('op', [
     .strictObject({
       op: z.literal('photo_look'),
       elementId: bookElementIdSchema,
-      fit: photo.fit.unwrap().optional(),
+      fit: bookPhotoFitSchema.optional(),
       focalX: unit01.optional(),
       focalY: unit01.optional(),
-      mask: photo.mask.unwrap().optional(),
-      frameStyle: photo.frameStyle.unwrap().optional(),
-      filter: photo.filter.unwrap().optional(),
+      mask: bookPhotoMaskSchema.optional(),
+      frameStyle: bookFrameStyleSchema.optional(),
+      filter: bookPhotoFilterSchema.optional(),
       radius: z.number().finite().min(0).max(500).optional(),
     })
     .refine((v) => has(v, LOOK_KEYS), { message: 'name at least one of the look fields' }),
@@ -138,9 +151,12 @@ export const bookPageOpSchema = z.discriminatedUnion('op', [
     .strictObject({
       op: z.literal('text'),
       elementId: bookElementIdSchema.optional(),
-      role: z.enum(['heading', 'body', 'meta']).optional(),
+      role: z
+        .enum(['heading', 'body', 'meta'])
+        .describe('heading is the largest type on the page, body the longest of the rest, meta the next.')
+        .optional(),
       text: z.string().max(BOOK_OP_LIMITS.text).optional(),
-      binding: text.binding.unwrap().optional(),
+      binding: text.binding.unwrap().describe(`${BOOK_BINDING_HINT} Null unbinds.`).optional(),
       ...TEXT_STYLE_FIELDS,
     })
     .refine((v) => v.elementId !== undefined || v.role !== undefined, { message: 'name an elementId or a role' })
@@ -227,7 +243,7 @@ export const setBookCoverArgs = {
 };
 export const createBookArgs = {
   title: z.string().max(MAX_BOOK_TITLE).optional(),
-  preset: bookPageSetupSchema.shape.preset.unwrap().optional(),
+  preset: bookPagePresetSchema.optional(),
 };
 /**
  * A page as it was before a write, for the assistant's undo: `index` is where
@@ -276,14 +292,21 @@ export const restoreBookPageArgs = {
 export const bookDesignIdSchema = z.string().regex(/^[\w-]{1,40}$/);
 
 export const describeBookPageArgs = { spreadId: bookSpreadIdSchema, designId: bookDesignIdSchema.optional() };
-export const listBookLayoutsArgs = { role: z.enum(['inner', 'single']).optional() };
+export const listBookLayoutsArgs = {
+  role: z.enum(['inner', 'single']).describe('inner for double pages, single for the cover and back.').optional(),
+};
 export const suggestBookPhotosArgs = {
   entryId: idSchema.optional(),
   date: z
     .string()
     .regex(/^\d{4}-\d{2}-\d{2}$/)
     .optional(),
-  purpose: z.enum(['page', 'cover']).optional(),
+  purpose: z
+    .enum(['page', 'cover'])
+    .describe(
+      'cover prefers wide or square pictures with enough pixels for a whole cover (2400 px on the long edge); page is for an inner page.',
+    )
+    .optional(),
   limit: z.number().int().min(1).max(PHOTO_PICK.maxLimit).optional(),
 };
 
@@ -295,7 +318,7 @@ const pageNumbers = bookPageNumbersSchema.shape;
  * answer carries `previous_setup` to set it back.
  */
 export const setBookSetupArgs = {
-  preset: bookPageSetupSchema.shape.preset.unwrap().optional(),
+  preset: bookPagePresetSchema.optional(),
   pageWidth: z.number().finite().min(60).max(500).optional(),
   pageHeight: z.number().finite().min(60).max(500).optional(),
   bleed: z.number().finite().min(0).max(20).optional(),
@@ -304,12 +327,15 @@ export const setBookSetupArgs = {
     .strictObject({
       show: pageNumbers.show.unwrap().optional(),
       startAt: pageNumbers.startAt.unwrap().optional(),
-      position: pageNumbers.position.unwrap().optional(),
+      position: pageNumbers.position
+        .unwrap()
+        .describe('outer edge, inner edge by the fold, or centre of the foot.')
+        .optional(),
       margin: z.number().finite().min(0).max(60).optional(),
       size: pageNumbers.size.unwrap().optional(),
       autoColor: pageNumbers.autoColor.unwrap().optional(),
       color: pageNumbers.color.unwrap().optional(),
-      font: pageNumbers.font.unwrap().optional(),
+      font: bookFontIdSchema.optional(),
     })
     .optional(),
   /** The assistant's undo sets the setup back only while the book is still at the version the change left. */

shared/src/book/book-schema-rev.spec.ts

@@ -0,0 +1,112 @@
+import { normalizeBookDocument } from './book-normalize';
+import {
+  BOOK_SCHEMA_REV,
+  bookSchemaRev,
+  isBookNewerThanReader,
+  readBookDocument,
+  stampBookSchemaRev,
+} from './book-schema-rev';
+import { bookSaveRequestSchema } from './book-store.schema';
+import { bookDocumentSchema } from './book.schema';
+
+import { describe, expect, it } from 'vitest';
+
+// BKREV-001 to BKREV-007
+
+/**
+ * The reader guard: a document says which revision of the format wrote it, a
+ * reader older than that opens it without saving it, and a book saved today
+ * stores exactly what it stored before the field existed.
+ */
+
+const frame = { x: 12, y: 18, w: 60, h: 40 };
+
+const doc = (over: Record<string, unknown> = {}) => ({
+  version: 1,
+  title: 'Lisbon',
+  page: { preset: 'square-210', pageWidth: 210, pageHeight: 210, bleed: 3, safe: 5 },
+  spreads: [
+    {
+      id: 's1',
+      role: 'inner',
+      background: null,
+      entryId: null,
+      elements: [{ id: 't1', kind: 'text', frame, text: 'Alfama' }],
+      parked: [],
+    },
+  ],
+  ...over,
+});
+
+describe('the revision a document was written by', () => {
+  it('BKREV-001: reads 1 for every document from before the field, and for anything that is not a whole number', () => {
+    expect(BOOK_SCHEMA_REV).toBe(1);
+    expect(bookSchemaRev(doc())).toBe(1);
+    expect(bookSchemaRev(null)).toBe(1);
+    expect(bookSchemaRev('{"schemaRev":4}')).toBe(1);
+    for (const odd of [0, -2, 2.5, '3', Number.NaN, null]) expect(bookSchemaRev(doc({ schemaRev: odd }))).toBe(1);
+    expect(bookSchemaRev(doc({ schemaRev: 3 }))).toBe(3);
+  });
+
+  it('BKREV-002: keeps the revision through the contract, and lets a broken one fall back without losing the book', () => {
+    expect(bookDocumentSchema.parse(doc({ schemaRev: 2 })).schemaRev).toBe(2);
+    const odd = bookDocumentSchema.safeParse(doc({ schemaRev: 'two' }));
+    expect(odd.success).toBe(true);
+    expect(odd.success && odd.data.schemaRev).toBeUndefined();
+    expect(odd.success && odd.data.spreads[0]?.elements).toHaveLength(1);
+  });
+
+  it('BKREV-003: leaves a book saved today as it was, with no revision written into it', () => {
+    const today = normalizeBookDocument(doc());
+    expect('schemaRev' in today).toBe(false);
+    expect(stampBookSchemaRev(today)).toBe(today);
+    expect(JSON.stringify(stampBookSchemaRev(today))).toBe(JSON.stringify(today));
+  });
+});
+
+describe('a reader older than the document', () => {
+  it('BKREV-004: knows the document is newer than it, read from the raw value even when the rest will not parse', () => {
+    expect(isBookNewerThanReader(doc({ schemaRev: 2 }))).toBe(true);
+    expect(isBookNewerThanReader(doc({ schemaRev: 1 }))).toBe(false);
+    expect(isBookNewerThanReader(doc())).toBe(false);
+    // A reader of a later revision reads the same document as its own.
+    expect(isBookNewerThanReader(doc({ schemaRev: 2 }), 2)).toBe(false);
+    const unreadable = doc({ schemaRev: 5, page: 'not a page' });
+    expect(isBookNewerThanReader(unreadable)).toBe(true);
+  });
+
+  it('BKREV-005: reads a newer book as far as it can and says so, so nothing it dropped is saved', () => {
+    const sticker = { id: 'x1', kind: 'sticker', frame, stickerId: 'lemon' };
+    const raw = doc({ schemaRev: 2 });
+    const spread = (raw.spreads as { elements: unknown[] }[])[0];
+    if (spread) spread.elements.push(sticker);
+    const read = readBookDocument(raw);
+    expect(read.newer).toBe(true);
+    expect(read.document.schemaRev).toBe(2);
+    expect(read.document.spreads[0]?.elements.map((e) => e.id)).toEqual(['t1']);
+    expect(readBookDocument(doc()).newer).toBe(false);
+  });
+
+  it('BKREV-006: a writer stamps its own revision once that is above 1, and never lowers one', () => {
+    const today = normalizeBookDocument(doc());
+    expect(stampBookSchemaRev(today, 2).schemaRev).toBe(2);
+    const later = normalizeBookDocument(doc({ schemaRev: 3 }));
+    expect(stampBookSchemaRev(later, 2)).toBe(later);
+    expect(stampBookSchemaRev(later, 2).schemaRev).toBe(3);
+  });
+});
+
+describe('a save request carrying a newer book', () => {
+  it('BKREV-007: reaches the server as its revision alone, so the save is refused there rather than at the pipe', () => {
+    const sticker = { id: 'x1', kind: 'sticker', frame, stickerId: 'lemon' };
+    const raw = doc({ schemaRev: 2 });
+    const spread = (raw.spreads as { elements: unknown[] }[])[0];
+    if (spread) spread.elements.push(sticker);
+    expect(bookSaveRequestSchema.parse({ title: 'T', document: raw }).document).toEqual({ schemaRev: 2 });
+    // A book of today still reads whole, revision or none.
+    const today = bookSaveRequestSchema.parse({ title: 'T', document: doc() }).document;
+    expect(today).toEqual(bookDocumentSchema.parse(doc()));
+    expect(bookSaveRequestSchema.parse({ document: doc({ schemaRev: 1 }) }).document).toMatchObject({ schemaRev: 1 });
+    expect(bookSaveRequestSchema.safeParse({ document: { schemaRev: 1, spreads: 'no' } }).success).toBe(false);
+  });
+});

shared/src/book/book-schema-rev.ts

@@ -0,0 +1,76 @@
+import { normalizeBookDocument } from './book-normalize';
+import type { BookDocument } from './book.schema';
+
+/**
+ * Which revision of the book format a document was written by, and what a
+ * reader does with one that is newer than it knows.
+ *
+ * ── Why a revision beside `version` ──────────────────────────────────────
+ *
+ * `version` is the format itself and stays 1: every document ever saved
+ * reads under it, and nothing here asks for a migration. What grows is the
+ * vocabulary inside it, a new element kind, a new font, a new field the
+ * renderer draws, and an older reader cannot tell any of those from noise.
+ * `normalizeBookDocument` drops an element it cannot read and the contract
+ * strips a field it does not know, both on purpose, so a damaged book still
+ * opens. Saving what is left is the part that must not happen: an old tab, an
+ * offline copy or a replayed request would write the loss down for everyone.
+ *
+ * So the document says which revision wrote it. A reader that meets a newer
+ * one opens it read-only and asks for a reload, and the server refuses a save
+ * from a writer older than the book it would replace.
+ *
+ * ── When to bump ─────────────────────────────────────────────────────────
+ *
+ * `BOOK_SCHEMA_REV` goes up by one in the change that adds an element kind,
+ * an enum value or a drawn field to book.schema.ts, never for a change an
+ * older reader survives whole. A writer stamps its own revision on what it
+ * saves only once that is above 1, so a book saved today stores exactly what
+ * it stored before this existed.
+ */
+export const BOOK_SCHEMA_REV = 1;
+
+/** The `code` a refused save carries in its body when the stored book is newer than the writer. */
+export const BOOK_SCHEMA_NEWER_CODE = 'book_schema_newer';
+
+/**
+ * The revision a document says it was written by, read from the raw value
+ * rather than the parsed one: a document so new that it fails to parse whole
+ * still says how new it is. Anything that is not a whole number from 1 up,
+ * and every document from before the field, reads as 1.
+ */
+export function bookSchemaRev(raw: unknown): number {
+  if (!raw || typeof raw !== 'object') return 1;
+  const rev = (raw as { schemaRev?: unknown }).schemaRev;
+  return typeof rev === 'number' && Number.isInteger(rev) && rev >= 1 ? rev : 1;
+}
+
+/** Whether a document was written by a newer revision than `readerRev` (this build's by default). */
+export function isBookNewerThanReader(raw: unknown, readerRev: number = BOOK_SCHEMA_REV): boolean {
+  return bookSchemaRev(raw) > readerRev;
+}
+
+/**
+ * The document as a writer of `writerRev` saves it: stamped with that
+ * revision, unless it already says as much or more. A document at revision 1
+ * is handed back as it is, so nothing changes on disk until the first bump.
+ */
+export function stampBookSchemaRev<T extends BookDocument>(doc: T, writerRev: number = BOOK_SCHEMA_REV): T {
+  return bookSchemaRev(doc) >= writerRev ? doc : { ...doc, schemaRev: writerRev };
+}
+
+/** A stored document as a reader holds it: normalised, and whether it was written by a newer revision. */
+export interface BookRead {
+  document: BookDocument;
+  /** True when the document is newer than the reader: show it, never save it. */
+  newer: boolean;
+}
+
+/**
+ * Read a stored document the way normalizeBookDocument does, and say whether
+ * it is newer than this reader. The normalised copy of a newer book has lost
+ * what this build cannot read, which is why `newer` has to travel with it.
+ */
+export function readBookDocument(raw: unknown, readerRev: number = BOOK_SCHEMA_REV): BookRead {
+  return { document: normalizeBookDocument(raw), newer: isBookNewerThanReader(raw, readerRev) };
+}

shared/src/book/book-store.schema.ts

@@ -1,3 +1,4 @@
+import { BOOK_SCHEMA_REV } from './book-schema-rev';
 import { bookDocumentSchema } from './book.schema';
 
 import { z } from 'zod';
@@ -42,9 +43,23 @@ export const bookRecordSchema = bookSummarySchema.extend({
 });
 export type BookRecord = z.infer<typeof bookRecordSchema>;
 
+/**
+ * A document a newer TREK wrote, as far as a save request carries it: only the
+ * revision. Its new element kinds or values would fail `bookDocumentSchema` at
+ * the pipe and end in a 400, so it is taken first and handed to the service
+ * this bare, where the save is refused with 409 `book_schema_newer` before
+ * anything is written. Nothing of the rest is needed for that refusal.
+ */
+const newerBookDocumentSchema = z.object({
+  schemaRev: z
+    .number()
+    .int()
+    .min(BOOK_SCHEMA_REV + 1),
+});
+
 export const bookSaveRequestSchema = z.object({
   title: z.string().max(200).default(''),
-  document: bookDocumentSchema,
+  document: z.union([newerBookDocumentSchema, bookDocumentSchema]),
   /**
    * The version this edit was made against.
    *

shared/src/book/book.schema.spec.ts

@@ -1,3 +1,4 @@
+import { normalizeBookDocument } from './book-normalize';
 import {
   MAX_BOOK_LAYOUTS,
   MAX_SPREAD_ELEMENTS,
@@ -7,7 +8,6 @@ import {
   bookSpreadSchema,
   bookStatsElementSchema,
   bookTextElementSchema,
-  normalizeBookDocument,
 } from './book.schema';
 
 import { describe, expect, it } from 'vitest';

shared/src/book/book.schema.ts

@@ -936,6 +936,8 @@ export type BookLayout = z.infer<typeof bookLayoutSchema>;
 export const bookDocumentSchema = z.object({
   /** In the document, not in a column: a format bump must not need a migration. */
   version: z.literal(1).catch(1).default(1),
+  /** The format revision that wrote it (book-schema-rev.ts); absent, or unreadable and so dropped, reads as 1. */
+  schemaRev: z.number().int().min(1).optional().catch(undefined),
   title: z.string().max(MAX_BOOK_TITLE).default(''),
   page: bookPageSetupSchema.default(() => bookPageSetupSchema.parse({})),
   spreads: z.array(bookSpreadSchema).max(MAX_SPREADS).default([]),
@@ -943,63 +945,3 @@ export const bookDocumentSchema = z.object({
   layouts: z.array(bookLayoutSchema).max(MAX_BOOK_LAYOUTS).optional(),
 });
 export type BookDocument = z.infer<typeof bookDocumentSchema>;
-
-/**
- * Read a stored document without ever throwing.
- *
- * Same shape as `normalizeAppearance`: a book that cannot be parsed must still
- * open — an editor that refuses to load someone's work because one field drifted
- * is worse than one that drops the field.
- *
- * ── Why there are two attempts ───────────────────────────────────────────
- *
- * Dropping *the field* was the intent; dropping the whole book was what the
- * code did. `elements` is an array of a discriminated union, so one element the
- * contract cannot read fails its spread, fails the array, fails the document —
- * and this function then handed back an empty book. It is not hypothetical: a
- * mood mark carried the journal's key in a field capped at two characters, so
- * every book with one on a page refused to save, and would have opened blank.
- * Both the client's load seam and the server's read *and* write path run
- * through here, which means the empty book was also what got written down.
- *
- * So a document that fails whole is tried again with the unreadable elements
- * removed, and only a document that fails even then is given up on. Losing one
- * decoration to a version skew is a shrug; losing the book is not.
- */
-export function normalizeBookDocument(raw: unknown): BookDocument {
-  const parsed = bookDocumentSchema.safeParse(raw);
-  if (parsed.success) return parsed.data;
-
-  const salvaged = bookDocumentSchema.safeParse(withoutUnreadableElements(raw));
-  if (salvaged.success) return salvaged.data;
-
-  return bookDocumentSchema.parse({});
-}
-
-function withoutUnreadableElements(raw: unknown): unknown {
-  if (!raw || typeof raw !== 'object') return raw;
-  const doc = raw as { spreads?: unknown };
-  if (!Array.isArray(doc.spreads)) return raw;
-
-  const readable = (list: unknown) =>
-    Array.isArray(list)
-      ? // Trimmed to the cap as well as filtered: a spread that grew past 60
-        // fails the array the same way an unreadable element fails the union, and
-        // losing the sixty-first decoration beats losing the book.
-        list.filter((el) => bookElementSchema.safeParse(el).success).slice(0, MAX_SPREAD_ELEMENTS)
-      : list;
-
-  const layouts = (doc as { layouts?: unknown }).layouts;
-  return {
-    ...doc,
-    // A saved layout is a convenience: one that no longer reads is dropped, not the book.
-    ...(Array.isArray(layouts)
-      ? { layouts: layouts.filter((l) => bookLayoutSchema.safeParse(l).success).slice(0, MAX_BOOK_LAYOUTS) }
-      : {}),
-    spreads: doc.spreads.map((sp) => {
-      if (!sp || typeof sp !== 'object') return sp;
-      const spread = sp as { elements?: unknown; parked?: unknown };
-      return { ...spread, elements: readable(spread.elements), parked: readable(spread.parked) };
-    }),
-  };
-}

shared/src/book/describe-spread.spec.ts

@@ -188,6 +188,82 @@ describe('findings', () => {
     expect(codes(list)).not.toContain('severe:overlap');
   });
 
+  it('BOOKDESC-025: takes photos laid over each other at an angle, or in a frame, as layered on purpose', () => {
+    const under = photo('p-a', 1, { x: 230, y: 20, w: 80, h: 60 });
+    const over = { x: 260, y: 40, w: 80, h: 60 };
+    for (const look of [{ rotation: 4 }, { rotation: -3 }, { rotation: 357 }, { frameStyle: 'polaroid' as const }]) {
+      const list = findings([under, photo('p-b', 1, over, look)]);
+      expect(
+        list.find((f) => f.code === 'overlap'),
+        JSON.stringify(look),
+      ).toMatchObject({
+        severity: 'info',
+        elementIds: ['p-a', 'p-b'],
+      });
+    }
+    // A frame on the lower picture does not make the upper one look laid down.
+    const framedUnder = photo('p-a', 1, { x: 230, y: 20, w: 80, h: 60 }, { frameStyle: 'white' });
+    expect(codes(findings([framedUnder, photo('p-b', 1, over)]))).toContain('severe:overlap');
+    // Framed as the journal style frames every photo, but four fifths covered: an accident all the same.
+    const stacked = photo('p-b', 1, { x: 238, y: 26, w: 80, h: 60 }, { frameStyle: 'white', rotation: 4 });
+    expect(codes(findings([photo('p-a', 1, { x: 230, y: 20, w: 80, h: 60 }), stacked]))).toContain('severe:overlap');
+  });
+
+  it('BOOKDESC-026: keeps an accident severe: two straight photos of a size, under 3 degrees off, a full turn included', () => {
+    const under = photo('p-a', 1, { x: 230, y: 20, w: 80, h: 60 }, { rotation: 1.5 });
+    // 2 degrees is the scrapbook style's own tilt, so it does not make a pair layered on its own.
+    for (const rotation of [0, -1, 2, -2.5, 359, 720]) {
+      const list = findings([under, photo('p-b', 1, { x: 260, y: 40, w: 80, h: 60 }, { rotation })]);
+      expect(codes(list), String(rotation)).toContain('severe:overlap');
+    }
+  });
+
+  it('BOOKDESC-027: sets a small line over display type as context, over running text or a text of a size as a fault', () => {
+    const title = text('t-big', 'Lisbon', { x: 230, y: 40, w: 160, h: 60 }, { size: 60 });
+    const accent = text('t-over', 'travel', { x: 240, y: 70, w: 40, h: 12 });
+    expect(findings([title, accent]).find((f) => f.code === 'overlap')).toMatchObject({
+      severity: 'info',
+      elementIds: ['t-over', 't-big'],
+    });
+    // The same small line on a story block prints words over words.
+    const story = text('t-story', 'A long day on the ice, and the harbour after it. '.repeat(3).trim(), {
+      x: 230,
+      y: 40,
+      w: 160,
+      h: 60,
+    });
+    expect(findings([story, accent]).find((f) => f.code === 'overlap')).toMatchObject({ severity: 'severe' });
+    const twin = text('t-twin', 'Porto', { x: 240, y: 60, w: 160, h: 60 });
+    expect(codes(findings([title, twin]))).toContain('severe:overlap');
+    const tilted = text('t-tilt', 'Porto', { x: 310, y: 90, w: 80, h: 30 }, { rotation: -6 });
+    expect(codes(findings([title, tilted]))).toContain('info:overlap');
+  });
+
+  it('BOOKDESC-028: never compares a title over a photo, or a photo over a shape', () => {
+    const shape = bookShapeElementSchema.parse({
+      id: 's-block',
+      kind: 'shape',
+      frame: { x: 220, y: 10, w: 120, h: 90 },
+    });
+    const list = findings([
+      shape as BookElement,
+      photo('p-a', 1, { x: 230, y: 20, w: 80, h: 60 }),
+      text('t-a', 'Over it', { x: 235, y: 30, w: 70, h: 20 }),
+    ]);
+    expect(list.filter((f) => f.code === 'overlap')).toEqual([]);
+  });
+
+  it('BOOKDESC-029: reports an accident on a busy layered page, however many insets come before it', () => {
+    const hero = photo('p-hero', 1, { x: 230, y: 20, w: 180, h: 170 });
+    const insets = Array.from({ length: 8 }, (_, i) =>
+      photo(`p-in-${i}`, 1, { x: 235 + (i % 4) * 42, y: 30 + Math.floor(i / 4) * 40, w: 20, h: 15 }),
+    );
+    const pair = [photo('p-a', 1, { x: 20, y: 20, w: 80, h: 60 }), photo('p-b', 1, { x: 50, y: 40, w: 80, h: 60 })];
+    const overlaps = findings([hero, ...insets, ...pair]).filter((f) => f.code === 'overlap');
+    expect(overlaps).toHaveLength(6);
+    expect(overlaps.find((f) => f.severity === 'severe')?.elementIds).toEqual(['p-a', 'p-b']);
+  });
+
   it('BOOKDESC-013: puts severe first and stops at the cap', () => {
     // 45 texts past the trim, each too small for its words: 90 severe findings before the cap.
     const many = Array.from({ length: 45 }, (_, i) => text(`t-${i}`, 'Cut', { x: -10, y: 5 + i * 4, w: 40, h: 3 }));

shared/src/book/design/design-book.spec.ts

@@ -8,6 +8,7 @@ import {
   MAX_SPREADS,
   MAX_SPREAD_ELEMENTS,
   bookDocumentSchema,
+  bookPhotoElementSchema,
   bookTextElementSchema,
   type BookDocument,
   type BookElement,
@@ -761,6 +762,33 @@ describe('design_book', () => {
     const more = { ...cut, text: `${cut.text} A long day on the ice.` };
     expect(textHeightNeeded(more, DESIGN_TEXT_HEADROOM)).toBeGreaterThan(frame.h);
   });
+
+  it('BOOKDSN-031: pulls two photos apart that lie mostly on top of each other, framed as the journal style frames them', () => {
+    const page = input('rich').page;
+    const look = designLook(bookDesignDirectivesSchema.parse({ style: 'journal' }), page, []);
+    const framed = (id: string, x: number, y: number) =>
+      bookPhotoElementSchema.parse({
+        id,
+        kind: 'photo',
+        frame: { x, y, w: 80, h: 60 },
+        photoId: 1,
+        frameStyle: 'white',
+      });
+    const spread: BookSpread = {
+      id: 'sp-in',
+      role: 'inner',
+      background: '#ffffff',
+      elements: [framed('p-a', 230, 20), framed('p-b', 238, 26)],
+      parked: [],
+      entryId: null,
+    };
+    const photos = [{ photoId: 1, width: 4000, height: 3000 }];
+    expect(pageFindings(spread, page, photos).map((f) => `${f.severity}:${f.code}`)).toContain('severe:overlap');
+    let n = 0;
+    const fixed = repairSpread(spread, { page, photos, look, newId: (p) => `${p}-${++n}` });
+    expect(fixed.findings.filter((f) => f.code === 'overlap')).toEqual([]);
+    expect(fixed.spread.elements.find((e) => e.id === 'p-b')?.frame.y).toBe(82);
+  });
 });
 
 /** Photos of one shape, ids counted from `from`. */

shared/src/book/design/design-compose.ts

@@ -180,7 +180,10 @@ export function textEl(c: ComposeCtx, at: TextAt, words: string, role: TextRole,
   return { ...el, frame: frameOf(at.x, at.y, at.w, textHeightNeeded(el, DESIGN_TEXT_HEADROOM) + 1.2) };
 }
 
-/** A heading that fits `maxH`: set smaller, down to the sub size, until it does. */
+/**
+ * A heading that fits `maxH`: set at `opts.size` (the heading size when none
+ * is given), then smaller, down to the sub size, until it does.
+ */
 export function headingEl(
   c: ComposeCtx,
   at: TextAt,
@@ -188,7 +191,7 @@ export function headingEl(
   maxH: number,
   opts: TextOpts = {},
 ): BookTextElement {
-  let size = c.look.sizes.heading;
+  let size = opts.size ?? c.look.sizes.heading;
   let el = textEl(c, at, words, 'heading', { ...opts, size });
   while (el.frame.h > maxH && size > c.look.sizes.sub) {
     size = Math.max(c.look.sizes.sub, size - 2);

shared/src/book/design/design-directives.schema.ts

@@ -1,6 +1,7 @@
 import { idSchema } from '../../common/primitives.schema';
+import { bookFontIdSchema, bookMetricSchema, bookPagePresetSchema } from '../book-op-enums';
 import { bookCoverTemplateIdSchema } from '../book-ops.schema';
-import { BOOK_FONTS_IDS, BOOK_METRICS, MAX_BOOK_TITLE, bookPageSetupSchema } from '../book.schema';
+import { MAX_BOOK_TITLE } from '../book.schema';
 
 import { z } from 'zod';
 
@@ -21,17 +22,31 @@ export const BOOK_DESIGN_STYLES = ['classic', 'minimal', 'editorial', 'journal',
 export type BookDesignStyle = (typeof BOOK_DESIGN_STYLES)[number];
 
 export const bookDesignDirectivesSchema = z.strictObject({
-  style: z.enum(BOOK_DESIGN_STYLES).default('classic'),
+  style: z
+    .enum(BOOK_DESIGN_STYLES)
+    .describe(
+      'The look: classic (white, sans, one warm accent), minimal (white, Inter, grey), editorial (cream, Playfair over Garamond), journal (warm paper, framed photos), bold (black paper, Bebas caps, strong accent), scrapbook (cream paper, MuseoModerno headings, polaroids turned a little).',
+    )
+    .default('classic'),
   /** Photos per spread: airy 1 to 2, balanced 2 to 4, rich 4 to 6. */
-  density: z.enum(['airy', 'balanced', 'rich']).default('balanced'),
+  density: z
+    .enum(['airy', 'balanced', 'rich'])
+    .describe('Photos per spread: airy 1 to 2, balanced 2 to 4, rich 4 to 6.')
+    .default('balanced'),
   /** Inner spreads, the covers and the first and last page not counted. */
   pages: z.strictObject({ min: pageCount.optional(), max: pageCount.optional() }).optional(),
   scope: z.strictObject({ entryIds: ids200.optional(), from: isoDate.optional(), to: isoDate.optional() }).optional(),
-  chapters: z.enum(['entry', 'day', 'place']).default('entry'),
+  chapters: z
+    .enum(['entry', 'day', 'place'])
+    .describe('What a chapter is: one journal entry, one day or one place.')
+    .default('entry'),
   photos: z
     .strictObject({
       /** best: the photo-pick groups' best, near duplicates and blurry ones left out; all: every photo. */
-      pick: z.enum(['best', 'all']).default('best'),
+      pick: z
+        .enum(['best', 'all'])
+        .describe('best leaves out near duplicates and blurry shots; all takes every photo.')
+        .default('best'),
       perChapterMax: z.number().int().min(1).max(24).optional(),
       include: ids300.optional(),
       exclude: ids300.optional(),
@@ -47,17 +62,51 @@ export const bookDesignDirectivesSchema = z.strictObject({
     .optional(),
   type: z
     .strictObject({
-      heading: z.enum(BOOK_FONTS_IDS).optional(),
-      body: z.enum(BOOK_FONTS_IDS).optional(),
-      scale: z.number().min(0.8).max(1.3).optional(),
+      heading: bookFontIdSchema.optional(),
+      body: bookFontIdSchema.optional(),
+      /** Every type size at once, 1 the style's own: under 1 a quieter book, up to 2.5 a poster. */
+      scale: z
+        .number()
+        .min(0.8)
+        .max(2.5)
+        .describe('Every type size at once: 1 as the style sets it, 2.5 a poster.')
+        .optional(),
+      /**
+       * The cover title as a multiple of the heading size, on top of `scale`:
+       * 1, the default, sets it as every book so far was set; 6.5 takes the
+       * 28 pt heading to about 180 pt, a title that fills the cover, so the
+       * cover grows without the rest of the book. Words that would not fit
+       * the cover are set smaller.
+       */
+      display: z
+        .number()
+        .min(1)
+        .max(6.5)
+        .describe(
+          'The cover title as a multiple of the heading size: 1 as before, up to 6.5 (about 180 pt) for a title that fills the cover.',
+        )
+        .optional(),
     })
     .optional(),
   /** The book's colours: taken from the photos, ink only, or given; the style's own when absent. */
-  palette: z.union([z.enum(['from_photos', 'ink']), z.strictObject({ paper: hex, ink: hex, accent: hex })]).optional(),
+  palette: z
+    .union([
+      z
+        .enum(['from_photos', 'ink'])
+        .describe('from_photos takes the accent from the pictures; ink sets every colour in the ink.'),
+      z.strictObject({ paper: hex, ink: hex, accent: hex }),
+    ])
+    .optional(),
   text: z
     .strictObject({
-      captions: z.enum(['none', 'entry', 'photo']).default('entry'),
-      story: z.enum(['full', 'excerpt', 'none']).default('full'),
+      captions: z
+        .enum(['none', 'entry', 'photo'])
+        .describe('Words under the pictures: none, the entry title, or each photo caption.')
+        .default('entry'),
+      story: z
+        .enum(['full', 'excerpt', 'none'])
+        .describe('The entry story in full, cut to excerptChars, or left out.')
+        .default('full'),
       excerptChars: z.number().int().min(80).max(1200).optional(),
     })
     .optional(),
@@ -67,13 +116,16 @@ export const bookDesignDirectivesSchema = z.strictObject({
       countries: z.boolean().default(true),
       chapterMaps: z.boolean().default(false),
       dayBadges: z.boolean().default(true),
-      metrics: z.array(z.enum(BOOK_METRICS)).min(1).max(7).optional(),
+      metrics: z.array(bookMetricSchema).min(1).max(7).optional(),
     })
     .optional(),
   /** What stays: pages holding a locked element, also hand-made pages, or nothing (a fresh book). */
-  keep: z.enum(['nothing', 'locked', 'edited']).default('locked'),
+  keep: z
+    .enum(['nothing', 'locked', 'edited'])
+    .describe('What stays: nothing, pages holding a locked element, or also the pages made by hand.')
+    .default('locked'),
   /** Only honoured for a blank or a new book. */
-  preset: bookPageSetupSchema.shape.preset.unwrap().optional(),
+  preset: bookPagePresetSchema.optional(),
   seed: z.number().int().min(0).max(2147483647).optional(),
 });
 export type BookDesignDirectives = z.infer<typeof bookDesignDirectivesSchema>;

shared/src/book/design/design-framing.ts

@@ -48,7 +48,11 @@ interface CoverWords {
   ownSubtitle?: string;
 }
 
-/** The cover: a photo to the bleed with the title on a scrim at its foot, or the title alone on the paper. */
+/**
+ * The cover: a photo to the bleed with the title on a scrim at its foot, or
+ * the title alone on the paper. The title starts at the display size and is
+ * set smaller only as far as its box needs.
+ */
 export function composeCover(c: ComposeCtx, words: CoverWords, photo: AutoPhoto | null): BookSpread {
   const { pageWidth: PW, pageHeight: H, bleed: b, margin: m } = c.grid;
   const els: BookElement[] = [];
@@ -64,7 +68,8 @@ export function composeCover(c: ComposeCtx, words: CoverWords, photo: AutoPhoto
   const y = photo ? box.y : box.y + box.h * 0.35;
   if (title.words.trim()) {
     const binding = title.bound ? { source: 'journey.title' as const } : null;
-    const head = headingEl(c, { x: box.x, y, w: box.w }, title.words, box.h * 0.6, { binding, color: colour });
+    const size = c.look.sizes.display;
+    const head = headingEl(c, { x: box.x, y, w: box.w }, title.words, box.h * 0.6, { binding, color: colour, size });
     els.push(head);
     if (sub.words.trim()) {
       const subBinding = sub.bound ? { source: 'journey.subtitle' as const } : null;

shared/src/book/design/design-style.spec.ts

@@ -0,0 +1,80 @@
+import { bookPageSetupSchema, type BookDocument, type BookTextElement } from '../book.schema';
+import { designBook, type BookDesignInput } from './design-book';
+import { bookDesignDirectivesSchema, type BookDesignDirectivesInput } from './design-directives.schema';
+import { designLook } from './design-style';
+
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { describe, expect, it } from 'vitest';
+
+// BOOKSTY-001 to BOOKSTY-004
+
+/**
+ * The type scale of a designed book: `type.scale` reaches a poster's sizes,
+ * the cover title has a display tier of its own, and a book designed without
+ * either is set exactly as before.
+ */
+
+const page = bookPageSetupSchema.parse({ preset: 'square-210', pageWidth: 210, pageHeight: 210 });
+const lookOf = (directives: BookDesignDirectivesInput, on = page) =>
+  designLook(bookDesignDirectivesSchema.parse(directives), on, []);
+
+const here = (file: string) => fileURLToPath(new URL(file, import.meta.url));
+const fixtures = JSON.parse(readFileSync(here('./design-book.fixtures.json'), 'utf8')) as {
+  rich: { input: BookDesignInput };
+};
+
+/** The rich fixture journey, its ids minted by a counter so every run designs the same book. */
+function rich(): BookDesignInput {
+  let n = 0;
+  return { ...fixtures.rich.input, newId: (p) => `${p}-${++n}` };
+}
+
+/** The cover's title: the text bound to the journey's title. */
+function coverTitle(doc: BookDocument): BookTextElement | undefined {
+  const cover = doc.spreads.find((s) => s.role === 'cover');
+  return cover?.elements.find((e): e is BookTextElement => e.kind === 'text' && e.binding?.source === 'journey.title');
+}
+
+describe('the type scale', () => {
+  it('BOOKSTY-001: sets the cover title at the heading size when nothing asks for more, as before', () => {
+    const look = lookOf({ style: 'classic' });
+    expect(look.sizes).toEqual({ display: 28, heading: 28, sub: 14, body: 10, caption: 7.5, meta: 7 });
+    expect(lookOf({ style: 'classic', type: { scale: 1.3 } }).sizes.heading).toBe(36.4);
+  });
+
+  it('BOOKSTY-002: takes a scale up to 2.5 and a display tier up to 6.5, and nothing past either', () => {
+    const parse = (type: Record<string, number>) => bookDesignDirectivesSchema.safeParse({ type }).success;
+    expect([parse({ scale: 2.5 }), parse({ scale: 2.6 }), parse({ scale: 0.7 })]).toEqual([true, false, false]);
+    expect([parse({ display: 6.5 }), parse({ display: 6.6 }), parse({ display: 0.9 })]).toEqual([true, false, false]);
+    const poster = lookOf({ style: 'bold', type: { scale: 2.5, display: 2 } });
+    expect([poster.sizes.heading, poster.sizes.display, poster.sizes.body]).toEqual([70, 140, 25]);
+    // The cover tier alone carries a cover-filling title: body stays where the style sets it.
+    const cover = lookOf({ style: 'bold', type: { display: 6.5 } });
+    expect([cover.sizes.heading, cover.sizes.display, cover.sizes.body]).toEqual([28, 182, 10]);
+  });
+
+  it('BOOKSTY-003: never sets a size past what a text element takes, on the largest page either', () => {
+    const large = bookPageSetupSchema.parse({ preset: 'custom', pageWidth: 500, pageHeight: 500 });
+    const look = lookOf({ style: 'bold', type: { scale: 2.5, display: 3 } }, large);
+    expect(look.sizes.display).toBe(200);
+    expect(Math.max(...Object.values(look.sizes))).toBeLessThanOrEqual(200);
+  });
+});
+
+describe('the cover title', () => {
+  it('BOOKSTY-004: starts at the display size and comes out larger than the heading, still inside its box', () => {
+    const plain = coverTitle(designBook(null, rich(), { style: 'classic' }).doc);
+    const big = coverTitle(designBook(null, rich(), { style: 'classic', type: { display: 3 } }).doc);
+    const base = plain?.size ?? 0;
+    expect(base).toBeGreaterThan(0);
+    expect(big?.size ?? 0).toBeGreaterThan(base);
+    expect(big?.size ?? 0).toBeLessThanOrEqual(base * 3);
+    const largest = coverTitle(designBook(null, rich(), { style: 'classic', type: { display: 6.5 } }).doc);
+    expect(largest?.size ?? 0).toBeGreaterThanOrEqual(big?.size ?? 0);
+    expect(largest?.size ?? 0).toBeLessThanOrEqual(182);
+    expect((largest?.frame.y ?? 0) + (largest?.frame.h ?? 0)).toBeLessThanOrEqual(page.pageHeight);
+    // The box under the title is the foot of the cover, below its 60 % line.
+    expect((big?.frame.y ?? 0) + (big?.frame.h ?? 0)).toBeLessThanOrEqual(page.pageHeight);
+  });
+});

shared/src/book/design/design-style.ts

@@ -9,9 +9,12 @@ import type { BookDesignDirectives, BookDesignStyle } from './design-directives.
  *
  * At most two families per book; badges, figures, maps and lists take the
  * heading face. Sizes are set for a 210 mm page and scale with the page
- * width, times `type.scale`, never under what a reader can read. Every
- * colour a text is set in is checked against the paper to WCAG contrast;
- * a pair that fails falls back to the ink.
+ * width, times `type.scale`, never under what a reader can read and never
+ * over what a text element takes. The cover title has a tier of its own,
+ * `display`, the heading size times `type.display`: 1 by default, so a book
+ * designed without it is set exactly as before, and up to 6.5 for a title
+ * that fills the cover. Every colour a text is set in is checked against the paper
+ * to WCAG contrast; a pair that fails falls back to the ink.
  */
 
 export interface BookDesignLook {
@@ -28,7 +31,8 @@ export interface BookDesignLook {
   onScrim: string;
   heading: BookFontFamily;
   body: BookFontFamily;
-  sizes: { heading: number; sub: number; body: number; caption: number; meta: number };
+  /** Points. `display` is the cover title's, the heading's unless `type.display` raises it. */
+  sizes: { display: number; heading: number; sub: number; body: number; caption: number; meta: number };
   /** The frame decoration and the slight turn a scrapbook gives its pictures. */
   frameStyle: BookPhotoElement['frameStyle'];
   tilt: number;
@@ -114,6 +118,8 @@ const PRESETS: Record<BookDesignStyle, StylePreset> = {
 const BASE_SIZES = { heading: 28, sub: 14, body: 10, caption: 7.5, meta: 7 };
 /** Never under these: running text reads from 7 pt, a caption or meta line from 5.5 pt (with room to spare). */
 const FLOOR = { heading: 14, sub: 9, body: 8, caption: 7, meta: 6 };
+/** Never over this: the largest size a text element takes (book.schema.ts). */
+const MAX_PT = 200;
 
 const round1 = (v: number) => Math.round(v * 10) / 10;
 
@@ -163,7 +169,8 @@ export function designLook(
   const softer = mix(ink, colours.paper, 0.3);
   const muted = contrastRatio(softer, colours.paper) >= 4.6 ? softer : ink;
   const scale = (page.pageWidth / 210) * (directives.type?.scale ?? 1);
-  const size = (role: keyof typeof BASE_SIZES) => Math.max(FLOOR[role], round1(BASE_SIZES[role] * scale));
+  const size = (role: keyof typeof BASE_SIZES, times = 1) =>
+    Math.min(MAX_PT, Math.max(FLOOR[role], round1(BASE_SIZES[role] * scale * times)));
   const heading = directives.type?.heading ?? preset.heading;
   return {
     style: directives.style,
@@ -177,6 +184,7 @@ export function designLook(
     heading,
     body: directives.type?.body ?? preset.body,
     sizes: {
+      display: size('heading', directives.type?.display ?? 1),
       heading: size('heading'),
       sub: size('sub'),
       body: size('body'),

shared/src/i18n/ar/assistantTour.ts

@@ -26,6 +26,7 @@ const assistantTour: TranslationStrings = {
   'assistant.card.tour.ways.two': 'طريقان',
   'assistant.card.tour.ways.few': '{count} طرق',
   'assistant.card.tour.ways.many': '{count} طريقًا',
+  'assistant.card.tour.waysPick': 'اختر طريقًا',
   'assistant.card.tour.deltaTo': 'مقارنةً بالطريق {letter}',
   'assistant.card.tour.deltaBefore': 'مقارنةً بالطريق الحالي',
   'assistant.card.tour.day': 'اليوم {day}',
@@ -66,6 +67,7 @@ const assistantTour: TranslationStrings = {
   'assistant.card.tour.sunset': 'الغروب {time}',
   'assistant.card.tour.nextDay': 'اليوم التالي',
   'assistant.card.tour.latestStart': 'انطلق قبل {time} لتنتهي قبل الغروب',
+  'assistant.card.tour.latestStartShort': 'الانطلاق قبل {time}',
   'assistant.card.tour.climate': 'طقس معتاد لهذا التاريخ، لا توقعات بعد',
   'assistant.card.tour.weatherNear': 'الطقس قرب أعلى نقطة',
   'assistant.card.tour.warn.thunder': 'عواصف رعدية محتملة من {time}',

shared/src/i18n/ar/journey.ts

@@ -677,6 +677,8 @@ const journey: TranslationStrings = {
   'journey.studio.rotateLeft': 'تدوير لليسار',
   'journey.studio.rotateRight': 'تدوير لليمين',
   'journey.studio.saveReadOnly': 'للقراءة فقط، لا يتم الحفظ',
+  'journey.studio.saveNewer': 'حفظ إصدار أحدث من Studio هذا الكتاب. أعد التحميل لتعديله.',
+  'journey.studio.saveReload': 'إعادة التحميل',
   'journey.studio.filterPhotos': 'تصفية الصور',
   'journey.studio.filterAll': 'كل الصور',
   'journey.studio.filterLoose': 'ليست ضمن إدخال',

shared/src/i18n/az/assistantTour.ts

@@ -22,6 +22,7 @@ const assistantTour: TranslationStrings = {
   'assistant.card.tour.list': 'Turlar',
   'assistant.card.tour.ways': '{count} yol',
   'assistant.card.tour.ways.one': '{count} yol',
+  'assistant.card.tour.waysPick': 'Yol seçin',
   'assistant.card.tour.deltaTo': '{letter} yolu ilə müqayisədə',
   'assistant.card.tour.deltaBefore': 'Hazırkı yolla müqayisədə',
   'assistant.card.tour.day': 'Gün {day}',
@@ -58,6 +59,7 @@ const assistantTour: TranslationStrings = {
   'assistant.card.tour.sunset': 'Gün batır {time}',
   'assistant.card.tour.nextDay': 'növbəti gün',
   'assistant.card.tour.latestStart': 'Gün batmazdan əvvəl bitirmək üçün ən gec {time} yola düşün',
+  'assistant.card.tour.latestStartShort': 'Ən gec {time}-da başla',
   'assistant.card.tour.climate': 'Tarix üçün tipik hava, hələ proqnoz yoxdur',
   'assistant.card.tour.weatherNear': 'Ən yüksək nöqtə yaxınlığında hava',
   'assistant.card.tour.warn.thunder': '{time} saatdan ildırım mümkündür',

shared/src/i18n/az/journey.ts

@@ -712,6 +712,8 @@ const journey: TranslationStrings = {
   'journey.studio.rotateLeft': 'Sola fırlat',
   'journey.studio.rotateRight': 'Sağa fırlat',
   'journey.studio.saveReadOnly': 'Yalnız oxuma rejimi — yadda saxlanılmadı',
+  'journey.studio.saveNewer': 'Bu kitabı Studio-nun daha yeni versiyası saxlayıb. Redaktə etmək üçün yenidən yükləyin.',
+  'journey.studio.saveReload': 'Yenidən yüklə',
 
   'journey.studio.filterPhotos': 'Fotoları filtrlə',
   'journey.studio.filterAll': 'Bütün fotolar',