Merge branch 'test-fixture-cleanup': book-agnostic CFI converter tests

Six converter tests pointed at absolute paths for 1984 and Crime and
Punishment under uploads/ — books that don't exist on most checkouts
(CI included), so the suite shipped with 5 permanently failing tests
(and a sixth passing only by accident: the percentage-fallback path
triggered by the missing file is the outcome it asserts).

A writeTestEPUB helper now builds a minimal deterministic EPUB in
t.TempDir() (zip → container.xml → OPF → 6-doc spine), so the tests
exercise the real zip/OPF/spine/document pipeline with no external
dependencies. The xpointer→CFI conversion, fragment-ID conversion,
both round-trips (bare and context-text-anchored), and the text-search
and percentage fallbacks all keep their original assertions, now
against known document content. internal/sync is green for the first
time on this machine.

internal/database/db.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.31.1
+//   sqlc v1.30.0
 
 package database
 

internal/database/models.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.31.1
+//   sqlc v1.30.0
 
 package database
 

internal/database/querier.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.31.1
+//   sqlc v1.30.0
 
 package database
 

internal/database/queries.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.31.1
+//   sqlc v1.30.0
 // source: queries.sql
 
 package database
@@ -6852,7 +6852,11 @@ SELECT
     mh.dedup_key,
     'highlight' as annotation_type,
     mh.device_sync_data,
-    mh.deleted_at
+    mh.deleted_at,
+    mh.start_position,
+    mh.end_position,
+    mh.epubcfi_start,
+    mh.epubcfi_end
 FROM media_highlights mh
 WHERE mh.media_item_id = $1 AND mh.user_id = $2 AND mh.deleted = TRUE AND mh.deleted_at > $3
 UNION ALL
@@ -6861,7 +6865,11 @@ SELECT
     mn.dedup_key,
     'note' as annotation_type,
     mn.device_sync_data,
-    mn.deleted_at
+    mn.deleted_at,
+    mn.position as start_position,
+    NULL as end_position,
+    mn.epubcfi_location as epubcfi_start,
+    NULL as epubcfi_end
 FROM media_notes mn
 WHERE mn.media_item_id = $1 AND mn.user_id = $2 AND mn.deleted = TRUE AND mn.deleted_at > $3
 UNION ALL
@@ -6870,7 +6878,11 @@ SELECT
     mb.dedup_key,
     'bookmark' as annotation_type,
     mb.device_sync_data,
-    mb.deleted_at
+    mb.deleted_at,
+    mb.position as start_position,
+    NULL as end_position,
+    mb.cfi_position as epubcfi_start,
+    NULL as epubcfi_end
 FROM media_bookmarks mb
 WHERE mb.media_item_id = $1 AND mb.user_id = $2 AND mb.deleted = TRUE AND mb.deleted_at > $3
 ORDER BY deleted_at DESC
@@ -6888,6 +6900,10 @@ type GetTombstonedAnnotationsForBookRow struct {
 	AnnotationType string             `db:"annotation_type" json:"annotation_type"`
 	DeviceSyncData []byte             `db:"device_sync_data" json:"device_sync_data"`
 	DeletedAt      pgtype.Timestamptz `db:"deleted_at" json:"deleted_at"`
+	StartPosition  pgtype.Text        `db:"start_position" json:"start_position"`
+	EndPosition    pgtype.Text        `db:"end_position" json:"end_position"`
+	EpubcfiStart   pgtype.Text        `db:"epubcfi_start" json:"epubcfi_start"`
+	EpubcfiEnd     pgtype.Text        `db:"epubcfi_end" json:"epubcfi_end"`
 }
 
 func (q *Queries) GetTombstonedAnnotationsForBook(ctx context.Context, arg GetTombstonedAnnotationsForBookParams) ([]GetTombstonedAnnotationsForBookRow, error) {
@@ -6905,6 +6921,10 @@ func (q *Queries) GetTombstonedAnnotationsForBook(ctx context.Context, arg GetTo
 			&i.AnnotationType,
 			&i.DeviceSyncData,
 			&i.DeletedAt,
+			&i.StartPosition,
+			&i.EndPosition,
+			&i.EpubcfiStart,
+			&i.EpubcfiEnd,
 		); err != nil {
 			return nil, err
 		}
@@ -11274,7 +11294,7 @@ SET
     title = $2,
     notes = $3,
     position = $4,
-    updated_at = NOW()
+    last_modified_at = NOW()
 WHERE id = $1 AND user_id = $5
 RETURNING id, media_item_id, user_id, page_number, chapter_number, cfi_position, title, position, notes, created_at, dedup_key, last_modified_at, last_modified_source, device_sync_data, percentage_location, epubcfi_location, chapter_reference, deleted, deleted_at
 `
@@ -11334,7 +11354,9 @@ UPDATE media_bookmarks SET
     last_modified_at = $11,
     last_modified_source = $12,
     device_sync_data = $13,
-    created_at = created_at
+    created_at = created_at,
+    deleted = FALSE,
+    deleted_at = NULL
 WHERE id = $1
 RETURNING id, media_item_id, user_id, page_number, chapter_number, cfi_position, title, position, notes, created_at, dedup_key, last_modified_at, last_modified_source, device_sync_data, percentage_location, epubcfi_location, chapter_reference, deleted, deleted_at
 `
@@ -11474,7 +11496,9 @@ UPDATE media_highlights SET
     last_modified_at = $12,
     last_modified_source = $13,
     device_sync_data = $14,
-    updated_at = NOW()
+    updated_at = NOW(),
+    deleted = FALSE,
+    deleted_at = NULL
 WHERE id = $1
 RETURNING id, media_item_id, user_id, selection_text, start_position, end_position, color, note_id, created_at, updated_at, percentage_start, percentage_end, character_start, character_end, epubcfi_start, epubcfi_end, chapter_reference, paragraph_start, paragraph_end, panel_number, device_sync_data, dedup_key, last_modified_at, last_modified_source, note_text, deleted, deleted_at
 `
@@ -12152,7 +12176,9 @@ UPDATE media_notes SET
     last_modified_at = $10,
     last_modified_source = $11,
     device_sync_data = $12,
-    updated_at = NOW()
+    updated_at = NOW(),
+    deleted = FALSE,
+    deleted_at = NULL
 WHERE id = $1
 RETURNING id, media_item_id, user_id, content, position, created_at, updated_at, percentage_location, character_start, character_end, epubcfi_location, chapter_reference, paragraph_reference, device_sync_data, dedup_key, last_modified_at, last_modified_source, deleted, deleted_at
 `

internal/database/queries/queries.sql

@@ -802,7 +802,9 @@ UPDATE media_highlights SET
     last_modified_at = $12,
     last_modified_source = $13,
     device_sync_data = $14,
-    updated_at = NOW()
+    updated_at = NOW(),
+    deleted = FALSE,
+    deleted_at = NULL
 WHERE id = $1
 RETURNING *;
 
@@ -857,7 +859,9 @@ UPDATE media_notes SET
     last_modified_at = $10,
     last_modified_source = $11,
     device_sync_data = $12,
-    updated_at = NOW()
+    updated_at = NOW(),
+    deleted = FALSE,
+    deleted_at = NULL
 WHERE id = $1
 RETURNING *;
 
@@ -913,7 +917,9 @@ UPDATE media_bookmarks SET
     last_modified_at = $11,
     last_modified_source = $12,
     device_sync_data = $13,
-    created_at = created_at
+    created_at = created_at,
+    deleted = FALSE,
+    deleted_at = NULL
 WHERE id = $1
 RETURNING *;
 
@@ -986,7 +992,11 @@ SELECT
     mh.dedup_key,
     'highlight' as annotation_type,
     mh.device_sync_data,
-    mh.deleted_at
+    mh.deleted_at,
+    mh.start_position,
+    mh.end_position,
+    mh.epubcfi_start,
+    mh.epubcfi_end
 FROM media_highlights mh
 WHERE mh.media_item_id = $1 AND mh.user_id = $2 AND mh.deleted = TRUE AND mh.deleted_at > $3
 UNION ALL
@@ -995,7 +1005,11 @@ SELECT
     mn.dedup_key,
     'note' as annotation_type,
     mn.device_sync_data,
-    mn.deleted_at
+    mn.deleted_at,
+    mn.position as start_position,
+    NULL as end_position,
+    mn.epubcfi_location as epubcfi_start,
+    NULL as epubcfi_end
 FROM media_notes mn
 WHERE mn.media_item_id = $1 AND mn.user_id = $2 AND mn.deleted = TRUE AND mn.deleted_at > $3
 UNION ALL
@@ -1004,7 +1018,11 @@ SELECT
     mb.dedup_key,
     'bookmark' as annotation_type,
     mb.device_sync_data,
-    mb.deleted_at
+    mb.deleted_at,
+    mb.position as start_position,
+    NULL as end_position,
+    mb.cfi_position as epubcfi_start,
+    NULL as epubcfi_end
 FROM media_bookmarks mb
 WHERE mb.media_item_id = $1 AND mb.user_id = $2 AND mb.deleted = TRUE AND mb.deleted_at > $3
 ORDER BY deleted_at DESC;
@@ -2481,7 +2499,7 @@ SET
     title = $2,
     notes = $3,
     position = $4,
-    updated_at = NOW()
+    last_modified_at = NOW()
 WHERE id = $1 AND user_id = $5
 RETURNING *;
 

internal/handlers/koreader.go

@@ -9,7 +9,10 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"strconv"
+	"strings"
 	"time"
+	"unicode/utf8"
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgtype"
@@ -47,7 +50,7 @@ func (h *KOReaderHandler) SetAnnotationService(svc *wsync.AnnotationService) {
 	h.annotationSvc = svc
 }
 
-func (h *KOReaderHandler) convertHighlightPositions(ctx context.Context, mediaItemID pgtype.UUID, pos0, pos1 string) (string, string) {
+func (h *KOReaderHandler) convertHighlightPositions(ctx context.Context, mediaItemID pgtype.UUID, pos0, pos1, contextText string) (string, string) {
 	if pos0 == "" || h.libraryService == nil {
 		return "", ""
 	}
@@ -59,9 +62,89 @@ func (h *KOReaderHandler) convertHighlightPositions(ctx context.Context, mediaIt
 	if err != nil || epubPath == "" {
 		return "", ""
 	}
-	startLoc := wsync.ConvertToCanonical(wsync.LocatorSourceKOReader, pos0, 0, "", mediaItem.FormatGroup, epubPath, "")
+	// The annotation's own text is the ideal anchor for the converter's
+	// text-search path: clients (thin, underpowered) send only raw
+	// locators, the server resolves them against the actual book.
+	startLoc := wsync.ConvertToCanonical(wsync.LocatorSourceKOReader, pos0, 0, contextText, mediaItem.FormatGroup, epubPath, "")
 	endLoc := wsync.ConvertToCanonical(wsync.LocatorSourceKOReader, pos1, 0, "", mediaItem.FormatGroup, epubPath, "")
-	return startLoc.CFI, endLoc.CFI
+	endCFI := endLoc.CFI
+	// The end conversion carries no context text, so unless it resolved
+	// exactly it degenerates to a percentage fallback anchored at the
+	// document start — useless as a range end. When the START resolved
+	// exactly, derive the end from it: same node, character offset
+	// advanced by the selection's UTF-16 length (the CFI offset unit).
+	if endLoc.Precision != "exact" && startLoc.Precision == "exact" && contextText != "" {
+		endCFI = extendCFIByLength(startLoc.CFI, contextText)
+	}
+	return startLoc.CFI, endCFI
+}
+
+// extendCFIByLength advances a point CFI's trailing character offset by the
+// UTF-16 length of text (EPUB CFI character offsets are UTF-16 code units).
+// Selections spanning multiple text nodes produce an out-of-range offset —
+// harmless: resolution clamps or fails, and consumers fall back to the start.
+func extendCFIByLength(cfi, text string) string {
+	if cfi == "" || text == "" {
+		return cfi
+	}
+	i := strings.LastIndex(cfi, ":")
+	if i < 0 || !strings.HasSuffix(cfi, ")") {
+		return cfi
+	}
+	off, err := strconv.Atoi(cfi[i+1 : len(cfi)-1])
+	if err != nil {
+		return cfi
+	}
+	utf16len := 0
+	for _, r := range text {
+		if r > 0xFFFF {
+			utf16len += 2
+		} else {
+			utf16len++
+		}
+	}
+	return cfi[:i+1] + strconv.Itoa(off+utf16len) + ")"
+}
+
+// existingHighlightColor returns the stored color of the highlight matching
+// the dedup key ("" when none) so device echoes that carry no color never
+// clobber the web color.
+func (h *KOReaderHandler) existingHighlightColor(ctx context.Context, mediaItemID, userID pgtype.UUID, dedupKey string) string {
+	if dedupKey == "" {
+		return ""
+	}
+	existing, err := h.db.GetMediaHighlightByDedupKey(ctx, database.GetMediaHighlightByDedupKeyParams{
+		UserID:      userID,
+		MediaItemID: mediaItemID,
+		DedupKey:    pgtype.Text{String: dedupKey, Valid: true},
+	})
+	if err != nil {
+		return ""
+	}
+	return existing.Color.String
+}
+
+// deriveAnnotationPercentage computes a percentage for device-pushed
+// annotations when the client didn't send one (thin clients skip their own
+// per-annotation page lookups; arithmetic is only free on paging documents).
+func (h *KOReaderHandler) deriveAnnotationPercentage(ctx context.Context, mediaItemID pgtype.UUID, pos0 string, page int) float64 {
+	mediaItem, err := h.db.GetMediaItem(ctx, mediaItemID)
+	if err != nil {
+		return 0
+	}
+	formatGroup := wsync.FormatGroup(mediaItem.FormatGroup)
+	if formatGroup == wsync.FormatGroupFixedLayout || formatGroup == wsync.FormatGroupComicArchive {
+		if page > 0 && mediaItem.PageCount.Valid && mediaItem.PageCount.Int32 > 0 {
+			return float64(page) / float64(mediaItem.PageCount.Int32)
+		}
+		return 0
+	}
+	if wsync.IsCREXPointer(pos0) && h.libraryService != nil {
+		if epubPath, err := h.libraryService.ResolveMediaPath(ctx, mediaItem.LibraryID, mediaItem.FilePath); err == nil && epubPath != "" {
+			return wsync.NewCFIConverter(epubPath).SectionPercentage(pos0)
+		}
+	}
+	return 0
 }
 
 func (h *KOReaderHandler) SetLibraryService(svc LibraryPathResolver) {
@@ -75,24 +158,24 @@ type KOReaderProgressRequest struct {
 }
 
 type KOReaderBookProgress struct {
-	UUID       string              `json:"uuid,omitempty"`
-	SHA256     string              `json:"sha256,omitempty"`
-	Title      string              `json:"title,omitempty"`
-	Authors    []string            `json:"authors,omitempty"`
-	Progress   float64             `json:"progress"`
-	Percentage float64             `json:"percentage"`
-	LastRead   string              `json:"last_read,omitempty"`
-	FilePath   string              `json:"file_path,omitempty"`
-	DeviceInfo KOReaderDeviceInfo  `json:"device_info,omitempty"`
-	Bookmarks  []KOReaderBookmark  `json:"bookmarks,omitempty"`
-	Highlights []KOReaderHighlight `json:"highlights,omitempty"`
-	Notes      []KOReaderNote      `json:"notes,omitempty"`
-	Chapter      *int                `json:"chapter,omitempty"`
-	Character    *int64              `json:"character,omitempty"`
-	Epubcfi      *string             `json:"epubcfi,omitempty"`
-	ContextText  *string             `json:"context_text,omitempty"`
-	Page         *int                `json:"page,omitempty"`
-	TotalPages   *int                `json:"total_pages,omitempty"`
+	UUID        string              `json:"uuid,omitempty"`
+	SHA256      string              `json:"sha256,omitempty"`
+	Title       string              `json:"title,omitempty"`
+	Authors     []string            `json:"authors,omitempty"`
+	Progress    float64             `json:"progress"`
+	Percentage  float64             `json:"percentage"`
+	LastRead    string              `json:"last_read,omitempty"`
+	FilePath    string              `json:"file_path,omitempty"`
+	DeviceInfo  KOReaderDeviceInfo  `json:"device_info,omitempty"`
+	Bookmarks   []KOReaderBookmark  `json:"bookmarks,omitempty"`
+	Highlights  []KOReaderHighlight `json:"highlights,omitempty"`
+	Notes       []KOReaderNote      `json:"notes,omitempty"`
+	Chapter     *int                `json:"chapter,omitempty"`
+	Character   *int64              `json:"character,omitempty"`
+	Epubcfi     *string             `json:"epubcfi,omitempty"`
+	ContextText *string             `json:"context_text,omitempty"`
+	Page        *int                `json:"page,omitempty"`
+	TotalPages  *int                `json:"total_pages,omitempty"`
 }
 
 type KOReaderDeviceInfo struct {
@@ -100,53 +183,91 @@ type KOReaderDeviceInfo struct {
 	DeviceModel     string `json:"device_model,omitempty"`
 }
 
+// FlexInt tolerates the loose types KOReader clients send for optional
+// numeric fields: JSON numbers, numeric strings ("30"), empty strings
+// (""), or non-numeric strings ("/body/..." xpointers in `page` for CRE
+// documents) — the latter decode to 0. Without this, a single annotation
+// carrying chapter:"" or page:"/body/..." failed the whole request bind
+// with a 400.
+type FlexInt int
+
+func (f *FlexInt) UnmarshalJSON(b []byte) error {
+	s := strings.TrimSpace(string(b))
+	if s == "null" || s == `""` {
+		*f = 0
+		return nil
+	}
+	if n, err := strconv.Atoi(s); err == nil {
+		*f = FlexInt(n)
+		return nil
+	}
+	if strings.HasPrefix(s, `"`) && strings.HasSuffix(s, `"`) {
+		inner := s[1 : len(s)-1]
+		if n, err := strconv.Atoi(inner); err == nil {
+			*f = FlexInt(n)
+			return nil
+		}
+		*f = 0
+		return nil
+	}
+	if fl, err := strconv.ParseFloat(s, 64); err == nil {
+		*f = FlexInt(int(fl))
+		return nil
+	}
+	*f = 0
+	return nil
+}
+
 type KOReaderBookmark struct {
-	Chapter    int      `json:"chapter,omitempty"`
+	Chapter    FlexInt  `json:"chapter,omitempty"`
 	Datetime   string   `json:"datetime,omitempty"`
 	Notes      string   `json:"notes,omitempty"`
 	Pos0       string   `json:"pos0,omitempty"`
 	Pos1       string   `json:"pos1,omitempty"`
-	Page       int      `json:"page,omitempty"`
+	Page       FlexInt  `json:"page,omitempty"`
 	Text       string   `json:"text,omitempty"`
 	Type       string   `json:"type,omitempty"`
 	Percentage *float64 `json:"percentage,omitempty"`
 	BookSHA256 string   `json:"book_sha256,omitempty"`
+	DedupKey   string   `json:"dedup_key,omitempty"`
 }
 
 type KOReaderHighlight struct {
-	Chapter    int      `json:"chapter,omitempty"`
+	Chapter    FlexInt  `json:"chapter,omitempty"`
 	Datetime   string   `json:"datetime,omitempty"`
 	Notes      string   `json:"notes,omitempty"`
 	Pos0       string   `json:"pos0,omitempty"`
 	Pos1       string   `json:"pos1,omitempty"`
-	Page       int      `json:"page,omitempty"`
+	Page       FlexInt  `json:"page,omitempty"`
 	Text       string   `json:"text,omitempty"`
 	Type       string   `json:"type,omitempty"`
 	Color      string   `json:"color,omitempty"`
 	Percentage *float64 `json:"percentage,omitempty"`
 	BookSHA256 string   `json:"book_sha256,omitempty"`
+	DedupKey   string   `json:"dedup_key,omitempty"`
 }
 
 type KOReaderNote struct {
-	Chapter    int      `json:"chapter,omitempty"`
+	Chapter    FlexInt  `json:"chapter,omitempty"`
 	Datetime   string   `json:"datetime,omitempty"`
 	Notes      string   `json:"notes,omitempty"`
 	Pos0       string   `json:"pos0,omitempty"`
 	Pos1       string   `json:"pos1,omitempty"`
-	Page       int      `json:"page,omitempty"`
+	Page       FlexInt  `json:"page,omitempty"`
 	Text       string   `json:"text,omitempty"`
 	Type       string   `json:"type,omitempty"`
 	Percentage *float64 `json:"percentage,omitempty"`
 	BookSHA256 string   `json:"book_sha256,omitempty"`
+	DedupKey   string   `json:"dedup_key,omitempty"`
 }
 
 type KOReaderSyncResponse struct {
-	SyncStatus    string                  `json:"sync_status"`
-	BooksSynced   int                     `json:"books_synced"`
+	SyncStatus    string                   `json:"sync_status"`
+	BooksSynced   int                      `json:"books_synced"`
 	BookResults   []KOReaderBookSyncResult `json:"book_results,omitempty"`
-	Conflicts     []KOReaderConflict      `json:"conflicts,omitempty"`
-	Timestamp     string                  `json:"timestamp"`
-	DeviceUpdated bool                    `json:"device_updated"`
+	Conflicts     []KOReaderConflict       `json:"conflicts,omitempty"`
+	Timestamp     string                   `json:"timestamp"`
+	DeviceUpdated bool                     `json:"device_updated"`
 }
 
 type KOReaderBookSyncResult struct {
@@ -174,20 +295,20 @@ type KOReaderMetadata struct {
 }
 
 type KOReaderProgressData struct {
-	Percentage         float64  `json:"percentage"`
-	Character          *int64   `json:"character,omitempty"`
-	Epubcfi            *string  `json:"epubcfi,omitempty"`
-	KoreaderXPointer   *string  `json:"koreader_xpointer,omitempty"`
-	Chapter            *int     `json:"chapter,omitempty"`
-	ChapterProgress    *float64 `json:"chapter_progress,omitempty"`
-	Page               *int     `json:"page,omitempty"`
-	TotalPages         *int     `json:"total_pages,omitempty"`
+	Percentage       float64  `json:"percentage"`
+	Character        *int64   `json:"character,omitempty"`
+	Epubcfi          *string  `json:"epubcfi,omitempty"`
+	KoreaderXPointer *string  `json:"koreader_xpointer,omitempty"`
+	Chapter          *int     `json:"chapter,omitempty"`
+	ChapterProgress  *float64 `json:"chapter_progress,omitempty"`
+	Page             *int     `json:"page,omitempty"`
+	TotalPages       *int     `json:"total_pages,omitempty"`
 }
 
 type KOReaderAnnotations struct {
-	Highlights        []KOReaderHighlight `json:"highlights,omitempty"`
-	Notes             []KOReaderNote      `json:"notes,omitempty"`
-	Bookmarks         []KOReaderBookmark  `json:"bookmarks,omitempty"`
+	Highlights        []KOReaderHighlight      `json:"highlights,omitempty"`
+	Notes             []KOReaderNote           `json:"notes,omitempty"`
+	Bookmarks         []KOReaderBookmark       `json:"bookmarks,omitempty"`
 	DeletedHighlights []map[string]interface{} `json:"deleted_highlights,omitempty"`
 	DeletedBookmarks  []map[string]interface{} `json:"deleted_bookmarks,omitempty"`
 }
@@ -486,12 +607,16 @@ func (h *KOReaderHandler) processBookAnnotations(ctx context.Context, deviceID,
 	for _, hl := range book.Highlights {
 		startPos := hl.Pos0
 		endPos := hl.Pos1
-		epubcfiStart, epubcfiEnd := h.convertHighlightPositions(ctx, mediaItemID, startPos, endPos)
+		// The highlight's own text anchors the conversion exactly.
+		epubcfiStart, epubcfiEnd := h.convertHighlightPositions(ctx, mediaItemID, startPos, endPos, hl.Text)
 
 		pctStart := 0.0
 		if hl.Percentage != nil {
 			pctStart = *hl.Percentage
 		}
+		if pctStart == 0 {
+			pctStart = h.deriveAnnotationPercentage(ctx, mediaItemID, startPos, int(hl.Page))
+		}
 
 		deviceData, _ := json.Marshal(map[string]interface{}{
 			"datetime": hl.Datetime,
@@ -500,31 +625,55 @@ func (h *KOReaderHandler) processBookAnnotations(ctx context.Context, deviceID,
 			"page":     hl.Page,
 		})
 
+		// Color semantics: devices render their own default and cannot
+		// round-trip web colors. An echo carries NO color — preserve the
+		// stored (web) color so round-trips never change it. A non-empty
+		// color means the user edited the highlight on the device: map the
+		// device color name and let it win.
+		color := ""
+		if hl.Color != "" {
+			color = mapColorFromKOReader(hl.Color)
+		}
+		dedupKey := hl.DedupKey
+		if dedupKey == "" {
+			dedupKey = wsync.ComputeDedupKey(hl.Text, epubcfiStart, startPos)
+		}
+		if color == "" {
+			color = h.existingHighlightColor(ctx, mediaItemID, userID, dedupKey)
+		}
+		if color == "" {
+			color = "#ffd54f"
+		}
+
 		h.annotationSvc.SaveHighlight(ctx, wsync.SaveHighlightRequest{
-			MediaItemID:      mediaItemID,
-			UserID:           userID,
-			SelectionText:    hl.Text,
-			StartPosition:    startPos,
-			EndPosition:      endPos,
-			Color:            hl.Color,
-			NoteText:         hl.Notes,
-			PercentageStart:  pctStart,
-			EpubcfiStart:     epubcfiStart,
-			EpubcfiEnd:       epubcfiEnd,
-			Source:           "koreader",
-			DeviceSyncData:   deviceData,
+			MediaItemID:     mediaItemID,
+			UserID:          userID,
+			SelectionText:   hl.Text,
+			StartPosition:   startPos,
+			EndPosition:     endPos,
+			Color:           color,
+			NoteText:        hl.Notes,
+			PercentageStart: pctStart,
+			EpubcfiStart:    epubcfiStart,
+			EpubcfiEnd:      epubcfiEnd,
+			Source:          "koreader",
+			DeviceSyncData:  deviceData,
+			DedupKey:        dedupKey,
 		})
 	}
 
 	for _, note := range book.Notes {
 		startPos := note.Pos0
 		endPos := note.Pos1
-		epubcfiStart, epubcfiEnd := h.convertHighlightPositions(ctx, mediaItemID, startPos, endPos)
+		epubcfiStart, epubcfiEnd := h.convertHighlightPositions(ctx, mediaItemID, startPos, endPos, note.Text)
 
 		pctStart := 0.0
 		if note.Percentage != nil {
 			pctStart = *note.Percentage
 		}
+		if pctStart == 0 {
+			pctStart = h.deriveAnnotationPercentage(ctx, mediaItemID, startPos, int(note.Page))
+		}
 
 		deviceData, _ := json.Marshal(map[string]interface{}{
 			"datetime": note.Datetime,
@@ -533,18 +682,25 @@ func (h *KOReaderHandler) processBookAnnotations(ctx context.Context, deviceID,
 			"page":     note.Page,
 		})
 
+		dedupKey := note.DedupKey
+		if dedupKey == "" {
+			dedupKey = wsync.ComputeDedupKey(note.Text, epubcfiStart, startPos)
+		}
+
 		h.annotationSvc.SaveHighlight(ctx, wsync.SaveHighlightRequest{
-			MediaItemID:      mediaItemID,
-			UserID:           userID,
-			SelectionText:    note.Text,
-			StartPosition:    startPos,
-			EndPosition:      endPos,
-			NoteText:         note.Notes,
-			PercentageStart:  pctStart,
-			EpubcfiStart:     epubcfiStart,
-			EpubcfiEnd:       epubcfiEnd,
-			Source:           "koreader",
-			DeviceSyncData:   deviceData,
+			MediaItemID:     mediaItemID,
+			UserID:          userID,
+			SelectionText:   note.Text,
+			StartPosition:   startPos,
+			EndPosition:     endPos,
+			Color:           h.existingHighlightColor(ctx, mediaItemID, userID, dedupKey),
+			NoteText:        note.Notes,
+			PercentageStart: pctStart,
+			EpubcfiStart:    epubcfiStart,
+			EpubcfiEnd:      epubcfiEnd,
+			Source:          "koreader",
+			DeviceSyncData:  deviceData,
+			DedupKey:        dedupKey,
 		})
 	}
 
@@ -562,6 +718,11 @@ func (h *KOReaderHandler) processBookAnnotations(ctx context.Context, deviceID,
 			"page":     bookmark.Page,
 		})
 
+		dedupKey := bookmark.DedupKey
+		if dedupKey == "" {
+			dedupKey = wsync.ComputeDedupKey(bookmark.Text, "", position)
+		}
+
 		h.annotationSvc.SaveBookmark(ctx, wsync.SaveBookmarkRequest{
 			MediaItemID:    mediaItemID,
 			UserID:         userID,
@@ -570,6 +731,7 @@ func (h *KOReaderHandler) processBookAnnotations(ctx context.Context, deviceID,
 			ChapterNumber:  int32(bookmark.Chapter),
 			Source:         "koreader",
 			DeviceSyncData: deviceData,
+			DedupKey:       dedupKey,
 		})
 	}
 }
@@ -809,34 +971,52 @@ func (h *KOReaderHandler) GetMetadata(c *echo.Context) error {
 
 	for _, ann := range annotations {
 		if ann.AnnotationType == "highlight" {
-			pos0 := ann.StartPosition.String
-			pos1 := ann.EndPosition.String
-			if ann.EpubcfiStart.Valid && ann.EpubcfiStart.String != "" {
-				if converted := h.reverseConvertCFI(c, mediaItem, ann.EpubcfiStart.String); converted != "" {
-					pos0 = converted
-				}
+			// Selection text doubles as the converter's text-search context.
+			pos0 := h.koreaderPos0(c, mediaItem, ann.StartPosition.String, ann.EpubcfiStart.String, ann.SelectionText)
+			pos1 := h.koreaderPos0(c, mediaItem, ann.EndPosition.String, ann.EpubcfiEnd.String, ann.SelectionText)
+			if pos0 == "" {
+				// Nothing the device could place — serving a locator it can't
+				// resolve would create junk bookmarks that re-push as
+				// duplicates, so skip instead.
+				log.Printf("Bookhoard: GetMetadata skip highlight %s (no resolvable pos0)", ann.ID)
+				continue
 			}
-			if ann.EpubcfiEnd.Valid && ann.EpubcfiEnd.String != "" {
-				if converted := h.reverseConvertCFI(c, mediaItem, ann.EpubcfiEnd.String); converted != "" {
-					pos1 = converted
-				}
+			// Old web highlights carry no end anchor, and converted range
+			// CFIs resolve to their start — either way pos1 collapses onto
+			// pos0 and the device paints a zero-width highlight. Derive the
+			// end by advancing the start's character offset by the length
+			// of the selected text.
+			if pos1 == "" || pos1 == pos0 {
+				pos1 = extendXPointerByLength(pos0, ann.SelectionText)
 			}
 			highlight := KOReaderHighlight{
-				Text:     ann.SelectionText,
-				Pos0:     pos0,
-				Pos1:     pos1,
-				Color:    ann.Color.String,
+				Text: ann.SelectionText,
+				Pos0: pos0,
+				Pos1: pos1,
+				// Web colors flow to the device, mapped to KOReader's named
+				// palette. Round-trip safety: the device suppresses the color
+				// when echoing un-edited applied entries (a pink→purple
+				// palette mismatch must not rewrite the stored hex), and an
+				// actual device edit pushes its color, which wins.
+				Color:    mapColorToKOReader(ann.Color.String),
 				Datetime: ann.CreatedAt.Time.Format(time.RFC3339),
+				DedupKey: ann.DedupKey.String,
 			}
 			if ann.NoteText.Valid && ann.NoteText.String != "" {
 				highlight.Notes = ann.NoteText.String
 			}
 			annotationsResponse.Highlights = append(annotationsResponse.Highlights, highlight)
 		} else if ann.AnnotationType == "note" {
+			pos0 := h.koreaderPos0(c, mediaItem, ann.StartPosition.String, ann.EpubcfiStart.String, "")
+			if pos0 == "" {
+				log.Printf("Bookhoard: GetMetadata skip note %s (no resolvable pos0)", ann.ID)
+				continue
+			}
 			annotationsResponse.Notes = append(annotationsResponse.Notes, KOReaderNote{
 				Text:     ann.SelectionText,
-				Pos0:     ann.StartPosition.String,
+				Pos0:     pos0,
 				Datetime: ann.CreatedAt.Time.Format(time.RFC3339),
+				DedupKey: ann.DedupKey.String,
 			})
 		}
 	}
@@ -846,21 +1026,23 @@ func (h *KOReaderHandler) GetMetadata(c *echo.Context) error {
 		UserID:      pgUserID,
 	})
 	for _, bm := range bookmarks {
-		pos0 := bm.Position.String
-		if pos0 == "" && bm.CfiPosition.Valid {
-			pos0 = bm.CfiPosition.String
+		pos0 := h.koreaderPos0(c, mediaItem, bm.Position.String, bm.CfiPosition.String, "")
+		if pos0 == "" {
+			log.Printf("Bookhoard: GetMetadata skip bookmark %s (no resolvable pos0)", bm.ID)
+			continue
 		}
 		koreaderBookmark := KOReaderBookmark{
 			Text:     bm.Title,
 			Pos0:     pos0,
 			Pos1:     pos0,
 			Datetime: bm.CreatedAt.Time.Format(time.RFC3339),
+			DedupKey: bm.DedupKey.String,
 		}
 		if bm.Notes.Valid && bm.Notes.String != "" {
 			koreaderBookmark.Notes = bm.Notes.String
 		}
 		if bm.ChapterNumber.Valid {
-			koreaderBookmark.Chapter = int(bm.ChapterNumber.Int32)
+			koreaderBookmark.Chapter = FlexInt(bm.ChapterNumber.Int32)
 		}
 		annotationsResponse.Bookmarks = append(annotationsResponse.Bookmarks, koreaderBookmark)
 	}
@@ -880,6 +1062,14 @@ func (h *KOReaderHandler) GetMetadata(c *echo.Context) error {
 			dd = map[string]interface{}{}
 		}
 		dd["dedup_key"] = ts.DedupKey.String
+		// KOReader deletes by matching pos0. Device-pushed annotations carry
+		// it in device_sync_data; web-created ones don't (their locator is
+		// converted at serve time), so resolve it from the stored columns.
+		if dd["pos0"] == nil || dd["pos0"] == "" {
+			if pos0 := h.koreaderPos0(c, mediaItem, ts.StartPosition.String, ts.EpubcfiStart.String, ""); pos0 != "" {
+				dd["pos0"] = pos0
+			}
+		}
 		if ts.AnnotationType == "highlight" {
 			annotationsResponse.DeletedHighlights = append(annotationsResponse.DeletedHighlights, dd)
 		} else if ts.AnnotationType == "bookmark" {
@@ -939,7 +1129,7 @@ func (h *KOReaderHandler) convertCFIToXPointer(c *echo.Context, mediaItem databa
 	}
 }
 
-func (h *KOReaderHandler) reverseConvertCFI(c *echo.Context, mediaItem database.MediaItems, epubcfi string) string {
+func (h *KOReaderHandler) reverseConvertCFI(c *echo.Context, mediaItem database.MediaItems, epubcfi string, contextText string) string {
 	if h.libraryService == nil || epubcfi == "" {
 		return ""
 	}
@@ -947,13 +1137,138 @@ func (h *KOReaderHandler) reverseConvertCFI(c *echo.Context, mediaItem database.
 	if err != nil || epubPath == "" {
 		return ""
 	}
-	loc := wsync.ConvertFromCanonical(wsync.LocatorSourceKOReader, epubcfi, 0, "", mediaItem.FormatGroup, epubPath, "")
+	loc := wsync.ConvertFromCanonical(wsync.LocatorSourceKOReader, epubcfi, 0, contextText, mediaItem.FormatGroup, epubPath, "")
 	if loc.Position != "" && loc.Position != epubcfi {
 		return loc.Position
 	}
 	return ""
 }
 
+// pdfRectAnchor is the JSON locator the web reader stores in epubcfi_start
+// for PDF text highlights (page-fraction rects; page index is 0-based).
+type pdfRectAnchor struct {
+	V     int         `json:"v"`
+	Page  int         `json:"page"`
+	Rects [][]float64 `json:"rects"`
+}
+
+// koreaderPos0 resolves a device-native KOReader pos0 from an annotation's
+// stored locators, whatever the source. Resolution order:
+//
+// extendXPointerByLength advances a CRE xpointer's trailing text-node
+// character offset by the rune length of text, so a highlight with only a
+// start anchor still gets a plausible (non-collapsed) end for drawing.
+// Overshooting the node just clamps on the device.
+func extendXPointerByLength(xp, text string) string {
+	if xp == "" || text == "" {
+		return xp
+	}
+	i := strings.LastIndex(xp, ".")
+	if i < 0 {
+		return xp
+	}
+	off, err := strconv.Atoi(xp[i+1:])
+	if err != nil {
+		return xp
+	}
+	return xp[:i+1] + strconv.Itoa(off+utf8.RuneCountInString(text))
+}
+
+// KOReader paints highlight colors from a fixed set of names
+// (Blitbuffer.HIGHLIGHT_COLORS); the web reader uses hex swatches. Map at
+// the boundary so each side always receives something it can render;
+// unmappable values fall back to each side's default (yellow).
+var koreaderColorFromName = map[string]string{
+	"yellow": "#ffd54f",
+	"orange": "#ffd54f",
+	"green":  "#a5d6a7",
+	"olive":  "#a5d6a7",
+	"cyan":   "#90caf9",
+	"blue":   "#90caf9",
+	"purple": "#ce93d8",
+	"red":    "#f48fb1",
+}
+
+// mapColorFromKOReader normalizes a device color name to a web hex
+// swatch (default yellow) when ingesting device pushes.
+func mapColorFromKOReader(name string) string {
+	if hex, ok := koreaderColorFromName[strings.ToLower(strings.TrimSpace(name))]; ok {
+		return hex
+	}
+	return "#ffd54f"
+}
+
+var koreaderColorFromHex = map[string]string{
+	"#ffd54f": "yellow",
+	"#a5d6a7": "green",
+	"#90caf9": "blue",
+	"#ce93d8": "purple",
+	"#f48fb1": "purple",
+}
+
+// mapColorToKOReader normalizes a web hex swatch to the nearest KOReader
+// color name (default yellow) when serving to devices. Pink maps to purple
+// (the palette's closest); round-trip drift is prevented on the device by
+// suppressing echo colors for un-edited applied entries.
+func mapColorToKOReader(hex string) string {
+	if name, ok := koreaderColorFromHex[strings.ToLower(strings.TrimSpace(hex))]; ok {
+		return name
+	}
+	return "yellow"
+}
+
+//  1. A device-native CRE xpointer ("/body/...") in startPosition wins —
+//     round-trip identical for KOReader-pushed annotations (converting the
+//     stored CFI instead could drift and duplicate on the device).
+//  2. The web reader's PDF JSON anchor → bare page number (KOReader paging
+//     documents use the page number as pos0).
+//  3. A stored EPUB CFI (epubcfi_start, or startPosition without the
+//     reader's "cfi:" prefix) → converted to a CRE xpointer, with
+//     contextText (the selection text) enabling the text-search fallback.
+//  4. A "page:N" or bare-numeric position → the bare number.
+//
+// Returns "" when nothing usable exists; callers skip such annotations so
+// devices never receive locators they cannot place.
+func (h *KOReaderHandler) koreaderPos0(c *echo.Context, mediaItem database.MediaItems, startPosition, epubcfi, contextText string) string {
+	if wsync.IsCREXPointer(startPosition) {
+		return startPosition
+	}
+	if strings.HasPrefix(epubcfi, "{") {
+		var anchor pdfRectAnchor
+		if json.Unmarshal([]byte(epubcfi), &anchor) == nil && anchor.Page >= 0 {
+			return strconv.Itoa(anchor.Page)
+		}
+	}
+	cfi := epubcfi
+	if cfi == "" && strings.HasPrefix(startPosition, "cfi:") {
+		cfi = strings.TrimPrefix(startPosition, "cfi:")
+	}
+	if cfi != "" && wsync.IsStandardEPUBCFI(cfi) {
+		if converted := h.reverseConvertCFI(c, mediaItem, cfi, contextText); converted != "" {
+			return converted
+		}
+		// Conversion failed; fall through so numeric positions still work.
+		if wsync.IsCREXPointer(cfi) {
+			return cfi
+		}
+	}
+	if p := strings.TrimPrefix(startPosition, "page:"); p != "" && parsePageInt(p) >= 0 {
+		return p
+	}
+	return ""
+}
+
+func parsePageInt(s string) int64 {
+	var n int64
+	for _, r := range s {
+		if r < '0' || r > '9' {
+			return -1
+		}
+		n = n*10 + int64(r-'0')
+	}
+	return n
+}
+
 func (h *KOReaderHandler) GetLibrary(c *echo.Context) error {
 	device := c.Get("device").(database.Devices)
 	userID := device.UserID.Bytes
@@ -1195,13 +1510,13 @@ func (h *KOReaderHandler) SyncBookmarks(c *echo.Context) error {
 			endPos = startPos
 		}
 
-		color := "#ffff00"
+		color := "#ffd54f"
 		if highlight.Color != "" {
-			color = highlight.Color
+			color = mapColorFromKOReader(highlight.Color)
 		}
 
 		if h.annotationSvc != nil {
-			epubcfiStart, epubcfiEnd := h.convertHighlightPositions(ctx, mediaItemID, highlight.Pos0, highlight.Pos1)
+			epubcfiStart, epubcfiEnd := h.convertHighlightPositions(ctx, mediaItemID, highlight.Pos0, highlight.Pos1, highlight.Text)
 
 			pctStart := 0.0
 			if highlight.Percentage != nil {

internal/handlers/media.go

@@ -115,20 +115,51 @@ type UpdateMediaNoteRequest struct {
 
 // CreateMediaHighlightRequest represents the request for creating a media highlight
 type CreateMediaHighlightRequest struct {
-	SelectionText string `json:"selection_text" validate:"required,min=1,max=5000"`
-	StartPosition string `json:"start_position" validate:"required,max=100"`
-	EndPosition   string `json:"end_position" validate:"required,max=100"`
-	Color         string `json:"color" validate:"omitempty,len=7"`
-	NoteID        string `json:"note_id"`
+	SelectionText    string  `json:"selection_text" validate:"required,min=1,max=5000"`
+	StartPosition    string  `json:"start_position" validate:"max=1000"`
+	EndPosition      string  `json:"end_position" validate:"max=1000"`
+	EpubcfiStart     string  `json:"epubcfi_start" validate:"max=2000"`
+	EpubcfiEnd       string  `json:"epubcfi_end" validate:"max=2000"`
+	Color            string  `json:"color" validate:"omitempty,len=7"`
+	NoteText         string  `json:"note_text" validate:"max=10000"`
+	NoteID           string  `json:"note_id"`
+	PercentageStart  float64 `json:"percentage_start"`
+	PercentageEnd    float64 `json:"percentage_end"`
+	ChapterReference int32   `json:"chapter_reference"`
 }
 
 // UpdateMediaHighlightRequest represents the request for updating a media highlight
 type UpdateMediaHighlightRequest struct {
-	SelectionText string `json:"selection_text" validate:"required,min=1,max=5000"`
-	StartPosition string `json:"start_position" validate:"required,max=100"`
-	EndPosition   string `json:"end_position" validate:"required,max=100"`
-	Color         string `json:"color" validate:"omitempty,len=7"`
-	NoteID        string `json:"note_id"`
+	SelectionText    string  `json:"selection_text" validate:"required,min=1,max=5000"`
+	StartPosition    string  `json:"start_position" validate:"max=1000"`
+	EndPosition      string  `json:"end_position" validate:"max=1000"`
+	EpubcfiStart     string  `json:"epubcfi_start" validate:"max=2000"`
+	EpubcfiEnd       string  `json:"epubcfi_end" validate:"max=2000"`
+	Color            string  `json:"color" validate:"omitempty,len=7"`
+	NoteText         string  `json:"note_text" validate:"max=10000"`
+	NoteID           string  `json:"note_id"`
+	PercentageStart  float64 `json:"percentage_start"`
+	PercentageEnd    float64 `json:"percentage_end"`
+	ChapterReference int32   `json:"chapter_reference"`
+}
+
+// CreateMediaBookmarkRequest represents the request for creating a media bookmark
+type CreateMediaBookmarkRequest struct {
+	Title            string  `json:"title" validate:"required,min=1,max=255"`
+	Position         string  `json:"position" validate:"max=100"`
+	Notes            string  `json:"notes" validate:"max=10000"`
+	CfiPosition      string  `json:"cfi_position" validate:"max=255"`
+	PageNumber       int32   `json:"page_number"`
+	ChapterNumber    int32   `json:"chapter_number"`
+	Percentage       float64 `json:"percentage"`
+	ChapterReference int32   `json:"chapter_reference"`
+}
+
+// UpdateMediaBookmarkRequest represents the request for updating a media bookmark
+type UpdateMediaBookmarkRequest struct {
+	Title    string `json:"title" validate:"required,min=1,max=255"`
+	Notes    string `json:"notes" validate:"max=10000"`
+	Position string `json:"position" validate:"max=100"`
 }
 
 type MediaHandler struct {
@@ -1557,14 +1588,20 @@ func (mh *MediaHandler) CreateMediaHighlight(c *echo.Context) error {
 
 	if mh.annotationSvc != nil {
 		result, err := mh.annotationSvc.SaveHighlight(c.Request().Context(), wsync.SaveHighlightRequest{
-			MediaItemID:    pgMediaID,
-			UserID:         pgUserID,
-			SelectionText:  req.SelectionText,
-			StartPosition:  req.StartPosition,
-			EndPosition:    req.EndPosition,
-			Color:          color,
-			Source:         "web",
-			ModifiedAt:     time.Now(),
+			MediaItemID:      pgMediaID,
+			UserID:           pgUserID,
+			SelectionText:    req.SelectionText,
+			StartPosition:    req.StartPosition,
+			EndPosition:      req.EndPosition,
+			EpubcfiStart:     req.EpubcfiStart,
+			EpubcfiEnd:       req.EpubcfiEnd,
+			Color:            color,
+			NoteText:         req.NoteText,
+			PercentageStart:  req.PercentageStart,
+			PercentageEnd:    req.PercentageEnd,
+			ChapterReference: req.ChapterReference,
+			Source:           "web",
+			ModifiedAt:       time.Now(),
 		})
 		if err != nil {
 			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
@@ -1637,6 +1674,42 @@ func (mh *MediaHandler) UpdateMediaHighlight(c *echo.Context) error {
 		color = req.Color
 	}
 
+	// Prefer the sync-aware path: the same selection text + CFI resolves to
+	// the same dedup key, so this performs an LWW update of the existing row
+	// (including note_text and CFI columns the plain query cannot touch).
+	if mh.annotationSvc != nil {
+		userID := c.Get("user_id").(string)
+		userUUID, err := uuid.Parse(userID)
+		if err != nil {
+			return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid user"})
+		}
+		mediaID := c.Param("id")
+		mediaUUID, err := uuid.Parse(mediaID)
+		if err != nil {
+			return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid media item id"})
+		}
+		result, err := mh.annotationSvc.SaveHighlight(c.Request().Context(), wsync.SaveHighlightRequest{
+			MediaItemID:      pgtype.UUID{Bytes: mediaUUID, Valid: true},
+			UserID:           pgtype.UUID{Bytes: userUUID, Valid: true},
+			SelectionText:    req.SelectionText,
+			StartPosition:    req.StartPosition,
+			EndPosition:      req.EndPosition,
+			EpubcfiStart:     req.EpubcfiStart,
+			EpubcfiEnd:       req.EpubcfiEnd,
+			Color:            color,
+			NoteText:         req.NoteText,
+			PercentageStart:  req.PercentageStart,
+			PercentageEnd:    req.PercentageEnd,
+			ChapterReference: req.ChapterReference,
+			Source:           "web",
+			ModifiedAt:       time.Now(),
+		})
+		if err != nil {
+			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
+		}
+		return c.JSON(http.StatusOK, result.Highlight)
+	}
+
 	highlight, err := mh.db.UpdateMediaHighlight(c.Request().Context(), database.UpdateMediaHighlightParams{
 		ID:            pgtype.UUID{Bytes: highlightUUID, Valid: true},
 		SelectionText: req.SelectionText,
@@ -1677,6 +1750,152 @@ func (mh *MediaHandler) DeleteMediaHighlight(c *echo.Context) error {
 	return c.NoContent(http.StatusNoContent)
 }
 
+// GetMediaBookmarks handles GET /api/media-items/:id/bookmarks
+func (mh *MediaHandler) GetMediaBookmarks(c *echo.Context) error {
+	userID := c.Get("user_id").(string)
+	userUUID, err := uuid.Parse(userID)
+	if err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid user"})
+	}
+
+	mediaID := c.Param("id")
+	mediaUUID, err := uuid.Parse(mediaID)
+	if err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid media item id"})
+	}
+
+	bookmarks, err := mh.db.GetMediaBookmarks(c.Request().Context(), database.GetMediaBookmarksParams{
+		MediaItemID: pgtype.UUID{Bytes: mediaUUID, Valid: true},
+		UserID:      pgtype.UUID{Bytes: userUUID, Valid: true},
+	})
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
+	}
+
+	return c.JSON(http.StatusOK, bookmarks)
+}
+
+// CreateMediaBookmark handles POST /api/media-items/:id/bookmarks
+func (mh *MediaHandler) CreateMediaBookmark(c *echo.Context) error {
+	userID := c.Get("user_id").(string)
+	userUUID, err := uuid.Parse(userID)
+	if err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid user"})
+	}
+
+	mediaID := c.Param("id")
+	mediaUUID, err := uuid.Parse(mediaID)
+	if err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid media item id"})
+	}
+
+	var req CreateMediaBookmarkRequest
+	if err := c.Bind(&req); err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid request"})
+	}
+	if err := c.Validate(&req); err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
+	}
+
+	// The sync-aware path (dedup + LWW + tombstones) is preferred; fall back
+	// to the plain query when the service isn't wired (e.g. some tests).
+	if mh.annotationSvc != nil {
+		result, err := mh.annotationSvc.SaveBookmark(c.Request().Context(), wsync.SaveBookmarkRequest{
+			MediaItemID:      pgtype.UUID{Bytes: mediaUUID, Valid: true},
+			UserID:           pgtype.UUID{Bytes: userUUID, Valid: true},
+			Title:            req.Title,
+			Position:         req.Position,
+			Notes:            req.Notes,
+			PageNumber:       req.PageNumber,
+			ChapterNumber:    req.ChapterNumber,
+			CFIPosition:      req.CfiPosition,
+			PercentageLoc:    req.Percentage,
+			ChapterReference: req.ChapterReference,
+			Source:           "web",
+			ModifiedAt:       time.Now(),
+		})
+		if err != nil {
+			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
+		}
+		return c.JSON(http.StatusCreated, result.Bookmark)
+	}
+
+	bookmark, err := mh.db.CreateMediaBookmark(c.Request().Context(), database.CreateMediaBookmarkParams{
+		MediaItemID:   pgtype.UUID{Bytes: mediaUUID, Valid: true},
+		UserID:        pgtype.UUID{Bytes: userUUID, Valid: true},
+		PageNumber:    pgtype.Int4{Int32: req.PageNumber, Valid: req.PageNumber > 0},
+		ChapterNumber: pgtype.Int4{Int32: req.ChapterNumber, Valid: req.ChapterNumber > 0},
+		CfiPosition:   pgtype.Text{String: req.CfiPosition, Valid: req.CfiPosition != ""},
+		Title:         req.Title,
+		Position:      pgtype.Text{String: req.Position, Valid: req.Position != ""},
+		Notes:         pgtype.Text{String: req.Notes, Valid: req.Notes != ""},
+	})
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
+	}
+	return c.JSON(http.StatusCreated, bookmark)
+}
+
+// UpdateMediaBookmark handles PUT /api/media-items/:id/bookmarks/:bookmarkId
+func (mh *MediaHandler) UpdateMediaBookmark(c *echo.Context) error {
+	userID := c.Get("user_id").(string)
+	userUUID, err := uuid.Parse(userID)
+	if err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid user"})
+	}
+
+	bookmarkID := c.Param("bookmarkId")
+	bookmarkUUID, err := uuid.Parse(bookmarkID)
+	if err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid bookmark id"})
+	}
+
+	var req UpdateMediaBookmarkRequest
+	if err := c.Bind(&req); err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid request"})
+	}
+	if err := c.Validate(&req); err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
+	}
+
+	bookmark, err := mh.db.UpdateMediaBookmark(c.Request().Context(), database.UpdateMediaBookmarkParams{
+		ID:       pgtype.UUID{Bytes: bookmarkUUID, Valid: true},
+		Title:    req.Title,
+		Notes:    pgtype.Text{String: req.Notes, Valid: req.Notes != ""},
+		Position: pgtype.Text{String: req.Position, Valid: req.Position != ""},
+		UserID:   pgtype.UUID{Bytes: userUUID, Valid: true},
+	})
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
+	}
+
+	return c.JSON(http.StatusOK, bookmark)
+}
+
+// DeleteMediaBookmark handles DELETE /api/media-items/:id/bookmarks/:bookmarkId
+func (mh *MediaHandler) DeleteMediaBookmark(c *echo.Context) error {
+	bookmarkID := c.Param("bookmarkId")
+	bookmarkUUID, err := uuid.Parse(bookmarkID)
+	if err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid bookmark id"})
+	}
+
+	pgBookmarkID := pgtype.UUID{Bytes: bookmarkUUID, Valid: true}
+
+	if mh.annotationSvc != nil {
+		if err := mh.annotationSvc.TombstoneBookmarkByID(c.Request().Context(), pgBookmarkID, "web"); err != nil {
+			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
+		}
+		return c.NoContent(http.StatusNoContent)
+	}
+
+	if err := mh.db.DeleteMediaBookmark(c.Request().Context(), pgBookmarkID); err != nil {
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
+	}
+
+	return c.NoContent(http.StatusNoContent)
+}
+
 // SearchMediaItems handles GET /api/media-items/search
 // Supports two modes:
 // 1. Autocomplete: author=value, genre=value, etc. → returns field values for dropdowns

internal/router/media.go

@@ -41,6 +41,12 @@ func registerMediaRoutes(cfg *Config) {
 	protected.PUT("/media-items/:id/highlights/:highlightId", cfg.MediaHandler.UpdateMediaHighlight)
 	protected.DELETE("/media-items/:id/highlights/:highlightId", cfg.MediaHandler.DeleteMediaHighlight)
 
+	// Bookmark routes (all authenticated users)
+	protected.GET("/media-items/:id/bookmarks", cfg.MediaHandler.GetMediaBookmarks)
+	protected.POST("/media-items/:id/bookmarks", cfg.MediaHandler.CreateMediaBookmark)
+	protected.PUT("/media-items/:id/bookmarks/:bookmarkId", cfg.MediaHandler.UpdateMediaBookmark)
+	protected.DELETE("/media-items/:id/bookmarks/:bookmarkId", cfg.MediaHandler.DeleteMediaBookmark)
+
 	// Admin-only media routes
 	admin.POST("/media-items", cfg.MediaHandler.CreateMediaItem)
 	admin.PUT("/media-items/:id", cfg.MediaHandler.UpdateMediaItem)

internal/services/reader.go

@@ -392,18 +392,23 @@ func (s *ReaderService) UpdateSettings(
 
 func (s *ReaderService) getDefaultSettings() map[string]interface{} {
 	return map[string]interface{}{
-		"chrome_behavior":    "auto-hide",
-		"progress_mode":      "pages",
-		"chrome_theme":       "tokyo-night",
-		"reading_theme":      "dark",
-		"reading_font":       "literata",
-		"font_size":          16,
-		"line_height":        1.6,
-		"margin_width":       20,
-		"tap_zone_size":      30,
-		"auto_scroll":        false,
-		"panel_zoom_enabled": true,
-		"double_page_spread": true,
+		"chrome_behavior":      "auto-hide",
+		"progress_mode":        "pages",
+		"chrome_theme":         "tokyo-night",
+		"reading_theme":        "dark",
+		"reading_font":         "literata",
+		"font_size":            16,
+		"line_height":          1.6,
+		"margin_width":         20,
+		"tap_zone_size":        30,
+		"auto_scroll":          false,
+		"panel_zoom_enabled":   true,
+		"double_page_spread":   true,
+		"pdf_interaction_mode": "select",
+		"fx_brightness":        1,
+		"fx_contrast":          1,
+		"fx_invert":            false,
+		"tap_zones_enabled":    true,
 
 		// Dockable panel defaults
 		"panel_layout": map[string]interface{}{

internal/sync/annotations.go

@@ -23,8 +23,8 @@ import (
 const TombstoneTTL = 30 * 24 * time.Hour
 
 type AnnotationService struct {
-	db      *database.Queries
-	connMgr *ConnectionManager
+	db       *database.Queries
+	connMgr  *ConnectionManager
 	settings *database.SettingsRegistry
 }
 
@@ -75,6 +75,11 @@ type SaveHighlightRequest struct {
 	Source           string
 	ModifiedAt       time.Time
 	DeviceSyncData   json.RawMessage
+	// DedupKey overrides the computed key when the client echoes back an
+	// annotation it received from us (device echoes carry device-native
+	// locators, so the computed key would never match the original row and
+	// every pull→push cycle would mint a duplicate).
+	DedupKey string
 }
 
 type SaveHighlightResult struct {
@@ -84,7 +89,10 @@ type SaveHighlightResult struct {
 }
 
 func (s *AnnotationService) SaveHighlight(ctx context.Context, req SaveHighlightRequest) (*SaveHighlightResult, error) {
-	dedupKey := ComputeDedupKey(req.SelectionText, req.EpubcfiStart, req.StartPosition)
+	dedupKey := req.DedupKey
+	if dedupKey == "" {
+		dedupKey = ComputeDedupKey(req.SelectionText, req.EpubcfiStart, req.StartPosition)
+	}
 
 	existing, err := s.db.GetMediaHighlightByDedupKey(ctx, database.GetMediaHighlightByDedupKeyParams{
 		UserID:      req.UserID,
@@ -100,10 +108,12 @@ func (s *AnnotationService) SaveHighlight(ctx context.Context, req SaveHighlight
 	}
 
 	if existing.Deleted.Bool {
-		if existing.DeletedAt.Valid && time.Since(existing.DeletedAt.Time) < s.tombstoneTTL() {
+		if !incomingNewerThanTombstone(req.ModifiedAt, existing.DeletedAt, existing.LastModifiedAt) {
 			return &SaveHighlightResult{Highlight: existing, Outcome: SaveOutcomeDeleted}, nil
 		}
-		return s.createHighlight(ctx, req, dedupKey)
+		// Newer than the tombstone: a deliberate re-create. Resurrect via the
+		// LWW update (which clears deleted/deleted_at).
+		return s.applyLWW(ctx, req, existing, dedupKey)
 	}
 
 	return s.applyLWW(ctx, req, existing, dedupKey)
@@ -122,22 +132,22 @@ func (s *AnnotationService) createHighlight(
 	deviceData := mergeDeviceSyncData(nil, req.Source, req.DeviceSyncData)
 
 	highlight, err := s.db.CreateMediaHighlightFull(ctx, database.CreateMediaHighlightFullParams{
-		MediaItemID:      req.MediaItemID,
-		UserID:           req.UserID,
-		SelectionText:    req.SelectionText,
-		StartPosition:    pgText(req.StartPosition),
-		EndPosition:      pgText(req.EndPosition),
-		Color:            pgText(req.Color),
-		NoteText:         pgText(req.NoteText),
-		PercentageStart:  pgFloat8(req.PercentageStart),
-		PercentageEnd:    pgFloat8(req.PercentageEnd),
-		EpubcfiStart:     pgText(req.EpubcfiStart),
-		EpubcfiEnd:       pgText(req.EpubcfiEnd),
-		ChapterReference: pgInt4(req.ChapterReference),
-		DedupKey:         pgtype.Text{String: dedupKey, Valid: true},
-		LastModifiedAt:   pgtype.Timestamptz{Time: modifiedAt, Valid: true},
+		MediaItemID:        req.MediaItemID,
+		UserID:             req.UserID,
+		SelectionText:      req.SelectionText,
+		StartPosition:      pgText(req.StartPosition),
+		EndPosition:        pgText(req.EndPosition),
+		Color:              pgText(req.Color),
+		NoteText:           pgText(req.NoteText),
+		PercentageStart:    pgFloat8(req.PercentageStart),
+		PercentageEnd:      pgFloat8(req.PercentageEnd),
+		EpubcfiStart:       pgText(req.EpubcfiStart),
+		EpubcfiEnd:         pgText(req.EpubcfiEnd),
+		ChapterReference:   pgInt4(req.ChapterReference),
+		DedupKey:           pgtype.Text{String: dedupKey, Valid: true},
+		LastModifiedAt:     pgtype.Timestamptz{Time: modifiedAt, Valid: true},
 		LastModifiedSource: pgtype.Text{String: req.Source, Valid: req.Source != ""},
-		DeviceSyncData:   deviceData,
+		DeviceSyncData:     deviceData,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("create highlight: %w", err)
@@ -177,20 +187,20 @@ func (s *AnnotationService) applyLWW(
 	deviceData := mergeDeviceSyncData(existing.DeviceSyncData, req.Source, req.DeviceSyncData)
 
 	highlight, err := s.db.UpdateMediaHighlightForSync(ctx, database.UpdateMediaHighlightForSyncParams{
-		ID:               existing.ID,
-		SelectionText:    req.SelectionText,
-		StartPosition:    pgText(req.StartPosition),
-		EndPosition:      pgText(req.EndPosition),
-		Color:            pgText(req.Color),
-		NoteText:         pgText(req.NoteText),
-		PercentageStart:  pgFloat8(req.PercentageStart),
-		PercentageEnd:    pgFloat8(req.PercentageEnd),
-		EpubcfiStart:     pgText(req.EpubcfiStart),
-		EpubcfiEnd:       pgText(req.EpubcfiEnd),
-		ChapterReference: pgInt4(req.ChapterReference),
-		LastModifiedAt:   pgtype.Timestamptz{Time: modifiedAt, Valid: true},
+		ID:                 existing.ID,
+		SelectionText:      req.SelectionText,
+		StartPosition:      pgText(req.StartPosition),
+		EndPosition:        pgText(req.EndPosition),
+		Color:              pgText(req.Color),
+		NoteText:           pgText(req.NoteText),
+		PercentageStart:    pgFloat8(req.PercentageStart),
+		PercentageEnd:      pgFloat8(req.PercentageEnd),
+		EpubcfiStart:       pgText(req.EpubcfiStart),
+		EpubcfiEnd:         pgText(req.EpubcfiEnd),
+		ChapterReference:   pgInt4(req.ChapterReference),
+		LastModifiedAt:     pgtype.Timestamptz{Time: modifiedAt, Valid: true},
 		LastModifiedSource: pgtype.Text{String: req.Source, Valid: req.Source != ""},
-		DeviceSyncData:   deviceData,
+		DeviceSyncData:     deviceData,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("update highlight: %w", err)
@@ -333,6 +343,7 @@ type SaveNoteRequest struct {
 	Source             string
 	ModifiedAt         time.Time
 	DeviceSyncData     []byte
+	DedupKey           string // overrides the computed key for device echoes
 }
 
 type SaveNoteResult struct {
@@ -346,7 +357,10 @@ func (s *AnnotationService) SaveNote(ctx context.Context, req SaveNoteRequest) (
 		return nil, errors.New("invalid user_id or media_item_id")
 	}
 
-	dedupKey := ComputeDedupKey(req.Content, req.EpubcfiLocation, req.Position)
+	dedupKey := req.DedupKey
+	if dedupKey == "" {
+		dedupKey = ComputeDedupKey(req.Content, req.EpubcfiLocation, req.Position)
+	}
 
 	existing, err := s.db.GetMediaNoteByDedupKey(ctx, database.GetMediaNoteByDedupKeyParams{
 		UserID:      req.UserID,
@@ -361,7 +375,11 @@ func (s *AnnotationService) SaveNote(ctx context.Context, req SaveNoteRequest) (
 	}
 
 	if existing.Deleted.Valid && existing.Deleted.Bool {
-		return &SaveNoteResult{Note: existing, Outcome: SaveOutcomeDeleted}, nil
+		if !incomingNewerThanTombstone(req.ModifiedAt, existing.DeletedAt, existing.LastModifiedAt) {
+			return &SaveNoteResult{Note: existing, Outcome: SaveOutcomeDeleted}, nil
+		}
+		// Newer than the tombstone: a deliberate re-create. Resurrect.
+		return s.applyNoteLWW(ctx, req, existing, dedupKey)
 	}
 
 	return s.applyNoteLWW(ctx, req, existing, dedupKey)
@@ -479,6 +497,9 @@ type SaveBookmarkRequest struct {
 	Source           string
 	ModifiedAt       time.Time
 	DeviceSyncData   json.RawMessage
+	// DedupKey overrides the computed key for device echoes (see
+	// SaveHighlightRequest).
+	DedupKey string
 }
 
 type SaveBookmarkResult struct {
@@ -488,7 +509,10 @@ type SaveBookmarkResult struct {
 }
 
 func (s *AnnotationService) SaveBookmark(ctx context.Context, req SaveBookmarkRequest) (*SaveBookmarkResult, error) {
-	dedupKey := ComputeDedupKey(req.Title, req.EpubcfiLocation, req.Position)
+	dedupKey := req.DedupKey
+	if dedupKey == "" {
+		dedupKey = ComputeDedupKey(req.Title, req.EpubcfiLocation, req.Position)
+	}
 
 	existing, err := s.db.GetMediaBookmarkByDedupKey(ctx, database.GetMediaBookmarkByDedupKeyParams{
 		UserID:      req.UserID,
@@ -504,10 +528,13 @@ func (s *AnnotationService) SaveBookmark(ctx context.Context, req SaveBookmarkRe
 	}
 
 	if existing.Deleted.Bool {
-		if existing.DeletedAt.Valid && time.Since(existing.DeletedAt.Time) < s.tombstoneTTL() {
+		if !incomingNewerThanTombstone(req.ModifiedAt, existing.DeletedAt, existing.LastModifiedAt) {
 			return &SaveBookmarkResult{Bookmark: existing, Outcome: SaveOutcomeDeleted}, nil
 		}
-		return s.createBookmark(ctx, req, dedupKey)
+		// Newer than the tombstone: a deliberate re-create. Resurrect via the
+		// LWW update instead of INSERT (the tombstoned row still holds the
+		// UNIQUE(media_item_id, user_id, title) slot).
+		return s.applyBookmarkLWW(ctx, req, existing, dedupKey)
 	}
 
 	return s.applyBookmarkLWW(ctx, req, existing, dedupKey)
@@ -521,21 +548,21 @@ func (s *AnnotationService) createBookmark(ctx context.Context, req SaveBookmark
 	deviceData := mergeDeviceSyncData(nil, req.Source, req.DeviceSyncData)
 
 	bm, err := s.db.CreateMediaBookmarkFull(ctx, database.CreateMediaBookmarkFullParams{
-		MediaItemID:      req.MediaItemID,
-		UserID:           req.UserID,
-		PageNumber:       pgInt4(req.PageNumber),
-		ChapterNumber:    pgInt4(req.ChapterNumber),
-		CfiPosition:      pgText(req.CFIPosition),
-		Title:            req.Title,
-		Position:         pgText(req.Position),
-		Notes:            pgText(req.Notes),
+		MediaItemID:        req.MediaItemID,
+		UserID:             req.UserID,
+		PageNumber:         pgInt4(req.PageNumber),
+		ChapterNumber:      pgInt4(req.ChapterNumber),
+		CfiPosition:        pgText(req.CFIPosition),
+		Title:              req.Title,
+		Position:           pgText(req.Position),
+		Notes:              pgText(req.Notes),
 		PercentageLocation: pgFloat8(req.PercentageLoc),
-		EpubcfiLocation:  pgText(req.EpubcfiLocation),
-		ChapterReference: pgInt4(req.ChapterReference),
-		DedupKey:         pgtype.Text{String: dedupKey, Valid: true},
-		LastModifiedAt:   pgtype.Timestamptz{Time: modifiedAt, Valid: true},
+		EpubcfiLocation:    pgText(req.EpubcfiLocation),
+		ChapterReference:   pgInt4(req.ChapterReference),
+		DedupKey:           pgtype.Text{String: dedupKey, Valid: true},
+		LastModifiedAt:     pgtype.Timestamptz{Time: modifiedAt, Valid: true},
 		LastModifiedSource: pgtype.Text{String: req.Source, Valid: req.Source != ""},
-		DeviceSyncData:   deviceData,
+		DeviceSyncData:     deviceData,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("create bookmark: %w", err)
@@ -564,19 +591,19 @@ func (s *AnnotationService) applyBookmarkLWW(ctx context.Context, req SaveBookma
 	deviceData := mergeDeviceSyncData(existing.DeviceSyncData, req.Source, req.DeviceSyncData)
 
 	bm, err := s.db.UpdateMediaBookmarkForSync(ctx, database.UpdateMediaBookmarkForSyncParams{
-		ID:               existing.ID,
-		PageNumber:       pgInt4(req.PageNumber),
-		ChapterNumber:    pgInt4(req.ChapterNumber),
-		CfiPosition:      pgText(req.CFIPosition),
-		Title:            req.Title,
-		Position:         pgText(req.Position),
-		Notes:            pgText(req.Notes),
+		ID:                 existing.ID,
+		PageNumber:         pgInt4(req.PageNumber),
+		ChapterNumber:      pgInt4(req.ChapterNumber),
+		CfiPosition:        pgText(req.CFIPosition),
+		Title:              req.Title,
+		Position:           pgText(req.Position),
+		Notes:              pgText(req.Notes),
 		PercentageLocation: pgFloat8(req.PercentageLoc),
-		EpubcfiLocation:  pgText(req.EpubcfiLocation),
-		ChapterReference: pgInt4(req.ChapterReference),
-		LastModifiedAt:   pgtype.Timestamptz{Time: modifiedAt, Valid: true},
+		EpubcfiLocation:    pgText(req.EpubcfiLocation),
+		ChapterReference:   pgInt4(req.ChapterReference),
+		LastModifiedAt:     pgtype.Timestamptz{Time: modifiedAt, Valid: true},
 		LastModifiedSource: pgtype.Text{String: req.Source, Valid: req.Source != ""},
-		DeviceSyncData:   deviceData,
+		DeviceSyncData:     deviceData,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("update bookmark: %w", err)
@@ -717,6 +744,23 @@ func ComputeDedupKey(selectionText, epubcfiStart, startPosition string) string {
 	return hex.EncodeToString(h.Sum(nil))
 }
 
+// incomingNewerThanTombstone reports whether an incoming save should
+// resurrect a tombstoned annotation. A save carrying a modification time
+// newer than the tombstone (e.g. the user deliberately re-adding on the web,
+// or a device that genuinely re-created it) wins; a save with a missing or
+// older timestamp is treated as a stale replay from a client that still has
+// the deleted annotation, and the tombstone stands.
+func incomingNewerThanTombstone(incoming time.Time, deletedAt, lastModifiedAt pgtype.Timestamptz) bool {
+	if incoming.IsZero() {
+		return false
+	}
+	tombstone := deletedAt.Time
+	if lastModifiedAt.Valid && lastModifiedAt.Time.After(tombstone) {
+		tombstone = lastModifiedAt.Time
+	}
+	return incoming.After(tombstone)
+}
+
 func normalizeText(s string) string {
 	fields := strings.Fields(strings.ToLower(s))
 	return strings.Join(fields, " ")

internal/sync/annotations_test.go

@@ -341,3 +341,31 @@ func pgHighlights(text, color, note string, pctStart, pctEnd float64) database.M
 		PercentageEnd:   pgtype.Float8{Float64: pctEnd, Valid: pctEnd != 0},
 	}
 }
+
+func TestIncomingNewerThanTombstone(t *testing.T) {
+	base := time.Date(2026, 8, 14, 12, 0, 0, 0, time.UTC)
+	delAt := pgtype.Timestamptz{Time: base, Valid: true}
+	lastMod := pgtype.Timestamptz{Time: base.Add(-time.Minute), Valid: true}
+
+	tests := []struct {
+		name     string
+		incoming time.Time
+		deleted  pgtype.Timestamptz
+		lastMod  pgtype.Timestamptz
+		want     bool
+	}{
+		{"newer than tombstone resurrects", base.Add(time.Hour), delAt, lastMod, true},
+		{"older than tombstone is a stale replay", base.Add(-time.Hour), delAt, lastMod, false},
+		{"missing timestamp never resurrects", time.Time{}, delAt, lastMod, false},
+		{"exactly equal does not resurrect", base, delAt, lastMod, false},
+		{"last_modified newer than deleted_at wins", base.Add(30 * time.Minute), delAt, pgtype.Timestamptz{Time: base.Add(90 * time.Minute), Valid: true}, false},
+		{"invalid timestamps compare against deleted_at", base.Add(time.Hour), delAt, pgtype.Timestamptz{}, true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := incomingNewerThanTombstone(tt.incoming, tt.deleted, tt.lastMod); got != tt.want {
+				t.Errorf("incomingNewerThanTombstone() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

internal/sync/cfi_converter.go

@@ -11,6 +11,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync"
 	"unicode/utf8"
 
 	"golang.org/x/net/html"
@@ -19,6 +20,9 @@ import (
 type CFIConverter struct {
 	epubPath string
 	cache    *spineCache
+	// mu guards the lazily-built spine/doc caches: converter instances are
+	// shared across concurrent requests via the package cache in locators.go.
+	mu sync.Mutex
 }
 
 type spineItem struct {
@@ -37,6 +41,8 @@ func NewCFIConverter(epubPath string) *CFIConverter {
 }
 
 func (c *CFIConverter) loadSpine() (*spineCache, error) {
+	c.mu.Lock()
+	defer c.mu.Unlock()
 	if c.cache != nil {
 		return c.cache, nil
 	}
@@ -94,6 +100,8 @@ func (c *CFIConverter) getContentDoc(fragmentIndex int) (*html.Node, string, err
 	item := spine.items[spineIndex]
 	href := item.href
 
+	c.mu.Lock()
+	defer c.mu.Unlock()
 	if cached, ok := spine.docCache[href]; ok {
 		return cached, href, nil
 	}
@@ -243,6 +251,46 @@ type ConversionResult struct {
 	Precision  string
 }
 
+// SectionPercentage derives an approximate book-wide percentage for a CRE
+// xpointer from the char distribution across the spine: the midpoint of the
+// document it points into. Precision is per-section, which is what
+// percentage_start is used for (ordering/filtering) — and it lets thin
+// clients skip their own per-annotation page lookups entirely.
+func (c *CFIConverter) SectionPercentage(xpointer string) float64 {
+	xp, err := ParseCREXPointer(xpointer)
+	if err != nil {
+		return 0
+	}
+	spine, err := c.loadSpine()
+	if err != nil {
+		return 0
+	}
+	total := 0
+	charCounts := make([]int, len(spine.items))
+	for i := range spine.items {
+		doc, _, docErr := c.getContentDoc(i + 1)
+		if docErr != nil {
+			continue
+		}
+		if b := findBody(doc); b != nil {
+			charCounts[i] = countTextChars(b)
+			total += charCounts[i]
+		}
+	}
+	if total <= 0 {
+		return 0
+	}
+	idx := xp.FragmentIndex - 1
+	if idx < 0 || idx >= len(spine.items) {
+		return 0
+	}
+	before := 0
+	for i := 0; i < idx; i++ {
+		before += charCounts[i]
+	}
+	return (float64(before) + float64(charCounts[idx])/2) / float64(total)
+}
+
 func (c *CFIConverter) ConvertCREToStandard(xpointer string, storedPercentage float64, contextText string) (*ConversionResult, error) {
 	if IsCREFragmentID(xpointer) {
 		return c.convertFragmentID(xpointer, storedPercentage)
@@ -884,8 +932,8 @@ func readZipFile(zr *zip.Reader, name string) ([]byte, error) {
 }
 
 type opfContainer struct {
-	XMLName   xml.Name   `xml:"container"`
-	RootFiles []opfRoot  `xml:"rootfiles>rootfile"`
+	XMLName   xml.Name  `xml:"container"`
+	RootFiles []opfRoot `xml:"rootfiles>rootfile"`
 }
 
 type opfRoot struct {
@@ -906,8 +954,8 @@ func extractOPFPath(data []byte) (string, error) {
 }
 
 type xmlPackage struct {
-	XMLName xml.Name `xml:"package"`
-	Spine   xmlSpine `xml:"spine"`
+	XMLName  xml.Name    `xml:"package"`
+	Spine    xmlSpine    `xml:"spine"`
 	Manifest xmlManifest `xml:"manifest"`
 }
 
@@ -1036,9 +1084,9 @@ func preprocessXHTML(input string) string {
 }
 
 type cfiStep struct {
-	Index    int
-	ID       string
-	Offset   int
+	Index     int
+	ID        string
+	Offset    int
 	HasOffset bool
 }
 

internal/sync/cfi_converter_test.go

@@ -1,6 +1,8 @@
 package sync
 
 import (
+	"archive/zip"
+	"os"
 	"strings"
 	"testing"
 
@@ -9,7 +11,7 @@ import (
 
 func TestParseCREXPointer(t *testing.T) {
 	tests := []struct {
-		input   string
+		input    string
 		wantFrag int
 		wantPath int
 		wantChar int
@@ -72,9 +74,9 @@ func TestIsCREFragmentID(t *testing.T) {
 
 func TestParseCREFragmentID(t *testing.T) {
 	tests := []struct {
-		input       string
-		wantSpine   int
-		wantAnchor  string
+		input      string
+		wantSpine  int
+		wantAnchor string
 	}{
 		{"#_doc_fragment_5_ link2HCH0002", 5, "link2HCH0002"},
 		{"#_doc_fragment_0_", 0, ""},
@@ -116,57 +118,224 @@ func TestIsStandardEPUBCFI(t *testing.T) {
 	}
 }
 
-func TestConvert1984(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/George Orwell/1984 (126)/1984 - George Orwell.epub"
-	c := NewCFIConverter(epubPath)
+// writeTestEPUB builds a minimal, deterministic EPUB in a temp dir so the
+// conversion tests exercise the real zip→OPF→spine→document pipeline
+// without depending on books in a particular machine's uploads/ tree.
+//
+// Spine: doc1..doc6. doc2 carries the Dashwood sentence used for exact and
+// text-search anchoring; doc6 has an id anchor for fragment-ID conversion.
+func writeTestEPUB(t *testing.T) string {
+	t.Helper()
 
-	xp := "/body/DocFragment[2]/body/div/p[5]/text().500"
-	result, err := c.ConvertCREToStandard(xp, 0.01, "")
+	type spineDoc struct {
+		name string
+		body string
+	}
+	docs := []spineDoc{
+		{"doc1.xhtml", "<body><div><p>Chapter one opening page.</p></div></body>"},
+		{"doc2.xhtml", "<body><div><p>The family of Dashwood had long been settled in Sussex.</p><p>Their estate was large, and their residence was at Norland Park.</p></div></body>"},
+		{"doc3.xhtml", "<body><div><p>Chapter three contents.</p></div></body>"},
+		{"doc4.xhtml", "<body><div><p>Chapter four contents.</p></div></body>"},
+		{"doc5.xhtml", "<body><div><p>Chapter five contents.</p></div></body>"},
+		{"doc6.xhtml", "<body><div><p id=\"link2HCH0002\">He was neither fit to be a husband nor a father.</p></div></body>"},
+	}
+
+	containerXML := `<?xml version="1.0"?>
+<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
+  <rootfiles>
+    <rootfile full-path="OEBPS/content.opf" media-type="application/oebps-package+xml"/>
+  </rootfiles>
+</container>`
+
+	manifest := ""
+	spineRefs := ""
+	for _, d := range docs {
+		id := d.name[:len(d.name)-len(".xhtml")]
+		manifest += "    <item id=\"" + id + "\" href=\"" + d.name + "\" media-type=\"application/xhtml+xml\"/>\n"
+		spineRefs += "    <itemref idref=\"" + id + "\"/>\n"
+	}
+	opf := `<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="http://www.idpf.org/2007/opf" version="3.0" unique-identifier="uid">
+  <metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <dc:identifier id="uid">test-bookhoard-fixture</dc:identifier>
+    <dc:title>Fixture</dc:title>
+  </metadata>
+  <manifest>
+` + manifest + `  </manifest>
+  <spine>
+` + spineRefs + `  </spine>
+</package>`
+
+	path := t.TempDir() + "/fixture.epub"
+	f, err := os.Create(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer f.Close()
+	zw := zip.NewWriter(f)
+	write := func(name, content string) {
+		w, err := zw.Create(name)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if _, err := w.Write([]byte(content)); err != nil {
+			t.Fatal(err)
+		}
+	}
+	write("META-INF/container.xml", containerXML)
+	write("OEBPS/content.opf", opf)
+	for _, d := range docs {
+		write("OEBPS/"+d.name, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<html xmlns=\"http://www.w3.org/1999/xhtml\">"+d.body+"</html>\n")
+	}
+	if err := zw.Close(); err != nil {
+		t.Fatal(err)
+	}
+	return path
+}
+
+const fixtureSentence = "The family of Dashwood had long been settled in Sussex."
+
+func TestConvertXPointerToCFI(t *testing.T) {
+	c := NewCFIConverter(writeTestEPUB(t))
+
+	xp := "/body/DocFragment[2]/body/div[1]/p[1]/text().10"
+	result, err := c.ConvertCREToStandard(xp, 0.05, "")
 	if err != nil {
 		t.Fatalf("ConvertCREToStandard error: %v", err)
 	}
 	t.Logf("Input: %s", xp)
 	t.Logf("EPUBCFI: %s", result.EPUBCFI)
-	t.Logf("Href: %s", result.Href)
 	t.Logf("Precision: %s", result.Precision)
-	t.Logf("Percentage: %.4f", result.Percentage)
 
 	if result.Precision == "percentage" {
 		t.Error("expected better than percentage precision")
 	}
+	if result.EPUBCFI == "" {
+		t.Error("expected non-empty epubcfi")
+	}
 }
 
-func TestConvertCrimeAndPunishmentFragmentID(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/Fyodor Dostoyevsky/Crime and Punishment (103)/Crime and Punishment - Fyodor Dostoyevsky.epub"
-	c := NewCFIConverter(epubPath)
+func TestConvertFragmentID(t *testing.T) {
+	c := NewCFIConverter(writeTestEPUB(t))
 
-	xp := "#_doc_fragment_5_ link2HCH0002"
-	result, err := c.ConvertCREToStandard(xp, 0.0303, "")
+	frag := "#_doc_fragment_5_ link2HCH0002"
+	result, err := c.ConvertCREToStandard(frag, 0.9, "")
 	if err != nil {
 		t.Fatalf("ConvertCREToStandard error: %v", err)
 	}
-	t.Logf("Input: %s", xp)
-	t.Logf("EPUBCFI: %s", result.EPUBCFI)
+	t.Logf("Input: %s", frag)
 	t.Logf("Href: %s", result.Href)
 	t.Logf("Precision: %s", result.Precision)
-	t.Logf("Percentage: %.4f", result.Percentage)
 
-	if result.Precision == "percentage" {
-		t.Error("expected better than percentage precision")
+	if result.Precision != "element" {
+		t.Errorf("expected element precision, got %s", result.Precision)
 	}
 	if result.Href == "" {
 		t.Error("expected non-empty href")
 	}
-	if result.Precision != "element" {
-		t.Errorf("expected element precision, got %s", result.Precision)
+	if !strings.Contains(result.Href, "doc6.xhtml#link2HCH0002") {
+		t.Errorf("expected doc6.xhtml#link2HCH0002 href, got %s", result.Href)
 	}
 }
 
+func TestRoundTripXPointer(t *testing.T) {
+	c := NewCFIConverter(writeTestEPUB(t))
+
+	originalXP := "/body/DocFragment[2]/body/div[1]/p[1]/text().10"
+	forward, err := c.ConvertCREToStandard(originalXP, 0.05, "")
+	if err != nil {
+		t.Fatalf("forward conversion error: %v", err)
+	}
+	if forward.EPUBCFI == "" {
+		t.Fatal("forward conversion produced empty epubcfi")
+	}
+	t.Logf("Forward: %s → %s", originalXP, forward.EPUBCFI)
+
+	reverse, err := c.ConvertStandardToCRE(forward.EPUBCFI, forward.Percentage, "")
+	if err != nil {
+		t.Fatalf("reverse conversion error: %v", err)
+	}
+	if reverse.XPointer == "" {
+		t.Fatal("reverse conversion produced empty XPointer")
+	}
+	t.Logf("Reverse: %s → %s", forward.EPUBCFI, reverse.XPointer)
+
+	if reverse.Precision != "exact" {
+		t.Errorf("expected exact precision, got %s", reverse.Precision)
+	}
+}
+
+func TestRoundTripWithContextText(t *testing.T) {
+	c := NewCFIConverter(writeTestEPUB(t))
+
+	originalXP := "/body/DocFragment[2]/body/div[1]/p[2]/text().3"
+	forward, err := c.ConvertCREToStandard(originalXP, 0.06, fixtureSentence)
+	if err != nil {
+		t.Fatalf("forward conversion error: %v", err)
+	}
+	if forward.EPUBCFI == "" {
+		t.Fatal("forward conversion produced empty epubcfi")
+	}
+	t.Logf("Forward: %s → %s", originalXP, forward.EPUBCFI)
+
+	reverse, err := c.ConvertStandardToCRE(forward.EPUBCFI, forward.Percentage, fixtureSentence)
+	if err != nil {
+		t.Fatalf("reverse conversion error: %v", err)
+	}
+	if reverse.XPointer == "" {
+		t.Fatal("reverse conversion produced empty XPointer")
+	}
+	t.Logf("Reverse: %s → %s", forward.EPUBCFI, reverse.XPointer)
+
+	if reverse.Precision != "exact" {
+		t.Errorf("expected exact precision, got %s", reverse.Precision)
+	}
+}
+
+func TestReverseTextSearchFallback(t *testing.T) {
+	c := NewCFIConverter(writeTestEPUB(t))
+
+	// Unresolvable steps in a CFI that still parses to spine doc2
+	// (spine index 1): the text search must anchor on the sentence.
+	reverse, err := c.ConvertStandardToCRE("epubcfi(/6/4!/4/99999/1:0)", 0.05, fixtureSentence)
+	if err != nil {
+		t.Fatalf("reverse conversion error: %v", err)
+	}
+	t.Logf("Text search fallback XPointer: %s", reverse.XPointer)
+	t.Logf("Precision: %s", reverse.Precision)
+
+	if reverse.Precision != "exact" {
+		t.Errorf("expected exact precision from text search, got %s", reverse.Precision)
+	}
+	if reverse.XPointer == "" {
+		t.Error("expected non-empty XPointer from text search")
+	}
+	if !strings.Contains(reverse.XPointer, "DocFragment[2]") {
+		t.Errorf("expected fallback into DocFragment[2], got %s", reverse.XPointer)
+	}
+}
+
+func TestReversePercentageFallback(t *testing.T) {
+	c := NewCFIConverter(writeTestEPUB(t))
+
+	reverse, err := c.ConvertStandardToCRE("epubcfi(/6/4!/4/99999/1:0)", 0.5, "")
+	if err != nil {
+		t.Fatalf("reverse conversion error: %v", err)
+	}
+	t.Logf("Percentage fallback precision: %s", reverse.Precision)
+
+	if reverse.Precision != "percentage" {
+		t.Errorf("expected percentage precision, got %s with XPointer %s", reverse.Precision, reverse.XPointer)
+	}
+	if reverse.XPointer != "" {
+		t.Error("expected empty XPointer for percentage fallback")
+	}
+}
 func TestParseEPUBCFI(t *testing.T) {
 	tests := []struct {
-		input      string
-		wantSpine  int
-		wantSteps  int
+		input     string
+		wantSpine int
+		wantSteps int
 	}{
 		{"epubcfi(/6/12!/4/2/90/1:7)", 5, 4},
 		{"epubcfi(/6/4!/4/2/1:0)", 1, 3},
@@ -213,103 +382,6 @@ func TestParseEPUBCFIInvalid(t *testing.T) {
 	}
 }
 
-func TestRoundTrip1984(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/George Orwell/1984 (126)/1984 - George Orwell.epub"
-	c := NewCFIConverter(epubPath)
-
-	originalXP := "/body/DocFragment[2]/body/div/p[5]/text().500"
-	forward, err := c.ConvertCREToStandard(originalXP, 0.01, "")
-	if err != nil {
-		t.Fatalf("forward conversion error: %v", err)
-	}
-	if forward.EPUBCFI == "" {
-		t.Fatal("forward conversion produced empty epubcfi")
-	}
-	t.Logf("Forward: %s → %s", originalXP, forward.EPUBCFI)
-
-	reverse, err := c.ConvertStandardToCRE(forward.EPUBCFI, forward.Percentage, "")
-	if err != nil {
-		t.Fatalf("reverse conversion error: %v", err)
-	}
-	if reverse.XPointer == "" {
-		t.Fatal("reverse conversion produced empty XPointer")
-	}
-	t.Logf("Reverse: %s → %s", forward.EPUBCFI, reverse.XPointer)
-	t.Logf("Reverse precision: %s", reverse.Precision)
-
-	if reverse.Precision != "exact" {
-		t.Errorf("expected exact precision, got %s", reverse.Precision)
-	}
-}
-
-func TestRoundTripCP(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/Fyodor Dostoyevsky/Crime and Punishment (103)/Crime and Punishment - Fyodor Dostoyevsky.epub"
-	c := NewCFIConverter(epubPath)
-
-	originalXP := "/body/DocFragment[6]/body/div/p[47]/text().2399"
-	contextText := "Raskolnikov was not used to crowds, and, as we said before, he avoided society of every sort, more especially of l"
-	forward, err := c.ConvertCREToStandard(originalXP, 0.0579, contextText)
-	if err != nil {
-		t.Fatalf("forward conversion error: %v", err)
-	}
-	if forward.EPUBCFI == "" {
-		t.Fatal("forward conversion produced empty epubcfi")
-	}
-	t.Logf("Forward: %s → %s", originalXP, forward.EPUBCFI)
-
-	reverse, err := c.ConvertStandardToCRE(forward.EPUBCFI, forward.Percentage, contextText)
-	if err != nil {
-		t.Fatalf("reverse conversion error: %v", err)
-	}
-	if reverse.XPointer == "" {
-		t.Fatal("reverse conversion produced empty XPointer")
-	}
-	t.Logf("Reverse: %s → %s", forward.EPUBCFI, reverse.XPointer)
-	t.Logf("Reverse precision: %s", reverse.Precision)
-
-	if reverse.Precision != "exact" {
-		t.Errorf("expected exact precision, got %s", reverse.Precision)
-	}
-}
-
-func TestReverseTextSearchFallback(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/Fyodor Dostoyevsky/Crime and Punishment (103)/Crime and Punishment - Fyodor Dostoyevsky.epub"
-	c := NewCFIConverter(epubPath)
-
-	contextText := "Raskolnikov was not used to crowds, and, as we said before, he avoided society of every sort, more especially of l"
-	reverse, err := c.ConvertStandardToCRE("epubcfi(/6/12!/4/99999/1:0)", 0.0579, contextText)
-	if err != nil {
-		t.Fatalf("reverse conversion error: %v", err)
-	}
-	t.Logf("Text search fallback XPointer: %s", reverse.XPointer)
-	t.Logf("Precision: %s", reverse.Precision)
-
-	if reverse.Precision != "exact" {
-		t.Errorf("expected exact precision from text search, got %s", reverse.Precision)
-	}
-	if reverse.XPointer == "" {
-		t.Error("expected non-empty XPointer from text search")
-	}
-}
-
-func TestReversePercentageFallback(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/George Orwell/1984 (126)/1984 - George Orwell.epub"
-	c := NewCFIConverter(epubPath)
-
-	reverse, err := c.ConvertStandardToCRE("epubcfi(/6/12!/4/99999/1:0)", 0.5, "")
-	if err != nil {
-		t.Fatalf("reverse conversion error: %v", err)
-	}
-	t.Logf("Percentage fallback precision: %s", reverse.Precision)
-
-	if reverse.Precision != "percentage" {
-		t.Errorf("expected percentage precision, got %s with XPointer %s", reverse.Precision, reverse.XPointer)
-	}
-	if reverse.XPointer != "" {
-		t.Error("expected empty XPointer for percentage fallback")
-	}
-}
-
 func TestFindTextInNode_SingleTextNode(t *testing.T) {
 	doc := parseTestHTML(`<html><body><p>Hello world this is a test</p></body></html>`)
 	body := findBody(doc)

internal/sync/locators.go

@@ -1,6 +1,9 @@
 package sync
 
-import "log"
+import (
+	"log"
+	"sync"
+)
 
 type LocatorSource string
 
@@ -26,6 +29,35 @@ func isConvertible(formatGroup string) bool {
 	return formatGroup == string(FormatGroupReflowable)
 }
 
+// Converters parse and cache the whole EPUB (spine + content docs), so
+// creating one per annotation re-reads the book for every entry. A small
+// bounded cache lets one request — or several — share a single parse.
+// Servers are the right place for this work: clients stay thin.
+var (
+	converterMu    sync.Mutex
+	converterCache = map[string]*CFIConverter{}
+	converterOrder []string // insertion order for eviction
+)
+
+const maxCachedConverters = 8
+
+func cachedConverter(epubPath string) *CFIConverter {
+	converterMu.Lock()
+	defer converterMu.Unlock()
+	if c, ok := converterCache[epubPath]; ok {
+		return c
+	}
+	c := NewCFIConverter(epubPath)
+	converterCache[epubPath] = c
+	converterOrder = append(converterOrder, epubPath)
+	for len(converterOrder) > maxCachedConverters {
+		oldest := converterOrder[0]
+		converterOrder = converterOrder[1:]
+		delete(converterCache, oldest)
+	}
+	return c
+}
+
 func ConvertToCanonical(
 	source LocatorSource,
 	devicePos string,
@@ -48,7 +80,7 @@ func ConvertToCanonical(
 		if !IsCREXPointer(devicePos) {
 			return CanonicalLocator{CFI: devicePos, Precision: "already-standard", Percentage: percentage}
 		}
-		converter := NewCFIConverter(epubPath)
+		converter := cachedConverter(epubPath)
 		result, err := converter.ConvertCREToStandard(devicePos, percentage, contextText)
 		if err != nil || result == nil {
 			log.Printf("Bookhoard: locator CRE→CFI conversion failed: %v", err)
@@ -101,7 +133,7 @@ func ConvertFromCanonical(
 
 	switch source {
 	case LocatorSourceKOReader:
-		converter := NewCFIConverter(epubPath)
+		converter := cachedConverter(epubPath)
 		result, err := converter.ConvertStandardToCRE(canonicalCFI, percentage, contextText)
 		if err != nil || result == nil {
 			log.Printf("Bookhoard: locator CFI→CRE conversion failed: %v", err)

package.json

@@ -12,7 +12,7 @@
     "dev": "npm run build:ts:dev && npm run build:css"
   },
   "dependencies": {
-    "@bookhoard/foliate-js": "git+https://github.com/john-okeefe/foliate-js.git#d4d87a9",
+    "@bookhoard/foliate-js": "git+https://github.com/john-okeefe/foliate-js.git#e448d36",
     "alpinejs": "^3.15.8",
     "chart.js": "^4.5.1",
     "highlight.js": "^11.11.1",

vite.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from "vite";
-import { cpSync, mkdirSync } from "node:fs";
+import { cpSync, mkdirSync, readdirSync, rmSync } from "node:fs";
 import { join } from "node:path";
 
 const pdfjsAssets = () => ({
@@ -16,6 +16,29 @@ const pdfjsAssets = () => ({
   },
 });
 
+// emptyOutDir must stay false (web/static also holds tracked assets),
+// so hashed chunks from previous builds would otherwise accumulate
+// forever and leak into Docker images via the build context. Remove
+// any *-<hash>.js(.map) that this build did not produce.
+const cleanStaleChunks = () => {
+  const produced = new Set<string>();
+  return {
+    name: "clean-stale-chunks",
+    generateBundle(_options, bundle) {
+      for (const fileName of Object.keys(bundle)) produced.add(fileName);
+    },
+    closeBundle() {
+      const outDir = "web/static";
+      const chunkRe = /-[A-Za-z0-9_-]{8}\.js(\.map)?$/;
+      for (const f of readdirSync(outDir)) {
+        if (chunkRe.test(f) && !produced.has(f)) {
+          rmSync(join(outDir, f));
+        }
+      }
+    },
+  };
+};
+
 export default defineConfig({
   resolve: {
     alias: {
@@ -24,7 +47,7 @@ export default defineConfig({
     },
   },
   base: "/static/",
-  plugins: [pdfjsAssets()],
+  plugins: [pdfjsAssets(), cleanStaleChunks()],
   build: {
     outDir: "web/static",
     emptyOutDir: false,

web/src/reader/pdf-search.ts

@@ -0,0 +1,163 @@
+// PDF in-book search: text extraction with item geometry, and a matcher
+// that maps hits back to page-fraction rects for the overlay renderer.
+//
+// pdf.js text items carry positional data (transform/width/height in PDF
+// units at scale 1) but their strings often omit inter-word spaces — gaps
+// are positional. Pages are therefore joined gap-aware, with a char→item
+// map so each match can be covered by the rects of the items it spans.
+
+export interface PdfSearchItem {
+  /** page-fraction rect of this text item */
+  x: number;
+  y: number;
+  w: number;
+  h: number;
+  /** char offset of this item's text within the page string */
+  start: number;
+  length: number;
+}
+
+export interface PdfPageText {
+  index: number;
+  /** normalized, gap-joined page text (lowercased by the matcher) */
+  text: string;
+  items: PdfSearchItem[];
+}
+
+export interface PdfSearchHit {
+  page: number;
+  rects: number[][];
+  pre: string;
+  match: string;
+  post: string;
+}
+
+interface RawItem {
+  str: string;
+  transform: number[];
+  width: number;
+  height: number;
+  hasEOL: boolean;
+}
+
+/** Join one page's text items into a searchable string + item map. */
+export function buildPageText(
+  rawItems: RawItem[],
+  viewportWidth: number,
+  viewportHeight: number,
+  index: number,
+): PdfPageText {
+  const vw = viewportWidth || 1;
+  const vh = viewportHeight || 1;
+  let text = "";
+  const items: PdfSearchItem[] = [];
+
+  let prevRight: number | null = null;
+  let prevBaseline: number | null = null;
+
+  for (const item of rawItems) {
+    if (!item.str) continue;
+    const t = item.transform ?? [1, 0, 0, 1, 0, 0];
+    const baseline = t[5] ?? 0;
+    const x = t[4] ?? 0;
+    const size =
+      Math.abs(item.height) || Math.abs(t[3]) || Math.abs(t[0]) || 10;
+    const w = Math.abs(item.width) || 0;
+    const h = size;
+
+    let sep = "";
+    if (text && !text.endsWith(" ") && prevRight != null) {
+      const newLine =
+        item.hasEOL ||
+        prevBaseline == null ||
+        Math.abs(baseline - prevBaseline) > size * 0.5;
+      const gap = x - prevRight;
+      if (newLine || gap > size * 0.2) sep = " ";
+    }
+
+    const s = item.str.replace(/\s+/g, " ");
+    const start = text.length + sep.length;
+    text += sep + s;
+
+    items.push({
+      x: x / vw,
+      y: (vh - baseline - h) / vh,
+      w: w / vw,
+      h: h / vh,
+      start,
+      length: s.length,
+    });
+
+    prevRight = x + w;
+    prevBaseline = baseline;
+  }
+
+  return { index, text: text.trimStart(), items };
+}
+
+/** Extract all pages of a PDF via pdf.js, reporting progress 0..1. */
+export async function extractPdfPages(
+  pdf: any,
+  onProgress?: (fraction: number) => void,
+): Promise<PdfPageText[]> {
+  const pages: PdfPageText[] = [];
+  const num = pdf.numPages as number;
+  for (let i = 0; i < num; i++) {
+    const page = await pdf.getPage(i + 1);
+    const viewport = page.getViewport({ scale: 1 });
+    const tc = await page.getTextContent();
+    pages.push(
+      buildPageText(tc.items, viewport.width, viewport.height, i),
+    );
+    onProgress?.((i + 1) / num);
+  }
+  return pages;
+}
+
+const CONTEXT = 60;
+
+/**
+ * Case-insensitive search over extracted pages. Returns hits grouped in
+ * page order; each hit carries the page-fraction rects of the items it
+ * spans (capped to keep pathological fills cheap) plus a trimmed excerpt.
+ */
+export function searchPdfPages(
+  pages: PdfPageText[],
+  query: string,
+  locales = "en",
+): PdfSearchHit[] {
+  const needle = query.toLocaleLowerCase(locales).replace(/\s+/g, " ").trim();
+  if (!needle) return [];
+  const hits: PdfSearchHit[] = [];
+
+  for (const page of pages) {
+    const haystack = page.text.toLocaleLowerCase(locales);
+    let from = 0;
+    for (;;) {
+      const s = haystack.indexOf(needle, from);
+      if (s === -1) break;
+      const e = s + needle.length;
+      from = s + Math.max(1, needle.length);
+
+      const rects: number[][] = [];
+      for (const it of page.items) {
+        if (it.length <= 0) continue;
+        if (it.start + it.length <= s || it.start >= e) continue;
+        if (rects.length >= 12) break;
+        rects.push([it.x, it.y, it.w, it.h]);
+      }
+      if (!rects.length) continue;
+
+      const pre = page.text.slice(Math.max(0, s - CONTEXT), s);
+      const post = page.text.slice(e, e + CONTEXT);
+      hits.push({
+        page: page.index,
+        rects,
+        pre: (s > CONTEXT ? "…" : "") + pre.trimStart(),
+        match: page.text.slice(s, e),
+        post: post.trimEnd() + (page.text.length > e + CONTEXT ? "…" : ""),
+      });
+    }
+  }
+  return hits;
+}

web/src/reader/settings-manager.ts

@@ -79,6 +79,11 @@ export function getDefaultSettings(): ReaderSettings {
     line_height: 1.6,
     margin_width: 20,
     double_page_spread: true,
+    pdf_interaction_mode: "select",
+    fx_brightness: 1,
+    fx_contrast: 1,
+    fx_invert: false,
+    tap_zones_enabled: true,
     reading_direction: "ltr",
     hardware_acceleration: true,
     panel_layout: {

web/src/types/reader.d.ts

@@ -189,7 +189,7 @@ interface ReaderSettings {
   progress_mode: "pages" | "chapter" | "percentage" | "time-left";
 
   chrome_theme: string;
-  reading_theme: "light" | "sepia" | "dark" | "night" | "high-contrast";
+  reading_theme: string;
 
   reading_font:
     | "literata"
@@ -208,6 +208,11 @@ interface ReaderSettings {
   auto_scroll: boolean;
 
   double_page_spread: boolean;
+  pdf_interaction_mode: "select" | "pan" | "text";
+  fx_brightness: number;
+  fx_contrast: number;
+  fx_invert: boolean;
+  tap_zones_enabled: boolean;
   reading_direction: "ltr" | "rtl" | "vertical";
   reading_mode: "dark" | "light";
 

web/static/input.css

@@ -725,7 +725,7 @@
     border: 1px solid var(--wood-border);
   }
 
-  /* ---------- Reader ---------- */
+  /* ---------- Reader chrome & drawers ---------- */
   .reader-icon {
     display: block;
     fill: none;
@@ -735,31 +735,521 @@
     stroke-linejoin: round;
   }
 
-  .dockable-panel {
+  /* Glass chrome: translucent theme-tinted bars over the edge-to-edge
+     reading surface. Blur + saturate the content behind, hairline border,
+     soft directional shadow. */
+  .reader-glass {
+    background-color: color-mix(in srgb, var(--bg-primary) 70%, transparent);
+    -webkit-backdrop-filter: blur(18px) saturate(1.4);
+    backdrop-filter: blur(18px) saturate(1.4);
+    border-color: color-mix(in srgb, var(--border) 60%, transparent);
+  }
+  #reader-topbar.reader-glass {
+    border-bottom: 1px solid
+      color-mix(in srgb, var(--border) 60%, transparent);
+    box-shadow: 0 4px 18px rgba(0, 0, 0, 0.16);
+  }
+  #reader-bottombar.reader-glass {
+    border-top: 1px solid
+      color-mix(in srgb, var(--border) 60%, transparent);
+    box-shadow: 0 -4px 18px rgba(0, 0, 0, 0.16);
+  }
+  /* Bars slide away when the chrome hides (opacity handled on #reader-chrome) */
+  #reader-topbar,
+  #reader-bottombar {
+    transition:
+      transform 0.3s ease,
+      opacity 0.3s ease;
+  }
+  #reader-chrome.chrome-hidden #reader-topbar {
+    transform: translateY(-101%);
+  }
+  #reader-chrome.chrome-hidden #reader-bottombar {
+    transform: translateY(101%);
+  }
+  /* Theme-aware translucent hover pills + focus rings for bar controls */
+  #reader-topbar button:hover,
+  #reader-bottombar button:hover,
+  #reader-topbar a:hover {
+    background-color: color-mix(in srgb, currentColor 13%, transparent);
+  }
+  #reader-topbar button:focus-visible,
+  #reader-bottombar button:focus-visible,
+  #reader-topbar a:focus-visible {
+    outline: 2px solid #3b82f6;
+    outline-offset: 2px;
+  }
+  .reader-sep {
+    background-color: color-mix(in srgb, var(--border) 80%, transparent);
+  }
+  .reader-select {
+    background-color: color-mix(in srgb, var(--bg-primary) 55%, transparent);
+    border: 1px solid color-mix(in srgb, var(--border) 70%, transparent);
+    color: inherit;
+  }
+  .reader-select:hover {
+    border-color: #3b82f6;
+  }
+  /* Progress slider: thin rounded track + floating white thumb */
+  #reader-bottombar input[type="range"] {
+    -webkit-appearance: none;
+    appearance: none;
+    height: 18px;
+    background: transparent;
+    cursor: pointer;
+    accent-color: #3b82f6;
+  }
+  #reader-bottombar input[type="range"]::-webkit-slider-runnable-track {
+    height: 4px;
+    border-radius: 9999px;
+    background: color-mix(in srgb, currentColor 22%, transparent);
+  }
+  #reader-bottombar input[type="range"]::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    margin-top: -5px;
+    width: 14px;
+    height: 14px;
+    border: none;
+    border-radius: 50%;
+    background: #ffffff;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.45);
+    transition: transform 0.12s ease;
+  }
+  #reader-bottombar input[type="range"]::-webkit-slider-thumb:hover {
+    transform: scale(1.15);
+  }
+  #reader-bottombar input[type="range"]::-moz-range-track {
+    height: 4px;
+    border-radius: 9999px;
+    background: color-mix(in srgb, currentColor 22%, transparent);
+  }
+  #reader-bottombar input[type="range"]::-moz-range-thumb {
+    width: 14px;
+    height: 14px;
+    border: none;
+    border-radius: 50%;
+    background: #ffffff;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.45);
+  }
+
+  .drawer-scrim {
+    position: fixed;
+    inset: 0;
+    background-color: rgba(0, 0, 0, 0.45);
+    z-index: 45;
+  }
+  .reader-drawer {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    width: 340px;
+    max-width: calc(100vw - 2rem);
     background-color: var(--bg-secondary);
+    z-index: 50;
+    display: flex;
+    flex-direction: column;
+    padding-top: env(safe-area-inset-top);
+    padding-bottom: env(safe-area-inset-bottom);
+  }
+  .reader-drawer.left {
+    left: 0;
+    border-right: 1px solid var(--border);
+  }
+  .reader-drawer.right {
+    right: 0;
+    border-left: 1px solid var(--border);
+  }
+  /* Mobile: drawers become full-width sheets */
+  @media (max-width: 640px) {
+    .reader-drawer {
+      width: 100%;
+      max-width: 100%;
+    }
+  }
+  .reader-drawer-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0.75rem 1rem;
     border-bottom: 1px solid var(--border);
-    transition: max-height 0.2s ease-out;
+    flex-shrink: 0;
+  }
+  .reader-drawer-body {
+    flex: 1;
+    overflow-y: auto;
+    padding: 1rem;
+  }
+  .reader-seg {
+    display: inline-flex;
+    border: 1px solid color-mix(in srgb, var(--border) 70%, transparent);
+    background-color: color-mix(in srgb, var(--bg-primary) 50%, transparent);
+    border-radius: 0.5rem;
     overflow: hidden;
   }
-  .dockable-panel.panel-collapsed .panel-content {
-    display: none;
+  .reader-seg button {
+    padding: 0.25rem 0.6rem;
+    font-size: 0.75rem;
+    line-height: 1.25rem;
   }
-  .panel-header {
-    user-select: none;
+  .reader-seg button.active {
+    background-color: #2563eb;
+    color: #ffffff;
   }
-  .panel-header:hover {
-    background-color: var(--surface-hover);
+  .theme-swatch {
+    height: 2.25rem;
+    border-radius: 0.5rem;
+    border: 1px solid var(--border);
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
-  .panel-container {
-    background-color: var(--bg-secondary);
-    border-right: 1px solid var(--border);
-    width: 320px;
-    max-height: calc(100vh - 8rem);
+  .theme-swatch:hover {
+    border-color: #3b82f6;
+  }
+
+  /* Selection popover & annotations drawer widgets */
+  .reader-popover {
+    position: fixed;
+    transform: translate(-50%, calc(-100% - 10px));
+    background-color: color-mix(in srgb, var(--bg-primary) 85%, transparent);
+    -webkit-backdrop-filter: blur(16px) saturate(1.3);
+    backdrop-filter: blur(16px) saturate(1.3);
+    border: 1px solid color-mix(in srgb, var(--border) 70%, transparent);
+    border-radius: 0.75rem;
+    box-shadow: 0 8px 28px rgba(0, 0, 0, 0.35);
+    padding: 0.5rem 0.625rem;
+    z-index: 60;
+  }
+  .color-dot {
+    width: 1.375rem;
+    height: 1.375rem;
+    border-radius: 9999px;
+    border: 2px solid rgba(0, 0, 0, 0.25);
+    transition: transform 0.12s ease;
+  }
+  .color-dot:hover {
+    transform: scale(1.15);
+  }
+  .color-dot.selected {
+    border-color: #ffffff;
+    box-shadow: 0 0 0 2px #3b82f6;
+  }
+  .reader-popover-btn {
+    padding: 0.3rem;
+    border-radius: 0.375rem;
+    color: inherit;
+  }
+  .reader-popover-btn:hover {
+    background-color: color-mix(in srgb, currentColor 13%, transparent);
+  }
+  .reader-popover-btn.danger:hover {
+    background-color: rgba(153, 27, 27, 0.6);
+  }
+  .reader-note-input {
+    width: 100%;
+    resize: vertical;
+    padding: 0.5rem;
+    border-radius: 0.5rem;
+    font-size: 0.875rem;
+    color: inherit;
+    background-color: color-mix(in srgb, var(--bg-primary) 55%, transparent);
+    border: 1px solid color-mix(in srgb, var(--border) 70%, transparent);
+  }
+  .reader-note-input:focus {
+    outline: 2px solid #3b82f6;
+    outline-offset: 1px;
+  }
+  .reader-tabs {
+    display: flex;
+    border-bottom: 1px solid var(--border);
+    flex-shrink: 0;
+  }
+  .reader-tabs button {
+    flex: 1;
+    padding: 0.5rem 0.25rem;
+    font-size: 0.8125rem;
+    color: var(--text-secondary);
+    border-bottom: 2px solid transparent;
+  }
+  .reader-tabs button.active {
+    color: var(--text-primary);
+    border-bottom-color: #3b82f6;
+  }
+  .reader-tab-count {
+    display: inline-block;
+    min-width: 1.25rem;
+    margin-left: 0.25rem;
+    padding: 0 0.25rem;
+    border-radius: 9999px;
+    font-size: 0.6875rem;
+    line-height: 1.1rem;
+    background-color: color-mix(in srgb, currentColor 13%, transparent);
+  }
+  .reader-hl-row {
+    display: flex;
+    align-items: center;
+    gap: 0.25rem;
+  }
+
+  /* Fixed-layout toolbar responsiveness is handled with Tailwind responsive
+     utilities in reader.templ (hidden md:flex for the full toolbar,
+     flex md:hidden for the compact row) — custom layer rules here would
+     lose the cascade to the flex utility anyway. */
+  .reader-tools-popover {
+    position: absolute;
+    bottom: 100%;
+    right: 0.5rem;
+    margin-bottom: 0.5rem;
+    min-width: 16rem;
+    max-width: calc(100vw - 1.5rem);
+    max-height: min(26rem, 65vh);
     overflow-y: auto;
+    background-color: color-mix(in srgb, var(--bg-primary) 88%, transparent);
+    -webkit-backdrop-filter: blur(18px) saturate(1.3);
+    backdrop-filter: blur(18px) saturate(1.3);
+    border: 1px solid color-mix(in srgb, var(--border) 70%, transparent);
+    border-radius: 0.75rem;
+    box-shadow: 0 -6px 28px rgba(0, 0, 0, 0.35);
+    padding: 0.25rem;
   }
-  .panel-container[data-side="right"] {
-    border-right: none;
-    border-left: 1px solid var(--border);
+  .reader-tools-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 1rem;
+    padding: 0.5rem 0.75rem;
+    font-size: 0.875rem;
+    border-radius: 0.5rem;
+  }
+  .reader-tools-row + .reader-tools-row {
+    border-top: 1px solid
+      color-mix(in srgb, var(--border) 45%, transparent);
+  }
+  .reader-tools-row:hover {
+    background-color: color-mix(in srgb, currentColor 6%, transparent);
+  }
+
+  /* Fixed-layout display filters: one var drives the iframe ::part(filter)
+     (comics/PDFs via foliate-view exportparts) and the webtoon page images. */
+  #reader-view::part(filter) {
+    filter: var(--fx-filter, none);
+  }
+
+  /* Page thumbnails grid (contents drawer, fixed-layout) */
+  .reader-thumb-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 0.5rem;
+  }
+  .reader-thumb {
+    position: relative;
+    border-radius: 0.375rem;
+    overflow: hidden;
+    border: 2px solid transparent;
+    padding: 0;
+    background-color: color-mix(in srgb, currentColor 6%, transparent);
+  }
+  .reader-thumb:hover {
+    border-color: color-mix(in srgb, currentColor 30%, transparent);
+  }
+  .reader-thumb.active {
+    border-color: #3b82f6;
+  }
+  .reader-thumb-img {
+    aspect-ratio: 3 / 4;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+  }
+  .reader-thumb-img canvas,
+  .reader-thumb-img img {
+    max-width: 100%;
+    max-height: 100%;
+    object-fit: contain;
+  }
+  .reader-thumb-num {
+    position: absolute;
+    bottom: 0.2rem;
+    right: 0.35rem;
+    font-size: 0.65rem;
+    line-height: 1;
+    padding: 0.15rem 0.3rem;
+    border-radius: 0.25rem;
+    background-color: rgba(0, 0, 0, 0.55);
+    color: #ffffff;
+  }
+
+  /* Desktop edge page-turn zones: only on hover-capable fine-pointer
+     devices (touch uses tap zones instead). Arrow + subtle edge gradient
+     appear on hover. */
+  .reader-edge-zone {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 8%;
+    max-width: 72px;
+    min-width: 44px;
+    z-index: 10;
+    display: none;
+    align-items: center;
+    cursor: pointer;
+  }
+  .reader-edge-zone.left {
+    left: 0;
+    justify-content: flex-start;
+    padding-left: 0.75rem;
+  }
+  .reader-edge-zone.right {
+    right: 0;
+    justify-content: flex-end;
+    padding-right: 0.75rem;
+  }
+  .reader-edge-zone::before {
+    content: "";
+    position: absolute;
+    inset: 0;
+    opacity: 0;
+    transition: opacity 0.15s ease;
+  }
+  .reader-edge-zone.left::before {
+    background: linear-gradient(to right, rgba(255, 255, 255, 0.08), transparent);
+  }
+  .reader-edge-zone.right::before {
+    background: linear-gradient(to left, rgba(255, 255, 255, 0.08), transparent);
+  }
+  .reader-edge-zone .reader-icon {
+    color: #ffffff;
+    filter: drop-shadow(0 1px 3px rgba(0, 0, 0, 0.6));
+    opacity: 0;
+    transition: opacity 0.15s ease;
+  }
+  .reader-edge-zone:hover::before {
+    opacity: 1;
+  }
+  .reader-edge-zone:hover .reader-icon {
+    opacity: 0.85;
+  }
+  @media (hover: hover) and (pointer: fine) {
+    .reader-edge-zone {
+      display: flex;
+    }
+  }
+
+  /* Shortcuts help modal */
+  .reader-help-backdrop {
+    position: fixed;
+    inset: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 70;
+  }
+  .reader-help {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: min(34rem, calc(100vw - 2rem));
+    max-height: min(38rem, calc(100vh - 4rem));
+    display: flex;
+    flex-direction: column;
+    background-color: color-mix(in srgb, var(--bg-primary) 90%, transparent);
+    -webkit-backdrop-filter: blur(20px) saturate(1.3);
+    backdrop-filter: blur(20px) saturate(1.3);
+    border: 1px solid color-mix(in srgb, var(--border) 70%, transparent);
+    border-radius: 0.875rem;
+    box-shadow: 0 16px 48px rgba(0, 0, 0, 0.45);
+    z-index: 71;
+  }
+  .reader-help-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0.875rem 1.25rem;
+    border-bottom: 1px solid var(--border);
+    flex-shrink: 0;
+  }
+  .reader-help-body {
+    overflow-y: auto;
+    padding: 1rem 1.25rem;
+  }
+  .reader-help-section {
+    font-size: 0.7rem;
+    text-transform: uppercase;
+    letter-spacing: 0.08em;
+    color: var(--text-secondary);
+    margin: 1.1rem 0 0.4rem;
+  }
+  .reader-help-body .reader-help-section:first-child {
+    margin-top: 0;
+  }
+  .help-row {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    gap: 1rem;
+    padding: 0.3rem 0;
+    font-size: 0.85rem;
+  }
+  .help-row > span:first-child {
+    color: var(--text-primary);
+  }
+  .help-keys {
+    text-align: right;
+    color: var(--text-secondary);
+    font-size: 0.8rem;
+    white-space: nowrap;
+  }
+  .help-note {
+    color: var(--text-secondary);
+    font-size: 0.75rem;
+  }
+  .kbd {
+    display: inline-block;
+    min-width: 1.4rem;
+    text-align: center;
+    padding: 0.05rem 0.4rem;
+    margin: 0 0.1rem;
+    border-radius: 0.3rem;
+    border: 1px solid color-mix(in srgb, var(--border) 80%, transparent);
+    border-bottom-width: 2px;
+    background-color: color-mix(in srgb, currentColor 8%, transparent);
+    font-family: ui-monospace, monospace;
+    font-size: 0.72rem;
+    line-height: 1.2rem;
+  }
+
+  /* In-book search */
+  .reader-search-bar {
+    display: flex;
+    align-items: center;
+    gap: 0.375rem;
+    padding: 0.625rem 1rem;
+    border-bottom: 1px solid var(--border);
+    flex-shrink: 0;
+  }
+  .reader-search-status {
+    padding: 0.375rem 1rem;
+    font-size: 0.75rem;
+    color: var(--text-secondary);
+    border-bottom: 1px solid color-mix(in srgb, var(--border) 50%, transparent);
+    flex-shrink: 0;
+    min-height: 1.75rem;
+  }
+  .search-result {
+    display: block;
+    padding: 0.375rem 0.5rem;
+    border-radius: 0.375rem;
+    font-size: 0.8125rem;
+    line-height: 1.35;
+  }
+  .search-result:hover {
+    background-color: color-mix(in srgb, currentColor 9%, transparent);
+  }
+  .search-result mark {
+    background-color: rgba(255, 213, 79, 0.4);
+    color: inherit;
+    border-radius: 2px;
+    padding: 0 1px;
   }
 
   /* ---------- Series stacked covers ---------- */