From 4e93e20bbb6eef87da986a214a090789916e19f0 Mon Sep 17 00:00:00 2001
From: neon <18559658+neonsolstice@users.noreply.github.com>
Date: Fri, 1 May 2026 23:59:37 -0600
Subject: [PATCH] feat(books): add table view, metadata export, and filter
 builder

---
 client/package.json                           |  20 +-
 client/src/components/AppLayout.vue           |   9 +-
 client/src/components/SelectionActionBar.vue  | 268 +++--
 client/src/components/ViewHeader.vue          | 162 +--
 .../__tests__/SelectionActionBar.spec.ts      | 104 +-
 .../components/ui/InputWithSuggestions.vue    | 157 +++
 .../ui/__tests__/InputWithSuggestions.spec.ts |  74 ++
 .../ui/dropdown-menu/DropdownMenuItem.vue     |   2 +-
 .../__tests__/useEffectiveViewMode.spec.ts    |  55 +
 client/src/composables/useDisplaySettings.ts  |  18 +-
 .../src/composables/useEffectiveViewMode.ts   |  15 +
 .../src/composables/useViewDisplaySettings.ts |   2 +-
 .../src/features/author/views/AuthorsView.vue |  14 +-
 .../book/components/BookCoverCard.vue         |   2 +-
 .../book/components/BookFilterBuilder.vue     |  57 +
 .../features/book/components/BookListRow.vue  |   2 +-
 .../book/components/BookQuickView.vue         |   4 +-
 .../components/KeyboardShortcutOverlay.vue    |  97 ++
 .../book/components/MetadataExportDialog.vue  | 356 +++++++
 .../book/components/TableColumnPanel.vue      | 266 +++++
 .../book/components/VirtualBookGrid.vue       |   2 +-
 .../book/components/VirtualBookTable.vue      | 992 ++++++++++++++++++
 .../__tests__/BookCoverCard.spec.ts           |  20 +-
 .../components/__tests__/BookListRow.spec.ts  |  20 +-
 .../__tests__/BookTableCells.spec.ts          | 767 ++++++++++++++
 .../__tests__/CollapsedSeriesCard.spec.ts     |   9 +
 .../__tests__/KeyboardShortcutOverlay.spec.ts | 100 ++
 .../__tests__/MetadataExportDialog.spec.ts    | 211 ++++
 .../VirtualBookTable.loadmore.spec.ts         |  81 ++
 .../detail/tabs/CoverEditorPanel.vue          |  18 +-
 .../detail/tabs/CoverSearchDrawer.vue         |  87 +-
 .../detail/tabs/EditMetadataTab.vue           |  22 +-
 .../book/components/table/BookCoverDialog.vue | 154 +++
 .../components/table/BookTableActionsCell.vue | 102 ++
 .../table/BookTableCellDispatcher.vue         | 165 +++
 .../components/table/BookTableChipsCell.vue   | 120 +++
 .../table/BookTableCollapsedSeriesRow.vue     |  55 +
 .../components/table/BookTableContextMenu.vue | 200 ++++
 .../components/table/BookTableCoverCell.vue   |  92 ++
 .../components/table/BookTableDateCell.vue    |  62 ++
 .../components/table/BookTableFormatCell.vue  |  51 +
 .../book/components/table/BookTableHeader.vue | 159 +++
 .../table/BookTableHeaderContextMenu.vue      | 190 ++++
 .../table/BookTableLockableCell.vue           |  44 +
 .../components/table/BookTableNumberCell.vue  | 116 ++
 .../table/BookTableProgressCell.vue           |  30 +
 .../components/table/BookTableRatingCell.vue  |  86 ++
 .../table/BookTableReadStatusCell.vue         |  88 ++
 .../components/table/BookTableTextCell.vue    | 255 +++++
 .../__tests__/BookTableCellDispatcher.spec.ts | 100 ++
 .../BookTableCollapsedSeriesRow.spec.ts       | 156 +++
 .../__tests__/tableColumnSchema.spec.ts       |  88 ++
 .../__tests__/useBookBulkActions.spec.ts      | 237 ++++-
 .../__tests__/useBookDataSource.spec.ts       | 235 +++++
 .../__tests__/useBookMetadataExport.spec.ts   | 221 ++++
 .../__tests__/useBookQuery.spec.ts            | 440 ++++++++
 .../__tests__/useLibraryBooks.spec.ts         | 546 ++++++++++
 .../__tests__/useSavedViews.spec.ts           |  99 ++
 .../__tests__/useTableCellEditor.spec.ts      | 343 ++++++
 .../__tests__/useTableCellHelpers.spec.ts     | 208 ++++
 .../__tests__/useTableColumns.spec.ts         | 366 +++++++
 .../__tests__/useTableCoverDialog.spec.ts     |  94 ++
 .../__tests__/useTableDragReorder.spec.ts     | 228 ++++
 .../__tests__/useTableKeyboard.spec.ts        | 281 +++++
 .../__tests__/useTableLocks.spec.ts           | 298 ++++++
 .../__tests__/useTablePresets.spec.ts         | 197 ++++
 .../__tests__/useTableQuickFilters.spec.ts    | 126 +++
 .../__tests__/useTableResize.spec.ts          | 122 +++
 .../__tests__/useTableScrollBehavior.spec.ts  | 135 +++
 .../__tests__/useTableSorting.spec.ts         | 188 ++++
 .../composables/__tests__/useViewSort.spec.ts | 137 +++
 .../book/composables/tableColumnSchema.ts     | 355 +++++++
 .../book/composables/useBookBulkActions.ts    | 253 ++++-
 .../book/composables/useBookDataSource.ts     | 111 ++
 .../book/composables/useBookMetadataExport.ts | 169 +++
 .../features/book/composables/useBookQuery.ts |  80 +-
 .../composables/useBookRefreshFeedback.ts     | 147 +++
 .../book/composables/useBookSelection.ts      |  11 +
 .../book/composables/useBookTableShell.ts     |  96 ++
 .../book/composables/useBookViewContext.ts    |  28 +
 .../book/composables/useBookViewSelection.ts  |  28 +
 .../composables/useInfiniteScrollSentinel.ts  |  52 +
 .../book/composables/useLibraryBooks.ts       | 157 +++
 .../composables/useMetadataFieldSearch.ts     |  23 +
 .../book/composables/useRefreshMetadata.ts    |   8 +-
 .../book/composables/useRefreshingBooks.ts    |  23 +-
 .../book/composables/useSavedViews.ts         | 180 ++++
 .../book/composables/useScopedBookQuery.ts    |   3 +
 .../book/composables/useTableCellEditor.ts    | 162 +++
 .../book/composables/useTableCellHelpers.ts   |  50 +
 .../book/composables/useTableColumns.ts       | 173 +++
 .../book/composables/useTableContextMenu.ts   |  20 +
 .../book/composables/useTableCoverDialog.ts   |  23 +
 .../book/composables/useTableDragReorder.ts   |  83 ++
 .../book/composables/useTableKeyboard.ts      | 222 ++++
 .../book/composables/useTableLocks.ts         |  95 ++
 .../book/composables/useTablePresets.ts       | 173 +++
 .../book/composables/useTableQuickFilters.ts  |  81 ++
 .../book/composables/useTableResize.ts        |  83 ++
 .../composables/useTableScrollBehavior.ts     |  31 +
 .../book/composables/useTableSorting.ts       |  54 +
 .../book/composables/useTableViewControls.ts  |  86 ++
 .../features/book/composables/useViewSort.ts  |  51 +
 .../src/features/book/lib/book-card-mapper.ts |  89 ++
 client/src/features/book/lib/filter-labels.ts |   5 +
 .../book/lib/table-row-state-sync.spec.ts     |  86 ++
 .../features/book/lib/table-row-state-sync.ts |  32 +
 .../__tests__/useCollectionBooks.spec.ts      | 154 +++
 .../composables/useCollectionBooks.ts         |  51 +-
 .../collection/composables/useCollections.ts  |  21 +-
 .../series/views/SeriesDetailView.vue         |  74 +-
 .../features/settings/AppearanceSettings.vue  |  17 +
 .../__tests__/useSmartScope.spec.ts           | 125 +++
 .../smart-scope/composables/useSmartScope.ts  |  49 +-
 .../smart-scope/composables/useSmartScopes.ts |  57 +-
 .../library/LanguageDistributionChart.vue     |  16 +-
 client/src/views/CollectionView.vue           | 380 ++++---
 client/src/views/HomeView.vue                 | 498 ++++++---
 client/src/views/SmartScopeView.vue           | 393 ++++---
 client/vite.config.ts                         |   4 +
 .../types/src/__tests__/table-layout.spec.ts  | 146 +++
 packages/types/src/audit.ts                   |   1 +
 packages/types/src/book.ts                    |  13 +-
 packages/types/src/font.ts                    |  36 +-
 packages/types/src/index.ts                   |   1 +
 packages/types/src/query.ts                   |  44 +-
 packages/types/src/table-layout.ts            |  45 +
 packages/types/tsconfig.json                  |   2 +-
 pnpm-lock.yaml                                |  29 +
 server/src/db/migrations/0000_baseline.sql    |   3 +
 .../src/db/migrations/meta/0000_snapshot.json |  65 +-
 server/src/db/migrations/meta/_journal.json   |   2 +-
 server/src/db/schema/metadata.ts              |   6 +-
 server/src/db/schema/reader.ts                |   2 +
 .../book-metadata-lock.service.ts             |   9 +
 .../book/book-query-builder.service.test.ts   | 148 ++-
 .../book/book-query-builder.service.ts        | 125 +--
 .../book/book-sort-builder.service.test.ts    | 182 ++++
 .../modules/book/book-sort-builder.service.ts | 100 ++
 .../src/modules/book/book.controller.test.ts  | 186 +++-
 server/src/modules/book/book.controller.ts    | 109 +-
 server/src/modules/book/book.module.test.ts   |   3 +-
 server/src/modules/book/book.module.ts        |   3 +-
 .../src/modules/book/book.repository.test.ts  |  16 +-
 server/src/modules/book/book.repository.ts    | 255 +++--
 server/src/modules/book/book.service.test.ts  | 620 ++++++++++-
 server/src/modules/book/book.service.ts       | 661 +++++++++++-
 .../book/dto/book-dto-validation.test.ts      |  96 +-
 .../src/modules/book/dto/bulk-book-ids.dto.ts |   9 +-
 .../book/dto/bulk-query-selection.dto.ts      |  22 +
 .../modules/book/dto/bulk-selection.dto.ts    |  24 +
 .../book/dto/bulk-set-metadata-lock.dto.ts    |  10 +-
 .../modules/book/dto/bulk-set-metadata.dto.ts |  13 +
 .../modules/book/dto/bulk-set-rating.dto.ts   |  10 +-
 .../modules/book/dto/bulk-set-status.dto.ts   |  10 +-
 .../modules/book/dto/bulk-update-tags.dto.ts  |  10 +-
 .../src/modules/book/dto/delete-books.dto.ts  |   9 +-
 .../book/dto/metadata-export-options.dto.ts   |  27 +
 .../modules/book/dto/metadata-export.dto.ts   |  30 +
 .../book/pipes/book-query.pipe.test.ts        |  38 +-
 .../src/modules/book/pipes/book-query.pipe.ts |  22 +-
 .../book/utils/assemble-book-cards.test.ts    | 130 ++-
 .../modules/book/utils/assemble-book-cards.ts |  59 +-
 .../book/utils/group-rule.validator.ts        |  84 +-
 .../collection/collection.controller.test.ts  |  17 +
 .../collection/collection.controller.ts       |   7 +
 .../collection/collection.repository.ts       |   9 +
 .../collection/collection.service.test.ts     | 125 +--
 .../modules/collection/collection.service.ts  |  96 +-
 .../src/modules/scanner/scanner.repository.ts |   6 +-
 .../smart-scope.controller.test.ts            |  32 +
 .../smart-scope/smart-scope.controller.ts     |  47 +-
 .../smart-scope/smart-scope.service.test.ts   | 232 +++-
 .../smart-scope/smart-scope.service.ts        |  91 +-
 174 files changed, 18545 insertions(+), 1521 deletions(-)
 create mode 100644 client/src/components/ui/InputWithSuggestions.vue
 create mode 100644 client/src/components/ui/__tests__/InputWithSuggestions.spec.ts
 create mode 100644 client/src/composables/__tests__/useEffectiveViewMode.spec.ts
 create mode 100644 client/src/composables/useEffectiveViewMode.ts
 create mode 100644 client/src/features/book/components/KeyboardShortcutOverlay.vue
 create mode 100644 client/src/features/book/components/MetadataExportDialog.vue
 create mode 100644 client/src/features/book/components/TableColumnPanel.vue
 create mode 100644 client/src/features/book/components/VirtualBookTable.vue
 create mode 100644 client/src/features/book/components/__tests__/BookTableCells.spec.ts
 create mode 100644 client/src/features/book/components/__tests__/KeyboardShortcutOverlay.spec.ts
 create mode 100644 client/src/features/book/components/__tests__/MetadataExportDialog.spec.ts
 create mode 100644 client/src/features/book/components/__tests__/VirtualBookTable.loadmore.spec.ts
 create mode 100644 client/src/features/book/components/table/BookCoverDialog.vue
 create mode 100644 client/src/features/book/components/table/BookTableActionsCell.vue
 create mode 100644 client/src/features/book/components/table/BookTableCellDispatcher.vue
 create mode 100644 client/src/features/book/components/table/BookTableChipsCell.vue
 create mode 100644 client/src/features/book/components/table/BookTableCollapsedSeriesRow.vue
 create mode 100644 client/src/features/book/components/table/BookTableContextMenu.vue
 create mode 100644 client/src/features/book/components/table/BookTableCoverCell.vue
 create mode 100644 client/src/features/book/components/table/BookTableDateCell.vue
 create mode 100644 client/src/features/book/components/table/BookTableFormatCell.vue
 create mode 100644 client/src/features/book/components/table/BookTableHeader.vue
 create mode 100644 client/src/features/book/components/table/BookTableHeaderContextMenu.vue
 create mode 100644 client/src/features/book/components/table/BookTableLockableCell.vue
 create mode 100644 client/src/features/book/components/table/BookTableNumberCell.vue
 create mode 100644 client/src/features/book/components/table/BookTableProgressCell.vue
 create mode 100644 client/src/features/book/components/table/BookTableRatingCell.vue
 create mode 100644 client/src/features/book/components/table/BookTableReadStatusCell.vue
 create mode 100644 client/src/features/book/components/table/BookTableTextCell.vue
 create mode 100644 client/src/features/book/components/table/__tests__/BookTableCellDispatcher.spec.ts
 create mode 100644 client/src/features/book/components/table/__tests__/BookTableCollapsedSeriesRow.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/tableColumnSchema.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useBookDataSource.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useBookMetadataExport.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useBookQuery.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useLibraryBooks.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useSavedViews.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTableCellEditor.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTableCellHelpers.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTableColumns.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTableCoverDialog.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTableDragReorder.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTableKeyboard.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTableLocks.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTablePresets.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTableQuickFilters.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTableResize.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTableScrollBehavior.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useTableSorting.spec.ts
 create mode 100644 client/src/features/book/composables/__tests__/useViewSort.spec.ts
 create mode 100644 client/src/features/book/composables/tableColumnSchema.ts
 create mode 100644 client/src/features/book/composables/useBookDataSource.ts
 create mode 100644 client/src/features/book/composables/useBookMetadataExport.ts
 create mode 100644 client/src/features/book/composables/useBookRefreshFeedback.ts
 create mode 100644 client/src/features/book/composables/useBookTableShell.ts
 create mode 100644 client/src/features/book/composables/useBookViewContext.ts
 create mode 100644 client/src/features/book/composables/useBookViewSelection.ts
 create mode 100644 client/src/features/book/composables/useInfiniteScrollSentinel.ts
 create mode 100644 client/src/features/book/composables/useLibraryBooks.ts
 create mode 100644 client/src/features/book/composables/useMetadataFieldSearch.ts
 create mode 100644 client/src/features/book/composables/useSavedViews.ts
 create mode 100644 client/src/features/book/composables/useScopedBookQuery.ts
 create mode 100644 client/src/features/book/composables/useTableCellEditor.ts
 create mode 100644 client/src/features/book/composables/useTableCellHelpers.ts
 create mode 100644 client/src/features/book/composables/useTableColumns.ts
 create mode 100644 client/src/features/book/composables/useTableContextMenu.ts
 create mode 100644 client/src/features/book/composables/useTableCoverDialog.ts
 create mode 100644 client/src/features/book/composables/useTableDragReorder.ts
 create mode 100644 client/src/features/book/composables/useTableKeyboard.ts
 create mode 100644 client/src/features/book/composables/useTableLocks.ts
 create mode 100644 client/src/features/book/composables/useTablePresets.ts
 create mode 100644 client/src/features/book/composables/useTableQuickFilters.ts
 create mode 100644 client/src/features/book/composables/useTableResize.ts
 create mode 100644 client/src/features/book/composables/useTableScrollBehavior.ts
 create mode 100644 client/src/features/book/composables/useTableSorting.ts
 create mode 100644 client/src/features/book/composables/useTableViewControls.ts
 create mode 100644 client/src/features/book/composables/useViewSort.ts
 create mode 100644 client/src/features/book/lib/book-card-mapper.ts
 create mode 100644 client/src/features/book/lib/table-row-state-sync.spec.ts
 create mode 100644 client/src/features/book/lib/table-row-state-sync.ts
 create mode 100644 client/src/features/collection/composables/__tests__/useCollectionBooks.spec.ts
 create mode 100644 client/src/features/smart-scope/composables/__tests__/useSmartScope.spec.ts
 create mode 100644 packages/types/src/__tests__/table-layout.spec.ts
 create mode 100644 packages/types/src/table-layout.ts
 create mode 100644 server/src/modules/book/book-sort-builder.service.test.ts
 create mode 100644 server/src/modules/book/book-sort-builder.service.ts
 create mode 100644 server/src/modules/book/dto/bulk-query-selection.dto.ts
 create mode 100644 server/src/modules/book/dto/bulk-selection.dto.ts
 create mode 100644 server/src/modules/book/dto/bulk-set-metadata.dto.ts
 create mode 100644 server/src/modules/book/dto/metadata-export-options.dto.ts
 create mode 100644 server/src/modules/book/dto/metadata-export.dto.ts

diff --git a/client/package.json b/client/package.json
index f2811014c..3f54d1e17 100644
--- a/client/package.json
+++ b/client/package.json
@@ -23,20 +23,22 @@
     "format:check": "prettier --check src/"
   },
   "dependencies": {
+    "@bookorbit/types": "workspace:*",
     "@fontsource-variable/fraunces": "^5.2.9",
     "@fontsource-variable/inter": "^5.2.8",
-    "@bookorbit/types": "workspace:*",
     "@tailwindcss/vite": "^4.2.4",
+    "@tanstack/vue-table": "^8.21.3",
+    "@tanstack/vue-virtual": "^3.13.24",
     "@types/howler": "^2.2.12",
-    "@vueuse/core": "^14.2.1",
+    "@vueuse/core": "^14.3.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "dompurify": "^3.4.1",
+    "dompurify": "^3.4.2",
     "driver.js": "^1.4.0",
     "echarts": "^6.0.0",
     "howler": "^2.2.4",
     "lucide-vue-next": "^1.0.0",
-    "pdfjs-dist": "^5.6.205",
+    "pdfjs-dist": "^5.7.284",
     "pinia": "^3.0.4",
     "reka-ui": "^2.9.6",
     "socket.io-client": "^4.8.3",
@@ -47,7 +49,7 @@
     "vue-echarts": "8.1.0-beta.2",
     "vue-router": "^5.0.6",
     "vue-sonner": "^2.0.9",
-    "vue-virtual-scroller": "^3.0.0"
+    "vue-virtual-scroller": "^3.0.2"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -58,16 +60,16 @@
     "@vitest/coverage-v8": "^4.1.5",
     "@vitest/eslint-plugin": "^1.6.16",
     "@vue/eslint-config-typescript": "^14.7.0",
-    "@vue/test-utils": "^2.4.8",
+    "@vue/test-utils": "^2.4.10",
     "@vue/tsconfig": "^0.9.1",
     "eslint": "^10.2.1",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-oxlint": "~1.61.0",
+    "eslint-plugin-oxlint": "~1.62.0",
     "eslint-plugin-vue": "~10.9.0",
     "jiti": "^2.6.1",
-    "jsdom": "^29.0.2",
+    "jsdom": "^29.1.1",
     "npm-run-all2": "^8.0.4",
-    "oxlint": "~1.61.0",
+    "oxlint": "~1.62.0",
     "prettier": "3.8.3",
     "tw-animate-css": "^1.4.0",
     "typescript": "~5.9.3",
diff --git a/client/src/components/AppLayout.vue b/client/src/components/AppLayout.vue
index f41277c46..dfbed603b 100644
--- a/client/src/components/AppLayout.vue
+++ b/client/src/components/AppLayout.vue
@@ -13,6 +13,7 @@ const themeStore = useThemeStore()
 const backgroundClass = computed(() => BACKGROUND_OPTIONS.find((b) => b.id === themeStore.background)?.cssClass ?? '')
 
 const BOOK_ROUTE_NAMES = new Set(['book-detail'])
+const TABLE_VIEW_ROUTE_NAMES = new Set(['library', 'smartScope', 'collection', 'series-detail'])
 const viewKey = computed(() => {
   const name = String(route.name)
   if (BOOK_ROUTE_NAMES.has(name)) return name
@@ -33,7 +34,13 @@ const viewKey = computed(() => {
       <div class="px-4 pt-2 flex-1 overflow-y-auto overflow-x-hidden relative scroll-smooth bg-transparent">
         <router-view v-slot="{ Component }">
           <Transition name="page" mode="out-in">
-            <div :key="viewKey" :class="{ 'h-full': viewKey === 'settings' || viewKey === 'tools' || BOOK_ROUTE_NAMES.has(viewKey) }">
+            <div
+              :key="viewKey"
+              :class="{
+                'h-full flex flex-col':
+                  viewKey === 'settings' || viewKey === 'tools' || BOOK_ROUTE_NAMES.has(viewKey) || TABLE_VIEW_ROUTE_NAMES.has(String(route.name)),
+              }"
+            >
               <component :is="Component" />
             </div>
           </Transition>
diff --git a/client/src/components/SelectionActionBar.vue b/client/src/components/SelectionActionBar.vue
index 1109b123f..c6dc0e1e6 100644
--- a/client/src/components/SelectionActionBar.vue
+++ b/client/src/components/SelectionActionBar.vue
@@ -3,6 +3,7 @@ import { computed, ref, useSlots, watch } from 'vue'
 import {
   BookOpen,
   Download,
+  FileSpreadsheet,
   FolderMinus,
   FolderPlus,
   ImageDown,
@@ -18,12 +19,14 @@ import {
   Unlock,
   X,
 } from 'lucide-vue-next'
+import InputWithSuggestions from '@/components/ui/InputWithSuggestions.vue'
+import { usePublisherSearch, useSeriesNameSearch, useLanguageSearch } from '@/features/book/composables/useMetadataFieldSearch'
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 import { usePermissions } from '@/features/auth/composables/usePermissions'
 import { STATUS_ICONS, STATUS_OPTIONS } from '@/features/book/composables/useBookStatus'
 import type { ReadStatus } from '@bookorbit/types'
-import type { InFlightOp } from '@/features/book/composables/useBookBulkActions'
+import type { BulkEditableField, BulkEditableValue, InFlightOp } from '@/features/book/composables/useBookBulkActions'
 
 export type ExportScope = 'primary' | 'all' | 'audio'
 
@@ -53,31 +56,55 @@ const emit = defineEmits<{
   'remove-from-collection': []
   edit: []
   send: []
-  export: [scope: ExportScope]
+  download: [scope: ExportScope]
+  'export-metadata': []
   'refresh-metadata': []
   're-extract-cover': []
   'set-status': [status: ReadStatus]
   'set-rating': [rating: number | null]
   'edit-tags': []
+  'set-field': [field: BulkEditableField, value: BulkEditableValue]
   'lock-metadata': [locked: boolean]
   delete: []
   exit: []
 }>()
 
 const { hasPermission, isDemoRestrictedAccount } = usePermissions()
+const { search: searchPublisher } = usePublisherSearch()
+const { search: searchSeriesName } = useSeriesNameSearch()
+const { search: searchLanguage } = useLanguageSearch()
 const confirmingDelete = ref(false)
 const deleteInput = ref('')
 const exportMenuOpen = ref(false)
 const ratingMenuOpen = ref(false)
-const moreMenuOpen = ref(false)
+const fieldMenuOpen = ref(false)
+const bulkField = ref<BulkEditableField>('publisher')
+const fieldValue = ref('')
 const slots = useSlots()
 const hasCustomContent = computed(() => Boolean(slots.content))
 const canBulkActions = computed(() => !isDemoRestrictedAccount.value)
+const canDownload = computed(() => hasPermission('library_download') && canBulkActions.value)
+const canEditMetadata = computed(() => hasPermission('library_edit_metadata') && canBulkActions.value)
+const canShowMoreMenu = computed(() => canDownload.value || canEditMetadata.value)
+const numericFieldSelected = computed(() => bulkField.value === 'publishedYear')
+const arrayFieldSelected = computed(() => ['authors', 'genres', 'tags', 'narrators'].includes(bulkField.value))
+const fieldValuePlaceholder = computed(() => (arrayFieldSelected.value ? 'Comma-separated (leave blank to clear)' : 'Leave blank to clear'))
+const typeaheadSearchFn = computed<((q: string) => Promise<string[]>) | null>(() => {
+  if (bulkField.value === 'seriesName') return searchSeriesName
+  if (bulkField.value === 'publisher') return searchPublisher
+  if (bulkField.value === 'language') return searchLanguage
+  return null
+})
 
 const canConfirmDelete = computed(() => props.count <= 50 || deleteInput.value === 'DELETE')
+const canApplyFieldValue = computed(() => {
+  if (!numericFieldSelected.value) return true
+  const trimmed = fieldValue.value.trim()
+  return trimmed.length === 0 || !Number.isNaN(Number(trimmed))
+})
 
 function onExport(scope: ExportScope) {
-  emit('export', scope)
+  emit('download', scope)
   exportMenuOpen.value = false
 }
 
@@ -114,6 +141,56 @@ function unlockAll() {
   emit('lock-metadata', false)
 }
 
+function openFieldEditor() {
+  if (props.count === 0) return
+  fieldMenuOpen.value = true
+}
+
+function onEditTags() {
+  if (props.count === 0) return
+  emit('edit-tags')
+}
+
+function onRefreshMetadata() {
+  if (props.count === 0) return
+  emit('refresh-metadata')
+}
+
+function onReExtractCover() {
+  if (props.count === 0) return
+  emit('re-extract-cover')
+}
+
+function resetFieldEditor() {
+  fieldMenuOpen.value = false
+  bulkField.value = 'publisher'
+  fieldValue.value = ''
+}
+
+function applyFieldEdit() {
+  if (!canApplyFieldValue.value) return
+  const trimmed = fieldValue.value.trim()
+  let value: BulkEditableValue
+  if (numericFieldSelected.value) {
+    value = trimmed ? Number(trimmed) : null
+  } else if (arrayFieldSelected.value) {
+    value = trimmed
+      ? [
+          ...new Set(
+            trimmed
+              .split(',')
+              .map((entry) => entry.trim())
+              .filter((entry) => entry.length > 0),
+          ),
+        ]
+      : []
+  } else {
+    value = trimmed || null
+  }
+  emit('set-field', bulkField.value, value)
+  resetFieldEditor()
+}
+
 watch(
   () => props.visible,
   (v) => {
@@ -121,8 +198,8 @@ watch(
       confirmingDelete.value = false
       exportMenuOpen.value = false
       ratingMenuOpen.value = false
-      moreMenuOpen.value = false
       deleteInput.value = ''
+      resetFieldEditor()
     }
   },
 )
@@ -155,7 +232,7 @@ watch(
             <slot name="content" :count="count" />
           </template>
 
-          <template v-else-if="!confirmingDelete && !exportMenuOpen && !ratingMenuOpen && !moreMenuOpen">
+          <template v-else-if="!confirmingDelete && !exportMenuOpen && !ratingMenuOpen && !fieldMenuOpen">
             <span class="px-2.5 py-0.5 text-sm font-semibold tabular-nums whitespace-nowrap rounded-full bg-primary/10 text-primary">{{
               count
             }}</span>
@@ -176,10 +253,10 @@ watch(
               <TooltipContent side="top">Send via email</TooltipContent>
             </Tooltip>
 
-            <Tooltip v-if="hasPermission('library_download') && canBulkActions">
+            <Tooltip v-if="canDownload">
               <TooltipTrigger as-child>
                 <button
-                  data-testid="action-export"
+                  data-testid="action-download-files"
                   :disabled="count === 0"
                   :class="[BTN_ICON, count > 0 ? BTN_PRIMARY : BTN_DISABLED]"
                   @click="exportMenuOpen = true"
@@ -187,7 +264,7 @@ watch(
                   <Download :size="ICON_SIZE" />
                 </button>
               </TooltipTrigger>
-              <TooltipContent side="top">Export as ZIP</TooltipContent>
+              <TooltipContent side="top">Download files as ZIP</TooltipContent>
             </Tooltip>
 
             <Tooltip>
@@ -217,7 +294,7 @@ watch(
               <TooltipContent side="top">Remove from collection</TooltipContent>
             </Tooltip>
 
-            <Tooltip v-if="hasPermission('library_edit_metadata') && canBulkActions">
+            <Tooltip v-if="canEditMetadata">
               <TooltipTrigger as-child>
                 <button
                   data-testid="action-bulk-edit-metadata"
@@ -228,7 +305,7 @@ watch(
                   <Pencil :size="ICON_SIZE" />
                 </button>
               </TooltipTrigger>
-              <TooltipContent side="top">Edit metadata</TooltipContent>
+              <TooltipContent side="top">Open metadata editor</TooltipContent>
             </Tooltip>
 
             <Tooltip v-if="canBulkActions">
@@ -257,7 +334,7 @@ watch(
               <TooltipContent side="top">Set reading status</TooltipContent>
             </Tooltip>
 
-            <Tooltip v-if="hasPermission('library_edit_metadata') && canBulkActions">
+            <Tooltip v-if="canEditMetadata">
               <TooltipTrigger as-child>
                 <button
                   data-testid="action-bulk-set-rating"
@@ -271,32 +348,56 @@ watch(
               <TooltipContent side="top">Set rating</TooltipContent>
             </Tooltip>
 
-            <Tooltip v-if="hasPermission('library_edit_metadata') && canBulkActions">
-              <TooltipTrigger as-child>
-                <button
-                  data-testid="action-bulk-edit-tags"
-                  :disabled="count === 0"
-                  :class="[BTN_ICON, count > 0 ? BTN_PRIMARY : BTN_DISABLED]"
-                  @click="emit('edit-tags')"
-                >
-                  <Tag :size="ICON_SIZE" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="top">Edit tags</TooltipContent>
-            </Tooltip>
+            <div v-if="canShowMoreMenu" :class="DIVIDER" />
 
-            <div v-if="hasPermission('library_edit_metadata') && canBulkActions" :class="DIVIDER" />
-
-            <Tooltip v-if="hasPermission('library_edit_metadata') && canBulkActions">
+            <Tooltip v-if="canShowMoreMenu">
               <TooltipTrigger as-child>
-                <button
-                  data-testid="action-bulk-more"
-                  :disabled="count === 0"
-                  :class="[BTN_ICON, count > 0 ? BTN_MUTED : BTN_DISABLED]"
-                  @click="moreMenuOpen = true"
-                >
-                  <MoreHorizontal :size="ICON_SIZE" />
-                </button>
+                <span class="inline-flex">
+                  <DropdownMenu>
+                    <DropdownMenuTrigger as-child>
+                      <button
+                        data-testid="action-bulk-metadata-menu"
+                        :disabled="count === 0"
+                        :class="[BTN_ICON, count > 0 ? BTN_MUTED : BTN_DISABLED]"
+                        aria-label="More actions"
+                      >
+                        <MoreHorizontal :size="ICON_SIZE" />
+                      </button>
+                    </DropdownMenuTrigger>
+                    <DropdownMenuContent side="top" align="center" class="w-56">
+                      <DropdownMenuItem v-if="canDownload" data-testid="action-export-metadata" @click="emit('export-metadata')">
+                        <FileSpreadsheet :size="14" />
+                        <span>Export metadata</span>
+                      </DropdownMenuItem>
+                      <template v-if="canEditMetadata">
+                        <DropdownMenuItem data-testid="action-bulk-set-field" @click="openFieldEditor">
+                          <Pencil :size="14" />
+                          <span>Set field</span>
+                        </DropdownMenuItem>
+                        <DropdownMenuItem data-testid="action-bulk-edit-tags" @click="onEditTags">
+                          <Tag :size="14" />
+                          <span>Edit tags</span>
+                        </DropdownMenuItem>
+                        <DropdownMenuItem data-testid="action-bulk-refresh-metadata" @click="onRefreshMetadata">
+                          <RefreshCw :size="14" />
+                          <span>Refresh metadata</span>
+                        </DropdownMenuItem>
+                        <DropdownMenuItem data-testid="action-bulk-re-extract-cover" @click="onReExtractCover">
+                          <ImageDown :size="14" />
+                          <span>Re-extract cover</span>
+                        </DropdownMenuItem>
+                        <DropdownMenuItem data-testid="action-bulk-lock-metadata" @click="lockAll">
+                          <Lock :size="14" />
+                          <span>Lock metadata</span>
+                        </DropdownMenuItem>
+                        <DropdownMenuItem data-testid="action-bulk-unlock-metadata" @click="unlockAll">
+                          <Unlock :size="14" />
+                          <span>Unlock metadata</span>
+                        </DropdownMenuItem>
+                      </template>
+                    </DropdownMenuContent>
+                  </DropdownMenu>
+                </span>
               </TooltipTrigger>
               <TooltipContent side="top">More actions</TooltipContent>
             </Tooltip>
@@ -331,7 +432,7 @@ watch(
 
           <!-- Export scope picker -->
           <template v-else-if="exportMenuOpen">
-            <span class="hidden sm:inline px-3 text-sm font-semibold text-foreground whitespace-nowrap">Export as ZIP:</span>
+            <span class="hidden sm:inline px-3 text-sm font-semibold text-foreground whitespace-nowrap">Download files as ZIP:</span>
             <div :class="DIVIDER" />
             <button :class="BTN_TEXT_PRIMARY" @click="onExport('primary')">Primary only</button>
             <button :class="BTN_TEXT_PRIMARY" @click="onExport('all')">All formats</button>
@@ -350,62 +451,45 @@ watch(
             <button :class="BTN_TEXT_CANCEL" @click="ratingMenuOpen = false">Cancel</button>
           </template>
 
-          <!-- More actions -->
-          <template v-else-if="moreMenuOpen">
-            <Tooltip>
-              <TooltipTrigger as-child>
-                <button
-                  data-testid="action-bulk-refresh-metadata"
-                  :disabled="count === 0"
-                  :class="[BTN_ICON, count > 0 ? BTN_MUTED : BTN_DISABLED]"
-                  @click="emit('refresh-metadata')"
-                >
-                  <RefreshCw :size="ICON_SIZE" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="top">Refresh metadata</TooltipContent>
-            </Tooltip>
-            <Tooltip>
-              <TooltipTrigger as-child>
-                <button
-                  data-testid="action-bulk-re-extract-cover"
-                  :disabled="count === 0"
-                  :class="[BTN_ICON, count > 0 ? BTN_MUTED : BTN_DISABLED]"
-                  @click="emit('re-extract-cover')"
-                >
-                  <ImageDown :size="ICON_SIZE" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="top">Re-extract cover</TooltipContent>
-            </Tooltip>
-            <Tooltip>
-              <TooltipTrigger as-child>
-                <button
-                  data-testid="action-bulk-lock-metadata"
-                  :disabled="count === 0"
-                  :class="[BTN_ICON, count > 0 ? BTN_MUTED : BTN_DISABLED]"
-                  @click="lockAll"
-                >
-                  <Lock :size="ICON_SIZE" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="top">Lock metadata</TooltipContent>
-            </Tooltip>
-            <Tooltip>
-              <TooltipTrigger as-child>
-                <button
-                  data-testid="action-bulk-unlock-metadata"
-                  :disabled="count === 0"
-                  :class="[BTN_ICON, count > 0 ? BTN_MUTED : BTN_DISABLED]"
-                  @click="unlockAll"
-                >
-                  <Unlock :size="ICON_SIZE" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="top">Unlock metadata</TooltipContent>
-            </Tooltip>
+          <!-- Field editor -->
+          <template v-else-if="fieldMenuOpen">
+            <span class="hidden sm:inline px-3 text-sm font-semibold text-foreground whitespace-nowrap">Set field:</span>
             <div :class="DIVIDER" />
-            <button :class="BTN_TEXT_CANCEL" @click="moreMenuOpen = false">Back</button>
+            <select
+              v-model="bulkField"
+              class="h-8 rounded-full border border-border bg-background px-3 text-sm text-foreground focus:outline-none focus:ring-1 focus:ring-primary"
+            >
+              <option value="seriesName">Series Name</option>
+              <option value="publisher">Publisher</option>
+              <option value="language">Language</option>
+              <option value="publishedYear">Published Year</option>
+              <option value="authors">Authors</option>
+              <option value="genres">Genres</option>
+              <option value="tags">Tags</option>
+              <option value="narrators">Narrators</option>
+            </select>
+            <InputWithSuggestions
+              v-if="typeaheadSearchFn"
+              v-model="fieldValue"
+              :search-fn="typeaheadSearchFn"
+              :placeholder="fieldValuePlaceholder"
+              :class="'h-8 min-w-28 rounded-full border border-border bg-background px-3 text-sm text-foreground placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-primary'"
+            />
+            <input
+              v-else
+              v-model="fieldValue"
+              :type="numericFieldSelected ? 'number' : 'text'"
+              class="h-8 min-w-28 rounded-full border border-border bg-background px-3 text-sm text-foreground placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-primary"
+              :placeholder="fieldValuePlaceholder"
+            />
+            <button
+              :disabled="!canApplyFieldValue"
+              :class="[BTN_TEXT_PRIMARY, !canApplyFieldValue && 'cursor-not-allowed opacity-40']"
+              @click="applyFieldEdit"
+            >
+              Apply
+            </button>
+            <button :class="BTN_TEXT_CANCEL" @click="resetFieldEditor">Cancel</button>
           </template>
 
           <!-- Delete confirmation -->
diff --git a/client/src/components/ViewHeader.vue b/client/src/components/ViewHeader.vue
index b9cec4e8d..cb73438fe 100644
--- a/client/src/components/ViewHeader.vue
+++ b/client/src/components/ViewHeader.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { nextTick, ref } from 'vue'
-import { CheckSquare, Circle, LayoutGrid, List, MoreHorizontal, Search, SlidersHorizontal, Square, X } from 'lucide-vue-next'
+import { CheckSquare, Circle, LayoutGrid, List, MoreHorizontal, Search, SlidersHorizontal, Square, Table2, X } from 'lucide-vue-next'
 import * as LucideIcons from 'lucide-vue-next'
 import { Button } from '@/components/ui/button'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
@@ -14,6 +14,7 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu'
+import type { BookViewMode } from '@/composables/useDisplaySettings'
 
 withDefaults(
   defineProps<{
@@ -22,7 +23,7 @@ withDefaults(
     total: number
     coverSize: number
     gridGap: number
-    viewMode: 'grid' | 'list'
+    viewMode: BookViewMode
     selectionMode?: boolean
     showSelection?: boolean
     showViewModeToggle?: boolean
@@ -35,6 +36,7 @@ withDefaults(
     gridGapStep?: number
     searchable?: boolean
     searchQuery?: string
+    allowedViewModes?: BookViewMode[]
   }>(),
   {
     coverSizeMin: 100,
@@ -45,13 +47,14 @@ withDefaults(
     gridGapStep: 4,
     showSelection: true,
     showViewModeToggle: true,
+    allowedViewModes: () => ['grid', 'list', 'table'] as BookViewMode[],
   },
 )
 
 const emit = defineEmits<{
   'update:coverSize': [value: number]
   'update:gridGap': [value: number]
-  'update:viewMode': [value: 'grid' | 'list']
+  'update:viewMode': [value: BookViewMode]
   'toggle-selection': []
   'update:coverShape': [value: 'square' | 'circle']
   'update:searchQuery': [value: string]
@@ -167,8 +170,9 @@ function handleSearchInput(event: Event) {
       <div v-if="showSelection" class="hidden md:block w-px h-3.5 bg-border/40 mx-1.5" />
 
       <!-- Desktop: view mode toggle -->
-      <div v-if="showViewModeToggle" class="hidden md:flex items-center gap-0.5">
+      <div v-if="showViewModeToggle && allowedViewModes.length > 0" class="hidden md:flex items-center gap-0.5">
         <Button
+          v-if="allowedViewModes.includes('grid')"
           variant="ghost"
           size="icon"
           class="h-8 w-8 rounded-lg"
@@ -178,6 +182,7 @@ function handleSearchInput(event: Event) {
           <LayoutGrid :size="14" />
         </Button>
         <Button
+          v-if="allowedViewModes.includes('list')"
           variant="ghost"
           size="icon"
           class="h-8 w-8 rounded-lg"
@@ -186,6 +191,16 @@ function handleSearchInput(event: Event) {
         >
           <List :size="14" />
         </Button>
+        <Button
+          v-if="allowedViewModes.includes('table')"
+          variant="ghost"
+          size="icon"
+          class="h-8 w-8 rounded-lg"
+          :class="viewMode === 'table' ? 'text-primary bg-primary/10' : 'text-muted-foreground/70 hover:text-foreground hover:bg-primary/5'"
+          @click="emit('update:viewMode', 'table')"
+        >
+          <Table2 :size="14" />
+        </Button>
       </div>
 
       <!-- Desktop: display settings popover -->
@@ -199,40 +214,47 @@ function handleSearchInput(event: Event) {
             <SlidersHorizontal :size="14" />
           </Button>
         </PopoverTrigger>
-        <PopoverContent class="w-56 p-4" align="end">
+        <PopoverContent :class="viewMode === 'table' ? 'w-80 max-w-[90vw] max-h-[80vh] overflow-y-auto p-4' : 'w-56 p-4'" align="end">
           <div class="space-y-4">
             <p class="text-xs font-semibold text-foreground uppercase tracking-wider">Display</p>
-            <div class="space-y-1.5">
-              <div class="flex items-center justify-between">
-                <span class="text-xs text-muted-foreground">Cover size</span>
-                <span class="text-xs font-medium tabular-nums text-foreground">{{ coverSize }}px</span>
+            <template v-if="viewMode !== 'table'">
+              <div class="space-y-1.5">
+                <div class="flex items-center justify-between">
+                  <span class="text-xs text-muted-foreground">Cover size</span>
+                  <span class="text-xs font-medium tabular-nums text-foreground">{{ coverSize }}px</span>
+                </div>
+                <input
+                  :value="coverSize"
+                  @input="emit('update:coverSize', Number(($event.target as HTMLInputElement).value))"
+                  type="range"
+                  :min="coverSizeMin"
+                  :max="coverSizeMax"
+                  :step="coverSizeStep"
+                  class="w-full accent-primary cursor-pointer"
+                />
               </div>
-              <input
-                :value="coverSize"
-                @input="emit('update:coverSize', Number(($event.target as HTMLInputElement).value))"
-                type="range"
-                :min="coverSizeMin"
-                :max="coverSizeMax"
-                :step="coverSizeStep"
-                class="w-full accent-primary cursor-pointer"
-              />
-            </div>
-            <div class="space-y-1.5">
-              <div class="flex items-center justify-between">
-                <span class="text-xs text-muted-foreground">Grid gap</span>
-                <span class="text-xs font-medium tabular-nums text-foreground">{{ gridGap }}px</span>
+              <div class="space-y-1.5">
+                <div class="flex items-center justify-between">
+                  <span class="text-xs text-muted-foreground">Grid gap</span>
+                  <span class="text-xs font-medium tabular-nums text-foreground">{{ gridGap }}px</span>
+                </div>
+                <input
+                  :value="gridGap"
+                  @input="emit('update:gridGap', Number(($event.target as HTMLInputElement).value))"
+                  type="range"
+                  :min="gridGapMin"
+                  :max="gridGapMax"
+                  :step="gridGapStep"
+                  class="w-full accent-primary cursor-pointer"
+                />
               </div>
-              <input
-                :value="gridGap"
-                @input="emit('update:gridGap', Number(($event.target as HTMLInputElement).value))"
-                type="range"
-                :min="gridGapMin"
-                :max="gridGapMax"
-                :step="gridGapStep"
-                class="w-full accent-primary cursor-pointer"
-              />
-            </div>
-            <div v-if="coverShape !== undefined" class="space-y-1.5">
+            </template>
+            <template v-else>
+              <slot name="columns">
+                <p class="text-xs text-muted-foreground">Use the column visibility panel in the table header to show or hide columns.</p>
+              </slot>
+            </template>
+            <div v-if="coverShape !== undefined && viewMode !== 'table'" class="space-y-1.5">
               <span class="text-xs text-muted-foreground">Cover shape</span>
               <div class="flex items-center gap-1 mt-1.5">
                 <button
@@ -271,9 +293,10 @@ function handleSearchInput(event: Event) {
           </Button>
         </DropdownMenuTrigger>
         <DropdownMenuContent align="end" class="w-44">
-          <DropdownMenuRadioGroup :model-value="viewMode" @update:model-value="emit('update:viewMode', $event as 'grid' | 'list')">
-            <DropdownMenuRadioItem value="grid">Grid</DropdownMenuRadioItem>
-            <DropdownMenuRadioItem value="list">List</DropdownMenuRadioItem>
+          <DropdownMenuRadioGroup :model-value="viewMode" @update:model-value="emit('update:viewMode', $event as BookViewMode)">
+            <DropdownMenuRadioItem v-if="allowedViewModes.includes('grid')" value="grid">Grid</DropdownMenuRadioItem>
+            <DropdownMenuRadioItem v-if="allowedViewModes.includes('list')" value="list">List</DropdownMenuRadioItem>
+            <DropdownMenuRadioItem v-if="allowedViewModes.includes('table')" value="table">Table</DropdownMenuRadioItem>
           </DropdownMenuRadioGroup>
           <DropdownMenuSeparator />
           <DropdownMenuItem @click="mobileDisplayOpen = true">
@@ -311,37 +334,44 @@ function handleSearchInput(event: Event) {
         <SheetTitle>Display</SheetTitle>
       </SheetHeader>
       <div class="space-y-4 px-4 pb-6">
-        <div class="space-y-1.5">
-          <div class="flex items-center justify-between">
-            <span class="text-xs text-muted-foreground">Cover size</span>
-            <span class="text-xs font-medium tabular-nums text-foreground">{{ coverSize }}px</span>
+        <template v-if="viewMode !== 'table'">
+          <div class="space-y-1.5">
+            <div class="flex items-center justify-between">
+              <span class="text-xs text-muted-foreground">Cover size</span>
+              <span class="text-xs font-medium tabular-nums text-foreground">{{ coverSize }}px</span>
+            </div>
+            <input
+              :value="coverSize"
+              @input="emit('update:coverSize', Number(($event.target as HTMLInputElement).value))"
+              type="range"
+              :min="coverSizeMin"
+              :max="coverSizeMax"
+              :step="coverSizeStep"
+              class="w-full accent-primary cursor-pointer"
+            />
           </div>
-          <input
-            :value="coverSize"
-            @input="emit('update:coverSize', Number(($event.target as HTMLInputElement).value))"
-            type="range"
-            :min="coverSizeMin"
-            :max="coverSizeMax"
-            :step="coverSizeStep"
-            class="w-full accent-primary cursor-pointer"
-          />
-        </div>
-        <div class="space-y-1.5">
-          <div class="flex items-center justify-between">
-            <span class="text-xs text-muted-foreground">Grid gap</span>
-            <span class="text-xs font-medium tabular-nums text-foreground">{{ gridGap }}px</span>
+          <div class="space-y-1.5">
+            <div class="flex items-center justify-between">
+              <span class="text-xs text-muted-foreground">Grid gap</span>
+              <span class="text-xs font-medium tabular-nums text-foreground">{{ gridGap }}px</span>
+            </div>
+            <input
+              :value="gridGap"
+              @input="emit('update:gridGap', Number(($event.target as HTMLInputElement).value))"
+              type="range"
+              :min="gridGapMin"
+              :max="gridGapMax"
+              :step="gridGapStep"
+              class="w-full accent-primary cursor-pointer"
+            />
           </div>
-          <input
-            :value="gridGap"
-            @input="emit('update:gridGap', Number(($event.target as HTMLInputElement).value))"
-            type="range"
-            :min="gridGapMin"
-            :max="gridGapMax"
-            :step="gridGapStep"
-            class="w-full accent-primary cursor-pointer"
-          />
-        </div>
-        <div v-if="coverShape !== undefined" class="space-y-1.5">
+        </template>
+        <template v-else>
+          <slot name="columns">
+            <p class="text-xs text-muted-foreground">Column visibility can be managed from the table header.</p>
+          </slot>
+        </template>
+        <div v-if="coverShape !== undefined && viewMode !== 'table'" class="space-y-1.5">
           <span class="text-xs text-muted-foreground">Cover shape</span>
           <div class="flex items-center gap-1 mt-1.5">
             <button
diff --git a/client/src/components/__tests__/SelectionActionBar.spec.ts b/client/src/components/__tests__/SelectionActionBar.spec.ts
index f6b8ad987..6657ce61b 100644
--- a/client/src/components/__tests__/SelectionActionBar.spec.ts
+++ b/client/src/components/__tests__/SelectionActionBar.spec.ts
@@ -19,6 +19,12 @@ vi.mock('@/features/auth/composables/usePermissions', () => ({
   }),
 }))
 
+vi.mock('@/features/book/composables/useMetadataFieldSearch', () => ({
+  usePublisherSearch: () => ({ search: vi.fn<(query: string) => Promise<string[]>>().mockResolvedValue([]) }),
+  useSeriesNameSearch: () => ({ search: vi.fn<(query: string) => Promise<string[]>>().mockResolvedValue([]) }),
+  useLanguageSearch: () => ({ search: vi.fn<(query: string) => Promise<string[]>>().mockResolvedValue([]) }),
+}))
+
 const globalStubs = {
   stubs: {
     DropdownMenu: { template: '<div><slot /></div>' },
@@ -53,15 +59,12 @@ describe('SelectionActionBar demo restriction', () => {
   it('shows bulk-edit controls for non-restricted accounts', async () => {
     const wrapper = mountBar()
 
-    expect(wrapper.find('[data-testid="action-export"]').exists()).toBe(true)
+    expect(wrapper.find('[data-testid="action-download-files"]').exists()).toBe(true)
+    expect(wrapper.find('[data-testid="action-export-metadata"]').exists()).toBe(true)
     expect(wrapper.find('[data-testid="action-bulk-edit-metadata"]').exists()).toBe(true)
     expect(wrapper.find('[data-testid="action-bulk-set-status"]').exists()).toBe(true)
     expect(wrapper.find('[data-testid="action-bulk-set-rating"]').exists()).toBe(true)
-    expect(wrapper.find('[data-testid="action-bulk-edit-tags"]').exists()).toBe(true)
-    expect(wrapper.find('[data-testid="action-bulk-more"]').exists()).toBe(true)
-
-    await wrapper.find('[data-testid="action-bulk-more"]').trigger('click')
-    await nextTick()
+    expect(wrapper.find('[data-testid="action-bulk-metadata-menu"]').exists()).toBe(true)
 
     expect(wrapper.find('[data-testid="action-bulk-refresh-metadata"]').exists()).toBe(true)
     expect(wrapper.find('[data-testid="action-bulk-re-extract-cover"]').exists()).toBe(true)
@@ -69,33 +72,48 @@ describe('SelectionActionBar demo restriction', () => {
     expect(wrapper.find('[data-testid="action-bulk-unlock-metadata"]').exists()).toBe(true)
   })
 
+  it('keeps metadata export available in the more menu with download-only permission', () => {
+    permissionState.allowed = new Set(['library_download'])
+    const wrapper = mountBar()
+
+    expect(wrapper.find('[data-testid="action-download-files"]').exists()).toBe(true)
+    expect(wrapper.find('[data-testid="action-bulk-metadata-menu"]').exists()).toBe(true)
+    expect(wrapper.find('[data-testid="action-export-metadata"]').exists()).toBe(true)
+
+    expect(wrapper.find('[data-testid="action-bulk-edit-metadata"]').exists()).toBe(false)
+    expect(wrapper.find('[data-testid="action-bulk-refresh-metadata"]').exists()).toBe(false)
+    expect(wrapper.find('[data-testid="action-bulk-re-extract-cover"]').exists()).toBe(false)
+  })
+
   it('hides bulk-edit controls for demo-restricted accounts', () => {
     permissionState.demoRestricted = true
     const wrapper = mountBar()
 
-    expect(wrapper.find('[data-testid="action-export"]').exists()).toBe(false)
+    expect(wrapper.find('[data-testid="action-download-files"]').exists()).toBe(false)
+    expect(wrapper.find('[data-testid="action-export-metadata"]').exists()).toBe(false)
     expect(wrapper.find('[data-testid="action-bulk-edit-metadata"]').exists()).toBe(false)
     expect(wrapper.find('[data-testid="action-bulk-set-status"]').exists()).toBe(false)
     expect(wrapper.find('[data-testid="action-bulk-set-rating"]').exists()).toBe(false)
-    expect(wrapper.find('[data-testid="action-bulk-edit-tags"]').exists()).toBe(false)
-    expect(wrapper.find('[data-testid="action-bulk-more"]').exists()).toBe(false)
+    expect(wrapper.find('[data-testid="action-bulk-metadata-menu"]').exists()).toBe(false)
     expect(wrapper.find('[data-testid="action-add-to-collection"]').exists()).toBe(true)
   })
 
-  it('emits add/send/export/status/rating/tag actions from default controls', async () => {
+  it('emits add/send/download/metadata-export/status/rating/tag actions from default controls', async () => {
     const wrapper = mountBar()
 
     await wrapper.find('[data-testid="action-add-to-collection"]').trigger('click')
     expect(wrapper.emitted('add-to-collection')).toHaveLength(1)
 
     await wrapper.find('[data-testid="action-send-email"]').trigger('click')
-    await wrapper.find('[data-testid="action-export"]').trigger('click')
+    await wrapper.find('[data-testid="action-export-metadata"]').trigger('click')
+    await wrapper.find('[data-testid="action-download-files"]').trigger('click')
     await wrapper
       .findAll('button')
       .find((btn) => btn.text() === 'Primary only')
       ?.trigger('click')
     expect(wrapper.emitted('send')).toHaveLength(1)
-    expect(wrapper.emitted('export')?.[0]).toEqual(['primary'])
+    expect(wrapper.emitted('export-metadata')).toHaveLength(1)
+    expect(wrapper.emitted('download')?.[0]).toEqual(['primary'])
 
     await wrapper.find('[data-testid="action-bulk-set-status"]').trigger('click')
     await wrapper
@@ -116,10 +134,8 @@ describe('SelectionActionBar demo restriction', () => {
     expect(wrapper.emitted('edit-tags')).toHaveLength(1)
   })
 
-  it('emits bulk metadata actions from More menu', async () => {
+  it('emits bulk metadata actions from Metadata menu', async () => {
     const wrapper = mountBar()
-    await wrapper.find('[data-testid="action-bulk-more"]').trigger('click')
-    await nextTick()
 
     await wrapper.find('[data-testid="action-bulk-refresh-metadata"]').trigger('click')
     await wrapper.find('[data-testid="action-bulk-re-extract-cover"]').trigger('click')
@@ -131,6 +147,56 @@ describe('SelectionActionBar demo restriction', () => {
     expect(wrapper.emitted('lock-metadata')?.map((args) => args[0])).toEqual([true, false])
   })
 
+  it('emits set-field from the field editor flow', async () => {
+    const wrapper = mountBar()
+    await wrapper.find('[data-testid="action-bulk-set-field"]').trigger('click')
+    await nextTick()
+
+    const select = wrapper.find('select')
+    const input = wrapper.find('input')
+    await select.setValue('language')
+    await input.setValue('fr')
+    await wrapper
+      .findAll('button')
+      .find((btn) => btn.text() === 'Apply')
+      ?.trigger('click')
+
+    expect(wrapper.emitted('set-field')?.[0]).toEqual(['language', 'fr'])
+  })
+
+  it('clears numeric fields when the field editor input is blank', async () => {
+    const wrapper = mountBar()
+    await wrapper.find('[data-testid="action-bulk-set-field"]').trigger('click')
+    await nextTick()
+
+    const select = wrapper.find('select')
+    await select.setValue('publishedYear')
+    await nextTick()
+    await wrapper
+      .findAll('button')
+      .find((btn) => btn.text() === 'Apply')
+      ?.trigger('click')
+
+    expect(wrapper.emitted('set-field')?.[0]).toEqual(['publishedYear', null])
+  })
+
+  it('emits list fields as deduplicated comma-separated values', async () => {
+    const wrapper = mountBar()
+    await wrapper.find('[data-testid="action-bulk-set-field"]').trigger('click')
+    await nextTick()
+
+    const select = wrapper.find('select')
+    await select.setValue('authors')
+    await nextTick()
+    await wrapper.find('input').setValue(' Author A, Author B , Author A ')
+    await wrapper
+      .findAll('button')
+      .find((btn) => btn.text() === 'Apply')
+      ?.trigger('click')
+
+    expect(wrapper.emitted('set-field')?.[0]).toEqual(['authors', ['Author A', 'Author B']])
+  })
+
   it('requires DELETE confirmation text when count exceeds 50', async () => {
     const wrapper = mount(SelectionActionBar, {
       props: { visible: true, count: 75, inCollection: false, inFlight: null },
@@ -156,16 +222,16 @@ describe('SelectionActionBar demo restriction', () => {
 
   it('resets transient menu state when visibility is turned off', async () => {
     const wrapper = mountBar()
-    await wrapper.find('[data-testid="action-bulk-more"]').trigger('click')
+    await wrapper.find('[data-testid="action-bulk-set-field"]').trigger('click')
     await nextTick()
-    expect(wrapper.find('[data-testid="action-bulk-refresh-metadata"]').exists()).toBe(true)
+    expect(wrapper.find('select').exists()).toBe(true)
 
     await wrapper.setProps({ visible: false })
     await nextTick()
     await wrapper.setProps({ visible: true })
     await nextTick()
 
-    expect(wrapper.find('[data-testid="action-bulk-more"]').exists()).toBe(true)
-    expect(wrapper.find('[data-testid="action-bulk-refresh-metadata"]').exists()).toBe(false)
+    expect(wrapper.find('[data-testid="action-bulk-metadata-menu"]').exists()).toBe(true)
+    expect(wrapper.find('select').exists()).toBe(false)
   })
 })
diff --git a/client/src/components/ui/InputWithSuggestions.vue b/client/src/components/ui/InputWithSuggestions.vue
new file mode 100644
index 000000000..2901e90a3
--- /dev/null
+++ b/client/src/components/ui/InputWithSuggestions.vue
@@ -0,0 +1,157 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+
+const props = defineProps<{
+  modelValue: string | null
+  searchFn: (q: string) => Promise<string[]>
+  placeholder?: string
+  disabled?: boolean
+  class?: string
+  maxlength?: number
+}>()
+
+const emit = defineEmits<{ 'update:modelValue': [value: string | null] }>()
+
+const inputRef = ref<HTMLInputElement | null>(null)
+const suggestions = ref<string[]>([])
+const showDropdown = ref(false)
+const activeIndex = ref(-1)
+const dropdownStyle = ref<Record<string, string>>({})
+const isFocused = ref(false)
+const shouldSearchFromInput = ref(false)
+let debounceTimer: ReturnType<typeof setTimeout> | null = null
+let latestRequestId = 0
+
+function computeDropdownStyle() {
+  if (!inputRef.value) return
+  const rect = inputRef.value.getBoundingClientRect()
+  const spaceBelow = window.innerHeight - rect.bottom
+  const maxH = 192
+  if (spaceBelow < maxH && rect.top > maxH) {
+    dropdownStyle.value = {
+      position: 'fixed',
+      bottom: `${window.innerHeight - rect.top}px`,
+      left: `${rect.left}px`,
+      width: `${rect.width}px`,
+      zIndex: '9999',
+    }
+  } else {
+    dropdownStyle.value = {
+      position: 'fixed',
+      top: `${rect.bottom + 4}px`,
+      left: `${rect.left}px`,
+      width: `${rect.width}px`,
+      zIndex: '9999',
+    }
+  }
+}
+
+watch(
+  () => props.modelValue,
+  (q) => {
+    if (debounceTimer) clearTimeout(debounceTimer)
+    if (props.disabled || !isFocused.value || !shouldSearchFromInput.value) {
+      showDropdown.value = false
+      activeIndex.value = -1
+      return
+    }
+    if (!q?.trim()) {
+      suggestions.value = []
+      showDropdown.value = false
+      return
+    }
+    shouldSearchFromInput.value = false
+    debounceTimer = setTimeout(async () => {
+      const requestId = ++latestRequestId
+      const results = await props.searchFn(q)
+      if (requestId !== latestRequestId) return
+      suggestions.value = results
+      if (results.length > 0) {
+        computeDropdownStyle()
+        showDropdown.value = true
+      } else {
+        showDropdown.value = false
+      }
+      activeIndex.value = -1
+    }, 200)
+  },
+)
+
+function onInput(e: Event) {
+  shouldSearchFromInput.value = true
+  emit('update:modelValue', (e.target as HTMLInputElement).value)
+}
+
+function select(value: string) {
+  shouldSearchFromInput.value = false
+  emit('update:modelValue', value)
+  showDropdown.value = false
+}
+
+function onKeydown(e: KeyboardEvent) {
+  if (showDropdown.value && suggestions.value.length > 0) {
+    if (e.key === 'ArrowDown') {
+      e.preventDefault()
+      activeIndex.value = Math.min(activeIndex.value + 1, suggestions.value.length - 1)
+      return
+    }
+    if (e.key === 'ArrowUp') {
+      e.preventDefault()
+      activeIndex.value = Math.max(activeIndex.value - 1, -1)
+      return
+    }
+    if (e.key === 'Enter' && activeIndex.value >= 0) {
+      e.preventDefault()
+      const s = suggestions.value[activeIndex.value]
+      if (s) select(s)
+      return
+    }
+    if (e.key === 'Escape') {
+      showDropdown.value = false
+    }
+  }
+}
+
+function onBlur() {
+  isFocused.value = false
+  shouldSearchFromInput.value = false
+  if (debounceTimer) clearTimeout(debounceTimer)
+  setTimeout(() => {
+    showDropdown.value = false
+  }, 150)
+}
+
+function onFocus() {
+  isFocused.value = true
+}
+</script>
+
+<template>
+  <input
+    ref="inputRef"
+    :value="modelValue ?? ''"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    :maxlength="maxlength"
+    :class="props.class"
+    type="text"
+    @input="onInput"
+    @keydown="onKeydown"
+    @focus="onFocus"
+    @blur="onBlur"
+  />
+  <Teleport to="body">
+    <div v-if="showDropdown" class="max-h-48 overflow-y-auto rounded-md border border-border bg-popover shadow-md" :style="dropdownStyle">
+      <button
+        v-for="(s, i) in suggestions"
+        :key="s"
+        type="button"
+        class="w-full truncate px-3 py-1.5 text-left text-sm text-foreground transition-colors hover:bg-accent"
+        :class="{ 'bg-accent': i === activeIndex }"
+        @mousedown.prevent="select(s)"
+      >
+        {{ s }}
+      </button>
+    </div>
+  </Teleport>
+</template>
diff --git a/client/src/components/ui/__tests__/InputWithSuggestions.spec.ts b/client/src/components/ui/__tests__/InputWithSuggestions.spec.ts
new file mode 100644
index 000000000..18b139ea8
--- /dev/null
+++ b/client/src/components/ui/__tests__/InputWithSuggestions.spec.ts
@@ -0,0 +1,74 @@
+import { mount } from '@vue/test-utils'
+import { defineComponent, nextTick, ref } from 'vue'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import InputWithSuggestions from '../InputWithSuggestions.vue'
+
+function mountHost(initialValue: string | null, searchFn: (query: string) => Promise<string[]>) {
+  const Host = defineComponent({
+    components: { InputWithSuggestions },
+    setup() {
+      const model = ref<string | null>(initialValue)
+      return { model, searchFn }
+    },
+    template: '<InputWithSuggestions v-model="model" :search-fn="searchFn" />',
+  })
+
+  return mount(Host, {
+    global: {
+      stubs: {
+        teleport: true,
+      },
+    },
+  })
+}
+
+describe('InputWithSuggestions', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('does not fetch suggestions on programmatic model updates', async () => {
+    const searchFn = vi.fn<(query: string) => Promise<string[]>>().mockResolvedValue(['English'])
+    const wrapper = mountHost(null, searchFn)
+
+    ;(wrapper.vm as { model: string | null }).model = 'English'
+    await nextTick()
+    await vi.advanceTimersByTimeAsync(250)
+
+    expect(searchFn).not.toHaveBeenCalled()
+    expect(wrapper.findAll('button')).toHaveLength(0)
+  })
+
+  it('fetches suggestions after user typing in a focused input', async () => {
+    const searchFn = vi.fn<(query: string) => Promise<string[]>>().mockResolvedValue(['English', 'French'])
+    const wrapper = mountHost(null, searchFn)
+    const input = wrapper.get('input')
+
+    await input.trigger('focus')
+    await input.setValue('En')
+    await vi.advanceTimersByTimeAsync(250)
+    await nextTick()
+
+    expect(searchFn).toHaveBeenCalledWith('En')
+    expect(wrapper.findAll('button')).toHaveLength(2)
+  })
+
+  it('cancels pending lookup when value is replaced programmatically', async () => {
+    const searchFn = vi.fn<(query: string) => Promise<string[]>>().mockResolvedValue(['English'])
+    const wrapper = mountHost(null, searchFn)
+    const input = wrapper.get('input')
+
+    await input.trigger('focus')
+    await input.setValue('En')
+    ;(wrapper.vm as { model: string | null }).model = 'French'
+    await nextTick()
+    await vi.advanceTimersByTimeAsync(250)
+
+    expect(searchFn).not.toHaveBeenCalled()
+    expect(wrapper.findAll('button')).toHaveLength(0)
+  })
+})
diff --git a/client/src/components/ui/dropdown-menu/DropdownMenuItem.vue b/client/src/components/ui/dropdown-menu/DropdownMenuItem.vue
index 291031e32..ba8d8433e 100644
--- a/client/src/components/ui/dropdown-menu/DropdownMenuItem.vue
+++ b/client/src/components/ui/dropdown-menu/DropdownMenuItem.vue
@@ -31,7 +31,7 @@ const forwardedProps = useForwardProps(delegatedProps)
     v-bind="forwardedProps"
     :class="
       cn(
-        'focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*=\'text-\'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',
+        'focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:text-destructive! [&_svg:not([class*=\'text-\'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 data-inset:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',
         props.class,
       )
     "
diff --git a/client/src/composables/__tests__/useEffectiveViewMode.spec.ts b/client/src/composables/__tests__/useEffectiveViewMode.spec.ts
new file mode 100644
index 000000000..10e7d72cd
--- /dev/null
+++ b/client/src/composables/__tests__/useEffectiveViewMode.spec.ts
@@ -0,0 +1,55 @@
+import { describe, it, expect, vi } from 'vitest'
+
+const mockStorage: Record<string, string> = {}
+
+vi.stubGlobal('localStorage', {
+  getItem: (key: string) => mockStorage[key] ?? null,
+  setItem: (key: string, value: string) => {
+    mockStorage[key] = value
+  },
+  removeItem: (key: string) => {
+    delete mockStorage[key]
+  },
+  clear: () => {
+    Object.keys(mockStorage).forEach((k) => delete mockStorage[k])
+  },
+})
+
+const breakpointMd = { value: true }
+vi.mock('@vueuse/core', () => ({
+  breakpointsTailwind: { sm: 640, md: 768, lg: 1024, xl: 1280, '2xl': 1536 },
+  useBreakpoints: () => ({ md: breakpointMd }),
+  watchDebounced: vi.fn<() => void>(),
+}))
+
+import { useEffectiveViewMode } from '@/composables/useEffectiveViewMode'
+
+describe('useEffectiveViewMode', () => {
+  it('returns same viewMode when on desktop', () => {
+    breakpointMd.value = true
+    const { viewMode, effectiveViewMode } = useEffectiveViewMode()
+    viewMode.value = 'table'
+    expect(effectiveViewMode.value).toBe('table')
+  })
+
+  it('forces grid on mobile when viewMode is table', () => {
+    breakpointMd.value = false
+    const { viewMode, effectiveViewMode } = useEffectiveViewMode()
+    viewMode.value = 'table'
+    expect(effectiveViewMode.value).toBe('grid')
+  })
+
+  it('keeps grid viewMode as-is on mobile', () => {
+    breakpointMd.value = false
+    const { viewMode, effectiveViewMode } = useEffectiveViewMode()
+    viewMode.value = 'grid'
+    expect(effectiveViewMode.value).toBe('grid')
+  })
+
+  it('keeps list viewMode as-is on mobile', () => {
+    breakpointMd.value = false
+    const { viewMode, effectiveViewMode } = useEffectiveViewMode()
+    viewMode.value = 'list'
+    expect(effectiveViewMode.value).toBe('list')
+  })
+})
diff --git a/client/src/composables/useDisplaySettings.ts b/client/src/composables/useDisplaySettings.ts
index db2255fc3..d6c3cedc9 100644
--- a/client/src/composables/useDisplaySettings.ts
+++ b/client/src/composables/useDisplaySettings.ts
@@ -4,6 +4,7 @@ import { storage } from '@/services/storage'
 export type CardOverlayKey = 'progress-bar' | 'format' | 'rating' | 'read-status' | 'lock-status'
 export type AuthorCoverShape = 'square' | 'circle'
 export type CoverSizeScope = 'per-view' | 'synced'
+export type TableDensity = 'compact' | 'comfortable' | 'roomy'
 
 const DEFAULT_BOOK_COVER_SIZE = 130
 const CARD_OVERLAY_KEYS: CardOverlayKey[] = ['progress-bar', 'format', 'rating', 'read-status', 'lock-status']
@@ -29,11 +30,22 @@ const coverSizeScope = ref<CoverSizeScope>(storage.get('coverSizeScope', 'per-vi
 const gridGap = ref(storage.get('gridGap', 20))
 const portraitGridGap = ref(storage.get('portraitGridGap', gridGap.value))
 const squareGridGap = ref(storage.get('squareGridGap', gridGap.value))
-const viewMode = ref<'grid' | 'list'>(storage.get('viewMode', 'grid'))
+export type BookViewMode = 'grid' | 'list' | 'table'
+
+const VALID_VIEW_MODES: BookViewMode[] = ['grid', 'list', 'table']
+
+function normalizeViewMode(v: unknown): BookViewMode {
+  if (typeof v === 'string' && VALID_VIEW_MODES.includes(v as BookViewMode)) return v as BookViewMode
+  return 'grid'
+}
+
+const viewMode = ref<BookViewMode>(normalizeViewMode(storage.get('viewMode', 'grid')))
 const cardOverlays = ref<CardOverlayKey[]>(normalizeCardOverlays(storage.get('cardOverlays', DEFAULT_CARD_OVERLAYS)))
 const smartScopeFilterExpanded = ref(storage.get('smartScopeFilterExpanded', true))
 const authorCoverSize = ref(Math.max(storage.get('authorCoverSize', 120), 100))
 const authorCoverShape = ref<AuthorCoverShape>(storage.get('authorCoverShape', 'circle'))
+const tableZebraStriping = ref(storage.get('tableZebraStriping', false))
+const tableDensity = ref<TableDensity>(storage.get('tableDensity', 'comfortable'))
 
 watch(portraitCoverSize, (v) => storage.set('portraitCoverSize', v))
 watch(squareCoverSize, (v) => storage.set('squareCoverSize', v))
@@ -46,6 +58,8 @@ watch(cardOverlays, (v) => storage.set('cardOverlays', normalizeCardOverlays(v))
 watch(smartScopeFilterExpanded, (v) => storage.set('smartScopeFilterExpanded', v))
 watch(authorCoverSize, (v) => storage.set('authorCoverSize', v))
 watch(authorCoverShape, (v) => storage.set('authorCoverShape', v))
+watch(tableZebraStriping, (v) => storage.set('tableZebraStriping', v))
+watch(tableDensity, (v) => storage.set('tableDensity', v))
 
 export function useDisplaySettings() {
   return {
@@ -60,5 +74,7 @@ export function useDisplaySettings() {
     smartScopeFilterExpanded,
     authorCoverSize,
     authorCoverShape,
+    tableZebraStriping,
+    tableDensity,
   }
 }
diff --git a/client/src/composables/useEffectiveViewMode.ts b/client/src/composables/useEffectiveViewMode.ts
new file mode 100644
index 000000000..7ab764072
--- /dev/null
+++ b/client/src/composables/useEffectiveViewMode.ts
@@ -0,0 +1,15 @@
+import { computed } from 'vue'
+import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
+import { useDisplaySettings, type BookViewMode } from '@/composables/useDisplaySettings'
+
+export function useEffectiveViewMode() {
+  const { viewMode } = useDisplaySettings()
+  const { md } = useBreakpoints(breakpointsTailwind)
+
+  const effectiveViewMode = computed<BookViewMode>(() => {
+    if (!md.value && viewMode.value === 'table') return 'grid'
+    return viewMode.value
+  })
+
+  return { viewMode, effectiveViewMode }
+}
diff --git a/client/src/composables/useViewDisplaySettings.ts b/client/src/composables/useViewDisplaySettings.ts
index 8729d2924..501d2ceeb 100644
--- a/client/src/composables/useViewDisplaySettings.ts
+++ b/client/src/composables/useViewDisplaySettings.ts
@@ -4,7 +4,7 @@ import { storage } from '@/services/storage'
 import { useDisplaySettings } from '@/composables/useDisplaySettings'
 import { DEFAULT_COVER_ASPECT_RATIO } from '@/features/book/lib/cover-aspect-ratio'
 
-type ViewType = 'library' | 'smartScope' | 'collection'
+type ViewType = 'library' | 'smartScope' | 'collection' | 'series'
 type CoverShapeGroup = 'portrait' | 'square'
 
 function coverSizeKey(type: ViewType, id: number, group: CoverShapeGroup) {
diff --git a/client/src/features/author/views/AuthorsView.vue b/client/src/features/author/views/AuthorsView.vue
index fa35bc04a..7bb5b5852 100644
--- a/client/src/features/author/views/AuthorsView.vue
+++ b/client/src/features/author/views/AuthorsView.vue
@@ -20,6 +20,7 @@ import { useAuthorSelection } from '../composables/useAuthorSelection'
 import { useAuthorsList } from '../composables/useAuthorsList'
 import { useRefreshingAuthors } from '../composables/useRefreshingAuthors'
 import type { AuthorListSort, SortDirection } from '../types/author'
+import type { BookViewMode } from '@/composables/useDisplaySettings'
 
 const router = useRouter()
 const route = useRoute()
@@ -54,6 +55,12 @@ const deleteDialogOpen = ref(false)
 
 const canRefreshMetadata = computed(() => hasPermission('library_edit_metadata') && !isDemoRestrictedAccount.value)
 const canDeleteAuthors = computed(() => isSuperuser.value)
+const authorViewMode = computed<BookViewMode>({
+  get: () => (viewMode.value === 'table' ? 'grid' : viewMode.value),
+  set: (next) => {
+    viewMode.value = next === 'table' ? 'grid' : next
+  },
+})
 
 const SORT_LABELS: Record<AuthorListSort, string> = {
   name: 'Name',
@@ -446,8 +453,9 @@ watch(
     :total="total"
     v-model:coverSize="authorCoverSize"
     v-model:gridGap="gridGap"
-    v-model:viewMode="viewMode"
+    v-model:viewMode="authorViewMode"
     v-model:coverShape="authorCoverShape"
+    :allowed-view-modes="['grid', 'list']"
     :selection-mode="selectionMode"
     @toggle-selection="toggleSelectionMode"
   >
@@ -698,7 +706,7 @@ watch(
     </div>
 
     <div
-      v-show="viewMode === 'grid' && items.length > 0"
+      v-show="authorViewMode === 'grid' && items.length > 0"
       class="grid"
       :style="{ gridTemplateColumns: `repeat(auto-fill, minmax(${authorCoverSize}px, 1fr))`, gap: `${gridGap}px` }"
     >
@@ -720,7 +728,7 @@ watch(
       />
     </div>
 
-    <div v-show="viewMode === 'list' && items.length > 0" class="flex flex-col divide-y divide-border">
+    <div v-show="authorViewMode === 'list' && items.length > 0" class="flex flex-col divide-y divide-border">
       <AuthorListRow
         v-for="author in items"
         :key="author.id"
diff --git a/client/src/features/book/components/BookCoverCard.vue b/client/src/features/book/components/BookCoverCard.vue
index b536d8f42..46fd014cf 100644
--- a/client/src/features/book/components/BookCoverCard.vue
+++ b/client/src/features/book/components/BookCoverCard.vue
@@ -55,7 +55,7 @@ const props = defineProps<{
   selected?: boolean
 }>()
 
-type BookActionType = 'quick-view' | 'edit-metadata' | 'add-to-collection' | 'delete'
+type BookActionType = 'quick-view' | 'add-to-collection' | 'delete'
 const emit = defineEmits<{
   action: [type: BookActionType]
   select: [event: MouseEvent]
diff --git a/client/src/features/book/components/BookFilterBuilder.vue b/client/src/features/book/components/BookFilterBuilder.vue
index ad2c0f234..8c2f15b90 100644
--- a/client/src/features/book/components/BookFilterBuilder.vue
+++ b/client/src/features/book/components/BookFilterBuilder.vue
@@ -2,6 +2,7 @@
 import { computed, onMounted, ref, watch } from 'vue'
 import { Plus, Trash2, X } from 'lucide-vue-next'
 import { FIELD_OPERATORS, RULE_FIELDS, type GroupRule, type Rule, type RuleField, type RuleOperator } from '@bookorbit/types'
+import { READ_STATUSES } from '@bookorbit/types'
 import { FIELD_LABELS, OPERATOR_LABELS } from '@/features/book/lib/filter-labels'
 import { useLibraries } from '@/features/library/composables/useLibraries'
 import FilterChipTypeahead from './FilterChipTypeahead.vue'
@@ -34,6 +35,17 @@ const SCORE_PRESETS = [
 const CHIP_TYPEAHEAD_FIELDS: RuleField[] = ['author', 'genre', 'tag', 'collection']
 const TEXT_TYPEAHEAD_FIELDS: RuleField[] = ['publisher', 'series', 'language']
 
+const READ_STATUS_LABELS: Record<string, string> = {
+  unread: 'Unread',
+  want_to_read: 'Want to Read',
+  reading: 'Reading',
+  on_hold: 'On Hold',
+  rereading: 'Rereading',
+  read: 'Read',
+  skimmed: 'Skimmed',
+  abandoned: 'Abandoned',
+}
+
 const ENDPOINT_BY_FIELD: Partial<Record<RuleField, string>> = {
   author: '/api/v1/metadata/authors',
   genre: '/api/v1/metadata/genres',
@@ -256,6 +268,26 @@ function removeLibraryChip(index: number, name: string) {
   emitUpdate()
 }
 
+function addStatusChip(index: number, event: Event) {
+  const select = event.target as HTMLSelectElement
+  const status = select.value
+  select.value = ''
+  if (!status) return
+
+  const node = nodes.value[index]
+  if (node?.kind !== 'rule') return
+  if (node.rule.valueChips.includes(status)) return
+  node.rule.valueChips = [...node.rule.valueChips, status]
+  emitUpdate()
+}
+
+function removeStatusChip(index: number, status: string) {
+  const node = nodes.value[index]
+  if (node?.kind !== 'rule') return
+  node.rule.valueChips = node.rule.valueChips.filter((value) => value !== status)
+  emitUpdate()
+}
+
 function valueInputType(field: RuleField, operator: RuleOperator): string {
   if (NO_VALUE_OPERATORS.includes(operator)) return 'none'
   if (DATE_FIELDS.includes(field)) return operator === 'withinLast' ? 'number' : 'date'
@@ -355,6 +387,31 @@ function showValueToInput(operator: RuleOperator): boolean {
             </select>
           </div>
         </template>
+        <!-- Read status dropdown -->
+        <template v-else-if="node.rule.field === 'readStatus' && COLLECTION_OPERATORS.includes(node.rule.operator)">
+          <div class="flex flex-wrap items-center gap-1 min-w-48 flex-1 rounded-md border border-input bg-background px-2 py-1.5">
+            <span
+              v-for="status in node.rule.valueChips"
+              :key="status"
+              class="flex items-center gap-1 h-5 px-1.5 rounded bg-primary/15 text-primary text-xs font-medium shrink-0"
+            >
+              {{ READ_STATUS_LABELS[status] ?? status }}
+              <button type="button" class="text-primary/60 hover:text-primary leading-none" @click="removeStatusChip(index, status)">
+                <X :size="10" />
+              </button>
+            </span>
+            <select
+              :value="''"
+              class="h-7 flex-1 min-w-32 bg-transparent text-foreground text-sm outline-none"
+              @change="addStatusChip(index, $event)"
+            >
+              <option value="" disabled>Select status...</option>
+              <option v-for="status in READ_STATUSES" :key="status" :value="status" :disabled="node.rule.valueChips.includes(status)">
+                {{ READ_STATUS_LABELS[status] ?? status }}
+              </option>
+            </select>
+          </div>
+        </template>
         <!-- withinLast: number + unit selector -->
         <template v-else-if="node.rule.operator === 'withinLast'">
           <input
diff --git a/client/src/features/book/components/BookListRow.vue b/client/src/features/book/components/BookListRow.vue
index 56ea6df5e..96274bed9 100644
--- a/client/src/features/book/components/BookListRow.vue
+++ b/client/src/features/book/components/BookListRow.vue
@@ -37,7 +37,7 @@ const props = defineProps<{
   selected?: boolean
 }>()
 
-type BookActionType = 'quick-view' | 'edit-metadata' | 'add-to-collection' | 'delete'
+type BookActionType = 'quick-view' | 'add-to-collection' | 'delete'
 const emit = defineEmits<{
   action: [type: BookActionType]
   select: [event: MouseEvent]
diff --git a/client/src/features/book/components/BookQuickView.vue b/client/src/features/book/components/BookQuickView.vue
index 122859a57..bd68f08e4 100644
--- a/client/src/features/book/components/BookQuickView.vue
+++ b/client/src/features/book/components/BookQuickView.vue
@@ -22,7 +22,7 @@ const props = defineProps<{ bookId: number | null; open: boolean }>()
 const { hasPermission } = usePermissions()
 const emit = defineEmits<{
   'update:open': [value: boolean]
-  action: [type: 'edit-metadata' | 'add-to-collection' | 'delete']
+  action: [type: 'add-to-collection' | 'delete']
 }>()
 
 type ProviderLink = {
@@ -429,7 +429,7 @@ function toggleGenres() {
                   <Pencil class="size-3.5" />
                 </button>
               </TooltipTrigger>
-              <TooltipContent>Edit metadata</TooltipContent>
+              <TooltipContent>Open metadata editor</TooltipContent>
             </Tooltip>
             <Tooltip>
               <TooltipTrigger as-child>
diff --git a/client/src/features/book/components/KeyboardShortcutOverlay.vue b/client/src/features/book/components/KeyboardShortcutOverlay.vue
new file mode 100644
index 000000000..084c0bcd5
--- /dev/null
+++ b/client/src/features/book/components/KeyboardShortcutOverlay.vue
@@ -0,0 +1,97 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { X } from 'lucide-vue-next'
+
+defineProps<{ open: boolean }>()
+const emit = defineEmits<{ 'update:open': [value: boolean] }>()
+
+const isMac = computed(() => typeof navigator !== 'undefined' && /Mac/i.test(navigator.userAgent))
+const modKey = computed(() => (isMac.value ? '⌘' : 'Ctrl'))
+
+function handleClose() {
+  emit('update:open', false)
+}
+
+const sections = computed(() => [
+  {
+    title: 'Navigation',
+    shortcuts: [
+      { keys: ['↑', '↓'], label: 'Move focus up/down' },
+      { keys: ['←', '→'], label: 'Move focus left/right' },
+      { keys: ['Home'], label: 'Jump to first column' },
+      { keys: ['End'], label: 'Jump to last column' },
+      { keys: [`${modKey.value}+Home`], label: 'Jump to first row' },
+      { keys: [`${modKey.value}+End`], label: 'Jump to last row' },
+    ],
+  },
+  {
+    title: 'Actions',
+    shortcuts: [
+      { keys: ['Enter'], label: 'Edit focused cell' },
+      { keys: ['Escape'], label: 'Cancel editing / Close overlay' },
+      { keys: ['Space'], label: 'Toggle row selection' },
+      { keys: [`${modKey.value}+C`], label: 'Copy cell value' },
+      { keys: [`${modKey.value}+Shift+C`], label: 'Copy focused row' },
+    ],
+  },
+  {
+    title: 'General',
+    shortcuts: [{ keys: ['?'], label: 'Toggle this help overlay' }],
+  },
+])
+</script>
+
+<template>
+  <Teleport to="body">
+    <Transition name="shortcut-overlay">
+      <div
+        v-if="open"
+        class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm"
+        @click.self="handleClose"
+        @keydown.escape="handleClose"
+      >
+        <div class="relative w-full max-w-md rounded-xl border border-border bg-card shadow-xl" role="dialog" aria-label="Keyboard shortcuts">
+          <div class="flex items-center justify-between border-b border-border px-5 py-3">
+            <h2 class="text-sm font-semibold text-foreground">Keyboard Shortcuts</h2>
+            <button
+              class="h-7 w-7 flex items-center justify-center rounded-md text-muted-foreground hover:text-foreground hover:bg-muted/60 transition-colors"
+              @click="handleClose"
+            >
+              <X :size="14" />
+            </button>
+          </div>
+          <div class="px-5 py-4 max-h-[60vh] overflow-y-auto space-y-5">
+            <div v-for="section in sections" :key="section.title">
+              <h3 class="text-xs font-medium text-muted-foreground uppercase tracking-wider mb-2">{{ section.title }}</h3>
+              <div class="space-y-1.5">
+                <div v-for="shortcut in section.shortcuts" :key="shortcut.label" class="flex items-center justify-between py-1">
+                  <span class="text-sm text-foreground">{{ shortcut.label }}</span>
+                  <div class="flex items-center gap-1">
+                    <kbd
+                      v-for="key in shortcut.keys"
+                      :key="key"
+                      class="inline-flex items-center justify-center min-w-[1.5rem] h-6 px-1.5 rounded border border-border bg-muted/50 text-xs font-mono text-muted-foreground"
+                    >
+                      {{ key }}
+                    </kbd>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </Transition>
+  </Teleport>
+</template>
+
+<style scoped>
+.shortcut-overlay-enter-active,
+.shortcut-overlay-leave-active {
+  transition: opacity 0.15s ease;
+}
+.shortcut-overlay-enter-from,
+.shortcut-overlay-leave-to {
+  opacity: 0;
+}
+</style>
diff --git a/client/src/features/book/components/MetadataExportDialog.vue b/client/src/features/book/components/MetadataExportDialog.vue
new file mode 100644
index 000000000..476fdfb3f
--- /dev/null
+++ b/client/src/features/book/components/MetadataExportDialog.vue
@@ -0,0 +1,356 @@
+<script setup lang="ts">
+import { computed, reactive, ref, watch } from 'vue'
+import { Download, FileJson2, FileSpreadsheet, Loader2, X } from 'lucide-vue-next'
+import { toast } from 'vue-sonner'
+import type { SortSpec } from '@bookorbit/types'
+import {
+  useBookMetadataExport,
+  type MetadataExportColumnsMode,
+  type MetadataExportFormat,
+  type MetadataExportQuery,
+  type MetadataExportRequest,
+  type MetadataExportScope,
+  type MetadataExportViewType,
+  type MetadataExportPreflight,
+} from '@/features/book/composables/useBookMetadataExport'
+
+const props = withDefaults(
+  defineProps<{
+    open: boolean
+    viewType: MetadataExportViewType
+    selectedBookIds: number[]
+    selectedCount: number
+    totalCount: number
+    allMatchingQuery?: MetadataExportQuery
+    sort?: SortSpec[]
+    visibleColumns?: string[]
+    defaultScope?: MetadataExportScope
+  }>(),
+  {
+    defaultScope: 'all-matching',
+    sort: () => [],
+    visibleColumns: () => [],
+  },
+)
+
+const emit = defineEmits<{ 'update:open': [value: boolean] }>()
+
+type PersistedSettings = {
+  format: MetadataExportFormat
+  columnsMode: MetadataExportColumnsMode
+  includePersonalData: boolean
+  includeFilePaths: boolean
+  includeContextMeta: boolean
+}
+
+const STORAGE_PREFIX = 'bookorbit:metadata-export:'
+
+const settings = reactive<PersistedSettings>({
+  format: 'csv',
+  columnsMode: 'canonical',
+  includePersonalData: false,
+  includeFilePaths: false,
+  includeContextMeta: true,
+})
+
+const scope = ref<MetadataExportScope>('all-matching')
+const preflight = ref<MetadataExportPreflight | null>(null)
+const preflightError = ref<string | null>(null)
+const preflighting = ref(false)
+const { loading, preflight: requestPreflight, download } = useBookMetadataExport()
+
+const selectedCountLabel = computed(() => props.selectedCount.toLocaleString())
+const totalCountLabel = computed(() => props.totalCount.toLocaleString())
+const hasSelectedRows = computed(() => props.selectedBookIds.length > 0)
+const hasAllMatchingScope = computed(() => Boolean(props.allMatchingQuery))
+
+const canRun = computed(() => {
+  if (scope.value === 'selected') return hasSelectedRows.value
+  return hasAllMatchingScope.value
+})
+
+const scopeSummary = computed(() => {
+  if (scope.value === 'selected') return `${selectedCountLabel.value} selected row${props.selectedCount === 1 ? '' : 's'}`
+  return `${totalCountLabel.value} matching row${props.totalCount === 1 ? '' : 's'}`
+})
+
+const sizeHintClass = computed(() => {
+  if (!preflight.value) return 'text-muted-foreground'
+  if (preflight.value.sizeCategory === 'small') return 'text-emerald-600'
+  if (preflight.value.sizeCategory === 'medium') return 'text-amber-600'
+  return 'text-destructive'
+})
+
+function storageKey(viewType: MetadataExportViewType) {
+  return `${STORAGE_PREFIX}${viewType}`
+}
+
+function loadSettings() {
+  if (typeof window === 'undefined') return
+  try {
+    const raw = window.localStorage.getItem(storageKey(props.viewType))
+    if (!raw) return
+    const parsed = JSON.parse(raw) as Partial<PersistedSettings>
+    if (parsed.format === 'csv' || parsed.format === 'json') settings.format = parsed.format
+    if (parsed.columnsMode === 'canonical' || parsed.columnsMode === 'visible') settings.columnsMode = parsed.columnsMode
+    if (typeof parsed.includePersonalData === 'boolean') settings.includePersonalData = parsed.includePersonalData
+    if (typeof parsed.includeFilePaths === 'boolean') settings.includeFilePaths = parsed.includeFilePaths
+    if (typeof parsed.includeContextMeta === 'boolean') settings.includeContextMeta = parsed.includeContextMeta
+  } catch {
+    // Ignore malformed persisted state.
+  }
+}
+
+function persistSettings() {
+  if (typeof window === 'undefined') return
+  window.localStorage.setItem(storageKey(props.viewType), JSON.stringify(settings))
+}
+
+function closeDialog() {
+  emit('update:open', false)
+}
+
+function resolveDefaultScope(): MetadataExportScope {
+  const preferred = props.defaultScope
+  if (preferred === 'selected' && hasSelectedRows.value) return 'selected'
+  if (preferred === 'all-matching' && hasAllMatchingScope.value) return 'all-matching'
+  if (hasSelectedRows.value) return 'selected'
+  return 'all-matching'
+}
+
+function buildRequest(): MetadataExportRequest | null {
+  if (!canRun.value) return null
+  return {
+    scope: scope.value,
+    format: settings.format,
+    viewType: props.viewType,
+    selectedBookIds: props.selectedBookIds,
+    allMatchingQuery: props.allMatchingQuery,
+    sort: props.sort,
+    options: {
+      includePersonalData: settings.includePersonalData,
+      includeFilePaths: settings.includeFilePaths,
+      includeContextMeta: settings.includeContextMeta,
+      columnsMode: settings.columnsMode,
+      visibleColumns: props.visibleColumns ?? [],
+    },
+  }
+}
+
+async function refreshPreflight() {
+  preflight.value = null
+  preflightError.value = null
+  const request = buildRequest()
+  if (!request) return
+  preflighting.value = true
+  try {
+    preflight.value = await requestPreflight(request)
+  } catch (error) {
+    preflightError.value = error instanceof Error ? error.message : 'Failed to prepare export'
+  } finally {
+    preflighting.value = false
+  }
+}
+
+async function runExport() {
+  const request = buildRequest()
+  if (!request) return
+  if (!preflight.value || preflightError.value) {
+    await refreshPreflight()
+    if (!preflight.value || preflightError.value) return
+  }
+
+  try {
+    await download(request)
+    toast.success(`Metadata export started: ${preflight.value.fileName}`)
+    closeDialog()
+  } catch (error) {
+    toast.error(error instanceof Error ? error.message : 'Metadata export failed')
+  }
+}
+
+watch(
+  () => props.open,
+  (open) => {
+    if (!open) return
+    loadSettings()
+    scope.value = resolveDefaultScope()
+    void refreshPreflight()
+  },
+)
+
+watch(
+  [
+    () => props.open,
+    scope,
+    () => settings.format,
+    () => settings.columnsMode,
+    () => settings.includePersonalData,
+    () => settings.includeFilePaths,
+    () => settings.includeContextMeta,
+  ],
+  ([open]) => {
+    if (!open) return
+    persistSettings()
+    void refreshPreflight()
+  },
+)
+
+watch(
+  () => props.viewType,
+  () => {
+    if (!props.open) return
+    loadSettings()
+    void refreshPreflight()
+  },
+)
+</script>
+
+<template>
+  <Teleport to="body">
+    <div v-if="open" class="fixed inset-0 z-50 flex items-center justify-center">
+      <div class="absolute inset-0 bg-black/40 backdrop-blur-sm" @click="closeDialog" />
+      <div class="relative z-10 mx-4 w-full max-w-2xl rounded-lg border border-border bg-card shadow-2xl">
+        <div class="flex items-center justify-between border-b border-border px-5 py-4">
+          <div class="flex items-center gap-2">
+            <FileSpreadsheet :size="16" class="text-primary" />
+            <h2 class="text-base font-semibold text-foreground">Export Metadata</h2>
+          </div>
+          <button class="rounded-md p-1 text-muted-foreground transition-colors hover:bg-muted hover:text-foreground" @click="closeDialog">
+            <X :size="14" />
+          </button>
+        </div>
+
+        <div class="space-y-5 px-5 py-4">
+          <section class="space-y-2">
+            <p class="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Scope</p>
+            <div class="grid gap-2 sm:grid-cols-2">
+              <button
+                class="rounded-md border px-3 py-2 text-left text-sm transition-colors"
+                :class="
+                  scope === 'selected' ? 'border-primary bg-primary/10 text-primary' : 'border-input bg-background text-foreground hover:bg-muted/40'
+                "
+                :disabled="!hasSelectedRows"
+                @click="scope = 'selected'"
+              >
+                <p class="font-medium">Selected rows</p>
+                <p class="text-xs text-muted-foreground">{{ selectedCountLabel }} currently selected</p>
+              </button>
+              <button
+                class="rounded-md border px-3 py-2 text-left text-sm transition-colors"
+                :class="
+                  scope === 'all-matching'
+                    ? 'border-primary bg-primary/10 text-primary'
+                    : 'border-input bg-background text-foreground hover:bg-muted/40'
+                "
+                :disabled="!hasAllMatchingScope"
+                @click="scope = 'all-matching'"
+              >
+                <p class="font-medium">All matching rows</p>
+                <p class="text-xs text-muted-foreground">{{ totalCountLabel }} rows in current result</p>
+              </button>
+            </div>
+          </section>
+
+          <section class="space-y-2">
+            <p class="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Format</p>
+            <div class="grid gap-2 sm:grid-cols-2">
+              <button
+                class="rounded-md border px-3 py-2 text-left text-sm transition-colors"
+                :class="
+                  settings.format === 'csv'
+                    ? 'border-primary bg-primary/10 text-primary'
+                    : 'border-input bg-background text-foreground hover:bg-muted/40'
+                "
+                @click="settings.format = 'csv'"
+              >
+                <p class="flex items-center gap-1.5 font-medium"><FileSpreadsheet :size="14" /> CSV</p>
+                <p class="text-xs text-muted-foreground">Spreadsheet-friendly, UTF-8 BOM included</p>
+              </button>
+              <button
+                class="rounded-md border px-3 py-2 text-left text-sm transition-colors"
+                :class="
+                  settings.format === 'json'
+                    ? 'border-primary bg-primary/10 text-primary'
+                    : 'border-input bg-background text-foreground hover:bg-muted/40'
+                "
+                @click="settings.format = 'json'"
+              >
+                <p class="flex items-center gap-1.5 font-medium"><FileJson2 :size="14" /> JSON</p>
+                <p class="text-xs text-muted-foreground">Structured export with metadata context</p>
+              </button>
+            </div>
+          </section>
+
+          <section class="space-y-2">
+            <p class="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Columns</p>
+            <div class="flex flex-wrap items-center gap-4 text-sm">
+              <label class="inline-flex items-center gap-2">
+                <input type="radio" class="accent-primary" value="canonical" v-model="settings.columnsMode" />
+                Stable canonical schema
+              </label>
+              <label class="inline-flex items-center gap-2">
+                <input type="radio" class="accent-primary" value="visible" v-model="settings.columnsMode" />
+                Current visible columns
+              </label>
+            </div>
+          </section>
+
+          <section class="space-y-2">
+            <p class="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Options</p>
+            <div class="grid gap-2 text-sm sm:grid-cols-2">
+              <label class="inline-flex items-center gap-2">
+                <input v-model="settings.includePersonalData" type="checkbox" class="accent-primary" />
+                Include personal reading data
+              </label>
+              <label class="inline-flex items-center gap-2">
+                <input v-model="settings.includeFilePaths" type="checkbox" class="accent-primary" />
+                Include file paths (advanced)
+              </label>
+              <label class="inline-flex items-center gap-2">
+                <input v-model="settings.includeContextMeta" type="checkbox" class="accent-primary" />
+                Include context metadata
+              </label>
+            </div>
+          </section>
+
+          <section class="rounded-md border border-border/70 bg-muted/30 p-3 text-sm">
+            <p class="font-medium text-foreground">Preflight</p>
+            <p class="mt-1 text-muted-foreground">Scope: {{ scopeSummary }}</p>
+            <p v-if="preflighting" class="mt-1 inline-flex items-center gap-2 text-muted-foreground">
+              <Loader2 :size="14" class="animate-spin" /> Calculating export size...
+            </p>
+            <template v-else-if="preflight">
+              <p class="mt-1 text-muted-foreground">
+                Estimated size:
+                <span :class="sizeHintClass">{{ (preflight.estimatedBytes / 1024 / 1024).toFixed(2) }} MB</span>
+                ({{ preflight.sizeCategory }})
+              </p>
+              <p class="mt-1 text-muted-foreground">File: {{ preflight.fileName }}</p>
+            </template>
+            <p v-else-if="preflightError" class="mt-1 text-destructive">{{ preflightError }}</p>
+          </section>
+        </div>
+
+        <div class="flex items-center justify-end gap-2 border-t border-border px-5 py-4">
+          <button
+            class="rounded-md px-4 py-2 text-sm font-medium text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+            :disabled="loading"
+            @click="closeDialog"
+          >
+            Cancel
+          </button>
+          <button
+            class="inline-flex items-center gap-2 rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90 disabled:opacity-50"
+            :disabled="!canRun || !!preflightError || loading || preflighting"
+            @click="runExport"
+          >
+            <Loader2 v-if="loading" :size="14" class="animate-spin" />
+            <Download v-else :size="14" />
+            Export
+          </button>
+        </div>
+      </div>
+    </div>
+  </Teleport>
+</template>
diff --git a/client/src/features/book/components/TableColumnPanel.vue b/client/src/features/book/components/TableColumnPanel.vue
new file mode 100644
index 000000000..7938645d3
--- /dev/null
+++ b/client/src/features/book/components/TableColumnPanel.vue
@@ -0,0 +1,266 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { Copy, Download, RotateCcw, Star, Upload, X } from 'lucide-vue-next'
+import type { TableDensity } from '@/composables/useDisplaySettings'
+import type { SavedView } from '@/features/book/composables/useSavedViews'
+import type { ColumnDef, ColumnId } from '@/features/book/composables/useTableColumns'
+import type { TablePreset } from '@/features/book/composables/useTablePresets'
+
+const props = withDefaults(
+  defineProps<{
+    allColumns: (ColumnDef & { visible: boolean })[]
+    allPresets: TablePreset[]
+    savedViews?: SavedView[]
+    tableDensity?: TableDensity
+  }>(),
+  {
+    savedViews: () => [],
+    tableDensity: 'comfortable',
+  },
+)
+
+const emit = defineEmits<{
+  'toggle-column': [id: ColumnId]
+  'reorder-columns': [cols: (ColumnDef & { visible: boolean })[]]
+  'apply-preset': [preset: TablePreset]
+  'save-preset': [name: string]
+  'delete-preset': [id: string]
+  'rename-preset': [id: string, name: string]
+  'duplicate-preset': [id: string]
+  'favorite-preset': [id: string]
+  'apply-view': [view: SavedView]
+  'save-view': [name: string]
+  'delete-view': [id: string]
+  'rename-view': [id: string, name: string]
+  'duplicate-view': [id: string]
+  'favorite-view': [id: string]
+  'update:density': [density: TableDensity]
+  'export-backup': []
+  'import-backup': [file: File]
+  reset: []
+}>()
+
+const presetName = ref('')
+const viewName = ref('')
+const importInputRef = ref<HTMLInputElement | null>(null)
+
+function handleSavePreset() {
+  const name = presetName.value.trim()
+  if (!name) return
+  emit('save-preset', name)
+  presetName.value = ''
+}
+
+function handleSaveView() {
+  const name = viewName.value.trim()
+  if (!name) return
+  emit('save-view', name)
+  viewName.value = ''
+}
+
+function promptForRename(currentName: string): string | null {
+  if (typeof window === 'undefined') return null
+  const nextName = window.prompt('Enter a new name', currentName)
+  return nextName ? nextName.trim() : null
+}
+
+function handleRenamePreset(preset: TablePreset) {
+  const nextName = promptForRename(preset.name)
+  if (!nextName) return
+  emit('rename-preset', preset.id, nextName)
+}
+
+function handleRenameView(view: SavedView) {
+  const nextName = promptForRename(view.name)
+  if (!nextName) return
+  emit('rename-view', view.id, nextName)
+}
+
+function handleImportBackupClick() {
+  importInputRef.value?.click()
+}
+
+function handleImportBackup(event: Event) {
+  const input = event.target as HTMLInputElement
+  const file = input.files?.[0]
+  if (!file) return
+  emit('import-backup', file)
+  input.value = ''
+}
+
+function densityButtonClass(density: TableDensity) {
+  return props.tableDensity === density
+    ? 'border-primary bg-primary/10 text-primary'
+    : 'border-input bg-background text-muted-foreground hover:bg-muted hover:text-foreground'
+}
+
+function pinBadge(column: ColumnDef & { visible: boolean }): string | null {
+  if (column.pinned === 'left') return 'Pinned left'
+  if (column.pinned === 'right') return 'Pinned right'
+  return null
+}
+
+function columnLabel(column: ColumnDef & { visible: boolean }): string {
+  if (column.header) return column.header
+  if (column.id === 'cover') return 'Cover'
+  return column.id === 'actions' ? 'Actions' : column.id
+}
+</script>
+
+<template>
+  <div class="space-y-3">
+    <div class="flex items-center justify-between">
+      <span class="text-xs font-semibold uppercase tracking-wide text-foreground">Columns</span>
+      <button class="text-xs text-muted-foreground hover:text-foreground" @click="emit('reset')">
+        <RotateCcw :size="11" class="mr-0.5 inline" />Reset
+      </button>
+    </div>
+
+    <div class="space-y-2 rounded-md border border-border/60 p-2">
+      <div class="text-[11px] font-semibold uppercase tracking-wide text-muted-foreground">Table density</div>
+      <div class="grid grid-cols-3 gap-1">
+        <button
+          class="h-8 rounded-md border text-xs transition-colors"
+          :class="densityButtonClass('compact')"
+          @click="emit('update:density', 'compact')"
+        >
+          Compact
+        </button>
+        <button
+          class="h-8 rounded-md border text-xs transition-colors"
+          :class="densityButtonClass('comfortable')"
+          @click="emit('update:density', 'comfortable')"
+        >
+          Comfortable
+        </button>
+        <button class="h-8 rounded-md border text-xs transition-colors" :class="densityButtonClass('roomy')" @click="emit('update:density', 'roomy')">
+          Roomy
+        </button>
+      </div>
+    </div>
+
+    <div class="space-y-2 rounded-md border border-border/60 p-2">
+      <div class="flex items-center justify-between gap-2">
+        <div class="text-[11px] font-semibold uppercase tracking-wide text-muted-foreground">Presets</div>
+        <div class="flex items-center gap-1">
+          <button
+            class="rounded p-1 text-muted-foreground hover:bg-accent hover:text-foreground"
+            title="Export presets and saved views"
+            @click="emit('export-backup')"
+          >
+            <Download :size="12" />
+          </button>
+          <button
+            class="rounded p-1 text-muted-foreground hover:bg-accent hover:text-foreground"
+            title="Import presets and saved views"
+            @click="handleImportBackupClick"
+          >
+            <Upload :size="12" />
+          </button>
+        </div>
+      </div>
+      <input ref="importInputRef" type="file" accept="application/json" class="hidden" @change="handleImportBackup" />
+      <div class="space-y-1">
+        <div
+          v-for="preset in allPresets"
+          :key="preset.id"
+          class="flex items-center gap-2 rounded px-2 py-1 text-xs transition-colors hover:bg-accent"
+        >
+          <button class="min-w-0 flex-1 text-left" @click="emit('apply-preset', preset)">
+            <span class="truncate">{{ preset.name }}</span>
+          </button>
+          <button
+            v-if="!preset.isBuiltIn"
+            class="rounded p-1 text-muted-foreground hover:bg-background hover:text-foreground"
+            :class="preset.favorite ? 'text-primary' : ''"
+            @click="emit('favorite-preset', preset.id)"
+          >
+            <Star :size="11" :class="preset.favorite ? 'fill-current' : ''" />
+          </button>
+          <button
+            v-if="!preset.isBuiltIn"
+            class="rounded p-1 text-muted-foreground hover:bg-background hover:text-foreground"
+            @click="emit('duplicate-preset', preset.id)"
+          >
+            <Copy :size="11" />
+          </button>
+          <button
+            v-if="!preset.isBuiltIn"
+            class="rounded p-1 text-muted-foreground hover:bg-background hover:text-foreground"
+            @click="handleRenamePreset(preset)"
+          >
+            Rename
+          </button>
+          <span v-if="preset.isBuiltIn" class="text-[10px] text-muted-foreground">Built in</span>
+          <button
+            v-if="!preset.isBuiltIn"
+            class="rounded p-1 text-muted-foreground hover:bg-background hover:text-destructive"
+            @click="emit('delete-preset', preset.id)"
+          >
+            <X :size="11" />
+          </button>
+        </div>
+      </div>
+      <div class="flex items-center gap-2">
+        <input
+          v-model="presetName"
+          class="h-8 min-w-0 flex-1 rounded-md border border-input bg-background px-2 text-xs text-foreground placeholder:text-muted-foreground"
+          placeholder="Save current preset"
+        />
+        <button
+          class="h-8 shrink-0 rounded-md border border-input px-2 text-xs text-muted-foreground hover:bg-muted hover:text-foreground"
+          @click="handleSavePreset"
+        >
+          Save
+        </button>
+      </div>
+    </div>
+
+    <div class="space-y-2 rounded-md border border-border/60 p-2">
+      <div class="text-[11px] font-semibold uppercase tracking-wide text-muted-foreground">Saved views</div>
+      <div v-if="savedViews.length > 0" class="space-y-1">
+        <div v-for="view in savedViews" :key="view.id" class="flex items-center gap-2 rounded px-2 py-1 text-xs transition-colors hover:bg-accent">
+          <button class="min-w-0 flex-1 text-left" @click="emit('apply-view', view)">
+            <span class="truncate">{{ view.name }}</span>
+          </button>
+          <button
+            class="rounded p-1 text-muted-foreground hover:bg-background hover:text-foreground"
+            :class="view.favorite ? 'text-primary' : ''"
+            @click="emit('favorite-view', view.id)"
+          >
+            <Star :size="11" :class="view.favorite ? 'fill-current' : ''" />
+          </button>
+          <button class="rounded p-1 text-muted-foreground hover:bg-background hover:text-foreground" @click="emit('duplicate-view', view.id)">
+            <Copy :size="11" />
+          </button>
+          <button class="rounded p-1 text-muted-foreground hover:bg-background hover:text-foreground" @click="handleRenameView(view)">Rename</button>
+          <button class="rounded p-1 text-muted-foreground hover:bg-background hover:text-destructive" @click="emit('delete-view', view.id)">
+            <X :size="11" />
+          </button>
+        </div>
+      </div>
+      <p v-else class="text-xs text-muted-foreground">Save sort, layout, and view-specific filters for quick reuse.</p>
+      <div class="flex items-center gap-2">
+        <input
+          v-model="viewName"
+          class="h-8 min-w-0 flex-1 rounded-md border border-input bg-background px-2 text-xs text-foreground placeholder:text-muted-foreground"
+          placeholder="Save current view"
+        />
+        <button
+          class="h-8 shrink-0 rounded-md border border-input px-2 text-xs text-muted-foreground hover:bg-muted hover:text-foreground"
+          @click="handleSaveView"
+        >
+          Save
+        </button>
+      </div>
+    </div>
+
+    <div class="space-y-1 rounded-md border border-border/60 p-2">
+      <label v-for="col in allColumns" :key="col.id" class="flex items-center gap-2 rounded px-1.5 py-1 text-xs hover:bg-accent">
+        <input type="checkbox" :checked="col.visible" class="accent-primary" @change="emit('toggle-column', col.id)" />
+        <span class="flex-1">{{ columnLabel(col) }}</span>
+        <span v-if="pinBadge(col)" class="rounded-full bg-primary/10 px-1.5 py-0.5 text-[10px] font-medium text-primary">{{ pinBadge(col) }}</span>
+      </label>
+    </div>
+  </div>
+</template>
diff --git a/client/src/features/book/components/VirtualBookGrid.vue b/client/src/features/book/components/VirtualBookGrid.vue
index 891d751b8..4d943566f 100644
--- a/client/src/features/book/components/VirtualBookGrid.vue
+++ b/client/src/features/book/components/VirtualBookGrid.vue
@@ -7,7 +7,7 @@ import BookCoverCard from './BookCoverCard.vue'
 import CollapsedSeriesCard from './CollapsedSeriesCard.vue'
 import { COVER_ASPECT_RATIO_KEY, DEFAULT_COVER_ASPECT_RATIO } from '../lib/cover-aspect-ratio'
 
-type BookActionType = 'quick-view' | 'edit-metadata' | 'add-to-collection' | 'delete'
+type BookActionType = 'quick-view' | 'add-to-collection' | 'delete'
 
 const props = withDefaults(
   defineProps<{
diff --git a/client/src/features/book/components/VirtualBookTable.vue b/client/src/features/book/components/VirtualBookTable.vue
new file mode 100644
index 000000000..7629b37c5
--- /dev/null
+++ b/client/src/features/book/components/VirtualBookTable.vue
@@ -0,0 +1,992 @@
+<script setup lang="ts">
+import { ref, computed, watch, nextTick, onMounted, onUnmounted } from 'vue'
+import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
+import { useVirtualizer } from '@tanstack/vue-virtual'
+import { AlertTriangle, ArrowDown, ArrowUp, BookOpen, CheckCircle2, ChevronUp, Loader2, RotateCcw, X } from 'lucide-vue-next'
+import {
+  useTableColumns,
+  COLUMN_DEFS,
+  COLUMN_DEF_MAP,
+  LOCK_ROW_COLUMN_DEF,
+  type ColumnId,
+  type ColumnDef,
+} from '@/features/book/composables/useTableColumns'
+import { useTableCellEditor } from '@/features/book/composables/useTableCellEditor'
+import { useTableLocks } from '@/features/book/composables/useTableLocks'
+import { useTablePresets } from '@/features/book/composables/useTablePresets'
+import { useTableContextMenu } from '@/features/book/composables/useTableContextMenu'
+import { useTableScrollBehavior } from '@/features/book/composables/useTableScrollBehavior'
+import { useTableResize } from '@/features/book/composables/useTableResize'
+import { useTableDragReorder } from '@/features/book/composables/useTableDragReorder'
+import { useTableKeyboard } from '@/features/book/composables/useTableKeyboard'
+import { useTableSorting } from '@/features/book/composables/useTableSorting'
+import { useTableQuickFilters } from '@/features/book/composables/useTableQuickFilters'
+import { useTableCellHelpers } from '@/features/book/composables/useTableCellHelpers'
+import { useTableCoverDialog } from '@/features/book/composables/useTableCoverDialog'
+import KeyboardShortcutOverlay from './KeyboardShortcutOverlay.vue'
+import { useAuthorSearch } from '@/features/book/composables/useAuthorSearch'
+import { useGenreSearch, useTagSearch } from '@/features/book/composables/useTagSearch'
+import { usePublisherSearch, useSeriesNameSearch, useLanguageSearch } from '@/features/book/composables/useMetadataFieldSearch'
+import { useRefreshMetadata } from '@/features/book/composables/useRefreshMetadata'
+import { useRefreshingBooks } from '@/features/book/composables/useRefreshingBooks'
+import { useBookRefreshFeedback } from '@/features/book/composables/useBookRefreshFeedback'
+import type { InFlightOp } from '@/features/book/composables/useBookBulkActions'
+import { detectChangedColumns, mergeBookCardWithDetail } from '@/features/book/lib/book-card-mapper'
+import { buildLockStateBookUpdate, mergeBookPatchWithLatest, sameLockFields } from '@/features/book/lib/table-row-state-sync'
+import BookCoverDialog from './table/BookCoverDialog.vue'
+import BookTableCellDispatcher from './table/BookTableCellDispatcher.vue'
+import BookTableCollapsedSeriesRow from './table/BookTableCollapsedSeriesRow.vue'
+import BookTableContextMenu from './table/BookTableContextMenu.vue'
+import BookTableHeader from './table/BookTableHeader.vue'
+import BookTableHeaderContextMenu from './table/BookTableHeaderContextMenu.vue'
+import type { BookCard, Rule, SortSpec, TableLayoutState, TableViewType } from '@bookorbit/types'
+import { BOOK_METADATA_LOCK_FIELDS } from '@bookorbit/types'
+import { useNarratorSearch } from '@/features/book/composables/useNarratorSearch'
+import { SORT_FIELD_LABELS } from '@/features/book/lib/filter-labels'
+import { useDisplaySettings } from '@/composables/useDisplaySettings'
+
+const props = withDefaults(
+  defineProps<{
+    books: BookCard[]
+    sort: SortSpec[]
+    viewType: TableViewType
+    selectionMode?: boolean
+    isSelected?: (id: number) => boolean
+    hasMore?: boolean
+    loading?: boolean
+    total?: number
+    sortable?: boolean
+    selectedCount?: number
+    filterActive?: boolean
+    initialized?: boolean
+    inFlight?: InFlightOp | null
+  }>(),
+  { sortable: true, initialized: true },
+)
+
+type BookActionType = 'quick-view' | 'add-to-collection' | 'delete'
+const emit = defineEmits<{
+  'update:sort': [value: SortSpec[]]
+  action: [book: BookCard, type: BookActionType]
+  select: [id: number, event: MouseEvent]
+  'update:book': [updated: BookCard]
+  'load-more': []
+  'select-all': [checked: boolean]
+  'enter-selection': []
+  'quick-filter': [rule: Rule]
+}>()
+
+const { md } = useBreakpoints(breakpointsTailwind)
+const isReadOnly = computed(() => !md.value)
+const { tableDensity, tableZebraStriping } = useDisplaySettings()
+
+const { layout, visibleColumns, allColumns, toggleColumn, setColumnOrder, setColumnWidth, setLayout, pinColumn, unpinColumn, resetLayout } =
+  useTableColumns(props.viewType)
+const editor = useTableCellEditor()
+const locks = useTableLocks()
+const tablePresets = useTablePresets(
+  props.viewType,
+  COLUMN_DEFS.map((column) => column.id),
+)
+
+const { search: searchAuthors } = useAuthorSearch()
+const { search: searchGenres } = useGenreSearch()
+const { search: searchTags } = useTagSearch()
+const { search: searchNarrators } = useNarratorSearch()
+const { search: searchPublisher } = usePublisherSearch()
+const { search: searchSeriesName } = useSeriesNameSearch()
+const { search: searchLanguage } = useLanguageSearch()
+const { refreshWithFeedback } = useRefreshMetadata()
+const { isRefreshing } = useRefreshingBooks()
+const refreshFeedback = useBookRefreshFeedback()
+const { getSortDir, handleColumnSort, removeSortField } = useTableSorting(
+  () => props.sort,
+  () => props.sortable ?? true,
+  (sort) => emit('update:sort', sort),
+)
+const { getQuickFilterOptions, buildQuickFilterRule } = useTableQuickFilters(props.viewType)
+const { getCellValue, isCellLocked, isCellReadOnly, isMandatoryFieldEmpty, isBookFileMissing, getPinnedCellBackground } = useTableCellHelpers(
+  locks,
+  () => isReadOnly.value,
+)
+const { coverDialogBook, handleCoverClick, handleCoverDialogUpdateBook } = useTableCoverDialog(
+  () => props.selectionMode ?? false,
+  (updated) => emit('update:book', updated),
+  () => props.books,
+)
+
+function getChipsSearchFn(colId: ColumnId): (q: string) => Promise<string[]> {
+  if (colId === 'authors') return searchAuthors
+  if (colId === 'genres') return searchGenres
+  if (colId === 'tags') return searchTags
+  if (colId === 'narrators') return searchNarrators
+  return () => Promise.resolve([])
+}
+
+function getChipsLinkFn(colId: ColumnId): ((chip: string) => string | null) | undefined {
+  if (colId === 'authors') return (name) => `/authors?q=${encodeURIComponent(name)}`
+  return undefined
+}
+
+function getChipsActionFn(colId: ColumnId): ((chip: string) => void) | undefined {
+  if (props.viewType !== 'library') return undefined
+  if (colId === 'genres') {
+    return (name) => emit('quick-filter', { type: 'rule', field: 'genre', operator: 'includesAny', value: [name] })
+  }
+  if (colId === 'tags') {
+    return (name) => emit('quick-filter', { type: 'rule', field: 'tag', operator: 'includesAny', value: [name] })
+  }
+  return undefined
+}
+
+function getTextCellOpenLink(book: BookCard, colId: ColumnId): string | null {
+  if (colId === 'title') return `/book/${book.id}`
+  if (colId === 'seriesName' && book.seriesName) return `/series/${encodeURIComponent(book.seriesName)}`
+  return null
+}
+
+const rowPaddingClass = computed(() => {
+  if (tableDensity.value === 'compact') return 'py-1'
+  if (tableDensity.value === 'roomy') return 'py-2.5'
+  return 'py-1.5'
+})
+
+function getTextCellOpenLinkLabel(colId: ColumnId): string | null {
+  if (colId === 'title') return 'Open book details'
+  if (colId === 'seriesName') return 'Open series'
+  return null
+}
+
+function getTextSearchFn(colId: ColumnId): ((q: string) => Promise<string[]>) | undefined {
+  if (colId === 'publisher') return searchPublisher
+  if (colId === 'seriesName') return searchSeriesName
+  if (colId === 'language') return searchLanguage
+  return undefined
+}
+
+const metadataInFlight = computed(() => (props.inFlight?.label === 'Refreshing metadata' ? props.inFlight : null))
+const metadataFailed = computed(() => metadataInFlight.value?.failed ?? 0)
+const metadataRemaining = computed(() => {
+  if (!metadataInFlight.value) return 0
+  return Math.max(metadataInFlight.value.total - metadataInFlight.value.processed, 0)
+})
+function getRowFeedback(bookId: number) {
+  return refreshFeedback.getFeedback(bookId)
+}
+
+function isRowRefreshing(bookId: number): boolean {
+  return getRowFeedback(bookId)?.state === 'refreshing' || isRefreshing(bookId)
+}
+
+function isCellChanged(bookId: number, colId: ColumnId): boolean {
+  return refreshFeedback.isCellChanged(bookId, colId)
+}
+
+function getRowFeedbackMessage(bookId: number): string {
+  return getRowFeedback(bookId)?.message ?? 'Metadata refresh failed'
+}
+
+async function retryMetadataRefresh(book: BookCard) {
+  if (isRefreshing(book.id)) return
+  refreshFeedback.markRefreshing(book.id)
+  const updated = await refreshWithFeedback(book.id)
+  if (updated) {
+    const merged = mergeBookCardWithDetail(book, updated)
+    refreshFeedback.markSuccess(book.id, detectChangedColumns(book, merged))
+    emit('update:book', merged)
+    return
+  }
+  refreshFeedback.markFailed(book.id)
+}
+
+// Init lock state for books and prune stale entries
+watch(
+  () => props.books,
+  (books) => {
+    for (const book of books) {
+      locks.initBook(book.id, book.lockedFields)
+    }
+    locks.pruneStaleEntries(new Set(books.map((b) => b.id)))
+  },
+  { immediate: true },
+)
+
+const displayColumns = computed(() => [LOCK_ROW_COLUMN_DEF, ...visibleColumns.value])
+const currentLayout = computed<TableLayoutState>(() => ({
+  columnOrder: [...layout.value.columnOrder],
+  hiddenColumns: [...layout.value.hiddenColumns],
+  columnWidths: { ...layout.value.columnWidths },
+  ...(layout.value.pinnedColumns ? { pinnedColumns: { ...layout.value.pinnedColumns } } : {}),
+}))
+const pinnedLeftOffsets = computed(() => {
+  const offsets = new Map<string, number>()
+  let left = 0
+  for (const column of displayColumns.value) {
+    if (column.pinned === 'left' || column.id === 'lockRow') {
+      offsets.set(column.id, left)
+      left += column.defaultWidth
+    }
+  }
+  return offsets
+})
+const statusAnchorColumnId = computed<ColumnId | null>(() => {
+  const visibleIds = displayColumns.value.map((column) => column.id)
+  if (visibleIds.includes('title')) return 'title'
+  if (visibleIds.includes('authors')) return 'authors'
+  return null
+})
+
+const scrollContainerRef = ref<HTMLDivElement | null>(null)
+const { contextMenuBook, contextMenuPosition, openContextMenu, closeContextMenu } = useTableContextMenu()
+const { isScrolled, showScrollTop, onScroll, scrollToTop } = useTableScrollBehavior(scrollContainerRef)
+
+// Extracted composables
+const {
+  resizingColumnId: _resizingColumnId,
+  isResizableCol: _isResizableCol,
+  startResize,
+  autoFitColumn,
+  autoFitAllColumns,
+} = useTableResize(scrollContainerRef, displayColumns, setColumnWidth, isReadOnly)
+void _resizingColumnId
+void _isResizableCol
+
+const {
+  dragSourceColId,
+  dropTargetColId,
+  dropSide,
+  isDraggableCol: _isDraggableCol,
+  handleColDragStart,
+  handleColDragOver,
+  handleColDragLeave,
+  handleColDrop,
+  handleColDragEnd,
+} = useTableDragReorder(allColumns, setColumnOrder)
+void _isDraggableCol
+
+// Column header context menu
+const headerCtxColumn = ref<ColumnDef | null>(null)
+const headerCtxPosition = ref<{ x: number; y: number } | null>(null)
+const headerCtxSortDir = computed<'asc' | 'desc' | null>(() => {
+  if (!headerCtxColumn.value?.sortField) return null
+  return getSortDir(headerCtxColumn.value.sortField)
+})
+
+function handleHeaderContextMenu(event: MouseEvent, col: ColumnDef) {
+  if (isReadOnly.value || col.id === 'lockRow') return
+  event.preventDefault()
+  headerCtxColumn.value = col
+  headerCtxPosition.value = { x: event.clientX, y: event.clientY }
+}
+
+function handleHeaderCtxSortAsc() {
+  if (!headerCtxColumn.value?.sortField) return
+  emit('update:sort', [{ field: headerCtxColumn.value.sortField, dir: 'asc' }])
+}
+
+function handleHeaderCtxSortDesc() {
+  if (!headerCtxColumn.value?.sortField) return
+  emit('update:sort', [{ field: headerCtxColumn.value.sortField, dir: 'desc' }])
+}
+
+function handleHeaderCtxClearSort() {
+  if (!headerCtxColumn.value?.sortField) return
+  removeSortField(headerCtxColumn.value.sortField)
+}
+
+function handleHeaderCtxHideColumn() {
+  if (!headerCtxColumn.value) return
+  toggleColumn(headerCtxColumn.value.id)
+}
+
+function handleHeaderCtxAutoFitAll() {
+  autoFitAllColumns()
+}
+
+function handleHeaderCtxAutoFit() {
+  if (!headerCtxColumn.value) return
+  autoFitColumn(headerCtxColumn.value.id)
+}
+
+function handleHeaderCtxPinLeft() {
+  if (!headerCtxColumn.value) return
+  pinColumn(headerCtxColumn.value.id, 'left')
+}
+
+function handleHeaderCtxPinRight() {
+  if (!headerCtxColumn.value) return
+  pinColumn(headerCtxColumn.value.id, 'right')
+}
+
+function handleHeaderCtxUnpin() {
+  if (!headerCtxColumn.value) return
+  unpinColumn(headerCtxColumn.value.id)
+}
+
+function handleHeaderCtxQuickFilter(key: string) {
+  if (!headerCtxColumn.value) return
+  const rule = buildQuickFilterRule(headerCtxColumn.value.id, key)
+  if (!rule) return
+  emit('quick-filter', rule)
+}
+
+function closeHeaderContextMenu() {
+  headerCtxColumn.value = null
+  headerCtxPosition.value = null
+}
+
+// Checkbox selection helpers
+const allBooksSelected = computed(() => {
+  if (props.books.length === 0 || !props.isSelected) return false
+  return props.books.every((b) => props.isSelected!(b.id))
+})
+
+const someBooksSelected = computed(() => {
+  if (props.books.length === 0 || !props.isSelected) return false
+  const someSelected = props.books.some((b) => props.isSelected!(b.id))
+  return someSelected && !allBooksSelected.value
+})
+
+function handleSelectAllToggle(event: Event) {
+  const checked = (event.target as HTMLInputElement).checked
+  emit('select-all', checked)
+}
+
+function handleCheckboxClick(bookId: number, event: MouseEvent) {
+  if (!props.selectionMode) {
+    emit('enter-selection')
+  }
+  emit('select', bookId, event)
+}
+
+// Sort strip
+const activeSorts = computed(() =>
+  props.sort.map((s) => ({
+    field: s.field,
+    dir: s.dir,
+    label: SORT_FIELD_LABELS[s.field] ?? s.field,
+  })),
+)
+
+// Skeleton rows for initial loading
+const SKELETON_ROW_COUNT = 12
+
+const virtualizer = useVirtualizer(
+  computed(() => ({
+    count: props.books.length,
+    getScrollElement: () => scrollContainerRef.value,
+    estimateSize: () => 44,
+    overscan: 10,
+  })),
+)
+
+const virtualItems = computed(() => virtualizer.value.getVirtualItems())
+const totalSize = computed(() => virtualizer.value.getTotalSize())
+
+const isLoadingMore = ref(false)
+
+watch(virtualItems, (items) => {
+  if (!props.hasMore || props.loading || isLoadingMore.value || !items.length) return
+  const last = items[items.length - 1]!
+  if (last.index >= props.books.length - 15) {
+    isLoadingMore.value = true
+    emit('load-more')
+  }
+})
+
+watch(
+  () => props.loading,
+  (loading) => {
+    if (!loading) isLoadingMore.value = false
+  },
+)
+
+// Keyboard navigation
+const { focusedRowIndex, focusedColIndex, isFocusedCell, handleTableKeydown } = useTableKeyboard({
+  books: () => props.books,
+  displayColumns,
+  activeCellKey: editor.activeCellKey,
+  selectionMode: () => props.selectionMode ?? false,
+  isReadOnly: () => isReadOnly.value,
+  virtualizer,
+  isCellReadOnly,
+  onActivate: handleActivate,
+  onSelect: (id, event) => emit('select', id, event),
+  onCopyRow: () => {},
+})
+
+const shortcutOverlayOpen = ref(false)
+
+function handleKeydownWithShortcuts(event: KeyboardEvent) {
+  if (event.key === '?' && !editor.activeCellKey.value) {
+    event.preventDefault()
+    shortcutOverlayOpen.value = !shortcutOverlayOpen.value
+    return
+  }
+  if (shortcutOverlayOpen.value) return
+  handleTableKeydown(event)
+}
+
+function shouldPreserveTargetFocus(target: EventTarget | null): boolean {
+  const targetElement = target instanceof Element ? target : target instanceof Node ? target.parentElement : null
+  if (!targetElement) return false
+  return Boolean(
+    targetElement.closest(
+      [
+        'input',
+        'textarea',
+        'select',
+        'button',
+        'a',
+        '[role="button"]',
+        '[role="textbox"]',
+        '[role="combobox"]',
+        '[contenteditable="true"]',
+        '[data-cell-activator="true"]',
+        '[tabindex]:not([tabindex="-1"])',
+      ].join(', '),
+    ),
+  )
+}
+
+function focusTableCell(rowIndex: number, colIndex: number, event?: MouseEvent, bookId?: number, colId?: ColumnId) {
+  focusedRowIndex.value = rowIndex
+  focusedColIndex.value = colIndex
+  if (bookId != null && colId && editor.isActive(bookId, colId)) return
+  if (shouldPreserveTargetFocus(event?.target ?? null)) return
+  scrollContainerRef.value?.focus({ preventScroll: true })
+}
+
+onMounted(() => {
+  scrollContainerRef.value?.addEventListener('scroll', onScroll, { passive: true })
+})
+
+onUnmounted(() => {
+  scrollContainerRef.value?.removeEventListener('scroll', onScroll)
+})
+
+// Bump tbody key on sort change to trigger enter animation
+watch(
+  () => props.sort,
+  () => {
+    nextTick(() => {
+      if (scrollContainerRef.value) scrollContainerRef.value.scrollTop = 0
+    })
+  },
+  { deep: true },
+)
+
+// Editable column IDs in display order (for Tab navigation)
+const editableColumnIds = computed<ColumnId[]>(() => visibleColumns.value.filter((c) => c.isEditable).map((c) => c.id))
+
+function handleActivate(book: BookCard, colId: ColumnId) {
+  if (isReadOnly.value || props.selectionMode) return
+  const col = displayColumns.value.find((c) => c.id === colId)
+  if (!col || isCellReadOnly(book, col)) return
+  editor.activateCell(book.id, colId, getCellValue(book, colId))
+}
+
+function handleSave(book: BookCard, colId: ColumnId, newValue: unknown) {
+  editor.saveCell(book.id, colId, newValue, (patch) => {
+    const updated = mergeBookPatchWithLatest(props.books, book, patch)
+    emit('update:book', updated)
+  })
+}
+
+function handleCancel(bookId: number, colId: ColumnId) {
+  editor.cancelCellIfActive(bookId, colId)
+}
+
+function handleNavigate(book: BookCard, colId: ColumnId, direction: 'next' | 'prev' | 'rowUp' | 'rowDown') {
+  if (direction === 'rowUp' || direction === 'rowDown') {
+    editor.navigateRow(direction === 'rowDown' ? 'down' : 'up', props.books, book.id, colId)
+    return
+  }
+  editor.navigateCell(direction, editableColumnIds.value, book, colId)
+}
+
+function handleRowClick(book: BookCard, e: MouseEvent) {
+  if (props.selectionMode) {
+    emit('select', book.id, e)
+  }
+}
+
+function emitLockStateUpdate(book: BookCard, nextFields: BookCard['lockedFields']) {
+  const updated = buildLockStateBookUpdate(props.books, book, nextFields)
+  if (!updated) return
+  emit('update:book', updated)
+}
+
+async function handleToggleCellLock(book: BookCard, colId: ColumnId) {
+  const lockField = COLUMN_DEF_MAP.get(colId)?.lockField
+  if (!lockField) return
+  const beforeFields = [...locks.getFields(book.id)]
+  await locks.toggleField(book.id, lockField)
+  const afterFields = [...locks.getFields(book.id)]
+  if (sameLockFields(beforeFields, afterFields)) return
+  emitLockStateUpdate(book, afterFields)
+}
+
+async function handleLockAllRow(book: BookCard) {
+  const beforeFields = [...locks.getFields(book.id)]
+  await locks.lockAll(book.id)
+  const afterFields = [...locks.getFields(book.id)]
+  if (sameLockFields(beforeFields, afterFields)) return
+  emitLockStateUpdate(book, afterFields)
+}
+
+async function handleUnlockAllRow(book: BookCard) {
+  const beforeFields = [...locks.getFields(book.id)]
+  await locks.unlockAll(book.id)
+  const afterFields = [...locks.getFields(book.id)]
+  if (sameLockFields(beforeFields, afterFields)) return
+  emitLockStateUpdate(book, afterFields)
+}
+
+function isRowFullyLocked(book: BookCard): boolean {
+  return getRowLockedFieldCount(book) >= BOOK_METADATA_LOCK_FIELDS.length
+}
+
+function getRowLockedFieldCount(book: BookCard): number {
+  return locks.getFields(book.id).length
+}
+
+function handleRowContextMenu(event: MouseEvent, book: BookCard): void {
+  if (props.selectionMode) return
+  openContextMenu(event, book)
+}
+
+function handleContextMenuAction(book: BookCard, type: BookActionType): void {
+  closeContextMenu()
+  emit('action', book, type)
+}
+
+function applyPreset(layoutState: TableLayoutState, sort?: SortSpec[]): void {
+  setLayout(layoutState)
+  if (sort && sort.length > 0) emit('update:sort', sort)
+}
+
+function saveCurrentPreset(name: string): void {
+  tablePresets.savePreset(name, currentLayout.value, props.sort)
+}
+
+defineExpose({
+  allColumns,
+  currentLayout,
+  toggleColumn,
+  setColumnOrder,
+  resetLayout,
+  applyPreset,
+  saveCurrentPreset,
+  deletePreset: tablePresets.deletePreset,
+  renamePreset: tablePresets.renamePreset,
+  duplicatePreset: tablePresets.duplicatePreset,
+  togglePresetFavorite: tablePresets.toggleFavorite,
+  importPresetBackup: tablePresets.importPresets,
+  allPresets: tablePresets.allPresets,
+  autoFitAllColumns,
+})
+</script>
+
+<template>
+  <div class="relative flex-1 min-h-0 flex flex-col overflow-hidden rounded-md border border-border">
+    <!-- Screen-reader live region for dynamic announcements -->
+    <div aria-live="polite" aria-atomic="true" class="sr-only">
+      <span v-if="selectionMode && selectedCount != null && selectedCount > 0"
+        >{{ selectedCount }} {{ selectedCount === 1 ? 'book' : 'books' }} selected</span
+      >
+      <span v-if="loading && initialized">Loading more books</span>
+    </div>
+    <!-- Sort strip: visible when multiple sorts are active -->
+    <div v-if="activeSorts.length > 1" class="shrink-0 flex items-center gap-1.5 border-b border-border/60 bg-muted/30 px-3 py-1">
+      <span class="text-[10px] font-semibold uppercase tracking-wide text-muted-foreground shrink-0">Sort</span>
+      <div class="flex flex-wrap items-center gap-1">
+        <span
+          v-for="(s, idx) in activeSorts"
+          :key="s.field"
+          class="inline-flex items-center gap-1 rounded-full bg-primary/10 px-2 py-0.5 text-[11px] font-medium text-primary"
+        >
+          <span class="flex h-3.5 w-3.5 items-center justify-center rounded-full bg-primary/20 text-[9px] font-bold">{{ idx + 1 }}</span>
+          {{ s.label }}
+          <ArrowUp v-if="s.dir === 'asc'" :size="10" />
+          <ArrowDown v-else :size="10" />
+          <button class="ml-0.5 rounded-full p-0.5 hover:bg-primary/20 transition-colors" @click="removeSortField(s.field)">
+            <X :size="9" />
+          </button>
+        </span>
+      </div>
+    </div>
+
+    <div v-if="metadataInFlight" class="shrink-0 flex items-center justify-between border-b border-border/60 bg-primary/5 px-3 py-1">
+      <div class="flex items-center gap-1.5 text-xs font-medium text-primary">
+        <Loader2 :size="12" class="animate-spin" />
+        <span>Refreshing metadata {{ metadataInFlight.processed }} / {{ metadataInFlight.total }}</span>
+      </div>
+      <span v-if="metadataFailed > 0" class="text-xs font-medium text-amber-700 dark:text-amber-400">{{ metadataFailed }} failed</span>
+      <span v-else class="text-xs text-muted-foreground">{{ metadataRemaining }} remaining</span>
+    </div>
+
+    <div v-if="isReadOnly" class="shrink-0 border-b border-border/60 bg-amber-500/8 px-3 py-1.5 text-xs text-amber-700 dark:text-amber-300">
+      Table editing is disabled on smaller screens. Switch to list or grid for quicker actions.
+    </div>
+
+    <div ref="scrollContainerRef" class="relative flex-1 min-h-0 overflow-auto" tabindex="0" @keydown="handleKeydownWithShortcuts">
+      <table role="grid" class="w-full border-collapse text-sm" style="table-layout: fixed">
+        <BookTableHeader
+          :display-columns="displayColumns"
+          :sort="props.sort"
+          :is-scrolled="isScrolled"
+          :loading="props.loading ?? false"
+          :selection-mode="props.selectionMode ?? false"
+          :all-books-selected="allBooksSelected"
+          :some-books-selected="someBooksSelected"
+          :is-read-only="isReadOnly"
+          :pinned-left-offsets="pinnedLeftOffsets"
+          :drag-source-col-id="dragSourceColId"
+          :drop-target-col-id="dropTargetColId"
+          :drop-side="dropSide"
+          :sortable="props.sortable ?? true"
+          @select-all="handleSelectAllToggle"
+          @column-sort="handleColumnSort"
+          @header-context-menu="handleHeaderContextMenu"
+          @col-drag-start="handleColDragStart"
+          @col-drag-over="handleColDragOver"
+          @col-drag-leave="handleColDragLeave"
+          @col-drop="handleColDrop"
+          @col-drag-end="handleColDragEnd"
+          @resize-start="startResize"
+          @auto-fit-column="autoFitColumn"
+        />
+
+        <!-- Skeleton loading rows -->
+        <tbody v-if="!initialized && loading" role="rowgroup">
+          <tr v-for="i in SKELETON_ROW_COUNT" :key="`skeleton-${i}`" role="row" class="border-b border-border/50">
+            <td v-if="selectionMode" role="gridcell" class="px-2 align-middle" :class="rowPaddingClass" :style="{ width: '36px', minWidth: '36px' }">
+              <div class="mx-auto h-4 w-4 rounded bg-muted animate-pulse" />
+            </td>
+            <td
+              v-for="col in displayColumns"
+              :key="col.id"
+              role="gridcell"
+              class="overflow-hidden px-2 align-middle"
+              :class="rowPaddingClass"
+              :style="{ width: `${col.defaultWidth}px`, minWidth: `${col.minWidth}px` }"
+            >
+              <div v-if="col.cellType === 'cover'" class="h-9 w-9 rounded-sm bg-muted animate-pulse" />
+              <div v-else-if="col.cellType === 'rating'" class="flex items-center gap-0.5">
+                <div v-for="s in 5" :key="s" class="h-3 w-3 rounded-full bg-muted animate-pulse" />
+              </div>
+              <div v-else-if="col.cellType === 'progress'" class="h-1.5 w-full rounded-full bg-muted animate-pulse" />
+              <div v-else-if="col.cellType === 'actions'" class="h-5 w-5 rounded bg-muted animate-pulse" />
+              <div v-else class="h-4 rounded bg-muted animate-pulse" :style="{ width: `${40 + ((i * 17 + col.defaultWidth) % 60)}%` }" />
+            </td>
+          </tr>
+        </tbody>
+
+        <tbody v-else class="tbody-enter" role="rowgroup">
+          <tr v-if="virtualItems.length > 0 && virtualItems[0]!.start > 0" role="row">
+            <td role="gridcell" :colspan="displayColumns.length + (selectionMode ? 1 : 0)" :style="{ height: `${virtualItems[0]!.start}px` }" />
+          </tr>
+
+          <tr
+            v-for="vItem in virtualItems"
+            :key="String(vItem.key)"
+            role="row"
+            :aria-label="books[vItem.index]!.title ?? undefined"
+            class="group border-b border-border/50 transition-colors"
+            :class="[
+              selectionMode && isSelected?.(books[vItem.index]!.id) ? 'bg-primary/8' : 'hover:bg-muted/40',
+              selectionMode ? 'cursor-pointer' : '',
+              isBookFileMissing(books[vItem.index]!) ? 'bg-destructive/5' : '',
+              isRowRefreshing(books[vItem.index]!.id) ? 'opacity-85' : '',
+              focusedRowIndex === vItem.index && !editor.activeCellKey.value ? 'ring-1 ring-inset ring-primary/40' : '',
+              tableZebraStriping && vItem.index % 2 === 1 && !(selectionMode && isSelected?.(books[vItem.index]!.id)) ? 'bg-muted/20' : '',
+            ]"
+            @click="handleRowClick(books[vItem.index]!, $event)"
+            @contextmenu.prevent="(event) => handleRowContextMenu(event, books[vItem.index]!)"
+          >
+            <!-- Collapsed series row: span all columns with dedicated component -->
+            <template v-if="books[vItem.index]!.collapsedSeries">
+              <td
+                v-if="selectionMode"
+                role="gridcell"
+                class="overflow-hidden px-2 bg-background"
+                :class="rowPaddingClass"
+                :style="{ width: '36px', minWidth: '36px', position: 'sticky', left: '0px', zIndex: 20 }"
+              >
+                <div class="flex items-center justify-center">
+                  <input
+                    type="checkbox"
+                    class="accent-primary h-3.5 w-3.5 cursor-pointer"
+                    :checked="isSelected?.(books[vItem.index]!.id) ?? false"
+                    @click.stop="handleCheckboxClick(books[vItem.index]!.id, $event)"
+                  />
+                </div>
+              </td>
+              <BookTableCollapsedSeriesRow :book="books[vItem.index]!" :colspan="displayColumns.length" :selection-mode="selectionMode" />
+            </template>
+
+            <template v-else>
+              <!-- Checkbox cell -->
+              <td
+                v-if="selectionMode"
+                role="gridcell"
+                class="overflow-hidden px-2 bg-background"
+                :class="rowPaddingClass"
+                :style="{ width: '36px', minWidth: '36px', position: 'sticky', left: '0px', zIndex: 20 }"
+              >
+                <div class="flex items-center justify-center">
+                  <input
+                    type="checkbox"
+                    class="accent-primary h-3.5 w-3.5 cursor-pointer"
+                    :checked="isSelected?.(books[vItem.index]!.id) ?? false"
+                    @click.stop="handleCheckboxClick(books[vItem.index]!.id, $event)"
+                  />
+                </div>
+              </td>
+
+              <td
+                v-for="(col, colIdx) in displayColumns"
+                :key="col.id"
+                :data-col-id="col.id"
+                :data-row-index="vItem.index"
+                role="gridcell"
+                class="relative overflow-hidden px-2 align-middle"
+                :class="[
+                  rowPaddingClass,
+                  col.pinned === 'right' ? 'border-l border-border/60' : '',
+                  col.pinned === null ? (isMandatoryFieldEmpty(books[vItem.index]!, col.id) ? 'bg-amber-500/5' : '') : '',
+                  isCellChanged(books[vItem.index]!.id, col.id) ? 'book-cell--changed' : '',
+                  isFocusedCell(vItem.index, colIdx) && !editor.isActive(books[vItem.index]!.id, col.id)
+                    ? 'outline outline-2 outline-primary/50 -outline-offset-2 rounded-sm'
+                    : '',
+                ]"
+                :style="{
+                  width: `${col.defaultWidth}px`,
+                  minWidth: `${col.minWidth}px`,
+                  ...(col.pinned === 'left' || col.id === 'lockRow'
+                    ? {
+                        position: 'sticky',
+                        left: `${(selectionMode ? 36 : 0) + (pinnedLeftOffsets.get(col.id) ?? 0)}px`,
+                        zIndex: col.id === 'lockRow' ? 20 : 2,
+                        background: getPinnedCellBackground(
+                          books[vItem.index]!,
+                          col.id,
+                          selectionMode && (isSelected?.(books[vItem.index]!.id) ?? false),
+                        ),
+                      }
+                    : {}),
+                  ...(col.pinned === 'right'
+                    ? {
+                        position: 'sticky',
+                        right: '0',
+                        zIndex: 2,
+                        background: getPinnedCellBackground(
+                          books[vItem.index]!,
+                          col.id,
+                          selectionMode && (isSelected?.(books[vItem.index]!.id) ?? false),
+                        ),
+                      }
+                    : {}),
+                }"
+                @click="focusTableCell(vItem.index, colIdx, $event, books[vItem.index]!.id, col.id)"
+              >
+                <BookTableCellDispatcher
+                  :book="books[vItem.index]!"
+                  :col-id="col.id"
+                  :cell-type="col.cellType"
+                  :has-lock-field="!!COLUMN_DEF_MAP.get(col.id)?.lockField"
+                  :is-locked="isCellLocked(books[vItem.index]!, col.id)"
+                  :is-active="editor.isActive(books[vItem.index]!.id, col.id)"
+                  :is-read-only="isCellReadOnly(books[vItem.index]!, col)"
+                  :is-fully-locked="isRowFullyLocked(books[vItem.index]!)"
+                  :locked-field-count="getRowLockedFieldCount(books[vItem.index]!)"
+                  :selection-mode="props.selectionMode ?? false"
+                  :always-show-open-link-icon="isReadOnly"
+                  :value="getCellValue(books[vItem.index]!, col.id)"
+                  :search-fn="col.cellType === 'text' ? getTextSearchFn(col.id) : col.cellType === 'chips' ? getChipsSearchFn(col.id) : undefined"
+                  :open-link="col.cellType === 'text' ? getTextCellOpenLink(books[vItem.index]!, col.id) : undefined"
+                  :open-link-label="col.cellType === 'text' ? getTextCellOpenLinkLabel(col.id) : undefined"
+                  :link-fn="col.cellType === 'chips' ? getChipsLinkFn(col.id) : undefined"
+                  :chip-action-fn="col.cellType === 'chips' ? getChipsActionFn(col.id) : undefined"
+                  :allow-decimal="col.id === 'seriesIndex'"
+                  @activate="handleActivate(books[vItem.index]!, col.id)"
+                  @save="(value) => handleSave(books[vItem.index]!, col.id, value)"
+                  @cancel="handleCancel(books[vItem.index]!.id, col.id)"
+                  @navigate="(direction) => handleNavigate(books[vItem.index]!, col.id, direction)"
+                  @cover-click="handleCoverClick(books[vItem.index]!)"
+                  @toggle-lock="handleToggleCellLock(books[vItem.index]!, col.id)"
+                  @lock-all="handleLockAllRow(books[vItem.index]!)"
+                  @unlock-all="handleUnlockAllRow(books[vItem.index]!)"
+                  @action="(type) => emit('action', books[vItem.index]!, type)"
+                  @update:book="(updated) => emit('update:book', updated)"
+                />
+
+                <div
+                  v-if="statusAnchorColumnId === col.id && getRowFeedback(books[vItem.index]!.id)"
+                  class="pointer-events-auto absolute right-1 top-1 z-30"
+                >
+                  <span
+                    v-if="getRowFeedback(books[vItem.index]!.id)?.state === 'refreshing'"
+                    class="inline-flex items-center gap-1 rounded-full border border-primary/30 bg-primary/12 px-1.5 py-0.5 text-[10px] font-medium text-primary"
+                  >
+                    <Loader2 :size="10" class="animate-spin" />
+                    Fetching...
+                  </span>
+                  <span
+                    v-else-if="getRowFeedback(books[vItem.index]!.id)?.state === 'success'"
+                    class="inline-flex items-center gap-1 rounded-full border border-emerald-500/30 bg-emerald-500/12 px-1.5 py-0.5 text-[10px] font-medium text-emerald-700 dark:text-emerald-300"
+                  >
+                    <CheckCircle2 :size="10" />
+                    Updated
+                  </span>
+                  <span
+                    v-else
+                    class="inline-flex items-center gap-1 rounded-full border border-destructive/40 bg-destructive/10 px-1 py-0.5 text-[10px] font-medium text-destructive"
+                  >
+                    <AlertTriangle :size="10" />
+                    Failed
+                    <button
+                      class="inline-flex h-3.5 w-3.5 items-center justify-center rounded-full hover:bg-destructive/20"
+                      :title="getRowFeedbackMessage(books[vItem.index]!.id)"
+                      @click.stop="retryMetadataRefresh(books[vItem.index]!)"
+                    >
+                      <RotateCcw :size="8" />
+                    </button>
+                  </span>
+                </div>
+              </td>
+            </template>
+          </tr>
+
+          <tr v-if="virtualItems.length > 0" role="row">
+            <td
+              role="gridcell"
+              :colspan="displayColumns.length + (selectionMode ? 1 : 0)"
+              :style="{ height: `${totalSize - virtualItems[virtualItems.length - 1]!.end}px` }"
+            />
+          </tr>
+        </tbody>
+      </table>
+    </div>
+
+    <div
+      v-if="books.length === 0 && !loading"
+      class="pointer-events-none absolute inset-0 flex flex-col items-center justify-center gap-3 text-muted-foreground"
+    >
+      <BookOpen :size="36" class="opacity-30" />
+      <p class="text-sm">No books to display</p>
+    </div>
+
+    <!-- Scroll to top FAB -->
+    <Transition
+      enter-active-class="transition-all duration-200 ease-out"
+      leave-active-class="transition-all duration-150 ease-in"
+      enter-from-class="opacity-0 translate-y-2"
+      leave-to-class="opacity-0 translate-y-2"
+    >
+      <button
+        v-if="showScrollTop"
+        class="absolute bottom-10 right-4 z-20 flex h-8 w-8 items-center justify-center rounded-full bg-primary text-primary-foreground shadow-md hover:bg-primary/90 transition-colors"
+        aria-label="Scroll to top"
+        @click="scrollToTop"
+      >
+        <ChevronUp :size="16" />
+      </button>
+    </Transition>
+
+    <!-- Enhanced status bar -->
+    <div class="shrink-0 flex items-center justify-between border-t border-border/60 bg-muted/40 px-3 py-1 text-xs text-muted-foreground">
+      <div class="flex items-center gap-2">
+        <span v-if="selectionMode && selectedCount">
+          {{ selectedCount.toLocaleString() }} selected
+          <span class="text-muted-foreground/60">/ </span>
+        </span>
+        <span v-if="filterActive" class="flex items-center gap-1 text-primary">
+          <span class="h-1.5 w-1.5 rounded-full bg-primary" />
+          Filtered
+        </span>
+        <span v-if="hasMore">{{ books.length.toLocaleString() }} of {{ (total ?? 0).toLocaleString() }} loaded</span>
+        <span v-else>{{ (total ?? books.length).toLocaleString() }} {{ (total ?? books.length) === 1 ? 'book' : 'books' }}</span>
+      </div>
+      <div class="flex items-center gap-3">
+        <button
+          class="inline-flex h-5 w-5 items-center justify-center rounded border border-border/70 bg-background text-[11px] font-semibold text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+          title="Keyboard shortcuts (?)"
+          aria-label="Show table keyboard shortcuts"
+          @click="shortcutOverlayOpen = true"
+        >
+          ?
+        </button>
+        <span class="hidden lg:inline text-[11px] text-muted-foreground/80">Copy cell: Ctrl/Cmd+C · Copy row: Ctrl/Cmd+Shift+C</span>
+        <span v-if="loading" class="flex items-center gap-1">
+          <Loader2 :size="11" class="animate-spin" />
+          Loading...
+        </span>
+      </div>
+    </div>
+
+    <BookTableContextMenu
+      :book="contextMenuBook"
+      :position="contextMenuPosition"
+      @action="handleContextMenuAction"
+      @update:book="(updated) => emit('update:book', updated)"
+      @close="closeContextMenu"
+    />
+
+    <BookTableHeaderContextMenu
+      v-if="headerCtxColumn"
+      :column="headerCtxColumn"
+      :position="headerCtxPosition"
+      :sort-dir="headerCtxSortDir"
+      :quick-filters="getQuickFilterOptions(headerCtxColumn.id)"
+      @sort-asc="handleHeaderCtxSortAsc"
+      @sort-desc="handleHeaderCtxSortDesc"
+      @clear-sort="handleHeaderCtxClearSort"
+      @quick-filter="handleHeaderCtxQuickFilter"
+      @hide-column="handleHeaderCtxHideColumn"
+      @auto-fit="handleHeaderCtxAutoFit"
+      @auto-fit-all="handleHeaderCtxAutoFitAll"
+      @pin-left="handleHeaderCtxPinLeft"
+      @pin-right="handleHeaderCtxPinRight"
+      @unpin="handleHeaderCtxUnpin"
+      @close="closeHeaderContextMenu"
+    />
+  </div>
+
+  <BookCoverDialog :book="coverDialogBook" :read-only="isReadOnly" @close="coverDialogBook = null" @update:book="handleCoverDialogUpdateBook" />
+  <KeyboardShortcutOverlay v-model:open="shortcutOverlayOpen" />
+</template>
+
+<style scoped>
+.tbody-enter {
+  animation: tbodyEnter 0.22s cubic-bezier(0.22, 1, 0.36, 1) both;
+}
+
+@keyframes tbodyEnter {
+  from {
+    opacity: 0;
+    transform: translateY(8px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.book-cell--changed {
+  animation: cellChangedFlash 2.8s ease-out both;
+}
+
+@keyframes cellChangedFlash {
+  0% {
+    box-shadow: inset 0 0 0 999px color-mix(in oklch, oklch(0.696 0.17 162.48) 20%, transparent);
+  }
+  85% {
+    box-shadow: inset 0 0 0 999px color-mix(in oklch, oklch(0.696 0.17 162.48) 8%, transparent);
+  }
+  100% {
+    box-shadow: inset 0 0 0 999px transparent;
+  }
+}
+</style>
diff --git a/client/src/features/book/components/__tests__/BookCoverCard.spec.ts b/client/src/features/book/components/__tests__/BookCoverCard.spec.ts
index 796cdb159..b1852be1d 100644
--- a/client/src/features/book/components/__tests__/BookCoverCard.spec.ts
+++ b/client/src/features/book/components/__tests__/BookCoverCard.spec.ts
@@ -69,12 +69,21 @@ const missingBook: BookCard = {
   publishedYear: null,
   language: null,
   genres: [],
+  tags: [],
   rating: null,
   readingProgress: null,
   readStatus: null,
   addedAt: '2026-01-01T00:00:00.000Z',
+  updatedAt: null,
+  metadataScore: null,
   hasCover: false,
   hasMetadataLocks: false,
+  lockedFields: [],
+  subtitle: null,
+  publisher: null,
+  pageCount: null,
+  isbn13: null,
+  narrators: [],
 }
 
 const presentBook: BookCard = {
@@ -84,16 +93,25 @@ const presentBook: BookCard = {
   authors: ['Test Author'],
   seriesName: null,
   seriesIndex: null,
-  files: [{ id: 10, format: 'epub', role: 'primary' }],
+  files: [{ id: 10, format: 'epub', role: 'primary', sizeBytes: null }],
   publishedYear: 2024,
   language: 'en',
   genres: [],
+  tags: [],
   rating: null,
   readingProgress: null,
   readStatus: null,
   addedAt: '2026-01-01T00:00:00.000Z',
+  updatedAt: null,
+  metadataScore: null,
   hasCover: false,
   hasMetadataLocks: false,
+  lockedFields: [],
+  subtitle: null,
+  publisher: null,
+  pageCount: null,
+  isbn13: null,
+  narrators: [],
 }
 
 const presentBookWithCover: BookCard = {
diff --git a/client/src/features/book/components/__tests__/BookListRow.spec.ts b/client/src/features/book/components/__tests__/BookListRow.spec.ts
index 96cfd8390..719bebc55 100644
--- a/client/src/features/book/components/__tests__/BookListRow.spec.ts
+++ b/client/src/features/book/components/__tests__/BookListRow.spec.ts
@@ -46,12 +46,21 @@ const missingBook: BookCard = {
   publishedYear: null,
   language: null,
   genres: [],
+  tags: [],
   rating: null,
   readingProgress: null,
   readStatus: null,
   addedAt: '2026-01-01T00:00:00.000Z',
+  updatedAt: null,
+  metadataScore: null,
   hasCover: false,
   hasMetadataLocks: false,
+  lockedFields: [],
+  subtitle: null,
+  publisher: null,
+  pageCount: null,
+  isbn13: null,
+  narrators: [],
 }
 
 const presentBook: BookCard = {
@@ -61,16 +70,25 @@ const presentBook: BookCard = {
   authors: ['Test Author'],
   seriesName: null,
   seriesIndex: null,
-  files: [{ id: 10, format: 'epub', role: 'primary' }],
+  files: [{ id: 10, format: 'epub', role: 'primary', sizeBytes: null }],
   publishedYear: 2024,
   language: 'en',
   genres: ['Fiction'],
+  tags: [],
   rating: null,
   readingProgress: null,
   readStatus: null,
   addedAt: '2026-01-01T00:00:00.000Z',
+  updatedAt: null,
+  metadataScore: null,
   hasCover: false,
   hasMetadataLocks: false,
+  lockedFields: [],
+  subtitle: null,
+  publisher: null,
+  pageCount: null,
+  isbn13: null,
+  narrators: [],
 }
 
 describe('BookListRow — missing state', () => {
diff --git a/client/src/features/book/components/__tests__/BookTableCells.spec.ts b/client/src/features/book/components/__tests__/BookTableCells.spec.ts
new file mode 100644
index 000000000..6aa2056a4
--- /dev/null
+++ b/client/src/features/book/components/__tests__/BookTableCells.spec.ts
@@ -0,0 +1,767 @@
+import { mount } from '@vue/test-utils'
+import { describe, it, expect, vi } from 'vitest'
+import BookTableTextCell from '../table/BookTableTextCell.vue'
+import BookTableNumberCell from '../table/BookTableNumberCell.vue'
+import BookTableRatingCell from '../table/BookTableRatingCell.vue'
+import BookTableChipsCell from '../table/BookTableChipsCell.vue'
+import BookTableReadStatusCell from '../table/BookTableReadStatusCell.vue'
+import BookTableDateCell from '../table/BookTableDateCell.vue'
+import BookTableFormatCell from '../table/BookTableFormatCell.vue'
+import BookTableProgressCell from '../table/BookTableProgressCell.vue'
+import type { BookFileRef, UserBookStatus } from '@bookorbit/types'
+
+vi.mock('@/features/book/composables/useBookStatus', () => ({
+  STATUS_OPTIONS: [
+    { value: 'unread', label: 'Unread' },
+    { value: 'reading', label: 'Reading' },
+    { value: 'read', label: 'Read' },
+  ],
+  STATUS_ICONS: {
+    unread: { template: '<span />' },
+    reading: { template: '<span />' },
+    read: { template: '<span />' },
+  },
+  STATUS_COLORS: {
+    unread: 'text-muted-foreground',
+    reading: 'text-blue-500',
+    read: 'text-green-500',
+  },
+}))
+
+const tooltipStubs = {
+  Tooltip: {
+    name: 'Tooltip',
+    template: '<div data-testid="tooltip"><slot /></div>',
+  },
+  TooltipTrigger: {
+    name: 'TooltipTrigger',
+    props: ['asChild'],
+    template: '<div data-testid="tooltip-trigger"><slot /></div>',
+  },
+  TooltipContent: {
+    name: 'TooltipContent',
+    template: '<div data-testid="tooltip-content"><slot /></div>',
+  },
+}
+
+// Stubs for popover-based chips cell
+const chipsStubs = {
+  Popover: {
+    name: 'Popover',
+    props: ['open'],
+    emits: ['update:open'],
+    template: '<div data-testid="popover" :data-open="String(open ?? false)"><slot /></div>',
+  },
+  PopoverTrigger: {
+    name: 'PopoverTrigger',
+    props: ['asChild', 'disabled'],
+    template: '<div data-testid="popover-trigger" :data-disabled="String(disabled ?? false)"><slot /></div>',
+  },
+  PopoverContent: {
+    name: 'PopoverContent',
+    template: '<div data-testid="popover-content"><slot /></div>',
+  },
+  ChipInput: {
+    name: 'ChipInput',
+    props: ['modelValue', 'searchFn', 'placeholder'],
+    emits: ['update:modelValue'],
+    template: '<div data-testid="chip-input" />',
+  },
+}
+
+// Stubs for dropdown-based read-status cell
+const statusStubs = {
+  DropdownMenu: {
+    name: 'DropdownMenu',
+    props: ['open'],
+    emits: ['update:open'],
+    template: '<div data-testid="dropdown" :data-open="String(open ?? false)"><slot /></div>',
+  },
+  DropdownMenuTrigger: {
+    name: 'DropdownMenuTrigger',
+    props: ['asChild', 'disabled'],
+    template: '<div data-testid="dropdown-trigger" :data-disabled="String(disabled ?? false)"><slot /></div>',
+  },
+  DropdownMenuContent: {
+    name: 'DropdownMenuContent',
+    template: '<div data-testid="dropdown-content"><slot /></div>',
+  },
+  DropdownMenuItem: {
+    name: 'DropdownMenuItem',
+    props: ['class'],
+    emits: ['select'],
+    template: '<button type="button" @click="$emit(\'select\')"><slot /></button>',
+  },
+  ChevronDown: {
+    name: 'ChevronDown',
+    template: '<span data-testid="chevron-down" />',
+  },
+}
+
+// ─── BookTableTextCell ─────────────────────────────────────────────────────────
+
+describe('BookTableDateCell', () => {
+  it('renders dash for null value', () => {
+    const wrapper = mount(BookTableDateCell, {
+      props: { value: null },
+    })
+    expect(wrapper.text()).toBe('-')
+  })
+
+  it('renders formatted date with day', () => {
+    const wrapper = mount(BookTableDateCell, {
+      props: { value: '2026-05-04T12:00:00.000Z' },
+    })
+    expect(wrapper.text()).toContain('May')
+    expect(wrapper.text()).toContain('4')
+    expect(wrapper.text()).toContain('2026')
+  })
+
+  it('renders tooltip with raw date for valid ISO', () => {
+    const wrapper = mount(BookTableDateCell, {
+      props: { value: '2026-05-04T00:00:00.000Z' },
+    })
+    expect(wrapper.find('span').attributes('title')).toContain('2026-05-04T00:00:00.000Z')
+  })
+
+  it('renders dash for invalid date string', () => {
+    const wrapper = mount(BookTableDateCell, {
+      props: { value: 'not-a-date' },
+    })
+    expect(wrapper.text()).toBe('-')
+  })
+})
+
+describe('BookTableFormatCell', () => {
+  function mountFormat(files: BookFileRef[]) {
+    return mount(BookTableFormatCell, {
+      props: { files },
+      global: { stubs: tooltipStubs },
+    })
+  }
+
+  it('shows dash for empty files', () => {
+    const wrapper = mountFormat([])
+    expect(wrapper.text()).toBe('-')
+  })
+
+  it('shows primary format badge', () => {
+    const wrapper = mountFormat([{ id: 1, format: 'epub', role: 'primary', sizeBytes: null }])
+    expect(wrapper.text()).toContain('epub')
+  })
+
+  it('shows multiple format badges for multiple files', () => {
+    const wrapper = mountFormat([
+      { id: 1, format: 'epub', role: 'primary', sizeBytes: null },
+      { id: 2, format: 'pdf', role: 'secondary', sizeBytes: null },
+    ])
+    expect(wrapper.text()).toContain('epub')
+    expect(wrapper.text()).toContain('pdf')
+  })
+
+  it('shows overflow indicator for more than 2 formats', () => {
+    const wrapper = mountFormat([
+      { id: 1, format: 'epub', role: 'primary', sizeBytes: null },
+      { id: 2, format: 'pdf', role: 'secondary', sizeBytes: null },
+      { id: 3, format: 'mobi', role: 'secondary', sizeBytes: null },
+    ])
+    expect(wrapper.text()).toContain('+1')
+  })
+})
+
+describe('BookTableProgressCell', () => {
+  function mountProgress(value: number | null) {
+    return mount(BookTableProgressCell, {
+      props: { value },
+      global: { stubs: tooltipStubs },
+    })
+  }
+
+  it('clamps value above 100 to 100', () => {
+    const wrapper = mountProgress(120)
+    expect(wrapper.text()).toContain('100%')
+  })
+
+  it('clamps value below 0 to 0', () => {
+    const wrapper = mountProgress(-12)
+    expect(wrapper.text()).toContain('0%')
+  })
+
+  it('shows correct precision while stripping trailing zeros', () => {
+    expect(mountProgress(45).text()).toContain('45%')
+    expect(mountProgress(45.5).text()).toContain('45.5%')
+    expect(mountProgress(45.123).text()).toContain('45.12%')
+  })
+
+  it('shows dash for null', () => {
+    const wrapper = mountProgress(null)
+    expect(wrapper.text()).toBe('-')
+  })
+
+  it('has progressbar aria attributes', () => {
+    const wrapper = mountProgress(30)
+    const progressbar = wrapper.find('[role="progressbar"]')
+    expect(progressbar.attributes('aria-valuenow')).toBe('30')
+    expect(progressbar.attributes('aria-valuemin')).toBe('0')
+    expect(progressbar.attributes('aria-valuemax')).toBe('100')
+  })
+})
+
+describe('BookTableTextCell', () => {
+  it('renders display span with value when inactive', () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello World', isActive: false },
+    })
+    expect(wrapper.find('span').text()).toBe('Hello World')
+    expect(wrapper.find('input').exists()).toBe(false)
+  })
+
+  it('renders input when active', () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello', isActive: true },
+    })
+    expect(wrapper.find('input').exists()).toBe(true)
+  })
+
+  it('emits activate on click when not read-only', async () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello', isActive: false, isReadOnly: false },
+    })
+    await wrapper.find('span').trigger('click')
+    expect(wrapper.emitted('activate')).toBeTruthy()
+  })
+
+  it('does not emit activate on click when read-only', async () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello', isActive: false, isReadOnly: true },
+    })
+    await wrapper.find('span').trigger('click')
+    expect(wrapper.emitted('activate')).toBeFalsy()
+  })
+
+  it('emits save with trimmed value on Enter', async () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello', isActive: true },
+    })
+    const input = wrapper.find('input')
+    await input.setValue('  New Title  ')
+    await input.trigger('keydown', { key: 'Enter' })
+    expect(wrapper.emitted('save')?.[0]).toEqual(['New Title'])
+  })
+
+  it('emits save with null when cleared on Enter', async () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello', isActive: true },
+    })
+    const input = wrapper.find('input')
+    await input.setValue('   ')
+    await input.trigger('keydown', { key: 'Enter' })
+    expect(wrapper.emitted('save')?.[0]).toEqual([null])
+  })
+
+  it('emits cancel on Escape', async () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello', isActive: true },
+    })
+    await wrapper.find('input').trigger('keydown', { key: 'Escape' })
+    expect(wrapper.emitted('cancel')).toBeTruthy()
+  })
+
+  it('emits navigate next on Tab', async () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello', isActive: true },
+    })
+    await wrapper.find('input').trigger('keydown', { key: 'Tab', shiftKey: false })
+    expect(wrapper.emitted('navigate')?.[0]).toEqual(['next'])
+  })
+
+  it('emits navigate prev on Shift+Tab', async () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello', isActive: true },
+    })
+    await wrapper.find('input').trigger('keydown', { key: 'Tab', shiftKey: true })
+    expect(wrapper.emitted('navigate')?.[0]).toEqual(['prev'])
+  })
+
+  it('emits save on blur', async () => {
+    vi.useFakeTimers()
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello', isActive: true },
+    })
+    const input = wrapper.find('input')
+    await input.setValue('Blurred value')
+    await input.trigger('blur')
+    vi.runAllTimers()
+    await wrapper.vm.$nextTick()
+    expect(wrapper.emitted('save')?.[0]).toEqual(['Blurred value'])
+    vi.useRealTimers()
+  })
+
+  it('emits cancel instead of save on blur when value is unchanged', async () => {
+    vi.useFakeTimers()
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello', isActive: true },
+    })
+    await wrapper.find('input').trigger('blur')
+    vi.runAllTimers()
+    await wrapper.vm.$nextTick()
+    expect(wrapper.emitted('save')).toBeFalsy()
+    expect(wrapper.emitted('cancel')).toBeTruthy()
+    vi.useRealTimers()
+  })
+
+  it('focuses input when isActive changes to true', async () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Hello', isActive: false },
+    })
+    expect(wrapper.find('input').exists()).toBe(false)
+    await wrapper.setProps({ isActive: true })
+    expect(wrapper.find('input').exists()).toBe(true)
+  })
+
+  it('renders placeholder dash for null value when not read-only', () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: null, isActive: false, isReadOnly: false },
+    })
+    expect(wrapper.find('span').text()).toBe('-')
+  })
+
+  it('renders placeholder dash for null value when read-only', () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: null, isActive: false, isReadOnly: true },
+    })
+    expect(wrapper.find('span').text()).toBe('-')
+  })
+
+  it('emits row navigation on ArrowUp and ArrowDown', async () => {
+    const wrapper = mount(BookTableTextCell, {
+      props: { value: 'Book', isActive: true },
+    })
+    const input = wrapper.find('input')
+    await input.trigger('keydown', { key: 'ArrowUp' })
+    await input.trigger('keydown', { key: 'ArrowDown' })
+    expect(wrapper.emitted('navigate')?.[0]).toEqual(['rowUp'])
+    expect(wrapper.emitted('navigate')?.[1]).toEqual(['rowDown'])
+  })
+})
+
+// ─── BookTableNumberCell ───────────────────────────────────────────────────────
+
+describe('BookTableNumberCell', () => {
+  it('renders display value when inactive', () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 42, isActive: false },
+    })
+    expect(wrapper.find('span').text()).toBe('42')
+  })
+
+  it('renders input when active', () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 42, isActive: true },
+    })
+    expect(wrapper.find('input').exists()).toBe(true)
+  })
+
+  it('emits save with parsed int on Enter', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 42, isActive: true },
+    })
+    const input = wrapper.find('input')
+    await input.setValue('99')
+    await input.trigger('keydown', { key: 'Enter' })
+    expect(wrapper.emitted('save')?.[0]).toEqual([99])
+  })
+
+  it('emits save with null when input is empty', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 42, isActive: true },
+    })
+    const input = wrapper.find('input')
+    await input.setValue('')
+    await input.trigger('keydown', { key: 'Enter' })
+    expect(wrapper.emitted('save')?.[0]).toEqual([null])
+  })
+
+  it('emits save with float when allowDecimal is true', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 1, isActive: true, allowDecimal: true },
+    })
+    const input = wrapper.find('input')
+    await input.setValue('1.5')
+    await input.trigger('keydown', { key: 'Enter' })
+    expect(wrapper.emitted('save')?.[0]).toEqual([1.5])
+  })
+
+  it('emits cancel on Escape', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 42, isActive: true },
+    })
+    await wrapper.find('input').trigger('keydown', { key: 'Escape' })
+    expect(wrapper.emitted('cancel')).toBeTruthy()
+  })
+
+  it('emits activate on click when not read-only', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 1, isActive: false, isReadOnly: false },
+    })
+    await wrapper.find('span').trigger('click')
+    expect(wrapper.emitted('activate')).toBeTruthy()
+  })
+
+  it('does not emit activate when read-only', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 1, isActive: false, isReadOnly: true },
+    })
+    await wrapper.find('span').trigger('click')
+    expect(wrapper.emitted('activate')).toBeFalsy()
+  })
+
+  it('renders dash placeholder for null value in editable mode', () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: null, isActive: false, isReadOnly: false },
+    })
+    expect(wrapper.find('span').text()).toBe('-')
+  })
+
+  it('renders dash placeholder for null value in read-only mode', () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: null, isActive: false, isReadOnly: true },
+    })
+    expect(wrapper.find('span').text()).toBe('-')
+  })
+
+  it('emits save on blur', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 10, isActive: true },
+    })
+    const input = wrapper.find('input')
+    await input.setValue('55')
+    await input.trigger('blur')
+    expect(wrapper.emitted('save')?.[0]).toEqual([55])
+  })
+
+  it('emits cancel instead of save on blur when value is unchanged', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 10, isActive: true },
+    })
+    await wrapper.find('input').trigger('blur')
+    expect(wrapper.emitted('save')).toBeFalsy()
+    expect(wrapper.emitted('cancel')).toBeTruthy()
+  })
+
+  it('focuses input when isActive changes to true', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 1, isActive: false },
+    })
+    await wrapper.setProps({ isActive: true })
+    expect(wrapper.find('input').exists()).toBe(true)
+  })
+
+  it('emits save with null for non-numeric input', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 1, isActive: true, allowDecimal: true },
+    })
+    const input = wrapper.find('input')
+    await input.setValue('abc')
+    await input.trigger('keydown', { key: 'Enter' })
+    expect(wrapper.emitted('save')?.[0]).toEqual([null])
+  })
+
+  it('clamps saved values to min and max', async () => {
+    const minWrapper = mount(BookTableNumberCell, {
+      props: { value: 5, isActive: true, min: 10, max: 20 },
+    })
+    await minWrapper.find('input').setValue('1')
+    await minWrapper.find('input').trigger('keydown', { key: 'Enter' })
+    expect(minWrapper.emitted('save')?.[0]).toEqual([10])
+
+    const maxWrapper = mount(BookTableNumberCell, {
+      props: { value: 5, isActive: true, min: 10, max: 20 },
+    })
+    await maxWrapper.find('input').setValue('99')
+    await maxWrapper.find('input').trigger('keydown', { key: 'Enter' })
+    expect(maxWrapper.emitted('save')?.[0]).toEqual([20])
+  })
+
+  it('blocks printable non-digit keys when decimals are disabled', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 5, isActive: true, allowDecimal: false },
+    })
+    const event = new KeyboardEvent('keydown', { key: 'a', bubbles: true, cancelable: true })
+    wrapper.find('input').element.dispatchEvent(event)
+    expect(event.defaultPrevented).toBe(true)
+  })
+
+  it('emits row navigation on ArrowUp and ArrowDown', async () => {
+    const wrapper = mount(BookTableNumberCell, {
+      props: { value: 5, isActive: true },
+    })
+    const input = wrapper.find('input')
+    await input.trigger('keydown', { key: 'ArrowUp' })
+    await input.trigger('keydown', { key: 'ArrowDown' })
+    expect(wrapper.emitted('navigate')?.[0]).toEqual(['rowUp'])
+    expect(wrapper.emitted('navigate')?.[1]).toEqual(['rowDown'])
+  })
+})
+
+// ─── BookTableRatingCell ───────────────────────────────────────────────────────
+
+describe('BookTableRatingCell', () => {
+  it('renders 5 star buttons', () => {
+    const wrapper = mount(BookTableRatingCell, {
+      props: { value: 3 },
+    })
+    expect(wrapper.findAll('button')).toHaveLength(5)
+  })
+
+  it('emits save with clicked star value', async () => {
+    const wrapper = mount(BookTableRatingCell, {
+      props: { value: null },
+    })
+    const buttons = wrapper.findAll('button')
+    await buttons[2]!.trigger('click')
+    expect(wrapper.emitted('save')?.[0]).toEqual([3])
+  })
+
+  it('emits save with null when clicking the active star (toggle off)', async () => {
+    const wrapper = mount(BookTableRatingCell, {
+      props: { value: 3 },
+    })
+    const buttons = wrapper.findAll('button')
+    await buttons[2]!.trigger('click')
+    expect(wrapper.emitted('save')?.[0]).toEqual([null])
+  })
+
+  it('does not emit save when read-only', async () => {
+    const wrapper = mount(BookTableRatingCell, {
+      props: { value: 3, isReadOnly: true },
+    })
+    await wrapper.findAll('button')[2]!.trigger('click')
+    expect(wrapper.emitted('save')).toBeFalsy()
+  })
+
+  it('renders accessible group and pressed state', () => {
+    const wrapper = mount(BookTableRatingCell, {
+      props: { value: 3 },
+    })
+    expect(wrapper.find('[role="group"]').attributes('aria-label')).toBe('Rating')
+    const buttons = wrapper.findAll('button')
+    expect(buttons[2]?.attributes('aria-pressed')).toBe('true')
+    expect(buttons[2]?.attributes('aria-label')).toBe('Remove rating')
+    expect(buttons[3]?.attributes('aria-label')).toBe('Rate 4 out of 5')
+  })
+
+  it('supports keyboard interaction', async () => {
+    const wrapper = mount(BookTableRatingCell, {
+      props: { value: 2 },
+    })
+    const buttons = wrapper.findAll('button')
+    await buttons[1]!.trigger('keydown', { key: 'ArrowRight' })
+    await buttons[2]!.trigger('keydown', { key: 'Enter' })
+    expect(wrapper.emitted('save')?.[0]).toEqual([3])
+  })
+})
+
+// ─── BookTableChipsCell ────────────────────────────────────────────────────────
+
+describe('BookTableChipsCell', () => {
+  const mountChips = (props: {
+    value: string[]
+    isActive: boolean
+    isReadOnly?: boolean
+    searchFn?: (q: string) => Promise<string[]>
+    chipActionFn?: (chip: string) => void
+  }) => mount(BookTableChipsCell, { props, global: { stubs: chipsStubs } })
+
+  it('renders chips in display mode', () => {
+    const wrapper = mountChips({ value: ['Vue', 'React'], isActive: false })
+    const spans = wrapper.findAll('span').filter((s) => ['Vue', 'React'].includes(s.text()))
+    expect(spans).toHaveLength(2)
+  })
+
+  it('shows overflow count for more than 2 chips', () => {
+    const wrapper = mountChips({ value: ['a', 'b', 'c', 'd'], isActive: false })
+    expect(wrapper.text()).toContain('+2')
+  })
+
+  it('renders placeholder when empty and inactive', () => {
+    const wrapper = mountChips({ value: [], isActive: false })
+    expect(wrapper.find('span').text()).toBe('-')
+  })
+
+  it('popover is closed when inactive', () => {
+    const wrapper = mountChips({ value: [], isActive: false })
+    expect(wrapper.find('[data-testid="popover"]').attributes('data-open')).toBe('false')
+  })
+
+  it('popover opens when isActive becomes true', async () => {
+    const wrapper = mountChips({ value: [], isActive: false })
+    await wrapper.setProps({ isActive: true })
+    expect(wrapper.find('[data-testid="popover"]').attributes('data-open')).toBe('true')
+  })
+
+  it('popover closes when isActive becomes false', async () => {
+    const wrapper = mountChips({ value: ['a'], isActive: true })
+    await wrapper.setProps({ isActive: false })
+    expect(wrapper.find('[data-testid="popover"]').attributes('data-open')).toBe('false')
+  })
+
+  it('emits activate when Popover opens via user interaction', async () => {
+    const wrapper = mountChips({ value: [], isActive: false })
+    await wrapper.findComponent({ name: 'Popover' }).vm.$emit('update:open', true)
+    expect(wrapper.emitted('activate')).toBeTruthy()
+  })
+
+  it('emits save with draft when Popover closes while active', async () => {
+    const wrapper = mountChips({ value: ['a', 'b'], isActive: true })
+    const chipInput = wrapper.findComponent({ name: 'ChipInput' })
+    await chipInput.vm.$emit('update:modelValue', ['a', 'b', 'c'])
+    await wrapper.findComponent({ name: 'Popover' }).vm.$emit('update:open', false)
+    expect(wrapper.emitted('save')?.[0]).toEqual([['a', 'b', 'c']])
+  })
+
+  it('emits cancel when Popover closes without changes', async () => {
+    const wrapper = mountChips({ value: ['a', 'b'], isActive: true })
+    await wrapper.findComponent({ name: 'Popover' }).vm.$emit('update:open', false)
+    expect(wrapper.emitted('save')).toBeFalsy()
+    expect(wrapper.emitted('cancel')).toBeTruthy()
+  })
+
+  it('emits navigate next on Tab keydown in popover content', async () => {
+    const wrapper = mountChips({ value: [], isActive: true })
+    await wrapper.find('[data-testid="popover-content"]').trigger('keydown', { key: 'Tab', shiftKey: false })
+    expect(wrapper.emitted('navigate')?.[0]).toEqual(['next'])
+    expect(wrapper.emitted('save')).toBeTruthy()
+  })
+
+  it('emits navigate prev on Shift+Tab in popover content', async () => {
+    const wrapper = mountChips({ value: [], isActive: true })
+    await wrapper.find('[data-testid="popover-content"]').trigger('keydown', { key: 'Tab', shiftKey: true })
+    expect(wrapper.emitted('navigate')?.[0]).toEqual(['prev'])
+  })
+
+  it('passes searchFn prop to ChipInput', () => {
+    const searchFn = vi.fn<() => Promise<string[]>>()
+    const wrapper = mountChips({ value: [], isActive: true, searchFn })
+    const chipInput = wrapper.findComponent({ name: 'ChipInput' })
+    expect(chipInput.props('searchFn')).toBe(searchFn)
+  })
+
+  it('draft is initialized from value when popover opens', async () => {
+    const wrapper = mountChips({ value: ['x', 'y'], isActive: false })
+    await wrapper.setProps({ isActive: true })
+    const chipInput = wrapper.findComponent({ name: 'ChipInput' })
+    expect(chipInput.props('modelValue')).toEqual(['x', 'y'])
+  })
+
+  it('popover trigger is disabled when read-only', () => {
+    const wrapper = mountChips({ value: [], isActive: false, isReadOnly: true })
+    expect(wrapper.find('[data-testid="popover-trigger"]').attributes('data-disabled')).toBe('true')
+  })
+
+  it('chips trigger is focusable and has button role when editable', () => {
+    const wrapper = mountChips({ value: ['Fantasy'], isActive: false, isReadOnly: false })
+    const trigger = wrapper.find('[data-cell-activator="true"]')
+    expect(trigger.attributes('role')).toBe('button')
+    expect(trigger.attributes('tabindex')).toBe('0')
+  })
+
+  it('renders chip buttons and invokes action callback when chipActionFn is provided', async () => {
+    const chipActionFn = vi.fn<(chip: string) => void>()
+    const wrapper = mountChips({ value: ['Fantasy', 'Epic'], isActive: false, chipActionFn })
+    const chipButtons = wrapper.findAll('button')
+
+    expect(chipButtons).toHaveLength(2)
+    await chipButtons[0]!.trigger('click')
+    expect(chipActionFn).toHaveBeenCalledWith('Fantasy')
+  })
+})
+
+// ─── BookTableReadStatusCell ───────────────────────────────────────────────────
+
+describe('BookTableReadStatusCell', () => {
+  const baseStatus: UserBookStatus = {
+    status: 'unread',
+    source: 'manual',
+    startedAt: null,
+    finishedAt: null,
+    updatedAt: '2024-01-01T00:00:00Z',
+  }
+
+  const mountStatus = (props: { value: UserBookStatus | null; isActive: boolean; isReadOnly?: boolean }) =>
+    mount(BookTableReadStatusCell, { props, global: { stubs: statusStubs } })
+
+  it('renders current status label', () => {
+    const wrapper = mountStatus({ value: baseStatus, isActive: false })
+    expect(wrapper.text()).toContain('Unread')
+  })
+
+  it('renders Unread as default when value is null', () => {
+    const wrapper = mountStatus({ value: null, isActive: false })
+    expect(wrapper.text()).toContain('Unread')
+  })
+
+  it('dropdown is closed when inactive', () => {
+    const wrapper = mountStatus({ value: baseStatus, isActive: false })
+    expect(wrapper.find('[data-testid="dropdown"]').attributes('data-open')).toBe('false')
+  })
+
+  it('dropdown opens when isActive becomes true', async () => {
+    const wrapper = mountStatus({ value: baseStatus, isActive: false })
+    await wrapper.setProps({ isActive: true })
+    expect(wrapper.find('[data-testid="dropdown"]').attributes('data-open')).toBe('true')
+  })
+
+  it('emits activate when DropdownMenu opens via user interaction', async () => {
+    const wrapper = mountStatus({ value: baseStatus, isActive: false })
+    await wrapper.findComponent({ name: 'DropdownMenu' }).vm.$emit('update:open', true)
+    expect(wrapper.emitted('activate')).toBeTruthy()
+  })
+
+  it('emits save when a status item is selected', async () => {
+    const wrapper = mountStatus({ value: baseStatus, isActive: true })
+    const items = wrapper.findAll('button')
+    const readingBtn = items.find((b) => b.text().includes('Reading'))
+    await readingBtn!.trigger('click')
+    expect(wrapper.emitted('save')?.[0]).toEqual(['reading'])
+  })
+
+  it('emits cancel when dropdown closes without a save', async () => {
+    const wrapper = mountStatus({ value: baseStatus, isActive: true })
+    await wrapper.findComponent({ name: 'DropdownMenu' }).vm.$emit('update:open', false)
+    expect(wrapper.emitted('cancel')).toBeTruthy()
+  })
+
+  it('does not emit cancel after a status is selected', async () => {
+    const wrapper = mountStatus({ value: baseStatus, isActive: true })
+    const items = wrapper.findAll('button')
+    const readBtn = items.find((b) => b.text().includes('Read'))
+    await readBtn!.trigger('click')
+    await wrapper.findComponent({ name: 'DropdownMenu' }).vm.$emit('update:open', false)
+    const cancelCount = wrapper.emitted('cancel')?.length ?? 0
+    expect(cancelCount).toBe(0)
+  })
+
+  it('emits navigate next on Tab in dropdown content', async () => {
+    const wrapper = mountStatus({ value: baseStatus, isActive: true })
+    await wrapper.find('[data-testid="dropdown-content"]').trigger('keydown', { key: 'Tab', shiftKey: false })
+    expect(wrapper.emitted('navigate')?.[0]).toEqual(['next'])
+    expect(wrapper.emitted('cancel')).toBeTruthy()
+  })
+
+  it('emits navigate prev on Shift+Tab in dropdown content', async () => {
+    const wrapper = mountStatus({ value: baseStatus, isActive: true })
+    await wrapper.find('[data-testid="dropdown-content"]').trigger('keydown', { key: 'Tab', shiftKey: true })
+    expect(wrapper.emitted('navigate')?.[0]).toEqual(['prev'])
+  })
+
+  it('dropdown trigger is not disabled when not read-only', () => {
+    const wrapper = mountStatus({ value: baseStatus, isActive: false, isReadOnly: false })
+    expect(wrapper.find('[data-testid="dropdown-trigger"]').attributes('data-disabled')).toBe('false')
+  })
+
+  it('dropdown trigger is disabled when read-only', () => {
+    const wrapper = mountStatus({ value: baseStatus, isActive: false, isReadOnly: true })
+    expect(wrapper.find('[data-testid="dropdown-trigger"]').attributes('data-disabled')).toBe('true')
+  })
+})
diff --git a/client/src/features/book/components/__tests__/CollapsedSeriesCard.spec.ts b/client/src/features/book/components/__tests__/CollapsedSeriesCard.spec.ts
index 25565964a..800645fba 100644
--- a/client/src/features/book/components/__tests__/CollapsedSeriesCard.spec.ts
+++ b/client/src/features/book/components/__tests__/CollapsedSeriesCard.spec.ts
@@ -30,12 +30,21 @@ function makeBook(overrides?: Partial<BookCard>): BookCard {
     publishedYear: null,
     language: null,
     genres: [],
+    tags: [],
     rating: null,
     readingProgress: null,
     readStatus: null,
     addedAt: '2024-01-01T00:00:00.000Z',
+    updatedAt: null,
+    metadataScore: null,
     hasCover: false,
     hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
     collapsedSeries: {
       bookCount: 5,
       readCount: 2,
diff --git a/client/src/features/book/components/__tests__/KeyboardShortcutOverlay.spec.ts b/client/src/features/book/components/__tests__/KeyboardShortcutOverlay.spec.ts
new file mode 100644
index 000000000..a00ec8308
--- /dev/null
+++ b/client/src/features/book/components/__tests__/KeyboardShortcutOverlay.spec.ts
@@ -0,0 +1,100 @@
+import { describe, it, expect } from 'vitest'
+import { mount } from '@vue/test-utils'
+import KeyboardShortcutOverlay from '../KeyboardShortcutOverlay.vue'
+
+describe('KeyboardShortcutOverlay', () => {
+  it('does not render when closed', () => {
+    const wrapper = mount(KeyboardShortcutOverlay, { props: { open: false } })
+
+    expect(wrapper.find('[role="dialog"]').exists()).toBe(false)
+  })
+
+  it('renders dialog when open', () => {
+    const wrapper = mount(KeyboardShortcutOverlay, {
+      props: { open: true },
+      global: { stubs: { Teleport: true } },
+    })
+
+    expect(wrapper.find('[role="dialog"]').exists()).toBe(true)
+    expect(wrapper.text()).toContain('Keyboard Shortcuts')
+  })
+
+  it('shows navigation shortcuts', () => {
+    const wrapper = mount(KeyboardShortcutOverlay, {
+      props: { open: true },
+      global: { stubs: { Teleport: true } },
+    })
+
+    expect(wrapper.text()).toContain('Move focus up/down')
+    expect(wrapper.text()).toContain('Move focus left/right')
+    expect(wrapper.text()).toContain('Jump to first column')
+  })
+
+  it('shows action shortcuts', () => {
+    const wrapper = mount(KeyboardShortcutOverlay, {
+      props: { open: true },
+      global: { stubs: { Teleport: true } },
+    })
+
+    expect(wrapper.text()).toContain('Edit focused cell')
+    expect(wrapper.text()).toContain('Cancel editing')
+    expect(wrapper.text()).toContain('Toggle row selection')
+    expect(wrapper.text()).toContain('Copy cell value')
+  })
+
+  it('shows help shortcut', () => {
+    const wrapper = mount(KeyboardShortcutOverlay, {
+      props: { open: true },
+      global: { stubs: { Teleport: true } },
+    })
+
+    expect(wrapper.text()).toContain('Toggle this help overlay')
+  })
+
+  it('emits update:open false when close button clicked', async () => {
+    const wrapper = mount(KeyboardShortcutOverlay, {
+      props: { open: true },
+      global: { stubs: { Teleport: true } },
+    })
+
+    const closeButton = wrapper.find('button')
+    await closeButton.trigger('click')
+
+    expect(wrapper.emitted('update:open')).toEqual([[false]])
+  })
+
+  it('emits update:open false on backdrop click', async () => {
+    const wrapper = mount(KeyboardShortcutOverlay, {
+      props: { open: true },
+      global: { stubs: { Teleport: true } },
+    })
+
+    const backdrop = wrapper.find('.fixed')
+    await backdrop.trigger('click')
+
+    expect(wrapper.emitted('update:open')).toEqual([[false]])
+  })
+
+  it('renders kbd elements for shortcuts', () => {
+    const wrapper = mount(KeyboardShortcutOverlay, {
+      props: { open: true },
+      global: { stubs: { Teleport: true } },
+    })
+
+    const kbds = wrapper.findAll('kbd')
+    expect(kbds.length).toBeGreaterThan(5)
+  })
+
+  it('includes section headers', () => {
+    const wrapper = mount(KeyboardShortcutOverlay, {
+      props: { open: true },
+      global: { stubs: { Teleport: true } },
+    })
+
+    const headers = wrapper.findAll('h3')
+    const headerTexts = headers.map((h) => h.text())
+    expect(headerTexts).toContain('Navigation')
+    expect(headerTexts).toContain('Actions')
+    expect(headerTexts).toContain('General')
+  })
+})
diff --git a/client/src/features/book/components/__tests__/MetadataExportDialog.spec.ts b/client/src/features/book/components/__tests__/MetadataExportDialog.spec.ts
new file mode 100644
index 000000000..a6e0d7ea6
--- /dev/null
+++ b/client/src/features/book/components/__tests__/MetadataExportDialog.spec.ts
@@ -0,0 +1,211 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { mount, flushPromises } from '@vue/test-utils'
+import MetadataExportDialog from '../MetadataExportDialog.vue'
+
+const composableMocks = vi.hoisted(() => ({
+  preflight: vi.fn<(request: unknown) => Promise<unknown>>(),
+  download: vi.fn<(request: unknown) => Promise<unknown>>(),
+}))
+
+const toastMocks = vi.hoisted(() => ({
+  success: vi.fn<(message: string) => void>(),
+  error: vi.fn<(message: string) => void>(),
+}))
+
+vi.mock('@/features/book/composables/useBookMetadataExport', async () => {
+  const { ref } = await import('vue')
+  return {
+    useBookMetadataExport: () => ({
+      loading: ref(false),
+      preflight: composableMocks.preflight,
+      download: composableMocks.download,
+    }),
+  }
+})
+
+vi.mock('vue-sonner', () => ({
+  toast: {
+    success: toastMocks.success,
+    error: toastMocks.error,
+  },
+}))
+
+const PREVIEW = {
+  schemaVersion: 1,
+  rowCount: 20,
+  estimatedBytes: 1024,
+  sizeCategory: 'small',
+  fileName: 'bookorbit-library-all-matching-2026-05-07.csv',
+  scope: 'all-matching',
+  format: 'csv',
+} as const
+
+type ExportRequest = {
+  scope: string
+  format: string
+  options: {
+    includePersonalData: boolean
+    includeFilePaths: boolean
+    includeContextMeta: boolean
+    columnsMode: string
+  }
+}
+
+function mountDialog(props: Record<string, unknown>) {
+  return mount(MetadataExportDialog, {
+    props: {
+      open: false,
+      viewType: 'library',
+      selectedBookIds: [1, 2],
+      selectedCount: 2,
+      totalCount: 20,
+      allMatchingQuery: { libraryId: 4, q: 'dune' },
+      visibleColumns: ['title', 'authors'],
+      ...props,
+    },
+    global: {
+      stubs: {
+        Teleport: true,
+      },
+    },
+  })
+}
+
+describe('MetadataExportDialog', () => {
+  beforeEach(() => {
+    localStorage.clear()
+    composableMocks.preflight.mockReset()
+    composableMocks.download.mockReset()
+    toastMocks.success.mockReset()
+    toastMocks.error.mockReset()
+    composableMocks.preflight.mockResolvedValue(PREVIEW)
+    composableMocks.download.mockResolvedValue(PREVIEW)
+  })
+
+  it('defaults to all-matching scope when query payload exists and requests preflight', async () => {
+    const wrapper = mountDialog({})
+    await wrapper.setProps({ open: true })
+    await flushPromises()
+
+    expect(composableMocks.preflight).toHaveBeenCalled()
+    const request = composableMocks.preflight.mock.calls[0]?.[0] as { scope: string }
+    expect(request.scope).toBe('all-matching')
+  })
+
+  it('falls back to selected scope when all-matching query is unavailable', async () => {
+    const wrapper = mountDialog({ allMatchingQuery: undefined, defaultScope: 'all-matching' })
+    await wrapper.setProps({ open: true })
+    await flushPromises()
+
+    expect(composableMocks.preflight).toHaveBeenCalled()
+    const request = composableMocks.preflight.mock.calls[0]?.[0] as { scope: string }
+    expect(request.scope).toBe('selected')
+  })
+
+  it('downloads metadata export and closes on success', async () => {
+    const wrapper = mountDialog({})
+    await wrapper.setProps({ open: true })
+    await flushPromises()
+
+    const exportButton = wrapper.findAll('button').find((button) => button.text().trim() === 'Export')
+    expect(exportButton).toBeTruthy()
+
+    await exportButton!.trigger('click')
+    await flushPromises()
+
+    expect(composableMocks.download).toHaveBeenCalledTimes(1)
+    expect(wrapper.emitted('update:open')).toBeTruthy()
+    const closeEvents = wrapper.emitted('update:open') ?? []
+    expect(closeEvents[closeEvents.length - 1]).toEqual([false])
+    expect(toastMocks.success).toHaveBeenCalled()
+  })
+
+  it('disables export action when neither selected nor all-matching scope can run', async () => {
+    const wrapper = mountDialog({ selectedBookIds: [], selectedCount: 0, allMatchingQuery: undefined, totalCount: 0 })
+    await wrapper.setProps({ open: true })
+    await flushPromises()
+
+    const exportButton = wrapper.findAll('button').find((button) => button.text().trim() === 'Export')
+
+    expect(exportButton?.attributes('disabled')).toBeDefined()
+    expect(composableMocks.preflight).not.toHaveBeenCalled()
+  })
+
+  it('loads persisted settings and sends them in preflight request', async () => {
+    localStorage.setItem(
+      'bookorbit:metadata-export:library',
+      JSON.stringify({
+        format: 'json',
+        columnsMode: 'visible',
+        includePersonalData: true,
+        includeFilePaths: true,
+        includeContextMeta: false,
+      }),
+    )
+
+    const wrapper = mountDialog({})
+    await wrapper.setProps({ open: true })
+    await flushPromises()
+
+    const request = composableMocks.preflight.mock.calls[0]?.[0] as ExportRequest
+    expect(request.format).toBe('json')
+    expect(request.options.columnsMode).toBe('visible')
+    expect(request.options.includePersonalData).toBe(true)
+    expect(request.options.includeFilePaths).toBe(true)
+    expect(request.options.includeContextMeta).toBe(false)
+  })
+
+  it('ignores malformed persisted settings and still runs preflight', async () => {
+    localStorage.setItem('bookorbit:metadata-export:library', '{bad-json')
+
+    const wrapper = mountDialog({})
+    await wrapper.setProps({ open: true })
+    await flushPromises()
+
+    const request = composableMocks.preflight.mock.calls[0]?.[0] as ExportRequest
+    expect(request.format).toBe('csv')
+    expect(request.options.columnsMode).toBe('canonical')
+  })
+
+  it('shows preflight errors and surfaces download failures', async () => {
+    composableMocks.preflight.mockReset()
+    composableMocks.preflight.mockRejectedValue(new Error('Too many rows selected'))
+    const wrapper = mountDialog({})
+    await wrapper.setProps({ open: true })
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('Too many rows selected')
+
+    composableMocks.preflight.mockReset()
+    composableMocks.preflight.mockResolvedValue(PREVIEW)
+    const optionsCheckboxes = wrapper.findAll('input[type="checkbox"]')
+    await optionsCheckboxes[0]?.setValue(true)
+    await optionsCheckboxes[1]?.setValue(true)
+    await optionsCheckboxes[2]?.setValue(false)
+    await flushPromises()
+
+    composableMocks.download.mockRejectedValueOnce(new Error('Metadata export failed hard'))
+    const exportButton = wrapper.findAll('button').find((button) => button.text().trim() === 'Export')
+    await exportButton?.trigger('click')
+    await flushPromises()
+
+    expect(toastMocks.error).toHaveBeenCalledWith('Metadata export failed hard')
+  })
+
+  it('supports format and columns-mode switching', async () => {
+    const wrapper = mountDialog({})
+    await wrapper.setProps({ open: true })
+    await flushPromises()
+
+    await wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('JSON'))
+      ?.trigger('click')
+    await wrapper.find('input[type="radio"][value="visible"]').setValue(true)
+    await flushPromises()
+
+    const lastRequest = composableMocks.preflight.mock.calls[composableMocks.preflight.mock.calls.length - 1]?.[0] as ExportRequest
+    expect(lastRequest.format).toBe('json')
+    expect(lastRequest.options.columnsMode).toBe('visible')
+  })
+})
diff --git a/client/src/features/book/components/__tests__/VirtualBookTable.loadmore.spec.ts b/client/src/features/book/components/__tests__/VirtualBookTable.loadmore.spec.ts
new file mode 100644
index 000000000..5e77aab23
--- /dev/null
+++ b/client/src/features/book/components/__tests__/VirtualBookTable.loadmore.spec.ts
@@ -0,0 +1,81 @@
+import { nextTick, ref, watch } from 'vue'
+import { describe, expect, it } from 'vitest'
+
+describe('isLoadingMore guard', () => {
+  it('prevents duplicate load-more emissions while loading is active', async () => {
+    const isLoadingMore = ref(false)
+    const loading = ref(false)
+    const emittedCount = ref(0)
+    const books = ref(Array.from({ length: 20 }, (_, index) => index))
+    const LOAD_THRESHOLD = 5
+    const virtualItems = ref<Array<{ index: number }>>([])
+
+    watch(virtualItems, (items) => {
+      if (!items.length || loading.value || isLoadingMore.value) return
+      const last = items[items.length - 1]
+      if (!last) return
+      if (last.index >= books.value.length - LOAD_THRESHOLD) {
+        isLoadingMore.value = true
+        emittedCount.value += 1
+      }
+    })
+
+    watch(loading, (value) => {
+      if (!value) isLoadingMore.value = false
+    })
+
+    virtualItems.value = [{ index: 17 }]
+    await nextTick()
+    expect(emittedCount.value).toBe(1)
+    expect(isLoadingMore.value).toBe(true)
+
+    loading.value = true
+    virtualItems.value = [{ index: 18 }]
+    await nextTick()
+    expect(emittedCount.value).toBe(1)
+
+    loading.value = false
+    await nextTick()
+    expect(isLoadingMore.value).toBe(false)
+
+    virtualItems.value = [{ index: 19 }]
+    await nextTick()
+    expect(emittedCount.value).toBe(2)
+  })
+
+  it('does not emit when the guard is already active', async () => {
+    const isLoadingMore = ref(true)
+    const loading = ref(false)
+    const emittedCount = ref(0)
+    const books = ref(Array.from({ length: 20 }, (_, index) => index))
+    const LOAD_THRESHOLD = 5
+    const virtualItems = ref<Array<{ index: number }>>([])
+
+    watch(virtualItems, (items) => {
+      if (!items.length || loading.value || isLoadingMore.value) return
+      const last = items[items.length - 1]
+      if (!last) return
+      if (last.index >= books.value.length - LOAD_THRESHOLD) {
+        isLoadingMore.value = true
+        emittedCount.value += 1
+      }
+    })
+
+    watch(loading, (value) => {
+      if (!value) isLoadingMore.value = false
+    })
+
+    virtualItems.value = [{ index: 19 }]
+    await nextTick()
+    expect(emittedCount.value).toBe(0)
+
+    loading.value = true
+    await nextTick()
+    loading.value = false
+    await nextTick()
+
+    virtualItems.value = [{ index: 19 }]
+    await nextTick()
+    expect(emittedCount.value).toBe(1)
+  })
+})
diff --git a/client/src/features/book/components/detail/tabs/CoverEditorPanel.vue b/client/src/features/book/components/detail/tabs/CoverEditorPanel.vue
index bb7a8f9d4..13c7a9e5f 100644
--- a/client/src/features/book/components/detail/tabs/CoverEditorPanel.vue
+++ b/client/src/features/book/components/detail/tabs/CoverEditorPanel.vue
@@ -183,16 +183,14 @@ onUnmounted(() => clearTimeout(debounceTimer))
       </button>
 
       <!-- Cover Search Drawer -->
-      <Teleport to="body">
-        <CoverSearchDrawer
-          v-if="isSearchOpen"
-          :initial-title="book.title ?? ''"
-          :initial-author="book.authors?.[0]?.name ?? ''"
-          :is-audiobook="isPrimaryAudio"
-          @close="isSearchOpen = false"
-          @select="handleSearchSelect"
-        />
-      </Teleport>
+      <CoverSearchDrawer
+        :open="isSearchOpen"
+        :initial-title="book.title ?? ''"
+        :initial-author="book.authors?.[0]?.name ?? ''"
+        :is-audiobook="isPrimaryAudio"
+        @update:open="isSearchOpen = $event"
+        @select="handleSearchSelect"
+      />
 
       <!-- Error -->
       <p v-if="error" class="text-xs text-destructive">{{ error }}</p>
diff --git a/client/src/features/book/components/detail/tabs/CoverSearchDrawer.vue b/client/src/features/book/components/detail/tabs/CoverSearchDrawer.vue
index 1fef4a80c..2679f1eb3 100644
--- a/client/src/features/book/components/detail/tabs/CoverSearchDrawer.vue
+++ b/client/src/features/book/components/detail/tabs/CoverSearchDrawer.vue
@@ -1,16 +1,18 @@
 <script setup lang="ts">
-import { ref, onMounted, nextTick } from 'vue'
-import { Search, Loader2, X, Image as ImageIcon, Check } from 'lucide-vue-next'
+import { ref, watch } from 'vue'
+import { Search, Loader2, Image as ImageIcon, Check } from 'lucide-vue-next'
 import type { CoverSearchResult } from '@bookorbit/types'
+import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle } from '@/components/ui/sheet'
 
 const props = defineProps<{
+  open: boolean
   initialTitle: string
   initialAuthor: string
   isAudiobook: boolean
 }>()
 
 const emit = defineEmits<{
-  close: []
+  'update:open': [boolean]
   select: [string]
 }>()
 
@@ -20,7 +22,18 @@ const searchProvider = ref<'duckduckgo' | 'itunes' | 'all'>('duckduckgo')
 const isSearching = ref(false)
 const searchResults = ref<CoverSearchResult[]>([])
 const hasSearched = ref(false)
-const titleInput = ref<HTMLInputElement | null>(null)
+
+watch(
+  () => props.open,
+  (val) => {
+    if (val) {
+      searchTitle.value = props.initialTitle
+      searchAuthor.value = props.initialAuthor
+      searchResults.value = []
+      hasSearched.value = false
+    }
+  },
+)
 
 async function performSearch() {
   if (!searchTitle.value.trim()) return
@@ -46,40 +59,35 @@ async function performSearch() {
 
 function handleSelect(url: string) {
   emit('select', url)
-  emit('close')
+  emit('update:open', false)
 }
 
-onMounted(() => {
-  nextTick(() => titleInput.value?.focus())
-})
+function handleOpenChange(val: boolean) {
+  emit('update:open', val)
+}
 </script>
 
 <template>
-  <div class="fixed inset-0 z-50 flex justify-end bg-black/40 backdrop-blur-sm" @click.self="emit('close')">
-    <div class="w-full max-w-2xl bg-background h-full shadow-2xl flex flex-col animate-in slide-in-from-right duration-300">
-      <!-- Header -->
-      <div class="flex items-center justify-between p-4 border-b">
+  <Sheet :open="open" @update:open="handleOpenChange">
+    <SheetContent side="right" class="w-full sm:max-w-2xl flex flex-col gap-0 p-0 overflow-hidden">
+      <SheetHeader class="p-4 border-b">
         <div class="flex items-center gap-2">
           <div class="p-2 rounded-lg bg-primary/10 text-primary">
             <Search class="size-5" />
           </div>
           <div>
-            <h2 class="text-sm font-semibold">Online Search</h2>
-            <p class="text-[10px] text-muted-foreground uppercase tracking-wider font-medium">Search for book covers</p>
+            <SheetTitle class="text-sm font-semibold">Online Search</SheetTitle>
+            <SheetDescription class="text-[10px] text-muted-foreground uppercase tracking-wider font-medium">Search for book covers</SheetDescription>
           </div>
         </div>
-        <button class="p-2 hover:bg-muted rounded-full transition-colors" @click="emit('close')">
-          <X class="size-5" />
-        </button>
-      </div>
+      </SheetHeader>
 
-      <!-- Search Bar (Sticky) -->
-      <div class="p-4 bg-muted/30 border-b space-y-3">
+      <!-- Search Bar -->
+      <div class="p-4 bg-muted/30 border-b space-y-3 shrink-0">
         <div class="grid grid-cols-2 md:grid-cols-3 gap-2 md:gap-3">
           <div class="space-y-1">
             <label class="hidden md:block text-[10px] font-bold text-muted-foreground ml-1 uppercase">Title</label>
             <input
-              ref="titleInput"
               v-model="searchTitle"
               class="w-full h-9 md:h-10 rounded-lg border border-input bg-background px-3 text-sm focus:ring-2 focus:ring-primary/20 outline-none transition-all"
               placeholder="Title"
@@ -107,7 +115,6 @@ onMounted(() => {
                 <option value="all">All Sources</option>
               </select>
             </div>
-            <!-- Icon-only search button on mobile, inline with Source -->
             <button
               class="md:hidden flex items-center justify-center h-9 aspect-square rounded-lg bg-primary text-primary-foreground transition-all shadow-sm active:scale-[0.98] disabled:opacity-50 shrink-0"
               :disabled="isSearching"
@@ -118,7 +125,6 @@ onMounted(() => {
             </button>
           </div>
         </div>
-        <!-- Full-width button on md+ -->
         <button
           class="hidden md:flex items-center justify-center gap-2 w-full h-10 rounded-lg bg-primary text-primary-foreground text-sm font-semibold hover:bg-primary/90 transition-all shadow-sm active:scale-[0.98]"
           :disabled="isSearching"
@@ -130,8 +136,8 @@ onMounted(() => {
         </button>
       </div>
 
-      <!-- Results Scroll Area -->
-      <div class="flex-1 overflow-y-auto p-4 custom-scrollbar">
+      <!-- Results -->
+      <div class="flex-1 overflow-y-auto p-4">
         <div v-if="isSearching" class="grid grid-cols-3 gap-4">
           <div v-for="i in 9" :key="i" class="aspect-[2/3] rounded-lg bg-muted animate-pulse" />
         </div>
@@ -144,8 +150,6 @@ onMounted(() => {
             @click="handleSelect(String(res.url))"
           >
             <img :src="res.previewUrl" class="w-full h-full object-cover transition-transform duration-500 group-hover:scale-105" loading="lazy" />
-
-            <!-- Hover Overlay -->
             <div
               class="absolute inset-0 bg-black/60 opacity-0 group-hover:opacity-100 transition-opacity flex flex-col items-center justify-center gap-2"
             >
@@ -154,23 +158,18 @@ onMounted(() => {
               </div>
               <span class="text-xs font-bold text-white uppercase tracking-widest">Select Cover</span>
             </div>
-
-            <!-- Resolution Badge -->
             <div
               class="absolute top-2 right-2 px-1.5 py-0.5 rounded-md text-[10px] font-bold text-white backdrop-blur-md shadow-sm"
               :class="res.width >= 1000 ? 'bg-green-500/80' : 'bg-black/50'"
             >
               {{ res.width }}x{{ res.height }}
             </div>
-
-            <!-- Source Badge -->
             <div class="absolute bottom-2 left-2 px-1.5 py-0.5 rounded-md text-[10px] font-bold text-white bg-black/50 backdrop-blur-md shadow-sm">
               {{ res.source }}
             </div>
           </div>
         </div>
 
-        <!-- Empty States -->
         <div v-else-if="hasSearched" class="h-full flex flex-col items-center justify-center text-center space-y-3 opacity-60 py-12">
           <div class="p-4 rounded-full bg-muted">
             <ImageIcon class="size-10 text-muted-foreground" />
@@ -191,29 +190,13 @@ onMounted(() => {
         </div>
       </div>
 
-      <!-- Footer / Hint -->
-      <div class="p-4 border-t bg-muted/10">
+      <!-- Footer -->
+      <div class="p-4 border-t bg-muted/10 shrink-0">
         <p class="text-[10px] text-center text-muted-foreground flex items-center justify-center gap-1">
           <ImageIcon class="size-3" />
           Tip: High resolution covers are marked in green
         </p>
       </div>
-    </div>
-  </div>
+    </SheetContent>
+  </Sheet>
 </template>
-
-<style scoped>
-.custom-scrollbar::-webkit-scrollbar {
-  width: 6px;
-}
-.custom-scrollbar::-webkit-scrollbar-track {
-  background: transparent;
-}
-.custom-scrollbar::-webkit-scrollbar-thumb {
-  background: rgba(0, 0, 0, 0.1);
-  border-radius: 10px;
-}
-.custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: rgba(0, 0, 0, 0.2);
-}
-</style>
diff --git a/client/src/features/book/components/detail/tabs/EditMetadataTab.vue b/client/src/features/book/components/detail/tabs/EditMetadataTab.vue
index 9cea65668..2fe19bbd2 100644
--- a/client/src/features/book/components/detail/tabs/EditMetadataTab.vue
+++ b/client/src/features/book/components/detail/tabs/EditMetadataTab.vue
@@ -17,6 +17,8 @@ import { useMetadataLocks } from '../../../composables/useMetadataLocks'
 import { useAuthorSearch } from '../../../composables/useAuthorSearch'
 import { useNarratorSearch } from '../../../composables/useNarratorSearch'
 import { useGenreSearch, useTagSearch } from '../../../composables/useTagSearch'
+import { usePublisherSearch, useSeriesNameSearch, useLanguageSearch } from '../../../composables/useMetadataFieldSearch'
+import InputWithSuggestions from '@/components/ui/InputWithSuggestions.vue'
 
 const props = defineProps<{ book: BookDetail }>()
 const emit = defineEmits<{
@@ -85,6 +87,9 @@ const { search: searchAuthors } = useAuthorSearch()
 const { search: searchNarrators } = useNarratorSearch()
 const { search: searchGenres } = useGenreSearch()
 const { search: searchTags } = useTagSearch()
+const { search: searchPublisher } = usePublisherSearch()
+const { search: searchSeriesName } = useSeriesNameSearch()
+const { search: searchLanguage } = useLanguageSearch()
 const searchComicMetadata = async (q: string): Promise<string[]> => (q.trim() ? [] : [])
 
 const coverPanel = ref<InstanceType<typeof CoverEditorPanel> | null>(null)
@@ -616,10 +621,11 @@ function handleCoverChanged(source: 'extracted' | 'custom' | null) {
           :is-updating="isUpdatingLock"
           @toggle="handleLockToggle"
         >
-          <input
+          <InputWithSuggestions
             v-model="form.seriesName"
-            class="w-full h-8 rounded-lg border border-input bg-background px-3 pr-12 text-sm outline-none focus:ring-1 focus:ring-ring transition-shadow disabled:opacity-50 disabled:cursor-not-allowed"
+            :search-fn="searchSeriesName"
             :disabled="isLocked('seriesName')"
+            :class="'w-full h-8 rounded-lg border border-input bg-background px-3 pr-12 text-sm outline-none focus:ring-1 focus:ring-ring transition-shadow disabled:opacity-50 disabled:cursor-not-allowed'"
           />
         </MetadataFieldLabel>
         <MetadataFieldLabel
@@ -648,10 +654,11 @@ function handleCoverChanged(source: 'extracted' | 'custom' | null) {
           :is-updating="isUpdatingLock"
           @toggle="handleLockToggle"
         >
-          <input
+          <InputWithSuggestions
             v-model="form.publisher"
-            class="w-full h-8 rounded-lg border border-input bg-background px-3 pr-12 text-sm outline-none focus:ring-1 focus:ring-ring transition-shadow disabled:opacity-50 disabled:cursor-not-allowed"
+            :search-fn="searchPublisher"
             :disabled="isLocked('publisher')"
+            :class="'w-full h-8 rounded-lg border border-input bg-background px-3 pr-12 text-sm outline-none focus:ring-1 focus:ring-ring transition-shadow disabled:opacity-50 disabled:cursor-not-allowed'"
           />
         </MetadataFieldLabel>
       </div>
@@ -666,11 +673,12 @@ function handleCoverChanged(source: 'extracted' | 'custom' | null) {
           :is-updating="isUpdatingLock"
           @toggle="handleLockToggle"
         >
-          <input
+          <InputWithSuggestions
             v-model="form.language"
-            class="w-full h-8 rounded-lg border border-input bg-background px-3 pr-12 text-sm outline-none focus:ring-1 focus:ring-ring transition-shadow disabled:opacity-50 disabled:cursor-not-allowed"
-            maxlength="10"
+            :search-fn="searchLanguage"
             :disabled="isLocked('language')"
+            :maxlength="10"
+            :class="'w-full h-8 rounded-lg border border-input bg-background px-3 pr-12 text-sm outline-none focus:ring-1 focus:ring-ring transition-shadow disabled:opacity-50 disabled:cursor-not-allowed'"
           />
         </MetadataFieldLabel>
         <MetadataFieldLabel
diff --git a/client/src/features/book/components/table/BookCoverDialog.vue b/client/src/features/book/components/table/BookCoverDialog.vue
new file mode 100644
index 000000000..cb416a99b
--- /dev/null
+++ b/client/src/features/book/components/table/BookCoverDialog.vue
@@ -0,0 +1,154 @@
+<script setup lang="ts">
+import { computed, inject, ref, watch } from 'vue'
+import { ArrowLeft, Loader2, Pencil, X } from 'lucide-vue-next'
+import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
+import { DialogClose, DialogContent, DialogDescription, DialogOverlay, DialogPortal, DialogRoot, DialogTitle } from 'reka-ui'
+import type { BookCard } from '@bookorbit/types'
+import { COVER_ASPECT_RATIO_KEY, DEFAULT_COVER_ASPECT_RATIO } from '../../lib/cover-aspect-ratio'
+import { useBookDetail } from '../../composables/useBookDetail'
+import { useMetadataLocks } from '../../composables/useMetadataLocks'
+import { useCoverVersions } from '../../composables/useCoverVersions'
+import BookCoverPlaceholder from '../BookCoverPlaceholder.vue'
+import CoverEditorPanel from '../detail/tabs/CoverEditorPanel.vue'
+
+const props = defineProps<{
+  book: BookCard | null
+  readOnly: boolean
+}>()
+
+const emit = defineEmits<{
+  close: []
+  'update:book': [bookId: number, hasCover: boolean]
+}>()
+
+const { md } = useBreakpoints(breakpointsTailwind)
+const isEditEnabled = computed(() => !props.readOnly && md.value)
+
+const mode = ref<'view' | 'edit'>('view')
+const savedCover = ref(false)
+
+const { detail, loading, fetch } = useBookDetail()
+const { isLocked, toggle, load: loadLocks } = useMetadataLocks()
+const { coverUrl } = useCoverVersions()
+const coverAspectRatio = inject(COVER_ASPECT_RATIO_KEY, ref(DEFAULT_COVER_ASPECT_RATIO))
+
+const hasCoverResolved = computed(() => savedCover.value || (props.book?.hasCover ?? false))
+
+watch(
+  () => props.book?.id,
+  () => {
+    mode.value = 'view'
+    savedCover.value = false
+    detail.value = null
+  },
+)
+
+watch(detail, (d) => {
+  if (d) loadLocks(d)
+})
+
+function switchToEdit() {
+  mode.value = 'edit'
+  if (!detail.value || detail.value.id !== props.book?.id) {
+    fetch(props.book!.id)
+  }
+}
+
+function switchToView() {
+  mode.value = 'view'
+}
+
+function handleCoverChanged() {
+  savedCover.value = true
+  if (props.book) emit('update:book', props.book.id, true)
+  mode.value = 'view'
+}
+
+function handleOpenChange(open: boolean) {
+  if (!open) emit('close')
+}
+
+async function handleToggleCoverLock() {
+  if (!detail.value) return
+  await toggle(detail.value.id, 'cover')
+}
+</script>
+
+<template>
+  <DialogRoot :open="book !== null" @update:open="handleOpenChange">
+    <DialogPortal>
+      <DialogOverlay class="fixed inset-0 z-50 bg-black/60 backdrop-blur-sm" />
+      <DialogContent
+        class="fixed left-1/2 top-1/2 z-50 w-full max-w-sm -translate-x-1/2 -translate-y-1/2 rounded-xl border border-border bg-card shadow-xl outline-none"
+        @escape-key-down="handleOpenChange(false)"
+      >
+        <DialogDescription class="sr-only">
+          {{ mode === 'view' ? 'Book cover preview' : 'Edit book cover' }}
+        </DialogDescription>
+
+        <!-- Header -->
+        <div class="flex items-center justify-between border-b border-border px-4 py-3">
+          <div class="flex min-w-0 items-center gap-2">
+            <button
+              v-if="mode === 'edit'"
+              class="flex shrink-0 items-center justify-center size-7 rounded-md text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+              @click="switchToView"
+            >
+              <ArrowLeft :size="15" />
+            </button>
+            <DialogTitle class="truncate text-sm font-semibold text-foreground">
+              {{ mode === 'view' ? book?.title : 'Edit cover' }}
+            </DialogTitle>
+          </div>
+          <DialogClose
+            class="flex shrink-0 items-center justify-center size-7 rounded-md text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+          >
+            <X :size="15" />
+          </DialogClose>
+        </div>
+
+        <!-- Body -->
+        <div class="p-4">
+          <!-- View mode -->
+          <template v-if="mode === 'view'">
+            <div class="mb-4 flex justify-center">
+              <div class="overflow-hidden rounded-lg bg-muted shadow-md" :style="{ aspectRatio: coverAspectRatio, width: 'min(100%, 280px)' }">
+                <img v-if="hasCoverResolved && book" :src="coverUrl(book.id, 'cover')" :alt="book.title ?? ''" class="h-full w-full object-contain" />
+                <BookCoverPlaceholder
+                  v-else
+                  :title="book?.title ?? ''"
+                  :author-line="null"
+                  :is-audio="false"
+                  :seed="String(book?.id ?? '')"
+                  class="h-full w-full"
+                />
+              </div>
+            </div>
+            <button
+              v-if="isEditEnabled"
+              class="flex w-full items-center justify-center gap-2 h-9 rounded-lg border border-input bg-background text-sm font-medium transition-colors hover:bg-muted"
+              @click="switchToEdit"
+            >
+              <Pencil :size="14" />
+              Edit Cover
+            </button>
+          </template>
+
+          <!-- Edit mode -->
+          <template v-else>
+            <div v-if="loading" class="flex items-center justify-center py-12">
+              <Loader2 class="size-5 animate-spin text-muted-foreground" />
+            </div>
+            <CoverEditorPanel
+              v-else-if="detail"
+              :book="detail"
+              :locked="isLocked('cover')"
+              @cover-changed="handleCoverChanged"
+              @toggle-lock="handleToggleCoverLock"
+            />
+          </template>
+        </div>
+      </DialogContent>
+    </DialogPortal>
+  </DialogRoot>
+</template>
diff --git a/client/src/features/book/components/table/BookTableActionsCell.vue b/client/src/features/book/components/table/BookTableActionsCell.vue
new file mode 100644
index 000000000..7f64ea445
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableActionsCell.vue
@@ -0,0 +1,102 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { BookOpen, ExternalLink, FolderPlus, MoreHorizontal, Pencil, RefreshCw, Send, Trash2 } from 'lucide-vue-next'
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger } from '@/components/ui/dropdown-menu'
+import { Button } from '@/components/ui/button'
+import { usePermissions } from '@/features/auth/composables/usePermissions'
+import { useRefreshMetadata } from '@/features/book/composables/useRefreshMetadata'
+import { useBookRefreshFeedback } from '@/features/book/composables/useBookRefreshFeedback'
+import { useRefreshingBooks } from '@/features/book/composables/useRefreshingBooks'
+import { detectChangedColumns, mergeBookCardWithDetail } from '@/features/book/lib/book-card-mapper'
+import SendBookDialog from '@/features/email/components/SendBookDialog.vue'
+import type { BookCard } from '@bookorbit/types'
+
+const props = defineProps<{
+  book: BookCard
+}>()
+
+type BookActionType = 'quick-view' | 'add-to-collection' | 'delete'
+const emit = defineEmits<{
+  action: [type: BookActionType]
+  'update:book': [updated: BookCard]
+}>()
+
+const router = useRouter()
+
+const { hasPermission } = usePermissions()
+const { refreshWithFeedback, refreshing } = useRefreshMetadata()
+const refreshFeedback = useBookRefreshFeedback()
+const { isRefreshing } = useRefreshingBooks()
+const showSendDialog = ref(false)
+const anyRefreshing = computed(() => refreshing.value || isRefreshing(props.book.id))
+
+function handleAction(type: BookActionType) {
+  emit('action', type)
+}
+
+async function handleRefresh() {
+  refreshFeedback.markRefreshing(props.book.id)
+  const updated = await refreshWithFeedback(props.book.id)
+  if (updated) {
+    const merged = mergeBookCardWithDetail(props.book, updated)
+    refreshFeedback.markSuccess(props.book.id, detectChangedColumns(props.book, merged))
+    emit('update:book', merged)
+    return
+  }
+  refreshFeedback.markFailed(props.book.id)
+}
+</script>
+
+<template>
+  <div class="flex items-center gap-0.5">
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <Button variant="ghost" size="icon" class="h-7 w-7 rounded text-muted-foreground/60 hover:text-foreground">
+          <MoreHorizontal :size="14" />
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end" class="w-44">
+        <DropdownMenuItem @click="handleAction('quick-view')">
+          <BookOpen :size="13" class="mr-2" />
+          Quick View
+        </DropdownMenuItem>
+        <DropdownMenuItem @click="router.push({ name: 'book-detail', params: { bookId: book.id } })">
+          <ExternalLink :size="13" class="mr-2" />
+          Book Details
+        </DropdownMenuItem>
+        <DropdownMenuSeparator v-if="hasPermission('library_edit_metadata')" />
+        <DropdownMenuItem
+          v-if="hasPermission('library_edit_metadata')"
+          @click="router.push({ name: 'book-detail', params: { bookId: book.id }, query: { tab: 'edit' } })"
+        >
+          <Pencil :size="13" class="mr-2" />
+          Edit Metadata
+        </DropdownMenuItem>
+        <DropdownMenuItem v-if="hasPermission('library_edit_metadata')" :disabled="anyRefreshing" @click="handleRefresh">
+          <RefreshCw :size="13" class="mr-2" :class="{ 'animate-spin': anyRefreshing }" />
+          Refresh Metadata
+        </DropdownMenuItem>
+        <DropdownMenuItem v-if="hasPermission('library_edit_metadata')" @click="handleAction('add-to-collection')">
+          <FolderPlus :size="13" class="mr-2" />
+          Add to Collection
+        </DropdownMenuItem>
+        <DropdownMenuItem v-if="hasPermission('email_send')" @click="showSendDialog = true">
+          <Send :size="13" class="mr-2" />
+          Send to Device
+        </DropdownMenuItem>
+        <DropdownMenuSeparator v-if="hasPermission('library_delete_books')" />
+        <DropdownMenuItem
+          v-if="hasPermission('library_delete_books')"
+          class="text-destructive focus:text-destructive"
+          @click="handleAction('delete')"
+        >
+          <Trash2 :size="13" class="mr-2" />
+          Delete
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+
+  <SendBookDialog v-if="showSendDialog" :book-ids="[book.id]" :open="showSendDialog" @update:open="showSendDialog = $event" />
+</template>
diff --git a/client/src/features/book/components/table/BookTableCellDispatcher.vue b/client/src/features/book/components/table/BookTableCellDispatcher.vue
new file mode 100644
index 000000000..323ea0f83
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableCellDispatcher.vue
@@ -0,0 +1,165 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { Lock, LockOpen } from 'lucide-vue-next'
+import BookTableCoverCell from './BookTableCoverCell.vue'
+import BookTableTextCell from './BookTableTextCell.vue'
+import BookTableNumberCell from './BookTableNumberCell.vue'
+import BookTableRatingCell from './BookTableRatingCell.vue'
+import BookTableChipsCell from './BookTableChipsCell.vue'
+import BookTableReadStatusCell from './BookTableReadStatusCell.vue'
+import BookTableFormatCell from './BookTableFormatCell.vue'
+import BookTableDateCell from './BookTableDateCell.vue'
+import BookTableActionsCell from './BookTableActionsCell.vue'
+import BookTableProgressCell from './BookTableProgressCell.vue'
+import BookTableLockableCell from './BookTableLockableCell.vue'
+import type { BookCard } from '@bookorbit/types'
+import type { CellType, ColumnId } from '@/features/book/composables/tableColumnSchema'
+
+type NavigationDirection = 'next' | 'prev' | 'rowUp' | 'rowDown'
+type BookActionType = 'quick-view' | 'add-to-collection' | 'delete'
+
+const props = defineProps<{
+  book: BookCard
+  colId: ColumnId
+  cellType: CellType
+  hasLockField: boolean
+  isLocked: boolean
+  isActive: boolean
+  isReadOnly: boolean
+  isFullyLocked: boolean
+  lockedFieldCount: number
+  selectionMode: boolean
+  alwaysShowOpenLinkIcon: boolean
+  value: unknown
+  searchFn?: (q: string) => Promise<string[]>
+  openLink?: string | null
+  openLinkLabel?: string | null
+  linkFn?: (chip: string) => string | null
+  chipActionFn?: (chip: string) => void
+  allowDecimal?: boolean
+}>()
+
+const emit = defineEmits<{
+  activate: []
+  save: [value: unknown]
+  cancel: []
+  navigate: [direction: NavigationDirection]
+  coverClick: []
+  toggleLock: []
+  lockAll: []
+  unlockAll: []
+  action: [type: BookActionType]
+  'update:book': [updated: BookCard]
+}>()
+
+function asString(v: unknown): string | null {
+  return v as string | null
+}
+
+function asNumber(v: unknown): number | null {
+  return v as number | null
+}
+
+function asStringArray(v: unknown): string[] {
+  return v as string[]
+}
+
+const lockStateClass = computed(() => {
+  if (props.isFullyLocked) return 'text-primary/90 hover:text-primary'
+  if (props.lockedFieldCount > 0) return 'text-amber-600/90 hover:text-amber-700 dark:text-amber-400 dark:hover:text-amber-300'
+  return 'text-muted-foreground/70 hover:text-foreground'
+})
+</script>
+
+<template>
+  <template v-if="cellType === 'lockRow'">
+    <button
+      class="flex h-6 w-6 items-center justify-center rounded transition-colors hover:bg-muted"
+      :class="lockStateClass"
+      :aria-label="isFullyLocked ? 'Unlock all fields' : 'Lock all fields'"
+      @click.stop="isFullyLocked ? emit('unlockAll') : emit('lockAll')"
+    >
+      <Lock v-if="lockedFieldCount > 0" :size="13" />
+      <LockOpen v-else :size="13" />
+    </button>
+  </template>
+
+  <BookTableCoverCell
+    v-else-if="cellType === 'cover'"
+    :book-id="book.id"
+    :title="book.title"
+    :has-cover="book.hasCover"
+    @cover-click="emit('coverClick')"
+  />
+
+  <BookTableLockableCell v-else-if="cellType === 'text'" :is-locked="isLocked" :has-lock-field="hasLockField" @toggle-lock="emit('toggleLock')">
+    <BookTableTextCell
+      :value="asString(value)"
+      :is-active="isActive"
+      :is-read-only="isReadOnly"
+      :always-show-open-link-icon="alwaysShowOpenLinkIcon"
+      :search-fn="searchFn"
+      :open-link="openLink"
+      :open-link-label="openLinkLabel"
+      @activate="emit('activate')"
+      @save="emit('save', $event)"
+      @cancel="emit('cancel')"
+      @navigate="emit('navigate', $event)"
+    />
+  </BookTableLockableCell>
+
+  <BookTableLockableCell v-else-if="cellType === 'number'" :is-locked="isLocked" :has-lock-field="hasLockField" @toggle-lock="emit('toggleLock')">
+    <BookTableNumberCell
+      :value="asNumber(value)"
+      :is-active="isActive"
+      :is-read-only="isReadOnly"
+      :allow-decimal="allowDecimal ?? false"
+      @activate="emit('activate')"
+      @save="emit('save', $event)"
+      @cancel="emit('cancel')"
+      @navigate="emit('navigate', $event)"
+    />
+  </BookTableLockableCell>
+
+  <BookTableLockableCell v-else-if="cellType === 'rating'" :is-locked="isLocked" :has-lock-field="hasLockField" @toggle-lock="emit('toggleLock')">
+    <BookTableRatingCell :value="asNumber(value)" :is-read-only="isReadOnly" @save="emit('save', $event)" />
+  </BookTableLockableCell>
+
+  <BookTableLockableCell v-else-if="cellType === 'chips'" :is-locked="isLocked" :has-lock-field="hasLockField" @toggle-lock="emit('toggleLock')">
+    <BookTableChipsCell
+      :value="asStringArray(value)"
+      :is-active="isActive"
+      :is-read-only="isReadOnly"
+      :search-fn="searchFn"
+      :link-fn="linkFn"
+      :chip-action-fn="chipActionFn"
+      @activate="emit('activate')"
+      @save="emit('save', $event)"
+      @cancel="emit('cancel')"
+      @navigate="emit('navigate', $event)"
+    />
+  </BookTableLockableCell>
+
+  <BookTableProgressCell v-else-if="cellType === 'progress'" :value="asNumber(value)" />
+
+  <BookTableReadStatusCell
+    v-else-if="cellType === 'readStatus'"
+    :value="book.readStatus"
+    :is-active="isActive"
+    :is-read-only="isReadOnly"
+    @activate="emit('activate')"
+    @save="emit('save', $event)"
+    @cancel="emit('cancel')"
+    @navigate="emit('navigate', $event)"
+  />
+
+  <BookTableFormatCell v-else-if="cellType === 'format'" :files="book.files" />
+  <BookTableDateCell v-else-if="cellType === 'date'" :value="asString(value)" />
+
+  <BookTableActionsCell
+    v-else-if="cellType === 'actions' && !selectionMode"
+    :book="book"
+    @action="emit('action', $event)"
+    @update:book="emit('update:book', $event)"
+  />
+</template>
diff --git a/client/src/features/book/components/table/BookTableChipsCell.vue b/client/src/features/book/components/table/BookTableChipsCell.vue
new file mode 100644
index 000000000..d15ff379e
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableChipsCell.vue
@@ -0,0 +1,120 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { RouterLink } from 'vue-router'
+import ChipInput from '@/components/ui/ChipInput.vue'
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+
+const props = defineProps<{
+  value: string[]
+  isActive: boolean
+  isReadOnly?: boolean
+  searchFn?: (q: string) => Promise<string[]>
+  linkFn?: (chip: string) => string | null
+  chipActionFn?: (chip: string) => void
+}>()
+
+const emit = defineEmits<{
+  activate: []
+  save: [value: string[]]
+  cancel: []
+  navigate: [direction: 'next' | 'prev']
+}>()
+
+const defaultSearchFn = () => Promise.resolve([])
+
+const isOpen = ref(false)
+const draft = ref<string[]>([...props.value])
+
+watch(
+  () => props.isActive,
+  (active) => {
+    if (active && !isOpen.value) {
+      draft.value = [...props.value]
+      isOpen.value = true
+    } else if (!active && isOpen.value) {
+      isOpen.value = false
+    }
+  },
+)
+
+function handleOpenChange(open: boolean) {
+  isOpen.value = open
+  if (open) {
+    draft.value = [...props.value]
+    if (!props.isActive) emit('activate')
+  } else if (props.isActive) {
+    const changed = draft.value.length !== props.value.length || draft.value.some((value, index) => value !== props.value[index])
+    if (changed) {
+      emit('save', draft.value)
+    } else {
+      emit('cancel')
+    }
+  }
+}
+
+function handleKeydown(e: KeyboardEvent) {
+  if (e.key === 'Tab') {
+    e.preventDefault()
+    const snap = [...draft.value]
+    isOpen.value = false
+    emit('save', snap)
+    emit('navigate', e.shiftKey ? 'prev' : 'next')
+  }
+}
+
+function handleChipAction(chip: string) {
+  props.chipActionFn?.(chip)
+}
+</script>
+
+<template>
+  <div class="w-full min-w-0">
+    <Popover :open="isOpen" @update:open="handleOpenChange">
+      <PopoverTrigger as-child :disabled="isReadOnly">
+        <div
+          data-cell-activator="true"
+          class="flex min-h-[28px] flex-wrap items-center gap-1 px-1 py-0.5"
+          :class="isReadOnly ? '' : 'cursor-pointer rounded hover:bg-primary/5'"
+          :role="isReadOnly ? undefined : 'button'"
+          :tabindex="isReadOnly ? -1 : 0"
+        >
+          <template v-if="value.length > 0">
+            <template v-for="(chip, idx) in value.slice(0, 2)" :key="idx">
+              <RouterLink
+                v-if="linkFn?.(chip)"
+                :to="linkFn(chip)!"
+                class="rounded-full bg-muted px-1.5 py-0.5 text-xs text-primary hover:underline"
+                @click.stop
+              >
+                {{ chip }}
+              </RouterLink>
+              <button
+                v-else-if="chipActionFn"
+                type="button"
+                class="rounded-full bg-muted px-1.5 py-0.5 text-xs text-primary hover:underline"
+                @click.stop="handleChipAction(chip)"
+              >
+                {{ chip }}
+              </button>
+              <span v-else class="rounded-full bg-muted px-1.5 py-0.5 text-xs text-muted-foreground">
+                {{ chip }}
+              </span>
+            </template>
+            <span v-if="value.length > 2" class="text-xs text-muted-foreground"> +{{ value.length - 2 }} </span>
+          </template>
+          <span v-else class="text-xs text-muted-foreground/40">-</span>
+        </div>
+      </PopoverTrigger>
+      <PopoverContent
+        align="start"
+        :side-offset="2"
+        :trap-focus="false"
+        class="w-auto p-2"
+        :style="{ minWidth: 'max(240px, var(--reka-popover-trigger-width))', maxWidth: 'min(400px, 90vw)' }"
+        @keydown="handleKeydown"
+      >
+        <ChipInput v-model="draft" :search-fn="searchFn ?? defaultSearchFn" placeholder="Add..." />
+      </PopoverContent>
+    </Popover>
+  </div>
+</template>
diff --git a/client/src/features/book/components/table/BookTableCollapsedSeriesRow.vue b/client/src/features/book/components/table/BookTableCollapsedSeriesRow.vue
new file mode 100644
index 000000000..98cab3103
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableCollapsedSeriesRow.vue
@@ -0,0 +1,55 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useRouter } from 'vue-router'
+import { ChevronRight } from 'lucide-vue-next'
+import type { BookCard } from '@bookorbit/types'
+
+const props = defineProps<{
+  book: BookCard
+  colspan: number
+  selectionMode?: boolean
+}>()
+
+const router = useRouter()
+
+const collapsed = computed(() => props.book.collapsedSeries!)
+const seriesName = computed(() => props.book.seriesName ?? '')
+const readCount = computed(() => collapsed.value.readCount)
+const bookCount = computed(() => collapsed.value.bookCount)
+const coverIds = computed(() => collapsed.value.coverBookIds.filter((id) => id > 0).slice(0, 4))
+
+function handleClick() {
+  if (props.selectionMode) return
+  router.push({ name: 'series-detail', params: { seriesName: seriesName.value } })
+}
+
+function thumbnailUrl(bookId: number): string {
+  return `/api/v1/books/${bookId}/thumbnail`
+}
+</script>
+
+<template>
+  <td :colspan="colspan" role="gridcell" class="cursor-pointer px-3 py-1.5" @click="handleClick">
+    <div class="flex items-center gap-3 min-w-0">
+      <!-- Cover row: up to 4 thumbnails -->
+      <div class="flex shrink-0 gap-0.5">
+        <img v-for="coverId in coverIds" :key="coverId" :src="thumbnailUrl(coverId)" class="h-8 w-6 rounded-sm object-cover" loading="lazy" alt="" />
+        <div v-if="coverIds.length === 0" class="h-8 w-6 rounded-sm bg-muted flex items-center justify-center">
+          <span class="text-[8px] text-muted-foreground">?</span>
+        </div>
+      </div>
+
+      <!-- Series info -->
+      <div class="min-w-0 flex-1">
+        <span class="font-medium text-sm truncate block">{{ seriesName }}</span>
+        <div class="flex items-center gap-2 mt-0.5">
+          <span class="text-xs text-muted-foreground"> {{ bookCount }} {{ bookCount === 1 ? 'book' : 'books' }} </span>
+          <span v-if="readCount > 0" class="text-xs text-muted-foreground"> &middot; {{ readCount }} of {{ bookCount }} read </span>
+        </div>
+      </div>
+
+      <!-- Chevron -->
+      <ChevronRight :size="14" class="shrink-0 text-muted-foreground group-hover:text-foreground transition-colors" />
+    </div>
+  </td>
+</template>
diff --git a/client/src/features/book/components/table/BookTableContextMenu.vue b/client/src/features/book/components/table/BookTableContextMenu.vue
new file mode 100644
index 000000000..304ad247d
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableContextMenu.vue
@@ -0,0 +1,200 @@
+<script setup lang="ts">
+import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import { useRouter } from 'vue-router'
+import { BookOpen, ExternalLink, FolderPlus, Pencil, RefreshCw, Send, Trash2 } from 'lucide-vue-next'
+import { usePermissions } from '@/features/auth/composables/usePermissions'
+import { useRefreshMetadata } from '@/features/book/composables/useRefreshMetadata'
+import { useBookRefreshFeedback } from '@/features/book/composables/useBookRefreshFeedback'
+import { useRefreshingBooks } from '@/features/book/composables/useRefreshingBooks'
+import { detectChangedColumns, mergeBookCardWithDetail } from '@/features/book/lib/book-card-mapper'
+import SendBookDialog from '@/features/email/components/SendBookDialog.vue'
+import type { BookCard } from '@bookorbit/types'
+
+type BookActionType = 'quick-view' | 'add-to-collection' | 'delete'
+
+const props = defineProps<{
+  book: BookCard | null
+  position: { x: number; y: number } | null
+}>()
+
+const emit = defineEmits<{
+  action: [book: BookCard, type: BookActionType]
+  'update:book': [updated: BookCard]
+  close: []
+}>()
+
+const router = useRouter()
+const { hasPermission } = usePermissions()
+const { refreshWithFeedback, refreshing } = useRefreshMetadata()
+const refreshFeedback = useBookRefreshFeedback()
+const { isRefreshing } = useRefreshingBooks()
+
+const menuRef = ref<HTMLElement | null>(null)
+const menuSize = ref({ width: 180, height: 240 })
+const showSendDialog = ref(false)
+const anyRefreshing = computed(() => {
+  if (!props.book) return refreshing.value
+  return refreshing.value || isRefreshing(props.book.id)
+})
+
+const adjustedX = computed(() => {
+  if (!props.position) return 0
+  return Math.max(8, Math.min(props.position.x, window.innerWidth - menuSize.value.width - 8))
+})
+
+const adjustedY = computed(() => {
+  if (!props.position) return 0
+  return Math.max(8, Math.min(props.position.y, window.innerHeight - menuSize.value.height - 8))
+})
+
+function closeMenu(): void {
+  emit('close')
+}
+
+async function measureMenu(): Promise<void> {
+  await nextTick()
+  if (!menuRef.value) return
+  menuSize.value = {
+    width: menuRef.value.offsetWidth,
+    height: menuRef.value.offsetHeight,
+  }
+}
+
+function handleDocumentClick(event: MouseEvent): void {
+  if (!props.position) return
+  const target = event.target as Node | null
+  if (menuRef.value?.contains(target)) return
+  closeMenu()
+}
+
+function handleKeydown(event: KeyboardEvent): void {
+  if (event.key === 'Escape' && props.position) {
+    event.preventDefault()
+    closeMenu()
+  }
+}
+
+function handleScroll(): void {
+  if (props.position) closeMenu()
+}
+
+function emitAction(type: BookActionType): void {
+  if (!props.book) return
+  emit('action', props.book, type)
+  closeMenu()
+}
+
+function openBookDetails(): void {
+  if (!props.book) return
+  router.push({ name: 'book-detail', params: { bookId: props.book.id } })
+  closeMenu()
+}
+
+function openEditMetadata(): void {
+  if (!props.book) return
+  router.push({ name: 'book-detail', params: { bookId: props.book.id }, query: { tab: 'edit' } })
+  closeMenu()
+}
+
+async function refreshMetadata(): Promise<void> {
+  const currentBook = props.book
+  if (!currentBook) return
+  refreshFeedback.markRefreshing(currentBook.id)
+  const updated = await refreshWithFeedback(currentBook.id)
+  if (updated) {
+    const merged = mergeBookCardWithDetail(currentBook, updated)
+    refreshFeedback.markSuccess(currentBook.id, detectChangedColumns(currentBook, merged))
+    emit('update:book', merged)
+  } else {
+    refreshFeedback.markFailed(currentBook.id)
+  }
+  closeMenu()
+}
+
+function openSendDialog(): void {
+  showSendDialog.value = true
+  closeMenu()
+}
+
+watch(
+  () => props.position,
+  (position) => {
+    if (position) {
+      void measureMenu()
+    }
+  },
+)
+
+onMounted(() => {
+  document.addEventListener('click', handleDocumentClick)
+  document.addEventListener('keydown', handleKeydown)
+  window.addEventListener('scroll', handleScroll, true)
+  window.addEventListener('resize', handleScroll)
+})
+
+onBeforeUnmount(() => {
+  document.removeEventListener('click', handleDocumentClick)
+  document.removeEventListener('keydown', handleKeydown)
+  window.removeEventListener('scroll', handleScroll, true)
+  window.removeEventListener('resize', handleScroll)
+})
+</script>
+
+<template>
+  <Teleport to="body">
+    <div
+      v-if="book && position"
+      ref="menuRef"
+      class="fixed z-[100] min-w-[180px] rounded-md border border-border bg-popover p-1 shadow-md"
+      :style="{ top: `${adjustedY}px`, left: `${adjustedX}px` }"
+    >
+      <button class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent" @click="emitAction('quick-view')">
+        <BookOpen :size="14" />
+        Quick View
+      </button>
+      <button class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent" @click="openBookDetails">
+        <ExternalLink :size="14" />
+        Book Details
+      </button>
+      <button
+        v-if="hasPermission('library_edit_metadata')"
+        class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+        @click="openEditMetadata"
+      >
+        <Pencil :size="14" />
+        Edit Metadata
+      </button>
+      <button
+        v-if="hasPermission('library_edit_metadata')"
+        class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+        :disabled="anyRefreshing"
+        @click="refreshMetadata"
+      >
+        <RefreshCw :size="14" :class="{ 'animate-spin': anyRefreshing }" />
+        Refresh Metadata
+      </button>
+      <button class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent" @click="emitAction('add-to-collection')">
+        <FolderPlus :size="14" />
+        Add to Collection
+      </button>
+      <button
+        v-if="hasPermission('email_send')"
+        class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+        @click="openSendDialog"
+      >
+        <Send :size="14" />
+        Send to Device
+      </button>
+      <button
+        v-if="hasPermission('library_delete_books')"
+        class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm text-destructive hover:bg-accent"
+        @click="emitAction('delete')"
+      >
+        <Trash2 :size="14" />
+        Delete
+      </button>
+    </div>
+  </Teleport>
+
+  <SendBookDialog v-if="book && showSendDialog" :book-ids="[book.id]" :open="showSendDialog" @update:open="showSendDialog = $event" />
+</template>
diff --git a/client/src/features/book/components/table/BookTableCoverCell.vue b/client/src/features/book/components/table/BookTableCoverCell.vue
new file mode 100644
index 000000000..cc693957b
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableCoverCell.vue
@@ -0,0 +1,92 @@
+<script setup lang="ts">
+import { computed, ref, onUnmounted } from 'vue'
+import { Loader2 } from 'lucide-vue-next'
+import BookCoverImage from '../BookCoverImage.vue'
+import BookCoverPlaceholder from '../BookCoverPlaceholder.vue'
+import { useRefreshingBooks } from '@/features/book/composables/useRefreshingBooks'
+
+const props = defineProps<{
+  bookId: number
+  title: string | null
+  hasCover: boolean
+}>()
+
+const emit = defineEmits<{ 'cover-click': [] }>()
+const { isRefreshing } = useRefreshingBooks()
+
+const seed = computed(() => props.title ?? String(props.bookId))
+const isRefreshingBook = computed(() => isRefreshing(props.bookId))
+const showPreview = ref(false)
+const previewPos = ref({ x: 0, y: 0 })
+let hoverTimer: ReturnType<typeof setTimeout> | null = null
+
+function handleMouseEnter(event: MouseEvent) {
+  if (!props.hasCover) return
+  const rect = (event.currentTarget as HTMLElement).getBoundingClientRect()
+  previewPos.value = { x: rect.right + 8, y: rect.top }
+  hoverTimer = setTimeout(() => {
+    showPreview.value = true
+  }, 300)
+}
+
+function handleMouseLeave() {
+  if (hoverTimer) {
+    clearTimeout(hoverTimer)
+    hoverTimer = null
+  }
+  showPreview.value = false
+}
+
+onUnmounted(() => {
+  if (hoverTimer) clearTimeout(hoverTimer)
+})
+
+function handleKeydown(event: KeyboardEvent) {
+  if (event.key === 'Enter' || event.key === ' ') {
+    event.preventDefault()
+    emit('cover-click')
+  }
+}
+
+const adjustedLeft = computed(() => {
+  const previewWidth = 180
+  if (previewPos.value.x + previewWidth > window.innerWidth - 8) {
+    return previewPos.value.x - previewWidth - 56
+  }
+  return previewPos.value.x
+})
+
+const adjustedTop = computed(() => {
+  const previewHeight = 260
+  return Math.max(8, Math.min(previewPos.value.y, window.innerHeight - previewHeight - 8))
+})
+</script>
+
+<template>
+  <div class="relative" @mouseenter="handleMouseEnter" @mouseleave="handleMouseLeave">
+    <div
+      tabindex="0"
+      role="button"
+      aria-label="View cover"
+      class="relative flex h-9 w-9 shrink-0 cursor-pointer overflow-hidden rounded-sm transition-opacity hover:opacity-80"
+      @click="emit('cover-click')"
+      @keydown="handleKeydown"
+    >
+      <BookCoverImage v-if="hasCover" :book-id="bookId" type="thumbnail" class="h-full w-full object-cover" />
+      <BookCoverPlaceholder v-else :title="title" :author-line="null" :is-audio="false" :seed="seed" class="h-full w-full" />
+      <div v-if="isRefreshingBook" class="absolute inset-0 flex items-center justify-center bg-black/50">
+        <Loader2 :size="12" class="animate-spin text-white" />
+      </div>
+    </div>
+
+    <Teleport to="body">
+      <div
+        v-if="showPreview"
+        class="pointer-events-none fixed z-[200] rounded-lg border border-border bg-popover p-1.5 shadow-xl transition-opacity duration-150"
+        :style="{ top: `${adjustedTop}px`, left: `${adjustedLeft}px` }"
+      >
+        <BookCoverImage :book-id="bookId" type="cover" class="h-[240px] w-auto rounded-md object-contain" />
+      </div>
+    </Teleport>
+  </div>
+</template>
diff --git a/client/src/features/book/components/table/BookTableDateCell.vue b/client/src/features/book/components/table/BookTableDateCell.vue
new file mode 100644
index 000000000..ef4bb78cc
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableDateCell.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+const props = defineProps<{
+  value: string | null
+  variant?: 'default' | 'relative'
+}>()
+
+function parseDate(isoDate: string | null): Date | null {
+  if (!isoDate?.trim()) return null
+  const date = new Date(isoDate)
+  return Number.isNaN(date.getTime()) ? null : date
+}
+
+function formatDate(isoDate: string | null): string {
+  const date = parseDate(isoDate)
+  if (!date) return '-'
+  return date.toLocaleDateString(undefined, {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  })
+}
+
+function formatRelativeTime(date: Date): string {
+  const diffMs = date.getTime() - Date.now()
+  const absMs = Math.abs(diffMs)
+  if (absMs < 5_000) return 'just now'
+
+  const formatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
+  const units = [
+    ['year', 1000 * 60 * 60 * 24 * 365],
+    ['month', 1000 * 60 * 60 * 24 * 30],
+    ['day', 1000 * 60 * 60 * 24],
+    ['hour', 1000 * 60 * 60],
+    ['minute', 1000 * 60],
+    ['second', 1000],
+  ] as const
+
+  for (const [unit, ms] of units) {
+    if (absMs >= ms || unit === 'second') {
+      return formatter.format(Math.round(diffMs / ms), unit)
+    }
+  }
+
+  return 'just now'
+}
+
+function getDisplayText(isoDate: string | null, variant: 'default' | 'relative' | undefined): string {
+  const date = parseDate(isoDate)
+  if (!date) return '-'
+  return variant === 'relative' ? formatRelativeTime(date) : formatDate(isoDate)
+}
+
+function getTooltip(isoDate: string | null): string {
+  const date = parseDate(isoDate)
+  if (!date || !isoDate?.trim()) return ''
+  return `${isoDate} (${formatRelativeTime(date)})`
+}
+</script>
+
+<template>
+  <span class="text-xs text-muted-foreground" :title="getTooltip(props.value)">{{ getDisplayText(props.value, props.variant) }}</span>
+</template>
diff --git a/client/src/features/book/components/table/BookTableFormatCell.vue b/client/src/features/book/components/table/BookTableFormatCell.vue
new file mode 100644
index 000000000..86c84a8dc
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableFormatCell.vue
@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { getFormatColor } from '@/features/book/lib/format-colors'
+import type { BookFileRef } from '@bookorbit/types'
+
+const props = defineProps<{
+  files: BookFileRef[]
+}>()
+
+const formattedFiles = computed(() => {
+  const primary = props.files.find((file) => file.role === 'primary')
+  const ordered = primary ? [primary, ...props.files.filter((file) => file.id !== primary.id)] : props.files
+  return ordered.filter((file) => file.format?.trim())
+})
+
+const formats = computed(() => {
+  const seen = new Set<string>()
+  return formattedFiles.value.reduce<string[]>((result, file) => {
+    const normalized = file.format!.trim().toLowerCase()
+    if (seen.has(normalized)) return result
+    seen.add(normalized)
+    result.push(normalized)
+    return result
+  }, [])
+})
+
+const visibleFormats = computed(() => formats.value.slice(0, 2))
+</script>
+
+<template>
+  <Tooltip v-if="formats.length > 0">
+    <TooltipTrigger as-child>
+      <div class="flex items-center gap-0.5">
+        <span
+          v-for="fmt in visibleFormats"
+          :key="fmt"
+          class="inline-block rounded px-1.5 py-0.5 text-[10px] font-bold uppercase tracking-wide text-white"
+          :style="{ backgroundColor: getFormatColor(fmt.toLowerCase()) }"
+        >
+          {{ fmt }}
+        </span>
+        <span v-if="formats.length > 2" class="ml-0.5 text-xs text-muted-foreground">+{{ formats.length - 2 }}</span>
+      </div>
+    </TooltipTrigger>
+    <TooltipContent>
+      <div v-for="file in formattedFiles" :key="file.id" class="text-xs">{{ file.format ?? 'unknown' }} ({{ file.role }})</div>
+    </TooltipContent>
+  </Tooltip>
+  <span v-else class="text-xs text-muted-foreground/40">-</span>
+</template>
diff --git a/client/src/features/book/components/table/BookTableHeader.vue b/client/src/features/book/components/table/BookTableHeader.vue
new file mode 100644
index 000000000..67b0a0c37
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableHeader.vue
@@ -0,0 +1,159 @@
+<script setup lang="ts">
+import { ArrowDown, ArrowUp, ArrowUpDown, GripVertical, Loader2 } from 'lucide-vue-next'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import type { ColumnDef, ColumnId } from '@/features/book/composables/tableColumnSchema'
+import type { SortSpec } from '@bookorbit/types'
+
+const props = defineProps<{
+  displayColumns: ColumnDef[]
+  sort: SortSpec[]
+  isScrolled: boolean
+  loading: boolean
+  selectionMode: boolean
+  allBooksSelected: boolean
+  someBooksSelected: boolean
+  isReadOnly: boolean
+  pinnedLeftOffsets: Map<string, number>
+  dragSourceColId: ColumnId | null
+  dropTargetColId: ColumnId | null
+  dropSide: 'before' | 'after' | null
+  sortable: boolean
+}>()
+
+const emit = defineEmits<{
+  selectAll: [event: Event]
+  columnSort: [sortField: string | null, event: MouseEvent]
+  headerContextMenu: [event: MouseEvent, col: ColumnDef]
+  colDragStart: [event: DragEvent, colId: ColumnId]
+  colDragOver: [event: DragEvent, col: ColumnDef]
+  colDragLeave: [colId: ColumnId]
+  colDrop: [event: DragEvent, colId: ColumnId]
+  colDragEnd: []
+  resizeStart: [event: MouseEvent, colId: ColumnId, currentWidth: number]
+  autoFitColumn: [colId: ColumnId]
+}>()
+
+function getSortDir(sortField: string): 'asc' | 'desc' | null {
+  return props.sort.find((s) => s.field === sortField)?.dir ?? null
+}
+
+function getSortPriority(sortField: string | null): number {
+  if (!sortField) return 0
+  return props.sort.findIndex((s) => s.field === sortField) + 1
+}
+
+function isSortableColumn(col: ColumnDef): boolean {
+  return !!col.sortField && props.sortable
+}
+</script>
+
+<template>
+  <thead class="sticky top-0 z-10 bg-muted transition-shadow" :class="{ 'shadow-[0_2px_8px_-2px_rgba(0,0,0,0.12)]': isScrolled }" role="rowgroup">
+    <tr role="row">
+      <th
+        v-if="selectionMode"
+        role="columnheader"
+        class="relative select-none border-b border-border px-2 py-2 text-center"
+        :style="{ width: '36px', minWidth: '36px', position: 'sticky', left: '0px', zIndex: 20, background: 'var(--muted)' }"
+      >
+        <input
+          type="checkbox"
+          class="accent-primary h-3.5 w-3.5 cursor-pointer"
+          :checked="allBooksSelected"
+          :indeterminate="someBooksSelected"
+          aria-label="Select all books"
+          @change="emit('selectAll', $event)"
+        />
+      </th>
+
+      <th
+        v-for="col in displayColumns"
+        :key="col.id"
+        :data-col-id="col.id"
+        role="columnheader"
+        class="group/th relative select-none border-b border-border px-2 py-2 text-left"
+        :aria-sort="
+          col.sortField && getSortDir(col.sortField) === 'asc'
+            ? 'ascending'
+            : col.sortField && getSortDir(col.sortField) === 'desc'
+              ? 'descending'
+              : 'none'
+        "
+        :class="[
+          col.pinned === 'right' ? 'border-l border-border/60' : '',
+          dropTargetColId === col.id && dropSide === 'before' ? 'border-l-2 border-primary' : '',
+          dropTargetColId === col.id && dropSide === 'after' ? 'border-r-2 border-primary' : '',
+          dragSourceColId === col.id ? 'opacity-40' : '',
+          col.sortField && getSortDir(col.sortField) !== null && isSortableColumn(col) ? 'bg-primary/5' : '',
+        ]"
+        :style="{
+          width: `${col.defaultWidth}px`,
+          minWidth: `${col.minWidth}px`,
+          ...(col.pinned === 'left' || col.id === 'lockRow'
+            ? {
+                position: 'sticky',
+                left: `${(selectionMode ? 36 : 0) + (pinnedLeftOffsets.get(col.id) ?? 0)}px`,
+                zIndex: 20,
+                background: 'var(--muted)',
+              }
+            : {}),
+          ...(col.pinned === 'right' ? { position: 'sticky', right: '0', zIndex: 20 } : {}),
+        }"
+        :draggable="!isReadOnly && col.pinned === null"
+        @dragstart="emit('colDragStart', $event, col.id)"
+        @dragover="emit('colDragOver', $event, col)"
+        @dragleave="emit('colDragLeave', col.id)"
+        @drop="emit('colDrop', $event, col.id)"
+        @dragend="emit('colDragEnd')"
+        @contextmenu="emit('headerContextMenu', $event, col)"
+      >
+        <Tooltip v-if="isSortableColumn(col)">
+          <TooltipTrigger as-child>
+            <div
+              data-col-label
+              class="flex min-w-0 items-center gap-1 overflow-hidden pr-2 hover:text-foreground"
+              :class="isSortableColumn(col) ? 'cursor-pointer' : ''"
+              @click="(event) => emit('columnSort', col.sortField, event)"
+            >
+              <GripVertical
+                v-if="col.pinned === null && !isReadOnly"
+                :size="11"
+                class="shrink-0 cursor-grab text-muted-foreground opacity-0 transition-opacity group-hover/th:opacity-40 hover:!opacity-100"
+              />
+              <span class="min-w-0 truncate text-xs font-semibold uppercase tracking-wide text-muted-foreground">{{ col.header }}</span>
+              <Loader2 v-if="loading && getSortDir(col.sortField!) !== null" :size="11" class="shrink-0 animate-spin text-primary" />
+              <ArrowUp v-else-if="getSortDir(col.sortField!) === 'asc'" :size="11" class="shrink-0 text-primary" />
+              <ArrowDown v-else-if="getSortDir(col.sortField!) === 'desc'" :size="11" class="shrink-0 text-primary" />
+              <ArrowUpDown v-else :size="11" class="shrink-0 text-muted-foreground/60" />
+              <span
+                v-if="sort.length > 1 && getSortPriority(col.sortField!) > 0"
+                class="flex h-3.5 w-3.5 shrink-0 items-center justify-center rounded-full bg-primary/20 text-[9px] font-bold text-primary"
+              >
+                {{ getSortPriority(col.sortField!) }}
+              </span>
+            </div>
+          </TooltipTrigger>
+          <TooltipContent>
+            {{ getSortDir(col.sortField!) ? 'Shift+click to add secondary sort' : 'Click to sort' }}
+          </TooltipContent>
+        </Tooltip>
+        <div v-else data-col-label class="flex min-w-0 items-center gap-1 overflow-hidden pr-2">
+          <GripVertical
+            v-if="col.pinned === null && !isReadOnly"
+            :size="11"
+            class="shrink-0 cursor-grab text-muted-foreground opacity-0 transition-opacity group-hover/th:opacity-40 hover:!opacity-100"
+          />
+          <span class="min-w-0 truncate text-xs font-semibold uppercase tracking-wide text-muted-foreground">{{ col.header }}</span>
+        </div>
+        <div
+          v-if="!isReadOnly && col.id !== 'lockRow' && col.id !== 'actions'"
+          class="group/rz absolute right-0 top-0 flex h-full w-4 cursor-col-resize items-center justify-end pr-0.5"
+          @mousedown="emit('resizeStart', $event, col.id, col.defaultWidth)"
+          @dblclick.stop="emit('autoFitColumn', col.id)"
+        >
+          <div class="h-4 w-[2px] rounded-full bg-border/60 transition-colors group-hover/rz:bg-primary/70" />
+        </div>
+      </th>
+    </tr>
+  </thead>
+</template>
diff --git a/client/src/features/book/components/table/BookTableHeaderContextMenu.vue b/client/src/features/book/components/table/BookTableHeaderContextMenu.vue
new file mode 100644
index 000000000..dc802a96c
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableHeaderContextMenu.vue
@@ -0,0 +1,190 @@
+<script setup lang="ts">
+import { computed, ref, watch, nextTick, onUnmounted } from 'vue'
+import { ArrowDown, ArrowUp, Columns3, EyeOff, Filter, Pin, PinOff, X } from 'lucide-vue-next'
+import type { ColumnDef } from '@/features/book/composables/useTableColumns'
+
+const props = defineProps<{
+  column: ColumnDef
+  position: { x: number; y: number } | null
+  sortDir: 'asc' | 'desc' | null
+  quickFilters?: { key: string; label: string }[]
+}>()
+
+const emit = defineEmits<{
+  'sort-asc': []
+  'sort-desc': []
+  'clear-sort': []
+  'hide-column': []
+  'auto-fit': []
+  'auto-fit-all': []
+  'pin-left': []
+  'pin-right': []
+  unpin: []
+  'quick-filter': [key: string]
+  close: []
+}>()
+
+const menuRef = ref<HTMLElement | null>(null)
+
+const adjustedX = computed(() => {
+  if (!props.position) return 0
+  return Math.max(8, Math.min(props.position.x, window.innerWidth - 200 - 8))
+})
+
+const adjustedY = computed(() => {
+  if (!props.position) return 0
+  return Math.max(8, Math.min(props.position.y, window.innerHeight - 260 - 8))
+})
+
+function handleAction(action: () => void): void {
+  action()
+  emit('close')
+}
+
+function handleEscape(e: KeyboardEvent) {
+  if (e.key === 'Escape' && props.position) {
+    e.preventDefault()
+    emit('close')
+  }
+}
+
+watch(
+  () => props.position,
+  (pos) => {
+    if (pos) {
+      document.addEventListener('keydown', handleEscape)
+      nextTick(() => {
+        const first = menuRef.value?.querySelector('button') as HTMLElement | null
+        first?.focus()
+      })
+    } else {
+      document.removeEventListener('keydown', handleEscape)
+    }
+  },
+)
+
+function handleMenuKeydown(e: KeyboardEvent) {
+  if (e.key === 'ArrowDown') {
+    e.preventDefault()
+    const buttons = Array.from(menuRef.value?.querySelectorAll('button') ?? []) as HTMLElement[]
+    const idx = buttons.indexOf(document.activeElement as HTMLElement)
+    const next = buttons[idx + 1] ?? buttons[0]
+    next?.focus()
+  } else if (e.key === 'ArrowUp') {
+    e.preventDefault()
+    const buttons = Array.from(menuRef.value?.querySelectorAll('button') ?? []) as HTMLElement[]
+    const idx = buttons.indexOf(document.activeElement as HTMLElement)
+    const prev = buttons[idx - 1] ?? buttons[buttons.length - 1]
+    prev?.focus()
+  }
+}
+
+onUnmounted(() => {
+  document.removeEventListener('keydown', handleEscape)
+})
+</script>
+
+<template>
+  <Teleport to="body">
+    <div v-if="position" class="fixed inset-0 z-[99]" @click="emit('close')" @contextmenu.prevent="emit('close')" />
+    <div
+      v-if="position"
+      ref="menuRef"
+      class="fixed z-[100] min-w-[180px] rounded-md border border-border bg-popover p-1 shadow-md"
+      :style="{ top: `${adjustedY}px`, left: `${adjustedX}px` }"
+      @keydown="handleMenuKeydown"
+    >
+      <template v-if="column.sortField">
+        <button
+          class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+          :class="{ 'text-primary font-medium': sortDir === 'asc' }"
+          @click="handleAction(() => emit('sort-asc'))"
+        >
+          <ArrowUp :size="14" />
+          Sort Ascending
+        </button>
+        <button
+          class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+          :class="{ 'text-primary font-medium': sortDir === 'desc' }"
+          @click="handleAction(() => emit('sort-desc'))"
+        >
+          <ArrowDown :size="14" />
+          Sort Descending
+        </button>
+        <button
+          v-if="sortDir"
+          class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+          @click="handleAction(() => emit('clear-sort'))"
+        >
+          <X :size="14" />
+          Clear Sort
+        </button>
+        <div class="my-1 h-px bg-border" />
+      </template>
+
+      <template v-if="quickFilters && quickFilters.length > 0">
+        <button
+          v-for="option in quickFilters"
+          :key="option.key"
+          class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+          @click="handleAction(() => emit('quick-filter', option.key))"
+        >
+          <Filter :size="14" />
+          {{ option.label }}
+        </button>
+        <div class="my-1 h-px bg-border" />
+      </template>
+
+      <button
+        v-if="column.pinned === null"
+        class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+        @click="handleAction(() => emit('hide-column'))"
+      >
+        <EyeOff :size="14" />
+        Hide Column
+      </button>
+
+      <template v-if="column.pinned === null">
+        <button
+          class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+          @click="handleAction(() => emit('pin-left'))"
+        >
+          <Pin :size="14" />
+          Pin Left
+        </button>
+        <button
+          class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+          @click="handleAction(() => emit('pin-right'))"
+        >
+          <Pin :size="14" class="rotate-90" />
+          Pin Right
+        </button>
+      </template>
+      <button
+        v-else
+        class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+        @click="handleAction(() => emit('unpin'))"
+      >
+        <PinOff :size="14" />
+        Unpin Column
+      </button>
+
+      <div class="my-1 h-px bg-border" />
+
+      <button
+        class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+        @click="handleAction(() => emit('auto-fit'))"
+      >
+        <Columns3 :size="14" />
+        Auto-Fit Width
+      </button>
+      <button
+        class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+        @click="handleAction(() => emit('auto-fit-all'))"
+      >
+        <Columns3 :size="14" />
+        Auto-Fit All Columns
+      </button>
+    </div>
+  </Teleport>
+</template>
diff --git a/client/src/features/book/components/table/BookTableLockableCell.vue b/client/src/features/book/components/table/BookTableLockableCell.vue
new file mode 100644
index 000000000..11e081a3d
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableLockableCell.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import { Lock, LockOpen } from 'lucide-vue-next'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+
+defineProps<{
+  isLocked: boolean
+  hasLockField: boolean
+}>()
+
+defineEmits<{
+  'toggle-lock': []
+}>()
+</script>
+
+<template>
+  <div v-if="hasLockField" class="group/cell flex min-w-0 w-full items-center gap-1">
+    <div class="min-w-0 flex-1">
+      <slot />
+    </div>
+    <Tooltip>
+      <TooltipTrigger as-child>
+        <button
+          type="button"
+          :aria-pressed="isLocked"
+          :aria-label="isLocked ? 'Unlock field' : 'Lock field'"
+          class="flex h-4 w-4 shrink-0 items-center justify-center rounded-sm transition-colors"
+          :class="
+            isLocked
+              ? 'text-primary/90 hover:text-primary'
+              : 'opacity-0 text-muted-foreground/80 group-hover/cell:opacity-100 hover:text-muted-foreground'
+          "
+          @click.stop="$emit('toggle-lock')"
+        >
+          <Lock v-if="isLocked" :size="11" />
+          <LockOpen v-else :size="11" />
+        </button>
+      </TooltipTrigger>
+      <TooltipContent>
+        {{ isLocked ? 'Click to unlock' : 'Click to lock' }}
+      </TooltipContent>
+    </Tooltip>
+  </div>
+  <slot v-else />
+</template>
diff --git a/client/src/features/book/components/table/BookTableNumberCell.vue b/client/src/features/book/components/table/BookTableNumberCell.vue
new file mode 100644
index 000000000..419560b8f
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableNumberCell.vue
@@ -0,0 +1,116 @@
+<script setup lang="ts">
+import { ref, watch, nextTick, computed } from 'vue'
+
+const props = defineProps<{
+  value: number | null
+  isActive: boolean
+  isReadOnly?: boolean
+  min?: number
+  max?: number
+  allowDecimal?: boolean
+}>()
+
+const emit = defineEmits<{
+  activate: []
+  save: [value: number | null]
+  cancel: []
+  navigate: [direction: 'next' | 'prev' | 'rowUp' | 'rowDown']
+}>()
+
+const inputRef = ref<HTMLInputElement | null>(null)
+const draft = ref<string>(props.value != null ? String(props.value) : '')
+let wasCancelled = false
+
+watch(
+  () => props.isActive,
+  (active) => {
+    if (active) {
+      wasCancelled = false
+      draft.value = props.value != null ? String(props.value) : ''
+      nextTick(() => {
+        inputRef.value?.focus()
+        inputRef.value?.select()
+      })
+    }
+  },
+)
+
+const parsedValue = computed<number | null>(() => {
+  const trimmed = String(draft.value).trim()
+  if (!trimmed) return null
+  const n = props.allowDecimal ? parseFloat(trimmed) : parseInt(trimmed, 10)
+  if (isNaN(n)) return null
+  if (props.min != null && n < props.min) return props.min
+  if (props.max != null && n > props.max) return props.max
+  return n
+})
+
+function handleBlur() {
+  if (wasCancelled) return
+  emitSaveIfChanged(parsedValue.value)
+}
+
+function emitSaveIfChanged(nextValue: number | null) {
+  if (nextValue === props.value) {
+    emit('cancel')
+    return
+  }
+  emit('save', nextValue)
+}
+
+function handleKeydown(e: KeyboardEvent) {
+  if (!props.allowDecimal && !e.ctrlKey && !e.metaKey && e.key.length === 1 && !/^\d$/.test(e.key)) {
+    e.preventDefault()
+    return
+  }
+
+  if (e.key === 'Enter') {
+    e.preventDefault()
+    emitSaveIfChanged(parsedValue.value)
+  } else if (e.key === 'Escape') {
+    e.preventDefault()
+    wasCancelled = true
+    emit('cancel')
+  } else if (e.key === 'Tab') {
+    e.preventDefault()
+    emit('navigate', e.shiftKey ? 'prev' : 'next')
+  } else if (e.key === 'ArrowDown') {
+    e.preventDefault()
+    emit('navigate', 'rowDown')
+  } else if (e.key === 'ArrowUp') {
+    e.preventDefault()
+    emit('navigate', 'rowUp')
+  }
+}
+
+function handleClick() {
+  if (!props.isReadOnly) emit('activate')
+}
+</script>
+
+<template>
+  <div class="relative w-full min-w-0">
+    <input
+      v-if="isActive"
+      ref="inputRef"
+      v-model="draft"
+      :type="allowDecimal ? 'text' : 'number'"
+      class="w-full rounded border border-primary/50 bg-background px-1.5 py-0.5 text-sm text-foreground outline-none focus:border-primary/70"
+      @blur="handleBlur"
+      @keydown="handleKeydown"
+    />
+    <span
+      v-else
+      class="block min-h-[20px] truncate rounded px-1 text-sm"
+      :class="[isReadOnly ? 'text-foreground' : 'cursor-pointer hover:bg-primary/5', value != null ? 'text-foreground' : 'text-muted-foreground/40']"
+      :title="value != null ? String(value) : ''"
+      :tabindex="isReadOnly ? -1 : 0"
+      :role="isReadOnly ? undefined : 'button'"
+      @click="handleClick"
+      @keydown.enter.prevent="handleClick"
+      @keydown.space.prevent="handleClick"
+    >
+      {{ value != null ? value : '-' }}
+    </span>
+  </div>
+</template>
diff --git a/client/src/features/book/components/table/BookTableProgressCell.vue b/client/src/features/book/components/table/BookTableProgressCell.vue
new file mode 100644
index 000000000..fc7b90081
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableProgressCell.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+
+const props = defineProps<{ value: number | null }>()
+
+const clamped = computed(() => (props.value == null ? null : Math.min(100, Math.max(0, props.value))))
+const displayPct = computed(() => (clamped.value == null ? null : `${parseFloat(clamped.value.toFixed(2))}%`))
+const barColor = computed(() => {
+  if (clamped.value == null) return 'bg-primary'
+  if (clamped.value >= 75) return 'bg-green-500'
+  if (clamped.value >= 25) return 'bg-amber-400'
+  return 'bg-primary'
+})
+</script>
+
+<template>
+  <Tooltip v-if="clamped !== null">
+    <TooltipTrigger as-child>
+      <div class="flex min-w-0 items-center gap-2" role="progressbar" :aria-valuenow="clamped ?? undefined" aria-valuemin="0" aria-valuemax="100">
+        <div class="h-1.5 min-w-0 flex-1 overflow-hidden rounded-full bg-muted">
+          <div class="h-full rounded-full transition-all" :class="barColor" :style="{ width: `${clamped}%` }" />
+        </div>
+        <span class="w-12 shrink-0 text-right text-xs tabular-nums text-muted-foreground">{{ displayPct }}</span>
+      </div>
+    </TooltipTrigger>
+    <TooltipContent>{{ displayPct }} complete</TooltipContent>
+  </Tooltip>
+  <span v-else class="text-xs text-muted-foreground/40">-</span>
+</template>
diff --git a/client/src/features/book/components/table/BookTableRatingCell.vue b/client/src/features/book/components/table/BookTableRatingCell.vue
new file mode 100644
index 000000000..3ab90dafc
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableRatingCell.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { Star } from 'lucide-vue-next'
+
+const props = defineProps<{
+  value: number | null
+  isReadOnly?: boolean
+}>()
+
+const emit = defineEmits<{
+  save: [value: number | null]
+}>()
+
+const STARS = [1, 2, 3, 4, 5]
+const groupRef = ref<HTMLDivElement | null>(null)
+
+function getStarFromEvent(event: Event): number | null {
+  const raw = (event.currentTarget as HTMLButtonElement | null)?.dataset.star
+  const star = Number(raw)
+  return Number.isInteger(star) ? star : null
+}
+
+function focusStar(star: number): void {
+  groupRef.value?.querySelector<HTMLButtonElement>(`button[data-star="${star}"]`)?.focus()
+}
+
+function handleStarClick(event: Event) {
+  const star = getStarFromEvent(event)
+  if (props.isReadOnly || star == null) return
+  emit('save', props.value === star ? null : star)
+}
+
+function handleStarKeydown(event: KeyboardEvent) {
+  const star = getStarFromEvent(event)
+  if (star == null) return
+
+  if (event.key === 'ArrowRight') {
+    event.preventDefault()
+    focusStar(Math.min(STARS.length, star + 1))
+    return
+  }
+
+  if (event.key === 'ArrowLeft') {
+    event.preventDefault()
+    focusStar(Math.max(1, star - 1))
+    return
+  }
+
+  if (event.key === 'Enter' || event.key === ' ') {
+    event.preventDefault()
+    handleStarClick(event)
+  }
+}
+
+function getAriaLabel(star: number): string {
+  return props.value === star ? 'Remove rating' : `Rate ${star} out of 5`
+}
+
+function getTabIndex(star: number): number {
+  if (props.isReadOnly) return -1
+  return star === (props.value ?? 1) ? 0 : -1
+}
+</script>
+
+<template>
+  <div ref="groupRef" role="group" aria-label="Rating" class="flex items-center gap-0.5">
+    <button
+      v-for="star in STARS"
+      :key="star"
+      :data-star="star"
+      :tabindex="getTabIndex(star)"
+      :aria-label="getAriaLabel(star)"
+      :aria-pressed="star <= (value ?? 0)"
+      type="button"
+      class="transition-colors"
+      :class="[
+        isReadOnly ? 'cursor-default' : 'cursor-pointer hover:scale-110',
+        star <= (value ?? 0) ? 'text-amber-400' : 'text-muted-foreground/30',
+      ]"
+      @click="handleStarClick"
+      @keydown="handleStarKeydown"
+    >
+      <Star :size="13" :fill="star <= (value ?? 0) ? 'currentColor' : 'none'" />
+    </button>
+  </div>
+</template>
diff --git a/client/src/features/book/components/table/BookTableReadStatusCell.vue b/client/src/features/book/components/table/BookTableReadStatusCell.vue
new file mode 100644
index 000000000..20dc2e7f5
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableReadStatusCell.vue
@@ -0,0 +1,88 @@
+<script setup lang="ts">
+import { ref, computed, watch } from 'vue'
+import { ChevronDown } from 'lucide-vue-next'
+import { STATUS_OPTIONS, STATUS_ICONS, STATUS_COLORS } from '@/features/book/composables/useBookStatus'
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu'
+import type { ReadStatus, UserBookStatus } from '@bookorbit/types'
+
+const props = defineProps<{
+  value: UserBookStatus | null
+  isActive: boolean
+  isReadOnly?: boolean
+}>()
+
+const emit = defineEmits<{
+  activate: []
+  save: [value: ReadStatus]
+  cancel: []
+  navigate: [direction: 'next' | 'prev']
+}>()
+
+const isOpen = ref(false)
+const saving = ref(false)
+
+const currentStatus = computed<ReadStatus>(() => props.value?.status ?? 'unread')
+const CurrentIcon = computed(() => STATUS_ICONS[currentStatus.value] as unknown)
+const currentColor = computed(() => STATUS_COLORS[currentStatus.value])
+const currentLabel = computed(() => STATUS_OPTIONS.find((o) => o.value === currentStatus.value)?.label ?? 'Unread')
+
+watch(
+  () => props.isActive,
+  (active) => {
+    if (active && !isOpen.value) isOpen.value = true
+    else if (!active && isOpen.value) isOpen.value = false
+  },
+)
+
+function handleOpenChange(open: boolean) {
+  isOpen.value = open
+  if (open) {
+    if (!props.isActive) emit('activate')
+  } else {
+    if (!saving.value && props.isActive) emit('cancel')
+    saving.value = false
+  }
+}
+
+function selectOption(status: ReadStatus) {
+  saving.value = true
+  isOpen.value = false
+  emit('save', status)
+}
+
+function handleTab(e: KeyboardEvent) {
+  isOpen.value = false
+  emit('cancel')
+  emit('navigate', e.shiftKey ? 'prev' : 'next')
+}
+</script>
+
+<template>
+  <div class="w-full min-w-0">
+    <DropdownMenu :open="isOpen" @update:open="handleOpenChange">
+      <DropdownMenuTrigger as-child :disabled="isReadOnly">
+        <button
+          type="button"
+          class="flex w-full items-center gap-1.5 rounded px-1 py-0.5 text-xs transition-colors"
+          :class="[currentColor, isReadOnly ? 'cursor-default' : 'hover:bg-primary/5 cursor-pointer']"
+        >
+          <component :is="CurrentIcon" :size="12" />
+          <span class="truncate">{{ currentLabel }}</span>
+          <ChevronDown v-if="!isReadOnly" :size="10" class="ml-auto shrink-0 text-muted-foreground/50" />
+        </button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="start" class="min-w-[140px]" :trap-focus="false" @keydown.tab.prevent="handleTab">
+        <DropdownMenuItem
+          v-for="opt in STATUS_OPTIONS"
+          :key="opt.value"
+          class="gap-2 text-xs"
+          :class="opt.value === currentStatus ? 'text-primary font-medium' : ''"
+          @select="selectOption(opt.value)"
+        >
+          <component :is="STATUS_ICONS[opt.value]" :size="12" :class="STATUS_COLORS[opt.value]" />
+          {{ opt.label }}
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/client/src/features/book/components/table/BookTableTextCell.vue b/client/src/features/book/components/table/BookTableTextCell.vue
new file mode 100644
index 000000000..1794ed1f7
--- /dev/null
+++ b/client/src/features/book/components/table/BookTableTextCell.vue
@@ -0,0 +1,255 @@
+<script setup lang="ts">
+import { ref, watch, nextTick, onBeforeUnmount } from 'vue'
+import { RouterLink } from 'vue-router'
+import { ExternalLink } from 'lucide-vue-next'
+
+const props = defineProps<{
+  value: string | null
+  isActive: boolean
+  isReadOnly?: boolean
+  searchFn?: (q: string) => Promise<string[]>
+  openLink?: string | null
+  openLinkLabel?: string | null
+  alwaysShowOpenLinkIcon?: boolean
+}>()
+
+const emit = defineEmits<{
+  activate: []
+  save: [value: string | null]
+  cancel: []
+  navigate: [direction: 'next' | 'prev' | 'rowUp' | 'rowDown']
+}>()
+
+const inputRef = ref<HTMLInputElement | null>(null)
+const draft = ref<string>(props.value ?? '')
+const suggestions = ref<string[]>([])
+const showDropdown = ref(false)
+const activeIndex = ref(-1)
+const dropdownStyle = ref<Record<string, string>>({})
+let debounceTimer: ReturnType<typeof setTimeout> | null = null
+let blurTimer: ReturnType<typeof setTimeout> | null = null
+let latestRequestId = 0
+let wasCancelled = false
+
+onBeforeUnmount(() => {
+  if (debounceTimer) clearTimeout(debounceTimer)
+  if (blurTimer) clearTimeout(blurTimer)
+})
+
+function computeDropdownStyle() {
+  if (!inputRef.value) return
+  const rect = inputRef.value.getBoundingClientRect()
+  const spaceBelow = window.innerHeight - rect.bottom
+  const maxH = 160
+  if (spaceBelow < maxH && rect.top > maxH) {
+    dropdownStyle.value = {
+      position: 'fixed',
+      bottom: `${window.innerHeight - rect.top}px`,
+      left: `${rect.left}px`,
+      width: `${Math.max(rect.width, 128)}px`,
+      zIndex: '9999',
+    }
+  } else {
+    dropdownStyle.value = {
+      position: 'fixed',
+      top: `${rect.bottom + 2}px`,
+      left: `${rect.left}px`,
+      width: `${Math.max(rect.width, 128)}px`,
+      zIndex: '9999',
+    }
+  }
+}
+
+watch(
+  () => props.isActive,
+  (active) => {
+    if (active) {
+      wasCancelled = false
+      draft.value = props.value ?? ''
+      suggestions.value = []
+      showDropdown.value = false
+      nextTick(() => {
+        inputRef.value?.focus()
+        inputRef.value?.select()
+      })
+    } else {
+      suggestions.value = []
+      showDropdown.value = false
+    }
+  },
+)
+
+watch(draft, (q) => {
+  if (!props.searchFn || !props.isActive) return
+  if (debounceTimer) clearTimeout(debounceTimer)
+  if (!q.trim()) {
+    suggestions.value = []
+    showDropdown.value = false
+    return
+  }
+  debounceTimer = setTimeout(async () => {
+    const requestId = ++latestRequestId
+    const results = await props.searchFn!(q)
+    if (requestId !== latestRequestId) return
+    suggestions.value = results
+    if (results.length > 0) {
+      computeDropdownStyle()
+      showDropdown.value = true
+    } else {
+      showDropdown.value = false
+    }
+    activeIndex.value = -1
+  }, 200)
+})
+
+function selectSuggestion(s: string) {
+  draft.value = s
+  suggestions.value = []
+  showDropdown.value = false
+  emitSaveIfChanged(s)
+}
+
+function normalizedTextValue(value: string | null): string | null {
+  const trimmed = value?.trim() ?? ''
+  return trimmed.length > 0 ? trimmed : null
+}
+
+function emitSaveIfChanged(nextValue: string | null) {
+  const normalizedNext = normalizedTextValue(nextValue)
+  const normalizedCurrent = normalizedTextValue(props.value)
+  if (normalizedNext === normalizedCurrent) {
+    emit('cancel')
+    return
+  }
+  emit('save', normalizedNext)
+}
+
+function handleBlur() {
+  blurTimer = setTimeout(() => {
+    if (wasCancelled) return
+    showDropdown.value = false
+    emitSaveIfChanged(draft.value)
+  }, 150)
+}
+
+function handleKeydown(e: KeyboardEvent) {
+  if (showDropdown.value && suggestions.value.length > 0) {
+    if (e.key === 'ArrowDown') {
+      e.preventDefault()
+      activeIndex.value = Math.min(activeIndex.value + 1, suggestions.value.length - 1)
+      return
+    }
+    if (e.key === 'ArrowUp') {
+      e.preventDefault()
+      activeIndex.value = Math.max(activeIndex.value - 1, -1)
+      return
+    }
+    if (e.key === 'Enter' && activeIndex.value >= 0) {
+      e.preventDefault()
+      const s = suggestions.value[activeIndex.value]
+      if (s) selectSuggestion(s)
+      return
+    }
+    if (e.key === 'Escape') {
+      showDropdown.value = false
+      return
+    }
+  }
+
+  if (e.key === 'Enter') {
+    e.preventDefault()
+    emitSaveIfChanged(draft.value)
+  } else if (e.key === 'Escape') {
+    e.preventDefault()
+    wasCancelled = true
+    emit('cancel')
+  } else if (e.key === 'Tab') {
+    e.preventDefault()
+    emit('navigate', e.shiftKey ? 'prev' : 'next')
+  } else if (e.key === 'ArrowDown') {
+    e.preventDefault()
+    emit('navigate', 'rowDown')
+  } else if (e.key === 'ArrowUp') {
+    e.preventDefault()
+    emit('navigate', 'rowUp')
+  }
+}
+
+function handleClick() {
+  if (!props.isReadOnly) emit('activate')
+}
+</script>
+
+<template>
+  <div class="relative w-full min-w-0">
+    <input
+      v-if="isActive"
+      ref="inputRef"
+      v-model="draft"
+      type="text"
+      class="w-full rounded border border-primary/50 bg-background px-1.5 py-0.5 text-sm text-foreground outline-none focus:border-primary/70"
+      :role="searchFn ? 'combobox' : undefined"
+      :aria-expanded="searchFn ? showDropdown : undefined"
+      :aria-controls="searchFn && showDropdown ? 'text-cell-suggestions' : undefined"
+      :aria-activedescendant="searchFn && activeIndex >= 0 ? `suggestion-${activeIndex}` : undefined"
+      aria-autocomplete="list"
+      @blur="handleBlur"
+      @keydown="handleKeydown"
+    />
+    <Teleport to="body">
+      <div
+        v-if="isActive && showDropdown"
+        id="text-cell-suggestions"
+        role="listbox"
+        class="max-h-40 overflow-y-auto rounded-md border border-border bg-popover shadow-md"
+        :style="dropdownStyle"
+      >
+        <button
+          v-for="(s, i) in suggestions"
+          :id="`suggestion-${i}`"
+          :key="s"
+          type="button"
+          role="option"
+          :aria-selected="i === activeIndex"
+          class="w-full truncate px-2.5 py-1 text-left text-sm text-foreground hover:bg-accent"
+          :class="{ 'bg-accent': i === activeIndex }"
+          @mousedown.prevent="selectSuggestion(s)"
+        >
+          {{ s }}
+        </button>
+      </div>
+    </Teleport>
+    <div v-if="!isActive" class="group/text-cell relative w-full min-w-0">
+      <span
+        class="block min-h-[20px] min-w-0 truncate rounded px-1 text-sm transition-[padding-right] duration-150"
+        :class="[
+          isReadOnly ? 'text-foreground' : 'cursor-pointer hover:bg-primary/5',
+          value ? 'text-foreground' : 'text-muted-foreground/40',
+          openLink ? 'pr-1 group-hover/text-cell:pr-6 group-focus-within/text-cell:pr-6' : 'pr-1',
+        ]"
+        :title="value ?? ''"
+        :tabindex="isReadOnly ? -1 : 0"
+        :role="isReadOnly ? undefined : 'button'"
+        @click="handleClick"
+        @keydown.space.prevent="handleClick"
+      >
+        {{ value || '-' }}
+      </span>
+      <RouterLink
+        v-if="openLink"
+        :to="openLink"
+        class="absolute right-0.5 top-1/2 inline-flex h-5 w-5 -translate-y-1/2 items-center justify-center rounded text-muted-foreground transition-opacity hover:bg-primary/10 hover:text-primary"
+        :class="
+          alwaysShowOpenLinkIcon
+            ? 'opacity-100'
+            : 'pointer-events-none opacity-0 group-hover/text-cell:pointer-events-auto group-hover/text-cell:opacity-100 group-focus-within/text-cell:pointer-events-auto group-focus-within/text-cell:opacity-100 focus-visible:pointer-events-auto focus-visible:opacity-100'
+        "
+        :aria-label="openLinkLabel ?? 'Open details'"
+        :title="openLinkLabel ?? 'Open details'"
+        @click.stop
+      >
+        <ExternalLink :size="12" />
+      </RouterLink>
+    </div>
+  </div>
+</template>
diff --git a/client/src/features/book/components/table/__tests__/BookTableCellDispatcher.spec.ts b/client/src/features/book/components/table/__tests__/BookTableCellDispatcher.spec.ts
new file mode 100644
index 000000000..3778a0838
--- /dev/null
+++ b/client/src/features/book/components/table/__tests__/BookTableCellDispatcher.spec.ts
@@ -0,0 +1,100 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+import type { BookCard } from '@bookorbit/types'
+import BookTableCellDispatcher from '../BookTableCellDispatcher.vue'
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    status: 'present',
+    title: 'Book One',
+    authors: ['Author A'],
+    seriesName: null,
+    seriesIndex: null,
+    files: [],
+    publishedYear: null,
+    language: null,
+    genres: [],
+    tags: [],
+    rating: null,
+    readingProgress: null,
+    readStatus: null,
+    addedAt: '2026-01-01T00:00:00.000Z',
+    updatedAt: null,
+    metadataScore: null,
+    hasCover: false,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    ...overrides,
+  }
+}
+
+const baseProps = {
+  book: makeBook(),
+  colId: 'lockRow' as const,
+  cellType: 'lockRow' as const,
+  hasLockField: false,
+  isLocked: false,
+  isActive: false,
+  isReadOnly: false,
+  isFullyLocked: false,
+  lockedFieldCount: 0,
+  selectionMode: false,
+  alwaysShowOpenLinkIcon: false,
+  value: null,
+}
+
+function mountDispatcher(overrides: Partial<typeof baseProps> = {}) {
+  return mount(BookTableCellDispatcher, {
+    props: { ...baseProps, ...overrides },
+    global: {
+      stubs: {
+        Lock: { template: '<svg data-test="lock-icon" />' },
+        LockOpen: { template: '<svg data-test="lock-open-icon" />' },
+      },
+    },
+  })
+}
+
+describe('BookTableCellDispatcher lock row', () => {
+  it('renders unlocked state and emits lock-all', async () => {
+    const wrapper = mountDispatcher({ isFullyLocked: false, lockedFieldCount: 0 })
+    const button = wrapper.get('button')
+
+    expect(button.attributes('aria-label')).toBe('Lock all fields')
+    expect(button.classes()).toContain('text-muted-foreground/70')
+
+    await button.trigger('click')
+    expect(wrapper.emitted('lockAll')).toBeTruthy()
+    expect(wrapper.emitted('unlockAll')).toBeFalsy()
+  })
+
+  it('renders partial lock state in first column and emits lock-all', async () => {
+    const wrapper = mountDispatcher({ isFullyLocked: false, lockedFieldCount: 2 })
+    const button = wrapper.get('button')
+
+    expect(button.attributes('aria-label')).toBe('Lock all fields')
+    expect(button.classes()).toContain('text-amber-600/90')
+
+    await button.trigger('click')
+    expect(wrapper.emitted('lockAll')).toBeTruthy()
+    expect(wrapper.emitted('unlockAll')).toBeFalsy()
+  })
+
+  it('renders fully locked state and emits unlock-all', async () => {
+    const wrapper = mountDispatcher({ isFullyLocked: true, lockedFieldCount: 12 })
+    const button = wrapper.get('button')
+
+    expect(button.attributes('aria-label')).toBe('Unlock all fields')
+    expect(button.classes()).toContain('text-primary/90')
+
+    await button.trigger('click')
+    expect(wrapper.emitted('unlockAll')).toBeTruthy()
+    expect(wrapper.emitted('lockAll')).toBeFalsy()
+  })
+})
diff --git a/client/src/features/book/components/table/__tests__/BookTableCollapsedSeriesRow.spec.ts b/client/src/features/book/components/table/__tests__/BookTableCollapsedSeriesRow.spec.ts
new file mode 100644
index 000000000..4b7d87377
--- /dev/null
+++ b/client/src/features/book/components/table/__tests__/BookTableCollapsedSeriesRow.spec.ts
@@ -0,0 +1,156 @@
+import { shallowMount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { BookCard } from '@bookorbit/types'
+import BookTableCollapsedSeriesRow from '../BookTableCollapsedSeriesRow.vue'
+
+const mockRouterPush = vi.fn<(...args: unknown[]) => unknown>()
+
+vi.mock('vue-router', () => ({
+  useRouter: () => ({ push: mockRouterPush }),
+}))
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    status: 'present',
+    title: 'Book One',
+    authors: ['Author A'],
+    seriesName: 'The Arc',
+    seriesIndex: 1,
+    files: [],
+    publishedYear: null,
+    language: null,
+    genres: [],
+    tags: [],
+    rating: null,
+    readingProgress: null,
+    readStatus: null,
+    addedAt: '2026-01-01T00:00:00.000Z',
+    updatedAt: null,
+    metadataScore: null,
+    hasCover: false,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    collapsedSeries: {
+      bookCount: 5,
+      readCount: 2,
+      coverBookIds: [10, 20, 30, 40],
+      seriesLatestAddedAt: null,
+    },
+    ...overrides,
+  }
+}
+
+describe('BookTableCollapsedSeriesRow', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('renders the series name and book count', () => {
+    const wrapper = shallowMount(BookTableCollapsedSeriesRow, {
+      props: { book: makeBook(), colspan: 6 },
+    })
+
+    expect(wrapper.text()).toContain('The Arc')
+    expect(wrapper.text()).toContain('5 books')
+  })
+
+  it('renders the read count when some books are read', () => {
+    const wrapper = shallowMount(BookTableCollapsedSeriesRow, {
+      props: { book: makeBook(), colspan: 6 },
+    })
+
+    expect(wrapper.text()).toContain('2 of 5 read')
+  })
+
+  it('does not render the read count when no books are read', () => {
+    const wrapper = shallowMount(BookTableCollapsedSeriesRow, {
+      props: {
+        book: makeBook({
+          collapsedSeries: { bookCount: 5, readCount: 0, coverBookIds: [10, 20], seriesLatestAddedAt: null },
+        }),
+        colspan: 6,
+      },
+    })
+
+    expect(wrapper.text()).not.toContain('0 of 5 read')
+  })
+
+  it('renders up to four cover thumbnails', () => {
+    const wrapper = shallowMount(BookTableCollapsedSeriesRow, {
+      props: { book: makeBook(), colspan: 6 },
+    })
+
+    const images = wrapper.findAll('img')
+    expect(images).toHaveLength(4)
+    expect(images.map((image) => image.attributes('src'))).toEqual([
+      '/api/v1/books/10/thumbnail',
+      '/api/v1/books/20/thumbnail',
+      '/api/v1/books/30/thumbnail',
+      '/api/v1/books/40/thumbnail',
+    ])
+  })
+
+  it('renders a placeholder when no cover ids are available', () => {
+    const wrapper = shallowMount(BookTableCollapsedSeriesRow, {
+      props: {
+        book: makeBook({
+          collapsedSeries: { bookCount: 5, readCount: 0, coverBookIds: [], seriesLatestAddedAt: null },
+        }),
+        colspan: 6,
+      },
+    })
+
+    expect(wrapper.findAll('img')).toHaveLength(0)
+    expect(wrapper.text()).toContain('?')
+  })
+
+  it('navigates to the series detail route on click', async () => {
+    const wrapper = shallowMount(BookTableCollapsedSeriesRow, {
+      props: { book: makeBook(), colspan: 6 },
+    })
+
+    await wrapper.get('td').trigger('click')
+
+    expect(mockRouterPush).toHaveBeenCalledWith({
+      name: 'series-detail',
+      params: { seriesName: 'The Arc' },
+    })
+  })
+
+  it('renders no more than four thumbnails even when more cover ids are provided', () => {
+    const wrapper = shallowMount(BookTableCollapsedSeriesRow, {
+      props: {
+        book: makeBook({
+          collapsedSeries: { bookCount: 6, readCount: 1, coverBookIds: [10, 20, 30, 40, 50, 60], seriesLatestAddedAt: null },
+        }),
+        colspan: 6,
+      },
+    })
+
+    expect(wrapper.findAll('img')).toHaveLength(4)
+  })
+
+  it('sets the expected colspan on the table cell', () => {
+    const wrapper = shallowMount(BookTableCollapsedSeriesRow, {
+      props: { book: makeBook(), colspan: 9 },
+    })
+
+    expect(wrapper.get('td').attributes('colspan')).toBe('9')
+  })
+
+  it('does not navigate when selectionMode is true', async () => {
+    const wrapper = shallowMount(BookTableCollapsedSeriesRow, {
+      props: { book: makeBook(), colspan: 6, selectionMode: true },
+    })
+
+    await wrapper.get('td').trigger('click')
+
+    expect(mockRouterPush).not.toHaveBeenCalled()
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/tableColumnSchema.spec.ts b/client/src/features/book/composables/__tests__/tableColumnSchema.spec.ts
new file mode 100644
index 000000000..473f74748
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/tableColumnSchema.spec.ts
@@ -0,0 +1,88 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { BookCard } from '@bookorbit/types'
+
+vi.mock('@/lib/formatting', () => ({
+  formatBytes: vi.fn<(bytes: number | null) => string>((bytes) => `formatted:${bytes}`),
+}))
+
+import { formatBytes } from '@/lib/formatting'
+import { COLUMN_DEFS, COLUMN_DEF_MAP, DEFAULT_HIDDEN, DEFAULT_ORDER, DEFAULT_WIDTHS, LOCK_ROW_COLUMN_DEF } from '../tableColumnSchema'
+
+describe('tableColumnSchema', () => {
+  it('exposes 24 total column definitions including the lock row', () => {
+    expect([LOCK_ROW_COLUMN_DEF, ...COLUMN_DEFS]).toHaveLength(24)
+  })
+
+  it('builds a map entry for every column definition in COLUMN_DEFS', () => {
+    expect(COLUMN_DEF_MAP.size).toBe(COLUMN_DEFS.length)
+    for (const column of COLUMN_DEFS) {
+      expect(COLUMN_DEF_MAP.get(column.id)).toBe(column)
+    }
+  })
+
+  it('defines the lock row as a left pinned column', () => {
+    expect(LOCK_ROW_COLUMN_DEF.id).toBe('lockRow')
+    expect(LOCK_ROW_COLUMN_DEF.pinned).toBe('left')
+  })
+
+  it('exports default order from column definitions in order', () => {
+    expect(DEFAULT_ORDER).toEqual(COLUMN_DEFS.map((column) => column.id))
+  })
+
+  it('exports hidden columns from definitions marked invisible by default', () => {
+    expect(DEFAULT_HIDDEN).toEqual(COLUMN_DEFS.filter((column) => !column.defaultVisible).map((column) => column.id))
+  })
+
+  it('exports widths for every column', () => {
+    expect(Object.keys(DEFAULT_WIDTHS)).toEqual(COLUMN_DEFS.map((column) => column.id))
+    for (const column of COLUMN_DEFS) {
+      expect(DEFAULT_WIDTHS[column.id]).toBe(column.defaultWidth)
+    }
+  })
+
+  it('defines required schema fields for every column', () => {
+    for (const column of COLUMN_DEFS) {
+      expect(column.id).toBeTruthy()
+      expect(column.header).toBeTypeOf('string')
+      expect(column.cellType).toBeTruthy()
+      expect(column.defaultWidth).toBeGreaterThan(0)
+      expect(column.minWidth).toBeGreaterThan(0)
+    }
+  })
+
+  it('formats file size accessors with formatBytes', () => {
+    const fileSizeColumn = COLUMN_DEFS.find((column) => column.id === 'fileSize')
+    const book = {
+      id: 1,
+      status: 'present',
+      title: 'Dune',
+      authors: ['Frank Herbert'],
+      seriesName: null,
+      seriesIndex: null,
+      files: [{ id: 10, format: 'epub', role: 'primary', sizeBytes: 2048 }],
+      publishedYear: 1965,
+      language: 'en',
+      genres: [],
+      rating: null,
+      readingProgress: null,
+      readStatus: null,
+      addedAt: '2025-01-01T00:00:00.000Z',
+      updatedAt: null,
+      metadataScore: null,
+      hasCover: false,
+      hasMetadataLocks: false,
+      lockedFields: [],
+      subtitle: null,
+      publisher: null,
+      pageCount: null,
+      isbn13: null,
+      narrators: [],
+      tags: [],
+    } satisfies BookCard
+
+    const value = fileSizeColumn?.accessor?.(book)
+
+    expect(formatBytes).toHaveBeenCalledWith(2048)
+    expect(value).toBe('formatted:2048')
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useBookBulkActions.spec.ts b/client/src/features/book/composables/__tests__/useBookBulkActions.spec.ts
index ed784eeed..f618abd9d 100644
--- a/client/src/features/book/composables/__tests__/useBookBulkActions.spec.ts
+++ b/client/src/features/book/composables/__tests__/useBookBulkActions.spec.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
-import type { BookCard, UserBookStatus } from '@bookorbit/types'
+import { BOOK_METADATA_LOCK_FIELDS, type BookCard, type UserBookStatus } from '@bookorbit/types'
 
 const mocks = vi.hoisted(() => ({
   api: vi.fn<(input: RequestInfo | URL, init?: RequestInit) => Promise<{ ok: boolean }>>(),
@@ -44,7 +44,7 @@ vi.mock('../useBookDownload', () => ({
   }),
 }))
 
-import { useBookBulkActions } from '../useBookBulkActions'
+import { useBookBulkActions, type QuerySelectionState } from '../useBookBulkActions'
 
 function makeReadStatus(overrides: Partial<UserBookStatus> = {}): UserBookStatus {
   return {
@@ -69,12 +69,31 @@ function makeBook(overrides: Partial<BookCard> = {}): BookCard {
     publishedYear: null,
     language: null,
     genres: [],
+    tags: [],
     rating: null,
     readingProgress: null,
     readStatus: null,
     addedAt: '2026-01-01T00:00:00.000Z',
+    updatedAt: null,
+    metadataScore: null,
     hasCover: false,
     hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    ...overrides,
+  }
+}
+
+function makeQuerySelection(overrides: Partial<QuerySelectionState> = {}): QuerySelectionState {
+  return {
+    libraryId: 5,
+    filter: { type: 'group', join: 'AND', rules: [] },
+    q: 'space opera',
+    total: 500,
     ...overrides,
   }
 }
@@ -132,6 +151,24 @@ describe('useBookBulkActions', () => {
     await handleBulkSetRating(5)
 
     expect(books.value.map((book) => book.rating)).toEqual([5, 2, 5])
+    expect(mocks.toastSuccess).toHaveBeenCalledWith('Rated 2 books 5/5')
+  })
+
+  it('skips locked rating fields in local bulk rating updates', async () => {
+    mocks.api.mockResolvedValue({ ok: true })
+    const selectedIds = ref(new Set([1, 2, 3]))
+    const books = ref([
+      makeBook({ id: 1, rating: null, lockedFields: [] }),
+      makeBook({ id: 2, rating: 2, lockedFields: ['rating'] }),
+      makeBook({ id: 3, rating: 4, lockedFields: [] }),
+    ])
+
+    const { handleBulkSetRating } = useBookBulkActions(selectedIds, vi.fn(), books)
+
+    await handleBulkSetRating(5)
+
+    expect(books.value.map((book) => book.rating)).toEqual([5, 2, 5])
+    expect(mocks.toastSuccess).toHaveBeenCalledWith('Rated 2 books 5/5 (1 locked skipped)')
   })
 
   it('does not mutate local books when the bulk status request fails', async () => {
@@ -162,5 +199,201 @@ describe('useBookBulkActions', () => {
     await handleBulkSetMetadataLock(true)
 
     expect(books.value.map((book) => book.hasMetadataLocks)).toEqual([true, false, true])
+    expect(books.value[0]?.lockedFields).toEqual([...BOOK_METADATA_LOCK_FIELDS])
+    expect(books.value[1]?.lockedFields).toEqual([])
+    expect(books.value[2]?.lockedFields).toEqual([...BOOK_METADATA_LOCK_FIELDS])
+  })
+
+  it('skips local field updates for selected books where that field is locked', async () => {
+    mocks.api.mockResolvedValue({ ok: true })
+    const selectedIds = ref(new Set([1, 2, 3]))
+    const books = ref([
+      makeBook({ id: 1, language: 'en', lockedFields: [] }),
+      makeBook({ id: 2, language: 'de', lockedFields: ['language'] }),
+      makeBook({ id: 3, language: 'it', lockedFields: [] }),
+    ])
+
+    const { handleBulkSetField } = useBookBulkActions(selectedIds, vi.fn(), books)
+
+    await handleBulkSetField('language', 'fr')
+
+    expect(books.value.map((book) => book.language)).toEqual(['fr', 'de', 'fr'])
+    expect(mocks.toastSuccess).toHaveBeenCalledWith('Updated language for 2 books (1 locked skipped)')
+  })
+
+  it('replaces relation list fields locally for editable books', async () => {
+    mocks.api.mockResolvedValue({ ok: true })
+    const selectedIds = ref(new Set([1, 2, 3]))
+    const books = ref([
+      makeBook({ id: 1, authors: ['Old A'], lockedFields: [] }),
+      makeBook({ id: 2, authors: ['Old B'], lockedFields: ['authors'] }),
+      makeBook({ id: 3, authors: ['Old C'], lockedFields: [] }),
+    ])
+
+    const { handleBulkSetField } = useBookBulkActions(selectedIds, vi.fn(), books)
+
+    await handleBulkSetField('authors', ['New A', 'New B'])
+
+    expect(books.value.map((book) => book.authors)).toEqual([['New A', 'New B'], ['Old B'], ['New A', 'New B']])
+    expect(mocks.toastSuccess).toHaveBeenCalledWith('Updated authors for 2 books (1 locked skipped)')
+  })
+
+  it('sends bulk status updates using query selection payloads', async () => {
+    mocks.api.mockResolvedValue({ ok: true })
+    const selectedIds = ref(new Set<number>())
+    const querySelection = ref<QuerySelectionState | null>(makeQuerySelection())
+
+    const { handleBulkSetStatus } = useBookBulkActions(selectedIds, vi.fn(), undefined, undefined, querySelection)
+
+    await handleBulkSetStatus('read')
+
+    expect(mocks.api).toHaveBeenCalledWith(
+      '/api/v1/books/bulk-set-status',
+      expect.objectContaining({
+        body: JSON.stringify({
+          query: { libraryId: 5, filter: { type: 'group', join: 'AND', rules: [] }, q: 'space opera' },
+          status: 'read',
+        }),
+      }),
+    )
+    expect(mocks.toastSuccess).toHaveBeenCalledWith('Updated status for 500 books')
+  })
+
+  it('forwards query sort specs in bulk payloads', async () => {
+    mocks.api.mockResolvedValue({ ok: true })
+    const selectedIds = ref(new Set<number>())
+    const querySelection = ref<QuerySelectionState | null>(
+      makeQuerySelection({
+        sort: [{ field: 'title', dir: 'asc' }],
+      }),
+    )
+
+    const { handleBulkSetStatus } = useBookBulkActions(selectedIds, vi.fn(), undefined, undefined, querySelection)
+
+    await handleBulkSetStatus('reading')
+
+    expect(mocks.api).toHaveBeenCalledWith(
+      '/api/v1/books/bulk-set-status',
+      expect.objectContaining({
+        body: JSON.stringify({
+          query: {
+            libraryId: 5,
+            filter: { type: 'group', join: 'AND', rules: [] },
+            q: 'space opera',
+            sort: [{ field: 'title', dir: 'asc' }],
+          },
+          status: 'reading',
+        }),
+      }),
+    )
+  })
+
+  it('sends bulk rating updates using query selection payloads', async () => {
+    mocks.api.mockResolvedValue({ ok: true })
+    const selectedIds = ref(new Set<number>())
+    const querySelection = ref<QuerySelectionState | null>(makeQuerySelection())
+
+    const { handleBulkSetRating } = useBookBulkActions(selectedIds, vi.fn(), undefined, undefined, querySelection)
+
+    await handleBulkSetRating(4)
+
+    expect(mocks.api).toHaveBeenCalledWith(
+      '/api/v1/books/bulk-set-rating',
+      expect.objectContaining({
+        body: JSON.stringify({
+          query: { libraryId: 5, filter: { type: 'group', join: 'AND', rules: [] }, q: 'space opera' },
+          rating: 4,
+        }),
+      }),
+    )
+    expect(mocks.toastSuccess).toHaveBeenCalledWith('Rated 500 books 4/5')
+  })
+
+  it('sends bulk tag updates using query selection payloads', async () => {
+    mocks.api.mockResolvedValue({ ok: true })
+    const selectedIds = ref(new Set<number>())
+    const querySelection = ref<QuerySelectionState | null>(makeQuerySelection())
+
+    const { handleBulkUpdateTags } = useBookBulkActions(selectedIds, vi.fn(), undefined, undefined, querySelection)
+
+    await handleBulkUpdateTags('add', ['favorite'])
+
+    expect(mocks.api).toHaveBeenCalledWith(
+      '/api/v1/books/bulk-update-tags',
+      expect.objectContaining({
+        body: JSON.stringify({
+          query: { libraryId: 5, filter: { type: 'group', join: 'AND', rules: [] }, q: 'space opera' },
+          mode: 'add',
+          tags: ['favorite'],
+        }),
+      }),
+    )
+    expect(mocks.toastSuccess).toHaveBeenCalledWith('Added tags to 500 books')
+  })
+
+  it('sends bulk field updates using query selection payloads', async () => {
+    mocks.api.mockResolvedValue({ ok: true })
+    const selectedIds = ref(new Set<number>())
+    const querySelection = ref<QuerySelectionState | null>(makeQuerySelection())
+
+    const { handleBulkSetField } = useBookBulkActions(selectedIds, vi.fn(), undefined, undefined, querySelection)
+
+    await handleBulkSetField('language', 'fr')
+
+    expect(mocks.api).toHaveBeenCalledWith(
+      '/api/v1/books/bulk-set-metadata',
+      expect.objectContaining({
+        body: JSON.stringify({
+          query: { libraryId: 5, filter: { type: 'group', join: 'AND', rules: [] }, q: 'space opera' },
+          field: 'language',
+          value: 'fr',
+        }),
+      }),
+    )
+    expect(mocks.toastSuccess).toHaveBeenCalledWith('Updated language for 500 books')
+  })
+
+  it('sends bulk metadata lock updates using query selection payloads', async () => {
+    mocks.api.mockResolvedValue({ ok: true })
+    const selectedIds = ref(new Set<number>())
+    const querySelection = ref<QuerySelectionState | null>(makeQuerySelection())
+
+    const { handleBulkSetMetadataLock } = useBookBulkActions(selectedIds, vi.fn(), undefined, undefined, querySelection)
+
+    await handleBulkSetMetadataLock(true)
+
+    expect(mocks.api).toHaveBeenCalledWith(
+      '/api/v1/books/bulk-set-metadata-lock',
+      expect.objectContaining({
+        body: JSON.stringify({
+          query: { libraryId: 5, filter: { type: 'group', join: 'AND', rules: [] }, q: 'space opera' },
+          locked: true,
+        }),
+      }),
+    )
+    expect(mocks.toastSuccess).toHaveBeenCalledWith('Locked metadata for 500 books')
+  })
+
+  it('sends delete requests using query selection payloads', async () => {
+    mocks.api.mockResolvedValue({ ok: true })
+    const selectedIds = ref(new Set<number>())
+    const onDeleted = vi.fn<(ids: number[]) => void>()
+    const querySelection = ref<QuerySelectionState | null>(makeQuerySelection())
+
+    const { handleDeleteSelected } = useBookBulkActions(selectedIds, onDeleted, undefined, undefined, querySelection)
+
+    await handleDeleteSelected()
+
+    expect(mocks.api).toHaveBeenCalledWith(
+      '/api/v1/books',
+      expect.objectContaining({
+        method: 'DELETE',
+        body: JSON.stringify({
+          query: { libraryId: 5, filter: { type: 'group', join: 'AND', rules: [] }, q: 'space opera' },
+        }),
+      }),
+    )
+    expect(onDeleted).toHaveBeenCalledWith([])
+    expect(mocks.toastSuccess).toHaveBeenCalledWith('Deleted 500 books')
   })
 })
diff --git a/client/src/features/book/composables/__tests__/useBookDataSource.spec.ts b/client/src/features/book/composables/__tests__/useBookDataSource.spec.ts
new file mode 100644
index 000000000..bdbabe8ac
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useBookDataSource.spec.ts
@@ -0,0 +1,235 @@
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { BookCard, BooksPage, SortSpec } from '@bookorbit/types'
+
+const fetchMock = vi.fn<(url: string, init?: RequestInit) => Promise<unknown>>()
+vi.stubGlobal('fetch', fetchMock)
+
+vi.mock('@/lib/api', () => ({
+  api: (url: string, init?: RequestInit) => fetchMock(url, init),
+}))
+
+function makePage(items: Partial<BookCard>[], total: number): BooksPage {
+  return { items: items as BookCard[], total, page: 0, size: 50 }
+}
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    status: 'active',
+    title: 'Book A',
+    authors: [],
+    seriesName: null,
+    seriesIndex: null,
+    files: [],
+    publishedYear: null,
+    language: null,
+    genres: [],
+    tags: [],
+    rating: null,
+    readingProgress: null,
+    readStatus: null,
+    addedAt: '2024-01-01T00:00:00Z',
+    updatedAt: null,
+    metadataScore: null,
+    hasCover: false,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    ...overrides,
+  }
+}
+
+function mockOkResponse(page: BooksPage) {
+  fetchMock.mockResolvedValueOnce({
+    ok: true,
+    json: () => Promise.resolve(page),
+  })
+}
+
+const endpointForId = (id: number) => `/api/v1/scopes/${id}/books`
+
+describe('useBookDataSource', () => {
+  beforeEach(() => {
+    fetchMock.mockReset()
+  })
+
+  it('returns initial state', async () => {
+    const { useBookDataSource } = await import('../useBookDataSource')
+    const scopeId = ref(1)
+    const { items, total, loading, error, initialized, hasMore } = useBookDataSource(scopeId, endpointForId)
+
+    expect(items.value).toEqual([])
+    expect(total.value).toBe(0)
+    expect(loading.value).toBe(false)
+    expect(error.value).toBeNull()
+    expect(initialized.value).toBe(false)
+    expect(hasMore.value).toBe(false)
+  })
+
+  it('loads books and populates total', async () => {
+    const { useBookDataSource } = await import('../useBookDataSource')
+    const scopeId = ref(7)
+    const { items, total, load } = useBookDataSource(scopeId, endpointForId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' })], 3))
+    await load(true)
+
+    expect(fetchMock).toHaveBeenCalledWith(
+      '/api/v1/scopes/7/books',
+      expect.objectContaining({ method: 'POST', headers: { 'Content-Type': 'application/json' } }),
+    )
+    expect(items.value).toHaveLength(1)
+    expect(items.value[0]!.title).toBe('A')
+    expect(total.value).toBe(3)
+  })
+
+  it('sets loading while a request is in flight and clears it after completion', async () => {
+    const { useBookDataSource } = await import('../useBookDataSource')
+    const scopeId = ref(7)
+    const { loading, load } = useBookDataSource(scopeId, endpointForId)
+
+    let resolveFetch!: (value: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((resolve) => {
+        resolveFetch = resolve
+      }),
+    )
+
+    const loadPromise = load(true)
+    expect(loading.value).toBe(true)
+
+    resolveFetch({ ok: true, json: () => Promise.resolve(makePage([], 0)) })
+    await loadPromise
+
+    expect(loading.value).toBe(false)
+  })
+
+  it('sets initialized after the first successful load', async () => {
+    const { useBookDataSource } = await import('../useBookDataSource')
+    const scopeId = ref(7)
+    const { initialized, load } = useBookDataSource(scopeId, endpointForId)
+
+    mockOkResponse(makePage([], 0))
+    await load(true)
+
+    expect(initialized.value).toBe(true)
+  })
+
+  it('accumulates pages across subsequent loads', async () => {
+    const { useBookDataSource } = await import('../useBookDataSource')
+    const scopeId = ref(7)
+    const { items, load } = useBookDataSource(scopeId, endpointForId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' })], 2))
+    await load(true)
+
+    mockOkResponse(makePage([makeBook({ id: 2, title: 'B' })], 2))
+    await load()
+
+    expect(items.value.map((book) => book.id)).toEqual([1, 2])
+  })
+
+  it('sets error when the request throws', async () => {
+    const { useBookDataSource } = await import('../useBookDataSource')
+    const scopeId = ref(7)
+    const { error, load } = useBookDataSource(scopeId, endpointForId)
+
+    fetchMock.mockRejectedValueOnce(new Error('network down'))
+    await load(true)
+
+    expect(error.value).toBe('network down')
+  })
+
+  it('clears state when clear is called', async () => {
+    const { useBookDataSource } = await import('../useBookDataSource')
+    const scopeId = ref(7)
+    const { items, total, error, clear, load } = useBookDataSource(scopeId, endpointForId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' })], 1))
+    await load(true)
+    clear()
+
+    expect(items.value).toEqual([])
+    expect(total.value).toBe(0)
+    expect(error.value).toBeNull()
+  })
+
+  it('includes page, size, sort, collapseSeries, and q in the request body', async () => {
+    const { useBookDataSource } = await import('../useBookDataSource')
+    const scopeId = ref(7)
+    const collapseEnabled = ref(true)
+    const q = ref('  needle  ')
+    const sort = ref<SortSpec[]>([{ field: 'author', dir: 'desc' }])
+    const { load } = useBookDataSource(scopeId, endpointForId, { collapseEnabled, q, sort })
+
+    mockOkResponse(makePage([], 0))
+    await load(true)
+
+    const [, init] = fetchMock.mock.calls[0]!
+    expect(JSON.parse(init!.body as string)).toEqual({
+      sort: [{ field: 'author', dir: 'desc' }],
+      pagination: { page: 0, size: 50 },
+      collapseSeries: true,
+      q: 'needle',
+    })
+  })
+
+  it('marks initialized and skips fetching when the scope id is invalid', async () => {
+    const { useBookDataSource } = await import('../useBookDataSource')
+    const scopeId = ref(0)
+    const { items, total, initialized, load } = useBookDataSource(scopeId, endpointForId)
+
+    await load(true)
+
+    expect(fetchMock).not.toHaveBeenCalled()
+    expect(items.value).toEqual([])
+    expect(total.value).toBe(0)
+    expect(initialized.value).toBe(true)
+  })
+
+  it('does not fetch another page once all results have been loaded', async () => {
+    const { useBookDataSource } = await import('../useBookDataSource')
+    const scopeId = ref(7)
+    const { load } = useBookDataSource(scopeId, endpointForId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' })], 1))
+    await load(true)
+    await load()
+
+    expect(fetchMock).toHaveBeenCalledTimes(1)
+  })
+
+  it('reloads when sort or collapseEnabled changes', async () => {
+    const { useBookDataSource } = await import('../useBookDataSource')
+    const scopeId = ref(7)
+    const collapseEnabled = ref(false)
+    const sort = ref<SortSpec[]>([{ field: 'title', dir: 'asc' }])
+    useBookDataSource(scopeId, endpointForId, { collapseEnabled, sort })
+
+    mockOkResponse(makePage([], 0))
+    sort.value = [{ field: 'author', dir: 'desc' }]
+    await Promise.resolve()
+    await new Promise((r) => setTimeout(r, 0))
+
+    mockOkResponse(makePage([], 0))
+    collapseEnabled.value = true
+    await Promise.resolve()
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(fetchMock).toHaveBeenCalledTimes(2)
+    expect(JSON.parse(fetchMock.mock.calls[0]![1]!.body as string)).toEqual({
+      sort: [{ field: 'author', dir: 'desc' }],
+      pagination: { page: 0, size: 50 },
+    })
+    expect(JSON.parse(fetchMock.mock.calls[1]![1]!.body as string)).toEqual({
+      sort: [{ field: 'author', dir: 'desc' }],
+      pagination: { page: 0, size: 50 },
+      collapseSeries: true,
+    })
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useBookMetadataExport.spec.ts b/client/src/features/book/composables/__tests__/useBookMetadataExport.spec.ts
new file mode 100644
index 000000000..79ae31890
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useBookMetadataExport.spec.ts
@@ -0,0 +1,221 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({
+  api: vi.fn<(input: RequestInfo | URL, init?: RequestInit) => Promise<Response>>(),
+}))
+
+vi.mock('@/lib/api', () => ({
+  api: mocks.api,
+}))
+
+function makeResponse(overrides?: Partial<Response> & { headers?: Headers }): Response {
+  const headers = overrides?.headers ?? new Headers()
+  return {
+    ok: true,
+    status: 200,
+    statusText: 'OK',
+    headers,
+    json: async () => ({}),
+    text: async () => '',
+    blob: async () => new Blob([]),
+    ...overrides,
+  } as Response
+}
+
+describe('useBookMetadataExport', () => {
+  beforeEach(() => {
+    vi.resetModules()
+    mocks.api.mockReset()
+  })
+
+  it('builds preflight payload for all-matching query selection', async () => {
+    const expected = {
+      schemaVersion: 1,
+      rowCount: 12,
+      estimatedBytes: 3456,
+      sizeCategory: 'small',
+      fileName: 'bookorbit-library-all-matching-2026-05-07.csv',
+      scope: 'all-matching',
+      format: 'csv',
+    }
+    mocks.api.mockResolvedValue(makeResponse({ json: async () => expected }))
+
+    const { useBookMetadataExport } = await import('../useBookMetadataExport')
+    const { preflight } = useBookMetadataExport()
+
+    const result = await preflight({
+      scope: 'all-matching',
+      format: 'csv',
+      viewType: 'library',
+      selectedBookIds: [],
+      allMatchingQuery: {
+        libraryId: 5,
+        q: 'dune',
+        sort: [{ field: 'title', dir: 'asc' }],
+      },
+      options: {
+        includePersonalData: false,
+        includeFilePaths: false,
+        includeContextMeta: true,
+        columnsMode: 'canonical',
+        visibleColumns: [],
+      },
+    })
+
+    expect(result).toEqual(expected)
+    expect(mocks.api).toHaveBeenCalledWith(
+      '/api/v1/books/metadata-export/preflight',
+      expect.objectContaining({
+        method: 'POST',
+        body: JSON.stringify({
+          query: {
+            libraryId: 5,
+            q: 'dune',
+            sort: [{ field: 'title', dir: 'asc' }],
+          },
+          format: 'csv',
+          viewType: 'library',
+          options: {
+            includePersonalData: false,
+            includeFilePaths: false,
+            includeContextMeta: true,
+            columnsMode: 'canonical',
+            visibleColumns: [],
+          },
+        }),
+      }),
+    )
+  })
+
+  it('throws before request when all-matching scope has no query payload', async () => {
+    const { useBookMetadataExport } = await import('../useBookMetadataExport')
+    const { preflight } = useBookMetadataExport()
+
+    await expect(
+      preflight({
+        scope: 'all-matching',
+        format: 'csv',
+        viewType: 'library',
+        selectedBookIds: [],
+        options: {
+          includePersonalData: false,
+          includeFilePaths: false,
+          includeContextMeta: true,
+          columnsMode: 'canonical',
+          visibleColumns: [],
+        },
+      }),
+    ).rejects.toThrow('All-matching metadata export requires a query payload')
+
+    expect(mocks.api).not.toHaveBeenCalled()
+  })
+
+  it('parses backend error payloads for preflight failures', async () => {
+    mocks.api.mockResolvedValue(
+      makeResponse({
+        ok: false,
+        status: 400,
+        text: async () => JSON.stringify({ message: 'Too many rows selected' }),
+      }),
+    )
+
+    const { useBookMetadataExport } = await import('../useBookMetadataExport')
+    const { preflight } = useBookMetadataExport()
+
+    await expect(
+      preflight({
+        scope: 'selected',
+        format: 'json',
+        viewType: 'collection',
+        selectedBookIds: [1],
+        options: {
+          includePersonalData: true,
+          includeFilePaths: false,
+          includeContextMeta: true,
+          columnsMode: 'visible',
+          visibleColumns: ['title'],
+        },
+      }),
+    ).rejects.toThrow('Too many rows selected')
+  })
+
+  it('downloads exported blob and uses UTF-8 filename when provided', async () => {
+    const appendSpy = vi.spyOn(document.body, 'append')
+    const clickSpy = vi.spyOn(HTMLAnchorElement.prototype, 'click').mockImplementation(() => {})
+    const removeSpy = vi.spyOn(HTMLElement.prototype, 'remove')
+    const createObjectUrlSpy = vi.spyOn(URL, 'createObjectURL').mockReturnValue('blob:test-url')
+    const revokeObjectUrlSpy = vi.spyOn(URL, 'revokeObjectURL').mockImplementation(() => {})
+
+    mocks.api.mockResolvedValue(
+      makeResponse({
+        headers: new Headers({
+          'Content-Disposition': `attachment; filename*=UTF-8''bookorbit-library-selected-%E2%9C%85.csv`,
+        }),
+        blob: async () => new Blob(['bookId,title\n1,Dune'], { type: 'text/csv' }),
+      }),
+    )
+
+    const { useBookMetadataExport } = await import('../useBookMetadataExport')
+    const { download, loading } = useBookMetadataExport()
+
+    const result = await download({
+      scope: 'selected',
+      format: 'csv',
+      viewType: 'library',
+      selectedBookIds: [1],
+      options: {
+        includePersonalData: false,
+        includeFilePaths: false,
+        includeContextMeta: true,
+        columnsMode: 'canonical',
+        visibleColumns: [],
+      },
+    })
+
+    const anchor = appendSpy.mock.calls[0]?.[0] as HTMLAnchorElement
+    expect(anchor.download).toBe('bookorbit-library-selected-✅.csv')
+    expect(createObjectUrlSpy).toHaveBeenCalledTimes(1)
+    expect(revokeObjectUrlSpy).toHaveBeenCalledWith('blob:test-url')
+    expect(clickSpy).toHaveBeenCalledTimes(1)
+    expect(removeSpy).toHaveBeenCalledTimes(1)
+    expect(result.fileName).toBe('bookorbit-library-selected-✅.csv')
+    expect(loading.value).toBe(false)
+
+    appendSpy.mockRestore()
+    clickSpy.mockRestore()
+    removeSpy.mockRestore()
+    createObjectUrlSpy.mockRestore()
+    revokeObjectUrlSpy.mockRestore()
+  })
+
+  it('surfaces download failure and clears loading state', async () => {
+    mocks.api.mockResolvedValue(
+      makeResponse({
+        ok: false,
+        status: 403,
+        text: async () => JSON.stringify({ error: 'Forbidden' }),
+      }),
+    )
+
+    const { useBookMetadataExport } = await import('../useBookMetadataExport')
+    const { download, loading } = useBookMetadataExport()
+
+    await expect(
+      download({
+        scope: 'selected',
+        format: 'json',
+        viewType: 'smartScope',
+        selectedBookIds: [2],
+        options: {
+          includePersonalData: true,
+          includeFilePaths: true,
+          includeContextMeta: false,
+          columnsMode: 'visible',
+          visibleColumns: ['title', 'authors'],
+        },
+      }),
+    ).rejects.toThrow('Forbidden')
+
+    expect(loading.value).toBe(false)
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useBookQuery.spec.ts b/client/src/features/book/composables/__tests__/useBookQuery.spec.ts
new file mode 100644
index 000000000..8bd45936b
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useBookQuery.spec.ts
@@ -0,0 +1,440 @@
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { BookCard, BooksPage } from '@bookorbit/types'
+
+const fetchMock = vi.fn<(url: string, init?: RequestInit) => Promise<unknown>>()
+vi.stubGlobal('fetch', fetchMock)
+
+vi.mock('@/lib/api', () => ({
+  api: (url: string, init?: RequestInit) => fetchMock(url, init),
+}))
+
+function makePage(items: Partial<BookCard>[], total: number): BooksPage {
+  return { items: items as BookCard[], total, page: 0, size: 50 }
+}
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    status: 'active',
+    title: 'Book A',
+    authors: [],
+    seriesName: null,
+    seriesIndex: null,
+    files: [],
+    publishedYear: null,
+    language: null,
+    genres: [],
+    tags: [],
+    rating: null,
+    readingProgress: null,
+    readStatus: null,
+    addedAt: '2024-01-01T00:00:00Z',
+    updatedAt: null,
+    metadataScore: null,
+    hasCover: false,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    ...overrides,
+  }
+}
+
+function mockOkResponse(page: BooksPage) {
+  fetchMock.mockResolvedValueOnce({
+    ok: true,
+    json: () => Promise.resolve(page),
+  })
+}
+
+describe('useBookQuery', () => {
+  beforeEach(() => {
+    fetchMock.mockReset()
+  })
+
+  it('fetches books when load is called', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { items, load } = useBookQuery(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' })], 1))
+    await load(true)
+
+    expect(items.value).toHaveLength(1)
+    expect(items.value[0]!.title).toBe('A')
+  })
+
+  it('reloads automatically when libraryId changes', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(null)
+    const { items } = useBookQuery(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' })], 1))
+    libraryId.value = 42
+    await Promise.resolve()
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value).toHaveLength(1)
+    expect(items.value[0]!.title).toBe('A')
+  })
+
+  it('does not clear items before server response arrives (keeps old items visible during reset)', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { items, load } = useBookQuery(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'First' })], 1))
+    await load(true)
+    expect(items.value).toHaveLength(1)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((resolve) => {
+        resolveFetch = resolve
+      }),
+    )
+
+    const loadPromise = load(true)
+    // Items should NOT be cleared while fetch is in-flight
+    expect(items.value).toHaveLength(1)
+    expect(items.value[0]!.title).toBe('First')
+
+    resolveFetch({ ok: true, json: () => Promise.resolve(makePage([makeBook({ id: 2, title: 'Second' })], 1)) })
+    await loadPromise
+    expect(items.value).toHaveLength(1)
+    expect(items.value[0]!.title).toBe('Second')
+  })
+
+  it('atomically replaces items on page 0 response', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { items, load } = useBookQuery(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' }), makeBook({ id: 2, title: 'B' })], 2))
+    await load(true)
+    expect(items.value).toHaveLength(2)
+
+    mockOkResponse(makePage([makeBook({ id: 2, title: 'B' }), makeBook({ id: 1, title: 'A' })], 2))
+    await load(true)
+    expect(items.value[0]!.title).toBe('B')
+    expect(items.value[1]!.title).toBe('A')
+  })
+
+  it('appends items on subsequent page loads', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { items, load, hasMore } = useBookQuery(libraryId)
+
+    // Page 0: 1 item, total=2 → hasMore=true
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' })], 2))
+    await load(true)
+    expect(items.value).toHaveLength(1)
+    expect(hasMore.value).toBe(true)
+
+    // Page 1: next item
+    mockOkResponse(makePage([makeBook({ id: 2, title: 'B' })], 2))
+    await load()
+    expect(items.value).toHaveLength(2)
+  })
+
+  it('sets error on fetch failure', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { error, load } = useBookQuery(libraryId)
+
+    fetchMock.mockResolvedValueOnce({ ok: false, status: 500 })
+    await load(true)
+    expect(error.value).toBe('HTTP 500')
+  })
+
+  it('load() (non-reset) is a no-op when a load is already in-flight', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { load, items } = useBookQuery(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'First' })], 10))
+    await load(true)
+
+    let resolvePage2!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolvePage2 = r
+      }),
+    )
+
+    const p1 = load() // page 2, in-flight
+    const p2 = load() // loading=true → no-op (non-reset)
+
+    resolvePage2({ ok: true, json: () => Promise.resolve(makePage([makeBook({ id: 2, title: 'Second' })], 10)) })
+    await Promise.all([p1, p2])
+
+    // Only 2 fetch calls total: initial reset + one page-2 load
+    expect(fetchMock).toHaveBeenCalledTimes(2)
+    expect(items.value).toHaveLength(2)
+  })
+
+  it('load(true) while in-flight aborts the first request and uses the second response', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { items, load } = useBookQuery(libraryId)
+
+    let resolveFirst!: (v: unknown) => void
+    let resolveSecond!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFirst = r
+      }),
+    )
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveSecond = r
+      }),
+    )
+
+    const p1 = load(true) // starts, in-flight
+    const p2 = load(true) // aborts first, starts new
+
+    expect(fetchMock).toHaveBeenCalledTimes(2)
+
+    resolveSecond({ ok: true, json: () => Promise.resolve(makePage([makeBook({ id: 2, title: 'Second' })], 1)) })
+    await p2
+
+    resolveFirst({ ok: true, json: () => Promise.resolve(makePage([makeBook({ id: 1, title: 'First' })], 1)) })
+    await p1
+
+    // Only second response should be applied
+    expect(items.value).toHaveLength(1)
+    expect(items.value[0]!.title).toBe('Second')
+  })
+})
+
+describe('useBookQuery - server-driven sort', () => {
+  beforeEach(() => {
+    fetchMock.mockReset()
+  })
+
+  it('keeps the current order while a new sort request is pending', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useBookQuery(libraryId)
+
+    const books = [makeBook({ id: 1, title: 'Zebra' }), makeBook({ id: 2, title: 'Apple' }), makeBook({ id: 3, title: 'Mango' })]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+    expect(items.value[0]!.title).toBe('Zebra') // original order
+
+    // Deferred second fetch so we can inspect optimistic state
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'title', dir: 'desc' }]
+    await Promise.resolve() // flush Vue watcher
+
+    expect(items.value.map((item) => item.title)).toEqual(['Zebra', 'Apple', 'Mango'])
+
+    resolveFetch({ ok: true, json: () => Promise.resolve(makePage(books, 3)) })
+    await new Promise((r) => setTimeout(r, 0))
+    expect(items.value).toHaveLength(3)
+  })
+
+  it('only updates the order after the server response arrives', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useBookQuery(libraryId)
+
+    const books = [makeBook({ id: 1, title: 'Apple' }), makeBook({ id: 2, title: 'Mango' }), makeBook({ id: 3, title: 'Zebra' })]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'title', dir: 'desc' }]
+    await Promise.resolve()
+
+    expect(items.value.map((item) => item.title)).toEqual(['Apple', 'Mango', 'Zebra'])
+
+    resolveFetch({
+      ok: true,
+      json: () =>
+        Promise.resolve(makePage([makeBook({ id: 3, title: 'Zebra' }), makeBook({ id: 2, title: 'Mango' }), makeBook({ id: 1, title: 'Apple' })], 3)),
+    })
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value.map((item) => item.title)).toEqual(['Zebra', 'Mango', 'Apple'])
+  })
+
+  it('keeps null values in place until the server returns the new ordering', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useBookQuery(libraryId)
+
+    const books = [
+      makeBook({ id: 1, title: 'A', rating: null }),
+      makeBook({ id: 2, title: 'B', rating: 5 }),
+      makeBook({ id: 3, title: 'C', rating: 3 }),
+    ]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'rating', dir: 'asc' }]
+    await Promise.resolve()
+
+    const nullIdx = items.value.findIndex((b) => b.rating === null)
+    expect(nullIdx).toBe(0)
+
+    resolveFetch({
+      ok: true,
+      json: () =>
+        Promise.resolve(
+          makePage(
+            [makeBook({ id: 3, title: 'C', rating: 3 }), makeBook({ id: 2, title: 'B', rating: 5 }), makeBook({ id: 1, title: 'A', rating: null })],
+            3,
+          ),
+        ),
+    })
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value.findIndex((b) => b.rating === null)).toBe(2)
+  })
+
+  it('waits for the server response before reordering by publishedYear', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useBookQuery(libraryId)
+
+    const books = [makeBook({ id: 1, publishedYear: 2020 }), makeBook({ id: 2, publishedYear: 2010 }), makeBook({ id: 3, publishedYear: 2015 })]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'publishedYear', dir: 'asc' }]
+    await Promise.resolve()
+
+    expect(items.value.map((book) => book.publishedYear)).toEqual([2020, 2010, 2015])
+
+    resolveFetch({
+      ok: true,
+      json: () =>
+        Promise.resolve(
+          makePage([makeBook({ id: 2, publishedYear: 2010 }), makeBook({ id: 3, publishedYear: 2015 }), makeBook({ id: 1, publishedYear: 2020 })], 3),
+        ),
+    })
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value.map((book) => book.publishedYear)).toEqual([2010, 2015, 2020])
+  })
+
+  it('waits for the server response before reordering by primary file size', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useBookQuery(libraryId)
+
+    const books = [
+      makeBook({ id: 1, files: [{ id: 11, format: 'epub', role: 'primary', sizeBytes: 500 }] }),
+      makeBook({ id: 2, files: [{ id: 12, format: 'epub', role: 'primary', sizeBytes: 100 }] }),
+      makeBook({ id: 3, files: [{ id: 13, format: 'epub', role: 'primary', sizeBytes: 300 }] }),
+    ]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'fileSize', dir: 'asc' }]
+    await Promise.resolve()
+
+    expect(items.value.map((book) => book.files[0]?.sizeBytes)).toEqual([500, 100, 300])
+
+    resolveFetch({
+      ok: true,
+      json: () =>
+        Promise.resolve(
+          makePage(
+            [
+              makeBook({ id: 2, files: [{ id: 12, format: 'epub', role: 'primary', sizeBytes: 100 }] }),
+              makeBook({ id: 3, files: [{ id: 13, format: 'epub', role: 'primary', sizeBytes: 300 }] }),
+              makeBook({ id: 1, files: [{ id: 11, format: 'epub', role: 'primary', sizeBytes: 500 }] }),
+            ],
+            3,
+          ),
+        ),
+    })
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value.map((book) => book.files[0]?.sizeBytes)).toEqual([100, 300, 500])
+  })
+
+  it('waits for the server response before reordering by updatedAt', async () => {
+    const { useBookQuery } = await import('../useBookQuery')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useBookQuery(libraryId)
+
+    const books = [
+      makeBook({ id: 1, updatedAt: '2024-03-01T00:00:00Z' }),
+      makeBook({ id: 2, updatedAt: '2024-01-01T00:00:00Z' }),
+      makeBook({ id: 3, updatedAt: '2024-02-01T00:00:00Z' }),
+    ]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'updatedAt', dir: 'asc' }]
+    await Promise.resolve()
+
+    expect(items.value.map((book) => book.updatedAt)).toEqual(['2024-03-01T00:00:00Z', '2024-01-01T00:00:00Z', '2024-02-01T00:00:00Z'])
+
+    resolveFetch({
+      ok: true,
+      json: () =>
+        Promise.resolve(
+          makePage(
+            [
+              makeBook({ id: 2, updatedAt: '2024-01-01T00:00:00Z' }),
+              makeBook({ id: 3, updatedAt: '2024-02-01T00:00:00Z' }),
+              makeBook({ id: 1, updatedAt: '2024-03-01T00:00:00Z' }),
+            ],
+            3,
+          ),
+        ),
+    })
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value.map((book) => book.updatedAt)).toEqual(['2024-01-01T00:00:00Z', '2024-02-01T00:00:00Z', '2024-03-01T00:00:00Z'])
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useLibraryBooks.spec.ts b/client/src/features/book/composables/__tests__/useLibraryBooks.spec.ts
new file mode 100644
index 000000000..e2328a4f5
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useLibraryBooks.spec.ts
@@ -0,0 +1,546 @@
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { BookCard, BooksPage, SortField } from '@bookorbit/types'
+
+const fetchMock = vi.fn<(url: string, init?: RequestInit) => Promise<unknown>>()
+vi.stubGlobal('fetch', fetchMock)
+
+vi.mock('@/lib/api', () => ({
+  api: (url: string, init?: RequestInit) => fetchMock(url, init),
+}))
+
+function makePage(items: Partial<BookCard>[], total: number): BooksPage {
+  return { items: items as BookCard[], total, page: 0, size: 50 }
+}
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    status: 'active',
+    title: 'Book A',
+    authors: [],
+    seriesName: null,
+    seriesIndex: null,
+    files: [],
+    publishedYear: null,
+    language: null,
+    genres: [],
+    tags: [],
+    rating: null,
+    readingProgress: null,
+    readStatus: null,
+    addedAt: '2024-01-01T00:00:00Z',
+    updatedAt: null,
+    metadataScore: null,
+    hasCover: false,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    ...overrides,
+  }
+}
+
+function mockOkResponse(page: BooksPage) {
+  fetchMock.mockResolvedValueOnce({
+    ok: true,
+    json: () => Promise.resolve(page),
+  })
+}
+
+describe('sortItems', () => {
+  beforeEach(() => {
+    fetchMock.mockReset()
+  })
+
+  it('sorts supported fields in ascending order', async () => {
+    const { sortItems } = await import('../useLibraryBooks')
+    const cases: Array<{ field: SortField; low: Partial<BookCard>; high: Partial<BookCard> }> = [
+      { field: 'title', low: { title: 'Alpha' }, high: { title: 'Zulu' } },
+      { field: 'author', low: { authors: ['Alpha'] }, high: { authors: ['Zulu'] } },
+      { field: 'series', low: { seriesName: 'Alpha Series' }, high: { seriesName: 'Zulu Series' } },
+      { field: 'seriesIndex', low: { seriesIndex: 1 }, high: { seriesIndex: 2 } },
+      { field: 'addedAt', low: { addedAt: '2024-01-01T00:00:00Z' }, high: { addedAt: '2024-02-01T00:00:00Z' } },
+      { field: 'publishedYear', low: { publishedYear: 2010 }, high: { publishedYear: 2020 } },
+      { field: 'updatedAt', low: { updatedAt: '2024-01-01T00:00:00Z' }, high: { updatedAt: '2024-02-01T00:00:00Z' } },
+      { field: 'pageCount', low: { pageCount: 100 }, high: { pageCount: 200 } },
+      { field: 'rating', low: { rating: 3 }, high: { rating: 5 } },
+      { field: 'publisher', low: { publisher: 'Alpha Press' }, high: { publisher: 'Zulu Press' } },
+      {
+        field: 'fileSize',
+        low: { files: [{ id: 11, format: 'epub', role: 'primary', sizeBytes: 100 }] },
+        high: { files: [{ id: 22, format: 'epub', role: 'secondary', sizeBytes: 200 }] },
+      },
+      { field: 'language', low: { language: 'en' }, high: { language: 'fr' } },
+      { field: 'readProgress', low: { readingProgress: 25 }, high: { readingProgress: 75 } },
+      {
+        field: 'lastReadAt',
+        low: { readStatus: { updatedAt: '2024-01-01T00:00:00Z', finishedAt: null } as never },
+        high: { readStatus: { updatedAt: '2024-02-01T00:00:00Z', finishedAt: null } as never },
+      },
+      {
+        field: 'finishedAt',
+        low: { readStatus: { updatedAt: null, finishedAt: '2024-01-01T00:00:00Z' } as never },
+        high: { readStatus: { updatedAt: null, finishedAt: '2024-02-01T00:00:00Z' } as never },
+      },
+      { field: 'metadataScore', low: { metadataScore: 2 }, high: { metadataScore: 9 } },
+    ]
+
+    for (const { field, low, high } of cases) {
+      const sorted = sortItems([makeBook({ id: 2, ...high }), makeBook({ id: 1, ...low })], [{ field, dir: 'asc' }])
+      expect(sorted.map((book) => book.id)).toEqual([1, 2])
+    }
+  })
+
+  it('places null values last', async () => {
+    const { sortItems } = await import('../useLibraryBooks')
+
+    const sorted = sortItems([makeBook({ id: 2, rating: null }), makeBook({ id: 1, rating: 4 })], [{ field: 'rating', dir: 'asc' }])
+
+    expect(sorted.map((book) => book.id)).toEqual([1, 2])
+  })
+
+  it('leaves items unchanged for unsupported sort fields', async () => {
+    const { sortItems } = await import('../useLibraryBooks')
+
+    const sorted = sortItems([makeBook({ id: 2, title: 'Bravo' }), makeBook({ id: 1, title: 'Alpha' })], [{ field: 'unknown' as never, dir: 'asc' }])
+
+    expect(sorted.map((book) => book.id)).toEqual([2, 1])
+  })
+})
+
+describe('useLibraryBooks', () => {
+  beforeEach(() => {
+    fetchMock.mockReset()
+  })
+
+  it('fetches books when load is called', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, load } = useLibraryBooks(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' })], 1))
+    await load(true)
+
+    expect(items.value).toHaveLength(1)
+    expect(items.value[0]!.title).toBe('A')
+  })
+
+  it('reloads automatically when libraryId changes', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(null)
+    const { items } = useLibraryBooks(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' })], 1))
+    libraryId.value = 42
+    await Promise.resolve()
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value).toHaveLength(1)
+    expect(items.value[0]!.title).toBe('A')
+  })
+
+  it('does not fetch when load is called without a library id', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(null)
+    const { load } = useLibraryBooks(libraryId)
+
+    await load(true)
+
+    expect(fetchMock).not.toHaveBeenCalled()
+  })
+
+  it('does not clear items before server response arrives (keeps old items visible during reset)', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, load } = useLibraryBooks(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'First' })], 1))
+    await load(true)
+    expect(items.value).toHaveLength(1)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((resolve) => {
+        resolveFetch = resolve
+      }),
+    )
+
+    const loadPromise = load(true)
+    expect(items.value).toHaveLength(1)
+    expect(items.value[0]!.title).toBe('First')
+
+    resolveFetch({ ok: true, json: () => Promise.resolve(makePage([makeBook({ id: 2, title: 'Second' })], 1)) })
+    await loadPromise
+    expect(items.value).toHaveLength(1)
+    expect(items.value[0]!.title).toBe('Second')
+  })
+
+  it('atomically replaces items on page 0 response', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, load } = useLibraryBooks(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' }), makeBook({ id: 2, title: 'B' })], 2))
+    await load(true)
+    expect(items.value).toHaveLength(2)
+
+    mockOkResponse(makePage([makeBook({ id: 2, title: 'B' }), makeBook({ id: 1, title: 'A' })], 2))
+    await load(true)
+    expect(items.value[0]!.title).toBe('B')
+    expect(items.value[1]!.title).toBe('A')
+  })
+
+  it('appends items on subsequent page loads', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, load, hasMore } = useLibraryBooks(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' })], 2))
+    await load(true)
+    expect(items.value).toHaveLength(1)
+    expect(hasMore.value).toBe(true)
+
+    mockOkResponse(makePage([makeBook({ id: 2, title: 'B' })], 2))
+    await load()
+    expect(items.value).toHaveLength(2)
+  })
+
+  it('sets error on fetch failure', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { error, load } = useLibraryBooks(libraryId)
+
+    fetchMock.mockResolvedValueOnce({ ok: false, status: 500 })
+    await load(true)
+    expect(error.value).toBe('HTTP 500')
+  })
+
+  it('load() (non-reset) is a no-op when a load is already in-flight', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { load, items } = useLibraryBooks(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'First' })], 10))
+    await load(true)
+
+    let resolvePage2!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolvePage2 = r
+      }),
+    )
+
+    const p1 = load()
+    const p2 = load()
+
+    resolvePage2({ ok: true, json: () => Promise.resolve(makePage([makeBook({ id: 2, title: 'Second' })], 10)) })
+    await Promise.all([p1, p2])
+
+    expect(fetchMock).toHaveBeenCalledTimes(2)
+    expect(items.value).toHaveLength(2)
+  })
+
+  it('load(true) while in-flight aborts the first request and uses the second response', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, load } = useLibraryBooks(libraryId)
+
+    let resolveFirst!: (v: unknown) => void
+    let resolveSecond!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFirst = r
+      }),
+    )
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveSecond = r
+      }),
+    )
+
+    const p1 = load(true)
+    const p2 = load(true)
+
+    expect(fetchMock).toHaveBeenCalledTimes(2)
+
+    resolveSecond({ ok: true, json: () => Promise.resolve(makePage([makeBook({ id: 2, title: 'Second' })], 1)) })
+    await p2
+
+    resolveFirst({ ok: true, json: () => Promise.resolve(makePage([makeBook({ id: 1, title: 'First' })], 1)) })
+    await p1
+
+    expect(items.value).toHaveLength(1)
+    expect(items.value[0]!.title).toBe('Second')
+  })
+
+  it('clears items, totals, and pagination state', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, total, pagination, clear, load } = useLibraryBooks(libraryId)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'A' })], 1))
+    await load(true)
+    clear()
+
+    expect(items.value).toEqual([])
+    expect(total.value).toBe(0)
+    expect(pagination.page).toBe(0)
+  })
+
+  it('includes filter, collapseSeries, and trimmed q in the request body', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(7)
+    const collapseEnabled = ref(true)
+    const q = ref('  needle  ')
+    const { filter, sort, load } = useLibraryBooks(libraryId, collapseEnabled, q)
+    filter.value = {
+      type: 'group',
+      join: 'AND',
+      rules: [{ type: 'rule', field: 'title', operator: 'contains', value: 'space' }],
+    }
+    sort.value = [{ field: 'author', dir: 'desc' }]
+
+    mockOkResponse(makePage([], 0))
+    await load(true)
+
+    const [url, init] = fetchMock.mock.calls[0]!
+    expect(url).toBe('/api/v1/libraries/7/books')
+    expect(JSON.parse(init!.body as string)).toEqual({
+      filter: filter.value,
+      sort: [{ field: 'author', dir: 'desc' }],
+      pagination: { page: 0, size: 50 },
+      collapseSeries: true,
+      q: 'needle',
+    })
+  })
+})
+
+describe('useLibraryBooks - server-driven sort', () => {
+  beforeEach(() => {
+    fetchMock.mockReset()
+  })
+
+  it('keeps the current order while a new sort request is pending', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useLibraryBooks(libraryId)
+
+    const books = [makeBook({ id: 1, title: 'Zebra' }), makeBook({ id: 2, title: 'Apple' }), makeBook({ id: 3, title: 'Mango' })]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+    expect(items.value[0]!.title).toBe('Zebra')
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'title', dir: 'desc' }]
+    await Promise.resolve()
+
+    expect(items.value.map((item) => item.title)).toEqual(['Zebra', 'Apple', 'Mango'])
+
+    resolveFetch({ ok: true, json: () => Promise.resolve(makePage(books, 3)) })
+    await new Promise((r) => setTimeout(r, 0))
+    expect(items.value).toHaveLength(3)
+  })
+
+  it('only updates the order after the server response arrives', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useLibraryBooks(libraryId)
+
+    const books = [makeBook({ id: 1, title: 'Apple' }), makeBook({ id: 2, title: 'Mango' }), makeBook({ id: 3, title: 'Zebra' })]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'title', dir: 'desc' }]
+    await Promise.resolve()
+
+    expect(items.value.map((item) => item.title)).toEqual(['Apple', 'Mango', 'Zebra'])
+
+    resolveFetch({
+      ok: true,
+      json: () =>
+        Promise.resolve(makePage([makeBook({ id: 3, title: 'Zebra' }), makeBook({ id: 2, title: 'Mango' }), makeBook({ id: 1, title: 'Apple' })], 3)),
+    })
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value.map((item) => item.title)).toEqual(['Zebra', 'Mango', 'Apple'])
+  })
+
+  it('keeps null values in place until the server returns the new ordering', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useLibraryBooks(libraryId)
+
+    const books = [
+      makeBook({ id: 1, title: 'A', rating: null }),
+      makeBook({ id: 2, title: 'B', rating: 5 }),
+      makeBook({ id: 3, title: 'C', rating: 3 }),
+    ]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'rating', dir: 'asc' }]
+    await Promise.resolve()
+
+    const nullIdx = items.value.findIndex((b) => b.rating === null)
+    expect(nullIdx).toBe(0)
+
+    resolveFetch({
+      ok: true,
+      json: () =>
+        Promise.resolve(
+          makePage(
+            [makeBook({ id: 3, title: 'C', rating: 3 }), makeBook({ id: 2, title: 'B', rating: 5 }), makeBook({ id: 1, title: 'A', rating: null })],
+            3,
+          ),
+        ),
+    })
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value.findIndex((b) => b.rating === null)).toBe(2)
+  })
+
+  it('waits for the server response before reordering by publishedYear', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useLibraryBooks(libraryId)
+
+    const books = [makeBook({ id: 1, publishedYear: 2020 }), makeBook({ id: 2, publishedYear: 2010 }), makeBook({ id: 3, publishedYear: 2015 })]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'publishedYear', dir: 'asc' }]
+    await Promise.resolve()
+
+    expect(items.value.map((book) => book.publishedYear)).toEqual([2020, 2010, 2015])
+
+    resolveFetch({
+      ok: true,
+      json: () =>
+        Promise.resolve(
+          makePage([makeBook({ id: 2, publishedYear: 2010 }), makeBook({ id: 3, publishedYear: 2015 }), makeBook({ id: 1, publishedYear: 2020 })], 3),
+        ),
+    })
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value.map((book) => book.publishedYear)).toEqual([2010, 2015, 2020])
+  })
+
+  it('waits for the server response before reordering by primary file size', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useLibraryBooks(libraryId)
+
+    const books = [
+      makeBook({ id: 1, files: [{ id: 11, format: 'epub', role: 'primary', sizeBytes: 500 }] }),
+      makeBook({ id: 2, files: [{ id: 12, format: 'epub', role: 'primary', sizeBytes: 100 }] }),
+      makeBook({ id: 3, files: [{ id: 13, format: 'epub', role: 'primary', sizeBytes: 300 }] }),
+    ]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'fileSize', dir: 'asc' }]
+    await Promise.resolve()
+
+    expect(items.value.map((book) => book.files[0]?.sizeBytes)).toEqual([500, 100, 300])
+
+    resolveFetch({
+      ok: true,
+      json: () =>
+        Promise.resolve(
+          makePage(
+            [
+              makeBook({ id: 2, files: [{ id: 12, format: 'epub', role: 'primary', sizeBytes: 100 }] }),
+              makeBook({ id: 3, files: [{ id: 13, format: 'epub', role: 'primary', sizeBytes: 300 }] }),
+              makeBook({ id: 1, files: [{ id: 11, format: 'epub', role: 'primary', sizeBytes: 500 }] }),
+            ],
+            3,
+          ),
+        ),
+    })
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value.map((book) => book.files[0]?.sizeBytes)).toEqual([100, 300, 500])
+  })
+
+  it('waits for the server response before reordering by updatedAt', async () => {
+    const { useLibraryBooks } = await import('../useLibraryBooks')
+    const libraryId = ref<number | null>(1)
+    const { items, sort, load } = useLibraryBooks(libraryId)
+
+    const books = [
+      makeBook({ id: 1, updatedAt: '2024-03-01T00:00:00Z' }),
+      makeBook({ id: 2, updatedAt: '2024-01-01T00:00:00Z' }),
+      makeBook({ id: 3, updatedAt: '2024-02-01T00:00:00Z' }),
+    ]
+    mockOkResponse(makePage(books, 3))
+    await load(true)
+
+    let resolveFetch!: (v: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((r) => {
+        resolveFetch = r
+      }),
+    )
+
+    sort.value = [{ field: 'updatedAt', dir: 'asc' }]
+    await Promise.resolve()
+
+    expect(items.value.map((book) => book.updatedAt)).toEqual(['2024-03-01T00:00:00Z', '2024-01-01T00:00:00Z', '2024-02-01T00:00:00Z'])
+
+    resolveFetch({
+      ok: true,
+      json: () =>
+        Promise.resolve(
+          makePage(
+            [
+              makeBook({ id: 2, updatedAt: '2024-01-01T00:00:00Z' }),
+              makeBook({ id: 3, updatedAt: '2024-02-01T00:00:00Z' }),
+              makeBook({ id: 1, updatedAt: '2024-03-01T00:00:00Z' }),
+            ],
+            3,
+          ),
+        ),
+    })
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(items.value.map((book) => book.updatedAt)).toEqual(['2024-01-01T00:00:00Z', '2024-02-01T00:00:00Z', '2024-03-01T00:00:00Z'])
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useSavedViews.spec.ts b/client/src/features/book/composables/__tests__/useSavedViews.spec.ts
new file mode 100644
index 000000000..652eaf78d
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useSavedViews.spec.ts
@@ -0,0 +1,99 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { nextTick, ref } from 'vue'
+import { useSavedViews } from '../useSavedViews'
+
+const mockStorage: Record<string, string> = {}
+
+vi.stubGlobal('localStorage', {
+  getItem: (key: string) => mockStorage[key] ?? null,
+  setItem: (key: string, value: string) => {
+    mockStorage[key] = value
+  },
+  removeItem: (key: string) => {
+    delete mockStorage[key]
+  },
+  clear: () => {
+    Object.keys(mockStorage).forEach((key) => delete mockStorage[key])
+  },
+})
+
+describe('useSavedViews', () => {
+  beforeEach(() => {
+    Object.keys(mockStorage).forEach((key) => delete mockStorage[key])
+  })
+
+  it('saves views with cloned layout, sort, and filter', async () => {
+    const scopeId = ref<number | null>(12)
+    const savedViews = useSavedViews('library', scopeId)
+    const layout = {
+      columnOrder: ['title', 'authors'],
+      hiddenColumns: ['authors'],
+      columnWidths: { title: 240 },
+      pinnedColumns: { title: 'left' as const },
+    }
+    const filter = {
+      type: 'group' as const,
+      join: 'AND' as const,
+      rules: [{ type: 'rule' as const, field: 'title' as const, operator: 'contains' as const, value: 'Dune' }],
+    }
+
+    savedViews.saveView({ name: '  Review Queue  ', layout, sort: [{ field: 'title', dir: 'desc' }], filter })
+    layout.hiddenColumns.push('title')
+    await nextTick()
+
+    expect(savedViews.savedViews.value).toHaveLength(1)
+    expect(savedViews.savedViews.value[0]?.name).toBe('Review Queue')
+    expect(savedViews.savedViews.value[0]?.layout.hiddenColumns).toEqual(['authors'])
+    expect(savedViews.savedViews.value[0]?.filter).toEqual(filter)
+  })
+
+  it('duplicates, favorites, renames, and deletes saved views', async () => {
+    const scopeId = ref<number | null>(7)
+    const savedViews = useSavedViews('collection', scopeId)
+    savedViews.saveView({ name: 'Original', layout: { columnOrder: ['title'], hiddenColumns: [], columnWidths: {} }, sort: [] })
+    const id = savedViews.savedViews.value[0]?.id
+
+    savedViews.toggleFavorite(id!)
+    savedViews.renameView(id!, 'Renamed')
+    savedViews.duplicateView(id!)
+    await nextTick()
+
+    expect(savedViews.allSavedViews.value[0]?.name).toBe('Renamed')
+    expect(savedViews.allSavedViews.value[0]?.favorite).toBe(true)
+    expect(savedViews.savedViews.value).toHaveLength(2)
+
+    savedViews.deleteView(id!)
+    await nextTick()
+    expect(savedViews.savedViews.value).toHaveLength(1)
+  })
+
+  it('reloads saved views when the scope changes', async () => {
+    mockStorage['bookorbit:savedViews:smartScope:1'] = JSON.stringify([
+      { id: 'saved_view_one', name: 'One', layout: { columnOrder: ['title'], hiddenColumns: [], columnWidths: {} }, sort: [] },
+    ])
+    mockStorage['bookorbit:savedViews:smartScope:2'] = JSON.stringify([
+      { id: 'saved_view_two', name: 'Two', layout: { columnOrder: ['authors'], hiddenColumns: [], columnWidths: {} }, sort: [] },
+    ])
+
+    const scopeId = ref<number | null>(1)
+    const savedViews = useSavedViews('smartScope', scopeId)
+    expect(savedViews.allSavedViews.value[0]?.name).toBe('One')
+
+    scopeId.value = 2
+    await nextTick()
+    expect(savedViews.allSavedViews.value[0]?.name).toBe('Two')
+  })
+
+  it('imports valid views and ignores invalid ones', () => {
+    const scopeId = ref<number | null>(3)
+    const savedViews = useSavedViews('library', scopeId)
+    const imported = savedViews.importViews([
+      { id: 'saved_view_import', name: 'Imported', layout: { columnOrder: ['title'], hiddenColumns: [], columnWidths: {} }, sort: [] },
+      { id: 'bad', name: 42, layout: null, sort: [] } as never,
+    ])
+
+    expect(imported).toBe(1)
+    expect(savedViews.savedViews.value).toHaveLength(1)
+    expect(savedViews.savedViews.value[0]?.name).toBe('Imported')
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTableCellEditor.spec.ts b/client/src/features/book/composables/__tests__/useTableCellEditor.spec.ts
new file mode 100644
index 000000000..1781a655d
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTableCellEditor.spec.ts
@@ -0,0 +1,343 @@
+import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest'
+import type { BookCard } from '@bookorbit/types'
+
+const mocks = vi.hoisted(() => ({
+  api: vi.fn<(input: RequestInfo | URL, init?: RequestInit) => Promise<Response>>(),
+  toastError: vi.fn<(message: string) => void>(),
+}))
+
+vi.mock('@/lib/api', () => ({ api: mocks.api }))
+vi.mock('vue-sonner', () => ({
+  toast: {
+    error: mocks.toastError,
+    success: vi.fn<(message: string) => void>(),
+  },
+}))
+
+import { useTableCellEditor } from '../useTableCellEditor'
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    status: 'ok',
+    title: 'Test Book',
+    authors: ['Author One'],
+    seriesName: 'My Series',
+    seriesIndex: 1,
+    files: [],
+    publishedYear: 2020,
+    language: 'en',
+    genres: [],
+    tags: [],
+    rating: null,
+    readingProgress: null,
+    readStatus: null,
+    addedAt: '2024-01-01T00:00:00Z',
+    updatedAt: null,
+    metadataScore: null,
+    hasCover: false,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    ...overrides,
+  }
+}
+
+describe('useTableCellEditor', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('activateCell sets activeCellKey and clones current value', () => {
+    const editor = useTableCellEditor()
+    editor.activateCell(1, 'title', 'Hello')
+    expect(editor.activeCellKey.value).toBe('1:title')
+    expect(editor.editValue.value).toBe('Hello')
+  })
+
+  it('activateCell deep-clones array values', () => {
+    const editor = useTableCellEditor()
+    const original = ['a', 'b']
+    editor.activateCell(1, 'authors', original)
+    expect(editor.editValue.value).toEqual(original)
+    expect(editor.editValue.value).not.toBe(original)
+  })
+
+  it('cancelCell clears activeCellKey and editValue', () => {
+    const editor = useTableCellEditor()
+    editor.activateCell(1, 'title', 'Hello')
+    editor.cancelCell()
+    expect(editor.activeCellKey.value).toBeNull()
+    expect(editor.editValue.value).toBeNull()
+  })
+
+  it('cancelCellIfActive clears when source matches active cell', () => {
+    const editor = useTableCellEditor()
+    editor.activateCell(1, 'title', 'Hello')
+
+    expect(editor.cancelCellIfActive(1, 'title')).toBe(true)
+    expect(editor.activeCellKey.value).toBeNull()
+    expect(editor.editValue.value).toBeNull()
+  })
+
+  it('cancelCellIfActive ignores stale cancel from a different cell', () => {
+    const editor = useTableCellEditor()
+    editor.activateCell(2, 'title', 'Still editing')
+
+    expect(editor.cancelCellIfActive(1, 'title')).toBe(false)
+    expect(editor.activeCellKey.value).toBe('2:title')
+    expect(editor.editValue.value).toBe('Still editing')
+  })
+
+  it('isActive returns true for the active cell', () => {
+    const editor = useTableCellEditor()
+    editor.activateCell(5, 'authors', [])
+    expect(editor.isActive(5, 'authors')).toBe(true)
+    expect(editor.isActive(5, 'title')).toBe(false)
+    expect(editor.isActive(6, 'authors')).toBe(false)
+  })
+
+  it('saveCell calls PATCH /metadata for metadata fields', async () => {
+    ;(mocks.api as Mock).mockResolvedValue({ ok: true } as Response)
+    const editor = useTableCellEditor()
+    const book = makeBook()
+    const onSuccess = vi.fn<(patch: Partial<BookCard>) => void>()
+
+    await editor.saveCell(book.id, 'title', 'New Title', onSuccess)
+
+    expect(mocks.api).toHaveBeenCalledWith(
+      `/api/v1/books/${book.id}/metadata`,
+      expect.objectContaining({
+        method: 'PATCH',
+        body: JSON.stringify({ title: 'New Title' }),
+      }),
+    )
+    expect(onSuccess).toHaveBeenCalledWith({ title: 'New Title' })
+  })
+
+  it('saveCell calls PATCH /status for readStatus field', async () => {
+    ;(mocks.api as Mock).mockResolvedValue({ ok: true } as Response)
+    const editor = useTableCellEditor()
+    const book = makeBook()
+    const onSuccess = vi.fn<(patch: Partial<BookCard>) => void>()
+
+    await editor.saveCell(book.id, 'readStatus', 'reading', onSuccess)
+
+    expect(mocks.api).toHaveBeenCalledWith(
+      `/api/v1/books/${book.id}/status`,
+      expect.objectContaining({
+        method: 'PATCH',
+        body: JSON.stringify({ status: 'reading' }),
+      }),
+    )
+    expect(onSuccess).toHaveBeenCalled()
+    const arg = onSuccess.mock.calls[0]![0] as { readStatus: { status: string } }
+    expect(arg.readStatus.status).toBe('reading')
+  })
+
+  it('saveCell calls onSuccess callback and clears active cell on success', async () => {
+    ;(mocks.api as Mock).mockResolvedValue({ ok: true } as Response)
+    const editor = useTableCellEditor()
+    editor.activateCell(1, 'title', 'Old')
+    const onSuccess = vi.fn<(patch: Partial<BookCard>) => void>()
+
+    await editor.saveCell(1, 'title', 'New', onSuccess)
+
+    expect(onSuccess).toHaveBeenCalled()
+    expect(editor.activeCellKey.value).toBeNull()
+  })
+
+  it('saveCell shows error toast and clears cell on API failure', async () => {
+    ;(mocks.api as Mock).mockResolvedValue({ ok: false, status: 500, json: async () => ({}) } as Response)
+    const editor = useTableCellEditor()
+    const onSuccess = vi.fn<(patch: Partial<BookCard>) => void>()
+
+    await editor.saveCell(1, 'title', 'New', onSuccess)
+
+    expect(onSuccess).not.toHaveBeenCalled()
+    expect(mocks.toastError).toHaveBeenCalled()
+    expect(editor.activeCellKey.value).toBeNull()
+  })
+
+  it('saveCell shows metadata lock message on 409 conflict', async () => {
+    ;(mocks.api as Mock).mockResolvedValue({
+      ok: false,
+      status: 409,
+      json: async () => ({ message: 'Metadata fields are locked: publishedYear' }),
+    } as Response)
+    const editor = useTableCellEditor()
+
+    await editor.saveCell(1, 'publishedYear', null, vi.fn<(patch: Partial<BookCard>) => void>())
+
+    expect(mocks.toastError).toHaveBeenCalledWith('Metadata fields are locked: publishedYear')
+  })
+
+  it('saveCell shows error toast and clears cell on network error', async () => {
+    ;(mocks.api as Mock).mockRejectedValue(new Error('network fail'))
+    const editor = useTableCellEditor()
+    const onSuccess = vi.fn<(patch: Partial<BookCard>) => void>()
+
+    await editor.saveCell(1, 'title', 'New', onSuccess)
+
+    expect(onSuccess).not.toHaveBeenCalled()
+    expect(mocks.toastError).toHaveBeenCalled()
+  })
+
+  it('saveCell does not start if isSaving is already true', async () => {
+    let resolveFirst!: () => void
+    const slowPromise = new Promise<Response>((res) => {
+      resolveFirst = () => res({ ok: true } as Response)
+    })
+    ;(mocks.api as Mock).mockReturnValue(slowPromise)
+
+    const editor = useTableCellEditor()
+    const onSuccess1 = vi.fn<(patch: Partial<BookCard>) => void>()
+    const onSuccess2 = vi.fn<(patch: Partial<BookCard>) => void>()
+
+    const p1 = editor.saveCell(1, 'title', 'First', onSuccess1)
+    expect(editor.isSaving.value).toBe(true)
+
+    await editor.saveCell(1, 'title', 'Second', onSuccess2)
+
+    resolveFirst()
+    await p1
+
+    expect(onSuccess2).not.toHaveBeenCalled()
+    expect(mocks.api).toHaveBeenCalledTimes(1)
+  })
+
+  it('activateCell is blocked while isSaving is true', async () => {
+    let resolve!: () => void
+    const slowPromise = new Promise<Response>((res) => {
+      resolve = () => res({ ok: true } as Response)
+    })
+    ;(mocks.api as Mock).mockReturnValue(slowPromise)
+
+    const editor = useTableCellEditor()
+    const p = editor.saveCell(1, 'title', 'New', vi.fn<(patch: Partial<BookCard>) => void>())
+
+    editor.activateCell(2, 'authors', [])
+    expect(editor.activeCellKey.value).toBeNull()
+
+    resolve()
+    await p
+  })
+
+  it('navigateCell moves to the next editable column', () => {
+    const editor = useTableCellEditor()
+    const cols = ['title', 'authors', 'seriesName'] as import('../useTableColumns').ColumnId[]
+    const book = makeBook()
+    editor.activateCell(1, 'title', 'val')
+    editor.navigateCell('next', cols, book, 'title')
+    expect(editor.activeCellKey.value).toBe('1:authors')
+    expect(editor.editValue.value).toEqual(book.authors)
+  })
+
+  it('navigateCell moves to the previous editable column', () => {
+    const editor = useTableCellEditor()
+    const cols = ['title', 'authors', 'seriesName'] as import('../useTableColumns').ColumnId[]
+    const book = makeBook()
+    editor.activateCell(1, 'authors', [])
+    editor.navigateCell('prev', cols, book, 'authors')
+    expect(editor.activeCellKey.value).toBe('1:title')
+    expect(editor.editValue.value).toBe(book.title)
+  })
+
+  it('navigateCell does not wrap or error at last column (next)', () => {
+    const editor = useTableCellEditor()
+    const cols = ['title', 'authors'] as import('../useTableColumns').ColumnId[]
+    const book = makeBook()
+    editor.navigateCell('next', cols, book, 'authors')
+    expect(editor.activeCellKey.value).toBeNull()
+  })
+
+  it('navigateCell does not wrap or error at first column (prev)', () => {
+    const editor = useTableCellEditor()
+    const cols = ['title', 'authors'] as import('../useTableColumns').ColumnId[]
+    const book = makeBook()
+    editor.navigateCell('prev', cols, book, 'title')
+    expect(editor.activeCellKey.value).toBeNull()
+  })
+
+  it('navigateCell does nothing if currentColumnId not in list', () => {
+    const editor = useTableCellEditor()
+    const cols = ['title', 'authors'] as import('../useTableColumns').ColumnId[]
+    const book = makeBook()
+    editor.navigateCell('next', cols, book, 'rating')
+    expect(editor.activeCellKey.value).toBeNull()
+  })
+
+  it('navigateRowUp moves to the previous row in the same column', () => {
+    const editor = useTableCellEditor()
+    const books = [makeBook({ id: 1, title: 'Book 1' }), makeBook({ id: 2, title: 'Book 2' }), makeBook({ id: 3, title: 'Book 3' })]
+
+    editor.navigateRowUp(books, 2, 'title')
+
+    expect(editor.activeCellKey.value).toBe('1:title')
+    expect(editor.editValue.value).toBe('Book 1')
+  })
+
+  it('navigateRowDown moves to the next row in the same column', () => {
+    const editor = useTableCellEditor()
+    const books = [makeBook({ id: 1, title: 'Book 1' }), makeBook({ id: 2, title: 'Book 2' }), makeBook({ id: 3, title: 'Book 3' })]
+
+    editor.navigateRowDown(books, 2, 'title')
+
+    expect(editor.activeCellKey.value).toBe('3:title')
+    expect(editor.editValue.value).toBe('Book 3')
+  })
+
+  it('navigateRow does nothing at list boundaries', () => {
+    const editor = useTableCellEditor()
+    const books = [makeBook({ id: 1, title: 'First' }), makeBook({ id: 2, title: 'Second' })]
+
+    editor.navigateRowUp(books, 1, 'title')
+    expect(editor.activeCellKey.value).toBeNull()
+
+    editor.navigateRowDown(books, 2, 'title')
+    expect(editor.activeCellKey.value).toBeNull()
+  })
+
+  it('saveCell sends audioMetadata.narrators for narrators column', async () => {
+    ;(mocks.api as Mock).mockResolvedValue({ ok: true } as Response)
+    const editor = useTableCellEditor()
+    const book = makeBook()
+    const onSuccess = vi.fn<(patch: Partial<BookCard>) => void>()
+    const narrators = ['Narrator One', 'Narrator Two']
+
+    await editor.saveCell(book.id, 'narrators', narrators, onSuccess)
+
+    expect(mocks.api).toHaveBeenCalledWith(
+      `/api/v1/books/${book.id}/metadata`,
+      expect.objectContaining({
+        method: 'PATCH',
+        body: JSON.stringify({ audioMetadata: { narrators } }),
+      }),
+    )
+    expect(onSuccess).toHaveBeenCalledWith({ narrators })
+  })
+
+  it('saveCell does not clear a different active cell on success', async () => {
+    ;(mocks.api as Mock).mockResolvedValue({ ok: true } as Response)
+    const editor = useTableCellEditor()
+    editor.activateCell(2, 'title', 'Current Active')
+
+    await editor.saveCell(1, 'title', 'Old Cell Save', vi.fn<(patch: Partial<BookCard>) => void>())
+
+    expect(editor.activeCellKey.value).toBe('2:title')
+  })
+
+  it('saveCell does not clear a different active cell on failure', async () => {
+    ;(mocks.api as Mock).mockResolvedValue({ ok: false, status: 500, json: async () => ({}) } as Response)
+    const editor = useTableCellEditor()
+    editor.activateCell(2, 'title', 'Current Active')
+
+    await editor.saveCell(1, 'title', 'Old Cell Save', vi.fn<(patch: Partial<BookCard>) => void>())
+
+    expect(editor.activeCellKey.value).toBe('2:title')
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTableCellHelpers.spec.ts b/client/src/features/book/composables/__tests__/useTableCellHelpers.spec.ts
new file mode 100644
index 000000000..45d2a3640
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTableCellHelpers.spec.ts
@@ -0,0 +1,208 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import type { BookCard, BookMetadataLockField } from '@bookorbit/types'
+
+vi.mock('../useTableLocks', () => ({
+  useTableLocks: vi.fn<() => ReturnType<typeof import('../useTableLocks').useTableLocks>>(),
+}))
+
+vi.mock('@bookorbit/types', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@bookorbit/types')>()
+  return {
+    ...actual,
+    isAudioFormat: vi.fn<(fmt: string) => boolean>((fmt) => ['m4b', 'mp3', 'aac', 'm4a'].includes(fmt.toLowerCase())),
+  }
+})
+
+import { useTableCellHelpers } from '../useTableCellHelpers'
+import type { useTableLocks } from '../useTableLocks'
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    status: 'present',
+    title: 'Test Book',
+    authors: ['Author One'],
+    seriesName: null,
+    seriesIndex: null,
+    files: [],
+    publishedYear: null,
+    language: null,
+    genres: [],
+    rating: null,
+    readingProgress: null,
+    readStatus: null,
+    addedAt: '2025-01-01T00:00:00.000Z',
+    updatedAt: null,
+    metadataScore: null,
+    hasCover: false,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    tags: [],
+    ...overrides,
+  }
+}
+
+function makeMockLocks(overrides: Partial<ReturnType<typeof useTableLocks>> = {}): ReturnType<typeof useTableLocks> {
+  return {
+    locksByBookId: { value: new Map() } as never,
+    initBook: vi.fn<(bookId: number, fields: BookMetadataLockField[]) => void>(),
+    getFields: vi.fn<(bookId: number) => BookMetadataLockField[]>(() => []),
+    isLocked: vi.fn<(bookId: number, field: BookMetadataLockField) => boolean>(() => false),
+    isPending: vi.fn<(bookId: number) => boolean>(() => false),
+    toggleField: vi.fn<(bookId: number, field: BookMetadataLockField) => Promise<void>>(),
+    lockAll: vi.fn<(bookId: number) => Promise<void>>(),
+    unlockAll: vi.fn<(bookId: number) => Promise<void>>(),
+    resetBook: vi.fn<(bookId: number) => void>(),
+    pruneStaleEntries: vi.fn<(activeBookIds: Set<number>) => void>(),
+    ...overrides,
+  }
+}
+
+describe('useTableCellHelpers', () => {
+  let locks: ReturnType<typeof useTableLocks>
+  let isReadOnly: boolean
+  let helpers: ReturnType<typeof useTableCellHelpers>
+
+  beforeEach(() => {
+    isReadOnly = false
+    locks = makeMockLocks()
+    helpers = useTableCellHelpers(locks, () => isReadOnly)
+  })
+
+  describe('getCellValue', () => {
+    it('returns accessor result for a column with an accessor', () => {
+      const book = makeBook({ title: 'Dune' })
+      expect(helpers.getCellValue(book, 'title')).toBe('Dune')
+    })
+
+    it('returns null for a column without an accessor', () => {
+      const book = makeBook()
+      expect(helpers.getCellValue(book, 'format')).toBeNull()
+    })
+  })
+
+  describe('isCellLocked', () => {
+    it('returns false for a column without a lockField', () => {
+      const book = makeBook()
+      expect(helpers.isCellLocked(book, 'format')).toBe(false)
+    })
+
+    it('delegates to locks.isLocked for a lockable column', () => {
+      const book = makeBook({ id: 42 })
+      helpers.isCellLocked(book, 'title')
+      expect(locks.isLocked).toHaveBeenCalledWith(42, 'title')
+    })
+
+    it('returns true when locks.isLocked returns true', () => {
+      locks = makeMockLocks({ isLocked: vi.fn<(bookId: number, field: BookMetadataLockField) => boolean>(() => true) })
+      helpers = useTableCellHelpers(locks, () => false)
+      expect(helpers.isCellLocked(makeBook(), 'title')).toBe(true)
+    })
+  })
+
+  describe('isCellReadOnly', () => {
+    it('returns true for a non-editable column', () => {
+      const book = makeBook()
+      expect(helpers.isCellReadOnly(book, { id: 'format', isEditable: false })).toBe(true)
+    })
+
+    it('returns true for narrators on a non-audio book', () => {
+      const book = makeBook({ files: [{ id: 1, format: 'epub', role: 'primary', sizeBytes: 0 }] })
+      expect(helpers.isCellReadOnly(book, { id: 'narrators', isEditable: true })).toBe(true)
+    })
+
+    it('returns false for narrators on an audio book when unlocked', () => {
+      const book = makeBook({ files: [{ id: 1, format: 'm4b', role: 'primary', sizeBytes: 0 }] })
+      locks = makeMockLocks({ isLocked: vi.fn<(bookId: number, field: BookMetadataLockField) => boolean>(() => false) })
+      helpers = useTableCellHelpers(locks, () => false)
+      expect(helpers.isCellReadOnly(book, { id: 'narrators', isEditable: true })).toBe(false)
+    })
+
+    it('returns true when the cell is locked', () => {
+      locks = makeMockLocks({ isLocked: vi.fn<(bookId: number, field: BookMetadataLockField) => boolean>(() => true) })
+      helpers = useTableCellHelpers(locks, () => false)
+      const book = makeBook()
+      expect(helpers.isCellReadOnly(book, { id: 'title', isEditable: true })).toBe(true)
+    })
+
+    it('returns true when isReadOnly global flag is set', () => {
+      isReadOnly = true
+      const book = makeBook()
+      expect(helpers.isCellReadOnly(book, { id: 'title', isEditable: true })).toBe(true)
+    })
+
+    it('returns false for editable, unlocked, non-readonly cell', () => {
+      const book = makeBook({ files: [] })
+      expect(helpers.isCellReadOnly(book, { id: 'title', isEditable: true })).toBe(false)
+    })
+  })
+
+  describe('isMandatoryFieldEmpty', () => {
+    it('returns true for empty title', () => {
+      const book = makeBook({ title: '' })
+      expect(helpers.isMandatoryFieldEmpty(book, 'title')).toBe(true)
+    })
+
+    it('returns false for non-empty title', () => {
+      const book = makeBook({ title: 'Dune' })
+      expect(helpers.isMandatoryFieldEmpty(book, 'title')).toBe(false)
+    })
+
+    it('returns true for empty authors array', () => {
+      const book = makeBook({ authors: [] })
+      expect(helpers.isMandatoryFieldEmpty(book, 'authors')).toBe(true)
+    })
+
+    it('returns false for non-empty authors', () => {
+      const book = makeBook({ authors: ['Frank Herbert'] })
+      expect(helpers.isMandatoryFieldEmpty(book, 'authors')).toBe(false)
+    })
+
+    it('returns false for non-mandatory columns', () => {
+      const book = makeBook({ rating: null })
+      expect(helpers.isMandatoryFieldEmpty(book, 'rating')).toBe(false)
+    })
+  })
+
+  describe('isBookFileMissing', () => {
+    it('returns true for status missing', () => {
+      expect(helpers.isBookFileMissing(makeBook({ status: 'missing' }))).toBe(true)
+    })
+
+    it('returns false for status present', () => {
+      expect(helpers.isBookFileMissing(makeBook({ status: 'present' }))).toBe(false)
+    })
+  })
+
+  describe('getPinnedCellBackground', () => {
+    it('returns base background for normal cell', () => {
+      const book = makeBook({ title: 'Dune' })
+      const bg = helpers.getPinnedCellBackground(book, 'title', false)
+      expect(bg).toBe('var(--background)')
+    })
+
+    it('returns primary tinted background for selected cell', () => {
+      const book = makeBook({ title: 'Dune' })
+      const bg = helpers.getPinnedCellBackground(book, 'title', true)
+      expect(bg).toContain('var(--primary)')
+    })
+
+    it('returns amber tinted background for mandatory empty cell when not selected', () => {
+      const book = makeBook({ title: '' })
+      const bg = helpers.getPinnedCellBackground(book, 'title', false)
+      expect(bg).toContain('oklch')
+    })
+
+    it('returns combined background for selected + mandatory empty cell', () => {
+      const book = makeBook({ title: '' })
+      const bg = helpers.getPinnedCellBackground(book, 'title', true)
+      expect(bg).toContain('var(--primary)')
+      expect(bg).toContain('oklch')
+    })
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTableColumns.spec.ts b/client/src/features/book/composables/__tests__/useTableColumns.spec.ts
new file mode 100644
index 000000000..7aa9c06f1
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTableColumns.spec.ts
@@ -0,0 +1,366 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+const mockStorage: Record<string, string> = {}
+
+vi.stubGlobal('localStorage', {
+  getItem: (key: string) => mockStorage[key] ?? null,
+  setItem: (key: string, value: string) => {
+    mockStorage[key] = value
+  },
+  removeItem: (key: string) => {
+    delete mockStorage[key]
+  },
+  clear: () => {
+    Object.keys(mockStorage).forEach((k) => delete mockStorage[k])
+  },
+})
+
+import { useTableColumns, COLUMN_DEFS, LOCK_ROW_COLUMN_DEF, type ColumnId } from '../useTableColumns'
+
+const ALL_IDS = COLUMN_DEFS.map((c) => c.id) as ColumnId[]
+
+describe('useTableColumns', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+    Object.keys(mockStorage).forEach((k) => delete mockStorage[k])
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+    vi.restoreAllMocks()
+  })
+
+  it('returns default visible columns', () => {
+    const { visibleColumns } = useTableColumns('library')
+    const ids = visibleColumns.value.map((c) => c.id)
+    const defaultVisible = COLUMN_DEFS.filter((c) => c.defaultVisible).map((c) => c.id)
+    expect(ids).toEqual(defaultVisible)
+  })
+
+  it('returns all columns with visible flag in allColumns', () => {
+    const { allColumns } = useTableColumns('library')
+    expect(allColumns.value).toHaveLength(COLUMN_DEFS.length)
+    const hiddenIds = COLUMN_DEFS.filter((c) => !c.defaultVisible).map((c) => c.id)
+    for (const col of allColumns.value) {
+      expect(col.visible).toBe(!hiddenIds.includes(col.id))
+    }
+  })
+
+  it('toggleColumn hides a visible column', () => {
+    const { visibleColumns, toggleColumn } = useTableColumns('library')
+    const titleVisible = visibleColumns.value.some((c) => c.id === 'title')
+    expect(titleVisible).toBe(true)
+
+    toggleColumn('title')
+
+    const titleVisibleAfter = visibleColumns.value.some((c) => c.id === 'title')
+    expect(titleVisibleAfter).toBe(false)
+  })
+
+  it('toggleColumn shows a hidden column', () => {
+    const { visibleColumns, allColumns, toggleColumn } = useTableColumns('library')
+    const hiddenCol = allColumns.value.find((c) => !c.visible)!
+    expect(hiddenCol).toBeDefined()
+
+    toggleColumn(hiddenCol.id)
+
+    const nowVisible = visibleColumns.value.some((c) => c.id === hiddenCol.id)
+    expect(nowVisible).toBe(true)
+  })
+
+  it('setColumnOrder reorders columns', () => {
+    const { allColumns, setColumnOrder } = useTableColumns('library')
+    const ids = allColumns.value.map((c) => c.id)
+    const reversed = [...ids].reverse() as ColumnId[]
+
+    setColumnOrder(reversed)
+
+    expect(allColumns.value.map((c) => c.id)).toEqual(reversed)
+  })
+
+  it('setColumnOrder updates visibleColumns order', () => {
+    const { visibleColumns, allColumns, setColumnOrder } = useTableColumns('library')
+    const unpinnedVisible = allColumns.value.filter((c) => c.pinned === null && c.visible)
+    const reversedAll = allColumns.value.map((c) => c.id).reverse() as ColumnId[]
+
+    setColumnOrder(reversedAll)
+
+    const newVisible = visibleColumns.value.filter((c) => c.pinned === null).map((c) => c.id)
+    const reversedUnpinnedVisible = unpinnedVisible.map((c) => c.id).reverse()
+    expect(newVisible).toEqual(reversedUnpinnedVisible)
+  })
+
+  it('setColumnOrder persists the new order to localStorage', async () => {
+    const { allColumns, setColumnOrder } = useTableColumns('library')
+    const ids = allColumns.value.map((c) => c.id) as ColumnId[]
+    const swapped = [...ids]
+    const unpinnedIdxs = swapped.reduce<number[]>((acc, id, i) => {
+      const col = allColumns.value.find((c) => c.id === id)
+      if (col?.pinned === null) acc.push(i)
+      return acc
+    }, [])
+    if (unpinnedIdxs.length >= 2) {
+      const tmp = swapped[unpinnedIdxs[0]!]!
+      swapped[unpinnedIdxs[0]!] = swapped[unpinnedIdxs[1]!]!
+      swapped[unpinnedIdxs[1]!] = tmp
+    }
+
+    setColumnOrder(swapped)
+    await nextTick()
+    vi.advanceTimersByTime(600)
+    await nextTick()
+
+    const raw = mockStorage['bookorbit:tableLayout:library']
+    expect(raw).toBeDefined()
+    const parsed = JSON.parse(raw!)
+    expect(parsed.columnOrder).toEqual(swapped)
+  })
+
+  it('setColumnOrder with unknown IDs: loadLayout filters them out and appends missing', () => {
+    const knownIds = COLUMN_DEFS.map((c) => c.id) as ColumnId[]
+    mockStorage['bookorbit:tableLayout:library'] = JSON.stringify({
+      columnOrder: ['unknown_col', ...knownIds],
+      hiddenColumns: [],
+      columnWidths: {},
+    })
+    const { allColumns } = useTableColumns('library')
+    expect(allColumns.value).toHaveLength(COLUMN_DEFS.length)
+    const ids = allColumns.value.map((c) => c.id)
+    expect(ids).not.toContain('unknown_col')
+  })
+
+  it('loadLayout initializes pinnedColumns as empty object when missing from storage', () => {
+    const knownIds = COLUMN_DEFS.map((c) => c.id) as ColumnId[]
+    mockStorage['bookorbit:tableLayout:library'] = JSON.stringify({
+      columnOrder: knownIds,
+      hiddenColumns: [],
+      columnWidths: {},
+    })
+    const { pinColumn, visibleColumns } = useTableColumns('library')
+    pinColumn('title', 'left')
+    const titleCol = visibleColumns.value.find((c) => c.id === 'title')
+    expect(titleCol?.pinned).toBe('left')
+  })
+
+  it('loadLayout filters invalid pinnedColumns entries and keeps explicit null overrides', () => {
+    const knownIds = COLUMN_DEFS.map((c) => c.id) as ColumnId[]
+    mockStorage['bookorbit:tableLayout:library'] = JSON.stringify({
+      columnOrder: knownIds,
+      hiddenColumns: [],
+      columnWidths: {},
+      pinnedColumns: { unknown_col: 'left', title: null, rating: 'right', authors: 'center' },
+    })
+    const { visibleColumns } = useTableColumns('library')
+    const titleCol = visibleColumns.value.find((c) => c.id === 'title')
+    const ratingCol = visibleColumns.value.find((c) => c.id === 'rating')
+    expect(titleCol?.pinned).toBeNull()
+    expect(ratingCol?.pinned).toBe('right')
+  })
+
+  it('setColumnWidth updates the width for a column', () => {
+    const { visibleColumns, setColumnWidth } = useTableColumns('library')
+    const before = visibleColumns.value.find((c) => c.id === 'title')!.defaultWidth
+    setColumnWidth('title', before + 100)
+    const after = visibleColumns.value.find((c) => c.id === 'title')!.defaultWidth
+    expect(after).toBe(before + 100)
+  })
+
+  it('setColumnWidth does not go below minWidth', () => {
+    const { visibleColumns, setColumnWidth } = useTableColumns('library')
+    const def = COLUMN_DEFS.find((c) => c.id === 'title')!
+    setColumnWidth('title', 1)
+    const after = visibleColumns.value.find((c) => c.id === 'title')!.defaultWidth
+    expect(after).toBeGreaterThanOrEqual(def.minWidth)
+  })
+
+  it('persists layout to localStorage', async () => {
+    const { toggleColumn } = useTableColumns('library')
+    toggleColumn('title')
+    await nextTick()
+    vi.advanceTimersByTime(600)
+    await nextTick()
+    const raw = mockStorage['bookorbit:tableLayout:library']
+    expect(raw).toBeDefined()
+    const parsed = JSON.parse(raw!)
+    expect(parsed.hiddenColumns).toContain('title')
+  })
+
+  it('restores layout from localStorage on init', () => {
+    mockStorage['bookorbit:tableLayout:library'] = JSON.stringify({
+      columnOrder: ALL_IDS,
+      hiddenColumns: ['language', 'addedAt'],
+      columnWidths: { title: 999 },
+    })
+    const { visibleColumns } = useTableColumns('library')
+    expect(visibleColumns.value.some((c) => c.id === 'language')).toBe(false)
+    expect(visibleColumns.value.some((c) => c.id === 'addedAt')).toBe(false)
+    expect(visibleColumns.value.find((c) => c.id === 'title')?.defaultWidth).toBe(999)
+  })
+
+  it('per-view-type isolation: library and collection layouts do not share state', () => {
+    const lib = useTableColumns('library')
+    const col = useTableColumns('collection')
+
+    lib.toggleColumn('language')
+
+    expect(lib.allColumns.value.find((c) => c.id === 'language')?.visible).toBe(true)
+    expect(col.allColumns.value.find((c) => c.id === 'language')?.visible).toBe(COLUMN_DEFS.find((c) => c.id === 'language')!.defaultVisible)
+  })
+
+  it('resetLayout restores all defaults and removes custom overrides', async () => {
+    const { toggleColumn, resetLayout, allColumns } = useTableColumns('library')
+    // Hide a default-visible column to create a custom state
+    toggleColumn('title')
+    await nextTick()
+    expect(allColumns.value.find((c) => c.id === 'title')?.visible).toBe(false)
+
+    resetLayout()
+    await nextTick()
+
+    // After reset, title should be visible again (back to default)
+    const titleVisible = allColumns.value.find((c) => c.id === 'title')?.visible
+    expect(titleVisible).toBe(COLUMN_DEFS.find((c) => c.id === 'title')!.defaultVisible)
+    // Hidden columns should match default set only
+    const hiddenIds = allColumns.value.filter((c) => !c.visible).map((c) => c.id)
+    const expectedHidden = COLUMN_DEFS.filter((c) => !c.defaultVisible).map((c) => c.id)
+    expect(hiddenIds.sort()).toEqual(expectedHidden.sort())
+  })
+
+  it('falls back to defaults when persisted JSON is invalid', () => {
+    mockStorage['bookorbit:tableLayout:library'] = '{ invalid json }'
+    const { allColumns } = useTableColumns('library')
+    expect(allColumns.value).toHaveLength(COLUMN_DEFS.length)
+  })
+
+  it('falls back gracefully when persisted columnOrder has unknown IDs', () => {
+    mockStorage['bookorbit:tableLayout:library'] = JSON.stringify({
+      columnOrder: ['nonexistent_col', 'title'],
+      hiddenColumns: [],
+      columnWidths: {},
+    })
+    const { allColumns } = useTableColumns('library')
+    expect(allColumns.value).toHaveLength(COLUMN_DEFS.length)
+  })
+
+  it('keeps the title column unpinned by default', () => {
+    const title = COLUMN_DEFS.find((column) => column.id === 'title')
+    expect(title?.pinned).toBeNull()
+  })
+
+  it('maps language and reading progress columns to explicit sort fields', () => {
+    const language = COLUMN_DEFS.find((column) => column.id === 'language')
+    const readingProgress = COLUMN_DEFS.find((column) => column.id === 'readingProgress')
+
+    expect(language?.sortField).toBe('language')
+    expect(readingProgress?.sortField).toBe('readProgress')
+  })
+
+  it('setLayout replaces the full layout state', async () => {
+    const { allColumns, visibleColumns, setLayout } = useTableColumns('library')
+
+    setLayout({
+      columnOrder: ['title', ...ALL_IDS.filter((id) => id !== 'title')],
+      hiddenColumns: ['authors', 'language'],
+      columnWidths: { title: 720 },
+    })
+    await nextTick()
+
+    expect(allColumns.value[0]?.id).toBe('title')
+    expect(allColumns.value.find((column) => column.id === 'authors')?.visible).toBe(false)
+    expect(allColumns.value.find((column) => column.id === 'language')?.visible).toBe(false)
+    expect(visibleColumns.value.find((column) => column.id === 'title')?.defaultWidth).toBe(720)
+  })
+
+  it('pinColumn pins unpinned column to specified side', () => {
+    const { pinColumn, allColumns } = useTableColumns('library')
+    pinColumn('rating', 'left')
+    const col = allColumns.value.find((c) => c.id === 'rating')
+    expect(col?.pinned).toBe('left')
+  })
+
+  it('unpinColumn restores column to def default pinned state', () => {
+    const { pinColumn, unpinColumn, allColumns } = useTableColumns('library')
+    pinColumn('rating', 'left')
+    expect(allColumns.value.find((c) => c.id === 'rating')?.pinned).toBe('left')
+    unpinColumn('rating')
+    const def = COLUMN_DEFS.find((c) => c.id === 'rating')
+    expect(allColumns.value.find((c) => c.id === 'rating')?.pinned).toBe(def?.pinned ?? null)
+  })
+
+  it('unpinColumn keeps title unpinned', () => {
+    const { unpinColumn, allColumns } = useTableColumns('library')
+    const before = allColumns.value.find((c) => c.id === 'title')
+    expect(before?.pinned).toBeNull()
+
+    unpinColumn('title')
+
+    const after = allColumns.value.find((c) => c.id === 'title')
+    expect(after?.pinned).toBeNull()
+  })
+
+  it('pinColumn enforces max 3 per side', () => {
+    const { pinColumn, allColumns } = useTableColumns('library')
+    pinColumn('rating', 'right')
+    pinColumn('authors', 'right')
+    pinColumn('seriesName', 'right')
+    pinColumn('genres', 'right')
+    const pinnedRight = allColumns.value.filter((c) => c.pinned === 'right')
+    expect(pinnedRight.some((c) => c.id === 'genres')).toBe(false)
+  })
+
+  it('setLayout with pinnedColumns restores pin state', async () => {
+    const { setLayout, allColumns } = useTableColumns('library')
+    setLayout({
+      columnOrder: ALL_IDS,
+      hiddenColumns: [],
+      columnWidths: {},
+      pinnedColumns: { rating: 'left' },
+    })
+    await nextTick()
+    expect(allColumns.value.find((c) => c.id === 'rating')?.pinned).toBe('left')
+  })
+
+  it('resetLayout clears pinnedColumns', async () => {
+    const { pinColumn, resetLayout, allColumns } = useTableColumns('library')
+    pinColumn('rating', 'left')
+    resetLayout()
+    await nextTick()
+    const col = allColumns.value.find((c) => c.id === 'rating')
+    const def = COLUMN_DEFS.find((c) => c.id === 'rating')
+    expect(col?.pinned).toBe(def?.pinned ?? null)
+  })
+
+  it('setColumnWidth clamps to upper bound of 800', () => {
+    const { setColumnWidth, visibleColumns } = useTableColumns('library')
+    setColumnWidth('title', 1500)
+    const title = visibleColumns.value.find((c) => c.id === 'title')
+    expect(title?.defaultWidth).toBeLessThanOrEqual(800)
+  })
+})
+
+describe('LOCK_ROW_COLUMN_DEF', () => {
+  it('has id lockRow', () => {
+    expect(LOCK_ROW_COLUMN_DEF.id).toBe('lockRow')
+  })
+
+  it('has cellType lockRow', () => {
+    expect(LOCK_ROW_COLUMN_DEF.cellType).toBe('lockRow')
+  })
+
+  it('is pinned left', () => {
+    expect(LOCK_ROW_COLUMN_DEF.pinned).toBe('left')
+  })
+
+  it('is not in the default visible column set', () => {
+    expect(LOCK_ROW_COLUMN_DEF.defaultVisible).toBe(false)
+  })
+
+  it('is not included in COLUMN_DEFS', () => {
+    expect(COLUMN_DEFS.find((c) => c.id === 'lockRow')).toBeUndefined()
+  })
+
+  it('has a compact width suitable for icon button', () => {
+    expect(LOCK_ROW_COLUMN_DEF.defaultWidth).toBeLessThanOrEqual(48)
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTableCoverDialog.spec.ts b/client/src/features/book/composables/__tests__/useTableCoverDialog.spec.ts
new file mode 100644
index 000000000..040335201
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTableCoverDialog.spec.ts
@@ -0,0 +1,94 @@
+import { describe, it, expect, beforeEach } from 'vitest'
+import { useTableCoverDialog } from '../useTableCoverDialog'
+import type { BookCard } from '@bookorbit/types'
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    status: 'present',
+    title: 'Test Book',
+    authors: ['Author One'],
+    seriesName: null,
+    seriesIndex: null,
+    files: [],
+    publishedYear: null,
+    language: null,
+    genres: [],
+    rating: null,
+    readingProgress: null,
+    readStatus: null,
+    addedAt: '2025-01-01T00:00:00.000Z',
+    updatedAt: null,
+    metadataScore: null,
+    hasCover: false,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    tags: [],
+    ...overrides,
+  }
+}
+
+describe('useTableCoverDialog', () => {
+  let selectionMode: boolean
+  let emittedUpdates: BookCard[]
+  let books: BookCard[]
+  let dialog: ReturnType<typeof useTableCoverDialog>
+
+  beforeEach(() => {
+    selectionMode = false
+    emittedUpdates = []
+    books = [makeBook({ id: 1, hasCover: false }), makeBook({ id: 2, hasCover: true })]
+    dialog = useTableCoverDialog(
+      () => selectionMode,
+      (updated) => emittedUpdates.push(updated),
+      () => books,
+    )
+  })
+
+  it('starts with coverDialogBook as null', () => {
+    expect(dialog.coverDialogBook.value).toBeNull()
+  })
+
+  it('handleCoverClick sets coverDialogBook when not in selection mode', () => {
+    const book = makeBook({ id: 1 })
+    dialog.handleCoverClick(book)
+    expect(dialog.coverDialogBook.value).toEqual(book)
+  })
+
+  it('handleCoverClick does nothing when in selection mode', () => {
+    selectionMode = true
+    dialog.handleCoverClick(makeBook({ id: 1 }))
+    expect(dialog.coverDialogBook.value).toBeNull()
+  })
+
+  it('handleCoverDialogUpdateBook emits updated book with new hasCover', () => {
+    dialog.handleCoverDialogUpdateBook(1, true)
+    expect(emittedUpdates).toHaveLength(1)
+    expect(emittedUpdates[0]!.id).toBe(1)
+    expect(emittedUpdates[0]!.hasCover).toBe(true)
+  })
+
+  it('handleCoverDialogUpdateBook does not emit when book is not in books list', () => {
+    dialog.handleCoverDialogUpdateBook(99, true)
+    expect(emittedUpdates).toHaveLength(0)
+  })
+
+  it('handleCoverDialogUpdateBook updates the open coverDialogBook hasCover', () => {
+    const book = makeBook({ id: 1, hasCover: false })
+    dialog.handleCoverClick(book)
+    dialog.handleCoverDialogUpdateBook(1, true)
+    expect(dialog.coverDialogBook.value?.hasCover).toBe(true)
+  })
+
+  it('handleCoverDialogUpdateBook does not alter coverDialogBook for different id', () => {
+    const book = makeBook({ id: 2, hasCover: false })
+    dialog.handleCoverClick(book)
+    dialog.handleCoverDialogUpdateBook(1, true)
+    expect(dialog.coverDialogBook.value?.hasCover).toBe(false)
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTableDragReorder.spec.ts b/client/src/features/book/composables/__tests__/useTableDragReorder.spec.ts
new file mode 100644
index 000000000..f85ae4186
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTableDragReorder.spec.ts
@@ -0,0 +1,228 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { ref, type Ref } from 'vue'
+import { useTableDragReorder } from '../useTableDragReorder'
+import type { ColumnDef, ColumnId } from '../useTableColumns'
+
+function makeColumns(): ColumnDef[] {
+  return [
+    { id: 'cover', header: 'Cover', defaultWidth: 60, minWidth: 40, cellType: 'cover', pinned: 'left', isEditable: false },
+    { id: 'title', header: 'Title', defaultWidth: 200, minWidth: 80, cellType: 'text', pinned: null, isEditable: true },
+    { id: 'authors', header: 'Authors', defaultWidth: 150, minWidth: 80, cellType: 'chips', pinned: null, isEditable: true },
+    { id: 'rating', header: 'Rating', defaultWidth: 80, minWidth: 60, cellType: 'rating', pinned: null, isEditable: true },
+    { id: 'actions', header: '', defaultWidth: 50, minWidth: 50, cellType: 'actions', pinned: 'right', isEditable: false },
+  ] as ColumnDef[]
+}
+
+describe('useTableDragReorder', () => {
+  let allColumns: Ref<ColumnDef[]>
+  let setOrderSpy: (order: ColumnId[]) => void
+
+  beforeEach(() => {
+    allColumns = ref(makeColumns())
+    setOrderSpy = vi.fn<(order: ColumnId[]) => void>()
+  })
+
+  it('isDraggableCol returns false for pinned columns', () => {
+    const { isDraggableCol } = useTableDragReorder(allColumns, setOrderSpy)
+    expect(isDraggableCol(allColumns.value[0]!)).toBe(false)
+    expect(isDraggableCol(allColumns.value[4]!)).toBe(false)
+    expect(isDraggableCol(allColumns.value[1]!)).toBe(true)
+  })
+
+  it('drag start sets dragSourceColId', () => {
+    const { handleColDragStart, dragSourceColId } = useTableDragReorder(allColumns, setOrderSpy)
+    const event = { dataTransfer: { effectAllowed: '', setData: vi.fn<(format: string, data: string) => void>() } } as unknown as DragEvent
+    handleColDragStart(event, 'title')
+    expect(dragSourceColId.value).toBe('title')
+    expect(event.dataTransfer!.effectAllowed).toBe('move')
+  })
+
+  it('drag over sets drop target and side', () => {
+    const { handleColDragStart, handleColDragOver, dropTargetColId, dropSide } = useTableDragReorder(allColumns, setOrderSpy)
+    handleColDragStart(
+      { dataTransfer: { effectAllowed: '', setData: vi.fn<(format: string, data: string) => void>() } } as unknown as DragEvent,
+      'title',
+    )
+
+    const target = document.createElement('div')
+    vi.spyOn(target, 'getBoundingClientRect').mockReturnValue({
+      left: 100,
+      width: 200,
+      top: 0,
+      right: 300,
+      bottom: 30,
+      height: 30,
+      x: 100,
+      y: 0,
+      toJSON: vi.fn<() => object>(),
+    })
+
+    const overEvent = {
+      clientX: 150,
+      preventDefault: vi.fn<() => void>(),
+      currentTarget: target,
+      dataTransfer: { dropEffect: '' },
+    } as unknown as DragEvent
+    handleColDragOver(overEvent, allColumns.value[2]!)
+
+    expect(dropTargetColId.value).toBe('authors')
+    expect(dropSide.value).toBe('before')
+  })
+
+  it('drag over on the right side of target sets "after"', () => {
+    const { handleColDragStart, handleColDragOver, dropSide } = useTableDragReorder(allColumns, setOrderSpy)
+    handleColDragStart(
+      { dataTransfer: { effectAllowed: '', setData: vi.fn<(format: string, data: string) => void>() } } as unknown as DragEvent,
+      'title',
+    )
+
+    const target = document.createElement('div')
+    vi.spyOn(target, 'getBoundingClientRect').mockReturnValue({
+      left: 100,
+      width: 200,
+      top: 0,
+      right: 300,
+      bottom: 30,
+      height: 30,
+      x: 100,
+      y: 0,
+      toJSON: vi.fn<() => object>(),
+    })
+
+    const overEvent = {
+      clientX: 250,
+      preventDefault: vi.fn<() => void>(),
+      currentTarget: target,
+      dataTransfer: { dropEffect: '' },
+    } as unknown as DragEvent
+    handleColDragOver(overEvent, allColumns.value[2]!)
+    expect(dropSide.value).toBe('after')
+  })
+
+  it('drag over same column does nothing', () => {
+    const { handleColDragStart, handleColDragOver, dropTargetColId } = useTableDragReorder(allColumns, setOrderSpy)
+    handleColDragStart(
+      { dataTransfer: { effectAllowed: '', setData: vi.fn<(format: string, data: string) => void>() } } as unknown as DragEvent,
+      'title',
+    )
+
+    const target = document.createElement('div')
+    const overEvent = {
+      clientX: 150,
+      preventDefault: vi.fn<() => void>(),
+      currentTarget: target,
+      dataTransfer: { dropEffect: '' },
+    } as unknown as DragEvent
+    handleColDragOver(overEvent, allColumns.value[1]!)
+    expect(dropTargetColId.value).toBeNull()
+  })
+
+  it('drag leave clears drop target for matching column', () => {
+    const { handleColDragStart, handleColDragOver, handleColDragLeave, dropTargetColId } = useTableDragReorder(allColumns, setOrderSpy)
+    handleColDragStart(
+      { dataTransfer: { effectAllowed: '', setData: vi.fn<(format: string, data: string) => void>() } } as unknown as DragEvent,
+      'title',
+    )
+
+    const target = document.createElement('div')
+    vi.spyOn(target, 'getBoundingClientRect').mockReturnValue({
+      left: 100,
+      width: 200,
+      top: 0,
+      right: 300,
+      bottom: 30,
+      height: 30,
+      x: 100,
+      y: 0,
+      toJSON: vi.fn<() => object>(),
+    })
+    handleColDragOver(
+      { clientX: 150, preventDefault: vi.fn<() => void>(), currentTarget: target, dataTransfer: { dropEffect: '' } } as unknown as DragEvent,
+      allColumns.value[2]!,
+    )
+    expect(dropTargetColId.value).toBe('authors')
+
+    handleColDragLeave('authors')
+    expect(dropTargetColId.value).toBeNull()
+  })
+
+  it('drag leave ignores non-matching column', () => {
+    const { handleColDragStart, handleColDragOver, handleColDragLeave, dropTargetColId } = useTableDragReorder(allColumns, setOrderSpy)
+    handleColDragStart(
+      { dataTransfer: { effectAllowed: '', setData: vi.fn<(format: string, data: string) => void>() } } as unknown as DragEvent,
+      'title',
+    )
+
+    const target = document.createElement('div')
+    vi.spyOn(target, 'getBoundingClientRect').mockReturnValue({
+      left: 100,
+      width: 200,
+      top: 0,
+      right: 300,
+      bottom: 30,
+      height: 30,
+      x: 100,
+      y: 0,
+      toJSON: vi.fn<() => object>(),
+    })
+    handleColDragOver(
+      { clientX: 150, preventDefault: vi.fn<() => void>(), currentTarget: target, dataTransfer: { dropEffect: '' } } as unknown as DragEvent,
+      allColumns.value[2]!,
+    )
+
+    handleColDragLeave('rating')
+    expect(dropTargetColId.value).toBe('authors')
+  })
+
+  it('drop reorders columns preserving pinned', () => {
+    const { handleColDragStart, handleColDragOver, handleColDrop, dragSourceColId } = useTableDragReorder(allColumns, setOrderSpy)
+    handleColDragStart(
+      { dataTransfer: { effectAllowed: '', setData: vi.fn<(format: string, data: string) => void>() } } as unknown as DragEvent,
+      'rating',
+    )
+
+    const target = document.createElement('div')
+    vi.spyOn(target, 'getBoundingClientRect').mockReturnValue({
+      left: 100,
+      width: 200,
+      top: 0,
+      right: 300,
+      bottom: 30,
+      height: 30,
+      x: 100,
+      y: 0,
+      toJSON: vi.fn<() => object>(),
+    })
+    handleColDragOver(
+      { clientX: 150, preventDefault: vi.fn<() => void>(), currentTarget: target, dataTransfer: { dropEffect: '' } } as unknown as DragEvent,
+      allColumns.value[1]!,
+    )
+
+    handleColDrop({ preventDefault: vi.fn<() => void>() } as unknown as DragEvent, 'title')
+    expect(setOrderSpy).toHaveBeenCalledWith(['cover', 'rating', 'title', 'authors', 'actions'])
+    expect(dragSourceColId.value).toBeNull()
+  })
+
+  it('drop same column resets state without calling setColumnOrder', () => {
+    const { handleColDragStart, handleColDrop, dragSourceColId } = useTableDragReorder(allColumns, setOrderSpy)
+    handleColDragStart(
+      { dataTransfer: { effectAllowed: '', setData: vi.fn<(format: string, data: string) => void>() } } as unknown as DragEvent,
+      'title',
+    )
+    handleColDrop({ preventDefault: vi.fn<() => void>() } as unknown as DragEvent, 'title')
+    expect(setOrderSpy).not.toHaveBeenCalled()
+    expect(dragSourceColId.value).toBeNull()
+  })
+
+  it('dragEnd resets all state', () => {
+    const { handleColDragStart, handleColDragEnd, dragSourceColId, dropTargetColId, dropSide } = useTableDragReorder(allColumns, setOrderSpy)
+    handleColDragStart(
+      { dataTransfer: { effectAllowed: '', setData: vi.fn<(format: string, data: string) => void>() } } as unknown as DragEvent,
+      'title',
+    )
+    handleColDragEnd()
+    expect(dragSourceColId.value).toBeNull()
+    expect(dropTargetColId.value).toBeNull()
+    expect(dropSide.value).toBeNull()
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTableKeyboard.spec.ts b/client/src/features/book/composables/__tests__/useTableKeyboard.spec.ts
new file mode 100644
index 000000000..6acee2270
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTableKeyboard.spec.ts
@@ -0,0 +1,281 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { ref, type Ref } from 'vue'
+import type { BookCard } from '@bookorbit/types'
+import { useTableKeyboard } from '../useTableKeyboard'
+import type { ColumnDef, ColumnId } from '../useTableColumns'
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    title: 'Test Book',
+    authors: ['Author A'],
+    genres: [],
+    tags: [],
+    files: [],
+    rating: 4,
+    pageCount: 300,
+    readStatus: { status: 'unread', progress: 0 },
+    ...overrides,
+  } as BookCard
+}
+
+function makeColumns(): ColumnDef[] {
+  return [
+    { id: 'title', header: 'Title', defaultWidth: 200, minWidth: 80, cellType: 'text', pinned: null, isEditable: true },
+    { id: 'authors', header: 'Authors', defaultWidth: 150, minWidth: 80, cellType: 'chips', pinned: null, isEditable: true },
+    { id: 'rating', header: 'Rating', defaultWidth: 80, minWidth: 60, cellType: 'rating', pinned: null, isEditable: false },
+  ] as ColumnDef[]
+}
+
+describe('useTableKeyboard', () => {
+  let books: BookCard[]
+  let displayColumns: Ref<ColumnDef[]>
+  let activeCellKey: Ref<string | null>
+  let onActivate: (book: BookCard, colId: ColumnId) => void
+  let onSelect: (id: number, event: MouseEvent) => void
+  let scrollToIndexSpy: ReturnType<typeof vi.fn>
+
+  function createKeyboard() {
+    return useTableKeyboard({
+      books: () => books,
+      displayColumns,
+      activeCellKey,
+      selectionMode: () => false,
+      isReadOnly: () => false,
+      virtualizer: { value: { scrollToIndex: scrollToIndexSpy } } as unknown as ReturnType<typeof import('@tanstack/vue-virtual').useVirtualizer>,
+      isCellReadOnly: () => false,
+      onActivate,
+      onSelect,
+    })
+  }
+
+  function keyEvent(key: string, extras: Partial<KeyboardEvent> = {}): KeyboardEvent {
+    return { key, preventDefault: vi.fn<() => void>(), ctrlKey: false, metaKey: false, ...extras } as unknown as KeyboardEvent
+  }
+
+  beforeEach(() => {
+    books = [makeBook({ id: 1, title: 'Book A' }), makeBook({ id: 2, title: 'Book B' }), makeBook({ id: 3, title: 'Book C' })]
+    displayColumns = ref(makeColumns())
+    activeCellKey = ref(null)
+    onActivate = vi.fn<(book: BookCard, colId: ColumnId) => void>()
+    onSelect = vi.fn<(id: number, event: MouseEvent) => void>()
+    scrollToIndexSpy = vi.fn<() => void>()
+  })
+
+  it('ArrowDown initializes focus to first row first col', () => {
+    const { handleTableKeydown, focusedRowIndex, focusedColIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    expect(focusedRowIndex.value).toBe(0)
+    expect(focusedColIndex.value).toBe(0)
+  })
+
+  it('ArrowDown moves focus down', () => {
+    const { handleTableKeydown, focusedRowIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowDown'))
+    expect(focusedRowIndex.value).toBe(1)
+  })
+
+  it('ArrowDown clamps to last row', () => {
+    const { handleTableKeydown, focusedRowIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowDown'))
+    expect(focusedRowIndex.value).toBe(2)
+  })
+
+  it('ArrowUp moves focus up', () => {
+    const { handleTableKeydown, focusedRowIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowUp'))
+    expect(focusedRowIndex.value).toBe(0)
+  })
+
+  it('ArrowUp clamps to first row', () => {
+    const { handleTableKeydown, focusedRowIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowUp'))
+    handleTableKeydown(keyEvent('ArrowUp'))
+    expect(focusedRowIndex.value).toBe(0)
+  })
+
+  it('ArrowRight moves col focus', () => {
+    const { handleTableKeydown, focusedColIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowRight'))
+    expect(focusedColIndex.value).toBe(1)
+  })
+
+  it('ArrowRight clamps to last column', () => {
+    const { handleTableKeydown, focusedColIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowRight'))
+    handleTableKeydown(keyEvent('ArrowRight'))
+    handleTableKeydown(keyEvent('ArrowRight'))
+    expect(focusedColIndex.value).toBe(2)
+  })
+
+  it('ArrowLeft moves col focus back', () => {
+    const { handleTableKeydown, focusedColIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowRight'))
+    handleTableKeydown(keyEvent('ArrowLeft'))
+    expect(focusedColIndex.value).toBe(0)
+  })
+
+  it('Home jumps to first column', () => {
+    const { handleTableKeydown, focusedColIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowRight'))
+    handleTableKeydown(keyEvent('ArrowRight'))
+    handleTableKeydown(keyEvent('Home'))
+    expect(focusedColIndex.value).toBe(0)
+  })
+
+  it('Ctrl+Home jumps to first row and first column', () => {
+    const { handleTableKeydown, focusedRowIndex, focusedColIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('ArrowRight'))
+    handleTableKeydown(keyEvent('Home', { ctrlKey: true }))
+    expect(focusedRowIndex.value).toBe(0)
+    expect(focusedColIndex.value).toBe(0)
+  })
+
+  it('End jumps to last column', () => {
+    const { handleTableKeydown, focusedColIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('End'))
+    expect(focusedColIndex.value).toBe(2)
+  })
+
+  it('Ctrl+End jumps to last row and last column', () => {
+    const { handleTableKeydown, focusedRowIndex, focusedColIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('End', { ctrlKey: true }))
+    expect(focusedRowIndex.value).toBe(2)
+    expect(focusedColIndex.value).toBe(2)
+  })
+
+  it('Enter does not activate edit mode', () => {
+    const { handleTableKeydown } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('Enter'))
+    expect(onActivate).not.toHaveBeenCalled()
+  })
+
+  it('Space in selection mode calls onSelect', () => {
+    const keyboard = useTableKeyboard({
+      books: () => books,
+      displayColumns,
+      activeCellKey,
+      selectionMode: () => true,
+      isReadOnly: () => false,
+      virtualizer: { value: { scrollToIndex: scrollToIndexSpy } } as unknown as ReturnType<typeof import('@tanstack/vue-virtual').useVirtualizer>,
+      isCellReadOnly: () => false,
+      onActivate,
+      onSelect,
+    })
+    keyboard.handleTableKeydown(keyEvent('ArrowDown'))
+    keyboard.handleTableKeydown(keyEvent(' '))
+    expect(onSelect).toHaveBeenCalledWith(1, expect.anything())
+  })
+
+  it('does nothing when activeCell is set', () => {
+    activeCellKey.value = '1:title'
+    const { handleTableKeydown, focusedRowIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    expect(focusedRowIndex.value).toBeNull()
+  })
+
+  it('Cmd/Ctrl+C still copies when a cell editor is active', () => {
+    const writeTextSpy = vi.fn<(text: string) => Promise<void>>().mockResolvedValue(undefined)
+    vi.stubGlobal('navigator', { clipboard: { writeText: writeTextSpy } })
+
+    activeCellKey.value = '2:title'
+    const { handleTableKeydown } = createKeyboard()
+    handleTableKeydown(keyEvent('c', { metaKey: true }))
+
+    expect(writeTextSpy).toHaveBeenCalledWith('Book B')
+
+    vi.unstubAllGlobals()
+  })
+
+  it('Cmd/Ctrl+Shift+C still copies row when a cell editor is active', () => {
+    const writeTextSpy = vi.fn<(text: string) => Promise<void>>().mockResolvedValue(undefined)
+    vi.stubGlobal('navigator', { clipboard: { writeText: writeTextSpy } })
+
+    activeCellKey.value = '2:title'
+    const { handleTableKeydown } = createKeyboard()
+    handleTableKeydown(keyEvent('C', { metaKey: true, shiftKey: true }))
+
+    expect(writeTextSpy).toHaveBeenCalledWith('Title: Book B\nAuthors: Author A\nRating: 4')
+
+    vi.unstubAllGlobals()
+  })
+
+  it('Cmd/Ctrl+C resolves target cell from keyboard event DOM target', () => {
+    const writeTextSpy = vi.fn<(text: string) => Promise<void>>().mockResolvedValue(undefined)
+    vi.stubGlobal('navigator', { clipboard: { writeText: writeTextSpy } })
+
+    const cell = document.createElement('td')
+    cell.dataset.colId = 'title'
+    cell.dataset.rowIndex = '1'
+    document.body.appendChild(cell)
+
+    const { handleTableKeydown } = createKeyboard()
+    handleTableKeydown(keyEvent('c', { metaKey: true, target: cell }))
+
+    expect(writeTextSpy).toHaveBeenCalledWith('Book B')
+
+    cell.remove()
+    vi.unstubAllGlobals()
+  })
+
+  it('does nothing with empty books array', () => {
+    books = []
+    const { handleTableKeydown, focusedRowIndex } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    expect(focusedRowIndex.value).toBeNull()
+  })
+
+  it('isFocusedCell returns correct boolean', () => {
+    const { handleTableKeydown, isFocusedCell } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    expect(isFocusedCell(0, 0)).toBe(true)
+    expect(isFocusedCell(1, 0)).toBe(false)
+  })
+
+  it('Ctrl+C copies focused cell value to clipboard', () => {
+    const writeTextSpy = vi.fn<(text: string) => Promise<void>>().mockResolvedValue(undefined)
+    vi.stubGlobal('navigator', { clipboard: { writeText: writeTextSpy } })
+
+    const { handleTableKeydown } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('c', { ctrlKey: true }))
+    expect(writeTextSpy).toHaveBeenCalledWith('Book A')
+
+    vi.unstubAllGlobals()
+  })
+
+  it('Ctrl+Shift+C copies the focused row when key is uppercase C', () => {
+    const writeTextSpy = vi.fn<(text: string) => Promise<void>>().mockResolvedValue(undefined)
+    vi.stubGlobal('navigator', { clipboard: { writeText: writeTextSpy } })
+
+    const { handleTableKeydown } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    handleTableKeydown(keyEvent('C', { ctrlKey: true, shiftKey: true }))
+
+    expect(writeTextSpy).toHaveBeenCalledWith('Title: Book A\nAuthors: Author A\nRating: 4')
+
+    vi.unstubAllGlobals()
+  })
+
+  it('scrollToIndex is called when moving rows', () => {
+    const { handleTableKeydown } = createKeyboard()
+    handleTableKeydown(keyEvent('ArrowDown'))
+    expect(scrollToIndexSpy).toHaveBeenCalledWith(0, { align: 'auto' })
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTableLocks.spec.ts b/client/src/features/book/composables/__tests__/useTableLocks.spec.ts
new file mode 100644
index 000000000..d342755b9
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTableLocks.spec.ts
@@ -0,0 +1,298 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { BOOK_METADATA_LOCK_FIELDS } from '@bookorbit/types'
+
+const toastMock = vi.hoisted(() => ({
+  error: vi.fn<(message: string) => void>(),
+}))
+
+vi.mock('vue-sonner', () => ({
+  toast: toastMock,
+}))
+
+const apiMock = vi.hoisted(() => vi.fn<(input: RequestInfo | URL, init?: RequestInit) => Promise<unknown>>())
+
+vi.mock('@/lib/api', () => ({
+  api: apiMock,
+}))
+
+import { useTableLocks } from '../useTableLocks'
+
+function makeOkResponse(fields: string[] = []) {
+  return { ok: true, json: async () => ({ lockedFields: fields }) }
+}
+
+describe('useTableLocks', () => {
+  beforeEach(() => {
+    apiMock.mockReset()
+    toastMock.error.mockClear()
+  })
+
+  describe('initBook', () => {
+    it('initializes lock state for a book', () => {
+      const { initBook, getFields } = useTableLocks()
+      initBook(1, ['title', 'authors'])
+      expect(getFields(1)).toEqual(['title', 'authors'])
+    })
+
+    it('refreshes fields from server for non-pending entries', () => {
+      const { initBook, getFields } = useTableLocks()
+      initBook(1, ['title'])
+      initBook(1, ['authors'])
+      expect(getFields(1)).toEqual(['authors'])
+    })
+
+    it('does not overwrite pending entries (optimistic update in-flight)', () => {
+      const { initBook, getFields, toggleField } = useTableLocks()
+      initBook(1, ['title'])
+      // Mock api to hang (never resolve) so pending stays true
+      apiMock.mockReturnValueOnce(new Promise(() => {}))
+      void toggleField(1, 'rating') // marks as pending (optimistic: adds 'rating')
+      // A server-side refresh while pending should be ignored
+      initBook(1, ['authors'])
+      expect(getFields(1)).toContain('rating') // optimistic state preserved
+    })
+
+    it('returns empty array for uninitialised book', () => {
+      const { getFields } = useTableLocks()
+      expect(getFields(99)).toEqual([])
+    })
+  })
+
+  describe('isLocked', () => {
+    it('returns true for a locked field', () => {
+      const { initBook, isLocked } = useTableLocks()
+      initBook(1, ['title', 'cover'])
+      expect(isLocked(1, 'title')).toBe(true)
+      expect(isLocked(1, 'cover')).toBe(true)
+    })
+
+    it('returns false for an unlocked field', () => {
+      const { initBook, isLocked } = useTableLocks()
+      initBook(1, ['title'])
+      expect(isLocked(1, 'authors')).toBe(false)
+    })
+
+    it('returns false for an uninitialised book', () => {
+      const { isLocked } = useTableLocks()
+      expect(isLocked(99, 'title')).toBe(false)
+    })
+  })
+
+  describe('isPending', () => {
+    it('returns false when not pending', () => {
+      const { initBook, isPending } = useTableLocks()
+      initBook(1, [])
+      expect(isPending(1)).toBe(false)
+    })
+
+    it('returns false for uninitialised book', () => {
+      const { isPending } = useTableLocks()
+      expect(isPending(99)).toBe(false)
+    })
+  })
+
+  describe('toggleField', () => {
+    it('locks an unlocked field optimistically', async () => {
+      apiMock.mockResolvedValue(makeOkResponse(['title']))
+      const { initBook, isLocked, toggleField } = useTableLocks()
+      initBook(1, [])
+
+      const promise = toggleField(1, 'title')
+      expect(isLocked(1, 'title')).toBe(true)
+      await promise
+      expect(isLocked(1, 'title')).toBe(true)
+    })
+
+    it('unlocks a locked field optimistically', async () => {
+      apiMock.mockResolvedValue(makeOkResponse([]))
+      const { initBook, isLocked, toggleField } = useTableLocks()
+      initBook(1, ['title'])
+
+      const promise = toggleField(1, 'title')
+      expect(isLocked(1, 'title')).toBe(false)
+      await promise
+      expect(isLocked(1, 'title')).toBe(false)
+    })
+
+    it('reverts optimistic update and shows toast on API error', async () => {
+      apiMock.mockRejectedValue(new Error('network error'))
+      const { initBook, isLocked, toggleField } = useTableLocks()
+      initBook(1, [])
+
+      await toggleField(1, 'title')
+
+      expect(isLocked(1, 'title')).toBe(false)
+      expect(toastMock.error).toHaveBeenCalledWith('Failed to update locks')
+    })
+
+    it('reverts optimistic update on non-ok HTTP response', async () => {
+      apiMock.mockResolvedValue({ ok: false, status: 409 })
+      const { initBook, isLocked, toggleField } = useTableLocks()
+      initBook(1, [])
+
+      await toggleField(1, 'title')
+
+      expect(isLocked(1, 'title')).toBe(false)
+      expect(toastMock.error).toHaveBeenCalledWith('Failed to update locks')
+    })
+
+    it('sends PATCH request with correct locked fields', async () => {
+      apiMock.mockResolvedValue(makeOkResponse(['title', 'authors']))
+      const { initBook, toggleField } = useTableLocks()
+      initBook(1, ['title'])
+
+      await toggleField(1, 'authors')
+
+      expect(apiMock).toHaveBeenCalledWith(
+        '/api/v1/books/1/metadata-locks',
+        expect.objectContaining({
+          method: 'PATCH',
+          body: JSON.stringify({ lockedFields: ['title', 'authors'] }),
+        }),
+      )
+    })
+
+    it('does nothing for an uninitialised book', async () => {
+      const { toggleField } = useTableLocks()
+      await toggleField(99, 'title')
+      expect(apiMock).not.toHaveBeenCalled()
+    })
+
+    it('clears pending flag after successful call', async () => {
+      apiMock.mockResolvedValue(makeOkResponse(['title']))
+      const { initBook, isPending, toggleField } = useTableLocks()
+      initBook(1, [])
+      await toggleField(1, 'title')
+      expect(isPending(1)).toBe(false)
+    })
+
+    it('clears pending flag after failed call', async () => {
+      apiMock.mockRejectedValue(new Error('fail'))
+      const { initBook, isPending, toggleField } = useTableLocks()
+      initBook(1, [])
+      await toggleField(1, 'title')
+      expect(isPending(1)).toBe(false)
+    })
+  })
+
+  describe('lockAll', () => {
+    it('locks all known fields optimistically', async () => {
+      apiMock.mockResolvedValue(makeOkResponse([...BOOK_METADATA_LOCK_FIELDS]))
+      const { initBook, getFields, lockAll } = useTableLocks()
+      initBook(1, [])
+
+      const promise = lockAll(1)
+      expect(getFields(1)).toEqual([...BOOK_METADATA_LOCK_FIELDS])
+      await promise
+    })
+
+    it('sends all lock fields in request body', async () => {
+      apiMock.mockResolvedValue(makeOkResponse([...BOOK_METADATA_LOCK_FIELDS]))
+      const { initBook, lockAll } = useTableLocks()
+      initBook(1, [])
+
+      await lockAll(1)
+
+      const [, req] = apiMock.mock.calls[0] as [string, RequestInit]
+      const body = JSON.parse(String(req.body))
+      expect(body.lockedFields).toEqual([...BOOK_METADATA_LOCK_FIELDS])
+    })
+
+    it('reverts on failure', async () => {
+      apiMock.mockRejectedValue(new Error('fail'))
+      const { initBook, getFields, lockAll } = useTableLocks()
+      initBook(1, ['title'])
+
+      await lockAll(1)
+
+      expect(getFields(1)).toEqual(['title'])
+      expect(toastMock.error).toHaveBeenCalledWith('Failed to update locks')
+    })
+  })
+
+  describe('unlockAll', () => {
+    it('removes all locked fields optimistically', async () => {
+      apiMock.mockResolvedValue(makeOkResponse([]))
+      const { initBook, getFields, unlockAll } = useTableLocks()
+      initBook(1, ['title', 'authors', 'cover'])
+
+      const promise = unlockAll(1)
+      expect(getFields(1)).toEqual([])
+      await promise
+    })
+
+    it('sends empty lockedFields array in request body', async () => {
+      apiMock.mockResolvedValue(makeOkResponse([]))
+      const { initBook, unlockAll } = useTableLocks()
+      initBook(1, ['title'])
+
+      await unlockAll(1)
+
+      const [, req] = apiMock.mock.calls[0] as [string, RequestInit]
+      expect(JSON.parse(String(req.body))).toEqual({ lockedFields: [] })
+    })
+
+    it('reverts on failure', async () => {
+      apiMock.mockRejectedValue(new Error('fail'))
+      const { initBook, getFields, unlockAll } = useTableLocks()
+      initBook(1, ['title', 'cover'])
+
+      await unlockAll(1)
+
+      expect(getFields(1)).toEqual(['title', 'cover'])
+      expect(toastMock.error).toHaveBeenCalledWith('Failed to update locks')
+    })
+  })
+
+  describe('resetBook', () => {
+    it('removes the book from lock state', () => {
+      const { initBook, getFields, resetBook } = useTableLocks()
+      initBook(1, ['title'])
+      resetBook(1)
+      expect(getFields(1)).toEqual([])
+    })
+
+    it('re-init is allowed after reset', () => {
+      const { initBook, getFields, resetBook } = useTableLocks()
+      initBook(1, ['title'])
+      resetBook(1)
+      initBook(1, ['authors'])
+      expect(getFields(1)).toEqual(['authors'])
+    })
+  })
+
+  describe('multiple books', () => {
+    it('manages lock state independently per book', async () => {
+      apiMock.mockResolvedValue(makeOkResponse(['title']))
+      const { initBook, isLocked, toggleField } = useTableLocks()
+      initBook(1, [])
+      initBook(2, ['authors'])
+
+      await toggleField(1, 'title')
+
+      expect(isLocked(1, 'title')).toBe(true)
+      expect(isLocked(2, 'title')).toBe(false)
+      expect(isLocked(2, 'authors')).toBe(true)
+    })
+  })
+
+  describe('concurrent guard', () => {
+    it('ignores concurrent applyLocks while one is pending', async () => {
+      let resolveFirst!: (v: unknown) => void
+      apiMock.mockReturnValueOnce(new Promise((r) => (resolveFirst = r)))
+      const { initBook, toggleField, getFields } = useTableLocks()
+      initBook(1, [])
+
+      const firstCall = toggleField(1, 'title')
+      // Second call while first is pending - should be ignored
+      await toggleField(1, 'authors')
+
+      expect(apiMock).toHaveBeenCalledTimes(1)
+      expect(getFields(1)).toContain('title')
+      expect(getFields(1)).not.toContain('authors')
+
+      resolveFirst(makeOkResponse(['title']))
+      await firstCall
+    })
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTablePresets.spec.ts b/client/src/features/book/composables/__tests__/useTablePresets.spec.ts
new file mode 100644
index 000000000..714ff47b0
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTablePresets.spec.ts
@@ -0,0 +1,197 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+const mockStorage: Record<string, string> = {}
+
+vi.stubGlobal('localStorage', {
+  getItem: (key: string) => mockStorage[key] ?? null,
+  setItem: (key: string, value: string) => {
+    mockStorage[key] = value
+  },
+  removeItem: (key: string) => {
+    delete mockStorage[key]
+  },
+  clear: () => {
+    Object.keys(mockStorage).forEach((key) => delete mockStorage[key])
+  },
+})
+
+import { useTablePresets } from '../useTablePresets'
+import type { ColumnId } from '../useTableColumns'
+
+const allColumnIds = ['cover', 'title', 'authors', 'language', 'actions'] as ColumnId[]
+
+describe('useTablePresets', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+    Object.keys(mockStorage).forEach((key) => delete mockStorage[key])
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('returns the built-in presets', () => {
+    const presets = useTablePresets('library', allColumnIds)
+
+    expect(presets.builtInPresets.value.map((preset) => preset.id)).toEqual(['default', 'compact', 'metadata'])
+  })
+
+  it('saves trimmed custom presets and persists them', async () => {
+    const presets = useTablePresets('library', allColumnIds)
+    const layout = {
+      columnOrder: [...allColumnIds],
+      hiddenColumns: ['language'],
+      columnWidths: { title: 480 },
+      pinnedColumns: { title: 'left' as const },
+    }
+
+    presets.savePreset('  My preset  ', layout)
+    layout.hiddenColumns.push('authors')
+    await nextTick()
+    vi.advanceTimersByTime(600)
+    await nextTick()
+
+    expect(presets.customPresets.value).toHaveLength(1)
+    expect(presets.customPresets.value[0]?.name).toBe('My preset')
+    expect(presets.customPresets.value[0]?.layout.hiddenColumns).toEqual(['language'])
+    expect(presets.customPresets.value[0]?.layout.pinnedColumns).toEqual({ title: 'left' })
+    expect(mockStorage['bookorbit:tablePresets:library']).toContain('My preset')
+  })
+
+  it('ignores blank preset names', () => {
+    const presets = useTablePresets('library', allColumnIds)
+
+    presets.savePreset('   ', {
+      columnOrder: [...allColumnIds],
+      hiddenColumns: [],
+      columnWidths: {},
+    })
+
+    expect(presets.customPresets.value).toHaveLength(0)
+  })
+
+  it('renames and deletes custom presets', async () => {
+    const presets = useTablePresets('library', allColumnIds)
+    presets.savePreset('One', {
+      columnOrder: [...allColumnIds],
+      hiddenColumns: [],
+      columnWidths: {},
+    })
+    const presetId = presets.customPresets.value[0]?.id
+    expect(presetId).toBeTruthy()
+
+    presets.renamePreset(presetId!, '  Renamed  ')
+    await nextTick()
+    expect(presets.customPresets.value[0]?.name).toBe('Renamed')
+
+    presets.deletePreset(presetId!)
+    await nextTick()
+    expect(presets.customPresets.value).toHaveLength(0)
+  })
+
+  it('isolates presets by view type', async () => {
+    const libraryPresets = useTablePresets('library', allColumnIds)
+    const collectionPresets = useTablePresets('collection', allColumnIds)
+
+    libraryPresets.savePreset('Library only', {
+      columnOrder: [...allColumnIds],
+      hiddenColumns: ['authors'],
+      columnWidths: {},
+    })
+    await nextTick()
+
+    expect(libraryPresets.customPresets.value).toHaveLength(1)
+    expect(collectionPresets.customPresets.value).toHaveLength(0)
+  })
+
+  it('saves sort along with layout', async () => {
+    const presets = useTablePresets('library', allColumnIds)
+    const layout = { columnOrder: [...allColumnIds], hiddenColumns: [], columnWidths: {} }
+    const sort = [{ field: 'title' as const, dir: 'desc' as const }]
+    presets.savePreset('With sort', layout, sort)
+    await nextTick()
+
+    expect(presets.customPresets.value).toHaveLength(1)
+    expect(presets.customPresets.value[0]?.sort).toEqual([{ field: 'title', dir: 'desc' }])
+  })
+
+  it('saves preset without sort when sort is empty', async () => {
+    const presets = useTablePresets('library', allColumnIds)
+    const layout = { columnOrder: [...allColumnIds], hiddenColumns: [], columnWidths: {} }
+    presets.savePreset('No sort', layout, [])
+    await nextTick()
+
+    expect(presets.customPresets.value[0]?.sort).toBeUndefined()
+  })
+
+  it('renamePreset ignores blank names', async () => {
+    const presets = useTablePresets('library', allColumnIds)
+    presets.savePreset('Original', { columnOrder: [...allColumnIds], hiddenColumns: [], columnWidths: {} })
+    const id = presets.customPresets.value[0]?.id
+    presets.renamePreset(id!, '  ')
+    await nextTick()
+    expect(presets.customPresets.value[0]?.name).toBe('Original')
+  })
+
+  it('allPresets includes both built-in and custom', () => {
+    const presets = useTablePresets('library', allColumnIds)
+    presets.savePreset('Custom', { columnOrder: [...allColumnIds], hiddenColumns: [], columnWidths: {} })
+    expect(presets.allPresets.value.length).toBe(4)
+    expect(presets.allPresets.value[3]?.name).toBe('Custom')
+  })
+
+  it('duplicates and favorites custom presets', () => {
+    const presets = useTablePresets('library', allColumnIds)
+    presets.savePreset('Original', { columnOrder: [...allColumnIds], hiddenColumns: [], columnWidths: {} })
+    const presetId = presets.customPresets.value[0]?.id
+
+    presets.toggleFavorite(presetId!)
+    presets.duplicatePreset(presetId!)
+
+    expect(presets.customPresets.value).toHaveLength(2)
+    expect(presets.customPresets.value[0]?.favorite).toBe(true)
+    expect(presets.customPresets.value[1]?.name).toBe('Original Copy')
+  })
+
+  it('imports valid custom presets and ignores built-in entries', () => {
+    const presets = useTablePresets('library', allColumnIds)
+    const imported = presets.importPresets([
+      {
+        id: 'custom_old',
+        name: 'Imported',
+        layout: { columnOrder: [...allColumnIds], hiddenColumns: ['authors'], columnWidths: {} },
+      },
+      {
+        id: 'default',
+        name: 'Default',
+        isBuiltIn: true,
+        layout: { columnOrder: [...allColumnIds], hiddenColumns: [], columnWidths: {} },
+      },
+    ])
+
+    expect(imported).toBe(1)
+    expect(presets.customPresets.value).toHaveLength(1)
+    expect(presets.customPresets.value[0]?.name).toBe('Imported')
+  })
+
+  it('loads custom presets from localStorage on init', () => {
+    const stored = [{ id: 'custom_abc', name: 'Stored', layout: { columnOrder: [...allColumnIds], hiddenColumns: [], columnWidths: {} } }]
+    mockStorage['bookorbit:tablePresets:library'] = JSON.stringify(stored)
+    const presets = useTablePresets('library', allColumnIds)
+    expect(presets.customPresets.value).toHaveLength(1)
+    expect(presets.customPresets.value[0]?.name).toBe('Stored')
+  })
+
+  it('discards invalid presets from localStorage', () => {
+    mockStorage['bookorbit:tablePresets:library'] = JSON.stringify([{ id: 'bad' }])
+    const presets = useTablePresets('library', allColumnIds)
+    expect(presets.customPresets.value).toHaveLength(0)
+  })
+
+  it('handles corrupted localStorage gracefully', () => {
+    mockStorage['bookorbit:tablePresets:library'] = 'not json'
+    const presets = useTablePresets('library', allColumnIds)
+    expect(presets.customPresets.value).toHaveLength(0)
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTableQuickFilters.spec.ts b/client/src/features/book/composables/__tests__/useTableQuickFilters.spec.ts
new file mode 100644
index 000000000..aecceccb6
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTableQuickFilters.spec.ts
@@ -0,0 +1,126 @@
+import { describe, it, expect } from 'vitest'
+import { useTableQuickFilters } from '../useTableQuickFilters'
+
+describe('useTableQuickFilters', () => {
+  describe('getQuickFilterOptions', () => {
+    it('returns empty array for non-library view types', () => {
+      const { getQuickFilterOptions } = useTableQuickFilters('collection')
+      expect(getQuickFilterOptions('title')).toEqual([])
+      expect(getQuickFilterOptions('format')).toEqual([])
+    })
+
+    it('returns empty array for smart scope view type', () => {
+      const { getQuickFilterOptions } = useTableQuickFilters('smartScope')
+      expect(getQuickFilterOptions('cover')).toEqual([])
+    })
+
+    it('returns file presence options for format column in library view', () => {
+      const { getQuickFilterOptions } = useTableQuickFilters('library')
+      const options = getQuickFilterOptions('format')
+      expect(options).toHaveLength(2)
+      expect(options[0]!.key).toBe('present')
+      expect(options[1]!.key).toBe('missing')
+    })
+
+    it('returns cover presence options for cover column in library view', () => {
+      const { getQuickFilterOptions } = useTableQuickFilters('library')
+      const options = getQuickFilterOptions('cover')
+      expect(options).toHaveLength(2)
+      expect(options[0]!.label).toContain('cover')
+    })
+
+    it('returns present/missing options for title column', () => {
+      const { getQuickFilterOptions } = useTableQuickFilters('library')
+      expect(getQuickFilterOptions('title')).toHaveLength(2)
+    })
+
+    it('returns options for all text field columns', () => {
+      const { getQuickFilterOptions } = useTableQuickFilters('library')
+      for (const colId of ['seriesName', 'publisher', 'language', 'isbn13', 'subtitle'] as const) {
+        expect(getQuickFilterOptions(colId)).toHaveLength(2)
+      }
+    })
+
+    it('returns options for all value field columns', () => {
+      const { getQuickFilterOptions } = useTableQuickFilters('library')
+      for (const colId of ['authors', 'genres', 'tags', 'readStatus', 'rating', 'pageCount', 'publishedYear'] as const) {
+        expect(getQuickFilterOptions(colId)).toHaveLength(2)
+      }
+    })
+
+    it('returns empty array for fileSize column (not filterable)', () => {
+      const { getQuickFilterOptions } = useTableQuickFilters('library')
+      expect(getQuickFilterOptions('fileSize')).toEqual([])
+    })
+
+    it('returns empty array for actions column', () => {
+      const { getQuickFilterOptions } = useTableQuickFilters('library')
+      expect(getQuickFilterOptions('actions')).toEqual([])
+    })
+  })
+
+  describe('buildQuickFilterRule', () => {
+    const { buildQuickFilterRule } = useTableQuickFilters('library')
+
+    it('returns fileAvailability isMissing rule for format+missing', () => {
+      const rule = buildQuickFilterRule('format', 'missing')
+      expect(rule).toEqual({ type: 'rule', field: 'fileAvailability', operator: 'isMissing' })
+    })
+
+    it('returns fileAvailability isPresent rule for format+present', () => {
+      const rule = buildQuickFilterRule('format', 'present')
+      expect(rule).toEqual({ type: 'rule', field: 'fileAvailability', operator: 'isPresent' })
+    })
+
+    it('returns cover isMissing rule for cover+missing', () => {
+      const rule = buildQuickFilterRule('cover', 'missing')
+      expect(rule).toEqual({ type: 'rule', field: 'cover', operator: 'isMissing' })
+    })
+
+    it('returns cover isPresent rule for cover+present', () => {
+      const rule = buildQuickFilterRule('cover', 'present')
+      expect(rule).toEqual({ type: 'rule', field: 'cover', operator: 'isPresent' })
+    })
+
+    it('returns title isEmpty rule for title+missing', () => {
+      const rule = buildQuickFilterRule('title', 'missing')
+      expect(rule).toEqual({ type: 'rule', field: 'title', operator: 'isEmpty' })
+    })
+
+    it('returns title isNotEmpty rule for title+present', () => {
+      const rule = buildQuickFilterRule('title', 'present')
+      expect(rule).toEqual({ type: 'rule', field: 'title', operator: 'isNotEmpty' })
+    })
+
+    it('returns series isEmpty rule for seriesName+missing', () => {
+      const rule = buildQuickFilterRule('seriesName', 'missing')
+      expect(rule).toEqual({ type: 'rule', field: 'series', operator: 'isEmpty' })
+    })
+
+    it('returns author isEmpty rule for authors+missing', () => {
+      const rule = buildQuickFilterRule('authors', 'missing')
+      expect(rule).toEqual({ type: 'rule', field: 'author', operator: 'isEmpty' })
+    })
+
+    it('returns genre isEmpty rule for genres+missing', () => {
+      const rule = buildQuickFilterRule('genres', 'missing')
+      expect(rule).toEqual({ type: 'rule', field: 'genre', operator: 'isEmpty' })
+    })
+
+    it('returns readStatus isEmpty rule for readStatus+missing', () => {
+      const rule = buildQuickFilterRule('readStatus', 'missing')
+      expect(rule).toEqual({ type: 'rule', field: 'readStatus', operator: 'isEmpty' })
+    })
+
+    it('returns rating isEmpty rule for rating+missing', () => {
+      const rule = buildQuickFilterRule('rating', 'missing')
+      expect(rule).toEqual({ type: 'rule', field: 'rating', operator: 'isEmpty' })
+    })
+
+    it('returns null for unrecognized column', () => {
+      expect(buildQuickFilterRule('fileSize', 'missing')).toBeNull()
+      expect(buildQuickFilterRule('actions', 'missing')).toBeNull()
+      expect(buildQuickFilterRule('addedAt', 'missing')).toBeNull()
+    })
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTableResize.spec.ts b/client/src/features/book/composables/__tests__/useTableResize.spec.ts
new file mode 100644
index 000000000..7bfba7747
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTableResize.spec.ts
@@ -0,0 +1,122 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { ref, type Ref } from 'vue'
+import { useTableResize } from '../useTableResize'
+import type { ColumnDef, ColumnId } from '../useTableColumns'
+
+vi.mock('vue', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('vue')>()
+  return { ...actual, onMounted: vi.fn<(cb: () => void) => void>((cb) => cb()), onUnmounted: vi.fn<(cb: () => void) => void>() }
+})
+
+function makeDefs(): ColumnDef[] {
+  return [
+    { id: 'cover', header: 'Cover', defaultWidth: 60, minWidth: 40, cellType: 'cover', pinned: 'left', isEditable: false },
+    { id: 'title', header: 'Title', defaultWidth: 200, minWidth: 80, cellType: 'text', pinned: null, isEditable: true, sortField: 'title' },
+    { id: 'authors', header: 'Authors', defaultWidth: 150, minWidth: 80, cellType: 'chips', pinned: null, isEditable: true },
+    { id: 'lockRow', header: '', defaultWidth: 28, minWidth: 28, cellType: 'text', pinned: null, isEditable: false },
+  ] as ColumnDef[]
+}
+
+describe('useTableResize', () => {
+  let scrollRef: Ref<HTMLDivElement | null>
+  let displayColumns: Ref<ColumnDef[]>
+  let setWidthSpy: (id: ColumnId, px: number) => void
+  let isReadOnly: Ref<boolean>
+
+  beforeEach(() => {
+    scrollRef = ref(null)
+    displayColumns = ref(makeDefs())
+    setWidthSpy = vi.fn<(id: ColumnId, px: number) => void>()
+    isReadOnly = ref(false)
+  })
+
+  it('returns initial state with no active resize', () => {
+    const { resizingColumnId } = useTableResize(scrollRef, displayColumns, setWidthSpy, isReadOnly)
+    expect(resizingColumnId.value).toBeNull()
+  })
+
+  it('isResizableCol returns false for lockRow', () => {
+    const { isResizableCol } = useTableResize(scrollRef, displayColumns, setWidthSpy, isReadOnly)
+    expect(isResizableCol(displayColumns.value[3]!)).toBe(false)
+    expect(isResizableCol(displayColumns.value[1]!)).toBe(true)
+  })
+
+  it('isResizableCol returns false when read-only', () => {
+    isReadOnly.value = true
+    const { isResizableCol } = useTableResize(scrollRef, displayColumns, setWidthSpy, isReadOnly)
+    expect(isResizableCol(displayColumns.value[1]!)).toBe(false)
+  })
+
+  it('startResize sets resizing state', () => {
+    const { startResize, resizingColumnId } = useTableResize(scrollRef, displayColumns, setWidthSpy, isReadOnly)
+    const event = { clientX: 100, preventDefault: vi.fn<() => void>() } as unknown as MouseEvent
+    startResize(event, 'title', 200)
+    expect(resizingColumnId.value).toBe('title')
+    expect(event.preventDefault).toHaveBeenCalled()
+  })
+
+  it('startResize does nothing when read-only', () => {
+    isReadOnly.value = true
+    const { startResize, resizingColumnId } = useTableResize(scrollRef, displayColumns, setWidthSpy, isReadOnly)
+    const event = { clientX: 100, preventDefault: vi.fn<() => void>() } as unknown as MouseEvent
+    startResize(event, 'title', 200)
+    expect(resizingColumnId.value).toBeNull()
+  })
+
+  it('mouse move during resize calls setColumnWidth with delta', () => {
+    const { startResize } = useTableResize(scrollRef, displayColumns, setWidthSpy, isReadOnly)
+    startResize({ clientX: 100, preventDefault: vi.fn<() => void>() } as unknown as MouseEvent, 'title', 200)
+
+    const moveEvent = new MouseEvent('mousemove', { clientX: 130 })
+    document.dispatchEvent(moveEvent)
+
+    expect(setWidthSpy).toHaveBeenCalledWith('title', 230)
+  })
+
+  it('mouseup stops resize', () => {
+    const { startResize, resizingColumnId } = useTableResize(scrollRef, displayColumns, setWidthSpy, isReadOnly)
+    startResize({ clientX: 100, preventDefault: vi.fn<() => void>() } as unknown as MouseEvent, 'title', 200)
+    expect(resizingColumnId.value).toBe('title')
+
+    document.dispatchEvent(new MouseEvent('mouseup'))
+    expect(resizingColumnId.value).toBeNull()
+  })
+
+  it('mouse move without active resize does not call setColumnWidth', () => {
+    useTableResize(scrollRef, displayColumns, setWidthSpy, isReadOnly)
+    document.dispatchEvent(new MouseEvent('mousemove', { clientX: 200 }))
+    expect(setWidthSpy).not.toHaveBeenCalled()
+  })
+
+  it('autoFitColumn measures cells by data-col-id instead of nth-child', () => {
+    scrollRef.value = document.createElement('div')
+    scrollRef.value.innerHTML = `
+      <table>
+        <thead>
+          <tr>
+            <th><div data-col-label>Selection</div></th>
+            <th data-col-id="title"><div data-col-label>Title</div></th>
+            <th data-col-id="authors"><div data-col-label>Authors</div></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>checkbox</td>
+            <td data-col-id="title">A very long book title</td>
+            <td data-col-id="authors">Short</td>
+          </tr>
+        </tbody>
+      </table>
+    `
+
+    const titleHeader = scrollRef.value.querySelector('thead [data-col-id="title"] [data-col-label]') as HTMLElement
+    Object.defineProperty(titleHeader, 'scrollWidth', { configurable: true, value: 120 })
+    const titleCell = scrollRef.value.querySelector('tbody td[data-col-id="title"]') as HTMLElement
+    Object.defineProperty(titleCell, 'scrollWidth', { configurable: true, value: 180 })
+
+    const { autoFitColumn } = useTableResize(scrollRef, displayColumns, setWidthSpy, isReadOnly)
+    autoFitColumn('title')
+
+    expect(setWidthSpy).toHaveBeenCalledWith('title', 196)
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTableScrollBehavior.spec.ts b/client/src/features/book/composables/__tests__/useTableScrollBehavior.spec.ts
new file mode 100644
index 000000000..f384171b8
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTableScrollBehavior.spec.ts
@@ -0,0 +1,135 @@
+import { describe, it, expect, vi } from 'vitest'
+import { ref, createApp, defineComponent, h } from 'vue'
+import { useTableScrollBehavior } from '../useTableScrollBehavior'
+
+function withSetup<T>(composable: () => T): { result: T; unmount: () => void } {
+  let result!: T
+  const app = createApp(
+    defineComponent({
+      setup() {
+        result = composable()
+        return () => h('div')
+      },
+    }),
+  )
+  const root = document.createElement('div')
+  app.mount(root)
+  return { result, unmount: () => app.unmount() }
+}
+
+describe('useTableScrollBehavior', () => {
+  it('returns initial values', () => {
+    const scrollRef = ref<HTMLDivElement | null>(null)
+    const { isScrolled, showScrollTop } = useTableScrollBehavior(scrollRef)
+    expect(isScrolled.value).toBe(false)
+    expect(showScrollTop.value).toBe(false)
+  })
+
+  it('onScroll updates isScrolled based on scrollTop', async () => {
+    const mockEl = { scrollTop: 50, clientHeight: 200 } as HTMLDivElement
+    const scrollRef = ref<HTMLDivElement | null>(mockEl)
+    const { isScrolled, showScrollTop, onScroll } = useTableScrollBehavior(scrollRef)
+
+    const originalRaf = globalThis.requestAnimationFrame
+    vi.stubGlobal('requestAnimationFrame', (cb: FrameRequestCallback) => {
+      cb(0)
+      return 0
+    })
+
+    onScroll()
+    expect(isScrolled.value).toBe(true)
+    expect(showScrollTop.value).toBe(false)
+
+    vi.stubGlobal('requestAnimationFrame', originalRaf)
+  })
+
+  it('onScroll sets showScrollTop when scrolled far enough', () => {
+    const mockEl = { scrollTop: 500, clientHeight: 200 } as HTMLDivElement
+    const scrollRef = ref<HTMLDivElement | null>(mockEl)
+    const { showScrollTop, onScroll } = useTableScrollBehavior(scrollRef)
+
+    const originalRaf = globalThis.requestAnimationFrame
+    vi.stubGlobal('requestAnimationFrame', (cb: FrameRequestCallback) => {
+      cb(0)
+      return 0
+    })
+
+    onScroll()
+    expect(showScrollTop.value).toBe(true)
+
+    vi.stubGlobal('requestAnimationFrame', originalRaf)
+  })
+
+  it('onScroll throttles via rAF', () => {
+    const mockEl = { scrollTop: 10, clientHeight: 200 } as HTMLDivElement
+    const scrollRef = ref<HTMLDivElement | null>(mockEl)
+    const { isScrolled, onScroll } = useTableScrollBehavior(scrollRef)
+
+    let capturedCb: FrameRequestCallback | null = null
+    const originalRaf = globalThis.requestAnimationFrame
+    vi.stubGlobal('requestAnimationFrame', (cb: FrameRequestCallback) => {
+      capturedCb = cb
+      return 1
+    })
+
+    onScroll()
+    onScroll()
+    expect(isScrolled.value).toBe(false)
+    capturedCb!(0)
+    expect(isScrolled.value).toBe(true)
+
+    vi.stubGlobal('requestAnimationFrame', originalRaf)
+  })
+
+  it('onScroll does nothing with null ref', () => {
+    const scrollRef = ref<HTMLDivElement | null>(null)
+    const { isScrolled, onScroll } = useTableScrollBehavior(scrollRef)
+
+    const originalRaf = globalThis.requestAnimationFrame
+    vi.stubGlobal('requestAnimationFrame', (cb: FrameRequestCallback) => {
+      cb(0)
+      return 0
+    })
+
+    onScroll()
+    expect(isScrolled.value).toBe(false)
+
+    vi.stubGlobal('requestAnimationFrame', originalRaf)
+  })
+
+  it('scrollToTop calls scrollTo on element', () => {
+    const scrollToSpy = vi.fn<(options?: ScrollToOptions) => void>()
+    const mockEl = { scrollTop: 100, clientHeight: 200, scrollTo: scrollToSpy } as unknown as HTMLDivElement
+    const scrollRef = ref<HTMLDivElement | null>(mockEl)
+    const { scrollToTop } = useTableScrollBehavior(scrollRef)
+
+    scrollToTop()
+    expect(scrollToSpy).toHaveBeenCalledWith({ top: 0, behavior: 'smooth' })
+  })
+
+  it('scrollToTop does nothing with null ref', () => {
+    const scrollRef = ref<HTMLDivElement | null>(null)
+    const { result } = withSetup(() => useTableScrollBehavior(scrollRef))
+    expect(() => result.scrollToTop()).not.toThrow()
+  })
+
+  it('cancels pending rAF on unmount', () => {
+    const mockEl = { scrollTop: 10, clientHeight: 200 } as HTMLDivElement
+    const scrollRef = ref<HTMLDivElement | null>(mockEl)
+
+    const cancelSpy = vi.fn<(handle: number) => void>()
+    const originalRaf = globalThis.requestAnimationFrame
+    const originalCaf = globalThis.cancelAnimationFrame
+    vi.stubGlobal('requestAnimationFrame', () => 42)
+    vi.stubGlobal('cancelAnimationFrame', cancelSpy)
+
+    const { result, unmount } = withSetup(() => useTableScrollBehavior(scrollRef))
+    result.onScroll()
+    unmount()
+
+    expect(cancelSpy).toHaveBeenCalledWith(42)
+
+    vi.stubGlobal('requestAnimationFrame', originalRaf)
+    vi.stubGlobal('cancelAnimationFrame', originalCaf)
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useTableSorting.spec.ts b/client/src/features/book/composables/__tests__/useTableSorting.spec.ts
new file mode 100644
index 000000000..9ffc44dd1
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useTableSorting.spec.ts
@@ -0,0 +1,188 @@
+import { describe, it, expect, beforeEach } from 'vitest'
+import { useTableSorting } from '../useTableSorting'
+import type { SortSpec } from '@bookorbit/types'
+import type { ColumnDef } from '../tableColumnSchema'
+
+function makeSortable(field: string): ColumnDef {
+  return {
+    id: field as never,
+    header: field,
+    cellType: 'text',
+    isEditable: false,
+    sortField: field as never,
+    defaultWidth: 100,
+    minWidth: 60,
+    defaultVisible: true,
+    pinned: null,
+  }
+}
+
+function makeUnsortable(): ColumnDef {
+  return {
+    id: 'cover',
+    header: '',
+    cellType: 'cover',
+    isEditable: false,
+    sortField: null,
+    defaultWidth: 48,
+    minWidth: 48,
+    defaultVisible: true,
+    pinned: 'left',
+  }
+}
+
+describe('useTableSorting', () => {
+  let currentSort: SortSpec[]
+  let emitted: SortSpec[][]
+  let sortEnabled: boolean
+  let sorting: ReturnType<typeof useTableSorting>
+
+  beforeEach(() => {
+    currentSort = [{ field: 'title', dir: 'asc' }]
+    emitted = []
+    sortEnabled = true
+    sorting = useTableSorting(
+      () => currentSort,
+      () => sortEnabled,
+      (sort) => {
+        emitted.push(sort)
+        currentSort = sort
+      },
+    )
+  })
+
+  describe('isSortableColumn', () => {
+    it('returns false when sortField is null', () => {
+      expect(sorting.isSortableColumn(makeUnsortable())).toBe(false)
+    })
+
+    it('returns false when sorting is disabled', () => {
+      sortEnabled = false
+      expect(sorting.isSortableColumn(makeSortable('title'))).toBe(false)
+    })
+
+    it('returns true when sortField is set and sorting enabled', () => {
+      expect(sorting.isSortableColumn(makeSortable('title'))).toBe(true)
+    })
+  })
+
+  describe('getSortDir', () => {
+    it('returns null when field is not in sort', () => {
+      currentSort = [{ field: 'title', dir: 'asc' }]
+      expect(sorting.getSortDir('authors')).toBeNull()
+    })
+
+    it('returns asc for an asc sorted field', () => {
+      currentSort = [{ field: 'title', dir: 'asc' }]
+      expect(sorting.getSortDir('title')).toBe('asc')
+    })
+
+    it('returns desc for a desc sorted field', () => {
+      currentSort = [{ field: 'title', dir: 'desc' }]
+      expect(sorting.getSortDir('title')).toBe('desc')
+    })
+  })
+
+  describe('getSortPriority', () => {
+    it('returns 0 for null field', () => {
+      expect(sorting.getSortPriority(null)).toBe(0)
+    })
+
+    it('returns 0 for field not in sort', () => {
+      expect(sorting.getSortPriority('authors')).toBe(0)
+    })
+
+    it('returns 1-based index for active field', () => {
+      currentSort = [
+        { field: 'title', dir: 'asc' },
+        { field: 'author', dir: 'asc' },
+      ]
+      expect(sorting.getSortPriority('title')).toBe(1)
+      expect(sorting.getSortPriority('author')).toBe(2)
+    })
+  })
+
+  describe('handleColumnSort', () => {
+    it('does nothing when sortField is null', () => {
+      sorting.handleColumnSort(null, new MouseEvent('click'))
+      expect(emitted).toHaveLength(0)
+    })
+
+    it('does nothing when sorting is disabled', () => {
+      sortEnabled = false
+      sorting.handleColumnSort('title', new MouseEvent('click'))
+      expect(emitted).toHaveLength(0)
+    })
+
+    it('sets asc sort when clicking unsorted field without shift', () => {
+      currentSort = []
+      sorting.handleColumnSort('author', new MouseEvent('click'))
+      expect(emitted[0]).toEqual([{ field: 'author', dir: 'asc' }])
+    })
+
+    it('toggles asc to desc when clicking already-asc field', () => {
+      currentSort = [{ field: 'title', dir: 'asc' }]
+      sorting.handleColumnSort('title', new MouseEvent('click'))
+      expect(emitted[0]).toEqual([{ field: 'title', dir: 'desc' }])
+    })
+
+    it('resets to title asc when clicking already-desc field', () => {
+      currentSort = [{ field: 'title', dir: 'desc' }]
+      sorting.handleColumnSort('title', new MouseEvent('click'))
+      expect(emitted[0]).toEqual([{ field: 'title', dir: 'asc' }])
+    })
+
+    it('adds to multi-sort when shift is held', () => {
+      currentSort = [{ field: 'title', dir: 'asc' }]
+      sorting.handleColumnSort('author', new MouseEvent('click', { shiftKey: true }))
+      expect(emitted[0]).toEqual([
+        { field: 'title', dir: 'asc' },
+        { field: 'author', dir: 'asc' },
+      ])
+    })
+
+    it('cycles asc->desc when shift-clicking already-asc field in multi-sort', () => {
+      currentSort = [
+        { field: 'title', dir: 'asc' },
+        { field: 'author', dir: 'asc' },
+      ]
+      sorting.handleColumnSort('title', new MouseEvent('click', { shiftKey: true }))
+      expect(emitted[0]).toEqual([
+        { field: 'title', dir: 'desc' },
+        { field: 'author', dir: 'asc' },
+      ])
+    })
+
+    it('removes field when shift-clicking already-desc field in multi-sort', () => {
+      currentSort = [
+        { field: 'title', dir: 'desc' },
+        { field: 'author', dir: 'asc' },
+      ]
+      sorting.handleColumnSort('title', new MouseEvent('click', { shiftKey: true }))
+      expect(emitted[0]).toEqual([{ field: 'author', dir: 'asc' }])
+    })
+
+    it('falls back to title asc when removing last sort via shift-click', () => {
+      currentSort = [{ field: 'title', dir: 'desc' }]
+      sorting.handleColumnSort('title', new MouseEvent('click', { shiftKey: true }))
+      expect(emitted[0]).toEqual([{ field: 'title', dir: 'asc' }])
+    })
+  })
+
+  describe('removeSortField', () => {
+    it('removes a field from the sort array', () => {
+      currentSort = [
+        { field: 'title', dir: 'asc' },
+        { field: 'author', dir: 'asc' },
+      ]
+      sorting.removeSortField('author')
+      expect(emitted[0]).toEqual([{ field: 'title', dir: 'asc' }])
+    })
+
+    it('falls back to title asc when removing the last sort field', () => {
+      currentSort = [{ field: 'author', dir: 'desc' }]
+      sorting.removeSortField('author')
+      expect(emitted[0]).toEqual([{ field: 'title', dir: 'asc' }])
+    })
+  })
+})
diff --git a/client/src/features/book/composables/__tests__/useViewSort.spec.ts b/client/src/features/book/composables/__tests__/useViewSort.spec.ts
new file mode 100644
index 000000000..c564db45e
--- /dev/null
+++ b/client/src/features/book/composables/__tests__/useViewSort.spec.ts
@@ -0,0 +1,137 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { ref, nextTick } from 'vue'
+import { useViewSort } from '../useViewSort'
+
+const mockStorage = new Map<string, string>()
+
+beforeEach(() => {
+  mockStorage.clear()
+  vi.spyOn(Storage.prototype, 'getItem').mockImplementation((key) => mockStorage.get(key) ?? null)
+  vi.spyOn(Storage.prototype, 'setItem').mockImplementation((key, value) => {
+    mockStorage.set(key, value)
+  })
+  vi.spyOn(Storage.prototype, 'removeItem').mockImplementation((key) => {
+    mockStorage.delete(key)
+  })
+})
+
+describe('useViewSort', () => {
+  it('initializes with default sort when no stored value', () => {
+    const sort = ref([{ field: 'title' as const, dir: 'asc' as const }])
+    const entityId = ref<number | null>(1)
+
+    const { sortModel, isDefaultSort } = useViewSort(sort, 'library', entityId)
+
+    expect(sortModel.value).toEqual([{ field: 'title', dir: 'asc' }])
+    expect(isDefaultSort.value).toBe(true)
+  })
+
+  it('loads stored sort from localStorage on init', () => {
+    const stored = JSON.stringify([{ field: 'author', dir: 'desc' }])
+    mockStorage.set('bookorbit:sort:library:5', stored)
+
+    const sort = ref([{ field: 'title' as const, dir: 'asc' as const }])
+    const entityId = ref<number | null>(5)
+
+    const { sortModel, isDefaultSort } = useViewSort(sort, 'library', entityId)
+
+    expect(sortModel.value).toEqual([{ field: 'author', dir: 'desc' }])
+    expect(isDefaultSort.value).toBe(false)
+  })
+
+  it('persists sort to localStorage on sortModel write', () => {
+    const sort = ref([{ field: 'title' as const, dir: 'asc' as const }])
+    const entityId = ref<number | null>(3)
+
+    const { sortModel } = useViewSort(sort, 'library', entityId)
+    sortModel.value = [{ field: 'rating', dir: 'desc' }]
+
+    expect(mockStorage.get('bookorbit:sort:library:3')).toBe(JSON.stringify([{ field: 'rating', dir: 'desc' }]))
+  })
+
+  it('falls back to default when sortModel set to empty', () => {
+    const sort = ref([{ field: 'title' as const, dir: 'asc' as const }])
+    const entityId = ref<number | null>(1)
+
+    const { sortModel } = useViewSort(sort, 'library', entityId)
+    sortModel.value = []
+
+    expect(sortModel.value).toEqual([{ field: 'title', dir: 'asc' }])
+  })
+
+  it('resets sort and removes from localStorage', () => {
+    mockStorage.set('bookorbit:sort:library:7', JSON.stringify([{ field: 'author', dir: 'asc' }]))
+    const sort = ref([{ field: 'title' as const, dir: 'asc' as const }])
+    const entityId = ref<number | null>(7)
+
+    const { resetSort, isDefaultSort } = useViewSort(sort, 'library', entityId)
+
+    expect(isDefaultSort.value).toBe(false)
+    resetSort()
+    expect(isDefaultSort.value).toBe(true)
+    expect(mockStorage.has('bookorbit:sort:library:7')).toBe(false)
+  })
+
+  it('produces correct sortSummary', () => {
+    const sort = ref([{ field: 'title' as const, dir: 'asc' as const }])
+    const entityId = ref<number | null>(1)
+
+    const { sortModel, sortSummary } = useViewSort(sort, 'library', entityId)
+
+    expect(sortSummary.value).toBe('Title ↑')
+
+    sortModel.value = [
+      { field: 'author', dir: 'asc' },
+      { field: 'title', dir: 'desc' },
+    ]
+    expect(sortSummary.value).toBe('Author ↑, Title ↓')
+  })
+
+  it('reloads sort when entityId changes', async () => {
+    mockStorage.set('bookorbit:sort:test:1', JSON.stringify([{ field: 'author', dir: 'asc' }]))
+    mockStorage.set('bookorbit:sort:test:2', JSON.stringify([{ field: 'series', dir: 'desc' }]))
+
+    const sort = ref([{ field: 'title' as const, dir: 'asc' as const }])
+    const entityId = ref<number | null>(1)
+
+    const { sortModel } = useViewSort(sort, 'test', entityId)
+    expect(sortModel.value).toEqual([{ field: 'author', dir: 'asc' }])
+
+    entityId.value = 2
+    await nextTick()
+    expect(sortModel.value).toEqual([{ field: 'series', dir: 'desc' }])
+  })
+
+  it('handles null entityId gracefully', () => {
+    const sort = ref([{ field: 'title' as const, dir: 'asc' as const }])
+    const entityId = ref<number | null>(null)
+
+    const { sortModel, saveSort, resetSort } = useViewSort(sort, 'library', entityId)
+
+    expect(sortModel.value).toEqual([{ field: 'title', dir: 'asc' }])
+    expect(() => saveSort()).not.toThrow()
+    expect(() => resetSort()).not.toThrow()
+  })
+
+  it('handles corrupted localStorage gracefully', () => {
+    mockStorage.set('bookorbit:sort:library:9', 'not valid json{{{')
+
+    const sort = ref([{ field: 'title' as const, dir: 'asc' as const }])
+    const entityId = ref<number | null>(9)
+
+    const { sortModel } = useViewSort(sort, 'library', entityId)
+
+    expect(sortModel.value).toEqual([{ field: 'title', dir: 'asc' }])
+  })
+
+  it('uses different key prefixes for different view types', () => {
+    const sort = ref([{ field: 'title' as const, dir: 'asc' as const }])
+    const entityId = ref<number | null>(1)
+
+    const { sortModel } = useViewSort(sort, 'collection', entityId)
+    sortModel.value = [{ field: 'rating', dir: 'desc' }]
+
+    expect(mockStorage.has('bookorbit:sort:collection:1')).toBe(true)
+    expect(mockStorage.has('bookorbit:sort:library:1')).toBe(false)
+  })
+})
diff --git a/client/src/features/book/composables/tableColumnSchema.ts b/client/src/features/book/composables/tableColumnSchema.ts
new file mode 100644
index 000000000..9db92fea1
--- /dev/null
+++ b/client/src/features/book/composables/tableColumnSchema.ts
@@ -0,0 +1,355 @@
+import type { BookCard, BookMetadataLockField, SortField } from '@bookorbit/types'
+import { formatBytes } from '@/lib/formatting'
+
+function getPrimaryFile(book: BookCard) {
+  return book.files.find((f) => f.role === 'primary') ?? book.files[0] ?? null
+}
+
+export type ColumnId =
+  | 'lockRow'
+  | 'cover'
+  | 'title'
+  | 'authors'
+  | 'seriesName'
+  | 'seriesIndex'
+  | 'publishedYear'
+  | 'language'
+  | 'rating'
+  | 'genres'
+  | 'tags'
+  | 'subtitle'
+  | 'publisher'
+  | 'pageCount'
+  | 'isbn13'
+  | 'narrators'
+  | 'readingProgress'
+  | 'finishedAt'
+  | 'readStatus'
+  | 'format'
+  | 'fileSize'
+  | 'updatedAt'
+  | 'addedAt'
+  | 'actions'
+
+export type CellType = 'lockRow' | 'cover' | 'text' | 'number' | 'rating' | 'chips' | 'readStatus' | 'format' | 'date' | 'progress' | 'actions'
+
+export type ColumnDef = {
+  id: ColumnId
+  header: string
+  cellType: CellType
+  isEditable: boolean
+  sortField: SortField | null
+  defaultWidth: number
+  minWidth: number
+  defaultVisible: boolean
+  pinned: 'left' | 'right' | null
+  accessor?: (book: BookCard) => unknown
+  lockField?: BookMetadataLockField
+}
+
+export const LOCK_ROW_COLUMN_DEF: ColumnDef = {
+  id: 'lockRow',
+  header: '',
+  cellType: 'lockRow',
+  isEditable: false,
+  sortField: null,
+  defaultWidth: 36,
+  minWidth: 36,
+  defaultVisible: false,
+  pinned: 'left',
+}
+
+export const COLUMN_DEFS: ColumnDef[] = [
+  {
+    id: 'cover',
+    header: '',
+    cellType: 'cover',
+    isEditable: false,
+    sortField: null,
+    defaultWidth: 48,
+    minWidth: 48,
+    defaultVisible: true,
+    pinned: 'left',
+  },
+  {
+    id: 'title',
+    header: 'Title',
+    cellType: 'text',
+    isEditable: true,
+    sortField: 'title',
+    defaultWidth: 240,
+    minWidth: 120,
+    defaultVisible: true,
+    pinned: null,
+    accessor: (book) => book.title,
+    lockField: 'title',
+  },
+  {
+    id: 'authors',
+    header: 'Authors',
+    cellType: 'chips',
+    isEditable: true,
+    sortField: 'author',
+    defaultWidth: 180,
+    minWidth: 100,
+    defaultVisible: true,
+    pinned: null,
+    accessor: (book) => book.authors,
+    lockField: 'authors',
+  },
+  {
+    id: 'seriesName',
+    header: 'Series',
+    cellType: 'text',
+    isEditable: true,
+    sortField: 'series',
+    defaultWidth: 160,
+    minWidth: 100,
+    defaultVisible: true,
+    pinned: null,
+    accessor: (book) => book.seriesName,
+    lockField: 'seriesName',
+  },
+  {
+    id: 'seriesIndex',
+    header: '#',
+    cellType: 'number',
+    isEditable: true,
+    sortField: 'seriesIndex',
+    defaultWidth: 60,
+    minWidth: 48,
+    defaultVisible: true,
+    pinned: null,
+    accessor: (book) => book.seriesIndex,
+    lockField: 'seriesIndex',
+  },
+  {
+    id: 'publishedYear',
+    header: 'Year',
+    cellType: 'number',
+    isEditable: true,
+    sortField: 'publishedYear',
+    defaultWidth: 110,
+    minWidth: 95,
+    defaultVisible: true,
+    pinned: null,
+    accessor: (book) => book.publishedYear,
+    lockField: 'publishedYear',
+  },
+  {
+    id: 'language',
+    header: 'Language',
+    cellType: 'text',
+    isEditable: true,
+    sortField: 'language',
+    defaultWidth: 100,
+    minWidth: 72,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.language,
+    lockField: 'language',
+  },
+  {
+    id: 'rating',
+    header: 'Rating',
+    cellType: 'rating',
+    isEditable: true,
+    sortField: 'rating',
+    defaultWidth: 110,
+    minWidth: 88,
+    defaultVisible: true,
+    pinned: null,
+    accessor: (book) => book.rating,
+    lockField: 'rating',
+  },
+  {
+    id: 'genres',
+    header: 'Genres',
+    cellType: 'chips',
+    isEditable: true,
+    sortField: null,
+    defaultWidth: 160,
+    minWidth: 100,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.genres,
+    lockField: 'genres',
+  },
+  {
+    id: 'tags',
+    header: 'Tags',
+    cellType: 'chips',
+    isEditable: true,
+    sortField: null,
+    defaultWidth: 160,
+    minWidth: 100,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.tags ?? [],
+    lockField: 'tags',
+  },
+  {
+    id: 'subtitle',
+    header: 'Subtitle',
+    cellType: 'text',
+    isEditable: true,
+    sortField: null,
+    defaultWidth: 200,
+    minWidth: 100,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.subtitle,
+    lockField: 'subtitle',
+  },
+  {
+    id: 'publisher',
+    header: 'Publisher',
+    cellType: 'text',
+    isEditable: true,
+    sortField: 'publisher',
+    defaultWidth: 140,
+    minWidth: 80,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.publisher,
+    lockField: 'publisher',
+  },
+  {
+    id: 'pageCount',
+    header: 'Pages',
+    cellType: 'number',
+    isEditable: true,
+    sortField: 'pageCount',
+    defaultWidth: 80,
+    minWidth: 60,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.pageCount,
+    lockField: 'pageCount',
+  },
+  {
+    id: 'isbn13',
+    header: 'ISBN-13',
+    cellType: 'text',
+    isEditable: false,
+    sortField: null,
+    defaultWidth: 150,
+    minWidth: 100,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.isbn13,
+  },
+  {
+    id: 'narrators',
+    header: 'Narrators',
+    cellType: 'chips',
+    isEditable: true,
+    sortField: null,
+    defaultWidth: 180,
+    minWidth: 100,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.narrators,
+    lockField: 'narrators',
+  },
+  {
+    id: 'readingProgress',
+    header: 'Progress',
+    cellType: 'progress',
+    isEditable: false,
+    sortField: 'readProgress',
+    defaultWidth: 120,
+    minWidth: 80,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.readingProgress,
+  },
+  {
+    id: 'finishedAt',
+    header: 'Date Read',
+    cellType: 'date',
+    isEditable: false,
+    sortField: 'finishedAt',
+    defaultWidth: 110,
+    minWidth: 80,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.readStatus?.finishedAt ?? null,
+  },
+  {
+    id: 'readStatus',
+    header: 'Status',
+    cellType: 'readStatus',
+    isEditable: true,
+    sortField: 'readStatus',
+    defaultWidth: 130,
+    minWidth: 100,
+    defaultVisible: true,
+    pinned: null,
+    accessor: (book) => book.readStatus,
+  },
+  {
+    id: 'format',
+    header: 'Format',
+    cellType: 'format',
+    isEditable: false,
+    sortField: 'format',
+    defaultWidth: 80,
+    minWidth: 64,
+    defaultVisible: true,
+    pinned: null,
+  },
+  {
+    id: 'fileSize',
+    header: 'File Size',
+    cellType: 'text',
+    isEditable: false,
+    sortField: 'fileSize',
+    defaultWidth: 100,
+    minWidth: 84,
+    defaultVisible: true,
+    pinned: null,
+    accessor: (book) => formatBytes(getPrimaryFile(book)?.sizeBytes ?? null),
+  },
+  {
+    id: 'updatedAt',
+    header: 'Updated',
+    cellType: 'date',
+    isEditable: false,
+    sortField: 'updatedAt',
+    defaultWidth: 110,
+    minWidth: 84,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.updatedAt ?? null,
+  },
+  {
+    id: 'addedAt',
+    header: 'Added',
+    cellType: 'date',
+    isEditable: false,
+    sortField: 'addedAt',
+    defaultWidth: 100,
+    minWidth: 80,
+    defaultVisible: false,
+    pinned: null,
+    accessor: (book) => book.addedAt,
+  },
+  {
+    id: 'actions',
+    header: '',
+    cellType: 'actions',
+    isEditable: false,
+    sortField: null,
+    defaultWidth: 48,
+    minWidth: 48,
+    defaultVisible: true,
+    pinned: 'right',
+  },
+]
+
+export const COLUMN_DEF_MAP = new Map(COLUMN_DEFS.map((c) => [c.id, c]))
+
+export const DEFAULT_ORDER: ColumnId[] = COLUMN_DEFS.map((c) => c.id)
+export const DEFAULT_HIDDEN: ColumnId[] = COLUMN_DEFS.filter((c) => !c.defaultVisible).map((c) => c.id)
+export const DEFAULT_WIDTHS: Record<string, number> = Object.fromEntries(COLUMN_DEFS.map((c) => [c.id, c.defaultWidth]))
diff --git a/client/src/features/book/composables/useBookBulkActions.ts b/client/src/features/book/composables/useBookBulkActions.ts
index 874320119..7653af364 100644
--- a/client/src/features/book/composables/useBookBulkActions.ts
+++ b/client/src/features/book/composables/useBookBulkActions.ts
@@ -1,15 +1,46 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import type { BookCard, ReadStatus, UserBookStatus } from '@bookorbit/types'
+import {
+  BOOK_METADATA_LOCK_FIELDS,
+  type BookCard,
+  type BookDetail,
+  type BookMetadataLockField,
+  type GroupRule,
+  type ReadStatus,
+  type SortSpec,
+  type UserBookStatus,
+} from '@bookorbit/types'
 import { api } from '@/lib/api'
 import { toast } from 'vue-sonner'
 import { useCoverVersions } from './useCoverVersions'
 import { useRefreshingBooks } from './useRefreshingBooks'
 import { useBookDownload } from './useBookDownload'
+import { useBookRefreshFeedback } from './useBookRefreshFeedback'
+import { detectChangedColumns, mergeBookCardWithDetail } from '@/features/book/lib/book-card-mapper'
 
 export type ExportScope = 'primary' | 'all' | 'audio'
+export type BulkEditableField = 'seriesName' | 'publisher' | 'language' | 'publishedYear' | 'authors' | 'genres' | 'tags' | 'narrators'
+export type BulkEditableValue = string | number | string[] | null
+const BULK_FIELD_LOCK_FIELD: Record<BulkEditableField, BookMetadataLockField> = {
+  seriesName: 'seriesName',
+  publisher: 'publisher',
+  language: 'language',
+  publishedYear: 'publishedYear',
+  authors: 'authors',
+  genres: 'genres',
+  tags: 'tags',
+  narrators: 'narrators',
+}
 
-export type InFlightOp = { label: string; processed: number; total: number }
+export type InFlightOp = { label: string; processed: number; total: number; failed?: number }
+
+export type QuerySelectionState = {
+  libraryId?: number
+  filter?: GroupRule
+  q?: string
+  sort?: SortSpec[]
+  total: number
+}
 
 function buildLocalReadStatus(status: ReadStatus, existing: UserBookStatus | null, nowIso: string): UserBookStatus {
   switch (status) {
@@ -45,13 +76,33 @@ function buildLocalReadStatus(status: ReadStatus, existing: UserBookStatus | nul
   }
 }
 
-export function useBookBulkActions(selectedIds: Ref<Set<number>>, onDeleted: (ids: number[]) => void, books?: Ref<BookCard[]>) {
+export function useBookBulkActions(
+  selectedIds: Ref<Set<number>>,
+  onDeleted: (ids: number[]) => void,
+  books?: Ref<BookCard[]>,
+  onBulkRefreshCompleted?: () => void | Promise<void>,
+  querySelection?: Ref<QuerySelectionState | null>,
+) {
   const { bumpVersion } = useCoverVersions()
   const { markRefreshing, clearRefreshing } = useRefreshingBooks()
+  const refreshFeedback = useBookRefreshFeedback()
   const { exportBooks } = useBookDownload()
 
   const inFlight = ref<InFlightOp | null>(null)
 
+  function getSelectionPayload(): { bookIds: number[] } | { query: Omit<QuerySelectionState, 'total'> } {
+    if (querySelection?.value) {
+      const { libraryId, filter, q, sort } = querySelection.value
+      return { query: { libraryId, filter, q, sort } }
+    }
+    return { bookIds: [...selectedIds.value] }
+  }
+
+  function hasSelection(): boolean {
+    if (querySelection?.value) return querySelection.value.total > 0
+    return selectedIds.value.size > 0
+  }
+
   function updateSelectedBooks(ids: number[], updater: (book: BookCard) => BookCard) {
     if (!books) return
     const selected = new Set(ids)
@@ -59,17 +110,20 @@ export function useBookBulkActions(selectedIds: Ref<Set<number>>, onDeleted: (id
   }
 
   async function handleBulkRefreshMetadata() {
-    const ids = [...selectedIds.value]
-    if (ids.length === 0) return
+    if (!hasSelection()) return
+    const ids = querySelection?.value ? [] : [...selectedIds.value]
+    const total = querySelection?.value ? querySelection.value.total : ids.length
     markRefreshing(ids)
-    inFlight.value = { label: 'Refreshing metadata', processed: 0, total: ids.length }
+    refreshFeedback.markRefreshingMany(ids)
+    inFlight.value = { label: 'Refreshing metadata', processed: 0, total, failed: 0 }
     const res = await api('/api/v1/books/bulk-refresh-metadata', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ bookIds: ids }),
+      body: JSON.stringify(getSelectionPayload()),
     })
     if (!res.ok) {
       clearRefreshing(ids)
+      refreshFeedback.markFailedMany(ids, 'Metadata refresh failed')
       inFlight.value = null
       toast.error('Failed to refresh metadata')
       return
@@ -85,15 +139,46 @@ export function useBookBulkActions(selectedIds: Ref<Set<number>>, onDeleted: (id
         for (const line of decoder.decode(value, { stream: true }).split('\n')) {
           if (!line.startsWith('data: ')) continue
           try {
-            const data = JSON.parse(line.slice(6))
+            const data = JSON.parse(line.slice(6)) as {
+              bookId?: number
+              success?: boolean
+              detail?: BookDetail
+              error?: string
+              done?: boolean
+              processed?: number
+              failed?: number
+            }
             if (data.bookId !== undefined) {
-              bumpVersion(data.bookId)
-              clearRefreshing([data.bookId])
-              inFlight.value = { label: 'Refreshing metadata', processed: inFlight.value!.processed + 1, total: ids.length }
+              const bookId = data.bookId
+              const succeeded = data.success !== false
+              let changedColumns: ReturnType<typeof detectChangedColumns> = []
+
+              if (succeeded && books && data.detail) {
+                const index = books.value.findIndex((book) => book.id === bookId)
+                const previous = index !== -1 ? books.value[index] : undefined
+                if (previous) {
+                  const merged = mergeBookCardWithDetail(previous, data.detail)
+                  changedColumns = detectChangedColumns(previous, merged)
+                  books.value = books.value.map((book, i) => (i === index ? merged : book))
+                }
+              }
+
+              if (succeeded) refreshFeedback.markSuccess(bookId, changedColumns)
+              else refreshFeedback.markFailed(bookId, data.error || 'Metadata refresh failed')
+
+              bumpVersion(bookId)
+              clearRefreshing([bookId])
+              const prev: InFlightOp = inFlight.value ?? { label: 'Refreshing metadata', processed: 0, total, failed: 0 }
+              inFlight.value = {
+                label: 'Refreshing metadata',
+                processed: prev.processed + 1,
+                total,
+                failed: (prev.failed ?? 0) + (succeeded ? 0 : 1),
+              }
             }
             if (data.done) {
-              processed = data.processed
-              failed = data.failed
+              processed = typeof data.processed === 'number' ? data.processed : processed
+              failed = typeof data.failed === 'number' ? data.failed : failed
             }
           } catch {
             /* ignore malformed SSE line */
@@ -101,9 +186,21 @@ export function useBookBulkActions(selectedIds: Ref<Set<number>>, onDeleted: (id
         }
       }
     } finally {
+      for (const id of ids) {
+        if (refreshFeedback.getFeedback(id)?.state === 'refreshing') {
+          refreshFeedback.markFailed(id, 'Metadata refresh interrupted')
+        }
+      }
       clearRefreshing(ids)
       inFlight.value = null
     }
+    if (onBulkRefreshCompleted) {
+      try {
+        await onBulkRefreshCompleted()
+      } catch {
+        // Ignore refresh-list failure and still surface the bulk action outcome.
+      }
+    }
     if (failed > 0) {
       toast.warning(`Refreshed ${processed} book${processed === 1 ? '' : 's'}, ${failed} failed`)
     } else {
@@ -112,14 +209,15 @@ export function useBookBulkActions(selectedIds: Ref<Set<number>>, onDeleted: (id
   }
 
   async function handleBulkReExtractCover() {
-    const ids = [...selectedIds.value]
-    if (ids.length === 0) return
+    if (!hasSelection()) return
+    const ids = querySelection?.value ? [] : [...selectedIds.value]
+    const total = querySelection?.value ? querySelection.value.total : ids.length
     markRefreshing(ids)
-    inFlight.value = { label: 'Re-extracting covers', processed: 0, total: ids.length }
+    inFlight.value = { label: 'Re-extracting covers', processed: 0, total }
     const res = await api('/api/v1/books/bulk-re-extract-cover', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ bookIds: ids }),
+      body: JSON.stringify(getSelectionPayload()),
     })
     if (!res.ok) {
       clearRefreshing(ids)
@@ -142,7 +240,7 @@ export function useBookBulkActions(selectedIds: Ref<Set<number>>, onDeleted: (id
             if (data.bookId !== undefined) {
               bumpVersion(data.bookId)
               clearRefreshing([data.bookId])
-              inFlight.value = { label: 'Re-extracting covers', processed: inFlight.value!.processed + 1, total: ids.length }
+              inFlight.value = { label: 'Re-extracting covers', processed: inFlight.value!.processed + 1, total }
             }
             if (data.done) {
               processed = data.processed
@@ -160,18 +258,18 @@ export function useBookBulkActions(selectedIds: Ref<Set<number>>, onDeleted: (id
     toast.success(`Re-extracted ${updated} of ${processed} cover${processed === 1 ? '' : 's'}`)
   }
 
-  async function handleExport(scope: ExportScope) {
+  async function handleDownloadFiles(scope: ExportScope) {
     const ids = [...selectedIds.value]
     await exportBooks(ids, scope === 'all', scope === 'audio' ? 'audio' : undefined)
   }
 
   async function handleBulkSetStatus(status: ReadStatus) {
-    const ids = [...selectedIds.value]
-    if (ids.length === 0) return
+    if (!hasSelection()) return
+    const ids = querySelection?.value ? [] : [...selectedIds.value]
     const res = await api('/api/v1/books/bulk-set-status', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ bookIds: ids, status }),
+      body: JSON.stringify({ ...getSelectionPayload(), status }),
     })
     if (!res.ok) {
       toast.error('Failed to update status')
@@ -182,52 +280,121 @@ export function useBookBulkActions(selectedIds: Ref<Set<number>>, onDeleted: (id
       ...book,
       readStatus: buildLocalReadStatus(status, book.readStatus, nowIso),
     }))
-    toast.success(`Updated status for ${ids.length} book${ids.length === 1 ? '' : 's'}`)
+    const count = querySelection?.value ? querySelection.value.total : ids.length
+    toast.success(`Updated status for ${count} book${count === 1 ? '' : 's'}`)
   }
 
   async function handleBulkSetRating(rating: number | null) {
-    const ids = [...selectedIds.value]
-    if (ids.length === 0) return
+    if (!hasSelection()) return
+    const ids = querySelection?.value ? [] : [...selectedIds.value]
     const res = await api('/api/v1/books/bulk-set-rating', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ bookIds: ids, rating }),
+      body: JSON.stringify({ ...getSelectionPayload(), rating }),
     })
     if (!res.ok) {
       toast.error('Failed to update rating')
       return
     }
-    updateSelectedBooks(ids, (book) => ({
+    const editableIds = books
+      ? ids.filter((id) => {
+          const book = books.value.find((entry) => entry.id === id)
+          return book ? !book.lockedFields.includes('rating') : true
+        })
+      : ids
+    const skippedCount = ids.length - editableIds.length
+    updateSelectedBooks(editableIds, (book) => ({
       ...book,
       rating,
     }))
-    const label = rating === null ? 'Cleared rating' : `Rated ${ids.length} book${ids.length === 1 ? '' : 's'} ${rating}/5`
+    const count = querySelection?.value ? querySelection.value.total : editableIds.length
+    const baseLabel =
+      rating === null ? `Cleared rating for ${count} book${count === 1 ? '' : 's'}` : `Rated ${count} book${count === 1 ? '' : 's'} ${rating}/5`
+    const label = skippedCount > 0 ? `${baseLabel} (${skippedCount} locked skipped)` : baseLabel
     toast.success(label)
   }
 
   async function handleBulkUpdateTags(mode: 'add' | 'remove' | 'replace', tags: string[]) {
-    const ids = [...selectedIds.value]
-    if (ids.length === 0) return
+    if (!hasSelection()) return
+    const ids = querySelection?.value ? [] : [...selectedIds.value]
     const res = await api('/api/v1/books/bulk-update-tags', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ bookIds: ids, mode, tags }),
+      body: JSON.stringify({ ...getSelectionPayload(), mode, tags }),
     })
     if (!res.ok) {
       toast.error('Failed to update tags')
       return
     }
     const verb = mode === 'add' ? 'Added tags to' : mode === 'remove' ? 'Removed tags from' : 'Replaced tags on'
-    toast.success(`${verb} ${ids.length} book${ids.length === 1 ? '' : 's'}`)
+    const count = querySelection?.value ? querySelection.value.total : ids.length
+    toast.success(`${verb} ${count} book${count === 1 ? '' : 's'}`)
+  }
+
+  async function handleBulkSetField(field: BulkEditableField, value: BulkEditableValue) {
+    if (!hasSelection()) return
+    const ids = querySelection?.value ? [] : [...selectedIds.value]
+    const lockField = BULK_FIELD_LOCK_FIELD[field]
+    const toStringList = (raw: BulkEditableValue): string[] => {
+      if (Array.isArray(raw)) return raw
+      if (raw === null) return []
+      const trimmed = String(raw).trim()
+      return trimmed.length > 0 ? [trimmed] : []
+    }
+    const res = await api('/api/v1/books/bulk-set-metadata', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ ...getSelectionPayload(), field, value }),
+    })
+    if (!res.ok) {
+      toast.error(`Failed to update ${field}`)
+      return
+    }
+    const editableIds = books
+      ? ids.filter((id) => {
+          const book = books.value.find((entry) => entry.id === id)
+          return book ? !book.lockedFields.includes(lockField) : true
+        })
+      : ids
+    const skippedCount = ids.length - editableIds.length
+    updateSelectedBooks(editableIds, (book) => {
+      switch (field) {
+        case 'seriesName':
+          return { ...book, seriesName: typeof value === 'string' ? value : value === null ? null : String(value) }
+        case 'publisher':
+          return { ...book, publisher: typeof value === 'string' ? value : value === null ? null : String(value) }
+        case 'language':
+          return { ...book, language: typeof value === 'string' ? value : value === null ? null : String(value) }
+        case 'publishedYear':
+          return {
+            ...book,
+            publishedYear: typeof value === 'number' ? value : value === null ? null : Number.isFinite(Number(value)) ? Number(value) : null,
+          }
+        case 'authors':
+          return { ...book, authors: toStringList(value) }
+        case 'genres':
+          return { ...book, genres: toStringList(value) }
+        case 'narrators':
+          return { ...book, narrators: toStringList(value) }
+        case 'tags':
+          return book
+      }
+    })
+    const count = querySelection?.value ? querySelection.value.total : editableIds.length
+    if (skippedCount > 0) {
+      toast.success(`Updated ${field} for ${count} book${count === 1 ? '' : 's'} (${skippedCount} locked skipped)`)
+      return
+    }
+    toast.success(`Updated ${field} for ${count} book${count === 1 ? '' : 's'}`)
   }
 
   async function handleBulkSetMetadataLock(locked: boolean) {
-    const ids = [...selectedIds.value]
-    if (ids.length === 0) return
+    if (!hasSelection()) return
+    const ids = querySelection?.value ? [] : [...selectedIds.value]
     const res = await api('/api/v1/books/bulk-set-metadata-lock', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ bookIds: ids, locked }),
+      body: JSON.stringify({ ...getSelectionPayload(), locked }),
     })
     if (!res.ok) {
       toast.error(`Failed to ${locked ? 'lock' : 'unlock'} metadata`)
@@ -236,34 +403,38 @@ export function useBookBulkActions(selectedIds: Ref<Set<number>>, onDeleted: (id
     updateSelectedBooks(ids, (book) => ({
       ...book,
       hasMetadataLocks: locked,
+      lockedFields: locked ? [...BOOK_METADATA_LOCK_FIELDS] : [],
     }))
-    toast.success(`${locked ? 'Locked' : 'Unlocked'} metadata for ${ids.length} book${ids.length === 1 ? '' : 's'}`)
+    const count = querySelection?.value ? querySelection.value.total : ids.length
+    toast.success(`${locked ? 'Locked' : 'Unlocked'} metadata for ${count} book${count === 1 ? '' : 's'}`)
   }
 
   async function handleDeleteSelected() {
-    const ids = [...selectedIds.value]
-    if (ids.length === 0) return
+    if (!hasSelection()) return
+    const ids = querySelection?.value ? [] : [...selectedIds.value]
+    const count = querySelection?.value ? querySelection.value.total : ids.length
     const res = await api('/api/v1/books', {
       method: 'DELETE',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ bookIds: ids }),
+      body: JSON.stringify(getSelectionPayload()),
     })
     if (!res.ok) {
       toast.error('Failed to delete books')
       return
     }
     onDeleted(ids)
-    toast.success(`Deleted ${ids.length} book${ids.length === 1 ? '' : 's'}`)
+    toast.success(`Deleted ${count} book${count === 1 ? '' : 's'}`)
   }
 
   return {
     inFlight,
     handleBulkRefreshMetadata,
     handleBulkReExtractCover,
-    handleExport,
+    handleDownloadFiles,
     handleBulkSetStatus,
     handleBulkSetRating,
     handleBulkUpdateTags,
+    handleBulkSetField,
     handleBulkSetMetadataLock,
     handleDeleteSelected,
   }
diff --git a/client/src/features/book/composables/useBookDataSource.ts b/client/src/features/book/composables/useBookDataSource.ts
new file mode 100644
index 000000000..14e0d0f49
--- /dev/null
+++ b/client/src/features/book/composables/useBookDataSource.ts
@@ -0,0 +1,111 @@
+import { computed, ref, watch, type Ref } from 'vue'
+import { api } from '@/lib/api'
+import type { BookCard, BookQuery, BooksPage, SortSpec } from '@bookorbit/types'
+
+const PAGE_SIZE = 50
+
+export type BookDataSourceOptions = {
+  collapseEnabled?: Ref<boolean>
+  q?: Ref<string>
+  sort?: Ref<SortSpec[]>
+}
+
+function isValidScopeId(value: number): boolean {
+  return Number.isInteger(value) && value > 0
+}
+
+export function useBookDataSource(scopeId: Ref<number>, endpointForId: (id: number) => string, options: BookDataSourceOptions = {}) {
+  const collapseEnabled = options.collapseEnabled ?? ref(false)
+  const q = options.q ?? ref('')
+  const sort = options.sort ?? ref<SortSpec[]>([{ field: 'title', dir: 'asc' }])
+
+  const items = ref<BookCard[]>([])
+  const total = ref(0)
+  const loading = ref(false)
+  const initialized = ref(false)
+  const error = ref<string | null>(null)
+  const page = ref(0)
+
+  const hasMore = computed(() => items.value.length < total.value)
+
+  let activeController: AbortController | null = null
+
+  async function load(reset = false) {
+    if (!isValidScopeId(scopeId.value)) {
+      clear()
+      initialized.value = true
+      return
+    }
+
+    if (!reset && (loading.value || !hasMore.value)) return
+
+    if (reset && activeController) {
+      activeController.abort()
+    }
+
+    const controller = new AbortController()
+    activeController = controller
+    loading.value = true
+    error.value = null
+
+    if (reset) {
+      page.value = 0
+    }
+
+    try {
+      const body: BookQuery = {
+        sort: sort.value,
+        pagination: { page: page.value, size: PAGE_SIZE },
+        ...(collapseEnabled.value ? { collapseSeries: true } : {}),
+        ...(q.value.trim() ? { q: q.value.trim() } : {}),
+      }
+      const res = await api(endpointForId(scopeId.value), {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(body),
+        signal: controller.signal,
+      })
+
+      if (controller.signal.aborted) return
+      if (!res.ok) throw new Error(`HTTP ${res.status}`)
+
+      const data: BooksPage = await res.json()
+      if (controller.signal.aborted) return
+
+      items.value = page.value === 0 ? data.items : [...items.value, ...data.items]
+      total.value = data.total
+      page.value += 1
+    } catch (e) {
+      if (controller.signal.aborted) return
+      error.value = e instanceof Error ? e.message : 'Failed to load books'
+    } finally {
+      if (!controller.signal.aborted) {
+        loading.value = false
+        initialized.value = true
+      }
+    }
+  }
+
+  function clear() {
+    activeController?.abort()
+    activeController = null
+    items.value = []
+    total.value = 0
+    page.value = 0
+    error.value = null
+  }
+
+  watch(
+    sort,
+    () => {
+      void load(true)
+    },
+    { deep: true },
+  )
+
+  watch(collapseEnabled, () => {
+    void load(true)
+  })
+
+  return { items, total, loading, initialized, error, hasMore, load, clear }
+}
diff --git a/client/src/features/book/composables/useBookMetadataExport.ts b/client/src/features/book/composables/useBookMetadataExport.ts
new file mode 100644
index 000000000..57e8735e9
--- /dev/null
+++ b/client/src/features/book/composables/useBookMetadataExport.ts
@@ -0,0 +1,169 @@
+import { ref } from 'vue'
+import type { GroupRule, SortSpec } from '@bookorbit/types'
+import { api } from '@/lib/api'
+
+export type MetadataExportFormat = 'csv' | 'json'
+export type MetadataExportScope = 'selected' | 'all-matching'
+export type MetadataExportViewType = 'library' | 'collection' | 'smartScope'
+export type MetadataExportColumnsMode = 'canonical' | 'visible'
+
+export type MetadataExportQuery = {
+  libraryId?: number
+  filter?: GroupRule
+  q?: string
+  sort?: SortSpec[]
+}
+
+export type MetadataExportOptions = {
+  includePersonalData: boolean
+  includeFilePaths: boolean
+  includeContextMeta: boolean
+  columnsMode: MetadataExportColumnsMode
+  visibleColumns: string[]
+}
+
+export type MetadataExportRequest = {
+  scope: MetadataExportScope
+  format: MetadataExportFormat
+  viewType: MetadataExportViewType
+  selectedBookIds: number[]
+  allMatchingQuery?: MetadataExportQuery
+  sort?: SortSpec[]
+  options: MetadataExportOptions
+}
+
+export type MetadataExportPreflight = {
+  schemaVersion: number
+  rowCount: number
+  estimatedBytes: number
+  sizeCategory: 'small' | 'medium' | 'large'
+  fileName: string
+  scope: MetadataExportScope
+  format: MetadataExportFormat
+}
+
+type MetadataExportPayload = {
+  bookIds?: number[]
+  query?: MetadataExportQuery
+  sort?: SortSpec[]
+  format: MetadataExportFormat
+  viewType: MetadataExportViewType
+  options: MetadataExportOptions
+}
+
+async function readErrorMessage(response: Response, fallback: string): Promise<string> {
+  const raw = await response.text()
+  if (!raw) return fallback
+  try {
+    const parsed = JSON.parse(raw) as { message?: string | string[]; error?: string }
+    if (Array.isArray(parsed.message) && parsed.message.length > 0) return parsed.message.join(', ')
+    if (typeof parsed.message === 'string' && parsed.message.length > 0) return parsed.message
+    if (typeof parsed.error === 'string' && parsed.error.length > 0) return parsed.error
+  } catch {
+    // Fall back to raw response text.
+  }
+  return raw
+}
+
+function triggerBlobDownload(blob: Blob, filename: string) {
+  const url = URL.createObjectURL(blob)
+  const anchor = document.createElement('a')
+  anchor.href = url
+  anchor.download = filename
+  anchor.rel = 'noopener'
+  document.body.append(anchor)
+  anchor.click()
+  anchor.remove()
+  URL.revokeObjectURL(url)
+}
+
+function extractFileName(disposition: string | null, fallback: string): string {
+  if (!disposition) return fallback
+  const utf8Match = disposition.match(/filename\*=UTF-8''([^;]+)/i)
+  if (utf8Match?.[1]) {
+    try {
+      return decodeURIComponent(utf8Match[1])
+    } catch {
+      // Fall through to regular filename parser.
+    }
+  }
+  const asciiMatch = disposition.match(/filename="([^"]+)"/i)
+  return asciiMatch?.[1] || fallback
+}
+
+function toPayload(request: MetadataExportRequest): MetadataExportPayload {
+  if (request.scope === 'all-matching') {
+    if (!request.allMatchingQuery) {
+      throw new Error('All-matching metadata export requires a query payload')
+    }
+    return {
+      query: request.allMatchingQuery,
+      format: request.format,
+      viewType: request.viewType,
+      options: request.options,
+    }
+  }
+
+  return {
+    bookIds: request.selectedBookIds,
+    sort: request.sort,
+    format: request.format,
+    viewType: request.viewType,
+    options: request.options,
+  }
+}
+
+export function useBookMetadataExport() {
+  const loading = ref(false)
+
+  async function preflight(request: MetadataExportRequest): Promise<MetadataExportPreflight> {
+    const response = await api('/api/v1/books/metadata-export/preflight', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(toPayload(request)),
+    })
+    if (!response.ok) {
+      const message = await readErrorMessage(response, 'Failed to prepare metadata export')
+      throw new Error(message)
+    }
+    return (await response.json()) as MetadataExportPreflight
+  }
+
+  async function download(request: MetadataExportRequest): Promise<MetadataExportPreflight> {
+    loading.value = true
+    try {
+      const payload = toPayload(request)
+      const response = await api('/api/v1/books/metadata-export/download', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(payload),
+      })
+      if (!response.ok) {
+        const message = await readErrorMessage(response, 'Failed to export metadata')
+        throw new Error(message)
+      }
+      const blob = await response.blob()
+      const defaultName = `bookorbit-${request.viewType}-${request.scope}.${request.format}`
+      const fileName = extractFileName(response.headers.get('Content-Disposition'), defaultName)
+      triggerBlobDownload(blob, fileName)
+
+      return {
+        schemaVersion: 1,
+        rowCount: 0,
+        estimatedBytes: blob.size,
+        sizeCategory: blob.size < 5 * 1024 * 1024 ? 'small' : blob.size < 25 * 1024 * 1024 ? 'medium' : 'large',
+        fileName,
+        scope: request.scope,
+        format: request.format,
+      }
+    } finally {
+      loading.value = false
+    }
+  }
+
+  return {
+    loading,
+    preflight,
+    download,
+  }
+}
diff --git a/client/src/features/book/composables/useBookQuery.ts b/client/src/features/book/composables/useBookQuery.ts
index a4097aa8d..bfd395075 100644
--- a/client/src/features/book/composables/useBookQuery.ts
+++ b/client/src/features/book/composables/useBookQuery.ts
@@ -1,77 +1,3 @@
-import { computed, reactive, ref, watch, type Ref } from 'vue'
-import { api } from '@/lib/api'
-import type { BookCard, BookQuery, BooksPage, GroupRule, SortSpec } from '@bookorbit/types'
-
-export type { BookCard }
-
-export function useBookQuery(libraryId: Ref<number | null>, collapseEnabled: Ref<boolean> = ref(false), q: Ref<string> = ref('')) {
-  const items = ref<BookCard[]>([])
-  const total = ref(0)
-  const loading = ref(false)
-  const initialized = ref(false)
-  const error = ref<string | null>(null)
-
-  const filter = ref<GroupRule | undefined>(undefined)
-  const sort = ref<SortSpec[]>([{ field: 'title', dir: 'asc' }])
-  const pagination = reactive({ page: 0, size: 50 })
-
-  const hasMore = computed(() => items.value.length < total.value)
-
-  async function load(reset = false) {
-    if (loading.value || libraryId.value === null) return
-    if (!reset && !hasMore.value) return
-    loading.value = true
-    error.value = null
-
-    if (reset) {
-      pagination.page = 0
-      items.value = []
-      total.value = 0
-    }
-
-    try {
-      const body: BookQuery = {
-        filter: filter.value,
-        sort: sort.value,
-        pagination: { page: pagination.page, size: pagination.size },
-        ...(collapseEnabled.value ? { collapseSeries: true } : {}),
-        ...(q.value.trim() ? { q: q.value.trim() } : {}),
-      }
-
-      const res = await api(`/api/v1/libraries/${libraryId.value}/books`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(body),
-      })
-
-      if (!res.ok) throw new Error(`HTTP ${res.status}`)
-
-      const page: BooksPage = await res.json()
-
-      if (pagination.page === 0) {
-        items.value = page.items
-      } else {
-        items.value = [...items.value, ...page.items]
-      }
-      total.value = page.total
-      pagination.page++
-    } catch (e) {
-      error.value = e instanceof Error ? e.message : 'Failed to load books'
-    } finally {
-      loading.value = false
-      initialized.value = true
-    }
-  }
-
-  function clear() {
-    items.value = []
-    total.value = 0
-    pagination.page = 0
-  }
-
-  watch(libraryId, (newId, oldId) => {
-    if (newId !== oldId) load(true)
-  })
-
-  return { items, total, loading, initialized, error, filter, sort, pagination, hasMore, load, clear }
-}
+// Deprecated: use useLibraryBooks instead.
+export { useLibraryBooks as useBookQuery, sortItems } from './useLibraryBooks'
+export type { BookCard } from '@bookorbit/types'
diff --git a/client/src/features/book/composables/useBookRefreshFeedback.ts b/client/src/features/book/composables/useBookRefreshFeedback.ts
new file mode 100644
index 000000000..704e011c2
--- /dev/null
+++ b/client/src/features/book/composables/useBookRefreshFeedback.ts
@@ -0,0 +1,147 @@
+import { ref } from 'vue'
+import type { ColumnId } from './useTableColumns'
+
+export type BookRefreshFeedbackState = 'refreshing' | 'success' | 'failed'
+
+export type BookRefreshFeedbackEntry = {
+  state: BookRefreshFeedbackState
+  changedColumns: Set<ColumnId>
+  message: string | null
+  updatedAt: number
+}
+
+const feedbackByBookId = ref(new Map<number, BookRefreshFeedbackEntry>())
+const clearTimers = new Map<number, ReturnType<typeof setTimeout>>()
+const flashTimers = new Map<number, ReturnType<typeof setTimeout>>()
+
+function setEntry(bookId: number, entry: BookRefreshFeedbackEntry) {
+  const next = new Map(feedbackByBookId.value)
+  next.set(bookId, entry)
+  feedbackByBookId.value = next
+}
+
+function clearEntry(bookId: number) {
+  const next = new Map(feedbackByBookId.value)
+  next.delete(bookId)
+  feedbackByBookId.value = next
+}
+
+function clearTimer(bookId: number) {
+  const timer = clearTimers.get(bookId)
+  if (!timer) return
+  clearTimeout(timer)
+  clearTimers.delete(bookId)
+}
+
+function clearFlashTimer(bookId: number) {
+  const timer = flashTimers.get(bookId)
+  if (!timer) return
+  clearTimeout(timer)
+  flashTimers.delete(bookId)
+}
+
+function scheduleFlashClear(bookId: number, expectedUpdatedAt: number, delayMs = 2800) {
+  clearFlashTimer(bookId)
+  flashTimers.set(
+    bookId,
+    setTimeout(() => {
+      const current = feedbackByBookId.value.get(bookId)
+      if (!current) return
+      if (current.updatedAt !== expectedUpdatedAt || current.state !== 'success') return
+      setEntry(bookId, { ...current, changedColumns: new Set<ColumnId>() })
+      flashTimers.delete(bookId)
+    }, delayMs),
+  )
+}
+
+function scheduleEntryClear(bookId: number, expectedUpdatedAt: number, delayMs: number) {
+  clearTimer(bookId)
+  clearTimers.set(
+    bookId,
+    setTimeout(() => {
+      const current = feedbackByBookId.value.get(bookId)
+      if (!current) return
+      if (current.updatedAt !== expectedUpdatedAt) return
+      clearEntry(bookId)
+      clearTimers.delete(bookId)
+      clearFlashTimer(bookId)
+    }, delayMs),
+  )
+}
+
+export function useBookRefreshFeedback() {
+  function markRefreshing(bookId: number) {
+    clearTimer(bookId)
+    clearFlashTimer(bookId)
+    setEntry(bookId, {
+      state: 'refreshing',
+      changedColumns: new Set<ColumnId>(),
+      message: null,
+      updatedAt: Date.now(),
+    })
+  }
+
+  function markRefreshingMany(bookIds: number[]) {
+    for (const bookId of bookIds) {
+      markRefreshing(bookId)
+    }
+  }
+
+  function markSuccess(bookId: number, changedColumns: ColumnId[] = []) {
+    clearTimer(bookId)
+    clearFlashTimer(bookId)
+    const updatedAt = Date.now()
+    setEntry(bookId, {
+      state: 'success',
+      changedColumns: new Set(changedColumns),
+      message: null,
+      updatedAt,
+    })
+    scheduleFlashClear(bookId, updatedAt)
+    scheduleEntryClear(bookId, updatedAt, 7000)
+  }
+
+  function markFailed(bookId: number, message = 'Metadata refresh failed') {
+    clearTimer(bookId)
+    clearFlashTimer(bookId)
+    const updatedAt = Date.now()
+    setEntry(bookId, {
+      state: 'failed',
+      changedColumns: new Set<ColumnId>(),
+      message,
+      updatedAt,
+    })
+    scheduleEntryClear(bookId, updatedAt, 10000)
+  }
+
+  function markFailedMany(bookIds: number[], message = 'Metadata refresh failed') {
+    for (const bookId of bookIds) {
+      markFailed(bookId, message)
+    }
+  }
+
+  function getFeedback(bookId: number): BookRefreshFeedbackEntry | null {
+    return feedbackByBookId.value.get(bookId) ?? null
+  }
+
+  function isCellChanged(bookId: number, columnId: ColumnId): boolean {
+    return feedbackByBookId.value.get(bookId)?.changedColumns.has(columnId) ?? false
+  }
+
+  function clearFeedback(bookId: number) {
+    clearTimer(bookId)
+    clearFlashTimer(bookId)
+    clearEntry(bookId)
+  }
+
+  return {
+    markRefreshing,
+    markRefreshingMany,
+    markSuccess,
+    markFailed,
+    markFailedMany,
+    clearFeedback,
+    getFeedback,
+    isCellChanged,
+  }
+}
diff --git a/client/src/features/book/composables/useBookSelection.ts b/client/src/features/book/composables/useBookSelection.ts
index 0fc47171c..0cf9eedf5 100644
--- a/client/src/features/book/composables/useBookSelection.ts
+++ b/client/src/features/book/composables/useBookSelection.ts
@@ -55,6 +55,16 @@ export function useBookSelection() {
     selectedIds.value = new Set(ids)
   }
 
+  function deselectAll(ids: number[]) {
+    if (ids.length === 0) return
+    const remove = new Set(ids)
+    selectedIds.value = new Set([...selectedIds.value].filter((id) => !remove.has(id)))
+    if (anchorId.value !== null && remove.has(anchorId.value)) {
+      anchorId.value = null
+      anchorSelected.value = false
+    }
+  }
+
   function isSelected(id: number) {
     return selectedIds.value.has(id)
   }
@@ -68,6 +78,7 @@ export function useBookSelection() {
     toggleBook,
     rangeSelectTo,
     selectAll,
+    deselectAll,
     isSelected,
   }
 }
diff --git a/client/src/features/book/composables/useBookTableShell.ts b/client/src/features/book/composables/useBookTableShell.ts
new file mode 100644
index 000000000..009038294
--- /dev/null
+++ b/client/src/features/book/composables/useBookTableShell.ts
@@ -0,0 +1,96 @@
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { BookCard } from '@bookorbit/types'
+import { useTableViewControls } from './useTableViewControls'
+import { useBookViewSelection } from './useBookViewSelection'
+import { useDeleteBook } from './useDeleteBook'
+import { useBookBulkActions, type QuerySelectionState } from './useBookBulkActions'
+
+interface BookTableShellOptions {
+  viewType?: 'library' | 'collection' | 'smartScope'
+  books: Ref<BookCard[]>
+  total?: Ref<number>
+  loading?: Ref<boolean>
+  exitSelectionMode?: () => void
+  loadFn: (force?: boolean) => void | Promise<void>
+  querySelection?: Ref<QuerySelectionState | null>
+}
+
+type BookActionType = 'quick-view' | 'add-to-collection' | 'delete'
+
+export function useBookTableShell({ books, loadFn, querySelection }: BookTableShellOptions) {
+  const tableControls = useTableViewControls()
+  const selection = useBookViewSelection(books)
+
+  const {
+    pendingId: deleteBookId,
+    deleting: deletingBook,
+    promptDelete,
+    cancelDelete,
+    confirmDelete,
+  } = useDeleteBook((id) => {
+    books.value = books.value.filter((book) => book.id !== id)
+  })
+
+  const bulk = useBookBulkActions(
+    selection.selectedIds,
+    (ids) => {
+      const deleted = new Set(ids)
+      books.value = books.value.filter((book) => !deleted.has(book.id))
+      selection.exitSelectionMode()
+    },
+    books,
+    () => loadFn(true),
+    querySelection,
+  )
+
+  const addToCollectionOpen = ref(false)
+  const bulkTagsOpen = ref(false)
+  const sendBookOpen = ref(false)
+  const quickViewBookId = ref<number | null>(null)
+  const quickViewOpen = ref(false)
+
+  function handleBookAction(book: BookCard, action: BookActionType): void {
+    if (action === 'quick-view') {
+      quickViewBookId.value = book.id
+      quickViewOpen.value = true
+      return
+    }
+
+    if (action === 'add-to-collection') {
+      if (!selection.selectionMode.value) {
+        selection.enterSelectionMode()
+        selection.toggleBook(book.id)
+      }
+      addToCollectionOpen.value = true
+      return
+    }
+
+    promptDelete(book.id)
+  }
+
+  function handleTableBookUpdate(updated: BookCard): void {
+    const index = books.value.findIndex((book) => book.id === updated.id)
+    if (index === -1) return
+
+    books.value = books.value.map((book, currentIndex) => (currentIndex === index ? updated : book))
+  }
+
+  return {
+    ...tableControls,
+    ...selection,
+    deleteBookId,
+    deletingBook,
+    promptDelete,
+    cancelDelete,
+    confirmDelete,
+    ...bulk,
+    addToCollectionOpen,
+    bulkTagsOpen,
+    sendBookOpen,
+    quickViewBookId,
+    quickViewOpen,
+    handleBookAction,
+    handleTableBookUpdate,
+  }
+}
diff --git a/client/src/features/book/composables/useBookViewContext.ts b/client/src/features/book/composables/useBookViewContext.ts
new file mode 100644
index 000000000..cd8f5c23f
--- /dev/null
+++ b/client/src/features/book/composables/useBookViewContext.ts
@@ -0,0 +1,28 @@
+import { onMounted, onUnmounted, watch, type Ref } from 'vue'
+import type { BookCard } from '@bookorbit/types'
+import { useBookNavigation } from './useBookNavigation'
+
+export function useBookViewContext(books: Ref<BookCard[]>, total: Ref<number>, loadMore: () => Promise<unknown> | unknown) {
+  const { setBookContext, registerLoadMore } = useBookNavigation()
+
+  watch(
+    [books, total],
+    ([items, count]) => {
+      setBookContext(
+        items.map((book) => book.id),
+        count,
+      )
+    },
+    { immediate: true },
+  )
+
+  onMounted(() => {
+    registerLoadMore(async () => {
+      await loadMore()
+    })
+  })
+
+  onUnmounted(() => {
+    registerLoadMore(null)
+  })
+}
diff --git a/client/src/features/book/composables/useBookViewSelection.ts b/client/src/features/book/composables/useBookViewSelection.ts
new file mode 100644
index 000000000..cdd59a32c
--- /dev/null
+++ b/client/src/features/book/composables/useBookViewSelection.ts
@@ -0,0 +1,28 @@
+import { computed, type Ref } from 'vue'
+import type { BookCard } from '@bookorbit/types'
+import { useBookSelection } from './useBookSelection'
+
+export function useBookViewSelection(books: Ref<BookCard[]>) {
+  const selection = useBookSelection()
+
+  const bookIds = computed(() => books.value.map((book) => book.id))
+
+  function handleSelect(id: number, event: MouseEvent) {
+    if (event.shiftKey) {
+      selection.rangeSelectTo(id, bookIds.value)
+      return
+    }
+    selection.toggleBook(id)
+  }
+
+  function toggleSelectionMode() {
+    if (selection.selectionMode.value) selection.exitSelectionMode()
+    else selection.enterSelectionMode()
+  }
+
+  return {
+    ...selection,
+    handleSelect,
+    toggleSelectionMode,
+  }
+}
diff --git a/client/src/features/book/composables/useInfiniteScrollSentinel.ts b/client/src/features/book/composables/useInfiniteScrollSentinel.ts
new file mode 100644
index 000000000..b4c52538f
--- /dev/null
+++ b/client/src/features/book/composables/useInfiniteScrollSentinel.ts
@@ -0,0 +1,52 @@
+import { onMounted, onUnmounted, ref, watch, type Ref } from 'vue'
+
+type UseInfiniteScrollSentinelOptions = {
+  loadMore: () => Promise<unknown> | unknown
+  hasMore: Ref<boolean>
+  loading: Ref<boolean>
+  rootMargin?: string
+}
+
+export function useInfiniteScrollSentinel(opts: UseInfiniteScrollSentinelOptions) {
+  const sentinel = ref<HTMLElement | null>(null)
+  let observer: IntersectionObserver | null = null
+  const rootMargin = opts.rootMargin ?? '300px'
+
+  function checkSentinel() {
+    if (!opts.hasMore.value || opts.loading.value) return
+    const element = sentinel.value
+    if (!element) return
+    if (element.getBoundingClientRect().top < window.innerHeight + 300) void opts.loadMore()
+  }
+
+  onMounted(() => {
+    observer = new IntersectionObserver(
+      (entries) => {
+        if (entries[0]?.isIntersecting && !opts.loading.value && opts.hasMore.value) {
+          void opts.loadMore()
+        }
+      },
+      { rootMargin },
+    )
+    if (sentinel.value) observer.observe(sentinel.value)
+    window.addEventListener('resize', checkSentinel, { passive: true })
+  })
+
+  onUnmounted(() => {
+    observer?.disconnect()
+    window.removeEventListener('resize', checkSentinel)
+  })
+
+  watch(
+    opts.loading,
+    (isLoading) => {
+      if (!isLoading) checkSentinel()
+    },
+    { flush: 'post' },
+  )
+
+  return {
+    sentinel,
+    checkSentinel,
+  }
+}
diff --git a/client/src/features/book/composables/useLibraryBooks.ts b/client/src/features/book/composables/useLibraryBooks.ts
new file mode 100644
index 000000000..5019770a1
--- /dev/null
+++ b/client/src/features/book/composables/useLibraryBooks.ts
@@ -0,0 +1,157 @@
+import { computed, reactive, ref, watch, type Ref } from 'vue'
+import { api } from '@/lib/api'
+import type { BookCard, BookQuery, BooksPage, GroupRule, SortField, SortSpec } from '@bookorbit/types'
+
+function getPrimaryFile(book: BookCard) {
+  return book.files.find((file) => file.role === 'primary') ?? book.files[0] ?? null
+}
+
+function getBookSortValue(book: BookCard, field: SortField): string | number | null {
+  switch (field) {
+    case 'title':
+      return book.title?.toLowerCase() ?? null
+    case 'author':
+      return book.authors?.[0]?.toLowerCase() ?? null
+    case 'series':
+      return book.seriesName?.toLowerCase() ?? null
+    case 'seriesIndex':
+      return book.seriesIndex ?? null
+    case 'addedAt':
+      return book.addedAt ?? null
+    case 'publishedYear':
+      return book.publishedYear ?? null
+    case 'updatedAt':
+      return book.updatedAt ?? null
+    case 'pageCount':
+      return book.pageCount ?? null
+    case 'rating':
+      return book.rating ?? null
+    case 'publisher':
+      return book.publisher?.toLowerCase() ?? null
+    case 'fileSize':
+      return getPrimaryFile(book)?.sizeBytes ?? null
+    case 'language':
+      return book.language?.toLowerCase() ?? null
+    case 'readProgress':
+      return book.readingProgress ?? null
+    case 'lastReadAt':
+      return book.readStatus?.updatedAt ?? null
+    case 'finishedAt':
+      return book.readStatus?.finishedAt ?? null
+    case 'metadataScore':
+      return book.metadataScore ?? null
+    default:
+      return null
+  }
+}
+
+export function sortItems(items: BookCard[], specs: SortSpec[]): BookCard[] {
+  return [...items].sort((a, b) => {
+    for (const spec of specs) {
+      const av = getBookSortValue(a, spec.field)
+      const bv = getBookSortValue(b, spec.field)
+      if (av === null && bv === null) continue
+      if (av === null) return 1
+      if (bv === null) return -1
+      const cmp = av < bv ? -1 : av > bv ? 1 : 0
+      if (cmp !== 0) return spec.dir === 'asc' ? cmp : -cmp
+    }
+    return 0
+  })
+}
+
+export type { BookCard }
+
+export function useLibraryBooks(libraryId: Ref<number | null>, collapseEnabled: Ref<boolean> = ref(false), q: Ref<string> = ref('')) {
+  const items = ref<BookCard[]>([])
+  const total = ref(0)
+  const loading = ref(false)
+  const initialized = ref(false)
+  const error = ref<string | null>(null)
+
+  const filter = ref<GroupRule | undefined>(undefined)
+  const sort = ref<SortSpec[]>([{ field: 'title', dir: 'asc' }])
+  const pagination = reactive({ page: 0, size: 50 })
+
+  const hasMore = computed(() => items.value.length < total.value)
+
+  let activeController: AbortController | null = null
+
+  async function load(reset = false) {
+    if (libraryId.value === null) return
+    if (!reset && (loading.value || !hasMore.value)) return
+
+    if (reset && activeController) {
+      activeController.abort()
+    }
+
+    const controller = new AbortController()
+    activeController = controller
+    loading.value = true
+    error.value = null
+
+    if (reset) {
+      pagination.page = 0
+    }
+
+    try {
+      const body: BookQuery = {
+        filter: filter.value,
+        sort: sort.value,
+        pagination: { page: pagination.page, size: pagination.size },
+        ...(collapseEnabled.value ? { collapseSeries: true } : {}),
+        ...(q.value.trim() ? { q: q.value.trim() } : {}),
+      }
+
+      const res = await api(`/api/v1/libraries/${libraryId.value}/books`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(body),
+        signal: controller.signal,
+      })
+
+      if (controller.signal.aborted) return
+      if (!res.ok) throw new Error(`HTTP ${res.status}`)
+
+      const page: BooksPage = await res.json()
+
+      if (controller.signal.aborted) return
+
+      if (pagination.page === 0) {
+        items.value = page.items
+      } else {
+        items.value = [...items.value, ...page.items]
+      }
+      total.value = page.total
+      pagination.page++
+    } catch (e) {
+      if (controller.signal.aborted) return
+      error.value = e instanceof Error ? e.message : 'Failed to load books'
+    } finally {
+      if (!controller.signal.aborted) {
+        loading.value = false
+        initialized.value = true
+      }
+    }
+  }
+
+  function clear() {
+    items.value = []
+    total.value = 0
+    pagination.page = 0
+  }
+
+  watch(libraryId, (newId, oldId) => {
+    if (newId !== oldId) load(true)
+  })
+
+  watch(
+    sort,
+    () => {
+      void load(true)
+    },
+    { deep: true },
+  )
+
+  return { items, total, loading, initialized, error, filter, sort, pagination, hasMore, load, clear }
+}
diff --git a/client/src/features/book/composables/useMetadataFieldSearch.ts b/client/src/features/book/composables/useMetadataFieldSearch.ts
new file mode 100644
index 000000000..d2dc98aa8
--- /dev/null
+++ b/client/src/features/book/composables/useMetadataFieldSearch.ts
@@ -0,0 +1,23 @@
+import { api } from '@/lib/api'
+
+function createSearchFn(endpoint: string) {
+  return async (q: string): Promise<string[]> => {
+    if (!q.trim()) return []
+    const res = await api(`${endpoint}?q=${encodeURIComponent(q)}`)
+    if (!res.ok) return []
+    const data: { name: string }[] = await res.json()
+    return data.map((d) => d.name)
+  }
+}
+
+export function usePublisherSearch() {
+  return { search: createSearchFn('/api/v1/metadata/publishers') }
+}
+
+export function useSeriesNameSearch() {
+  return { search: createSearchFn('/api/v1/metadata/series') }
+}
+
+export function useLanguageSearch() {
+  return { search: createSearchFn('/api/v1/metadata/languages') }
+}
diff --git a/client/src/features/book/composables/useRefreshMetadata.ts b/client/src/features/book/composables/useRefreshMetadata.ts
index 68ed8a1a9..fb27be09c 100644
--- a/client/src/features/book/composables/useRefreshMetadata.ts
+++ b/client/src/features/book/composables/useRefreshMetadata.ts
@@ -2,6 +2,7 @@ import { ref } from 'vue'
 import { api } from '@/lib/api'
 import type { BookDetail, ComicMetadataFields } from '@bookorbit/types'
 import { useCoverVersions } from './useCoverVersions'
+import { useRefreshingBooks } from './useRefreshingBooks'
 import { toast } from 'vue-sonner'
 
 export interface MetadataRefreshPreview {
@@ -37,9 +38,11 @@ export interface MetadataRefreshPreview {
 export function useRefreshMetadata() {
   const refreshing = ref(false)
   const { bumpVersion } = useCoverVersions()
+  const { markRefreshing, clearRefreshing } = useRefreshingBooks()
 
   async function callRefresh<T>(bookId: number, preview: boolean): Promise<T | null> {
     refreshing.value = true
+    if (!preview) markRefreshing([bookId])
     try {
       const url = `/api/v1/books/${bookId}/refresh-metadata${preview ? '?preview=true' : ''}`
       const res = await api(url, { method: 'POST' })
@@ -48,6 +51,7 @@ export function useRefreshMetadata() {
     } catch {
       return null
     } finally {
+      if (!preview) clearRefreshing([bookId])
       refreshing.value = false
     }
   }
@@ -60,13 +64,15 @@ export function useRefreshMetadata() {
     return callRefresh<MetadataRefreshPreview>(bookId, true)
   }
 
-  async function refreshWithFeedback(bookId: number): Promise<void> {
+  async function refreshWithFeedback(bookId: number): Promise<BookDetail | null> {
     const updated = await refreshAndSave(bookId)
     if (updated) {
       bumpVersion(bookId)
       toast.success('Metadata refreshed')
+      return updated
     } else {
       toast.error('Metadata refresh failed')
+      return null
     }
   }
 
diff --git a/client/src/features/book/composables/useRefreshingBooks.ts b/client/src/features/book/composables/useRefreshingBooks.ts
index f6ce2a15e..3d89273df 100644
--- a/client/src/features/book/composables/useRefreshingBooks.ts
+++ b/client/src/features/book/composables/useRefreshingBooks.ts
@@ -1,22 +1,29 @@
 import { ref } from 'vue'
 
-const refreshingIds = ref(new Set<number>())
+const refreshingCounts = ref(new Map<number, number>())
 
 export function useRefreshingBooks() {
   function markRefreshing(ids: number[]) {
-    const next = new Set(refreshingIds.value)
-    ids.forEach((id) => next.add(id))
-    refreshingIds.value = next
+    const next = new Map(refreshingCounts.value)
+    for (const id of ids) {
+      const current = next.get(id) ?? 0
+      next.set(id, current + 1)
+    }
+    refreshingCounts.value = next
   }
 
   function clearRefreshing(ids: number[]) {
-    const next = new Set(refreshingIds.value)
-    ids.forEach((id) => next.delete(id))
-    refreshingIds.value = next
+    const next = new Map(refreshingCounts.value)
+    for (const id of ids) {
+      const current = next.get(id) ?? 0
+      if (current <= 1) next.delete(id)
+      else next.set(id, current - 1)
+    }
+    refreshingCounts.value = next
   }
 
   function isRefreshing(id: number): boolean {
-    return refreshingIds.value.has(id)
+    return (refreshingCounts.value.get(id) ?? 0) > 0
   }
 
   return { markRefreshing, clearRefreshing, isRefreshing }
diff --git a/client/src/features/book/composables/useSavedViews.ts b/client/src/features/book/composables/useSavedViews.ts
new file mode 100644
index 000000000..d1432115a
--- /dev/null
+++ b/client/src/features/book/composables/useSavedViews.ts
@@ -0,0 +1,180 @@
+import { computed, ref, watch, type Ref } from 'vue'
+import { storage } from '@/services/storage'
+import type { GroupRule, SortSpec, TableLayoutState, TableViewType } from '@bookorbit/types'
+
+/**
+ * Saved views: full presentation state snapshots, persisted locally.
+ *
+ * A saved view captures the complete visual state of the table at a point
+ * in time: column layout, sort order, AND active filter. It is local-first
+ * (stored in localStorage per view type + scope) and is distinct from:
+ *
+ *   - Column presets (useTablePresets): layout + optional default sort ONLY
+ *   - SmartScopes: server-backed, rule-based data sets that control which
+ *     books appear; saving filter state is their job, not presets'
+ *
+ * Concept boundaries:
+ *   - Saved view   → full snapshot (layout + sort + filter), local-first
+ *   - Column preset → layout + optional sort, no filter, reusable template
+ *   - SmartScope   → server-side rule engine that produces filtered datasets
+ */
+export type SavedView = {
+  id: string
+  name: string
+  layout: TableLayoutState
+  sort: SortSpec[]
+  filter?: GroupRule
+  favorite?: boolean
+}
+
+type SaveSavedViewInput = {
+  name: string
+  layout: TableLayoutState
+  sort?: SortSpec[]
+  filter?: GroupRule
+}
+
+function savedViewsStorageKey(viewType: TableViewType, scopeId: number | null | undefined): string {
+  return `bookorbit:savedViews:${viewType}:${scopeId ?? 'shared'}`
+}
+
+function cloneLayout(layout: TableLayoutState): TableLayoutState {
+  return {
+    columnOrder: [...layout.columnOrder],
+    hiddenColumns: [...layout.hiddenColumns],
+    columnWidths: { ...layout.columnWidths },
+    ...(layout.pinnedColumns ? { pinnedColumns: { ...layout.pinnedColumns } } : {}),
+  }
+}
+
+function cloneFilter(filter: GroupRule | undefined): GroupRule | undefined {
+  if (!filter) return undefined
+  return JSON.parse(JSON.stringify(filter)) as GroupRule
+}
+
+function isValidLayout(value: unknown): value is TableLayoutState {
+  if (typeof value !== 'object' || value === null) return false
+  const obj = value as Record<string, unknown>
+  return Array.isArray(obj.columnOrder) && Array.isArray(obj.hiddenColumns) && typeof obj.columnWidths === 'object' && obj.columnWidths !== null
+}
+
+function isValidSort(value: unknown): value is SortSpec[] {
+  return (
+    Array.isArray(value) &&
+    value.every((entry) => typeof entry === 'object' && entry !== null && typeof entry.field === 'string' && typeof entry.dir === 'string')
+  )
+}
+
+function isValidFilter(value: unknown): value is GroupRule {
+  if (typeof value !== 'object' || value === null) return false
+  const obj = value as Record<string, unknown>
+  return obj.type === 'group' && (obj.join === 'AND' || obj.join === 'OR') && Array.isArray(obj.rules)
+}
+
+function isValidSavedView(value: unknown): value is SavedView {
+  if (typeof value !== 'object' || value === null) return false
+  const obj = value as Record<string, unknown>
+  if (typeof obj.id !== 'string' || typeof obj.name !== 'string' || !isValidLayout(obj.layout)) return false
+  if (obj.sort !== undefined && !isValidSort(obj.sort)) return false
+  if (obj.filter !== undefined && !isValidFilter(obj.filter)) return false
+  if (obj.favorite !== undefined && typeof obj.favorite !== 'boolean') return false
+  return true
+}
+
+function createSnapshot(input: SaveSavedViewInput): SavedView | null {
+  const trimmedName = input.name.trim()
+  if (!trimmedName) return null
+  return {
+    id: `saved_view_${crypto.randomUUID()}`,
+    name: trimmedName,
+    layout: cloneLayout(input.layout),
+    sort: input.sort ? [...input.sort] : [],
+    filter: cloneFilter(input.filter),
+  }
+}
+
+export function useSavedViews(viewType: TableViewType, scopeId: Readonly<Ref<number | null>>) {
+  const savedViews = ref<SavedView[]>([])
+
+  function loadSavedViews() {
+    savedViews.value = storage.get<unknown[]>(savedViewsStorageKey(viewType, scopeId.value), []).filter(isValidSavedView)
+  }
+
+  watch(scopeId, loadSavedViews, { immediate: true })
+  watch(
+    savedViews,
+    (value) => {
+      storage.set(savedViewsStorageKey(viewType, scopeId.value), value)
+    },
+    { deep: true },
+  )
+
+  function saveView(input: SaveSavedViewInput): boolean {
+    const snapshot = createSnapshot(input)
+    if (!snapshot) return false
+    savedViews.value = [...savedViews.value, snapshot]
+    return true
+  }
+
+  function renameView(id: string, name: string): void {
+    const trimmedName = name.trim()
+    if (!trimmedName) return
+    savedViews.value = savedViews.value.map((view) => (view.id === id ? { ...view, name: trimmedName } : view))
+  }
+
+  function deleteView(id: string): void {
+    savedViews.value = savedViews.value.filter((view) => view.id !== id)
+  }
+
+  function duplicateView(id: string): void {
+    const existing = savedViews.value.find((view) => view.id === id)
+    if (!existing) return
+    savedViews.value = [
+      ...savedViews.value,
+      {
+        ...existing,
+        id: `saved_view_${crypto.randomUUID()}`,
+        name: `${existing.name} Copy`,
+        layout: cloneLayout(existing.layout),
+        sort: [...existing.sort],
+        filter: cloneFilter(existing.filter),
+      },
+    ]
+  }
+
+  function toggleFavorite(id: string): void {
+    savedViews.value = savedViews.value.map((view) => (view.id === id ? { ...view, favorite: !view.favorite } : view))
+  }
+
+  function importViews(views: SavedView[]): number {
+    const valid = views.filter(isValidSavedView).map((view) => ({
+      ...view,
+      id: `saved_view_${crypto.randomUUID()}`,
+      layout: cloneLayout(view.layout),
+      sort: [...view.sort],
+      filter: cloneFilter(view.filter),
+    }))
+    if (valid.length === 0) return 0
+    savedViews.value = [...savedViews.value, ...valid]
+    return valid.length
+  }
+
+  const allSavedViews = computed(() =>
+    [...savedViews.value].sort((a, b) => {
+      if (!!a.favorite !== !!b.favorite) return a.favorite ? -1 : 1
+      return a.name.localeCompare(b.name, undefined, { sensitivity: 'base' })
+    }),
+  )
+
+  return {
+    savedViews,
+    allSavedViews,
+    saveView,
+    renameView,
+    deleteView,
+    duplicateView,
+    toggleFavorite,
+    importViews,
+    reload: loadSavedViews,
+  }
+}
diff --git a/client/src/features/book/composables/useScopedBookQuery.ts b/client/src/features/book/composables/useScopedBookQuery.ts
new file mode 100644
index 000000000..039240f44
--- /dev/null
+++ b/client/src/features/book/composables/useScopedBookQuery.ts
@@ -0,0 +1,3 @@
+// Deprecated: use useBookDataSource instead.
+export { useBookDataSource as useScopedBookQuery } from './useBookDataSource'
+export type { BookDataSourceOptions as ScopedBookQueryOptions } from './useBookDataSource'
diff --git a/client/src/features/book/composables/useTableCellEditor.ts b/client/src/features/book/composables/useTableCellEditor.ts
new file mode 100644
index 000000000..32256901a
--- /dev/null
+++ b/client/src/features/book/composables/useTableCellEditor.ts
@@ -0,0 +1,162 @@
+import { ref } from 'vue'
+import { toast } from 'vue-sonner'
+import { api } from '@/lib/api'
+import type { BookCard, ReadStatus } from '@bookorbit/types'
+import type { ColumnId } from './useTableColumns'
+import { COLUMN_DEF_MAP } from './useTableColumns'
+
+const METADATA_FIELD_MAP: Partial<Record<ColumnId, string>> = {
+  title: 'title',
+  authors: 'authors',
+  seriesName: 'seriesName',
+  seriesIndex: 'seriesIndex',
+  publishedYear: 'publishedYear',
+  language: 'language',
+  rating: 'rating',
+  genres: 'genres',
+  tags: 'tags',
+  subtitle: 'subtitle',
+  publisher: 'publisher',
+  pageCount: 'pageCount',
+}
+
+type SaveCallback = (updatedBook: Partial<BookCard>) => void
+
+async function getApiErrorMessage(response: Response): Promise<string> {
+  try {
+    const body = (await response.json()) as { message?: unknown }
+    if (typeof body.message === 'string' && body.message.trim().length > 0) return body.message
+    if (Array.isArray(body.message) && body.message.length > 0) return body.message.join(', ')
+  } catch {
+    // Fall back to status text below.
+  }
+  return `HTTP ${response.status}`
+}
+
+function getToastErrorMessage(err: unknown): string {
+  if (!(err instanceof Error) || !err.message) return 'Failed to save - change reverted'
+  if (err.message.startsWith('Metadata fields are locked:')) return err.message
+  if (/^HTTP \d+$/.test(err.message)) return 'Failed to save - change reverted'
+  return err.message
+}
+
+export function useTableCellEditor() {
+  const activeCellKey = ref<string | null>(null)
+  const editValue = ref<unknown>(null)
+  const isSaving = ref(false)
+
+  function cellKey(bookId: number, columnId: ColumnId): string {
+    return `${bookId}:${columnId}`
+  }
+
+  function isActive(bookId: number, columnId: ColumnId): boolean {
+    return activeCellKey.value === cellKey(bookId, columnId)
+  }
+
+  function activateCell(bookId: number, columnId: ColumnId, currentValue: unknown): void {
+    if (isSaving.value) return
+    activeCellKey.value = cellKey(bookId, columnId)
+    editValue.value = Array.isArray(currentValue) ? [...(currentValue as unknown[])] : currentValue
+  }
+
+  function cancelCell(): void {
+    activeCellKey.value = null
+    editValue.value = null
+  }
+
+  function cancelCellIfActive(bookId: number, columnId: ColumnId): boolean {
+    if (!isActive(bookId, columnId)) return false
+    cancelCell()
+    return true
+  }
+
+  async function saveCell(bookId: number, columnId: ColumnId, newValue: unknown, onSuccess: SaveCallback): Promise<void> {
+    if (isSaving.value) return
+    isSaving.value = true
+    const sourceCellKey = cellKey(bookId, columnId)
+
+    try {
+      if (columnId === 'readStatus') {
+        const status = newValue as ReadStatus
+        const res = await api(`/api/v1/books/${bookId}/status`, {
+          method: 'PATCH',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ status }),
+        })
+        if (!res.ok) throw new Error(await getApiErrorMessage(res as Response))
+        onSuccess({ readStatus: { status, source: 'manual', startedAt: null, finishedAt: null, updatedAt: new Date().toISOString() } })
+      } else {
+        if (columnId === 'narrators') {
+          const res = await api(`/api/v1/books/${bookId}/metadata`, {
+            method: 'PATCH',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ audioMetadata: { narrators: newValue } }),
+          })
+          if (!res.ok) throw new Error(await getApiErrorMessage(res as Response))
+          onSuccess({ narrators: newValue as string[] })
+          if (activeCellKey.value === sourceCellKey) cancelCellIfActive(bookId, columnId)
+          return
+        }
+        const metaKey = METADATA_FIELD_MAP[columnId]
+        if (!metaKey) {
+          toast.error(`Cannot save: unsupported field "${columnId}"`)
+          if (activeCellKey.value === sourceCellKey) cancelCellIfActive(bookId, columnId)
+          return
+        }
+        const res = await api(`/api/v1/books/${bookId}/metadata`, {
+          method: 'PATCH',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ [metaKey]: newValue }),
+        })
+        if (!res.ok) throw new Error(await getApiErrorMessage(res as Response))
+        onSuccess({ [columnId as keyof BookCard]: newValue } as Partial<BookCard>)
+      }
+      if (activeCellKey.value === sourceCellKey) cancelCellIfActive(bookId, columnId)
+    } catch (err) {
+      toast.error(getToastErrorMessage(err))
+      if (activeCellKey.value === sourceCellKey) cancelCellIfActive(bookId, columnId)
+    } finally {
+      isSaving.value = false
+    }
+  }
+
+  function navigateCell(direction: 'next' | 'prev', editableColumnIds: ColumnId[], book: BookCard, currentColumnId: ColumnId): void {
+    const idx = editableColumnIds.indexOf(currentColumnId)
+    if (idx === -1) return
+    const nextIdx = direction === 'next' ? idx + 1 : idx - 1
+    if (nextIdx < 0 || nextIdx >= editableColumnIds.length) return
+    const nextCol = editableColumnIds[nextIdx]!
+    const colDef = COLUMN_DEF_MAP.get(nextCol)
+    const targetValue = colDef?.accessor ? colDef.accessor(book) : null
+    activateCell(book.id, nextCol, targetValue)
+  }
+
+  function navigateRow(direction: 'up' | 'down', books: BookCard[], currentBookId: number, columnId: ColumnId): void {
+    const idx = books.findIndex((book) => book.id === currentBookId)
+    if (idx === -1) return
+    const nextIdx = direction === 'down' ? idx + 1 : idx - 1
+    if (nextIdx < 0 || nextIdx >= books.length) return
+    const nextBook = books[nextIdx]!
+    const colDef = COLUMN_DEF_MAP.get(columnId)
+    const targetValue = colDef?.accessor ? colDef.accessor(nextBook) : null
+    activateCell(nextBook.id, columnId, targetValue)
+  }
+
+  const navigateRowUp = (books: BookCard[], currentBookId: number, columnId: ColumnId) => navigateRow('up', books, currentBookId, columnId)
+  const navigateRowDown = (books: BookCard[], currentBookId: number, columnId: ColumnId) => navigateRow('down', books, currentBookId, columnId)
+
+  return {
+    activeCellKey,
+    editValue,
+    isSaving,
+    isActive,
+    activateCell,
+    cancelCell,
+    cancelCellIfActive,
+    saveCell,
+    navigateCell,
+    navigateRow,
+    navigateRowUp,
+    navigateRowDown,
+  }
+}
diff --git a/client/src/features/book/composables/useTableCellHelpers.ts b/client/src/features/book/composables/useTableCellHelpers.ts
new file mode 100644
index 000000000..3f78ce367
--- /dev/null
+++ b/client/src/features/book/composables/useTableCellHelpers.ts
@@ -0,0 +1,50 @@
+import type { BookCard } from '@bookorbit/types'
+import { isAudioFormat } from '@bookorbit/types'
+import { COLUMN_DEF_MAP, type ColumnId } from './tableColumnSchema'
+import type { useTableLocks } from './useTableLocks'
+
+export function useTableCellHelpers(locks: ReturnType<typeof useTableLocks>, isReadOnly: () => boolean) {
+  function getCellValue(book: BookCard, colId: ColumnId): unknown {
+    return COLUMN_DEF_MAP.get(colId)?.accessor?.(book) ?? null
+  }
+
+  function isCellLocked(book: BookCard, colId: ColumnId): boolean {
+    const lockField = COLUMN_DEF_MAP.get(colId)?.lockField
+    if (!lockField) return false
+    return locks.isLocked(book.id, lockField)
+  }
+
+  function isBookAudio(book: BookCard): boolean {
+    const primaryFile = book.files.find((f) => f.role === 'primary') ?? book.files[0] ?? null
+    return primaryFile?.format ? isAudioFormat(primaryFile.format) : false
+  }
+
+  function isCellReadOnly(book: BookCard, col: { id: ColumnId; isEditable: boolean }): boolean {
+    if (!col.isEditable) return true
+    if (col.id === 'narrators' && !isBookAudio(book)) return true
+    if (isCellLocked(book, col.id)) return true
+    if (isReadOnly()) return true
+    return false
+  }
+
+  function isMandatoryFieldEmpty(book: BookCard, colId: ColumnId): boolean {
+    if (colId === 'title') return !book.title
+    if (colId === 'authors') return book.authors.length === 0
+    return false
+  }
+
+  function isBookFileMissing(book: BookCard): boolean {
+    return book.status === 'missing'
+  }
+
+  function getPinnedCellBackground(book: BookCard, colId: ColumnId, isSelected: boolean): string {
+    const isMandatory = isMandatoryFieldEmpty(book, colId)
+    if (isSelected && isMandatory)
+      return 'color-mix(in oklch, color-mix(in oklch, oklch(0.769 0.188 70.08) 5%, var(--background)) 92%, var(--primary))'
+    if (isSelected) return 'color-mix(in oklch, var(--primary) 8%, var(--background))'
+    if (isMandatory) return 'color-mix(in oklch, oklch(0.769 0.188 70.08) 5%, var(--background))'
+    return 'var(--background)'
+  }
+
+  return { getCellValue, isCellLocked, isBookAudio, isCellReadOnly, isMandatoryFieldEmpty, isBookFileMissing, getPinnedCellBackground }
+}
diff --git a/client/src/features/book/composables/useTableColumns.ts b/client/src/features/book/composables/useTableColumns.ts
new file mode 100644
index 000000000..b8d3713fc
--- /dev/null
+++ b/client/src/features/book/composables/useTableColumns.ts
@@ -0,0 +1,173 @@
+import { computed, ref } from 'vue'
+import { watchDebounced } from '@vueuse/core'
+import { storage } from '@/services/storage'
+import type { TableLayoutState, TableViewType } from '@bookorbit/types'
+import {
+  type ColumnId,
+  type CellType,
+  type ColumnDef,
+  LOCK_ROW_COLUMN_DEF,
+  COLUMN_DEFS,
+  COLUMN_DEF_MAP,
+  DEFAULT_ORDER,
+  DEFAULT_HIDDEN,
+  DEFAULT_WIDTHS,
+} from './tableColumnSchema'
+
+export type { ColumnId, CellType, ColumnDef }
+export { LOCK_ROW_COLUMN_DEF, COLUMN_DEFS, COLUMN_DEF_MAP, DEFAULT_ORDER, DEFAULT_HIDDEN, DEFAULT_WIDTHS }
+
+function storageKey(viewType: TableViewType): string {
+  return `bookorbit:tableLayout:${viewType}`
+}
+
+function loadPinnedColumns(raw: unknown, knownIds: Set<ColumnId>): Record<string, 'left' | 'right' | null> {
+  if (!raw || typeof raw !== 'object') return {}
+  const result: Record<string, 'left' | 'right' | null> = {}
+  for (const [id, dir] of Object.entries(raw as Record<string, unknown>)) {
+    if (knownIds.has(id as ColumnId) && (dir === 'left' || dir === 'right' || dir === null)) {
+      result[id] = dir
+    }
+  }
+  return result
+}
+
+function resolvePinnedColumn(
+  userPins: Record<string, 'left' | 'right' | null>,
+  id: string,
+  fallback: 'left' | 'right' | null,
+): 'left' | 'right' | null {
+  if (Object.prototype.hasOwnProperty.call(userPins, id)) {
+    return userPins[id] ?? null
+  }
+  return fallback
+}
+
+function loadLayout(viewType: TableViewType): TableLayoutState {
+  try {
+    const raw = storage.get<TableLayoutState | null>(storageKey(viewType), null)
+    if (!raw || !Array.isArray(raw.columnOrder) || !Array.isArray(raw.hiddenColumns)) {
+      return { columnOrder: [...DEFAULT_ORDER], hiddenColumns: [...DEFAULT_HIDDEN], columnWidths: { ...DEFAULT_WIDTHS } }
+    }
+    const knownIds = new Set(DEFAULT_ORDER)
+    const order = raw.columnOrder.filter((id) => knownIds.has(id as ColumnId)) as ColumnId[]
+    const missing = DEFAULT_ORDER.filter((id) => !order.includes(id))
+    const finalOrder = [...order, ...missing]
+    const hidden = raw.hiddenColumns.filter((id) => knownIds.has(id as ColumnId)) as ColumnId[]
+    const widths: Record<string, number> = { ...DEFAULT_WIDTHS }
+    for (const [id, w] of Object.entries(raw.columnWidths ?? {})) {
+      if (knownIds.has(id as ColumnId) && typeof w === 'number' && w > 0) widths[id] = w
+    }
+    return { columnOrder: finalOrder, hiddenColumns: hidden, columnWidths: widths, pinnedColumns: loadPinnedColumns(raw.pinnedColumns, knownIds) }
+  } catch {
+    return { columnOrder: [...DEFAULT_ORDER], hiddenColumns: [...DEFAULT_HIDDEN], columnWidths: { ...DEFAULT_WIDTHS }, pinnedColumns: {} }
+  }
+}
+
+export function useTableColumns(viewType: TableViewType) {
+  const layout = ref<TableLayoutState>(loadLayout(viewType))
+
+  watchDebounced(layout, (v) => storage.set(storageKey(viewType), v), { deep: true, debounce: 500 })
+
+  const visibleColumns = computed<ColumnDef[]>(() => {
+    const hiddenSet = new Set(layout.value.hiddenColumns)
+    const userPins = layout.value.pinnedColumns ?? {}
+    return layout.value.columnOrder
+      .filter((id) => !hiddenSet.has(id))
+      .map((id) => {
+        const def = COLUMN_DEF_MAP.get(id as ColumnId)!
+        return {
+          ...def,
+          defaultWidth: layout.value.columnWidths[id] ?? def.defaultWidth,
+          pinned: resolvePinnedColumn(userPins, id, def.pinned),
+        }
+      })
+  })
+
+  const allColumns = computed<(ColumnDef & { visible: boolean })[]>(() => {
+    const hiddenSet = new Set(layout.value.hiddenColumns)
+    const userPins = layout.value.pinnedColumns ?? {}
+    return layout.value.columnOrder.map((id) => {
+      const def = COLUMN_DEF_MAP.get(id as ColumnId)!
+      return { ...def, visible: !hiddenSet.has(id), pinned: resolvePinnedColumn(userPins, id, def.pinned) }
+    })
+  })
+
+  function toggleColumn(id: ColumnId): void {
+    const hidden = new Set(layout.value.hiddenColumns)
+    if (hidden.has(id)) {
+      hidden.delete(id)
+    } else {
+      hidden.add(id)
+    }
+    layout.value = { ...layout.value, hiddenColumns: [...hidden] }
+  }
+
+  function setColumnOrder(order: ColumnId[]): void {
+    const seen = new Set<ColumnId>()
+    const deduped = order.filter((id) => COLUMN_DEF_MAP.has(id) && !seen.has(id) && seen.add(id) !== undefined)
+    const missing = DEFAULT_ORDER.filter((id) => !seen.has(id))
+    layout.value = { ...layout.value, columnOrder: [...deduped, ...missing] }
+  }
+
+  function setColumnWidth(id: ColumnId, px: number): void {
+    const def = COLUMN_DEF_MAP.get(id)
+    const min = def?.minWidth ?? 40
+    const max = 800
+    const clamped = Math.min(Math.max(px, min), max)
+    layout.value = {
+      ...layout.value,
+      columnWidths: { ...layout.value.columnWidths, [id]: clamped },
+    }
+  }
+
+  function setLayout(nextLayout: TableLayoutState): void {
+    const knownIds = new Set(DEFAULT_ORDER)
+    const order = nextLayout.columnOrder.filter((id) => knownIds.has(id as ColumnId)) as ColumnId[]
+    const missing = DEFAULT_ORDER.filter((id) => !order.includes(id))
+    const hidden = nextLayout.hiddenColumns.filter((id) => knownIds.has(id as ColumnId)) as ColumnId[]
+    const widths: Record<string, number> = { ...DEFAULT_WIDTHS }
+    for (const [id, width] of Object.entries(nextLayout.columnWidths ?? {})) {
+      if (knownIds.has(id as ColumnId) && typeof width === 'number' && width > 0) {
+        widths[id] = width
+      }
+    }
+    const pins: Record<string, 'left' | 'right' | null> = {}
+    if (nextLayout.pinnedColumns) {
+      for (const [id, dir] of Object.entries(nextLayout.pinnedColumns)) {
+        if (knownIds.has(id as ColumnId) && (dir === 'left' || dir === 'right' || dir === null)) {
+          pins[id] = dir
+        }
+      }
+    }
+    layout.value = {
+      columnOrder: [...order, ...missing],
+      hiddenColumns: hidden,
+      columnWidths: widths,
+      pinnedColumns: pins,
+    }
+  }
+
+  function pinColumn(id: ColumnId, side: 'left' | 'right'): void {
+    const currentPins = { ...(layout.value.pinnedColumns ?? {}) }
+    if (currentPins[id] === side) return
+    const MAX_PINNED = 3
+    const pinnedOnSide = Object.values(currentPins).filter((s) => s === side).length
+    if (pinnedOnSide >= MAX_PINNED) return
+    currentPins[id] = side
+    layout.value = { ...layout.value, pinnedColumns: currentPins }
+  }
+
+  function unpinColumn(id: ColumnId): void {
+    const currentPins = { ...(layout.value.pinnedColumns ?? {}) }
+    currentPins[id] = null
+    layout.value = { ...layout.value, pinnedColumns: currentPins }
+  }
+
+  function resetLayout(): void {
+    storage.remove(storageKey(viewType))
+    layout.value = { columnOrder: [...DEFAULT_ORDER], hiddenColumns: [...DEFAULT_HIDDEN], columnWidths: { ...DEFAULT_WIDTHS }, pinnedColumns: {} }
+  }
+
+  return { layout, visibleColumns, allColumns, toggleColumn, setColumnOrder, setColumnWidth, setLayout, pinColumn, unpinColumn, resetLayout }
+}
diff --git a/client/src/features/book/composables/useTableContextMenu.ts b/client/src/features/book/composables/useTableContextMenu.ts
new file mode 100644
index 000000000..4a472f787
--- /dev/null
+++ b/client/src/features/book/composables/useTableContextMenu.ts
@@ -0,0 +1,20 @@
+import { ref } from 'vue'
+import type { BookCard } from '@bookorbit/types'
+
+export function useTableContextMenu() {
+  const contextMenuBook = ref<BookCard | null>(null)
+  const contextMenuPosition = ref<{ x: number; y: number } | null>(null)
+
+  function openContextMenu(event: MouseEvent, book: BookCard) {
+    event.preventDefault()
+    contextMenuBook.value = book
+    contextMenuPosition.value = { x: event.clientX, y: event.clientY }
+  }
+
+  function closeContextMenu() {
+    contextMenuBook.value = null
+    contextMenuPosition.value = null
+  }
+
+  return { contextMenuBook, contextMenuPosition, openContextMenu, closeContextMenu }
+}
diff --git a/client/src/features/book/composables/useTableCoverDialog.ts b/client/src/features/book/composables/useTableCoverDialog.ts
new file mode 100644
index 000000000..b9ea1723d
--- /dev/null
+++ b/client/src/features/book/composables/useTableCoverDialog.ts
@@ -0,0 +1,23 @@
+import { ref } from 'vue'
+import type { BookCard } from '@bookorbit/types'
+
+export function useTableCoverDialog(isSelectionMode: () => boolean, emitUpdateBook: (updated: BookCard) => void, getBooks: () => BookCard[]) {
+  const coverDialogBook = ref<BookCard | null>(null)
+
+  function handleCoverClick(book: BookCard): void {
+    if (isSelectionMode()) return
+    coverDialogBook.value = book
+  }
+
+  function handleCoverDialogUpdateBook(bookId: number, hasCover: boolean): void {
+    const book = getBooks().find((b) => b.id === bookId)
+    if (!book) return
+
+    emitUpdateBook({ ...book, hasCover })
+    if (coverDialogBook.value?.id === bookId) {
+      coverDialogBook.value = { ...coverDialogBook.value, hasCover }
+    }
+  }
+
+  return { coverDialogBook, handleCoverClick, handleCoverDialogUpdateBook }
+}
diff --git a/client/src/features/book/composables/useTableDragReorder.ts b/client/src/features/book/composables/useTableDragReorder.ts
new file mode 100644
index 000000000..7be67cb9d
--- /dev/null
+++ b/client/src/features/book/composables/useTableDragReorder.ts
@@ -0,0 +1,83 @@
+import { ref, type Ref } from 'vue'
+import type { ColumnId, ColumnDef } from './useTableColumns'
+
+export function useTableDragReorder(allColumns: Ref<ColumnDef[]>, setColumnOrder: (order: ColumnId[]) => void) {
+  const dragSourceColId = ref<ColumnId | null>(null)
+  const dropTargetColId = ref<ColumnId | null>(null)
+  const dropSide = ref<'before' | 'after' | null>(null)
+
+  function isDraggableCol(col: ColumnDef): boolean {
+    return col.pinned === null
+  }
+
+  function handleColDragStart(e: DragEvent, colId: ColumnId) {
+    dragSourceColId.value = colId
+    if (e.dataTransfer) {
+      e.dataTransfer.effectAllowed = 'move'
+      e.dataTransfer.setData('text/plain', colId)
+    }
+  }
+
+  function handleColDragOver(e: DragEvent, col: ColumnDef) {
+    if (!dragSourceColId.value || !isDraggableCol(col) || col.id === dragSourceColId.value) return
+    e.preventDefault()
+    if (e.dataTransfer) e.dataTransfer.dropEffect = 'move'
+    const target = e.currentTarget as HTMLElement
+    const rect = target.getBoundingClientRect()
+    const midX = rect.left + rect.width / 2
+    dropTargetColId.value = col.id
+    dropSide.value = e.clientX < midX ? 'before' : 'after'
+  }
+
+  function handleColDragLeave(colId: ColumnId) {
+    if (dropTargetColId.value === colId) {
+      dropTargetColId.value = null
+      dropSide.value = null
+    }
+  }
+
+  function handleColDrop(e: DragEvent, targetColId: ColumnId) {
+    e.preventDefault()
+    const sourceId = dragSourceColId.value
+    if (!sourceId || sourceId === targetColId) {
+      resetDragState()
+      return
+    }
+    const unpinnedIds = allColumns.value.filter((c) => c.pinned === null).map((c) => c.id)
+    const pinnedLeft = allColumns.value.filter((c) => c.pinned === 'left').map((c) => c.id)
+    const pinnedRight = allColumns.value.filter((c) => c.pinned === 'right').map((c) => c.id)
+
+    const withoutSource = unpinnedIds.filter((id) => id !== sourceId)
+    const targetIdx = withoutSource.indexOf(targetColId)
+    if (targetIdx === -1) {
+      resetDragState()
+      return
+    }
+    const insertIdx = dropSide.value === 'after' ? targetIdx + 1 : targetIdx
+    const newUnpinned = [...withoutSource.slice(0, insertIdx), sourceId, ...withoutSource.slice(insertIdx)]
+    setColumnOrder([...pinnedLeft, ...newUnpinned, ...pinnedRight])
+    resetDragState()
+  }
+
+  function handleColDragEnd() {
+    resetDragState()
+  }
+
+  function resetDragState() {
+    dragSourceColId.value = null
+    dropTargetColId.value = null
+    dropSide.value = null
+  }
+
+  return {
+    dragSourceColId,
+    dropTargetColId,
+    dropSide,
+    isDraggableCol,
+    handleColDragStart,
+    handleColDragOver,
+    handleColDragLeave,
+    handleColDrop,
+    handleColDragEnd,
+  }
+}
diff --git a/client/src/features/book/composables/useTableKeyboard.ts b/client/src/features/book/composables/useTableKeyboard.ts
new file mode 100644
index 000000000..e9f54258d
--- /dev/null
+++ b/client/src/features/book/composables/useTableKeyboard.ts
@@ -0,0 +1,222 @@
+import { ref, type Ref } from 'vue'
+import type { BookCard } from '@bookorbit/types'
+import type { ColumnDef, ColumnId } from './useTableColumns'
+import { COLUMN_DEF_MAP } from './useTableColumns'
+
+function formatCellForClipboard(book: BookCard, colId: ColumnId): string {
+  const def = COLUMN_DEF_MAP.get(colId)
+  if (!def?.accessor) return ''
+  const value = def.accessor(book)
+  if (value == null) return ''
+  if (Array.isArray(value)) return (value as string[]).join(', ')
+  if (typeof value === 'object' && 'status' in (value as Record<string, unknown>)) {
+    return String((value as { status?: string }).status ?? '')
+  }
+  return String(value)
+}
+
+function formatRowForClipboard(book: BookCard, columns: ColumnDef[]): string {
+  return columns
+    .map((column) => `${column.header ?? column.id}: ${formatCellForClipboard(book, column.id)}`)
+    .filter((line) => line.trim().length > 0)
+    .join('\n')
+}
+
+async function copyToClipboard(text: string): Promise<void> {
+  if (!text) return
+
+  if (typeof navigator !== 'undefined' && navigator.clipboard?.writeText) {
+    try {
+      await navigator.clipboard.writeText(text)
+      return
+    } catch {
+      // Fall through to legacy API below.
+    }
+  }
+
+  if (typeof document === 'undefined') return
+  const textarea = document.createElement('textarea')
+  textarea.value = text
+  textarea.setAttribute('readonly', '')
+  textarea.style.position = 'fixed'
+  textarea.style.top = '-9999px'
+  textarea.style.left = '-9999px'
+  document.body.appendChild(textarea)
+  textarea.focus()
+  textarea.select()
+  try {
+    document.execCommand('copy')
+  } finally {
+    document.body.removeChild(textarea)
+  }
+}
+
+export function useTableKeyboard(opts: {
+  books: () => BookCard[]
+  displayColumns: Ref<ColumnDef[]>
+  activeCellKey: Ref<string | null>
+  selectionMode: () => boolean
+  isReadOnly: () => boolean
+  virtualizer: Ref<{ scrollToIndex: (index: number, opts?: Record<string, unknown>) => void }>
+  isCellReadOnly: (book: BookCard, col: { id: ColumnId; isEditable: boolean }) => boolean
+  onActivate: (book: BookCard, colId: ColumnId) => void
+  onSelect: (id: number, event: MouseEvent) => void
+  onCopyRow?: (book: BookCard) => void
+}) {
+  const focusedRowIndex = ref<number | null>(null)
+  const focusedColIndex = ref<number | null>(null)
+
+  function scrollToFocusedRow() {
+    if (focusedRowIndex.value === null) return
+    opts.virtualizer.value.scrollToIndex(focusedRowIndex.value, { align: 'auto' })
+  }
+
+  function isFocusedCell(rowIndex: number, colIndex: number): boolean {
+    return focusedRowIndex.value === rowIndex && focusedColIndex.value === colIndex
+  }
+
+  function resolveFocusFromActiveCellKey(books: BookCard[], columns: ColumnDef[]): { rowIndex: number; colIndex: number } | null {
+    const key = opts.activeCellKey.value
+    if (!key) return null
+    const separatorIndex = key.indexOf(':')
+    if (separatorIndex <= 0) return null
+
+    const rawBookId = key.slice(0, separatorIndex)
+    const rawColId = key.slice(separatorIndex + 1)
+    const bookId = Number(rawBookId)
+    if (!Number.isFinite(bookId)) return null
+
+    const rowIndex = books.findIndex((book) => book.id === bookId)
+    if (rowIndex < 0) return null
+
+    const colIndex = columns.findIndex((column) => column.id === rawColId)
+    if (colIndex < 0) return null
+
+    return { rowIndex, colIndex }
+  }
+
+  function resolveFocusFromEventTarget(event: KeyboardEvent, columns: ColumnDef[]): { rowIndex: number; colIndex: number } | null {
+    const target = event.target
+    if (!(target instanceof Element)) return null
+
+    const cell = target.closest<HTMLElement>('[data-col-id][data-row-index]')
+    if (!cell) return null
+
+    const rowIndex = Number(cell.dataset.rowIndex)
+    if (!Number.isFinite(rowIndex)) return null
+
+    const colId = cell.dataset.colId
+    if (!colId) return null
+
+    const colIndex = columns.findIndex((column) => column.id === colId)
+    if (colIndex < 0) return null
+
+    return { rowIndex, colIndex }
+  }
+
+  function resolveCopyTarget(event: KeyboardEvent, books: BookCard[], columns: ColumnDef[]): { rowIndex: number; colIndex: number } | null {
+    if (focusedRowIndex.value !== null && focusedColIndex.value !== null) {
+      return { rowIndex: focusedRowIndex.value, colIndex: focusedColIndex.value }
+    }
+
+    const fromActiveCell = resolveFocusFromActiveCellKey(books, columns)
+    if (fromActiveCell) return fromActiveCell
+
+    return resolveFocusFromEventTarget(event, columns)
+  }
+
+  function handleTableKeydown(event: KeyboardEvent) {
+    const key = event.key.toLowerCase()
+    const isCopyShortcut = key === 'c' && (event.ctrlKey || event.metaKey)
+    if (opts.activeCellKey.value && !isCopyShortcut) return
+
+    const books = opts.books()
+    if (books.length === 0) return
+    const columns = opts.displayColumns.value
+    const colCount = columns.length
+
+    if (event.key === 'ArrowDown') {
+      event.preventDefault()
+      if (focusedRowIndex.value === null) {
+        focusedRowIndex.value = 0
+        focusedColIndex.value = 0
+      } else {
+        focusedRowIndex.value = Math.min(focusedRowIndex.value + 1, books.length - 1)
+      }
+      scrollToFocusedRow()
+    } else if (event.key === 'ArrowUp') {
+      event.preventDefault()
+      if (focusedRowIndex.value === null) {
+        focusedRowIndex.value = 0
+        focusedColIndex.value = 0
+      } else {
+        focusedRowIndex.value = Math.max(focusedRowIndex.value - 1, 0)
+      }
+      scrollToFocusedRow()
+    } else if (event.key === 'ArrowRight') {
+      event.preventDefault()
+      if (focusedColIndex.value === null) {
+        focusedColIndex.value = 0
+      } else {
+        focusedColIndex.value = Math.min(focusedColIndex.value + 1, colCount - 1)
+      }
+    } else if (event.key === 'ArrowLeft') {
+      event.preventDefault()
+      if (focusedColIndex.value === null) {
+        focusedColIndex.value = 0
+      } else {
+        focusedColIndex.value = Math.max(focusedColIndex.value - 1, 0)
+      }
+    } else if (event.key === 'Home') {
+      event.preventDefault()
+      if (event.ctrlKey || event.metaKey) {
+        focusedRowIndex.value = 0
+        scrollToFocusedRow()
+      }
+      focusedColIndex.value = 0
+    } else if (event.key === 'End') {
+      event.preventDefault()
+      if (event.ctrlKey || event.metaKey) {
+        focusedRowIndex.value = books.length - 1
+        scrollToFocusedRow()
+      }
+      focusedColIndex.value = colCount - 1
+    } else if (event.key === ' ' && focusedRowIndex.value !== null && opts.selectionMode()) {
+      event.preventDefault()
+      if (focusedRowIndex.value >= books.length) return
+      const book = books[focusedRowIndex.value]
+      if (book) opts.onSelect(book.id, event as unknown as MouseEvent)
+    } else if (isCopyShortcut) {
+      event.preventDefault()
+      const target = resolveCopyTarget(event, books, columns)
+      if (!target) return
+      if (target.rowIndex >= books.length || target.colIndex >= colCount) return
+
+      focusedRowIndex.value = target.rowIndex
+      focusedColIndex.value = target.colIndex
+
+      const book = books[target.rowIndex]
+      if (!book) return
+
+      if (event.shiftKey) {
+        const text = formatRowForClipboard(book, columns)
+        void copyToClipboard(text)
+        opts.onCopyRow?.(book)
+        return
+      }
+
+      const col = columns[target.colIndex]
+      if (col) {
+        const text = formatCellForClipboard(book, col.id)
+        void copyToClipboard(text)
+      }
+    }
+  }
+
+  return {
+    focusedRowIndex,
+    focusedColIndex,
+    isFocusedCell,
+    handleTableKeydown,
+  }
+}
diff --git a/client/src/features/book/composables/useTableLocks.ts b/client/src/features/book/composables/useTableLocks.ts
new file mode 100644
index 000000000..7abe72576
--- /dev/null
+++ b/client/src/features/book/composables/useTableLocks.ts
@@ -0,0 +1,95 @@
+import { ref } from 'vue'
+import { toast } from 'vue-sonner'
+import { BOOK_METADATA_LOCK_FIELDS, type BookMetadataLockField } from '@bookorbit/types'
+import { api } from '@/lib/api'
+
+type LockState = {
+  fields: BookMetadataLockField[]
+  pending: boolean
+}
+
+export function useTableLocks() {
+  const locksByBookId = ref(new Map<number, LockState>())
+
+  function initBook(bookId: number, fields: BookMetadataLockField[]) {
+    const existing = locksByBookId.value.get(bookId)
+    if (!existing || !existing.pending) {
+      locksByBookId.value.set(bookId, { fields: [...fields], pending: false })
+    }
+  }
+
+  function getFields(bookId: number): BookMetadataLockField[] {
+    return locksByBookId.value.get(bookId)?.fields ?? []
+  }
+
+  function isLocked(bookId: number, field: BookMetadataLockField): boolean {
+    return getFields(bookId).includes(field)
+  }
+
+  function isPending(bookId: number): boolean {
+    return locksByBookId.value.get(bookId)?.pending ?? false
+  }
+
+  async function applyLocks(bookId: number, nextFields: BookMetadataLockField[]): Promise<void> {
+    const state = locksByBookId.value.get(bookId)
+    if (!state || state.pending) return
+
+    const previousFields = [...state.fields]
+    state.fields = nextFields
+    state.pending = true
+
+    try {
+      const res = await api(`/api/v1/books/${bookId}/metadata-locks`, {
+        method: 'PATCH',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ lockedFields: nextFields }),
+      })
+      if (!res.ok) throw new Error(`HTTP ${res.status}`)
+    } catch {
+      state.fields = previousFields
+      toast.error('Failed to update locks')
+    } finally {
+      state.pending = false
+    }
+  }
+
+  async function toggleField(bookId: number, field: BookMetadataLockField): Promise<void> {
+    const current = getFields(bookId)
+    const next = current.includes(field) ? current.filter((f) => f !== field) : [...current, field]
+    await applyLocks(bookId, next)
+  }
+
+  async function lockAll(bookId: number): Promise<void> {
+    await applyLocks(bookId, [...BOOK_METADATA_LOCK_FIELDS])
+  }
+
+  async function unlockAll(bookId: number): Promise<void> {
+    await applyLocks(bookId, [])
+  }
+
+  function resetBook(bookId: number) {
+    locksByBookId.value.delete(bookId)
+  }
+
+  function pruneStaleEntries(activeBookIds: Set<number>) {
+    for (const bookId of locksByBookId.value.keys()) {
+      if (!activeBookIds.has(bookId)) {
+        const state = locksByBookId.value.get(bookId)
+        if (state && !state.pending) locksByBookId.value.delete(bookId)
+      }
+    }
+  }
+
+  return {
+    locksByBookId,
+    initBook,
+    getFields,
+    isLocked,
+    isPending,
+    toggleField,
+    lockAll,
+    unlockAll,
+    resetBook,
+    pruneStaleEntries,
+  }
+}
diff --git a/client/src/features/book/composables/useTablePresets.ts b/client/src/features/book/composables/useTablePresets.ts
new file mode 100644
index 000000000..ef7df5dd9
--- /dev/null
+++ b/client/src/features/book/composables/useTablePresets.ts
@@ -0,0 +1,173 @@
+import { computed, ref } from 'vue'
+import { watchDebounced } from '@vueuse/core'
+import { storage } from '@/services/storage'
+import { cloneTableLayout, validateTableLayout, type SortSpec, type TableLayoutState, type TableViewType } from '@bookorbit/types'
+import type { ColumnId } from './useTableColumns'
+
+/**
+ * Column presets: reusable column layouts only.
+ *
+ * A preset captures column visibility, order, and widths — nothing more.
+ * It may optionally include a default sort that is applied when the preset
+ * is activated, but it deliberately excludes filter state. Filters belong
+ * in SavedViews (see useSavedViews) or SmartScopes (server-side rule sets).
+ *
+ * Concept boundaries:
+ *   - Column preset  → column layout (visibility / order / widths) + optional default sort
+ *   - Saved view     → full presentation snapshot (layout + sort + filter), local-first
+ *   - SmartScope     → server-backed, rule-based dynamic data set (data filtering only)
+ */
+export type TablePreset = {
+  id: string
+  name: string
+  layout: TableLayoutState
+  /** Optional default sort applied when activating the preset. Presets must NOT store filter state. */
+  sort?: SortSpec[]
+  isBuiltIn?: boolean
+  favorite?: boolean
+}
+
+function presetsStorageKey(viewType: TableViewType): string {
+  return `bookorbit:tablePresets:${viewType}`
+}
+
+function getBuiltInPresets(allColumnIds: ColumnId[]): TablePreset[] {
+  const defaultVisible = ['cover', 'title', 'authors', 'seriesName', 'seriesIndex', 'publishedYear', 'rating', 'readStatus', 'format', 'actions']
+  const compactVisible = ['cover', 'title', 'authors', 'rating', 'readStatus', 'actions']
+  const metadataVisible = ['cover', 'title', 'authors', 'subtitle', 'publisher', 'language', 'publishedYear', 'pageCount', 'format', 'actions']
+
+  const buildLayout = (visibleIds: string[]): TableLayoutState => ({
+    columnOrder: allColumnIds,
+    hiddenColumns: allColumnIds.filter((id) => !visibleIds.includes(id)),
+    columnWidths: {},
+  })
+
+  return [
+    {
+      id: 'default',
+      name: 'Default',
+      isBuiltIn: true,
+      layout: buildLayout(defaultVisible),
+    },
+    {
+      id: 'compact',
+      name: 'Compact',
+      isBuiltIn: true,
+      layout: buildLayout(compactVisible),
+    },
+    {
+      id: 'metadata',
+      name: 'Metadata',
+      isBuiltIn: true,
+      layout: buildLayout(metadataVisible),
+    },
+  ]
+}
+
+function isValidPreset(p: unknown, knownIds: ColumnId[]): p is TablePreset {
+  if (typeof p !== 'object' || p === null) return false
+  const obj = p as Record<string, unknown>
+  if (typeof obj.id !== 'string' || typeof obj.name !== 'string' || validateTableLayout(obj.layout, knownIds) === null) return false
+  if (obj.sort !== undefined && !isValidSort(obj.sort)) return false
+  if (obj.favorite !== undefined && typeof obj.favorite !== 'boolean') return false
+  return true
+}
+
+function isValidSort(value: unknown): value is SortSpec[] {
+  return (
+    Array.isArray(value) &&
+    value.every((entry) => typeof entry === 'object' && entry !== null && typeof entry.field === 'string' && typeof entry.dir === 'string')
+  )
+}
+
+function loadCustomPresets(viewType: TableViewType, knownIds: ColumnId[]): TablePreset[] {
+  const raw = storage.get<unknown[]>(presetsStorageKey(viewType), [])
+  if (!Array.isArray(raw)) return []
+  return raw.filter((preset): preset is TablePreset => isValidPreset(preset, knownIds))
+}
+
+export function useTablePresets(viewType: TableViewType, allColumnIds: ColumnId[]) {
+  const customPresets = ref<TablePreset[]>(loadCustomPresets(viewType, allColumnIds))
+
+  watchDebounced(customPresets, (value) => storage.set(presetsStorageKey(viewType), value), { deep: true, debounce: 500 })
+
+  const builtInPresets = computed(() => getBuiltInPresets(allColumnIds))
+
+  function savePreset(name: string, layout: TableLayoutState, sort?: SortSpec[]): void {
+    const trimmedName = name.trim()
+    if (!trimmedName) return
+    const id = `custom_${crypto.randomUUID()}`
+    const preset: TablePreset = { id, name: trimmedName, layout: cloneTableLayout(layout) }
+    if (sort && sort.length > 0) preset.sort = [...sort]
+    customPresets.value = [...customPresets.value, preset]
+  }
+
+  function deletePreset(id: string): void {
+    customPresets.value = customPresets.value.filter((preset) => preset.id !== id)
+  }
+
+  function renamePreset(id: string, name: string): void {
+    const trimmedName = name.trim()
+    if (!trimmedName) return
+    customPresets.value = customPresets.value.map((preset) => (preset.id === id ? { ...preset, name: trimmedName } : preset))
+  }
+
+  function duplicatePreset(id: string): void {
+    const existing = customPresets.value.find((preset) => preset.id === id) ?? builtInPresets.value.find((preset) => preset.id === id)
+    if (!existing) return
+    const duplicate: TablePreset = {
+      ...existing,
+      id: `custom_${crypto.randomUUID()}`,
+      name: `${existing.name} Copy`,
+      isBuiltIn: false,
+      layout: cloneTableLayout(existing.layout),
+      sort: existing.sort ? [...existing.sort] : undefined,
+    }
+    customPresets.value = [...customPresets.value, duplicate]
+  }
+
+  function toggleFavorite(id: string): void {
+    customPresets.value = customPresets.value.map((preset) =>
+      preset.id === id
+        ? {
+            ...preset,
+            favorite: !preset.favorite,
+          }
+        : preset,
+    )
+  }
+
+  function importPresets(presets: TablePreset[]): number {
+    const valid = presets
+      .filter((preset) => isValidPreset(preset, allColumnIds) && !preset.isBuiltIn)
+      .map((preset) => ({
+        ...preset,
+        id: `custom_${crypto.randomUUID()}`,
+        layout: cloneTableLayout(preset.layout),
+        sort: preset.sort ? [...preset.sort] : undefined,
+      }))
+    if (valid.length === 0) return 0
+    customPresets.value = [...customPresets.value, ...valid]
+    return valid.length
+  }
+
+  const allPresets = computed(() => [
+    ...builtInPresets.value,
+    ...[...customPresets.value].sort((a, b) => {
+      if (!!a.favorite !== !!b.favorite) return a.favorite ? -1 : 1
+      return a.name.localeCompare(b.name, undefined, { sensitivity: 'base' })
+    }),
+  ])
+
+  return {
+    customPresets,
+    builtInPresets,
+    allPresets,
+    savePreset,
+    deletePreset,
+    renamePreset,
+    duplicatePreset,
+    toggleFavorite,
+    importPresets,
+  }
+}
diff --git a/client/src/features/book/composables/useTableQuickFilters.ts b/client/src/features/book/composables/useTableQuickFilters.ts
new file mode 100644
index 000000000..8cdb52ac5
--- /dev/null
+++ b/client/src/features/book/composables/useTableQuickFilters.ts
@@ -0,0 +1,81 @@
+import type { Rule, RuleField, TableViewType } from '@bookorbit/types'
+import type { ColumnId } from './tableColumnSchema'
+
+const TEXT_FIELD_MAP: Partial<Record<ColumnId, RuleField>> = {
+  title: 'title',
+  seriesName: 'series',
+  publisher: 'publisher',
+  language: 'language',
+  isbn13: 'isbn',
+  subtitle: 'description',
+}
+
+const VALUE_FIELD_MAP: Partial<Record<ColumnId, RuleField>> = {
+  authors: 'author',
+  genres: 'genre',
+  tags: 'tag',
+  readStatus: 'readStatus',
+  rating: 'rating',
+  pageCount: 'pageCount',
+  publishedYear: 'publishedYear',
+}
+
+export function useTableQuickFilters(viewType: TableViewType) {
+  function getQuickFilterOptions(colId: ColumnId): { key: string; label: string }[] {
+    if (viewType !== 'library') return []
+
+    if (colId === 'format') {
+      return [
+        { key: 'present', label: 'Filter to present files' },
+        { key: 'missing', label: 'Filter to missing files' },
+      ]
+    }
+
+    if (colId === 'cover') {
+      return [
+        { key: 'present', label: 'Filter to books with covers' },
+        { key: 'missing', label: 'Filter to books missing covers' },
+      ]
+    }
+
+    if (
+      [
+        'title',
+        'seriesName',
+        'publisher',
+        'language',
+        'isbn13',
+        'subtitle',
+        'authors',
+        'genres',
+        'tags',
+        'readStatus',
+        'rating',
+        'pageCount',
+        'publishedYear',
+      ].includes(colId)
+    ) {
+      return [
+        { key: 'present', label: 'Filter to rows with values' },
+        { key: 'missing', label: 'Filter to empty rows' },
+      ]
+    }
+
+    return []
+  }
+
+  function buildQuickFilterRule(colId: ColumnId, key: string): Rule | null {
+    if (colId === 'format') return { type: 'rule', field: 'fileAvailability', operator: key === 'missing' ? 'isMissing' : 'isPresent' }
+    if (colId === 'cover') return { type: 'rule', field: 'cover', operator: key === 'missing' ? 'isMissing' : 'isPresent' }
+
+    const textField = TEXT_FIELD_MAP[colId]
+    if (textField) return { type: 'rule', field: textField, operator: key === 'missing' ? 'isEmpty' : 'isNotEmpty' }
+
+    const valueField = VALUE_FIELD_MAP[colId]
+    if (valueField) return { type: 'rule', field: valueField, operator: key === 'missing' ? 'isEmpty' : 'isNotEmpty' }
+
+    return null
+  }
+
+  return { getQuickFilterOptions, buildQuickFilterRule }
+}
diff --git a/client/src/features/book/composables/useTableResize.ts b/client/src/features/book/composables/useTableResize.ts
new file mode 100644
index 000000000..ca8764c32
--- /dev/null
+++ b/client/src/features/book/composables/useTableResize.ts
@@ -0,0 +1,83 @@
+import { ref, onMounted, onUnmounted, type Ref } from 'vue'
+import type { ColumnId } from './useTableColumns'
+import type { ColumnDef } from './useTableColumns'
+
+export function useTableResize(
+  scrollContainerRef: Ref<HTMLDivElement | null>,
+  displayColumns: Ref<ColumnDef[]>,
+  setColumnWidth: (id: ColumnId, px: number) => void,
+  isReadOnly: Ref<boolean>,
+) {
+  const resizingColumnId = ref<ColumnId | null>(null)
+  const resizeStartX = ref(0)
+  const resizeStartWidth = ref(0)
+
+  function isResizableCol(col: ColumnDef): boolean {
+    return !isReadOnly.value && col.id !== 'lockRow'
+  }
+
+  function startResize(e: MouseEvent, colId: ColumnId, currentWidth: number) {
+    if (isReadOnly.value) return
+    resizingColumnId.value = colId
+    resizeStartX.value = e.clientX
+    resizeStartWidth.value = currentWidth
+    e.preventDefault()
+  }
+
+  function onResizeMove(e: MouseEvent) {
+    if (!resizingColumnId.value) return
+    const delta = e.clientX - resizeStartX.value
+    setColumnWidth(resizingColumnId.value, resizeStartWidth.value + delta)
+  }
+
+  function stopResize() {
+    resizingColumnId.value = null
+  }
+
+  function autoFitColumn(colId: ColumnId): void {
+    if (!scrollContainerRef.value) return
+    const table = scrollContainerRef.value.querySelector('table')
+    if (!table) return
+
+    const column = displayColumns.value.find((currentColumn) => currentColumn.id === colId)
+    if (!column) return
+
+    let maxWidth = column.minWidth
+    const headerCell = table.querySelector(`thead [data-col-id="${colId}"] [data-col-label]`) as HTMLElement | null
+    if (headerCell) {
+      maxWidth = Math.max(maxWidth, headerCell.scrollWidth + 32)
+    }
+
+    const cells = table.querySelectorAll(`tbody tr td[data-col-id="${colId}"]`)
+    cells.forEach((cell) => {
+      const element = cell as HTMLElement
+      maxWidth = Math.max(maxWidth, element.scrollWidth + 16)
+    })
+
+    setColumnWidth(colId, Math.min(400, maxWidth))
+  }
+
+  function autoFitAllColumns(): void {
+    for (const col of displayColumns.value) {
+      if (col.id !== 'lockRow') autoFitColumn(col.id)
+    }
+  }
+
+  onMounted(() => {
+    document.addEventListener('mousemove', onResizeMove)
+    document.addEventListener('mouseup', stopResize)
+  })
+
+  onUnmounted(() => {
+    document.removeEventListener('mousemove', onResizeMove)
+    document.removeEventListener('mouseup', stopResize)
+  })
+
+  return {
+    resizingColumnId,
+    isResizableCol,
+    startResize,
+    autoFitColumn,
+    autoFitAllColumns,
+  }
+}
diff --git a/client/src/features/book/composables/useTableScrollBehavior.ts b/client/src/features/book/composables/useTableScrollBehavior.ts
new file mode 100644
index 000000000..1379dfb7d
--- /dev/null
+++ b/client/src/features/book/composables/useTableScrollBehavior.ts
@@ -0,0 +1,31 @@
+import { ref, onBeforeUnmount, type Ref } from 'vue'
+
+export function useTableScrollBehavior(scrollContainerRef: Ref<HTMLDivElement | null>) {
+  const isScrolled = ref(false)
+  const showScrollTop = ref(false)
+  let rafId: number | null = null
+
+  function onScroll() {
+    if (rafId !== null) return
+    rafId = requestAnimationFrame(() => {
+      rafId = null
+      const el = scrollContainerRef.value
+      if (!el) return
+      isScrolled.value = el.scrollTop > 0
+      showScrollTop.value = el.scrollTop > el.clientHeight * 2
+    })
+  }
+
+  function scrollToTop() {
+    scrollContainerRef.value?.scrollTo({ top: 0, behavior: 'smooth' })
+  }
+
+  onBeforeUnmount(() => {
+    if (rafId !== null) {
+      cancelAnimationFrame(rafId)
+      rafId = null
+    }
+  })
+
+  return { isScrolled, showScrollTop, onScroll, scrollToTop }
+}
diff --git a/client/src/features/book/composables/useTableSorting.ts b/client/src/features/book/composables/useTableSorting.ts
new file mode 100644
index 000000000..f01b83692
--- /dev/null
+++ b/client/src/features/book/composables/useTableSorting.ts
@@ -0,0 +1,54 @@
+import type { SortSpec } from '@bookorbit/types'
+import type { ColumnDef } from './tableColumnSchema'
+
+export function useTableSorting(getSort: () => SortSpec[], isSortEnabled: () => boolean, emitSort: (sort: SortSpec[]) => void) {
+  function isSortableColumn(col: ColumnDef): boolean {
+    return !!col.sortField && isSortEnabled()
+  }
+
+  function getSortDir(sortField: string): 'asc' | 'desc' | null {
+    return getSort().find((s) => s.field === sortField)?.dir ?? null
+  }
+
+  function getSortPriority(sortField: string | null): number {
+    if (!sortField) return 0
+    return getSort().findIndex((s) => s.field === sortField) + 1
+  }
+
+  function handleColumnSort(sortField: string | null, event: MouseEvent): void {
+    if (!sortField || !isSortEnabled()) return
+
+    if (event.shiftKey && getSort().length > 0) {
+      const existing = getSort().find((s) => s.field === sortField)
+      let next: SortSpec[]
+      if (!existing) {
+        next = [...getSort(), { field: sortField as SortSpec['field'], dir: 'asc' }]
+      } else if (existing.dir === 'asc') {
+        next = getSort().map((s) => (s.field === sortField ? { ...s, dir: 'desc' as const } : s))
+      } else {
+        next = getSort().filter((s) => s.field !== sortField)
+        if (next.length === 0) next = [{ field: 'title' as SortSpec['field'], dir: 'asc' }]
+      }
+      emitSort(next)
+      return
+    }
+
+    const current = getSort().find((s) => s.field === sortField)
+    let next: SortSpec[]
+    if (!current) {
+      next = [{ field: sortField as SortSpec['field'], dir: 'asc' }]
+    } else if (current.dir === 'asc') {
+      next = [{ field: sortField as SortSpec['field'], dir: 'desc' }]
+    } else {
+      next = [{ field: 'title' as SortSpec['field'], dir: 'asc' }]
+    }
+    emitSort(next)
+  }
+
+  function removeSortField(field: string): void {
+    const next = getSort().filter((s) => s.field !== field)
+    emitSort(next.length > 0 ? next : [{ field: 'title' as SortSpec['field'], dir: 'asc' }])
+  }
+
+  return { isSortableColumn, getSortDir, getSortPriority, handleColumnSort, removeSortField }
+}
diff --git a/client/src/features/book/composables/useTableViewControls.ts b/client/src/features/book/composables/useTableViewControls.ts
new file mode 100644
index 000000000..b84371c5b
--- /dev/null
+++ b/client/src/features/book/composables/useTableViewControls.ts
@@ -0,0 +1,86 @@
+import { ref } from 'vue'
+import type { SortSpec, TableLayoutState } from '@bookorbit/types'
+import type { ColumnDef, ColumnId } from './useTableColumns'
+import type { TablePreset } from './useTablePresets'
+
+export type TableViewHandle = {
+  allColumns: (ColumnDef & { visible: boolean })[]
+  currentLayout: TableLayoutState
+  allPresets: TablePreset[]
+  resetLayout: () => void
+  toggleColumn: (id: ColumnId) => void
+  setColumnOrder: (ids: ColumnId[]) => void
+  applyPreset: (layout: TableLayoutState, sort?: SortSpec[]) => void
+  saveCurrentPreset: (name: string) => void
+  deletePreset: (id: string) => void
+  renamePreset: (id: string, name: string) => void
+  duplicatePreset: (id: string) => void
+  togglePresetFavorite: (id: string) => void
+  importPresetBackup: (presets: TablePreset[]) => number
+}
+
+export function useTableViewControls() {
+  const tableRef = ref<TableViewHandle | null>(null)
+
+  function handleResetColumns() {
+    tableRef.value?.resetLayout()
+  }
+
+  function handleToggleColumn(id: ColumnId) {
+    tableRef.value?.toggleColumn(id)
+  }
+
+  function handleSetColumnOrder(ids: ColumnId[]) {
+    tableRef.value?.setColumnOrder(ids)
+  }
+
+  function handleColumnPanelReorder(newUnpinnedCols: (ColumnDef & { visible: boolean })[]) {
+    if (!tableRef.value) return
+    const pinnedLeft = tableRef.value.allColumns.filter((column) => column.pinned === 'left').map((column) => column.id)
+    const pinnedRight = tableRef.value.allColumns.filter((column) => column.pinned === 'right').map((column) => column.id)
+    handleSetColumnOrder([...pinnedLeft, ...newUnpinnedCols.map((column) => column.id), ...pinnedRight])
+  }
+
+  function handleApplyTablePreset(preset: { layout: TableLayoutState; sort?: SortSpec[] }) {
+    tableRef.value?.applyPreset(preset.layout, preset.sort)
+  }
+
+  function handleSaveTablePreset(name: string) {
+    tableRef.value?.saveCurrentPreset(name)
+  }
+
+  function handleDeleteTablePreset(id: string) {
+    tableRef.value?.deletePreset(id)
+  }
+
+  function handleRenameTablePreset(id: string, name: string) {
+    tableRef.value?.renamePreset(id, name)
+  }
+
+  function handleDuplicateTablePreset(id: string) {
+    tableRef.value?.duplicatePreset(id)
+  }
+
+  function handleTogglePresetFavorite(id: string) {
+    tableRef.value?.togglePresetFavorite(id)
+  }
+
+  function handleImportPresetBackup(presets: TablePreset[]) {
+    return tableRef.value?.importPresetBackup(presets) ?? 0
+  }
+
+  return {
+    tableRef,
+    handleResetColumns,
+    handleToggleColumn,
+    handleSetColumnOrder,
+    handleColumnPanelReorder,
+    handleApplyTablePreset,
+    handleSaveTablePreset,
+    handleDeleteTablePreset,
+    handleRenameTablePreset,
+    handleDuplicateTablePreset,
+    handleTogglePresetFavorite,
+    handleImportPresetBackup,
+  }
+}
diff --git a/client/src/features/book/composables/useViewSort.ts b/client/src/features/book/composables/useViewSort.ts
new file mode 100644
index 000000000..7d38be58b
--- /dev/null
+++ b/client/src/features/book/composables/useViewSort.ts
@@ -0,0 +1,51 @@
+import { computed, watch, type Ref } from 'vue'
+import type { SortSpec } from '@bookorbit/types'
+import { SORT_FIELD_LABELS } from '../lib/filter-labels'
+
+const DEFAULT_SORT: SortSpec[] = [{ field: 'title', dir: 'asc' }]
+
+function storageKey(prefix: string, id: number) {
+  return `bookorbit:sort:${prefix}:${id}`
+}
+
+export function useViewSort(sort: Ref<SortSpec[]>, keyPrefix: string, entityId: Ref<number | null>) {
+  watch(
+    entityId,
+    (id) => {
+      if (id === null) return
+      try {
+        const raw = localStorage.getItem(storageKey(keyPrefix, id))
+        sort.value = raw ? JSON.parse(raw) : [...DEFAULT_SORT]
+      } catch {
+        sort.value = [...DEFAULT_SORT]
+      }
+    },
+    { immediate: true },
+  )
+
+  function saveSort() {
+    const id = entityId.value
+    if (id === null) return
+    localStorage.setItem(storageKey(keyPrefix, id), JSON.stringify(sort.value))
+  }
+
+  function resetSort() {
+    sort.value = [...DEFAULT_SORT]
+    const id = entityId.value
+    if (id !== null) localStorage.removeItem(storageKey(keyPrefix, id))
+  }
+
+  const sortModel = computed({
+    get: () => sort.value,
+    set: (v: SortSpec[]) => {
+      sort.value = v.length > 0 ? v : [...DEFAULT_SORT]
+      saveSort()
+    },
+  })
+
+  const isDefaultSort = computed(() => sort.value.length === 1 && sort.value[0]?.field === 'title' && sort.value[0]?.dir === 'asc')
+
+  const sortSummary = computed(() => sort.value.map((s) => `${SORT_FIELD_LABELS[s.field]} ${s.dir === 'asc' ? '↑' : '↓'}`).join(', '))
+
+  return { sortModel, isDefaultSort, sortSummary, resetSort, saveSort }
+}
diff --git a/client/src/features/book/lib/book-card-mapper.ts b/client/src/features/book/lib/book-card-mapper.ts
new file mode 100644
index 000000000..a96de5551
--- /dev/null
+++ b/client/src/features/book/lib/book-card-mapper.ts
@@ -0,0 +1,89 @@
+import type { BookCard, BookDetail, BookFileRef } from '@bookorbit/types'
+import type { ColumnId } from '@/features/book/composables/useTableColumns'
+
+function toBookFileRef(file: BookDetail['files'][number]): BookFileRef {
+  return {
+    id: file.id,
+    format: file.format,
+    role: file.role,
+    sizeBytes: file.sizeBytes,
+  }
+}
+
+export function mergeBookCardWithDetail(book: BookCard, detail: BookDetail): BookCard {
+  return {
+    ...book,
+    status: detail.status,
+    title: detail.title,
+    subtitle: detail.subtitle,
+    isbn13: detail.isbn13,
+    publisher: detail.publisher,
+    publishedYear: detail.publishedYear,
+    language: detail.language,
+    pageCount: detail.pageCount,
+    seriesName: detail.seriesName,
+    seriesIndex: detail.seriesIndex,
+    rating: detail.rating,
+    authors: detail.authors.map((author) => author.name),
+    genres: detail.genres,
+    files: detail.files.map(toBookFileRef),
+    readStatus: detail.readStatus,
+    metadataScore: detail.metadataScore,
+    hasCover: detail.coverSource !== null,
+    hasMetadataLocks: detail.lockedFields.length > 0,
+    lockedFields: detail.lockedFields,
+    narrators: detail.audioMetadata?.narrators.map((narrator) => narrator.name) ?? [],
+  }
+}
+
+function sameStringArray(a: string[], b: string[]) {
+  if (a.length !== b.length) return false
+  return a.every((value, index) => value === b[index])
+}
+
+function sameFiles(a: BookFileRef[], b: BookFileRef[]) {
+  if (a.length !== b.length) return false
+  return a.every((file, index) => {
+    const other = b[index]
+    if (!other) return false
+    return file.id === other.id && file.format === other.format && file.role === other.role && file.sizeBytes === other.sizeBytes
+  })
+}
+
+function sameReadStatus(a: BookCard['readStatus'], b: BookCard['readStatus']) {
+  if (a === b) return true
+  if (!a || !b) return false
+  return a.status === b.status && a.startedAt === b.startedAt && a.finishedAt === b.finishedAt && a.updatedAt === b.updatedAt
+}
+
+export function detectChangedColumns(previous: BookCard, next: BookCard): ColumnId[] {
+  const changed = new Set<ColumnId>()
+
+  if (previous.title !== next.title) changed.add('title')
+  if (previous.subtitle !== next.subtitle) changed.add('subtitle')
+  if (!sameStringArray(previous.authors, next.authors)) changed.add('authors')
+  if (previous.seriesName !== next.seriesName) changed.add('seriesName')
+  if (previous.seriesIndex !== next.seriesIndex) changed.add('seriesIndex')
+  if (previous.publishedYear !== next.publishedYear) changed.add('publishedYear')
+  if (previous.language !== next.language) changed.add('language')
+  if (previous.rating !== next.rating) changed.add('rating')
+  if (!sameStringArray(previous.genres, next.genres)) changed.add('genres')
+  if (previous.publisher !== next.publisher) changed.add('publisher')
+  if (previous.pageCount !== next.pageCount) changed.add('pageCount')
+  if (previous.isbn13 !== next.isbn13) changed.add('isbn13')
+  if (!sameStringArray(previous.narrators, next.narrators)) changed.add('narrators')
+  if (previous.readingProgress !== next.readingProgress) changed.add('readingProgress')
+  if (!sameReadStatus(previous.readStatus, next.readStatus)) {
+    changed.add('readStatus')
+    changed.add('finishedAt')
+  }
+  if (previous.updatedAt !== next.updatedAt) changed.add('updatedAt')
+  if (previous.addedAt !== next.addedAt) changed.add('addedAt')
+  if (previous.hasCover !== next.hasCover || !sameFiles(previous.files, next.files)) {
+    changed.add('cover')
+    changed.add('format')
+    changed.add('fileSize')
+  }
+
+  return [...changed]
+}
diff --git a/client/src/features/book/lib/filter-labels.ts b/client/src/features/book/lib/filter-labels.ts
index 168de5426..b18a4767a 100644
--- a/client/src/features/book/lib/filter-labels.ts
+++ b/client/src/features/book/lib/filter-labels.ts
@@ -13,6 +13,10 @@ export const SORT_FIELD_LABELS: Record<SortField, string> = {
   publisher: 'Publisher',
   fileSize: 'File Size',
   readProgress: 'Read Progress',
+  readStatus: 'Read Status',
+  format: 'Format',
+  language: 'Language',
+  metadataScore: 'Metadata Score',
   lastReadAt: 'Last Read',
   finishedAt: 'Date Finished',
   random: 'Random',
@@ -36,6 +40,7 @@ export const FIELD_LABELS: Record<RuleField, string> = {
   fileAvailability: 'File Availability',
   rating: 'Rating',
   readProgress: 'Reading Progress',
+  readStatus: 'Read Status',
   description: 'Description',
   isbn: 'ISBN',
   metadataScore: 'Metadata Score',
diff --git a/client/src/features/book/lib/table-row-state-sync.spec.ts b/client/src/features/book/lib/table-row-state-sync.spec.ts
new file mode 100644
index 000000000..1c9048673
--- /dev/null
+++ b/client/src/features/book/lib/table-row-state-sync.spec.ts
@@ -0,0 +1,86 @@
+import { describe, expect, it } from 'vitest'
+import type { BookCard } from '@bookorbit/types'
+import { buildLockStateBookUpdate, mergeBookPatchWithLatest, sameLockFields } from './table-row-state-sync'
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    status: 'ok',
+    title: 'Test Book',
+    authors: ['Author One'],
+    seriesName: null,
+    seriesIndex: null,
+    files: [],
+    publishedYear: 2020,
+    language: 'en',
+    genres: [],
+    tags: [],
+    rating: null,
+    readingProgress: null,
+    readStatus: null,
+    addedAt: '2024-01-01T00:00:00Z',
+    updatedAt: null,
+    metadataScore: null,
+    hasCover: false,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    ...overrides,
+  }
+}
+
+describe('table-row-state-sync', () => {
+  it('merges status patch into latest row snapshot and preserves latest lock fields (regression)', () => {
+    const staleBook = makeBook({
+      id: 195,
+      hasMetadataLocks: false,
+      lockedFields: [],
+      readStatus: { status: 'reading', source: 'manual', startedAt: null, finishedAt: null, updatedAt: '2024-01-01T00:00:00Z' },
+    })
+    const latestBook = makeBook({
+      id: 195,
+      hasMetadataLocks: true,
+      lockedFields: ['title'],
+      readStatus: { status: 'reading', source: 'manual', startedAt: null, finishedAt: null, updatedAt: '2024-01-02T00:00:00Z' },
+    })
+
+    const updated = mergeBookPatchWithLatest([latestBook], staleBook, {
+      readStatus: { status: 'skimmed', source: 'manual', startedAt: null, finishedAt: null, updatedAt: '2024-01-03T00:00:00Z' },
+    })
+
+    expect(updated.lockedFields).toEqual(['title'])
+    expect(updated.hasMetadataLocks).toBe(true)
+    expect(updated.readStatus?.status).toBe('skimmed')
+  })
+
+  it('returns null for lock-state update when lock fields are unchanged', () => {
+    const latestBook = makeBook({
+      id: 7,
+      hasMetadataLocks: true,
+      lockedFields: ['authors', 'title'],
+    })
+
+    const updated = buildLockStateBookUpdate([latestBook], latestBook, ['title', 'authors'])
+    expect(updated).toBeNull()
+  })
+
+  it('builds lock-state row update from latest snapshot', () => {
+    const staleBook = makeBook({ id: 9, lockedFields: [], hasMetadataLocks: false, title: 'Stale Title' })
+    const latestBook = makeBook({ id: 9, lockedFields: ['title'], hasMetadataLocks: true, title: 'Latest Title' })
+
+    const updated = buildLockStateBookUpdate([latestBook], staleBook, ['title', 'authors'])
+    expect(updated).not.toBeNull()
+    expect(updated?.title).toBe('Latest Title')
+    expect(updated?.lockedFields).toEqual(['title', 'authors'])
+    expect(updated?.hasMetadataLocks).toBe(true)
+  })
+
+  it('compares lock fields ignoring order', () => {
+    expect(sameLockFields(['title', 'authors'], ['authors', 'title'])).toBe(true)
+    expect(sameLockFields(['title'], ['authors'])).toBe(false)
+  })
+})
diff --git a/client/src/features/book/lib/table-row-state-sync.ts b/client/src/features/book/lib/table-row-state-sync.ts
new file mode 100644
index 000000000..aed58c87f
--- /dev/null
+++ b/client/src/features/book/lib/table-row-state-sync.ts
@@ -0,0 +1,32 @@
+import type { BookCard, BookMetadataLockField } from '@bookorbit/types'
+
+export function resolveLatestBook(books: readonly BookCard[], fallbackBook: BookCard): BookCard {
+  return books.find((entry) => entry.id === fallbackBook.id) ?? fallbackBook
+}
+
+export function mergeBookPatchWithLatest(books: readonly BookCard[], fallbackBook: BookCard, patch: Partial<BookCard>): BookCard {
+  const latest = resolveLatestBook(books, fallbackBook)
+  return { ...latest, ...patch }
+}
+
+export function sameLockFields(a: readonly BookMetadataLockField[], b: readonly BookMetadataLockField[]): boolean {
+  if (a.length !== b.length) return false
+  const bSet = new Set(b)
+  return a.every((field) => bSet.has(field))
+}
+
+export function buildLockStateBookUpdate(
+  books: readonly BookCard[],
+  fallbackBook: BookCard,
+  nextFields: readonly BookMetadataLockField[],
+): BookCard | null {
+  const latest = resolveLatestBook(books, fallbackBook)
+  const normalizedFields = [...nextFields]
+  const hasMetadataLocks = normalizedFields.length > 0
+  if (sameLockFields(latest.lockedFields, normalizedFields) && latest.hasMetadataLocks === hasMetadataLocks) return null
+  return {
+    ...latest,
+    lockedFields: normalizedFields,
+    hasMetadataLocks,
+  }
+}
diff --git a/client/src/features/collection/composables/__tests__/useCollectionBooks.spec.ts b/client/src/features/collection/composables/__tests__/useCollectionBooks.spec.ts
new file mode 100644
index 000000000..06f3f41a3
--- /dev/null
+++ b/client/src/features/collection/composables/__tests__/useCollectionBooks.spec.ts
@@ -0,0 +1,154 @@
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { BookCard, BooksPage, SortSpec } from '@bookorbit/types'
+
+const fetchMock = vi.fn<(url: string, init?: RequestInit) => Promise<unknown>>()
+vi.stubGlobal('fetch', fetchMock)
+
+vi.mock('@/lib/api', () => ({
+  api: (url: string, init?: RequestInit) => fetchMock(url, init),
+}))
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    status: 'active',
+    title: 'Book A',
+    authors: [],
+    seriesName: null,
+    seriesIndex: null,
+    files: [],
+    publishedYear: null,
+    language: null,
+    genres: [],
+    tags: [],
+    rating: null,
+    readingProgress: null,
+    readStatus: null,
+    addedAt: '2024-01-01T00:00:00Z',
+    updatedAt: null,
+    metadataScore: null,
+    hasCover: false,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    ...overrides,
+  }
+}
+
+function makePage(items: Partial<BookCard>[], total: number): BooksPage {
+  return { items: items as BookCard[], total, page: 0, size: 50 }
+}
+
+function mockOkResponse(page: BooksPage) {
+  fetchMock.mockResolvedValueOnce({
+    ok: true,
+    json: () => Promise.resolve(page),
+  })
+}
+
+describe('useCollectionBooks', () => {
+  beforeEach(() => {
+    fetchMock.mockReset()
+  })
+
+  it('posts collection table queries to the unified endpoint', async () => {
+    const { useCollectionBooks } = await import('../useCollectionBooks')
+    const collectionId = ref(7)
+    const collapseEnabled = ref(true)
+    const q = ref('tolkien')
+    const sort = ref<SortSpec[]>([{ field: 'title', dir: 'asc' }])
+    const { items, total, hasMore, load } = useCollectionBooks(collectionId, collapseEnabled, q, sort)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'The Hobbit' })], 2))
+    await load(true)
+
+    expect(fetchMock).toHaveBeenCalledWith(
+      '/api/v1/collections/7/books/query',
+      expect.objectContaining({
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          sort: [{ field: 'title', dir: 'asc' }],
+          pagination: { page: 0, size: 50 },
+          collapseSeries: true,
+          q: 'tolkien',
+        }),
+      }),
+    )
+    expect(items.value.map((book) => book.id)).toEqual([1])
+    expect(total.value).toBe(2)
+    expect(hasMore.value).toBe(true)
+  })
+
+  it('keeps existing rows visible until the replacement sort response arrives', async () => {
+    const { useCollectionBooks } = await import('../useCollectionBooks')
+    const collectionId = ref(7)
+    const sort = ref<SortSpec[]>([{ field: 'title', dir: 'asc' }])
+    const { items, load } = useCollectionBooks(collectionId, ref(false), ref(''), sort)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'Zulu' }), makeBook({ id: 2, title: 'Alpha' })], 2))
+    await load(true)
+    expect(items.value.map((book) => book.title)).toEqual(['Zulu', 'Alpha'])
+
+    let resolveFetch!: (value: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((resolve) => {
+        resolveFetch = resolve
+      }),
+    )
+
+    sort.value = [{ field: 'author', dir: 'desc' }]
+    await Promise.resolve()
+
+    expect(items.value.map((book) => book.title)).toEqual(['Zulu', 'Alpha'])
+
+    resolveFetch({
+      ok: true,
+      json: () => Promise.resolve(makePage([makeBook({ id: 2, title: 'Alpha' }), makeBook({ id: 1, title: 'Zulu' })], 2)),
+    })
+    await new Promise((resolve) => setTimeout(resolve, 0))
+
+    expect(items.value.map((book) => book.title)).toEqual(['Alpha', 'Zulu'])
+  })
+
+  it('aborts stale reset requests and keeps only the latest response', async () => {
+    const { useCollectionBooks } = await import('../useCollectionBooks')
+    const collectionId = ref(7)
+    const { items, load } = useCollectionBooks(collectionId)
+
+    let resolveFirst!: (value: unknown) => void
+    let resolveSecond!: (value: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((resolve) => {
+        resolveFirst = resolve
+      }),
+    )
+    fetchMock.mockReturnValueOnce(
+      new Promise((resolve) => {
+        resolveSecond = resolve
+      }),
+    )
+
+    const first = load(true)
+    const second = load(true)
+
+    resolveSecond({
+      ok: true,
+      json: () => Promise.resolve(makePage([makeBook({ id: 2, title: 'Second' })], 1)),
+    })
+    await second
+
+    resolveFirst({
+      ok: true,
+      json: () => Promise.resolve(makePage([makeBook({ id: 1, title: 'First' })], 1)),
+    })
+    await first
+
+    expect(items.value.map((book) => book.title)).toEqual(['Second'])
+  })
+})
diff --git a/client/src/features/collection/composables/useCollectionBooks.ts b/client/src/features/collection/composables/useCollectionBooks.ts
index e9f1a0c6e..f2e85126f 100644
--- a/client/src/features/collection/composables/useCollectionBooks.ts
+++ b/client/src/features/collection/composables/useCollectionBooks.ts
@@ -1,41 +1,16 @@
 import { ref, type Ref } from 'vue'
-import { api } from '@/lib/api'
-import type { BookCard } from '@bookorbit/types'
+import { useBookDataSource } from '@/features/book/composables/useBookDataSource'
+import type { SortSpec } from '@bookorbit/types'
 
-const PAGE_SIZE = 50
-
-export function useCollectionBooks(collectionId: Ref<number>, collapseEnabled: Ref<boolean> = ref(false), q: Ref<string> = ref('')) {
-  const items = ref<BookCard[]>([])
-  const total = ref(0)
-  const loading = ref(false)
-  const initialized = ref(false)
-  const hasMore = ref(false)
-  let page = 0
-
-  async function load(reset = false) {
-    if (loading.value) return
-    if (!reset && !hasMore.value) return
-    if (reset) {
-      page = 0
-      items.value = []
-    }
-    loading.value = true
-    try {
-      const params = new URLSearchParams({ page: String(page), size: String(PAGE_SIZE) })
-      if (collapseEnabled.value) params.set('collapseSeries', 'true')
-      if (q.value.trim()) params.set('q', q.value.trim())
-      const res = await api(`/api/v1/collections/${collectionId.value}/books?${params.toString()}`)
-      if (!res.ok) throw new Error('Failed to load collection books')
-      const data = await res.json()
-      items.value = reset ? data.items : [...items.value, ...data.items]
-      total.value = data.total
-      hasMore.value = items.value.length < data.total
-      page++
-    } finally {
-      loading.value = false
-      initialized.value = true
-    }
-  }
-
-  return { items, total, loading, initialized, hasMore, load }
+export function useCollectionBooks(
+  collectionId: Ref<number>,
+  collapseEnabled: Ref<boolean> = ref(false),
+  q: Ref<string> = ref(''),
+  sort: Ref<SortSpec[]> = ref([{ field: 'title', dir: 'asc' }]),
+) {
+  return useBookDataSource(collectionId, (id) => `/api/v1/collections/${id}/books/query`, {
+    collapseEnabled,
+    q,
+    sort,
+  })
 }
diff --git a/client/src/features/collection/composables/useCollections.ts b/client/src/features/collection/composables/useCollections.ts
index fd93e2c2e..6d037d186 100644
--- a/client/src/features/collection/composables/useCollections.ts
+++ b/client/src/features/collection/composables/useCollections.ts
@@ -3,20 +3,30 @@ import { api } from '@/lib/api'
 import type { Collection } from '@bookorbit/types'
 
 const collections = ref<Collection[]>([])
-let loaded = false
+const loaded = ref(false)
+const loading = ref(false)
+const error = ref<string | null>(null)
 let fetchPromise: Promise<void> | null = null
 
 export function useCollections() {
   async function fetchCollections(): Promise<void> {
-    if (loaded) return
+    if (loaded.value) return
     if (fetchPromise) return fetchPromise
+    loading.value = true
+    error.value = null
     fetchPromise = api('/api/v1/collections')
       .then(async (res) => {
-        if (!res.ok) return
+        if (!res.ok) {
+          throw new Error(`HTTP ${res.status}`)
+        }
         collections.value = await res.json()
-        loaded = true
+        loaded.value = true
+      })
+      .catch((e: unknown) => {
+        error.value = e instanceof Error ? e.message : 'Failed to load collections'
       })
       .finally(() => {
+        loading.value = false
         fetchPromise = null
       })
     return fetchPromise
@@ -95,6 +105,9 @@ export function useCollections() {
 
   return {
     collections,
+    loaded,
+    loading,
+    error,
     fetchCollections,
     fetchCollectionsWithMembership,
     createCollection,
diff --git a/client/src/features/series/views/SeriesDetailView.vue b/client/src/features/series/views/SeriesDetailView.vue
index f1cf3436a..c826c2f0d 100644
--- a/client/src/features/series/views/SeriesDetailView.vue
+++ b/client/src/features/series/views/SeriesDetailView.vue
@@ -1,15 +1,17 @@
 <script setup lang="ts">
 import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { ChevronLeft, Pencil } from 'lucide-vue-next'
+import { ChevronLeft, Pencil, RotateCcw, SlidersHorizontal } from 'lucide-vue-next'
 import { toast } from 'vue-sonner'
 
-import type { BookCard, BookDetail } from '@bookorbit/types'
+import type { BookCard, BookDetail, SortSpec } from '@bookorbit/types'
 import VirtualBookGrid from '@/features/book/components/VirtualBookGrid.vue'
 import BookListRow from '@/features/book/components/BookListRow.vue'
+import VirtualBookTable from '@/features/book/components/VirtualBookTable.vue'
 import { bookCoverStyle } from '@/features/book/lib/book-cover'
 import { useCoverVersions } from '@/features/book/composables/useCoverVersions'
 import { useDisplaySettings } from '@/composables/useDisplaySettings'
+import { useEffectiveViewMode } from '@/composables/useEffectiveViewMode'
 import { usePermissions } from '@/features/auth/composables/usePermissions'
 import { useBookNavigation } from '@/features/book/composables/useBookNavigation'
 import { useLibraries } from '@/features/library/composables/useLibraries'
@@ -22,6 +24,8 @@ import SeriesGapBanner from '../components/SeriesGapBanner.vue'
 import { fetchSeriesBooks } from '../api/series'
 import { useSeriesDetail } from '../composables/useSeriesDetail'
 import { useCoverStack, MAX_VISIBLE as MAX_STACK_VISIBLE } from '../composables/useCoverStack'
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+import type { ColumnId } from '@/features/book/composables/useTableColumns'
 
 const route = useRoute()
 const router = useRouter()
@@ -29,7 +33,8 @@ const { hasPermission } = usePermissions()
 const { setBookContext } = useBookNavigation()
 const { coverUrl } = useCoverVersions()
 
-const { portraitCoverSize, gridGap, viewMode } = useDisplaySettings()
+const { portraitCoverSize, gridGap } = useDisplaySettings()
+const { effectiveViewMode } = useEffectiveViewMode()
 const { libraries, fetchLibraries } = useLibraries()
 
 const seriesName = computed(() => {
@@ -114,6 +119,22 @@ function handleBookAction(book: BookCard, action: string) {
   }
 }
 
+function handleTableBookUpdate(updated: BookCard) {
+  const idx = books.value.findIndex((b) => b.id === updated.id)
+  if (idx !== -1) books.value = books.value.map((b, i) => (i === idx ? updated : b))
+}
+
+const tableSort = ref<SortSpec[]>([{ field: 'seriesIndex', dir: 'asc' }])
+const tableRef = ref<InstanceType<typeof VirtualBookTable> | null>(null)
+
+function handleResetColumns() {
+  tableRef.value?.resetLayout()
+}
+
+function handleToggleColumn(id: ColumnId) {
+  tableRef.value?.toggleColumn(id)
+}
+
 function goBack() {
   if (window.history.length > 1 && route.query.from) {
     void router.push(route.query.from as string)
@@ -492,6 +513,37 @@ watch(
                 <option value="">All Libraries</option>
                 <option v-for="library in libraries" :key="library.id" :value="library.id">{{ library.name }}</option>
               </select>
+
+              <Popover v-if="effectiveViewMode === 'table'">
+                <PopoverTrigger as-child>
+                  <button
+                    class="flex h-8 w-full items-center gap-1.5 rounded-md border border-input px-2.5 text-sm text-muted-foreground transition-colors hover:bg-muted hover:text-foreground sm:w-auto"
+                  >
+                    <SlidersHorizontal :size="13" />
+                    Columns
+                  </button>
+                </PopoverTrigger>
+                <PopoverContent align="end" class="w-52 p-3">
+                  <template v-if="tableRef">
+                    <div class="mb-2 flex items-center justify-between">
+                      <span class="text-xs font-semibold uppercase tracking-wide text-foreground">Columns</span>
+                      <button class="text-xs text-muted-foreground hover:text-foreground" @click="handleResetColumns">
+                        <RotateCcw :size="11" class="mr-0.5 inline" />Reset
+                      </button>
+                    </div>
+                    <div class="space-y-1">
+                      <label
+                        v-for="col in tableRef.allColumns.filter((c) => c.pinned === null)"
+                        :key="col.id"
+                        class="flex cursor-pointer items-center gap-2 rounded px-1.5 py-1 text-xs hover:bg-accent"
+                      >
+                        <input type="checkbox" :checked="col.visible" class="accent-primary" @change="handleToggleColumn(col.id)" />
+                        {{ col.header || col.id }}
+                      </label>
+                    </div>
+                  </template>
+                </PopoverContent>
+              </Popover>
             </div>
           </div>
         </div>
@@ -502,17 +554,29 @@ watch(
         </div>
 
         <VirtualBookGrid
-          v-if="viewMode === 'grid' && books.length > 0"
+          v-if="effectiveViewMode === 'grid' && books.length > 0"
           :books="books"
           :cover-size="seriesBooksCoverSize"
           :grid-gap="gridGap"
           @action="handleBookAction"
         />
 
-        <div v-if="viewMode === 'list' && books.length > 0" class="flex flex-col divide-y divide-border">
+        <div v-if="effectiveViewMode === 'list' && books.length > 0" class="flex flex-col divide-y divide-border">
           <BookListRow v-for="book in books" :key="book.id" :book="book" @action="handleBookAction(book, $event)" />
         </div>
 
+        <!-- Table view -->
+        <VirtualBookTable
+          v-if="effectiveViewMode === 'table'"
+          ref="tableRef"
+          :books="books"
+          :sort="tableSort"
+          view-type="series"
+          @update:sort="tableSort = $event"
+          @action="handleBookAction"
+          @update:book="handleTableBookUpdate"
+        />
+
         <div ref="sentinel" class="mt-4 flex h-8 items-center justify-center">
           <span v-if="loadingBooks" class="text-xs text-muted-foreground">Loading...</span>
           <span v-else-if="!hasMore && books.length > 0" class="text-xs text-muted-foreground"> All {{ total.toLocaleString() }} books loaded </span>
diff --git a/client/src/features/settings/AppearanceSettings.vue b/client/src/features/settings/AppearanceSettings.vue
index 2592ff923..deefc2cbb 100644
--- a/client/src/features/settings/AppearanceSettings.vue
+++ b/client/src/features/settings/AppearanceSettings.vue
@@ -19,6 +19,7 @@ const {
   smartScopeFilterExpanded,
   authorCoverSize,
   authorCoverShape,
+  tableZebraStriping,
 } = useDisplaySettings()
 
 const { prefs, setPreference } = useSeriesCollapsePreference()
@@ -435,6 +436,22 @@ const syncModeEnabled = computed(() => coverSizeScope.value === 'synced')
     </div>
   </div>
 
+  <!-- Table View -->
+  <div class="mt-8">
+    <p class="settings-group-label">Table View</p>
+    <div class="border border-border rounded-lg overflow-hidden divide-y divide-border shadow-xs">
+      <div class="flex items-center justify-between gap-3 px-4 py-3 md:px-5 md:py-3.5 bg-card">
+        <div class="min-w-0">
+          <p class="settings-label">Zebra striping</p>
+          <p class="settings-hint overflow-hidden text-ellipsis whitespace-nowrap md:whitespace-normal md:overflow-visible">
+            Alternate row background colors for easier scanning
+          </p>
+        </div>
+        <ToggleSwitch v-model="tableZebraStriping" />
+      </div>
+    </div>
+  </div>
+
   <!-- SmartScopes -->
   <div class="mt-8">
     <p class="settings-group-label">Smart Scopes</p>
diff --git a/client/src/features/smart-scope/composables/__tests__/useSmartScope.spec.ts b/client/src/features/smart-scope/composables/__tests__/useSmartScope.spec.ts
new file mode 100644
index 000000000..3eb82e4e2
--- /dev/null
+++ b/client/src/features/smart-scope/composables/__tests__/useSmartScope.spec.ts
@@ -0,0 +1,125 @@
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { BookCard, BooksPage, SortSpec } from '@bookorbit/types'
+
+const fetchMock = vi.fn<(url: string, init?: RequestInit) => Promise<unknown>>()
+vi.stubGlobal('fetch', fetchMock)
+
+vi.mock('@/lib/api', () => ({
+  api: (url: string, init?: RequestInit) => fetchMock(url, init),
+}))
+
+function makeBook(overrides: Partial<BookCard> = {}): BookCard {
+  return {
+    id: 1,
+    status: 'active',
+    title: 'Book A',
+    authors: [],
+    seriesName: null,
+    seriesIndex: null,
+    files: [],
+    publishedYear: null,
+    language: null,
+    genres: [],
+    tags: [],
+    rating: null,
+    readingProgress: null,
+    readStatus: null,
+    addedAt: '2024-01-01T00:00:00Z',
+    updatedAt: null,
+    metadataScore: null,
+    hasCover: false,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
+    narrators: [],
+    ...overrides,
+  }
+}
+
+function makePage(items: Partial<BookCard>[], total: number): BooksPage {
+  return { items: items as BookCard[], total, page: 0, size: 50 }
+}
+
+function mockOkResponse(page: BooksPage) {
+  fetchMock.mockResolvedValueOnce({
+    ok: true,
+    json: () => Promise.resolve(page),
+  })
+}
+
+describe('useSmartScope', () => {
+  beforeEach(() => {
+    fetchMock.mockReset()
+  })
+
+  it('posts SmartScope queries to the unified endpoint with temporary sort overrides', async () => {
+    const { useSmartScope } = await import('../useSmartScope')
+    const smartScopeId = ref(9)
+    const q = ref('space')
+    const sort = ref([{ field: 'author' as const, dir: 'desc' as const }])
+    const { items, load } = useSmartScope(smartScopeId, q, sort)
+
+    mockOkResponse(makePage([makeBook({ id: 4, title: 'Dune' })], 1))
+    await load(true)
+
+    expect(fetchMock).toHaveBeenCalledWith(
+      '/api/v1/smart-scopes/9/books/query',
+      expect.objectContaining({
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          sort: [{ field: 'author', dir: 'desc' }],
+          pagination: { page: 0, size: 50 },
+          q: 'space',
+        }),
+      }),
+    )
+    expect(items.value.map((book) => book.id)).toEqual([4])
+  })
+
+  it('does not hit the API for invalid SmartScope ids', async () => {
+    const { useSmartScope } = await import('../useSmartScope')
+    const smartScopeId = ref(Number.NaN)
+    const { load, initialized, items } = useSmartScope(smartScopeId)
+
+    await load(true)
+
+    expect(fetchMock).not.toHaveBeenCalled()
+    expect(initialized.value).toBe(true)
+    expect(items.value).toEqual([])
+  })
+
+  it('keeps current items in place while a new sort request is pending', async () => {
+    const { useSmartScope } = await import('../useSmartScope')
+    const smartScopeId = ref(9)
+    const sort = ref<SortSpec[]>([{ field: 'title', dir: 'asc' }])
+    const { items, load } = useSmartScope(smartScopeId, ref(''), sort)
+
+    mockOkResponse(makePage([makeBook({ id: 1, title: 'Zulu' }), makeBook({ id: 2, title: 'Alpha' })], 2))
+    await load(true)
+
+    let resolveFetch!: (value: unknown) => void
+    fetchMock.mockReturnValueOnce(
+      new Promise((resolve) => {
+        resolveFetch = resolve
+      }),
+    )
+
+    sort.value = [{ field: 'title', dir: 'desc' }]
+    await Promise.resolve()
+
+    expect(items.value.map((book) => book.title)).toEqual(['Zulu', 'Alpha'])
+
+    resolveFetch({
+      ok: true,
+      json: () => Promise.resolve(makePage([makeBook({ id: 2, title: 'Alpha' }), makeBook({ id: 1, title: 'Zulu' })], 2)),
+    })
+    await new Promise((resolve) => setTimeout(resolve, 0))
+
+    expect(items.value.map((book) => book.title)).toEqual(['Alpha', 'Zulu'])
+  })
+})
diff --git a/client/src/features/smart-scope/composables/useSmartScope.ts b/client/src/features/smart-scope/composables/useSmartScope.ts
index d797fac4d..a0d563f99 100644
--- a/client/src/features/smart-scope/composables/useSmartScope.ts
+++ b/client/src/features/smart-scope/composables/useSmartScope.ts
@@ -1,46 +1,7 @@
-import { computed, ref, type Ref } from 'vue'
-import { api } from '@/lib/api'
-import type { BookCard, BooksPage } from '@bookorbit/types'
+import { ref, type Ref } from 'vue'
+import { useBookDataSource } from '@/features/book/composables/useBookDataSource'
+import type { SortSpec } from '@bookorbit/types'
 
-const PAGE_SIZE = 50
-
-export function useSmartScope(smartScopeId: Ref<number>, q: Ref<string> = ref('')) {
-  const items = ref<BookCard[]>([])
-  const total = ref(0)
-  const loading = ref(false)
-  const initialized = ref(false)
-  const page = ref(0)
-
-  const hasMore = computed(() => items.value.length < total.value)
-
-  async function load(reset = false) {
-    if (loading.value || !smartScopeId.value || isNaN(smartScopeId.value)) return
-    loading.value = true
-
-    if (reset) {
-      page.value = 0
-      items.value = []
-    }
-
-    try {
-      const qParam = q.value.trim() ? `&q=${encodeURIComponent(q.value.trim())}` : ''
-      const res = await api(`/api/v1/smart-scopes/${smartScopeId.value}/books?page=${page.value}&size=${PAGE_SIZE}${qParam}`)
-      if (!res.ok) throw new Error(`HTTP ${res.status}`)
-
-      const data: BooksPage = await res.json()
-
-      if (page.value === 0) {
-        items.value = data.items
-      } else {
-        items.value = [...items.value, ...data.items]
-      }
-      total.value = data.total
-      page.value++
-    } finally {
-      loading.value = false
-      initialized.value = true
-    }
-  }
-
-  return { items, total, loading, initialized, hasMore, load }
+export function useSmartScope(smartScopeId: Ref<number>, q: Ref<string> = ref(''), sort: Ref<SortSpec[]> = ref([{ field: 'title', dir: 'asc' }])) {
+  return useBookDataSource(smartScopeId, (id) => `/api/v1/smart-scopes/${id}/books/query`, { q, sort })
 }
diff --git a/client/src/features/smart-scope/composables/useSmartScopes.ts b/client/src/features/smart-scope/composables/useSmartScopes.ts
index f01b1d3cd..943276761 100644
--- a/client/src/features/smart-scope/composables/useSmartScopes.ts
+++ b/client/src/features/smart-scope/composables/useSmartScopes.ts
@@ -4,21 +4,49 @@ import type { CreateSmartScopePayload, SmartScope } from '@bookorbit/types'
 
 const smartScopes = ref<SmartScope[]>([])
 const loaded = ref(false)
+const loading = ref(false)
+const error = ref<string | null>(null)
+let fetchPromise: Promise<void> | null = null
 
 export function useSmartScopes() {
   async function fetchSmartScopes() {
     if (loaded.value) return
-    const res = await api('/api/v1/smart-scopes')
-    if (!res.ok) return
-    smartScopes.value = await res.json()
-    loaded.value = true
+    if (fetchPromise) return fetchPromise
+    loading.value = true
+    error.value = null
+    fetchPromise = api('/api/v1/smart-scopes')
+      .then(async (res) => {
+        if (!res.ok) {
+          throw new Error(`HTTP ${res.status}`)
+        }
+        smartScopes.value = await res.json()
+        loaded.value = true
+      })
+      .catch((e: unknown) => {
+        error.value = e instanceof Error ? e.message : 'Failed to load smart scopes'
+      })
+      .finally(() => {
+        loading.value = false
+        fetchPromise = null
+      })
+    return fetchPromise
   }
 
   async function refreshSmartScopes() {
-    const res = await api('/api/v1/smart-scopes')
-    if (!res.ok) return
-    smartScopes.value = await res.json()
-    loaded.value = true
+    loading.value = true
+    error.value = null
+    try {
+      const res = await api('/api/v1/smart-scopes')
+      if (!res.ok) {
+        throw new Error(`HTTP ${res.status}`)
+      }
+      smartScopes.value = await res.json()
+      loaded.value = true
+    } catch (e: unknown) {
+      error.value = e instanceof Error ? e.message : 'Failed to load smart scopes'
+    } finally {
+      loading.value = false
+    }
   }
 
   async function createSmartScope(payload: CreateSmartScopePayload): Promise<SmartScope> {
@@ -60,5 +88,16 @@ export function useSmartScopes() {
     if (!res.ok) throw new Error(`HTTP ${res.status}`)
   }
 
-  return { smartScopes, fetchSmartScopes, refreshSmartScopes, createSmartScope, updateSmartScope, deleteSmartScope, reorderSmartScopes }
+  return {
+    smartScopes,
+    loaded,
+    loading,
+    error,
+    fetchSmartScopes,
+    refreshSmartScopes,
+    createSmartScope,
+    updateSmartScope,
+    deleteSmartScope,
+    reorderSmartScopes,
+  }
 }
diff --git a/client/src/features/statistics/components/library/LanguageDistributionChart.vue b/client/src/features/statistics/components/library/LanguageDistributionChart.vue
index 2ece29e9a..5078310ff 100644
--- a/client/src/features/statistics/components/library/LanguageDistributionChart.vue
+++ b/client/src/features/statistics/components/library/LanguageDistributionChart.vue
@@ -17,16 +17,22 @@ watchEffect(() => {
   option.value = {
     tooltip: { trigger: 'item' },
     legend: {
+      type: 'scroll',
       orient: md.value ? 'vertical' : 'horizontal',
-      right: md.value ? '2%' : 'auto',
-      bottom: md.value ? 'auto' : 0,
-      top: md.value ? 'middle' : 'auto',
+      left: md.value ? '56%' : 'center',
+      right: md.value ? 0 : 'auto',
+      top: md.value ? 8 : 'auto',
+      bottom: md.value ? 8 : 0,
+      itemWidth: 12,
+      itemHeight: 8,
+      pageIconSize: 10,
+      pageButtonGap: 4,
     },
     series: [
       {
         type: 'pie',
-        radius: ['40%', '70%'],
-        center: md.value ? ['38%', '50%'] : ['50%', '44%'],
+        radius: ['42%', '68%'],
+        center: md.value ? ['27%', '50%'] : ['50%', '38%'],
         data: data.value.items.map((item) => ({ name: item.language.toUpperCase(), value: item.count })),
         label: { show: false },
       },
diff --git a/client/src/views/CollectionView.vue b/client/src/views/CollectionView.vue
index b832c26f4..6935a95f2 100644
--- a/client/src/views/CollectionView.vue
+++ b/client/src/views/CollectionView.vue
@@ -1,43 +1,55 @@
 <script setup lang="ts">
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { CheckSquare, FolderOpen, Layers, Pencil, SlidersHorizontal, Square, X } from 'lucide-vue-next'
+import { AlertTriangle, CheckSquare, FileSpreadsheet, FolderOpen, Layers, Pencil, SlidersHorizontal, Square, X } from 'lucide-vue-next'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { DropdownMenuItem } from '@/components/ui/dropdown-menu'
 import VirtualBookGrid from '@/features/book/components/VirtualBookGrid.vue'
 import BookListRow from '@/features/book/components/BookListRow.vue'
+import VirtualBookTable from '@/features/book/components/VirtualBookTable.vue'
+import TableColumnPanel from '@/features/book/components/TableColumnPanel.vue'
 import BookQuickView from '@/features/book/components/BookQuickView.vue'
 import ViewHeader from '@/components/ViewHeader.vue'
 import SelectionActionBar from '@/components/SelectionActionBar.vue'
 import AddToCollectionSheet from '@/features/collection/components/AddToCollectionSheet.vue'
 import BulkUpdateTagsDialog from '@/features/book/components/BulkUpdateTagsDialog.vue'
+import MetadataExportDialog from '@/features/book/components/MetadataExportDialog.vue'
 import EditCollectionDialog from '@/features/collection/components/EditCollectionDialog.vue'
 import SendBookDialog from '@/features/email/components/SendBookDialog.vue'
 import DeleteBookDialog from '@/features/book/components/DeleteBookDialog.vue'
 import { toast } from 'vue-sonner'
 import { useCollections } from '@/features/collection/composables/useCollections'
 import { useCollectionBooks } from '@/features/collection/composables/useCollectionBooks'
-import { useBookNavigation } from '@/features/book/composables/useBookNavigation'
-import { useBookSelection } from '@/features/book/composables/useBookSelection'
-import { useDeleteBook } from '@/features/book/composables/useDeleteBook'
-import { useBookBulkActions } from '@/features/book/composables/useBookBulkActions'
 import { useSeriesCollapsePreference } from '@/features/book/composables/useSeriesCollapsePreference'
 import { useViewSearch } from '@/features/book/composables/useViewSearch'
-import { useDisplaySettings } from '@/composables/useDisplaySettings'
+import { useEffectiveViewMode } from '@/composables/useEffectiveViewMode'
 import { useViewDisplaySettings } from '@/composables/useViewDisplaySettings'
 import { usePageTitle } from '@/composables/usePageTitle'
 import { DEFAULT_COVER_ASPECT_RATIO } from '@/features/book/lib/cover-aspect-ratio'
-import type { BookCard } from '@bookorbit/types'
+import { useViewSort } from '@/features/book/composables/useViewSort'
+import { useDisplaySettings } from '@/composables/useDisplaySettings'
+import { usePermissions } from '@/features/auth/composables/usePermissions'
+import { useBookNavigation } from '@/features/book/composables/useBookNavigation'
+import { useBookViewContext } from '@/features/book/composables/useBookViewContext'
+import { useBookTableShell } from '@/features/book/composables/useBookTableShell'
+import { useInfiniteScrollSentinel } from '@/features/book/composables/useInfiniteScrollSentinel'
+import { useSavedViews, type SavedView } from '@/features/book/composables/useSavedViews'
+import type { BookCard, SortSpec } from '@bookorbit/types'
 import EntityNotFound from '@/components/EntityNotFound.vue'
 
 const route = useRoute()
 const router = useRouter()
-const { viewMode } = useDisplaySettings()
+const { viewMode, effectiveViewMode } = useEffectiveViewMode()
+const { hasPermission, isDemoRestrictedAccount } = usePermissions()
 
 const collectionId = computed(() => Number(route.params.id))
+const tableSort = ref<SortSpec[]>([{ field: 'title', dir: 'asc' }])
+const { sortModel: tableSortModel } = useViewSort(tableSort, 'collection', collectionId)
+const { tableDensity } = useDisplaySettings()
+const { allSavedViews, saveView, renameView, deleteView, duplicateView, toggleFavorite, importViews } = useSavedViews('collection', collectionId)
 const coverAspectRatio = computed(() => DEFAULT_COVER_ASPECT_RATIO)
 const { coverSize, gridGap } = useViewDisplaySettings('collection', collectionId, coverAspectRatio)
-const { collections, fetchCollections, removeBooksFromCollection } = useCollections()
+const { collections, loaded: collectionsLoaded, error: collectionsError, fetchCollections, removeBooksFromCollection } = useCollections()
 const collectionNotFound = ref(false)
 const collection = computed(() => collections.value.find((c) => c.id === collectionId.value))
 const pageTitle = computed(() => {
@@ -64,83 +76,125 @@ const {
   total,
   loading,
   initialized: booksInitialized,
+  error: booksError,
   hasMore,
   load,
-} = useCollectionBooks(collectionId, collapseEnabledRef, debouncedQuery)
-const { setBookContext, registerLoadMore } = useBookNavigation()
-watch(
-  [books, total],
-  ([newBooks, newTotal]) => {
-    setBookContext(
-      newBooks.map((b) => b.id),
-      newTotal,
-    )
-  },
-  { immediate: true },
-)
+  clear,
+} = useCollectionBooks(collectionId, collapseEnabledRef, debouncedQuery, tableSort)
+const collectionLoadError = computed(() => collectionsError.value ?? booksError.value)
+const { setBookContext } = useBookNavigation()
+useBookViewContext(books, total, () => load())
 
-onMounted(() => {
-  registerLoadMore(async () => {
-    await load()
+function handleSaveCurrentView(name: string) {
+  if (!tableRef.value) return
+  saveView({
+    name,
+    layout: tableRef.value.currentLayout,
+    sort: tableSort.value,
   })
-})
-onUnmounted(() => {
-  registerLoadMore(null)
-})
-
-const { selectionMode, selectedIds, selectedCount, enterSelectionMode, exitSelectionMode, toggleBook, rangeSelectTo, isSelected } = useBookSelection()
-
-function handleSelect(id: number, event: MouseEvent) {
-  if (event.shiftKey)
-    rangeSelectTo(
-      id,
-      books.value.map((b) => b.id),
-    )
-  else toggleBook(id)
 }
 
-function toggleSelectionMode() {
-  if (selectionMode.value) exitSelectionMode()
-  else enterSelectionMode()
+function handleApplySavedView(view: SavedView) {
+  tableRef.value?.applyPreset(view.layout, view.sort)
+}
+
+function handleExportTableBackup() {
+  const blob = new Blob(
+    [
+      JSON.stringify(
+        {
+          version: 1,
+          presets: tableRef.value?.allPresets.filter((preset) => !preset.isBuiltIn) ?? [],
+          savedViews: allSavedViews.value,
+        },
+        null,
+        2,
+      ),
+    ],
+    { type: 'application/json' },
+  )
+  const url = URL.createObjectURL(blob)
+  const anchor = document.createElement('a')
+  anchor.href = url
+  anchor.download = `collection-table-backup-${collectionId.value ?? 'shared'}.json`
+  anchor.click()
+  URL.revokeObjectURL(url)
+}
+
+async function handleImportTableBackup(file: File) {
+  const raw = await file.text()
+  const parsed = JSON.parse(raw) as { presets?: unknown[]; savedViews?: unknown[] }
+  handleImportPresetBackup((parsed.presets ?? []) as never)
+  importViews((parsed.savedViews ?? []) as SavedView[])
+}
+
+function handleTableDensityChange(value: 'compact' | 'comfortable' | 'roomy') {
+  tableDensity.value = value
+}
+
+function handleSelectAllLoaded(checked: boolean) {
+  const ids = books.value.map((book) => book.id)
+  if (checked) selectAll(ids)
+  else deselectAll(ids)
 }
 
-const addToCollectionOpen = ref(false)
-const bulkTagsOpen = ref(false)
-const sendBookOpen = ref(false)
-const editCollectionOpen = ref(false)
-const mobileControlsExpanded = ref(false)
-let removingInProgress = false
 const {
-  pendingId: deleteBookId,
-  deleting: deletingBook,
-  promptDelete,
+  tableRef,
+  handleResetColumns,
+  handleToggleColumn,
+  handleColumnPanelReorder,
+  handleApplyTablePreset,
+  handleSaveTablePreset,
+  handleDeleteTablePreset,
+  handleRenameTablePreset,
+  handleDuplicateTablePreset,
+  handleTogglePresetFavorite,
+  handleImportPresetBackup,
+  selectionMode,
+  selectedIds,
+  selectedCount,
+  enterSelectionMode,
+  exitSelectionMode,
+  selectAll,
+  deselectAll,
+  isSelected,
+  handleSelect,
+  toggleSelectionMode,
+  deleteBookId,
+  deletingBook,
   cancelDelete,
   confirmDelete,
-} = useDeleteBook((id) => {
-  books.value = books.value.filter((b) => b.id !== id)
-})
-const {
   inFlight,
   handleBulkRefreshMetadata,
   handleBulkReExtractCover,
-  handleExport,
+  handleDownloadFiles,
   handleBulkSetStatus,
   handleBulkSetRating,
   handleBulkUpdateTags,
+  handleBulkSetField,
   handleBulkSetMetadataLock,
   handleDeleteSelected,
-} = useBookBulkActions(
-  selectedIds,
-  (ids) => {
-    const deleted = new Set(ids)
-    books.value = books.value.filter((b) => !deleted.has(b.id))
-    exitSelectionMode()
-  },
+  addToCollectionOpen,
+  bulkTagsOpen,
+  sendBookOpen,
+  quickViewBookId,
+  quickViewOpen,
+  handleBookAction,
+  handleTableBookUpdate,
+} = useBookTableShell({
   books,
-)
+  loadFn: () => load(true),
+})
 
-const quickViewBookId = ref<number | null>(null)
-const quickViewOpen = ref(false)
+const metadataExportOpen = ref(false)
+const visibleExportColumns = computed(() => {
+  if (!tableRef.value) return []
+  return tableRef.value.allColumns.filter((column) => column.visible).map((column) => column.id)
+})
+
+const editCollectionOpen = ref(false)
+const mobileControlsExpanded = ref(false)
+let removingInProgress = false
 
 async function handleRemoveFromCollection() {
   if (removingInProgress || !collectionId.value || selectedIds.value.size === 0) return
@@ -185,6 +239,11 @@ function openCollectionEditor() {
   collapseMobileControlsIfNeeded()
 }
 
+function openMetadataExport() {
+  metadataExportOpen.value = true
+  collapseMobileControlsIfNeeded()
+}
+
 function handleEditSelected() {
   const ids = [...selectedIds.value]
   if (ids.length === 0) return
@@ -193,17 +252,6 @@ function handleEditSelected() {
   exitSelectionMode()
 }
 
-function handleBookAction(book: BookCard, action: 'quick-view' | 'edit-metadata' | 'add-to-collection' | 'delete') {
-  if (action === 'quick-view') {
-    quickViewBookId.value = book.id
-    quickViewOpen.value = true
-    return
-  }
-  if (action === 'delete') {
-    promptDelete(book.id)
-  }
-}
-
 async function handleToggleCollapse() {
   const next = !collapseEnabledRef.value
   collapseEnabledRef.value = next
@@ -211,49 +259,37 @@ async function handleToggleCollapse() {
   await setPreference({ collectionId: collectionId.value }, next)
 }
 
-const sentinel = ref<HTMLElement | null>(null)
-let observer: IntersectionObserver | null = null
-function checkSentinel() {
-  if (!hasMore.value || loading.value) return
-  const el = sentinel.value
-  if (!el) return
-  if (el.getBoundingClientRect().top < window.innerHeight + 300) load()
-}
+const { sentinel } = useInfiniteScrollSentinel({
+  hasMore,
+  loading,
+  loadMore: () => load(),
+})
 
 onMounted(async () => {
+  await retryCollectionLoad()
+})
+
+async function retryCollectionLoad() {
+  collectionNotFound.value = false
+  clear()
   await fetchCollections()
-  if (!collection.value) {
+  if (collectionsError.value) return
+  if (!collection.value && collectionsLoaded.value) {
     collectionNotFound.value = true
     return
   }
-  load(true)
-  observer = new IntersectionObserver(
-    (entries) => {
-      if (entries[0]?.isIntersecting && !loading.value && hasMore.value) load()
-    },
-    { rootMargin: '300px' },
-  )
-  if (sentinel.value) observer.observe(sentinel.value)
-  window.addEventListener('resize', checkSentinel, { passive: true })
-})
+  if (collection.value) {
+    await load(true)
+  }
+}
 
-onUnmounted(() => {
-  observer?.disconnect()
-  window.removeEventListener('resize', checkSentinel)
-})
-
-watch(collectionId, () => {
+watch(collectionId, async () => {
   clearSearch()
-  load(true)
+  await retryCollectionLoad()
+})
+watch(debouncedQuery, () => {
+  if (collection.value) void load(true)
 })
-watch(debouncedQuery, () => load(true))
-watch(
-  loading,
-  (isLoading) => {
-    if (!isLoading) checkSentinel()
-  },
-  { flush: 'post' },
-)
 </script>
 
 <template>
@@ -270,7 +306,8 @@ watch(
     :in-collection="true"
     :in-flight="inFlight"
     @send="sendBookOpen = true"
-    @export="handleExport"
+    @download="handleDownloadFiles"
+    @export-metadata="openMetadataExport"
     @add-to-collection="addToCollectionOpen = true"
     @remove-from-collection="handleRemoveFromCollection"
     @edit="handleEditSelected"
@@ -279,11 +316,24 @@ watch(
     @set-status="handleBulkSetStatus"
     @set-rating="handleBulkSetRating"
     @edit-tags="bulkTagsOpen = true"
+    @set-field="handleBulkSetField"
     @lock-metadata="handleBulkSetMetadataLock"
     @delete="handleDeleteSelected"
     @exit="exitSelectionMode"
   />
 
+  <MetadataExportDialog
+    :open="metadataExportOpen"
+    view-type="collection"
+    :selected-book-ids="[...selectedIds]"
+    :selected-count="selectedCount"
+    :total-count="total"
+    :sort="tableSort"
+    :visible-columns="visibleExportColumns"
+    default-scope="selected"
+    @update:open="metadataExportOpen = $event"
+  />
+
   <AddToCollectionSheet
     :open="addToCollectionOpen"
     :book-ids="[...selectedIds]"
@@ -302,7 +352,7 @@ watch(
   <SendBookDialog :open="sendBookOpen" :book-ids="[...selectedIds]" @update:open="sendBookOpen = $event" @sent="exitSelectionMode" />
   <DeleteBookDialog :open="deleteBookId !== null" :deleting="deletingBook" @confirm="confirmDelete" @cancel="cancelDelete" />
 
-  <section class="flex min-h-full flex-col">
+  <section class="flex h-full flex-col">
     <ViewHeader
       :title="collection?.name ?? 'Collection'"
       :icon="collection?.icon || 'FolderOpen'"
@@ -333,6 +383,19 @@ watch(
           <TooltipContent>{{ collapseEnabledRef ? 'Expand series' : 'Collapse series' }}</TooltipContent>
         </Tooltip>
 
+        <Tooltip>
+          <TooltipTrigger as-child>
+            <button
+              v-if="hasPermission('library_download') && !isDemoRestrictedAccount"
+              class="hidden sm:flex h-8 w-8 items-center justify-center rounded-md border border-input text-muted-foreground bg-background transition-colors hover:text-foreground hover:bg-muted"
+              @click="openMetadataExport"
+            >
+              <FileSpreadsheet :size="14" />
+            </button>
+          </TooltipTrigger>
+          <TooltipContent>Export metadata</TooltipContent>
+        </Tooltip>
+
         <Tooltip>
           <TooltipTrigger as-child>
             <button
@@ -360,6 +423,33 @@ watch(
           Collapse series
         </DropdownMenuItem>
       </template>
+      <template v-if="effectiveViewMode === 'table'" #columns>
+        <TableColumnPanel
+          v-if="tableRef"
+          :all-columns="tableRef.allColumns"
+          :all-presets="tableRef.allPresets"
+          :saved-views="allSavedViews"
+          :table-density="tableDensity"
+          @toggle-column="handleToggleColumn"
+          @reorder-columns="handleColumnPanelReorder"
+          @apply-preset="handleApplyTablePreset"
+          @save-preset="handleSaveTablePreset"
+          @delete-preset="handleDeleteTablePreset"
+          @rename-preset="handleRenameTablePreset"
+          @duplicate-preset="handleDuplicateTablePreset"
+          @favorite-preset="handleTogglePresetFavorite"
+          @apply-view="handleApplySavedView"
+          @save-view="handleSaveCurrentView"
+          @delete-view="deleteView"
+          @rename-view="renameView"
+          @duplicate-view="duplicateView"
+          @favorite-view="toggleFavorite"
+          @update:density="handleTableDensityChange"
+          @export-backup="handleExportTableBackup"
+          @import-backup="handleImportTableBackup"
+          @reset="handleResetColumns"
+        />
+      </template>
     </ViewHeader>
 
     <section v-if="mobileControlsExpanded" class="mb-3 rounded-lg border border-border/70 bg-card/70 p-2 sm:hidden">
@@ -376,6 +466,14 @@ watch(
           <Layers :size="13" />
           <span>{{ collapseEnabledRef ? 'Expanded' : 'Collapse series' }}</span>
         </button>
+        <button
+          v-if="hasPermission('library_download') && !isDemoRestrictedAccount"
+          class="flex h-8 items-center gap-1.5 rounded-md border border-input px-2.5 text-sm text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+          @click="openMetadataExport"
+        >
+          <FileSpreadsheet :size="13" />
+          <span>Export</span>
+        </button>
         <button
           v-if="collection"
           class="flex h-8 items-center gap-1.5 rounded-md border border-input px-2.5 text-sm text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
@@ -394,19 +492,35 @@ watch(
       </div>
     </section>
 
-    <main class="flex-1 min-h-0">
-      <EntityNotFound v-if="collectionNotFound" entity="Collection" />
+    <main :class="effectiveViewMode === 'table' ? 'flex-1 min-h-0 flex flex-col overflow-hidden' : 'flex-1 min-h-0 overflow-y-auto'">
+      <div v-if="collectionLoadError" class="flex flex-col items-center justify-center gap-3 py-24 text-center">
+        <div class="flex h-16 w-16 items-center justify-center rounded-full bg-destructive/10 text-destructive">
+          <AlertTriangle :size="28" />
+        </div>
+        <p class="text-sm font-medium text-foreground">Could not load this collection</p>
+        <p class="max-w-md text-xs text-muted-foreground">{{ collectionLoadError }}</p>
+        <button
+          class="rounded-md border border-input px-3 py-2 text-sm text-foreground transition-colors hover:bg-muted"
+          @click="retryCollectionLoad"
+        >
+          Retry
+        </button>
+      </div>
 
-      <div v-else-if="booksInitialized && !loading && books.length === 0" class="flex flex-col items-center justify-center py-24 gap-3 text-center">
+      <EntityNotFound v-else-if="collectionNotFound" entity="Collection" />
+
+      <div v-else-if="booksInitialized && !loading && books.length === 0" class="flex flex-col items-center justify-center gap-3 py-24 text-center">
         <div class="h-16 w-16 rounded-full bg-muted flex items-center justify-center">
           <FolderOpen :size="28" class="text-muted-foreground/70" />
         </div>
-        <p class="text-sm font-medium text-foreground">No books in this collection</p>
-        <p class="text-xs text-muted-foreground">Select books from your library and add them here.</p>
+        <p class="text-sm font-medium text-foreground">{{ debouncedQuery ? 'No books match this search' : 'No books in this collection' }}</p>
+        <p class="text-xs text-muted-foreground">
+          {{ debouncedQuery ? 'Try a different search term or clear the search.' : 'Select books from your library and add them here.' }}
+        </p>
       </div>
 
       <VirtualBookGrid
-        v-if="viewMode === 'grid' && books.length > 0"
+        v-if="effectiveViewMode === 'grid' && books.length > 0"
         :books="books"
         :cover-size="coverSize"
         :grid-gap="gridGap"
@@ -416,7 +530,7 @@ watch(
         @select="handleSelect"
       />
 
-      <div v-if="viewMode === 'list' && books.length > 0" class="flex flex-col divide-y divide-border">
+      <div v-if="effectiveViewMode === 'list' && books.length > 0" class="flex flex-col divide-y divide-border">
         <BookListRow
           v-for="book in books"
           :key="book.id"
@@ -428,7 +542,31 @@ watch(
         />
       </div>
 
-      <div ref="sentinel" class="h-8 mt-4 flex items-center justify-center">
+      <!-- Table view -->
+      <VirtualBookTable
+        v-if="effectiveViewMode === 'table'"
+        ref="tableRef"
+        :books="books"
+        :in-flight="inFlight"
+        :sort="tableSort"
+        :has-more="hasMore"
+        :loading="loading"
+        :total="total"
+        view-type="collection"
+        :selection-mode="selectionMode"
+        :is-selected="isSelected"
+        :selected-count="selectedCount"
+        :initialized="booksInitialized"
+        @update:sort="tableSortModel = $event"
+        @action="handleBookAction"
+        @select="handleSelect"
+        @update:book="handleTableBookUpdate"
+        @load-more="load"
+        @select-all="handleSelectAllLoaded"
+        @enter-selection="enterSelectionMode"
+      />
+
+      <div v-if="effectiveViewMode !== 'table'" ref="sentinel" class="h-8 mt-4 flex items-center justify-center">
         <span v-if="loading" class="text-xs text-muted-foreground">Loading...</span>
         <span v-else-if="!hasMore && books.length > 0" class="text-xs text-muted-foreground">All {{ total.toLocaleString() }} books loaded</span>
       </div>
diff --git a/client/src/views/HomeView.vue b/client/src/views/HomeView.vue
index 99ff1138d..f3efbfc2c 100644
--- a/client/src/views/HomeView.vue
+++ b/client/src/views/HomeView.vue
@@ -1,9 +1,24 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, provide, ref, shallowRef, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { ArrowUpDown, Bookmark, BookmarkCheck, BookOpen, CheckSquare, Filter, Layers, SlidersHorizontal, Square, Telescope, X } from 'lucide-vue-next'
+import {
+  ArrowUpDown,
+  Bookmark,
+  BookmarkCheck,
+  BookOpen,
+  CheckSquare,
+  FileSpreadsheet,
+  Filter,
+  Layers,
+  SlidersHorizontal,
+  Square,
+  Telescope,
+  X,
+} from 'lucide-vue-next'
 import VirtualBookGrid from '@/features/book/components/VirtualBookGrid.vue'
 import BookListRow from '@/features/book/components/BookListRow.vue'
+import VirtualBookTable from '@/features/book/components/VirtualBookTable.vue'
+import TableColumnPanel from '@/features/book/components/TableColumnPanel.vue'
 import BookQuickView from '@/features/book/components/BookQuickView.vue'
 import BookFilterBuilder from '@/features/book/components/BookFilterBuilder.vue'
 import BookSortBuilder from '@/features/book/components/BookSortBuilder.vue'
@@ -13,36 +28,42 @@ import ViewHeader from '@/components/ViewHeader.vue'
 import SelectionActionBar from '@/components/SelectionActionBar.vue'
 import AddToCollectionSheet from '@/features/collection/components/AddToCollectionSheet.vue'
 import BulkUpdateTagsDialog from '@/features/book/components/BulkUpdateTagsDialog.vue'
+import MetadataExportDialog from '@/features/book/components/MetadataExportDialog.vue'
 import SendBookDialog from '@/features/email/components/SendBookDialog.vue'
 import SaveAsSmartScopeDialog from '@/features/smart-scope/components/SaveAsSmartScopeDialog.vue'
 import DeleteBookDialog from '@/features/book/components/DeleteBookDialog.vue'
-import { useBookQuery, type BookCard } from '@/features/book/composables/useBookQuery'
+import { useLibraryBooks, type BookCard } from '@/features/book/composables/useLibraryBooks'
 import { useViewSearch } from '@/features/book/composables/useViewSearch'
 import { useSeriesCollapsePreference } from '@/features/book/composables/useSeriesCollapsePreference'
 
 import { useBookEvents } from '@/features/book/composables/useBookEvents'
-import { useBookSelection } from '@/features/book/composables/useBookSelection'
-import { useDeleteBook } from '@/features/book/composables/useDeleteBook'
-import { useBookBulkActions } from '@/features/book/composables/useBookBulkActions'
 import { useBookNavigation } from '@/features/book/composables/useBookNavigation'
 import { useLiveScanBooks } from '@/features/scanner/composables/useLiveScanBooks'
 import ScanProgressBar from '@/features/scanner/components/ScanProgressBar.vue'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { useDisplaySettings } from '@/composables/useDisplaySettings'
+import { useEffectiveViewMode } from '@/composables/useEffectiveViewMode'
 import { useViewDisplaySettings } from '@/composables/useViewDisplaySettings'
 import { useLibraries } from '@/features/library/composables/useLibraries'
 import { useLibraryUploadEvents } from '@/features/library/composables/useLibraryUploadEvents'
 import { useScanProgress } from '@/features/scanner/composables/useScanProgress'
-import { SORT_FIELD_LABELS } from '@/features/book/lib/filter-labels'
+import { useViewSort } from '@/features/book/composables/useViewSort'
 import { usePageTitle } from '@/composables/usePageTitle'
 import { COVER_ASPECT_RATIO_KEY, DEFAULT_COVER_ASPECT_RATIO } from '@/features/book/lib/cover-aspect-ratio'
-import type { GroupRule, SortSpec } from '@bookorbit/types'
+import { useDisplaySettings } from '@/composables/useDisplaySettings'
+import { usePermissions } from '@/features/auth/composables/usePermissions'
+import { useBookViewContext } from '@/features/book/composables/useBookViewContext'
+import { useBookTableShell } from '@/features/book/composables/useBookTableShell'
+import { useInfiniteScrollSentinel } from '@/features/book/composables/useInfiniteScrollSentinel'
+import { useSavedViews, type SavedView } from '@/features/book/composables/useSavedViews'
+import type { GroupRule, Rule, SortSpec } from '@bookorbit/types'
 import EntityNotFound from '@/components/EntityNotFound.vue'
+import { type QuerySelectionState } from '@/features/book/composables/useBookBulkActions'
 
 const route = useRoute()
 const router = useRouter()
-const { viewMode } = useDisplaySettings()
+const { viewMode, effectiveViewMode } = useEffectiveViewMode()
 const { libraries, loaded: librariesLoaded } = useLibraries()
+const { hasPermission, isDemoRestrictedAccount } = usePermissions()
 
 const libraryId = shallowRef<number | null>(route.params.id ? Number(route.params.id) : null)
 const currentLibrary = computed(() => libraries.value.find((l) => l.id === libraryId.value))
@@ -84,43 +105,128 @@ const {
   hasMore,
   load,
   clear,
-} = useBookQuery(libraryId, collapseEnabledRef, debouncedQuery)
+} = useLibraryBooks(libraryId, collapseEnabledRef, debouncedQuery)
 const { onLibraryUploadCompleted } = useLibraryUploadEvents()
-
-const { setBookContext, registerLoadMore } = useBookNavigation()
-watch(
-  [books, total],
-  ([newBooks, newTotal]) => {
-    setBookContext(
-      newBooks.map((b) => b.id),
-      newTotal,
-    )
-  },
-  { immediate: true },
-)
-onMounted(() => {
-  registerLoadMore(async () => {
-    await load()
-  })
-})
-onUnmounted(() => {
-  registerLoadMore(null)
-})
+const { setBookContext } = useBookNavigation()
+useBookViewContext(books, total, () => load())
 
 const FILTER_STORAGE_PREFIX = 'bookorbit:filter:library:'
 function getFilterKey(id: number) {
   return `${FILTER_STORAGE_PREFIX}${id}`
 }
 
-const SORT_STORAGE_PREFIX = 'bookorbit:sort:library:'
-function getSortKey(id: number) {
-  return `${SORT_STORAGE_PREFIX}${id}`
-}
-
 const savedFilter = ref<GroupRule | undefined>(undefined)
 const hasSavedFilter = computed(() => savedFilter.value !== undefined)
 const isFilterSaved = computed(() => JSON.stringify(filter.value) === JSON.stringify(savedFilter.value))
 
+const { sortModel, isDefaultSort, sortSummary, resetSort } = useViewSort(sort, 'library', libraryId)
+const { tableDensity } = useDisplaySettings()
+const { allSavedViews, saveView, renameView, deleteView, duplicateView, toggleFavorite, importViews } = useSavedViews('library', libraryId)
+
+function handleSaveCurrentView(name: string) {
+  if (!tableRef.value) return
+  saveView({
+    name,
+    layout: tableRef.value.currentLayout,
+    sort: sort.value,
+    filter: filter.value,
+  })
+}
+
+function handleApplySavedView(view: SavedView) {
+  tableRef.value?.applyPreset(view.layout, view.sort)
+  filter.value = view.filter ? JSON.parse(JSON.stringify(view.filter)) : undefined
+}
+
+function handleRenameSavedView(id: string, name: string) {
+  renameView(id, name)
+}
+
+function handleDeleteSavedView(id: string) {
+  deleteView(id)
+}
+
+function handleDuplicateSavedView(id: string) {
+  duplicateView(id)
+}
+
+function handleToggleSavedViewFavorite(id: string) {
+  toggleFavorite(id)
+}
+
+function downloadBackup(filename: string, payload: unknown) {
+  const blob = new Blob([JSON.stringify(payload, null, 2)], { type: 'application/json' })
+  const url = URL.createObjectURL(blob)
+  const anchor = document.createElement('a')
+  anchor.href = url
+  anchor.download = filename
+  anchor.click()
+  URL.revokeObjectURL(url)
+}
+
+function handleExportTableBackup() {
+  downloadBackup(`library-table-backup-${libraryId.value ?? 'shared'}.json`, {
+    version: 1,
+    presets: tableRef.value?.allPresets.filter((preset) => !preset.isBuiltIn) ?? [],
+    savedViews: allSavedViews.value,
+  })
+}
+
+async function handleImportTableBackup(file: File) {
+  const raw = await file.text()
+  const parsed = JSON.parse(raw) as { presets?: unknown[]; savedViews?: unknown[] }
+  const importedPresets = handleImportPresetBackup((parsed.presets ?? []) as never)
+  const importedViews = importViews((parsed.savedViews ?? []) as SavedView[])
+  if (importedPresets === 0 && importedViews === 0) return
+}
+
+function handleQuickFilter(rule: Rule) {
+  filter.value = filter.value
+    ? {
+        type: 'group',
+        join: 'AND',
+        rules: [...filter.value.rules, rule],
+      }
+    : {
+        type: 'group',
+        join: 'AND',
+        rules: [rule],
+      }
+}
+
+function handleTableDensityChange(value: 'compact' | 'comfortable' | 'roomy') {
+  tableDensity.value = value
+}
+
+function handleSelectAllLoaded(checked: boolean) {
+  const ids = books.value.map((book) => book.id)
+  if (checked) {
+    selectAll(ids)
+    if (total.value > books.value.length) {
+      showQuerySelectionBanner.value = true
+    }
+  } else {
+    deselectAll(ids)
+    querySelection.value = null
+    showQuerySelectionBanner.value = false
+  }
+}
+
+function activateQuerySelection() {
+  querySelection.value = {
+    libraryId: libraryId.value ?? undefined,
+    filter: filter.value,
+    q: debouncedQuery.value || undefined,
+    sort: sort.value,
+    total: total.value,
+  }
+  showQuerySelectionBanner.value = false
+}
+
+function dismissQuerySelectionBanner() {
+  showQuerySelectionBanner.value = false
+}
+
 watch(
   libraryId,
   (id) => {
@@ -132,15 +238,11 @@ watch(
         filter.value = saved
       } catch {
         savedFilter.value = undefined
-      }
-      try {
-        const rawSort = localStorage.getItem(getSortKey(id))
-        sort.value = rawSort ? JSON.parse(rawSort) : [{ field: 'title', dir: 'asc' }]
-      } catch {
-        sort.value = [{ field: 'title', dir: 'asc' }]
+        filter.value = undefined
       }
     } else {
       savedFilter.value = undefined
+      filter.value = undefined
     }
   },
   { immediate: true },
@@ -199,29 +301,16 @@ onBookMoved((bookIds) => {
 const filterOpen = ref(false)
 const mobileControlsExpanded = ref(false)
 
-function saveSort() {
-  if (libraryId.value === null) return
-  localStorage.setItem(getSortKey(libraryId.value), JSON.stringify(sort.value))
-}
-
-const isDefaultSort = computed(() => sort.value.length === 1 && sort.value[0]?.field === 'title' && sort.value[0]?.dir === 'asc')
-
-const sortSummary = computed(() => sort.value.map((s) => `${SORT_FIELD_LABELS[s.field]} ${s.dir === 'asc' ? '↑' : '↓'}`).join(', '))
-
-const sortModel = computed({
-  get: () => sort.value,
+const localSortModel = computed({
+  get: () => sortModel.value,
   set: (v: SortSpec[]) => {
-    sort.value = v.length > 0 ? v : [{ field: 'title', dir: 'asc' }]
-    saveSort()
-    load(true)
+    sortModel.value = v
     collapseMobileControlsIfNeeded()
   },
 })
 
-function resetSort() {
-  sort.value = [{ field: 'title', dir: 'asc' }]
-  if (libraryId.value !== null) localStorage.removeItem(getSortKey(libraryId.value))
-  load(true)
+function handleResetSort() {
+  resetSort()
   collapseMobileControlsIfNeeded()
 }
 
@@ -257,31 +346,14 @@ function closeFilterPanel() {
   filterOpen.value = false
 }
 
-const sentinel = ref<HTMLElement | null>(null)
-let observer: IntersectionObserver | null = null
-function checkSentinel() {
-  if (!hasMore.value || loading.value) return
-  const el = sentinel.value
-  if (!el) return
-  if (el.getBoundingClientRect().top < window.innerHeight + 300) load()
-}
+const { sentinel } = useInfiniteScrollSentinel({
+  hasMore,
+  loading,
+  loadMore: () => load(),
+})
 
 onMounted(() => {
   load(true)
-
-  observer = new IntersectionObserver(
-    (entries) => {
-      if (entries[0]?.isIntersecting && !loading.value && hasMore.value) load()
-    },
-    { rootMargin: '300px' },
-  )
-  if (sentinel.value) observer.observe(sentinel.value)
-  window.addEventListener('resize', checkSentinel, { passive: true })
-})
-
-onUnmounted(() => {
-  observer?.disconnect()
-  window.removeEventListener('resize', checkSentinel)
 })
 
 const stopUploadCompletedListener = onLibraryUploadCompleted((event) => {
@@ -301,67 +373,89 @@ watch(libraryId, (newId) => {
 watch(debouncedQuery, () => load(true))
 
 watch(filter, () => load(true), { deep: true })
-watch(
-  loading,
-  (isLoading) => {
-    if (!isLoading) checkSentinel()
-  },
-  { flush: 'post' },
-)
 
-const { selectionMode, selectedIds, selectedCount, enterSelectionMode, exitSelectionMode, toggleBook, rangeSelectTo, isSelected } = useBookSelection()
+const saveAsSmartScopeOpen = ref(false)
+const querySelection = ref<QuerySelectionState | null>(null)
+const showQuerySelectionBanner = ref(false)
+
 const {
-  pendingId: deleteBookId,
-  deleting: deletingBook,
-  promptDelete,
+  tableRef,
+  handleResetColumns,
+  handleToggleColumn,
+  handleColumnPanelReorder,
+  handleApplyTablePreset,
+  handleSaveTablePreset,
+  handleDeleteTablePreset,
+  handleRenameTablePreset,
+  handleDuplicateTablePreset,
+  handleTogglePresetFavorite,
+  handleImportPresetBackup,
+  selectionMode,
+  selectedIds,
+  selectedCount,
+  enterSelectionMode,
+  exitSelectionMode,
+  selectAll,
+  deselectAll,
+  isSelected,
+  handleSelect,
+  toggleSelectionMode,
+  deleteBookId,
+  deletingBook,
   cancelDelete,
   confirmDelete,
-} = useDeleteBook((id) => {
-  books.value = books.value.filter((b) => b.id !== id)
-})
-const {
   inFlight,
   handleBulkRefreshMetadata,
   handleBulkReExtractCover,
-  handleExport,
+  handleDownloadFiles,
   handleBulkSetStatus,
   handleBulkSetRating,
   handleBulkUpdateTags,
+  handleBulkSetField,
   handleBulkSetMetadataLock,
   handleDeleteSelected,
-} = useBookBulkActions(
-  selectedIds,
-  (ids) => {
-    const deleted = new Set(ids)
-    books.value = books.value.filter((b) => !deleted.has(b.id))
-    exitSelectionMode()
-  },
+  addToCollectionOpen,
+  bulkTagsOpen,
+  sendBookOpen,
+  quickViewBookId,
+  quickViewOpen,
+  handleBookAction,
+  handleTableBookUpdate,
+} = useBookTableShell({
   books,
-)
+  loadFn: () => load(true),
+  querySelection,
+})
 
-function handleSelect(id: number, event: MouseEvent) {
-  if (event.shiftKey)
-    rangeSelectTo(
-      id,
-      books.value.map((b) => b.id),
-    )
-  else toggleBook(id)
+const metadataExportOpen = ref(false)
+const metadataExportDefaultScope = ref<'selected' | 'all-matching'>('all-matching')
+
+const metadataExportQuery = computed(() => {
+  if (libraryId.value === null) return undefined
+  return {
+    libraryId: libraryId.value,
+    filter: filter.value,
+    q: debouncedQuery.value || undefined,
+    sort: sort.value,
+  }
+})
+
+const visibleExportColumns = computed(() => {
+  if (!tableRef.value) return []
+  return tableRef.value.allColumns.filter((column) => column.visible).map((column) => column.id)
+})
+
+function openMetadataExport(scope: 'selected' | 'all-matching') {
+  metadataExportDefaultScope.value = scope
+  metadataExportOpen.value = true
 }
 
-function toggleSelectionMode() {
-  if (selectionMode.value) exitSelectionMode()
-  else enterSelectionMode()
-}
-
-const addToCollectionOpen = ref(false)
-const bulkTagsOpen = ref(false)
-const sendBookOpen = ref(false)
-const saveAsSmartScopeOpen = ref(false)
-
-type BookActionType = 'quick-view' | 'edit-metadata' | 'add-to-collection' | 'delete'
-
-const quickViewBookId = ref<number | null>(null)
-const quickViewOpen = ref(false)
+watch(selectionMode, (active) => {
+  if (!active) {
+    querySelection.value = null
+    showQuerySelectionBanner.value = false
+  }
+})
 
 function handleEditSelected() {
   const ids = [...selectedIds.value]
@@ -371,25 +465,6 @@ function handleEditSelected() {
   exitSelectionMode()
 }
 
-function handleBookAction(book: BookCard, action: BookActionType) {
-  if (action === 'quick-view') {
-    quickViewBookId.value = book.id
-    quickViewOpen.value = true
-    return
-  }
-  if (action === 'add-to-collection') {
-    if (!selectionMode.value) {
-      enterSelectionMode()
-      toggleBook(book.id)
-    }
-    addToCollectionOpen.value = true
-    return
-  }
-  if (action === 'delete') {
-    promptDelete(book.id)
-  }
-}
-
 async function handleToggleCollapse() {
   if (libraryId.value === null) return
   const next = !collapseEnabledRef.value
@@ -400,7 +475,7 @@ async function handleToggleCollapse() {
 </script>
 
 <template>
-  <section class="flex min-h-full flex-col">
+  <section class="flex h-full flex-col">
     <ViewHeader
       :title="title"
       :icon="libraryIcon"
@@ -414,7 +489,7 @@ async function handleToggleCollapse() {
       @toggle-selection="toggleSelectionMode"
     >
       <template #toolbar>
-        <div class="hidden sm:flex items-center gap-1">
+        <div v-if="effectiveViewMode !== 'table'" class="hidden sm:flex items-center gap-1">
           <Popover>
             <PopoverTrigger as-child>
               <button
@@ -433,14 +508,14 @@ async function handleToggleCollapse() {
               </button>
             </PopoverTrigger>
             <PopoverContent align="start" class="w-80 p-3">
-              <BookSortBuilder v-model="sortModel" />
+              <BookSortBuilder v-model="localSortModel" />
             </PopoverContent>
           </Popover>
           <Tooltip>
             <TooltipTrigger as-child>
               <button
                 v-if="!isDefaultSort"
-                @click="resetSort"
+                @click="handleResetSort"
                 class="h-8 w-8 flex items-center justify-center rounded-md text-muted-foreground/70 hover:text-destructive hover:bg-destructive/10 transition-colors"
               >
                 <X :size="13" />
@@ -466,6 +541,18 @@ async function handleToggleCollapse() {
           </TooltipTrigger>
           <TooltipContent>{{ collapseEnabledRef ? 'Expand series' : 'Collapse series' }}</TooltipContent>
         </Tooltip>
+        <Tooltip>
+          <TooltipTrigger as-child>
+            <button
+              v-if="hasPermission('library_download') && !isDemoRestrictedAccount"
+              class="hidden sm:flex h-8 w-8 items-center justify-center rounded-md border border-input text-muted-foreground bg-background transition-colors hover:text-foreground hover:bg-muted"
+              @click="openMetadataExport('all-matching')"
+            >
+              <FileSpreadsheet :size="14" />
+            </button>
+          </TooltipTrigger>
+          <TooltipContent>Export metadata</TooltipContent>
+        </Tooltip>
         <button
           @click="toggleFilterPanel"
           class="hidden sm:flex items-center gap-1.5 h-8 px-3 rounded-md border text-sm transition-colors"
@@ -518,6 +605,33 @@ async function handleToggleCollapse() {
           Collapse series
         </DropdownMenuItem>
       </template>
+      <template v-if="effectiveViewMode === 'table'" #columns>
+        <TableColumnPanel
+          v-if="tableRef"
+          :all-columns="tableRef.allColumns"
+          :all-presets="tableRef.allPresets"
+          :saved-views="allSavedViews"
+          :table-density="tableDensity"
+          @toggle-column="handleToggleColumn"
+          @reorder-columns="handleColumnPanelReorder"
+          @apply-preset="handleApplyTablePreset"
+          @save-preset="handleSaveTablePreset"
+          @delete-preset="handleDeleteTablePreset"
+          @rename-preset="handleRenameTablePreset"
+          @duplicate-preset="handleDuplicateTablePreset"
+          @favorite-preset="handleTogglePresetFavorite"
+          @apply-view="handleApplySavedView"
+          @save-view="handleSaveCurrentView"
+          @delete-view="handleDeleteSavedView"
+          @rename-view="handleRenameSavedView"
+          @duplicate-view="handleDuplicateSavedView"
+          @favorite-view="handleToggleSavedViewFavorite"
+          @update:density="handleTableDensityChange"
+          @export-backup="handleExportTableBackup"
+          @import-backup="handleImportTableBackup"
+          @reset="handleResetColumns"
+        />
+      </template>
     </ViewHeader>
 
     <section v-if="mobileControlsExpanded" class="mb-3 space-y-2 rounded-lg border border-border/70 bg-card/70 p-2 sm:hidden">
@@ -538,14 +652,14 @@ async function handleToggleCollapse() {
             </button>
           </PopoverTrigger>
           <PopoverContent align="start" class="w-80 p-3">
-            <BookSortBuilder v-model="sortModel" />
+            <BookSortBuilder v-model="localSortModel" />
           </PopoverContent>
         </Popover>
 
         <button
           v-if="!isDefaultSort"
           class="h-8 w-8 flex items-center justify-center rounded-md text-muted-foreground/70 transition-colors hover:text-destructive hover:bg-destructive/10"
-          @click="resetSort"
+          @click="handleResetSort"
         >
           <X :size="13" />
         </button>
@@ -566,6 +680,15 @@ async function handleToggleCollapse() {
           </span>
         </button>
 
+        <button
+          v-if="hasPermission('library_download') && !isDemoRestrictedAccount"
+          class="flex h-8 items-center gap-1.5 rounded-md border border-input px-2.5 text-sm text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+          @click="openMetadataExport('all-matching')"
+        >
+          <FileSpreadsheet :size="13" />
+          <span>Export</span>
+        </button>
+
         <button
           v-if="activeFilterCount > 0"
           @click="clearFilters"
@@ -576,7 +699,7 @@ async function handleToggleCollapse() {
       </div>
     </section>
 
-    <main class="flex-1 min-h-0">
+    <main :class="effectiveViewMode === 'table' ? 'flex-1 min-h-0 flex flex-col overflow-hidden' : 'flex-1 min-h-0 overflow-y-auto'">
       <EntityNotFound v-if="libraryNotFound" entity="Library" />
 
       <template v-else>
@@ -671,7 +794,7 @@ async function handleToggleCollapse() {
 
         <!-- Grid view -->
         <VirtualBookGrid
-          v-if="viewMode === 'grid' && books.length > 0"
+          v-if="effectiveViewMode === 'grid' && books.length > 0"
           :books="books"
           :cover-size="coverSize"
           :grid-gap="gridGap"
@@ -683,7 +806,7 @@ async function handleToggleCollapse() {
         />
 
         <!-- List view -->
-        <div v-if="viewMode === 'list' && books.length > 0" class="flex flex-col divide-y divide-border">
+        <div v-if="effectiveViewMode === 'list' && books.length > 0" class="flex flex-col divide-y divide-border">
           <BookListRow
             v-for="book in books"
             :key="book.id"
@@ -695,7 +818,33 @@ async function handleToggleCollapse() {
           />
         </div>
 
-        <div ref="sentinel" class="h-8 mt-4 flex items-center justify-center">
+        <!-- Table view -->
+        <VirtualBookTable
+          v-if="effectiveViewMode === 'table'"
+          ref="tableRef"
+          :books="books"
+          :in-flight="inFlight"
+          :sort="sort"
+          :has-more="hasMore"
+          :loading="loading"
+          :total="total"
+          view-type="library"
+          :selection-mode="selectionMode"
+          :is-selected="isSelected"
+          :selected-count="selectedCount"
+          :filter-active="activeFilterCount > 0"
+          :initialized="booksInitialized"
+          @update:sort="localSortModel = $event"
+          @action="handleBookAction"
+          @select="handleSelect"
+          @update:book="handleTableBookUpdate"
+          @load-more="load"
+          @select-all="handleSelectAllLoaded"
+          @enter-selection="enterSelectionMode"
+          @quick-filter="handleQuickFilter"
+        />
+
+        <div v-if="effectiveViewMode !== 'table'" ref="sentinel" class="h-8 mt-4 flex items-center justify-center">
           <span v-if="loading" class="text-xs text-muted-foreground">Loading...</span>
           <span v-else-if="!hasMore && books.length > 0" class="text-xs text-muted-foreground">All {{ total.toLocaleString() }} books loaded</span>
         </div>
@@ -710,12 +859,33 @@ async function handleToggleCollapse() {
     @action="quickViewBookId !== null && handleBookAction({ id: quickViewBookId } as BookCard, $event)"
   />
 
+  <Transition
+    enter-active-class="transition-all duration-200 ease-out"
+    leave-active-class="transition-all duration-150 ease-in"
+    enter-from-class="opacity-0 -translate-y-2"
+    leave-to-class="opacity-0 -translate-y-2"
+  >
+    <div
+      v-if="showQuerySelectionBanner && !querySelection"
+      class="fixed bottom-16 left-1/2 z-40 -translate-x-1/2 flex items-center gap-3 rounded-lg border border-primary/30 bg-background px-4 py-2.5 text-sm shadow-lg"
+    >
+      <span class="text-muted-foreground"> {{ selectedCount.toLocaleString() }} of {{ total.toLocaleString() }} loaded books selected. </span>
+      <button class="font-medium text-primary underline-offset-2 hover:underline" @click="activateQuerySelection">
+        Select all {{ total.toLocaleString() }} matching books
+      </button>
+      <button class="text-muted-foreground hover:text-foreground" @click="dismissQuerySelectionBanner">
+        <X :size="14" />
+      </button>
+    </div>
+  </Transition>
+
   <SelectionActionBar
     :visible="selectionMode"
-    :count="selectedCount"
+    :count="querySelection ? querySelection.total : selectedCount"
     :in-flight="inFlight"
     @send="sendBookOpen = true"
-    @export="handleExport"
+    @download="handleDownloadFiles"
+    @export-metadata="openMetadataExport(querySelection ? 'all-matching' : 'selected')"
     @add-to-collection="addToCollectionOpen = true"
     @edit="handleEditSelected"
     @refresh-metadata="handleBulkRefreshMetadata"
@@ -723,11 +893,25 @@ async function handleToggleCollapse() {
     @set-status="handleBulkSetStatus"
     @set-rating="handleBulkSetRating"
     @edit-tags="bulkTagsOpen = true"
+    @set-field="handleBulkSetField"
     @lock-metadata="handleBulkSetMetadataLock"
     @delete="handleDeleteSelected"
     @exit="exitSelectionMode"
   />
 
+  <MetadataExportDialog
+    :open="metadataExportOpen"
+    view-type="library"
+    :selected-book-ids="[...selectedIds]"
+    :selected-count="selectedCount"
+    :total-count="total"
+    :all-matching-query="metadataExportQuery"
+    :sort="sort"
+    :visible-columns="visibleExportColumns"
+    :default-scope="metadataExportDefaultScope"
+    @update:open="metadataExportOpen = $event"
+  />
+
   <AddToCollectionSheet
     :open="addToCollectionOpen"
     :book-ids="[...selectedIds]"
diff --git a/client/src/views/SmartScopeView.vue b/client/src/views/SmartScopeView.vue
index ecd49e96b..92340f6e9 100644
--- a/client/src/views/SmartScopeView.vue
+++ b/client/src/views/SmartScopeView.vue
@@ -1,66 +1,80 @@
 <script setup lang="ts">
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { Settings2, Trash2, ChevronDown, ChevronUp, ArrowUpDown, Aperture, SlidersHorizontal, X } from 'lucide-vue-next'
+import {
+  AlertTriangle,
+  Settings2,
+  Trash2,
+  ChevronDown,
+  ChevronUp,
+  ArrowUpDown,
+  Aperture,
+  FileSpreadsheet,
+  SlidersHorizontal,
+  X,
+} from 'lucide-vue-next'
 import VirtualBookGrid from '@/features/book/components/VirtualBookGrid.vue'
 import BookListRow from '@/features/book/components/BookListRow.vue'
+import VirtualBookTable from '@/features/book/components/VirtualBookTable.vue'
+import TableColumnPanel from '@/features/book/components/TableColumnPanel.vue'
 import BookQuickView from '@/features/book/components/BookQuickView.vue'
 import ViewHeader from '@/components/ViewHeader.vue'
 import SmartScopeEditorPanel from '@/features/smart-scope/components/SmartScopeEditorPanel.vue'
 import SelectionActionBar from '@/components/SelectionActionBar.vue'
 import AddToCollectionSheet from '@/features/collection/components/AddToCollectionSheet.vue'
 import BulkUpdateTagsDialog from '@/features/book/components/BulkUpdateTagsDialog.vue'
+import MetadataExportDialog from '@/features/book/components/MetadataExportDialog.vue'
 import SendBookDialog from '@/features/email/components/SendBookDialog.vue'
 import DeleteBookDialog from '@/features/book/components/DeleteBookDialog.vue'
 import { toast } from 'vue-sonner'
 import { useSmartScope } from '@/features/smart-scope/composables/useSmartScope'
 import { useSmartScopes } from '@/features/smart-scope/composables/useSmartScopes'
-import { useBookNavigation } from '@/features/book/composables/useBookNavigation'
 import { useDisplaySettings } from '@/composables/useDisplaySettings'
+import { useEffectiveViewMode } from '@/composables/useEffectiveViewMode'
 import { useViewDisplaySettings } from '@/composables/useViewDisplaySettings'
-import { useBookSelection } from '@/features/book/composables/useBookSelection'
-import { useDeleteBook } from '@/features/book/composables/useDeleteBook'
-import { useBookBulkActions } from '@/features/book/composables/useBookBulkActions'
 import { useViewSearch } from '@/features/book/composables/useViewSearch'
 import FilterSummary from '@/features/book/components/FilterSummary.vue'
 import { SORT_FIELD_LABELS } from '@/features/book/lib/filter-labels'
 import { DEFAULT_COVER_ASPECT_RATIO } from '@/features/book/lib/cover-aspect-ratio'
 import { usePageTitle } from '@/composables/usePageTitle'
-import type { BookCard, GroupRule, SortField } from '@bookorbit/types'
+import { useBookNavigation } from '@/features/book/composables/useBookNavigation'
+import { useBookViewContext } from '@/features/book/composables/useBookViewContext'
+import { useBookTableShell } from '@/features/book/composables/useBookTableShell'
+import { useInfiniteScrollSentinel } from '@/features/book/composables/useInfiniteScrollSentinel'
+import { useSavedViews, type SavedView } from '@/features/book/composables/useSavedViews'
+import { usePermissions } from '@/features/auth/composables/usePermissions'
+import type { BookCard, GroupRule, SortField, SortSpec } from '@bookorbit/types'
 import EntityNotFound from '@/components/EntityNotFound.vue'
 
 const route = useRoute()
 const router = useRouter()
-const { viewMode, smartScopeFilterExpanded } = useDisplaySettings()
+const { viewMode, effectiveViewMode } = useEffectiveViewMode()
+const { hasPermission, isDemoRestrictedAccount } = usePermissions()
+const { smartScopeFilterExpanded } = useDisplaySettings()
 
 const smartScopeId = computed(() => Number(route.params.id))
+const tableSort = ref<SortSpec[]>([{ field: 'title', dir: 'asc' }])
 const coverAspectRatio = computed(() => DEFAULT_COVER_ASPECT_RATIO)
 const { coverSize, gridGap } = useViewDisplaySettings('smartScope', smartScopeId, coverAspectRatio)
+const { tableDensity } = useDisplaySettings()
+const { allSavedViews, saveView, renameView, deleteView, duplicateView, toggleFavorite, importViews } = useSavedViews('smartScope', smartScopeId)
 
 const { searchQuery, debouncedQuery, clearSearch } = useViewSearch()
-const { items: books, total, loading, initialized: booksInitialized, hasMore, load } = useSmartScope(smartScopeId, debouncedQuery)
-const { setBookContext, registerLoadMore } = useBookNavigation()
-watch(
-  [books, total],
-  ([newBooks, newTotal]) => {
-    setBookContext(
-      newBooks.map((b) => b.id),
-      newTotal,
-    )
-  },
-  { immediate: true },
-)
-
-onMounted(() => {
-  registerLoadMore(async () => {
-    await load()
-  })
-})
-onUnmounted(() => {
-  registerLoadMore(null)
-})
-const { smartScopes, fetchSmartScopes, deleteSmartScope } = useSmartScopes()
+const {
+  items: books,
+  total,
+  loading,
+  initialized: booksInitialized,
+  error: booksError,
+  hasMore,
+  load,
+  clear,
+} = useSmartScope(smartScopeId, debouncedQuery, tableSort)
+const { setBookContext } = useBookNavigation()
+useBookViewContext(books, total, () => load())
+const { smartScopes, loaded: smartScopesLoaded, error: smartScopesError, fetchSmartScopes, deleteSmartScope } = useSmartScopes()
 const smartScopeNotFound = ref(false)
+const smartScopeLoadError = computed(() => smartScopesError.value ?? booksError.value)
 
 const smartScope = computed(() => smartScopes.value.find((l) => l.id === smartScopeId.value))
 const pageTitle = computed(() => {
@@ -78,58 +92,112 @@ const sortChip = computed(() => {
 const filterExpanded = smartScopeFilterExpanded
 const mobileControlsExpanded = ref(false)
 
-const { selectionMode, selectedIds, selectedCount, enterSelectionMode, exitSelectionMode, toggleBook, rangeSelectTo, isSelected } = useBookSelection()
-
-function handleSelect(id: number, event: MouseEvent) {
-  if (event.shiftKey)
-    rangeSelectTo(
-      id,
-      books.value.map((b) => b.id),
-    )
-  else toggleBook(id)
+function handleSaveCurrentView(name: string) {
+  if (!tableRef.value) return
+  saveView({
+    name,
+    layout: tableRef.value.currentLayout,
+    sort: tableSort.value,
+  })
 }
 
-function toggleSelectionMode() {
-  if (selectionMode.value) exitSelectionMode()
-  else enterSelectionMode()
+function handleApplySavedView(view: SavedView) {
+  tableRef.value?.applyPreset(view.layout, view.sort)
+}
+
+function handleExportTableBackup() {
+  const blob = new Blob(
+    [
+      JSON.stringify(
+        {
+          version: 1,
+          presets: tableRef.value?.allPresets.filter((preset) => !preset.isBuiltIn) ?? [],
+          savedViews: allSavedViews.value,
+        },
+        null,
+        2,
+      ),
+    ],
+    { type: 'application/json' },
+  )
+  const url = URL.createObjectURL(blob)
+  const anchor = document.createElement('a')
+  anchor.href = url
+  anchor.download = `smart-scope-table-backup-${smartScopeId.value ?? 'shared'}.json`
+  anchor.click()
+  URL.revokeObjectURL(url)
+}
+
+async function handleImportTableBackup(file: File) {
+  const raw = await file.text()
+  const parsed = JSON.parse(raw) as { presets?: unknown[]; savedViews?: unknown[] }
+  handleImportPresetBackup((parsed.presets ?? []) as never)
+  importViews((parsed.savedViews ?? []) as SavedView[])
+}
+
+function handleTableDensityChange(value: 'compact' | 'comfortable' | 'roomy') {
+  tableDensity.value = value
+}
+
+function handleSelectAllLoaded(checked: boolean) {
+  const ids = books.value.map((book) => book.id)
+  if (checked) selectAll(ids)
+  else deselectAll(ids)
 }
 
-const addToCollectionOpen = ref(false)
-const bulkTagsOpen = ref(false)
-const sendBookOpen = ref(false)
 const {
-  pendingId: deleteBookId,
-  deleting: deletingBook,
-  promptDelete,
+  tableRef,
+  handleResetColumns,
+  handleToggleColumn,
+  handleColumnPanelReorder,
+  handleApplyTablePreset,
+  handleSaveTablePreset,
+  handleDeleteTablePreset,
+  handleRenameTablePreset,
+  handleDuplicateTablePreset,
+  handleTogglePresetFavorite,
+  handleImportPresetBackup,
+  selectionMode,
+  selectedIds,
+  selectedCount,
+  enterSelectionMode,
+  exitSelectionMode,
+  selectAll,
+  deselectAll,
+  isSelected,
+  handleSelect,
+  toggleSelectionMode,
+  deleteBookId,
+  deletingBook,
   cancelDelete,
   confirmDelete,
-} = useDeleteBook((id) => {
-  books.value = books.value.filter((b) => b.id !== id)
-})
-const {
   inFlight,
   handleBulkRefreshMetadata,
   handleBulkReExtractCover,
-  handleExport,
+  handleDownloadFiles,
   handleBulkSetStatus,
   handleBulkSetRating,
   handleBulkUpdateTags,
+  handleBulkSetField,
   handleBulkSetMetadataLock,
   handleDeleteSelected,
-} = useBookBulkActions(
-  selectedIds,
-  (ids) => {
-    const deleted = new Set(ids)
-    books.value = books.value.filter((b) => !deleted.has(b.id))
-    exitSelectionMode()
-  },
+  addToCollectionOpen,
+  bulkTagsOpen,
+  sendBookOpen,
+  quickViewBookId,
+  quickViewOpen,
+  handleBookAction,
+  handleTableBookUpdate,
+} = useBookTableShell({
   books,
-)
+  loadFn: () => load(true),
+})
 
-type BookActionType = 'quick-view' | 'edit-metadata' | 'add-to-collection' | 'delete'
-
-const quickViewBookId = ref<number | null>(null)
-const quickViewOpen = ref(false)
+const metadataExportOpen = ref(false)
+const visibleExportColumns = computed(() => {
+  if (!tableRef.value) return []
+  return tableRef.value.allColumns.filter((column) => column.visible).map((column) => column.id)
+})
 
 function handleEditSelected() {
   const ids = [...selectedIds.value]
@@ -139,24 +207,13 @@ function handleEditSelected() {
   exitSelectionMode()
 }
 
-function handleBookAction(book: BookCard, action: BookActionType) {
-  if (action === 'quick-view') {
-    quickViewBookId.value = book.id
-    quickViewOpen.value = true
-    return
-  }
-  if (action === 'add-to-collection') {
-    if (!selectionMode.value) {
-      enterSelectionMode()
-      toggleBook(book.id)
-    }
-    addToCollectionOpen.value = true
-    return
-  }
-  if (action === 'delete') {
-    promptDelete(book.id)
-  }
-}
+watch(
+  smartScope,
+  (scope) => {
+    tableSort.value = scope?.defaultSort?.length ? [...scope.defaultSort] : [{ field: 'title', dir: 'asc' }]
+  },
+  { immediate: true },
+)
 
 const editorOpen = ref(false)
 const confirmSmartScopeDelete = ref(false)
@@ -211,53 +268,46 @@ function openEditor() {
   collapseMobileControlsIfNeeded()
 }
 
+function openMetadataExport() {
+  metadataExportOpen.value = true
+  collapseMobileControlsIfNeeded()
+}
+
 function onSaved() {
   load(true)
 }
 
-const sentinel = ref<HTMLElement | null>(null)
-let observer: IntersectionObserver | null = null
-
-function checkSentinel() {
-  if (!hasMore.value || loading.value) return
-  const el = sentinel.value
-  if (!el) return
-  if (el.getBoundingClientRect().top < window.innerHeight + 300) load()
-}
+const { sentinel } = useInfiniteScrollSentinel({
+  hasMore,
+  loading,
+  loadMore: () => load(),
+})
 
 onMounted(async () => {
-  observer = new IntersectionObserver(
-    (entries) => {
-      if (entries[0]?.isIntersecting && !loading.value && hasMore.value) load()
-    },
-    { rootMargin: '300px' },
-  )
-  if (sentinel.value) observer.observe(sentinel.value)
-  window.addEventListener('resize', checkSentinel, { passive: true })
+  await retrySmartScopeLoad()
+})
 
+async function retrySmartScopeLoad() {
+  smartScopeNotFound.value = false
+  clear()
   await fetchSmartScopes()
-  if (!smartScope.value) {
+  if (smartScopesError.value) return
+  if (!smartScope.value && smartScopesLoaded.value) {
     smartScopeNotFound.value = true
     return
   }
-  load(true)
+  if (smartScope.value) {
+    await load(true)
+  }
+}
+
+watch(smartScopeId, async () => {
+  clearSearch()
+  await retrySmartScopeLoad()
 })
-
-onUnmounted(() => {
-  observer?.disconnect()
-  window.removeEventListener('resize', checkSentinel)
+watch(debouncedQuery, () => {
+  if (smartScope.value) void load(true)
 })
-
-watch(smartScopeId, () => clearSearch())
-watch(debouncedQuery, () => load(true))
-
-watch(
-  loading,
-  (isLoading) => {
-    if (!isLoading) checkSentinel()
-  },
-  { flush: 'post' },
-)
 </script>
 
 <template>
@@ -275,7 +325,8 @@ watch(
     :count="selectedCount"
     :in-flight="inFlight"
     @send="sendBookOpen = true"
-    @export="handleExport"
+    @download="handleDownloadFiles"
+    @export-metadata="openMetadataExport"
     @add-to-collection="addToCollectionOpen = true"
     @edit="handleEditSelected"
     @refresh-metadata="handleBulkRefreshMetadata"
@@ -283,11 +334,24 @@ watch(
     @set-status="handleBulkSetStatus"
     @set-rating="handleBulkSetRating"
     @edit-tags="bulkTagsOpen = true"
+    @set-field="handleBulkSetField"
     @lock-metadata="handleBulkSetMetadataLock"
     @delete="handleDeleteSelected"
     @exit="exitSelectionMode"
   />
 
+  <MetadataExportDialog
+    :open="metadataExportOpen"
+    view-type="smartScope"
+    :selected-book-ids="[...selectedIds]"
+    :selected-count="selectedCount"
+    :total-count="total"
+    :sort="tableSort"
+    :visible-columns="visibleExportColumns"
+    default-scope="selected"
+    @update:open="metadataExportOpen = $event"
+  />
+
   <AddToCollectionSheet
     :open="addToCollectionOpen"
     :book-ids="[...selectedIds]"
@@ -299,7 +363,7 @@ watch(
 
   <DeleteBookDialog :open="deleteBookId !== null" :deleting="deletingBook" @confirm="confirmDelete" @cancel="cancelDelete" />
 
-  <section class="flex min-h-full flex-col">
+  <section class="flex h-full flex-col">
     <ViewHeader
       :title="smartScope?.name ?? 'SmartScope'"
       :icon="smartScope?.icon ?? undefined"
@@ -329,6 +393,14 @@ watch(
           <component :is="filterExpanded ? ChevronUp : ChevronDown" :size="13" />
           <span>Filter</span>
         </button>
+        <button
+          v-if="hasPermission('library_download') && !isDemoRestrictedAccount"
+          @click="openMetadataExport"
+          class="hidden md:flex items-center gap-1.5 h-8 px-3 rounded-md border border-input text-sm text-muted-foreground hover:text-foreground hover:bg-muted transition-colors"
+        >
+          <FileSpreadsheet :size="13" />
+          <span>Export</span>
+        </button>
         <button
           @click="openEditor"
           class="hidden md:flex items-center gap-1.5 h-8 px-3 rounded-md border border-input text-sm text-muted-foreground hover:text-foreground hover:bg-muted transition-colors"
@@ -350,6 +422,33 @@ watch(
           <span>{{ confirmSmartScopeDelete ? 'Confirm?' : 'Delete' }}</span>
         </button>
       </template>
+      <template v-if="effectiveViewMode === 'table'" #columns>
+        <TableColumnPanel
+          v-if="tableRef"
+          :all-columns="tableRef.allColumns"
+          :all-presets="tableRef.allPresets"
+          :saved-views="allSavedViews"
+          :table-density="tableDensity"
+          @toggle-column="handleToggleColumn"
+          @reorder-columns="handleColumnPanelReorder"
+          @apply-preset="handleApplyTablePreset"
+          @save-preset="handleSaveTablePreset"
+          @delete-preset="handleDeleteTablePreset"
+          @rename-preset="handleRenameTablePreset"
+          @duplicate-preset="handleDuplicateTablePreset"
+          @favorite-preset="handleTogglePresetFavorite"
+          @apply-view="handleApplySavedView"
+          @save-view="handleSaveCurrentView"
+          @delete-view="deleteView"
+          @rename-view="renameView"
+          @duplicate-view="duplicateView"
+          @favorite-view="toggleFavorite"
+          @update:density="handleTableDensityChange"
+          @export-backup="handleExportTableBackup"
+          @import-backup="handleImportTableBackup"
+          @reset="handleResetColumns"
+        />
+      </template>
     </ViewHeader>
 
     <section v-if="mobileControlsExpanded" class="mb-3 rounded-lg border border-border/70 bg-card/70 p-2 sm:hidden">
@@ -362,6 +461,14 @@ watch(
           <component :is="filterExpanded ? ChevronUp : ChevronDown" :size="13" />
           <span>{{ filterExpanded ? 'Hide Filter' : 'Show Filter' }}</span>
         </button>
+        <button
+          v-if="hasPermission('library_download') && !isDemoRestrictedAccount"
+          @click="openMetadataExport"
+          class="flex h-8 items-center gap-1.5 rounded-md border border-input px-2.5 text-sm text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+        >
+          <FileSpreadsheet :size="13" />
+          <span>Export</span>
+        </button>
         <button
           @click="openEditor"
           class="flex h-8 items-center gap-1.5 rounded-md border border-input px-2.5 text-sm text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
@@ -392,8 +499,22 @@ watch(
       </div>
     </section>
 
-    <main class="flex-1 min-h-0">
-      <EntityNotFound v-if="smartScopeNotFound" entity="SmartScope" />
+    <main :class="effectiveViewMode === 'table' ? 'flex-1 min-h-0 flex flex-col overflow-hidden' : 'flex-1 min-h-0 overflow-y-auto'">
+      <div v-if="smartScopeLoadError" class="flex flex-col items-center justify-center gap-3 py-24 text-center">
+        <div class="flex h-16 w-16 items-center justify-center rounded-full bg-destructive/10 text-destructive">
+          <AlertTriangle :size="28" />
+        </div>
+        <p class="text-sm font-medium text-foreground">Could not load this SmartScope</p>
+        <p class="max-w-md text-xs text-muted-foreground">{{ smartScopeLoadError }}</p>
+        <button
+          class="rounded-md border border-input px-3 py-2 text-sm text-foreground transition-colors hover:bg-muted"
+          @click="retrySmartScopeLoad"
+        >
+          Retry
+        </button>
+      </div>
+
+      <EntityNotFound v-else-if="smartScopeNotFound" entity="SmartScope" />
 
       <template v-else>
         <!-- Filter summary -->
@@ -449,7 +570,7 @@ watch(
 
         <!-- Grid view -->
         <VirtualBookGrid
-          v-if="viewMode === 'grid' && books.length > 0"
+          v-if="effectiveViewMode === 'grid' && books.length > 0"
           :books="books"
           :cover-size="coverSize"
           :grid-gap="gridGap"
@@ -460,7 +581,7 @@ watch(
         />
 
         <!-- List view -->
-        <div v-if="viewMode === 'list' && books.length > 0" class="flex flex-col divide-y divide-border">
+        <div v-if="effectiveViewMode === 'list' && books.length > 0" class="flex flex-col divide-y divide-border">
           <BookListRow
             v-for="book in books"
             :key="book.id"
@@ -472,7 +593,31 @@ watch(
           />
         </div>
 
-        <div ref="sentinel" class="h-8 mt-4 flex items-center justify-center">
+        <!-- Table view -->
+        <VirtualBookTable
+          v-if="effectiveViewMode === 'table'"
+          ref="tableRef"
+          :books="books"
+          :in-flight="inFlight"
+          :sort="tableSort"
+          :has-more="hasMore"
+          :loading="loading"
+          :total="total"
+          view-type="smartScope"
+          :selection-mode="selectionMode"
+          :is-selected="isSelected"
+          :selected-count="selectedCount"
+          :initialized="booksInitialized"
+          @update:sort="tableSort = $event"
+          @action="handleBookAction"
+          @select="handleSelect"
+          @update:book="handleTableBookUpdate"
+          @load-more="load"
+          @select-all="handleSelectAllLoaded"
+          @enter-selection="enterSelectionMode"
+        />
+
+        <div v-if="effectiveViewMode !== 'table'" ref="sentinel" class="h-8 mt-4 flex items-center justify-center">
           <span v-if="loading" class="text-xs text-muted-foreground">Loading...</span>
           <span v-else-if="!hasMore && books.length > 0" class="text-xs text-muted-foreground"> All {{ total.toLocaleString() }} books loaded </span>
         </div>
diff --git a/client/vite.config.ts b/client/vite.config.ts
index ef8564f1c..afa5bff5a 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -9,11 +9,15 @@ import tailwindcss from '@tailwindcss/vite'
 export default defineConfig({
   plugins: [vue(), vueDevTools(), tailwindcss()],
   resolve: {
+    dedupe: ['vue'],
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url)),
       '@bookorbit/types': fileURLToPath(new URL('../packages/types/src/index.ts', import.meta.url)),
     },
   },
+  optimizeDeps: {
+    include: ['@tanstack/vue-table', '@tanstack/vue-virtual'],
+  },
   server: {
     proxy: {
       '/api': 'http://localhost:3000',
diff --git a/packages/types/src/__tests__/table-layout.spec.ts b/packages/types/src/__tests__/table-layout.spec.ts
new file mode 100644
index 000000000..3cd38fdf1
--- /dev/null
+++ b/packages/types/src/__tests__/table-layout.spec.ts
@@ -0,0 +1,146 @@
+import { describe, expect, it } from "vitest";
+
+import { cloneTableLayout, validateTableLayout } from "../table-layout";
+
+describe("validateTableLayout", () => {
+  const knownIds = ["title", "authors", "rating"];
+
+  it("returns null for null input", () => {
+    expect(validateTableLayout(null, knownIds)).toBeNull();
+  });
+
+  it("returns null for non-object input", () => {
+    expect(validateTableLayout("nope", knownIds)).toBeNull();
+  });
+
+  it("returns null when columnOrder is missing", () => {
+    expect(validateTableLayout({ hiddenColumns: [], columnWidths: {} }, knownIds)).toBeNull();
+  });
+
+  it("returns null when hiddenColumns is missing", () => {
+    expect(validateTableLayout({ columnOrder: [], columnWidths: {} }, knownIds)).toBeNull();
+  });
+
+  it("filters unknown column ids from columnOrder", () => {
+    expect(validateTableLayout({ columnOrder: ["unknown", "title"], hiddenColumns: [], columnWidths: {} }, knownIds)?.columnOrder).toEqual([
+      "title",
+      "authors",
+      "rating",
+    ]);
+  });
+
+  it("filters unknown column ids from hiddenColumns", () => {
+    expect(
+      validateTableLayout({ columnOrder: [...knownIds], hiddenColumns: ["unknown", "rating"], columnWidths: {} }, knownIds)?.hiddenColumns,
+    ).toEqual(["rating"]);
+  });
+
+  it("appends missing known ids to columnOrder", () => {
+    expect(validateTableLayout({ columnOrder: ["authors"], hiddenColumns: [], columnWidths: {} }, knownIds)?.columnOrder).toEqual([
+      "authors",
+      "title",
+      "rating",
+    ]);
+  });
+
+  it("validates and includes positive column widths", () => {
+    expect(
+      validateTableLayout({ columnOrder: [...knownIds], hiddenColumns: [], columnWidths: { title: 320, authors: 0, unknown: 100 } }, knownIds)
+        ?.columnWidths,
+    ).toEqual({ title: 320 });
+  });
+
+  it("rejects negative width values", () => {
+    expect(validateTableLayout({ columnOrder: [...knownIds], hiddenColumns: [], columnWidths: { title: -1 } }, knownIds)?.columnWidths).toEqual({});
+  });
+
+  it("validates pinned columns to left/right/null only", () => {
+    expect(
+      validateTableLayout(
+        {
+          columnOrder: [...knownIds],
+          hiddenColumns: [],
+          columnWidths: {},
+          pinnedColumns: { title: "left", authors: null, rating: "right", unknown: "left" },
+        },
+        knownIds,
+      )?.pinnedColumns,
+    ).toEqual({ title: "left", authors: null, rating: "right" });
+  });
+
+  it("returns a valid layout with all known ids in columnOrder", () => {
+    expect(validateTableLayout({ columnOrder: ["title"], hiddenColumns: [], columnWidths: {} }, knownIds)).toEqual({
+      columnOrder: ["title", "authors", "rating"],
+      hiddenColumns: [],
+      columnWidths: {},
+      pinnedColumns: {},
+    });
+  });
+});
+
+describe("cloneTableLayout", () => {
+  it("returns a deep clone", () => {
+    const source = {
+      columnOrder: ["title"],
+      hiddenColumns: ["authors"],
+      columnWidths: { title: 320 },
+      pinnedColumns: { title: "left" as const },
+    };
+
+    const clone = cloneTableLayout(source);
+
+    expect(clone).toEqual(source);
+    expect(clone).not.toBe(source);
+    expect(clone.columnOrder).not.toBe(source.columnOrder);
+    expect(clone.hiddenColumns).not.toBe(source.hiddenColumns);
+    expect(clone.columnWidths).not.toBe(source.columnWidths);
+  });
+
+  it("does not let clone mutations affect the original", () => {
+    const source = {
+      columnOrder: ["title"],
+      hiddenColumns: ["authors"],
+      columnWidths: { title: 320 },
+      pinnedColumns: { title: "left" as const },
+    };
+
+    const clone = cloneTableLayout(source);
+    clone.columnOrder.push("rating");
+    clone.hiddenColumns.push("rating");
+    clone.columnWidths.title = 640;
+    clone.pinnedColumns!.title = "right";
+
+    expect(source).toEqual({
+      columnOrder: ["title"],
+      hiddenColumns: ["authors"],
+      columnWidths: { title: 320 },
+      pinnedColumns: { title: "left" },
+    });
+  });
+
+  it("clones pinnedColumns when present", () => {
+    const source = {
+      columnOrder: ["title"],
+      hiddenColumns: [],
+      columnWidths: {},
+      pinnedColumns: { title: "left" as const },
+    };
+
+    const clone = cloneTableLayout(source);
+
+    expect(clone.pinnedColumns).toEqual({ title: "left" });
+    expect(clone.pinnedColumns).not.toBe(source.pinnedColumns);
+  });
+
+  it("omits pinnedColumns when source does not have them", () => {
+    const source = {
+      columnOrder: ["title"],
+      hiddenColumns: [],
+      columnWidths: {},
+    };
+
+    const clone = cloneTableLayout(source);
+
+    expect("pinnedColumns" in clone).toBe(false);
+  });
+});
diff --git a/packages/types/src/audit.ts b/packages/types/src/audit.ts
index 2ee710d11..3d35ae03d 100644
--- a/packages/types/src/audit.ts
+++ b/packages/types/src/audit.ts
@@ -47,6 +47,7 @@ export enum AuditAction {
   BookBulkCoverReextract = "book.bulk.cover_reextract",
   BookBulkSetStatus = "book.bulk.set_status",
   BookBulkSetRating = "book.bulk.set_rating",
+  BookBulkSetMetadata = "book.bulk.set_metadata",
   BookBulkUpdateTags = "book.bulk.update_tags",
   BookBulkSetMetadataLock = "book.bulk.set_metadata_lock",
 
diff --git a/packages/types/src/book.ts b/packages/types/src/book.ts
index 1c0e5b957..dbd3c727d 100644
--- a/packages/types/src/book.ts
+++ b/packages/types/src/book.ts
@@ -11,7 +11,8 @@ export function isAudioFormat(format: string): boolean {
   return AUDIO_FORMATS.has(format.toLowerCase());
 }
 
-export type ReadStatus = "unread" | "want_to_read" | "reading" | "on_hold" | "rereading" | "read" | "skimmed" | "abandoned";
+export const READ_STATUSES = ["unread", "want_to_read", "reading", "on_hold", "rereading", "read", "skimmed", "abandoned"] as const;
+export type ReadStatus = (typeof READ_STATUSES)[number];
 export type ReadStatusSource = "auto" | "manual";
 
 export type UserBookStatus = {
@@ -26,6 +27,7 @@ export type BookFileRef = {
   id: number;
   format: string | null;
   role: string;
+  sizeBytes: number | null;
 };
 
 export type BookCard = {
@@ -43,8 +45,17 @@ export type BookCard = {
   readingProgress: number | null;
   readStatus: UserBookStatus | null;
   addedAt: string;
+  updatedAt: string | null;
+  metadataScore: number | null;
   hasCover: boolean;
   hasMetadataLocks: boolean;
+  lockedFields: BookMetadataLockField[];
+  subtitle: string | null;
+  publisher: string | null;
+  pageCount: number | null;
+  isbn13: string | null;
+  narrators: string[];
+  tags: string[];
   collapsedSeries?: import("./series-collapse").CollapsedSeriesInfo;
 };
 
diff --git a/packages/types/src/font.ts b/packages/types/src/font.ts
index edf34b9eb..9d97304fe 100644
--- a/packages/types/src/font.ts
+++ b/packages/types/src/font.ts
@@ -1,5 +1,5 @@
-export type FontFormat = 'ttf' | 'otf' | 'woff' | 'woff2';
-export type FontStyle = 'normal' | 'italic';
+export type FontFormat = "ttf" | "otf" | "woff" | "woff2";
+export type FontStyle = "normal" | "italic";
 
 export interface UserFont {
   id: number;
@@ -19,27 +19,27 @@ export interface FontUploadResult {
   suggestedStyle: FontStyle;
 }
 
-export const FONT_FORMATS: readonly FontFormat[] = ['ttf', 'otf', 'woff', 'woff2'];
+export const FONT_FORMATS: readonly FontFormat[] = ["ttf", "otf", "woff", "woff2"];
 
 export const FONT_FORMAT_EXTENSIONS: Record<FontFormat, string> = {
-  ttf: '.ttf',
-  otf: '.otf',
-  woff: '.woff',
-  woff2: '.woff2',
+  ttf: ".ttf",
+  otf: ".otf",
+  woff: ".woff",
+  woff2: ".woff2",
 };
 
 export const FONT_FORMAT_MIME_TYPES: Record<FontFormat, string> = {
-  ttf: 'font/ttf',
-  otf: 'font/otf',
-  woff: 'font/woff',
-  woff2: 'font/woff2',
+  ttf: "font/ttf",
+  otf: "font/otf",
+  woff: "font/woff",
+  woff2: "font/woff2",
 };
 
 export const FONT_FORMAT_CSS_FORMAT: Record<FontFormat, string> = {
-  ttf: 'truetype',
-  otf: 'opentype',
-  woff: 'woff',
-  woff2: 'woff2',
+  ttf: "truetype",
+  otf: "opentype",
+  woff: "woff",
+  woff2: "woff2",
 };
 
 export const MAX_FONT_FILE_SIZE = 10 * 1024 * 1024; // 10 MB
@@ -57,6 +57,10 @@ export function fontCssFamilyName(fontId: number): string {
  * browser pick bold/italic variants automatically.
  */
 export function fontCssFamilyGroupName(familyName: string): string {
-  const safe = familyName.toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/^_+|_+$/g, '') || 'font';
+  const safe =
+    familyName
+      .toLowerCase()
+      .replace(/[^a-z0-9]+/g, "_")
+      .replace(/^_+|_+$/g, "") || "font";
   return `__userfont_${safe}`;
 }
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 5208bba65..2f2d6af09 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -28,6 +28,7 @@ export * from "./user-statistics";
 export * from "./migration";
 export * from "./notification";
 export * from "./series";
+export * from "./table-layout";
 export * from "./series-collapse";
 export * from "./entity-manager";
 export * from "./font";
diff --git a/packages/types/src/query.ts b/packages/types/src/query.ts
index eaee04865..e96a13410 100644
--- a/packages/types/src/query.ts
+++ b/packages/types/src/query.ts
@@ -1,3 +1,18 @@
+/**
+ * Semantic filter field names used in rules.
+ *
+ * Most fields map directly to a DB column. The exceptions:
+ * - `fileAvailability` - derived from `books.status` ('present' | 'missing')
+ * - `readProgress` - aggregated from `reading_progress.percentage` (per-user, per-book-file)
+ * - `readStatus` - stored in `user_book_status.status` (per-user)
+ * - `author` - resolved via `book_authors` join to `authors.name`
+ * - `genre` - resolved via `book_genres` join to `genres.name`
+ * - `tag` - resolved via `book_tags` join to `tags.name`
+ * - `collection` - resolved via `collection_books` join to `collections.name`
+ * - `library` - resolved via `books.library_id` join to `libraries.name`
+ * - `format` - resolved via `book_files.format` (primary file)
+ * - `isbn` - matches both `isbn10` and `isbn13` in `book_metadata`
+ */
 export type RuleField =
   | "title"
   | "publisher"
@@ -16,6 +31,7 @@ export type RuleField =
   | "fileAvailability"
   | "rating"
   | "readProgress"
+  | "readStatus"
   | "description"
   | "isbn"
   | "metadataScore"
@@ -65,6 +81,7 @@ export const FIELD_OPERATORS: Record<RuleField, RuleOperator[]> = {
   fileAvailability: ["isMissing", "isPresent"],
   rating: ["eq", "gt", "gte", "lt", "lte", "isEmpty", "isNotEmpty"],
   readProgress: ["isUnread", "isInProgress", "isFinished"],
+  readStatus: ["includesAny", "excludesAll", "isEmpty", "isNotEmpty"],
   description: ["isEmpty", "isNotEmpty"],
   isbn: ["isEmpty", "isNotEmpty", "eq"],
   metadataScore: ["gt", "gte", "lt", "lte", "between", "isEmpty", "isNotEmpty"],
@@ -114,6 +131,23 @@ export type GroupRule = {
   rules: (Rule | GroupRule)[];
 };
 
+/**
+ * Semantic sort field names used in sort specs.
+ *
+ * Most fields map directly to `book_metadata` columns. The exceptions:
+ * - `author` - sorts by first author's `sort_name` via `book_authors` → `authors` join
+ * - `fileSize` - fetched from `book_files.size_bytes` for the primary file (correlated subquery)
+ * - `readProgress` - aggregated from `reading_progress.percentage` (per-user, correlated subquery)
+ * - `readStatus` - from `user_book_status.status` (per-user, correlated subquery)
+ * - `lastReadAt` - max `reading_progress.updated_at` across all files (per-user, correlated subquery)
+ * - `finishedAt` - from `user_book_status.finished_at` (per-user, correlated subquery)
+ * - `rating` - from `user_book_ratings.rating` (per-user, correlated subquery)
+ * - `format` - from `book_files.format` for the primary file (correlated subquery)
+ * - `random` - day-seeded pseudorandom based on book id and user id
+ *
+ * Fields marked "per-user, correlated subquery" require an authenticated userId and
+ * execute a subquery per result row; they are slower on large result sets.
+ */
 export type SortField =
   | "author"
   | "title"
@@ -127,9 +161,13 @@ export type SortField =
   | "publisher"
   | "fileSize"
   | "readProgress"
+  | "readStatus"
+  | "format"
   | "lastReadAt"
   | "finishedAt"
-  | "random";
+  | "random"
+  | "language"
+  | "metadataScore";
 
 export const SORT_FIELDS: SortField[] = [
   "author",
@@ -144,9 +182,13 @@ export const SORT_FIELDS: SortField[] = [
   "publisher",
   "fileSize",
   "readProgress",
+  "readStatus",
+  "format",
   "lastReadAt",
   "finishedAt",
   "random",
+  "language",
+  "metadataScore",
 ];
 
 export type SortSpec = {
diff --git a/packages/types/src/table-layout.ts b/packages/types/src/table-layout.ts
new file mode 100644
index 000000000..03b30ae06
--- /dev/null
+++ b/packages/types/src/table-layout.ts
@@ -0,0 +1,45 @@
+export type TableViewType = "library" | "smartScope" | "collection" | "series";
+
+export type TableLayoutState = {
+  columnOrder: string[];
+  hiddenColumns: string[];
+  columnWidths: Record<string, number>;
+  pinnedColumns?: Record<string, "left" | "right" | null>;
+};
+
+export function validateTableLayout(raw: unknown, knownIds: string[]): TableLayoutState | null {
+  if (!raw || typeof raw !== "object") return null;
+  const r = raw as Record<string, unknown>;
+  if (!Array.isArray(r.columnOrder) || !Array.isArray(r.hiddenColumns)) return null;
+  const known = new Set(knownIds);
+  const order = (r.columnOrder as unknown[]).filter((id): id is string => typeof id === "string" && known.has(id));
+  const missing = knownIds.filter((id) => !order.includes(id));
+  const hidden = (r.hiddenColumns as unknown[]).filter((id): id is string => typeof id === "string" && known.has(id));
+  const widths: Record<string, number> = {};
+  if (r.columnWidths && typeof r.columnWidths === "object") {
+    for (const [id, w] of Object.entries(r.columnWidths as Record<string, unknown>)) {
+      if (known.has(id) && typeof w === "number" && w > 0) widths[id] = w;
+    }
+  }
+  const pins: Record<string, "left" | "right" | null> = {};
+  if (r.pinnedColumns && typeof r.pinnedColumns === "object") {
+    for (const [id, dir] of Object.entries(r.pinnedColumns as Record<string, unknown>)) {
+      if (known.has(id) && (dir === "left" || dir === "right" || dir === null)) pins[id] = dir as "left" | "right" | null;
+    }
+  }
+  return {
+    columnOrder: [...order, ...missing],
+    hiddenColumns: hidden,
+    columnWidths: widths,
+    pinnedColumns: pins,
+  };
+}
+
+export function cloneTableLayout(layout: TableLayoutState): TableLayoutState {
+  return {
+    columnOrder: [...layout.columnOrder],
+    hiddenColumns: [...layout.hiddenColumns],
+    columnWidths: { ...layout.columnWidths },
+    ...(layout.pinnedColumns ? { pinnedColumns: { ...layout.pinnedColumns } } : {}),
+  };
+}
diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json
index f827b3530..04d1cfc39 100644
--- a/packages/types/tsconfig.json
+++ b/packages/types/tsconfig.json
@@ -11,5 +11,5 @@
     "skipLibCheck": true
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist"]
+  "exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/__tests__/**/*"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 97e139134..5440a5635 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -59,6 +59,12 @@ importers:
       "@tailwindcss/vite":
         specifier: ^4.2.4
         version: 4.2.4(vite@8.0.10(@types/node@25.6.0)(esbuild@0.27.7)(jiti@2.6.1)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.3))
+      "@tanstack/vue-table":
+        specifier: ^8.21.3
+        version: 8.21.3(vue@3.5.33(typescript@5.9.3))
+      "@tanstack/vue-virtual":
+        specifier: ^3.13.24
+        version: 3.13.24(vue@3.5.33(typescript@5.9.3))
       "@types/howler":
         specifier: ^2.2.12
         version: 2.2.12
@@ -3811,12 +3817,28 @@ packages:
     peerDependencies:
       vite: ^5.2.0 || ^6 || ^7 || ^8
 
+  "@tanstack/table-core@8.21.3":
+    resolution:
+      {
+        integrity: sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==,
+      }
+    engines: { node: ">=12" }
+
   "@tanstack/virtual-core@3.14.0":
     resolution:
       {
         integrity: sha512-JLANqGy/D6k4Ujmh8Tr25lGimuOXNiaVyXaCAZS0W+1390sADdGnyUdSWNIfd49gebtIxGMij4IktRVzrdr12Q==,
       }
 
+  "@tanstack/vue-table@8.21.3":
+    resolution:
+      {
+        integrity: sha512-rusRyd77c5tDPloPskctMyPLFEQUeBzxdQ+2Eow4F7gDPlPOB1UnnhzfpdvqZ8ZyX2rRNGmqNnQWm87OI2OQPw==,
+      }
+    engines: { node: ">=12" }
+    peerDependencies:
+      vue: ">=3.2"
+
   "@tanstack/vue-virtual@3.13.24":
     resolution:
       {
@@ -13685,8 +13707,15 @@ snapshots:
       tailwindcss: 4.2.4
       vite: 8.0.10(@types/node@25.6.0)(esbuild@0.27.7)(jiti@2.6.1)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.3)
 
+  "@tanstack/table-core@8.21.3": {}
+
   "@tanstack/virtual-core@3.14.0": {}
 
+  "@tanstack/vue-table@8.21.3(vue@3.5.33(typescript@5.9.3))":
+    dependencies:
+      "@tanstack/table-core": 8.21.3
+      vue: 3.5.33(typescript@5.9.3)
+
   "@tanstack/vue-virtual@3.13.24(vue@3.5.33(typescript@5.9.3))":
     dependencies:
       "@tanstack/virtual-core": 3.14.0
diff --git a/server/src/db/migrations/0000_baseline.sql b/server/src/db/migrations/0000_baseline.sql
index a4d0abd85..e94585dfb 100644
--- a/server/src/db/migrations/0000_baseline.sql
+++ b/server/src/db/migrations/0000_baseline.sql
@@ -1095,6 +1095,7 @@ CREATE INDEX "author_enrichment_queue_next_attempt_idx" ON "author_enrichment_qu
 CREATE UNIQUE INDEX "author_enrichment_queue_single_processing_idx" ON "author_enrichment_queue" USING btree ("status") WHERE "author_enrichment_queue"."status" = 'processing';--> statement-breakpoint
 CREATE INDEX "authors_name_trgm_idx" ON "authors" USING gin ("name" gin_trgm_ops);--> statement-breakpoint
 CREATE INDEX "book_authors_author_id_idx" ON "book_authors" USING btree ("author_id");--> statement-breakpoint
+CREATE INDEX "book_authors_book_display_idx" ON "book_authors" USING btree ("book_id","display_order");--> statement-breakpoint
 CREATE INDEX "book_genres_genre_id_idx" ON "book_genres" USING btree ("genre_id");--> statement-breakpoint
 CREATE INDEX "bm_title_trgm_idx" ON "book_metadata" USING gin ("title" gin_trgm_ops);--> statement-breakpoint
 CREATE INDEX "bm_title_lower_idx" ON "book_metadata" USING btree (lower("title"));--> statement-breakpoint
@@ -1134,8 +1135,10 @@ CREATE INDEX "rs_book_file_started_at_idx" ON "reading_sessions" USING btree ("b
 CREATE INDEX "rs_user_book_file_idx" ON "reading_sessions" USING btree ("user_id","book_file_id");--> statement-breakpoint
 CREATE INDEX "ubr_user_id_idx" ON "user_book_ratings" USING btree ("user_id");--> statement-breakpoint
 CREATE INDEX "ubr_book_id_idx" ON "user_book_ratings" USING btree ("book_id");--> statement-breakpoint
+CREATE INDEX "ubr_book_user_rating_idx" ON "user_book_ratings" USING btree ("book_id","user_id");--> statement-breakpoint
 CREATE INDEX "ubs_user_id_idx" ON "user_book_status" USING btree ("user_id");--> statement-breakpoint
 CREATE INDEX "ubs_user_status_idx" ON "user_book_status" USING btree ("user_id","status");--> statement-breakpoint
+CREATE INDEX "ubs_book_user_idx" ON "user_book_status" USING btree ("book_id","user_id");--> statement-breakpoint
 CREATE INDEX "urds_user_day_idx" ON "user_reading_daily_stats" USING btree ("user_id","day");--> statement-breakpoint
 CREATE UNIQUE INDEX "oidc_group_mappings_provider_claim_uidx" ON "oidc_group_mappings" USING btree ("provider_id","oidc_group_claim");--> statement-breakpoint
 CREATE UNIQUE INDEX "oidc_identities_provider_subject_uidx" ON "oidc_identities" USING btree ("provider_id","oidc_subject");--> statement-breakpoint
diff --git a/server/src/db/migrations/meta/0000_snapshot.json b/server/src/db/migrations/meta/0000_snapshot.json
index fc443ae55..7cf4745d6 100644
--- a/server/src/db/migrations/meta/0000_snapshot.json
+++ b/server/src/db/migrations/meta/0000_snapshot.json
@@ -1,5 +1,5 @@
 {
-  "id": "52d50fa2-4ef0-4f17-be4d-394264347f6f",
+  "id": "a84f4ac7-bd44-40d9-b758-318201d0cc8d",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
@@ -3229,6 +3229,27 @@
           "concurrently": false,
           "method": "btree",
           "with": {}
+        },
+        "book_authors_book_display_idx": {
+          "name": "book_authors_book_display_idx",
+          "columns": [
+            {
+              "expression": "book_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
         }
       },
       "foreignKeys": {
@@ -5346,6 +5367,27 @@
           "concurrently": false,
           "method": "btree",
           "with": {}
+        },
+        "ubr_book_user_rating_idx": {
+          "name": "ubr_book_user_rating_idx",
+          "columns": [
+            {
+              "expression": "book_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
         }
       },
       "foreignKeys": {
@@ -5470,6 +5512,27 @@
           "concurrently": false,
           "method": "btree",
           "with": {}
+        },
+        "ubs_book_user_idx": {
+          "name": "ubs_book_user_idx",
+          "columns": [
+            {
+              "expression": "book_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
         }
       },
       "foreignKeys": {
diff --git a/server/src/db/migrations/meta/_journal.json b/server/src/db/migrations/meta/_journal.json
index f249687c6..2c4fa03a3 100644
--- a/server/src/db/migrations/meta/_journal.json
+++ b/server/src/db/migrations/meta/_journal.json
@@ -5,7 +5,7 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1777434203224,
+      "when": 1778081512901,
       "tag": "0000_baseline",
       "breakpoints": true
     }
diff --git a/server/src/db/schema/metadata.ts b/server/src/db/schema/metadata.ts
index c7540fdab..b7bfc587c 100644
--- a/server/src/db/schema/metadata.ts
+++ b/server/src/db/schema/metadata.ts
@@ -118,7 +118,11 @@ export const bookAuthors = pgTable(
       .references(() => authors.id),
     displayOrder: integer('display_order').notNull().default(0),
   },
-  (t) => [primaryKey({ columns: [t.bookId, t.authorId] }), index('book_authors_author_id_idx').on(t.authorId)],
+  (t) => [
+    primaryKey({ columns: [t.bookId, t.authorId] }),
+    index('book_authors_author_id_idx').on(t.authorId),
+    index('book_authors_book_display_idx').on(t.bookId, t.displayOrder),
+  ],
 );
 
 export const authorEnrichmentQueue = pgTable(
diff --git a/server/src/db/schema/reader.ts b/server/src/db/schema/reader.ts
index d5f961794..385d7c564 100644
--- a/server/src/db/schema/reader.ts
+++ b/server/src/db/schema/reader.ts
@@ -30,6 +30,7 @@ export const userBookStatus = pgTable(
     primaryKey({ columns: [t.userId, t.bookId] }),
     index('ubs_user_id_idx').on(t.userId),
     index('ubs_user_status_idx').on(t.userId, t.status),
+    index('ubs_book_user_idx').on(t.bookId, t.userId),
     check(
       'user_book_status_status_chk',
       sql`${t.status} in ('unread', 'want_to_read', 'reading', 'on_hold', 'rereading', 'read', 'skimmed', 'abandoned')`,
@@ -61,6 +62,7 @@ export const userBookRatings = pgTable(
     primaryKey({ columns: [t.userId, t.bookId] }),
     index('ubr_user_id_idx').on(t.userId),
     index('ubr_book_id_idx').on(t.bookId),
+    index('ubr_book_user_rating_idx').on(t.bookId, t.userId),
     check('user_book_ratings_rating_range_chk', sql`${t.rating} >= 1 and ${t.rating} <= 5`),
   ],
 );
diff --git a/server/src/modules/book-metadata-lock/book-metadata-lock.service.ts b/server/src/modules/book-metadata-lock/book-metadata-lock.service.ts
index 5ce0265d0..36f07631c 100644
--- a/server/src/modules/book-metadata-lock/book-metadata-lock.service.ts
+++ b/server/src/modules/book-metadata-lock/book-metadata-lock.service.ts
@@ -83,6 +83,15 @@ export class BookMetadataLockService {
     return locked;
   }
 
+  async getBookIdsWithLockedField(bookIds: number[], field: BookMetadataLockField): Promise<Set<number>> {
+    const fieldsMap = await this.lockRepo.findLockedFieldsByBookIds(bookIds);
+    const locked = new Set<number>();
+    for (const [bookId, fields] of fieldsMap) {
+      if (fields.includes(field)) locked.add(bookId);
+    }
+    return locked;
+  }
+
   async assertFieldsUnlocked(bookId: number, fields: readonly BookMetadataLockField[]): Promise<void> {
     const lockedFields = await this.getLockedFields(bookId);
     const lockedSet = new Set(lockedFields);
diff --git a/server/src/modules/book/book-query-builder.service.test.ts b/server/src/modules/book/book-query-builder.service.test.ts
index b3f0f8d45..769fe3957 100644
--- a/server/src/modules/book/book-query-builder.service.test.ts
+++ b/server/src/modules/book/book-query-builder.service.test.ts
@@ -30,6 +30,7 @@ import { ilike, sql } from 'drizzle-orm';
 import { FIELD_OPERATORS, type RuleField, type RuleOperator } from '@bookorbit/types';
 
 import { BookQueryBuilder } from './book-query-builder.service';
+import { BookSortBuilder } from './book-sort-builder.service';
 
 function makeBuilder() {
   const sqWhere = vi.fn((whereClause?: unknown) => ({ type: 'subquery', whereClause }));
@@ -38,7 +39,7 @@ function makeBuilder() {
   const db = {
     select: vi.fn().mockReturnValue({ from: sqFrom }),
   };
-  return { builder: new BookQueryBuilder(db as never), db };
+  return { builder: new BookQueryBuilder(db as never, new BookSortBuilder()), db };
 }
 
 function wrapRule(rule: Record<string, unknown>) {
@@ -279,6 +280,36 @@ describe('BookQueryBuilder', () => {
     expect(raw).not.toHaveBeenCalledWith(expect.stringContaining('DROP TABLE'));
   });
 
+  it('builds order clauses for language and metadataScore', () => {
+    const { builder } = makeBuilder();
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+
+    const result = builder.buildOrderBy([
+      { field: 'language', dir: 'asc' },
+      { field: 'metadataScore', dir: 'desc' },
+    ]);
+
+    expect(result).toHaveLength(2);
+    expect(raw).toHaveBeenNthCalledWith(1, 'ASC');
+    expect(raw).toHaveBeenNthCalledWith(2, 'DESC');
+  });
+
+  it('builds readStatus sort with subquery', () => {
+    const { builder } = makeBuilder();
+
+    const result = builder.buildOrderBy([{ field: 'readStatus', dir: 'asc' }], 1);
+
+    expect(result).toHaveLength(1);
+  });
+
+  it('builds format sort with subquery', () => {
+    const { builder } = makeBuilder();
+
+    const result = builder.buildOrderBy([{ field: 'format', dir: 'desc' }]);
+
+    expect(result).toHaveLength(1);
+  });
+
   it('builds one author subquery per includesAll value and uses ilike patterns', () => {
     const { builder, db } = makeBuilder();
 
@@ -304,6 +335,87 @@ describe('BookQueryBuilder', () => {
   });
 });
 
+describe('readStatus filter field', () => {
+  it('includesAny generates exists with inArray', () => {
+    const { builder, db } = makeBuilder();
+
+    const where = builder.buildWhere(
+      wrapRule({ type: 'rule', field: 'readStatus', operator: 'includesAny', value: ['reading', 'read'] }) as never,
+      USER_CTX,
+    ) as any;
+
+    const ruleSql = getRuleSql(where);
+    expect(ruleSql).toMatchObject({ type: 'sql' });
+    expect(db.select).toHaveBeenCalled();
+  });
+
+  it('excludesAll generates not(exists) with inArray', () => {
+    const { builder } = makeBuilder();
+
+    const where = builder.buildWhere(
+      wrapRule({ type: 'rule', field: 'readStatus', operator: 'excludesAll', value: ['abandoned'] }) as never,
+      USER_CTX,
+    ) as any;
+
+    const ruleSql = getRuleSql(where);
+    expect(ruleSql).toMatchObject({ type: 'not' });
+  });
+
+  it('isEmpty generates not(exists)', () => {
+    const { builder } = makeBuilder();
+
+    const where = builder.buildWhere(wrapRule({ type: 'rule', field: 'readStatus', operator: 'isEmpty' }) as never, USER_CTX) as any;
+
+    const ruleSql = getRuleSql(where);
+    expect(ruleSql).toMatchObject({ type: 'not' });
+  });
+
+  it('isNotEmpty generates exists', () => {
+    const { builder } = makeBuilder();
+
+    const where = builder.buildWhere(wrapRule({ type: 'rule', field: 'readStatus', operator: 'isNotEmpty' }) as never, USER_CTX) as any;
+
+    const ruleSql = getRuleSql(where);
+    expect(ruleSql).toMatchObject({ type: 'sql' });
+  });
+
+  it('includesAny with empty array returns always-false', () => {
+    const { builder } = makeBuilder();
+
+    const where = builder.buildWhere(wrapRule({ type: 'rule', field: 'readStatus', operator: 'includesAny', value: [] }) as never, USER_CTX) as any;
+
+    const ruleSql = getRuleSql(where);
+    expect(ruleSql).toMatchObject({ type: 'sql', text: '1 = 0' });
+  });
+
+  it('excludesAll with empty array returns always-true', () => {
+    const { builder } = makeBuilder();
+
+    const where = builder.buildWhere(wrapRule({ type: 'rule', field: 'readStatus', operator: 'excludesAll', value: [] }) as never, USER_CTX) as any;
+
+    const ruleSql = getRuleSql(where);
+    expect(ruleSql).toMatchObject({ type: 'sql', text: '1 = 1' });
+  });
+
+  it('throws when userId is undefined', () => {
+    const { builder } = makeBuilder();
+
+    expect(() =>
+      builder.buildWhere(wrapRule({ type: 'rule', field: 'readStatus', operator: 'includesAny', value: ['read'] }) as never, {
+        accessibleLibraryIds: [1],
+      }),
+    ).toThrow(BadRequestException);
+  });
+
+  it('throws for invalid operator', () => {
+    const { builder } = makeBuilder();
+
+    expect(() => builder.buildWhere(wrapRule({ type: 'rule', field: 'readStatus', operator: 'contains', value: 'read' }) as never, USER_CTX)).toThrow(
+      BadRequestException,
+    );
+  });
+});
+
 describe('field coverage smoke tests', () => {
   it.each(Object.entries(FIELD_OPERATORS) as [RuleField, RuleOperator[]][])(
     'field %s: every valid operator resolves without throwing',
@@ -412,11 +524,11 @@ describe('buildWhere with q', () => {
 describe('textRuleToSql (via title)', () => {
   it.each([
     ['contains', 'Dune', { type: 'ilike', pattern: '%Dune%' }],
-    ['notContains', 'Dune', { type: 'not' }],
+    ['notContains', 'Dune', { type: 'or' }],
     ['startsWith', 'Dune', { type: 'ilike', pattern: 'Dune%' }],
     ['endsWith', 'Dune', { type: 'ilike', pattern: '%Dune' }],
     ['eq', 'Dune', { type: 'ilike', pattern: 'Dune' }],
-    ['notEq', 'Dune', { type: 'not' }],
+    ['notEq', 'Dune', { type: 'or' }],
     ['isEmpty', undefined, { type: 'or' }],
     ['isNotEmpty', undefined, { type: 'and' }],
   ] as const)('operator %s produces the correct SQL shape', (operator, value, expected) => {
@@ -428,18 +540,22 @@ describe('textRuleToSql (via title)', () => {
     expect(getRuleSql(where)).toMatchObject(expected);
   });
 
-  it('notContains wraps an ilike in not()', () => {
+  it('notContains wraps an ilike in or(isNull, not())', () => {
     const { builder } = makeBuilder();
     const where = builder.buildWhere(wrapRule({ type: 'rule', field: 'title', operator: 'notContains', value: 'Dune' }) as never, BASE_CTX) as any;
     const clause = getRuleSql(where);
-    expect(clause).toMatchObject({ type: 'not', value: { type: 'ilike', pattern: '%Dune%' } });
+    expect(clause).toMatchObject({ type: 'or' });
+    expect(clause.clauses[0]).toMatchObject({ type: 'isNull' });
+    expect(clause.clauses[1]).toMatchObject({ type: 'not', value: { type: 'ilike', pattern: '%Dune%' } });
   });
 
-  it('notEq wraps an exact ilike in not()', () => {
+  it('notEq wraps an exact ilike in or(isNull, not())', () => {
     const { builder } = makeBuilder();
     const where = builder.buildWhere(wrapRule({ type: 'rule', field: 'title', operator: 'notEq', value: 'Dune' }) as never, BASE_CTX) as any;
     const clause = getRuleSql(where);
-    expect(clause).toMatchObject({ type: 'not', value: { type: 'ilike', pattern: 'Dune' } });
+    expect(clause).toMatchObject({ type: 'or' });
+    expect(clause.clauses[0]).toMatchObject({ type: 'isNull' });
+    expect(clause.clauses[1]).toMatchObject({ type: 'not', value: { type: 'ilike', pattern: 'Dune' } });
   });
 });
 
@@ -1048,4 +1164,22 @@ describe('BookQueryBuilder.buildCollapseOrderBy', () => {
     const result = BookQueryBuilder.buildCollapseOrderBy([{ field: 'unknownField' as never, dir: 'asc' }], 1);
     expect(result).toBe('sort_title ASC NULLS LAST');
   });
+
+  it('generates readStatus sort using subquery', () => {
+    const result = BookQueryBuilder.buildCollapseOrderBy([{ field: 'readStatus', dir: 'asc' }], 1);
+    expect(result).toContain('user_book_status');
+    expect(result).toContain('ASC NULLS LAST');
+  });
+
+  it('generates format sort using subquery', () => {
+    const result = BookQueryBuilder.buildCollapseOrderBy([{ field: 'format', dir: 'desc' }], 1);
+    expect(result).toContain('book_files');
+    expect(result).toContain('DESC NULLS LAST');
+  });
+
+  it('throws for non-integer userId', () => {
+    expect(() => BookQueryBuilder.buildCollapseOrderBy([{ field: 'readProgress', dir: 'asc' }], 1.5)).toThrow('Invalid userId');
+    expect(() => BookQueryBuilder.buildCollapseOrderBy([{ field: 'readProgress', dir: 'asc' }], NaN)).toThrow('Invalid userId');
+    expect(() => BookQueryBuilder.buildCollapseOrderBy([{ field: 'readProgress', dir: 'asc' }], Infinity)).toThrow('Invalid userId');
+  });
 });
diff --git a/server/src/modules/book/book-query-builder.service.ts b/server/src/modules/book/book-query-builder.service.ts
index 61cce38ad..b2138f8cf 100644
--- a/server/src/modules/book/book-query-builder.service.ts
+++ b/server/src/modules/book/book-query-builder.service.ts
@@ -2,9 +2,10 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { AnyColumn, SQL, and, eq, gt, gte, ilike, inArray, isNotNull, isNull, lt, lte, ne, not, or, sql } from 'drizzle-orm';
 import { NodePgDatabase } from 'drizzle-orm/node-postgres';
 
-import type { GroupRule, Rule, SortField, SortSpec } from '@bookorbit/types';
+import type { GroupRule, ReadStatus, Rule, SortSpec } from '@bookorbit/types';
 import { DB } from '../../db';
 import * as schema from '../../db/schema';
+import { BookSortBuilder } from './book-sort-builder.service';
 import {
   authors,
   bookAuthors,
@@ -18,6 +19,7 @@ import {
   collections,
   readingProgress,
   userBookRatings,
+  userBookStatus,
   genres,
   libraries,
   narrators,
@@ -26,20 +28,12 @@ import {
 
 type Db = NodePgDatabase<typeof schema>;
 
-const SORT_FIELD_MAP: Partial<Record<SortField, AnyColumn>> = {
-  title: bookMetadata.title,
-  series: bookMetadata.seriesName,
-  seriesIndex: bookMetadata.seriesIndex,
-  addedAt: books.addedAt,
-  updatedAt: books.updatedAt,
-  publishedYear: bookMetadata.publishedYear,
-  pageCount: bookMetadata.pageCount,
-  publisher: bookMetadata.publisher,
-};
-
 @Injectable()
 export class BookQueryBuilder {
-  constructor(@Inject(DB) private readonly db: Db) {}
+  constructor(
+    @Inject(DB) private readonly db: Db,
+    private readonly sortBuilder: BookSortBuilder,
+  ) {}
 
   buildWhere(
     filter: GroupRule | null | undefined,
@@ -91,60 +85,7 @@ export class BookQueryBuilder {
   }
 
   buildOrderBy(sort: SortSpec[], userId?: number): SQL[] {
-    if (sort.length === 0) return [sql`${bookMetadata.title} ASC NULLS LAST`];
-    const result: SQL[] = [];
-    for (const { field, dir } of sort) {
-      const D = this.normalizeSortDirection(dir);
-      if (!D) continue;
-      if (field === 'author') {
-        result.push(
-          sql.raw(
-            `(SELECT a.sort_name FROM book_authors ba INNER JOIN authors a ON ba.author_id = a.id WHERE ba.book_id = books.id ORDER BY ba.display_order LIMIT 1) ${D} NULLS LAST`,
-          ),
-        );
-      } else if (field === 'fileSize') {
-        result.push(sql.raw(`(SELECT bf.size_bytes FROM book_files bf WHERE bf.id = books.primary_file_id) ${D} NULLS LAST`));
-      } else if (field === 'readProgress') {
-        if (userId === undefined) throw new BadRequestException('readProgress sort requires an authenticated user');
-        result.push(
-          sql`(SELECT max(rp.percentage) FROM reading_progress rp INNER JOIN book_files bf ON rp.book_file_id = bf.id WHERE bf.book_id = books.id AND rp.user_id = ${userId}) ${sql.raw(D)} NULLS LAST`,
-        );
-      } else if (field === 'lastReadAt') {
-        if (userId === undefined) throw new BadRequestException('lastReadAt sort requires an authenticated user');
-        result.push(
-          sql`(SELECT max(rp.updated_at) FROM reading_progress rp INNER JOIN book_files bf ON rp.book_file_id = bf.id WHERE bf.book_id = books.id AND rp.user_id = ${userId}) ${sql.raw(D)} NULLS LAST`,
-        );
-      } else if (field === 'finishedAt') {
-        if (userId === undefined) throw new BadRequestException('finishedAt sort requires an authenticated user');
-        result.push(
-          sql`(SELECT ubs.finished_at FROM user_book_status ubs WHERE ubs.book_id = books.id AND ubs.user_id = ${userId}) ${sql.raw(D)} NULLS LAST`,
-        );
-      } else if (field === 'rating') {
-        if (userId === undefined) throw new BadRequestException('rating sort requires an authenticated user');
-        result.push(
-          sql`(SELECT ubr.rating FROM user_book_ratings ubr WHERE ubr.book_id = books.id AND ubr.user_id = ${userId}) ${sql.raw(D)} NULLS LAST`,
-        );
-      } else if (field === 'random') {
-        const daySeed = Math.floor(Date.now() / 86_400_000);
-        const scopedSeed = daySeed + (userId ?? 0);
-        result.push(sql`md5(${books.id}::text || ':' || ${scopedSeed}::text) ${sql.raw(D)}`);
-        result.push(sql`${books.id} ${sql.raw(D)}`);
-      } else {
-        const col = SORT_FIELD_MAP[field];
-        if (!col) continue;
-        result.push(sql`${col} ${sql.raw(D)} NULLS LAST`);
-        if (field === 'seriesIndex' && !sort.some((s) => s.field === 'series')) {
-          result.push(sql`${bookMetadata.seriesName} ${sql.raw(D)} NULLS LAST`);
-        }
-      }
-    }
-    return result.length > 0 ? result : [sql`${bookMetadata.title} ASC NULLS LAST`];
-  }
-
-  private normalizeSortDirection(dir: string): 'ASC' | 'DESC' | null {
-    const direction = dir.toUpperCase();
-    if (direction === 'ASC' || direction === 'DESC') return direction;
-    return null;
+    return this.sortBuilder.build(sort, userId);
   }
 
   private groupToSql(node: GroupRule, depth: number, userId?: number): SQL {
@@ -197,6 +138,8 @@ export class BookQueryBuilder {
         return this.statusRuleToSql(operator);
       case 'readProgress':
         return this.readProgressRuleToSql(operator, userId);
+      case 'readStatus':
+        return this.readStatusRuleToSql(operator, value as string[] | undefined, userId);
       case 'description':
         return this.textRuleToSql(bookMetadata.description, operator, value as string);
       case 'isbn':
@@ -219,7 +162,7 @@ export class BookQueryBuilder {
       case 'contains':
         return ilike(col, `%${escapeLikePattern(value!)}%`);
       case 'notContains':
-        return not(ilike(col, `%${escapeLikePattern(value!)}%`));
+        return or(isNull(col), not(ilike(col, `%${escapeLikePattern(value!)}%`)))!;
       case 'startsWith':
         return ilike(col, `${escapeLikePattern(value!)}%`);
       case 'endsWith':
@@ -227,7 +170,7 @@ export class BookQueryBuilder {
       case 'eq':
         return ilike(col, escapeLikePattern(value!));
       case 'notEq':
-        return not(ilike(col, escapeLikePattern(value!)));
+        return or(isNull(col), not(ilike(col, escapeLikePattern(value!))))!;
       case 'isEmpty':
         return or(isNull(col), eq(col, ''))!;
       case 'isNotEmpty':
@@ -485,6 +428,34 @@ export class BookQueryBuilder {
     }
   }
 
+  private readStatusRuleToSql(operator: string, values: string[] | undefined, userId?: number): SQL {
+    if (userId === undefined) throw new BadRequestException('Read status filter requires an authenticated user');
+    const existsStatus = (whereClause?: SQL) => {
+      const predicates: SQL[] = [eq(userBookStatus.bookId, books.id), eq(userBookStatus.userId, userId)];
+      if (whereClause) predicates.push(whereClause);
+      const sq = this.db
+        .select({ one: sql`1` })
+        .from(userBookStatus)
+        .where(and(...predicates)!);
+      return sql`exists (${sq})`;
+    };
+
+    switch (operator) {
+      case 'includesAny':
+        if (!values?.length) return sql`1 = 0`;
+        return existsStatus(inArray(userBookStatus.status, values as ReadStatus[]));
+      case 'excludesAll':
+        if (!values?.length) return sql`1 = 1`;
+        return not(existsStatus(inArray(userBookStatus.status, values as ReadStatus[])));
+      case 'isEmpty':
+        return not(existsStatus());
+      case 'isNotEmpty':
+        return existsStatus();
+      default:
+        throw new BadRequestException(`Invalid operator '${operator}' for readStatus field`);
+    }
+  }
+
   private tagRuleToSql(operator: string, values?: string[]): SQL {
     const existsTag = (whereClause?: SQL) => {
       const predicates: SQL[] = [eq(bookTags.bookId, books.id)];
@@ -590,6 +561,10 @@ export class BookQueryBuilder {
 
   static buildCollapseOrderBy(sort: SortSpec[], userId: number): string {
     if (sort.length === 0) return 'sort_title ASC NULLS LAST';
+
+    if (!Number.isSafeInteger(userId)) throw new BadRequestException('Invalid userId for collapse order');
+    const safeUserId = String(Math.trunc(userId));
+
     const parts: string[] = [];
     for (const { field, dir } of sort) {
       const D = dir.toUpperCase();
@@ -633,16 +608,16 @@ export class BookQueryBuilder {
           break;
         case 'readProgress':
           parts.push(
-            `(SELECT max(rp.percentage) FROM reading_progress rp INNER JOIN book_files bf ON rp.book_file_id = bf.id WHERE bf.book_id = r.id AND rp.user_id = ${userId}) ${D} NULLS LAST`,
+            `(SELECT max(rp.percentage) FROM reading_progress rp INNER JOIN book_files bf ON rp.book_file_id = bf.id WHERE bf.book_id = r.id AND rp.user_id = ${safeUserId}) ${D} NULLS LAST`,
           );
           break;
         case 'lastReadAt':
           parts.push(
-            `(SELECT max(rp.updated_at) FROM reading_progress rp INNER JOIN book_files bf ON rp.book_file_id = bf.id WHERE bf.book_id = r.id AND rp.user_id = ${userId}) ${D} NULLS LAST`,
+            `(SELECT max(rp.updated_at) FROM reading_progress rp INNER JOIN book_files bf ON rp.book_file_id = bf.id WHERE bf.book_id = r.id AND rp.user_id = ${safeUserId}) ${D} NULLS LAST`,
           );
           break;
         case 'finishedAt':
-          parts.push(`(SELECT ubs.finished_at FROM user_book_status ubs WHERE ubs.book_id = r.id AND ubs.user_id = ${userId}) ${D} NULLS LAST`);
+          parts.push(`(SELECT ubs.finished_at FROM user_book_status ubs WHERE ubs.book_id = r.id AND ubs.user_id = ${safeUserId}) ${D} NULLS LAST`);
           break;
         case 'random': {
           const daySeed = Math.floor(Date.now() / 86_400_000);
@@ -651,6 +626,12 @@ export class BookQueryBuilder {
           parts.push(`r.id ${D}`);
           break;
         }
+        case 'readStatus':
+          parts.push(`(SELECT ubs.status FROM user_book_status ubs WHERE ubs.book_id = r.id AND ubs.user_id = ${safeUserId}) ${D} NULLS LAST`);
+          break;
+        case 'format':
+          parts.push(`(SELECT bf.format FROM book_files bf WHERE bf.id = r.primary_file_id) ${D} NULLS LAST`);
+          break;
       }
     }
     return parts.length > 0 ? parts.join(', ') : 'sort_title ASC NULLS LAST';
diff --git a/server/src/modules/book/book-sort-builder.service.test.ts b/server/src/modules/book/book-sort-builder.service.test.ts
new file mode 100644
index 000000000..026b222e0
--- /dev/null
+++ b/server/src/modules/book/book-sort-builder.service.test.ts
@@ -0,0 +1,182 @@
+vi.mock('drizzle-orm', () => {
+  const sqlTag = Object.assign(
+    vi.fn((strings: TemplateStringsArray, ...values: unknown[]) => ({ type: 'sql', text: strings.join(''), values })),
+    {
+      raw: vi.fn((value: string) => ({ type: 'raw', value })),
+    },
+  );
+
+  return {
+    sql: sqlTag,
+  };
+});
+
+import { BadRequestException } from '@nestjs/common';
+import { sql } from 'drizzle-orm';
+
+import { BookSortBuilder } from './book-sort-builder.service';
+
+describe('BookSortBuilder', () => {
+  let service: BookSortBuilder;
+
+  beforeEach(() => {
+    service = new BookSortBuilder();
+    vi.clearAllMocks();
+    vi.useRealTimers();
+  });
+
+  it('returns default title sort when no sorts are provided', () => {
+    const result = service.build([]);
+
+    expect(result).toHaveLength(1);
+    expect(result[0]).toMatchObject({ type: 'sql', text: ' ASC NULLS LAST' });
+  });
+
+  it('builds simple field sorts for title asc and desc', () => {
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+
+    const ascResult = service.build([{ field: 'title', dir: 'asc' }]);
+    const descResult = service.build([{ field: 'title', dir: 'desc' }]);
+
+    expect(ascResult).toHaveLength(1);
+    expect(descResult).toHaveLength(1);
+    expect(raw).toHaveBeenNthCalledWith(1, 'ASC');
+    expect(raw).toHaveBeenNthCalledWith(2, 'DESC');
+  });
+
+  it('builds author sort with a correlated subquery', () => {
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+
+    const result = service.build([{ field: 'author', dir: 'asc' }]);
+
+    expect(result).toHaveLength(1);
+    expect(raw).toHaveBeenCalledWith(expect.stringContaining('SELECT a.sort_name FROM book_authors'));
+  });
+
+  it('builds fileSize sort with a correlated subquery', () => {
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+
+    const result = service.build([{ field: 'fileSize', dir: 'desc' }]);
+
+    expect(result).toHaveLength(1);
+    expect(raw).toHaveBeenCalledWith(expect.stringContaining('SELECT bf.size_bytes FROM book_files'));
+  });
+
+  it('builds format sort with a correlated subquery', () => {
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+
+    const result = service.build([{ field: 'format', dir: 'asc' }]);
+
+    expect(result).toHaveLength(1);
+    expect(raw).toHaveBeenCalledWith(expect.stringContaining('SELECT bf.format FROM book_files'));
+  });
+
+  it('builds random sort with md5 hash expression', () => {
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2025-01-15T00:00:00Z'));
+
+    const result = service.build([{ field: 'random', dir: 'desc' }], 7);
+
+    expect(result).toHaveLength(2);
+    expect(result[0]).toMatchObject({ type: 'sql', text: expect.stringContaining('md5(') });
+    expect(result[0]?.values[1]).toBe(Math.floor(new Date('2025-01-15T00:00:00Z').getTime() / 86_400_000) + 7);
+    expect(raw).toHaveBeenNthCalledWith(1, 'DESC');
+    expect(raw).toHaveBeenNthCalledWith(2, 'DESC');
+  });
+
+  it('throws for readProgress sort without userId', () => {
+    expect(() => service.build([{ field: 'readProgress', dir: 'asc' }])).toThrow(
+      new BadRequestException('readProgress sort requires an authenticated user'),
+    );
+  });
+
+  it('builds readProgress sort with userId', () => {
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+
+    const result = service.build([{ field: 'readProgress', dir: 'asc' }], 42);
+
+    expect(result).toHaveLength(1);
+    expect(result[0]).toMatchObject({ type: 'sql', text: expect.stringContaining('SELECT max(rp.percentage)') });
+    expect(result[0]?.values[0]).toBe(42);
+    expect(raw).toHaveBeenCalledWith('ASC');
+  });
+
+  it('throws for lastReadAt sort without userId', () => {
+    expect(() => service.build([{ field: 'lastReadAt', dir: 'asc' }])).toThrow(
+      new BadRequestException('lastReadAt sort requires an authenticated user'),
+    );
+  });
+
+  it('throws for finishedAt sort without userId', () => {
+    expect(() => service.build([{ field: 'finishedAt', dir: 'asc' }])).toThrow(
+      new BadRequestException('finishedAt sort requires an authenticated user'),
+    );
+  });
+
+  it('throws for rating sort without userId', () => {
+    expect(() => service.build([{ field: 'rating', dir: 'asc' }])).toThrow(new BadRequestException('rating sort requires an authenticated user'));
+  });
+
+  it('throws for readStatus sort without userId', () => {
+    expect(() => service.build([{ field: 'readStatus', dir: 'asc' }])).toThrow(
+      new BadRequestException('readStatus sort requires an authenticated user'),
+    );
+  });
+
+  it('adds series name fallback when sorting by seriesIndex without series sort', () => {
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+
+    const result = service.build([{ field: 'seriesIndex', dir: 'desc' }]);
+
+    expect(result).toHaveLength(2);
+    expect(raw).toHaveBeenNthCalledWith(1, 'DESC');
+    expect(raw).toHaveBeenNthCalledWith(2, 'DESC');
+  });
+
+  it('does not add series name fallback when series is already sorted', () => {
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+
+    const result = service.build([
+      { field: 'series', dir: 'asc' },
+      { field: 'seriesIndex', dir: 'desc' },
+    ]);
+
+    expect(result).toHaveLength(2);
+    expect(raw).toHaveBeenNthCalledWith(1, 'ASC');
+    expect(raw).toHaveBeenNthCalledWith(2, 'DESC');
+  });
+
+  it('adds multiple sorts in the requested order', () => {
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+
+    const result = service.build([
+      { field: 'language', dir: 'asc' },
+      { field: 'metadataScore', dir: 'desc' },
+      { field: 'publisher', dir: 'asc' },
+    ]);
+
+    expect(result).toHaveLength(3);
+    expect(raw).toHaveBeenNthCalledWith(1, 'ASC');
+    expect(raw).toHaveBeenNthCalledWith(2, 'DESC');
+    expect(raw).toHaveBeenNthCalledWith(3, 'ASC');
+  });
+
+  it('skips unknown sort fields silently', () => {
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+
+    const result = service.build([{ field: 'unknown', dir: 'asc' } as never]);
+
+    expect(result).toHaveLength(1);
+    expect(raw).not.toHaveBeenCalled();
+  });
+
+  it('skips invalid sort directions', () => {
+    const raw = (sql as unknown as { raw: vi.Mock }).raw;
+
+    const result = service.build([{ field: 'title', dir: 'asc; DROP TABLE books' } as never]);
+
+    expect(result).toHaveLength(1);
+    expect(raw).not.toHaveBeenCalled();
+  });
+});
diff --git a/server/src/modules/book/book-sort-builder.service.ts b/server/src/modules/book/book-sort-builder.service.ts
new file mode 100644
index 000000000..31bfdd462
--- /dev/null
+++ b/server/src/modules/book/book-sort-builder.service.ts
@@ -0,0 +1,100 @@
+import { BadRequestException, Injectable } from '@nestjs/common';
+import { AnyColumn, SQL, sql } from 'drizzle-orm';
+
+import type { SortField, SortSpec } from '@bookorbit/types';
+import { bookMetadata, books } from '../../db/schema';
+
+const SORT_FIELD_MAP: Partial<Record<SortField, AnyColumn>> = {
+  title: bookMetadata.title,
+  series: bookMetadata.seriesName,
+  seriesIndex: bookMetadata.seriesIndex,
+  addedAt: books.addedAt,
+  updatedAt: books.updatedAt,
+  publishedYear: bookMetadata.publishedYear,
+  pageCount: bookMetadata.pageCount,
+  publisher: bookMetadata.publisher,
+  language: bookMetadata.language,
+  metadataScore: bookMetadata.metadataScore,
+};
+
+@Injectable()
+export class BookSortBuilder {
+  build(sort: SortSpec[], userId?: number): SQL[] {
+    if (sort.length === 0) return [sql`${bookMetadata.title} ASC NULLS LAST`];
+    const result: SQL[] = [];
+    for (const { field, dir } of sort) {
+      const D = this.normalizeDir(dir);
+      if (!D) continue;
+      this.appendField(result, field, D, sort, userId);
+    }
+    return result.length > 0 ? result : [sql`${bookMetadata.title} ASC NULLS LAST`];
+  }
+
+  private normalizeDir(dir: string): 'ASC' | 'DESC' | null {
+    const d = dir.toUpperCase();
+    return d === 'ASC' || d === 'DESC' ? d : null;
+  }
+
+  private appendField(result: SQL[], field: SortField, D: 'ASC' | 'DESC', allSorts: SortSpec[], userId?: number): void {
+    switch (field) {
+      case 'author':
+        result.push(
+          sql.raw(
+            `(SELECT a.sort_name FROM book_authors ba INNER JOIN authors a ON ba.author_id = a.id WHERE ba.book_id = books.id ORDER BY ba.display_order LIMIT 1) ${D} NULLS LAST`,
+          ),
+        );
+        break;
+      case 'fileSize':
+        result.push(sql.raw(`(SELECT bf.size_bytes FROM book_files bf WHERE bf.id = books.primary_file_id) ${D} NULLS LAST`));
+        break;
+      case 'readProgress':
+        if (userId === undefined) throw new BadRequestException('readProgress sort requires an authenticated user');
+        result.push(
+          sql`(SELECT max(rp.percentage) FROM reading_progress rp INNER JOIN book_files bf ON rp.book_file_id = bf.id WHERE bf.book_id = books.id AND rp.user_id = ${userId}) ${sql.raw(D)} NULLS LAST`,
+        );
+        break;
+      case 'lastReadAt':
+        if (userId === undefined) throw new BadRequestException('lastReadAt sort requires an authenticated user');
+        result.push(
+          sql`(SELECT max(rp.updated_at) FROM reading_progress rp INNER JOIN book_files bf ON rp.book_file_id = bf.id WHERE bf.book_id = books.id AND rp.user_id = ${userId}) ${sql.raw(D)} NULLS LAST`,
+        );
+        break;
+      case 'finishedAt':
+        if (userId === undefined) throw new BadRequestException('finishedAt sort requires an authenticated user');
+        result.push(
+          sql`(SELECT ubs.finished_at FROM user_book_status ubs WHERE ubs.book_id = books.id AND ubs.user_id = ${userId}) ${sql.raw(D)} NULLS LAST`,
+        );
+        break;
+      case 'rating':
+        if (userId === undefined) throw new BadRequestException('rating sort requires an authenticated user');
+        result.push(
+          sql`(SELECT ubr.rating FROM user_book_ratings ubr WHERE ubr.book_id = books.id AND ubr.user_id = ${userId}) ${sql.raw(D)} NULLS LAST`,
+        );
+        break;
+      case 'random': {
+        const daySeed = Math.floor(Date.now() / 86_400_000);
+        const scopedSeed = daySeed + (userId ?? 0);
+        result.push(sql`md5(${books.id}::text || ':' || ${scopedSeed}::text) ${sql.raw(D)}`);
+        result.push(sql`${books.id} ${sql.raw(D)}`);
+        break;
+      }
+      case 'readStatus':
+        if (userId === undefined) throw new BadRequestException('readStatus sort requires an authenticated user');
+        result.push(
+          sql`(SELECT ubs.status FROM user_book_status ubs WHERE ubs.book_id = books.id AND ubs.user_id = ${userId}) ${sql.raw(D)} NULLS LAST`,
+        );
+        break;
+      case 'format':
+        result.push(sql.raw(`(SELECT bf.format FROM book_files bf WHERE bf.id = books.primary_file_id) ${D} NULLS LAST`));
+        break;
+      default: {
+        const col = SORT_FIELD_MAP[field];
+        if (!col) return;
+        result.push(sql`${col} ${sql.raw(D)} NULLS LAST`);
+        if (field === 'seriesIndex' && !allSorts.some((s) => s.field === 'series')) {
+          result.push(sql`${bookMetadata.seriesName} ${sql.raw(D)} NULLS LAST`);
+        }
+      }
+    }
+  }
+}
diff --git a/server/src/modules/book/book.controller.test.ts b/server/src/modules/book/book.controller.test.ts
index 687ed6385..739bdf994 100644
--- a/server/src/modules/book/book.controller.test.ts
+++ b/server/src/modules/book/book.controller.test.ts
@@ -119,7 +119,10 @@ function makeController() {
     globalQuery: vi.fn(),
     bulkRefreshMetadata: vi.fn(),
     bulkReExtractCover: vi.fn(),
+    bulkSetMetadata: vi.fn(),
     getExportFiles: vi.fn(),
+    getMetadataExportPreflight: vi.fn(),
+    buildMetadataExport: vi.fn(),
     acquireExportSlot: vi.fn().mockReturnValue(vi.fn()),
     getCoverPath: vi.fn(),
     getThumbnailPath: vi.fn(),
@@ -138,6 +141,7 @@ function makeController() {
     getKoboState: vi.fn(),
     setReadStatus: vi.fn(),
     getDetail: vi.fn(),
+    resolveSelectionToIds: vi.fn().mockImplementation((dto: { bookIds?: number[] }) => Promise.resolve(dto.bookIds ?? [])),
   };
   const fileWriteService = {
     findWriteLog: vi.fn(),
@@ -163,7 +167,7 @@ describe('BookController', () => {
     const { reply } = makeReply();
     bookService.getCoverPath.mockResolvedValue(null);
 
-    await expect(controller.getCover(7, makeUser(), reply, undefined)).rejects.toThrow(NotFoundException);
+    await expect(controller.getCover(7, makeUser(), reply, undefined, undefined)).rejects.toThrow(NotFoundException);
   });
 
   it('delegates embed-all endpoint to service', async () => {
@@ -174,36 +178,60 @@ describe('BookController', () => {
     expect(bookService.embedAll).toHaveBeenCalledTimes(1);
   });
 
-  it('returns 304 when cover etag matches', async () => {
+  it('returns 304 when cover etag matches (unversioned → 1h cache)', async () => {
     const { controller, bookService } = makeController();
     const { reply, headers } = makeReply();
     bookService.getCoverPath.mockResolvedValue('/tmp/cover.jpg');
     mockStat.mockResolvedValue({ mtimeMs: 1234 } as never);
 
-    await controller.getCover(7, makeUser(), reply, '"1234"');
+    await controller.getCover(7, makeUser(), reply, undefined, '"1234"');
 
     expect(reply.status).toHaveBeenCalledWith(304);
-    expect(headers['Cache-Control']).toBe('no-cache');
+    expect(headers['Cache-Control']).toBe('public, max-age=3600');
     expect(headers['ETag']).toBe('"1234"');
     expect(reply.send).toHaveBeenCalled();
     expect(mockCreateReadStream).not.toHaveBeenCalled();
   });
 
-  it('streams cover with computed content type and cache headers', async () => {
+  it('returns 304 with immutable cache when cover etag matches and ?t= present', async () => {
+    const { controller, bookService } = makeController();
+    const { reply, headers } = makeReply();
+    bookService.getCoverPath.mockResolvedValue('/tmp/cover.jpg');
+    mockStat.mockResolvedValue({ mtimeMs: 1234 } as never);
+
+    await controller.getCover(7, makeUser(), reply, '1234567890', '"1234"');
+
+    expect(reply.status).toHaveBeenCalledWith(304);
+    expect(headers['Cache-Control']).toBe('public, max-age=31536000, immutable');
+  });
+
+  it('streams cover with 1h cache when no ?t= param', async () => {
     const { controller, bookService } = makeController();
     const { reply, headers } = makeReply();
     bookService.getCoverPath.mockResolvedValue('/tmp/cover.png');
     mockStat.mockResolvedValue({ mtimeMs: 4321 } as never);
 
-    await controller.getCover(7, makeUser(), reply, undefined);
+    await controller.getCover(7, makeUser(), reply, undefined, undefined);
 
-    expect(headers['Cache-Control']).toBe('no-cache');
+    expect(headers['Cache-Control']).toBe('public, max-age=3600');
     expect(headers['ETag']).toBe('"4321"');
     expect(reply.type).toHaveBeenCalledWith('image/png');
     expect(mockCreateReadStream).toHaveBeenCalledWith('/tmp/cover.png');
     expect(reply.send).toHaveBeenCalled();
   });
 
+  it('streams cover with immutable cache when ?t= param present', async () => {
+    const { controller, bookService } = makeController();
+    const { reply, headers } = makeReply();
+    bookService.getCoverPath.mockResolvedValue('/tmp/cover.jpg');
+    mockStat.mockResolvedValue({ mtimeMs: 4321 } as never);
+
+    await controller.getCover(7, makeUser(), reply, '1234567890', undefined);
+
+    expect(headers['Cache-Control']).toBe('public, max-age=31536000, immutable');
+    expect(reply.type).toHaveBeenCalledWith('image/jpeg');
+  });
+
   it('sets RFC5987 content-disposition filename for downloads', async () => {
     const { controller, bookService } = makeController();
     const { reply, headers } = makeReply();
@@ -281,9 +309,14 @@ describe('BookController', () => {
     const { controller, bookService } = makeController();
     const { reply, raw } = makeReply();
     bookService.bulkRefreshMetadata.mockImplementation(
-      (_bookIds: number[], _user: RequestUser, onProgress: (bookId: number) => void, options?: { isCancelled?: () => boolean }) => {
+      (
+        _bookIds: number[],
+        _user: RequestUser,
+        onProgress: (event: { bookId: number; success: boolean; detail?: unknown; error?: string }) => void,
+        options?: { isCancelled?: () => boolean },
+      ) => {
         expect(options?.isCancelled?.()).toBe(false);
-        onProgress(9);
+        onProgress({ bookId: 9, success: true });
         return Promise.resolve({ processed: 1, failed: 0 });
       },
     );
@@ -295,7 +328,7 @@ describe('BookController', () => {
       'Cache-Control': 'no-cache',
       Connection: 'keep-alive',
     });
-    expect(raw.write).toHaveBeenNthCalledWith(1, `data: ${JSON.stringify({ bookId: 9 })}\n\n`);
+    expect(raw.write).toHaveBeenNthCalledWith(1, `data: ${JSON.stringify({ bookId: 9, success: true })}\n\n`);
     expect(raw.write).toHaveBeenNthCalledWith(2, `data: ${JSON.stringify({ done: true, processed: 1, failed: 0 })}\n\n`);
     expect(raw.end).toHaveBeenCalled();
   });
@@ -303,16 +336,22 @@ describe('BookController', () => {
   it('stops sending SSE done event when client disconnects', async () => {
     const { controller, bookService } = makeController();
     const { reply, raw, emitRawEvent } = makeReply();
-    bookService.bulkRefreshMetadata.mockImplementation((_bookIds: number[], _user: RequestUser, onProgress: (bookId: number) => void) => {
-      onProgress(9);
-      emitRawEvent('close');
-      return Promise.resolve({ processed: 1, failed: 0 });
-    });
+    bookService.bulkRefreshMetadata.mockImplementation(
+      (
+        _bookIds: number[],
+        _user: RequestUser,
+        onProgress: (event: { bookId: number; success: boolean; detail?: unknown; error?: string }) => void,
+      ) => {
+        onProgress({ bookId: 9, success: true });
+        emitRawEvent('close');
+        return Promise.resolve({ processed: 1, failed: 0 });
+      },
+    );
 
     await controller.bulkRefreshMetadata({ bookIds: [9] }, makeUser(), reply);
 
     expect(raw.write).toHaveBeenCalledTimes(1);
-    expect(raw.write).toHaveBeenCalledWith(`data: ${JSON.stringify({ bookId: 9 })}\n\n`);
+    expect(raw.write).toHaveBeenCalledWith(`data: ${JSON.stringify({ bookId: 9, success: true })}\n\n`);
     expect(raw.end).not.toHaveBeenCalled();
   });
 
@@ -407,6 +446,94 @@ describe('BookController', () => {
     await expect(controller.exportBooksDownload('1,-2', 'primary', makeUser(), reply)).rejects.toThrow(BadRequestException);
   });
 
+  it('delegates metadata export preflight to service', async () => {
+    const { controller, bookService } = makeController();
+    const user = makeUser();
+    bookService.getMetadataExportPreflight.mockResolvedValue({
+      schemaVersion: 1,
+      rowCount: 200,
+      estimatedBytes: 120000,
+      sizeCategory: 'small',
+      fileName: 'bookorbit-library-all-matching-2026-05-07.csv',
+      scope: 'all-matching',
+      format: 'csv',
+    });
+
+    const result = await controller.metadataExportPreflight(
+      {
+        query: { libraryId: 5, q: 'dune', sort: [{ field: 'title', dir: 'asc' }] },
+        format: 'csv',
+        viewType: 'library',
+      } as never,
+      user,
+    );
+
+    expect(bookService.getMetadataExportPreflight).toHaveBeenCalledWith(
+      {
+        query: { libraryId: 5, q: 'dune', sort: [{ field: 'title', dir: 'asc' }] },
+        format: 'csv',
+        viewType: 'library',
+      },
+      user,
+    );
+    expect(result).toEqual({
+      schemaVersion: 1,
+      rowCount: 200,
+      estimatedBytes: 120000,
+      sizeCategory: 'small',
+      fileName: 'bookorbit-library-all-matching-2026-05-07.csv',
+      scope: 'all-matching',
+      format: 'csv',
+    });
+  });
+
+  it('streams metadata export content with encoded filename', async () => {
+    const { controller, bookService } = makeController();
+    const { reply, raw } = makeReply();
+    bookService.buildMetadataExport.mockResolvedValue({
+      preflight: {
+        schemaVersion: 1,
+        rowCount: 2,
+        estimatedBytes: 250,
+        sizeCategory: 'small',
+        fileName: 'bookorbit-library-selected-2026-05-07.csv',
+        scope: 'selected',
+        format: 'csv',
+      },
+      fileName: 'bookorbit-library-selected-2026-05-07.csv',
+      contentType: 'text/csv; charset=utf-8',
+      content: '\uFEFFbookId,title\n1,Dune',
+    });
+
+    await controller.downloadMetadataExport(
+      {
+        bookIds: [1, 2],
+        format: 'csv',
+        viewType: 'library',
+      } as never,
+      makeUser(),
+      reply,
+    );
+
+    expect(raw.setHeader).toHaveBeenCalledWith('Content-Type', 'text/csv; charset=utf-8');
+    expect(raw.setHeader).toHaveBeenCalledWith(
+      'Content-Disposition',
+      expect.stringContaining('attachment; filename="bookorbit-library-selected-2026-05-07.csv"'),
+    );
+    expect(reply.send).toHaveBeenCalledWith('\uFEFFbookId,title\n1,Dune');
+  });
+
+  it('releases export slot when metadata export fails', async () => {
+    const { controller, bookService } = makeController();
+    const { reply } = makeReply();
+    const release = vi.fn();
+    bookService.acquireExportSlot.mockReturnValueOnce(release);
+    bookService.buildMetadataExport.mockRejectedValueOnce(new Error('boom'));
+
+    await expect(controller.downloadMetadataExport({ bookIds: [1], format: 'json' } as never, makeUser(), reply)).rejects.toThrow('boom');
+    expect(release).toHaveBeenCalledTimes(1);
+  });
+
   it('aborts archive export and swallows finalize errors after client disconnect', async () => {
     const { controller, bookService } = makeController();
     const { reply, emitRawEvent } = makeReply();
@@ -455,28 +582,40 @@ describe('BookController', () => {
     expect(result).toEqual({ entries: [{ id: 1 }] });
   });
 
-  it('handles thumbnail 304 and streaming responses', async () => {
+  it('handles thumbnail 304 (unversioned) and streaming responses', async () => {
     const { controller, bookService } = makeController();
     const first = makeReply();
     const second = makeReply();
     bookService.getThumbnailPath.mockResolvedValue('/tmp/thumb.jpg');
     mockStat.mockResolvedValue({ mtimeMs: 1000 } as never);
 
-    await controller.getThumbnail(7, makeUser(), first.reply, '"1000"');
+    await controller.getThumbnail(7, makeUser(), first.reply, undefined, '"1000"');
     expect(first.reply.status).toHaveBeenCalledWith(304);
     expect(first.headers['ETag']).toBe('"1000"');
+    expect(first.headers['Cache-Control']).toBe('public, max-age=3600');
 
-    await controller.getThumbnail(7, makeUser(), second.reply, undefined);
+    await controller.getThumbnail(7, makeUser(), second.reply, undefined, undefined);
     expect(second.reply.type).toHaveBeenCalledWith('image/jpeg');
+    expect(second.headers['Cache-Control']).toBe('public, max-age=3600');
     expect(mockCreateReadStream).toHaveBeenCalledWith('/tmp/thumb.jpg');
   });
 
+  it('uses immutable cache for thumbnail when ?t= param present', async () => {
+    const { controller, bookService } = makeController();
+    const { reply, headers } = makeReply();
+    bookService.getThumbnailPath.mockResolvedValue('/tmp/thumb.jpg');
+    mockStat.mockResolvedValue({ mtimeMs: 1000 } as never);
+
+    await controller.getThumbnail(7, makeUser(), reply, '1234567890', undefined);
+    expect(headers['Cache-Control']).toBe('public, max-age=31536000, immutable');
+  });
+
   it('throws NotFoundException when thumbnail is missing', async () => {
     const { controller, bookService } = makeController();
     const { reply } = makeReply();
     bookService.getThumbnailPath.mockResolvedValue(null);
 
-    await expect(controller.getThumbnail(7, makeUser(), reply, undefined)).rejects.toThrow(NotFoundException);
+    await expect(controller.getThumbnail(7, makeUser(), reply, undefined, undefined)).rejects.toThrow(NotFoundException);
   });
 
   it('delegates re-extract-cover endpoint to bulk cover flow', async () => {
@@ -529,6 +668,7 @@ describe('BookController', () => {
     bookService.getDetail.mockResolvedValue({ id: 7, title: 'Detail' });
 
     await controller.updateMetadata(7, { title: 'New' } as never, user);
+    await controller.bulkSetMetadata({ bookIds: [7, 8], field: 'language', value: 'fr' } as never, user);
     await controller.updateMetadataLocks(7, { lockedFields: ['title'] } as never, user);
     await controller.refreshMetadata(7, 'true', user);
     await controller.getMetadataFromFile(7, user);
@@ -538,6 +678,7 @@ describe('BookController', () => {
     await controller.getDetail(7, user);
 
     expect(bookService.updateMetadata).toHaveBeenCalledWith(7, { title: 'New' }, user);
+    expect(bookService.bulkSetMetadata).toHaveBeenCalledWith([7, 8], 'language', 'fr', user);
     expect(bookService.updateMetadataLocks).toHaveBeenCalledWith(7, ['title'], user);
     expect(bookService.refreshMetadata).toHaveBeenCalledWith(7, true, user);
     expect(bookService.getMetadataFromFile).toHaveBeenCalledWith(7, user);
@@ -567,6 +708,9 @@ describe('BookController', () => {
     const bulkCoverAudit = Reflect.getMetadata(AUDITABLE_KEY, BookController.prototype.bulkReExtractCover) as {
       description: (req: { body: { bookIds?: number[] } }) => string;
     };
+    const bulkSetMetadataAudit = Reflect.getMetadata(AUDITABLE_KEY, BookController.prototype.bulkSetMetadata) as {
+      description: (req: { body: { bookIds?: number[]; field?: string } }) => string;
+    };
     const updateMetadataAudit = Reflect.getMetadata(AUDITABLE_KEY, BookController.prototype.updateMetadata) as {
       getResourceId: (req: { params: Record<string, string> }) => number;
       description: (req: { params: Record<string, string> }) => string;
@@ -583,6 +727,7 @@ describe('BookController', () => {
     expect(deleteAudit.description({ body: { bookIds: [1, 2] } })).toBe('Deleted 2 books');
     expect(bulkRefreshAudit.description({ body: { bookIds: [1] } })).toBe('Bulk refreshed metadata for 1 book');
     expect(bulkCoverAudit.description({ body: { bookIds: [1, 2, 3] } })).toBe('Bulk re-extracted covers for 3 books');
+    expect(bulkSetMetadataAudit.description({ body: { bookIds: [1, 2], field: 'language' } })).toBe('Bulk set language for 2 books');
     expect(updateMetadataAudit.getResourceId({ params: { id: '44' } })).toBe(44);
     expect(updateMetadataAudit.description({ params: { id: '44' } })).toBe('Updated metadata for book #44');
     expect(updateLocksAudit.getResourceId({ params: { id: '44' } })).toBe(44);
@@ -598,6 +743,7 @@ describe('BookController', () => {
       BookController.prototype.bulkReExtractCover,
       BookController.prototype.bulkSetStatus,
       BookController.prototype.bulkSetRating,
+      BookController.prototype.bulkSetMetadata,
       BookController.prototype.bulkUpdateTags,
       BookController.prototype.bulkSetMetadataLock,
     ];
diff --git a/server/src/modules/book/book.controller.ts b/server/src/modules/book/book.controller.ts
index f42e4aa90..a86fc2b12 100644
--- a/server/src/modules/book/book.controller.ts
+++ b/server/src/modules/book/book.controller.ts
@@ -33,10 +33,12 @@ import { BookQueryPipe } from './pipes/book-query.pipe';
 import { BulkBookIdsDto } from './dto/bulk-book-ids.dto';
 import { BulkSetStatusDto } from './dto/bulk-set-status.dto';
 import { BulkSetRatingDto } from './dto/bulk-set-rating.dto';
+import { BulkSetMetadataDto } from './dto/bulk-set-metadata.dto';
 import { BulkUpdateTagsDto } from './dto/bulk-update-tags.dto';
 import { BulkSetMetadataLockDto } from './dto/bulk-set-metadata-lock.dto';
 import { DeleteBooksDto } from './dto/delete-books.dto';
 import { ExportBooksDto } from './dto/export-books.dto';
+import { MetadataExportDto } from './dto/metadata-export.dto';
 import { SaveProgressDto } from './dto/save-progress.dto';
 import { UpsertAudioProgressDto } from './dto/upsert-audio-progress.dto';
 import { UpdateBookMetadataDto } from './dto/update-book-metadata.dto';
@@ -130,8 +132,9 @@ export class BookController {
       return `Deleted ${count} book${count !== 1 ? 's' : ''}`;
     },
   })
-  deleteBooks(@Body() dto: DeleteBooksDto, @CurrentUser() user: RequestUser) {
-    return this.bookService.deleteBooks(dto.bookIds, user);
+  async deleteBooks(@Body() dto: DeleteBooksDto, @CurrentUser() user: RequestUser) {
+    const ids = await this.bookService.resolveSelectionToIds(dto, user);
+    return this.bookService.deleteBooks(ids, user);
   }
 
   // Must be before @Get(':id') so NestJS does not treat 'search' as an :id param
@@ -157,13 +160,14 @@ export class BookController {
     },
   })
   async bulkRefreshMetadata(@Body() dto: BulkBookIdsDto, @CurrentUser() user: RequestUser, @Res() reply: FastifyReply) {
+    const ids = await this.bookService.resolveSelectionToIds(dto, user);
     const stream = this.createSseStream(reply);
     try {
       const result = await this.bookService.bulkRefreshMetadata(
-        dto.bookIds,
+        ids,
         user,
-        (bookId) => {
-          stream.send({ bookId });
+        (event) => {
+          stream.send(event);
         },
         { isCancelled: stream.isClosed },
       );
@@ -187,10 +191,11 @@ export class BookController {
     },
   })
   async bulkReExtractCover(@Body() dto: BulkBookIdsDto, @CurrentUser() user: RequestUser, @Res() reply: FastifyReply) {
+    const ids = await this.bookService.resolveSelectionToIds(dto, user);
     const stream = this.createSseStream(reply);
     try {
       const result = await this.bookService.bulkReExtractCover(
-        dto.bookIds,
+        ids,
         user,
         (bookId) => {
           stream.send({ bookId });
@@ -233,6 +238,46 @@ export class BookController {
     await this.streamBookExport(bookIds, scope, user, reply);
   }
 
+  @Post('metadata-export/preflight')
+  @RequirePermission(Permission.LibraryDownload)
+  @ForbidPermission(Permission.DemoRestricted, 'Demo-restricted account cannot perform bulk downloads')
+  metadataExportPreflight(@Body() dto: MetadataExportDto, @CurrentUser() user: RequestUser) {
+    return this.bookService.getMetadataExportPreflight(dto, user);
+  }
+
+  @Post('metadata-export/download')
+  @RequirePermission(Permission.LibraryDownload)
+  @ForbidPermission(Permission.DemoRestricted, 'Demo-restricted account cannot perform bulk downloads')
+  async downloadMetadataExport(@Body() dto: MetadataExportDto, @CurrentUser() user: RequestUser, @Res() reply: FastifyReply) {
+    const event = 'book.export_metadata';
+    const startedAt = Date.now();
+    this.logger.log(`[${event}] [start] userId=${user.id} format=${dto.format} scope=${dto.query ? 'all-matching' : 'selected'} - export started`);
+    const releaseExportSlot = this.bookService.acquireExportSlot(user.id);
+    try {
+      const exported = await this.bookService.buildMetadataExport(dto, user);
+      const asciiFilename = exported.fileName.replace(/[^\x20-\x7E]|["\\]/g, '_') || 'book-metadata-export';
+      const encodedFilename = encodeFilenameStar(exported.fileName);
+      const disposition = `attachment; filename="${asciiFilename}"`;
+
+      reply.raw.setHeader('Content-Type', exported.contentType);
+      reply.raw.setHeader('Content-Disposition', encodedFilename ? `${disposition}; filename*=UTF-8''${encodedFilename}` : disposition);
+      reply.send(exported.content);
+
+      this.logger.log(
+        `[${event}] [end] userId=${user.id} format=${dto.format} scope=${exported.preflight.scope} rows=${exported.preflight.rowCount} durationMs=${Date.now() - startedAt} - export completed`,
+      );
+    } catch (err) {
+      const errorClass = err instanceof Error ? err.name : 'Error';
+      const errorMessage = (err instanceof Error ? err.message : String(err)).replace(/"/g, '\\"');
+      this.logger.warn(
+        `[${event}] [fail] userId=${user.id} format=${dto.format} durationMs=${Date.now() - startedAt} errorClass=${errorClass} error="${errorMessage}" - export failed`,
+      );
+      throw err;
+    } finally {
+      releaseExportSlot();
+    }
+  }
+
   private async streamBookExport(bookIds: number[], scope: 'primary' | 'all' | 'audio', user: RequestUser, reply: FastifyReply) {
     const event = 'book.export_books';
     const startedAt = Date.now();
@@ -297,6 +342,7 @@ export class BookController {
     @Param('id', ParseIntPipe) id: number,
     @CurrentUser() user: RequestUser,
     @Res() reply: FastifyReply,
+    @Query('t') t?: string,
     @Headers('if-none-match') ifNoneMatch?: string,
   ) {
     const coverPath = await this.bookService.getCoverPath(id, user);
@@ -304,13 +350,15 @@ export class BookController {
 
     const { mtimeMs } = await stat(coverPath);
     const etag = `"${Math.floor(mtimeMs)}"`;
+    const cacheControl = t ? 'public, max-age=31536000, immutable' : 'public, max-age=3600';
+
     if (ifNoneMatch === etag) {
-      reply.status(304).header('Cache-Control', 'no-cache').header('ETag', etag).send();
+      reply.status(304).header('Cache-Control', cacheControl).header('ETag', etag).send();
       return;
     }
 
     const contentType = imageContentTypeFromPath(coverPath);
-    reply.header('Cache-Control', 'no-cache');
+    reply.header('Cache-Control', cacheControl);
     reply.header('ETag', etag);
     reply.type(contentType);
     reply.send(createReadStream(coverPath));
@@ -322,6 +370,7 @@ export class BookController {
     @Param('id', ParseIntPipe) id: number,
     @CurrentUser() user: RequestUser,
     @Res() reply: FastifyReply,
+    @Query('t') t?: string,
     @Headers('if-none-match') ifNoneMatch?: string,
   ) {
     const thumbnailPath = await this.bookService.getThumbnailPath(id, user);
@@ -329,12 +378,14 @@ export class BookController {
 
     const { mtimeMs } = await stat(thumbnailPath);
     const etag = `"${Math.floor(mtimeMs)}"`;
+    const cacheControl = t ? 'public, max-age=31536000, immutable' : 'public, max-age=3600';
+
     if (ifNoneMatch === etag) {
-      reply.status(304).header('Cache-Control', 'no-cache').header('ETag', etag).send();
+      reply.status(304).header('Cache-Control', cacheControl).header('ETag', etag).send();
       return;
     }
 
-    reply.header('Cache-Control', 'no-cache');
+    reply.header('Cache-Control', cacheControl);
     reply.header('ETag', etag);
     reply.type('image/jpeg');
     reply.send(createReadStream(thumbnailPath));
@@ -516,8 +567,9 @@ export class BookController {
       return `Bulk set status to ${body?.status ?? 'unknown'} for ${count} book${count !== 1 ? 's' : ''}`;
     },
   })
-  bulkSetStatus(@Body() dto: BulkSetStatusDto, @CurrentUser() user: RequestUser) {
-    return this.bookService.bulkSetStatus(dto.bookIds, dto.status, user);
+  async bulkSetStatus(@Body() dto: BulkSetStatusDto, @CurrentUser() user: RequestUser) {
+    const ids = await this.bookService.resolveSelectionToIds(dto, user);
+    return this.bookService.bulkSetStatus(ids, dto.status, user);
   }
 
   @Post('bulk-set-rating')
@@ -533,8 +585,27 @@ export class BookController {
       return `Bulk set rating to ${body?.rating ?? 'null'} for ${count} book${count !== 1 ? 's' : ''}`;
     },
   })
-  bulkSetRating(@Body() dto: BulkSetRatingDto, @CurrentUser() user: RequestUser) {
-    return this.bookService.bulkSetRating(dto.bookIds, dto.rating ?? null, user);
+  async bulkSetRating(@Body() dto: BulkSetRatingDto, @CurrentUser() user: RequestUser) {
+    const ids = await this.bookService.resolveSelectionToIds(dto, user);
+    return this.bookService.bulkSetRating(ids, dto.rating ?? null, user);
+  }
+
+  @Post('bulk-set-metadata')
+  @HttpCode(HttpStatus.NO_CONTENT)
+  @RequirePermission(Permission.LibraryEditMetadata)
+  @ForbidPermission(Permission.DemoRestricted, 'Demo-restricted account cannot perform bulk edits')
+  @Auditable({
+    action: AuditAction.BookBulkSetMetadata,
+    resource: AuditResource.Book,
+    description: (req) => {
+      const body = req.body as { bookIds?: number[]; field?: string };
+      const count = body?.bookIds?.length ?? 0;
+      return `Bulk set ${body?.field ?? 'metadata'} for ${count} book${count !== 1 ? 's' : ''}`;
+    },
+  })
+  async bulkSetMetadata(@Body() dto: BulkSetMetadataDto, @CurrentUser() user: RequestUser) {
+    const ids = await this.bookService.resolveSelectionToIds(dto, user);
+    return this.bookService.bulkSetMetadata(ids, dto.field, dto.value ?? null, user);
   }
 
   @Post('bulk-update-tags')
@@ -550,8 +621,9 @@ export class BookController {
       return `Bulk ${body?.mode ?? 'update'} tags for ${count} book${count !== 1 ? 's' : ''}`;
     },
   })
-  bulkUpdateTags(@Body() dto: BulkUpdateTagsDto, @CurrentUser() user: RequestUser) {
-    return this.bookService.bulkUpdateTags(dto.bookIds, dto.mode, dto.tags, user);
+  async bulkUpdateTags(@Body() dto: BulkUpdateTagsDto, @CurrentUser() user: RequestUser) {
+    const ids = await this.bookService.resolveSelectionToIds(dto, user);
+    return this.bookService.bulkUpdateTags(ids, dto.mode, dto.tags, user);
   }
 
   @Post('bulk-set-metadata-lock')
@@ -567,8 +639,9 @@ export class BookController {
       return `Bulk ${body?.locked ? 'locked' : 'unlocked'} metadata for ${count} book${count !== 1 ? 's' : ''}`;
     },
   })
-  bulkSetMetadataLock(@Body() dto: BulkSetMetadataLockDto, @CurrentUser() user: RequestUser) {
-    return this.bookService.bulkSetMetadataLock(dto.bookIds, dto.locked, user);
+  async bulkSetMetadataLock(@Body() dto: BulkSetMetadataLockDto, @CurrentUser() user: RequestUser) {
+    const ids = await this.bookService.resolveSelectionToIds(dto, user);
+    return this.bookService.bulkSetMetadataLock(ids, dto.locked, user);
   }
 
   @Get(':id')
diff --git a/server/src/modules/book/book.module.test.ts b/server/src/modules/book/book.module.test.ts
index 91120f43c..e07948a90 100644
--- a/server/src/modules/book/book.module.test.ts
+++ b/server/src/modules/book/book.module.test.ts
@@ -12,6 +12,7 @@ import { MODULE_METADATA } from '@nestjs/common/constants';
 import { LibraryModule } from '../library/library.module';
 import { BookQueryBuilder } from './book-query-builder.service';
 import { BookReadService } from './book-read.service';
+import { BookSortBuilder } from './book-sort-builder.service';
 import { BookController } from './book.controller';
 import { BookModule } from './book.module';
 import { BookRepository } from './book.repository';
@@ -20,7 +21,7 @@ import { BookService } from './book.service';
 describe('BookModule', () => {
   it('registers expected controller/providers/exports', () => {
     expect(Reflect.getMetadata('controllers', BookModule)).toEqual([BookController]);
-    expect(Reflect.getMetadata('providers', BookModule)).toEqual([BookService, BookRepository, BookReadService, BookQueryBuilder]);
+    expect(Reflect.getMetadata('providers', BookModule)).toEqual([BookService, BookRepository, BookReadService, BookSortBuilder, BookQueryBuilder]);
     expect(Reflect.getMetadata('exports', BookModule)).toEqual([BookService, BookReadService, BookQueryBuilder]);
   });
 
diff --git a/server/src/modules/book/book.module.ts b/server/src/modules/book/book.module.ts
index 1ee3f30fc..bd3d32118 100644
--- a/server/src/modules/book/book.module.ts
+++ b/server/src/modules/book/book.module.ts
@@ -12,6 +12,7 @@ import { NarratorModule } from '../narrator/narrator.module';
 import { UserBookStatusModule } from '../user-book-status/user-book-status.module';
 import { BookReadService } from './book-read.service';
 import { BookQueryBuilder } from './book-query-builder.service';
+import { BookSortBuilder } from './book-sort-builder.service';
 import { BookController } from './book.controller';
 import { BookRepository } from './book.repository';
 import { BookService } from './book.service';
@@ -30,7 +31,7 @@ import { BookService } from './book.service';
     UserBookStatusModule,
   ],
   controllers: [BookController],
-  providers: [BookService, BookRepository, BookReadService, BookQueryBuilder],
+  providers: [BookService, BookRepository, BookReadService, BookSortBuilder, BookQueryBuilder],
   exports: [BookService, BookReadService, BookQueryBuilder],
 })
 export class BookModule {}
diff --git a/server/src/modules/book/book.repository.test.ts b/server/src/modules/book/book.repository.test.ts
index 7d2ea5aaa..d28a20140 100644
--- a/server/src/modules/book/book.repository.test.ts
+++ b/server/src/modules/book/book.repository.test.ts
@@ -50,24 +50,26 @@ describe('BookRepository', () => {
   });
 
   it('findCards loads card rows and related collections for the current user', async () => {
-    const rows = [{ id: 10, primaryFileId: 1001 }];
-    const totals = [{ total: '1' }];
+    const rows = [{ id: 10, primaryFileId: 1001, _total: 1 }];
     const authorRows = [{ bookId: 10, name: 'Frank Herbert' }];
     const fileRows = [{ bookId: 10, id: 1001, format: 'epub', role: 'primary' }];
     const genreRows = [{ bookId: 10, name: 'Sci-Fi' }];
+    const tagRows = [{ bookId: 10, name: 'dune' }];
     const progressRows = [{ bookFileId: 1001, percentage: 45 }];
     const statusRows = [{ bookId: 10, status: 'reading', source: 'manual', startedAt: null, finishedAt: null, updatedAt: null }];
+    const narratorRows = [{ bookId: 10, name: 'Scott Brick' }];
 
     const db = {
       select: vi
         .fn()
         .mockReturnValueOnce(makeSelectChain('offset', rows))
-        .mockReturnValueOnce(makeSelectChain('where', totals))
         .mockReturnValueOnce(makeSelectChain('orderBy', authorRows))
         .mockReturnValueOnce(makeSelectChain('where', fileRows))
         .mockReturnValueOnce(makeSelectChain('where', genreRows))
-        .mockReturnValueOnce(makeSelectChain('where', progressRows))
-        .mockReturnValueOnce(makeSelectChain('where', statusRows)),
+        .mockReturnValueOnce(makeSelectChain('where', tagRows))
+        .mockReturnValueOnce(makeSelectChain('orderBy', narratorRows))
+        .mockReturnValueOnce(makeSelectChain('where', statusRows))
+        .mockReturnValueOnce(makeSelectChain('where', progressRows)),
     };
     const repo = new BookRepository(db as never);
 
@@ -78,8 +80,10 @@ describe('BookRepository', () => {
       authorRows,
       fileRows,
       genreRows,
+      tagRows,
       progressRows,
       statusRows,
+      narratorRows,
       total: 1,
     });
   });
@@ -93,8 +97,10 @@ describe('BookRepository', () => {
       authorRows: [],
       fileRows: [],
       genreRows: [],
+      tagRows: [],
       progressRows: [],
       statusRows: [],
+      narratorRows: [],
       total: 0,
     });
     expect(db.select).not.toHaveBeenCalled();
diff --git a/server/src/modules/book/book.repository.ts b/server/src/modules/book/book.repository.ts
index a41ec7679..23fde6c90 100644
--- a/server/src/modules/book/book.repository.ts
+++ b/server/src/modules/book/book.repository.ts
@@ -42,14 +42,20 @@ type CollapsedRawRow = {
   primary_file_id: number | null;
   folder_path: string;
   added_at: string;
+  updated_at: string;
   title: string | null;
   series_name: string | null;
   series_index: number | null;
   published_year: number | null;
   language: string | null;
   rating: number | null;
+  metadata_score: number | null;
   cover_source: string | null;
   locked_fields: string[] | null;
+  subtitle: string | null;
+  isbn13: string | null;
+  publisher: string | null;
+  page_count: number | null;
   sort_title: string | null;
   sort_added_at: string | null;
   book_count: string | null;
@@ -81,83 +87,113 @@ export class BookRepository {
   async findCards(opts: { where: SQL | undefined; orderBy: SQL[]; limit: number; offset: number; userId: number }) {
     const { where, orderBy, limit, offset, userId } = opts;
 
-    const [rows, [{ total }]] = await Promise.all([
-      this.db
-        .select({
-          id: books.id,
-          status: books.status,
-          primaryFileId: books.primaryFileId,
-          folderPath: books.folderPath,
-          addedAt: books.addedAt,
-          title: bookMetadata.title,
-          seriesName: bookMetadata.seriesName,
-          seriesIndex: bookMetadata.seriesIndex,
-          publishedYear: bookMetadata.publishedYear,
-          language: bookMetadata.language,
-          rating: userBookRatings.rating,
-          coverSource: bookMetadata.coverSource,
-          lockedFields: bookMetadata.lockedFields,
-        })
-        .from(books)
-        .leftJoin(bookMetadata, eq(bookMetadata.bookId, books.id))
-        .leftJoin(userBookRatings, and(eq(userBookRatings.bookId, books.id), eq(userBookRatings.userId, userId)))
-        .where(where)
-        .orderBy(...orderBy)
-        .limit(limit)
-        .offset(offset),
-      this.db.select({ total: count() }).from(books).leftJoin(bookMetadata, eq(bookMetadata.bookId, books.id)).where(where),
-    ]);
+    const rows = await this.db
+      .select({
+        id: books.id,
+        status: books.status,
+        primaryFileId: books.primaryFileId,
+        folderPath: books.folderPath,
+        addedAt: books.addedAt,
+        updatedAt: books.updatedAt,
+        title: bookMetadata.title,
+        seriesName: bookMetadata.seriesName,
+        seriesIndex: bookMetadata.seriesIndex,
+        publishedYear: bookMetadata.publishedYear,
+        language: bookMetadata.language,
+        rating: userBookRatings.rating,
+        coverSource: bookMetadata.coverSource,
+        lockedFields: bookMetadata.lockedFields,
+        subtitle: bookMetadata.subtitle,
+        publisher: bookMetadata.publisher,
+        pageCount: bookMetadata.pageCount,
+        isbn13: bookMetadata.isbn13,
+        metadataScore: bookMetadata.metadataScore,
+        _total: sql<number>`count(*) over()`.as('_total'),
+      })
+      .from(books)
+      .leftJoin(bookMetadata, eq(bookMetadata.bookId, books.id))
+      .leftJoin(userBookRatings, and(eq(userBookRatings.bookId, books.id), eq(userBookRatings.userId, userId)))
+      .where(where)
+      .orderBy(...orderBy)
+      .limit(limit)
+      .offset(offset);
+
+    const total = rows.length > 0 ? rows[0]._total : await this.countWhere(where);
 
     const bookIds = rows.map((r) => r.id);
-
-    const [authorRows, fileRows, genreRows] = await Promise.all([
-      bookIds.length > 0
-        ? this.db
-            .select({ bookId: bookAuthors.bookId, name: authors.name })
-            .from(bookAuthors)
-            .innerJoin(authors, eq(authors.id, bookAuthors.authorId))
-            .where(inArray(bookAuthors.bookId, bookIds))
-            .orderBy(bookAuthors.displayOrder)
-        : [],
-      bookIds.length > 0
-        ? this.db
-            .select({ bookId: bookFiles.bookId, id: bookFiles.id, format: bookFiles.format, role: bookFiles.role })
-            .from(bookFiles)
-            .where(inArray(bookFiles.bookId, bookIds))
-        : ([] as { bookId: number; id: number; format: string | null; role: string }[]),
-      bookIds.length > 0
-        ? this.db
-            .select({ bookId: bookGenres.bookId, name: genres.name })
-            .from(bookGenres)
-            .innerJoin(genres, eq(genres.id, bookGenres.genreId))
-            .where(inArray(bookGenres.bookId, bookIds))
-        : [],
-    ]);
-
     const primaryFileIds = rows.map((r) => r.primaryFileId).filter((id): id is number => id != null);
-    const [progressRows, statusRows] = await Promise.all([
+    const enrichment = await this.enrichBookIds(bookIds, primaryFileIds, userId);
+
+    return { rows, ...enrichment, total: Number(total) };
+  }
+
+  private async enrichBookIds(bookIds: number[], primaryFileIds: number[], userId: number) {
+    if (bookIds.length === 0) {
+      return {
+        authorRows: [] as { bookId: number; name: string }[],
+        fileRows: [] as { bookId: number; id: number; format: string | null; role: string; sizeBytes: number | null }[],
+        genreRows: [] as { bookId: number; name: string }[],
+        tagRows: [] as { bookId: number; name: string }[],
+        progressRows: [] as { bookFileId: number; percentage: number }[],
+        statusRows: [] as {
+          bookId: number;
+          status: string;
+          source: string;
+          startedAt: Date | null;
+          finishedAt: Date | null;
+          updatedAt: Date;
+        }[],
+        narratorRows: [] as { bookId: number; name: string }[],
+      };
+    }
+
+    const [authorRows, fileRows, genreRows, tagRows, narratorRows, statusRows, progressRows] = await Promise.all([
+      this.db
+        .select({ bookId: bookAuthors.bookId, name: authors.name })
+        .from(bookAuthors)
+        .innerJoin(authors, eq(authors.id, bookAuthors.authorId))
+        .where(inArray(bookAuthors.bookId, bookIds))
+        .orderBy(bookAuthors.displayOrder),
+      this.db
+        .select({ bookId: bookFiles.bookId, id: bookFiles.id, format: bookFiles.format, role: bookFiles.role, sizeBytes: bookFiles.sizeBytes })
+        .from(bookFiles)
+        .where(inArray(bookFiles.bookId, bookIds)),
+      this.db
+        .select({ bookId: bookGenres.bookId, name: genres.name })
+        .from(bookGenres)
+        .innerJoin(genres, eq(genres.id, bookGenres.genreId))
+        .where(inArray(bookGenres.bookId, bookIds)),
+      this.db
+        .select({ bookId: bookTags.bookId, name: tags.name })
+        .from(bookTags)
+        .innerJoin(tags, eq(tags.id, bookTags.tagId))
+        .where(inArray(bookTags.bookId, bookIds)),
+      this.db
+        .select({ bookId: bookNarrators.bookId, name: narrators.name })
+        .from(bookNarrators)
+        .innerJoin(narrators, eq(narrators.id, bookNarrators.narratorId))
+        .where(inArray(bookNarrators.bookId, bookIds))
+        .orderBy(bookNarrators.displayOrder),
+      this.db
+        .select({
+          bookId: userBookStatus.bookId,
+          status: userBookStatus.status,
+          source: userBookStatus.source,
+          startedAt: userBookStatus.startedAt,
+          finishedAt: userBookStatus.finishedAt,
+          updatedAt: userBookStatus.updatedAt,
+        })
+        .from(userBookStatus)
+        .where(and(eq(userBookStatus.userId, userId), inArray(userBookStatus.bookId, bookIds))),
       primaryFileIds.length > 0
         ? this.db
             .select({ bookFileId: readingProgress.bookFileId, percentage: readingProgress.percentage })
             .from(readingProgress)
             .where(and(eq(readingProgress.userId, userId), inArray(readingProgress.bookFileId, primaryFileIds)))
-        : Promise.resolve([]),
-      bookIds.length > 0
-        ? this.db
-            .select({
-              bookId: userBookStatus.bookId,
-              status: userBookStatus.status,
-              source: userBookStatus.source,
-              startedAt: userBookStatus.startedAt,
-              finishedAt: userBookStatus.finishedAt,
-              updatedAt: userBookStatus.updatedAt,
-            })
-            .from(userBookStatus)
-            .where(and(eq(userBookStatus.userId, userId), inArray(userBookStatus.bookId, bookIds)))
-        : Promise.resolve([]),
+        : Promise.resolve([] as { bookFileId: number; percentage: number }[]),
     ]);
 
-    return { rows, authorRows, fileRows, genreRows, progressRows, statusRows, total: Number(total) };
+    return { authorRows, fileRows, genreRows, tagRows, progressRows, statusRows, narratorRows };
   }
 
   async findCardsByBookIds(bookIds: number[], userId: number) {
@@ -167,8 +203,10 @@ export class BookRepository {
         authorRows: [],
         fileRows: [],
         genreRows: [],
+        tagRows: [],
         progressRows: [],
         statusRows: [],
+        narratorRows: [],
         total: 0,
       };
     }
@@ -189,22 +227,29 @@ export class BookRepository {
       primaryFileId: number | null;
       folderPath: string;
       addedAt: Date;
+      updatedAt: Date;
       title: string | null;
       seriesName: string | null;
       seriesIndex: number | null;
       publishedYear: number | null;
       language: string | null;
       rating: number | null;
+      metadataScore: number | null;
       coverSource: string | null;
       lockedFields: string[] | null;
+      subtitle: string | null;
+      publisher: string | null;
+      pageCount: number | null;
+      isbn13: string | null;
       bookCount: number | null;
       readCount: number | null;
       coverBookIds: number[] | null;
       seriesLatestAddedAt: Date | null;
     }>;
     authorRows: { bookId: number; name: string }[];
-    fileRows: { bookId: number; id: number; format: string | null; role: string }[];
+    fileRows: { bookId: number; id: number; format: string | null; role: string; sizeBytes: number | null }[];
     genreRows: { bookId: number; name: string }[];
+    tagRows: { bookId: number; name: string }[];
     progressRows: { bookFileId: number; percentage: number | null }[];
     statusRows: {
       bookId: number;
@@ -214,6 +259,7 @@ export class BookRepository {
       finishedAt: Date | null;
       updatedAt: Date;
     }[];
+    narratorRows: { bookId: number; name: string }[];
     total: number;
   }> {
     const { where, sort, limit, offset, userId } = opts;
@@ -275,6 +321,10 @@ export class BookRepository {
           book_metadata.locked_fields,
           book_metadata.publisher,
           book_metadata.page_count,
+          book_metadata.subtitle,
+          book_metadata.isbn13,
+          book_metadata.metadata_score,
+          books.updated_at,
           COALESCE(NULLIF(lower(btrim(book_metadata.series_name)), ''), lower(book_metadata.title)) AS sort_title,
           COALESCE(sa.latest_added_at, books.added_at) AS sort_added_at,
           sa.book_count,
@@ -313,14 +363,20 @@ export class BookRepository {
       primaryFileId: r.primary_file_id,
       folderPath: r.folder_path,
       addedAt: new Date(r.added_at),
+      updatedAt: new Date(r.updated_at),
       title: r.title,
       seriesName: r.series_name,
       seriesIndex: r.series_index,
       publishedYear: r.published_year,
       language: r.language,
       rating: r.rating,
+      metadataScore: r.metadata_score !== null ? Number(r.metadata_score) : null,
       coverSource: r.cover_source,
       lockedFields: r.locked_fields,
+      subtitle: r.subtitle,
+      publisher: r.publisher,
+      pageCount: r.page_count !== null ? Number(r.page_count) : null,
+      isbn13: r.isbn13,
       bookCount: r.book_count !== null ? Number(r.book_count) : null,
       readCount: r.read_count !== null ? Number(r.read_count) : null,
       coverBookIds: r.cover_book_ids,
@@ -328,55 +384,10 @@ export class BookRepository {
     }));
 
     const bookIds = mappedRows.map((r) => r.id);
-
-    const [authorRows, fileRows, genreRows] = await Promise.all([
-      bookIds.length > 0
-        ? this.db
-            .select({ bookId: bookAuthors.bookId, name: authors.name })
-            .from(bookAuthors)
-            .innerJoin(authors, eq(authors.id, bookAuthors.authorId))
-            .where(inArray(bookAuthors.bookId, bookIds))
-            .orderBy(bookAuthors.displayOrder)
-        : [],
-      bookIds.length > 0
-        ? this.db
-            .select({ bookId: bookFiles.bookId, id: bookFiles.id, format: bookFiles.format, role: bookFiles.role })
-            .from(bookFiles)
-            .where(inArray(bookFiles.bookId, bookIds))
-        : ([] as { bookId: number; id: number; format: string | null; role: string }[]),
-      bookIds.length > 0
-        ? this.db
-            .select({ bookId: bookGenres.bookId, name: genres.name })
-            .from(bookGenres)
-            .innerJoin(genres, eq(genres.id, bookGenres.genreId))
-            .where(inArray(bookGenres.bookId, bookIds))
-        : [],
-    ]);
-
     const primaryFileIds = mappedRows.map((r) => r.primaryFileId).filter((id): id is number => id != null);
-    const [progressRows, statusRows] = await Promise.all([
-      primaryFileIds.length > 0
-        ? this.db
-            .select({ bookFileId: readingProgress.bookFileId, percentage: readingProgress.percentage })
-            .from(readingProgress)
-            .where(and(eq(readingProgress.userId, userId), inArray(readingProgress.bookFileId, primaryFileIds)))
-        : Promise.resolve([]),
-      bookIds.length > 0
-        ? this.db
-            .select({
-              bookId: userBookStatus.bookId,
-              status: userBookStatus.status,
-              source: userBookStatus.source,
-              startedAt: userBookStatus.startedAt,
-              finishedAt: userBookStatus.finishedAt,
-              updatedAt: userBookStatus.updatedAt,
-            })
-            .from(userBookStatus)
-            .where(and(eq(userBookStatus.userId, userId), inArray(userBookStatus.bookId, bookIds)))
-        : Promise.resolve([]),
-    ]);
+    const enrichment = await this.enrichBookIds(bookIds, primaryFileIds, userId);
 
-    return { rows: mappedRows, authorRows, fileRows, genreRows, progressRows, statusRows, total };
+    return { rows: mappedRows, ...enrichment, total };
   }
 
   async findById(id: number) {
@@ -673,6 +684,11 @@ export class BookRepository {
     return rows.map((r) => r.id);
   }
 
+  async findIdsByWhere(where: SQL | undefined): Promise<number[]> {
+    const rows = await this.db.select({ id: books.id }).from(books).where(where);
+    return rows.map((r) => r.id);
+  }
+
   async findPrimaryFile(bookId: number): Promise<{ absolutePath: string; format: string | null } | null> {
     const [row] = await this.db
       .select({ absolutePath: bookFiles.absolutePath, format: bookFiles.format })
@@ -756,6 +772,15 @@ export class BookRepository {
     await executor.update(bookMetadata).set(fields).where(eq(bookMetadata.bookId, bookId));
   }
 
+  async bulkUpdateMetadataFields(
+    bookIds: number[],
+    fields: Partial<typeof bookMetadata.$inferInsert>,
+    executor: MetadataUpdateExecutor = this.db,
+  ): Promise<void> {
+    if (bookIds.length === 0) return;
+    await executor.update(bookMetadata).set(fields).where(inArray(bookMetadata.bookId, bookIds));
+  }
+
   async upsertProgress(
     userId: number,
     fileId: number,
diff --git a/server/src/modules/book/book.service.test.ts b/server/src/modules/book/book.service.test.ts
index f486f4f6c..1f890df45 100644
--- a/server/src/modules/book/book.service.test.ts
+++ b/server/src/modules/book/book.service.test.ts
@@ -1,15 +1,16 @@
-import { BadRequestException, ConflictException, ForbiddenException, NotFoundException } from '@nestjs/common';
+import { BadRequestException, ConflictException, ForbiddenException, Logger, NotFoundException } from '@nestjs/common';
 import type { MockedFunction } from 'vitest';
 import { access, readdir, rm, stat } from 'fs/promises';
 
 import type { RequestUser } from '../../common/types/request-user';
-import { MetadataProviderKey } from '@bookorbit/types';
+import { MetadataProviderKey, type BookQuery } from '@bookorbit/types';
 import { extractEpubMetadata } from '../metadata/lib/epub';
 import { extractCbzMetadata, extractCbrMetadata, extractCb7Metadata } from '../metadata/lib/cbz-metadata';
 import { parseFb2File } from '../metadata/lib/fb2-parser';
 import { parseMobiFile } from '../metadata/lib/mobi-parser';
 import { parsePdfFile } from '../metadata/lib/pdf-parser';
 import { UpdateBookMetadataDto } from './dto/update-book-metadata.dto';
+import { BookQueryBuilder } from './book-query-builder.service';
 import { BookService } from './book.service';
 
 vi.mock('fs/promises', async () => {
@@ -78,6 +79,7 @@ function makeUser(overrides?: Partial<RequestUser>): RequestUser {
 function makeService() {
   const bookRepo = {
     findCards: vi.fn(),
+    countWhere: vi.fn(),
     findPatternMetadataByBookIds: vi.fn(),
     findLibraryIdsByBookIds: vi.fn(),
     findPrimaryFilesByBookIds: vi.fn(),
@@ -98,10 +100,12 @@ function makeService() {
     findAudioProgress: vi.fn(),
     upsertAudioProgress: vi.fn(),
     bulkSetRating: vi.fn(),
+    bulkUpdateMetadataFields: vi.fn(),
     updateMetadataFields: vi.fn(),
     withTransaction: vi.fn(),
     deleteByIds: vi.fn(),
     findAllIds: vi.fn(),
+    findIdsByWhere: vi.fn(),
     findCardsCollapsed: vi.fn(),
   };
   const libraryService = {
@@ -159,6 +163,7 @@ function makeService() {
     ),
     assertFieldsUnlocked: vi.fn().mockResolvedValue(undefined),
     getCoverLockedBookIds: vi.fn().mockResolvedValue(new Set()),
+    getBookIdsWithLockedField: vi.fn().mockResolvedValue(new Set()),
     replaceLockedFields: vi.fn().mockResolvedValue([]),
   };
   const userBookStatusService = {
@@ -221,6 +226,43 @@ function metaRow(bookId: number, fields?: Partial<{ title: string | null; author
   };
 }
 
+function makeBookCard(id: number, overrides?: Record<string, unknown>) {
+  return {
+    id,
+    status: 'present',
+    title: `Book ${id}`,
+    subtitle: null,
+    authors: ['Author'],
+    seriesName: null,
+    seriesIndex: null,
+    files: [{ id: id * 10, format: 'epub', role: 'primary', sizeBytes: 123 }],
+    publishedYear: 2020,
+    language: 'en',
+    genres: ['Sci-Fi'],
+    tags: ['tag1'],
+    rating: 4,
+    readingProgress: 75,
+    readStatus: {
+      status: 'reading',
+      source: 'manual',
+      startedAt: '2026-05-01T00:00:00.000Z',
+      finishedAt: null,
+      updatedAt: '2026-05-07T00:00:00.000Z',
+    },
+    addedAt: '2026-04-01T00:00:00.000Z',
+    updatedAt: '2026-05-01T00:00:00.000Z',
+    metadataScore: 88,
+    hasCover: true,
+    hasMetadataLocks: false,
+    lockedFields: [],
+    publisher: 'Pub',
+    pageCount: 320,
+    isbn13: '9780000000000',
+    narrators: [],
+    ...(overrides ?? {}),
+  };
+}
+
 describe('BookService', () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -411,6 +453,179 @@ describe('BookService', () => {
     });
   });
 
+  describe('metadata export', () => {
+    it('builds metadata export preflight for query selection', async () => {
+      const { service, libraryService, queryBuilder, bookRepo } = makeService();
+      const user = makeUser({ id: 12 });
+      libraryService.findAll.mockResolvedValue([{ id: 5, name: 'Main' }]);
+      queryBuilder.buildWhere.mockReturnValue('WHERE_CLAUSE' as never);
+      bookRepo.countWhere.mockResolvedValue(42);
+
+      const preflight = await service.getMetadataExportPreflight(
+        {
+          query: { libraryId: 5, q: 'dune', sort: [{ field: 'title', dir: 'asc' }] },
+          format: 'csv',
+          viewType: 'library',
+        } as never,
+        user,
+      );
+
+      expect(preflight.rowCount).toBe(42);
+      expect(preflight.format).toBe('csv');
+      expect(preflight.scope).toBe('all-matching');
+      expect(preflight.fileName).toContain('bookorbit-library-all-matching-');
+      expect(queryBuilder.buildWhere).toHaveBeenCalledWith(undefined, {
+        accessibleLibraryIds: [5],
+        implicitLibraryId: 5,
+        userId: 12,
+        q: 'dune',
+      });
+      expect(bookRepo.countWhere).toHaveBeenCalledWith('WHERE_CLAUSE');
+    });
+
+    it('rejects metadata export preflight for inaccessible library query selections', async () => {
+      const { service, libraryService } = makeService();
+      const user = makeUser({ id: 99 });
+      libraryService.findAll.mockResolvedValue([{ id: 7, name: 'Allowed' }]);
+
+      await expect(
+        service.getMetadataExportPreflight(
+          {
+            query: { libraryId: 9, q: 'dune' },
+            format: 'json',
+            viewType: 'library',
+          } as never,
+          user,
+        ),
+      ).rejects.toThrow(ForbiddenException);
+    });
+
+    it('builds csv metadata export with context lines and stable machine keys', async () => {
+      const { service, libraryService, queryBuilder, bookRepo } = makeService();
+      const user = makeUser({ id: 7 });
+      libraryService.findAll.mockResolvedValue([{ id: 5, name: 'Main Library' }]);
+      queryBuilder.buildWhere.mockReturnValue('WHERE_CLAUSE' as never);
+      bookRepo.countWhere.mockResolvedValue(1);
+      bookRepo.findLibraryIdsByBookIds.mockResolvedValue([{ id: 1, libraryId: 5 }]);
+      vi.spyOn(service, 'executeBooksQuery').mockResolvedValue({
+        items: [makeBookCard(1)],
+        total: 1,
+        page: 0,
+        size: 1,
+      });
+
+      const exported = await service.buildMetadataExport(
+        {
+          query: { libraryId: 5, sort: [{ field: 'title', dir: 'asc' }] },
+          format: 'csv',
+          viewType: 'library',
+          options: { includePersonalData: false, includeContextMeta: true, columnsMode: 'canonical' },
+        } as never,
+        user,
+      );
+
+      expect(exported.contentType).toBe('text/csv; charset=utf-8');
+      expect(exported.fileName).toContain('.csv');
+      expect(exported.preflight.rowCount).toBe(1);
+      expect(exported.content).toContain('\uFEFF');
+      expect(exported.content).toContain('# schemaVersion=1');
+      expect(exported.content).toContain('bookId,libraryId,libraryName,status,title');
+      expect(exported.content).toContain('1,5,Main Library,present,Book 1');
+    });
+
+    it('builds json metadata export with visible-column projection', async () => {
+      const { service, bookRepo, libraryService } = makeService();
+      const user = makeUser({ id: 11 });
+      bookRepo.findLibraryIdsByBookIds.mockResolvedValue([{ id: 2, libraryId: 8 }]);
+      libraryService.findAll.mockResolvedValue([{ id: 8, name: 'Focus' }]);
+      vi.spyOn(service, 'executeBooksQuery').mockResolvedValue({
+        items: [makeBookCard(2)],
+        total: 1,
+        page: 0,
+        size: 1,
+      });
+
+      const exported = await service.buildMetadataExport(
+        {
+          bookIds: [2],
+          sort: [{ field: 'title', dir: 'asc' }],
+          format: 'json',
+          viewType: 'collection',
+          options: { columnsMode: 'visible', visibleColumns: ['title', 'authors', 'format'], includePersonalData: true },
+        } as never,
+        user,
+      );
+
+      expect(exported.contentType).toBe('application/json; charset=utf-8');
+      const parsed = JSON.parse(exported.content) as {
+        schemaVersion: number;
+        meta: { viewType: string; scope: string };
+        items: Array<Record<string, unknown>>;
+      };
+      expect(parsed.schemaVersion).toBe(1);
+      expect(parsed.meta.viewType).toBe('collection');
+      expect(parsed.meta.scope).toBe('selected');
+      expect(parsed.items[0]).toMatchObject({
+        bookId: 2,
+        libraryId: 8,
+        libraryName: 'Focus',
+        title: 'Book 2',
+      });
+      expect(parsed.items[0]).toHaveProperty('authors');
+      expect(parsed.items[0]).toHaveProperty('primaryFormat', 'epub');
+      expect(parsed.items[0]).toHaveProperty('formats');
+      expect(parsed.items[0]).not.toHaveProperty('status');
+    });
+
+    it('omits json context metadata when includeContextMeta is disabled', async () => {
+      const { service, bookRepo, libraryService } = makeService();
+      const user = makeUser({ id: 15 });
+      bookRepo.findLibraryIdsByBookIds.mockResolvedValue([{ id: 4, libraryId: 6 }]);
+      libraryService.findAll.mockResolvedValue([{ id: 6, name: 'Focus' }]);
+      vi.spyOn(service, 'executeBooksQuery').mockResolvedValue({
+        items: [makeBookCard(4)],
+        total: 1,
+        page: 0,
+        size: 1,
+      });
+
+      const exported = await service.buildMetadataExport(
+        {
+          bookIds: [4],
+          format: 'json',
+          viewType: 'smartScope',
+          options: { includeContextMeta: false, columnsMode: 'canonical' },
+        } as never,
+        user,
+      );
+
+      const parsed = JSON.parse(exported.content) as Record<string, unknown>;
+      expect(parsed).toHaveProperty('schemaVersion', 1);
+      expect(parsed).toHaveProperty('items');
+      expect(parsed).not.toHaveProperty('meta');
+    });
+
+    it('rejects metadata export preflight when projected payload estimate exceeds guardrail', async () => {
+      const { service, libraryService, queryBuilder, bookRepo } = makeService();
+      const user = makeUser();
+      libraryService.findAll.mockResolvedValue([{ id: 1, name: 'Main' }]);
+      queryBuilder.buildWhere.mockReturnValue('WHERE_CLAUSE' as never);
+      bookRepo.countWhere.mockResolvedValue(100000);
+
+      await expect(
+        service.getMetadataExportPreflight(
+          {
+            query: { libraryId: 1 },
+            format: 'json',
+            viewType: 'library',
+            options: { includeFilePaths: true, includePersonalData: true },
+          } as never,
+          user,
+        ),
+      ).rejects.toThrow(BadRequestException);
+    });
+  });
+
   describe('export concurrency slots', () => {
     it('enforces max concurrent exports per user', () => {
       const { service } = makeService();
@@ -909,6 +1124,92 @@ describe('BookService', () => {
       );
     });
 
+    it('updateMetadata applies single-field title patch without touching other fields', async () => {
+      const { service, bookRepo } = makeService();
+      const user = makeUser();
+      vi.spyOn(service, 'verifyBookAccess').mockResolvedValue(undefined);
+      vi.spyOn(service, 'getDetail').mockResolvedValue({ id: 5 } as never);
+
+      const dto = new UpdateBookMetadataDto();
+      dto.title = 'Inline Edit Title';
+      await service.updateMetadata(5, dto, user);
+
+      expect(bookRepo.updateMetadataFields).toHaveBeenCalledWith(5, expect.objectContaining({ title: 'Inline Edit Title' }), expect.anything());
+      expect(bookRepo.updateMetadataFields).not.toHaveBeenCalledWith(
+        5,
+        expect.objectContaining({ seriesName: expect.anything() }),
+        expect.anything(),
+      );
+    });
+
+    it('updateMetadata applies single-field seriesName and seriesIndex patch', async () => {
+      const { service, bookRepo } = makeService();
+      const user = makeUser();
+      vi.spyOn(service, 'verifyBookAccess').mockResolvedValue(undefined);
+      vi.spyOn(service, 'getDetail').mockResolvedValue({ id: 5 } as never);
+
+      const dto = new UpdateBookMetadataDto();
+      dto.seriesName = 'Dune Saga';
+      dto.seriesIndex = 2;
+      await service.updateMetadata(5, dto, user);
+
+      expect(bookRepo.updateMetadataFields).toHaveBeenCalledWith(
+        5,
+        expect.objectContaining({ seriesName: 'Dune Saga', seriesIndex: 2 }),
+        expect.anything(),
+      );
+    });
+
+    it('updateMetadata applies single-field language patch', async () => {
+      const { service, bookRepo } = makeService();
+      const user = makeUser();
+      vi.spyOn(service, 'verifyBookAccess').mockResolvedValue(undefined);
+      vi.spyOn(service, 'getDetail').mockResolvedValue({ id: 5 } as never);
+
+      const dto = new UpdateBookMetadataDto();
+      dto.language = 'fr';
+      await service.updateMetadata(5, dto, user);
+
+      expect(bookRepo.updateMetadataFields).toHaveBeenCalledWith(5, expect.objectContaining({ language: 'fr' }), expect.anything());
+    });
+
+    it('updateMetadata clears rating to null', async () => {
+      const { service, bookRepo } = makeService();
+      const user = makeUser();
+      vi.spyOn(service, 'verifyBookAccess').mockResolvedValue(undefined);
+      vi.spyOn(service, 'getDetail').mockResolvedValue({ id: 5 } as never);
+
+      await service.updateMetadata(5, { rating: null }, user);
+
+      expect(bookRepo.bulkSetRating).toHaveBeenCalledWith([5], null, user.id);
+    });
+
+    it('updateMetadata replaces genres array only', async () => {
+      const { service, metadataService } = makeService();
+      const user = makeUser();
+      vi.spyOn(service, 'verifyBookAccess').mockResolvedValue(undefined);
+      vi.spyOn(service, 'getDetail').mockResolvedValue({ id: 5 } as never);
+
+      await service.updateMetadata(5, { genres: ['Fantasy', 'Adventure'] }, user);
+
+      expect(metadataService.replaceGenres).toHaveBeenCalledWith(5, ['Fantasy', 'Adventure'], expect.anything());
+      expect(metadataService.replaceAuthors).not.toHaveBeenCalled();
+      expect(metadataService.replaceTags).not.toHaveBeenCalled();
+    });
+
+    it('updateMetadata replaces tags array only', async () => {
+      const { service, metadataService } = makeService();
+      const user = makeUser();
+      vi.spyOn(service, 'verifyBookAccess').mockResolvedValue(undefined);
+      vi.spyOn(service, 'getDetail').mockResolvedValue({ id: 5 } as never);
+
+      await service.updateMetadata(5, { tags: ['favorite', 'to-read'] }, user);
+
+      expect(metadataService.replaceTags).toHaveBeenCalledWith(5, ['favorite', 'to-read'], expect.anything());
+      expect(metadataService.replaceAuthors).not.toHaveBeenCalled();
+      expect(metadataService.replaceGenres).not.toHaveBeenCalled();
+    });
+
     it('updateMetadataLocks replaces lock state and returns updated detail', async () => {
       const { service, bookMetadataLockService } = makeService();
       const user = makeUser();
@@ -1678,6 +1979,90 @@ describe('BookService', () => {
       expect(scoreService.calculateAndSave).toHaveBeenNthCalledWith(2, 5);
     });
 
+    it('bulkSetRating skips books where rating is metadata-locked', async () => {
+      const { service, bookRepo, fileWriteService, scoreService, bookMetadataLockService } = makeService();
+      const user = makeUser({ id: 42 });
+      vi.spyOn(service, 'verifyLibraryAccessForBookIds').mockResolvedValue(undefined);
+      bookMetadataLockService.getBookIdsWithLockedField.mockResolvedValue(new Set([5]));
+
+      await service.bulkSetRating([3, 5], 4, user);
+
+      expect(bookMetadataLockService.getBookIdsWithLockedField).toHaveBeenCalledWith([3, 5], 'rating');
+      expect(bookRepo.bulkSetRating).toHaveBeenCalledWith([3], 4, 42);
+      expect(fileWriteService.scheduleWrite).toHaveBeenCalledTimes(1);
+      expect(fileWriteService.scheduleWrite).toHaveBeenCalledWith(3, 'auto', 42);
+      expect(scoreService.calculateAndSave).toHaveBeenCalledTimes(1);
+      expect(scoreService.calculateAndSave).toHaveBeenCalledWith(3);
+    });
+
+    it('bulkSetMetadata updates a single metadata field and queues follow-up work', async () => {
+      const { service, bookRepo, fileWriteService, scoreService } = makeService();
+      const user = makeUser({ id: 11 });
+      vi.spyOn(service, 'verifyLibraryAccessForBookIds').mockResolvedValue(undefined);
+
+      await service.bulkSetMetadata([7, 9], 'language', 'fr', user);
+
+      expect(bookRepo.bulkUpdateMetadataFields).toHaveBeenCalledWith(
+        [7, 9],
+        expect.objectContaining({ language: 'fr', updatedAt: expect.any(Date) }),
+      );
+      expect(fileWriteService.scheduleWrite).toHaveBeenNthCalledWith(1, 7, 'auto', 11);
+      expect(fileWriteService.scheduleWrite).toHaveBeenNthCalledWith(2, 9, 'auto', 11);
+      expect(scoreService.calculateAndSave).toHaveBeenNthCalledWith(1, 7);
+      expect(scoreService.calculateAndSave).toHaveBeenNthCalledWith(2, 9);
+    });
+
+    it('bulkSetMetadata skips books where the field is metadata-locked', async () => {
+      const { service, bookRepo, fileWriteService, scoreService, bookMetadataLockService } = makeService();
+      const user = makeUser({ id: 11 });
+      vi.spyOn(service, 'verifyLibraryAccessForBookIds').mockResolvedValue(undefined);
+      bookMetadataLockService.getBookIdsWithLockedField.mockResolvedValue(new Set([9]));
+
+      await service.bulkSetMetadata([7, 9], 'language', 'fr', user);
+
+      expect(bookMetadataLockService.getBookIdsWithLockedField).toHaveBeenCalledWith([7, 9], 'language');
+      expect(bookRepo.bulkUpdateMetadataFields).toHaveBeenCalledWith([7], expect.objectContaining({ language: 'fr', updatedAt: expect.any(Date) }));
+      expect(fileWriteService.scheduleWrite).toHaveBeenCalledTimes(1);
+      expect(fileWriteService.scheduleWrite).toHaveBeenCalledWith(7, 'auto', 11);
+      expect(scoreService.calculateAndSave).toHaveBeenCalledTimes(1);
+      expect(scoreService.calculateAndSave).toHaveBeenCalledWith(7);
+    });
+
+    it('bulkSetMetadata replaces relation fields in a transaction', async () => {
+      const { service, bookRepo, metadataService, fileWriteService, scoreService } = makeService();
+      const user = makeUser({ id: 11 });
+      const tx = { select: vi.fn(), delete: vi.fn(), insert: vi.fn(), update: vi.fn() };
+      bookRepo.withTransaction.mockImplementation(async (callback: (value: unknown) => Promise<unknown>) => callback(tx));
+      vi.spyOn(service, 'verifyLibraryAccessForBookIds').mockResolvedValue(undefined);
+
+      await service.bulkSetMetadata([7, 9], 'tags', ['favorite', 'reading'], user);
+
+      expect(metadataService.replaceTags).toHaveBeenNthCalledWith(1, 7, ['favorite', 'reading'], { executor: tx });
+      expect(metadataService.replaceTags).toHaveBeenNthCalledWith(2, 9, ['favorite', 'reading'], { executor: tx });
+      expect(fileWriteService.scheduleWrite).toHaveBeenNthCalledWith(1, 7, 'auto', 11);
+      expect(fileWriteService.scheduleWrite).toHaveBeenNthCalledWith(2, 9, 'auto', 11);
+      expect(scoreService.calculateAndSave).toHaveBeenNthCalledWith(1, 7);
+      expect(scoreService.calculateAndSave).toHaveBeenNthCalledWith(2, 9);
+    });
+
+    it('bulkSetMetadata replaces narrators for editable books only', async () => {
+      const { service, bookRepo, narratorService, fileWriteService, scoreService, bookMetadataLockService } = makeService();
+      const user = makeUser({ id: 11 });
+      const tx = { select: vi.fn(), delete: vi.fn(), insert: vi.fn(), update: vi.fn() };
+      bookRepo.withTransaction.mockImplementation(async (callback: (value: unknown) => Promise<unknown>) => callback(tx));
+      vi.spyOn(service, 'verifyLibraryAccessForBookIds').mockResolvedValue(undefined);
+      bookMetadataLockService.getBookIdsWithLockedField.mockResolvedValue(new Set([9]));
+
+      await service.bulkSetMetadata([7, 9], 'narrators', ['Narrator A'], user);
+
+      expect(narratorService.replaceForBook).toHaveBeenCalledTimes(1);
+      expect(narratorService.replaceForBook).toHaveBeenCalledWith(7, ['Narrator A'], { executor: tx });
+      expect(fileWriteService.scheduleWrite).toHaveBeenCalledTimes(1);
+      expect(fileWriteService.scheduleWrite).toHaveBeenCalledWith(7, 'auto', 11);
+      expect(scoreService.calculateAndSave).toHaveBeenCalledTimes(1);
+      expect(scoreService.calculateAndSave).toHaveBeenCalledWith(7);
+    });
+
     it('bulkUpdateTags performs all tag changes in one transaction and queues follow-up work', async () => {
       const { service, bookRepo, metadataService, fileWriteService, scoreService } = makeService();
       const user = makeUser({ id: 11 });
@@ -1992,4 +2377,235 @@ describe('BookService', () => {
       expect(plan.files.map((file) => file.absolutePath)).toEqual(['/books/alpha.epub', '/books/zeta.epub']);
     });
   });
+
+  describe('executeBooksQuery', () => {
+    const emptyCardQueryResult = {
+      rows: [],
+      authorRows: [],
+      fileRows: [],
+      genreRows: [],
+      tagRows: [],
+      progressRows: [],
+      statusRows: [],
+      narratorRows: [],
+      total: 0,
+    };
+
+    afterEach(() => {
+      vi.restoreAllMocks();
+    });
+
+    it('returns results from findCards when collapseSeries is false', async () => {
+      const { service, bookRepo, queryBuilder } = makeService();
+      const query: BookQuery = {
+        pagination: { page: 0, size: 50 },
+        sort: [{ field: 'title', dir: 'asc' }],
+        filter: undefined,
+        collapseSeries: false,
+      };
+      queryBuilder.buildOrderBy.mockReturnValue('order-by');
+      bookRepo.findCards.mockResolvedValue(emptyCardQueryResult);
+
+      const result = await service.executeBooksQuery(12, undefined, query);
+
+      expect(queryBuilder.buildOrderBy).toHaveBeenCalledWith(query.sort, 12);
+      expect(bookRepo.findCards).toHaveBeenCalledWith({
+        where: undefined,
+        orderBy: 'order-by',
+        limit: 50,
+        offset: 0,
+        userId: 12,
+      });
+      expect(bookRepo.findCardsCollapsed).not.toHaveBeenCalled();
+      expect(result).toEqual({ items: [], total: 0, page: 0, size: 50 });
+    });
+
+    it('returns results from findCardsCollapsed when collapseSeries is true', async () => {
+      const { service, bookRepo, queryBuilder } = makeService();
+      const hasSeriesFilterSpy = vi.spyOn(BookQueryBuilder, 'hasSeriesFilter').mockReturnValue(false);
+      const query: BookQuery = {
+        pagination: { page: 1, size: 25 },
+        sort: [{ field: 'title', dir: 'asc' }],
+        filter: undefined,
+        collapseSeries: true,
+      };
+      bookRepo.findCardsCollapsed.mockResolvedValue(emptyCardQueryResult);
+
+      const result = await service.executeBooksQuery(12, 'where' as never, query);
+
+      expect(hasSeriesFilterSpy).toHaveBeenCalledWith(undefined);
+      expect(bookRepo.findCardsCollapsed).toHaveBeenCalledWith({
+        where: 'where',
+        sort: query.sort,
+        limit: 25,
+        offset: 25,
+        userId: 12,
+      });
+      expect(bookRepo.findCards).not.toHaveBeenCalled();
+      expect(queryBuilder.buildOrderBy).not.toHaveBeenCalled();
+      expect(result).toEqual({ items: [], total: 0, page: 1, size: 25 });
+    });
+
+    it('does not call logger.warn when query completes fast', async () => {
+      const { service, bookRepo, queryBuilder } = makeService();
+      const warnSpy = vi.spyOn((service as unknown as { logger: Logger }).logger, 'warn').mockImplementation(() => undefined);
+      vi.spyOn(Date, 'now').mockReturnValueOnce(0).mockReturnValueOnce(400);
+      queryBuilder.buildOrderBy.mockReturnValue('order-by');
+      bookRepo.findCards.mockResolvedValue(emptyCardQueryResult);
+
+      await service.executeBooksQuery(12, undefined, {
+        pagination: { page: 0, size: 50 },
+        sort: [],
+        filter: undefined,
+        collapseSeries: false,
+      });
+
+      expect(warnSpy).not.toHaveBeenCalled();
+    });
+
+    it('calls logger.warn when a non-collapsed query is slow', async () => {
+      const { service, bookRepo, queryBuilder } = makeService();
+      const warnSpy = vi.spyOn((service as unknown as { logger: Logger }).logger, 'warn').mockImplementation(() => undefined);
+      vi.spyOn(Date, 'now').mockReturnValueOnce(0).mockReturnValueOnce(600);
+      queryBuilder.buildOrderBy.mockReturnValue('order-by');
+      bookRepo.findCards.mockResolvedValue(emptyCardQueryResult);
+
+      await service.executeBooksQuery(12, undefined, {
+        pagination: { page: 0, size: 50 },
+        sort: [],
+        filter: undefined,
+        collapseSeries: false,
+      });
+
+      expect(warnSpy).toHaveBeenCalledTimes(1);
+      expect(warnSpy).toHaveBeenCalledWith(
+        '[book.list_query] [end] userId=12 page=0 size=50 filterCount=0 sortFields=0 collapseSeries=false resultCount=0 durationMs=600 - slow query',
+      );
+    });
+
+    it('calls logger.warn when a collapsed query is slow', async () => {
+      const { service, bookRepo } = makeService();
+      const warnSpy = vi.spyOn((service as unknown as { logger: Logger }).logger, 'warn').mockImplementation(() => undefined);
+      vi.spyOn(Date, 'now').mockReturnValueOnce(0).mockReturnValueOnce(600);
+      vi.spyOn(BookQueryBuilder, 'hasSeriesFilter').mockReturnValue(false);
+      bookRepo.findCardsCollapsed.mockResolvedValue(emptyCardQueryResult);
+
+      await service.executeBooksQuery(12, undefined, {
+        pagination: { page: 0, size: 50 },
+        sort: [],
+        filter: undefined,
+        collapseSeries: true,
+      });
+
+      expect(warnSpy).toHaveBeenCalledTimes(1);
+      expect(warnSpy).toHaveBeenCalledWith(
+        '[book.list_query] [end] userId=12 page=0 size=50 filterCount=0 sortFields=0 collapseSeries=true resultCount=0 durationMs=600 - slow query',
+      );
+    });
+
+    it('includes the expected fields in the slow-query warning message', async () => {
+      const { service, bookRepo, queryBuilder } = makeService();
+      const warnSpy = vi.spyOn((service as unknown as { logger: Logger }).logger, 'warn').mockImplementation(() => undefined);
+      vi.spyOn(Date, 'now').mockReturnValueOnce(0).mockReturnValueOnce(900);
+      queryBuilder.buildOrderBy.mockReturnValue('order-by');
+      bookRepo.findCards.mockResolvedValue(emptyCardQueryResult);
+
+      await service.executeBooksQuery(77, undefined, {
+        pagination: { page: 2, size: 25 },
+        sort: [
+          { field: 'title', dir: 'asc' },
+          { field: 'author', dir: 'desc' },
+        ],
+        filter: {
+          type: 'group',
+          join: 'AND',
+          rules: [
+            { type: 'rule', field: 'title', operator: 'contains', value: 'space' },
+            { type: 'rule', field: 'language', operator: 'eq', value: 'en' },
+          ],
+        },
+        collapseSeries: false,
+      });
+
+      expect(warnSpy).toHaveBeenCalledWith(
+        '[book.list_query] [end] userId=77 page=2 size=25 filterCount=2 sortFields=2 collapseSeries=false resultCount=0 durationMs=900 - slow query',
+      );
+    });
+  });
+
+  describe('resolveSelectionToIds', () => {
+    it('verifies access and returns explicit book ids', async () => {
+      const { service } = makeService();
+      const user = makeUser();
+      const verifySpy = vi.spyOn(service, 'verifyLibraryAccessForBookIds').mockResolvedValue(undefined);
+
+      await expect(service.resolveSelectionToIds({ bookIds: [1, 2] }, user)).resolves.toEqual([1, 2]);
+      expect(verifySpy).toHaveBeenCalledWith([1, 2], user);
+    });
+
+    it('throws when bookIds and query are both provided', async () => {
+      const { service } = makeService();
+
+      await expect(service.resolveSelectionToIds({ bookIds: [1], query: {} }, makeUser())).rejects.toThrow(BadRequestException);
+    });
+
+    it('propagates library access errors for explicit book ids', async () => {
+      const { service } = makeService();
+      const error = new ForbiddenException('no access');
+      vi.spyOn(service, 'verifyLibraryAccessForBookIds').mockRejectedValue(error);
+
+      await expect(service.resolveSelectionToIds({ bookIds: [1, 2] }, makeUser())).rejects.toBe(error);
+    });
+
+    it('resolves query selections across all accessible libraries', async () => {
+      const { service, bookRepo, libraryService, queryBuilder } = makeService();
+      const user = makeUser({ id: 42 });
+      const filter = { type: 'group', join: 'AND', rules: [] } as const;
+      libraryService.findAll.mockResolvedValue([{ id: 5 }, { id: 9 }]);
+      queryBuilder.buildWhere.mockReturnValue('where-clause');
+      bookRepo.findIdsByWhere.mockResolvedValue([10, 11]);
+
+      await expect(service.resolveSelectionToIds({ query: { filter, q: 'dune' } }, user)).resolves.toEqual([10, 11]);
+      expect(libraryService.findAll).toHaveBeenCalledWith(user);
+      expect(queryBuilder.buildWhere).toHaveBeenCalledWith(filter, {
+        accessibleLibraryIds: [5, 9],
+        implicitLibraryId: undefined,
+        userId: 42,
+        q: 'dune',
+      });
+      expect(bookRepo.findIdsByWhere).toHaveBeenCalledWith('where-clause');
+    });
+
+    it('restricts query selections to the requested accessible library', async () => {
+      const { service, bookRepo, libraryService, queryBuilder } = makeService();
+      const user = makeUser({ id: 7 });
+      libraryService.findAll.mockResolvedValue([{ id: 5 }, { id: 9 }]);
+      queryBuilder.buildWhere.mockReturnValue('library-where');
+      bookRepo.findIdsByWhere.mockResolvedValue([22]);
+
+      await expect(service.resolveSelectionToIds({ query: { libraryId: 9 } }, user)).resolves.toEqual([22]);
+      expect(queryBuilder.buildWhere).toHaveBeenCalledWith(undefined, {
+        accessibleLibraryIds: [9],
+        implicitLibraryId: 9,
+        userId: 7,
+        q: undefined,
+      });
+      expect(bookRepo.findIdsByWhere).toHaveBeenCalledWith('library-where');
+    });
+
+    it('rejects query selections for inaccessible libraries', async () => {
+      const { service, libraryService, queryBuilder, bookRepo } = makeService();
+      libraryService.findAll.mockResolvedValue([{ id: 5 }]);
+
+      await expect(service.resolveSelectionToIds({ query: { libraryId: 9 } }, makeUser())).rejects.toThrow(ForbiddenException);
+      expect(queryBuilder.buildWhere).not.toHaveBeenCalled();
+      expect(bookRepo.findIdsByWhere).not.toHaveBeenCalled();
+    });
+
+    it('throws when neither bookIds nor query is provided', async () => {
+      const { service } = makeService();
+
+      await expect(service.resolveSelectionToIds({}, makeUser())).rejects.toThrow(BadRequestException);
+    });
+  });
 });
diff --git a/server/src/modules/book/book.service.ts b/server/src/modules/book/book.service.ts
index 330022c48..78c0a83d2 100644
--- a/server/src/modules/book/book.service.ts
+++ b/server/src/modules/book/book.service.ts
@@ -1,5 +1,6 @@
 import {
   BadRequestException,
+  ForbiddenException,
   HttpException,
   HttpStatus,
   Injectable,
@@ -10,7 +11,7 @@ import {
 } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { access, readdir, rm, stat } from 'fs/promises';
-import type { SQL } from 'drizzle-orm';
+import { inArray, type SQL } from 'drizzle-orm';
 
 import { bookCoverDirPath, bookThumbnailPath, findPreferredBookCoverFileName } from '../../common/book-cover-storage';
 import { MAX_OFFSET_ROWS, isOffsetWithinLimit } from '../../common/constants/pagination.constants';
@@ -19,7 +20,7 @@ import { extractCbzMetadata, extractCbrMetadata, extractCb7Metadata } from '../m
 import { parseFb2File } from '../metadata/lib/fb2-parser';
 import { parseMobiFile } from '../metadata/lib/mobi-parser';
 import { parsePdfFile, type PdfParseWarning } from '../metadata/lib/pdf-parser';
-import { basename, extname, join } from 'path';
+import { basename, dirname, extname, join } from 'path';
 
 import {
   BOOK_METADATA_LOCK_FIELDS,
@@ -37,6 +38,7 @@ import { BookEmbedderService } from '../embedding/book-embedder.service';
 import { MetadataService } from '../metadata/metadata.service';
 import { MetadataScoreService } from '../metadata-score/metadata-score.service';
 import { LibraryService } from '../library/library.service';
+import { books } from '../../db/schema';
 import { MetadataFetchPipeline, ResolvedMetadataFields } from '../metadata-fetch/metadata-fetch-pipeline';
 import type { MetadataSearchParams } from '../metadata-fetch/providers/metadata-search-params';
 import { FileWriteService } from '../file-write/file-write.service';
@@ -47,6 +49,10 @@ import { BookQueryBuilder } from './book-query-builder.service';
 import { BookRepository } from './book.repository';
 import { ComicMetadataRepository } from '../metadata/comic-metadata.repository';
 import { BookDetailDto } from './dto/book-detail.dto';
+import type { BulkMetadataField } from './dto/bulk-set-metadata.dto';
+import type { BulkSelectionDto } from './dto/bulk-selection.dto';
+import type { MetadataExportDto, MetadataExportFormat, MetadataExportViewType } from './dto/metadata-export.dto';
+import type { MetadataExportColumnMode } from './dto/metadata-export-options.dto';
 import { SaveProgressDto } from './dto/save-progress.dto';
 import { UpsertAudioProgressDto } from './dto/upsert-audio-progress.dto';
 import { UpdateBookMetadataDto } from './dto/update-book-metadata.dto';
@@ -63,6 +69,16 @@ const METADATA_UPDATE_FAILPOINTS = [
 
 export type MetadataUpdateFailpoint = (typeof METADATA_UPDATE_FAILPOINTS)[number];
 export type ExportScope = 'primary' | 'all' | 'audio';
+const BULK_METADATA_LOCK_FIELD_BY_FIELD: Record<BulkMetadataField, BookMetadataLockField> = {
+  seriesName: 'seriesName',
+  publisher: 'publisher',
+  language: 'language',
+  publishedYear: 'publishedYear',
+  authors: 'authors',
+  genres: 'genres',
+  tags: 'tags',
+  narrators: 'narrators',
+};
 
 const EXPORT_LIMITS = {
   MAX_BOOKS: 250,
@@ -86,6 +102,59 @@ export type ExportPlan = {
   scope: ExportScope;
 };
 
+const METADATA_EXPORT_SCHEMA_VERSION = 1 as const;
+
+const METADATA_EXPORT_LIMITS = {
+  MAX_ROWS: 100_000,
+  MAX_ESTIMATED_BYTES: 120 * 1024 * 1024,
+} as const;
+
+type MetadataExportSizeCategory = 'small' | 'medium' | 'large';
+
+type MetadataExportResolvedOptions = {
+  includePersonalData: boolean;
+  includeFilePaths: boolean;
+  includeContextMeta: boolean;
+  columnsMode: MetadataExportColumnMode;
+  visibleColumns: string[];
+  viewType: MetadataExportViewType;
+};
+
+type MetadataExportSelectionScope = 'selected' | 'all-matching';
+
+type MetadataExportPreflight = {
+  schemaVersion: number;
+  rowCount: number;
+  estimatedBytes: number;
+  sizeCategory: MetadataExportSizeCategory;
+  fileName: string;
+  scope: MetadataExportSelectionScope;
+  format: MetadataExportFormat;
+};
+
+type MetadataExportContextMeta = {
+  exportedAt: string;
+  exportedByUserId: number;
+  viewType: MetadataExportViewType;
+  scope: MetadataExportSelectionScope;
+  format: MetadataExportFormat;
+  rowCount: number;
+  options: MetadataExportResolvedOptions;
+  query?: {
+    libraryId?: number;
+    q?: string;
+    sort?: { field: string; dir: string }[];
+    filterApplied: boolean;
+  };
+};
+
+type MetadataExportBuildResult = {
+  preflight: MetadataExportPreflight;
+  content: string;
+  contentType: string;
+  fileName: string;
+};
+
 @Injectable()
 export class BookService {
   private readonly logger = new Logger(BookService.name);
@@ -186,6 +255,34 @@ export class BookService {
     return file;
   }
 
+  async resolveSelectionToIds(dto: BulkSelectionDto, user: RequestUser): Promise<number[]> {
+    if (dto.bookIds && dto.query) {
+      throw new BadRequestException('bookIds and query are mutually exclusive');
+    }
+    if (dto.bookIds) {
+      await this.verifyLibraryAccessForBookIds(dto.bookIds, user);
+      return dto.bookIds;
+    }
+    if (dto.query) {
+      const libs = await this.libraryService.findAll(user);
+      let accessibleLibraryIds = libs.map((l) => l.id);
+      if (dto.query.libraryId !== undefined) {
+        if (!accessibleLibraryIds.includes(dto.query.libraryId)) {
+          throw new ForbiddenException(`Library ${dto.query.libraryId} is not accessible`);
+        }
+        accessibleLibraryIds = [dto.query.libraryId];
+      }
+      const where = this.queryBuilder.buildWhere(dto.query.filter, {
+        accessibleLibraryIds,
+        implicitLibraryId: dto.query.libraryId,
+        userId: user.id,
+        q: dto.query.q,
+      });
+      return this.bookRepo.findIdsByWhere(where);
+    }
+    throw new BadRequestException('Either bookIds or query must be provided');
+  }
+
   acquireExportSlot(userId: number): () => void {
     const current = this.activeExportCounts.get(userId) ?? 0;
     if (current >= EXPORT_LIMITS.MAX_CONCURRENT_PER_USER) {
@@ -210,6 +307,445 @@ export class BookService {
     };
   }
 
+  private resolveMetadataExportOptions(dto: MetadataExportDto): MetadataExportResolvedOptions {
+    return {
+      includePersonalData: dto.options?.includePersonalData ?? false,
+      includeFilePaths: dto.options?.includeFilePaths ?? false,
+      includeContextMeta: dto.options?.includeContextMeta ?? true,
+      columnsMode: dto.options?.columnsMode ?? 'canonical',
+      visibleColumns: dto.options?.visibleColumns ?? [],
+      viewType: dto.viewType ?? 'library',
+    };
+  }
+
+  private resolveMetadataExportScope(dto: BulkSelectionDto): MetadataExportSelectionScope {
+    return dto.query ? 'all-matching' : 'selected';
+  }
+
+  private resolveMetadataExportFileName(viewType: MetadataExportViewType, scope: MetadataExportSelectionScope, format: MetadataExportFormat): string {
+    const date = new Date().toISOString().slice(0, 10);
+    return `bookorbit-${viewType}-${scope}-${date}.${format}`;
+  }
+
+  private estimateMetadataExportBytes(rowCount: number, format: MetadataExportFormat, options: MetadataExportResolvedOptions): number {
+    const basePerRow = format === 'json' ? 1150 : 520;
+    const personalExtra = options.includePersonalData ? 160 : 0;
+    const pathExtra = options.includeFilePaths ? 260 : 0;
+    const contextExtra = options.includeContextMeta ? 2200 : 0;
+    return Math.max(0, rowCount * (basePerRow + personalExtra + pathExtra) + contextExtra);
+  }
+
+  private resolveMetadataExportSizeCategory(estimatedBytes: number): MetadataExportSizeCategory {
+    if (estimatedBytes < 5 * 1024 * 1024) return 'small';
+    if (estimatedBytes < 25 * 1024 * 1024) return 'medium';
+    return 'large';
+  }
+
+  private normalizeExportSort(sort: unknown): BookQuery['sort'] {
+    if (!Array.isArray(sort)) return [];
+    return sort
+      .map((entry) => {
+        const field =
+          typeof (entry as { field?: unknown })?.field === 'string'
+            ? ((entry as { field: string }).field as BookQuery['sort'][number]['field'])
+            : null;
+        const dir =
+          typeof (entry as { dir?: unknown })?.dir === 'string' ? ((entry as { dir: string }).dir as BookQuery['sort'][number]['dir']) : null;
+        if (!field || !dir) return null;
+        if (dir !== 'asc' && dir !== 'desc') return null;
+        return { field, dir };
+      })
+      .filter((entry): entry is BookQuery['sort'][number] => entry !== null);
+  }
+
+  private async resolveMetadataExportRows(
+    dto: MetadataExportDto,
+    user: RequestUser,
+  ): Promise<{
+    rows: BooksPage['items'];
+    rowCount: number;
+    scope: MetadataExportSelectionScope;
+    queryMeta?: MetadataExportContextMeta['query'];
+  }> {
+    if (dto.query) {
+      const libraries = await this.libraryService.findAll(user);
+      let accessibleLibraryIds = libraries.map((library) => library.id);
+      if (dto.query.libraryId !== undefined) {
+        if (!accessibleLibraryIds.includes(dto.query.libraryId)) {
+          throw new ForbiddenException(`Library ${dto.query.libraryId} is not accessible`);
+        }
+        accessibleLibraryIds = [dto.query.libraryId];
+      }
+      const where = this.queryBuilder.buildWhere(dto.query.filter, {
+        accessibleLibraryIds,
+        implicitLibraryId: dto.query.libraryId,
+        userId: user.id,
+        q: dto.query.q,
+      });
+      const rowCount = await this.bookRepo.countWhere(where);
+      if (rowCount === 0) throw new BadRequestException('No books matched export selection');
+      if (rowCount > METADATA_EXPORT_LIMITS.MAX_ROWS) {
+        throw new BadRequestException(`Too many rows selected for metadata export. Limit is ${METADATA_EXPORT_LIMITS.MAX_ROWS}.`);
+      }
+      const sort = this.normalizeExportSort(dto.query.sort);
+      const page = await this.executeBooksQuery(user.id, where, {
+        filter: dto.query.filter,
+        sort,
+        pagination: { page: 0, size: rowCount },
+        q: dto.query.q,
+      });
+      return {
+        rows: page.items,
+        rowCount,
+        scope: 'all-matching',
+        queryMeta: {
+          libraryId: dto.query.libraryId,
+          q: dto.query.q,
+          sort: sort.map((spec) => ({ field: spec.field, dir: spec.dir })),
+          filterApplied: !!dto.query.filter,
+        },
+      };
+    }
+
+    const uniqueIds = [...new Set(dto.bookIds ?? [])];
+    if (uniqueIds.length === 0) throw new BadRequestException('No books selected for metadata export');
+    if (uniqueIds.length > METADATA_EXPORT_LIMITS.MAX_ROWS) {
+      throw new BadRequestException(`Too many rows selected for metadata export. Limit is ${METADATA_EXPORT_LIMITS.MAX_ROWS}.`);
+    }
+    const rows = await this.verifyLibraryAccessForBookIds(uniqueIds, user);
+    const foundIds = new Set(rows.map((row) => row.id));
+    const missingIds = uniqueIds.filter((id) => !foundIds.has(id));
+    if (missingIds.length > 0) {
+      throw new BadRequestException(`Some selected books were not found: ${missingIds.join(', ')}`);
+    }
+
+    const sort = this.normalizeExportSort(dto.sort);
+    const page = await this.executeBooksQuery(user.id, inArray(books.id, uniqueIds), {
+      filter: undefined,
+      sort,
+      pagination: { page: 0, size: uniqueIds.length },
+    });
+    return {
+      rows: page.items,
+      rowCount: page.items.length,
+      scope: 'selected',
+    };
+  }
+
+  private async resolveMetadataExportSelectionCount(
+    dto: MetadataExportDto,
+    user: RequestUser,
+  ): Promise<{
+    rowCount: number;
+    scope: MetadataExportSelectionScope;
+  }> {
+    if (dto.query) {
+      const libraries = await this.libraryService.findAll(user);
+      let accessibleLibraryIds = libraries.map((library) => library.id);
+      if (dto.query.libraryId !== undefined) {
+        if (!accessibleLibraryIds.includes(dto.query.libraryId)) {
+          throw new ForbiddenException(`Library ${dto.query.libraryId} is not accessible`);
+        }
+        accessibleLibraryIds = [dto.query.libraryId];
+      }
+      const where = this.queryBuilder.buildWhere(dto.query.filter, {
+        accessibleLibraryIds,
+        implicitLibraryId: dto.query.libraryId,
+        userId: user.id,
+        q: dto.query.q,
+      });
+      const rowCount = await this.bookRepo.countWhere(where);
+      if (rowCount === 0) throw new BadRequestException('No books matched export selection');
+      return { rowCount, scope: 'all-matching' };
+    }
+
+    const uniqueIds = [...new Set(dto.bookIds ?? [])];
+    if (uniqueIds.length === 0) throw new BadRequestException('No books selected for metadata export');
+    await this.verifyLibraryAccessForBookIds(uniqueIds, user);
+    const rows = await this.bookRepo.findLibraryIdsByBookIds(uniqueIds);
+    const foundIds = new Set(rows.map((row) => row.id));
+    const missingIds = uniqueIds.filter((id) => !foundIds.has(id));
+    if (missingIds.length > 0) {
+      throw new BadRequestException(`Some selected books were not found: ${missingIds.join(', ')}`);
+    }
+    return { rowCount: uniqueIds.length, scope: 'selected' };
+  }
+
+  private resolveVisibleExportKeys(visibleColumns: string[], options: MetadataExportResolvedOptions): string[] {
+    const keyMap: Record<string, string[]> = {
+      title: ['title'],
+      subtitle: ['subtitle'],
+      authors: ['authors'],
+      seriesName: ['seriesName'],
+      seriesIndex: ['seriesIndex'],
+      publishedYear: ['publishedYear'],
+      language: ['language'],
+      genres: ['genres'],
+      tags: ['tags'],
+      narrators: ['narrators'],
+      publisher: ['publisher'],
+      pageCount: ['pageCount'],
+      isbn13: ['isbn13'],
+      metadataScore: ['metadataScore'],
+      addedAt: ['addedAt'],
+      updatedAt: ['updatedAt'],
+      format: ['primaryFormat', 'formats'],
+      fileSize: ['totalFileSizeBytes'],
+      rating: ['rating'],
+      readingProgress: ['readProgress'],
+      finishedAt: ['readFinishedAt'],
+      readStatus: ['readStatus'],
+    };
+    const required = ['bookId', 'libraryId', 'libraryName'];
+    const resolved = new Set<string>(required);
+    for (const columnId of visibleColumns) {
+      for (const key of keyMap[columnId] ?? []) {
+        resolved.add(key);
+      }
+    }
+    if (options.includeFilePaths) {
+      resolved.add('folderPath');
+      resolved.add('filePaths');
+    }
+    return [...resolved];
+  }
+
+  private resolveCanonicalExportKeys(options: MetadataExportResolvedOptions): string[] {
+    const keys = [
+      'bookId',
+      'libraryId',
+      'libraryName',
+      'status',
+      'title',
+      'subtitle',
+      'authors',
+      'seriesName',
+      'seriesIndex',
+      'publishedYear',
+      'language',
+      'publisher',
+      'pageCount',
+      'isbn13',
+      'genres',
+      'tags',
+      'narrators',
+      'metadataScore',
+      'hasCover',
+      'hasMetadataLocks',
+      'lockedFields',
+      'addedAt',
+      'updatedAt',
+      'fileCount',
+      'primaryFormat',
+      'formats',
+      'totalFileSizeBytes',
+      'rating',
+      'readProgress',
+      'readStatus',
+      'readStartedAt',
+      'readFinishedAt',
+      'readUpdatedAt',
+    ];
+    if (!options.includePersonalData) {
+      // Keep schema stable by retaining personal-data fields but emitting null values.
+    }
+    if (options.includeFilePaths) {
+      keys.push('folderPath', 'filePaths');
+    }
+    return keys;
+  }
+
+  private csvCell(value: string | number | boolean | null | undefined): string {
+    if (value === null || value === undefined) return '';
+    const text = String(value);
+    if (!/[",\n]/.test(text)) return text;
+    return `"${text.replace(/"/g, '""')}"`;
+  }
+
+  private projectExportRow(record: Record<string, unknown>, keys: string[]): Record<string, unknown> {
+    const projected: Record<string, unknown> = {};
+    for (const key of keys) projected[key] = record[key];
+    return projected;
+  }
+
+  private serializeCsvRows(rows: Record<string, unknown>[], keys: string[], meta: MetadataExportContextMeta, includeContextMeta: boolean): string {
+    const lines: string[] = ['\uFEFF'];
+    if (includeContextMeta) {
+      lines.push(`# schemaVersion=${METADATA_EXPORT_SCHEMA_VERSION}`);
+      lines.push(`# exportedAt=${meta.exportedAt}`);
+      lines.push(`# viewType=${meta.viewType}`);
+      lines.push(`# scope=${meta.scope}`);
+      lines.push(`# rowCount=${meta.rowCount}`);
+    }
+    lines.push(keys.join(','));
+    for (const row of rows) {
+      const values = keys.map((key) => {
+        const value = row[key];
+        if (Array.isArray(value)) return this.csvCell(value.join('; '));
+        if (value !== null && typeof value === 'object') return this.csvCell(JSON.stringify(value));
+        return this.csvCell(value as string | number | boolean | null | undefined);
+      });
+      lines.push(values.join(','));
+    }
+    return lines.join('\n');
+  }
+
+  async getMetadataExportPreflight(dto: MetadataExportDto, user: RequestUser): Promise<MetadataExportPreflight> {
+    const options = this.resolveMetadataExportOptions(dto);
+    const { rowCount, scope } = await this.resolveMetadataExportSelectionCount(dto, user);
+    if (rowCount > METADATA_EXPORT_LIMITS.MAX_ROWS) {
+      throw new BadRequestException(`Too many rows selected for metadata export. Limit is ${METADATA_EXPORT_LIMITS.MAX_ROWS}.`);
+    }
+    const estimatedBytes = this.estimateMetadataExportBytes(rowCount, dto.format, options);
+    if (estimatedBytes > METADATA_EXPORT_LIMITS.MAX_ESTIMATED_BYTES) {
+      throw new BadRequestException(
+        `Metadata export is too large. Estimated size exceeds ${METADATA_EXPORT_LIMITS.MAX_ESTIMATED_BYTES} bytes. Refine your filters.`,
+      );
+    }
+    return {
+      schemaVersion: METADATA_EXPORT_SCHEMA_VERSION,
+      rowCount,
+      estimatedBytes,
+      sizeCategory: this.resolveMetadataExportSizeCategory(estimatedBytes),
+      fileName: this.resolveMetadataExportFileName(options.viewType, scope, dto.format),
+      scope,
+      format: dto.format,
+    };
+  }
+
+  async buildMetadataExport(dto: MetadataExportDto, user: RequestUser): Promise<MetadataExportBuildResult> {
+    const options = this.resolveMetadataExportOptions(dto);
+    const { rows, rowCount, scope, queryMeta } = await this.resolveMetadataExportRows(dto, user);
+    const estimatedBytes = this.estimateMetadataExportBytes(rowCount, dto.format, options);
+    if (estimatedBytes > METADATA_EXPORT_LIMITS.MAX_ESTIMATED_BYTES) {
+      throw new BadRequestException(
+        `Metadata export is too large. Estimated size exceeds ${METADATA_EXPORT_LIMITS.MAX_ESTIMATED_BYTES} bytes. Refine your filters.`,
+      );
+    }
+    const preflight: MetadataExportPreflight = {
+      schemaVersion: METADATA_EXPORT_SCHEMA_VERSION,
+      rowCount,
+      estimatedBytes,
+      sizeCategory: this.resolveMetadataExportSizeCategory(estimatedBytes),
+      fileName: this.resolveMetadataExportFileName(options.viewType, scope, dto.format),
+      scope,
+      format: dto.format,
+    };
+    const bookIds = rows.map((row) => row.id);
+    const [libraryRows, libraries, filePathRows] = await Promise.all([
+      this.bookRepo.findLibraryIdsByBookIds(bookIds),
+      this.libraryService.findAll(user),
+      options.includeFilePaths ? this.bookRepo.findAllFilesByBookIds(bookIds) : Promise.resolve([]),
+    ]);
+
+    const libraryIdByBookId = new Map(libraryRows.map((row) => [row.id, row.libraryId]));
+    const libraryNameById = new Map(libraries.map((library) => [library.id, library.name]));
+    const filePathsByBookId = new Map<number, string[]>();
+    for (const file of filePathRows) {
+      const byBook = filePathsByBookId.get(file.bookId) ?? [];
+      byBook.push(file.absolutePath);
+      filePathsByBookId.set(file.bookId, byBook);
+    }
+
+    const records = rows.map((row) => {
+      const libraryId = libraryIdByBookId.get(row.id) ?? null;
+      const primaryFile = row.files.find((file) => file.role === 'primary') ?? row.files[0] ?? null;
+      const formats = [...new Set(row.files.map((file) => file.format).filter((format): format is string => !!format))];
+      const totalFileSizeBytes = row.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0);
+      const readStatus = options.includePersonalData ? (row.readStatus?.status ?? null) : null;
+      const readStartedAt = options.includePersonalData ? (row.readStatus?.startedAt ?? null) : null;
+      const readFinishedAt = options.includePersonalData ? (row.readStatus?.finishedAt ?? null) : null;
+      const readUpdatedAt = options.includePersonalData ? (row.readStatus?.updatedAt ?? null) : null;
+      const rating = options.includePersonalData ? (row.rating ?? null) : null;
+      const readProgress = options.includePersonalData ? (row.readingProgress ?? null) : null;
+      const filePaths = options.includeFilePaths ? (filePathsByBookId.get(row.id) ?? []) : [];
+      const folderPath = options.includeFilePaths && filePaths.length > 0 ? dirname(filePaths[0]!) : null;
+
+      return {
+        bookId: row.id,
+        libraryId,
+        libraryName: libraryId !== null ? (libraryNameById.get(libraryId) ?? null) : null,
+        status: row.status,
+        title: row.title,
+        subtitle: row.subtitle,
+        authors: row.authors,
+        seriesName: row.seriesName,
+        seriesIndex: row.seriesIndex,
+        publishedYear: row.publishedYear,
+        language: row.language,
+        publisher: row.publisher,
+        pageCount: row.pageCount,
+        isbn13: row.isbn13,
+        genres: row.genres,
+        tags: row.tags,
+        narrators: row.narrators,
+        metadataScore: row.metadataScore,
+        hasCover: row.hasCover,
+        hasMetadataLocks: row.hasMetadataLocks,
+        lockedFields: row.lockedFields,
+        addedAt: row.addedAt,
+        updatedAt: row.updatedAt,
+        fileCount: row.files.length,
+        primaryFormat: primaryFile?.format ?? null,
+        formats,
+        totalFileSizeBytes,
+        rating,
+        readProgress,
+        readStatus,
+        readStartedAt,
+        readFinishedAt,
+        readUpdatedAt,
+        folderPath,
+        filePaths,
+        files: row.files.map((file) => ({
+          id: file.id,
+          format: file.format,
+          role: file.role,
+          sizeBytes: file.sizeBytes,
+        })),
+      } as Record<string, unknown>;
+    });
+
+    const exportKeys =
+      options.columnsMode === 'visible' ? this.resolveVisibleExportKeys(options.visibleColumns, options) : this.resolveCanonicalExportKeys(options);
+    const projected = records.map((record) => this.projectExportRow(record, exportKeys));
+    const contextMeta: MetadataExportContextMeta = {
+      exportedAt: new Date().toISOString(),
+      exportedByUserId: user.id,
+      viewType: options.viewType,
+      scope,
+      format: dto.format,
+      rowCount,
+      options,
+      query: queryMeta,
+    };
+
+    if (dto.format === 'json') {
+      const payload: { schemaVersion: number; items: Record<string, unknown>[]; meta?: MetadataExportContextMeta } = {
+        schemaVersion: METADATA_EXPORT_SCHEMA_VERSION,
+        items: projected,
+      };
+      if (options.includeContextMeta) {
+        payload.meta = contextMeta;
+      }
+      const content = JSON.stringify(payload, null, 2);
+      return {
+        preflight,
+        content,
+        contentType: 'application/json; charset=utf-8',
+        fileName: preflight.fileName,
+      };
+    }
+
+    const content = this.serializeCsvRows(projected, exportKeys, contextMeta, options.includeContextMeta);
+    return {
+      preflight,
+      content,
+      contentType: 'text/csv; charset=utf-8',
+      fileName: preflight.fileName,
+    };
+  }
+
   private assertPaginationWindow(page: number, size: number): void {
     if (!isOffsetWithinLimit(page * size)) {
       throw new BadRequestException(`pagination window is too deep; page * size must be <= ${MAX_OFFSET_ROWS}`);
@@ -236,40 +772,56 @@ export class BookService {
     return this.executeBooksQuery(user.id, where, query);
   }
 
-  private async executeBooksQuery(userId: number, where: SQL | undefined, query: BookQuery): Promise<BooksPage> {
+  async executeBooksQuery(userId: number, where: SQL | undefined, query: BookQuery): Promise<BooksPage> {
+    const start = Date.now();
     const { page, size } = query.pagination;
     const shouldCollapse = query.collapseSeries === true && !BookQueryBuilder.hasSeriesFilter(query.filter);
 
     if (shouldCollapse) {
-      const { rows, authorRows, fileRows, genreRows, progressRows, statusRows, total } = await this.bookRepo.findCardsCollapsed({
-        where,
-        sort: query.sort,
-        limit: size,
-        offset: page * size,
-        userId,
-      });
-      return {
-        items: assembleCollapsedBookCards(rows, authorRows, fileRows, genreRows, progressRows, statusRows),
+      const { rows, authorRows, fileRows, genreRows, tagRows, progressRows, statusRows, narratorRows, total } =
+        await this.bookRepo.findCardsCollapsed({
+          where,
+          sort: query.sort,
+          limit: size,
+          offset: page * size,
+          userId,
+        });
+      const result = {
+        items: assembleCollapsedBookCards(rows, authorRows, fileRows, genreRows, progressRows, statusRows, narratorRows, tagRows),
         total,
         page,
         size,
       };
+      const durationMs = Date.now() - start;
+      if (durationMs >= 500) {
+        this.logger.warn(
+          `[book.list_query] [end] userId=${userId} page=${page} size=${size} filterCount=${query.filter?.rules?.length ?? 0} sortFields=${query.sort?.length ?? 0} collapseSeries=true resultCount=${result.items.length} durationMs=${durationMs} - slow query`,
+        );
+      }
+      return result;
     }
 
     const orderBy = this.queryBuilder.buildOrderBy(query.sort, userId);
-    const { rows, authorRows, fileRows, genreRows, progressRows, statusRows, total } = await this.bookRepo.findCards({
+    const { rows, authorRows, fileRows, genreRows, tagRows, progressRows, statusRows, narratorRows, total } = await this.bookRepo.findCards({
       where,
       orderBy,
       limit: size,
       offset: page * size,
       userId,
     });
-    return {
-      items: assembleBookCards(rows, authorRows, fileRows, genreRows, progressRows, statusRows),
+    const result = {
+      items: assembleBookCards(rows, authorRows, fileRows, genreRows, progressRows, statusRows, narratorRows, tagRows),
       total,
       page,
       size,
     };
+    const durationMs = Date.now() - start;
+    if (durationMs >= 500) {
+      this.logger.warn(
+        `[book.list_query] [end] userId=${userId} page=${page} size=${size} filterCount=${query.filter?.rules?.length ?? 0} sortFields=${query.sort?.length ?? 0} collapseSeries=false resultCount=${result.items.length} durationMs=${durationMs} - slow query`,
+      );
+    }
+    return result;
   }
 
   async getCoverPath(id: number, user: RequestUser): Promise<string | null> {
@@ -758,10 +1310,71 @@ export class BookService {
     const startedAt = Date.now();
     this.logger.log(`[${event}] [start] userId=${user.id} count=${bookIds.length} rating=${rating ?? 'null'} - bulk set rating started`);
     await this.verifyLibraryAccessForBookIds(bookIds, user);
-    await this.bookRepo.bulkSetRating(bookIds, rating, user.id);
-    this.triggerPostMetadataUpdateEffects(bookIds, user.id);
+    const lockedIds = await this.bookMetadataLockService.getBookIdsWithLockedField(bookIds, 'rating');
+    const updatableIds = bookIds.filter((bookId) => !lockedIds.has(bookId));
+    if (updatableIds.length > 0) {
+      await this.bookRepo.bulkSetRating(updatableIds, rating, user.id);
+      this.triggerPostMetadataUpdateEffects(updatableIds, user.id);
+    }
     this.logger.log(
-      `[${event}] [end] userId=${user.id} count=${bookIds.length} rating=${rating ?? 'null'} durationMs=${Date.now() - startedAt} - bulk set rating completed`,
+      `[${event}] [end] userId=${user.id} count=${bookIds.length} rating=${rating ?? 'null'} updated=${updatableIds.length} skippedLocked=${lockedIds.size} durationMs=${Date.now() - startedAt} - bulk set rating completed`,
+    );
+  }
+
+  async bulkSetMetadata(bookIds: number[], field: BulkMetadataField, value: string | number | string[] | null, user: RequestUser): Promise<void> {
+    const event = 'book.bulk.set_metadata';
+    const startedAt = Date.now();
+    this.logger.log(`[${event}] [start] userId=${user.id} count=${bookIds.length} field=${field} - bulk set metadata started`);
+    await this.verifyLibraryAccessForBookIds(bookIds, user);
+    const lockField = BULK_METADATA_LOCK_FIELD_BY_FIELD[field];
+    const lockedIds = await this.bookMetadataLockService.getBookIdsWithLockedField(bookIds, lockField);
+    const updatableIds = bookIds.filter((bookId) => !lockedIds.has(bookId));
+    if (updatableIds.length > 0) {
+      const normalizeListValue = (raw: string | number | string[] | null): string[] => {
+        if (Array.isArray(raw)) return [...new Set(raw.map((entry) => entry.trim()).filter((entry) => entry.length > 0))];
+        if (raw === null) return [];
+        const normalized = String(raw).trim();
+        return normalized.length > 0 ? [normalized] : [];
+      };
+      if (field === 'seriesName' || field === 'publisher' || field === 'language' || field === 'publishedYear') {
+        if (field === 'publishedYear') {
+          const year = value === null ? null : typeof value === 'number' ? value : Number(value);
+          if (year !== null && (!Number.isFinite(year) || !Number.isInteger(year))) {
+            throw new BadRequestException('Invalid publishedYear value');
+          }
+          await this.bookRepo.bulkUpdateMetadataFields(updatableIds, { publishedYear: year, updatedAt: new Date() });
+        } else {
+          const textValue = value === null ? null : String(value).trim();
+          await this.bookRepo.bulkUpdateMetadataFields(updatableIds, { [field]: textValue?.length ? textValue : null, updatedAt: new Date() });
+        }
+      } else {
+        const names = normalizeListValue(value);
+        await this.bookRepo.withTransaction(async (tx) => {
+          for (const bookId of updatableIds) {
+            if (field === 'authors') {
+              await this.metadataService.replaceAuthors(
+                bookId,
+                names.map((name) => ({ name, sortName: null })),
+                { executor: tx },
+              );
+              continue;
+            }
+            if (field === 'genres') {
+              await this.metadataService.replaceGenres(bookId, names, { executor: tx });
+              continue;
+            }
+            if (field === 'tags') {
+              await this.metadataService.replaceTags(bookId, names, { executor: tx });
+              continue;
+            }
+            await this.narratorService.replaceForBook(bookId, names, { executor: tx });
+          }
+        });
+      }
+      this.triggerPostMetadataUpdateEffects(updatableIds, user.id);
+    }
+    this.logger.log(
+      `[${event}] [end] userId=${user.id} count=${bookIds.length} field=${field} updated=${updatableIds.length} skippedLocked=${lockedIds.size} durationMs=${Date.now() - startedAt} - bulk set metadata completed`,
     );
   }
 
@@ -1005,7 +1618,7 @@ export class BookService {
   async bulkRefreshMetadata(
     bookIds: number[],
     user: RequestUser,
-    onProgress?: (bookId: number) => void,
+    onProgress?: (event: { bookId: number; success: boolean; detail?: BookDetailDto; error?: string }) => void,
     options?: { isCancelled?: () => boolean },
   ): Promise<{ processed: number; failed: number }> {
     const event = 'book.bulk_refresh_metadata';
@@ -1027,19 +1640,25 @@ export class BookService {
           cancelled = true;
           break;
         }
+        let success = false;
+        let detail: BookDetailDto | undefined;
+        let errorMessage: string | undefined;
         try {
-          await this.refreshMetadata(id, false, user);
+          const refreshed = await this.refreshMetadata(id, false, user);
+          detail = refreshed as BookDetailDto;
           processed++;
+          success = true;
         } catch (err) {
           const itemErrorClass = err instanceof Error ? err.name : 'Error';
           const itemError = (err instanceof Error ? err.message : String(err)).replace(/"/g, '\\"');
+          errorMessage = err instanceof Error ? err.message : String(err);
           this.logger.warn(
             `[${event}] [fail] bookId=${id} userId=${user.id} durationMs=${Date.now() - startedAt} errorClass=${itemErrorClass} error="${itemError}" - bulk refresh metadata item failed`,
           );
           failed++;
         }
         try {
-          onProgress?.(id);
+          onProgress?.({ bookId: id, success, detail, error: errorMessage });
         } catch {
           callbackInterrupted = true;
           break;
diff --git a/server/src/modules/book/dto/book-dto-validation.test.ts b/server/src/modules/book/dto/book-dto-validation.test.ts
index 062cd7721..c65b54082 100644
--- a/server/src/modules/book/dto/book-dto-validation.test.ts
+++ b/server/src/modules/book/dto/book-dto-validation.test.ts
@@ -4,8 +4,16 @@ import { plainToInstance } from 'class-transformer';
 import { validate } from 'class-validator';
 
 import { BulkBookIdsDto } from './bulk-book-ids.dto';
+import { BulkQuerySelectionDto } from './bulk-query-selection.dto';
+import { BulkSelectionDto } from './bulk-selection.dto';
+import { BulkSetMetadataDto } from './bulk-set-metadata.dto';
+import { BulkSetMetadataLockDto } from './bulk-set-metadata-lock.dto';
+import { BulkSetRatingDto } from './bulk-set-rating.dto';
+import { BulkSetStatusDto } from './bulk-set-status.dto';
+import { BulkUpdateTagsDto } from './bulk-update-tags.dto';
 import { DeleteBooksDto } from './delete-books.dto';
 import { ExportBooksDto } from './export-books.dto';
+import { MetadataExportDto } from './metadata-export.dto';
 import { GetBooksDto } from './get-books.dto';
 import { SaveProgressDto } from './save-progress.dto';
 import { SearchBooksDto } from './search-books.dto';
@@ -24,13 +32,45 @@ async function strictErrorsFor<T extends object>(cls: new () => T, value: Record
 }
 
 describe('Book DTO validation', () => {
-  it('validates book id array DTOs require non-empty integer arrays', async () => {
+  it('validates bulk selection DTOs for explicit ids and query payloads', async () => {
+    expect((await errorsFor(BulkQuerySelectionDto, { libraryId: 5 })).length).toBe(0);
+    expect((await errorsFor(BulkQuerySelectionDto, { filter: { type: 'group', join: 'AND', rules: [] } })).length).toBe(0);
+    expect((await errorsFor(BulkSelectionDto, { bookIds: [1, 2] })).length).toBe(0);
+    expect((await errorsFor(BulkSelectionDto, { query: { libraryId: 5 } })).length).toBe(0);
+    expect((await errorsFor(BulkSelectionDto, { query: { filter: { type: 'group', join: 'AND', rules: [] } } })).length).toBe(0);
+    expect((await errorsFor(BulkSelectionDto, { query: { sort: [{ field: 'title', dir: 'asc' }] } })).length).toBe(0);
+    expect((await errorsFor(BulkSelectionDto, { query: {} })).length).toBe(0);
+    expect((await errorsFor(BulkSelectionDto, {})).length).toBeGreaterThan(0);
+    expect((await errorsFor(BulkSelectionDto, { bookIds: [] })).length).toBeGreaterThan(0);
+    expect((await errorsFor(BulkSelectionDto, { bookIds: ['x'] })).length).toBeGreaterThan(0);
+  });
+
+  it('validates bulk book id DTOs in explicit and query modes', async () => {
     expect((await errorsFor(BulkBookIdsDto, { bookIds: [1, 2] })).length).toBe(0);
+    expect((await errorsFor(BulkBookIdsDto, { query: { libraryId: 5 } })).length).toBe(0);
     expect((await errorsFor(DeleteBooksDto, { bookIds: [3] })).length).toBe(0);
+    expect((await errorsFor(DeleteBooksDto, { query: { filter: { type: 'group', join: 'AND', rules: [] } } })).length).toBe(0);
+    expect((await errorsFor(BulkBookIdsDto, {})).length).toBeGreaterThan(0);
     expect((await errorsFor(BulkBookIdsDto, { bookIds: [] })).length).toBeGreaterThan(0);
     expect((await errorsFor(DeleteBooksDto, { bookIds: ['x'] })).length).toBeGreaterThan(0);
   });
 
+  it('validates bulk action DTOs with bookIds and query selection', async () => {
+    expect((await errorsFor(BulkSetStatusDto, { bookIds: [1], status: 'read' })).length).toBe(0);
+    expect((await errorsFor(BulkSetStatusDto, { query: { libraryId: 5 }, status: 'read' })).length).toBe(0);
+    expect((await errorsFor(BulkSetRatingDto, { bookIds: [1], rating: 4 })).length).toBe(0);
+    expect((await errorsFor(BulkSetRatingDto, { query: {}, rating: 4 })).length).toBe(0);
+    expect((await errorsFor(BulkSetMetadataDto, { bookIds: [1], field: 'language', value: 'fr' })).length).toBe(0);
+    expect((await errorsFor(BulkSetMetadataDto, { query: { libraryId: 5 }, field: 'language', value: 'fr' })).length).toBe(0);
+    expect((await errorsFor(BulkUpdateTagsDto, { bookIds: [1], mode: 'add', tags: ['favorite'] })).length).toBe(0);
+    expect(
+      (await errorsFor(BulkUpdateTagsDto, { query: { filter: { type: 'group', join: 'AND', rules: [] } }, mode: 'replace', tags: ['favorite'] }))
+        .length,
+    ).toBe(0);
+    expect((await errorsFor(BulkSetMetadataLockDto, { bookIds: [1], locked: true })).length).toBe(0);
+    expect((await errorsFor(BulkSetMetadataLockDto, { query: {}, locked: false })).length).toBe(0);
+  });
+
   it('validates export options and boolean allFormats flag', async () => {
     expect((await errorsFor(ExportBooksDto, { bookIds: [1], allFormats: true })).length).toBe(0);
     expect((await errorsFor(ExportBooksDto, { bookIds: [1], audioOnly: true })).length).toBe(0);
@@ -38,6 +78,33 @@ describe('Book DTO validation', () => {
     expect((await errorsFor(ExportBooksDto, { bookIds: [1], audioOnly: 'true' })).length).toBeGreaterThan(0);
   });
 
+  it('validates metadata export dto options and scopes', async () => {
+    expect(
+      (
+        await errorsFor(MetadataExportDto, {
+          bookIds: [1],
+          format: 'csv',
+          viewType: 'library',
+          sort: [{ field: 'title', dir: 'asc' }],
+          options: { includePersonalData: true, includeFilePaths: false, columnsMode: 'canonical' },
+        })
+      ).length,
+    ).toBe(0);
+    expect(
+      (
+        await errorsFor(MetadataExportDto, {
+          query: { libraryId: 3, q: 'dune', sort: [{ field: 'addedAt', dir: 'desc' }] },
+          format: 'json',
+          viewType: 'smartScope',
+          options: { columnsMode: 'visible', visibleColumns: ['title', 'authors'] },
+        })
+      ).length,
+    ).toBe(0);
+    expect((await errorsFor(MetadataExportDto, { bookIds: [1], format: 'xml' })).length).toBeGreaterThan(0);
+    expect((await errorsFor(MetadataExportDto, { bookIds: [1], format: 'csv', options: { columnsMode: 'bad-mode' } })).length).toBeGreaterThan(0);
+    expect((await errorsFor(MetadataExportDto, { bookIds: [1], format: 'csv', viewType: 'series' })).length).toBeGreaterThan(0);
+  });
+
   it('coerces GetBooksDto numeric query values and enforces bounds', async () => {
     const valid = plainToInstance(GetBooksDto, { libraryId: '3', page: '0', size: '50', search: 'dune' });
     const validErrors = await validate(valid);
@@ -97,6 +164,33 @@ describe('Book DTO validation', () => {
     expect((await errorsFor(UpdateBookMetadataDto, { isbn10: '12345678901' })).length).toBeGreaterThan(0);
   });
 
+  it('validates inline-edit single-field patches for table view use cases', async () => {
+    // Single title patch
+    expect((await errorsFor(UpdateBookMetadataDto, { title: 'New Title' })).length).toBe(0);
+    // Single series patch
+    expect((await errorsFor(UpdateBookMetadataDto, { seriesName: 'My Series', seriesIndex: 1.5 })).length).toBe(0);
+    // Series cleared to null
+    expect((await errorsFor(UpdateBookMetadataDto, { seriesName: null, seriesIndex: null })).length).toBe(0);
+    // Language valid 2-letter code
+    expect((await errorsFor(UpdateBookMetadataDto, { language: 'en' })).length).toBe(0);
+    // Language cleared to null
+    expect((await errorsFor(UpdateBookMetadataDto, { language: null })).length).toBe(0);
+    // Rating null (clear rating)
+    expect((await errorsFor(UpdateBookMetadataDto, { rating: null })).length).toBe(0);
+    // Rating valid range
+    expect((await errorsFor(UpdateBookMetadataDto, { rating: 1 })).length).toBe(0);
+    expect((await errorsFor(UpdateBookMetadataDto, { rating: 5 })).length).toBe(0);
+    // Authors array single-field patch
+    expect((await errorsFor(UpdateBookMetadataDto, { authors: ['Author One'] })).length).toBe(0);
+    // Genres/tags single-field patch
+    expect((await errorsFor(UpdateBookMetadataDto, { genres: ['Fantasy'] })).length).toBe(0);
+    expect((await errorsFor(UpdateBookMetadataDto, { tags: ['to-read'] })).length).toBe(0);
+    // Empty payload (all fields optional)
+    expect((await errorsFor(UpdateBookMetadataDto, {})).length).toBe(0);
+    // seriesIndex must be a number
+    expect((await errorsFor(UpdateBookMetadataDto, { seriesIndex: 'not-a-number' })).length).toBeGreaterThan(0);
+  });
+
   it('rejects legacy top-level audiobook fields and accepts nested audioMetadata', async () => {
     const legacyErrors = await strictErrorsFor(UpdateBookMetadataDto, {
       narrators: ['Narrator One'],
diff --git a/server/src/modules/book/dto/bulk-book-ids.dto.ts b/server/src/modules/book/dto/bulk-book-ids.dto.ts
index b4401f51d..a1ab0ccdc 100644
--- a/server/src/modules/book/dto/bulk-book-ids.dto.ts
+++ b/server/src/modules/book/dto/bulk-book-ids.dto.ts
@@ -1,8 +1,3 @@
-import { ArrayNotEmpty, IsArray, IsInt } from 'class-validator';
+import { BulkSelectionDto } from './bulk-selection.dto';
 
-export class BulkBookIdsDto {
-  @IsArray()
-  @ArrayNotEmpty()
-  @IsInt({ each: true })
-  bookIds: number[];
-}
+export class BulkBookIdsDto extends BulkSelectionDto {}
diff --git a/server/src/modules/book/dto/bulk-query-selection.dto.ts b/server/src/modules/book/dto/bulk-query-selection.dto.ts
new file mode 100644
index 000000000..65ef16e40
--- /dev/null
+++ b/server/src/modules/book/dto/bulk-query-selection.dto.ts
@@ -0,0 +1,22 @@
+import { IsArray, IsInt, IsObject, IsOptional, IsString } from 'class-validator';
+import type { GroupRule } from '@bookorbit/types';
+import type { SortSpec } from '@bookorbit/types';
+
+export class BulkQuerySelectionDto {
+  @IsOptional()
+  @IsInt()
+  libraryId?: number;
+
+  @IsOptional()
+  @IsObject()
+  filter?: GroupRule;
+
+  @IsOptional()
+  @IsString()
+  q?: string;
+
+  @IsOptional()
+  @IsArray()
+  @IsObject({ each: true })
+  sort?: SortSpec[];
+}
diff --git a/server/src/modules/book/dto/bulk-selection.dto.ts b/server/src/modules/book/dto/bulk-selection.dto.ts
new file mode 100644
index 000000000..7b4eba709
--- /dev/null
+++ b/server/src/modules/book/dto/bulk-selection.dto.ts
@@ -0,0 +1,24 @@
+import { ArrayNotEmpty, IsArray, IsInt, IsOptional, ValidateIf, ValidateNested } from 'class-validator';
+import { Type } from 'class-transformer';
+import { BulkQuerySelectionDto } from './bulk-query-selection.dto';
+
+/**
+ * Selection DTO used by all bulk book operations.
+ *
+ * Exactly one of `bookIds` or `query` must be provided:
+ * - `bookIds` - explicit list of book IDs (standard selection)
+ * - `query`   - filter/scope that is resolved to IDs server-side at execution time
+ *               (used for cross-page "select all N matching books" mode)
+ */
+export class BulkSelectionDto {
+  @ValidateIf((dto: BulkSelectionDto) => !dto.query)
+  @IsArray()
+  @ArrayNotEmpty()
+  @IsInt({ each: true })
+  bookIds?: number[];
+
+  @IsOptional()
+  @ValidateNested()
+  @Type(() => BulkQuerySelectionDto)
+  query?: BulkQuerySelectionDto;
+}
diff --git a/server/src/modules/book/dto/bulk-set-metadata-lock.dto.ts b/server/src/modules/book/dto/bulk-set-metadata-lock.dto.ts
index be72a7daf..be093f2bc 100644
--- a/server/src/modules/book/dto/bulk-set-metadata-lock.dto.ts
+++ b/server/src/modules/book/dto/bulk-set-metadata-lock.dto.ts
@@ -1,11 +1,7 @@
-import { ArrayNotEmpty, IsArray, IsBoolean, IsInt } from 'class-validator';
-
-export class BulkSetMetadataLockDto {
-  @IsArray()
-  @ArrayNotEmpty()
-  @IsInt({ each: true })
-  bookIds: number[];
+import { IsBoolean } from 'class-validator';
+import { BulkSelectionDto } from './bulk-selection.dto';
 
+export class BulkSetMetadataLockDto extends BulkSelectionDto {
   @IsBoolean()
   locked!: boolean;
 }
diff --git a/server/src/modules/book/dto/bulk-set-metadata.dto.ts b/server/src/modules/book/dto/bulk-set-metadata.dto.ts
new file mode 100644
index 000000000..22f1c824c
--- /dev/null
+++ b/server/src/modules/book/dto/bulk-set-metadata.dto.ts
@@ -0,0 +1,13 @@
+import { IsIn, IsOptional } from 'class-validator';
+import { BulkSelectionDto } from './bulk-selection.dto';
+
+const ALLOWED_FIELDS = ['seriesName', 'publisher', 'language', 'publishedYear', 'authors', 'genres', 'tags', 'narrators'] as const;
+export type BulkMetadataField = (typeof ALLOWED_FIELDS)[number];
+
+export class BulkSetMetadataDto extends BulkSelectionDto {
+  @IsIn(ALLOWED_FIELDS)
+  field!: BulkMetadataField;
+
+  @IsOptional()
+  value?: string | number | string[] | null;
+}
diff --git a/server/src/modules/book/dto/bulk-set-rating.dto.ts b/server/src/modules/book/dto/bulk-set-rating.dto.ts
index 16fe12694..df20ed155 100644
--- a/server/src/modules/book/dto/bulk-set-rating.dto.ts
+++ b/server/src/modules/book/dto/bulk-set-rating.dto.ts
@@ -1,11 +1,7 @@
-import { ArrayNotEmpty, IsArray, IsInt, IsOptional, Max, Min } from 'class-validator';
-
-export class BulkSetRatingDto {
-  @IsArray()
-  @ArrayNotEmpty()
-  @IsInt({ each: true })
-  bookIds: number[];
+import { IsInt, IsOptional, Max, Min } from 'class-validator';
+import { BulkSelectionDto } from './bulk-selection.dto';
 
+export class BulkSetRatingDto extends BulkSelectionDto {
   @IsOptional()
   @IsInt()
   @Min(1)
diff --git a/server/src/modules/book/dto/bulk-set-status.dto.ts b/server/src/modules/book/dto/bulk-set-status.dto.ts
index b7048849b..76a976318 100644
--- a/server/src/modules/book/dto/bulk-set-status.dto.ts
+++ b/server/src/modules/book/dto/bulk-set-status.dto.ts
@@ -1,13 +1,9 @@
-import { ArrayNotEmpty, IsArray, IsIn, IsInt } from 'class-validator';
+import { IsIn } from 'class-validator';
 import type { ReadStatus } from '@bookorbit/types';
 import { READ_STATUSES } from '../../user-book-status/user-book-status.constants';
+import { BulkSelectionDto } from './bulk-selection.dto';
 
-export class BulkSetStatusDto {
-  @IsArray()
-  @ArrayNotEmpty()
-  @IsInt({ each: true })
-  bookIds: number[];
-
+export class BulkSetStatusDto extends BulkSelectionDto {
   @IsIn(READ_STATUSES)
   status!: ReadStatus;
 }
diff --git a/server/src/modules/book/dto/bulk-update-tags.dto.ts b/server/src/modules/book/dto/bulk-update-tags.dto.ts
index 98ecf0171..728591851 100644
--- a/server/src/modules/book/dto/bulk-update-tags.dto.ts
+++ b/server/src/modules/book/dto/bulk-update-tags.dto.ts
@@ -1,14 +1,10 @@
-import { ArrayNotEmpty, IsArray, IsIn, IsInt, IsString } from 'class-validator';
+import { IsArray, IsIn, IsString } from 'class-validator';
+import { BulkSelectionDto } from './bulk-selection.dto';
 
 const TAG_MODES = ['add', 'remove', 'replace'] as const;
 export type TagUpdateMode = (typeof TAG_MODES)[number];
 
-export class BulkUpdateTagsDto {
-  @IsArray()
-  @ArrayNotEmpty()
-  @IsInt({ each: true })
-  bookIds: number[];
-
+export class BulkUpdateTagsDto extends BulkSelectionDto {
   @IsIn(TAG_MODES)
   mode!: TagUpdateMode;
 
diff --git a/server/src/modules/book/dto/delete-books.dto.ts b/server/src/modules/book/dto/delete-books.dto.ts
index eae5201c2..e4a331958 100644
--- a/server/src/modules/book/dto/delete-books.dto.ts
+++ b/server/src/modules/book/dto/delete-books.dto.ts
@@ -1,8 +1,3 @@
-import { ArrayNotEmpty, IsArray, IsInt } from 'class-validator';
+import { BulkSelectionDto } from './bulk-selection.dto';
 
-export class DeleteBooksDto {
-  @IsArray()
-  @ArrayNotEmpty()
-  @IsInt({ each: true })
-  bookIds: number[];
-}
+export class DeleteBooksDto extends BulkSelectionDto {}
diff --git a/server/src/modules/book/dto/metadata-export-options.dto.ts b/server/src/modules/book/dto/metadata-export-options.dto.ts
new file mode 100644
index 000000000..f4b0f99c9
--- /dev/null
+++ b/server/src/modules/book/dto/metadata-export-options.dto.ts
@@ -0,0 +1,27 @@
+import { IsArray, IsBoolean, IsIn, IsOptional, IsString } from 'class-validator';
+
+export const METADATA_EXPORT_COLUMN_MODES = ['canonical', 'visible'] as const;
+export type MetadataExportColumnMode = (typeof METADATA_EXPORT_COLUMN_MODES)[number];
+
+export class MetadataExportOptionsDto {
+  @IsOptional()
+  @IsBoolean()
+  includePersonalData?: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  includeFilePaths?: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  includeContextMeta?: boolean;
+
+  @IsOptional()
+  @IsIn(METADATA_EXPORT_COLUMN_MODES)
+  columnsMode?: MetadataExportColumnMode;
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  visibleColumns?: string[];
+}
diff --git a/server/src/modules/book/dto/metadata-export.dto.ts b/server/src/modules/book/dto/metadata-export.dto.ts
new file mode 100644
index 000000000..101a92b4e
--- /dev/null
+++ b/server/src/modules/book/dto/metadata-export.dto.ts
@@ -0,0 +1,30 @@
+import { Type } from 'class-transformer';
+import { IsArray, IsIn, IsObject, IsOptional, ValidateNested } from 'class-validator';
+import type { SortSpec } from '@bookorbit/types';
+import { BulkSelectionDto } from './bulk-selection.dto';
+import { MetadataExportOptionsDto } from './metadata-export-options.dto';
+
+export const METADATA_EXPORT_FORMATS = ['csv', 'json'] as const;
+export type MetadataExportFormat = (typeof METADATA_EXPORT_FORMATS)[number];
+
+export const METADATA_EXPORT_VIEW_TYPES = ['library', 'collection', 'smartScope'] as const;
+export type MetadataExportViewType = (typeof METADATA_EXPORT_VIEW_TYPES)[number];
+
+export class MetadataExportDto extends BulkSelectionDto {
+  @IsIn(METADATA_EXPORT_FORMATS)
+  format!: MetadataExportFormat;
+
+  @IsOptional()
+  @ValidateNested()
+  @Type(() => MetadataExportOptionsDto)
+  options?: MetadataExportOptionsDto;
+
+  @IsOptional()
+  @IsIn(METADATA_EXPORT_VIEW_TYPES)
+  viewType?: MetadataExportViewType;
+
+  @IsOptional()
+  @IsArray()
+  @IsObject({ each: true })
+  sort?: SortSpec[];
+}
diff --git a/server/src/modules/book/pipes/book-query.pipe.test.ts b/server/src/modules/book/pipes/book-query.pipe.test.ts
index 85b7d3cb4..712386d8d 100644
--- a/server/src/modules/book/pipes/book-query.pipe.test.ts
+++ b/server/src/modules/book/pipes/book-query.pipe.test.ts
@@ -58,6 +58,16 @@ describe('BookQueryPipe', () => {
     expect(() => pipe.transform({ sort: [{ field: 'title', dir: 'sideways' }] })).toThrow(BadRequestException);
   });
 
+  it('accepts readStatus as a valid sort field', () => {
+    const result = pipe.transform({ sort: [{ field: 'readStatus', dir: 'asc' }] });
+    expect(result.sort).toEqual([{ field: 'readStatus', dir: 'asc' }]);
+  });
+
+  it('accepts format as a valid sort field', () => {
+    const result = pipe.transform({ sort: [{ field: 'format', dir: 'desc' }] });
+    expect(result.sort).toEqual([{ field: 'format', dir: 'desc' }]);
+  });
+
   it('throws BadRequestException for more than 5 sort entries', () => {
     const sort = ['title', 'author', 'series', 'addedAt', 'publishedYear', 'pageCount'].map((field) => ({ field, dir: 'asc' }));
     expect(() => pipe.transform({ sort })).toThrow(BadRequestException);
@@ -103,9 +113,35 @@ describe('BookQueryPipe', () => {
   });
 
   it('accepts all valid sort fields', () => {
-    const validFields = ['author', 'title', 'series', 'seriesIndex', 'addedAt', 'updatedAt', 'publishedYear', 'pageCount', 'rating'];
+    const validFields = [
+      'author',
+      'title',
+      'series',
+      'seriesIndex',
+      'addedAt',
+      'updatedAt',
+      'publishedYear',
+      'pageCount',
+      'rating',
+      'language',
+      'metadataScore',
+    ];
     for (const field of validFields) {
       expect(() => pipe.transform({ sort: [{ field, dir: 'desc' }] })).not.toThrow();
     }
   });
+
+  it('accepts metadataScore and language sort entries together', () => {
+    const result = pipe.transform({
+      sort: [
+        { field: 'metadataScore', dir: 'desc' },
+        { field: 'language', dir: 'asc' },
+      ],
+    });
+
+    expect(result.sort).toEqual([
+      { field: 'metadataScore', dir: 'desc' },
+      { field: 'language', dir: 'asc' },
+    ]);
+  });
 });
diff --git a/server/src/modules/book/pipes/book-query.pipe.ts b/server/src/modules/book/pipes/book-query.pipe.ts
index 11a95f798..0c8fbadf8 100644
--- a/server/src/modules/book/pipes/book-query.pipe.ts
+++ b/server/src/modules/book/pipes/book-query.pipe.ts
@@ -1,29 +1,11 @@
 import { BadRequestException, Injectable, PipeTransform } from '@nestjs/common';
 import { z } from 'zod';
 
-import type { BookQuery } from '@bookorbit/types';
+import { SORT_FIELDS, type BookQuery } from '@bookorbit/types';
 
 import { MAX_OFFSET_ROWS, isOffsetWithinLimit } from '../../../common/constants/pagination.constants';
 import { groupRuleSchema } from '../utils/group-rule.validator';
 
-const SORT_FIELDS = [
-  'author',
-  'title',
-  'series',
-  'seriesIndex',
-  'addedAt',
-  'updatedAt',
-  'publishedYear',
-  'pageCount',
-  'rating',
-  'publisher',
-  'fileSize',
-  'readProgress',
-  'lastReadAt',
-  'finishedAt',
-  'random',
-] as const;
-
 const bookQuerySchema = z.object({
   collapseSeries: z.boolean().optional(),
   filter: groupRuleSchema(5).optional(),
@@ -31,7 +13,7 @@ const bookQuerySchema = z.object({
   sort: z
     .array(
       z.object({
-        field: z.enum(SORT_FIELDS),
+        field: z.enum(SORT_FIELDS as unknown as [string, ...string[]]),
         dir: z.enum(['asc', 'desc']),
       }),
     )
diff --git a/server/src/modules/book/utils/assemble-book-cards.test.ts b/server/src/modules/book/utils/assemble-book-cards.test.ts
index 08598d5da..0d8cdc290 100644
--- a/server/src/modules/book/utils/assemble-book-cards.test.ts
+++ b/server/src/modules/book/utils/assemble-book-cards.test.ts
@@ -14,6 +14,10 @@ function makeBookRow(id: number, overrides?: Partial<Parameters<typeof assembleB
     rating: null,
     coverSource: null,
     lockedFields: null,
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
     ...overrides,
   };
 }
@@ -22,14 +26,25 @@ describe('assembleBookCards', () => {
   it('assembles a simple book card with authors and files', () => {
     const rows = [makeBookRow(1)];
     const authorRows = [{ bookId: 1, name: 'Author A' }];
-    const fileRows = [{ bookId: 1, id: 10, format: 'epub', role: 'primary' }];
+    const fileRows = [{ bookId: 1, id: 10, format: 'epub', role: 'primary', sizeBytes: null }];
 
     const [card] = assembleBookCards(rows, authorRows, fileRows, [], []);
 
     expect(card.id).toBe(1);
     expect(card.title).toBe('Book 1');
     expect(card.authors).toEqual(['Author A']);
-    expect(card.files).toEqual([{ id: 10, format: 'epub', role: 'primary' }]);
+    expect(card.files).toEqual([{ id: 10, format: 'epub', role: 'primary', sizeBytes: null }]);
+  });
+
+  it('includes updatedAt, metadataScore, and file size when present', () => {
+    const rows = [makeBookRow(1, { updatedAt: new Date('2024-02-01T00:00:00.000Z'), metadataScore: 88 })];
+    const fileRows = [{ bookId: 1, id: 10, format: 'epub', role: 'primary', sizeBytes: 4096 }];
+
+    const [card] = assembleBookCards(rows, [], fileRows, [], []);
+
+    expect(card.updatedAt).toBe('2024-02-01T00:00:00.000Z');
+    expect(card.metadataScore).toBe(88);
+    expect(card.files).toEqual([{ id: 10, format: 'epub', role: 'primary', sizeBytes: 4096 }]);
   });
 
   it('falls back to basename of folderPath when title is null', () => {
@@ -43,8 +58,8 @@ describe('assembleBookCards', () => {
   it('returns reading progress from primary file', () => {
     const rows = [makeBookRow(1)];
     const fileRows = [
-      { bookId: 1, id: 10, format: 'epub', role: 'primary' },
-      { bookId: 1, id: 11, format: 'pdf', role: 'supplemental' },
+      { bookId: 1, id: 10, format: 'epub', role: 'primary', sizeBytes: null },
+      { bookId: 1, id: 11, format: 'pdf', role: 'supplemental', sizeBytes: null },
     ];
     const progressRows = [
       { bookFileId: 10, percentage: 45 },
@@ -58,7 +73,7 @@ describe('assembleBookCards', () => {
 
   it('falls back to first file for progress when no primary file exists', () => {
     const rows = [makeBookRow(1)];
-    const fileRows = [{ bookId: 1, id: 11, format: 'pdf', role: 'supplemental' }];
+    const fileRows = [{ bookId: 1, id: 11, format: 'pdf', role: 'supplemental', sizeBytes: null }];
     const progressRows = [{ bookFileId: 11, percentage: 30 }];
 
     const [card] = assembleBookCards(rows, [], fileRows, [], progressRows);
@@ -74,7 +89,7 @@ describe('assembleBookCards', () => {
 
   it('returns null readingProgress when progress is not recorded for the file', () => {
     const rows = [makeBookRow(1)];
-    const fileRows = [{ bookId: 1, id: 10, format: 'epub', role: 'primary' }];
+    const fileRows = [{ bookId: 1, id: 10, format: 'epub', role: 'primary', sizeBytes: null }];
 
     const [card] = assembleBookCards(rows, [], fileRows, [], []);
 
@@ -147,6 +162,7 @@ describe('assembleBookCards', () => {
     const [card] = assembleBookCards(rows, [], [], [], []);
 
     expect(card.hasMetadataLocks).toBe(true);
+    expect(card.lockedFields).toEqual(['title']);
   });
 
   it('marks cards without metadata locks as unlocked', () => {
@@ -155,6 +171,34 @@ describe('assembleBookCards', () => {
     const [card] = assembleBookCards(rows, [], [], [], []);
 
     expect(card.hasMetadataLocks).toBe(false);
+    expect(card.lockedFields).toEqual([]);
+  });
+
+  it('returns empty lockedFields when lockedFields row is null', () => {
+    const rows = [makeBookRow(1, { lockedFields: null })];
+
+    const [card] = assembleBookCards(rows, [], [], [], []);
+
+    expect(card.hasMetadataLocks).toBe(false);
+    expect(card.lockedFields).toEqual([]);
+  });
+
+  it('normalizes lockedFields by filtering out unknown field names', () => {
+    const rows = [makeBookRow(1, { lockedFields: ['title', 'unknownField', 'authors'] })];
+
+    const [card] = assembleBookCards(rows, [], [], [], []);
+
+    expect(card.lockedFields).toEqual(['title', 'authors']);
+    expect(card.hasMetadataLocks).toBe(true);
+  });
+
+  it('returns lockedFields with multiple known fields', () => {
+    const rows = [makeBookRow(1, { lockedFields: ['title', 'authors', 'seriesName', 'cover'] })];
+
+    const [card] = assembleBookCards(rows, [], [], [], []);
+
+    expect(card.lockedFields).toEqual(['title', 'authors', 'seriesName', 'cover']);
+    expect(card.hasMetadataLocks).toBe(true);
   });
 
   it('includes all optional metadata fields', () => {
@@ -182,7 +226,7 @@ describe('assembleBookCards', () => {
 
   it('handles a book with progress percentage of 0', () => {
     const rows = [makeBookRow(1)];
-    const fileRows = [{ bookId: 1, id: 10, format: 'epub', role: 'primary' }];
+    const fileRows = [{ bookId: 1, id: 10, format: 'epub', role: 'primary', sizeBytes: null }];
     const progressRows = [{ bookFileId: 10, percentage: 0 }];
 
     const [card] = assembleBookCards(rows, [], fileRows, [], progressRows);
@@ -190,6 +234,68 @@ describe('assembleBookCards', () => {
     // 0 is a valid progress value, not null
     expect(card.readingProgress).toBe(0);
   });
+
+  it('populates narrators from narratorRows', () => {
+    const rows = [makeBookRow(1)];
+    const narratorRows = [
+      { bookId: 1, name: 'Narrator A' },
+      { bookId: 1, name: 'Narrator B' },
+    ];
+    const [card] = assembleBookCards(rows, [], [], [], [], [], narratorRows);
+    expect(card.narrators).toEqual(['Narrator A', 'Narrator B']);
+  });
+
+  it('returns empty narrators array when no narratorRows for book', () => {
+    const rows = [makeBookRow(1)];
+    const [card] = assembleBookCards(rows, [], [], [], []);
+    expect(card.narrators).toEqual([]);
+  });
+
+  it('maps subtitle, publisher, pageCount, isbn13 from row', () => {
+    const rows = [makeBookRow(1, { subtitle: 'A Subtitle', publisher: 'Pub', pageCount: 300, isbn13: '9780000000000' })];
+    const [card] = assembleBookCards(rows, [], [], [], []);
+    expect(card.subtitle).toBe('A Subtitle');
+    expect(card.publisher).toBe('Pub');
+    expect(card.pageCount).toBe(300);
+    expect(card.isbn13).toBe('9780000000000');
+  });
+
+  it('returns null for subtitle, publisher, pageCount, isbn13 when absent', () => {
+    const rows = [makeBookRow(1)];
+    const [card] = assembleBookCards(rows, [], [], [], []);
+    expect(card.subtitle).toBeNull();
+    expect(card.publisher).toBeNull();
+    expect(card.pageCount).toBeNull();
+    expect(card.isbn13).toBeNull();
+  });
+
+  it('populates tags from tagRows', () => {
+    const rows = [makeBookRow(1)];
+    const tagRows = [
+      { bookId: 1, name: 'sci-fi' },
+      { bookId: 1, name: 'classic' },
+    ];
+    const [card] = assembleBookCards(rows, [], [], [], [], [], [], tagRows);
+    expect(card.tags).toEqual(['sci-fi', 'classic']);
+  });
+
+  it('returns empty tags array when no tagRows for book', () => {
+    const rows = [makeBookRow(1)];
+    const [card] = assembleBookCards(rows, [], [], [], []);
+    expect(card.tags).toEqual([]);
+  });
+
+  it('assigns tags to correct books in multi-book assembly', () => {
+    const rows = [makeBookRow(1), makeBookRow(2)];
+    const tagRows = [
+      { bookId: 1, name: 'fiction' },
+      { bookId: 2, name: 'non-fiction' },
+      { bookId: 2, name: 'history' },
+    ];
+    const cards = assembleBookCards(rows, [], [], [], [], [], [], tagRows);
+    expect(cards[0].tags).toEqual(['fiction']);
+    expect(cards[1].tags).toEqual(['non-fiction', 'history']);
+  });
 });
 
 function makeCollapsedRow(id: number, overrides?: Record<string, unknown>) {
@@ -207,6 +313,10 @@ function makeCollapsedRow(id: number, overrides?: Record<string, unknown>) {
     rating: null,
     coverSource: null,
     lockedFields: null,
+    subtitle: null,
+    publisher: null,
+    pageCount: null,
+    isbn13: null,
     bookCount: 3,
     readCount: 1,
     coverBookIds: [id],
@@ -233,6 +343,12 @@ function makeBookCard(id: number, overrides?: Record<string, unknown>) {
     addedAt: '2024-01-01T00:00:00.000Z',
     hasCover: false,
     hasMetadataLocks: false,
+    lockedFields: [] as string[],
+    subtitle: null as string | null,
+    publisher: null as string | null,
+    pageCount: null as number | null,
+    isbn13: null as string | null,
+    narrators: [] as string[],
     ...overrides,
   };
 }
diff --git a/server/src/modules/book/utils/assemble-book-cards.ts b/server/src/modules/book/utils/assemble-book-cards.ts
index 039fea68e..b35459f31 100644
--- a/server/src/modules/book/utils/assemble-book-cards.ts
+++ b/server/src/modules/book/utils/assemble-book-cards.ts
@@ -1,6 +1,14 @@
 import { basename } from 'path';
 
-import type { BookCard, CollapsedSeriesInfo, UserBookStatus } from '@bookorbit/types';
+import type { BookCard, BookMetadataLockField, CollapsedSeriesInfo, UserBookStatus } from '@bookorbit/types';
+import { BOOK_METADATA_LOCK_FIELDS } from '@bookorbit/types';
+
+const LOCK_FIELD_SET = new Set<string>(BOOK_METADATA_LOCK_FIELDS);
+
+function normalizeLockedFields(raw: string[] | null | undefined): BookMetadataLockField[] {
+  if (!raw?.length) return [];
+  return raw.filter((f) => LOCK_FIELD_SET.has(f)) as BookMetadataLockField[];
+}
 
 type BookRow = {
   id: number;
@@ -8,14 +16,20 @@ type BookRow = {
   primaryFileId?: number | null;
   folderPath: string;
   addedAt: Date;
+  updatedAt?: Date;
   title: string | null;
   seriesName: string | null;
   seriesIndex: number | null;
   publishedYear: number | null;
   language: string | null;
   rating: number | null;
+  metadataScore?: number | null;
   coverSource: string | null;
   lockedFields: string[] | null;
+  subtitle: string | null;
+  publisher: string | null;
+  pageCount: number | null;
+  isbn13: string | null;
 };
 
 type CollapsedBookRow = BookRow & {
@@ -26,7 +40,8 @@ type CollapsedBookRow = BookRow & {
 };
 
 type NameRow = { bookId: number; name: string };
-type FileRow = { bookId: number; id: number; format: string | null; role: string };
+type NarratorRow = { bookId: number; name: string };
+type FileRow = { bookId: number; id: number; format: string | null; role: string; sizeBytes: number | null };
 type ProgressRow = { bookFileId: number; percentage: number | null };
 type StatusRow = {
   bookId: number;
@@ -44,6 +59,8 @@ export function assembleBookCards(
   genreRows: NameRow[],
   progressRows: ProgressRow[],
   statusRows: StatusRow[] = [],
+  narratorRows: NarratorRow[] = [],
+  tagRows: NameRow[] = [],
 ): BookCard[] {
   const authorsByBook = new Map<number, string[]>();
   for (const row of authorRows) {
@@ -52,10 +69,10 @@ export function assembleBookCards(
     authorsByBook.set(row.bookId, list);
   }
 
-  const filesByBook = new Map<number, { id: number; format: string | null; role: string }[]>();
+  const filesByBook = new Map<number, { id: number; format: string | null; role: string; sizeBytes: number | null }[]>();
   for (const row of fileRows) {
     const list = filesByBook.get(row.bookId) ?? [];
-    list.push({ id: row.id, format: row.format, role: row.role });
+    list.push({ id: row.id, format: row.format, role: row.role, sizeBytes: row.sizeBytes });
     filesByBook.set(row.bookId, list);
   }
 
@@ -82,6 +99,20 @@ export function assembleBookCards(
     });
   }
 
+  const narratorsByBook = new Map<number, string[]>();
+  for (const row of narratorRows) {
+    const list = narratorsByBook.get(row.bookId) ?? [];
+    list.push(row.name);
+    narratorsByBook.set(row.bookId, list);
+  }
+
+  const tagsByBook = new Map<number, string[]>();
+  for (const row of tagRows) {
+    const list = tagsByBook.get(row.bookId) ?? [];
+    list.push(row.name);
+    tagsByBook.set(row.bookId, list);
+  }
+
   return rows.map((row) => {
     const rawFiles = filesByBook.get(row.id) ?? [];
     const primaryFile =
@@ -90,7 +121,12 @@ export function assembleBookCards(
       rawFiles.find((f) => f.role === 'content') ??
       rawFiles[0] ??
       null;
-    const files = rawFiles.map((f) => ({ ...f, role: primaryFile && f.id === primaryFile.id ? 'primary' : f.role }));
+    const files = rawFiles.map((f) => ({
+      id: f.id,
+      format: f.format,
+      role: primaryFile && f.id === primaryFile.id ? 'primary' : f.role,
+      sizeBytes: f.sizeBytes,
+    }));
     const readingProgress = primaryFile != null ? (progressByFileId.get(primaryFile.id) ?? null) : null;
 
     return {
@@ -108,8 +144,17 @@ export function assembleBookCards(
       readingProgress,
       readStatus: statusByBookId.get(row.id) ?? null,
       addedAt: row.addedAt.toISOString(),
+      updatedAt: row.updatedAt?.toISOString() ?? null,
+      metadataScore: row.metadataScore ?? null,
       hasCover: row.coverSource != null,
       hasMetadataLocks: (row.lockedFields?.length ?? 0) > 0,
+      lockedFields: normalizeLockedFields(row.lockedFields),
+      subtitle: row.subtitle ?? null,
+      publisher: row.publisher ?? null,
+      pageCount: row.pageCount ?? null,
+      isbn13: row.isbn13 ?? null,
+      narrators: narratorsByBook.get(row.id) ?? [],
+      tags: tagsByBook.get(row.id) ?? [],
     };
   });
 }
@@ -121,8 +166,10 @@ export function assembleCollapsedBookCards(
   genreRows: NameRow[],
   progressRows: ProgressRow[],
   statusRows: StatusRow[] = [],
+  narratorRows: NarratorRow[] = [],
+  tagRows: NameRow[] = [],
 ): BookCard[] {
-  const base = assembleBookCards(rows, authorRows, fileRows, genreRows, progressRows, statusRows);
+  const base = assembleBookCards(rows, authorRows, fileRows, genreRows, progressRows, statusRows, narratorRows, tagRows);
 
   for (let i = 0; i < base.length; i++) {
     const row = rows[i];
diff --git a/server/src/modules/book/utils/group-rule.validator.ts b/server/src/modules/book/utils/group-rule.validator.ts
index 8df762154..1fa0e861d 100644
--- a/server/src/modules/book/utils/group-rule.validator.ts
+++ b/server/src/modules/book/utils/group-rule.validator.ts
@@ -1,93 +1,17 @@
 import { BadRequestException } from '@nestjs/common';
 import { z } from 'zod';
 
-import type { GroupRule, Rule } from '@bookorbit/types';
-
-// Constants inlined to avoid a runtime require() of the @bookorbit/types TS source.
-// Keep in sync with packages/types/src/query.ts.
-const RULE_FIELDS = [
-  'title',
-  'publisher',
-  'language',
-  'series',
-  'seriesIndex',
-  'publishedYear',
-  'pageCount',
-  'author',
-  'genre',
-  'tag',
-  'collection',
-  'library',
-  'format',
-  'addedAt',
-  'fileAvailability',
-  'rating',
-  'readProgress',
-  'description',
-  'isbn',
-  'metadataScore',
-  'cover',
-] as const;
-const RULE_OPERATORS = [
-  'contains',
-  'notContains',
-  'startsWith',
-  'endsWith',
-  'eq',
-  'notEq',
-  'isEmpty',
-  'isNotEmpty',
-  'gt',
-  'gte',
-  'lt',
-  'lte',
-  'between',
-  'includesAny',
-  'includesAll',
-  'excludesAll',
-  'before',
-  'after',
-  'withinLast',
-  'isMissing',
-  'isPresent',
-  'isUnread',
-  'isInProgress',
-  'isFinished',
-] as const;
-
-const VALID_OPERATORS_BY_FIELD: Record<string, string[]> = {
-  title: ['contains', 'notContains', 'startsWith', 'endsWith', 'eq', 'notEq', 'isEmpty', 'isNotEmpty'],
-  publisher: ['contains', 'notContains', 'eq', 'notEq', 'includesAny', 'excludesAll', 'isEmpty', 'isNotEmpty'],
-  language: ['eq', 'notEq', 'includesAny', 'excludesAll', 'isEmpty', 'isNotEmpty'],
-  series: ['contains', 'notContains', 'eq', 'notEq', 'includesAny', 'excludesAll', 'isEmpty', 'isNotEmpty'],
-  author: ['includesAny', 'includesAll', 'excludesAll', 'isEmpty', 'isNotEmpty'],
-  genre: ['includesAny', 'includesAll', 'excludesAll', 'isEmpty', 'isNotEmpty'],
-  tag: ['includesAny', 'includesAll', 'excludesAll', 'isEmpty', 'isNotEmpty'],
-  collection: ['includesAny', 'excludesAll', 'isEmpty', 'isNotEmpty'],
-  library: ['includesAny', 'excludesAll'],
-  format: ['includesAny', 'excludesAll'],
-  publishedYear: ['eq', 'notEq', 'gt', 'gte', 'lt', 'lte', 'between', 'isEmpty', 'isNotEmpty'],
-  seriesIndex: ['eq', 'notEq', 'gt', 'gte', 'lt', 'lte', 'between', 'isEmpty', 'isNotEmpty'],
-  pageCount: ['gt', 'gte', 'lt', 'lte', 'between', 'isEmpty', 'isNotEmpty'],
-  addedAt: ['before', 'after', 'between', 'withinLast'],
-  fileAvailability: ['isMissing', 'isPresent'],
-  rating: ['eq', 'gt', 'gte', 'lt', 'lte', 'isEmpty', 'isNotEmpty'],
-  readProgress: ['isUnread', 'isInProgress', 'isFinished'],
-  description: ['isEmpty', 'isNotEmpty'],
-  isbn: ['isEmpty', 'isNotEmpty', 'eq'],
-  metadataScore: ['gt', 'gte', 'lt', 'lte', 'between', 'isEmpty', 'isNotEmpty'],
-  cover: ['isMissing', 'isPresent'],
-};
+import { FIELD_OPERATORS, RULE_FIELDS, RULE_OPERATORS, type GroupRule, type Rule } from '@bookorbit/types';
 
 const ruleSchema: z.ZodType<Rule> = z
   .object({
     type: z.literal('rule'),
-    field: z.enum(RULE_FIELDS),
-    operator: z.enum(RULE_OPERATORS),
+    field: z.enum(RULE_FIELDS as unknown as [string, ...string[]]),
+    operator: z.enum(RULE_OPERATORS as unknown as [string, ...string[]]),
     value: z.union([z.string(), z.number(), z.array(z.string().min(1)).min(1).max(20), z.array(z.number()).min(1).max(20)]).optional(),
     valueTo: z.union([z.string(), z.number()]).optional(),
   })
-  .refine((rule) => !!VALID_OPERATORS_BY_FIELD[rule.field]?.includes(rule.operator), {
+  .refine((rule) => !!FIELD_OPERATORS[rule.field as keyof typeof FIELD_OPERATORS]?.includes(rule.operator as never), {
     message: 'Operator is not valid for this field',
   }) as z.ZodType<Rule>;
 
diff --git a/server/src/modules/collection/collection.controller.test.ts b/server/src/modules/collection/collection.controller.test.ts
index 44d1321bb..af48e3d73 100644
--- a/server/src/modules/collection/collection.controller.test.ts
+++ b/server/src/modules/collection/collection.controller.test.ts
@@ -2,6 +2,7 @@ import 'reflect-metadata';
 
 import { BadRequestException } from '@nestjs/common';
 
+import type { BookQuery } from '@bookorbit/types';
 import type { RequestUser } from '../../common/types/request-user';
 import { AUDITABLE_KEY } from '../../common/decorators/auditable.decorator';
 import { CollectionController } from './collection.controller';
@@ -32,6 +33,7 @@ function makeController() {
     addBooks: vi.fn(),
     removeBooks: vi.fn(),
     getBooks: vi.fn(),
+    queryBooks: vi.fn(),
   };
   const controller = new CollectionController(service as never);
   return { controller, service };
@@ -102,6 +104,21 @@ describe('CollectionController', () => {
     });
   });
 
+  it('forwards validated POST table queries to the collection service', async () => {
+    const { controller, service } = makeController();
+    const query: BookQuery = {
+      filter: { type: 'group', join: 'AND', rules: [{ type: 'rule', field: 'title', operator: 'contains', value: 'hobbit' }] },
+      sort: [{ field: 'title', dir: 'asc' }],
+      pagination: { page: 0, size: 50 },
+      collapseSeries: true,
+      q: 'tolkien',
+    };
+
+    await controller.queryBooks(10, query, USER);
+
+    expect(service.queryBooks).toHaveBeenCalledWith(10, USER, query);
+  });
+
   describe('mutation endpoints', () => {
     it('delegates create, update, remove, reorder, and membership mutations', async () => {
       const { controller, service } = makeController();
diff --git a/server/src/modules/collection/collection.controller.ts b/server/src/modules/collection/collection.controller.ts
index fa1cbf2f5..e65497591 100644
--- a/server/src/modules/collection/collection.controller.ts
+++ b/server/src/modules/collection/collection.controller.ts
@@ -16,10 +16,12 @@ import {
 } from '@nestjs/common';
 
 import { AuditAction, AuditResource } from '@bookorbit/types';
+import type { BookQuery } from '@bookorbit/types';
 import { MAX_OFFSET_ROWS, isOffsetWithinLimit } from '../../common/constants/pagination.constants';
 import { CurrentUser } from '../../common/decorators/current-user.decorator';
 import { Auditable } from '../../common/decorators/auditable.decorator';
 import type { RequestUser } from '../../common/types/request-user';
+import { BookQueryPipe } from '../book/pipes/book-query.pipe';
 import { CollectionBooksDto } from './dto/collection-books.dto';
 import { CreateCollectionDto } from './dto/create-collection.dto';
 import { ReorderCollectionsDto } from './dto/reorder-collections.dto';
@@ -159,4 +161,9 @@ export class CollectionController {
     this.validatePageQuery(page, size);
     return this.collectionService.getBooks(id, user, page, size, collapseSeries, q);
   }
+
+  @Post(':id/books/query')
+  queryBooks(@Param('id', ParseIntPipe) id: number, @Body(BookQueryPipe) query: BookQuery, @CurrentUser() user: RequestUser) {
+    return this.collectionService.queryBooks(id, user, query);
+  }
 }
diff --git a/server/src/modules/collection/collection.repository.ts b/server/src/modules/collection/collection.repository.ts
index f41d64897..124b81f1b 100644
--- a/server/src/modules/collection/collection.repository.ts
+++ b/server/src/modules/collection/collection.repository.ts
@@ -93,6 +93,15 @@ export class CollectionRepository {
       .returning();
   }
 
+  buildMembershipWhere(collectionId: number): SQL {
+    const membership = this.db
+      .select({ one: sql`1` })
+      .from(collectionBooks)
+      .where(and(eq(collectionBooks.collectionId, collectionId), eq(collectionBooks.bookId, books.id)))
+      .limit(1);
+    return sql`exists (${membership})`;
+  }
+
   async findBookIdsPage(collectionId: number, libraryIds: number[], page: number, size: number, extraWhere?: SQL) {
     if (libraryIds.length === 0) {
       return {
diff --git a/server/src/modules/collection/collection.service.test.ts b/server/src/modules/collection/collection.service.test.ts
index 8a57d8570..9273717ae 100644
--- a/server/src/modules/collection/collection.service.test.ts
+++ b/server/src/modules/collection/collection.service.test.ts
@@ -50,6 +50,7 @@ function makeService() {
     removeBooks: vi.fn(),
     findBookIdsPage: vi.fn(),
     findAllBookIds: vi.fn(),
+    buildMembershipWhere: vi.fn(),
   };
 
   const bookReadService = {
@@ -63,11 +64,21 @@ function makeService() {
   };
 
   const queryBuilder = {
-    buildQuickSearch: vi.fn().mockReturnValue({ type: 'quick-search' }),
+    buildWhere: vi.fn().mockReturnValue({ type: 'where' }),
   };
 
-  const service = new CollectionService(collectionRepo as never, bookReadService as never, libraryService as never, queryBuilder as never);
-  return { service, collectionRepo, bookReadService, libraryService, queryBuilder };
+  const bookService = {
+    executeBooksQuery: vi.fn(),
+  };
+
+  const service = new CollectionService(
+    collectionRepo as never,
+    bookReadService as never,
+    libraryService as never,
+    queryBuilder as never,
+    bookService as never,
+  );
+  return { service, collectionRepo, bookReadService, libraryService, queryBuilder, bookService };
 }
 
 describe('CollectionService', () => {
@@ -277,82 +288,62 @@ describe('CollectionService', () => {
 
   describe('getBooks', () => {
     it('returns an empty page when no collection books are visible to the user', async () => {
-      const { service, collectionRepo, libraryService, bookReadService } = makeService();
+      const { service, collectionRepo, libraryService, queryBuilder, bookService } = makeService();
       collectionRepo.findById.mockResolvedValue([makeCollection()]);
       libraryService.findAccessibleLibraryIds.mockResolvedValue([100]);
-      collectionRepo.findBookIdsPage.mockResolvedValue({ bookIds: [], total: 0, page: 0, size: 50 });
+      collectionRepo.buildMembershipWhere.mockReturnValue('membership-where');
+      bookService.executeBooksQuery.mockResolvedValue({ items: [], total: 0, page: 0, size: 50 });
 
       const result = await service.getBooks(10, makeUser(), 0, 50);
 
       expect(result).toEqual({ items: [], total: 0, page: 0, size: 50 });
-      expect(bookReadService.findCardsByBookIds).not.toHaveBeenCalled();
+      expect(queryBuilder.buildWhere).toHaveBeenCalledWith(undefined, {
+        accessibleLibraryIds: [100],
+        userId: 1,
+        q: undefined,
+      });
+      expect(collectionRepo.buildMembershipWhere).toHaveBeenCalledWith(10);
+      expect(bookService.executeBooksQuery).toHaveBeenCalledWith(1, expect.anything(), {
+        sort: [],
+        pagination: { page: 0, size: 50 },
+      });
     });
 
-    it('loads page ids via repository and returns ordered cards with read status', async () => {
-      const { service, collectionRepo, libraryService, bookReadService } = makeService();
+    it('passes collapse, search, and query filters into the shared book query pipeline', async () => {
+      const { service, collectionRepo, libraryService, queryBuilder, bookService } = makeService();
       collectionRepo.findById.mockResolvedValue([makeCollection()]);
       libraryService.findAccessibleLibraryIds.mockResolvedValue([100, 101]);
-      collectionRepo.findBookIdsPage.mockResolvedValue({ bookIds: [2, 1], total: 2, page: 0, size: 50 });
-      bookReadService.findCardsByBookIds.mockResolvedValue({
-        rows: [
-          {
-            id: 1,
-            status: 'present',
-            primaryFileId: 11,
-            folderPath: '/books/one',
-            addedAt: new Date('2026-01-01T00:00:00Z'),
-            title: 'One',
-            seriesName: null,
-            seriesIndex: null,
-            publishedYear: null,
-            language: null,
-            rating: null,
-          },
-          {
-            id: 2,
-            status: 'present',
-            primaryFileId: 22,
-            folderPath: '/books/two',
-            addedAt: new Date('2026-01-02T00:00:00Z'),
-            title: 'Two',
-            seriesName: null,
-            seriesIndex: null,
-            publishedYear: null,
-            language: null,
-            rating: null,
-          },
-        ],
-        authorRows: [],
-        fileRows: [
-          { bookId: 1, id: 11, format: 'epub', role: 'primary' },
-          { bookId: 2, id: 22, format: 'epub', role: 'primary' },
-        ],
-        genreRows: [],
-        progressRows: [
-          { bookFileId: 11, percentage: 35 },
-          { bookFileId: 22, percentage: 95 },
-        ],
-        statusRows: [
-          {
-            bookId: 1,
-            status: 'reading',
-            source: 'manual',
-            startedAt: new Date('2026-01-03T00:00:00Z'),
-            finishedAt: null,
-            updatedAt: new Date('2026-01-03T00:00:00Z'),
-          },
-        ],
-        total: 2,
+      collectionRepo.buildMembershipWhere.mockReturnValue('membership-where');
+      queryBuilder.buildWhere.mockReturnValue('filter-where');
+      bookService.executeBooksQuery.mockResolvedValue({ items: [{ id: 2 }, { id: 1 }], total: 2, page: 0, size: 50 });
+
+      const result = await service.queryBooks(10, makeUser(), {
+        filter: { type: 'group', join: 'AND', rules: [{ type: 'rule', field: 'title', operator: 'contains', value: 'Two' }] },
+        sort: [{ field: 'title', dir: 'desc' }],
+        pagination: { page: 0, size: 50 },
+        collapseSeries: true,
+        q: 'science',
       });
 
-      const result = await service.getBooks(10, makeUser(), 0, 50);
-
-      expect(libraryService.findAccessibleLibraryIds).toHaveBeenCalledWith(expect.objectContaining({ id: 1 }));
-      expect(collectionRepo.findBookIdsPage).toHaveBeenCalledWith(10, [100, 101], 0, 50, undefined);
-      expect(bookReadService.findCardsByBookIds).toHaveBeenCalledWith([2, 1], 1);
-      expect(result.total).toBe(2);
-      expect(result.items.map((item) => item.id)).toEqual([2, 1]);
-      expect(result.items[1]?.readStatus).toEqual(expect.objectContaining({ status: 'reading' }));
+      expect(queryBuilder.buildWhere).toHaveBeenCalledWith(
+        { type: 'group', join: 'AND', rules: [{ type: 'rule', field: 'title', operator: 'contains', value: 'Two' }] },
+        {
+          accessibleLibraryIds: [100, 101],
+          userId: 1,
+          q: 'science',
+        },
+      );
+      expect(bookService.executeBooksQuery).toHaveBeenCalledWith(
+        1,
+        expect.anything(),
+        expect.objectContaining({
+          sort: [{ field: 'title', dir: 'desc' }],
+          pagination: { page: 0, size: 50 },
+          collapseSeries: true,
+          q: 'science',
+        }),
+      );
+      expect(result).toEqual({ items: [{ id: 2 }, { id: 1 }], total: 2, page: 0, size: 50 });
     });
 
     it('propagates ownership errors before loading collection books', async () => {
diff --git a/server/src/modules/collection/collection.service.ts b/server/src/modules/collection/collection.service.ts
index 9ef7b2658..704df5e42 100644
--- a/server/src/modules/collection/collection.service.ts
+++ b/server/src/modules/collection/collection.service.ts
@@ -1,8 +1,9 @@
 import { BadRequestException, ConflictException, ForbiddenException, Injectable, Logger, NotFoundException } from '@nestjs/common';
+import { and } from 'drizzle-orm';
 
-import type { BooksPage } from '@bookorbit/types';
-import { assembleBookCards, collapseBookCards } from '../book/utils/assemble-book-cards';
+import type { BookQuery, BooksPage } from '@bookorbit/types';
 import type { RequestUser } from '../../common/types/request-user';
+import { BookService } from '../book/book.service';
 import { BookQueryBuilder } from '../book/book-query-builder.service';
 import { BookReadService } from '../book/book-read.service';
 import { LibraryService } from '../library/library.service';
@@ -42,6 +43,7 @@ export class CollectionService {
     private readonly bookReadService: BookReadService,
     private readonly libraryService: LibraryService,
     private readonly queryBuilder: BookQueryBuilder,
+    private readonly bookService: BookService,
   ) {}
 
   private assertAccess(ownerId: number, user: RequestUser): void {
@@ -204,87 +206,39 @@ export class CollectionService {
   }
 
   async getBooks(id: number, user: RequestUser, page: number, size: number, collapseSeries?: boolean, q?: string): Promise<BooksPage> {
-    const event = 'collection.get_books';
+    return this.queryBooks(id, user, {
+      sort: [],
+      pagination: { page, size },
+      ...(collapseSeries ? { collapseSeries: true } : {}),
+      ...(q?.trim() ? { q: q.trim() } : {}),
+    });
+  }
+
+  async queryBooks(id: number, user: RequestUser, query: BookQuery): Promise<BooksPage> {
+    const event = 'collection.query_books';
     const startedAt = Date.now();
     this.logger.log(
-      `[${event}] [start] collectionId=${id} userId=${user.id} page=${page} size=${size} collapseSeries=${collapseSeries ?? false} hasSearch=${!!q?.trim()} - get collection books started`,
+      `[${event}] [start] collectionId=${id} userId=${user.id} page=${query.pagination.page} size=${query.pagination.size} collapseSeries=${query.collapseSeries ?? false} hasSearch=${!!query.q?.trim()} - query collection books started`,
     );
     try {
       await this.findCollectionForUserOrThrow(id, user);
       const libraryIds = await this.libraryService.findAccessibleLibraryIds(user);
-      const qWhere = q?.trim() ? this.queryBuilder.buildQuickSearch(q.trim()) : undefined;
-
-      if (collapseSeries) {
-        const MAX_COLLAPSE_BOOKS = 5000;
-        const allBookIds = await this.collectionRepo.findAllBookIds(id, libraryIds, qWhere);
-        if (allBookIds.length === 0) {
-          this.logger.log(
-            `[${event}] [end] collectionId=${id} durationMs=${Date.now() - startedAt} total=0 itemCount=0 - get collection books completed`,
-          );
-          return { items: [], total: 0, page, size };
-        }
-
-        if (allBookIds.length > MAX_COLLAPSE_BOOKS) {
-          this.logger.warn(
-            `[${event}] [end] collectionId=${id} durationMs=${Date.now() - startedAt} bookCount=${allBookIds.length} cap=${MAX_COLLAPSE_BOOKS} - falling back to non-collapsed pagination`,
-          );
-          const bookPage = await this.collectionRepo.findBookIdsPage(id, libraryIds, page, size, qWhere);
-          if (bookPage.bookIds.length === 0) {
-            return { items: [], total: bookPage.total, page, size };
-          }
-          const { rows, authorRows, fileRows, genreRows, progressRows, statusRows } = await this.bookReadService.findCardsByBookIds(
-            bookPage.bookIds,
-            user.id,
-          );
-          const orderMap = new Map(bookPage.bookIds.map((bookId, index) => [bookId, index]));
-          const items = assembleBookCards(rows, authorRows, fileRows, genreRows, progressRows, statusRows).sort(
-            (left, right) => (orderMap.get(left.id) ?? 0) - (orderMap.get(right.id) ?? 0),
-          );
-          return { items, total: bookPage.total, page, size };
-        }
-
-        const { rows, authorRows, fileRows, genreRows, progressRows, statusRows } = await this.bookReadService.findCardsByBookIds(
-          allBookIds,
-          user.id,
-        );
-        const orderMap = new Map(allBookIds.map((bookId, index) => [bookId, index]));
-        const allItems = assembleBookCards(rows, authorRows, fileRows, genreRows, progressRows, statusRows).sort(
-          (left, right) => (orderMap.get(left.id) ?? 0) - (orderMap.get(right.id) ?? 0),
-        );
-        const collapsed = collapseBookCards(allItems);
-        const pageItems = collapsed.slice(page * size, page * size + size);
-
-        this.logger.log(
-          `[${event}] [end] collectionId=${id} durationMs=${Date.now() - startedAt} total=${collapsed.length} itemCount=${pageItems.length} - get collection books completed`,
-        );
-        return { items: pageItems, total: collapsed.length, page, size };
-      }
-
-      const bookPage = await this.collectionRepo.findBookIdsPage(id, libraryIds, page, size, qWhere);
-      if (bookPage.bookIds.length === 0) {
-        this.logger.log(
-          `[${event}] [end] collectionId=${id} durationMs=${Date.now() - startedAt} total=${bookPage.total} itemCount=0 - get collection books completed`,
-        );
-        return { items: [], total: bookPage.total, page, size };
-      }
-
-      const { rows, authorRows, fileRows, genreRows, progressRows, statusRows } = await this.bookReadService.findCardsByBookIds(
-        bookPage.bookIds,
-        user.id,
-      );
-      const orderMap = new Map(bookPage.bookIds.map((bookId, index) => [bookId, index]));
-      const items = assembleBookCards(rows, authorRows, fileRows, genreRows, progressRows, statusRows).sort(
-        (left, right) => (orderMap.get(left.id) ?? 0) - (orderMap.get(right.id) ?? 0),
-      );
+      const filterWhere = this.queryBuilder.buildWhere(query.filter, {
+        accessibleLibraryIds: libraryIds,
+        userId: user.id,
+        q: query.q,
+      });
+      const where = and(filterWhere, this.collectionRepo.buildMembershipWhere(id));
+      const page = await this.bookService.executeBooksQuery(user.id, where, query);
 
       this.logger.log(
-        `[${event}] [end] collectionId=${id} durationMs=${Date.now() - startedAt} total=${bookPage.total} itemCount=${items.length} - get collection books completed`,
+        `[${event}] [end] collectionId=${id} durationMs=${Date.now() - startedAt} total=${page.total} itemCount=${page.items.length} - query collection books completed`,
       );
-      return { items, total: bookPage.total, page, size };
+      return page;
     } catch (error) {
       const { errorClass, errorMessage } = this.buildErrorLogFields(error);
       this.logger.warn(
-        `[${event}] [fail] collectionId=${id} durationMs=${Date.now() - startedAt} errorClass=${errorClass} error="${errorMessage}" - get collection books failed`,
+        `[${event}] [fail] collectionId=${id} durationMs=${Date.now() - startedAt} errorClass=${errorClass} error="${errorMessage}" - query collection books failed`,
       );
       throw error;
     }
diff --git a/server/src/modules/scanner/scanner.repository.ts b/server/src/modules/scanner/scanner.repository.ts
index e27f0a5d1..3344ee474 100644
--- a/server/src/modules/scanner/scanner.repository.ts
+++ b/server/src/modules/scanner/scanner.repository.ts
@@ -359,6 +359,10 @@ export class ScannerRepository {
           rating: bookMetadata.rating,
           coverSource: bookMetadata.coverSource,
           lockedFields: bookMetadata.lockedFields,
+          subtitle: bookMetadata.subtitle,
+          publisher: bookMetadata.publisher,
+          pageCount: bookMetadata.pageCount,
+          isbn13: bookMetadata.isbn13,
         })
         .from(books)
         .leftJoin(bookMetadata, eq(bookMetadata.bookId, books.id))
@@ -370,7 +374,7 @@ export class ScannerRepository {
         .where(inArray(bookAuthors.bookId, bookIds))
         .orderBy(bookAuthors.displayOrder),
       this.db
-        .select({ bookId: bookFiles.bookId, id: bookFiles.id, format: bookFiles.format, role: bookFiles.role })
+        .select({ bookId: bookFiles.bookId, id: bookFiles.id, format: bookFiles.format, role: bookFiles.role, sizeBytes: bookFiles.sizeBytes })
         .from(bookFiles)
         .where(inArray(bookFiles.bookId, bookIds)),
       this.db
diff --git a/server/src/modules/smart-scope/smart-scope.controller.test.ts b/server/src/modules/smart-scope/smart-scope.controller.test.ts
index 3886bc7fe..423464d35 100644
--- a/server/src/modules/smart-scope/smart-scope.controller.test.ts
+++ b/server/src/modules/smart-scope/smart-scope.controller.test.ts
@@ -1,3 +1,6 @@
+import { BadRequestException } from '@nestjs/common';
+
+import type { BookQuery } from '@bookorbit/types';
 import type { RequestUser } from '../../common/types/request-user';
 import { SmartScopeController } from './smart-scope.controller';
 
@@ -20,6 +23,10 @@ function makeUser(overrides: Partial<RequestUser> = {}): RequestUser {
 }
 
 describe('SmartScopeController', () => {
+  async function expectBadRequest(fn: () => unknown | Promise<unknown>) {
+    await expect(Promise.resolve().then(fn)).rejects.toBeInstanceOf(BadRequestException);
+  }
+
   it('forwards each route handler to SmartScopeService with parsed args', async () => {
     const smartScopeService = {
       findAll: vi.fn().mockResolvedValue([]),
@@ -29,6 +36,7 @@ describe('SmartScopeController', () => {
       update: vi.fn().mockResolvedValue({ id: 1, name: 'Updated' }),
       remove: vi.fn().mockResolvedValue(undefined),
       executeSmartScope: vi.fn().mockResolvedValue({ items: [], total: 0, page: 0, size: 50 }),
+      queryBooks: vi.fn().mockResolvedValue({ items: [], total: 0, page: 0, size: 50 }),
     };
     const controller = new SmartScopeController(smartScopeService as never);
     const user = makeUser();
@@ -40,6 +48,8 @@ describe('SmartScopeController', () => {
     await controller.update(1, { name: 'Updated' } as never, user);
     await controller.remove(1, user);
     await controller.executeSmartScope(1, user, 2, 25);
+    const query: BookQuery = { sort: [{ field: 'title', dir: 'asc' }], pagination: { page: 0, size: 50 } };
+    await controller.queryBooks(1, query, user);
 
     expect(smartScopeService.findAll).toHaveBeenCalledWith(user);
     expect(smartScopeService.findOne).toHaveBeenCalledWith(1, user);
@@ -48,5 +58,27 @@ describe('SmartScopeController', () => {
     expect(smartScopeService.update).toHaveBeenCalledWith(1, { name: 'Updated' }, user);
     expect(smartScopeService.remove).toHaveBeenCalledWith(1, user);
     expect(smartScopeService.executeSmartScope).toHaveBeenCalledWith(1, user, 2, 25, undefined);
+    expect(smartScopeService.queryBooks).toHaveBeenCalledWith(1, user, query);
+  });
+
+  it('rejects invalid page and size boundaries for legacy GET queries', async () => {
+    const smartScopeService = {
+      findAll: vi.fn(),
+      findOne: vi.fn(),
+      create: vi.fn(),
+      reorder: vi.fn(),
+      update: vi.fn(),
+      remove: vi.fn(),
+      executeSmartScope: vi.fn(),
+      queryBooks: vi.fn(),
+    };
+    const controller = new SmartScopeController(smartScopeService as never);
+    const user = makeUser();
+
+    await expectBadRequest(() => controller.executeSmartScope(1, user, -1, 50));
+    await expectBadRequest(() => controller.executeSmartScope(1, user, 0, 0));
+    await expectBadRequest(() => controller.executeSmartScope(1, user, 0, 101));
+    await expectBadRequest(() => controller.executeSmartScope(1, user, 2_000_000, 100));
+    expect(smartScopeService.executeSmartScope).not.toHaveBeenCalled();
   });
 });
diff --git a/server/src/modules/smart-scope/smart-scope.controller.ts b/server/src/modules/smart-scope/smart-scope.controller.ts
index 3ca884ecc..e3bf75e64 100644
--- a/server/src/modules/smart-scope/smart-scope.controller.ts
+++ b/server/src/modules/smart-scope/smart-scope.controller.ts
@@ -1,18 +1,56 @@
-import { Body, Controller, DefaultValuePipe, Delete, Get, HttpCode, HttpStatus, Param, ParseIntPipe, Patch, Post, Query } from '@nestjs/common';
+import {
+  BadRequestException,
+  Body,
+  Controller,
+  DefaultValuePipe,
+  Delete,
+  Get,
+  HttpCode,
+  HttpStatus,
+  Param,
+  ParseIntPipe,
+  Patch,
+  Post,
+  Query,
+} from '@nestjs/common';
 
 import { AuditAction, AuditResource } from '@bookorbit/types';
+import type { BookQuery } from '@bookorbit/types';
+import { MAX_OFFSET_ROWS, isOffsetWithinLimit } from '../../common/constants/pagination.constants';
 import { CurrentUser } from '../../common/decorators/current-user.decorator';
 import { Auditable } from '../../common/decorators/auditable.decorator';
 import type { RequestUser } from '../../common/types/request-user';
+import { BookQueryPipe } from '../book/pipes/book-query.pipe';
 import { CreateSmartScopeDto } from './dto/create-smart-scope.dto';
 import { ReorderSmartScopesDto } from './dto/reorder-smart-scopes.dto';
 import { UpdateSmartScopeDto } from './dto/update-smart-scope.dto';
 import { SmartScopeService } from './smart-scope.service';
 
+const PAGE_QUERY_INVALID_MESSAGE = 'page must be greater than or equal to 0';
+const PAGE_WINDOW_INVALID_MESSAGE = `pagination window is too deep; page * size must be <= ${MAX_OFFSET_ROWS}`;
+const SIZE_QUERY_INVALID_MESSAGE = 'size must be between 1 and 100';
+const MAX_PAGE_SIZE = 100;
+
 @Controller('smart-scopes')
 export class SmartScopeController {
   constructor(private readonly smartScopeService: SmartScopeService) {}
 
+  private validatePageQuery(page: number, size: number): void {
+    if (page < 0) {
+      throw new BadRequestException(PAGE_QUERY_INVALID_MESSAGE);
+    }
+
+    if (!isOffsetWithinLimit(page * size)) {
+      throw new BadRequestException(PAGE_WINDOW_INVALID_MESSAGE);
+    }
+  }
+
+  private validateSizeQuery(size: number): void {
+    if (size < 1 || size > MAX_PAGE_SIZE) {
+      throw new BadRequestException(SIZE_QUERY_INVALID_MESSAGE);
+    }
+  }
+
   @Get()
   findAll(@CurrentUser() user: RequestUser) {
     return this.smartScopeService.findAll(user);
@@ -71,6 +109,13 @@ export class SmartScopeController {
     @Query('size', new DefaultValuePipe(50), ParseIntPipe) size: number,
     @Query('q') q?: string,
   ) {
+    this.validateSizeQuery(size);
+    this.validatePageQuery(page, size);
     return this.smartScopeService.executeSmartScope(id, user, page, size, q);
   }
+
+  @Post(':id/books/query')
+  queryBooks(@Param('id', ParseIntPipe) id: number, @Body(BookQueryPipe) query: BookQuery, @CurrentUser() user: RequestUser) {
+    return this.smartScopeService.queryBooks(id, user, query);
+  }
 }
diff --git a/server/src/modules/smart-scope/smart-scope.service.test.ts b/server/src/modules/smart-scope/smart-scope.service.test.ts
index e45f9b3f9..788358e76 100644
--- a/server/src/modules/smart-scope/smart-scope.service.test.ts
+++ b/server/src/modules/smart-scope/smart-scope.service.test.ts
@@ -1,4 +1,5 @@
-import { BadRequestException, ForbiddenException, NotFoundException } from '@nestjs/common';
+import { BadRequestException, ForbiddenException, Logger, NotFoundException } from '@nestjs/common';
+import type { BookQuery } from '@bookorbit/types';
 
 import type { RequestUser } from '../../common/types/request-user';
 import type { SmartScope } from '../../db/schema/smart-scopes';
@@ -58,9 +59,18 @@ function makeService() {
   const libraryService = {
     findAccessibleLibraryIds: vi.fn(),
   };
+  const bookService = {
+    executeBooksQuery: vi.fn(),
+  };
 
-  const service = new SmartScopeService(smartScopeRepo as never, bookReadService as never, queryBuilder as never, libraryService as never);
-  return { service, smartScopeRepo, bookReadService, queryBuilder, libraryService };
+  const service = new SmartScopeService(
+    smartScopeRepo as never,
+    bookReadService as never,
+    queryBuilder as never,
+    libraryService as never,
+    bookService as never,
+  );
+  return { service, smartScopeRepo, bookReadService, queryBuilder, libraryService, bookService };
 }
 
 describe('SmartScopeService', () => {
@@ -274,7 +284,7 @@ describe('SmartScopeService', () => {
   });
 
   it('executeSmartScope returns empty page without querying when filter is null', async () => {
-    const { service, smartScopeRepo, libraryService, queryBuilder, bookReadService } = makeService();
+    const { service, smartScopeRepo, libraryService, queryBuilder, bookReadService, bookService } = makeService();
     smartScopeRepo.findById.mockResolvedValue([makeSmartScope({ id: 5, userId: 12, filter: null })]);
 
     const result = await service.executeSmartScope(5, makeUser({ id: 12 }), 0, 25);
@@ -282,11 +292,12 @@ describe('SmartScopeService', () => {
     expect(libraryService.findAccessibleLibraryIds).not.toHaveBeenCalled();
     expect(queryBuilder.buildWhere).not.toHaveBeenCalled();
     expect(bookReadService.findCards).not.toHaveBeenCalled();
+    expect(bookService.executeBooksQuery).not.toHaveBeenCalled();
     expect(result).toEqual({ items: [], total: 0, page: 0, size: 25 });
   });
 
-  it('executeSmartScope builds query and returns paginated books page', async () => {
-    const { service, smartScopeRepo, libraryService, queryBuilder, bookReadService } = makeService();
+  it('executeSmartScope seeds sort from the smartScope when the request does not override it', async () => {
+    const { service, smartScopeRepo, libraryService, queryBuilder, bookService } = makeService();
     const smartScope = makeSmartScope({
       id: 5,
       userId: 12,
@@ -297,27 +308,204 @@ describe('SmartScopeService', () => {
     smartScopeRepo.findById.mockResolvedValue([smartScope]);
     libraryService.findAccessibleLibraryIds.mockResolvedValue([9]);
     queryBuilder.buildWhere.mockReturnValue('where');
-    queryBuilder.buildOrderBy.mockReturnValue(['orderBy']);
-    bookReadService.findCards.mockResolvedValue({
-      rows: [],
-      authorRows: [],
-      fileRows: [],
-      genreRows: [],
-      progressRows: [],
-      total: 0,
-    });
+    bookService.executeBooksQuery.mockResolvedValue({ items: [], total: 0, page: 1, size: 25 });
 
     const result = await service.executeSmartScope(5, makeUser({ id: 12 }), 1, 25);
 
     expect(queryBuilder.buildWhere).toHaveBeenCalledWith(smartScope.filter, { accessibleLibraryIds: [9], userId: 12 });
-    expect(queryBuilder.buildOrderBy).toHaveBeenCalledWith([{ field: 'title', dir: 'asc' }], 12);
-    expect(bookReadService.findCards).toHaveBeenCalledWith({
-      where: 'where',
-      orderBy: ['orderBy'],
-      limit: 25,
-      offset: 25,
-      userId: 12,
+    expect(bookService.executeBooksQuery).toHaveBeenCalledWith(12, 'where', {
+      filter: smartScope.filter,
+      sort: [{ field: 'title', dir: 'asc' }],
+      pagination: { page: 1, size: 25 },
     });
     expect(result).toEqual({ items: [], total: 0, page: 1, size: 25 });
   });
+
+  it('queryBooks combines smartScope rules with temporary table filters and sort overrides', async () => {
+    const { service, smartScopeRepo, libraryService, queryBuilder, bookService } = makeService();
+    const smartScope = makeSmartScope({
+      id: 5,
+      filter: { type: 'group', join: 'AND', rules: [{ type: 'rule', field: 'title', operator: 'contains', value: 'scope' }] },
+      defaultSort: [{ field: 'title', dir: 'asc' }],
+    });
+    const requestFilter = {
+      type: 'group',
+      join: 'AND' as const,
+      rules: [{ type: 'rule' as const, field: 'language' as const, operator: 'eq' as const, value: 'en' }],
+    };
+    smartScopeRepo.findById.mockResolvedValue([smartScope]);
+    libraryService.findAccessibleLibraryIds.mockResolvedValue([9]);
+    queryBuilder.buildWhere.mockReturnValue('combined-where');
+    bookService.executeBooksQuery.mockResolvedValue({ items: [], total: 0, page: 0, size: 50 });
+
+    await service.queryBooks(5, makeUser({ id: 12 }), {
+      filter: requestFilter,
+      sort: [{ field: 'author', dir: 'desc' }],
+      pagination: { page: 0, size: 50 },
+      q: 'needle',
+    });
+
+    expect(queryBuilder.buildWhere).toHaveBeenCalledWith(
+      {
+        type: 'group',
+        join: 'AND',
+        rules: [smartScope.filter, requestFilter],
+      },
+      { accessibleLibraryIds: [9], userId: 12, q: 'needle' },
+    );
+    expect(bookService.executeBooksQuery).toHaveBeenCalledWith(12, 'combined-where', {
+      filter: {
+        type: 'group',
+        join: 'AND',
+        rules: [smartScope.filter, requestFilter],
+      },
+      sort: [{ field: 'author', dir: 'desc' }],
+      pagination: { page: 0, size: 50 },
+      q: 'needle',
+    });
+  });
+
+  describe('queryBooks', () => {
+    afterEach(() => {
+      vi.restoreAllMocks();
+    });
+
+    it('returns an empty result immediately when the smartScope has no filter', async () => {
+      const { service, smartScopeRepo, libraryService, queryBuilder, bookService } = makeService();
+      smartScopeRepo.findById.mockResolvedValue([makeSmartScope({ id: 5, userId: 12, filter: null })]);
+
+      const result = await service.queryBooks(5, makeUser({ id: 12 }), {
+        pagination: { page: 3, size: 25 },
+        sort: [],
+      });
+
+      expect(result).toEqual({ items: [], total: 0, page: 3, size: 25 });
+      expect(libraryService.findAccessibleLibraryIds).not.toHaveBeenCalled();
+      expect(queryBuilder.buildWhere).not.toHaveBeenCalled();
+      expect(bookService.executeBooksQuery).not.toHaveBeenCalled();
+    });
+
+    it('builds a combined filter and calls executeBooksQuery with the effective query', async () => {
+      const { service, smartScopeRepo, libraryService, queryBuilder, bookService } = makeService();
+      const smartScope = makeSmartScope({
+        id: 5,
+        filter: { type: 'group', join: 'AND', rules: [{ type: 'rule', field: 'title', operator: 'contains', value: 'scope' }] },
+        defaultSort: [{ field: 'title', dir: 'asc' }],
+      });
+      const requestFilter = {
+        type: 'group',
+        join: 'AND' as const,
+        rules: [{ type: 'rule' as const, field: 'language' as const, operator: 'eq' as const, value: 'en' }],
+      };
+      const query: BookQuery = {
+        filter: requestFilter,
+        sort: [{ field: 'author', dir: 'desc' }],
+        pagination: { page: 0, size: 50 },
+        q: 'needle',
+      };
+      smartScopeRepo.findById.mockResolvedValue([smartScope]);
+      libraryService.findAccessibleLibraryIds.mockResolvedValue([9]);
+      queryBuilder.buildWhere.mockReturnValue('combined-where');
+      bookService.executeBooksQuery.mockResolvedValue({ items: [], total: 0, page: 0, size: 50 });
+
+      await service.queryBooks(5, makeUser({ id: 12 }), query);
+
+      expect(queryBuilder.buildWhere).toHaveBeenCalledWith(
+        {
+          type: 'group',
+          join: 'AND',
+          rules: [smartScope.filter, requestFilter],
+        },
+        { accessibleLibraryIds: [9], userId: 12, q: 'needle' },
+      );
+      expect(bookService.executeBooksQuery).toHaveBeenCalledWith(12, 'combined-where', {
+        ...query,
+        filter: {
+          type: 'group',
+          join: 'AND',
+          rules: [smartScope.filter, requestFilter],
+        },
+      });
+    });
+
+    it('uses the smartScope defaultSort when the query has no sort', async () => {
+      const { service, smartScopeRepo, libraryService, queryBuilder, bookService } = makeService();
+      const smartScope = makeSmartScope({
+        id: 5,
+        filter: { type: 'group', join: 'AND', rules: [{ type: 'rule', field: 'title', operator: 'contains', value: 'scope' }] },
+        defaultSort: [{ field: 'title', dir: 'asc' }],
+      });
+      const query: BookQuery = {
+        filter: undefined,
+        sort: [],
+        pagination: { page: 1, size: 25 },
+      };
+      smartScopeRepo.findById.mockResolvedValue([smartScope]);
+      libraryService.findAccessibleLibraryIds.mockResolvedValue([9]);
+      queryBuilder.buildWhere.mockReturnValue('scope-where');
+      bookService.executeBooksQuery.mockResolvedValue({ items: [], total: 0, page: 1, size: 25 });
+
+      await service.queryBooks(5, makeUser({ id: 12 }), query);
+
+      expect(bookService.executeBooksQuery).toHaveBeenCalledWith(12, 'scope-where', {
+        ...query,
+        filter: smartScope.filter,
+        sort: [{ field: 'title', dir: 'asc' }],
+      });
+    });
+
+    it('logs a warning when queryBooks takes at least 500ms', async () => {
+      const { service, smartScopeRepo, libraryService, queryBuilder, bookService } = makeService();
+      const logger = (service as unknown as { logger: Logger }).logger;
+      vi.spyOn(logger, 'debug').mockImplementation(() => undefined);
+      const warnSpy = vi.spyOn(logger, 'warn').mockImplementation(() => undefined);
+      vi.spyOn(Date, 'now').mockReturnValueOnce(0).mockReturnValue(600);
+      smartScopeRepo.findById.mockResolvedValue([
+        makeSmartScope({
+          id: 5,
+          filter: { type: 'group', join: 'AND', rules: [{ type: 'rule', field: 'title', operator: 'contains', value: 'scope' }] },
+        }),
+      ]);
+      libraryService.findAccessibleLibraryIds.mockResolvedValue([9]);
+      queryBuilder.buildWhere.mockReturnValue('scope-where');
+      bookService.executeBooksQuery.mockResolvedValue({ items: [{ id: 1 }, { id: 2 }, { id: 3 }] as never[], total: 3, page: 0, size: 50 });
+
+      await service.queryBooks(5, makeUser({ id: 12 }), {
+        filter: undefined,
+        sort: [],
+        pagination: { page: 0, size: 50 },
+      });
+
+      expect(warnSpy).toHaveBeenCalledWith('[smart_scope.query_books] [end] scopeId=5 userId=12 resultCount=3 durationMs=600 - slow query');
+    });
+
+    it('logs an error and re-throws when executeBooksQuery fails', async () => {
+      const { service, smartScopeRepo, libraryService, queryBuilder, bookService } = makeService();
+      const logger = (service as unknown as { logger: Logger }).logger;
+      vi.spyOn(logger, 'debug').mockImplementation(() => undefined);
+      const errorSpy = vi.spyOn(logger, 'error').mockImplementation(() => undefined);
+      vi.spyOn(Date, 'now').mockReturnValueOnce(0).mockReturnValue(600);
+      smartScopeRepo.findById.mockResolvedValue([
+        makeSmartScope({
+          id: 5,
+          filter: { type: 'group', join: 'AND', rules: [{ type: 'rule', field: 'title', operator: 'contains', value: 'scope' }] },
+        }),
+      ]);
+      libraryService.findAccessibleLibraryIds.mockResolvedValue([9]);
+      queryBuilder.buildWhere.mockReturnValue('scope-where');
+      bookService.executeBooksQuery.mockRejectedValue(new Error('boom'));
+
+      await expect(
+        service.queryBooks(5, makeUser({ id: 12 }), {
+          filter: undefined,
+          sort: [],
+          pagination: { page: 0, size: 50 },
+        }),
+      ).rejects.toThrow('boom');
+
+      expect(errorSpy).toHaveBeenCalledWith(
+        '[smart_scope.query_books] [fail] scopeId=5 userId=12 durationMs=600 errorClass=Error error="boom" - query failed',
+      );
+    });
+  });
 });
diff --git a/server/src/modules/smart-scope/smart-scope.service.ts b/server/src/modules/smart-scope/smart-scope.service.ts
index cdd1a1262..faa6fb32a 100644
--- a/server/src/modules/smart-scope/smart-scope.service.ts
+++ b/server/src/modules/smart-scope/smart-scope.service.ts
@@ -1,12 +1,12 @@
-import { BadRequestException, ForbiddenException, Injectable, NotFoundException } from '@nestjs/common';
+import { BadRequestException, ForbiddenException, Injectable, Logger, NotFoundException } from '@nestjs/common';
 
-import type { BooksPage } from '@bookorbit/types';
+import type { BookQuery, BooksPage, GroupRule, SortSpec } from '@bookorbit/types';
 import type { RequestUser } from '../../common/types/request-user';
 import type { SmartScope } from '../../db/schema/smart-scopes';
+import { BookService } from '../book/book.service';
 import { BookQueryBuilder } from '../book/book-query-builder.service';
 import { BookReadService } from '../book/book-read.service';
 import { validateGroupRule } from '../book/utils/group-rule.validator';
-import { assembleBookCards } from '../book/utils/assemble-book-cards';
 import { LibraryService } from '../library/library.service';
 import { CreateSmartScopeDto } from './dto/create-smart-scope.dto';
 import { ReorderSmartScopesDto } from './dto/reorder-smart-scopes.dto';
@@ -19,13 +19,32 @@ function normalizeIcon(value: unknown): string | null {
   return icon.length > 0 ? icon : null;
 }
 
+/**
+ * SmartScopes: server-backed, rule-based dynamic datasets.
+ *
+ * A SmartScope is a saved filter rule (GroupRule) stored in the database.
+ * When queried it executes the rule against the book catalog and returns a
+ * live, always-up-to-date subset of books. It is the server-side equivalent
+ * of a smart playlist.
+ *
+ * Concept boundaries:
+ *   - SmartScope    → server-backed, rule-based data filtering (what books appear)
+ *   - Saved view    → client-only snapshot of presentation state (layout + sort + filter UI)
+ *   - Column preset → client-only column layout template (visibility / order / widths)
+ *
+ * SmartScopes own data scoping. Saved views and presets own presentation state.
+ * They are independent: a saved view may be applied on top of any scope.
+ */
 @Injectable()
 export class SmartScopeService {
+  private readonly logger = new Logger(SmartScopeService.name);
+
   constructor(
     private readonly smartScopeRepo: SmartScopeRepository,
     private readonly bookReadService: BookReadService,
     private readonly queryBuilder: BookQueryBuilder,
     private readonly libraryService: LibraryService,
+    private readonly bookService: BookService,
   ) {}
 
   private async getSmartScopeOrThrow(id: number): Promise<SmartScope> {
@@ -126,25 +145,71 @@ export class SmartScopeService {
   }
 
   async executeSmartScope(id: number, user: RequestUser, page: number, size: number, q?: string): Promise<BooksPage> {
+    return this.queryBooks(id, user, {
+      sort: [],
+      pagination: { page, size },
+      ...(q?.trim() ? { q: q.trim() } : {}),
+    });
+  }
+
+  async queryBooks(id: number, user: RequestUser, query: BookQuery): Promise<BooksPage> {
+    const start = Date.now();
+    this.logger.debug(
+      `[smart_scope.query_books] [start] scopeId=${id} userId=${user.id} page=${query.pagination.page} size=${query.pagination.size} - query started`,
+    );
+
     const smartScope = await this.getSmartScopeOrThrow(id);
     this.assertReadAccess(smartScope, user);
 
     if (!smartScope.filter) {
-      return { items: [], total: 0, page, size };
+      return { items: [], total: 0, page: query.pagination.page, size: query.pagination.size };
     }
 
     const accessibleLibraryIds = await this.libraryService.findAccessibleLibraryIds(user);
-
-    const where = this.queryBuilder.buildWhere(smartScope.filter, { accessibleLibraryIds, userId: user.id, q });
-    const orderBy = this.queryBuilder.buildOrderBy(smartScope.defaultSort ?? [], user.id);
-    const { rows, authorRows, fileRows, genreRows, progressRows, total } = await this.bookReadService.findCards({
-      where,
-      orderBy,
-      limit: size,
-      offset: page * size,
+    const filter = this.combineFilters(smartScope.filter, query.filter);
+    const effectiveQuery: BookQuery = {
+      ...query,
+      filter,
+      sort: this.resolveSort(query.sort, smartScope),
+    };
+    const where = this.queryBuilder.buildWhere(filter, {
+      accessibleLibraryIds,
       userId: user.id,
+      q: query.q,
     });
 
-    return { items: assembleBookCards(rows, authorRows, fileRows, genreRows, progressRows), total, page, size };
+    try {
+      const result = await this.bookService.executeBooksQuery(user.id, where, effectiveQuery);
+      const durationMs = Date.now() - start;
+      if (durationMs >= 500) {
+        this.logger.warn(
+          `[smart_scope.query_books] [end] scopeId=${id} userId=${user.id} resultCount=${result.items.length} durationMs=${durationMs} - slow query`,
+        );
+      }
+      return result;
+    } catch (err) {
+      const durationMs = Date.now() - start;
+      this.logger.error(
+        `[smart_scope.query_books] [fail] scopeId=${id} userId=${user.id} durationMs=${durationMs} errorClass=${(err as Error).constructor?.name} error="${(err as Error).message}" - query failed`,
+      );
+      throw err;
+    }
+  }
+
+  private combineFilters(scopeFilter: GroupRule | null, queryFilter?: GroupRule): GroupRule | undefined {
+    if (!scopeFilter) return undefined;
+    if (!queryFilter) return scopeFilter;
+    return {
+      type: 'group',
+      join: 'AND',
+      rules: [scopeFilter, queryFilter],
+    };
+  }
+
+  private resolveSort(querySort: SortSpec[] | undefined, smartScope: SmartScope): SortSpec[] {
+    if (querySort && querySort.length > 0) {
+      return querySort;
+    }
+    return smartScope.defaultSort ?? [];
   }
 }