feat(router): cookie-aware SSR library resolution with resolveLibrary helper

- helpers.go: Promote getText() from a local closure in frontend.go
  to a package-level function so it can be used by resolveLibrary.
  Add resolveLibrary(c, cfg, user.ID) helper that:
    1. Reads library_id query param (explicit navigation wins)
    2. Falls back to selectedLibrary cookie — validates __all__
       sentinel or real UUID, rejects garbage values silently
    3. Falls back to user's first visible library
  Returns LibraryResolution struct with LibraryID, IsAll, LibUUID,
  Libraries, and FirstID — eliminating repeated boilerplate across
  all SSR routes.

- frontend.go: Replace manual library resolution boilerplate in 5
  SSR route handlers (series, tags/detail, bookshelf, dashboard,
  collections/:id) with resolveLibrary(). Each route now gets cookie-
  aware library selection for free. Collection detail correctly
  handles All Libraries mode for both system and user collections.
  Dashboard no longer makes a redundant second GetUserVisibleLibraries
  call.

.env.example

@@ -10,21 +10,6 @@ JWT_SECRET=your-secure-jwt-secret-key-here
 # Generate with: openssl rand -hex 16
 DBPASS=your-secure-database-password-here
 
-# Networking: change a port if it conflicts on your host
-# Postgres port, host + container (e.g. another local DB already uses 5432)
-# DB_PORT=15432
-# App web port, host + container
-# SERVER_PORT=8765
-
-# Deployment
-# External URL for device sync (must include protocol; defaults to http://localhost:8765)
-# Examples: https://bookhoard.example.com | http://192.168.1.10:8765
-# BASE_URL=https://bookhoard.example.com
-# Mark session cookies Secure — set true behind a TLS-terminating reverse proxy (Caddy/nginx/traefik)
-# COOKIE_SECURE=true
-# Pin or rollback a specific published image version (defaults to "latest")
-# IMAGE_TAG=1.0.0
-
 # Optional: Override Defaults (defaults are set in docker-compose.yml)
 # Test Mode: WARNING - Only set to true for integration testing
 # TEST_MODE=true

.gitea/workflows/release.yml

@@ -1,112 +0,0 @@
-name: Release
-
-# Overrides the default run name (the tagged commit's message) so the Actions
-# runs list shows "Release v0.3.0" instead.
-run-name: "Release ${{ gitea.event.inputs.tag || gitea.ref_name }}"
-
-# Publishes the Bookhoard container image to the Gitea container registry AND
-# creates a Gitea Release whose body is the annotated tag's message (generated
-# locally by `make release VERSION=...` via git-cliff). Triggered by a version
-# tag push, or manually via workflow_dispatch with a tag. Pushing to main does
-# nothing, so work-in-progress commits never ship. Each release publishes two
-# image tags: the version (e.g. v0.3.0) and "latest".
-on:
-  push:
-    tags:
-      - 'v*'
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Tag to release (e.g. v0.3.0)'
-        required: true
-        type: string
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    env:
-      # Resolve the target tag for both triggers: explicit input on manual
-      # dispatch, otherwise the pushed tag ref.
-      TAG: ${{ gitea.event.inputs.tag || gitea.ref_name }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          # Full history ensures the tag annotation (the release notes) is present.
-          fetch-depth: 0
-          ref: ${{ gitea.event.inputs.tag || gitea.ref }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.linuxhg.com
-          username: ${{ gitea.actor }}
-          # PAT stored as a repo Actions secret (auto GITHUB_TOKEN lacks package scope in Gitea)
-          password: ${{ secrets.REGISTRY_TOKEN }}
-
-      - name: Build and push image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          # Publishes both the exact version (e.g. v0.2.0) and the movable "latest" tag.
-          # Deployments default to "latest" via ${IMAGE_TAG:-latest} in docker-compose.yml;
-          # pin or roll back by setting IMAGE_TAG in .env.
-          tags: |
-            git.linuxhg.com/bookhoard/bookhoard:${{ env.TAG }}
-            git.linuxhg.com/bookhoard/bookhoard:latest
-
-      - name: Create Gitea Release
-        env:
-          # REGISTRY_TOKEN is reused for release creation because Gitea's auto
-          # GITHUB_TOKEN cannot create releases on this instance. The PAT must
-          # carry write:repository scope. Idempotent: re-runs update an existing
-          # release for this tag instead of failing with 409. On any HTTP error
-          # the API response body is printed so a 403 names the missing scope.
-          TOKEN: ${{ secrets.REGISTRY_TOKEN }}
-          REPO: ${{ gitea.repository }}
-        run: |
-          set -euo pipefail
-          : "${TAG:?TAG is required}"
-          API="https://git.linuxhg.com/api/v1/repos/${REPO}/releases"
-          AUTH="Authorization: token ${TOKEN}"
-          # Release body = the annotated tag's message (the git-cliff notes).
-          BODY="$(git tag -l --format='%(contents)' "${TAG}")"
-
-          # Tags containing a '-' (e.g. v0.3.0-rc1) are published as pre-releases.
-          PRE="false"; case "${TAG}" in *-*) PRE="true";; esac
-
-          PAYLOAD=$(jq -n \
-            --arg t "${TAG}" --arg n "${TAG}" --arg b "${BODY}" --argjson p "${PRE}" \
-            '{tag_name:$t, name:$n, body:$b, draft:false, prerelease:$p}')
-
-          # POST/PATCH the release, surfacing Gitea's error message on failure
-          # (e.g. "token does not have write scope") instead of failing silently.
-          api_call() {
-            local method="$1" url="$2" resp code rbody
-            resp="$(curl -sS -w '\n%{http_code}' -X "${method}" \
-              -H "${AUTH}" -H "Content-Type: application/json" \
-              -d "${PAYLOAD}" "${url}")"
-            code="$(printf '%s' "${resp}" | tail -n1)"
-            rbody="$(printf '%s' "${resp}" | sed '$d')"
-            if [ "${code}" -ge 400 ]; then
-              echo "::error::Release API ${code} (${method} ${url}): ${rbody}" >&2
-              return 1
-            fi
-          }
-
-          EXISTING_ID="$(curl -sS -H "${AUTH}" "${API}/tags/${TAG}" | jq -r '.id // empty' 2>/dev/null || true)"
-          if [ -n "${EXISTING_ID}" ]; then
-            api_call PATCH "${API}/${EXISTING_ID}"
-            echo "Updated existing release id=${EXISTING_ID} for ${TAG}"
-          else
-            api_call POST "${API}"
-            echo "Created new release for ${TAG}"
-          fi

Dockerfile

@@ -8,15 +8,15 @@ RUN apk add --no-cache nodejs npm curl git
 
 # Install Go tools (cached well)
 RUN wget -O /tmp/sqlc.tar.gz https://github.com/sqlc-dev/sqlc/releases/download/v1.31.0/sqlc_1.31.0_linux_amd64.tar.gz && \
-  tar -xzf /tmp/sqlc.tar.gz -C /usr/local/bin sqlc && \
-  rm /tmp/sqlc.tar.gz
+    tar -xzf /tmp/sqlc.tar.gz -C /usr/local/bin sqlc && \
+    rm /tmp/sqlc.tar.gz
 RUN --mount=type=cache,target=/root/go/pkg/mod \
   go install github.com/a-h/templ/cmd/templ@v0.3.1020
 
 # Copy package files and install npm dependencies (cached unless package.json changes)
 COPY package*.json ./
 RUN --mount=type=cache,target=/root/.npm \
-  npm install 
+  npm ci
 
 # Copy Go mod files (cached unless go.mod changes)
 COPY go.mod go.sum ./
@@ -36,8 +36,7 @@ RUN npm run build:ts
 
 # Build Go binary (cached unless Go files or generated code changes)
 RUN --mount=type=cache,target=/root/go/pkg/mod \
-  --mount=type=cache,target=/root/.cache/go-build \
-  CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o main ./cmd/server
+  CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o main ./cmd/server
 
 # Test runner stage - includes Go runtime and test dependencies
 # This stage is ONLY used for running tests, never deployed to production

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help test test-integration test-all rebuild rebuild-force rebuild-app rebuild-app-force rebuild-force-db clean restart up down logs ps test-env-up test-env-down verify-guidelines verify-quick release
+.PHONY: help test test-integration test-all rebuild rebuild-force rebuild-app rebuild-app-force rebuild-force-db clean restart up down logs ps test-env-up test-env-down verify-guidelines verify-quick
 
 # Include .env file for environment variables (single source of truth)
 # Ignore if .env doesn't exist yet
@@ -7,14 +7,6 @@ ifneq (,$(wildcard ./.env))
     export
 endif
 
-# Auto-detect container runtime: prefer docker, fall back to podman
-# Override with: CONTAINER_RUNTIME=podman make rebuild-app
-CONTAINER_RUNTIME ?= $(shell command -v docker 2>/dev/null || command -v podman 2>/dev/null)
-
-# Dev compose stack: base prod file merged with the dev override (local build + tests).
-# Prod deploy does NOT use this — it runs plain `docker compose` against the base file only.
-COMPOSE := $(CONTAINER_RUNTIME) compose -f docker-compose.yml -f docker-compose.dev.yml
-
 # Default target
 help:
 	@echo "Available targets:"
@@ -44,9 +36,6 @@ help:
 	@echo "Verification:"
 	@echo "  make verify-guidelines - Run comprehensive guidelines check"
 	@echo "  make verify-quick      - Run quick guidelines check"
-	@echo ""
-	@echo "Release:"
-	@echo "  ./release v0.3.0            - Tag, push, and release (notes auto-generated from commits)"
 
 # Run unit tests locally (fast, no containers)
 test:
@@ -55,23 +44,23 @@ test:
 # Run integration tests in containers (matches production environment)
 test-integration:
 	@echo "Building test containers..."
-	$(COMPOSE) --profile tests build
+	podman compose --profile tests build
 	@echo "Starting application containers..."
-	$(COMPOSE) up -d db app
+	podman compose up -d db app
 	@echo "Waiting for services to be healthy..."
-	@until $(CONTAINER_RUNTIME) exec bookhoard_db pg_isready -U postgres > /dev/null 2>&1; do \
+	@until podman exec bookhoard_db pg_isready -U postgres > /dev/null 2>&1; do \
 		echo "  Database not ready yet..."; \
 		sleep 2; \
 	done; \
 	echo "  ✓ Database is ready"
-	@until $(CONTAINER_RUNTIME) exec bookhoard curl -sf http://localhost:8765/health > /dev/null 2>&1; do \
+	@until podman exec bookhoard curl -sf http://localhost:8765/health > /dev/null 2>&1; do \
 		echo "  Application not ready yet..."; \
 		sleep 2; \
 	done; \
 	echo "  ✓ Application is ready"
 	@echo ""
 	@echo "Running integration tests in container..."
-	$(COMPOSE) --profile tests run --rm tests
+	podman compose --profile tests run --rm tests
 	@echo ""
 	@echo "✅ Integration tests completed!"
 	@echo "📝 Containers are still running. Use 'make logs' to view logs or 'make clean' to stop."
@@ -82,76 +71,76 @@ test-all: test test-integration
 # Rebuild app container only (preserve DB, with cache)
 rebuild-app:
 	@echo "Rebuilding app container (database stays running)..."
-	$(COMPOSE) up --build --force-recreate -d app
+	podman compose up --build --force-recreate -d app
 	@echo "✓ App container rebuilt and restarted"
 
 # Rebuild app container only (preserve DB, no cache)
 rebuild-app-force:
 	@echo "Force rebuilding app container (database stays running, no cache)..."
-	$(COMPOSE) build --no-cache app
-	$(COMPOSE) up --force-recreate -d app
+	podman compose build --no-cache app
+	podman compose up --force-recreate -d app
 	@echo "✓ App container rebuilt and restarted"
 
 # Rebuild all containers (preserve DB, with cache)
 rebuild:
 	@echo "Rebuilding all containers (database preserved)..."
-	$(COMPOSE) up --build --force-recreate -d
+	podman compose up --build --force-recreate -d
 	@echo "✓ All containers rebuilt and restarted"
 
 # Rebuild all containers (preserve DB, no cache)
 rebuild-force:
 	@echo "Force rebuilding all containers (database preserved, no cache)..."
-	$(COMPOSE) build --no-cache
-	$(COMPOSE) up --force-recreate -d
+	podman compose build --no-cache
+	podman compose up --force-recreate -d
 	@echo "✓ All containers rebuilt and restarted"
 
 # Rebuild all containers (remove DB, no cache)
 rebuild-force-db:
 	@echo "Force rebuilding all containers (database will be DELETED, no cache)..."
-	$(COMPOSE) down -v
-	$(COMPOSE) build --no-cache
-	$(COMPOSE) up --force-recreate -d
+	podman compose down -v
+	podman compose build --no-cache
+	podman compose up --force-recreate -d
 	@echo "✓ All containers rebuilt and restarted"
 
 # Stop and remove containers
 clean:
-	$(COMPOSE) down -v
+	podman compose down -v
 
 # Quick start (if already built)
 up:
-	$(COMPOSE) up -d
+	podman compose up -d
 
 # Stop all containers (alias for clean)
 down:
-	$(COMPOSE) down
+	podman compose down
 
 # Restart app container (preserves database)
 restart:
 	@echo "Restarting app container (database stays running)..."
-	$(COMPOSE) restart app
+	podman compose restart app
 	@echo "✓ App container restarted"
 
 # Show container status
 ps:
-	$(COMPOSE) ps
+	podman compose ps
 
 # Show container logs
 logs:
-	$(COMPOSE) logs -f
+	podman compose logs -f
 
 # Start containers with test mode enabled for manual testing
 test-env-up:
 	@echo "Starting containers with test mode enabled..."
-	TEST_MODE=true RATE_LIMIT_ENABLED=false REQUESTS_PER_MINUTE=1000 $(COMPOSE) up --build --force-recreate -d
+	TEST_MODE=true RATE_LIMIT_ENABLED=false REQUESTS_PER_MINUTE=1000 podman compose up --build --force-recreate -d
 	@echo "Waiting for services to be ready..."
-	@until $(CONTAINER_RUNTIME) exec bookhoard_db pg_isready -U postgres > /dev/null 2>&1; do sleep 1; done
-	@until $(CONTAINER_RUNTIME) exec bookhoard curl -sf http://localhost:8765/health > /dev/null 2>&1; do sleep 1; done
+	@until podman exec bookhoard_db pg_isready -U postgres > /dev/null 2>&1; do sleep 1; done
+	@until podman exec bookhoard curl -sf http://localhost:8765/health > /dev/null 2>&1; do sleep 1; done
 	@echo "✓ Test environment is ready!"
 	@echo "Application available at http://localhost:8765"
 
 # Stop test environment
 test-env-down:
-	$(COMPOSE) down -v
+	podman compose down -v
 
 # Verify project guidelines compliance
 verify-guidelines:
@@ -161,27 +150,3 @@ verify-guidelines:
 verify-quick:
 	@echo "Running quick project guidelines verification..."
 	@./scripts/verify-quick.sh
-
-# Create an annotated version tag carrying auto-generated release notes (git-cliff)
-# and push it. The tag push triggers .gitea/workflows/release.yml, which builds the
-# image and publishes a Gitea Release whose body is this tag's message. Notes come
-# entirely from Conventional Commits — no hand-written message required.
-#
-# git-cliff's --latest needs the tag to exist to scope the notes, so we create a
-# throwaway lightweight tag, generate the notes, replace it with an annotated tag,
-# then push. --cleanup=verbatim keeps the markdown "###" group headers (git's
-# default cleanup would strip lines starting with "#").
-#
-# Requires git-cliff: https://git-cliff.org/install
-# Usage: make release VERSION=v0.3.0
-release:
-	@test -n "$(VERSION)" || { echo "Usage: make release VERSION=v0.3.0"; exit 1; }
-	@command -v git-cliff >/dev/null 2>&1 || { echo "git-cliff not found — install: https://git-cliff.org/install"; exit 1; }
-	@if git rev-parse "$(VERSION)" >/dev/null 2>&1; then echo "Tag $(VERSION) already exists locally — delete it first: git tag -d $(VERSION)"; exit 1; fi
-	@echo "Generating release notes for $(VERSION)..."
-	@git tag "$(VERSION)" HEAD && \
-		(git cliff --latest --config cliff.toml > .release-notes.tmp && git tag -d "$(VERSION)" >/dev/null) || \
-		{ git tag -d "$(VERSION)" >/dev/null 2>&1; rm -f .release-notes.tmp; echo "git-cliff failed"; exit 1; }
-	@git tag -a --cleanup=verbatim -F .release-notes.tmp "$(VERSION)" HEAD && rm -f .release-notes.tmp
-	@git push origin "$(VERSION)"
-	@echo "Pushed $(VERSION) — Gitea Actions will build the image and publish the Release."

README.md

@@ -25,7 +25,7 @@ A modern self-hosted media library system built with Go, PostgreSQL, HTMX, and T
 
 ```bash
 # 1. Clone the repository
-git clone https://git.linuxhg.com/Bookhoard/bookhoard.git
+git clone https://github.com/yourusername/bookhoard.git
 cd bookhoard
 
 # 2. Set up environment
@@ -35,10 +35,8 @@ cp .env.example .env
 #   DBPASS: openssl rand -hex 16
 # Edit .env with your generated values
 
-# 3. Pull images and start the server
-docker compose pull
-docker compose up -d
-# Optionally pin a specific version: set IMAGE_TAG in .env (defaults to "latest")
+# 3. Start the server
+podman-compose up --build -d  # or: docker-compose up --build -d
 
 # 4. Open your browser
 open http://localhost:8765

TIMEZONE_PLAN.md

@@ -0,0 +1,379 @@
+# Timezone Implementation Plan
+
+## Overview
+
+Add per-user timezone support with system-wide fallback (set via docker-compose), defaulting to UTC. The database already stores all timestamps as UTC via `TIMESTAMPTZ` columns, so this is primarily a display-layer feature.
+
+**Display format:** MM-DD-YYYY HH:MM (US convention, no timezone abbreviation shown)
+
+**Timezone selection:** Manual dropdown only (no browser auto-detect)
+
+---
+
+## Phase 1: Database Schema
+
+**File:** `database/schema/schema.sql`
+
+1. Add `timezone` column directly to the `users` table definition (line ~36):
+
+```sql
+CREATE TABLE IF NOT EXISTS users (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    email VARCHAR(255) UNIQUE NOT NULL,
+    username VARCHAR(255) UNIQUE NOT NULL,
+    password_hash VARCHAR(255) NOT NULL,
+    first_name VARCHAR(255),
+    last_name VARCHAR(255),
+    role VARCHAR(20) NOT NULL DEFAULT 'user' CHECK (role IN ('admin', 'user')),
+    theme VARCHAR(50) DEFAULT 'tokyo-night',
+    max_devices INTEGER DEFAULT 10,
+    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+    timezone VARCHAR(50) DEFAULT 'UTC'
+);
+```
+
+> Note: The `timezone` column is already present at line 36 in the current schema. No change needed for this step.
+
+1. Add `default_timezone` to the `system_settings` INSERT block (line ~49-52):
+
+```sql
+INSERT INTO system_settings (setting_key, setting_value, description) VALUES
+('scan_poll_interval_seconds', '60', 'How often to scan all libraries in minutes'),
+('auto_scan_enabled', 'true', 'Whether auto-scanning is enabled system-wide'),
+('default_timezone', 'UTC', 'System default timezone')
+ON CONFLICT (setting_key) DO NOTHING;
+```
+
+1. Add index in the indexes section (after line ~460, with other user indexes):
+
+```sql
+CREATE INDEX IF NOT EXISTS idx_users_timezone ON users(timezone);
+```
+
+1. Regenerate sqlc code:
+
+```bash
+cd internal/database && sqlc generate
+```
+
+---
+
+## Phase 2: Database Queries
+
+**File:** `internal/database/queries/queries.sql`
+
+Add new queries:
+
+```sql
+-- name: UpdateUserTimezone :exec
+UPDATE users SET timezone = $2, updated_at = NOW() WHERE id = $1;
+
+-- name: GetSystemTimezone :one
+SELECT setting_value FROM system_settings WHERE setting_key = 'default_timezone';
+```
+
+> Note: `UpdateSystemTimezone` is omitted because the existing `UpdateSystemSetting` query handles it by passing `'default_timezone'` as the key parameter.
+
+Regenerate after adding queries:
+
+```bash
+cd internal/database && sqlc generate
+```
+
+---
+
+## Phase 3: Template Utilities
+
+**File:** `templates/utils.go`
+
+Add timezone-aware time formatting helpers:
+
+```go
+package templates
+
+import (
+    "time"
+
+    "github.com/jackc/pgx/v5/pgtype"
+)
+
+// FormatInTimezone formats a time.Time in the specified timezone as MM-DD-YYYY HH:MM
+func FormatInTimezone(t time.Time, timezone string) string {
+    if t.IsZero() {
+        return ""
+    }
+
+    loc, err := time.LoadLocation(timezone)
+    if err != nil {
+        loc = time.UTC
+    }
+
+    return t.In(loc).Format("01-02-2006 03:04 PM")
+}
+
+// FormatTimestamptzInTimezone formats a pgtype.Timestamptz in the specified timezone
+func FormatTimestamptzInTimezone(t pgtype.Timestamptz, timezone string) string {
+    if !t.Valid {
+        return ""
+    }
+    return FormatInTimezone(t.Time, timezone)
+}
+```
+
+---
+
+## Phase 4: User Context Update
+
+**File:** `templates/types.go`
+
+Add `Timezone` field to the `User` struct:
+
+```go
+type User struct {
+    ID        string
+    Email     string
+    Username  string
+    Role      string
+    Theme     string
+    FirstName string
+    LastName  string
+    CreatedAt time.Time
+    Token     string
+    Timezone  string
+}
+```
+
+**File:** `internal/router/helpers.go`
+
+Update `getTemplateUserWithTheme()` to include timezone:
+
+```go
+userTimezone := "UTC"
+if userDB.Timezone.Valid {
+    userTimezone = userDB.Timezone.String
+}
+
+return templates.User{
+    // ... existing fields ...
+    Timezone: userTimezone,
+}
+```
+
+---
+
+## Phase 5: Handlers
+
+**File:** `internal/handlers/auth.go`
+
+Update `UpdateProfileRequest` struct:
+
+```go
+type UpdateProfileRequest struct {
+    Username  string `json:"username,omitempty" validate:"omitempty,min=3,max=50"`
+    Email     string `json:"email,omitempty" validate:"omitempty,email"`
+    FirstName string `json:"first_name,omitempty" validate:"omitempty,max=100"`
+    LastName  string `json:"last_name,omitempty" validate:"omitempty,max=100"`
+    Theme     string `json:"theme,omitempty" validate:"omitempty"`
+    Timezone  string `json:"timezone,omitempty" validate:"omitempty"`
+}
+```
+
+Add timezone update logic in `UpdateProfile()`:
+
+```go
+if req.Timezone != "" {
+    if _, err := time.LoadLocation(req.Timezone); err != nil {
+        return c.JSON(http.StatusBadRequest, map[string]string{
+            "error": "Invalid timezone",
+        })
+    }
+    err := h.db.UpdateUserTimezone(ctx, database.UpdateUserTimezoneParams{
+        ID:       pgtype.UUID{Bytes: userUUID, Valid: true},
+        Timezone: pgtype.Text{String: req.Timezone, Valid: true},
+    })
+    if err != nil {
+        return err
+    }
+}
+```
+
+**File:** `internal/handlers/system_settings.go`
+
+Add timezone settings handler:
+
+```go
+type UpdateTimezoneSettingsRequest struct {
+    DefaultTimezone string `json:"default_timezone" validate:"required"`
+}
+
+func (h *SystemSettingsHandler) UpdateTimezoneSettings(c *echo.Context) error {
+    var req UpdateTimezoneSettingsRequest
+    if err := c.Bind(&req); err != nil {
+        return c.JSON(http.StatusBadRequest, map[string]string{"error": "Invalid request"})
+    }
+    if _, err := time.LoadLocation(req.DefaultTimezone); err != nil {
+        return c.JSON(http.StatusBadRequest, map[string]string{"error": "Invalid timezone"})
+    }
+    err := h.db.UpdateSystemSetting(c.Request().Context(), database.UpdateSystemSettingParams{
+        SettingKey:   "default_timezone",
+        SettingValue: req.DefaultTimezone,
+    })
+    if err != nil {
+        return err
+    }
+    return c.JSON(http.StatusOK, map[string]string{"message": "Timezone updated"})
+}
+```
+
+---
+
+## Phase 6: User Profile UI
+
+**File:** `templates/profile_form.templ`
+
+Add timezone dropdown after the theme field:
+
+```templ
+<div class="form-group">
+    <label for="timezone">Timezone</label>
+    <select name="timezone" id="timezone" class="form-select">
+        <option value="UTC" selected?={ user.Timezone == "UTC" }>UTC (Coordinated Universal Time)</option>
+        <option value="America/New_York" selected?={ user.Timezone == "America/New_York" }>Eastern Time</option>
+        <option value="America/Chicago" selected?={ user.Timezone == "America/Chicago" }>Central Time</option>
+        <option value="America/Denver" selected?={ user.Timezone == "America/Denver" }>Mountain Time</option>
+        <option value="America/Los_Angeles" selected?={ user.Timezone == "America/Los_Angeles" }>Pacific Time</option>
+        <option value="America/Phoenix" selected?={ user.Timezone == "America/Phoenix" }>Mountain Time (no DST)</option>
+        <option value="America/Anchorage" selected?={ user.Timezone == "America/Anchorage" }>Alaska Time</option>
+        <option value="Pacific/Honolulu" selected?={ user.Timezone == "Pacific/Honolulu" }>Hawaii Time</option>
+    </select>
+</div>
+```
+
+Include timezone in the HTMX form submission payload.
+
+---
+
+## Phase 7: Admin Settings UI
+
+**File:** `templates/admin_settings.templ`
+
+Add system default timezone setting:
+
+```templ
+<div class="setting-group">
+    <h3>System Defaults</h3>
+    <label for="default_timezone">Default Timezone</label>
+    <select name="default_timezone" id="default_timezone">
+        <option value="UTC">UTC (Coordinated Universal Time)</option>
+        <option value="America/New_York">Eastern Time</option>
+        <option value="America/Chicago">Central Time</option>
+        <option value="America/Denver">Mountain Time</option>
+        <option value="America/Los_Angeles">Pacific Time</option>
+        <option value="America/Phoenix">Mountain Time (no DST)</option>
+        <option value="America/Anchorage">Alaska Time</option>
+        <option value="Pacific/Honolulu">Hawaii Time</option>
+    </select>
+</div>
+```
+
+---
+
+## Phase 8: Template Time Display Updates
+
+### Files to update
+
+| Template                             | Line(s)        | Field(s)                            |
+| ------------------------------------ | -------------- | ----------------------------------- |
+| `templates/book_detail.templ`        | ~253, ~282     | `LastReadAt`, `DatePublished`       |
+| `templates/book_detail_modals.templ` | ~68, ~113      | `Timestamp`, `LastReadAt`           |
+| `templates/devices.templ`            | ~83, ~91, ~174 | `LastSync`, `LastSeen`, `ExpiresAt` |
+| `templates/conflicts.templ`          | ~114           | `CreatedAt`                         |
+| `templates/admin_users.templ`        | ~89            | `CreatedAt`                         |
+| `templates/queue.templ`              | ~138           | `CreatedAt`                         |
+
+### Change pattern
+
+```templ
+<!-- Before -->
+{ book.ReadingProgress.LastReadAt.Time.Format("01-02-2006 03:04 PM") }
+
+<!-- After -->
+{ templates.FormatTimestamptzInTimezone(book.ReadingProgress.LastReadAt, user.Timezone) }
+```
+
+For `time.Time` fields:
+
+```templ
+<!-- Before -->
+{ device.LastSync.Format("01-02-2006 03:04 PM") }
+
+<!-- After -->
+{ templates.FormatInTimezone(device.LastSync, user.Timezone) }
+```
+
+---
+
+## Phase 9: Docker Configuration
+
+**File:** `docker-compose.yml`
+
+```yaml
+services:
+  server:
+    environment:
+      - TZ=UTC
+```
+
+**File:** `.env.example`
+
+```
+# System default timezone (fallback if not set in DB)
+TZ=UTC
+```
+
+---
+
+## Files Modified Summary
+
+| File                                    | Change                                                                          |
+| --------------------------------------- | ------------------------------------------------------------------------------- |
+| `database/schema/schema.sql`            | Add timezone column to users, system_setting row                                |
+| `internal/database/queries/queries.sql` | Add UpdateUserTimezone, GetSystemTimezone (reuses existing UpdateSystemSetting) |
+| `templates/utils.go`                    | Add FormatInTimezone, FormatTimestamptzInTimezone                               |
+| `templates/types.go`                    | Add Timezone field to User struct                                               |
+| `internal/router/helpers.go`            | Pass timezone to template User                                                  |
+| `internal/handlers/auth.go`             | Handle timezone updates in UpdateProfile                                        |
+| `internal/handlers/system_settings.go`  | Add timezone settings handler                                                   |
+| `templates/profile_form.templ`          | Add timezone dropdown                                                           |
+| `templates/admin_settings.templ`        | Add default timezone setting                                                    |
+| `templates/book_detail.templ`           | Update time displays                                                            |
+| `templates/book_detail_modals.templ`    | Update time displays                                                            |
+| `templates/devices.templ`               | Update time displays                                                            |
+| `templates/conflicts.templ`             | Update time displays                                                            |
+| `templates/admin_users.templ`           | Update time displays                                                            |
+| `templates/queue.templ`                 | Update time displays                                                            |
+| `docker-compose.yml`                    | Add TZ env var                                                                  |
+| `.env.example`                          | Add TZ example                                                                  |
+
+---
+
+## Testing Checklist
+
+- [ ] Create user, set timezone to Eastern, verify times display in MM-DD-YYYY HH:MM format
+- [ ] Create user, set timezone to Pacific, verify different offset
+- [ ] Test system default timezone fallback for users with no timezone set
+- [ ] Verify invalid timezone values are rejected by the API
+- [ ] Verify existing users (no timezone set) fall back to system default
+- [ ] Verify all templates show consistent MM-DD-YYYY HH:MM format
+- [ ] Run `make test-integration` to verify no regressions
+
+---
+
+## Deployment Steps
+
+1. Update `database/schema/schema.sql` with new column and settings
+2. Regenerate sqlc: `cd internal/database && sqlc generate`
+3. Apply schema changes (restart database container with `make rebuild-force-db`)
+4. Deploy backend code changes
+5. Verify with existing data

bruno/NewDB.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bru run --env Bookhoard --delay 500 "NewDevDBSetup/RegisterUser.yml" "NewDevDBSetup/SetBaseUrl.yml" "NewDevDBSetup/CreateEbookLibrary.yml" "NewDevDBSetup/CreateComicLibrary.yml" "NewDevDBSetup/CreateMangaLibrary.yml" "NewDevDBSetup/AddEbookLibraryFolder.yml" "NewDevDBSetup/AddComicLibraryFolder.yml" "NewDevDBSetup/AddMangaLibraryFolder.yml" "NewDevDBSetup/ScanAllLibraries.yml"
+bru run --env Bookhoard --delay 500 "NewDevDBSetup/RegisterUser.yml" "NewDevDBSetup/CreateEbookLibrary.yml" "NewDevDBSetup/CreateComicLibrary.yml" "NewDevDBSetup/CreateMangaLibrary.yml" "NewDevDBSetup/AddEbookLibraryFolder.yml" "NewDevDBSetup/AddComicLibraryFolder.yml" "NewDevDBSetup/AddMangaLibraryFolder.yml" "NewDevDBSetup/ScanAllLibraries.yml"

bruno/NewDevDBSetup/SetBaseUrl.yml

@@ -1,38 +0,0 @@
-info:
-  name: SetBaseUrl
-  type: http
-  seq: 3
-
-http:
-  method: PUT
-  url: '{{base_url}}/api/system/config'
-  auth: inherit
-  body:
-    type: json
-    jsonBody: |-
-      {
-        "base_url": "http://localhost:8765"
-      }
-  headers:
-  - key: Authorization
-    value: Bearer {{token}}
-  - key: Content-Type
-    value: application/json
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5
-
-docs: |-
-  ## Set Base URL
-
-  Configures the server's base_url during initial dev database setup.
-
-  Must be run after RegisterUser (which provides the auth token) and before
-  any library/device creation (which require setup to be complete).
-
-  **Method:** PUT
-  **Endpoint:** /api/system/config
-  **Auth:** Bearer token (from RegisterUser)

bruno/media-items/Update Media Rating.yml

@@ -47,7 +47,7 @@ docs: |-
     - `id` (string, required): Media item UUID
 
     **Request Body:**
-    - `rating` (number, required): Rating value (1-10 integer scale; displayed as 1-5 stars with half-star precision)
+    - `rating` (number, required): Rating value (typically 1-5)
     - `review` (string, optional): Review text
 
     **Response:** Updated rating object

bruno/opencollection.yml

@@ -83,10 +83,9 @@ docs:
     - **Update Highlight**: PUT /api/highlights/:id - Update highlight
     - **Delete Highlight**: DELETE /api/highlights/:id - Remove highlight
      Ratings (All Users)
-    - **Get Rating**: GET /api/media-items/:id/rating - User's rating (returns null if unrated)
-    - **Create/Update Rating**: POST /api/media-items/:id/rating - Rate media item (1-10 scale, displayed as 1-5 stars with half-star precision). POST upserts; PUT also available.
-    - **Update Rating**: PUT /api/media-items/:id/rating - Update rating (upsert)
-    - **Delete Rating**: DELETE /api/media-items/:id/rating - Remove rating
+    - **Get Rating**: GET /api/ratings/:media_id - User's rating (returns 0 if unrated)
+    - **Create/Update Rating**: POST /api/ratings - Rate media item (1-5 stars, half-star precision)
+    - **Delete Rating**: DELETE /api/ratings/:media_id - Remove rating
      Collections (All Users)
     - **List Collections**: GET /api/collections - Get user's collections
     - **Get Collection**: GET /api/collections/:id - Collection details with media items

cliff.toml

@@ -1,37 +0,0 @@
-# git-cliff configuration — generates the body of each Gitea Release from
-# Conventional Commits accumulated since the previous tag. Invoked in CI by
-# orhun/git-cliff-action with --latest so only the current tag's section is
-# emitted (no full history, no header — the Gitea Release title is the tag).
-# Docs: https://git-cliff.org/docs/configuration
-
-[changelog]
-header = ""
-body = """
-{% for group, commits in commits | group_by(attribute="group") %}\
-### {{ group | upper_first }}
-{% for commit in commits %}\
-- {% if commit.scope %}*({{ commit.scope }})* {% endif %}{{ commit.message | upper_first }} ({{ commit.id | truncate(length=7, end="") }})
-{% endfor %}\
-{% endfor %}\
-"""
-trim = true
-footer = ""
-
-[git]
-conventional_commits = true
-filter_unconventional = false
-require_conventional = false
-split_commits = false
-commit_parsers = [
-  { message = "^feat", group = "Features" },
-  { message = "^fix", group = "Bug Fixes" },
-  { message = "^perf", group = "Performance" },
-  { message = "^refactor", group = "Refactor" },
-  { message = "^docs", group = "Documentation" },
-  { message = "^test", group = "Tests" },
-  { message = "^chore|^ci", group = "Miscellaneous Tasks" },
-  { message = ".*", group = "Other" },
-]
-filter_commits = false
-tag_pattern = "v[0-9].*"
-sort_commits = "oldest"

cmd/server/main.go

@@ -14,8 +14,6 @@ import (
 	"log"
 	"time"
 
-	_ "time/tzdata"
-
 	"github.com/go-playground/validator/v10"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/labstack/echo/v5"
@@ -50,74 +48,24 @@ func main() {
 	}
 	log.Println("✅ Database schema initialized and verified, starting server...")
 
-	// Load tunable settings from the DB into the registry. All values fall back
-	// to compiled defaults if a row is missing, so this never blocks startup.
-	registry := database.NewSettingsRegistry(queries)
-	if err := registry.Load(ctx); err != nil {
-		log.Printf("⚠️ Could not load system settings (using defaults): %v", err)
-	}
-	// Wire the registry into the package-level password validator so live
-	// rule changes apply to the echo struct-tag validator and ValidatePassword.
-	middleware.SetDefaultPasswordSettings(registry)
-
-	// Seed base_url from env var if not already configured. Uses conditional
-	// UPDATE so admin-set values are never overwritten on restart.
-	if cfg.BaseURL != "" {
-		_, err = dbPool.Exec(ctx, `
-			INSERT INTO system_config (key, value)
-			VALUES ('base_url', $1)
-			ON CONFLICT (key) DO UPDATE
-			SET value = EXCLUDED.value
-			WHERE system_config.value = ''
-		`, cfg.BaseURL)
-		if err != nil {
-			log.Printf("⚠️ Could not seed base_url: %v", err)
-		} else {
-			// Also seed derived URLs
-			for key, suffix := range map[string]string{
-				"opds_base_url": "/opds",
-				"api_base_url":  "/api",
-			} {
-				_, _ = dbPool.Exec(ctx, `
-					INSERT INTO system_config (key, value)
-					VALUES ($1, $2)
-					ON CONFLICT (key) DO UPDATE
-					SET value = EXCLUDED.value
-					WHERE system_config.value = ''
-				`, key, cfg.BaseURL+suffix)
-			}
-		}
-	}
-
-	// Create login attempt tracker from configured (or default) lockout policy.
-	loginMaxAttempts, loginLockout := registry.LoginLockout()
-	loginAttemptTracker := ratelimit.NewLoginAttemptTracker(loginMaxAttempts, loginLockout, 5*time.Minute)
+	// Create login attempt tracker: 5 failed attempts = 15 minute lockout
+	loginAttemptTracker := ratelimit.NewLoginAttemptTracker(5, 15*time.Minute, 5*time.Minute)
 
 	authHandler := handlers.NewAuthHandler(queries, cfg.JWTSecret, loginAttemptTracker)
-	authHandler.SetSettings(registry)
 	systemSettingsHandler := handlers.NewSystemSettingsHandler(queries)
-	systemSettingsHandler.SetSettings(registry)
 	sidecarHandler := handlers.NewSidecarHandler(queries, cfg)
-	sidecarHandler.SetSettings(registry)
 	libraryHandler := handlers.NewLibraryHandler(queries)
 	deviceHandler := handlers.NewDeviceHandler(queries, cfg.JWTSecret, cfg)
 	deviceAuthMiddleware := middleware.NewDeviceAuthMiddleware(queries)
-	deviceAuthMiddleware.SetSettings(registry)
 	processingIssuesHandler := handlers.NewProcessingIssuesHandler(queries)
-	hashConflictsHandler := handlers.NewHashConflictsHandler(queries)
 
 	// Create WebSocket connection manager
 	connManager := sync.NewConnectionManager()
 
 	progressService := sync.NewProgressService(queries, connManager)
-	annotationService := sync.NewAnnotationService(queries, connManager)
-	annotationService.SetSettings(registry)
-	maintenanceCancel := annotationService.StartDailyMaintenance()
-	defer maintenanceCancel()
 
-	queueProcessor := sync.NewSyncQueueProcessorWithConfig(queries, registry.SyncQueueConfig().Interval, registry.SyncQueueConfig().BatchSize)
+	queueProcessor := sync.NewSyncQueueProcessor(queries)
 	queueProcessor.SetProgressService(progressService)
-	queueProcessor.SetAnnotationService(annotationService)
 
 	// Create library service
 	libraryService := services.NewLibraryService(queries)
@@ -126,23 +74,18 @@ func main() {
 	libraryService.SyncAllowedExtensions(context.Background())
 
 	// Create worker for background tasks
-	workerCfg := registry.WorkerPoolConfig()
-	worker := services.NewWorkerWithConfig(workerCfg.Size, workerCfg.QueueCap, connManager)
+	worker := services.NewWorker(3, connManager)
 	services.WorkerInstance = worker
 
 	koreaderHandler := handlers.NewKOReaderHandler(queries, connManager, queueProcessor)
 	koreaderHandler.SetProgressService(progressService)
-	koreaderHandler.SetAnnotationService(annotationService)
-	koreaderHandler.SetLibraryService(libraryService)
 	wsHandler := handlers.NewWSHandler(queries, connManager, cfg.JWTSecret, deviceAuthMiddleware)
 	conflictHandler := handlers.NewConflictHandler(queries, connManager)
 	analyticsHandler := handlers.NewAnalyticsHandler(queries)
 	queueHandler := handlers.NewQueueHandler(queries, queueProcessor)
 
 	conversionService := services.NewConversionService(queries, "/var/bookhoard/cache/kepub")
-	conversionService.SetSettings(registry)
 	opdsHandler := handlers.NewOPDSHandler(queries, libraryService, conversionService)
-	opdsHandler.SetSettings(registry)
 
 	collectionHandler := handlers.NewCollectionHandler(queries, libraryService, connManager)
 	dashboardService := services.NewDashboardService(queries)
@@ -151,7 +94,6 @@ func main() {
 	filtersHandler := handlers.NewFiltersHandler(queries)
 	mediaHandler := handlers.NewMediaHandler(queries, libraryService, worker)
 	mediaHandler.SetProgressService(progressService)
-	mediaHandler.SetAnnotationService(annotationService)
 	matchingHandler := handlers.NewMatchingHandler(queries, connManager)
 	jobsHandler := handlers.NewJobsHandler(queries, worker)
 
@@ -195,7 +137,6 @@ func main() {
 		Echo:                    e,
 		Queries:                 queries,
 		Cfg:                     cfg,
-		Settings:                registry,
 		DBPool:                  dbPool,
 		AuthHandler:             authHandler,
 		LibraryHandler:          libraryHandler,
@@ -203,7 +144,6 @@ func main() {
 		MediaHandler:            mediaHandler,
 		MatchingHandler:         matchingHandler,
 		ProcessingIssuesHandler: processingIssuesHandler,
-		HashConflictsHandler:    hashConflictsHandler,
 		KOReaderHandler:         koreaderHandler,
 		WSHandler:               wsHandler,
 		ConflictHandler:         conflictHandler,
@@ -221,11 +161,9 @@ func main() {
 		ConnManager:             connManager,
 		QueueProcessor:          queueProcessor,
 		ProgressService:         progressService,
-		AnnotationService:       annotationService,
 		DeviceAuthMiddleware:    deviceAuthMiddleware,
 		JobsHandler:             jobsHandler,
 		LoginTracker:            loginAttemptTracker,
-		LibraryService:          libraryService,
 	}
 
 	// Register all routes and get ebook handler

cmd/server/tests/calibre_integration_test.go

@@ -90,7 +90,7 @@ func TestCalibreLibraryScan(t *testing.T) {
 	// Create scanner and configure it
 	scanner := services.NewMediaScanner(setup.DB)
 	scanner.SetAdminID(adminID)
-	err = scanner.SetFolders([]string{tmpDir}, false)
+	err = scanner.SetFolders([]string{tmpDir})
 	require.NoError(t, err, "Failed to set scanner folders")
 
 	// Scan library
@@ -167,7 +167,7 @@ func TestCalibreLibraryScanWithoutSidecar(t *testing.T) {
 	// Create scanner and configure it
 	scanner := services.NewMediaScanner(setup.DB)
 	scanner.SetAdminID(adminID)
-	err = scanner.SetFolders([]string{tmpDir}, false)
+	err = scanner.SetFolders([]string{tmpDir})
 	require.NoError(t, err, "Failed to set scanner folders")
 
 	// Scan library

cmd/server/tests/test_helpers_test.go

@@ -84,7 +84,6 @@ type TestServerSetup struct {
 	ConnManager     *wsync.ConnectionManager
 	QueueProcessor  *wsync.SyncQueueProcessor
 	ProgressService *wsync.ProgressService
-	AnnotationService *wsync.AnnotationService
 	CleanupCancel   context.CancelFunc
 	QueueCtx        context.Context
 	QueueCancel     context.CancelFunc
@@ -456,7 +455,6 @@ func setupTestServer(t *testing.T) *TestServerSetup {
 	cleanupCancel := connManager.StartCleanupTask()
 
 	progressService := wsync.NewProgressService(queries, connManager)
-	annotationService := wsync.NewAnnotationService(queries, connManager)
 
 	queueProcessor := wsync.NewSyncQueueProcessor(queries)
 	queueProcessor.SetProgressService(progressService)
@@ -465,7 +463,6 @@ func setupTestServer(t *testing.T) *TestServerSetup {
 
 	koreaderHandler := handlers.NewKOReaderHandler(queries, connManager, queueProcessor)
 	koreaderHandler.SetProgressService(progressService)
-	koreaderHandler.SetAnnotationService(annotationService)
 	wsHandler := handlers.NewWSHandler(queries, connManager, cfg.JWTSecret, deviceAuthMiddleware)
 	conflictHandler := handlers.NewConflictHandler(queries, connManager)
 	analyticsHandler := handlers.NewAnalyticsHandler(queries)
@@ -485,7 +482,6 @@ func setupTestServer(t *testing.T) *TestServerSetup {
 	seriesHandler := handlers.NewSeriesHandler(queries)
 	mediaHandler := handlers.NewMediaHandler(queries, libraryService, worker)
 	mediaHandler.SetProgressService(progressService)
-	mediaHandler.SetAnnotationService(annotationService)
 	matchingHandler := handlers.NewMatchingHandler(queries, connManager)
 
 	// Create conversion service for OPDS
@@ -541,7 +537,6 @@ func setupTestServer(t *testing.T) *TestServerSetup {
 		ConnManager:           connManager,
 		QueueProcessor:        queueProcessor,
 		ProgressService:       progressService,
-		AnnotationService:     annotationService,
 		DeviceAuthMiddleware:  deviceAuthMiddleware,
 		LoginTracker:          loginAttemptTracker,
 	}

database/schema/schema.sql

@@ -45,47 +45,11 @@ CREATE TABLE IF NOT EXISTS system_settings (
     updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
 );
 
--- Extend system_settings with typed metadata so it can back the admin UI's
--- configurable tunables. All columns are nullable for backward compatibility
--- with the original three rows and any pre-existing data.
-ALTER TABLE system_settings ADD COLUMN IF NOT EXISTS setting_type VARCHAR(20);
-ALTER TABLE system_settings ADD COLUMN IF NOT EXISTS min_value TEXT;
-ALTER TABLE system_settings ADD COLUMN IF NOT EXISTS max_value TEXT;
-ALTER TABLE system_settings ADD COLUMN IF NOT EXISTS requires_restart BOOLEAN DEFAULT FALSE;
-ALTER TABLE system_settings ADD COLUMN IF NOT EXISTS category VARCHAR(40);
-
--- Insert default system settings (original scan/timezone rows + tunables).
--- Values match the previous hardcoded literals, so behavior is unchanged on upgrade.
--- ON CONFLICT DO NOTHING preserves any admin-modified values.
-INSERT INTO system_settings (setting_key, setting_value, description, setting_type, min_value, max_value, requires_restart, category) VALUES
-('scan_poll_interval_seconds', '60', 'How often to scan all libraries (seconds)', 'int', '1', '3600', FALSE, 'scanner'),
-('auto_scan_enabled', 'true', 'Whether auto-scanning is enabled system-wide', 'bool', NULL, NULL, FALSE, 'scanner'),
-('default_timezone', 'UTC', 'System default timezone', 'string', NULL, NULL, FALSE, 'general'),
--- security / auth (live)
-('session_duration_seconds', '604800', 'How long a login session stays valid', 'int', '300', '31536000', FALSE, 'security'),
-('password_min_length', '8', 'Minimum password length', 'int', '1', '128', FALSE, 'security'),
-('password_require_upper', 'true', 'Require at least one uppercase letter (A-Z)', 'bool', NULL, NULL, FALSE, 'security'),
-('password_require_lower', 'true', 'Require at least one lowercase letter (a-z)', 'bool', NULL, NULL, FALSE, 'security'),
-('password_require_number', 'true', 'Require at least one number (0-9)', 'bool', NULL, NULL, FALSE, 'security'),
-('password_require_special', 'true', 'Require at least one special character', 'bool', NULL, NULL, FALSE, 'security'),
--- security / auth (restart required)
-('auth_rate_limit_per_min', '10', 'Global auth API rate limit (requests per minute)', 'int', '1', '10000', TRUE, 'security'),
-('login_max_attempts', '5', 'Failed login attempts before lockout', 'int', '1', '100', TRUE, 'security'),
-('login_lockout_minutes', '15', 'Lockout duration after too many failed logins', 'int', '1', '10080', TRUE, 'security'),
--- api (live)
-('opds_default_page_size', '50', 'Default OPDS page size', 'int', '1', '500', FALSE, 'api'),
-('opds_max_page_size', '200', 'Maximum OPDS page size', 'int', '1', '1000', FALSE, 'api'),
-('device_rate_sync_per_min', '60', 'Device sync requests per minute', 'int', '1', '10000', FALSE, 'api'),
-('device_rate_progress_per_min', '120', 'Device progress requests per minute', 'int', '1', '10000', FALSE, 'api'),
-('device_rate_metadata_per_min', '30', 'Device metadata requests per minute', 'int', '1', '10000', FALSE, 'api'),
--- sync / performance (live)
-('annotation_tombstone_ttl_days', '30', 'How long deleted annotations are kept before purge', 'int', '1', '3650', FALSE, 'sync'),
-('conversion_cache_ttl_hours', '24', 'How long converted (kepub) files are cached', 'int', '1', '720', FALSE, 'performance'),
--- sync / performance (restart required)
-('sync_queue_interval_seconds', '5', 'How often the sync queue flushes', 'int', '1', '3600', TRUE, 'sync'),
-('sync_queue_batch_size', '50', 'Maximum items processed per sync queue flush', 'int', '1', '10000', TRUE, 'sync'),
-('worker_pool_size', '3', 'Number of background worker goroutines', 'int', '1', '100', TRUE, 'performance'),
-('worker_queue_cap', '100', 'Background worker job queue capacity', 'int', '1', '10000', TRUE, 'performance')
+-- Insert default system settings
+INSERT INTO system_settings (setting_key, setting_value, description) VALUES
+('scan_poll_interval_seconds', '60', 'How often to scan all libraries in minutes'),
+('auto_scan_enabled', 'true', 'Whether auto-scanning is enabled system-wide'),
+('default_timezone', 'UTC', 'System default timezone')
 ON CONFLICT (setting_key) DO NOTHING;
 
 -- Create refresh_tokens table
@@ -281,7 +245,6 @@ CREATE TABLE IF NOT EXISTS reading_progress (
     percentage FLOAT CHECK (percentage >= 0 AND percentage <= 1),
     character_offset BIGINT,
     epubcfi TEXT,
-    context_text TEXT,
     chapter INTEGER,
     chapter_progress FLOAT CHECK (chapter_progress >= 0 AND chapter_progress <= 1),
     viewport_x FLOAT DEFAULT 0,
@@ -974,7 +937,6 @@ BEGIN
         percentage = (book_record->>'percentage')::FLOAT,
         character_offset = CASE WHEN book_record ? 'character' THEN (book_record->>'character')::BIGINT ELSE existing_progress.character_offset END,
         epubcfi = CASE WHEN book_record ? 'epubcfi' THEN (book_record->>'epubcfi')::TEXT ELSE existing_progress.epubcfi END,
-        context_text = CASE WHEN book_record ? 'context_text' THEN (book_record->>'context_text')::TEXT ELSE existing_progress.context_text END,
         chapter = CASE WHEN book_record ? 'chapter' THEN (book_record->>'chapter')::INTEGER ELSE existing_progress.chapter END,
         chapter_progress = (book_record->>'percentage')::FLOAT,
         last_sync_device = 'koreader',
@@ -993,7 +955,6 @@ BEGIN
         percentage,
         character_offset,
         epubcfi,
-        context_text,
         chapter,
         chapter_progress,
         last_sync_device,
@@ -1010,7 +971,6 @@ BEGIN
         (book_record->>'percentage')::FLOAT,
         CASE WHEN book_record ? 'character' THEN (book_record->>'character')::BIGINT ELSE NULL END,
         CASE WHEN book_record ? 'epubcfi' THEN (book_record->>'epubcfi')::TEXT ELSE NULL END,
-        CASE WHEN book_record ? 'context_text' THEN (book_record->>'context_text')::TEXT ELSE NULL END,
         CASE WHEN book_record ? 'chapter' THEN (book_record->>'chapter')::INTEGER ELSE NULL END,
         (book_record->>'percentage')::FLOAT,
         'koreader',
@@ -1185,14 +1145,12 @@ CREATE TABLE IF NOT EXISTS system_config (
     updated_by UUID REFERENCES users(id)
 );
 
--- One-time cleanup: clear the old placeholder seed so the startup logic
--- can re-seed from the BASE_URL env var (or the setup wizard can set it).
-UPDATE system_config SET value = ''
-WHERE key = 'base_url' AND value = 'https://bookhoard.example.com';
-UPDATE system_config SET value = ''
-WHERE key = 'opds_base_url' AND value = 'https://bookhoard.example.com/opds';
-UPDATE system_config SET value = ''
-WHERE key = 'api_base_url' AND value = 'https://bookhoard.example.com/api';
+-- Pre-seeded values
+INSERT INTO system_config (key, value) VALUES
+('base_url', 'https://bookhoard.example.com'),
+('opds_base_url', 'https://bookhoard.example.com/opds'),
+('api_base_url', 'https://bookhoard.example.com/api')
+ON CONFLICT (key) DO NOTHING;
 
 -- Create opds_tokens table (device-specific OPDS access tokens)
 CREATE TABLE IF NOT EXISTS opds_tokens (
@@ -1350,215 +1308,3 @@ CREATE TABLE IF NOT EXISTS media_bookmarks (
 
 CREATE INDEX IF NOT EXISTS idx_media_bookmarks_media ON media_bookmarks(media_item_id);
 CREATE INDEX IF NOT EXISTS idx_media_bookmarks_user ON media_bookmarks(user_id);
-
--- ============================================
--- ANNOTATION SYNC MIGRATIONS
--- Adds dedup_key, LWW timestamps, soft-delete,
--- and device_sync_data to annotation tables.
--- ============================================
-
-ALTER TABLE media_highlights ADD COLUMN IF NOT EXISTS dedup_key VARCHAR(40);
-ALTER TABLE media_highlights ADD COLUMN IF NOT EXISTS last_modified_at TIMESTAMPTZ;
-ALTER TABLE media_highlights ADD COLUMN IF NOT EXISTS last_modified_source VARCHAR(30);
-ALTER TABLE media_highlights ADD COLUMN IF NOT EXISTS note_text TEXT;
-ALTER TABLE media_highlights ADD COLUMN IF NOT EXISTS deleted BOOLEAN DEFAULT FALSE;
-ALTER TABLE media_highlights ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;
-
-ALTER TABLE media_notes ADD COLUMN IF NOT EXISTS dedup_key VARCHAR(40);
-ALTER TABLE media_notes ADD COLUMN IF NOT EXISTS last_modified_at TIMESTAMPTZ;
-ALTER TABLE media_notes ADD COLUMN IF NOT EXISTS last_modified_source VARCHAR(30);
-ALTER TABLE media_notes ADD COLUMN IF NOT EXISTS deleted BOOLEAN DEFAULT FALSE;
-ALTER TABLE media_notes ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;
-
-ALTER TABLE media_bookmarks ADD COLUMN IF NOT EXISTS dedup_key VARCHAR(40);
-ALTER TABLE media_bookmarks ADD COLUMN IF NOT EXISTS last_modified_at TIMESTAMPTZ;
-ALTER TABLE media_bookmarks ADD COLUMN IF NOT EXISTS last_modified_source VARCHAR(30);
-ALTER TABLE media_bookmarks ADD COLUMN IF NOT EXISTS device_sync_data JSONB;
-ALTER TABLE media_bookmarks ADD COLUMN IF NOT EXISTS percentage_location FLOAT;
-ALTER TABLE media_bookmarks ADD COLUMN IF NOT EXISTS epubcfi_location TEXT;
-ALTER TABLE media_bookmarks ADD COLUMN IF NOT EXISTS chapter_reference INTEGER;
-ALTER TABLE media_bookmarks ADD COLUMN IF NOT EXISTS deleted BOOLEAN DEFAULT FALSE;
-ALTER TABLE media_bookmarks ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;
-
-CREATE UNIQUE INDEX IF NOT EXISTS idx_media_highlights_dedup
-    ON media_highlights (user_id, media_item_id, dedup_key)
-    WHERE dedup_key IS NOT NULL AND deleted = FALSE;
-
-CREATE UNIQUE INDEX IF NOT EXISTS idx_media_notes_dedup
-    ON media_notes (user_id, media_item_id, dedup_key)
-    WHERE dedup_key IS NOT NULL AND deleted = FALSE;
-
-CREATE UNIQUE INDEX IF NOT EXISTS idx_media_bookmarks_dedup
-    ON media_bookmarks (user_id, media_item_id, dedup_key)
-    WHERE dedup_key IS NOT NULL AND deleted = FALSE;
-
-CREATE INDEX IF NOT EXISTS idx_media_highlights_deleted_at ON media_highlights(deleted_at) WHERE deleted = TRUE;
-CREATE INDEX IF NOT EXISTS idx_media_notes_deleted_at ON media_notes(deleted_at) WHERE deleted = TRUE;
-CREATE INDEX IF NOT EXISTS idx_media_bookmarks_deleted_at ON media_bookmarks(deleted_at) WHERE deleted = TRUE;
-
--- ============================================
---: MEDIA ITEM DEDUPLICATION + PATH UNIQUENESS
--- ============================================
--- A read-then-write race in the scanner historically allowed the same
--- (library_id, file_path) to be inserted twice. This block is self-healing:
--- it collapses any existing path-duplicates (re-parenting child rows onto a
--- survivor so no reading history is lost), then enforces uniqueness going
--- forward. Idempotent — safe to re-run on every startup.
-
--- Move every child row that points at p_source so it points at p_target,
--- deleting source rows that would violate a UNIQUE constraint on the target.
-CREATE OR REPLACE FUNCTION reparent_media_item_children(p_target UUID, p_source UUID)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-    IF p_target IS NULL OR p_source IS NULL OR p_target = p_source THEN
-        RETURN;
-    END IF;
-
-    DELETE FROM reading_progress
-    WHERE media_item_id = p_source
-      AND user_id IN (SELECT user_id FROM reading_progress WHERE media_item_id = p_target);
-    UPDATE reading_progress SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    DELETE FROM reading_speed
-    WHERE media_item_id = p_source
-      AND user_id IN (SELECT user_id FROM reading_speed WHERE media_item_id = p_target);
-    UPDATE reading_speed SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    DELETE FROM media_ratings
-    WHERE media_item_id = p_source
-      AND user_id IN (SELECT user_id FROM media_ratings WHERE media_item_id = p_target);
-    UPDATE media_ratings SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    DELETE FROM media_bookmarks
-    WHERE media_item_id = p_source
-      AND (user_id, title) IN (SELECT user_id, title FROM media_bookmarks WHERE media_item_id = p_target);
-    UPDATE media_bookmarks SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    DELETE FROM media_item_formats
-    WHERE media_item_id = p_source
-      AND format_type IN (SELECT format_type FROM media_item_formats WHERE media_item_id = p_target);
-    UPDATE media_item_formats SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    DELETE FROM collection_items
-    WHERE media_item_id = p_source
-      AND collection_id IN (SELECT collection_id FROM collection_items WHERE media_item_id = p_target);
-    UPDATE collection_items SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    DELETE FROM kobo_shelves
-    WHERE media_item_id = p_source
-      AND device_id IN (SELECT device_id FROM kobo_shelves WHERE media_item_id = p_target);
-    UPDATE kobo_shelves SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    DELETE FROM panel_data
-    WHERE media_item_id = p_source
-      AND page_number IN (SELECT page_number FROM panel_data WHERE media_item_id = p_target);
-    UPDATE panel_data SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    DELETE FROM processing_issues
-    WHERE media_item_id = p_source
-      AND issue_type IN (SELECT issue_type FROM processing_issues WHERE media_item_id = p_target);
-    UPDATE processing_issues SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    DELETE FROM device_file_aliases
-    WHERE media_item_id = p_source
-      AND (device_id, file_path) IN (SELECT device_id, file_path FROM device_file_aliases WHERE media_item_id = p_target);
-    UPDATE device_file_aliases SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    -- Tables whose UNIQUE keys do not include media_item_id.
-    UPDATE device_catalogs   SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE kobo_entitlements SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE media_highlights  SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE media_notes       SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE reading_history   SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE sync_conflicts    SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE sync_queue        SET media_item_id = p_target WHERE media_item_id = p_source;
-END;
-$$;
-
--- Collapse every (library_id, file_path) group into a single row.
--- Survivor = the row with the most user data; ties broken by lowest id.
-CREATE OR REPLACE FUNCTION dedup_media_items_by_path() RETURNS void
-LANGUAGE plpgsql
-AS $$
-DECLARE
-    g        RECORD;
-    v_surv   UUID;
-    v_loser  UUID;
-BEGIN
-    FOR g IN
-        SELECT library_id, file_path
-        FROM media_items
-        GROUP BY library_id, file_path
-        HAVING COUNT(*) > 1
-    LOOP
-        SELECT mi.id INTO v_surv
-        FROM media_items mi
-        WHERE mi.library_id = g.library_id AND mi.file_path = g.file_path
-        ORDER BY
-            ((SELECT COUNT(*) FROM reading_progress  rp WHERE rp.media_item_id = mi.id)
-           + (SELECT COUNT(*) FROM media_highlights   mh WHERE mh.media_item_id = mi.id)
-           + (SELECT COUNT(*) FROM media_bookmarks    mb WHERE mb.media_item_id = mi.id)
-           + (SELECT COUNT(*) FROM media_notes        mn WHERE mn.media_item_id = mi.id)
-           + (SELECT COUNT(*) FROM reading_history    rh WHERE rh.media_item_id = mi.id)
-           + (SELECT COUNT(*) FROM collection_items   ci WHERE ci.media_item_id = mi.id)) DESC,
-            mi.id ASC
-        LIMIT 1;
-
-        FOR v_loser IN
-            SELECT id FROM media_items
-            WHERE library_id = g.library_id AND file_path = g.file_path AND id <> v_surv
-            ORDER BY id
-        LOOP
-            PERFORM reparent_media_item_children(v_surv, v_loser);
-            DELETE FROM media_items WHERE id = v_loser;
-        END LOOP;
-    END LOOP;
-END;
-$$;
-
--- Collapse any existing path-duplicates so the constraint below can be created.
-SELECT dedup_media_items_by_path();
-
--- Enforce path uniqueness going forward (guarded so re-runs don't error).
-DO $$
-BEGIN
-    IF NOT EXISTS (
-        SELECT 1 FROM pg_constraint
-        WHERE conname = 'media_items_library_id_file_path_key'
-          AND conrelid = 'media_items'::regclass
-    ) THEN
-        ALTER TABLE media_items
-            ADD CONSTRAINT media_items_library_id_file_path_key UNIQUE (library_id, file_path);
-    END IF;
-END $$;
-
--- ============================================
---: HASH CONFLICTS
--- ============================================
--- Records content-duplicate groups discovered during hash backfill or rescan:
--- two or more media_items in the same library share a file_sha256 but live at
--- different file paths (e.g. the same book imported twice under two names on
--- a preexisting database). Unlike path duplicates these cannot be auto-collapsed
--- (keeping both copies may be intentional), so each group is surfaced on the
--- admin Hash Conflicts page for the user to resolve:
---   keep_all      - both copies are intentional; just stop flagging
---   kept:<uuid>   - merge every other copy's child rows into the kept item
---                   (via reparent_media_item_children) and delete the losers
-CREATE TABLE IF NOT EXISTS hash_conflicts (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    library_id UUID NOT NULL REFERENCES libraries(id) ON DELETE CASCADE,
-    file_sha256 CHAR(64) NOT NULL,
-    status VARCHAR(20) NOT NULL DEFAULT 'pending' CHECK (status IN ('pending','resolved')),
-    resolution VARCHAR(50),        -- 'keep_all' or 'kept:<media_item_uuid>' (41 chars)
-    resolved_by UUID REFERENCES users(id) ON DELETE SET NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    resolved_at TIMESTAMPTZ,
-    UNIQUE(library_id, file_sha256)
-);
-
-CREATE INDEX IF NOT EXISTS idx_hash_conflicts_status ON hash_conflicts(status);
-
--- Widen for databases created before the resolution format settled (no-op otherwise)
-ALTER TABLE hash_conflicts ALTER COLUMN resolution TYPE VARCHAR(50);

docker-compose.dev.yml

@@ -1,57 +0,0 @@
-# Development override — merged on top of docker-compose.yml (the base/prod file).
-# Activated by all `make` targets via:
-#   COMPOSE = <runtime> compose -f docker-compose.yml -f docker-compose.dev.yml
-#
-# What this adds over prod:
-#   - Local image BUILDING (prod pulls a prebuilt image from the registry)
-#   - The integration-tests service (dev only, gated behind the "tests" profile)
-# Everything else (env vars, volumes, ports, healthchecks) is inherited from the base file.
-services:
-  # Build the app image locally instead of pulling from the registry
-  app:
-    build:
-      context: .
-      dockerfile: ./Dockerfile
-
-  # Integration Tests - runs against containerized app and db (dev only)
-  tests:
-    build:
-      context: .
-      dockerfile: ./Dockerfile
-      target: test-runner
-    container_name: bookhoard_tests
-    environment:
-      # Database Configuration
-      DATABASE_HOST: db
-      DATABASE_PORT: ${DB_PORT:-5432}
-      DATABASE_USER: postgres
-      DATABASE_PASSWORD: ${DBPASS}
-      DATABASE_NAME: bookhoard
-      COOKIE_SECURE: false
-
-      # Application Configuration
-      JWT_SECRET: ${JWT_SECRET}
-      SERVER_PORT: ${SERVER_PORT:-8765}
-
-      # Test Configuration
-      TEST_MODE: "true"
-      RATE_LIMIT_ENABLED: "false"
-      REQUESTS_PER_MINUTE: 1000
-
-      # Conversion Service Configuration
-      BOOKHOARD_CONVERSION_CACHE_DIR: /app/cache/kepub
-      BOOKHOARD_CONVERSION_TOOL: /usr/bin/kepubify
-      BOOKHOARD_CONVERSION_CACHE_TTL: 24h
-
-      # Test upload path (inside container)
-      TEST_UPLOAD_PATH: /app/uploads
-    depends_on:
-      db:
-        condition: service_healthy
-      app:
-        condition: service_healthy
-    volumes:
-      - ./uploads:/app/uploads
-      - bookhoard_conversion_cache:/app/cache/kepub
-    profiles:
-      - tests

docker-compose.yml

@@ -1,3 +1,5 @@
+version: "3.8"
+
 services:
   # PostgreSQL Database
   db:
@@ -7,15 +9,14 @@ services:
       POSTGRES_DB: bookhoard
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: ${DBPASS}
-      # PGPORT makes Postgres listen on DB_PORT (kept in sync with the host mapping + app's DATABASE_PORT)
-      PGPORT: ${DB_PORT:-5432}
+      COOKIE_SECURE: false # make true in production with HTTPS
     volumes:
       - postgres_data:/var/lib/postgresql/data
       - ./database/schema:/docker-entrypoint-initdb.d
       # Make other volumes as needed
       - ./uploads:/app/uploads
     ports:
-      - "${DB_PORT:-5432}:${DB_PORT:-5432}"
+      - "5432:5432"
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 30s
@@ -26,30 +27,27 @@ services:
       - .env
 
   # Bookhoard Application
-  # In production this image is pulled from the Gitea container registry.
-  # Override IMAGE_TAG in .env to pin or rollback a specific version (defaults to "latest").
   app:
-    image: git.linuxhg.com/bookhoard/bookhoard:${IMAGE_TAG:-latest}
+    build:
+      context: .
+      dockerfile: ./Dockerfile
     container_name: bookhoard
-    restart: unless-stopped
     environment:
       # Database Configuration
       DATABASE_HOST: db
-      DATABASE_PORT: ${DB_PORT:-5432}
+      DATABASE_PORT: 5432
       DATABASE_USER: postgres
       DATABASE_PASSWORD: ${DBPASS}
       DATABASE_NAME: bookhoard
 
       # Application Configuration
       JWT_SECRET: ${JWT_SECRET}
-      SERVER_PORT: ${SERVER_PORT:-8765}
+      SERVER_PORT: 8765
       # IMPORTANT: Device sync requires full URL with protocol
       # Local: http://localhost:8765
       # Local network: http://192.168.1.X:8765
       # Domain: https://bookhoard.example.com
-      BASE_URL: ${BASE_URL:-http://localhost:8765}
-      # Mark session cookies Secure; set true behind a TLS-terminating reverse proxy (Caddy/nginx/traefik)
-      COOKIE_SECURE: ${COOKIE_SECURE:-false}
+      BASE_URL: http://localhost:${SERVER_PORT}
 
       # Rate Limiting Configuration
       TEST_MODE: ${TEST_MODE:-false}
@@ -64,7 +62,7 @@ services:
       # System timezone (fallback for server-side time operations)
       TZ: ${TZ:-UTC}
     ports:
-      - "${SERVER_PORT:-8765}:${SERVER_PORT:-8765}"
+      - "8765:8765"
     depends_on:
       db:
         condition: service_healthy
@@ -72,12 +70,55 @@ services:
       - ./uploads:/app/uploads
       - bookhoard_conversion_cache:/app/cache/kepub
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:${SERVER_PORT:-8765}/health || exit 1"]
+      test: ["CMD-SHELL", "curl -f http://localhost:8765/health || exit 1"]
       interval: 30s
       timeout: 5s
       retries: 3
       start_period: 10s
 
+  # Integration Tests - runs against containerized app and db
+  tests:
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+      target: test-runner
+    container_name: bookhoard_tests
+    environment:
+      # Database Configuration
+      DATABASE_HOST: db
+      DATABASE_PORT: 5432
+      DATABASE_USER: postgres
+      DATABASE_PASSWORD: ${DBPASS}
+      DATABASE_NAME: bookhoard
+      COOKIE_SECURE: false
+
+      # Application Configuration
+      JWT_SECRET: ${JWT_SECRET}
+      SERVER_PORT: 8765
+
+      # Test Configuration
+      TEST_MODE: "true"
+      RATE_LIMIT_ENABLED: "false"
+      REQUESTS_PER_MINUTE: 1000
+
+      # Conversion Service Configuration
+      BOOKHOARD_CONVERSION_CACHE_DIR: /app/cache/kepub
+      BOOKHOARD_CONVERSION_TOOL: /usr/bin/kepubify
+      BOOKHOARD_CONVERSION_CACHE_TTL: 24h
+
+      # Test upload path (inside container)
+      TEST_UPLOAD_PATH: /app/uploads
+    depends_on:
+      db:
+        condition: service_healthy
+      app:
+        condition: service_healthy
+    volumes:
+      - ./uploads:/app/uploads
+      - bookhoard_conversion_cache:/app/cache/kepub
+    profiles:
+      - tests
+
 # Named Volumes
 volumes:
   postgres_data:

docs/developer/api-reference.md

@@ -986,39 +986,25 @@ GET /opds/devices/{deviceId}/catalog?page={page}&per_page={per_page}
 - `page` (optional): Page number (default: 1)
 - `per_page` (optional): Items per page (default: 50, max: 200)
 
-The feed is paginated via standard OPDS link relations. Clients (e.g. KOReader)
-walk pages by following the `rel="next"` link until it is absent. OpenSearch
-paging metadata (`totalResults`, `itemsPerPage`, `startIndex`) is also included.
-
 **Response** (200 - OPDS 1.2 XML):
 
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"
        xmlns:opds="http://opds-spec.org/2010/"
-       xmlns:dc="http://purl.org/dc/elements/1.1/"
-       xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
+       xmlns:dc="http://purl.org/dc/elements/1.1/">
   <id>urn:uuid:device-id</id>
   <title>Bookhoard Library</title>
   <updated>2026-02-01T12:00:00Z</updated>
 
-  <link rel="self" href="http://localhost:8765/opds/devices/kobo-id/catalog?page=2&per_page=50"/>
-  <link rel="start" href="http://localhost:8765/opds/devices/kobo-id/catalog?page=1&per_page=50"/>
-  <link rel="first" href="http://localhost:8765/opds/devices/kobo-id/catalog?page=1&per_page=50"/>
-  <link rel="previous" href="http://localhost:8765/opds/devices/kobo-id/catalog?page=1&per_page=50"/>
-  <link rel="next" href="http://localhost:8765/opds/devices/kobo-id/catalog?page=3&per_page=50"/>
-  <link rel="last" href="http://localhost:8765/opds/devices/kobo-id/catalog?page=37&per_page=50"/>
-  <link rel="search" type="application/opensearchdescription+xml"
-        href="http://localhost:8765/opds/devices/kobo-id/search"/>
-
-  <opensearch:totalResults>1814</opensearch:totalResults>
-  <opensearch:itemsPerPage>50</opensearch:itemsPerPage>
-  <opensearch:startIndex>51</opensearch:startIndex>
+  <link rel="self" href="http://localhost:8765/opds/devices/kobo-id/catalog"/>
+  <link rel="search" href="http://localhost:8765/opds/devices/kobo-id/search"/>
+  <link rel="start" href="http://localhost:8765/opds/devices/kobo-id/nav"/>
 
   <entry>
     <id>urn:uuid:bookhoard-uuid-123</id>
-    <title>The Hobbit</title>
-    <author><name>J.R.R. Tolkien</name></author>
+    <dc:title>The Hobbit</dc:title>
+    <dc:creator>J.R.R. Tolkien</dc:creator>
     <updated>2026-02-01T10:00:00Z</updated>
 
     <link href="http://localhost:8765/opds/devices/kobo-id/download/uuid-123"
@@ -1057,28 +1043,10 @@ GET /opds/devices/{deviceId}/download/{bookId}?format={format}
 ### Search OPDS Catalog
 
 ```http
-GET /opds/devices/{deviceId}/search            # OpenSearch description
-GET /opds/devices/{deviceId}/search?q={query}  # search results feed
+GET /opds/devices/{deviceId}/search?q={query}
 ```
 
-When called **without** a `q` parameter, returns an OpenSearch description
-document (`application/opensearchdescription+xml`). OPDS clients fetch this to
-learn the search URL template, then substitute `{searchTerms}`:
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-  <ShortName>Bookhoard</ShortName>
-  <Description>Search the Bookhoard library</Description>
-  <InputEncoding>UTF-8</InputEncoding>
-  <OutputEncoding>UTF-8</OutputEncoding>
-  <Url type="application/atom+xml;profile=opds-catalog;kind=acquisition"
-       template="http://localhost:8765/opds/devices/kobo-id/search?q={searchTerms}"/>
-</OpenSearchDescription>
-```
-
-When called **with** a `q` parameter, **Response** (200 - OPDS 1.2 XML with
-search results, including `opensearch:totalResults`).
+**Response** (200 - OPDS 1.2 XML with search results)
 
 ### List Available Formats
 

docs/developer/api/sync/koreader-protocol.md

@@ -17,29 +17,20 @@ KOReader uses a custom JSON-based sync protocol.
 
 ### Request Body
 
-| Field              | Type    | Required | Description                                          |
-| ------------------ | ------- | -------- | ---------------------------------------------------- |
-| library_id         | string  | No       | Library UUID                                         |
-| books              | array   | Yes      | Array of book sync data                              |
-| books[].uuid       | string  | No\*     | Book UUID (highest-confidence match; omitted on first sync of a newly downloaded book) |
-| books[].sha256     | string  | No\*     | Full-file SHA-256 (64 hex chars); used to resolve the book when `uuid` is absent |
-| books[].file_path  | string  | No       | Device-local file path; used to create/look up a device file alias |
-| books[].title      | string  | Yes      | Book title                                           |
-| books[].authors    | array   | Yes      | Array of author names                                |
-| books[].progress   | float   | Yes      | Progress percentage (0-1)                            |
-| books[].percentage | float   | Yes      | Progress percentage (0-1)                            |
-| books[].last_read  | string  | Yes      | ISO 8601 timestamp                                   |
-| books[].chapter    | integer | No       | Current chapter                                      |
-| books[].epubcfi    | string  | No       | EPUB CFI location                                    |
-| books[].character  | integer | No       | Character offset                                     |
-| books[].bookmarks  | array   | No       | Array of bookmarks/highlights                        |
-
-\* At least one of `uuid` or `sha256` should be present. The server resolves the
-book through the shared `BookResolver` with this priority: `uuid` → `sha256` →
-`file_path` alias → `title`/`author`. SHA-256 matching is **format-aware**: it
-checks `media_items.file_sha256` first, then `media_item_formats.file_sha256`, so
-a converted file (e.g. KEPUB or PDF) downloaded via OPDS matches even though its
-hash differs from the primary format's hash.
+| Field              | Type    | Required | Description                   |
+| ------------------ | ------- | -------- | ----------------------------- |
+| library_id         | string  | No       | Library UUID                  |
+| books              | array   | Yes      | Array of book sync data       |
+| books[].uuid       | string  | Yes      | Book UUID                     |
+| books[].title      | string  | Yes      | Book title                    |
+| books[].authors    | array   | Yes      | Array of author names         |
+| books[].progress   | float   | Yes      | Progress percentage (0-1)     |
+| books[].percentage | float   | Yes      | Progress percentage (0-1)     |
+| books[].last_read  | string  | Yes      | ISO 8601 timestamp            |
+| books[].chapter    | integer | No       | Current chapter               |
+| books[].epubcfi    | string  | No       | EPUB CFI location             |
+| books[].character  | integer | No       | Character offset              |
+| books[].bookmarks  | array   | No       | Array of bookmarks/highlights |
 
 ### Example Request
 
@@ -111,7 +102,6 @@ Authorization: Bearer device-token
 ```json
 {
   "uuid": "book-uuid",
-  "sha256": "ff3e4501bf9d72dea2ae28731a6cb5b83d7a7532c05b5d2dd083d0dbc9193ebf",
   "title": "Book Title",
   "authors": ["Author Name"],
   "progress": {
@@ -129,18 +119,3 @@ Authorization: Bearer device-token
   "last_sync": "2026-01-30T20:00:00Z"
 }
 ```
-
-`sha256` is the canonical primary-format hash of the book on the server. It is
-returned so clients can cache it regardless of how the book was originally
-obtained. The library list endpoint (`GET /api/sync/koreader/library`) includes
-the same `sha256` field on each book.
-
-## Book identification
-
-Every client/sync interface (KOReader, Kobo, OPDS, the device-link UI, and any
-future mobile app) resolves books through a single shared service:
-[`internal/services/book_resolver.go`](../../../internal/services/book_resolver.go).
-The import-time SHA-256 (stored on `media_items.file_sha256`, plus a per-format
-hash on `media_item_formats.file_sha256` for KEPUB/PDF) is the canonical shared
-identifier. New clients should resolve by SHA-256 via `BookResolver` rather than
-re-implementing their own matcher.

go.mod

@@ -29,7 +29,6 @@ require (
 	github.com/yuin/goldmark v1.8.2
 	github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594
 	golang.org/x/crypto v0.50.0
-	golang.org/x/net v0.53.0
 	golang.org/x/text v0.36.0
 )
 
@@ -58,6 +57,7 @@ require (
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/xyproto/randomstring v1.2.0 // indirect
 	golang.org/x/image v0.39.0 // indirect
+	golang.org/x/net v0.53.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
 	golang.org/x/sys v0.43.0 // indirect
 	golang.org/x/time v0.15.0 // indirect

internal/config/config.go

@@ -45,19 +45,30 @@ func (c *Config) DatabaseURL() string {
 		c.DatabaseUser, c.DatabasePassword, c.DatabaseHost, c.DatabasePort, c.DatabaseName)
 }
 
-// SystemConfigGetter returns the value for a system config key, or an error.
-type SystemConfigGetter func(ctx context.Context, key string) (string, error)
-
-// GetBaseURL returns the base URL from system configuration database, or empty
-// string if not set. The getter abstraction avoids importing the database package.
-func GetBaseURL(ctx context.Context, getter SystemConfigGetter) string {
-	val, err := getter(ctx, "base_url")
-	if err == nil && val != "" {
-		return val
+// GetBaseURL returns the base URL from system configuration database with fallback to config/env var
+func GetBaseURL(ctx context.Context, db interface{}) string {
+	// Try to get from database first
+	type SystemConfigQuerier interface {
+		GetSystemConfig(ctx context.Context, key string) (SystemConfigRow, error)
 	}
+
+	if querier, ok := db.(SystemConfigQuerier); ok {
+		config, err := querier.GetSystemConfig(ctx, "base_url")
+		if err == nil && config.Value != "" {
+			return config.Value
+		}
+	}
+
+	// Fallback: return empty string - caller should use their own fallback
 	return ""
 }
 
+// SystemConfigRow represents a system configuration row
+type SystemConfigRow struct {
+	Key   string
+	Value string
+}
+
 func getEnv(key, defaultValue string) string {
 	if value := os.Getenv(key); value != "" {
 		return value

internal/database/models.go

@@ -92,17 +92,6 @@ type DictionaryCache struct {
 	AccessedAt   pgtype.Timestamptz `db:"accessed_at" json:"accessed_at"`
 }
 
-type HashConflicts struct {
-	ID         pgtype.UUID        `db:"id" json:"id"`
-	LibraryID  pgtype.UUID        `db:"library_id" json:"library_id"`
-	FileSha256 string             `db:"file_sha256" json:"file_sha256"`
-	Status     string             `db:"status" json:"status"`
-	Resolution pgtype.Text        `db:"resolution" json:"resolution"`
-	ResolvedBy pgtype.UUID        `db:"resolved_by" json:"resolved_by"`
-	CreatedAt  pgtype.Timestamptz `db:"created_at" json:"created_at"`
-	ResolvedAt pgtype.Timestamptz `db:"resolved_at" json:"resolved_at"`
-}
-
 type KoboEntitlements struct {
 	ID             pgtype.UUID        `db:"id" json:"id"`
 	DeviceID       pgtype.UUID        `db:"device_id" json:"device_id"`
@@ -166,55 +155,40 @@ type LibraryVisibility struct {
 }
 
 type MediaBookmarks struct {
-	ID                 pgtype.UUID        `db:"id" json:"id"`
-	MediaItemID        pgtype.UUID        `db:"media_item_id" json:"media_item_id"`
-	UserID             pgtype.UUID        `db:"user_id" json:"user_id"`
-	PageNumber         pgtype.Int4        `db:"page_number" json:"page_number"`
-	ChapterNumber      pgtype.Int4        `db:"chapter_number" json:"chapter_number"`
-	CfiPosition        pgtype.Text        `db:"cfi_position" json:"cfi_position"`
-	Title              string             `db:"title" json:"title"`
-	Position           pgtype.Text        `db:"position" json:"position"`
-	Notes              pgtype.Text        `db:"notes" json:"notes"`
-	CreatedAt          pgtype.Timestamptz `db:"created_at" json:"created_at"`
-	DedupKey           pgtype.Text        `db:"dedup_key" json:"dedup_key"`
-	LastModifiedAt     pgtype.Timestamptz `db:"last_modified_at" json:"last_modified_at"`
-	LastModifiedSource pgtype.Text        `db:"last_modified_source" json:"last_modified_source"`
-	DeviceSyncData     []byte             `db:"device_sync_data" json:"device_sync_data"`
-	PercentageLocation pgtype.Float8      `db:"percentage_location" json:"percentage_location"`
-	EpubcfiLocation    pgtype.Text        `db:"epubcfi_location" json:"epubcfi_location"`
-	ChapterReference   pgtype.Int4        `db:"chapter_reference" json:"chapter_reference"`
-	Deleted            pgtype.Bool        `db:"deleted" json:"deleted"`
-	DeletedAt          pgtype.Timestamptz `db:"deleted_at" json:"deleted_at"`
+	ID            pgtype.UUID        `db:"id" json:"id"`
+	MediaItemID   pgtype.UUID        `db:"media_item_id" json:"media_item_id"`
+	UserID        pgtype.UUID        `db:"user_id" json:"user_id"`
+	PageNumber    pgtype.Int4        `db:"page_number" json:"page_number"`
+	ChapterNumber pgtype.Int4        `db:"chapter_number" json:"chapter_number"`
+	CfiPosition   pgtype.Text        `db:"cfi_position" json:"cfi_position"`
+	Title         string             `db:"title" json:"title"`
+	Position      pgtype.Text        `db:"position" json:"position"`
+	Notes         pgtype.Text        `db:"notes" json:"notes"`
+	CreatedAt     pgtype.Timestamptz `db:"created_at" json:"created_at"`
 }
 
 type MediaHighlights struct {
-	ID                 pgtype.UUID        `db:"id" json:"id"`
-	MediaItemID        pgtype.UUID        `db:"media_item_id" json:"media_item_id"`
-	UserID             pgtype.UUID        `db:"user_id" json:"user_id"`
-	SelectionText      string             `db:"selection_text" json:"selection_text"`
-	StartPosition      pgtype.Text        `db:"start_position" json:"start_position"`
-	EndPosition        pgtype.Text        `db:"end_position" json:"end_position"`
-	Color              pgtype.Text        `db:"color" json:"color"`
-	NoteID             pgtype.UUID        `db:"note_id" json:"note_id"`
-	CreatedAt          pgtype.Timestamptz `db:"created_at" json:"created_at"`
-	UpdatedAt          pgtype.Timestamptz `db:"updated_at" json:"updated_at"`
-	PercentageStart    pgtype.Float8      `db:"percentage_start" json:"percentage_start"`
-	PercentageEnd      pgtype.Float8      `db:"percentage_end" json:"percentage_end"`
-	CharacterStart     pgtype.Int4        `db:"character_start" json:"character_start"`
-	CharacterEnd       pgtype.Int4        `db:"character_end" json:"character_end"`
-	EpubcfiStart       pgtype.Text        `db:"epubcfi_start" json:"epubcfi_start"`
-	EpubcfiEnd         pgtype.Text        `db:"epubcfi_end" json:"epubcfi_end"`
-	ChapterReference   pgtype.Int4        `db:"chapter_reference" json:"chapter_reference"`
-	ParagraphStart     pgtype.Int4        `db:"paragraph_start" json:"paragraph_start"`
-	ParagraphEnd       pgtype.Int4        `db:"paragraph_end" json:"paragraph_end"`
-	PanelNumber        pgtype.Int4        `db:"panel_number" json:"panel_number"`
-	DeviceSyncData     []byte             `db:"device_sync_data" json:"device_sync_data"`
-	DedupKey           pgtype.Text        `db:"dedup_key" json:"dedup_key"`
-	LastModifiedAt     pgtype.Timestamptz `db:"last_modified_at" json:"last_modified_at"`
-	LastModifiedSource pgtype.Text        `db:"last_modified_source" json:"last_modified_source"`
-	NoteText           pgtype.Text        `db:"note_text" json:"note_text"`
-	Deleted            pgtype.Bool        `db:"deleted" json:"deleted"`
-	DeletedAt          pgtype.Timestamptz `db:"deleted_at" json:"deleted_at"`
+	ID               pgtype.UUID        `db:"id" json:"id"`
+	MediaItemID      pgtype.UUID        `db:"media_item_id" json:"media_item_id"`
+	UserID           pgtype.UUID        `db:"user_id" json:"user_id"`
+	SelectionText    string             `db:"selection_text" json:"selection_text"`
+	StartPosition    pgtype.Text        `db:"start_position" json:"start_position"`
+	EndPosition      pgtype.Text        `db:"end_position" json:"end_position"`
+	Color            pgtype.Text        `db:"color" json:"color"`
+	NoteID           pgtype.UUID        `db:"note_id" json:"note_id"`
+	CreatedAt        pgtype.Timestamptz `db:"created_at" json:"created_at"`
+	UpdatedAt        pgtype.Timestamptz `db:"updated_at" json:"updated_at"`
+	PercentageStart  pgtype.Float8      `db:"percentage_start" json:"percentage_start"`
+	PercentageEnd    pgtype.Float8      `db:"percentage_end" json:"percentage_end"`
+	CharacterStart   pgtype.Int4        `db:"character_start" json:"character_start"`
+	CharacterEnd     pgtype.Int4        `db:"character_end" json:"character_end"`
+	EpubcfiStart     pgtype.Text        `db:"epubcfi_start" json:"epubcfi_start"`
+	EpubcfiEnd       pgtype.Text        `db:"epubcfi_end" json:"epubcfi_end"`
+	ChapterReference pgtype.Int4        `db:"chapter_reference" json:"chapter_reference"`
+	ParagraphStart   pgtype.Int4        `db:"paragraph_start" json:"paragraph_start"`
+	ParagraphEnd     pgtype.Int4        `db:"paragraph_end" json:"paragraph_end"`
+	PanelNumber      pgtype.Int4        `db:"panel_number" json:"panel_number"`
+	DeviceSyncData   []byte             `db:"device_sync_data" json:"device_sync_data"`
 }
 
 type MediaItemFormats struct {
@@ -330,11 +304,6 @@ type MediaNotes struct {
 	ChapterReference   pgtype.Int4        `db:"chapter_reference" json:"chapter_reference"`
 	ParagraphReference pgtype.Int4        `db:"paragraph_reference" json:"paragraph_reference"`
 	DeviceSyncData     []byte             `db:"device_sync_data" json:"device_sync_data"`
-	DedupKey           pgtype.Text        `db:"dedup_key" json:"dedup_key"`
-	LastModifiedAt     pgtype.Timestamptz `db:"last_modified_at" json:"last_modified_at"`
-	LastModifiedSource pgtype.Text        `db:"last_modified_source" json:"last_modified_source"`
-	Deleted            pgtype.Bool        `db:"deleted" json:"deleted"`
-	DeletedAt          pgtype.Timestamptz `db:"deleted_at" json:"deleted_at"`
 }
 
 type MediaRatings struct {
@@ -411,7 +380,6 @@ type ReadingProgress struct {
 	Percentage        pgtype.Float8      `db:"percentage" json:"percentage"`
 	CharacterOffset   pgtype.Int8        `db:"character_offset" json:"character_offset"`
 	Epubcfi           pgtype.Text        `db:"epubcfi" json:"epubcfi"`
-	ContextText       pgtype.Text        `db:"context_text" json:"context_text"`
 	Chapter           pgtype.Int4        `db:"chapter" json:"chapter"`
 	ChapterProgress   pgtype.Float8      `db:"chapter_progress" json:"chapter_progress"`
 	ViewportX         pgtype.Float8      `db:"viewport_x" json:"viewport_x"`
@@ -495,16 +463,11 @@ type SystemConfig struct {
 }
 
 type SystemSettings struct {
-	ID              pgtype.UUID        `db:"id" json:"id"`
-	SettingKey      string             `db:"setting_key" json:"setting_key"`
-	SettingValue    string             `db:"setting_value" json:"setting_value"`
-	Description     pgtype.Text        `db:"description" json:"description"`
-	UpdatedAt       pgtype.Timestamptz `db:"updated_at" json:"updated_at"`
-	SettingType     pgtype.Text        `db:"setting_type" json:"setting_type"`
-	MinValue        pgtype.Text        `db:"min_value" json:"min_value"`
-	MaxValue        pgtype.Text        `db:"max_value" json:"max_value"`
-	RequiresRestart pgtype.Bool        `db:"requires_restart" json:"requires_restart"`
-	Category        pgtype.Text        `db:"category" json:"category"`
+	ID           pgtype.UUID        `db:"id" json:"id"`
+	SettingKey   string             `db:"setting_key" json:"setting_key"`
+	SettingValue string             `db:"setting_value" json:"setting_value"`
+	Description  pgtype.Text        `db:"description" json:"description"`
+	UpdatedAt    pgtype.Timestamptz `db:"updated_at" json:"updated_at"`
 }
 
 type UnlinkedBooks struct {

internal/database/querier.go

@@ -26,15 +26,13 @@ type Querier interface {
 	CheckForProgressConflicts(ctx context.Context, arg CheckForProgressConflictsParams) (int64, error)
 	// Cleanup expired OPDS tokens
 	CleanupExpiredOpdsTokens(ctx context.Context) error
-	CleanupExpiredRefreshTokens(ctx context.Context, dollar_1 float64) error
+	CleanupExpiredRefreshTokens(ctx context.Context) error
 	ClearDeviceSyncQueue(ctx context.Context, deviceID pgtype.UUID) error
 	ClearKoboShelf(ctx context.Context, deviceID pgtype.UUID) error
 	ClearKoboShelfByName(ctx context.Context, arg ClearKoboShelfByNameParams) error
-	CountAdmins(ctx context.Context) (int64, error)
 	// Count unlinked books for a device
 	CountUnlinkedBooks(ctx context.Context, deviceID pgtype.UUID) (int64, error)
 	CountUserDevices(ctx context.Context, userID pgtype.UUID) (int64, error)
-	CreateAutoResolvedSyncConflict(ctx context.Context, arg CreateAutoResolvedSyncConflictParams) (SyncConflicts, error)
 	// COLLECTIONS QUERIES
 	// Create collection
 	CreateCollection(ctx context.Context, arg CreateCollectionParams) (Collections, error)
@@ -53,17 +51,11 @@ type Querier interface {
 	// Create device shelf mapping
 	CreateDeviceShelfMapping(ctx context.Context, arg CreateDeviceShelfMappingParams) (DeviceShelfMappings, error)
 	CreateDictionaryEntry(ctx context.Context, arg CreateDictionaryEntryParams) (DictionaryCache, error)
-	// HASH CONFLICTS QUERIES
-	// Record a pending hash conflict (no-op if the group is already tracked, so
-	// resolved groups stay resolved and are never re-flagged)
-	CreateHashConflict(ctx context.Context, arg CreateHashConflictParams) error
 	// Libraries queries
 	CreateLibrary(ctx context.Context, arg CreateLibraryParams) (Libraries, error)
 	CreateMediaBookmark(ctx context.Context, arg CreateMediaBookmarkParams) (MediaBookmarks, error)
-	CreateMediaBookmarkFull(ctx context.Context, arg CreateMediaBookmarkFullParams) (MediaBookmarks, error)
 	// Media Highlights queries
 	CreateMediaHighlight(ctx context.Context, arg CreateMediaHighlightParams) (MediaHighlights, error)
-	CreateMediaHighlightFull(ctx context.Context, arg CreateMediaHighlightFullParams) (MediaHighlights, error)
 	// Media Items queries
 	CreateMediaItem(ctx context.Context, arg CreateMediaItemParams) (MediaItems, error)
 	// MEDIA ITEM FORMATS QUERIES
@@ -71,7 +63,6 @@ type Querier interface {
 	CreateMediaItemFormat(ctx context.Context, arg CreateMediaItemFormatParams) (MediaItemFormats, error)
 	// Media Notes queries
 	CreateMediaNote(ctx context.Context, arg CreateMediaNoteParams) (MediaNotes, error)
-	CreateMediaNoteFull(ctx context.Context, arg CreateMediaNoteFullParams) (MediaNotes, error)
 	CreateMediaRating(ctx context.Context, arg CreateMediaRatingParams) (MediaRatings, error)
 	// OPDS TOKENS QUERIES
 	// Create OPDS token
@@ -133,17 +124,10 @@ type Querier interface {
 	DeleteUnlinkedBook(ctx context.Context, id pgtype.UUID) error
 	DeleteUser(ctx context.Context, id pgtype.UUID) error
 	DeleteUserSystemCollection(ctx context.Context, arg DeleteUserSystemCollectionParams) error
-	// Find content-duplicate groups (same library + SHA-256, more than one row)
-	FindHashConflictGroups(ctx context.Context) ([]FindHashConflictGroupsRow, error)
 	GenerateKoboEntitlementId(ctx context.Context) (interface{}, error)
-	// ============================================
-	// ANNOTATION SERVE QUERIES
-	// ============================================
-	GetActiveAnnotationsForBook(ctx context.Context, arg GetActiveAnnotationsForBookParams) ([]GetActiveAnnotationsForBookRow, error)
 	// Get all system config
 	GetAllSystemConfig(ctx context.Context) ([]SystemConfig, error)
 	GetAllSystemSettings(ctx context.Context) ([]GetAllSystemSettingsRow, error)
-	GetAllSystemSettingsFull(ctx context.Context) ([]SystemSettings, error)
 	GetAnnotationsForBook(ctx context.Context, arg GetAnnotationsForBookParams) ([]GetAnnotationsForBookRow, error)
 	GetBooksByTag(ctx context.Context, arg GetBooksByTagParams) ([]MediaItems, error)
 	// Get collection
@@ -190,7 +174,6 @@ type Querier interface {
 	GetFailedSyncQueueItems(ctx context.Context, limit int32) ([]SyncQueue, error)
 	GetFirstAdmin(ctx context.Context) (pgtype.UUID, error)
 	GetFirstAdminExclude(ctx context.Context, id pgtype.UUID) (GetFirstAdminExcludeRow, error)
-	GetHashConflict(ctx context.Context, id pgtype.UUID) (HashConflicts, error)
 	GetKoboEntitlementByContentId(ctx context.Context, arg GetKoboEntitlementByContentIdParams) (GetKoboEntitlementByContentIdRow, error)
 	GetKoboEntitlementByEntitlementId(ctx context.Context, arg GetKoboEntitlementByEntitlementIdParams) (GetKoboEntitlementByEntitlementIdRow, error)
 	GetKoboEntitlementsForDevice(ctx context.Context, deviceID pgtype.UUID) ([]GetKoboEntitlementsForDeviceRow, error)
@@ -213,17 +196,8 @@ type Querier interface {
 	// LIBRARY WITH TYPE INFO QUERIES
 	// ============================================================================
 	GetLibraryWithType(ctx context.Context, id pgtype.UUID) (GetLibraryWithTypeRow, error)
-	GetMediaBookmark(ctx context.Context, id pgtype.UUID) (MediaBookmarks, error)
-	// ============================================
-	// ANNOTATION SYNC QUERIES (bookmarks)
-	// ============================================
-	GetMediaBookmarkByDedupKey(ctx context.Context, arg GetMediaBookmarkByDedupKeyParams) (MediaBookmarks, error)
 	GetMediaBookmarks(ctx context.Context, arg GetMediaBookmarksParams) ([]MediaBookmarks, error)
 	GetMediaHighlight(ctx context.Context, id pgtype.UUID) (MediaHighlights, error)
-	// ============================================
-	// ANNOTATION SYNC QUERIES (highlights)
-	// ============================================
-	GetMediaHighlightByDedupKey(ctx context.Context, arg GetMediaHighlightByDedupKeyParams) (MediaHighlights, error)
 	GetMediaHighlights(ctx context.Context, arg GetMediaHighlightsParams) ([]MediaHighlights, error)
 	GetMediaItem(ctx context.Context, id pgtype.UUID) (MediaItems, error)
 	GetMediaItemByFilePath(ctx context.Context, arg GetMediaItemByFilePathParams) (MediaItems, error)
@@ -239,21 +213,13 @@ type Querier interface {
 	GetMediaItemByOPFUUID(ctx context.Context, opfUuid pgtype.Text) (MediaItems, error)
 	// Get media item by SHA-256 hash
 	GetMediaItemBySHA256(ctx context.Context, fileSha256 pgtype.Text) (MediaItems, error)
-	// Get media item by SHA-256 hash within a specific library (content dedup)
-	GetMediaItemBySHA256AndLibrary(ctx context.Context, arg GetMediaItemBySHA256AndLibraryParams) (MediaItems, error)
 	// Get media item format by SHA-256
 	GetMediaItemFormatBySHA256(ctx context.Context, fileSha256 pgtype.Text) (MediaItemFormats, error)
 	// Get media item format by type
 	GetMediaItemFormatByType(ctx context.Context, arg GetMediaItemFormatByTypeParams) (MediaItemFormats, error)
 	// Get media item formats
 	GetMediaItemFormats(ctx context.Context, mediaItemID pgtype.UUID) ([]MediaItemFormats, error)
-	// Per-item user-data counts, used when choosing which duplicate copy to keep
-	GetMediaItemUsageCounts(ctx context.Context, mediaItemID pgtype.UUID) (GetMediaItemUsageCountsRow, error)
 	GetMediaNote(ctx context.Context, id pgtype.UUID) (MediaNotes, error)
-	// ============================================
-	// ANNOTATION SYNC QUERIES (notes)
-	// ============================================
-	GetMediaNoteByDedupKey(ctx context.Context, arg GetMediaNoteByDedupKeyParams) (MediaNotes, error)
 	GetMediaNotes(ctx context.Context, arg GetMediaNotesParams) ([]MediaNotes, error)
 	GetMediaRating(ctx context.Context, arg GetMediaRatingParams) (MediaRatings, error)
 	GetMediaRatings(ctx context.Context, mediaItemID pgtype.UUID) ([]GetMediaRatingsRow, error)
@@ -290,9 +256,7 @@ type Querier interface {
 	GetSystemConfig(ctx context.Context, key string) (SystemConfig, error)
 	// System Settings queries
 	GetSystemSetting(ctx context.Context, settingKey string) (string, error)
-	GetSystemSettingFull(ctx context.Context, settingKey string) (SystemSettings, error)
 	GetSystemTimezone(ctx context.Context) (string, error)
-	GetTombstonedAnnotationsForBook(ctx context.Context, arg GetTombstonedAnnotationsForBookParams) ([]GetTombstonedAnnotationsForBookRow, error)
 	// Get universal progress for a book
 	GetUniversalProgress(ctx context.Context, arg GetUniversalProgressParams) (GetUniversalProgressRow, error)
 	// Get unlinked book by ContentId
@@ -316,8 +280,6 @@ type Querier interface {
 	// Get user reading history for analytics
 	GetUserReadingHistory(ctx context.Context, arg GetUserReadingHistoryParams) ([]GetUserReadingHistoryRow, error)
 	GetUserVisibleLibraries(ctx context.Context, userID pgtype.UUID) ([]GetUserVisibleLibrariesRow, error)
-	GetVisibleLibraryMediaCounts(ctx context.Context, userID pgtype.UUID) ([]GetVisibleLibraryMediaCountsRow, error)
-	HasRecentConflictResolution(ctx context.Context, arg HasRecentConflictResolutionParams) (bool, error)
 	IncrementSyncQueueAttempts(ctx context.Context, arg IncrementSyncQueueAttemptsParams) (SyncQueue, error)
 	// Check if book is in collection
 	IsBookInCollection(ctx context.Context, arg IsBookInCollectionParams) (bool, error)
@@ -332,12 +294,7 @@ type Querier interface {
 	ListLibraries(ctx context.Context) ([]ListLibrariesRow, error)
 	ListMediaItems(ctx context.Context, arg ListMediaItemsParams) ([]ListMediaItemsRow, error)
 	ListMediaItemsByLibrary(ctx context.Context, libraryID pgtype.UUID) ([]ListMediaItemsByLibraryRow, error)
-	// List all media items sharing a SHA-256 hash within a library (hash conflict group)
-	ListMediaItemsBySHA256AndLibrary(ctx context.Context, arg ListMediaItemsBySHA256AndLibraryParams) ([]MediaItems, error)
-	// List media items that have no stored SHA-256 (imported before hashing existed)
-	ListMediaItemsMissingHash(ctx context.Context) ([]MediaItems, error)
 	ListMediaItemsSorted(ctx context.Context, arg ListMediaItemsSortedParams) ([]ListMediaItemsSortedRow, error)
-	ListPendingHashConflicts(ctx context.Context) ([]ListPendingHashConflictsRow, error)
 	ListPendingSyncQueueItems(ctx context.Context, arg ListPendingSyncQueueItemsParams) ([]SyncQueue, error)
 	ListProcessingIssuesByLibrary(ctx context.Context, libraryID pgtype.UUID) ([]ListProcessingIssuesByLibraryRow, error)
 	ListSyncConflictsByMediaItem(ctx context.Context, arg ListSyncConflictsByMediaItemParams) ([]SyncConflicts, error)
@@ -345,9 +302,6 @@ type Querier interface {
 	// List unresolved unlinked books with pagination
 	ListUnresolvedUnlinkedBooks(ctx context.Context, arg ListUnresolvedUnlinkedBooksParams) ([]ListUnresolvedUnlinkedBooksRow, error)
 	ListUsers(ctx context.Context) ([]ListUsersRow, error)
-	PurgeExpiredBookmarkTombstones(ctx context.Context, deletedAt pgtype.Timestamptz) error
-	PurgeExpiredHighlightTombstones(ctx context.Context, deletedAt pgtype.Timestamptz) error
-	PurgeExpiredNoteTombstones(ctx context.Context, deletedAt pgtype.Timestamptz) error
 	// Query media items by multiple identifiers with confidence scoring
 	QueryMediaItemsByIdentifiers(ctx context.Context, arg QueryMediaItemsByIdentifiersParams) ([]QueryMediaItemsByIdentifiersRow, error)
 	ReassignLibraries(ctx context.Context, arg ReassignLibrariesParams) error
@@ -355,10 +309,7 @@ type Querier interface {
 	// Remove book from collection
 	RemoveBookFromCollection(ctx context.Context, arg RemoveBookFromCollectionParams) error
 	RemoveBookFromKoboShelf(ctx context.Context, arg RemoveBookFromKoboShelfParams) error
-	// Re-parent all child rows of p_source onto p_target (defined in schema.sql)
-	ReparentMediaItemChildren(ctx context.Context, arg ReparentMediaItemChildrenParams) error
 	ResetSystemCollectionMetadata(ctx context.Context, arg ResetSystemCollectionMetadataParams) error
-	ResolveHashConflict(ctx context.Context, arg ResolveHashConflictParams) error
 	ResolveProcessingIssue(ctx context.Context, arg ResolveProcessingIssueParams) (ProcessingIssues, error)
 	ResolveSyncConflict(ctx context.Context, arg ResolveSyncConflictParams) (SyncConflicts, error)
 	// Resolve unlinked book
@@ -381,12 +332,6 @@ type Querier interface {
 	// Set system config
 	SetSystemConfig(ctx context.Context, arg SetSystemConfigParams) (SystemConfig, error)
 	SyncLibraryTypeExtensions(ctx context.Context, arg SyncLibraryTypeExtensionsParams) error
-	TombstoneMediaBookmarkByDedupKey(ctx context.Context, arg TombstoneMediaBookmarkByDedupKeyParams) error
-	TombstoneMediaBookmarkByID(ctx context.Context, id pgtype.UUID) error
-	TombstoneMediaHighlightByDedupKey(ctx context.Context, arg TombstoneMediaHighlightByDedupKeyParams) error
-	TombstoneMediaHighlightByID(ctx context.Context, id pgtype.UUID) error
-	TombstoneMediaNoteByDedupKey(ctx context.Context, arg TombstoneMediaNoteByDedupKeyParams) error
-	TombstoneMediaNoteByID(ctx context.Context, id pgtype.UUID) error
 	// Update collection
 	UpdateCollection(ctx context.Context, arg UpdateCollectionParams) (Collections, error)
 	UpdateDashboardPreferences(ctx context.Context, arg UpdateDashboardPreferencesParams) (UserDashboardPreferences, error)
@@ -410,9 +355,7 @@ type Querier interface {
 	UpdateKoboShelfCollection(ctx context.Context, arg UpdateKoboShelfCollectionParams) (KoboShelves, error)
 	UpdateLibrary(ctx context.Context, arg UpdateLibraryParams) (Libraries, error)
 	UpdateMediaBookmark(ctx context.Context, arg UpdateMediaBookmarkParams) (MediaBookmarks, error)
-	UpdateMediaBookmarkForSync(ctx context.Context, arg UpdateMediaBookmarkForSyncParams) (MediaBookmarks, error)
 	UpdateMediaHighlight(ctx context.Context, arg UpdateMediaHighlightParams) (MediaHighlights, error)
-	UpdateMediaHighlightForSync(ctx context.Context, arg UpdateMediaHighlightForSyncParams) (MediaHighlights, error)
 	UpdateMediaItem(ctx context.Context, arg UpdateMediaItemParams) (MediaItems, error)
 	UpdateMediaItemChapterMetadata(ctx context.Context, arg UpdateMediaItemChapterMetadataParams) (MediaItems, error)
 	// Update media item format
@@ -430,7 +373,6 @@ type Querier interface {
 	UpdateMediaItemIdentifiers(ctx context.Context, arg UpdateMediaItemIdentifiersParams) (MediaItems, error)
 	UpdateMediaItemKoboMetadata(ctx context.Context, arg UpdateMediaItemKoboMetadataParams) (MediaItems, error)
 	UpdateMediaNote(ctx context.Context, arg UpdateMediaNoteParams) (MediaNotes, error)
-	UpdateMediaNoteForSync(ctx context.Context, arg UpdateMediaNoteForSyncParams) (MediaNotes, error)
 	UpdateMediaRating(ctx context.Context, arg UpdateMediaRatingParams) (MediaRatings, error)
 	UpdatePassword(ctx context.Context, arg UpdatePasswordParams) error
 	UpdateReadingProgress(ctx context.Context, arg UpdateReadingProgressParams) (ReadingProgress, error)
@@ -449,7 +391,6 @@ type Querier interface {
 	UpsertDashboardPreferences(ctx context.Context, arg UpsertDashboardPreferencesParams) (UserDashboardPreferences, error)
 	UpsertPanelData(ctx context.Context, arg UpsertPanelDataParams) (PanelData, error)
 	UpsertReaderSettings(ctx context.Context, arg UpsertReaderSettingsParams) (ReaderSettings, error)
-	UpsertSystemSetting(ctx context.Context, arg UpsertSystemSettingParams) (SystemSettings, error)
 }
 
 var _ Querier = (*Queries)(nil)

internal/database/queries/queries.sql

@@ -137,19 +137,10 @@ LEFT JOIN library_visibility lv ON l.id = lv.library_id AND lv.user_id = $1
 WHERE COALESCE(lv.is_visible, true) = true
 ORDER BY l.created_at ASC;
 
--- name: GetVisibleLibraryMediaCounts :many
-SELECT l.id, COUNT(mi.id) as media_count
-FROM libraries l
-LEFT JOIN library_visibility lv ON l.id = lv.library_id AND lv.user_id = $1
-LEFT JOIN media_items mi ON mi.library_id = l.id
-WHERE COALESCE(lv.is_visible, true) = true
-GROUP BY l.id;
-
 -- Media Items queries
 -- name: CreateMediaItem :one
 INSERT INTO media_items (library_id, title, author, isbn, description, file_path, file_size, mime_type, cover_image_path, series, series_number, tags, tags_search, asin, date_published, publisher, contributors, contributors_search, language, edition, page_count, genre, copyright_year, goodreads_id, openlibrary_id, google_books_id, added_by_admin_id, created_at, imported_at, manga_type, reading_direction, series_count, volume, imprint, age_rating, web_url, story_arc, is_black_and_white, metadata_notes, community_rating, alternate_info, scan_information, summary, library_type_name)
 VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $40, $41, $42, $43, $44)
-ON CONFLICT (library_id, file_path) DO UPDATE SET updated_at = NOW()
 RETURNING *;
 
 -- name: GetMediaItem :one
@@ -355,9 +346,6 @@ WHERE role = 'admin'
 ORDER BY created_at ASC
 LIMIT 1;
 
--- name: CountAdmins :one
-SELECT COUNT(*) FROM users WHERE role = 'admin';
-
 -- name: ReassignLibraries :exec
 UPDATE libraries SET created_by_admin_id = $2, updated_at = NOW() WHERE created_by_admin_id = $1;
 
@@ -374,29 +362,9 @@ SELECT setting_value FROM system_settings WHERE setting_key = $1;
 -- name: UpdateSystemSetting :exec
 UPDATE system_settings SET setting_value = $2, updated_at = NOW() WHERE setting_key = $1;
 
--- name: UpsertSystemSetting :one
-INSERT INTO system_settings (setting_key, setting_value, description, setting_type, min_value, max_value, requires_restart, category)
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-ON CONFLICT (setting_key) DO UPDATE
-SET setting_value = EXCLUDED.setting_value,
-    description = EXCLUDED.description,
-    setting_type = EXCLUDED.setting_type,
-    min_value = EXCLUDED.min_value,
-    max_value = EXCLUDED.max_value,
-    requires_restart = EXCLUDED.requires_restart,
-    category = EXCLUDED.category,
-    updated_at = NOW()
-RETURNING *;
-
--- name: GetSystemSettingFull :one
-SELECT * FROM system_settings WHERE setting_key = $1;
-
 -- name: GetAllSystemSettings :many
 SELECT setting_key, setting_value, description FROM system_settings ORDER BY setting_key;
 
--- name: GetAllSystemSettingsFull :many
-SELECT * FROM system_settings ORDER BY category, setting_key;
-
 -- name: CreateMediaRating :one
 INSERT INTO media_ratings (media_item_id, user_id, rating)
 VALUES ($1, $2, $3)
@@ -725,7 +693,7 @@ RETURNING *;
 SELECT * FROM media_notes WHERE id = $1;
 
 -- name: GetMediaNotes :many
-SELECT * FROM media_notes WHERE media_item_id = $1 AND user_id = $2 AND COALESCE(deleted, FALSE) = FALSE ORDER BY created_at DESC;
+SELECT * FROM media_notes WHERE media_item_id = $1 AND user_id = $2 ORDER BY created_at DESC;
 
 -- name: UpdateMediaNote :one
 UPDATE media_notes SET
@@ -748,7 +716,7 @@ RETURNING *;
 SELECT * FROM media_highlights WHERE id = $1;
 
 -- name: GetMediaHighlights :many
-SELECT * FROM media_highlights WHERE media_item_id = $1 AND user_id = $2 AND COALESCE(deleted, FALSE) = FALSE ORDER BY created_at DESC;
+SELECT * FROM media_highlights WHERE media_item_id = $1 AND user_id = $2 ORDER BY created_at DESC;
 
 -- name: UpdateMediaHighlight :one
 UPDATE media_highlights SET
@@ -764,257 +732,6 @@ RETURNING *;
 -- name: DeleteMediaHighlight :exec
 DELETE FROM media_highlights WHERE id = $1;
 
--- ============================================
--- ANNOTATION SYNC QUERIES (highlights)
--- ============================================
-
--- name: GetMediaHighlightByDedupKey :one
-SELECT * FROM media_highlights
-WHERE user_id = $1 AND media_item_id = $2 AND dedup_key = $3
-ORDER BY deleted ASC, deleted_at DESC NULLS LAST
-LIMIT 1;
-
--- name: CreateMediaHighlightFull :one
-INSERT INTO media_highlights (
-    media_item_id, user_id, selection_text,
-    start_position, end_position, color, note_text,
-    percentage_start, percentage_end,
-    epubcfi_start, epubcfi_end,
-    chapter_reference,
-    dedup_key, last_modified_at, last_modified_source,
-    device_sync_data
-) VALUES (
-    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16
-) RETURNING *;
-
--- name: UpdateMediaHighlightForSync :one
-UPDATE media_highlights SET
-    selection_text = $2,
-    start_position = $3,
-    end_position = $4,
-    color = $5,
-    note_text = $6,
-    percentage_start = $7,
-    percentage_end = $8,
-    epubcfi_start = $9,
-    epubcfi_end = $10,
-    chapter_reference = $11,
-    last_modified_at = $12,
-    last_modified_source = $13,
-    device_sync_data = $14,
-    updated_at = NOW(),
-    deleted = FALSE,
-    deleted_at = NULL
-WHERE id = $1
-RETURNING *;
-
--- name: TombstoneMediaHighlightByDedupKey :exec
-UPDATE media_highlights SET
-    deleted = TRUE,
-    deleted_at = NOW(),
-    last_modified_at = NOW()
-WHERE user_id = $1 AND media_item_id = $2 AND dedup_key = $3 AND deleted = FALSE;
-
--- name: TombstoneMediaHighlightByID :exec
-UPDATE media_highlights SET
-    deleted = TRUE,
-    deleted_at = NOW(),
-    last_modified_at = NOW()
-WHERE id = $1;
-
--- name: PurgeExpiredHighlightTombstones :exec
-DELETE FROM media_highlights WHERE deleted = TRUE AND deleted_at < $1;
-
--- ============================================
--- ANNOTATION SYNC QUERIES (notes)
--- ============================================
-
--- name: GetMediaNoteByDedupKey :one
-SELECT * FROM media_notes
-WHERE user_id = $1 AND media_item_id = $2 AND dedup_key = $3
-ORDER BY deleted ASC, deleted_at DESC NULLS LAST
-LIMIT 1;
-
--- name: CreateMediaNoteFull :one
-INSERT INTO media_notes (
-    media_item_id, user_id, content, position,
-    percentage_location, character_start, character_end,
-    epubcfi_location, chapter_reference, paragraph_reference,
-    dedup_key, last_modified_at, last_modified_source,
-    device_sync_data
-) VALUES (
-    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14
-) RETURNING *;
-
--- name: UpdateMediaNoteForSync :one
-UPDATE media_notes SET
-    content = $2,
-    position = $3,
-    percentage_location = $4,
-    character_start = $5,
-    character_end = $6,
-    epubcfi_location = $7,
-    chapter_reference = $8,
-    paragraph_reference = $9,
-    last_modified_at = $10,
-    last_modified_source = $11,
-    device_sync_data = $12,
-    updated_at = NOW(),
-    deleted = FALSE,
-    deleted_at = NULL
-WHERE id = $1
-RETURNING *;
-
--- name: TombstoneMediaNoteByDedupKey :exec
-UPDATE media_notes SET
-    deleted = TRUE,
-    deleted_at = NOW(),
-    last_modified_at = NOW()
-WHERE user_id = $1 AND media_item_id = $2 AND dedup_key = $3 AND deleted = FALSE;
-
--- name: TombstoneMediaNoteByID :exec
-UPDATE media_notes SET
-    deleted = TRUE,
-    deleted_at = NOW(),
-    last_modified_at = NOW()
-WHERE id = $1;
-
--- name: PurgeExpiredNoteTombstones :exec
-DELETE FROM media_notes WHERE deleted = TRUE AND deleted_at < $1;
-
--- ============================================
--- ANNOTATION SYNC QUERIES (bookmarks)
--- ============================================
-
--- name: GetMediaBookmarkByDedupKey :one
-SELECT * FROM media_bookmarks
-WHERE user_id = $1 AND media_item_id = $2 AND dedup_key = $3
-ORDER BY deleted ASC, deleted_at DESC NULLS LAST
-LIMIT 1;
-
--- name: CreateMediaBookmarkFull :one
-INSERT INTO media_bookmarks (
-    media_item_id, user_id, page_number, chapter_number,
-    cfi_position, title, position, notes,
-    percentage_location, epubcfi_location, chapter_reference,
-    dedup_key, last_modified_at, last_modified_source,
-    device_sync_data
-) VALUES (
-    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15
-) RETURNING *;
-
--- name: UpdateMediaBookmarkForSync :one
-UPDATE media_bookmarks SET
-    page_number = $2,
-    chapter_number = $3,
-    cfi_position = $4,
-    title = $5,
-    position = $6,
-    notes = $7,
-    percentage_location = $8,
-    epubcfi_location = $9,
-    chapter_reference = $10,
-    last_modified_at = $11,
-    last_modified_source = $12,
-    device_sync_data = $13,
-    created_at = created_at,
-    deleted = FALSE,
-    deleted_at = NULL
-WHERE id = $1
-RETURNING *;
-
--- name: TombstoneMediaBookmarkByDedupKey :exec
-UPDATE media_bookmarks SET
-    deleted = TRUE,
-    deleted_at = NOW(),
-    last_modified_at = NOW()
-WHERE user_id = $1 AND media_item_id = $2 AND dedup_key = $3 AND deleted = FALSE;
-
--- name: TombstoneMediaBookmarkByID :exec
-UPDATE media_bookmarks SET
-    deleted = TRUE,
-    deleted_at = NOW(),
-    last_modified_at = NOW()
-WHERE id = $1;
-
--- name: PurgeExpiredBookmarkTombstones :exec
-DELETE FROM media_bookmarks WHERE deleted = TRUE AND deleted_at < $1;
-
--- ============================================
--- ANNOTATION SERVE QUERIES
--- ============================================
-
--- name: GetActiveAnnotationsForBook :many
-SELECT
-    mh.id,
-    mh.selection_text,
-    mh.start_position,
-    mh.end_position,
-    mh.color,
-    mh.created_at,
-    mh.updated_at,
-    'highlight' as annotation_type,
-    mh.percentage_start,
-    mh.percentage_end,
-    mh.epubcfi_start,
-    mh.epubcfi_end,
-    mh.note_text,
-    mh.dedup_key,
-    mh.last_modified_at,
-    mh.last_modified_source
-FROM media_highlights mh
-WHERE mh.media_item_id = $1 AND mh.user_id = $2 AND mh.deleted = FALSE
-UNION ALL
-SELECT
-    mn.id,
-    mn.content,
-    mn.position,
-    NULL as end_position,
-    NULL as color,
-    mn.created_at,
-    mn.updated_at,
-    'note' as annotation_type,
-    mn.percentage_location as percentage_start,
-    NULL as percentage_end,
-    mn.epubcfi_location as epubcfi_start,
-    NULL as epubcfi_end,
-    NULL as note_text,
-    mn.dedup_key,
-    mn.last_modified_at,
-    mn.last_modified_source
-FROM media_notes mn
-WHERE mn.media_item_id = $1 AND mn.user_id = $2 AND mn.deleted = FALSE
-ORDER BY created_at DESC;
-
--- name: GetTombstonedAnnotationsForBook :many
-SELECT
-    mh.id,
-    mh.dedup_key,
-    'highlight' as annotation_type,
-    mh.device_sync_data,
-    mh.deleted_at
-FROM media_highlights mh
-WHERE mh.media_item_id = $1 AND mh.user_id = $2 AND mh.deleted = TRUE AND mh.deleted_at > $3
-UNION ALL
-SELECT
-    mn.id,
-    mn.dedup_key,
-    'note' as annotation_type,
-    mn.device_sync_data,
-    mn.deleted_at
-FROM media_notes mn
-WHERE mn.media_item_id = $1 AND mn.user_id = $2 AND mn.deleted = TRUE AND mn.deleted_at > $3
-UNION ALL
-SELECT
-    mb.id,
-    mb.dedup_key,
-    'bookmark' as annotation_type,
-    mb.device_sync_data,
-    mb.deleted_at
-FROM media_bookmarks mb
-WHERE mb.media_item_id = $1 AND mb.user_id = $2 AND mb.deleted = TRUE AND mb.deleted_at > $3
-ORDER BY deleted_at DESC;
-
 -- Refresh Tokens queries
 -- name: CreateRefreshToken :one
 INSERT INTO refresh_tokens (user_id, token, expires_at)
@@ -1034,7 +751,7 @@ UPDATE refresh_tokens SET revoked_at = NOW() WHERE token = $1;
 UPDATE refresh_tokens SET revoked_at = NOW() WHERE user_id = $1 AND revoked_at IS NULL;
 
 -- name: CleanupExpiredRefreshTokens :exec
-DELETE FROM refresh_tokens WHERE expires_at < NOW() OR (revoked_at IS NOT NULL AND revoked_at < NOW() - make_interval(secs => $1::double precision));
+DELETE FROM refresh_tokens WHERE expires_at < NOW() OR (revoked_at IS NOT NULL AND revoked_at < NOW() - INTERVAL '7 days');
 
 -- ============================================
 -- FORMAT DETECTION & PROGRESS
@@ -1076,7 +793,6 @@ SELECT
     rp.percentage,
     rp.character_offset,
     rp.epubcfi,
-    rp.context_text,
     rp.chapter,
     rp.chapter_progress,
     rp.viewport_x,
@@ -1109,7 +825,6 @@ INSERT INTO reading_progress (
     percentage,
     character_offset,
     epubcfi,
-    context_text,
     chapter,
     chapter_progress,
     viewport_x,
@@ -1127,14 +842,13 @@ INSERT INTO reading_progress (
     last_read_at
 )
 VALUES (
-    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, NOW(), $18, $19, NOW()
+    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, NOW(), $17, $18, NOW()
 )
 ON CONFLICT (media_item_id, user_id)
 DO UPDATE SET
     percentage = EXCLUDED.percentage,
     character_offset = EXCLUDED.character_offset,
     epubcfi = EXCLUDED.epubcfi,
-    context_text = EXCLUDED.context_text,
     chapter = EXCLUDED.chapter,
     chapter_progress = EXCLUDED.chapter_progress,
     viewport_x = EXCLUDED.viewport_x,
@@ -1406,11 +1120,6 @@ INSERT INTO sync_conflicts (media_item_id, user_id, conflict_type, conflict_data
 VALUES ($1, $2, $3, $4)
 RETURNING *;
 
--- name: CreateAutoResolvedSyncConflict :one
-INSERT INTO sync_conflicts (media_item_id, user_id, conflict_type, conflict_data, resolution_status, resolution_data, resolved_at)
-VALUES ($1, $2, $3, $4, 'auto_resolved', $5, NOW())
-RETURNING *;
-
 -- name: GetSyncConflict :one
 SELECT * FROM sync_conflicts WHERE id = $1;
 
@@ -1453,15 +1162,6 @@ JOIN media_items mi ON sc.media_item_id = mi.id
 WHERE sc.user_id = $1
 ORDER BY sc.created_at DESC;
 
--- name: HasRecentConflictResolution :one
-SELECT EXISTS(
-    SELECT 1 FROM sync_conflicts
-    WHERE media_item_id = $1
-    AND user_id = $2
-    AND resolution_status != 'unresolved'
-    AND resolved_at > NOW() - INTERVAL '10 minutes'
-);
-
 -- ============================================
 -- KOREADER SYNC PROTOCOL
 -- ============================================
@@ -1510,7 +1210,7 @@ SELECT
     mh.epubcfi_start,
     mh.epubcfi_end
 FROM media_highlights mh
-WHERE mh.media_item_id = $1 AND mh.user_id = $2 AND COALESCE(mh.deleted, FALSE) = FALSE
+WHERE mh.media_item_id = $1 AND mh.user_id = $2
 UNION ALL
 SELECT
     mn.id,
@@ -1526,7 +1226,7 @@ SELECT
     mn.epubcfi_location as epubcfi_start,
     NULL as epubcfi_end
 FROM media_notes mn
-WHERE mn.media_item_id = $1 AND mn.user_id = $2 AND COALESCE(mn.deleted, FALSE) = FALSE
+WHERE mn.media_item_id = $1 AND mn.user_id = $2
 ORDER BY created_at DESC;
 
 -- name: UpdateDeviceSyncTimestamp :one
@@ -1714,70 +1414,6 @@ RETURNING *;
 -- name: GetMediaItemBySHA256 :one
 SELECT * FROM media_items WHERE file_sha256 = $1;
 
--- Get media item by SHA-256 hash within a specific library (content dedup)
--- name: GetMediaItemBySHA256AndLibrary :one
-SELECT * FROM media_items WHERE file_sha256 = $1 AND library_id = $2;
-
--- List all media items sharing a SHA-256 hash within a library (hash conflict group)
--- name: ListMediaItemsBySHA256AndLibrary :many
-SELECT * FROM media_items WHERE file_sha256 = $1 AND library_id = $2 ORDER BY file_path;
-
--- List media items that have no stored SHA-256 (imported before hashing existed)
--- name: ListMediaItemsMissingHash :many
-SELECT * FROM media_items WHERE file_sha256 IS NULL ORDER BY created_at;
-
--- Find content-duplicate groups (same library + SHA-256, more than one row)
--- name: FindHashConflictGroups :many
-SELECT library_id, file_sha256, COUNT(*) AS dup_count
-FROM media_items
-WHERE file_sha256 IS NOT NULL
-GROUP BY library_id, file_sha256
-HAVING COUNT(*) > 1;
-
--- Per-item user-data counts, used when choosing which duplicate copy to keep
--- name: GetMediaItemUsageCounts :one
-SELECT
-    (SELECT COUNT(*) FROM reading_progress  rp WHERE rp.media_item_id = $1) AS progress_count,
-    (SELECT COUNT(*) FROM media_highlights   mh WHERE mh.media_item_id = $1) AS highlights_count,
-    (SELECT COUNT(*) FROM media_bookmarks    mb WHERE mb.media_item_id = $1) AS bookmarks_count,
-    (SELECT COUNT(*) FROM media_notes        mn WHERE mn.media_item_id = $1) AS notes_count,
-    (SELECT COUNT(*) FROM collection_items   ci WHERE ci.media_item_id = $1) AS collections_count;
-
--- HASH CONFLICTS QUERIES
-
--- Record a pending hash conflict (no-op if the group is already tracked, so
--- resolved groups stay resolved and are never re-flagged)
--- name: CreateHashConflict :exec
-INSERT INTO hash_conflicts (library_id, file_sha256)
-VALUES ($1, $2)
-ON CONFLICT (library_id, file_sha256) DO NOTHING;
-
--- name: ListPendingHashConflicts :many
-SELECT hc.id, hc.library_id, hc.file_sha256, hc.created_at,
-       l.name AS library_name,
-       COUNT(mi.id) AS item_count
-FROM hash_conflicts hc
-JOIN libraries l ON l.id = hc.library_id
-LEFT JOIN media_items mi ON mi.library_id = hc.library_id AND mi.file_sha256 = hc.file_sha256
-WHERE hc.status = 'pending'
-GROUP BY hc.id, hc.library_id, hc.file_sha256, hc.created_at, l.name
-ORDER BY hc.created_at;
-
--- name: GetHashConflict :one
-SELECT * FROM hash_conflicts WHERE id = $1;
-
--- name: ResolveHashConflict :exec
-UPDATE hash_conflicts
-SET status = 'resolved',
-    resolution = $2,
-    resolved_by = $3,
-    resolved_at = NOW()
-WHERE id = $1;
-
--- Re-parent all child rows of p_source onto p_target (defined in schema.sql)
--- name: ReparentMediaItemChildren :exec
-SELECT reparent_media_item_children($1::uuid, $2::uuid);
-
 -- Get media item by OPF identifier
 -- name: GetMediaItemByOPFIdentifier :one
 SELECT * FROM media_items WHERE opf_identifier = $1;
@@ -1825,11 +1461,6 @@ ORDER BY confidence_score DESC;
 -- name: CreateMediaItemFormat :one
 INSERT INTO media_item_formats (media_item_id, format_type, file_path, file_sha256, file_size_bytes, mime_type, converted_from_format_id)
 VALUES ($1, $2, $3, $4, $5, $6, $7)
-ON CONFLICT (media_item_id, format_type) DO UPDATE SET
-    file_path = EXCLUDED.file_path,
-    file_sha256 = EXCLUDED.file_sha256,
-    file_size_bytes = EXCLUDED.file_size_bytes,
-    mime_type = EXCLUDED.mime_type
 RETURNING *;
 
 -- Get media item formats
@@ -2466,12 +2097,9 @@ RETURNING *;
 
 -- name: GetMediaBookmarks :many
 SELECT * FROM media_bookmarks
-WHERE media_item_id = $1 AND user_id = $2 AND COALESCE(deleted, FALSE) = FALSE
+WHERE media_item_id = $1 AND user_id = $2
 ORDER BY created_at DESC;
 
--- name: GetMediaBookmark :one
-SELECT * FROM media_bookmarks WHERE id = $1;
-
 -- name: CreateMediaBookmark :one
 INSERT INTO media_bookmarks (media_item_id, user_id, page_number, chapter_number, cfi_position, title, position, notes)
 VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
@@ -2487,7 +2115,7 @@ SET
     title = $2,
     notes = $3,
     position = $4,
-    last_modified_at = NOW()
+    updated_at = NOW()
 WHERE id = $1 AND user_id = $5
 RETURNING *;
 

internal/database/settings_registry.go

@@ -1,342 +0,0 @@
-package database
-
-// SettingsRegistry provides a typed, cached view over the system_settings table.
-// It is the single source of truth for tunable runtime values that used to be
-// hardcoded as Go literals.
-//
-// Consumers call the domain-specific getters (SessionDuration, OpdsPageSize,
-// etc.) which read from an in-memory cache. The cache is populated by Load at
-// startup and refreshed by Reload whenever a setting is written. Getters always
-// fall back to a compiled-in default if the DB value is missing or unparsable,
-// so a corrupt or deleted row can never break the app.
-//
-// SettingsRegistry lives in the database package (rather than its own package)
-// so that every consumer already imports database and does not need to take on
-// a new package import.
-
-import (
-	"context"
-	"log"
-	"strconv"
-	"sync"
-	"time"
-)
-
-// SettingType enumerates the value types stored in system_settings.setting_type.
-const (
-	SettingTypeInt       = "int"
-	SettingTypeBool      = "bool"
-	SettingTypeString    = "string"
-	SettingTypeStringList = "string_list"
-)
-
-// SecondsPerDay / SecondsPerHour are conversion helpers used by defaults.
-const (
-	SecondsPerMinute = 60
-	SecondsPerHour   = 3600
-	SecondsPerDay    = 86400
-)
-
-// SettingDefault holds the fallback value for a key. These mirror the literals that
-// were previously hardcoded in the source so an empty/corrupt DB row preserves
-// prior behavior exactly.
-type SettingDefault struct {
-	Key             string
-	Value           string
-	Type            string
-	Min             string
-	Max             string
-	RequiresRestart bool
-	Category        string
-	Group           string
-	Description     string
-}
-
-// SettingDefaults is the source of truth for fallback values and metadata. New keys
-// must be added here AND seeded in database/schema/schema.sql. Entries are ordered
-// by (RequiresRestart, Group) so the admin UI renders coherent sub-sections.
-var SettingDefaults = []SettingDefault{
-	{Key: "scan_poll_interval_seconds", Value: "60", Type: SettingTypeInt, Min: "1", Max: "3600", Category: "scanner", Group: "Scanning", Description: "How often to scan all libraries (seconds)"},
-	{Key: "auto_scan_enabled", Value: "true", Type: SettingTypeBool, Category: "scanner", Group: "Scanning", Description: "Whether auto-scanning is enabled system-wide"},
-	{Key: "default_timezone", Value: "UTC", Type: SettingTypeString, Category: "general", Group: "System Defaults", Description: "System default timezone"},
-	{Key: "session_duration_seconds", Value: "604800", Type: SettingTypeInt, Min: "300", Max: "31536000", Category: "security", Group: "Session", Description: "How long a login session stays valid"},
-	{Key: "password_min_length", Value: "8", Type: SettingTypeInt, Min: "1", Max: "128", Category: "security", Group: "Password Quality", Description: "Minimum password length"},
-	{Key: "password_require_upper", Value: "true", Type: SettingTypeBool, Category: "security", Group: "Password Quality", Description: "Require at least one uppercase letter (A-Z)"},
-	{Key: "password_require_lower", Value: "true", Type: SettingTypeBool, Category: "security", Group: "Password Quality", Description: "Require at least one lowercase letter (a-z)"},
-	{Key: "password_require_number", Value: "true", Type: SettingTypeBool, Category: "security", Group: "Password Quality", Description: "Require at least one number (0-9)"},
-	{Key: "password_require_special", Value: "true", Type: SettingTypeBool, Category: "security", Group: "Password Quality", Description: "Require at least one special character"},
-	{Key: "opds_default_page_size", Value: "50", Type: SettingTypeInt, Min: "1", Max: "500", Category: "api", Group: "OPDS Catalog", Description: "Default OPDS page size"},
-	{Key: "opds_max_page_size", Value: "200", Type: SettingTypeInt, Min: "1", Max: "1000", Category: "api", Group: "OPDS Catalog", Description: "Maximum OPDS page size"},
-	{Key: "device_rate_sync_per_min", Value: "60", Type: SettingTypeInt, Min: "1", Max: "10000", Category: "api", Group: "Device Rate Limits", Description: "Device sync requests per minute"},
-	{Key: "device_rate_progress_per_min", Value: "120", Type: SettingTypeInt, Min: "1", Max: "10000", Category: "api", Group: "Device Rate Limits", Description: "Device progress requests per minute"},
-	{Key: "device_rate_metadata_per_min", Value: "30", Type: SettingTypeInt, Min: "1", Max: "10000", Category: "api", Group: "Device Rate Limits", Description: "Device metadata requests per minute"},
-	{Key: "annotation_tombstone_ttl_days", Value: "30", Type: SettingTypeInt, Min: "1", Max: "3650", Category: "sync", Group: "Annotation Retention", Description: "How long deleted annotations are kept before purge"},
-	{Key: "conversion_cache_ttl_hours", Value: "24", Type: SettingTypeInt, Min: "1", Max: "720", Category: "performance", Group: "Conversion Cache", Description: "How long converted (kepub) files are cached"},
-	{Key: "auth_rate_limit_per_min", Value: "10", Type: SettingTypeInt, Min: "1", Max: "10000", RequiresRestart: true, Category: "security", Group: "Auth Rate Limiting", Description: "Global auth API rate limit (requests per minute)"},
-	{Key: "login_max_attempts", Value: "5", Type: SettingTypeInt, Min: "1", Max: "100", RequiresRestart: true, Category: "security", Group: "Login Lockout", Description: "Failed login attempts before lockout"},
-	{Key: "login_lockout_minutes", Value: "15", Type: SettingTypeInt, Min: "1", Max: "10080", RequiresRestart: true, Category: "security", Group: "Login Lockout", Description: "Lockout duration after too many failed logins"},
-	{Key: "sync_queue_interval_seconds", Value: "5", Type: SettingTypeInt, Min: "1", Max: "3600", RequiresRestart: true, Category: "sync", Group: "Sync Queue", Description: "How often the sync queue flushes"},
-	{Key: "sync_queue_batch_size", Value: "50", Type: SettingTypeInt, Min: "1", Max: "10000", RequiresRestart: true, Category: "sync", Group: "Sync Queue", Description: "Maximum items processed per sync queue flush"},
-	{Key: "worker_pool_size", Value: "3", Type: SettingTypeInt, Min: "1", Max: "100", RequiresRestart: true, Category: "performance", Group: "Worker Pool", Description: "Number of background worker goroutines"},
-	{Key: "worker_queue_cap", Value: "100", Type: SettingTypeInt, Min: "1", Max: "10000", RequiresRestart: true, Category: "performance", Group: "Worker Pool", Description: "Background worker job queue capacity"},
-}
-
-// defaultBy indexes SettingDefaults by key for O(1) lookup.
-var defaultBy = func() map[string]SettingDefault {
-	m := make(map[string]SettingDefault, len(SettingDefaults))
-	for _, d := range SettingDefaults {
-		m[d.Key] = d
-	}
-	return m
-}()
-
-// Registry caches system_settings values in memory. The zero value is not
-// usable; construct with New.
-type SettingsRegistry struct {
-	q *Queries
-
-	mu       sync.RWMutex
-	values   map[string]string
-	loadedAt time.Time
-}
-
-// New returns a Registry backed by the given queries. The cache is empty
-// until Load is called.
-func NewSettingsRegistry(q *Queries) *SettingsRegistry {
-	return &SettingsRegistry{q: q, values: make(map[string]string)}
-}
-
-// Load populates the cache from the database. Missing rows fall back to the
-// compiled defaults. Safe to call multiple times.
-func (r *SettingsRegistry) Load(ctx context.Context) error {
-	rows, err := r.q.GetAllSystemSettings(ctx)
-	if err != nil {
-		return err
-	}
-	fresh := make(map[string]string, len(SettingDefaults))
-	for _, d := range SettingDefaults {
-		fresh[d.Key] = d.Value
-	}
-	for _, row := range rows {
-		if _, ok := fresh[row.SettingKey]; ok {
-			fresh[row.SettingKey] = row.SettingValue
-		}
-	}
-	r.mu.Lock()
-	r.values = fresh
-	r.loadedAt = time.Now()
-	r.mu.Unlock()
-	return nil
-}
-
-// Reload refreshes the cache from the database. Should be called after any
-// setting write. On error the cache is left untouched and the error is logged.
-func (r *SettingsRegistry) Reload(ctx context.Context) {
-	if err := r.Load(ctx); err != nil {
-		log.Printf("settings: reload failed: %v", err)
-	}
-}
-
-// raw returns the cached string value for a key (or the default), clamped to
-// [min, max] for int-typed keys.
-func (r *SettingsRegistry) raw(key string) string {
-	r.mu.RLock()
-	v, ok := r.values[key]
-	r.mu.RUnlock()
-	if !ok || v == "" {
-		v = defaultBy[key].Value
-	}
-	return v
-}
-
-func (r *SettingsRegistry) getInt(key string) int {
-	d := defaultBy[key]
-	v := r.raw(key)
-	n, err := strconv.Atoi(v)
-	if err != nil {
-		n, _ = strconv.Atoi(d.Value)
-	}
-	if d.Min != "" {
-		if mn, err := strconv.Atoi(d.Min); err == nil && n < mn {
-			n = mn
-		}
-	}
-	if d.Max != "" {
-		if mx, err := strconv.Atoi(d.Max); err == nil && n > mx {
-			n = mx
-		}
-	}
-	return n
-}
-
-func (r *SettingsRegistry) getBool(key string) bool {
-	v := r.raw(key)
-	b, err := strconv.ParseBool(v)
-	if err != nil {
-		b, _ = strconv.ParseBool(defaultBy[key].Value)
-	}
-	return b
-}
-
-// ---- Domain-specific getters (call sites use these) ----
-
-// ScanPollInterval is how often the scanner polls, as a duration.
-func (r *SettingsRegistry) ScanPollInterval() time.Duration {
-	return time.Duration(r.getInt("scan_poll_interval_seconds")) * time.Second
-}
-
-// AutoScanEnabled reports whether auto-scanning is on.
-func (r *SettingsRegistry) AutoScanEnabled() bool { return r.getBool("auto_scan_enabled") }
-
-// DefaultTimezone returns the configured default timezone name.
-func (r *SettingsRegistry) DefaultTimezone() string { return r.raw("default_timezone") }
-
-// SessionDuration is how long a login session / refresh token stays valid.
-func (r *SettingsRegistry) SessionDuration() time.Duration {
-	return time.Duration(r.getInt("session_duration_seconds")) * time.Second
-}
-
-// PasswordMinLength is the minimum password length.
-func (r *SettingsRegistry) PasswordMinLength() int { return r.getInt("password_min_length") }
-
-// PasswordRules bundles the active complexity requirements.
-type PasswordRules struct {
-	MinLength int
-	Upper     bool
-	Lower     bool
-	Number    bool
-	Special   bool
-}
-
-// PasswordRules returns the active password complexity configuration.
-func (r *SettingsRegistry) PasswordRules() PasswordRules {
-	return PasswordRules{
-		MinLength: r.PasswordMinLength(),
-		Upper:     r.getBool("password_require_upper"),
-		Lower:     r.getBool("password_require_lower"),
-		Number:    r.getBool("password_require_number"),
-		Special:   r.getBool("password_require_special"),
-	}
-}
-
-// AuthRateLimit is the global auth endpoint rate limit (requests/minute). Read
-// once at startup.
-func (r *SettingsRegistry) AuthRateLimit() int { return r.getInt("auth_rate_limit_per_min") }
-
-// LoginLockout returns (max attempts, lockout duration). Read once at startup.
-func (r *SettingsRegistry) LoginLockout() (int, time.Duration) {
-	return r.getInt("login_max_attempts"), time.Duration(r.getInt("login_lockout_minutes")) * time.Minute
-}
-
-// OpdsDefaultPageSize is the default OPDS items-per-page.
-func (r *SettingsRegistry) OpdsDefaultPageSize() int { return r.getInt("opds_default_page_size") }
-
-// OpdsMaxPageSize is the maximum items-per-page a client may request.
-func (r *SettingsRegistry) OpdsMaxPageSize() int { return r.getInt("opds_max_page_size") }
-
-// DeviceRateLimits bundles the per-route device rate limits (requests/minute).
-type DeviceRateLimits struct {
-	Sync     int
-	Progress int
-	Metadata int
-}
-
-// DeviceRateLimits returns the active device rate limits.
-func (r *SettingsRegistry) DeviceRateLimits() DeviceRateLimits {
-	return DeviceRateLimits{
-		Sync:     r.getInt("device_rate_sync_per_min"),
-		Progress: r.getInt("device_rate_progress_per_min"),
-		Metadata: r.getInt("device_rate_metadata_per_min"),
-	}
-}
-
-// TombstoneTTL is how long deleted annotations are retained before purge.
-func (r *SettingsRegistry) TombstoneTTL() time.Duration {
-	return time.Duration(r.getInt("annotation_tombstone_ttl_days")) * 24 * time.Hour
-}
-
-// ConversionCacheTTL is how long converted (kepub) files are served from cache.
-func (r *SettingsRegistry) ConversionCacheTTL() time.Duration {
-	return time.Duration(r.getInt("conversion_cache_ttl_hours")) * time.Hour
-}
-
-// SyncQueueConfig bundles the sync queue interval and batch size. Read at
-// startup; changes require a restart.
-type SyncQueueConfig struct {
-	Interval  time.Duration
-	BatchSize int
-}
-
-// SyncQueueConfig returns the active sync queue configuration.
-func (r *SettingsRegistry) SyncQueueConfig() SyncQueueConfig {
-	return SyncQueueConfig{
-		Interval:  time.Duration(r.getInt("sync_queue_interval_seconds")) * time.Second,
-		BatchSize: r.getInt("sync_queue_batch_size"),
-	}
-}
-
-// WorkerPoolConfig bundles worker count and queue capacity. Read at startup;
-// changes require a restart.
-type WorkerPoolConfig struct {
-	Size   int
-	QueueCap int
-}
-
-// WorkerPoolConfig returns the active worker pool configuration.
-func (r *SettingsRegistry) WorkerPoolConfig() WorkerPoolConfig {
-	return WorkerPoolConfig{
-		Size:     r.getInt("worker_pool_size"),
-		QueueCap: r.getInt("worker_queue_cap"),
-	}
-}
-
-// SettingEntry exposes one setting's metadata + current value, for the admin UI/API.
-type SettingEntry struct {
-	Key             string `json:"key"`
-	Value           string `json:"value"`
-	Type            string `json:"type"`
-	Min             string `json:"min,omitempty"`
-	Max             string `json:"max,omitempty"`
-	RequiresRestart bool   `json:"requires_restart"`
-	Category        string `json:"category"`
-	Group           string `json:"group"`
-	Description     string `json:"description"`
-	IsDefault       bool   `json:"is_default"`
-}
-
-// All returns metadata + current values for every known setting, grouped by
-// the in-memory cache (which reflects the DB after Load/Reload).
-func (r *SettingsRegistry) All() []SettingEntry {
-	r.mu.RLock()
-	vals := make(map[string]string, len(r.values))
-	for k, v := range r.values {
-		vals[k] = v
-	}
-	r.mu.RUnlock()
-	out := make([]SettingEntry, 0, len(SettingDefaults))
-	for _, d := range SettingDefaults {
-		v, ok := vals[d.Key]
-		if !ok {
-			v = d.Value
-		}
-		out = append(out, SettingEntry{
-			Key:             d.Key,
-			Value:           v,
-			Type:            d.Type,
-			Min:             d.Min,
-			Max:             d.Max,
-			RequiresRestart: d.RequiresRestart,
-			Category:        d.Category,
-			Group:           d.Group,
-			Description:     d.Description,
-			IsDefault:       v == d.Value,
-		})
-	}
-	return out
-}
-
-// LookupDefault returns the compiled-in SettingDefault for a key (ok=false if unknown).
-func LookupDefault(key string) (SettingDefault, bool) {
-	d, ok := defaultBy[key]
-	return d, ok
-}

internal/database/settings_registry_test.go

@@ -1,97 +0,0 @@
-package database
-
-import (
-	"strconv"
-	"testing"
-)
-
-// TestSettingDefaults ensures every seeded setting has a compiled default with
-// a valid value for its declared type. This guards against typos that would
-// silently fall back at runtime.
-func TestSettingDefaults(t *testing.T) {
-	if len(SettingDefaults) == 0 {
-		t.Fatal("SettingDefaults is empty")
-	}
-	for _, d := range SettingDefaults {
-		if d.Key == "" {
-			t.Errorf("default has empty key: %+v", d)
-			continue
-		}
-		switch d.Type {
-		case SettingTypeInt:
-			if _, err := strconv.Atoi(d.Value); err != nil {
-				t.Errorf("int setting %s default %q is not an int: %v", d.Key, d.Value, err)
-			}
-			if d.Min != "" {
-				if _, err := strconv.Atoi(d.Min); err != nil {
-					t.Errorf("int setting %s min %q is not an int", d.Key, d.Min)
-				}
-			}
-			if d.Max != "" {
-				if _, err := strconv.Atoi(d.Max); err != nil {
-					t.Errorf("int setting %s max %q is not an int", d.Key, d.Max)
-				}
-			}
-		case SettingTypeBool:
-			if _, err := strconv.ParseBool(d.Value); err != nil {
-				t.Errorf("bool setting %s default %q is not a bool", d.Key, d.Value)
-			}
-		case SettingTypeString:
-			if d.Value == "" {
-				t.Errorf("string setting %s has empty default", d.Key)
-			}
-		default:
-			t.Errorf("setting %s has unknown type %q", d.Key, d.Type)
-		}
-	}
-}
-
-// TestSettingsRegistryGetIntClamping verifies that out-of-range DB values are
-// clamped to the declared min/max, and that garbage falls back to the default.
-func TestSettingsRegistryGetIntClamping(t *testing.T) {
-	r := &SettingsRegistry{values: map[string]string{}, q: nil}
-
-	// Seed with an over-max value; expect clamping to the max (3600).
-	r.values["scan_poll_interval_seconds"] = "999999"
-	if got := r.ScanPollInterval(); got.Seconds() != 3600 {
-		t.Errorf("expected clamp to 3600, got %v", got)
-	}
-
-	// Seed with an under-min value; expect clamp to min (1).
-	r.values["scan_poll_interval_seconds"] = "0"
-	if got := r.ScanPollInterval(); got.Seconds() != 1 {
-		t.Errorf("expected clamp to 1, got %v", got)
-	}
-
-	// Seed with garbage; expect fallback to default (60).
-	r.values["scan_poll_interval_seconds"] = "not-a-number"
-	if got := r.ScanPollInterval(); got.Seconds() != 60 {
-		t.Errorf("expected fallback default 60, got %v", got)
-	}
-}
-
-// TestSettingsRegistryGetBoolFallback verifies bool parsing and fallback.
-func TestSettingsRegistryGetBoolFallback(t *testing.T) {
-	r := &SettingsRegistry{values: map[string]string{}, q: nil}
-
-	r.values["auto_scan_enabled"] = "true"
-	if !r.AutoScanEnabled() {
-		t.Error("expected true")
-	}
-
-	r.values["auto_scan_enabled"] = "garbage"
-	// garbage falls back to default ("true")
-	if !r.AutoScanEnabled() {
-		t.Error("expected fallback to default true")
-	}
-}
-
-// TestLookupDefaultUnknownKey verifies unknown keys return ok=false.
-func TestLookupDefaultUnknownKey(t *testing.T) {
-	if _, ok := LookupDefault("does_not_exist"); ok {
-		t.Error("expected ok=false for unknown key")
-	}
-	if _, ok := LookupDefault("session_duration_seconds"); !ok {
-		t.Error("expected ok=true for known key")
-	}
-}

internal/handlers/auth.go

@@ -6,7 +6,6 @@ package handlers
 import (
 	"bookhoard/internal/database"
 	"bookhoard/internal/middleware"
-	"bookhoard/internal/setupstatus"
 	"context"
 	"errors"
 	"fmt"
@@ -26,34 +25,14 @@ import (
 )
 
 const (
-	// DefaultSessionDuration is the fallback session duration used when no
-	// settings registry is wired (matches the historical 7-day value).
-	DefaultSessionDuration = 7 * 24 * time.Hour
+	// Session duration constants
+	// Follows same pattern as refresh_token.go
+	SessionDuration = 7 * 24 * time.Hour // 7 days
 )
 
-// SessionDurationSec is retained for backward compatibility; new code uses the
-// registry via AuthHandler.sessionDuration().
-var SessionDurationSec = int(DefaultSessionDuration.Seconds())
-
-// SetSettings wires the tunable settings registry (optional).
-func (h *AuthHandler) SetSettings(s *database.SettingsRegistry) { h.settings = s }
-
-// sessionDuration returns the active session duration from the registry.
-func (h *AuthHandler) sessionDuration() time.Duration {
-	if h.settings != nil {
-		return h.settings.SessionDuration()
-	}
-	return DefaultSessionDuration
-}
-
-// refreshTokenTTL returns the active refresh-token lifetime (shared with the
-// session duration), with a compiled-default fallback.
-func (h *AuthHandler) refreshTokenTTL() time.Duration {
-	if h.settings != nil {
-		return h.settings.SessionDuration()
-	}
-	return DefaultSessionDuration
-}
+// SessionDurationSec is the session duration in seconds for use in cookies and API responses
+// Note: This is computed from SessionDuration to avoid magic numbers
+var SessionDurationSec = int(SessionDuration.Seconds())
 
 var secure = os.Getenv("COOKIE_SECURE")
 
@@ -61,7 +40,6 @@ type AuthHandler struct {
 	db                  *database.Queries
 	jwtKey              []byte
 	loginAttemptTracker *middleware.LoginAttemptTracker
-	settings            *database.SettingsRegistry
 }
 
 func NewAuthHandler(db *database.Queries, jwtSecret string, loginAttemptTracker *middleware.LoginAttemptTracker) *AuthHandler {
@@ -104,22 +82,22 @@ type UserProfile struct {
 }
 
 type UpdateProfileRequest struct {
-	Username  string `json:"username,omitempty" form:"username" validate:"omitempty,min=3,max=50"`
-	Email     string `json:"email,omitempty" form:"email" validate:"omitempty,email"`
-	FirstName string `json:"first_name,omitempty" form:"first_name" validate:"omitempty,max=100"`
-	LastName  string `json:"last_name,omitempty" form:"last_name" validate:"omitempty,max=100"`
-	Theme     string `json:"theme,omitempty" form:"theme" validate:"omitempty"`
-	Timezone  string `json:"timezone,omitempty" form:"timezone" validate:"omitempty"`
+	Username  string `json:"username,omitempty" validate:"omitempty,min=3,max=50"`
+	Email     string `json:"email,omitempty" validate:"omitempty,email"`
+	FirstName string `json:"first_name,omitempty" validate:"omitempty,max=100"`
+	LastName  string `json:"last_name,omitempty" validate:"omitempty,max=100"`
+	Theme     string `json:"theme,omitempty" validate:"omitempty"`
+	Timezone  string `json:"timezone,omitempty" validate:"omitempty"`
 }
 
 type AdminUpdateUserRequest struct {
-	Username  string `json:"username,omitempty" form:"username" validate:"omitempty,min=3,max=50"`
-	Email     string `json:"email,omitempty" form:"email" validate:"omitempty,email"`
-	FirstName string `json:"first_name,omitempty" form:"first_name" validate:"omitempty,max=100"`
-	LastName  string `json:"last_name,omitempty" form:"last_name" validate:"omitempty,max=100"`
-	Theme     string `json:"theme,omitempty" form:"theme" validate:"omitempty"`
-	Timezone  string `json:"timezone,omitempty" form:"timezone" validate:"omitempty"`
-	Role      string `json:"role,omitempty" form:"role" validate:"omitempty,oneof=user admin"`
+	Username  string `json:"username,omitempty" validate:"omitempty,min=3,max=50"`
+	Email     string `json:"email,omitempty" validate:"omitempty,email"`
+	FirstName string `json:"first_name,omitempty" validate:"omitempty,max=100"`
+	LastName  string `json:"last_name,omitempty" validate:"omitempty,max=100"`
+	Theme     string `json:"theme,omitempty" validate:"omitempty"`
+	Timezone  string `json:"timezone,omitempty" validate:"omitempty"`
+	Role      string `json:"role,omitempty" validate:"omitempty,oneof=user admin"`
 }
 
 // Register handles POST /api/auth/register
@@ -212,7 +190,7 @@ func (h *AuthHandler) Register(c *echo.Context) error {
 	}
 
 	var userRole string
-	if !adminExists {
+	if len(users) == 0 {
 		userRole = "admin"
 	} else {
 		userRole = req.Role
@@ -254,10 +232,6 @@ func (h *AuthHandler) Register(c *echo.Context) error {
 		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 
-	// A new user may have changed the admin count (e.g. first user becomes
-	// admin), so refresh the setup-status cache.
-	setupstatus.Invalidate()
-
 	if err := h.CreateDefaultCollectionsForUser(c.Request().Context(), user.ID); err != nil {
 		if c.Request().Header.Get("HX-Request") == "true" {
 			return c.HTML(http.StatusInternalServerError, `<div class="text-red-500">Failed to create default collections</div>`)
@@ -286,7 +260,7 @@ func (h *AuthHandler) Register(c *echo.Context) error {
 		HttpOnly: true,
 		Secure:   secure == "true", // TODO: Set to true in production with HTTPS
 		SameSite: http.SameSiteLaxMode,
-		MaxAge:   int(h.sessionDuration().Seconds()),
+		MaxAge:   SessionDurationSec,
 	}
 	c.SetCookie(cookie)
 
@@ -319,7 +293,7 @@ window.location.href = '/dashboard';
 		Token:        accessToken,
 		RefreshToken: refreshToken,
 		TokenType:    "Bearer",
-		ExpiresIn:    int(h.sessionDuration().Seconds()),
+		ExpiresIn:    SessionDurationSec,
 		User: UserProfile{
 			ID:        uuid.UUID(user.ID.Bytes).String(),
 			Email:     user.Email,
@@ -432,7 +406,7 @@ func (h *AuthHandler) Login(c *echo.Context) error {
 		HttpOnly: true,
 		Secure:   secure == "true", // TODO: Set to true in production with HTTPS
 		SameSite: http.SameSiteLaxMode,
-		MaxAge:   int(h.sessionDuration().Seconds()),
+		MaxAge:   SessionDurationSec,
 	}
 	c.SetCookie(cookie)
 
@@ -471,7 +445,7 @@ window.location.href = '%s';
 		Token:        accessToken,
 		RefreshToken: refreshToken,
 		TokenType:    "Bearer",
-		ExpiresIn:    int(h.sessionDuration().Seconds()),
+		ExpiresIn:    SessionDurationSec,
 		User: UserProfile{
 			ID:        uuid.UUID(user.ID.Bytes).String(),
 			Email:     user.Email,
@@ -574,9 +548,6 @@ func (h *AuthHandler) UpdateProfile(c *echo.Context) error {
 		if err != nil {
 			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 		}
-
-		// Role changes can affect the admin count, so refresh the setup-status cache.
-		setupstatus.Invalidate()
 	}
 
 	// Update username (if provided)
@@ -814,9 +785,9 @@ func (h *AuthHandler) UpdatePassword(c *echo.Context) error {
 	}
 
 	type PasswordRequest struct {
-		CurrentPassword string `json:"current_password,omitempty" form:"current_password"`
-		NewPassword     string `json:"new_password" form:"new_password" validate:"required,passwordcomplex"`
-		ConfirmPassword string `json:"confirm_password" form:"confirm_password" validate:"required"`
+		CurrentPassword string `json:"current_password,omitempty"`
+		NewPassword     string `json:"new_password" validate:"required,passwordcomplex"`
+		ConfirmPassword string `json:"confirm_password" validate:"required"`
 	}
 
 	var req PasswordRequest
@@ -963,9 +934,6 @@ func (h *AuthHandler) DeleteUser(c *echo.Context) error {
 		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 
-	// Deletion may have changed the admin count, so refresh the setup-status cache.
-	setupstatus.Invalidate()
-
 	// Create success message based on context
 	var message string
 	if targetUserID != "" && targetUserUUID.Bytes != currentUser.ID.Bytes {
@@ -1035,7 +1003,7 @@ func (h *AuthHandler) generateJWTWithAllClaims(userID, userRole, userEmail, user
 		"user_role":     userRole,
 		"user_email":    userEmail,
 		"user_username": userUsername,
-		"exp":           time.Now().Add(h.sessionDuration()).Unix(),
+		"exp":           time.Now().Add(SessionDuration).Unix(),
 		"iat":           time.Now().Unix(),
 	}
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)

internal/handlers/collections.go

@@ -73,7 +73,6 @@ type BookInfo struct {
 	Title          string `json:"title"`
 	Author         string `json:"author"`
 	CoverImagePath string `json:"cover_image_path"`
-	HasConflict    bool   `json:"has_conflict"`
 }
 
 type SectionData struct {

internal/handlers/conflicts.go

@@ -28,7 +28,7 @@ func NewConflictHandler(db *database.Queries, connManager *wsync.ConnectionManag
 }
 
 type ConflictResolutionRequest struct {
-	Winner     string                 `json:"winner" validate:"required"`
+	Winner     string                 `json:"winner" validate:"required,oneof=koreader kobo web manual"`
 	ManualData map[string]interface{} `json:"manual_data"`
 	ApplyToAll bool                   `json:"apply_to_all_future_conflicts"`
 	Reason     string                 `json:"reason"`
@@ -225,7 +225,7 @@ func (h *ConflictHandler) ResolveConflict(c *echo.Context) error {
 		return echo.NewHTTPError(http.StatusForbidden, "access denied")
 	}
 
-	if conflict.ResolutionStatus.String == "user_resolved" {
+	if conflict.ResolutionStatus.String != "unresolved" {
 		return echo.NewHTTPError(http.StatusBadRequest, "conflict already resolved")
 	}
 
@@ -235,10 +235,8 @@ func (h *ConflictHandler) ResolveConflict(c *echo.Context) error {
 	}
 
 	winnerData := map[string]interface{}{}
-	winnerSource := req.Winner
 	if req.Winner == "manual" {
 		winnerData = req.ManualData
-		winnerSource = "manual"
 	} else {
 		source, ok := conflictData[req.Winner]
 		if !ok {
@@ -253,17 +251,11 @@ func (h *ConflictHandler) ResolveConflict(c *echo.Context) error {
 	}
 
 	if conflict.ConflictType == "progress" {
-		if err := h.applyProgressResolution(conflict.MediaItemID, conflict.UserID, winnerSource, winnerData); err == nil {
+		if err := h.applyProgressResolution(conflict.MediaItemID, conflict.UserID, winnerData); err == nil {
 			appliedTo["progress"] = true
 		}
 	}
 
-	if conflict.ConflictType == "annotation_highlight" || conflict.ConflictType == "annotation_bookmark" || conflict.ConflictType == "annotation_note" {
-		if err := h.applyAnnotationResolution(conflict.MediaItemID, conflict.UserID, winnerData, conflict.ConflictType); err == nil {
-			appliedTo["annotations"] = true
-		}
-	}
-
 	resolutionData := map[string]interface{}{
 		"winner":      req.Winner,
 		"applied_to":  appliedTo,
@@ -294,7 +286,7 @@ func (h *ConflictHandler) ResolveConflict(c *echo.Context) error {
 	return c.JSON(http.StatusOK, response)
 }
 
-func (h *ConflictHandler) applyProgressResolution(mediaItemID pgtype.UUID, userID pgtype.UUID, winnerSource string, data map[string]interface{}) error {
+func (h *ConflictHandler) applyProgressResolution(mediaItemID pgtype.UUID, userID pgtype.UUID, data map[string]interface{}) error {
 	ctx := context.Background()
 
 	existingProgress, err := h.db.GetReadingProgress(ctx, database.GetReadingProgressParams{
@@ -350,7 +342,7 @@ func (h *ConflictHandler) applyProgressResolution(mediaItemID pgtype.UUID, userI
 		CurrentPage:     currentPage,
 		TotalPages:      totalPages,
 		LastSyncDevice:  pgtype.Text{String: "conflict_resolution", Valid: true},
-		LastSyncSource:  pgtype.Text{String: winnerSource, Valid: true},
+		LastSyncSource:  pgtype.Text{String: "manual", Valid: true},
 		ViewportY:       pgtype.Float8{},
 		ScrollPositionX: pgtype.Float8{},
 		ScrollPositionY: pgtype.Float8{},
@@ -362,143 +354,6 @@ func (h *ConflictHandler) applyProgressResolution(mediaItemID pgtype.UUID, userI
 	return err
 }
 
-func (h *ConflictHandler) applyAnnotationResolution(mediaItemID pgtype.UUID, userID pgtype.UUID, winnerData map[string]interface{}, conflictType string) error {
-	ctx := context.Background()
-
-	dedupKey, _ := winnerData["dedup_key"].(string)
-	if dedupKey == "" {
-		return errors.New("missing dedup_key in winner data")
-	}
-
-	switch conflictType {
-	case "annotation_highlight":
-		return h.applyHighlightResolution(ctx, mediaItemID, userID, dedupKey, winnerData)
-	case "annotation_bookmark":
-		return h.applyBookmarkResolution(ctx, mediaItemID, userID, dedupKey, winnerData)
-	case "annotation_note":
-		return h.applyNoteResolution(ctx, mediaItemID, userID, dedupKey, winnerData)
-	default:
-		return errors.New("unknown annotation conflict type")
-	}
-}
-
-func (h *ConflictHandler) applyHighlightResolution(ctx context.Context, mediaItemID pgtype.UUID, userID pgtype.UUID, dedupKey string, data map[string]interface{}) error {
-	existing, err := h.db.GetMediaHighlightByDedupKey(ctx, database.GetMediaHighlightByDedupKeyParams{
-		MediaItemID: mediaItemID,
-		DedupKey:    pgtype.Text{String: dedupKey, Valid: true},
-	})
-	if err != nil {
-		return err
-	}
-
-	params := database.UpdateMediaHighlightForSyncParams{
-		ID:                existing.ID,
-		SelectionText:     existing.SelectionText,
-		StartPosition:     existing.StartPosition,
-		EndPosition:       existing.EndPosition,
-		Color:             existing.Color,
-		NoteText:          existing.NoteText,
-		PercentageStart:   existing.PercentageStart,
-		PercentageEnd:     existing.PercentageEnd,
-		EpubcfiStart:      existing.EpubcfiStart,
-		EpubcfiEnd:        existing.EpubcfiEnd,
-		ChapterReference:  existing.ChapterReference,
-		LastModifiedAt:    pgtype.Timestamptz{Time: time.Now(), Valid: true},
-		LastModifiedSource: pgtype.Text{String: "conflict_resolution", Valid: true},
-		DeviceSyncData:     existing.DeviceSyncData,
-	}
-
-	if v, ok := data["selection_text"].(string); ok {
-		params.SelectionText = v
-	}
-	if v, ok := data["color"].(string); ok {
-		params.Color = pgtype.Text{String: v, Valid: true}
-	}
-	if v, ok := data["note_text"].(string); ok {
-		params.NoteText = pgtype.Text{String: v, Valid: true}
-	}
-	if v, ok := data["start_position"].(string); ok {
-		params.StartPosition = pgtype.Text{String: v, Valid: true}
-	}
-	if v, ok := data["end_position"].(string); ok {
-		params.EndPosition = pgtype.Text{String: v, Valid: true}
-	}
-
-	_, err = h.db.UpdateMediaHighlightForSync(ctx, params)
-	return err
-}
-
-func (h *ConflictHandler) applyBookmarkResolution(ctx context.Context, mediaItemID pgtype.UUID, userID pgtype.UUID, dedupKey string, data map[string]interface{}) error {
-	existing, err := h.db.GetMediaBookmarkByDedupKey(ctx, database.GetMediaBookmarkByDedupKeyParams{
-		MediaItemID: mediaItemID,
-		DedupKey:    pgtype.Text{String: dedupKey, Valid: true},
-	})
-	if err != nil {
-		return err
-	}
-
-	params := database.UpdateMediaBookmarkForSyncParams{
-		ID:                existing.ID,
-		PageNumber:        existing.PageNumber,
-		ChapterNumber:     existing.ChapterNumber,
-		CfiPosition:       existing.CfiPosition,
-		Title:             existing.Title,
-		Position:          existing.Position,
-		Notes:             existing.Notes,
-		PercentageLocation: existing.PercentageLocation,
-		EpubcfiLocation:   existing.EpubcfiLocation,
-		ChapterReference:  existing.ChapterReference,
-		LastModifiedAt:    pgtype.Timestamptz{Time: time.Now(), Valid: true},
-		LastModifiedSource: pgtype.Text{String: "conflict_resolution", Valid: true},
-		DeviceSyncData:     existing.DeviceSyncData,
-	}
-
-	if v, ok := data["title"].(string); ok {
-		params.Title = v
-	}
-	if v, ok := data["notes"].(string); ok {
-		params.Notes = pgtype.Text{String: v, Valid: true}
-	}
-
-	_, err = h.db.UpdateMediaBookmarkForSync(ctx, params)
-	return err
-}
-
-func (h *ConflictHandler) applyNoteResolution(ctx context.Context, mediaItemID pgtype.UUID, userID pgtype.UUID, dedupKey string, data map[string]interface{}) error {
-	existing, err := h.db.GetMediaNoteByDedupKey(ctx, database.GetMediaNoteByDedupKeyParams{
-		MediaItemID: mediaItemID,
-		DedupKey:    pgtype.Text{String: dedupKey, Valid: true},
-	})
-	if err != nil {
-		return err
-	}
-
-	params := database.UpdateMediaNoteForSyncParams{
-		ID:                 existing.ID,
-		Content:            existing.Content,
-		Position:           existing.Position,
-		PercentageLocation: existing.PercentageLocation,
-		CharacterStart:     existing.CharacterStart,
-		CharacterEnd:       existing.CharacterEnd,
-		EpubcfiLocation:    existing.EpubcfiLocation,
-		ChapterReference:   existing.ChapterReference,
-		ParagraphReference: existing.ParagraphReference,
-		LastModifiedAt:     pgtype.Timestamptz{Time: time.Now(), Valid: true},
-		LastModifiedSource: pgtype.Text{String: "conflict_resolution", Valid: true},
-		DeviceSyncData:     existing.DeviceSyncData,
-	}
-
-	if v, ok := data["content"].(string); ok {
-		params.Content = v
-	}
-	if v, ok := data["position"].(string); ok {
-		params.Position = pgtype.Text{String: v, Valid: true}
-	}
-
-	_, err = h.db.UpdateMediaNoteForSync(ctx, params)
-	return err
-}
-
 func (h *ConflictHandler) notifyDevicesOfResolution(mediaItemID pgtype.UUID, data map[string]interface{}) []string {
 	devices, err := h.db.ListDevicesByType(context.Background(), "koreader")
 	if err != nil {
@@ -696,7 +551,7 @@ func (h *ConflictHandler) BulkResolveConflicts(c *echo.Context) error {
 			continue
 		}
 
-		if err := h.applyResolution(conflict.MediaItemID, conflict.UserID, winningSource, winnerData); err != nil {
+		if err := h.applyResolution(conflict.MediaItemID, conflict.UserID, winnerData); err != nil {
 			results = append(results, ConflictResult{
 				ConflictID: conflictIDStr,
 				Status:     "error",
@@ -780,7 +635,7 @@ func (h *ConflictHandler) getHighestProgressSource(conflictData map[string]Confl
 	return highestSource, highestData
 }
 
-func (h *ConflictHandler) applyResolution(mediaItemID pgtype.UUID, userID pgtype.UUID, winnerSource string, data map[string]interface{}) error {
+func (h *ConflictHandler) applyResolution(mediaItemID pgtype.UUID, userID pgtype.UUID, data map[string]interface{}) error {
 	ctx := context.Background()
 
 	existingProgress, err := h.db.GetReadingProgress(ctx, database.GetReadingProgressParams{
@@ -835,8 +690,8 @@ func (h *ConflictHandler) applyResolution(mediaItemID pgtype.UUID, userID pgtype
 		CharacterOffset: characterOffset,
 		CurrentPage:     currentPage,
 		TotalPages:      totalPages,
-		LastSyncDevice:  pgtype.Text{String: "conflict_resolution", Valid: true},
-		LastSyncSource:  pgtype.Text{String: winnerSource, Valid: true},
+		LastSyncDevice:  pgtype.Text{String: "bulk_resolution", Valid: true},
+		LastSyncSource:  pgtype.Text{String: "bulk", Valid: true},
 		ViewportY:       pgtype.Float8{},
 		ScrollPositionX: pgtype.Float8{},
 		ScrollPositionY: pgtype.Float8{},

internal/handlers/dashboard.go

@@ -4,7 +4,6 @@ import (
 	"bookhoard/internal/database"
 	"bookhoard/internal/services"
 	"bookhoard/internal/utils"
-	"context"
 	"log"
 	"net/http"
 	"strconv"
@@ -65,7 +64,6 @@ func (h *DashboardHandler) GetSections(c *echo.Context) error {
 	}
 
 	sectionData := BuildSections(sections, libraryID)
-	sectionData = MarkActiveConflictsSections(c.Request().Context(), h.db, user.ID, sectionData)
 
 	return c.JSON(http.StatusOK, map[string]interface{}{"sections": sectionData})
 }
@@ -190,59 +188,6 @@ func BuildSections(sections []services.DashboardSection, currentLibraryID string
 	return result
 }
 
-// activeConflictSet returns the set of media item IDs (as strings) that have an
-// active (unresolved) progress sync conflict for the given user. A single query
-// is issued; resolved conflicts are filtered out in memory.
-func activeConflictSet(ctx context.Context, db *database.Queries, userID pgtype.UUID) map[string]bool {
-	conflicts, err := db.ListSyncConflictsByUser(ctx, userID)
-	if err != nil {
-		return nil
-	}
-	set := make(map[string]bool, len(conflicts))
-	for _, c := range conflicts {
-		if c.ResolutionStatus.String == "unresolved" {
-			set[uuid.UUID(c.MediaItemID.Bytes).String()] = true
-		}
-	}
-	return set
-}
-
-// MarkActiveConflicts stamps HasConflict on each book whose media item has an
-// active progress sync conflict for the user. It performs a single query
-// regardless of how many books are passed.
-func MarkActiveConflicts(ctx context.Context, db *database.Queries, userID pgtype.UUID, books []BookInfo) []BookInfo {
-	if len(books) == 0 {
-		return books
-	}
-	set := activeConflictSet(ctx, db, userID)
-	for i := range books {
-		if set[books[i].MediaItemID] {
-			books[i].HasConflict = true
-		}
-	}
-	return books
-}
-
-// MarkActiveConflictsSections is the section-aware variant of MarkActiveConflicts,
-// used by the dashboard which renders books grouped into sections.
-func MarkActiveConflictsSections(ctx context.Context, db *database.Queries, userID pgtype.UUID, sections []SectionData) []SectionData {
-	if len(sections) == 0 {
-		return sections
-	}
-	set := activeConflictSet(ctx, db, userID)
-	if len(set) == 0 {
-		return sections
-	}
-	for s := range sections {
-		for i := range sections[s].Items {
-			if set[sections[s].Items[i].MediaItemID] {
-				sections[s].Items[i].HasConflict = true
-			}
-		}
-	}
-	return sections
-}
-
 func getViewAllURL(collectionID string, libraryID string) string {
 	if collectionID != "" {
 		if libraryID != "" {

internal/handlers/devices.go

@@ -100,10 +100,6 @@ type PendingRegistration struct {
 	UserID           uuid.UUID
 	ExpiresAt        time.Time
 	CreatedAt        time.Time
-	Approved         bool
-	AuthToken        string
-	DeviceID         [16]byte
-	SyncEndpoints    map[string]string
 }
 
 var pendingRegistrations = make(map[string]*PendingRegistration)
@@ -177,21 +173,60 @@ func (h *DeviceHandler) CheckRegistrationStatus(c *echo.Context) error {
 		return c.JSON(http.StatusGone, map[string]string{"error": "registration expired"})
 	}
 
-	if registration.Approved {
-		delete(pendingRegistrations, req.RegistrationID)
-
+	if registration.UserID == (uuid.UUID{}) {
 		return c.JSON(http.StatusOK, DeviceAuthStatusResponse{
-			Status:        "approved",
-			AuthToken:     registration.AuthToken,
-			DeviceID:      registration.DeviceID,
-			SyncEndpoints: registration.SyncEndpoints,
+			Status:    "pending",
+			Message:   "awaiting user approval",
+			ExpiresIn: int(time.Until(registration.ExpiresAt).Seconds()),
 		})
 	}
 
+	authToken, err := generateDeviceToken()
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to generate auth token"})
+	}
+
+	userUUID := registration.UserID
+	pgUserID := pgtype.UUID{Bytes: [16]byte(userUUID), Valid: true}
+
+	syncEnabled := pgtype.Bool{Bool: true, Valid: true}
+	autoSync := pgtype.Bool{Bool: true, Valid: true}
+	syncFreq := pgtype.Int4{Int32: 5, Valid: true}
+
+	device, err := h.db.CreateDevice(c.Request().Context(), database.CreateDeviceParams{
+		UserID:               pgUserID,
+		DeviceName:           registration.DeviceName,
+		DeviceType:           registration.DeviceType,
+		DeviceIdentifier:     registration.DeviceIdentifier,
+		AuthToken:            authToken,
+		SyncEnabled:          syncEnabled,
+		AutoSync:             autoSync,
+		SyncFrequencyMinutes: syncFreq,
+		DeviceMetadata:       []byte("{}"),
+	})
+
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to create device"})
+	}
+
+	delete(pendingRegistrations, req.RegistrationID)
+
+	syncEndpoints := map[string]string{}
+	switch registration.DeviceType {
+	case "koreader":
+		syncEndpoints["progress"] = fmt.Sprintf("%s/api/sync/koreader/progress", h.cfg.BaseURL)
+		syncEndpoints["metadata"] = fmt.Sprintf("%s/api/sync/koreader/metadata", h.cfg.BaseURL)
+		syncEndpoints["bookmarks"] = fmt.Sprintf("%s/api/sync/koreader/bookmarks", h.cfg.BaseURL)
+	case "kobo":
+		syncEndpoints["markup"] = fmt.Sprintf("%s/api/sync/kobo/markup", h.cfg.BaseURL)
+		syncEndpoints["library"] = fmt.Sprintf("%s/api/sync/kobo/library", h.cfg.BaseURL)
+	}
+
 	return c.JSON(http.StatusOK, DeviceAuthStatusResponse{
-		Status:    "pending",
-		Message:   "awaiting user approval",
-		ExpiresIn: int(time.Until(registration.ExpiresAt).Seconds()),
+		Status:        "approved",
+		AuthToken:     authToken,
+		DeviceID:      device.ID.Bytes,
+		SyncEndpoints: syncEndpoints,
 	})
 }
 
@@ -562,63 +597,14 @@ func (h *DeviceHandler) ApproveDevice(c *echo.Context) error {
 		return c.JSON(http.StatusGone, map[string]string{"error": "registration expired"})
 	}
 
-	if registration.Approved {
-		return c.JSON(http.StatusOK, map[string]interface{}{
-			"message":     "device already approved",
-			"device_name": registration.DeviceName,
-			"device_type": registration.DeviceType,
-			"approved":    true,
-		})
-	}
-
-	authToken, err := generateDeviceToken()
-	if err != nil {
-		return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to generate auth token"})
-	}
-
-	pgUserID := pgtype.UUID{Bytes: [16]byte(userUUID), Valid: true}
-	syncEnabled := pgtype.Bool{Bool: true, Valid: true}
-	autoSync := pgtype.Bool{Bool: true, Valid: true}
-	syncFreq := pgtype.Int4{Int32: 5, Valid: true}
-
-	device, err := h.db.CreateDevice(c.Request().Context(), database.CreateDeviceParams{
-		UserID:               pgUserID,
-		DeviceName:           registration.DeviceName,
-		DeviceType:           registration.DeviceType,
-		DeviceIdentifier:     registration.DeviceIdentifier,
-		AuthToken:            authToken,
-		SyncEnabled:          syncEnabled,
-		AutoSync:             autoSync,
-		SyncFrequencyMinutes: syncFreq,
-		DeviceMetadata:       []byte("{}"),
-	})
-	if err != nil {
-		return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to create device"})
-	}
-
-	syncEndpoints := map[string]string{}
-	switch registration.DeviceType {
-	case "koreader":
-		syncEndpoints["progress"] = fmt.Sprintf("%s/api/sync/koreader/progress", h.cfg.BaseURL)
-		syncEndpoints["metadata"] = fmt.Sprintf("%s/api/sync/koreader/metadata", h.cfg.BaseURL)
-		syncEndpoints["bookmarks"] = fmt.Sprintf("%s/api/sync/koreader/bookmarks", h.cfg.BaseURL)
-	case "kobo":
-		syncEndpoints["markup"] = fmt.Sprintf("%s/api/sync/kobo/markup", h.cfg.BaseURL)
-		syncEndpoints["library"] = fmt.Sprintf("%s/api/sync/kobo/library", h.cfg.BaseURL)
-	}
-
 	registration.UserID = userUUID
-	registration.Approved = true
-	registration.AuthToken = authToken
-	registration.DeviceID = device.ID.Bytes
-	registration.SyncEndpoints = syncEndpoints
 
 	return c.JSON(http.StatusOK, map[string]interface{}{
 		"message":         "device approved successfully",
 		"device_name":     registration.DeviceName,
 		"device_type":     registration.DeviceType,
 		"registration_id": registrationID,
-		"approved":        true,
+		"approved":        true, // Fixed: Add confirmation field for test compatibility
 	})
 }
 
@@ -638,9 +624,15 @@ func (h *DeviceHandler) RejectDevice(c *echo.Context) error {
 }
 
 func (h *DeviceHandler) GetPendingRegistrationsData(c *echo.Context) ([]map[string]interface{}, error) {
+	userID := c.Get("user_id").(string)
+	userUUID, err := uuid.Parse(userID)
+	if err != nil {
+		return nil, err
+	}
+
 	registrations := []map[string]interface{}{}
 	for _, reg := range pendingRegistrations {
-		if reg.UserID == (uuid.UUID{}) {
+		if reg.UserID == userUUID || reg.UserID == (uuid.UUID{}) {
 			registrations = append(registrations, map[string]interface{}{
 				"registration_id":   reg.RegistrationID,
 				"device_name":       reg.DeviceName,
@@ -648,7 +640,7 @@ func (h *DeviceHandler) GetPendingRegistrationsData(c *echo.Context) ([]map[stri
 				"device_identifier": reg.DeviceIdentifier,
 				"expires_at":        reg.ExpiresAt,
 				"created_at":        reg.CreatedAt,
-				"is_approved":       false,
+				"is_approved":       reg.UserID != (uuid.UUID{}),
 			})
 		}
 	}

internal/handlers/hash_conflicts.go

@@ -1,255 +0,0 @@
-package handlers
-
-import (
-	"bookhoard/internal/database"
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgtype"
-	"github.com/labstack/echo/v5"
-)
-
-// HashConflictsHandler serves the admin Hash Conflicts page API: listing
-// content-duplicate groups (same library + SHA-256 at different paths) and
-// resolving them by keeping every copy or merging all but one.
-type HashConflictsHandler struct {
-	db *database.Queries
-}
-
-func NewHashConflictsHandler(db *database.Queries) *HashConflictsHandler {
-	return &HashConflictsHandler{db: db}
-}
-
-// HashConflictItem is one copy in a conflict group, hydrated with per-item
-// user-data counts so the admin can make an informed keep/merge choice.
-type HashConflictItem struct {
-	ID              uuid.UUID `json:"id"`
-	Title           string    `json:"title"`
-	Author          string    `json:"author,omitempty"`
-	FilePath        string    `json:"file_path"`
-	FileSize        int64     `json:"file_size,omitempty"`
-	CreatedAt       string    `json:"created_at"`
-	ProgressCount   int64     `json:"progress_count"`
-	HighlightCount  int64     `json:"highlight_count"`
-	BookmarkCount   int64     `json:"bookmark_count"`
-	NoteCount       int64     `json:"note_count"`
-	CollectionCount int64     `json:"collection_count"`
-}
-
-// HashConflictResponse is one pending conflict group.
-type HashConflictResponse struct {
-	ID          string             `json:"id"`
-	LibraryID   string             `json:"library_id"`
-	LibraryName string             `json:"library_name"`
-	SHA256      string             `json:"sha256"`
-	CreatedAt   string             `json:"created_at"`
-	Items       []HashConflictItem `json:"items"`
-}
-
-// ListHashConflicts returns all pending hash conflict groups with their member
-// items and usage counts.
-// GET /api/admin/hash-conflicts
-func (h *HashConflictsHandler) ListHashConflicts(c *echo.Context) error {
-	ctx := c.Request().Context()
-
-	pending, err := h.db.ListPendingHashConflicts(ctx)
-	if err != nil {
-		return c.JSON(http.StatusInternalServerError, map[string]string{
-			"error": "failed to list hash conflicts",
-		})
-	}
-
-	conflicts := make([]HashConflictResponse, 0, len(pending))
-	for _, p := range pending {
-		resp := HashConflictResponse{
-			ID:          uuid.UUID(p.ID.Bytes).String(),
-			LibraryID:   uuid.UUID(p.LibraryID.Bytes).String(),
-			LibraryName: p.LibraryName,
-			SHA256:      p.FileSha256,
-			CreatedAt:   p.CreatedAt.Time.Format(time.RFC3339),
-			Items:       []HashConflictItem{},
-		}
-		items, err := h.db.ListMediaItemsBySHA256AndLibrary(ctx, database.ListMediaItemsBySHA256AndLibraryParams{
-			FileSha256: pgtype.Text{String: p.FileSha256, Valid: true},
-			LibraryID:  p.LibraryID,
-		})
-		if err != nil {
-			continue
-		}
-
-		for _, mi := range items {
-			counts, err := h.db.GetMediaItemUsageCounts(ctx, mi.ID)
-			if err != nil {
-				counts = database.GetMediaItemUsageCountsRow{}
-			}
-			resp.Items = append(resp.Items, HashConflictItem{
-				ID:              uuid.UUID(mi.ID.Bytes),
-				Title:           mi.Title,
-				Author:          mi.Author.String,
-				FilePath:        mi.FilePath,
-				FileSize:        mi.FileSize.Int64,
-				CreatedAt:       mi.CreatedAt.Time.Format(time.RFC3339),
-				ProgressCount:   counts.ProgressCount,
-				HighlightCount:  counts.HighlightsCount,
-				BookmarkCount:   counts.BookmarksCount,
-				NoteCount:       counts.NotesCount,
-				CollectionCount: counts.CollectionsCount,
-			})
-		}
-
-		conflicts = append(conflicts, resp)
-	}
-
-	return c.JSON(http.StatusOK, map[string]interface{}{
-		"conflicts": conflicts,
-		"total":     len(conflicts),
-	})
-}
-
-// ResolveHashConflict resolves one conflict group.
-//
-// Form/JSON fields:
-//   - action=keep_all              both copies are intentional; dismiss
-//   - action=keep&keep_uuid=<uuid> merge every other copy's child rows into the
-//     kept item (progress, highlights, bookmarks,
-//     notes, collections, ...) and delete the losers
-//
-// POST /api/admin/hash-conflicts/:id/resolve
-func (h *HashConflictsHandler) ResolveHashConflict(c *echo.Context) error {
-	ctx := c.Request().Context()
-
-	conflictID, err := uuid.Parse(c.Param("id"))
-	if err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid conflict ID"})
-	}
-	pgConflictID := pgtype.UUID{Bytes: conflictID, Valid: true}
-
-	conflict, err := h.db.GetHashConflict(ctx, pgConflictID)
-	if err != nil {
-		return c.JSON(http.StatusNotFound, map[string]string{"error": "conflict not found"})
-	}
-	if conflict.Status != "pending" {
-		return c.JSON(http.StatusConflict, map[string]string{"error": "conflict already resolved"})
-	}
-
-	action := c.FormValue("action")
-	keepUUIDStr := c.FormValue("keep_uuid")
-	if action == "" {
-		// Also accept a JSON body (htmx sends form-encoded, API clients may send JSON)
-		var body struct {
-			Action   string `json:"action"`
-			KeepUUID string `json:"keep_uuid"`
-		}
-		if err := c.Bind(&body); err == nil && body.Action != "" {
-			action = body.Action
-			if keepUUIDStr == "" {
-				keepUUIDStr = body.KeepUUID
-			}
-		}
-	}
-
-	var pgUserID pgtype.UUID
-	if userID, ok := c.Get("user_id").(string); ok && userID != "" {
-		if u, err := uuid.Parse(userID); err == nil {
-			pgUserID = pgtype.UUID{Bytes: u, Valid: true}
-		}
-	}
-
-	switch action {
-	case "keep_all":
-		if err := h.db.ResolveHashConflict(ctx, database.ResolveHashConflictParams{
-			ID:         pgConflictID,
-			Resolution: pgtype.Text{String: "keep_all", Valid: true},
-			ResolvedBy: pgUserID,
-		}); err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to resolve conflict"})
-		}
-		return renderResolved(c, "All copies kept.")
-
-	case "keep":
-		keepUUID, err := uuid.Parse(keepUUIDStr)
-		if err != nil {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "keep_uuid is required for action=keep"})
-		}
-		pgKeepUUID := pgtype.UUID{Bytes: keepUUID, Valid: true}
-
-		// Validate the kept item belongs to this conflict group.
-		items, err := h.db.ListMediaItemsBySHA256AndLibrary(ctx, database.ListMediaItemsBySHA256AndLibraryParams{
-			FileSha256: pgtype.Text{String: conflict.FileSha256, Valid: true},
-			LibraryID:  conflict.LibraryID,
-		})
-		if err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to load conflict group"})
-		}
-
-		keepValid := false
-		for _, mi := range items {
-			if mi.ID.Bytes == pgKeepUUID.Bytes {
-				keepValid = true
-				break
-			}
-		}
-		if !keepValid {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "keep_uuid is not part of this conflict"})
-		}
-
-		merged := 0
-		for _, mi := range items {
-			if mi.ID.Bytes == pgKeepUUID.Bytes {
-				continue
-			}
-			if err := h.db.ReparentMediaItemChildren(ctx, database.ReparentMediaItemChildrenParams{
-				Column1: pgKeepUUID,
-				Column2: mi.ID,
-			}); err != nil {
-				return c.JSON(http.StatusInternalServerError, map[string]string{
-					"error": fmt.Sprintf("failed to merge %q: %v", mi.FilePath, err),
-				})
-			}
-			if err := h.db.DeleteMediaItem(ctx, mi.ID); err != nil {
-				return c.JSON(http.StatusInternalServerError, map[string]string{
-					"error": fmt.Sprintf("failed to delete %q: %v", mi.FilePath, err),
-				})
-			}
-			merged++
-		}
-
-		if err := h.db.ResolveHashConflict(ctx, database.ResolveHashConflictParams{
-			ID:         pgConflictID,
-			Resolution: pgtype.Text{String: "kept:" + keepUUID.String(), Valid: true},
-			ResolvedBy: pgUserID,
-		}); err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to resolve conflict"})
-		}
-
-		return renderResolved(c, fmt.Sprintf("Merged %d duplicate cop%s - all reading data preserved.",
-			merged, map[bool]string{true: "y", false: "ies"}[merged == 1]))
-
-	default:
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "action must be 'keep_all' or 'keep'"})
-	}
-}
-
-// renderResolved returns the htmx fragment swapped in place of a conflict card.
-// Built inline (rather than via the templates package) because templates
-// imports handlers and a back-import would be a cycle.
-func renderResolved(c *echo.Context, message string) error {
-	html := fmt.Sprintf(`
-<div class="card p-6 flex items-center gap-3">
-	<span class="grid place-items-center h-10 w-10 rounded-xl shrink-0"
-		style="background-color: var(--accent-muted); color: var(--accent);">
-		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor"
-			stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="h-5 w-5" aria-hidden="true">
-			<path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"></path>
-			<polyline points="22 4 12 14.01 9 11.01"></polyline>
-		</svg>
-	</span>
-	<div>
-		<p class="font-medium" style="color: var(--text-primary);">Conflict resolved</p>
-		<p class="text-sm" style="color: var(--text-secondary);">%s</p>
-	</div>
-</div>`, message)
-	return c.HTML(http.StatusOK, html)
-}

internal/handlers/kobo.go

@@ -2,11 +2,8 @@ package handlers
 
 import (
 	"bookhoard/internal/database"
-	"bookhoard/internal/services"
 	wsync "bookhoard/internal/sync"
-	"encoding/json"
 	"fmt"
-	"log"
 	"net/http"
 	"regexp"
 	"strings"
@@ -18,30 +15,19 @@ import (
 )
 
 type KoboHandler struct {
-	db             *database.Queries
-	connManager    *wsync.ConnectionManager
-	progressSvc    *wsync.ProgressService
-	annotationSvc  *wsync.AnnotationService
-	libraryService LibraryPathResolver
-	bookResolver   *services.BookResolver
+	db          *database.Queries
+	connManager *wsync.ConnectionManager
+	progressSvc *wsync.ProgressService
 }
 
 func NewKoboHandler(db *database.Queries, connManager *wsync.ConnectionManager) *KoboHandler {
-	return &KoboHandler{db: db, connManager: connManager, bookResolver: services.NewBookResolver(db)}
+	return &KoboHandler{db: db, connManager: connManager}
 }
 
 func (h *KoboHandler) SetProgressService(svc *wsync.ProgressService) {
 	h.progressSvc = svc
 }
 
-func (h *KoboHandler) SetAnnotationService(svc *wsync.AnnotationService) {
-	h.annotationSvc = svc
-}
-
-func (h *KoboHandler) SetLibraryService(svc LibraryPathResolver) {
-	h.libraryService = svc
-}
-
 // mapContentIdToBookhoardUUID maps Kobo ContentId to Bookhoard UUID with multiple fallback strategies
 // Enhanced Kobo Sync - ContentId Mapping Logic
 func (h *KoboHandler) mapContentIdToBookhoardUUID(ctx *echo.Context, contentId string, deviceID uuid.UUID) (uuid.UUID, error, string) {
@@ -54,9 +40,8 @@ func (h *KoboHandler) mapContentIdToBookhoardUUID(ctx *echo.Context, contentId s
 
 	// Step 2: ContentId not found - check if it looks like a SHA-256 hash
 	if len(contentId) == 64 && looksLikeSHA256(contentId) {
-		// Try to find media item by SHA-256 (format-aware: also checks
-		// media_item_formats, so a converted/alternate format hash matches).
-		mediaItem, _, err := h.bookResolver.ResolveBySHA256(ctx.Request().Context(), contentId)
+		// Try to find media item by SHA-256
+		mediaItem, err := h.db.GetMediaItemBySHA256(ctx.Request().Context(), pgtype.Text{String: contentId, Valid: true})
 		if err == nil {
 			// Found by SHA-256! Create device catalog entry for future lookups
 			_, _ = h.db.CreateDeviceCatalog(ctx.Request().Context(), database.CreateDeviceCatalogParams{
@@ -254,16 +239,9 @@ type KoboInitResponse struct {
 }
 
 type KoboSyncStatus struct {
-	Status            string                 `json:"Status"`
-	MarkupsSynced     int                    `json:"MarkupsSynced"`
-	BookmarksSynced   int                    `json:"BookmarksSynced"`
-	DeletedAnnotations []KoboDeletedAnnotation `json:"DeletedAnnotations,omitempty"`
-}
-
-type KoboDeletedAnnotation struct {
-	ContentId  string `json:"ContentId"`
-	BookmarkId string `json:"BookmarkId"`
-	Type       string `json:"Type"`
+	Status          string `json:"Status"`
+	MarkupsSynced   int    `json:"MarkupsSynced"`
+	BookmarksSynced int    `json:"BookmarksSynced"`
 }
 
 type KoboServerSyncData struct {
@@ -327,7 +305,7 @@ func (h *KoboHandler) Initialization(c *echo.Context) error {
 		}
 
 		bookmarkCount := 0
-		annotations, _ := h.db.GetActiveAnnotationsForBook(c.Request().Context(), database.GetActiveAnnotationsForBookParams{
+		annotations, _ := h.db.GetAnnotationsForBook(c.Request().Context(), database.GetAnnotationsForBookParams{
 			MediaItemID: pgtype.UUID{Bytes: item.ID.Bytes, Valid: true},
 			UserID:      pgUserID,
 		})
@@ -419,7 +397,6 @@ func (h *KoboHandler) Markup(c *echo.Context) error {
 	markupsSynced := 0
 	bookmarksSynced := 0
 	unlinkedBooks := 0
-	processedBooks := make(map[pgtype.UUID]string)
 
 	for _, readingSync := range req.ReadingSync {
 		bookhoardUUID, err, _ := h.mapContentIdToBookhoardUUID(c, readingSync.ContentId, deviceUUID)
@@ -429,23 +406,8 @@ func (h *KoboHandler) Markup(c *echo.Context) error {
 		}
 
 		pgMediaUUID := pgtype.UUID{Bytes: bookhoardUUID, Valid: true}
-		processedBooks[pgMediaUUID] = readingSync.ContentId
 		percentage := readingSync.PercentRead / 100.0
 
-		// Kobo only sends a percentage. For fixed-layout & comic formats the page
-		// index is the canonical locator, so derive it from the known page count.
-		var currentPage, totalPages *int
-		if mediaItem, mErr := h.db.GetMediaItem(c.Request().Context(), pgMediaUUID); mErr == nil {
-			if mediaItem.FormatGroup == string(wsync.FormatGroupFixedLayout) || mediaItem.FormatGroup == string(wsync.FormatGroupComicArchive) {
-				if mediaItem.PageCount.Valid && mediaItem.PageCount.Int32 > 0 {
-					total := int(mediaItem.PageCount.Int32)
-					page := wsync.PercentageToPage(percentage, total)
-					currentPage = &page
-					totalPages = &total
-				}
-			}
-		}
-
 		if h.progressSvc != nil {
 			_, err = h.progressSvc.SaveProgress(c.Request().Context(), wsync.SaveProgressRequest{
 				MediaItemID: pgMediaUUID,
@@ -453,8 +415,6 @@ func (h *KoboHandler) Markup(c *echo.Context) error {
 				Source:      "kobo",
 				DeviceID:    pgtype.UUID{Bytes: deviceID, Valid: true},
 				Percentage:  &percentage,
-				CurrentPage: currentPage,
-				TotalPages:  totalPages,
 				DeviceType:  "kobo",
 				DeviceName:  device.DeviceName,
 				Broadcast:   true,
@@ -483,72 +443,29 @@ func (h *KoboHandler) Markup(c *echo.Context) error {
 		}
 
 		pgMediaUUID := pgtype.UUID{Bytes: bookhoardUUID, Valid: true}
-		processedBooks[pgMediaUUID] = bookmarkSync.ContentId
 
 		switch bookmarkSync.BookmarkType {
 		case "annotation":
 			if bookmarkSync.BookmarkText != "" {
-				if h.annotationSvc != nil {
-					deviceData, _ := json.Marshal(map[string]interface{}{
-						"bookmark_id":  bookmarkSync.BookmarkId,
-						"date_created": bookmarkSync.DateCreated,
-					})
-
-					result, err := h.annotationSvc.SaveHighlight(c.Request().Context(), wsync.SaveHighlightRequest{
-						MediaItemID:    pgMediaUUID,
-						UserID:         pgUserID,
-						SelectionText:  bookmarkSync.BookmarkText,
-						StartPosition:  bookmarkSync.BookmarkId,
-						EndPosition:    bookmarkSync.BookmarkId,
-						Color:          "#ffff00",
-						NoteText:       bookmarkSync.BookmarkTitle,
-						Source:         "kobo",
-						DeviceSyncData: deviceData,
-					})
-					if err == nil && result.Outcome != wsync.SaveOutcomeDeleted {
-						bookmarksSynced++
-					}
-				} else {
-					h.db.CreateMediaHighlight(c.Request().Context(), database.CreateMediaHighlightParams{
-						MediaItemID:   pgMediaUUID,
-						UserID:        pgUserID,
-						SelectionText: bookmarkSync.BookmarkText,
-						StartPosition: pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
-						EndPosition:   pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
-						Color:         pgtype.Text{String: "#ffff00", Valid: true},
-					})
-					bookmarksSynced++
-				}
+				h.db.CreateMediaHighlight(c.Request().Context(), database.CreateMediaHighlightParams{
+					MediaItemID:   pgMediaUUID,
+					UserID:        pgUserID,
+					SelectionText: bookmarkSync.BookmarkText,
+					StartPosition: pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
+					EndPosition:   pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
+					Color:         pgtype.Text{String: "#ffff00", Valid: true},
+				})
+				bookmarksSynced++
 			}
 		case "bookmark":
 			if bookmarkSync.BookmarkText != "" {
-				if h.annotationSvc != nil {
-					deviceData, _ := json.Marshal(map[string]interface{}{
-						"bookmark_id":  bookmarkSync.BookmarkId,
-						"date_created": bookmarkSync.DateCreated,
-					})
-
-					result, err := h.annotationSvc.SaveBookmark(c.Request().Context(), wsync.SaveBookmarkRequest{
-						MediaItemID:    pgMediaUUID,
-						UserID:         pgUserID,
-						Title:          bookmarkSync.BookmarkText,
-						Position:       bookmarkSync.BookmarkId,
-						ChapterNumber:  int32(bookmarkSync.Chapter),
-						Source:         "kobo",
-						DeviceSyncData: deviceData,
-					})
-					if err == nil && result.Outcome != wsync.SaveOutcomeDeleted {
-						bookmarksSynced++
-					}
-				} else {
-					h.db.CreateMediaNote(c.Request().Context(), database.CreateMediaNoteParams{
-						MediaItemID: pgMediaUUID,
-						UserID:      pgUserID,
-						Content:     bookmarkSync.BookmarkText,
-						Position:    pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
-					})
-					bookmarksSynced++
-				}
+				h.db.CreateMediaNote(c.Request().Context(), database.CreateMediaNoteParams{
+					MediaItemID: pgMediaUUID,
+					UserID:      pgUserID,
+					Content:     bookmarkSync.BookmarkText,
+					Position:    pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
+				})
+				bookmarksSynced++
 			}
 		case "last-read-place":
 			if bookmarkSync.BookmarkId != "" {
@@ -562,23 +479,6 @@ func (h *KoboHandler) Markup(c *echo.Context) error {
 				chapter := bookmarkSync.Chapter
 				chapterProgress := 0.5
 
-				var convertedCFI *string
-				var contextText *string
-
-				if epubcfi != "" && h.libraryService != nil {
-					mediaItem, mErr := h.db.GetMediaItem(c.Request().Context(), pgMediaUUID)
-					if mErr == nil {
-						formatGroup := wsync.FormatGroup(mediaItem.FormatGroup)
-						if formatGroup != wsync.FormatGroupFixedLayout && formatGroup != wsync.FormatGroupComicArchive {
-							convertedCFI, contextText = h.convertKoboCFIToStandard(c, mediaItem, epubcfi)
-						}
-					}
-				}
-
-				if convertedCFI != nil {
-					epubcfi = *convertedCFI
-				}
-
 				if h.progressSvc != nil {
 					_, err = h.progressSvc.SaveProgress(c.Request().Context(), wsync.SaveProgressRequest{
 						MediaItemID:     pgMediaUUID,
@@ -586,7 +486,6 @@ func (h *KoboHandler) Markup(c *echo.Context) error {
 						Source:          "kobo",
 						DeviceID:        pgtype.UUID{Bytes: deviceID, Valid: true},
 						Epubcfi:         &epubcfi,
-						ContextText:     contextText,
 						Chapter:         &chapter,
 						ChapterProgress: &chapterProgress,
 						DeviceType:      "kobo",
@@ -625,32 +524,6 @@ func (h *KoboHandler) Markup(c *echo.Context) error {
 		BookmarksSynced: bookmarksSynced,
 	}
 
-	if h.annotationSvc != nil && len(processedBooks) > 0 {
-		cutoff := pgtype.Timestamptz{Time: time.Now().Add(-h.annotationSvc.ActiveTombstoneTTL()), Valid: true}
-		for mediaItemID, contentId := range processedBooks {
-			tombstones, _ := h.db.GetTombstonedAnnotationsForBook(c.Request().Context(), database.GetTombstonedAnnotationsForBookParams{
-				MediaItemID: mediaItemID,
-				UserID:      pgUserID,
-				DeletedAt:   cutoff,
-			})
-			for _, ts := range tombstones {
-				var dd map[string]interface{}
-				if len(ts.DeviceSyncData) > 0 {
-					json.Unmarshal(ts.DeviceSyncData, &dd)
-				}
-				bookmarkID, _ := dd["bookmark_id"].(string)
-				if bookmarkID == "" {
-					continue
-				}
-				response.DeletedAnnotations = append(response.DeletedAnnotations, KoboDeletedAnnotation{
-					ContentId:  contentId,
-					BookmarkId: bookmarkID,
-					Type:       ts.AnnotationType,
-				})
-			}
-		}
-	}
-
 	// Include unlinked books count if any
 	if unlinkedBooks > 0 {
 		// For now, just log it. In production, this should trigger an alert
@@ -693,67 +566,25 @@ func (h *KoboHandler) Bookmark(c *echo.Context) error {
 		switch bookmarkSync.BookmarkType {
 		case "annotation":
 			if bookmarkSync.BookmarkText != "" {
-				if h.annotationSvc != nil {
-					deviceData, _ := json.Marshal(map[string]interface{}{
-						"bookmark_id":  bookmarkSync.BookmarkId,
-						"date_created": bookmarkSync.DateCreated,
-					})
-
-					result, err := h.annotationSvc.SaveHighlight(c.Request().Context(), wsync.SaveHighlightRequest{
-						MediaItemID:    pgMediaUUID,
-						UserID:         pgUserID,
-						SelectionText:  bookmarkSync.BookmarkText,
-						StartPosition:  bookmarkSync.BookmarkId,
-						EndPosition:    bookmarkSync.BookmarkId,
-						Color:          "#ffff00",
-						NoteText:       bookmarkSync.BookmarkTitle,
-						Source:         "kobo",
-						DeviceSyncData: deviceData,
-					})
-					if err == nil && result.Outcome != wsync.SaveOutcomeDeleted {
-						bookmarksSynced++
-					}
-				} else {
-					h.db.CreateMediaHighlight(c.Request().Context(), database.CreateMediaHighlightParams{
-						MediaItemID:   pgMediaUUID,
-						UserID:        pgUserID,
-						SelectionText: bookmarkSync.BookmarkText,
-						StartPosition: pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
-						EndPosition:   pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
-						Color:         pgtype.Text{String: "#ffff00", Valid: true},
-					})
-					bookmarksSynced++
-				}
+				h.db.CreateMediaHighlight(c.Request().Context(), database.CreateMediaHighlightParams{
+					MediaItemID:   pgMediaUUID,
+					UserID:        pgUserID,
+					SelectionText: bookmarkSync.BookmarkText,
+					StartPosition: pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
+					EndPosition:   pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
+					Color:         pgtype.Text{String: "#ffff00", Valid: true},
+				})
+				bookmarksSynced++
 			}
 		case "bookmark":
 			if bookmarkSync.BookmarkText != "" {
-				if h.annotationSvc != nil {
-					deviceData, _ := json.Marshal(map[string]interface{}{
-						"bookmark_id":  bookmarkSync.BookmarkId,
-						"date_created": bookmarkSync.DateCreated,
-					})
-
-					result, err := h.annotationSvc.SaveBookmark(c.Request().Context(), wsync.SaveBookmarkRequest{
-						MediaItemID:    pgMediaUUID,
-						UserID:         pgUserID,
-						Title:          bookmarkSync.BookmarkText,
-						Position:       bookmarkSync.BookmarkId,
-						ChapterNumber:  int32(bookmarkSync.Chapter),
-						Source:         "kobo",
-						DeviceSyncData: deviceData,
-					})
-					if err == nil && result.Outcome != wsync.SaveOutcomeDeleted {
-						bookmarksSynced++
-					}
-				} else {
-					h.db.CreateMediaNote(c.Request().Context(), database.CreateMediaNoteParams{
-						MediaItemID: pgMediaUUID,
-						UserID:      pgUserID,
-						Content:     bookmarkSync.BookmarkText,
-						Position:    pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
-					})
-					bookmarksSynced++
-				}
+				h.db.CreateMediaNote(c.Request().Context(), database.CreateMediaNoteParams{
+					MediaItemID: pgMediaUUID,
+					UserID:      pgUserID,
+					Content:     bookmarkSync.BookmarkText,
+					Position:    pgtype.Text{String: bookmarkSync.BookmarkId, Valid: true},
+				})
+				bookmarksSynced++
 			}
 		}
 	}
@@ -885,80 +716,37 @@ func (h *KoboHandler) SyncFromServer(c *echo.Context) error {
 
 		for _, bookmark := range syncData.Bookmarks {
 			if bookmark.BookmarkType == "bookmark" {
-				if h.annotationSvc != nil {
-					result, err := h.annotationSvc.SaveBookmark(c.Request().Context(), wsync.SaveBookmarkRequest{
-						MediaItemID: pgMediaUUID,
-						UserID:      pgUserID,
-						Title:       bookmark.BookmarkText,
-						Position:    bookmark.BookmarkId,
-						Source:      "kobo",
-					})
-					if err == nil && result.Outcome != wsync.SaveOutcomeDeleted {
-						bookmarksSent++
-					}
-				} else {
-					h.db.CreateMediaNote(c.Request().Context(), database.CreateMediaNoteParams{
-						MediaItemID: pgMediaUUID,
-						UserID:      pgUserID,
-						Content:     bookmark.BookmarkText,
-						Position:    pgtype.Text{String: bookmark.BookmarkId, Valid: true},
-					})
-					bookmarksSent++
-				}
-			} else if bookmark.BookmarkType == "annotation" {
-				if h.annotationSvc != nil {
-					result, err := h.annotationSvc.SaveHighlight(c.Request().Context(), wsync.SaveHighlightRequest{
-						MediaItemID:   pgMediaUUID,
-						UserID:        pgUserID,
-						SelectionText: bookmark.BookmarkText,
-						StartPosition: bookmark.BookmarkId,
-						EndPosition:   bookmark.BookmarkId,
-						Color:         "#ffff00",
-						Source:        "kobo",
-					})
-					if err == nil && result.Outcome != wsync.SaveOutcomeDeleted {
-						highlightsSent++
-					}
-				} else {
-					h.db.CreateMediaHighlight(c.Request().Context(), database.CreateMediaHighlightParams{
-						MediaItemID:   pgMediaUUID,
-						UserID:        pgUserID,
-						SelectionText: bookmark.BookmarkText,
-						StartPosition: pgtype.Text{String: bookmark.BookmarkId, Valid: true},
-						EndPosition:   pgtype.Text{String: bookmark.BookmarkId, Valid: true},
-						Color:         pgtype.Text{String: "#ffff00", Valid: true},
-					})
-					highlightsSent++
-				}
-			}
-		}
-
-		for _, highlight := range syncData.Highlights {
-			if h.annotationSvc != nil {
-				result, err := h.annotationSvc.SaveHighlight(c.Request().Context(), wsync.SaveHighlightRequest{
-					MediaItemID:   pgMediaUUID,
-					UserID:        pgUserID,
-					SelectionText: highlight.BookmarkText,
-					StartPosition: highlight.BookmarkId,
-					EndPosition:   highlight.BookmarkId,
-					Color:         "#ffff00",
-					Source:        "kobo",
+				h.db.CreateMediaNote(c.Request().Context(), database.CreateMediaNoteParams{
+					MediaItemID: pgMediaUUID,
+					UserID:      pgUserID,
+					Content:     bookmark.BookmarkText,
+					Position:    pgtype.Text{String: bookmark.BookmarkId, Valid: true},
 				})
-				if err == nil && result.Outcome != wsync.SaveOutcomeDeleted {
-					highlightsSent++
-				}
-			} else {
+				bookmarksSent++
+			} else if bookmark.BookmarkType == "annotation" {
 				h.db.CreateMediaHighlight(c.Request().Context(), database.CreateMediaHighlightParams{
 					MediaItemID:   pgMediaUUID,
 					UserID:        pgUserID,
-					SelectionText: highlight.BookmarkText,
-					StartPosition: pgtype.Text{String: highlight.BookmarkId, Valid: true},
-					EndPosition:   pgtype.Text{String: highlight.BookmarkId, Valid: true},
+					SelectionText: bookmark.BookmarkText,
+					StartPosition: pgtype.Text{String: bookmark.BookmarkId, Valid: true},
+					EndPosition:   pgtype.Text{String: bookmark.BookmarkId, Valid: true},
 					Color:         pgtype.Text{String: "#ffff00", Valid: true},
 				})
 				highlightsSent++
 			}
 		}
+
+		for _, highlight := range syncData.Highlights {
+			h.db.CreateMediaHighlight(c.Request().Context(), database.CreateMediaHighlightParams{
+				MediaItemID:   pgMediaUUID,
+				UserID:        pgUserID,
+				SelectionText: highlight.BookmarkText,
+				StartPosition: pgtype.Text{String: highlight.BookmarkId, Valid: true},
+				EndPosition:   pgtype.Text{String: highlight.BookmarkId, Valid: true},
+				Color:         pgtype.Text{String: "#ffff00", Valid: true},
+			})
+			highlightsSent++
+		}
 	}
 
 	_, err := h.db.UpdateDeviceLastSync(c.Request().Context(), device.ID)
@@ -974,43 +762,3 @@ func (h *KoboHandler) SyncFromServer(c *echo.Context) error {
 		HighlightsSent: highlightsSent,
 	})
 }
-
-func (h *KoboHandler) convertKoboCFIToStandard(c *echo.Context, mediaItem database.MediaItems, kepubCFI string) (*string, *string) {
-	epubPath, err := h.libraryService.ResolveMediaPath(c.Request().Context(), mediaItem.LibraryID, mediaItem.FilePath)
-	if err != nil {
-		log.Printf("Bookhoard: KEPUB→CFI failed to resolve EPUB path: %v", err)
-		return nil, nil
-	}
-	if epubPath == "" {
-		log.Printf("Bookhoard: KEPUB→CFI resolved empty EPUB path for %s", mediaItem.FilePath)
-		return nil, nil
-	}
-
-	kepubFormat, err := h.db.GetMediaItemFormatByType(c.Request().Context(), database.GetMediaItemFormatByTypeParams{
-		MediaItemID: pgtype.UUID{Bytes: mediaItem.ID.Bytes, Valid: true},
-		FormatType:  "kepub",
-	})
-	if err != nil || !kepubFormat.FilePath.Valid {
-		return nil, nil
-	}
-
-	converter := wsync.NewKEPUBCFIConverter(epubPath, kepubFormat.FilePath.String)
-	result, err := converter.ConvertKEPUBCFIToStandard(kepubCFI, 0.0, "")
-	if err != nil {
-		log.Printf("Bookhoard: KEPUB→CFI conversion error: %v", err)
-		return nil, nil
-	}
-
-	var cfi *string
-	if result.CFI != "" {
-		cfi = &result.CFI
-		log.Printf("Bookhoard: KEPUB→CFI converted (precision=%s)", result.Precision)
-	}
-
-	var ctx *string
-	if result.ExtractedContext != "" {
-		ctx = &result.ExtractedContext
-	}
-
-	return cfi, ctx
-}

internal/handlers/koreader.go

@@ -2,12 +2,8 @@ package handlers
 
 import (
 	"bookhoard/internal/database"
-	"bookhoard/internal/services"
 	wsync "bookhoard/internal/sync"
-	"context"
-	"encoding/json"
 	"fmt"
-	"log"
 	"net/http"
 	"time"
 
@@ -17,57 +13,20 @@ import (
 )
 
 type KOReaderHandler struct {
-	db             *database.Queries
-	connManager    *wsync.ConnectionManager
-	queue          *wsync.SyncQueueProcessor
-	progressSvc    *wsync.ProgressService
-	annotationSvc  *wsync.AnnotationService
-	libraryService LibraryPathResolver
-	bookResolver   *services.BookResolver
-}
-
-type LibraryPathResolver interface {
-	ResolveMediaPath(ctx context.Context, libraryID pgtype.UUID, relativePath string) (string, error)
+	db          *database.Queries
+	connManager *wsync.ConnectionManager
+	queue       *wsync.SyncQueueProcessor
+	progressSvc *wsync.ProgressService
 }
 
 func NewKOReaderHandler(db *database.Queries, connManager *wsync.ConnectionManager, queue *wsync.SyncQueueProcessor) *KOReaderHandler {
-	return &KOReaderHandler{
-		db:           db,
-		connManager:  connManager,
-		queue:        queue,
-		bookResolver: services.NewBookResolver(db),
-	}
+	return &KOReaderHandler{db: db, connManager: connManager, queue: queue}
 }
 
 func (h *KOReaderHandler) SetProgressService(svc *wsync.ProgressService) {
 	h.progressSvc = svc
 }
 
-func (h *KOReaderHandler) SetAnnotationService(svc *wsync.AnnotationService) {
-	h.annotationSvc = svc
-}
-
-func (h *KOReaderHandler) convertHighlightPositions(ctx context.Context, mediaItemID pgtype.UUID, pos0, pos1 string) (string, string) {
-	if pos0 == "" || h.libraryService == nil {
-		return "", ""
-	}
-	mediaItem, err := h.db.GetMediaItem(ctx, mediaItemID)
-	if err != nil {
-		return "", ""
-	}
-	epubPath, err := h.libraryService.ResolveMediaPath(ctx, mediaItem.LibraryID, mediaItem.FilePath)
-	if err != nil || epubPath == "" {
-		return "", ""
-	}
-	startLoc := wsync.ConvertToCanonical(wsync.LocatorSourceKOReader, pos0, 0, "", mediaItem.FormatGroup, epubPath, "")
-	endLoc := wsync.ConvertToCanonical(wsync.LocatorSourceKOReader, pos1, 0, "", mediaItem.FormatGroup, epubPath, "")
-	return startLoc.CFI, endLoc.CFI
-}
-
-func (h *KOReaderHandler) SetLibraryService(svc LibraryPathResolver) {
-	h.libraryService = svc
-}
-
 type KOReaderProgressRequest struct {
 	LibraryID *string                `json:"library_id,omitempty"`
 	Books     []KOReaderBookProgress `json:"books" validate:"required"`
@@ -87,12 +46,11 @@ type KOReaderBookProgress struct {
 	Bookmarks  []KOReaderBookmark  `json:"bookmarks,omitempty"`
 	Highlights []KOReaderHighlight `json:"highlights,omitempty"`
 	Notes      []KOReaderNote      `json:"notes,omitempty"`
-	Chapter      *int                `json:"chapter,omitempty"`
-	Character    *int64              `json:"character,omitempty"`
-	Epubcfi      *string             `json:"epubcfi,omitempty"`
-	ContextText  *string             `json:"context_text,omitempty"`
-	Page         *int                `json:"page,omitempty"`
-	TotalPages   *int                `json:"total_pages,omitempty"`
+	Chapter    *int                `json:"chapter,omitempty"`
+	Character  *int64              `json:"character,omitempty"`
+	Epubcfi    *string             `json:"epubcfi,omitempty"`
+	Page       *int                `json:"page,omitempty"`
+	TotalPages *int                `json:"total_pages,omitempty"`
 }
 
 type KOReaderDeviceInfo struct {
@@ -141,18 +99,11 @@ type KOReaderNote struct {
 }
 
 type KOReaderSyncResponse struct {
-	SyncStatus    string                  `json:"sync_status"`
-	BooksSynced   int                     `json:"books_synced"`
-	BookResults   []KOReaderBookSyncResult `json:"book_results,omitempty"`
-	Conflicts     []KOReaderConflict      `json:"conflicts,omitempty"`
-	Timestamp     string                  `json:"timestamp"`
-	DeviceUpdated bool                    `json:"device_updated"`
-}
-
-type KOReaderBookSyncResult struct {
-	SHA256   string `json:"sha256"`
-	BookUUID string `json:"book_uuid"`
-	Synced   bool   `json:"synced"`
+	SyncStatus    string             `json:"sync_status"`
+	BooksSynced   int                `json:"books_synced"`
+	Conflicts     []KOReaderConflict `json:"conflicts,omitempty"`
+	Timestamp     string             `json:"timestamp"`
+	DeviceUpdated bool               `json:"device_updated"`
 }
 
 type KOReaderConflict struct {
@@ -165,7 +116,6 @@ type KOReaderConflict struct {
 
 type KOReaderMetadata struct {
 	UUID        string               `json:"uuid"`
-	SHA256      string               `json:"sha256,omitempty"`
 	Title       string               `json:"title"`
 	Authors     []string             `json:"authors"`
 	Progress    KOReaderProgressData `json:"progress"`
@@ -174,22 +124,19 @@ type KOReaderMetadata struct {
 }
 
 type KOReaderProgressData struct {
-	Percentage         float64  `json:"percentage"`
-	Character          *int64   `json:"character,omitempty"`
-	Epubcfi            *string  `json:"epubcfi,omitempty"`
-	KoreaderXPointer   *string  `json:"koreader_xpointer,omitempty"`
-	Chapter            *int     `json:"chapter,omitempty"`
-	ChapterProgress    *float64 `json:"chapter_progress,omitempty"`
-	Page               *int     `json:"page,omitempty"`
-	TotalPages         *int     `json:"total_pages,omitempty"`
+	Percentage      float64  `json:"percentage"`
+	Character       *int64   `json:"character,omitempty"`
+	Epubcfi         *string  `json:"epubcfi,omitempty"`
+	Chapter         *int     `json:"chapter,omitempty"`
+	ChapterProgress *float64 `json:"chapter_progress,omitempty"`
+	Page            *int     `json:"page,omitempty"`
+	TotalPages      *int     `json:"total_pages,omitempty"`
 }
 
 type KOReaderAnnotations struct {
-	Highlights        []KOReaderHighlight `json:"highlights,omitempty"`
-	Notes             []KOReaderNote      `json:"notes,omitempty"`
-	Bookmarks         []KOReaderBookmark  `json:"bookmarks,omitempty"`
-	DeletedHighlights []map[string]interface{} `json:"deleted_highlights,omitempty"`
-	DeletedBookmarks  []map[string]interface{} `json:"deleted_bookmarks,omitempty"`
+	Highlights []KOReaderHighlight `json:"highlights,omitempty"`
+	Notes      []KOReaderNote      `json:"notes,omitempty"`
+	Bookmarks  []KOReaderBookmark  `json:"bookmarks,omitempty"`
 }
 
 type KOReaderLibraryResponse struct {
@@ -200,7 +147,6 @@ type KOReaderLibraryResponse struct {
 
 type KOReaderLibraryBook struct {
 	UUID           string  `json:"uuid"`
-	SHA256         string  `json:"sha256,omitempty"`
 	Title          string  `json:"title"`
 	Author         string  `json:"author"`
 	ContentType    string  `json:"content_type"`
@@ -241,28 +187,17 @@ func (h *KOReaderHandler) SyncProgress(c *echo.Context) error {
 
 	booksSynced := 0
 	conflicts := []KOReaderConflict{}
-	bookResults := []KOReaderBookSyncResult{}
 
 	for _, book := range req.Books {
 		mediaItemID, _ := h.resolveBookToMediaItem(c, device.ID, pgUserID, book)
 		if !mediaItemID.Valid {
-			bookResults = append(bookResults, KOReaderBookSyncResult{
-				SHA256: book.SHA256,
-				Synced: false,
-			})
 			continue
 		}
 
 		err := h.updateProgressForBook(c, device.ID, pgUserID, mediaItemID, book)
-		synced := err == nil
-		if synced {
+		if err == nil {
 			booksSynced++
 		}
-		bookResults = append(bookResults, KOReaderBookSyncResult{
-			SHA256:   book.SHA256,
-			BookUUID: uuid.UUID(mediaItemID.Bytes).String(),
-			Synced:   synced,
-		})
 	}
 
 	_, err := h.db.UpdateDeviceLastSync(c.Request().Context(), device.ID)
@@ -276,7 +211,6 @@ func (h *KOReaderHandler) SyncProgress(c *echo.Context) error {
 		return c.JSON(http.StatusAccepted, KOReaderSyncResponse{
 			SyncStatus:    "accepted",
 			BooksSynced:   booksSynced,
-			BookResults:   bookResults,
 			Conflicts:     conflicts,
 			Timestamp:     time.Now().Format(time.RFC3339),
 			DeviceUpdated: true,
@@ -286,7 +220,6 @@ func (h *KOReaderHandler) SyncProgress(c *echo.Context) error {
 	return c.JSON(http.StatusOK, KOReaderSyncResponse{
 		SyncStatus:    "completed",
 		BooksSynced:   booksSynced,
-		BookResults:   bookResults,
 		Conflicts:     conflicts,
 		Timestamp:     time.Now().Format(time.RFC3339),
 		DeviceUpdated: true,
@@ -312,10 +245,8 @@ func (h *KOReaderHandler) resolveBookToMediaItem(c *echo.Context, deviceID pgtyp
 	}
 
 	// Priority 2: SHA-256 provided (medium confidence - 0.9)
-	// Uses the shared BookResolver, which also checks per-format hashes
-	// (media_item_formats) so a converted file (KEPUB/PDF) matches too.
 	if book.SHA256 != "" && len(book.SHA256) == 64 {
-		mediaItem, _, err := h.bookResolver.ResolveBySHA256(ctx, book.SHA256)
+		mediaItem, err := h.db.GetMediaItemBySHA256(ctx, pgtype.Text{String: book.SHA256, Valid: true})
 		if err == nil {
 			// Create device file alias if FilePath is provided
 			if book.FilePath != "" {
@@ -415,29 +346,17 @@ func (h *KOReaderHandler) createDeviceFileAlias(c *echo.Context, deviceID pgtype
 
 func (h *KOReaderHandler) handleCheckpointSync(c *echo.Context, device database.Devices, userID pgtype.UUID, req KOReaderProgressRequest) error {
 	booksEnqueued := 0
-	bookResults := []KOReaderBookSyncResult{}
 
 	for _, book := range req.Books {
 		mediaItemID, _ := h.resolveBookToMediaItem(c, device.ID, userID, book)
 		if !mediaItemID.Valid {
-			bookResults = append(bookResults, KOReaderBookSyncResult{
-				SHA256: book.SHA256,
-				Synced: false,
-			})
 			continue
 		}
 
 		err := h.enqueueProgressForBook(c, device.ID, userID, mediaItemID, book)
-		synced := err == nil
-		if synced {
+		if err == nil {
 			booksEnqueued++
 		}
-		h.processBookAnnotations(c.Request().Context(), device.ID, userID, mediaItemID, book)
-		bookResults = append(bookResults, KOReaderBookSyncResult{
-			SHA256:   book.SHA256,
-			BookUUID: uuid.UUID(mediaItemID.Bytes).String(),
-			Synced:   synced,
-		})
 	}
 
 	_, err := h.db.UpdateDeviceLastSync(c.Request().Context(), device.ID)
@@ -447,11 +366,11 @@ func (h *KOReaderHandler) handleCheckpointSync(c *echo.Context, device database.
 		})
 	}
 
-	return c.JSON(http.StatusAccepted, KOReaderSyncResponse{
-		SyncStatus:  "checkpoint_enqueued",
-		BooksSynced: booksEnqueued,
-		BookResults: bookResults,
-		Timestamp:   time.Now().Format(time.RFC3339),
+	return c.JSON(http.StatusAccepted, map[string]interface{}{
+		"sync_status":    "checkpoint_enqueued",
+		"books_enqueued": booksEnqueued,
+		"message":        "Sync will be processed in the background",
+		"timestamp":      time.Now().Format(time.RFC3339),
 	})
 }
 
@@ -466,7 +385,6 @@ func (h *KOReaderHandler) enqueueProgressForBook(c *echo.Context, deviceID pgtyp
 		UserID:      userID,
 		Percentage:  book.Percentage,
 		Epubcfi:     book.Epubcfi,
-		ContextText: book.ContextText,
 		Chapter:     book.Chapter,
 		Character:   book.Character,
 		Page:        book.Page,
@@ -478,102 +396,6 @@ func (h *KOReaderHandler) enqueueProgressForBook(c *echo.Context, deviceID pgtyp
 	return h.queue.EnqueueProgress(update)
 }
 
-func (h *KOReaderHandler) processBookAnnotations(ctx context.Context, deviceID, userID, mediaItemID pgtype.UUID, book KOReaderBookProgress) {
-	if h.annotationSvc == nil {
-		return
-	}
-
-	for _, hl := range book.Highlights {
-		startPos := hl.Pos0
-		endPos := hl.Pos1
-		epubcfiStart, epubcfiEnd := h.convertHighlightPositions(ctx, mediaItemID, startPos, endPos)
-
-		pctStart := 0.0
-		if hl.Percentage != nil {
-			pctStart = *hl.Percentage
-		}
-
-		deviceData, _ := json.Marshal(map[string]interface{}{
-			"datetime": hl.Datetime,
-			"pos0":     hl.Pos0,
-			"pos1":     hl.Pos1,
-			"page":     hl.Page,
-		})
-
-		h.annotationSvc.SaveHighlight(ctx, wsync.SaveHighlightRequest{
-			MediaItemID:      mediaItemID,
-			UserID:           userID,
-			SelectionText:    hl.Text,
-			StartPosition:    startPos,
-			EndPosition:      endPos,
-			Color:            hl.Color,
-			NoteText:         hl.Notes,
-			PercentageStart:  pctStart,
-			EpubcfiStart:     epubcfiStart,
-			EpubcfiEnd:       epubcfiEnd,
-			Source:           "koreader",
-			DeviceSyncData:   deviceData,
-		})
-	}
-
-	for _, note := range book.Notes {
-		startPos := note.Pos0
-		endPos := note.Pos1
-		epubcfiStart, epubcfiEnd := h.convertHighlightPositions(ctx, mediaItemID, startPos, endPos)
-
-		pctStart := 0.0
-		if note.Percentage != nil {
-			pctStart = *note.Percentage
-		}
-
-		deviceData, _ := json.Marshal(map[string]interface{}{
-			"datetime": note.Datetime,
-			"pos0":     note.Pos0,
-			"pos1":     note.Pos1,
-			"page":     note.Page,
-		})
-
-		h.annotationSvc.SaveHighlight(ctx, wsync.SaveHighlightRequest{
-			MediaItemID:      mediaItemID,
-			UserID:           userID,
-			SelectionText:    note.Text,
-			StartPosition:    startPos,
-			EndPosition:      endPos,
-			NoteText:         note.Notes,
-			PercentageStart:  pctStart,
-			EpubcfiStart:     epubcfiStart,
-			EpubcfiEnd:       epubcfiEnd,
-			Source:           "koreader",
-			DeviceSyncData:   deviceData,
-		})
-	}
-
-	for _, bookmark := range book.Bookmarks {
-		position := ""
-		if bookmark.Pos0 != "" {
-			position = bookmark.Pos0
-		} else if bookmark.Page > 0 {
-			position = fmt.Sprintf("page:%d", bookmark.Page)
-		}
-
-		deviceData, _ := json.Marshal(map[string]interface{}{
-			"datetime": bookmark.Datetime,
-			"pos0":     bookmark.Pos0,
-			"page":     bookmark.Page,
-		})
-
-		h.annotationSvc.SaveBookmark(ctx, wsync.SaveBookmarkRequest{
-			MediaItemID:    mediaItemID,
-			UserID:         userID,
-			Title:          bookmark.Text,
-			Position:       position,
-			ChapterNumber:  int32(bookmark.Chapter),
-			Source:         "koreader",
-			DeviceSyncData: deviceData,
-		})
-	}
-}
-
 func (h *KOReaderHandler) updateProgressForBook(c *echo.Context, deviceID pgtype.UUID, userID pgtype.UUID, mediaItemID pgtype.UUID, book KOReaderBookProgress) error {
 	ctx := c.Request().Context()
 
@@ -584,67 +406,13 @@ func (h *KOReaderHandler) updateProgressForBook(c *echo.Context, deviceID pgtype
 	}
 
 	if h.progressSvc != nil {
-		epubcfi := book.Epubcfi
-		if epubcfi != nil && wsync.IsCREXPointer(*epubcfi) {
-			log.Printf("Bookhoard: CRE→CFI attempting conversion for %s", *epubcfi)
-			mediaItem, err := h.db.GetMediaItem(ctx, mediaItemID)
-			if err != nil {
-				log.Printf("Bookhoard: CRE→CFI failed to get media item: %v", err)
-			} else if mediaItem.FormatGroup == string(wsync.FormatGroupFixedLayout) ||
-				mediaItem.FormatGroup == string(wsync.FormatGroupComicArchive) {
-				// Image-based fixed content (fixed-layout comic EPUBs, PDF,
-				// comic archives) has no extractable text, so CRE→CFI conversion
-				// cannot succeed. The page index (page/total_pages) is the
-				// canonical locator. Keep the incoming xpointer for device-native
-				// restore; the web reader restores by page.
-				log.Printf("Bookhoard: CRE→CFI skipped for %s format", mediaItem.FormatGroup)
-			} else if h.libraryService == nil {
-				log.Printf("Bookhoard: CRE→CFI libraryService is nil, skipping conversion")
-			} else {
-				epubPath, resolveErr := h.libraryService.ResolveMediaPath(ctx, mediaItem.LibraryID, mediaItem.FilePath)
-				if resolveErr != nil {
-					log.Printf("Bookhoard: CRE→CFI failed to resolve media path: %v", resolveErr)
-				} else if epubPath == "" {
-					log.Printf("Bookhoard: CRE→CFI resolved empty epub path for %s", mediaItem.FilePath)
-				} else {
-					log.Printf("Bookhoard: CRE→CFI resolved epub path: %s", epubPath)
-					converter := wsync.NewCFIConverter(epubPath)
-					pct := 0.0
-					if book.Percentage >= 0 {
-						pct = book.Percentage
-					}
-					contextText := ""
-					if book.ContextText != nil {
-						contextText = *book.ContextText
-					}
-					result, convErr := converter.ConvertCREToStandard(*epubcfi, pct, contextText)
-					if convErr != nil {
-						log.Printf("Bookhoard: CRE→CFI conversion error: %v", convErr)
-					} else if result != nil {
-						if result.EPUBCFI != "" {
-							convertedCFI := result.EPUBCFI
-							epubcfi = &convertedCFI
-							log.Printf("Bookhoard: CRE→CFI converted to epubcfi: %s", convertedCFI)
-						} else if result.Href != "" {
-							convertedHref := result.Href
-							epubcfi = &convertedHref
-							log.Printf("Bookhoard: CRE→CFI converted to href: %s", convertedHref)
-						} else {
-							log.Printf("Bookhoard: CRE→CFI conversion: %s precision for %s", result.Precision, *epubcfi)
-						}
-					}
-				}
-			}
-		}
-
 		saveReq := wsync.SaveProgressRequest{
 			MediaItemID:     mediaItemID,
 			UserID:          userID,
 			Source:          "koreader",
 			DeviceID:        deviceID,
 			Percentage:      &book.Percentage,
-			Epubcfi:         epubcfi,
-			ContextText:     book.ContextText,
+			Epubcfi:         book.Epubcfi,
 			Chapter:         book.Chapter,
 			CharacterOffset: book.Character,
 			CurrentPage:     book.Page,
@@ -655,11 +423,7 @@ func (h *KOReaderHandler) updateProgressForBook(c *echo.Context, deviceID pgtype
 		}
 
 		_, err := h.progressSvc.SaveProgress(ctx, saveReq)
-		if err != nil {
-			return err
-		}
-		h.processBookAnnotations(ctx, deviceID, userID, mediaItemID, book)
-		return nil
+		return err
 	}
 
 	_, err := h.db.UpdateUniversalProgress(ctx, database.UpdateUniversalProgressParams{
@@ -695,8 +459,6 @@ func (h *KOReaderHandler) updateProgressForBook(c *echo.Context, deviceID pgtype
 		},
 	)
 
-	h.processBookAnnotations(ctx, deviceID, userID, mediaItemID, book)
-
 	return nil
 }
 
@@ -761,19 +523,8 @@ func (h *KOReaderHandler) GetMetadata(c *echo.Context) error {
 		Percentage: progress.Percentage.Float64,
 	}
 
-	// CFI/xpointer are meaningless for image-based fixed-layout content; the
-	// page index is the canonical locator. Only return them for reflowable docs.
-	formatGroup := wsync.FormatGroup(mediaItem.FormatGroup)
-	isFixed := formatGroup == wsync.FormatGroupFixedLayout ||
-		formatGroup == wsync.FormatGroupComicArchive
-
-	if !isFixed {
-		if progress.Epubcfi.Valid {
-			progressData.Epubcfi = &progress.Epubcfi.String
-		}
-		if progress.Epubcfi.Valid && wsync.IsStandardEPUBCFI(progress.Epubcfi.String) {
-			h.convertCFIToXPointer(c, mediaItem, progress, &progressData)
-		}
+	if progress.Epubcfi.Valid {
+		progressData.Epubcfi = &progress.Epubcfi.String
 	}
 	if progress.Chapter.Valid {
 		progress := int(progress.Chapter.Int32)
@@ -796,7 +547,7 @@ func (h *KOReaderHandler) GetMetadata(c *echo.Context) error {
 		progressData.TotalPages = &progress
 	}
 
-	annotations, err := h.db.GetActiveAnnotationsForBook(c.Request().Context(), database.GetActiveAnnotationsForBookParams{
+	annotations, err := h.db.GetAnnotationsForBook(c.Request().Context(), database.GetAnnotationsForBookParams{
 		MediaItemID: pgBookUUID,
 		UserID:      pgUserID,
 	})
@@ -809,29 +560,13 @@ func (h *KOReaderHandler) GetMetadata(c *echo.Context) error {
 
 	for _, ann := range annotations {
 		if ann.AnnotationType == "highlight" {
-			pos0 := ann.StartPosition.String
-			pos1 := ann.EndPosition.String
-			if ann.EpubcfiStart.Valid && ann.EpubcfiStart.String != "" {
-				if converted := h.reverseConvertCFI(c, mediaItem, ann.EpubcfiStart.String); converted != "" {
-					pos0 = converted
-				}
-			}
-			if ann.EpubcfiEnd.Valid && ann.EpubcfiEnd.String != "" {
-				if converted := h.reverseConvertCFI(c, mediaItem, ann.EpubcfiEnd.String); converted != "" {
-					pos1 = converted
-				}
-			}
-			highlight := KOReaderHighlight{
+			annotationsResponse.Highlights = append(annotationsResponse.Highlights, KOReaderHighlight{
 				Text:     ann.SelectionText,
-				Pos0:     pos0,
-				Pos1:     pos1,
+				Pos0:     ann.StartPosition.String,
+				Pos1:     ann.EndPosition.String,
 				Color:    ann.Color.String,
 				Datetime: ann.CreatedAt.Time.Format(time.RFC3339),
-			}
-			if ann.NoteText.Valid && ann.NoteText.String != "" {
-				highlight.Notes = ann.NoteText.String
-			}
-			annotationsResponse.Highlights = append(annotationsResponse.Highlights, highlight)
+			})
 		} else if ann.AnnotationType == "note" {
 			annotationsResponse.Notes = append(annotationsResponse.Notes, KOReaderNote{
 				Text:     ann.SelectionText,
@@ -841,52 +576,6 @@ func (h *KOReaderHandler) GetMetadata(c *echo.Context) error {
 		}
 	}
 
-	bookmarks, _ := h.db.GetMediaBookmarks(c.Request().Context(), database.GetMediaBookmarksParams{
-		MediaItemID: pgBookUUID,
-		UserID:      pgUserID,
-	})
-	for _, bm := range bookmarks {
-		pos0 := bm.Position.String
-		if pos0 == "" && bm.CfiPosition.Valid {
-			pos0 = bm.CfiPosition.String
-		}
-		koreaderBookmark := KOReaderBookmark{
-			Text:     bm.Title,
-			Pos0:     pos0,
-			Pos1:     pos0,
-			Datetime: bm.CreatedAt.Time.Format(time.RFC3339),
-		}
-		if bm.Notes.Valid && bm.Notes.String != "" {
-			koreaderBookmark.Notes = bm.Notes.String
-		}
-		if bm.ChapterNumber.Valid {
-			koreaderBookmark.Chapter = int(bm.ChapterNumber.Int32)
-		}
-		annotationsResponse.Bookmarks = append(annotationsResponse.Bookmarks, koreaderBookmark)
-	}
-
-	cutoff := pgtype.Timestamptz{Time: time.Now().Add(-h.annotationSvc.ActiveTombstoneTTL()), Valid: true}
-	tombstones, _ := h.db.GetTombstonedAnnotationsForBook(c.Request().Context(), database.GetTombstonedAnnotationsForBookParams{
-		MediaItemID: pgBookUUID,
-		UserID:      pgUserID,
-		DeletedAt:   cutoff,
-	})
-	for _, ts := range tombstones {
-		var dd map[string]interface{}
-		if len(ts.DeviceSyncData) > 0 {
-			json.Unmarshal(ts.DeviceSyncData, &dd)
-		}
-		if dd == nil {
-			dd = map[string]interface{}{}
-		}
-		dd["dedup_key"] = ts.DedupKey.String
-		if ts.AnnotationType == "highlight" {
-			annotationsResponse.DeletedHighlights = append(annotationsResponse.DeletedHighlights, dd)
-		} else if ts.AnnotationType == "bookmark" {
-			annotationsResponse.DeletedBookmarks = append(annotationsResponse.DeletedBookmarks, dd)
-		}
-	}
-
 	lastSync := "never"
 	if progress.LastSyncTimestamp.Valid {
 		lastSync = progress.LastSyncTimestamp.Time.Format(time.RFC3339)
@@ -894,7 +583,6 @@ func (h *KOReaderHandler) GetMetadata(c *echo.Context) error {
 
 	metadata := KOReaderMetadata{
 		UUID:        bookUUID.String(),
-		SHA256:      mediaItem.FileSha256.String,
 		Title:       mediaItem.Title,
 		Authors:     []string{mediaItem.Author.String},
 		Progress:    progressData,
@@ -905,55 +593,6 @@ func (h *KOReaderHandler) GetMetadata(c *echo.Context) error {
 	return c.JSON(http.StatusOK, metadata)
 }
 
-func (h *KOReaderHandler) convertCFIToXPointer(c *echo.Context, mediaItem database.MediaItems, progress database.GetUniversalProgressRow, progressData *KOReaderProgressData) {
-	if h.libraryService == nil {
-		log.Printf("Bookhoard: CFI→CRE libraryService is nil, skipping reverse conversion")
-		return
-	}
-
-	epubPath, err := h.libraryService.ResolveMediaPath(c.Request().Context(), mediaItem.LibraryID, mediaItem.FilePath)
-	if err != nil {
-		log.Printf("Bookhoard: CFI→CRE failed to resolve media path: %v", err)
-		return
-	}
-	if epubPath == "" {
-		log.Printf("Bookhoard: CFI→CRE resolved empty epub path for %s", mediaItem.FilePath)
-		return
-	}
-
-	converter := wsync.NewCFIConverter(epubPath)
-	contextText := ""
-	if progress.ContextText.Valid {
-		contextText = progress.ContextText.String
-	}
-	pct := progress.Percentage.Float64
-
-	result, err := converter.ConvertStandardToCRE(progress.Epubcfi.String, pct, contextText)
-	if err != nil {
-		log.Printf("Bookhoard: CFI→CRE conversion error: %v", err)
-		return
-	}
-	if result != nil && result.XPointer != "" {
-		progressData.KoreaderXPointer = &result.XPointer
-		log.Printf("Bookhoard: CFI→CRE converted to XPointer: %s", result.XPointer)
-	}
-}
-
-func (h *KOReaderHandler) reverseConvertCFI(c *echo.Context, mediaItem database.MediaItems, epubcfi string) string {
-	if h.libraryService == nil || epubcfi == "" {
-		return ""
-	}
-	epubPath, err := h.libraryService.ResolveMediaPath(c.Request().Context(), mediaItem.LibraryID, mediaItem.FilePath)
-	if err != nil || epubPath == "" {
-		return ""
-	}
-	loc := wsync.ConvertFromCanonical(wsync.LocatorSourceKOReader, epubcfi, 0, "", mediaItem.FormatGroup, epubPath, "")
-	if loc.Position != "" && loc.Position != epubcfi {
-		return loc.Position
-	}
-	return ""
-}
-
 func (h *KOReaderHandler) GetLibrary(c *echo.Context) error {
 	device := c.Get("device").(database.Devices)
 	userID := device.UserID.Bytes
@@ -993,7 +632,7 @@ func (h *KOReaderHandler) GetLibrary(c *echo.Context) error {
 			}
 		}
 
-		annotations, _ := h.db.GetActiveAnnotationsForBook(c.Request().Context(), database.GetActiveAnnotationsForBookParams{
+		annotations, _ := h.db.GetAnnotationsForBook(c.Request().Context(), database.GetAnnotationsForBookParams{
 			MediaItemID: pgItemUUID,
 			UserID:      pgUserID,
 		})
@@ -1001,7 +640,6 @@ func (h *KOReaderHandler) GetLibrary(c *echo.Context) error {
 
 		libraryBooks = append(libraryBooks, KOReaderLibraryBook{
 			UUID:           uuid.UUID(item.ID.Bytes).String(),
-			SHA256:         item.FileSha256.String,
 			Title:          item.Title,
 			Author:         item.Author.String,
 			ContentType:    "6",
@@ -1058,8 +696,8 @@ func (h *KOReaderHandler) SyncBookmarks(c *echo.Context) error {
 		}
 		pgBookUUID = pgtype.UUID{Bytes: bookUUID, Valid: true}
 	} else if req.BookSHA256 != "" && len(req.BookSHA256) == 64 {
-		// Use SHA-256 to find book (format-aware: also checks media_item_formats)
-		mediaItem, _, err := h.bookResolver.ResolveBySHA256(ctx, req.BookSHA256)
+		// Use SHA-256 to find book
+		mediaItem, err := h.db.GetMediaItemBySHA256(ctx, pgtype.Text{String: req.BookSHA256, Valid: true})
 		if err != nil {
 			return c.JSON(http.StatusNotFound, map[string]string{
 				"error": "book not found by SHA-256",
@@ -1081,7 +719,7 @@ func (h *KOReaderHandler) SyncBookmarks(c *echo.Context) error {
 
 		// If bookmark has its own SHA-256, use it for matching
 		if bookmark.BookSHA256 != "" && len(bookmark.BookSHA256) == 64 {
-			mediaItem, _, err := h.bookResolver.ResolveBySHA256(ctx, bookmark.BookSHA256)
+			mediaItem, err := h.db.GetMediaItemBySHA256(ctx, pgtype.Text{String: bookmark.BookSHA256, Valid: true})
 			if err == nil {
 				mediaItemID = mediaItem.ID
 			}
@@ -1094,36 +732,15 @@ func (h *KOReaderHandler) SyncBookmarks(c *echo.Context) error {
 			position = fmt.Sprintf("page:%d", bookmark.Page)
 		}
 
-		if h.annotationSvc != nil {
-			deviceData, _ := json.Marshal(map[string]interface{}{
-				"datetime": bookmark.Datetime,
-				"pos0":     bookmark.Pos0,
-				"page":     bookmark.Page,
-			})
+		_, err := h.db.CreateMediaNote(ctx, database.CreateMediaNoteParams{
+			MediaItemID: mediaItemID,
+			UserID:      pgUserID,
+			Content:     bookmark.Text,
+			Position:    pgtype.Text{String: position, Valid: position != ""},
+		})
 
-			result, err := h.annotationSvc.SaveBookmark(ctx, wsync.SaveBookmarkRequest{
-				MediaItemID:    mediaItemID,
-				UserID:         pgUserID,
-				Title:          bookmark.Text,
-				Position:       position,
-				ChapterNumber:  int32(bookmark.Chapter),
-				Source:         "koreader",
-				DeviceSyncData: deviceData,
-			})
-			if err == nil && result.Outcome != wsync.SaveOutcomeDeleted {
-				bookmarksSynced++
-			}
-		} else {
-			_, err := h.db.CreateMediaNote(ctx, database.CreateMediaNoteParams{
-				MediaItemID: mediaItemID,
-				UserID:      pgUserID,
-				Content:     bookmark.Text,
-				Position:    pgtype.Text{String: position, Valid: position != ""},
-			})
-
-			if err == nil {
-				bookmarksSynced++
-			}
+		if err == nil {
+			bookmarksSynced++
 		}
 	}
 
@@ -1132,7 +749,7 @@ func (h *KOReaderHandler) SyncBookmarks(c *echo.Context) error {
 
 		// If note has its own SHA-256, use it for matching
 		if note.BookSHA256 != "" && len(note.BookSHA256) == 64 {
-			mediaItem, _, err := h.bookResolver.ResolveBySHA256(ctx, note.BookSHA256)
+			mediaItem, err := h.db.GetMediaItemBySHA256(ctx, pgtype.Text{String: note.BookSHA256, Valid: true})
 			if err == nil {
 				mediaItemID = mediaItem.ID
 			}
@@ -1145,35 +762,15 @@ func (h *KOReaderHandler) SyncBookmarks(c *echo.Context) error {
 			position = fmt.Sprintf("page:%d", note.Page)
 		}
 
-		if h.annotationSvc != nil {
-			deviceData, _ := json.Marshal(map[string]interface{}{
-				"datetime": note.Datetime,
-				"pos0":     note.Pos0,
-				"page":     note.Page,
-			})
+		_, err := h.db.CreateMediaNote(ctx, database.CreateMediaNoteParams{
+			MediaItemID: mediaItemID,
+			UserID:      pgUserID,
+			Content:     note.Notes,
+			Position:    pgtype.Text{String: position, Valid: position != ""},
+		})
 
-			result, err := h.annotationSvc.SaveNote(ctx, wsync.SaveNoteRequest{
-				MediaItemID:    mediaItemID,
-				UserID:         pgUserID,
-				Content:        note.Notes,
-				Position:       position,
-				Source:         "koreader",
-				DeviceSyncData: deviceData,
-			})
-			if err == nil && result.Outcome != wsync.SaveOutcomeDeleted {
-				notesSynced++
-			}
-		} else {
-			_, err := h.db.CreateMediaNote(ctx, database.CreateMediaNoteParams{
-				MediaItemID: mediaItemID,
-				UserID:      pgUserID,
-				Content:     note.Notes,
-				Position:    pgtype.Text{String: position, Valid: position != ""},
-			})
-
-			if err == nil {
-				notesSynced++
-			}
+		if err == nil {
+			notesSynced++
 		}
 	}
 
@@ -1182,7 +779,7 @@ func (h *KOReaderHandler) SyncBookmarks(c *echo.Context) error {
 
 		// If highlight has its own SHA-256, use it for matching
 		if highlight.BookSHA256 != "" && len(highlight.BookSHA256) == 64 {
-			mediaItem, _, err := h.bookResolver.ResolveBySHA256(ctx, highlight.BookSHA256)
+			mediaItem, err := h.db.GetMediaItemBySHA256(ctx, pgtype.Text{String: highlight.BookSHA256, Valid: true})
 			if err == nil {
 				mediaItemID = mediaItem.ID
 			}
@@ -1200,51 +797,17 @@ func (h *KOReaderHandler) SyncBookmarks(c *echo.Context) error {
 			color = highlight.Color
 		}
 
-		if h.annotationSvc != nil {
-			epubcfiStart, epubcfiEnd := h.convertHighlightPositions(ctx, mediaItemID, highlight.Pos0, highlight.Pos1)
+		_, err := h.db.CreateMediaHighlight(ctx, database.CreateMediaHighlightParams{
+			MediaItemID:   mediaItemID,
+			UserID:        pgUserID,
+			SelectionText: highlight.Text,
+			StartPosition: pgtype.Text{String: startPos, Valid: startPos != ""},
+			EndPosition:   pgtype.Text{String: endPos, Valid: endPos != ""},
+			Color:         pgtype.Text{String: color, Valid: true},
+		})
 
-			pctStart := 0.0
-			if highlight.Percentage != nil {
-				pctStart = *highlight.Percentage
-			}
-
-			deviceData, _ := json.Marshal(map[string]interface{}{
-				"datetime": highlight.Datetime,
-				"pos0":     highlight.Pos0,
-				"pos1":     highlight.Pos1,
-				"page":     highlight.Page,
-			})
-
-			result, err := h.annotationSvc.SaveHighlight(ctx, wsync.SaveHighlightRequest{
-				MediaItemID:     mediaItemID,
-				UserID:          pgUserID,
-				SelectionText:   highlight.Text,
-				StartPosition:   startPos,
-				EndPosition:     endPos,
-				Color:           color,
-				NoteText:        highlight.Notes,
-				PercentageStart: pctStart,
-				EpubcfiStart:    epubcfiStart,
-				EpubcfiEnd:      epubcfiEnd,
-				Source:          "koreader",
-				DeviceSyncData:  deviceData,
-			})
-			if err == nil && result.Outcome != wsync.SaveOutcomeDeleted {
-				highlightsSynced++
-			}
-		} else {
-			_, err := h.db.CreateMediaHighlight(ctx, database.CreateMediaHighlightParams{
-				MediaItemID:   mediaItemID,
-				UserID:        pgUserID,
-				SelectionText: highlight.Text,
-				StartPosition: pgtype.Text{String: startPos, Valid: startPos != ""},
-				EndPosition:   pgtype.Text{String: endPos, Valid: endPos != ""},
-				Color:         pgtype.Text{String: color, Valid: true},
-			})
-
-			if err == nil {
-				highlightsSynced++
-			}
+		if err == nil {
+			highlightsSynced++
 		}
 	}
 

internal/handlers/media.go

@@ -19,7 +19,6 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
@@ -115,51 +114,20 @@ type UpdateMediaNoteRequest struct {
 
 // CreateMediaHighlightRequest represents the request for creating a media highlight
 type CreateMediaHighlightRequest struct {
-	SelectionText    string  `json:"selection_text" validate:"required,min=1,max=5000"`
-	StartPosition    string  `json:"start_position" validate:"max=1000"`
-	EndPosition      string  `json:"end_position" validate:"max=1000"`
-	EpubcfiStart     string  `json:"epubcfi_start" validate:"max=2000"`
-	EpubcfiEnd       string  `json:"epubcfi_end" validate:"max=2000"`
-	Color            string  `json:"color" validate:"omitempty,len=7"`
-	NoteText         string  `json:"note_text" validate:"max=10000"`
-	NoteID           string  `json:"note_id"`
-	PercentageStart  float64 `json:"percentage_start"`
-	PercentageEnd    float64 `json:"percentage_end"`
-	ChapterReference int32   `json:"chapter_reference"`
+	SelectionText string `json:"selection_text" validate:"required,min=1,max=5000"`
+	StartPosition string `json:"start_position" validate:"required,max=100"`
+	EndPosition   string `json:"end_position" validate:"required,max=100"`
+	Color         string `json:"color" validate:"omitempty,len=7"`
+	NoteID        string `json:"note_id"`
 }
 
 // UpdateMediaHighlightRequest represents the request for updating a media highlight
 type UpdateMediaHighlightRequest struct {
-	SelectionText    string  `json:"selection_text" validate:"required,min=1,max=5000"`
-	StartPosition    string  `json:"start_position" validate:"max=1000"`
-	EndPosition      string  `json:"end_position" validate:"max=1000"`
-	EpubcfiStart     string  `json:"epubcfi_start" validate:"max=2000"`
-	EpubcfiEnd       string  `json:"epubcfi_end" validate:"max=2000"`
-	Color            string  `json:"color" validate:"omitempty,len=7"`
-	NoteText         string  `json:"note_text" validate:"max=10000"`
-	NoteID           string  `json:"note_id"`
-	PercentageStart  float64 `json:"percentage_start"`
-	PercentageEnd    float64 `json:"percentage_end"`
-	ChapterReference int32   `json:"chapter_reference"`
-}
-
-// CreateMediaBookmarkRequest represents the request for creating a media bookmark
-type CreateMediaBookmarkRequest struct {
-	Title            string  `json:"title" validate:"required,min=1,max=255"`
-	Position         string  `json:"position" validate:"max=100"`
-	Notes            string  `json:"notes" validate:"max=10000"`
-	CfiPosition      string  `json:"cfi_position" validate:"max=255"`
-	PageNumber       int32   `json:"page_number"`
-	ChapterNumber    int32   `json:"chapter_number"`
-	Percentage       float64 `json:"percentage"`
-	ChapterReference int32   `json:"chapter_reference"`
-}
-
-// UpdateMediaBookmarkRequest represents the request for updating a media bookmark
-type UpdateMediaBookmarkRequest struct {
-	Title    string `json:"title" validate:"required,min=1,max=255"`
-	Notes    string `json:"notes" validate:"max=10000"`
-	Position string `json:"position" validate:"max=100"`
+	SelectionText string `json:"selection_text" validate:"required,min=1,max=5000"`
+	StartPosition string `json:"start_position" validate:"required,max=100"`
+	EndPosition   string `json:"end_position" validate:"required,max=100"`
+	Color         string `json:"color" validate:"omitempty,len=7"`
+	NoteID        string `json:"note_id"`
 }
 
 type MediaHandler struct {
@@ -168,7 +136,6 @@ type MediaHandler struct {
 	libraryService *services.LibraryService
 	searchService  *services.SearchService
 	progressSvc    *wsync.ProgressService
-	annotationSvc  *wsync.AnnotationService
 }
 
 func NewMediaHandler(db *database.Queries, libraryService *services.LibraryService, worker ...*services.Worker) *MediaHandler {
@@ -187,10 +154,6 @@ func (mh *MediaHandler) SetProgressService(svc *wsync.ProgressService) {
 	mh.progressSvc = svc
 }
 
-func (mh *MediaHandler) SetAnnotationService(svc *wsync.AnnotationService) {
-	mh.annotationSvc = svc
-}
-
 func (h *MediaHandler) DownloadBook(c *echo.Context) error {
 	bookUUID, err := uuid.Parse(c.Param("uuid"))
 	if err != nil {
@@ -1012,7 +975,6 @@ func (mh *MediaHandler) UpdateMediaReadingProgress(c *echo.Context) error {
 		CurrentPage     *int32   `json:"current_page"`
 		TotalPages      *int32   `json:"total_pages"`
 		Epubcfi         *string  `json:"epubcfi"`
-		ContextText     *string  `json:"context_text"`
 		Percentage      *float64 `json:"percentage"`
 		Chapter         *int     `json:"chapter"`
 		ChapterProgress *float64 `json:"chapter_progress"`
@@ -1034,7 +996,6 @@ func (mh *MediaHandler) UpdateMediaReadingProgress(c *echo.Context) error {
 			DeviceID:        pgtype.UUID{Bytes: userUUID, Valid: true},
 			Percentage:      req.Percentage,
 			Epubcfi:         req.Epubcfi,
-			ContextText:     req.ContextText,
 			CharacterOffset: req.CharacterOffset,
 			Chapter:         req.Chapter,
 			ChapterProgress: req.ChapterProgress,
@@ -1057,16 +1018,6 @@ func (mh *MediaHandler) UpdateMediaReadingProgress(c *echo.Context) error {
 			saveReq.TotalPages = &tp
 		}
 
-		if req.Percentage != nil && *req.Percentage < 0.005 {
-			existing, err := mh.db.GetUniversalProgress(c.Request().Context(), database.GetUniversalProgressParams{
-				MediaItemID: pgtype.UUID{Bytes: mediaUUID, Valid: true},
-				UserID:      pgtype.UUID{Bytes: userUUID, Valid: true},
-			})
-			if err == nil && existing.Percentage.Valid && existing.Percentage.Float64 > 0.01 {
-				return c.JSON(http.StatusOK, map[string]string{"status": "ignored"})
-			}
-		}
-
 		result, err := mh.progressSvc.SaveProgress(c.Request().Context(), saveReq)
 		if err != nil {
 			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
@@ -1425,31 +1376,14 @@ func (mh *MediaHandler) CreateMediaNote(c *echo.Context) error {
 		return c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
 	}
 
-	var note database.MediaNotes
-	if mh.annotationSvc != nil {
-		result, err := mh.annotationSvc.SaveNote(c.Request().Context(), wsync.SaveNoteRequest{
-			MediaItemID: pgtype.UUID{Bytes: mediaUUID, Valid: true},
-			UserID:      pgtype.UUID{Bytes: userUUID, Valid: true},
-			Content:     req.Content,
-			Position:    req.Position,
-			Source:      "web",
-			ModifiedAt:  time.Now(),
-		})
-		if err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		}
-		note = result.Note
-	} else {
-		var err error
-		note, err = mh.db.CreateMediaNote(c.Request().Context(), database.CreateMediaNoteParams{
-			MediaItemID: pgtype.UUID{Bytes: mediaUUID, Valid: true},
-			UserID:      pgtype.UUID{Bytes: userUUID, Valid: true},
-			Content:     req.Content,
-			Position:    pgtype.Text{String: req.Position, Valid: req.Position != ""},
-		})
-		if err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		}
+	note, err := mh.db.CreateMediaNote(c.Request().Context(), database.CreateMediaNoteParams{
+		MediaItemID: pgtype.UUID{Bytes: mediaUUID, Valid: true},
+		UserID:      pgtype.UUID{Bytes: userUUID, Valid: true},
+		Content:     req.Content,
+		Position:    pgtype.Text{String: req.Position, Valid: req.Position != ""},
+	})
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 
 	return c.JSON(http.StatusCreated, note)
@@ -1510,11 +1444,7 @@ func (mh *MediaHandler) DeleteMediaNote(c *echo.Context) error {
 		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid note id"})
 	}
 
-	if mh.annotationSvc != nil {
-		err = mh.annotationSvc.TombstoneNoteByID(c.Request().Context(), pgtype.UUID{Bytes: noteUUID, Valid: true})
-	} else {
-		err = mh.db.DeleteMediaNote(c.Request().Context(), pgtype.UUID{Bytes: noteUUID, Valid: true})
-	}
+	err = mh.db.DeleteMediaNote(c.Request().Context(), pgtype.UUID{Bytes: noteUUID, Valid: true})
 	if err != nil {
 		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
@@ -1583,35 +1513,9 @@ func (mh *MediaHandler) CreateMediaHighlight(c *echo.Context) error {
 		color = req.Color
 	}
 
-	pgMediaID := pgtype.UUID{Bytes: mediaUUID, Valid: true}
-	pgUserID := pgtype.UUID{Bytes: userUUID, Valid: true}
-
-	if mh.annotationSvc != nil {
-		result, err := mh.annotationSvc.SaveHighlight(c.Request().Context(), wsync.SaveHighlightRequest{
-			MediaItemID:      pgMediaID,
-			UserID:           pgUserID,
-			SelectionText:    req.SelectionText,
-			StartPosition:    req.StartPosition,
-			EndPosition:      req.EndPosition,
-			EpubcfiStart:     req.EpubcfiStart,
-			EpubcfiEnd:       req.EpubcfiEnd,
-			Color:            color,
-			NoteText:         req.NoteText,
-			PercentageStart:  req.PercentageStart,
-			PercentageEnd:    req.PercentageEnd,
-			ChapterReference: req.ChapterReference,
-			Source:           "web",
-			ModifiedAt:       time.Now(),
-		})
-		if err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		}
-		return c.JSON(http.StatusCreated, result.Highlight)
-	}
-
 	highlight, err := mh.db.CreateMediaHighlight(c.Request().Context(), database.CreateMediaHighlightParams{
-		MediaItemID:   pgMediaID,
-		UserID:        pgUserID,
+		MediaItemID:   pgtype.UUID{Bytes: mediaUUID, Valid: true},
+		UserID:        pgtype.UUID{Bytes: userUUID, Valid: true},
 		SelectionText: req.SelectionText,
 		StartPosition: pgtype.Text{String: req.StartPosition, Valid: true},
 		EndPosition:   pgtype.Text{String: req.EndPosition, Valid: true},
@@ -1674,42 +1578,6 @@ func (mh *MediaHandler) UpdateMediaHighlight(c *echo.Context) error {
 		color = req.Color
 	}
 
-	// Prefer the sync-aware path: the same selection text + CFI resolves to
-	// the same dedup key, so this performs an LWW update of the existing row
-	// (including note_text and CFI columns the plain query cannot touch).
-	if mh.annotationSvc != nil {
-		userID := c.Get("user_id").(string)
-		userUUID, err := uuid.Parse(userID)
-		if err != nil {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid user"})
-		}
-		mediaID := c.Param("id")
-		mediaUUID, err := uuid.Parse(mediaID)
-		if err != nil {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid media item id"})
-		}
-		result, err := mh.annotationSvc.SaveHighlight(c.Request().Context(), wsync.SaveHighlightRequest{
-			MediaItemID:      pgtype.UUID{Bytes: mediaUUID, Valid: true},
-			UserID:           pgtype.UUID{Bytes: userUUID, Valid: true},
-			SelectionText:    req.SelectionText,
-			StartPosition:    req.StartPosition,
-			EndPosition:      req.EndPosition,
-			EpubcfiStart:     req.EpubcfiStart,
-			EpubcfiEnd:       req.EpubcfiEnd,
-			Color:            color,
-			NoteText:         req.NoteText,
-			PercentageStart:  req.PercentageStart,
-			PercentageEnd:    req.PercentageEnd,
-			ChapterReference: req.ChapterReference,
-			Source:           "web",
-			ModifiedAt:       time.Now(),
-		})
-		if err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		}
-		return c.JSON(http.StatusOK, result.Highlight)
-	}
-
 	highlight, err := mh.db.UpdateMediaHighlight(c.Request().Context(), database.UpdateMediaHighlightParams{
 		ID:            pgtype.UUID{Bytes: highlightUUID, Valid: true},
 		SelectionText: req.SelectionText,
@@ -1733,16 +1601,7 @@ func (mh *MediaHandler) DeleteMediaHighlight(c *echo.Context) error {
 		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid highlight id"})
 	}
 
-	pgHighlightID := pgtype.UUID{Bytes: highlightUUID, Valid: true}
-
-	if mh.annotationSvc != nil {
-		if err := mh.annotationSvc.TombstoneHighlightByID(c.Request().Context(), pgHighlightID, "web"); err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		}
-		return c.NoContent(http.StatusNoContent)
-	}
-
-	err = mh.db.DeleteMediaHighlight(c.Request().Context(), pgHighlightID)
+	err = mh.db.DeleteMediaHighlight(c.Request().Context(), pgtype.UUID{Bytes: highlightUUID, Valid: true})
 	if err != nil {
 		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
@@ -1750,152 +1609,6 @@ func (mh *MediaHandler) DeleteMediaHighlight(c *echo.Context) error {
 	return c.NoContent(http.StatusNoContent)
 }
 
-// GetMediaBookmarks handles GET /api/media-items/:id/bookmarks
-func (mh *MediaHandler) GetMediaBookmarks(c *echo.Context) error {
-	userID := c.Get("user_id").(string)
-	userUUID, err := uuid.Parse(userID)
-	if err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid user"})
-	}
-
-	mediaID := c.Param("id")
-	mediaUUID, err := uuid.Parse(mediaID)
-	if err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid media item id"})
-	}
-
-	bookmarks, err := mh.db.GetMediaBookmarks(c.Request().Context(), database.GetMediaBookmarksParams{
-		MediaItemID: pgtype.UUID{Bytes: mediaUUID, Valid: true},
-		UserID:      pgtype.UUID{Bytes: userUUID, Valid: true},
-	})
-	if err != nil {
-		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-	}
-
-	return c.JSON(http.StatusOK, bookmarks)
-}
-
-// CreateMediaBookmark handles POST /api/media-items/:id/bookmarks
-func (mh *MediaHandler) CreateMediaBookmark(c *echo.Context) error {
-	userID := c.Get("user_id").(string)
-	userUUID, err := uuid.Parse(userID)
-	if err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid user"})
-	}
-
-	mediaID := c.Param("id")
-	mediaUUID, err := uuid.Parse(mediaID)
-	if err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid media item id"})
-	}
-
-	var req CreateMediaBookmarkRequest
-	if err := c.Bind(&req); err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid request"})
-	}
-	if err := c.Validate(&req); err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
-	}
-
-	// The sync-aware path (dedup + LWW + tombstones) is preferred; fall back
-	// to the plain query when the service isn't wired (e.g. some tests).
-	if mh.annotationSvc != nil {
-		result, err := mh.annotationSvc.SaveBookmark(c.Request().Context(), wsync.SaveBookmarkRequest{
-			MediaItemID:      pgtype.UUID{Bytes: mediaUUID, Valid: true},
-			UserID:           pgtype.UUID{Bytes: userUUID, Valid: true},
-			Title:            req.Title,
-			Position:         req.Position,
-			Notes:            req.Notes,
-			PageNumber:       req.PageNumber,
-			ChapterNumber:    req.ChapterNumber,
-			CFIPosition:      req.CfiPosition,
-			PercentageLoc:    req.Percentage,
-			ChapterReference: req.ChapterReference,
-			Source:           "web",
-			ModifiedAt:       time.Now(),
-		})
-		if err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		}
-		return c.JSON(http.StatusCreated, result.Bookmark)
-	}
-
-	bookmark, err := mh.db.CreateMediaBookmark(c.Request().Context(), database.CreateMediaBookmarkParams{
-		MediaItemID:   pgtype.UUID{Bytes: mediaUUID, Valid: true},
-		UserID:        pgtype.UUID{Bytes: userUUID, Valid: true},
-		PageNumber:    pgtype.Int4{Int32: req.PageNumber, Valid: req.PageNumber > 0},
-		ChapterNumber: pgtype.Int4{Int32: req.ChapterNumber, Valid: req.ChapterNumber > 0},
-		CfiPosition:   pgtype.Text{String: req.CfiPosition, Valid: req.CfiPosition != ""},
-		Title:         req.Title,
-		Position:      pgtype.Text{String: req.Position, Valid: req.Position != ""},
-		Notes:         pgtype.Text{String: req.Notes, Valid: req.Notes != ""},
-	})
-	if err != nil {
-		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-	}
-	return c.JSON(http.StatusCreated, bookmark)
-}
-
-// UpdateMediaBookmark handles PUT /api/media-items/:id/bookmarks/:bookmarkId
-func (mh *MediaHandler) UpdateMediaBookmark(c *echo.Context) error {
-	userID := c.Get("user_id").(string)
-	userUUID, err := uuid.Parse(userID)
-	if err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid user"})
-	}
-
-	bookmarkID := c.Param("bookmarkId")
-	bookmarkUUID, err := uuid.Parse(bookmarkID)
-	if err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid bookmark id"})
-	}
-
-	var req UpdateMediaBookmarkRequest
-	if err := c.Bind(&req); err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid request"})
-	}
-	if err := c.Validate(&req); err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
-	}
-
-	bookmark, err := mh.db.UpdateMediaBookmark(c.Request().Context(), database.UpdateMediaBookmarkParams{
-		ID:       pgtype.UUID{Bytes: bookmarkUUID, Valid: true},
-		Title:    req.Title,
-		Notes:    pgtype.Text{String: req.Notes, Valid: req.Notes != ""},
-		Position: pgtype.Text{String: req.Position, Valid: req.Position != ""},
-		UserID:   pgtype.UUID{Bytes: userUUID, Valid: true},
-	})
-	if err != nil {
-		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-	}
-
-	return c.JSON(http.StatusOK, bookmark)
-}
-
-// DeleteMediaBookmark handles DELETE /api/media-items/:id/bookmarks/:bookmarkId
-func (mh *MediaHandler) DeleteMediaBookmark(c *echo.Context) error {
-	bookmarkID := c.Param("bookmarkId")
-	bookmarkUUID, err := uuid.Parse(bookmarkID)
-	if err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid bookmark id"})
-	}
-
-	pgBookmarkID := pgtype.UUID{Bytes: bookmarkUUID, Valid: true}
-
-	if mh.annotationSvc != nil {
-		if err := mh.annotationSvc.TombstoneBookmarkByID(c.Request().Context(), pgBookmarkID, "web"); err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		}
-		return c.NoContent(http.StatusNoContent)
-	}
-
-	if err := mh.db.DeleteMediaBookmark(c.Request().Context(), pgBookmarkID); err != nil {
-		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-	}
-
-	return c.NoContent(http.StatusNoContent)
-}
-
 // SearchMediaItems handles GET /api/media-items/search
 // Supports two modes:
 // 1. Autocomplete: author=value, genre=value, etc. → returns field values for dropdowns
@@ -2010,10 +1723,6 @@ func (mh *MediaHandler) SearchMediaItems(c *echo.Context) error {
 			"results": []interface{}{},
 		})
 	}
-	for i := range results {
-		resolved := utils.ResolveMediaURL(results[i].LibraryID, results[i].CoverImagePath)
-		results[i].CoverImagePath = pgtype.Text{String: resolved, Valid: resolved != ""}
-	}
 	return c.JSON(http.StatusOK, results)
 }
 

internal/handlers/opds.go

@@ -26,26 +26,6 @@ type OPDSHandler struct {
 	conversionService interface {
 		ConvertEPUBToKEPUB(ctx context.Context, mediaItemID pgtype.UUID, epubPath string) (*services.ConvertedKEPUB, error)
 	}
-	settings *database.SettingsRegistry
-}
-
-// SetSettings wires the tunable settings registry (OPDS page size).
-func (h *OPDSHandler) SetSettings(s *database.SettingsRegistry) { h.settings = s }
-
-// opdsDefaultPageSize returns the configured default page size (50 if unset).
-func (h *OPDSHandler) opdsDefaultPageSize() int {
-	if h.settings != nil {
-		return h.settings.OpdsDefaultPageSize()
-	}
-	return 50
-}
-
-// opdsMaxPageSize returns the configured maximum page size (200 if unset).
-func (h *OPDSHandler) opdsMaxPageSize() int {
-	if h.settings != nil {
-		return h.settings.OpdsMaxPageSize()
-	}
-	return 200
 }
 
 func NewOPDSHandler(db *database.Queries, libraryService *services.LibraryService, conversionService interface {
@@ -58,118 +38,15 @@ func NewOPDSHandler(db *database.Queries, libraryService *services.LibraryServic
 	}
 }
 
-// Helper function to get base URL from system config with request-derived fallback
+// Helper function to get base URL from system config
 func (h *OPDSHandler) getBaseURLs(c *echo.Context) (string, string, error) {
-	var dbBaseURL string
-	if config, err := h.db.GetSystemConfig(c.Request().Context(), "base_url"); err == nil {
-		dbBaseURL = config.Value
-	}
-	baseURL := deriveBaseURL(c, dbBaseURL)
-	opdsBaseURL := baseURL + "/opds"
-	return baseURL, opdsBaseURL, nil
-}
-
-func (h *OPDSHandler) getAuthToken(c *echo.Context) string {
-	token := c.QueryParam("token")
-	if token == "" {
-		token = strings.TrimPrefix(c.Request().Header.Get("Authorization"), "Bearer ")
-	}
-	return token
-}
-
-func appendToken(url, token string) string {
-	if token == "" {
-		return url
-	}
-	if strings.Contains(url, "?") {
-		return url + "&token=" + token
-	}
-	return url + "?token=" + token
-}
-
-// catalogMediaType is the OPDS media type for an acquisition catalog feed.
-const catalogMediaType = "application/atom+xml;profile=opds-catalog;kind=acquisition"
-
-// addCatalogPaginationLinks adds OPDS pagination links (self, start, first,
-// previous, next, last) and OpenSearch paging metadata (totalResults,
-// itemsPerPage, startIndex) to a feed based on the current page position.
-// catalogBase is the device catalog URL without query parameters. The token
-// (device auth) is appended to every generated link.
-func addCatalogPaginationLinks(feed *opds.Feed, catalogBase string, pageNum, perPageNum, totalItems int, token string) {
-	totalPages := 0
-	if totalItems > 0 {
-		totalPages = (totalItems + perPageNum - 1) / perPageNum
-	}
-	startIdx := (pageNum - 1) * perPageNum
-
-	pagedURL := func(page int) string {
-		return appendToken(fmt.Sprintf("%s?page=%d&per_page=%d", catalogBase, page, perPageNum), token)
+	baseURL, err := h.db.GetSystemConfig(c.Request().Context(), "base_url")
+	if err != nil {
+		return "", "", fmt.Errorf("failed to get base_url from config: %w", err)
 	}
 
-	// self reflects the current page; start/first point to the first page
-	feed.AddLink(pagedURL(pageNum), catalogMediaType, "self")
-	feed.AddLink(pagedURL(1), catalogMediaType, "start")
-	feed.AddLink(pagedURL(1), catalogMediaType, "first")
-	if totalPages > 0 {
-		feed.AddLink(pagedURL(totalPages), catalogMediaType, "last")
-	}
-	if pageNum > 1 {
-		feed.AddLink(pagedURL(pageNum-1), catalogMediaType, "previous")
-	}
-	if pageNum < totalPages {
-		feed.AddLink(pagedURL(pageNum+1), catalogMediaType, "next")
-	}
-
-	feed.SetPagination(totalItems, perPageNum, startIdx+1)
-}
-
-// resolveMimeType returns the mime type for a media item, preferring the stored
-// mime_type, then format_mimetype, and finally falling back to EPUB.
-func resolveMimeType(mime, formatMime pgtype.Text) string {
-	if mime.Valid && mime.String != "" {
-		return mime.String
-	}
-	if formatMime.Valid && formatMime.String != "" {
-		return formatMime.String
-	}
-	return "application/epub+zip"
-}
-
-// isComicArchive reports whether a format group represents a comic/manga
-// archive (cbz/cbr/cb7/cbt). Comic archives are served in their native format
-// and should not be offered as EPUB/KEPUB/PDF conversions.
-func isComicArchive(formatGroup string) bool {
-	return strings.EqualFold(formatGroup, "comic_archive")
-}
-
-// formatLabelFromPath derives a short format label (e.g. "epub", "cbz") from a
-// file path's extension, defaulting to "epub" when it cannot be determined.
-func formatLabelFromPath(path string) string {
-	ext := strings.ToLower(filepath.Ext(path))
-	switch ext {
-	case ".epub":
-		return "epub"
-	case ".pdf":
-		return "pdf"
-	case ".cbz":
-		return "cbz"
-	case ".cbr":
-		return "cbr"
-	case ".cb7":
-		return "cb7"
-	case ".cbt":
-		return "cbt"
-	case ".mobi":
-		return "mobi"
-	case ".azw", ".azw3":
-		return "azw3"
-	case ".txt":
-		return "txt"
-	case "":
-		return "epub"
-	default:
-		return strings.TrimPrefix(ext, ".")
-	}
+	opdsBaseURL := baseURL.Value + "/opds"
+	return baseURL.Value, opdsBaseURL, nil
 }
 
 // GetDeviceCatalog returns the OPDS catalog feed for a device
@@ -188,10 +65,9 @@ func (h *OPDSHandler) GetDeviceCatalog(c *echo.Context) error {
 		}
 	}
 
-	perPageNum := h.opdsDefaultPageSize()
-	maxPerPage := h.opdsMaxPageSize()
+	perPageNum := 50
 	if perPage != "" {
-		if num, err := strconv.Atoi(perPage); err == nil && num > 0 && num <= maxPerPage {
+		if num, err := strconv.Atoi(perPage); err == nil && num > 0 && num <= 200 {
 			perPageNum = num
 		}
 	}
@@ -263,17 +139,13 @@ func (h *OPDSHandler) GetDeviceCatalog(c *echo.Context) error {
 		"Bookhoard Library",
 	)
 
-	// Feed links, including OPDS pagination links (first/previous/next/last) and
-	// OpenSearch paging metadata (totalResults/itemsPerPage/startIndex).
-	token := h.getAuthToken(c)
-	catalogBase := fmt.Sprintf("%s/devices/%s/catalog", opdsBaseURL, deviceID)
-	addCatalogPaginationLinks(feed, catalogBase, pageNum, perPageNum, totalItems, token)
+	// Add feed links
+	catalogURL := fmt.Sprintf("%s/opds/devices/%s/catalog", opdsBaseURL, deviceID)
+	feed.AddLink(catalogURL, "application/atom+xml;profile=opds-catalog;kind=acquisition", "self")
+	feed.AddLink(catalogURL, "application/atom+xml;profile=opds-catalog;kind=acquisition", "start")
 
-	// OpenSearch: the search link points to an OpenSearch description document
-	// (served by the same /search endpoint when no query is supplied) so that
-	// OPDS clients like KOReader can discover how to formulate search requests.
-	searchURL := appendToken(fmt.Sprintf("%s/devices/%s/search", opdsBaseURL, deviceID), token)
-	feed.AddLink(searchURL, "application/opensearchdescription+xml", "search")
+	searchURL := fmt.Sprintf("%s/opds/devices/%s/search", opdsBaseURL, deviceID)
+	feed.AddLink(searchURL, "application/atom+xml;profile=opds-catalog;kind=acquisition", "search")
 
 	// Add entries
 	for _, item := range allItems {
@@ -298,21 +170,16 @@ func (h *OPDSHandler) GetDeviceCatalog(c *echo.Context) error {
 			entry.SetSummary(item.Description.String)
 		}
 
-		// Add acquisition link using the item's real mime type
-		downloadURL := appendToken(fmt.Sprintf("%s/devices/%s/download/%s", opdsBaseURL, deviceID, bookUUID), token)
-		entry.AddAcquisitionLink(downloadURL, resolveMimeType(item.MimeType, item.FormatMimetype))
+		// Add acquisition links
+		downloadURL := fmt.Sprintf("%s/opds/devices/%s/download/%s", opdsBaseURL, deviceID, bookUUID)
+		entry.AddAcquisitionLink(downloadURL, "application/epub+zip")
 
-		// Only offer reflowable conversions (kepub/pdf) for ebooks; comic
-		// archives are served as-is in their native format.
-		if !isComicArchive(item.FormatGroup) {
-			if device.DeviceType == "kobo" {
-				kepubURL := downloadURL + "&format=kepub"
-				entry.AddAlternateLink(kepubURL, "application/vnd.kobo+xml+zip")
-			}
+		// Add format variants
+		kepubURL := fmt.Sprintf("%s?format=kepub", downloadURL)
+		entry.AddAlternateLink(kepubURL, "application/vnd.kobo+xml+zip")
 
-			pdfURL := downloadURL + "&format=pdf"
-			entry.AddAlternateLink(pdfURL, "application/pdf")
-		}
+		pdfURL := fmt.Sprintf("%s?format=pdf", downloadURL)
+		entry.AddAlternateLink(pdfURL, "application/pdf")
 
 		// Add canonical identifier
 		entry.SetIdentifier(bookUUID)
@@ -346,17 +213,16 @@ func (h *OPDSHandler) GetDeviceCatalog(c *echo.Context) error {
 	return c.String(http.StatusOK, xmlString)
 }
 
-// SearchDeviceCatalog searches the OPDS catalog for a device.
-//
-// When no "q" query parameter is supplied it returns an OpenSearch description
-// document (application/opensearchdescription+xml) so that OPDS clients such as
-// KOReader can discover the search URL template (which contains the
-// {searchTerms} placeholder). When "q" is supplied it returns an OPDS
-// acquisition feed of matching books.
+// SearchDeviceCatalog searches the OPDS catalog for a device
 func (h *OPDSHandler) SearchDeviceCatalog(c *echo.Context) error {
 	deviceID := c.Param("deviceId")
+
 	query := c.QueryParam("q")
 
+	if query == "" {
+		return c.XML(http.StatusBadRequest, opds.NewErrorFeed("Missing search query"))
+	}
+
 	// Get base URLs
 	baseURL, opdsBaseURL, err := h.getBaseURLs(c)
 	if err != nil {
@@ -377,30 +243,12 @@ func (h *OPDSHandler) SearchDeviceCatalog(c *echo.Context) error {
 
 	// Get user's visible libraries
 	userID := device.UserID.Bytes
+
 	_, err = h.db.GetUserVisibleLibraries(c.Request().Context(), pgtype.UUID{Bytes: userID, Valid: true})
 	if err != nil {
 		return c.XML(http.StatusInternalServerError, opds.NewErrorFeed("Failed to get libraries"))
 	}
 
-	token := h.getAuthToken(c)
-
-	// No query: serve the OpenSearch description document so clients can learn
-	// the search template (contains the {searchTerms} placeholder).
-	if query == "" {
-		searchURL := appendToken(fmt.Sprintf("%s/devices/%s/search?q={searchTerms}", opdsBaseURL, deviceID), token)
-		desc := opds.NewSearchDescription(
-			"Bookhoard",
-			"Search the Bookhoard library",
-			searchURL,
-		)
-		xmlString, err := desc.GenerateXMLString()
-		if err != nil {
-			return c.XML(http.StatusInternalServerError, opds.NewErrorFeed("Failed to generate search description"))
-		}
-		c.Response().Header().Set("Content-Type", "application/opensearchdescription+xml")
-		return c.String(http.StatusOK, xmlString)
-	}
-
 	// Search media items
 	allItems, err := h.db.SearchMediaItems(c.Request().Context(), database.SearchMediaItemsParams{
 		UserID:        pgtype.UUID{Bytes: userID, Valid: true},
@@ -419,14 +267,11 @@ func (h *OPDSHandler) SearchDeviceCatalog(c *echo.Context) error {
 	)
 
 	// Add feed links
-	catalogURL := appendToken(fmt.Sprintf("%s/devices/%s/catalog", opdsBaseURL, deviceID), token)
-	feed.AddLink(catalogURL, catalogMediaType, "start")
+	catalogURL := fmt.Sprintf("%s/opds/devices/%s/catalog", opdsBaseURL, deviceID)
+	feed.AddLink(catalogURL, "application/atom+xml;profile=opds-catalog;kind=acquisition", "start")
 
-	searchURL := appendToken(fmt.Sprintf("%s/devices/%s/search?q=%s", opdsBaseURL, deviceID, query), token)
-	feed.AddLink(searchURL, catalogMediaType, "self")
-
-	// OpenSearch paging metadata (search results are a single page)
-	feed.SetPagination(len(allItems), len(allItems), 1)
+	searchURL := fmt.Sprintf("%s/opds/devices/%s/search?q=%s", opdsBaseURL, deviceID, query)
+	feed.AddLink(searchURL, "application/atom+xml;profile=opds-catalog;kind=acquisition", "self")
 
 	// Add entries (same as catalog)
 	userUUID := uuid.UUID(userID)
@@ -451,15 +296,11 @@ func (h *OPDSHandler) SearchDeviceCatalog(c *echo.Context) error {
 			entry.SetSummary(item.Description.String)
 		}
 
-		downloadURL := appendToken(fmt.Sprintf("%s/devices/%s/download/%s", opdsBaseURL, deviceID, bookUUID), token)
-		entry.AddAcquisitionLink(downloadURL, resolveMimeType(item.MimeType, item.FormatMimetype))
+		downloadURL := fmt.Sprintf("%s/opds/devices/%s/download/%s", opdsBaseURL, deviceID, bookUUID)
+		entry.AddAcquisitionLink(downloadURL, "application/epub+zip")
 
-		// Only offer kepub conversion for ebooks; comic archives are served
-		// as-is in their native format.
-		if !isComicArchive(item.FormatGroup) && device.DeviceType == "kobo" {
-			kepubURL := downloadURL + "&format=kepub"
-			entry.AddAlternateLink(kepubURL, "application/vnd.kobo+xml+zip")
-		}
+		kepubURL := fmt.Sprintf("%s?format=kepub", downloadURL)
+		entry.AddAlternateLink(kepubURL, "application/vnd.kobo+xml+zip")
 
 		entry.SetIdentifier(bookUUID)
 
@@ -605,12 +446,6 @@ func (h *OPDSHandler) DownloadBook(c *echo.Context) error {
 		if mediaItem.MimeType.Valid {
 			mimeType = mediaItem.MimeType.String
 		}
-		// Always expose the primary content hash so clients (e.g. the koreader
-		// plugin) learn the canonical SHA-256 from the download response itself,
-		// not just from the feed metadata.
-		if mediaItem.FileSha256.Valid {
-			fileSha256 = mediaItem.FileSha256.String
-		}
 	}
 
 	// Check if file exists
@@ -764,7 +599,7 @@ func (h *OPDSHandler) GetDeviceNavigation(c *echo.Context) error {
 	)
 
 	// Add feed links
-	catalogURL := fmt.Sprintf("%s/devices/%s/catalog", opdsBaseURL, deviceID)
+	catalogURL := fmt.Sprintf("%s/opds/devices/%s/catalog", opdsBaseURL, deviceID)
 	feed.AddLink(catalogURL, "application/atom+xml;profile=opds-catalog;kind=acquisition", "start")
 	feed.AddLink(catalogURL, "application/atom+xml;profile=opds-catalog;kind=acquisition", "self")
 
@@ -847,14 +682,14 @@ func (h *OPDSHandler) ListFormats(c *echo.Context) error {
 
 	formatList := []FormatInfo{}
 
-	// Add the primary/native format (always available if media item exists)
+	// Add EPUB format (always available if media item exists)
 	fileSize := int64(0)
 	if mediaItem.FileSize.Valid {
 		fileSize = mediaItem.FileSize.Int64
 	}
 
 	formatList = append(formatList, FormatInfo{
-		FormatType: formatLabelFromPath(mediaItem.FilePath),
+		FormatType: "epub",
 		FilePath:   mediaItem.FilePath,
 		FileSha256: func() string {
 			if mediaItem.FileSha256.Valid {
@@ -956,7 +791,7 @@ func (h *OPDSHandler) RegisterOPDS(c *echo.Context) error {
 		return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to create OPDS token"})
 	}
 
-	catalogURL := fmt.Sprintf("%s/devices/%s/catalog", opdsBaseURL, deviceID)
+	catalogURL := fmt.Sprintf("%s/opds/devices/%s/catalog", opdsBaseURL, deviceID)
 
 	return c.JSON(http.StatusOK, map[string]interface{}{
 		"opds_token": map[string]interface{}{

internal/handlers/opds_test.go

@@ -1,119 +0,0 @@
-package handlers
-
-import (
-	"bookhoard/internal/opds"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// rels collects the rel attributes of all links currently on the feed.
-func rels(feed *opds.Feed) []string {
-	out := make([]string, 0, len(feed.Links))
-	for _, l := range feed.Links {
-		out = append(out, l.Rel)
-	}
-	return out
-}
-
-func containsRel(feed *opds.Feed, rel string) bool {
-	for _, l := range feed.Links {
-		if l.Rel == rel {
-			return true
-		}
-	}
-	return false
-}
-
-func TestAddCatalogPaginationLinks_MiddlePage(t *testing.T) {
-	feed := opds.NewFeed("urn:uuid:dev", "Library")
-	// 1814 items, 50 per page => 37 pages; on page 2
-	addCatalogPaginationLinks(feed, "http://h/opds/devices/dev/catalog", 2, 50, 1814, "tok")
-
-	assert.True(t, containsRel(feed, "self"))
-	assert.True(t, containsRel(feed, "start"))
-	assert.True(t, containsRel(feed, "first"))
-	assert.True(t, containsRel(feed, "last"))
-	assert.True(t, containsRel(feed, "previous"), "middle page must have previous")
-	assert.True(t, containsRel(feed, "next"), "middle page must have next")
-
-	// self must point to the current page
-	var selfHref string
-	for _, l := range feed.Links {
-		if l.Rel == "self" {
-			selfHref = l.Href
-		}
-	}
-	assert.Contains(t, selfHref, "page=2&per_page=50")
-	assert.Contains(t, selfHref, "token=tok")
-
-	// next must advance the page
-	var nextHref string
-	for _, l := range feed.Links {
-		if l.Rel == "next" {
-			nextHref = l.Href
-		}
-	}
-	assert.Contains(t, nextHref, "page=3")
-
-	// OpenSearch metadata
-	require.NotNil(t, feed.TotalResults)
-	assert.Equal(t, 1814, *feed.TotalResults)
-	require.NotNil(t, feed.ItemsPerPage)
-	assert.Equal(t, 50, *feed.ItemsPerPage)
-	require.NotNil(t, feed.StartIndex)
-	assert.Equal(t, 51, *feed.StartIndex, "startIndex should be 1-based offset of first item on page 2")
-}
-
-func TestAddCatalogPaginationLinks_FirstPage_NoPrevious(t *testing.T) {
-	feed := opds.NewFeed("urn:uuid:dev", "Library")
-	addCatalogPaginationLinks(feed, "http://h/opds/devices/dev/catalog", 1, 50, 1814, "")
-
-	rels := rels(feed)
-	assert.NotContains(t, rels, "previous", "first page must not have previous")
-	assert.Contains(t, rels, "next")
-}
-
-func TestAddCatalogPaginationLinks_LastPage_NoNext(t *testing.T) {
-	feed := opds.NewFeed("urn:uuid:dev", "Library")
-	addCatalogPaginationLinks(feed, "http://h/opds/devices/dev/catalog", 37, 50, 1814, "")
-
-	rels := rels(feed)
-	assert.NotContains(t, rels, "next", "last page must not have next")
-	assert.Contains(t, rels, "previous")
-}
-
-func TestAddCatalogPaginationLinks_SinglePage(t *testing.T) {
-	feed := opds.NewFeed("urn:uuid:dev", "Library")
-	addCatalogPaginationLinks(feed, "http://h/opds/devices/dev/catalog", 1, 50, 10, "")
-
-	rels := rels(feed)
-	assert.NotContains(t, rels, "previous")
-	assert.NotContains(t, rels, "next")
-	// still emits self/start/first/last
-	assert.Contains(t, rels, "self")
-	assert.Contains(t, rels, "last")
-}
-
-func TestAddCatalogPaginationLinks_EmptyCatalog(t *testing.T) {
-	feed := opds.NewFeed("urn:uuid:dev", "Library")
-	addCatalogPaginationLinks(feed, "http://h/opds/devices/dev/catalog", 1, 50, 0, "")
-
-	rels := rels(feed)
-	assert.NotContains(t, rels, "next")
-	assert.NotContains(t, rels, "previous")
-	assert.NotContains(t, rels, "last", "empty catalog should not advertise a last page")
-	require.NotNil(t, feed.TotalResults)
-	assert.Equal(t, 0, *feed.TotalResults)
-}
-
-func TestAddCatalogPaginationLinks_TokenAppended(t *testing.T) {
-	feed := opds.NewFeed("urn:uuid:dev", "Library")
-	addCatalogPaginationLinks(feed, "http://h/opds/devices/dev/catalog", 1, 50, 100, "abc")
-
-	xml, err := feed.GenerateXMLString()
-	require.NoError(t, err)
-	assert.True(t, strings.Count(xml, "token=abc") >= 3, "token should be appended to generated links")
-}

internal/handlers/processing_issues.go

@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"bookhoard/internal/database"
-	"context"
 	"net/http"
 	"time"
 
@@ -140,8 +139,3 @@ func (h *ProcessingIssuesHandler) DeleteProcessingIssue(c *echo.Context) error {
 		"message": "Issue deleted",
 	})
 }
-
-// GetProcessingIssueStatsData returns stats for SSR (not JSON response)
-func (h *ProcessingIssuesHandler) GetProcessingIssueStatsData(ctx context.Context, libraryID pgtype.UUID) (database.GetProcessingIssueStatsRow, error) {
-	return h.db.GetProcessingIssueStats(ctx, libraryID)
-}

internal/handlers/progress.go

@@ -374,11 +374,6 @@ func (h *Handler) GetAllProgressData(c *echo.Context) ([]ProgressWithMedia, erro
 			deviceName = progress.LastSyncDevice.String
 		}
 
-		lastUpdated := ""
-		if progress.LastReadAt.Valid {
-			lastUpdated = progress.LastReadAt.Time.Format("01-02-2006 03:04 PM")
-		}
-
 		progressList = append(progressList, ProgressWithMedia{
 			MediaItemID:        progress.MediaItemID.Bytes,
 			Title:              mediaItem.Title,
@@ -391,11 +386,6 @@ func (h *Handler) GetAllProgressData(c *echo.Context) ([]ProgressWithMedia, erro
 			Epubcfi:            epubcfi,
 			LastSyncDevice:     deviceName,
 			ProgressPercentage: progress.Percentage.Float64 * 100,
-			EpubCFI:            epubcfi,
-			LastUpdated:        lastUpdated,
-			DeviceIcon:         getDeviceIcon(deviceName),
-			DeviceName:         deviceName,
-			DeviceType:         deviceName,
 			FormatGroup:        mediaItem.FormatGroup,
 			EstimatedPages:     wsync.EstimatedPages(mediaItem.TotalCharacters.Int64),
 		})

internal/handlers/refresh_token.go

@@ -14,6 +14,10 @@ import (
 	"github.com/labstack/echo/v5"
 )
 
+const (
+	refreshTokenExpiration = 7 * 24 * time.Hour // 7 days
+)
+
 type RefreshTokenRequest struct {
 	RefreshToken string `json:"refresh_token" validate:"required"`
 }
@@ -68,7 +72,7 @@ func (h *AuthHandler) RefreshAccessToken(c *echo.Context) error {
 	return c.JSON(http.StatusOK, RefreshTokenResponse{
 		AccessToken: accessToken,
 		TokenType:   "Bearer",
-		ExpiresIn:   int(h.refreshTokenTTL().Seconds()),
+		ExpiresIn:   SessionDurationSec,
 	})
 }
 
@@ -97,7 +101,7 @@ func (h *AuthHandler) CreateRefreshToken(userID uuid.UUID) (string, string, erro
 	tokenUUID := uuid.New()
 	refreshToken := tokenUUID.String()
 
-	expiresAt := time.Now().Add(h.refreshTokenTTL())
+	expiresAt := time.Now().Add(refreshTokenExpiration)
 	_, err := h.db.CreateRefreshToken(context.Background(), database.CreateRefreshTokenParams{
 		UserID:    pgtype.UUID{Bytes: userID, Valid: true},
 		Token:     pgtype.UUID{Bytes: tokenUUID, Valid: true},

internal/handlers/scanner.go

@@ -128,8 +128,8 @@ func (h *Handler) StartScanner(c *echo.Context) error {
 		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid user id"})
 	}
 
-	// Set the folder paths (watch=true: this long-lived scanner reads events)
-	if err := h.scanner.SetFolders(req.FolderPaths, true); err != nil {
+	// Set the folder paths
+	if err := h.scanner.SetFolders(req.FolderPaths); err != nil {
 		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid folder paths: " + err.Error()})
 	}
 
@@ -202,7 +202,7 @@ func (h *Handler) StartWatchModeForLibrary(ctx context.Context, libraryID pgtype
 	}
 
 	scanner := services.NewMediaScanner(h.db)
-	if err := scanner.SetFolders(folderPaths, true); err != nil {
+	if err := scanner.SetFolders(folderPaths); err != nil {
 		return fmt.Errorf("failed to set scanner folders: %v", err)
 	}
 

internal/handlers/sidecar.go

@@ -3,7 +3,6 @@ package handlers
 import (
 	"bookhoard/internal/config"
 	"bookhoard/internal/database"
-	"bookhoard/internal/setupstatus"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -15,19 +14,14 @@ import (
 )
 
 type SidecarHandler struct {
-	db       *database.Queries
-	cfg      *config.Config
-	settings *database.SettingsRegistry
+	db  *database.Queries
+	cfg *config.Config
 }
 
 func NewSidecarHandler(db *database.Queries, cfg *config.Config) *SidecarHandler {
 	return &SidecarHandler{db: db, cfg: cfg}
 }
 
-// SetSettings wires the tunable settings registry so the timezone write path
-// keeps the cache consistent.
-func (h *SidecarHandler) SetSettings(s *database.SettingsRegistry) { h.settings = s }
-
 type SidecarConfig struct {
 	Version        string                 `json:"version"`
 	Bookhoard      SidecarBookhoardConfig `json:"bookhoard"`
@@ -87,13 +81,15 @@ func (h *SidecarHandler) GetSidecarConfig(c *echo.Context) error {
 	userID := device.UserID.Bytes
 	pgUserID := pgtype.UUID{Bytes: userID, Valid: true}
 
-	// Get base URL and compute paths (with request-derived fallback)
-	dbBaseURL, _ := h.db.GetSystemConfig(ctx, "base_url")
-	baseURL := deriveBaseURL(c, dbBaseURL.Value)
+	// Get base URL and compute paths
+	baseURL, _ := h.db.GetSystemConfig(ctx, "base_url")
+	if baseURL.Value == "" {
+		baseURL.Value = h.cfg.BaseURL
+	}
 
 	// Generate URLs
-	opdsCatalogURL := fmt.Sprintf("%s/opds/devices/%s/catalog", baseURL, deviceID.String())
-	syncAPIURL := fmt.Sprintf("%s/api/sync/kobo", baseURL)
+	opdsCatalogURL := fmt.Sprintf("%s/opds/devices/%s/catalog", baseURL.Value, deviceID.String())
+	syncAPIURL := fmt.Sprintf("%s/api/sync/kobo", baseURL.Value)
 
 	// Get user's visible libraries with media items
 	mediaItems, err := h.db.GetUserMediaItemsForSync(ctx, pgUserID)
@@ -134,21 +130,6 @@ func (h *SidecarHandler) GetSidecarConfig(c *echo.Context) error {
 			SHA256:           item.FileSha256.String,
 			FilePath:         item.FilePath,
 		}
-
-		// Also key the book by each per-format hash (KEPUB/PDF/...), so a device
-		// holding a converted format resolves via the sidecar the same way it
-		// would via BookResolver on the server.
-		formats, ferr := h.db.GetMediaItemFormats(ctx, item.ID)
-		if ferr == nil {
-			entry := books[key]
-			for _, f := range formats {
-				if f.FileSha256.Valid && f.FileSha256.String != "" {
-					if _, exists := books[f.FileSha256.String]; !exists {
-						books[f.FileSha256.String] = entry
-					}
-				}
-			}
-		}
 	}
 
 	// Get collections
@@ -195,8 +176,8 @@ func (h *SidecarHandler) GetSidecarConfig(c *echo.Context) error {
 		Bookhoard: SidecarBookhoardConfig{
 			OPDSCatalog: opdsCatalogURL,
 			SyncAPI:     syncAPIURL,
-			OPDSBaseURL: baseURL + "/opds",
-			APIBaseURL:  baseURL + "/api",
+			OPDSBaseURL: baseURL.Value + "/opds",
+			APIBaseURL:  baseURL.Value + "/api",
 			DeviceID:    deviceID.String(),
 			DeviceToken: device.AuthToken,
 		},
@@ -238,13 +219,15 @@ func (h *SidecarHandler) DownloadSidecarConfig(c *echo.Context) error {
 	userID := device.UserID.Bytes
 	pgUserID := pgtype.UUID{Bytes: userID, Valid: true}
 
-	// Get base URL and compute paths (with request-derived fallback)
-	dbBaseURL, _ := h.db.GetSystemConfig(ctx, "base_url")
-	baseURL := deriveBaseURL(c, dbBaseURL.Value)
+	// Get base URL and compute paths
+	baseURL, _ := h.db.GetSystemConfig(ctx, "base_url")
+	if baseURL.Value == "" {
+		baseURL.Value = h.cfg.BaseURL
+	}
 
 	// Generate URLs
-	opdsCatalogURL := fmt.Sprintf("%s/opds/devices/%s/catalog", baseURL, deviceID.String())
-	syncAPIURL := fmt.Sprintf("%s/api/sync/kobo", baseURL)
+	opdsCatalogURL := fmt.Sprintf("%s/opds/devices/%s/catalog", baseURL.Value, deviceID.String())
+	syncAPIURL := fmt.Sprintf("%s/api/sync/kobo", baseURL.Value)
 
 	// Get user's visible libraries with media items
 	mediaItems, err := h.db.GetUserMediaItemsForSync(ctx, pgUserID)
@@ -284,21 +267,6 @@ func (h *SidecarHandler) DownloadSidecarConfig(c *echo.Context) error {
 			SHA256:           item.FileSha256.String,
 			FilePath:         item.FilePath,
 		}
-
-		// Also key the book by each per-format hash (KEPUB/PDF/...), so a device
-		// holding a converted format resolves via the sidecar the same way it
-		// would via BookResolver on the server.
-		formats, ferr := h.db.GetMediaItemFormats(ctx, item.ID)
-		if ferr == nil {
-			entry := books[key]
-			for _, f := range formats {
-				if f.FileSha256.Valid && f.FileSha256.String != "" {
-					if _, exists := books[f.FileSha256.String]; !exists {
-						books[f.FileSha256.String] = entry
-					}
-				}
-			}
-		}
 	}
 
 	// Get collections
@@ -341,8 +309,8 @@ func (h *SidecarHandler) DownloadSidecarConfig(c *echo.Context) error {
 		Bookhoard: SidecarBookhoardConfig{
 			OPDSCatalog: opdsCatalogURL,
 			SyncAPI:     syncAPIURL,
-			OPDSBaseURL: baseURL + "/opds",
-			APIBaseURL:  baseURL + "/api",
+			OPDSBaseURL: baseURL.Value + "/opds",
+			APIBaseURL:  baseURL.Value + "/api",
 			DeviceID:    deviceID.String(),
 			DeviceToken: device.AuthToken,
 		},
@@ -435,9 +403,6 @@ func (h *SidecarHandler) UpdateSystemConfiguration(c *echo.Context) error {
 					"error": "failed to update default timezone",
 				})
 			}
-			if h.settings != nil {
-				h.settings.Reload(ctx)
-			}
 			continue
 		}
 		_, err := h.db.SetSystemConfig(ctx, database.SetSystemConfigParams{
@@ -452,29 +417,6 @@ func (h *SidecarHandler) UpdateSystemConfiguration(c *echo.Context) error {
 		}
 	}
 
-	if newBaseURL, ok := req["base_url"]; ok && newBaseURL != "" {
-		derivedConfigs := map[string]string{
-			"opds_base_url": newBaseURL + "/opds",
-			"api_base_url":  newBaseURL + "/api",
-		}
-		for derivedKey, derivedValue := range derivedConfigs {
-			_, err := h.db.SetSystemConfig(ctx, database.SetSystemConfigParams{
-				Key:       derivedKey,
-				Value:     derivedValue,
-				UpdatedBy: pgUserID,
-			})
-			if err != nil {
-				return c.JSON(http.StatusInternalServerError, map[string]string{
-					"error": fmt.Sprintf("failed to update derived config key: %s", derivedKey),
-				})
-			}
-		}
-
-		// Invalidate setup status cache so the middleware picks up the new
-		// base_url immediately (setup is not complete until base_url is set).
-		setupstatus.Invalidate()
-	}
-
 	// Check for HTMX request
 	if c.Request().Header.Get("HX-Request") == "true" {
 		// Fetch updated base_url for template

internal/handlers/system_settings.go

@@ -2,21 +2,17 @@ package handlers
 
 import (
 	"bookhoard/internal/database"
-	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"strconv"
 	"time"
 
 	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/labstack/echo/v5"
 )
 
 type SystemSettingsHandler struct {
-	db       *database.Queries
-	settings *database.SettingsRegistry
+	db *database.Queries
 }
 
 func NewSystemSettingsHandler(db *database.Queries) *SystemSettingsHandler {
@@ -25,154 +21,6 @@ func NewSystemSettingsHandler(db *database.Queries) *SystemSettingsHandler {
 	}
 }
 
-// SetSettings wires the tunable settings registry. Required for the unified
-// /api/system/settings endpoints and for cache invalidation after writes.
-func (h *SystemSettingsHandler) SetSettings(s *database.SettingsRegistry) {
-	h.settings = s
-}
-
-// reload refreshes the in-memory cache after a write.
-func (h *SystemSettingsHandler) reload(c *echo.Context) {
-	if h.settings != nil {
-		h.settings.Reload(c.Request().Context())
-	}
-}
-
-// ---- Unified /api/system/settings endpoints ----
-
-// GetSettings handles GET /api/system/settings.
-func (h *SystemSettingsHandler) GetSettings(c *echo.Context) error {
-	if h.settings == nil {
-		return c.JSON(http.StatusServiceUnavailable, map[string]string{"error": "settings registry not initialized"})
-	}
-	return c.JSON(http.StatusOK, h.settings.All())
-}
-
-// UpdateSettingRequest is the body for PUT /api/system/settings.
-type UpdateSettingRequest struct {
-	Key   string `json:"key" form:"key"`
-	Value string `json:"value" form:"value"`
-}
-
-// UpdateSettingResponse mirrors a settings entry plus a reload hint.
-type UpdateSettingResponse struct {
-	database.SettingEntry
-	ReloadRequired bool   `json:"reload_required"`
-	Message        string `json:"message,omitempty"`
-}
-
-// UpdateSetting handles PUT /api/system/settings.
-func (h *SystemSettingsHandler) UpdateSetting(c *echo.Context) error {
-	if h.settings == nil {
-		return c.JSON(http.StatusServiceUnavailable, map[string]string{"error": "settings registry not initialized"})
-	}
-	var req UpdateSettingRequest
-	if err := c.Bind(&req); err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid request"})
-	}
-	resp, err := h.ApplySetting(c.Request().Context(), req.Key, req.Value)
-	if err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
-	}
-	return c.JSON(http.StatusOK, resp)
-}
-
-// ApplySetting validates, persists, and reloads a single setting. Shared by the
-// JSON API and the HTMX admin endpoint.
-func (h *SystemSettingsHandler) ApplySetting(ctx context.Context, key, value string) (UpdateSettingResponse, error) {
-	if h.settings == nil {
-		return UpdateSettingResponse{}, fmt.Errorf("settings registry not initialized")
-	}
-	if key == "" {
-		return UpdateSettingResponse{}, fmt.Errorf("key is required")
-	}
-	def, ok := database.LookupDefault(key)
-	if !ok {
-		return UpdateSettingResponse{}, fmt.Errorf("unknown setting key: %s", key)
-	}
-	if err := validateSettingValue(def, value); err != nil {
-		return UpdateSettingResponse{}, err
-	}
-
-	desc := def.Description
-	rType := pgtype.Text{}
-	if def.Type != "" {
-		rType = pgtype.Text{String: def.Type, Valid: true}
-	}
-	var minP, maxP pgtype.Text
-	if def.Min != "" {
-		minP = pgtype.Text{String: def.Min, Valid: true}
-	}
-	if def.Max != "" {
-		maxP = pgtype.Text{String: def.Max, Valid: true}
-	}
-	if _, err := h.db.UpsertSystemSetting(ctx, database.UpsertSystemSettingParams{
-		SettingKey:      key,
-		SettingValue:    value,
-		Description:     pgtype.Text{String: desc, Valid: desc != ""},
-		SettingType:     rType,
-		MinValue:        minP,
-		MaxValue:        maxP,
-		RequiresRestart: pgtype.Bool{Bool: def.RequiresRestart, Valid: true},
-		Category:        pgtype.Text{String: def.Category, Valid: def.Category != ""},
-	}); err != nil {
-		return UpdateSettingResponse{}, err
-	}
-
-	h.settings.Reload(ctx)
-
-	resp := UpdateSettingResponse{ReloadRequired: def.RequiresRestart}
-	for _, e := range h.settings.All() {
-		if e.Key == key {
-			resp.SettingEntry = e
-			break
-		}
-	}
-	if def.RequiresRestart {
-		resp.Message = "Saved. Restart the server for this change to take full effect."
-	} else {
-		resp.Message = "Saved."
-	}
-	return resp, nil
-}
-
-// validateSettingValue checks a candidate value against the setting's type and bounds.
-func validateSettingValue(def database.SettingDefault, value string) error {
-	switch def.Type {
-	case database.SettingTypeInt:
-		n, err := strconv.Atoi(value)
-		if err != nil {
-			return fmt.Errorf("value must be an integer")
-		}
-		if def.Min != "" {
-			if mn, err := strconv.Atoi(def.Min); err == nil && n < mn {
-				return fmt.Errorf("value must be >= %s", def.Min)
-			}
-		}
-		if def.Max != "" {
-			if mx, err := strconv.Atoi(def.Max); err == nil && n > mx {
-				return fmt.Errorf("value must be <= %s", def.Max)
-			}
-		}
-	case database.SettingTypeBool:
-		if _, err := strconv.ParseBool(value); err != nil {
-			return fmt.Errorf("value must be true or false")
-		}
-	case database.SettingTypeString:
-		if value == "" {
-			return fmt.Errorf("value must not be empty")
-		}
-		if def.Key == "default_timezone" {
-			if _, err := time.LoadLocation(value); err != nil {
-				return fmt.Errorf("invalid timezone: %v", err)
-			}
-		}
-	}
-	return nil
-}
-
-// ---- Legacy scan-settings endpoints (retained for backward compatibility) ----
-
 type UpdateScanSettingsRequest struct {
 	ScanPollIntervalSeconds int32 `json:"scan_poll_interval_seconds" validate:"required,min=1,max=3600"`
 	AutoScanEnabled         bool  `json:"auto_scan_enabled"`
@@ -203,7 +51,6 @@ func (h *SystemSettingsHandler) UpdateTimezoneSettings(c *echo.Context) error {
 	if err != nil {
 		return err
 	}
-	h.reload(c)
 	return c.JSON(http.StatusOK, map[string]string{"message": "Timezone updated"})
 }
 
@@ -241,8 +88,6 @@ func (h *SystemSettingsHandler) UpdateScanSettings(c *echo.Context) error {
 		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 
-	h.reload(c)
-
 	return c.JSON(http.StatusOK, ScanSettingsResponse{
 		ScanPollIntervalSeconds: req.ScanPollIntervalSeconds,
 		AutoScanEnabled:         req.AutoScanEnabled,
@@ -251,15 +96,6 @@ func (h *SystemSettingsHandler) UpdateScanSettings(c *echo.Context) error {
 }
 
 func (h *SystemSettingsHandler) GetScanSettings(c *echo.Context) error {
-	// Prefer the registry (single source of truth after Load).
-	if h.settings != nil {
-		interval := int32(h.settings.ScanPollInterval().Seconds())
-		return c.JSON(http.StatusOK, ScanSettingsResponse{
-			ScanPollIntervalSeconds: interval,
-			AutoScanEnabled:         h.settings.AutoScanEnabled(),
-		})
-	}
-
 	scanFrequencySetting, err := h.db.GetSystemSetting(c.Request().Context(), "scan_poll_interval_seconds")
 	if err != nil {
 		if errors.Is(err, pgx.ErrNoRows) {

internal/handlers/url.go

@@ -1,36 +0,0 @@
-package handlers
-
-import (
-	"strings"
-
-	"github.com/labstack/echo/v5"
-)
-
-// deriveBaseURL returns the base URL to use for constructing self-referential
-// links (OPDS feeds, sidecar config, etc.). It prefers the database-configured
-// base_url when available, and falls back to deriving the URL from the incoming
-// HTTP request (Host header + scheme), which is always reachable by the client.
-//
-// Proxy header support: X-Forwarded-Proto and X-Forwarded-Host are respected so
-// that deployments behind TLS-terminating reverse proxies advertise the correct
-// external URL.
-func deriveBaseURL(c *echo.Context, dbBaseURL string) string {
-	if dbBaseURL != "" {
-		return strings.TrimRight(dbBaseURL, "/")
-	}
-
-	scheme := "http"
-	if c.Request().TLS != nil {
-		scheme = "https"
-	}
-	if proto := c.Request().Header.Get("X-Forwarded-Proto"); proto != "" {
-		scheme = proto
-	}
-
-	host := c.Request().Host
-	if forwarded := c.Request().Header.Get("X-Forwarded-Host"); forwarded != "" {
-		host = forwarded
-	}
-
-	return scheme + "://" + host
-}

internal/middleware/device_auth.go

@@ -25,7 +25,6 @@ type DeviceContext struct {
 type DeviceAuthMiddleware struct {
 	db          *database.Queries
 	rateLimiter *DeviceRateLimiter
-	settings    *database.SettingsRegistry
 }
 
 func NewDeviceAuthMiddleware(db *database.Queries) *DeviceAuthMiddleware {
@@ -35,41 +34,6 @@ func NewDeviceAuthMiddleware(db *database.Queries) *DeviceAuthMiddleware {
 	}
 }
 
-// SetSettings wires the tunable settings registry so device rate limits are
-// read live on each authenticated request.
-func (m *DeviceAuthMiddleware) SetSettings(s *database.SettingsRegistry) { m.settings = s }
-
-// rateLimitConfig returns the active device rate limits from the registry, or
-// the historical defaults when no registry is wired.
-func (m *DeviceAuthMiddleware) rateLimitConfig() DeviceRateLimitConfig {
-	if m.settings != nil {
-		dl := m.settings.DeviceRateLimits()
-		return DeviceRateLimitConfig{
-			SyncRequestsPerMinute:     dl.Sync,
-			ProgressUpdatesPerMinute:  dl.Progress,
-			MetadataRequestsPerMinute: dl.Metadata,
-		}
-	}
-	return DeviceRateLimitConfig{
-		SyncRequestsPerMinute:     DefaultSyncRequestsPerMinute,
-		ProgressUpdatesPerMinute:  DefaultProgressUpdatesPerMinute,
-		MetadataRequestsPerMinute: DefaultMetadataRequestsPerMinute,
-	}
-}
-
-// rateLimitForRequestType returns the configured per-minute limit for a given
-// request type, for use in X-RateLimit-* headers.
-func (m *DeviceAuthMiddleware) rateLimitForRequestType(requestType string, config DeviceRateLimitConfig) int {
-	switch requestType {
-	case "progress":
-		return config.ProgressUpdatesPerMinute
-	case "metadata":
-		return config.MetadataRequestsPerMinute
-	default: // "sync" and any unknown type
-		return config.SyncRequestsPerMinute
-	}
-}
-
 func (m *DeviceAuthMiddleware) Authenticate(next echo.HandlerFunc) echo.HandlerFunc {
 	return func(c *echo.Context) error {
 		var device database.Devices
@@ -151,12 +115,15 @@ func (m *DeviceAuthMiddleware) Authenticate(next echo.HandlerFunc) echo.HandlerF
 		deviceUUID := uuid.UUID(device.ID.Bytes)
 		deviceID := deviceUUID.String()
 
-		config := m.rateLimitConfig()
-		limitForType := m.rateLimitForRequestType(requestType, config)
+		config := DeviceRateLimitConfig{
+			SyncRequestsPerMinute:     60,
+			ProgressUpdatesPerMinute:  120,
+			MetadataRequestsPerMinute: 30,
+		}
 
 		if !m.rateLimiter.CheckRateLimit(deviceID, requestType, config) {
 			remaining := m.rateLimiter.GetRemainingRequests(deviceID, requestType, config)
-			c.Response().Header().Set("X-RateLimit-Limit", strconv.Itoa(limitForType))
+			c.Response().Header().Set("X-RateLimit-Limit", "60")
 			c.Response().Header().Set("X-RateLimit-Remaining", strconv.Itoa(remaining))
 			c.Response().Header().Set("X-RateLimit-Reset", "60")
 			return c.JSON(http.StatusTooManyRequests, map[string]string{
@@ -167,7 +134,7 @@ func (m *DeviceAuthMiddleware) Authenticate(next echo.HandlerFunc) echo.HandlerF
 		}
 
 		remaining := m.rateLimiter.GetRemainingRequests(deviceID, requestType, config)
-		c.Response().Header().Set("X-RateLimit-Limit", strconv.Itoa(limitForType))
+		c.Response().Header().Set("X-RateLimit-Limit", "60")
 		c.Response().Header().Set("X-RateLimit-Remaining", strconv.Itoa(remaining))
 
 		ctx := DeviceContext{

internal/middleware/password_validator.go

@@ -1,146 +1,96 @@
 package middleware
 
 import (
-	"bookhoard/internal/database"
 	"fmt"
 	"regexp"
-	"sync"
 
 	"github.com/go-playground/validator/v10"
 )
 
-// specialCharRegex matches the historical "special character" set used by the
-// password complexity rules.
-const specialCharRegex = `[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]`
+// PasswordValidator validates password complexity requirements
+type PasswordValidator struct{}
 
-// PasswordValidator validates password complexity against the configured rules.
-// When a database.SettingsRegistry is wired via SetSettings, rules are read live and the
-// regex set is recompiled under a mutex on each validation. Without a registry
-// the historical hardcoded defaults (8+ chars, upper/lower/number/special) apply.
-type PasswordValidator struct {
-	settings *database.SettingsRegistry
-}
-
-// SetSettings wires the tunable settings registry.
-func (v *PasswordValidator) SetSettings(s *database.SettingsRegistry) { v.settings = s }
-
-// compileSpecialRegex isolates the regexp compile (which is safe to call
-// concurrently, but we keep it behind a cached var for the no-registry path).
-var (
-	specialOnce sync.Once
-	specialRe   *regexp.Regexp
-)
-
-func specialRegex() *regexp.Regexp {
-	specialOnce.Do(func() {
-		specialRe = regexp.MustCompile(specialCharRegex)
-	})
-	return specialRe
-}
-
-func (v *PasswordValidator) rules() database.PasswordRules {
-	if v.settings != nil {
-		return v.settings.PasswordRules()
-	}
-	return database.PasswordRules{MinLength: 8, Upper: true, Lower: true, Number: true, Special: true}
-}
-
-// Validate checks if a password meets the configured complexity requirements.
+// Validate checks if a password meets complexity requirements:
+// - Minimum 8 characters
+// - At least one uppercase letter
+// - At least one lowercase letter
+// - At least one number
+// - At least one special character
 func (v *PasswordValidator) Validate(fl validator.FieldLevel) bool {
-	return v.CheckPassword(fl.Field().String())
-}
+	password := fl.Field().String()
 
-// CheckPassword applies the active rules to a single password.
-func (v *PasswordValidator) CheckPassword(password string) bool {
-	r := v.rules()
-	if len(password) < r.MinLength {
+	// Check minimum length
+	if len(password) < 8 {
 		return false
 	}
-	if r.Upper && !regexp.MustCompile(`[A-Z]`).MatchString(password) {
+
+	// Check for uppercase
+	hasUpper := regexp.MustCompile(`[A-Z]`).MatchString(password)
+	if !hasUpper {
 		return false
 	}
-	if r.Lower && !regexp.MustCompile(`[a-z]`).MatchString(password) {
+
+	// Check for lowercase
+	hasLower := regexp.MustCompile(`[a-z]`).MatchString(password)
+	if !hasLower {
 		return false
 	}
-	if r.Number && !regexp.MustCompile(`[0-9]`).MatchString(password) {
+
+	// Check for number
+	hasNumber := regexp.MustCompile(`[0-9]`).MatchString(password)
+	if !hasNumber {
 		return false
 	}
-	if r.Special && !specialRegex().MatchString(password) {
+
+	// Check for special character
+	hasSpecial := regexp.MustCompile(`[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]`).MatchString(password)
+	if !hasSpecial {
 		return false
 	}
+
 	return true
 }
 
-// GetPasswordRequirements returns a human-readable list of the active password
-// requirements, driven by the configured rules when a registry is wired.
+// GetPasswordRequirements returns a human-readable list of password requirements
 func GetPasswordRequirements() []string {
-	return defaultPasswordValidator.Requirements()
+	return []string{
+		"At least 8 characters long",
+		"At least one uppercase letter (A-Z)",
+		"At least one lowercase letter (a-z)",
+		"At least one number (0-9)",
+		"At least one special character (!@#$%^&*()_+-=[]{}|;':\",./<>?)",
+	}
 }
 
-// Requirements returns the human-readable list for the receiver's active rules.
-func (v *PasswordValidator) Requirements() []string {
-	r := v.rules()
-	var out []string
-	out = append(out, fmt.Sprintf("At least %d characters long", r.MinLength))
-	if r.Upper {
-		out = append(out, "At least one uppercase letter (A-Z)")
-	}
-	if r.Lower {
-		out = append(out, "At least one lowercase letter (a-z)")
-	}
-	if r.Number {
-		out = append(out, "At least one number (0-9)")
-	}
-	if r.Special {
-		out = append(out, "At least one special character (!@#$%^&*()_+-=[]{}|;':\",./<>?)")
-	}
-	return out
-}
-
-// ValidatePassword checks a password against the default (hardcoded) rules and
-// returns an error describing the first unmet requirement. Retained for callers
-// that don't have access to a configured PasswordValidator instance.
+// ValidatePassword checks a password and returns an error if it doesn't meet requirements
 func ValidatePassword(password string) error {
-	v := defaultPasswordValidator
-	r := v.rules()
-	if len(password) < r.MinLength {
-		return fmt.Errorf("password must be at least %d characters long", r.MinLength)
+	if len(password) < 8 {
+		return fmt.Errorf("password must be at least 8 characters long")
 	}
-	if r.Upper && !regexp.MustCompile(`[A-Z]`).MatchString(password) {
+
+	if !regexp.MustCompile(`[A-Z]`).MatchString(password) {
 		return fmt.Errorf("password must contain at least one uppercase letter")
 	}
-	if r.Lower && !regexp.MustCompile(`[a-z]`).MatchString(password) {
+
+	if !regexp.MustCompile(`[a-z]`).MatchString(password) {
 		return fmt.Errorf("password must contain at least one lowercase letter")
 	}
-	if r.Number && !regexp.MustCompile(`[0-9]`).MatchString(password) {
+
+	if !regexp.MustCompile(`[0-9]`).MatchString(password) {
 		return fmt.Errorf("password must contain at least one number")
 	}
-	if r.Special && !specialRegex().MatchString(password) {
+
+	if !regexp.MustCompile(`[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]`).MatchString(password) {
 		return fmt.Errorf("password must contain at least one special character")
 	}
+
 	return nil
 }
 
-// defaultPasswordValidator is used by the package-level helpers
-// (GetPasswordRequirements, ValidatePassword) and as the fallback inside
-// RegisterPasswordValidation when no registry has been wired. Callers that want
-// live rule updates should construct their own PasswordValidator and call
-// SetSettings.
-var defaultPasswordValidator = &PasswordValidator{}
-
-// RegisterPasswordValidation registers the password validator with the
-// validator instance. The registered func re-evaluates rules on every call, so
-// changes to the wired registry take effect immediately.
+// RegisterPasswordValidation registers the password validator with the validator instance
 func RegisterPasswordValidation(v *validator.Validate) error {
 	return v.RegisterValidation("passwordcomplex", func(fl validator.FieldLevel) bool {
-		return defaultPasswordValidator.CheckPassword(fl.Field().String())
+		pv := &PasswordValidator{}
+		return pv.Validate(fl)
 	})
 }
-
-// SetDefaultPasswordSettings wires the settings registry into the package-level
-// default validator so that the struct-tag validator (used by echo's
-// CustomValidator) and ValidatePassword follow live configuration. Intended to
-// be called once at startup.
-func SetDefaultPasswordSettings(s *database.SettingsRegistry) {
-	defaultPasswordValidator.SetSettings(s)
-}

internal/opds/feed.go

@@ -9,25 +9,21 @@ import (
 // OPDS 1.2 Feed Structures
 
 type Feed struct {
-	XMLName      xml.Name `xml:"feed"`
-	Xmlns        string   `xml:"xmlns,attr"`
-	OpdsNS       string   `xml:"xmlns:opds,attr"`
-	DcNS         string   `xml:"xmlns:dc,attr"`
-	OpenSearchNS string   `xml:"xmlns:opensearch,attr,omitempty"`
-	ID           string   `xml:"id"`
-	Title        string   `xml:"title"`
-	Updated      string   `xml:"updated"`
-	Links        []Link   `xml:"link"`
-	TotalResults *int     `xml:"opensearch:totalResults,omitempty"`
-	ItemsPerPage *int     `xml:"opensearch:itemsPerPage,omitempty"`
-	StartIndex   *int     `xml:"opensearch:startIndex,omitempty"`
-	Entries      []Entry  `xml:"entry"`
+	XMLName xml.Name `xml:"feed"`
+	Xmlns   string   `xml:"xmlns,attr"`
+	OpdsNS  string   `xml:"xmlns:opds,attr"`
+	DcNS    string   `xml:"xmlns:dc,attr"`
+	ID      string   `xml:"id"`
+	Title   string   `xml:"title"`
+	Updated string   `xml:"updated"`
+	Links   []Link   `xml:"link"`
+	Entries []Entry  `xml:"entry"`
 }
 
 type Entry struct {
 	ID         string      `xml:"id"`
-	Title      string      `xml:"title"`
-	Author     *Author     `xml:"author,omitempty"`
+	Title      string      `xml:"dc:title"`
+	Creator    string      `xml:"dc:creator,omitempty"`
 	Updated    string      `xml:"updated"`
 	Summary    string      `xml:"summary,omitempty"`
 	Links      []Link      `xml:"link"`
@@ -36,12 +32,6 @@ type Entry struct {
 	Categories []Category  `xml:"category,omitempty"`
 }
 
-type Author struct {
-	XMLName xml.Name `xml:"author"`
-	Name    string   `xml:"name"`
-	URI     string   `xml:"uri,omitempty"`
-}
-
 type Link struct {
 	Href string `xml:"href,attr"`
 	Type string `xml:"type,attr"`
@@ -68,29 +58,17 @@ type Category struct {
 func NewFeed(feedID, title string) *Feed {
 	now := time.Now().Format(time.RFC3339)
 	return &Feed{
-		Xmlns:        "http://www.w3.org/2005/Atom",
-		OpdsNS:       "http://opds-spec.org/2010/",
-		DcNS:         "http://purl.org/dc/elements/1.1/",
-		OpenSearchNS: "http://a9.com/-/spec/opensearch/1.1/",
-		ID:           feedID,
-		Title:        title,
-		Updated:      now,
-		Links:        []Link{},
-		Entries:      []Entry{},
+		Xmlns:   "http://www.w3.org/2005/Atom",
+		OpdsNS:  "http://opds-spec.org/2010/",
+		DcNS:    "http://purl.org/dc/elements/1.1/",
+		ID:      feedID,
+		Title:   title,
+		Updated: now,
+		Links:   []Link{},
+		Entries: []Entry{},
 	}
 }
 
-// SetPagination populates the OpenSearch paging metadata (totalResults,
-// itemsPerPage, startIndex). startIndex is 1-based to match the page model.
-func (f *Feed) SetPagination(totalResults, itemsPerPage, startIndex int) {
-	tr := totalResults
-	ipp := itemsPerPage
-	si := startIndex
-	f.TotalResults = &tr
-	f.ItemsPerPage = &ipp
-	f.StartIndex = &si
-}
-
 // AddLink adds a link to the feed
 func (f *Feed) AddLink(href, linkType, rel string) {
 	f.Links = append(f.Links, Link{
@@ -107,17 +85,14 @@ func (f *Feed) AddEntry(entry Entry) {
 
 // NewEntry creates a new OPDS entry
 func NewEntry(id, title, creator, updated string) Entry {
-	e := Entry{
+	return Entry{
 		ID:       id,
 		Title:    title,
+		Creator:  creator,
 		Updated:  updated,
 		Links:    []Link{},
 		Metadata: []Meta{},
 	}
-	if creator != "" {
-		e.Author = &Author{Name: creator}
-	}
-	return e
 }
 
 // AddAcquisitionLink adds an acquisition link to the entry
@@ -194,62 +169,6 @@ func (f *Feed) GenerateXMLString() (string, error) {
 	return xml.Header + string(output), nil
 }
 
-// OpenSearchUrl is a single <Url> element in an OpenSearch description.
-type OpenSearchUrl struct {
-	XMLName  xml.Name `xml:"Url"`
-	Type     string   `xml:"type,attr"`
-	Template string   `xml:"template,attr"`
-}
-
-// OpenSearchDescription is an OpenSearch description document used by OPDS
-// clients (e.g. KOReader) to discover how to perform catalog searches. Clients
-// fetch this document at the catalog's rel="search" link, then substitute
-// {searchTerms} in the Url template to execute a query.
-type OpenSearchDescription struct {
-	XMLName        xml.Name      `xml:"OpenSearchDescription"`
-	Xmlns          string        `xml:"xmlns,attr"`
-	ShortName      string        `xml:"ShortName"`
-	Description    string        `xml:"Description"`
-	InputEncoding  string        `xml:"InputEncoding"`
-	OutputEncoding string        `xml:"OutputEncoding"`
-	Url            OpenSearchUrl `xml:"Url"`
-}
-
-// NewSearchDescription creates an OpenSearch description document whose Url
-// template points clients back to the search results endpoint. The template
-// must contain the {searchTerms} placeholder.
-func NewSearchDescription(shortName, description, template string) *OpenSearchDescription {
-	return &OpenSearchDescription{
-		Xmlns:          "http://a9.com/-/spec/opensearch/1.1/",
-		ShortName:      shortName,
-		Description:    description,
-		InputEncoding:  "UTF-8",
-		OutputEncoding: "UTF-8",
-		Url: OpenSearchUrl{
-			Type:     "application/atom+xml;profile=opds-catalog;kind=acquisition",
-			Template: template,
-		},
-	}
-}
-
-// GenerateXML generates the OpenSearch description XML
-func (d *OpenSearchDescription) GenerateXML() ([]byte, error) {
-	output, err := xml.MarshalIndent(d, "", "  ")
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal OpenSearch description: %w", err)
-	}
-	return output, nil
-}
-
-// GenerateXMLString generates the OpenSearch description XML as a string
-func (d *OpenSearchDescription) GenerateXMLString() (string, error) {
-	output, err := d.GenerateXML()
-	if err != nil {
-		return "", err
-	}
-	return xml.Header + string(output), nil
-}
-
 // NewErrorFeed creates an error feed
 func NewErrorFeed(message string) *Feed {
 	feed := NewFeed(

internal/opds/feed_test.go

@@ -71,8 +71,8 @@ func TestNewEntry(t *testing.T) {
 		t.Errorf("expected Title to be 'Test Title', got '%s'", entry.Title)
 	}
 
-	if entry.Author == nil || entry.Author.Name != "Test Author" {
-		t.Errorf("expected Author.Name to be 'Test Author', got %v", entry.Author)
+	if entry.Creator != "Test Author" {
+		t.Errorf("expected Creator to be 'Test Author', got '%s'", entry.Creator)
 	}
 
 	if entry.Updated != "2023-01-01T00:00:00Z" {
@@ -201,8 +201,8 @@ func TestFeedGenerateXML(t *testing.T) {
 		`<title>Test Feed</title>`,
 		`<entry>`,
 		`<id>urn:uuid:book-id</id>`,
-		`<title>Test Book</title>`,
-		`<name>Test Author</name>`,
+		`<dc:title>Test Book</dc:title>`,
+		`<dc:creator>Test Author</dc:creator>`,
 		`<link href="http://example.com/book.epub"`,
 		`rel="http://opds-spec.org/acquisition/open-access"`,
 		`<dc:identifier id="bookhoard">book-uuid-123</dc:identifier>`,
@@ -232,107 +232,6 @@ func TestNewErrorFeed(t *testing.T) {
 	}
 }
 
-func TestFeedSetPagination(t *testing.T) {
-	feed := NewFeed("urn:uuid:test-id", "Test Feed")
-	feed.SetPagination(1814, 50, 51)
-
-	if feed.TotalResults == nil || *feed.TotalResults != 1814 {
-		t.Errorf("expected TotalResults to be 1814, got %v", feed.TotalResults)
-	}
-	if feed.ItemsPerPage == nil || *feed.ItemsPerPage != 50 {
-		t.Errorf("expected ItemsPerPage to be 50, got %v", feed.ItemsPerPage)
-	}
-	if feed.StartIndex == nil || *feed.StartIndex != 51 {
-		t.Errorf("expected StartIndex to be 51, got %v", feed.StartIndex)
-	}
-}
-
-func TestFeedGenerateXMLPagination(t *testing.T) {
-	feed := NewFeed("urn:uuid:test-id", "Test Feed")
-	feed.AddLink("http://example.com/catalog?page=1", "application/atom+xml", "first")
-	feed.AddLink("http://example.com/catalog?page=1", "application/atom+xml", "previous")
-	feed.AddLink("http://example.com/catalog?page=2", "application/atom+xml", "self")
-	feed.AddLink("http://example.com/catalog?page=3", "application/atom+xml", "next")
-	feed.AddLink("http://example.com/catalog?page=37", "application/atom+xml", "last")
-	feed.SetPagination(1814, 50, 51)
-
-	output, err := feed.GenerateXML()
-	if err != nil {
-		t.Fatalf("failed to generate XML: %v", err)
-	}
-	outputStr := string(output)
-
-	requiredStrings := []string{
-		`xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"`,
-		`<opensearch:totalResults>1814</opensearch:totalResults>`,
-		`<opensearch:itemsPerPage>50</opensearch:itemsPerPage>`,
-		`<opensearch:startIndex>51</opensearch:startIndex>`,
-		`rel="first"`,
-		`rel="previous"`,
-		`rel="next"`,
-		`rel="last"`,
-		`page=3`,
-	}
-
-	for _, required := range requiredStrings {
-		if !contains(outputStr, required) {
-			t.Errorf("generated XML missing required string: %s", required)
-		}
-	}
-}
-
-func TestFeedGenerateXMLOmitsPaginationWhenUnset(t *testing.T) {
-	feed := NewFeed("urn:uuid:test-id", "Test Feed")
-
-	output, err := feed.GenerateXML()
-	if err != nil {
-		t.Fatalf("failed to generate XML: %v", err)
-	}
-	outputStr := string(output)
-
-	if contains(outputStr, "opensearch:totalResults") {
-		t.Errorf("expected no totalResults when pagination unset, but found it")
-	}
-	if contains(outputStr, "opensearch:itemsPerPage") {
-		t.Errorf("expected no itemsPerPage when pagination unset, but found it")
-	}
-}
-
-func TestNewSearchDescription(t *testing.T) {
-	template := "http://example.com/opds/devices/abc/search?q={searchTerms}&token=xyz"
-	desc := NewSearchDescription("Bookhoard", "Search the library", template)
-
-	if desc.ShortName != "Bookhoard" {
-		t.Errorf("expected ShortName 'Bookhoard', got '%s'", desc.ShortName)
-	}
-	if desc.Url.Template != template {
-		t.Errorf("expected template '%s', got '%s'", template, desc.Url.Template)
-	}
-}
-
-func TestSearchDescriptionGenerateXML(t *testing.T) {
-	template := "http://example.com/opds/devices/abc/search?q={searchTerms}"
-	desc := NewSearchDescription("Bookhoard", "Search the library", template)
-
-	output, err := desc.GenerateXMLString()
-	if err != nil {
-		t.Fatalf("failed to generate XML: %v", err)
-	}
-
-	requiredStrings := []string{
-		`<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">`,
-		`<ShortName>Bookhoard</ShortName>`,
-		`<Url type="application/atom+xml;profile=opds-catalog;kind=acquisition"`,
-		`template="http://example.com/opds/devices/abc/search?q={searchTerms}"`,
-	}
-
-	for _, required := range requiredStrings {
-		if !contains(output, required) {
-			t.Errorf("generated OpenSearch XML missing required string: %s", required)
-		}
-	}
-}
-
 func contains(s, substr string) bool {
 	return len(s) >= len(substr) && indexOf(s, substr) >= 0
 }

internal/router/admin_library.go

@@ -1,447 +0,0 @@
-package router
-
-import (
-	"bookhoard/internal/database"
-	"bookhoard/internal/handlers"
-	"bookhoard/templates"
-	"bytes"
-	"context"
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgtype"
-	"github.com/jackc/pgx/v5/pgxpool"
-	"github.com/labstack/echo/v5"
-)
-
-func registerAdminLibraryRoutes(cfg *Config, frontendProtected *echo.Group) {
-	g := frontendProtected.Group("", handlers.AdminMiddleware)
-
-	// HTMX: Create library
-	g.POST("/admin/library/create", func(c *echo.Context) error {
-		user := c.Get("user").(database.Users)
-
-		name := c.FormValue("name")
-		desc := c.FormValue("description")
-		libType := c.FormValue("type")
-		if name == "" || libType == "" {
-			return c.HTML(http.StatusBadRequest, `<div class="text-sm" style="color: var(--status-danger);">Name and type are required</div>`)
-		}
-
-		_, err := cfg.LibraryService.CreateLibrary(
-			c.Request().Context(),
-			name,
-			desc,
-			libType,
-			user.ID,
-		)
-		if err != nil {
-			return c.HTML(http.StatusInternalServerError, `<div class="text-sm" style="color: var(--status-danger);">Failed to create library</div>`)
-		}
-
-		return renderLibraryList(c, cfg)
-	})
-
-	// HTMX: Update library
-	g.PUT("/admin/library/:id", func(c *echo.Context) error {
-		libraryID, err := parseAdminUUID(c.Param("id"))
-		if err != nil {
-			return c.HTML(http.StatusBadRequest, `<div class="text-sm" style="color: var(--status-danger);">Invalid library ID</div>`)
-		}
-
-		name := c.FormValue("name")
-		desc := c.FormValue("description")
-		if name == "" {
-			return c.HTML(http.StatusBadRequest, `<div class="text-sm" style="color: var(--status-danger);">Name is required</div>`)
-		}
-
-		_, err = cfg.LibraryService.UpdateLibrary(c.Request().Context(), libraryID, name, desc)
-		if err != nil {
-			return c.HTML(http.StatusInternalServerError, `<div class="text-sm" style="color: var(--status-danger);">Failed to update library</div>`)
-		}
-
-		return renderLibraryList(c, cfg)
-	})
-
-	// HTMX: Delete library
-	g.DELETE("/admin/library/:id", func(c *echo.Context) error {
-		libraryID, err := parseAdminUUID(c.Param("id"))
-		if err != nil {
-			return c.HTML(http.StatusBadRequest, `<div class="text-sm" style="color: var(--status-danger);">Invalid library ID</div>`)
-		}
-
-		err = cfg.LibraryService.DeleteLibrary(c.Request().Context(), libraryID)
-		if err != nil {
-			return c.HTML(http.StatusInternalServerError, `<div class="text-sm" style="color: var(--status-danger);">Failed to delete library</div>`)
-		}
-
-		return renderLibraryList(c, cfg)
-	})
-
-	// HTMX: Library expanded panel
-	g.GET("/admin/library/:id/panel", func(c *echo.Context) error {
-		libraryID, err := parseAdminUUID(c.Param("id"))
-		if err != nil {
-			return c.HTML(http.StatusBadRequest, `<div class="text-sm" style="color: var(--status-danger);">Invalid library ID</div>`)
-		}
-
-		return renderLibraryPanel(c, cfg, libraryID)
-	})
-
-	// HTMX: Add folder
-	g.POST("/admin/library/:id/folders", func(c *echo.Context) error {
-		libraryID, err := parseAdminUUID(c.Param("id"))
-		if err != nil {
-			return c.HTML(http.StatusBadRequest, `<div class="text-sm" style="color: var(--status-danger);">Invalid library ID</div>`)
-		}
-
-		folderPath := c.FormValue("folder_path")
-		if folderPath == "" {
-			return renderLibraryPanel(c, cfg, libraryID)
-		}
-
-		if strings.Contains(folderPath, "..") {
-			return renderLibraryPanelWithError(c, cfg, libraryID, "Path traversal not allowed")
-		}
-
-		cleanPath := filepath.Clean(folderPath)
-		fileInfo, err := os.Stat(cleanPath)
-		if err != nil {
-			return renderLibraryPanelWithError(c, cfg, libraryID, "Folder path does not exist")
-		}
-		if !fileInfo.IsDir() {
-			return renderLibraryPanelWithError(c, cfg, libraryID, "Path must be a directory")
-		}
-
-		_, err = cfg.LibraryService.AddLibraryFolder(c.Request().Context(), libraryID, cleanPath)
-		if err != nil {
-			return renderLibraryPanelWithError(c, cfg, libraryID, "Failed to add folder: "+err.Error())
-		}
-
-		return renderLibraryPanel(c, cfg, libraryID)
-	})
-
-	// HTMX: Remove folder
-	g.DELETE("/admin/library/:id/folders", func(c *echo.Context) error {
-		libraryID, err := parseAdminUUID(c.Param("id"))
-		if err != nil {
-			return c.HTML(http.StatusBadRequest, `<div class="text-sm" style="color: var(--status-danger);">Invalid library ID</div>`)
-		}
-
-		folderPath := c.FormValue("folder_path")
-		if folderPath == "" {
-			return renderLibraryPanel(c, cfg, libraryID)
-		}
-
-		err = cfg.LibraryService.DeleteLibraryFolder(c.Request().Context(), libraryID, folderPath)
-		if err != nil {
-			return renderLibraryPanelWithError(c, cfg, libraryID, "Failed to remove folder")
-		}
-
-		return renderLibraryPanel(c, cfg, libraryID)
-	})
-
-	// HTMX: Folder browser
-	g.GET("/admin/library/browse", func(c *echo.Context) error {
-		path := c.QueryParam("path")
-		if path == "" {
-			path = "/"
-		}
-		targetInput := c.QueryParam("target_input")
-		libraryID := c.QueryParam("library_id")
-
-		dirs, currentPath, parentPath, err := cfg.LibraryService.BrowseDirectories(c.Request().Context(), path)
-		if err != nil {
-			return c.HTML(http.StatusBadRequest, `<div class="text-sm" style="color: var(--status-danger);">Cannot browse: `+err.Error()+`</div>`)
-		}
-
-		entries := make([]templates.DirEntry, len(dirs))
-		for i, d := range dirs {
-			fullPath := filepath.Join(currentPath, d)
-			entries[i] = templates.DirEntry{Name: d, Path: fullPath}
-		}
-
-		var buf bytes.Buffer
-		err = templates.FolderBrowserContent(currentPath, parentPath, entries, targetInput, libraryID).Render(c.Request().Context(), &buf)
-		if err != nil {
-			return err
-		}
-		return c.HTML(http.StatusOK, buf.String())
-	})
-
-	// HTMX: Set user visibility for library
-	g.POST("/admin/library/:id/visibility", func(c *echo.Context) error {
-		libraryID, err := parseAdminUUID(c.Param("id"))
-		if err != nil {
-			return c.HTML(http.StatusBadRequest, `<div class="text-sm" style="color: var(--status-danger);">Invalid library ID</div>`)
-		}
-
-		userIDStr := c.FormValue("user_id")
-		isVisible := c.FormValue("is_visible") == "true"
-
-		userID, err := parseAdminUUID(userIDStr)
-		if err != nil {
-			return c.HTML(http.StatusBadRequest, `<div class="text-sm" style="color: var(--status-danger);">Invalid user ID</div>`)
-		}
-
-		_, err = cfg.LibraryService.SetLibraryVisibility(c.Request().Context(), userID, libraryID, isVisible)
-		if err != nil {
-			return c.HTML(http.StatusInternalServerError, `<div class="text-sm" style="color: var(--status-danger);">Failed to update visibility</div>`)
-		}
-
-		return renderLibraryPanel(c, cfg, libraryID)
-	})
-}
-
-// renderLibraryList fetches all libraries + users and renders the LibraryList partial.
-func renderLibraryList(c *echo.Context, cfg *Config) error {
-	libraries, err := cfg.LibraryHandler.ListLibrariesData(c.Request().Context())
-	if err != nil {
-		return c.HTML(http.StatusInternalServerError, `<div class="text-sm" style="color: var(--status-danger);">Failed to load libraries</div>`)
-	}
-
-	libData := make([]templates.LibraryData, len(libraries))
-	for i, lib := range libraries {
-		libUUID, _ := uuid.FromBytes(lib.ID.Bytes[0:16])
-		folderCount := getFolderCount(c.Request().Context(), cfg, lib.ID)
-		libData[i] = templates.LibraryData{
-			ID:          libUUID.String(),
-			Name:        lib.Name,
-			Description: getText(lib.Description),
-			TypeName:    lib.TypeName,
-			TypeValue:   lib.TypeName,
-			FolderCount: folderCount,
-		}
-	}
-
-	users, err := cfg.Queries.ListUsers(c.Request().Context())
-	if err != nil {
-		log.Printf("ListUsers failed: %v", err)
-		users = []database.ListUsersRow{}
-	}
-	userData := make([]templates.User, len(users))
-	for i, u := range users {
-		userUUID, _ := uuid.FromBytes(u.ID.Bytes[0:16])
-		userData[i] = templates.User{
-			ID:       userUUID.String(),
-			Username: u.Username,
-			Email:    u.Email,
-			Role:     u.Role,
-		}
-	}
-
-	var buf bytes.Buffer
-	err = templates.LibraryList(templates.User{}, libData, userData).Render(c.Request().Context(), &buf)
-	if err != nil {
-		return err
-	}
-	return c.HTML(http.StatusOK, buf.String())
-}
-
-// renderLibraryPanel fetches library details and renders the LibraryPanel partial.
-func renderLibraryPanel(c *echo.Context, cfg *Config, libraryID pgtype.UUID) error {
-	return renderLibraryPanelWithError(c, cfg, libraryID, "")
-}
-
-func renderLibraryPanelWithError(c *echo.Context, cfg *Config, libraryID pgtype.UUID, errMsg string) error {
-	ctx := c.Request().Context()
-	libraryIDStr := uuid.UUID(libraryID.Bytes).String()
-
-	// Get library details
-	lib, err := cfg.LibraryService.GetLibrary(ctx, libraryID)
-	if err != nil {
-		return c.HTML(http.StatusNotFound, `<div class="text-sm" style="color: var(--status-danger);">Library not found</div>`)
-	}
-
-	libData := templates.LibraryData{
-		ID:          libraryIDStr,
-		Name:        lib.Name,
-		Description: getText(lib.Description),
-		TypeName:    lib.TypeName,
-		TypeValue:   lib.TypeName,
-	}
-
-	// Get folders
-	dbFolders, err := cfg.LibraryService.GetLibraryFolders(ctx, libraryID)
-	if err != nil {
-		log.Printf("GetLibraryFolders failed: %v", err)
-	}
-	folders := make([]templates.FolderData, len(dbFolders))
-	for i, f := range dbFolders {
-		folders[i] = templates.FolderData{FolderPath: f.FolderPath}
-	}
-	libData.FolderCount = len(folders)
-
-	// Get users
-	dbUsers, err := cfg.Queries.ListUsers(ctx)
-	if err != nil {
-		log.Printf("ListUsers failed: %v", err)
-		dbUsers = []database.ListUsersRow{}
-	}
-	userData := make([]templates.User, len(dbUsers))
-	for i, u := range dbUsers {
-		userUUID, _ := uuid.FromBytes(u.ID.Bytes[0:16])
-		userData[i] = templates.User{
-			ID:       userUUID.String(),
-			Username: u.Username,
-			Email:    u.Email,
-		}
-	}
-
-	// Get visibility for all users
-	visibility := make([]templates.UserVisibilityData, len(userData))
-	for i, u := range userData {
-		userUUID, _ := parseAdminUUID(u.ID)
-		visibleLibs, err := cfg.LibraryService.GetUserVisibleLibraries(ctx, userUUID)
-		if err != nil {
-			log.Printf("GetUserVisibleLibraries failed: %v", err)
-		}
-		isVisible := false
-		for _, vl := range visibleLibs {
-			if vl.ID.Bytes == libraryID.Bytes {
-				isVisible = true
-				break
-			}
-		}
-		visibility[i] = templates.UserVisibilityData{
-			UserID:    u.ID,
-			Username:  u.Username,
-			Email:     u.Email,
-			IsVisible: isVisible,
-		}
-	}
-
-	// Get issue count
-	issueStats, err := cfg.ProcessingIssuesHandler.GetProcessingIssueStatsData(ctx, libraryID)
-	if err != nil {
-		log.Printf("GetProcessingIssueStats failed: %v", err)
-	}
-	issueCount := issueStats.ErrorCount + issueStats.WarningCount + issueStats.InfoCount
-
-	// Get current user for template
-	tmplUser := templates.User{}
-	if u, ok := c.Get("user").(database.Users); ok {
-		userUUID, _ := uuid.FromBytes(u.ID.Bytes[0:16])
-		tmplUser = templates.User{
-			ID:       userUUID.String(),
-			Username: u.Username,
-			Role:     u.Role,
-		}
-	}
-
-	var buf bytes.Buffer
-	err = templates.LibraryPanel(tmplUser, libraryIDStr, libData, folders, userData, visibility, int(issueCount)).Render(ctx, &buf)
-	if err != nil {
-		return err
-	}
-
-	html := buf.String()
-	if errMsg != "" {
-		html = `<div class="p-3 mb-3 rounded-lg text-sm" style="background-color: color-mix(in srgb, var(--status-danger) 12%, var(--bg-secondary)); color: var(--status-danger);">` + errMsg + `</div>` + html
-	}
-	return c.HTML(http.StatusOK, html)
-}
-
-func getFolderCount(ctx context.Context, cfg *Config, libraryID pgtype.UUID) int {
-	folders, err := cfg.LibraryService.GetLibraryFolders(ctx, libraryID)
-	if err != nil {
-		return 0
-	}
-	return len(folders)
-}
-
-func parseAdminUUID(s string) (pgtype.UUID, error) {
-	parsed, err := uuid.Parse(s)
-	if err != nil {
-		return pgtype.UUID{}, err
-	}
-	return pgtype.UUID{Bytes: parsed, Valid: true}, nil
-}
-
-func getAdminStats(ctx context.Context, cfg *Config) templates.AdminStats {
-	stats := templates.AdminStats{}
-
-	libs, _ := cfg.LibraryHandler.ListLibrariesData(ctx)
-	stats.LibraryCount = len(libs)
-
-	users, _ := cfg.Queries.ListUsers(ctx)
-	stats.UserCount = len(users)
-
-	if pool, ok := cfg.DBPool.(*pgxpool.Pool); ok {
-		_ = pool.QueryRow(ctx, "SELECT COUNT(*) FROM media_items").Scan(&stats.MediaCount)
-		_ = pool.QueryRow(ctx, "SELECT COUNT(*) FROM devices").Scan(&stats.DeviceCount)
-	}
-
-	return stats
-}
-
-func registerAdminSettingsRoutes(cfg *Config, frontendProtected *echo.Group) {
-	g := frontendProtected.Group("", handlers.AdminMiddleware)
-
-	g.PUT("/admin/settings/scan", func(c *echo.Context) error {
-		ctx := c.Request().Context()
-
-		autoScan := c.FormValue("auto_scan_enabled") == "true"
-		intervalStr := c.FormValue("scan_poll_interval_seconds")
-		interval, err := strconv.Atoi(intervalStr)
-		if err != nil || interval < 1 || interval > 3600 {
-			return c.HTML(http.StatusBadRequest, `<div class="text-sm" style="color: var(--status-danger);">Interval must be between 1 and 3600 seconds</div>`)
-		}
-
-		autoScanStr := "false"
-		if autoScan {
-			autoScanStr = "true"
-		}
-		_ = cfg.Queries.UpdateSystemSetting(ctx, database.UpdateSystemSettingParams{
-			SettingKey:   "auto_scan_enabled",
-			SettingValue: autoScanStr,
-		})
-		_ = cfg.Queries.UpdateSystemSetting(ctx, database.UpdateSystemSettingParams{
-			SettingKey:   "scan_poll_interval_seconds",
-			SettingValue: strconv.Itoa(interval),
-		})
-
-		// Refresh the registry cache so the change is visible immediately.
-		if cfg.Settings != nil {
-			cfg.Settings.Reload(ctx)
-		}
-
-		scanSettings := templates.ScanSettingsData{
-			AutoScanEnabled:         autoScan,
-			ScanPollIntervalSeconds: interval,
-		}
-		var buf bytes.Buffer
-		_ = templates.ScanSettingsSection(scanSettings).Render(ctx, &buf)
-		return c.HTML(http.StatusOK, buf.String())
-	})
-
-	// HTMX endpoint for saving a single tunable setting. Returns a small HTML
-	// status snippet rendered into the row's status span.
-	g.PUT("/admin/settings/tunable", func(c *echo.Context) error {
-		ctx := c.Request().Context()
-		key := c.FormValue("key")
-		value := c.FormValue("value")
-
-		if cfg.SystemSettingsHandler == nil {
-			return c.HTML(http.StatusServiceUnavailable, `<span style="color: var(--status-danger);">settings unavailable</span>`)
-		}
-		resp, err := cfg.SystemSettingsHandler.ApplySetting(ctx, key, value)
-		if err != nil {
-			return c.HTML(http.StatusBadRequest, fmt.Sprintf(`<span style="color: var(--status-danger);">%s</span>`, err.Error()))
-		}
-
-		color := "var(--status-success)"
-		msg := "Saved"
-		if resp.ReloadRequired {
-			color = "var(--status-warning)"
-			msg = "Saved — restart required"
-		}
-		return c.HTML(http.StatusOK, fmt.Sprintf(`<span style="color: %s;">%s</span>`, color, msg))
-	})
-}

internal/router/frontend.go

@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"fmt"
 	"log"
 	"net/http"
 	"strconv"
 	"time"
 
+	"bookhoard/internal/config"
 	"bookhoard/internal/database"
 	"bookhoard/internal/handlers"
 	"bookhoard/internal/services"
@@ -215,9 +215,6 @@ func registerFrontendRoutes(cfg *Config) {
 			bookInfoList = []handlers.BookInfo{}
 		}
 
-		seriesUserUUID, _ := uuid.Parse(user.ID)
-		bookInfoList = handlers.MarkActiveConflicts(c.Request().Context(), cfg.Queries, pgtype.UUID{Bytes: seriesUserUUID, Valid: true}, bookInfoList)
-
 		var buf bytes.Buffer
 		err = templates.BrowseDetail(user, "📚", "Series", seriesName, seriesName, "/series", "All Series", "📚", "This series doesn't have any books yet", bookInfoList, errorMsg).Render(c.Request().Context(), &buf)
 		if err != nil {
@@ -270,9 +267,6 @@ func registerFrontendRoutes(cfg *Config) {
 			bookInfoList = []handlers.BookInfo{}
 		}
 
-		tagUserUUID, _ := uuid.Parse(user.ID)
-		bookInfoList = handlers.MarkActiveConflicts(c.Request().Context(), cfg.Queries, pgtype.UUID{Bytes: tagUserUUID, Valid: true}, bookInfoList)
-
 		var buf bytes.Buffer
 		err = templates.BrowseDetail(user, "🏷️", "Tag", tagName, tagName, "/bookshelf", "Bookshelf", "🏷️", "No books found with this tag", bookInfoList, errorMsg).Render(c.Request().Context(), &buf)
 		if err != nil {
@@ -360,7 +354,6 @@ func registerFrontendRoutes(cfg *Config) {
 		}
 
 		var buf bytes.Buffer
-		bookInfoList = handlers.MarkActiveConflicts(c.Request().Context(), cfg.Queries, pgtype.UUID{Bytes: userUUID, Valid: true}, bookInfoList)
 		err = templates.BookShelf(user, libData, libraryID, errorMsg, savedFilters, bookInfoList, limit, offset, totalCount).Render(c.Request().Context(), &buf)
 		if err != nil {
 			return err
@@ -415,8 +408,7 @@ func registerFrontendRoutes(cfg *Config) {
 		// Get only visible sections for the dashboard display
 		visibleSections := cfg.DashboardService.FilterHiddenCollections(allSections, prefs.HiddenCollections)
 
-		userPgID := pgtype.UUID{Bytes: userUUID, Valid: true}
-		sectionData := handlers.MarkActiveConflictsSections(c.Request().Context(), cfg.Queries, userPgID, handlers.BuildSections(visibleSections, libraryID))
+		sectionData := handlers.BuildSections(visibleSections, libraryID)
 		allSectionsData := handlers.BuildSections(allSections, libraryID)
 
 		var buf bytes.Buffer
@@ -631,7 +623,6 @@ func registerFrontendRoutes(cfg *Config) {
 			Description: collection.Description.String,
 			Color:       collection.Color.String,
 			Icon:        collection.Icon.String,
-			IsSystem:    collection.IsSystemCollection.Bool,
 		}
 
 		var buf bytes.Buffer
@@ -734,7 +725,10 @@ func registerFrontendRoutes(cfg *Config) {
 		}
 
 		// Get base URL from database config with fallback to config/env var
-		baseURL := cfg.getBaseURL(c.Request().Context())
+		baseURL := config.GetBaseURL(c.Request().Context(), cfg.Queries)
+		if baseURL == "" {
+			baseURL = cfg.Cfg.BaseURL
+		}
 
 		var buf bytes.Buffer
 		err = templates.Devices(user, devices, pendingList, errorMsg, baseURL).Render(c.Request().Context(), &buf)
@@ -811,9 +805,8 @@ func registerFrontendRoutes(cfg *Config) {
 		if err != nil {
 			return renderErrorPage(c, "Error loading user", "user_load_error")
 		}
-		stats := getAdminStats(c.Request().Context(), cfg)
 		var buf bytes.Buffer
-		err = templates.Admin(user, stats).Render(c.Request().Context(), &buf)
+		err = templates.Admin(user).Render(c.Request().Context(), &buf)
 		if err != nil {
 			return err
 		}
@@ -825,9 +818,8 @@ func registerFrontendRoutes(cfg *Config) {
 		if err != nil {
 			return renderErrorPage(c, "Error loading user", "user_load_error")
 		}
-		stats := getAdminStats(c.Request().Context(), cfg)
 		var buf bytes.Buffer
-		err = templates.Admin(user, stats).Render(c.Request().Context(), &buf)
+		err = templates.Admin(user).Render(c.Request().Context(), &buf)
 		if err != nil {
 			return err
 		}
@@ -851,14 +843,11 @@ func registerFrontendRoutes(cfg *Config) {
 		libData := make([]templates.LibraryData, len(libraries))
 		for i, lib := range libraries {
 			libUUID, _ := uuid.FromBytes(lib.ID.Bytes[0:16])
-			folders, _ := cfg.LibraryService.GetLibraryFolders(c.Request().Context(), lib.ID)
 			libData[i] = templates.LibraryData{
 				ID:          libUUID.String(),
 				Name:        lib.Name,
 				Description: getText(lib.Description),
 				TypeName:    lib.TypeName,
-				TypeValue:   lib.TypeName,
-				FolderCount: len(folders),
 			}
 		}
 
@@ -945,67 +934,6 @@ func registerFrontendRoutes(cfg *Config) {
 		return c.HTML(http.StatusOK, buf.String())
 	}))
 
-	// Admin hash conflicts page: content-duplicate groups flagged during hash
-	// backfill or rescan, resolved by keeping all copies or merging into one.
-	frontendProtected.GET("/admin/hash-conflicts", handlers.AdminMiddleware(func(c *echo.Context) error {
-		user, err := getTemplateUserWithTheme(c, cfg)
-		if err != nil {
-			return renderErrorPage(c, "Error loading user", "user_load_error")
-		}
-
-		pending, err := cfg.Queries.ListPendingHashConflicts(c.Request().Context())
-		if err != nil {
-			return renderErrorPage(c, "Error loading hash conflicts", "conflicts_load_error")
-		}
-
-		conflicts := make([]templates.HashConflictData, 0, len(pending))
-		for _, p := range pending {
-			conflict := templates.HashConflictData{
-				ID:          uuid.UUID(p.ID.Bytes).String(),
-				LibraryName: p.LibraryName,
-				SHA256:      p.FileSha256,
-				SHAShort:    p.FileSha256[:16] + "…",
-				CreatedAt:   p.CreatedAt.Time.Format("Jan 2, 2006"),
-				Items:       []templates.HashConflictItemData{},
-			}
-
-			items, err := cfg.Queries.ListMediaItemsBySHA256AndLibrary(c.Request().Context(), database.ListMediaItemsBySHA256AndLibraryParams{
-				FileSha256: pgtype.Text{String: p.FileSha256, Valid: true},
-				LibraryID:  p.LibraryID,
-			})
-			if err != nil {
-				continue
-			}
-
-			for _, mi := range items {
-				counts, err := cfg.Queries.GetMediaItemUsageCounts(c.Request().Context(), mi.ID)
-				if err != nil {
-					counts = database.GetMediaItemUsageCountsRow{}
-				}
-				totalData := counts.ProgressCount + counts.HighlightsCount + counts.BookmarksCount + counts.NotesCount + counts.CollectionsCount
-				conflict.Items = append(conflict.Items, templates.HashConflictItemData{
-					ID:             uuid.UUID(mi.ID.Bytes).String(),
-					Title:          mi.Title,
-					Author:         mi.Author.String,
-					FilePath:       mi.FilePath,
-					FileSize:       mi.FileSize.Int64,
-					UsageSummary:   fmt.Sprintf("%d progress, %d highlights, %d bookmarks, %d notes, %d collections",
-						counts.ProgressCount, counts.HighlightsCount, counts.BookmarksCount, counts.NotesCount, counts.CollectionsCount),
-					HasReadingData: totalData > 0,
-				})
-			}
-
-			conflicts = append(conflicts, conflict)
-		}
-
-		var buf bytes.Buffer
-		err = templates.AdminHashConflicts(user, conflicts).Render(c.Request().Context(), &buf)
-		if err != nil {
-			return err
-		}
-		return c.HTML(http.StatusOK, buf.String())
-	}))
-
 	// Admin users page
 	frontendProtected.GET("/admin/users", handlers.AdminMiddleware(func(c *echo.Context) error {
 		user, err := getTemplateUserWithTheme(c, cfg)
@@ -1057,67 +985,24 @@ func registerFrontendRoutes(cfg *Config) {
 			return renderErrorPage(c, "Error loading user", "user_load_error")
 		}
 
-		ctx := c.Request().Context()
-
 		// Fetch current system configuration - just base_url
-		baseURL := cfg.getBaseURL(ctx)
+		baseURL := config.GetBaseURL(c.Request().Context(), cfg.Queries)
+		if baseURL == "" {
+			baseURL = cfg.Cfg.BaseURL
+		}
 
 		systemConfig := map[string]string{
 			"base_url":         baseURL,
 			"default_timezone": "UTC",
 		}
 
-		defaultTimezone, err := cfg.Queries.GetSystemTimezone(ctx)
+		defaultTimezone, err := cfg.Queries.GetSystemTimezone(c.Request().Context())
 		if err == nil && defaultTimezone != "" {
 			systemConfig["default_timezone"] = defaultTimezone
 		}
 
-		// Fetch scan settings
-		scanSettings := templates.ScanSettingsData{
-			AutoScanEnabled:         true,
-			ScanPollIntervalSeconds: 60,
-		}
-		if val, err := cfg.Queries.GetSystemSetting(ctx, "auto_scan_enabled"); err == nil {
-			scanSettings.AutoScanEnabled = val == "true"
-		}
-		if val, err := cfg.Queries.GetSystemSetting(ctx, "scan_poll_interval_seconds"); err == nil {
-			if n, err := strconv.Atoi(val); err == nil {
-				scanSettings.ScanPollIntervalSeconds = n
-			}
-		}
-
-		// Load tunable settings entries from the registry. Exclude keys that
-		// already have their own dedicated UI cards (timezone dropdown, scan
-		// settings) so they aren't listed twice.
-		dedicatedUI := map[string]bool{
-			"default_timezone":          true,
-			"scan_poll_interval_seconds": true,
-			"auto_scan_enabled":         true,
-		}
-		var tunableSettings []templates.SettingEntry
-		if cfg.Settings != nil {
-			for _, e := range cfg.Settings.All() {
-				if dedicatedUI[e.Key] {
-					continue
-				}
-				tunableSettings = append(tunableSettings, templates.SettingEntry{
-					Key:             e.Key,
-					Value:           e.Value,
-					Type:            e.Type,
-					Min:             e.Min,
-					Max:             e.Max,
-					RequiresRestart: e.RequiresRestart,
-					Category:        e.Category,
-					Group:           e.Group,
-					Description:     e.Description,
-					IsDefault:       e.IsDefault,
-				})
-			}
-		}
-		liveGroups, restartGroups := templates.GroupTunableSettings(tunableSettings)
-
 		var buf bytes.Buffer
-		err = templates.AdminSettings(user, systemConfig, scanSettings, liveGroups, restartGroups, "").Render(ctx, &buf)
+		err = templates.AdminSettings(user, systemConfig, "").Render(c.Request().Context(), &buf)
 		if err != nil {
 			return err
 		}
@@ -1159,11 +1044,6 @@ func registerFrontendRoutes(cfg *Config) {
 		return c.HTML(http.StatusOK, buf.String())
 	}))
 
-	// Admin library HTMX endpoints
-	registerAdminLibraryRoutes(cfg, frontendProtected)
-	// Admin settings HTMX endpoints
-	registerAdminSettingsRoutes(cfg, frontendProtected)
-
 	// ============================================================================
 	// LEGACY API ROUTES (for backward compatibility)
 	// ============================================================================
@@ -1197,7 +1077,10 @@ func registerFrontendRoutes(cfg *Config) {
 		}
 
 		// Get base URL from database config with fallback to config/env var
-		baseURL := cfg.getBaseURL(c.Request().Context())
+		baseURL := config.GetBaseURL(c.Request().Context(), cfg.Queries)
+		if baseURL == "" {
+			baseURL = cfg.Cfg.BaseURL
+		}
 
 		var buf bytes.Buffer
 		err = templates.Devices(user, devices, pendingList, errorMsg, baseURL).Render(c.Request().Context(), &buf)

internal/router/helpers.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"log"
 	"net/url"
-	"time"
 
 	"bookhoard/internal/database"
 	"bookhoard/templates"
@@ -67,7 +66,7 @@ func convertPending(pending []map[string]interface{}) []templates.PendingRegistr
 			RegistrationID: p["registration_id"].(string),
 			DeviceName:     p["device_name"].(string),
 			DeviceType:     p["device_type"].(string),
-			ExpiresAt:      p["expires_at"].(time.Time).Format(time.RFC3339),
+			ExpiresAt:      p["expires_at"].(string),
 		}
 	}
 	return result
@@ -118,17 +117,6 @@ func resolveLibrary(c *echo.Context, cfg *Config, userUUID string) LibraryResolu
 		libraries = []database.GetUserVisibleLibrariesRow{}
 	}
 
-	counts, countErr := cfg.Queries.GetVisibleLibraryMediaCounts(c.Request().Context(), uuidToPGType(userU))
-	if countErr != nil {
-		log.Printf("GetVisibleLibraryMediaCounts failed: %v", countErr)
-		counts = []database.GetVisibleLibraryMediaCountsRow{}
-	}
-	countMap := make(map[string]int64, len(counts))
-	for _, mc := range counts {
-		mcUUID, _ := uuid.FromBytes(mc.ID.Bytes[0:16])
-		countMap[mcUUID.String()] = mc.MediaCount
-	}
-
 	res.Libraries = make([]templates.LibraryData, len(libraries))
 	for i, lib := range libraries {
 		libUUID, _ := uuid.FromBytes(lib.ID.Bytes[0:16])
@@ -137,7 +125,6 @@ func resolveLibrary(c *echo.Context, cfg *Config, userUUID string) LibraryResolu
 			Name:        lib.Name,
 			Description: getText(lib.Description),
 			TypeName:    lib.TypeName,
-			MediaCount:  countMap[libUUID.String()],
 		}
 	}
 

internal/router/library.go

@@ -38,8 +38,6 @@ func registerLibraryRoutes(cfg *Config) {
 	adminLibrary.GET("/:id/stats", cfg.LibraryHandler.GetLibraryStats)
 	adminLibrary.GET("/:id/issues/list", cfg.ProcessingIssuesHandler.ListProcessingIssues)
 	adminLibrary.GET("/:id/issues/stats", cfg.ProcessingIssuesHandler.GetProcessingIssueStats)
-	adminLibrary.POST("/:id/issues/:issueId/:mediaItemId/resolve", cfg.ProcessingIssuesHandler.ResolveProcessingIssue)
-	adminLibrary.DELETE("/:id/issues/:issueId", cfg.ProcessingIssuesHandler.DeleteProcessingIssue)
 	adminLibrary.POST("/:id/scan", func(c *echo.Context) error {
 		libraryID := c.Param("id")
 		scanReq := map[string]interface{}{

internal/router/media.go

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

internal/router/router.go

@@ -39,7 +39,6 @@ type Config struct {
 	Echo                    *echo.Echo
 	Queries                 *database.Queries
 	Cfg                     *config.Config
-	Settings                *database.SettingsRegistry
 	DBPool                  interface{} // pgxpool.Pool interface
 	AuthHandler             *handlers.AuthHandler
 	LibraryHandler          *handlers.LibraryHandler
@@ -47,7 +46,6 @@ type Config struct {
 	MediaHandler            *handlers.MediaHandler
 	MatchingHandler         *handlers.MatchingHandler
 	ProcessingIssuesHandler *handlers.ProcessingIssuesHandler
-	HashConflictsHandler    *handlers.HashConflictsHandler
 	KOReaderHandler         *handlers.KOReaderHandler
 	WSHandler               *handlers.WSHandler
 	ConflictHandler         *handlers.ConflictHandler
@@ -64,32 +62,12 @@ type Config struct {
 	ConnManager             *sync.ConnectionManager
 	QueueProcessor          *sync.SyncQueueProcessor
 	ProgressService         *sync.ProgressService
-	AnnotationService       *sync.AnnotationService
 	DeviceAuthMiddleware    *middleware.DeviceAuthMiddleware
 	LoginTracker            *ratelimit.LoginAttemptTracker
 	ScannerHandler          *handlers.Handler
 	JobsHandler             *handlers.JobsHandler
-	SidecarHandler           *handlers.SidecarHandler
+	SidecarHandler          *handlers.SidecarHandler
 	ReaderHandler           *handlers.ReaderHandler
-	LibraryService          *services.LibraryService
-}
-
-// getBaseURL returns the configured base URL from the database, falling back to
-// the env var / config default. Uses a closure to adapt the database query to
-// config.SystemConfigGetter.
-func (cfg *Config) getBaseURL(ctx context.Context) string {
-	getter := func(ctx context.Context, key string) (string, error) {
-		row, err := cfg.Queries.GetSystemConfig(ctx, key)
-		if err != nil {
-			return "", err
-		}
-		return row.Value, nil
-	}
-	baseURL := config.GetBaseURL(ctx, getter)
-	if baseURL == "" {
-		baseURL = cfg.Cfg.BaseURL
-	}
-	return baseURL
 }
 
 // createJWTMiddleware creates a JWT middleware with proper user context setup
@@ -210,15 +188,10 @@ func RegisterRoutes(cfg *Config) *handlers.Handler {
 	}
 	e.Validator = &CustomValidator{validator: v}
 
-	// Setup redirect middleware - must run before all routes
-	e.Pre(setupRedirectMiddleware(cfg))
-
-	// Rate limiter. The per-minute value comes from the settings registry (DB);
-	// the enabled flag stays env-driven since disabling rate limiting is a
-	// deployment-time decision, not a runtime tunable.
+	// Rate limiter
 	rateLimiterConfig := ratelimit.RateLimiterConfig{
 		Enabled:           cfg.Cfg.RateLimitEnabled,
-		RequestsPerMinute: cfg.Settings.AuthRateLimit(),
+		RequestsPerMinute: cfg.Cfg.RequestsPerMinute,
 		CleanupInterval:   5 * time.Minute,
 	}
 	rateLimiter := ratelimit.NewRateLimiter(rateLimiterConfig)
@@ -233,7 +206,6 @@ func RegisterRoutes(cfg *Config) *handlers.Handler {
 	cfg.ScannerHandler = scannerHandler
 
 	// Register route groups
-	registerSetupRoutes(cfg)
 	registerAuthRoutes(cfg, rateLimitMiddleware)
 	registerLibraryRoutes(cfg)
 	registerDeviceRoutes(cfg)
@@ -295,17 +267,6 @@ func RegisterRoutes(cfg *Config) *handlers.Handler {
 		}
 	}()
 
-	// One-time hash backfill: compute and store SHA-256 for media items
-	// imported before hashing existed, then flag any content-duplicate groups
-	// for admin review on the Hash Conflicts page. Runs independently of
-	// auto-scan (it is a one-shot self-heal, not a recurring scan) and is a
-	// no-op once every item is hashed. Delayed so it does not compete with
-	// startup scans for disk I/O.
-	go func() {
-		time.Sleep(30 * time.Second)
-		services.NewHashBackfillService(cfg.Queries).Run(context.Background())
-	}()
-
 	// Register progress routes with actual handler
 	registerProgressRoutes(cfg, scannerHandler)
 
@@ -313,9 +274,5 @@ func RegisterRoutes(cfg *Config) *handlers.Handler {
 	admin := protected.Group("", handlers.AdminMiddleware)
 	registerScannerRoutes(admin, scannerHandler)
 
-	// Hash conflict routes (admin only)
-	admin.GET("/api/admin/hash-conflicts", cfg.HashConflictsHandler.ListHashConflicts)
-	admin.POST("/api/admin/hash-conflicts/:id/resolve", cfg.HashConflictsHandler.ResolveHashConflict)
-
 	return scannerHandler
 }

internal/router/search.go

@@ -112,15 +112,9 @@ func handleSearchHTML(c *echo.Context, cfg *Config) error {
 			CoverImagePath: utils.ResolveMediaURL(pgtype.UUID{Bytes: bookLibUUID, Valid: true}, book.CoverImagePath),
 		}
 	}
-	// Stamp active conflict flags so cards route the play action correctly
-	bookInfoList = handlers.MarkActiveConflicts(c.Request().Context(), cfg.Queries, user.ID, bookInfoList)
-	// Render using BooksGrid template (or BookPickerGrid for collection picker)
+	// Render using BooksGrid template
 	var buf bytes.Buffer
-	if c.QueryParam("show_checkbox") == "true" {
-		err = templates.BookPickerGrid(bookInfoList).Render(c.Request().Context(), &buf)
-	} else {
-		err = templates.BooksGrid(bookInfoList, limit, offset, totalCount, libraryID).Render(c.Request().Context(), &buf)
-	}
+	err = templates.BooksGrid(bookInfoList, limit, offset, totalCount, libraryID).Render(c.Request().Context(), &buf)
 	if err != nil {
 		log.Printf("Template render error: %v", err)
 		return c.HTML(http.StatusInternalServerError, `<div style="color: red;">Render error</div>`)

internal/router/setup.go

@@ -1,90 +0,0 @@
-package router
-
-import (
-	"bytes"
-	"context"
-	"log"
-	"net/http"
-	"strings"
-
-	"bookhoard/internal/setupstatus"
-	"bookhoard/templates"
-
-	"github.com/labstack/echo/v5"
-)
-
-func isSetupComplete(cfg *Config) bool {
-	getter := func(ctx context.Context) (string, error) {
-		row, err := cfg.Queries.GetSystemConfig(ctx, "base_url")
-		if err != nil {
-			return "", err
-		}
-		return row.Value, nil
-	}
-	return setupstatus.IsSetupComplete(context.Background(), cfg.Queries, getter)
-}
-
-// setupAllowedAPIRoutes lists API endpoints that remain accessible before
-// initial setup is complete so the server can be configured via API.
-var setupAllowedAPIRoutes = []string{
-	"/api/auth/register",
-	"/api/auth/login",
-	"/api/system/config",
-}
-
-// isAllowedDuringSetup reports whether a request path should bypass the setup
-// gate. This includes the setup page itself, static assets, health checks, and
-// the minimal set of API routes needed to perform initial configuration.
-func isAllowedDuringSetup(path string) bool {
-	if path == "/setup" || path == "/setup/" {
-		return true
-	}
-	if strings.HasPrefix(path, "/static/") || path == "/health" || path == "/favicon.ico" {
-		return true
-	}
-	for _, route := range setupAllowedAPIRoutes {
-		if path == route || strings.HasPrefix(path, route+"/") {
-			return true
-		}
-	}
-	return false
-}
-
-func setupRedirectMiddleware(cfg *Config) echo.MiddlewareFunc {
-	return func(next echo.HandlerFunc) echo.HandlerFunc {
-		return func(c *echo.Context) error {
-			path := c.Request().URL.Path
-
-			if isAllowedDuringSetup(path) {
-				return next(c)
-			}
-
-			if !isSetupComplete(cfg) {
-				if strings.HasPrefix(path, "/api/") {
-					return c.JSON(http.StatusServiceUnavailable, map[string]string{
-						"error": "Server setup is not complete. Configure an admin account and base_url via the setup wizard or API.",
-					})
-				}
-				return c.Redirect(http.StatusFound, "/setup")
-			}
-
-			return next(c)
-		}
-	}
-}
-
-func registerSetupRoutes(cfg *Config) {
-	e := cfg.Echo
-
-	e.GET("/setup", func(c *echo.Context) error {
-		if isSetupComplete(cfg) {
-			return c.Redirect(http.StatusFound, "/")
-		}
-		var buf bytes.Buffer
-		if err := templates.Setup().Render(c.Request().Context(), &buf); err != nil {
-			log.Printf("Failed to render setup template: %v", err)
-			return c.HTML(http.StatusInternalServerError, "Failed to render setup page")
-		}
-		return c.HTML(http.StatusOK, buf.String())
-	})
-}

internal/router/sync.go

@@ -33,8 +33,6 @@ func registerSyncRoutes(cfg *Config) {
 	// API clients can use Authorization header: Authorization: Bearer {token}
 	koboHandler := handlers.NewKoboHandler(cfg.Queries, cfg.ConnManager)
 	koboHandler.SetProgressService(cfg.ProgressService)
-	koboHandler.SetAnnotationService(cfg.AnnotationService)
-	koboHandler.SetLibraryService(cfg.LibraryService)
 	koboSync := e.Group("/api/sync/kobo/:token")
 	koboSync.POST("/markup", cfg.DeviceAuthMiddleware.Authenticate(koboHandler.Markup))
 	koboSync.POST("/bookmark", cfg.DeviceAuthMiddleware.Authenticate(koboHandler.Bookmark))

internal/router/system.go

@@ -17,10 +17,4 @@ func registerSystemRoutes(cfg *Config) {
 	// System configuration routes (admin-only)
 	system.GET("/config", cfg.SidecarHandler.GetSystemConfiguration)
 	system.PUT("/config", cfg.SidecarHandler.UpdateSystemConfiguration)
-
-	// Unified tunable settings (admin-only). These back the admin UI's
-	// editable System Settings sections and supersede the legacy
-	// /api/libraries/scan-settings JSON routes.
-	system.GET("/settings", cfg.SystemSettingsHandler.GetSettings)
-	system.PUT("/settings", cfg.SystemSettingsHandler.UpdateSetting)
 }

internal/services/book_matching.go

@@ -46,15 +46,13 @@ type LinkBookRequest struct {
 
 // BookMatchingService handles universal book matching
 type BookMatchingService struct {
-	db       *database.Queries
-	resolver *BookResolver
+	db *database.Queries
 }
 
 // NewBookMatchingService creates a new book matching service
 func NewBookMatchingService(db *database.Queries) *BookMatchingService {
 	return &BookMatchingService{
-		db:       db,
-		resolver: NewBookResolver(db),
+		db: db,
 	}
 }
 
@@ -169,21 +167,27 @@ func (s *BookMatchingService) matchByOPFUUID(ctx context.Context, identifiers []
 	return nil
 }
 
-// matchBySHA256 attempts to match by file SHA-256 hash.
-// Uses the shared BookResolver so it is both indexed (no full-table scan) and
-// format-aware: a converted/alternate format hash (media_item_formats) matches
-// in addition to the primary media_items.file_sha256.
+// matchBySHA256 attempts to match by file SHA-256 hash
 func (s *BookMatchingService) matchBySHA256(ctx context.Context, sha256 string) *BookMatch {
-	item, method, err := s.resolver.ResolveBySHA256(ctx, sha256)
-	if err != nil || !item.ID.Valid {
+	items, err := s.db.ListMediaItems(ctx, database.ListMediaItemsParams{
+		Limit:  1000,
+		Offset: 0,
+	})
+	if err != nil {
 		return nil
 	}
-	return &BookMatch{
-		MediaItemID:   item.ID.Bytes,
-		BookhoardUUID: item.ID.Bytes,
-		Confidence:    0.9,
-		MatchMethod:   "sha256_" + string(method),
+
+	for _, item := range items {
+		if item.FileSha256.Valid && item.FileSha256.String == sha256 {
+			return &BookMatch{
+				MediaItemID:   item.ID.Bytes,
+				BookhoardUUID: item.ID.Bytes,
+				Confidence:    0.9,
+				MatchMethod:   "sha256_match",
+			}
+		}
 	}
+	return nil
 }
 
 // matchByOPFIdentifier attempts to match by OPF identifier

internal/services/book_resolver.go

@@ -1,68 +0,0 @@
-package services
-
-import (
-	"bookhoard/internal/database"
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// ResolveMethod describes how a media item was resolved from a client-supplied identifier.
-type ResolveMethod string
-
-const (
-	MethodNone         ResolveMethod = ""
-	MethodSHA256       ResolveMethod = "sha256"        // matched on media_items.file_sha256
-	MethodSHA256Format ResolveMethod = "sha256_format" // matched on media_item_formats.file_sha256 (converted/alternate format)
-)
-
-// BookResolver is the single shared path from a client-supplied identifier to a
-// media_item.
-//
-// All client/sync interfaces (koreader, kobo, OPDS, the device-link UI, and any
-// future mobile app) should resolve books through BookResolver so they share
-// identical matching semantics. In particular it provides format-aware SHA-256
-// matching: a converted file (KEPUB/PDF) whose hash lives in media_item_formats
-// resolves just as well as the primary format. The import-time SHA-256 is the
-// canonical shared identifier across every client.
-type BookResolver struct {
-	db *database.Queries
-}
-
-// NewBookResolver constructs a resolver backed by the given queries.
-func NewBookResolver(db *database.Queries) *BookResolver {
-	return &BookResolver{db: db}
-}
-
-// ResolveBySHA256 resolves a media item by its content hash. It checks the
-// primary media_items.file_sha256 first, then media_item_formats.file_sha256 so
-// that a converted/alternate format (KEPUB, PDF, ...) also matches. Returns the
-// matched item and how it matched, or pgx.ErrNoRows when no item has this hash.
-func (r *BookResolver) ResolveBySHA256(ctx context.Context, sha256 string) (database.MediaItems, ResolveMethod, error) {
-	if sha256 == "" {
-		return database.MediaItems{}, MethodNone, pgx.ErrNoRows
-	}
-	sha := pgtype.Text{String: sha256, Valid: true}
-
-	// 1. Primary content hash (the file the media item was imported from).
-	if mi, err := r.db.GetMediaItemBySHA256(ctx, sha); err == nil {
-		return mi, MethodSHA256, nil
-	} else if !errors.Is(err, pgx.ErrNoRows) {
-		return database.MediaItems{}, MethodNone, fmt.Errorf("resolve by sha256 (primary): %w", err)
-	}
-
-	// 2. Per-format hash (a converted/alternate format: KEPUB, PDF, ...).
-	formatRow, err := r.db.GetMediaItemFormatBySHA256(ctx, sha)
-	if err == nil {
-		if mi, err := r.db.GetMediaItem(ctx, formatRow.MediaItemID); err == nil {
-			return mi, MethodSHA256Format, nil
-		}
-	} else if !errors.Is(err, pgx.ErrNoRows) {
-		return database.MediaItems{}, MethodNone, fmt.Errorf("resolve by sha256 (format): %w", err)
-	}
-
-	return database.MediaItems{}, MethodNone, pgx.ErrNoRows
-}

internal/services/conversion_service.go

@@ -16,10 +16,6 @@ import (
 	"github.com/jackc/pgx/v5/pgtype"
 )
 
-// defaultConversionCacheTTL is the fallback kepub cache lifetime when no
-// settings registry is wired. Matches the historical hardcoded 24h.
-const defaultConversionCacheTTL = 24 * time.Hour
-
 type ConvertedKEPUB struct {
 	Path   string
 	SHA256 string
@@ -31,7 +27,6 @@ type ConversionService struct {
 	cacheDir           string
 	conversionTool     string
 	conversionCacheTTL time.Duration
-	settings           *database.SettingsRegistry
 }
 
 func NewConversionService(db *database.Queries, cacheDir string) *ConversionService {
@@ -39,32 +34,17 @@ func NewConversionService(db *database.Queries, cacheDir string) *ConversionServ
 		db:                 db,
 		cacheDir:           cacheDir,
 		conversionTool:     "/usr/bin/kepubify",
-		conversionCacheTTL: defaultConversionCacheTTL,
+		conversionCacheTTL: 24 * time.Hour,
 	}
 }
 
-// SetSettings wires the tunable settings registry. When wired, the cache TTL
-// is read live on each conversion request.
-func (s *ConversionService) SetSettings(reg *database.SettingsRegistry) { s.settings = reg }
-
-// cacheTTL returns the active conversion cache TTL.
-func (s *ConversionService) cacheTTL() time.Duration {
-	if s.settings != nil {
-		return s.settings.ConversionCacheTTL()
-	}
-	if s.conversionCacheTTL > 0 {
-		return s.conversionCacheTTL
-	}
-	return defaultConversionCacheTTL
-}
-
 func (s *ConversionService) ConvertEPUBToKEPUB(ctx context.Context, mediaItemID pgtype.UUID, epubPath string) (*ConvertedKEPUB, error) {
 	existing, err := s.db.GetMediaItemFormatByType(ctx, database.GetMediaItemFormatByTypeParams{
 		MediaItemID: mediaItemID,
 		FormatType:  "kepub",
 	})
 	if err == nil && existing.FilePath.Valid {
-		if time.Since(existing.CreatedAt.Time) < s.cacheTTL() {
+		if time.Since(existing.CreatedAt.Time) < s.conversionCacheTTL {
 			return &ConvertedKEPUB{
 				Path:   existing.FilePath.String,
 				SHA256: existing.FileSha256.String,

internal/services/conversion_service_test.go

@@ -65,7 +65,5 @@ func TestConversionServiceDefaults(t *testing.T) {
 	assert.NotNil(t, service)
 	assert.Equal(t, cacheDir, service.cacheDir)
 	assert.Equal(t, "/usr/bin/kepubify", service.conversionTool)
-	assert.Equal(t, int64(24*3600*1000000000), service.conversionCacheTTL.Nanoseconds(), "Default TTL field should be 24 hours")
-	// cacheTTL() must reflect the same default when no registry is wired.
-	assert.Equal(t, int64(24*3600*1000000000), service.cacheTTL().Nanoseconds(), "Default TTL accessor should return 24 hours")
+	assert.Equal(t, int64(24*3600*1000000000), service.conversionCacheTTL.Nanoseconds(), "Default TTL should be 24 hours")
 }

internal/services/hash_backfill.go

@@ -1,119 +0,0 @@
-package services
-
-import (
-	"bookhoard/internal/database"
-	"context"
-	"log"
-	"time"
-
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// HashBackfillService is a one-time self-heal pass that computes and stores the
-// SHA-256 for media items imported before hashing existed (file_sha256 IS
-// NULL). It runs once shortly after startup, independently of auto-scan, and
-// also performs a final conflict sweep that flags any content-duplicate groups
-// (same library + SHA-256 at different paths) on the admin Hash Conflicts page.
-//
-// The sweep runs after the per-item pass because during the pass only one side
-// of a preexisting duplicate pair may be hashed at a time - the group only
-// becomes visible once every item has its hash.
-type HashBackfillService struct {
-	db     *database.Queries
-	libSvc *LibraryService
-}
-
-// NewHashBackfillService creates a backfill service.
-func NewHashBackfillService(db *database.Queries) *HashBackfillService {
-	return &HashBackfillService{db: db, libSvc: NewLibraryService(db)}
-}
-
-// Run performs the backfill pass followed by the conflict sweep. It logs
-// progress and never returns an error - failures on individual items are
-// skipped so one unreadable file cannot block the rest.
-func (s *HashBackfillService) Run(ctx context.Context) {
-	items, err := s.db.ListMediaItemsMissingHash(ctx)
-	if err != nil {
-		log.Printf("[HASH-BACKFILL] failed to list items missing hash: %v", err)
-		return
-	}
-	if len(items) == 0 {
-		log.Printf("[HASH-BACKFILL] all media items already hashed, nothing to do")
-		s.sweepConflicts(ctx)
-		return
-	}
-
-	log.Printf("[HASH-BACKFILL] computing SHA-256 for %d unhashed media items", len(items))
-	started := time.Now()
-	hashed, failed := 0, 0
-
-	for _, item := range items {
-		if ctx.Err() != nil {
-			log.Printf("[HASH-BACKFILL] cancelled after %d items", hashed)
-			return
-		}
-
-		path, err := s.libSvc.ResolveMediaPath(ctx, item.LibraryID, item.FilePath)
-		if err != nil {
-			log.Printf("[HASH-BACKFILL] could not resolve path for %q: %v", item.FilePath, err)
-			failed++
-			continue
-		}
-
-		sha, err := computeFileSHA256(path)
-		if err != nil {
-			log.Printf("[HASH-BACKFILL] could not hash %q: %v", path, err)
-			failed++
-			continue
-		}
-
-		_, err = s.db.UpdateMediaItemIdentifiers(ctx, database.UpdateMediaItemIdentifiersParams{
-			ID:             item.ID,
-			FileSha256:     pgtype.Text{String: sha, Valid: true},
-			HashConfidence: pgtype.Text{String: "sha256_full", Valid: true},
-		})
-		if err != nil {
-			log.Printf("[HASH-BACKFILL] could not store hash for %q: %v", item.FilePath, err)
-			failed++
-			continue
-		}
-		hashed++
-
-		if hashed%25 == 0 {
-			log.Printf("[HASH-BACKFILL] progress: %d/%d hashed", hashed, len(items))
-		}
-	}
-
-	log.Printf("[HASH-BACKFILL] done in %s: %d hashed, %d failed (of %d)",
-		time.Since(started).Round(time.Second), hashed, failed, len(items))
-
-	s.sweepConflicts(ctx)
-}
-
-// sweepConflicts flags every content-duplicate group (same library + SHA-256,
-// more than one item) as a pending hash conflict. The upsert is a no-op for
-// groups that are already tracked or resolved, so admins who chose "keep both"
-// are never re-prompted.
-func (s *HashBackfillService) sweepConflicts(ctx context.Context) {
-	groups, err := s.db.FindHashConflictGroups(ctx)
-	if err != nil {
-		log.Printf("[HASH-BACKFILL] conflict sweep failed: %v", err)
-		return
-	}
-	if len(groups) == 0 {
-		return
-	}
-
-	flagged := 0
-	for _, g := range groups {
-		if err := s.db.CreateHashConflict(ctx, database.CreateHashConflictParams{
-			LibraryID:  g.LibraryID,
-			FileSha256: g.FileSha256.String,
-		}); err != nil {
-			log.Printf("[HASH-BACKFILL] could not record conflict group: %v", err)
-			continue
-		}
-		flagged++
-	}
-	log.Printf("[HASH-BACKFILL] flagged %d content-duplicate group(s) for admin review", flagged)
-}

internal/services/media_scanner.go

@@ -146,18 +146,16 @@ type CalibreOPFMetadata struct {
 	Timestamp    *time.Time
 }
 
-// NewMediaScanner creates a new media scanner instance.
-//
-// The fsnotify watcher is NOT created here. It is created lazily inside
-// SetFolders only when watch=true (the long-lived watch-mode scanner).
-// Ephemeral one-off scan jobs pass watch=false, so they never allocate a
-// watcher (and thus can never panic on EMFILE/ENOSPC). This fixes the
-// fd/inotify-watch leak where every scan job created a watcher that was
-// never closed.
+// NewMediaScanner creates a new media scanner instance
 func NewMediaScanner(db *database.Queries) *MediaScanner {
+	watcher, err := fsnotify.NewWatcher()
+	if err != nil {
+		panic(fmt.Sprintf("Failed to create file watcher: %v", err))
+	}
+
 	return &MediaScanner{
 		db:             db,
-		watcher:        nil,
+		watcher:        watcher,
 		settingsCache:  NewSettingsCache(30 * time.Second),
 		dirtyDirs:      make(map[string]time.Time),
 		fileStability:  make(map[string]*atomic.Bool),
@@ -240,34 +238,24 @@ func (s *MediaScanner) GetStats() (int, int, int) {
 	return s.totalFiles, s.newItems, s.errors
 }
 
-// SetFolders configures the scanner's folders and (optionally) sets up an
-// fsnotify watcher over the full directory tree.
-//
-// watch should be true only for the single long-lived watch-mode scanner that
-// actually consumes watcher.Events. Ephemeral scan jobs must pass false so no
-// watcher (and thus no fd/inotify watches) is allocated — the watcher is never
-// read by scan jobs and previously leaked one watcher per job.
-func (s *MediaScanner) SetFolders(folders []string, watch bool) error {
+func (s *MediaScanner) SetFolders(folders []string) error {
 	s.folders = folders
 
-	// Always close any previously-owned watcher so reconfiguration doesn't leak.
+	// Remove old watch if exists
 	if s.watcher != nil {
-		if err := s.watcher.Close(); err != nil {
-			fmt.Printf("Warning: failed to close old watcher during folder reconfiguration: %v\n", err)
+		if s.watcher != nil {
+			if err := s.watcher.Close(); err != nil {
+				fmt.Printf("Warning: failed to close old watcher during folder reconfiguration: %v\n", err)
+			}
 		}
-		s.watcher = nil
 	}
 
-	// Create + populate a fresh watcher only when the caller intends to read events.
-	if watch {
-		watcher, err := fsnotify.NewWatcher()
-		if err != nil {
-			// Return an error instead of panicking so a failed watcher can't
-			// take down the whole process.
-			return fmt.Errorf("failed to create watcher: %w", err)
-		}
-		s.watcher = watcher
+	// Create new watcher
+	watcher, err := fsnotify.NewWatcher()
+	if err != nil {
+		return fmt.Errorf("failed to create watcher: %v", err)
 	}
+	s.watcher = watcher
 
 	// Build cache of allowed extensions per folder
 	// Uses Go AllowedExtensions map as source of truth (not DB)
@@ -298,37 +286,32 @@ func (s *MediaScanner) SetFolders(folders []string, watch bool) error {
 		}
 	}
 
-	// Add all folders and their subdirectories to the watcher (like Audiobookshelf).
-	// Only when watching; scan jobs (watch=false) skip this entirely.
-	if s.watcher != nil {
-		watchCount := 0
-		for _, folder := range folders {
-			if err := s.watcher.Add(folder); err != nil {
-				fmt.Printf("[WATCHER] Warning: failed to watch root folder %s: %v\n", folder, err)
+	// Add all folders and their subdirectories to the watcher (like Audiobookshelf)
+	watchCount := 0
+	for _, folder := range folders {
+		if err := s.watcher.Add(folder); err != nil {
+			fmt.Printf("[WATCHER] Warning: failed to watch root folder %s: %v\n", folder, err)
+		} else {
+			watchCount++
+		}
+		filepath.WalkDir(folder, func(path string, d fs.DirEntry, err error) error {
+			if err != nil {
+				return err
+			}
+			if !d.IsDir() || path == folder {
+				return nil
+			}
+			if err := s.watcher.Add(path); err != nil {
+				fmt.Printf("[WATCHER] Warning: failed to watch subdirectory %s: %v\n", path, err)
 			} else {
 				watchCount++
 			}
-			filepath.WalkDir(folder, func(path string, d fs.DirEntry, err error) error {
-				if err != nil {
-					return err
-				}
-				if !d.IsDir() || path == folder {
-					return nil
-				}
-				if err := s.watcher.Add(path); err != nil {
-					fmt.Printf("[WATCHER] Warning: failed to watch subdirectory %s: %v\n", path, err)
-				} else {
-					watchCount++
-				}
-				return nil
-			})
-		}
-
-		fmt.Printf("[WATCHER] Now watching %d directories across %d root folders\n", watchCount, len(folders))
-	} else {
-		fmt.Printf("[SCANNER] Configured %d root folders (watch mode disabled, no inotify watcher)\n", len(folders))
+			return nil
+		})
 	}
 
+	fmt.Printf("[WATCHER] Now watching %d directories across %d root folders\n", watchCount, len(folders))
+
 	return nil
 }
 
@@ -434,10 +417,8 @@ func (s *MediaScanner) ScanFolders(ctx context.Context) error {
 			}
 
 			if d.IsDir() {
-				if s.watcher != nil {
-					if err := s.watcher.Add(path); err != nil {
-						fmt.Printf("Warning: failed to watch subdirectory %s: %v\n", path, err)
-					}
+				if err := s.watcher.Add(path); err != nil {
+					fmt.Printf("Warning: failed to watch subdirectory %s: %v\n", path, err)
 				}
 				return nil
 			}
@@ -699,24 +680,14 @@ func (s *MediaScanner) processMediaFile(ctx context.Context, path string) (bool,
 			if err := s.updateMediaItem(ctx, existingItem.ID, path, info); err != nil {
 				fmt.Printf("Warning: failed to update existing media item: %v\n", err)
 			}
-			// Recompute hash identifiers too - a force rescan is the admin's
-			// backfill tool and must refresh stale or missing hashes.
-			s.recomputeHashInfo(ctx, existingItem.ID, libraryID, path)
 			return false, nil
 		} else {
 			// Normal behavior: check if file has changed (by size)
 			if existingItem.FileSize.Int64 != info.Size() {
 				fmt.Printf("File size changed, updating media item: %s\n", path)
 				_ = s.updateMediaItem(ctx, existingItem.ID, path, info)
-				// The bytes changed, so any stored hash is stale.
-				s.recomputeHashInfo(ctx, existingItem.ID, libraryID, path)
 				return false, nil
 			}
-			// Self-heal items imported before hashing existed: even an unchanged
-			// file gets its hash computed if missing.
-			if !existingItem.FileSha256.Valid || existingItem.FileSha256.String == "" {
-				s.recomputeHashInfo(ctx, existingItem.ID, libraryID, path)
-			}
 			fmt.Printf("Media item already exists with same size, skipping: %s\n", path)
 			return false, nil
 		}
@@ -745,26 +716,6 @@ func (s *MediaScanner) processMediaFile(ctx context.Context, path string) (bool,
 			path, hashInfo.FileSHA256, hashInfo.OPFIdentifier, hashInfo.OPFUUID, hashInfo.HashConfidence)
 	}
 
-	// Content dedup: if an item with the same SHA-256 already exists in this
-	// library (same file at a different path), treat it as existing rather than
-	// creating a duplicate. The file bytes are identical, so metadata matches.
-	if hashInfo.FileSHA256 != "" {
-		existingByHash, err := s.db.GetMediaItemBySHA256AndLibrary(ctx, database.GetMediaItemBySHA256AndLibraryParams{
-			FileSha256: pgtype.Text{String: hashInfo.FileSHA256, Valid: true},
-			LibraryID:  libraryID,
-		})
-		if err == nil && existingByHash.ID.Valid {
-			fmt.Printf("Media item with same SHA-256 already exists in library (path %q), skipping duplicate: %s\n",
-				existingByHash.FilePath, path)
-			if s.forceRescan {
-				_ = s.updateMediaItem(ctx, existingByHash.ID, path, info)
-			}
-			return false, nil
-		} else if err != nil && !errors.Is(err, pgx.ErrNoRows) {
-			fmt.Printf("Warning: failed to check media item by SHA-256 for %s: %v\n", path, err)
-		}
-	}
-
 	// REMOVED: Comic metadata extraction now handled by mergeMetadata()
 	// This avoids duplicate extraction and ensures smart merging happens
 
@@ -2625,68 +2576,6 @@ func (s *MediaScanner) getMediaItemByFilePath(ctx context.Context, filePath stri
 	})
 }
 
-// recomputeHashInfo recomputes the file's hash identifiers and stores them on
-// the media item (plus its per-format row). Called on force rescan, on file
-// size change, and when an unchanged item is found with no stored hash, so
-// items imported before hashing existed are backfilled by ordinary scans.
-// After storing, it records a hash conflict if the same content now exists at
-// more than one path in the library.
-func (s *MediaScanner) recomputeHashInfo(ctx context.Context, mediaItemID pgtype.UUID, libraryID pgtype.UUID, path string) {
-	hashInfo, formatInfo, err := s.extractHashInfo(path)
-	if err != nil {
-		fmt.Printf("Warning: failed to extract hash info from %s: %v\n", path, err)
-		return
-	}
-	if hashInfo == nil || hashInfo.FileSHA256 == "" {
-		return
-	}
-
-	_, err = s.db.UpdateMediaItemIdentifiers(ctx, database.UpdateMediaItemIdentifiersParams{
-		ID:             mediaItemID,
-		FileSha256:     pgtype.Text{String: hashInfo.FileSHA256, Valid: true},
-		OpfIdentifier:  pgtype.Text{String: hashInfo.OPFIdentifier, Valid: hashInfo.OPFIdentifier != ""},
-		OpfUuid:        pgtype.Text{String: hashInfo.OPFUUID, Valid: hashInfo.OPFUUID != ""},
-		HashConfidence: pgtype.Text{String: hashInfo.HashConfidence, Valid: hashInfo.HashConfidence != ""},
-	})
-	if err != nil {
-		fmt.Printf("Warning: failed to update hash identifiers for %s: %v\n", path, err)
-		return
-	}
-
-	if formatInfo != nil {
-		_, _ = s.db.CreateMediaItemFormat(ctx, database.CreateMediaItemFormatParams{
-			MediaItemID:   mediaItemID,
-			FormatType:    formatInfo.FormatType,
-			FilePath:      pgtype.Text{String: s.getRelativePath(formatInfo.FilePath), Valid: true},
-			FileSha256:    pgtype.Text{String: formatInfo.FileSHA256, Valid: true},
-			FileSizeBytes: pgtype.Int8{Int64: formatInfo.FileSizeBytes, Valid: true},
-			MimeType:      pgtype.Text{String: formatInfo.MimeType, Valid: true},
-		})
-	}
-
-	s.recordHashConflictIfAny(ctx, libraryID, hashInfo.FileSHA256)
-}
-
-// recordHashConflictIfAny flags a pending hash conflict when the given content
-// hash is now shared by more than one media item in the same library. The
-// upsert is a no-op for already-tracked (including resolved) groups.
-func (s *MediaScanner) recordHashConflictIfAny(ctx context.Context, libraryID pgtype.UUID, fileSHA256 string) {
-	items, err := s.db.ListMediaItemsBySHA256AndLibrary(ctx, database.ListMediaItemsBySHA256AndLibraryParams{
-		FileSha256: pgtype.Text{String: fileSHA256, Valid: true},
-		LibraryID:  libraryID,
-	})
-	if err != nil {
-		return
-	}
-	if len(items) > 1 {
-		fmt.Printf("Hash conflict: %d media items share SHA-256 %s in one library\n", len(items), fileSHA256)
-		_ = s.db.CreateHashConflict(ctx, database.CreateHashConflictParams{
-			LibraryID:  libraryID,
-			FileSha256: fileSHA256,
-		})
-	}
-}
-
 func (s *MediaScanner) getMimeType(path string) string {
 	ext := strings.ToLower(filepath.Ext(path))
 	if mime, ok := MimeTypes[ext]; ok {
@@ -2712,13 +2601,6 @@ func (s *MediaScanner) WatchChanges(ctx context.Context) error {
 	go s.startBackupScan(ctx)
 
 	go func() {
-		// The event loop only runs if a real watcher was set up (watch=true).
-		// If watching with no watcher (e.g. inotify unavailable through a Docker
-		// bind mount), polling via startBackupScan above still handles detection.
-		if s.watcher == nil {
-			fmt.Printf("[WATCHER] No inotify watcher configured; relying on periodic polling for change detection\n")
-			return
-		}
 		fmt.Printf("[WATCHER] Event loop started for %d folders\n", len(s.folders))
 		for {
 			select {
@@ -3110,12 +2992,6 @@ func (s *MediaScanner) startBackupScan(ctx context.Context) {
 }
 
 func (s *MediaScanner) calculateFileSHA256(filePath string) (string, error) {
-	return computeFileSHA256(filePath)
-}
-
-// computeFileSHA256 is the package-level full-file SHA-256 used by the hash
-// backfill service; the MediaScanner method delegates to it.
-func computeFileSHA256(filePath string) (string, error) {
 	file, err := os.Open(filePath)
 	if err != nil {
 		return "", fmt.Errorf("failed to open file: %v", err)

internal/services/reader.go

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

internal/services/worker.go

@@ -176,17 +176,10 @@ func (w *Worker) GetActiveJobCount() int {
 	return count
 }
 func NewWorker(numWorkers int, connManager *wsync.ConnectionManager) *Worker {
-	return NewWorkerWithConfig(numWorkers, 100, connManager)
-}
-
-// NewWorkerWithConfig constructs a worker pool with the given worker count and
-// job-queue capacity. Used at startup to source values from the settings
-// registry.
-func NewWorkerWithConfig(numWorkers, queueCap int, connManager *wsync.ConnectionManager) *Worker {
 	ctx, cancel := context.WithCancel(context.Background())
 
 	w := &Worker{
-		jobQueue: make(chan *Job, queueCap),
+		jobQueue: make(chan *Job, 100),
 		results:  make(map[string]*JobResult),
 		ctx:      ctx,
 		cancel:   cancel,
@@ -212,23 +205,7 @@ func (w *Worker) worker() {
 				return
 			}
 
-			// Recover from any panic inside a job so a single failing job can
-			// never crash the whole worker goroutine (and thus the process).
-			func() {
-				defer func() {
-					if r := recover(); r != nil {
-						fmt.Printf("[WORKER] panic in job %s (%s): %v\n", job.ID, job.Type, r)
-						w.mu.Lock()
-						w.results[job.ID] = &JobResult{
-							JobID:  job.ID,
-							Status: JobStatusFailed,
-							Error:  fmt.Sprintf("panic: %v", r),
-						}
-						w.mu.Unlock()
-					}
-				}()
-				w.processJob(job)
-			}()
+			w.processJob(job)
 
 		case <-w.ctx.Done():
 			return
@@ -371,7 +348,6 @@ func (w *Worker) processScanJob(job *Job) (interface{}, error) {
 	}
 
 	scanner := NewMediaScanner(db)
-	defer scanner.Close()
 	scanner.job = job
 
 	job.ProgressCallback = func(progress float64, filesScanned, newItems, errors int) {
@@ -401,7 +377,7 @@ func (w *Worker) processScanJob(job *Job) (interface{}, error) {
 		}
 	}
 
-	if err := scanner.SetFolders(folders, false); err != nil {
+	if err := scanner.SetFolders(folders); err != nil {
 		return nil, err
 	}
 
@@ -545,8 +521,7 @@ func (w *Worker) processSetFoldersJob(job *Job) (interface{}, error) {
 
 	// Create scanner and configure folders
 	scanner := NewMediaScanner(db)
-	defer scanner.Close()
-	if err := scanner.SetFolders(folders, false); err != nil {
+	if err := scanner.SetFolders(folders); err != nil {
 		return nil, fmt.Errorf("failed to set folders: %w", err)
 	}
 
@@ -925,7 +900,6 @@ func (w *Worker) processDirectoryScanJob(job *Job) (interface{}, error) {
 
 	// Create temporary scanner instance for this job
 	scanner := NewMediaScanner(db)
-	defer scanner.Close()
 	scanner.job = job
 	// Find which library owns this directory (prefix match for subdirectories)
 	ctx := context.Background()
@@ -944,7 +918,7 @@ func (w *Worker) processDirectoryScanJob(job *Job) (interface{}, error) {
 		folderPaths = append(folderPaths, f.FolderPath)
 	}
 	// Configure scanner with folders
-	if err := scanner.SetFolders(folderPaths, false); err != nil {
+	if err := scanner.SetFolders(folderPaths); err != nil {
 		return nil, fmt.Errorf("failed to set folders: %w", err)
 	}
 	// Now scan the directory
@@ -1002,4 +976,3 @@ func (w *Worker) Shutdown() {
 	close(w.jobQueue)
 	w.wg.Wait()
 }
-

internal/setupstatus/status.go

@@ -1,79 +0,0 @@
-// Package setupstatus reports whether the application's initial setup has been
-// completed. Setup is considered complete when at least one admin user exists
-// AND a non-empty base_url has been configured, regardless of how those were
-// created (setup wizard, API, or a future CLI). This keeps the setup gate a
-// derived property of real data rather than a manually-flipped flag that can
-// drift out of sync.
-package setupstatus
-
-import (
-	"context"
-	"sync"
-	"time"
-)
-
-// AdminCounter is satisfied by *database.Queries. It is defined as an interface
-// here so this package does not import the database package, keeping the
-// dependency graph flat and avoiding import cycles.
-type AdminCounter interface {
-	CountAdmins(ctx context.Context) (int64, error)
-}
-
-// BaseURLGetter returns the configured base_url value from the database, or an
-// error if it cannot be read. Defined as a function type (not an interface) so
-// it can be satisfied by a closure wrapping *database.Queries.GetSystemConfig
-// without importing the database package.
-type BaseURLGetter func(ctx context.Context) (string, error)
-
-var (
-	cacheMu       sync.RWMutex
-	cacheComplete bool = true
-	cacheExpiry   time.Time
-	cacheTTL           = 10 * time.Second
-)
-
-// IsSetupComplete reports whether setup is complete. Setup is complete when at
-// least one admin user exists AND base_url is configured. A short in-memory
-// cache avoids hammering the database on every request. On a database error the
-// function fails open (returns true) so a transient outage does not lock users
-// out of the app.
-func IsSetupComplete(ctx context.Context, q AdminCounter, baseURLGetter BaseURLGetter) bool {
-	cacheMu.RLock()
-	if time.Now().Before(cacheExpiry) {
-		complete := cacheComplete
-		cacheMu.RUnlock()
-		return complete
-	}
-	cacheMu.RUnlock()
-
-	complete := true
-
-	count, err := q.CountAdmins(ctx)
-	if err == nil {
-		complete = count > 0
-	}
-
-	if complete && baseURLGetter != nil {
-		baseURL, err := baseURLGetter(ctx)
-		if err == nil {
-			complete = baseURL != ""
-		}
-	}
-
-	cacheMu.Lock()
-	cacheComplete = complete
-	cacheExpiry = time.Now().Add(cacheTTL)
-	cacheMu.Unlock()
-	return complete
-}
-
-// Invalidate clears the cached setup status so the next call to IsSetupComplete
-// re-reads from the database. Call this after any write that could change the
-// admin user count (user creation, role promotion/demotion, user deletion) or
-// the base_url configuration.
-func Invalidate() {
-	cacheMu.Lock()
-	cacheComplete = true
-	cacheExpiry = time.Time{}
-	cacheMu.Unlock()
-}

internal/sync/annotations.go

@@ -1,827 +0,0 @@
-package sync
-
-import (
-	"bookhoard/internal/database"
-	"context"
-	"crypto/sha1"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"log"
-	"math"
-	"strings"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// TombstoneTTL is the fallback retention for soft-deleted annotations when no
-// settings registry is wired (e.g. in tests). It matches the historical value.
-const TombstoneTTL = 30 * 24 * time.Hour
-
-type AnnotationService struct {
-	db      *database.Queries
-	connMgr *ConnectionManager
-	settings *database.SettingsRegistry
-}
-
-func NewAnnotationService(db *database.Queries, connMgr *ConnectionManager) *AnnotationService {
-	return &AnnotationService{db: db, connMgr: connMgr}
-}
-
-// SetSettings wires the tunable settings registry. When wired, the tombstone
-// TTL is read live from the DB; otherwise the package const TombstoneTTL is
-// used.
-func (s *AnnotationService) SetSettings(reg *database.SettingsRegistry) { s.settings = reg }
-
-// tombstoneTTL returns the active tombstone retention window.
-func (s *AnnotationService) tombstoneTTL() time.Duration {
-	if s.settings != nil {
-		return s.settings.TombstoneTTL()
-	}
-	return TombstoneTTL
-}
-
-// ActiveTombstoneTTL exposes the configured tombstone retention window for
-// callers outside the sync package (e.g. kobo/koreader handlers) that need to
-// compute cutoffs consistently with the service.
-func (s *AnnotationService) ActiveTombstoneTTL() time.Duration { return s.tombstoneTTL() }
-
-type SaveOutcome string
-
-const (
-	SaveOutcomeCreated SaveOutcome = "created"
-	SaveOutcomeUpdated SaveOutcome = "updated"
-	SaveOutcomeSkipped SaveOutcome = "skipped"
-	SaveOutcomeDeleted SaveOutcome = "deleted"
-)
-
-type SaveHighlightRequest struct {
-	MediaItemID      pgtype.UUID
-	UserID           pgtype.UUID
-	SelectionText    string
-	StartPosition    string
-	EndPosition      string
-	Color            string
-	NoteText         string
-	PercentageStart  float64
-	PercentageEnd    float64
-	EpubcfiStart     string
-	EpubcfiEnd       string
-	ChapterReference int32
-	Source           string
-	ModifiedAt       time.Time
-	DeviceSyncData   json.RawMessage
-}
-
-type SaveHighlightResult struct {
-	Highlight database.MediaHighlights
-	Outcome   SaveOutcome
-	Conflict  bool
-}
-
-func (s *AnnotationService) SaveHighlight(ctx context.Context, req SaveHighlightRequest) (*SaveHighlightResult, error) {
-	dedupKey := ComputeDedupKey(req.SelectionText, req.EpubcfiStart, req.StartPosition)
-
-	existing, err := s.db.GetMediaHighlightByDedupKey(ctx, database.GetMediaHighlightByDedupKeyParams{
-		UserID:      req.UserID,
-		MediaItemID: req.MediaItemID,
-		DedupKey:    pgtype.Text{String: dedupKey, Valid: true},
-	})
-	if err != nil && !errors.Is(err, pgx.ErrNoRows) {
-		return nil, fmt.Errorf("query existing highlight: %w", err)
-	}
-
-	if errors.Is(err, pgx.ErrNoRows) {
-		return s.createHighlight(ctx, req, dedupKey)
-	}
-
-	if existing.Deleted.Bool {
-		if !incomingNewerThanTombstone(req.ModifiedAt, existing.DeletedAt, existing.LastModifiedAt) {
-			return &SaveHighlightResult{Highlight: existing, Outcome: SaveOutcomeDeleted}, nil
-		}
-		// Newer than the tombstone: a deliberate re-create. Resurrect via the
-		// LWW update (which clears deleted/deleted_at).
-		return s.applyLWW(ctx, req, existing, dedupKey)
-	}
-
-	return s.applyLWW(ctx, req, existing, dedupKey)
-}
-
-func (s *AnnotationService) createHighlight(
-	ctx context.Context,
-	req SaveHighlightRequest,
-	dedupKey string,
-) (*SaveHighlightResult, error) {
-	modifiedAt := req.ModifiedAt
-	if modifiedAt.IsZero() {
-		modifiedAt = time.Now()
-	}
-
-	deviceData := mergeDeviceSyncData(nil, req.Source, req.DeviceSyncData)
-
-	highlight, err := s.db.CreateMediaHighlightFull(ctx, database.CreateMediaHighlightFullParams{
-		MediaItemID:      req.MediaItemID,
-		UserID:           req.UserID,
-		SelectionText:    req.SelectionText,
-		StartPosition:    pgText(req.StartPosition),
-		EndPosition:      pgText(req.EndPosition),
-		Color:            pgText(req.Color),
-		NoteText:         pgText(req.NoteText),
-		PercentageStart:  pgFloat8(req.PercentageStart),
-		PercentageEnd:    pgFloat8(req.PercentageEnd),
-		EpubcfiStart:     pgText(req.EpubcfiStart),
-		EpubcfiEnd:       pgText(req.EpubcfiEnd),
-		ChapterReference: pgInt4(req.ChapterReference),
-		DedupKey:         pgtype.Text{String: dedupKey, Valid: true},
-		LastModifiedAt:   pgtype.Timestamptz{Time: modifiedAt, Valid: true},
-		LastModifiedSource: pgtype.Text{String: req.Source, Valid: req.Source != ""},
-		DeviceSyncData:   deviceData,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("create highlight: %w", err)
-	}
-
-	s.broadcast(highlight.ID, req.UserID, req.MediaItemID, "highlight", req.Source)
-	return &SaveHighlightResult{Highlight: highlight, Outcome: SaveOutcomeCreated}, nil
-}
-
-func (s *AnnotationService) applyLWW(
-	ctx context.Context,
-	req SaveHighlightRequest,
-	existing database.MediaHighlights,
-	dedupKey string,
-) (*SaveHighlightResult, error) {
-	incomingNewer, contentChanged := s.compareIncoming(req, existing)
-
-	if !incomingNewer && !contentChanged {
-		conflict := isCrossSource(req.Source, existing.LastModifiedSource)
-		if conflict {
-			s.recordConflict(ctx, req.UserID, req.MediaItemID, "annotation_highlight",
-				existing.DedupKey.String, req.Source, existing.LastModifiedSource.String,
-				req, existing, "existing")
-		}
-		return &SaveHighlightResult{
-			Highlight: existing,
-			Outcome:   SaveOutcomeSkipped,
-			Conflict:  conflict,
-		}, nil
-	}
-
-	modifiedAt := req.ModifiedAt
-	if modifiedAt.IsZero() {
-		modifiedAt = time.Now()
-	}
-
-	deviceData := mergeDeviceSyncData(existing.DeviceSyncData, req.Source, req.DeviceSyncData)
-
-	highlight, err := s.db.UpdateMediaHighlightForSync(ctx, database.UpdateMediaHighlightForSyncParams{
-		ID:               existing.ID,
-		SelectionText:    req.SelectionText,
-		StartPosition:    pgText(req.StartPosition),
-		EndPosition:      pgText(req.EndPosition),
-		Color:            pgText(req.Color),
-		NoteText:         pgText(req.NoteText),
-		PercentageStart:  pgFloat8(req.PercentageStart),
-		PercentageEnd:    pgFloat8(req.PercentageEnd),
-		EpubcfiStart:     pgText(req.EpubcfiStart),
-		EpubcfiEnd:       pgText(req.EpubcfiEnd),
-		ChapterReference: pgInt4(req.ChapterReference),
-		LastModifiedAt:   pgtype.Timestamptz{Time: modifiedAt, Valid: true},
-		LastModifiedSource: pgtype.Text{String: req.Source, Valid: req.Source != ""},
-		DeviceSyncData:   deviceData,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("update highlight: %w", err)
-	}
-
-	conflict := isCrossSource(req.Source, existing.LastModifiedSource)
-	if conflict {
-		s.recordConflict(ctx, req.UserID, req.MediaItemID, "annotation_highlight",
-			existing.DedupKey.String, req.Source, existing.LastModifiedSource.String,
-			req, existing, "incoming")
-	}
-	s.broadcast(highlight.ID, req.UserID, req.MediaItemID, "highlight", req.Source)
-	return &SaveHighlightResult{Highlight: highlight, Outcome: SaveOutcomeUpdated, Conflict: conflict}, nil
-}
-
-func (s *AnnotationService) compareIncoming(req SaveHighlightRequest, existing database.MediaHighlights) (incomingNewer bool, contentChanged bool) {
-	if req.ModifiedAt.IsZero() {
-		contentSame := strings.EqualFold(req.SelectionText, existing.SelectionText) &&
-			textEq(req.Color, existing.Color) &&
-			textEq(req.NoteText, existing.NoteText) &&
-			floatEq(req.PercentageStart, existing.PercentageStart) &&
-			floatEq(req.PercentageEnd, existing.PercentageEnd)
-		return !contentSame, !contentSame
-	}
-
-	existingMod := existing.LastModifiedAt
-	if !existingMod.Valid {
-		existingMod = existing.UpdatedAt
-	}
-	return req.ModifiedAt.After(existingMod.Time), true
-}
-
-func (s *AnnotationService) TombstoneHighlight(
-	ctx context.Context,
-	userID, mediaItemID pgtype.UUID,
-	dedupKey string,
-	source string,
-) error {
-	err := s.db.TombstoneMediaHighlightByDedupKey(ctx, database.TombstoneMediaHighlightByDedupKeyParams{
-		UserID:      userID,
-		MediaItemID: mediaItemID,
-		DedupKey:    pgtype.Text{String: dedupKey, Valid: true},
-	})
-	if err != nil {
-		return fmt.Errorf("tombstone highlight: %w", err)
-	}
-	s.broadcast(pgtype.UUID{}, userID, mediaItemID, "highlight_delete", source)
-	return nil
-}
-
-func (s *AnnotationService) TombstoneHighlightByID(
-	ctx context.Context,
-	highlightID pgtype.UUID,
-	source string,
-) error {
-	h, err := s.db.GetMediaHighlight(ctx, highlightID)
-	if err != nil {
-		return fmt.Errorf("get highlight for tombstone: %w", err)
-	}
-	err = s.db.TombstoneMediaHighlightByID(ctx, highlightID)
-	if err != nil {
-		return fmt.Errorf("tombstone highlight by ID: %w", err)
-	}
-	s.broadcast(pgtype.UUID{}, h.UserID, h.MediaItemID, "highlight_delete", source)
-	return nil
-}
-
-func (s *AnnotationService) PurgeExpiredTombstones(ctx context.Context) error {
-	cutoff := pgtype.Timestamptz{Time: time.Now().Add(-s.tombstoneTTL()), Valid: true}
-	if err := s.db.PurgeExpiredHighlightTombstones(ctx, cutoff); err != nil {
-		return fmt.Errorf("purge highlight tombstones: %w", err)
-	}
-	if err := s.db.PurgeExpiredNoteTombstones(ctx, cutoff); err != nil {
-		return fmt.Errorf("purge note tombstones: %w", err)
-	}
-	if err := s.db.PurgeExpiredBookmarkTombstones(ctx, cutoff); err != nil {
-		return fmt.Errorf("purge bookmark tombstones: %w", err)
-	}
-	return nil
-}
-
-// StartDailyMaintenance launches a single background goroutine that runs all
-// periodic cleanup tasks once every 24 hours: expired annotation tombstones,
-// expired/revoked refresh tokens (retention follows the configured session
-// duration), and expired OPDS tokens. Each task is independent; a failure in
-// one is logged and does not skip the others. The returned CancelFunc stops the
-// goroutine and the underlying ticker; it must be invoked on shutdown.
-func (s *AnnotationService) StartDailyMaintenance() context.CancelFunc {
-	ticker := time.NewTicker(24 * time.Hour)
-	ctx, cancel := context.WithCancel(context.Background())
-
-	go func() {
-		for {
-			select {
-			case <-ctx.Done():
-				ticker.Stop()
-				return
-			case <-ticker.C:
-				s.runDailyMaintenance(ctx)
-			}
-		}
-	}()
-
-	return cancel
-}
-
-// runDailyMaintenance executes every periodic cleanup task. Tasks run
-// sequentially under the single daily-tick goroutine so there is no added
-// concurrency. All three queries only delete rows that are already unusable
-// (expired or revoked), so this never logs out active sessions.
-func (s *AnnotationService) runDailyMaintenance(ctx context.Context) {
-	if err := s.PurgeExpiredTombstones(ctx); err != nil {
-		log.Printf("maintenance: tombstone purge failed: %v", err)
-	}
-	if err := s.db.CleanupExpiredOpdsTokens(ctx); err != nil {
-		log.Printf("maintenance: OPDS token purge failed: %v", err)
-	}
-	// Refresh-token retention follows the configured session duration; re-read
-	// on every tick so live settings changes are honored. Guarded so unwired
-	// test paths simply skip cleanup (production always wires the registry).
-	if s.settings != nil {
-		retention := s.settings.SessionDuration().Seconds()
-		if err := s.db.CleanupExpiredRefreshTokens(ctx, retention); err != nil {
-			log.Printf("maintenance: refresh token purge failed: %v", err)
-		}
-	}
-}
-
-type SaveNoteRequest struct {
-	MediaItemID        pgtype.UUID
-	UserID             pgtype.UUID
-	Content            string
-	Position           string
-	PercentageLocation float64
-	CharacterStart     int32
-	CharacterEnd       int32
-	EpubcfiLocation    string
-	ChapterReference   int32
-	ParagraphReference int32
-	Source             string
-	ModifiedAt         time.Time
-	DeviceSyncData     []byte
-}
-
-type SaveNoteResult struct {
-	Note     database.MediaNotes
-	Outcome  SaveOutcome
-	Conflict bool
-}
-
-func (s *AnnotationService) SaveNote(ctx context.Context, req SaveNoteRequest) (*SaveNoteResult, error) {
-	if !req.UserID.Valid || !req.MediaItemID.Valid {
-		return nil, errors.New("invalid user_id or media_item_id")
-	}
-
-	dedupKey := ComputeDedupKey(req.Content, req.EpubcfiLocation, req.Position)
-
-	existing, err := s.db.GetMediaNoteByDedupKey(ctx, database.GetMediaNoteByDedupKeyParams{
-		UserID:      req.UserID,
-		MediaItemID: req.MediaItemID,
-		DedupKey:    pgtype.Text{String: dedupKey, Valid: true},
-	})
-	if err != nil {
-		if !errors.Is(err, pgx.ErrNoRows) {
-			return nil, fmt.Errorf("get note by dedup key: %w", err)
-		}
-		return s.createNote(ctx, req, dedupKey)
-	}
-
-	if existing.Deleted.Valid && existing.Deleted.Bool {
-		if !incomingNewerThanTombstone(req.ModifiedAt, existing.DeletedAt, existing.LastModifiedAt) {
-			return &SaveNoteResult{Note: existing, Outcome: SaveOutcomeDeleted}, nil
-		}
-		// Newer than the tombstone: a deliberate re-create. Resurrect.
-		return s.applyNoteLWW(ctx, req, existing, dedupKey)
-	}
-
-	return s.applyNoteLWW(ctx, req, existing, dedupKey)
-}
-
-func (s *AnnotationService) createNote(ctx context.Context, req SaveNoteRequest, dedupKey string) (*SaveNoteResult, error) {
-	modifiedAt := req.ModifiedAt
-	if modifiedAt.IsZero() {
-		modifiedAt = time.Now()
-	}
-
-	note, err := s.db.CreateMediaNoteFull(ctx, database.CreateMediaNoteFullParams{
-		MediaItemID:        req.MediaItemID,
-		UserID:             req.UserID,
-		Content:            req.Content,
-		Position:           pgText(req.Position),
-		PercentageLocation: pgFloat8(req.PercentageLocation),
-		CharacterStart:     pgInt4(req.CharacterStart),
-		CharacterEnd:       pgInt4(req.CharacterEnd),
-		EpubcfiLocation:    pgText(req.EpubcfiLocation),
-		ChapterReference:   pgInt4(req.ChapterReference),
-		ParagraphReference: pgInt4(req.ParagraphReference),
-		DedupKey:           pgtype.Text{String: dedupKey, Valid: true},
-		LastModifiedAt:     pgtype.Timestamptz{Time: modifiedAt, Valid: true},
-		LastModifiedSource: pgtype.Text{String: req.Source, Valid: req.Source != ""},
-		DeviceSyncData:     req.DeviceSyncData,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("create note: %w", err)
-	}
-	s.broadcast(note.ID, req.UserID, req.MediaItemID, "note", req.Source)
-	return &SaveNoteResult{Note: note, Outcome: SaveOutcomeCreated}, nil
-}
-
-func (s *AnnotationService) applyNoteLWW(ctx context.Context, req SaveNoteRequest, existing database.MediaNotes, dedupKey string) (*SaveNoteResult, error) {
-	incomingNewer, contentChanged := s.compareIncomingNote(req, existing)
-
-	if !incomingNewer && !contentChanged {
-		conflict := isCrossSource(req.Source, existing.LastModifiedSource)
-		if conflict {
-			s.recordConflict(ctx, req.UserID, req.MediaItemID, "annotation_note",
-				existing.DedupKey.String, req.Source, existing.LastModifiedSource.String,
-				req, existing, "existing")
-		}
-		return &SaveNoteResult{Note: existing, Outcome: SaveOutcomeSkipped, Conflict: conflict}, nil
-	}
-
-	modifiedAt := req.ModifiedAt
-	if modifiedAt.IsZero() {
-		modifiedAt = time.Now()
-	}
-
-	deviceData := mergeDeviceSyncData(existing.DeviceSyncData, req.Source, req.DeviceSyncData)
-
-	note, err := s.db.UpdateMediaNoteForSync(ctx, database.UpdateMediaNoteForSyncParams{
-		ID:                 existing.ID,
-		Content:            req.Content,
-		Position:           pgText(req.Position),
-		PercentageLocation: pgFloat8(req.PercentageLocation),
-		CharacterStart:     pgInt4(req.CharacterStart),
-		CharacterEnd:       pgInt4(req.CharacterEnd),
-		EpubcfiLocation:    pgText(req.EpubcfiLocation),
-		ChapterReference:   pgInt4(req.ChapterReference),
-		ParagraphReference: pgInt4(req.ParagraphReference),
-		LastModifiedAt:     pgtype.Timestamptz{Time: modifiedAt, Valid: true},
-		LastModifiedSource: pgtype.Text{String: req.Source, Valid: req.Source != ""},
-		DeviceSyncData:     deviceData,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("update note: %w", err)
-	}
-
-	conflict := isCrossSource(req.Source, existing.LastModifiedSource)
-	if conflict {
-		s.recordConflict(ctx, req.UserID, req.MediaItemID, "annotation_note",
-			existing.DedupKey.String, req.Source, existing.LastModifiedSource.String,
-			req, existing, "incoming")
-	}
-	s.broadcast(note.ID, req.UserID, req.MediaItemID, "note", req.Source)
-	return &SaveNoteResult{Note: note, Outcome: SaveOutcomeUpdated, Conflict: conflict}, nil
-}
-
-func (s *AnnotationService) compareIncomingNote(req SaveNoteRequest, existing database.MediaNotes) (incomingNewer bool, contentChanged bool) {
-	if req.ModifiedAt.IsZero() {
-		contentSame := strings.EqualFold(req.Content, existing.Content) &&
-			textEq(req.Position, existing.Position)
-		return !contentSame, !contentSame
-	}
-	existingMod := existing.LastModifiedAt
-	if !existingMod.Valid {
-		existingMod = existing.UpdatedAt
-	}
-	if !existingMod.Valid {
-		return true, true
-	}
-	return req.ModifiedAt.After(existingMod.Time), true
-}
-
-func (s *AnnotationService) TombstoneNoteByID(ctx context.Context, id pgtype.UUID) error {
-	return s.db.TombstoneMediaNoteByID(ctx, id)
-}
-
-type SaveBookmarkRequest struct {
-	MediaItemID      pgtype.UUID
-	UserID           pgtype.UUID
-	Title            string
-	Position         string
-	Notes            string
-	PageNumber       int32
-	ChapterNumber    int32
-	CFIPosition      string
-	PercentageLoc    float64
-	EpubcfiLocation  string
-	ChapterReference int32
-	Source           string
-	ModifiedAt       time.Time
-	DeviceSyncData   json.RawMessage
-}
-
-type SaveBookmarkResult struct {
-	Bookmark database.MediaBookmarks
-	Outcome  SaveOutcome
-	Conflict bool
-}
-
-func (s *AnnotationService) SaveBookmark(ctx context.Context, req SaveBookmarkRequest) (*SaveBookmarkResult, error) {
-	dedupKey := ComputeDedupKey(req.Title, req.EpubcfiLocation, req.Position)
-
-	existing, err := s.db.GetMediaBookmarkByDedupKey(ctx, database.GetMediaBookmarkByDedupKeyParams{
-		UserID:      req.UserID,
-		MediaItemID: req.MediaItemID,
-		DedupKey:    pgtype.Text{String: dedupKey, Valid: true},
-	})
-	if err != nil && !errors.Is(err, pgx.ErrNoRows) {
-		return nil, fmt.Errorf("query existing bookmark: %w", err)
-	}
-
-	if errors.Is(err, pgx.ErrNoRows) {
-		return s.createBookmark(ctx, req, dedupKey)
-	}
-
-	if existing.Deleted.Bool {
-		if !incomingNewerThanTombstone(req.ModifiedAt, existing.DeletedAt, existing.LastModifiedAt) {
-			return &SaveBookmarkResult{Bookmark: existing, Outcome: SaveOutcomeDeleted}, nil
-		}
-		// Newer than the tombstone: a deliberate re-create. Resurrect via the
-		// LWW update instead of INSERT (the tombstoned row still holds the
-		// UNIQUE(media_item_id, user_id, title) slot).
-		return s.applyBookmarkLWW(ctx, req, existing, dedupKey)
-	}
-
-	return s.applyBookmarkLWW(ctx, req, existing, dedupKey)
-}
-
-func (s *AnnotationService) createBookmark(ctx context.Context, req SaveBookmarkRequest, dedupKey string) (*SaveBookmarkResult, error) {
-	modifiedAt := req.ModifiedAt
-	if modifiedAt.IsZero() {
-		modifiedAt = time.Now()
-	}
-	deviceData := mergeDeviceSyncData(nil, req.Source, req.DeviceSyncData)
-
-	bm, err := s.db.CreateMediaBookmarkFull(ctx, database.CreateMediaBookmarkFullParams{
-		MediaItemID:      req.MediaItemID,
-		UserID:           req.UserID,
-		PageNumber:       pgInt4(req.PageNumber),
-		ChapterNumber:    pgInt4(req.ChapterNumber),
-		CfiPosition:      pgText(req.CFIPosition),
-		Title:            req.Title,
-		Position:         pgText(req.Position),
-		Notes:            pgText(req.Notes),
-		PercentageLocation: pgFloat8(req.PercentageLoc),
-		EpubcfiLocation:  pgText(req.EpubcfiLocation),
-		ChapterReference: pgInt4(req.ChapterReference),
-		DedupKey:         pgtype.Text{String: dedupKey, Valid: true},
-		LastModifiedAt:   pgtype.Timestamptz{Time: modifiedAt, Valid: true},
-		LastModifiedSource: pgtype.Text{String: req.Source, Valid: req.Source != ""},
-		DeviceSyncData:   deviceData,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("create bookmark: %w", err)
-	}
-	s.broadcast(bm.ID, req.UserID, req.MediaItemID, "bookmark", req.Source)
-	return &SaveBookmarkResult{Bookmark: bm, Outcome: SaveOutcomeCreated}, nil
-}
-
-func (s *AnnotationService) applyBookmarkLWW(ctx context.Context, req SaveBookmarkRequest, existing database.MediaBookmarks, dedupKey string) (*SaveBookmarkResult, error) {
-	incomingNewer, contentChanged := s.compareIncomingBookmark(req, existing)
-
-	if !incomingNewer && !contentChanged {
-		conflict := isCrossSource(req.Source, existing.LastModifiedSource)
-		if conflict {
-			s.recordConflict(ctx, req.UserID, req.MediaItemID, "annotation_bookmark",
-				existing.DedupKey.String, req.Source, existing.LastModifiedSource.String,
-				req, existing, "existing")
-		}
-		return &SaveBookmarkResult{Bookmark: existing, Outcome: SaveOutcomeSkipped, Conflict: conflict}, nil
-	}
-
-	modifiedAt := req.ModifiedAt
-	if modifiedAt.IsZero() {
-		modifiedAt = time.Now()
-	}
-	deviceData := mergeDeviceSyncData(existing.DeviceSyncData, req.Source, req.DeviceSyncData)
-
-	bm, err := s.db.UpdateMediaBookmarkForSync(ctx, database.UpdateMediaBookmarkForSyncParams{
-		ID:               existing.ID,
-		PageNumber:       pgInt4(req.PageNumber),
-		ChapterNumber:    pgInt4(req.ChapterNumber),
-		CfiPosition:      pgText(req.CFIPosition),
-		Title:            req.Title,
-		Position:         pgText(req.Position),
-		Notes:            pgText(req.Notes),
-		PercentageLocation: pgFloat8(req.PercentageLoc),
-		EpubcfiLocation:  pgText(req.EpubcfiLocation),
-		ChapterReference: pgInt4(req.ChapterReference),
-		LastModifiedAt:   pgtype.Timestamptz{Time: modifiedAt, Valid: true},
-		LastModifiedSource: pgtype.Text{String: req.Source, Valid: req.Source != ""},
-		DeviceSyncData:   deviceData,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("update bookmark: %w", err)
-	}
-	conflict := isCrossSource(req.Source, existing.LastModifiedSource)
-	if conflict {
-		s.recordConflict(ctx, req.UserID, req.MediaItemID, "annotation_bookmark",
-			existing.DedupKey.String, req.Source, existing.LastModifiedSource.String,
-			req, existing, "incoming")
-	}
-	s.broadcast(bm.ID, req.UserID, req.MediaItemID, "bookmark", req.Source)
-	return &SaveBookmarkResult{Bookmark: bm, Outcome: SaveOutcomeUpdated, Conflict: conflict}, nil
-}
-
-func (s *AnnotationService) compareIncomingBookmark(req SaveBookmarkRequest, existing database.MediaBookmarks) (incomingNewer bool, contentChanged bool) {
-	if req.ModifiedAt.IsZero() {
-		contentSame := strings.EqualFold(req.Title, existing.Title) &&
-			textEq(req.Notes, existing.Notes)
-		return !contentSame, !contentSame
-	}
-	existingMod := existing.LastModifiedAt
-	if !existingMod.Valid {
-		existingMod = existing.CreatedAt
-	}
-	return req.ModifiedAt.After(existingMod.Time), true
-}
-
-func (s *AnnotationService) TombstoneBookmarkByID(ctx context.Context, bookmarkID pgtype.UUID, source string) error {
-	bm, err := s.db.GetMediaBookmark(ctx, bookmarkID)
-	if err != nil {
-		return fmt.Errorf("get bookmark for tombstone: %w", err)
-	}
-	err = s.db.TombstoneMediaBookmarkByID(ctx, bookmarkID)
-	if err != nil {
-		return fmt.Errorf("tombstone bookmark by ID: %w", err)
-	}
-	s.broadcast(pgtype.UUID{}, bm.UserID, bm.MediaItemID, "bookmark_delete", source)
-	return nil
-}
-
-func (s *AnnotationService) recordConflict(
-	ctx context.Context,
-	userID, mediaItemID pgtype.UUID,
-	conflictType, dedupKey string,
-	incomingSource, existingSource string,
-	incoming any,
-	existing any,
-	winner string,
-) {
-	if s.connMgr == nil || !userID.Valid || !mediaItemID.Valid {
-		return
-	}
-
-	incomingJSON, _ := json.Marshal(incoming)
-	existingJSON, _ := json.Marshal(existing)
-
-	var incomingMap, existingMap map[string]interface{}
-	json.Unmarshal(incomingJSON, &incomingMap)
-	json.Unmarshal(existingJSON, &existingMap)
-	if incomingMap == nil {
-		incomingMap = map[string]interface{}{}
-	}
-	if existingMap == nil {
-		existingMap = map[string]interface{}{}
-	}
-	incomingMap["dedup_key"] = dedupKey
-	existingMap["dedup_key"] = dedupKey
-
-	conflictData, _ := json.Marshal(map[string]interface{}{
-		"incoming": map[string]interface{}{
-			"source": incomingSource,
-			"data":   incomingMap,
-		},
-		"existing": map[string]interface{}{
-			"source": existingSource,
-			"data":   existingMap,
-		},
-	})
-
-	resolutionData, _ := json.Marshal(map[string]interface{}{
-		"winner": winner,
-		"reason": "last_modified_at_wins",
-	})
-
-	conflict, err := s.db.CreateAutoResolvedSyncConflict(ctx, database.CreateAutoResolvedSyncConflictParams{
-		MediaItemID:    mediaItemID,
-		UserID:         userID,
-		ConflictType:   conflictType,
-		ConflictData:   conflictData,
-		ResolutionData: resolutionData,
-	})
-	if err != nil {
-		log.Printf("AnnotationService: failed to record conflict: %v", err)
-		return
-	}
-
-	var conflictIDStr string
-	if conflict.ID.Valid {
-		conflictIDStr = uuid.UUID(conflict.ID.Bytes).String()
-	}
-	s.connMgr.BroadcastConflictNotification(
-		uuid.UUID(mediaItemID.Bytes),
-		"annotation_conflict",
-		conflictIDStr,
-	)
-}
-
-func (s *AnnotationService) broadcast(
-	highlightID, userID, mediaItemID pgtype.UUID,
-	annotationType string,
-	source string,
-) {
-	if s.connMgr == nil || !userID.Valid || !mediaItemID.Valid {
-		return
-	}
-	src := SourceDevice{Type: source}
-	s.connMgr.BroadcastAnnotationUpdate(
-		uuid.UUID(mediaItemID.Bytes),
-		annotationType,
-		map[string]interface{}{
-			"highlight_id": uuid.UUID(highlightID.Bytes),
-		},
-		src,
-	)
-}
-
-func ComputeDedupKey(selectionText, epubcfiStart, startPosition string) string {
-	normalized := normalizeText(selectionText)
-	posBucket := bucketPosition(epubcfiStart)
-	if posBucket == "" {
-		posBucket = bucketPosition(startPosition)
-	}
-
-	h := sha1.New()
-	h.Write([]byte(normalized))
-	h.Write([]byte{0})
-	h.Write([]byte(posBucket))
-	return hex.EncodeToString(h.Sum(nil))
-}
-
-// incomingNewerThanTombstone reports whether an incoming save should
-// resurrect a tombstoned annotation. A save carrying a modification time
-// newer than the tombstone (e.g. the user deliberately re-adding on the web,
-// or a device that genuinely re-created it) wins; a save with a missing or
-// older timestamp is treated as a stale replay from a client that still has
-// the deleted annotation, and the tombstone stands.
-func incomingNewerThanTombstone(incoming time.Time, deletedAt, lastModifiedAt pgtype.Timestamptz) bool {
-	if incoming.IsZero() {
-		return false
-	}
-	tombstone := deletedAt.Time
-	if lastModifiedAt.Valid && lastModifiedAt.Time.After(tombstone) {
-		tombstone = lastModifiedAt.Time
-	}
-	return incoming.After(tombstone)
-}
-
-func normalizeText(s string) string {
-	fields := strings.Fields(strings.ToLower(s))
-	return strings.Join(fields, " ")
-}
-
-func bucketPosition(pos string) string {
-	if pos == "" {
-		return ""
-	}
-	if strings.HasPrefix(pos, "epubcfi(") {
-		if idx := strings.LastIndex(pos, ":"); idx > 0 {
-			return pos[:idx]
-		}
-	}
-	if len(pos) > 50 {
-		return pos[:50]
-	}
-	return pos
-}
-
-func mergeDeviceSyncData(existing []byte, source string, data json.RawMessage) []byte {
-	if source == "" && len(data) == 0 {
-		return existing
-	}
-	m := make(map[string]interface{})
-	if len(existing) > 0 {
-		_ = json.Unmarshal(existing, &m)
-	}
-	if source != "" {
-		if len(data) > 0 {
-			var val interface{}
-			_ = json.Unmarshal(data, &val)
-			m[source] = val
-		} else {
-			m[source] = map[string]interface{}{"synced_at": time.Now().UTC().Format(time.RFC3339)}
-		}
-	}
-	result, _ := json.Marshal(m)
-	return result
-}
-
-func isCrossSource(incoming string, existing pgtype.Text) bool {
-	if incoming == "" || !existing.Valid {
-		return false
-	}
-	return incoming != existing.String
-}
-
-func pgText(s string) pgtype.Text {
-	if s == "" {
-		return pgtype.Text{Valid: false}
-	}
-	return pgtype.Text{String: s, Valid: true}
-}
-
-func pgFloat8(f float64) pgtype.Float8 {
-	if f == 0 {
-		return pgtype.Float8{Valid: false}
-	}
-	return pgtype.Float8{Float64: f, Valid: true}
-}
-
-func pgInt4(i int32) pgtype.Int4 {
-	if i == 0 {
-		return pgtype.Int4{Valid: false}
-	}
-	return pgtype.Int4{Int32: i, Valid: true}
-}
-
-func textEq(a string, b pgtype.Text) bool {
-	if !b.Valid {
-		return a == ""
-	}
-	return a == b.String
-}
-
-func floatEq(a float64, b pgtype.Float8) bool {
-	if !b.Valid {
-		return a == 0
-	}
-	return math.Abs(a-b.Float64) < 0.001
-}

internal/sync/annotations_test.go

@@ -1,371 +0,0 @@
-package sync
-
-import (
-	"bookhoard/internal/database"
-	"encoding/json"
-	"testing"
-	"time"
-
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-func TestComputeDedupKey_Deterministic(t *testing.T) {
-	k1 := ComputeDedupKey("Hello World", "epubcfi(/6/4!/4/10/3:100)", "")
-	k2 := ComputeDedupKey("Hello World", "epubcfi(/6/4!/4/10/3:100)", "")
-	if k1 != k2 {
-		t.Errorf("same input should produce same key: %q vs %q", k1, k2)
-	}
-}
-
-func TestComputeDedupKey_Normalization(t *testing.T) {
-	cases := [][]string{
-		{"Hello World", "  Hello   World  "},
-		{"HELLO WORLD", "hello world"},
-		{"Hello  World", "Hello World"},
-		{"Hello\t\nWorld", "Hello World"},
-	}
-	cfi := "epubcfi(/6/4!/4/10/3:100)"
-	for _, c := range cases {
-		k1 := ComputeDedupKey(c[0], cfi, "")
-		k2 := ComputeDedupKey(c[1], cfi, "")
-		if k1 != k2 {
-			t.Errorf("normalized texts should match: %q vs %q → %q vs %q", c[0], c[1], k1, k2)
-		}
-	}
-}
-
-func TestComputeDedupKey_PositionSensitivity(t *testing.T) {
-	text := "same text"
-	k1 := ComputeDedupKey(text, "epubcfi(/6/4!/4/10/3:100)", "")
-	k2 := ComputeDedupKey(text, "epubcfi(/6/4!/4/20/3:100)", "")
-	if k1 == k2 {
-		t.Error("different element paths should produce different keys")
-	}
-}
-
-func TestComputeDedupKey_OffsetInsensitive(t *testing.T) {
-	text := "same text"
-	base := "epubcfi(/6/4!/4/10/3:100)"
-	offsetShift := "epubcfi(/6/4!/4/10/3:200)"
-	k1 := ComputeDedupKey(text, base, "")
-	k2 := ComputeDedupKey(text, offsetShift, "")
-	if k1 != k2 {
-		t.Error("same element path with different char offsets should produce same key (bucket)")
-	}
-}
-
-func TestComputeDedupKey_FallbackToRawPosition(t *testing.T) {
-	text := "same text"
-	k1 := ComputeDedupKey(text, "", "page:42")
-	k2 := ComputeDedupKey(text, "", "page:42")
-	if k1 != k2 {
-		t.Error("same raw position should produce same key")
-	}
-	k3 := ComputeDedupKey(text, "", "page:99")
-	if k1 == k3 {
-		t.Error("different raw positions should produce different keys")
-	}
-}
-
-func TestComputeDedupKey_DifferentTextSamePosition(t *testing.T) {
-	cfi := "epubcfi(/6/4!/4/10/3:100)"
-	k1 := ComputeDedupKey("first highlight", cfi, "")
-	k2 := ComputeDedupKey("second highlight", cfi, "")
-	if k1 == k2 {
-		t.Error("different selection text should produce different keys")
-	}
-}
-
-func TestNormalizeText(t *testing.T) {
-	cases := []struct{ in, want string }{
-		{"Hello World", "hello world"},
-		{"  Hello   World  ", "hello world"},
-		{"Hello\t\nWorld", "hello world"},
-		{"", ""},
-		{"   ", ""},
-	}
-	for _, c := range cases {
-		got := normalizeText(c.in)
-		if got != c.want {
-			t.Errorf("normalizeText(%q) = %q, want %q", c.in, got, c.want)
-		}
-	}
-}
-
-func TestBucketPosition(t *testing.T) {
-	cases := []struct{ in, want string }{
-		{"epubcfi(/6/4!/4/10/3:100)", "epubcfi(/6/4!/4/10/3"},
-		{"epubcfi(/6/4!/4/10/3:0)", "epubcfi(/6/4!/4/10/3"},
-		{"page:42", "page:42"},
-		{"short", "short"},
-		{"", ""},
-	}
-	for _, c := range cases {
-		got := bucketPosition(c.in)
-		if got != c.want {
-			t.Errorf("bucketPosition(%q) = %q, want %q", c.in, got, c.want)
-		}
-	}
-}
-
-func TestBucketPosition_LongString(t *testing.T) {
-	long := "this_is_a_very_long_position_string_that_exceeds_fifty_characters_total"
-	got := bucketPosition(long)
-	if len(got) > 50 {
-		t.Errorf("bucketPosition should truncate to <=50 chars, got %d", len(got))
-	}
-	if got != long[:50] {
-		t.Errorf("bucketPosition truncated wrong: got %q", got)
-	}
-}
-
-func TestMergeDeviceSyncData_NewEntry(t *testing.T) {
-	result := mergeDeviceSyncData(nil, "koreader", json.RawMessage(`{"datetime":"2024-01-01"}`))
-	var m map[string]interface{}
-	if err := json.Unmarshal(result, &m); err != nil {
-		t.Fatalf("unmarshal failed: %v", err)
-	}
-	entry, ok := m["koreader"]
-	if !ok {
-		t.Fatal("expected koreader entry")
-	}
-	entryMap := entry.(map[string]interface{})
-	if entryMap["datetime"] != "2024-01-01" {
-		t.Errorf("unexpected datetime: %v", entryMap["datetime"])
-	}
-}
-
-func TestMergeDeviceSyncData_PreservesExisting(t *testing.T) {
-	existing := []byte(`{"koreader":{"datetime":"2024-01-01"}}`)
-	result := mergeDeviceSyncData(existing, "kobo", json.RawMessage(`{"bookmark_id":"abc"}`))
-	var m map[string]interface{}
-	if err := json.Unmarshal(result, &m); err != nil {
-		t.Fatalf("unmarshal failed: %v", err)
-	}
-	if _, ok := m["koreader"]; !ok {
-		t.Error("koreader entry should be preserved")
-	}
-	if _, ok := m["kobo"]; !ok {
-		t.Error("kobo entry should be added")
-	}
-}
-
-func TestMergeDeviceSyncData_OverwritesSameSource(t *testing.T) {
-	existing := []byte(`{"koreader":{"datetime":"old"}}`)
-	result := mergeDeviceSyncData(existing, "koreader", json.RawMessage(`{"datetime":"new"}`))
-	var m map[string]interface{}
-	json.Unmarshal(result, &m)
-	entry := m["koreader"].(map[string]interface{})
-	if entry["datetime"] != "new" {
-		t.Errorf("expected overwritten datetime 'new', got %v", entry["datetime"])
-	}
-}
-
-func TestIsCrossSource(t *testing.T) {
-	if isCrossSource("koreader", pgtype.Text{String: "kobo", Valid: true}) != true {
-		t.Error("different sources should be cross-source")
-	}
-	if isCrossSource("koreader", pgtype.Text{String: "koreader", Valid: true}) != false {
-		t.Error("same sources should not be cross-source")
-	}
-	if isCrossSource("", pgtype.Text{String: "koreader", Valid: true}) != false {
-		t.Error("empty incoming source should not be cross-source")
-	}
-	if isCrossSource("koreader", pgtype.Text{Valid: false}) != false {
-		t.Error("invalid existing source should not be cross-source")
-	}
-}
-
-func TestCompareIncoming_FieldDiff_Identical(t *testing.T) {
-	svc := &AnnotationService{}
-	req := SaveHighlightRequest{
-		SelectionText:   "hello",
-		Color:           "#ffff00",
-		NoteText:        "a note",
-		PercentageStart: 10.5,
-		PercentageEnd:   11.0,
-	}
-	existing := pgHighlights("hello", "#ffff00", "a note", 10.5, 11.0)
-	newer, changed := svc.compareIncoming(req, existing)
-	if newer {
-		t.Error("identical content should not be newer")
-	}
-	if changed {
-		t.Error("identical content should not be changed")
-	}
-}
-
-func TestCompareIncoming_FieldDiff_DifferentText(t *testing.T) {
-	svc := &AnnotationService{}
-	req := SaveHighlightRequest{
-		SelectionText: "edited text",
-	}
-	existing := pgHighlights("original text", "#ffff00", "", 0, 0)
-	newer, changed := svc.compareIncoming(req, existing)
-	if !newer {
-		t.Error("different content should be newer")
-	}
-	if !changed {
-		t.Error("different content should be changed")
-	}
-}
-
-func TestCompareIncoming_FieldDiff_DifferentColor(t *testing.T) {
-	svc := &AnnotationService{}
-	req := SaveHighlightRequest{
-		SelectionText: "same",
-		Color:         "#ff0000",
-	}
-	existing := pgHighlights("same", "#ffff00", "", 0, 0)
-	_, changed := svc.compareIncoming(req, existing)
-	if !changed {
-		t.Error("different color should be detected as changed")
-	}
-}
-
-func TestCompareIncoming_LWW_NewerWins(t *testing.T) {
-	svc := &AnnotationService{}
-	now := time.Now()
-	req := SaveHighlightRequest{
-		SelectionText: "same",
-		ModifiedAt:    now.Add(1 * time.Hour),
-	}
-	existing := pgHighlights("same", "", "", 0, 0)
-	existing.LastModifiedAt = pgtype.Timestamptz{Time: now, Valid: true}
-	newer, changed := svc.compareIncoming(req, existing)
-	if !newer {
-		t.Error("future timestamp should be newer")
-	}
-	if !changed {
-		t.Error("LWW mode should always report changed=true")
-	}
-}
-
-func TestCompareIncoming_LWW_OlderSkipped(t *testing.T) {
-	svc := &AnnotationService{}
-	now := time.Now()
-	req := SaveHighlightRequest{
-		SelectionText: "same",
-		ModifiedAt:    now.Add(-1 * time.Hour),
-	}
-	existing := pgHighlights("same", "", "", 0, 0)
-	existing.LastModifiedAt = pgtype.Timestamptz{Time: now, Valid: true}
-	newer, _ := svc.compareIncoming(req, existing)
-	if newer {
-		t.Error("past timestamp should not be newer")
-	}
-}
-
-func TestCompareIncoming_LWW_FallsBackToUpdatedAt(t *testing.T) {
-	svc := &AnnotationService{}
-	now := time.Now()
-	req := SaveHighlightRequest{
-		SelectionText: "same",
-		ModifiedAt:    now.Add(1 * time.Hour),
-	}
-	existing := pgHighlights("same", "", "", 0, 0)
-	existing.LastModifiedAt = pgtype.Timestamptz{Valid: false}
-	existing.UpdatedAt = pgtype.Timestamptz{Time: now, Valid: true}
-	newer, _ := svc.compareIncoming(req, existing)
-	if !newer {
-		t.Error("should fall back to updated_at when last_modified_at is invalid")
-	}
-}
-
-func TestPgText(t *testing.T) {
-	if pgText("").Valid {
-		t.Error("empty string should produce invalid pgtype.Text")
-	}
-	v := pgText("hello")
-	if !v.Valid || v.String != "hello" {
-		t.Errorf("expected valid 'hello', got %+v", v)
-	}
-}
-
-func TestPgFloat8(t *testing.T) {
-	if pgFloat8(0).Valid {
-		t.Error("zero should produce invalid pgtype.Float8")
-	}
-	v := pgFloat8(1.5)
-	if !v.Valid || v.Float64 != 1.5 {
-		t.Errorf("expected valid 1.5, got %+v", v)
-	}
-}
-
-func TestPgInt4(t *testing.T) {
-	if pgInt4(0).Valid {
-		t.Error("zero should produce invalid pgtype.Int4")
-	}
-	v := pgInt4(3)
-	if !v.Valid || v.Int32 != 3 {
-		t.Errorf("expected valid 3, got %+v", v)
-	}
-}
-
-func TestFloatEq(t *testing.T) {
-	if !floatEq(0, pgtype.Float8{Valid: false}) {
-		t.Error("0 vs invalid should be equal")
-	}
-	if !floatEq(10.5, pgtype.Float8{Float64: 10.5, Valid: true}) {
-		t.Error("10.5 vs 10.5 should be equal")
-	}
-	if floatEq(10.6, pgtype.Float8{Float64: 10.5, Valid: true}) {
-		t.Error("10.6 vs 10.5 should not be equal")
-	}
-}
-
-func TestTextEq(t *testing.T) {
-	if !textEq("", pgtype.Text{Valid: false}) {
-		t.Error("empty vs invalid should be equal")
-	}
-	if !textEq("hi", pgtype.Text{String: "hi", Valid: true}) {
-		t.Error("same strings should be equal")
-	}
-	if textEq("hi", pgtype.Text{String: "bye", Valid: true}) {
-		t.Error("different strings should not be equal")
-	}
-}
-
-func TestTombstoneTTL(t *testing.T) {
-	if TombstoneTTL != 30*24*time.Hour {
-		t.Errorf("expected 30 days, got %v", TombstoneTTL)
-	}
-}
-
-func pgHighlights(text, color, note string, pctStart, pctEnd float64) database.MediaHighlights {
-	return database.MediaHighlights{
-		SelectionText:   text,
-		Color:           pgtype.Text{String: color, Valid: color != ""},
-		NoteText:        pgtype.Text{String: note, Valid: note != ""},
-		PercentageStart: pgtype.Float8{Float64: pctStart, Valid: pctStart != 0},
-		PercentageEnd:   pgtype.Float8{Float64: pctEnd, Valid: pctEnd != 0},
-	}
-}
-
-func TestIncomingNewerThanTombstone(t *testing.T) {
-	base := time.Date(2026, 8, 14, 12, 0, 0, 0, time.UTC)
-	delAt := pgtype.Timestamptz{Time: base, Valid: true}
-	lastMod := pgtype.Timestamptz{Time: base.Add(-time.Minute), Valid: true}
-
-	tests := []struct {
-		name     string
-		incoming time.Time
-		deleted  pgtype.Timestamptz
-		lastMod  pgtype.Timestamptz
-		want     bool
-	}{
-		{"newer than tombstone resurrects", base.Add(time.Hour), delAt, lastMod, true},
-		{"older than tombstone is a stale replay", base.Add(-time.Hour), delAt, lastMod, false},
-		{"missing timestamp never resurrects", time.Time{}, delAt, lastMod, false},
-		{"exactly equal does not resurrect", base, delAt, lastMod, false},
-		{"last_modified newer than deleted_at wins", base.Add(30 * time.Minute), delAt, pgtype.Timestamptz{Time: base.Add(90 * time.Minute), Valid: true}, false},
-		{"invalid timestamps compare against deleted_at", base.Add(time.Hour), delAt, pgtype.Timestamptz{}, true},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := incomingNewerThanTombstone(tt.incoming, tt.deleted, tt.lastMod); got != tt.want {
-				t.Errorf("incomingNewerThanTombstone() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

internal/sync/cfi_converter_test.go

@@ -1,449 +0,0 @@
-package sync
-
-import (
-	"strings"
-	"testing"
-
-	"golang.org/x/net/html"
-)
-
-func TestParseCREXPointer(t *testing.T) {
-	tests := []struct {
-		input   string
-		wantFrag int
-		wantPath int
-		wantChar int
-	}{
-		{"/body/DocFragment[0]/body/div[4]/p[38]/text().541", 0, 2, 541},
-		{"/body/DocFragment[2]/body/div/p[5]/text()[2].16", 2, 2, 16},
-		{"/body/DocFragment[1]/body", 1, 0, 0},
-		{"/body/DocFragment[5]/body/div[3]/p[28]", 5, 2, 0},
-	}
-
-	for _, tt := range tests {
-		xp, err := ParseCREXPointer(tt.input)
-		if err != nil {
-			t.Errorf("ParseCREXPointer(%q) error: %v", tt.input, err)
-			continue
-		}
-		if xp.FragmentIndex != tt.wantFrag {
-			t.Errorf("FragmentIndex = %d, want %d", xp.FragmentIndex, tt.wantFrag)
-		}
-		if len(xp.ElementPath) != tt.wantPath {
-			t.Errorf("len(ElementPath) = %d, want %d (got %+v)", len(xp.ElementPath), tt.wantPath, xp.ElementPath)
-		}
-		if xp.CharOffset != tt.wantChar {
-			t.Errorf("CharOffset = %d, want %d", xp.CharOffset, tt.wantChar)
-		}
-	}
-}
-
-func TestParseCREXPointerInvalid(t *testing.T) {
-	_, err := ParseCREXPointer("epubcfi(/6/4!/4/2/1:0)")
-	if err == nil {
-		t.Error("expected error for standard epubcfi")
-	}
-	_, err = ParseCREXPointer("")
-	if err == nil {
-		t.Error("expected error for empty string")
-	}
-}
-
-func TestIsCREXPointer(t *testing.T) {
-	if !IsCREXPointer("/body/DocFragment[0]/body/div/p") {
-		t.Error("should recognize CRE XPointer")
-	}
-	if !IsCREXPointer("#_doc_fragment_5_ link2HCH0002") {
-		t.Error("should recognize CRE fragment ID")
-	}
-	if IsCREXPointer("epubcfi(/6/4!/4/2/1:0)") {
-		t.Error("should not recognize standard epubcfi as CRE")
-	}
-}
-
-func TestIsCREFragmentID(t *testing.T) {
-	if !IsCREFragmentID("#_doc_fragment_5_ link2HCH0002") {
-		t.Error("should recognize fragment ID")
-	}
-	if IsCREFragmentID("/body/DocFragment[2]/body") {
-		t.Error("should not recognize XPointer as fragment ID")
-	}
-}
-
-func TestParseCREFragmentID(t *testing.T) {
-	tests := []struct {
-		input       string
-		wantSpine   int
-		wantAnchor  string
-	}{
-		{"#_doc_fragment_5_ link2HCH0002", 5, "link2HCH0002"},
-		{"#_doc_fragment_0_", 0, ""},
-		{"#_doc_fragment_12_someid123", 12, "someid123"},
-	}
-
-	for _, tt := range tests {
-		frag, err := ParseCREFragmentID(tt.input)
-		if err != nil {
-			t.Errorf("ParseCREFragmentID(%q) error: %v", tt.input, err)
-			continue
-		}
-		if frag.SpineIndex != tt.wantSpine {
-			t.Errorf("SpineIndex = %d, want %d", frag.SpineIndex, tt.wantSpine)
-		}
-		if frag.Anchor != tt.wantAnchor {
-			t.Errorf("Anchor = %q, want %q", frag.Anchor, tt.wantAnchor)
-		}
-	}
-}
-
-func TestParseCREFragmentIDInvalid(t *testing.T) {
-	_, err := ParseCREFragmentID("/body/DocFragment[2]/body")
-	if err == nil {
-		t.Error("expected error for XPointer input")
-	}
-	_, err = ParseCREFragmentID("#_doc_fragment_")
-	if err == nil {
-		t.Error("expected error for missing index")
-	}
-}
-
-func TestIsStandardEPUBCFI(t *testing.T) {
-	if !IsStandardEPUBCFI("epubcfi(/6/4!/4/2/1:0)") {
-		t.Error("should recognize standard epubcfi")
-	}
-	if IsStandardEPUBCFI("/body/DocFragment[0]/body") {
-		t.Error("should not recognize CRE as standard")
-	}
-}
-
-func TestConvert1984(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/George Orwell/1984 (126)/1984 - George Orwell.epub"
-	c := NewCFIConverter(epubPath)
-
-	xp := "/body/DocFragment[2]/body/div/p[5]/text().500"
-	result, err := c.ConvertCREToStandard(xp, 0.01, "")
-	if err != nil {
-		t.Fatalf("ConvertCREToStandard error: %v", err)
-	}
-	t.Logf("Input: %s", xp)
-	t.Logf("EPUBCFI: %s", result.EPUBCFI)
-	t.Logf("Href: %s", result.Href)
-	t.Logf("Precision: %s", result.Precision)
-	t.Logf("Percentage: %.4f", result.Percentage)
-
-	if result.Precision == "percentage" {
-		t.Error("expected better than percentage precision")
-	}
-}
-
-func TestConvertCrimeAndPunishmentFragmentID(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/Fyodor Dostoyevsky/Crime and Punishment (103)/Crime and Punishment - Fyodor Dostoyevsky.epub"
-	c := NewCFIConverter(epubPath)
-
-	xp := "#_doc_fragment_5_ link2HCH0002"
-	result, err := c.ConvertCREToStandard(xp, 0.0303, "")
-	if err != nil {
-		t.Fatalf("ConvertCREToStandard error: %v", err)
-	}
-	t.Logf("Input: %s", xp)
-	t.Logf("EPUBCFI: %s", result.EPUBCFI)
-	t.Logf("Href: %s", result.Href)
-	t.Logf("Precision: %s", result.Precision)
-	t.Logf("Percentage: %.4f", result.Percentage)
-
-	if result.Precision == "percentage" {
-		t.Error("expected better than percentage precision")
-	}
-	if result.Href == "" {
-		t.Error("expected non-empty href")
-	}
-	if result.Precision != "element" {
-		t.Errorf("expected element precision, got %s", result.Precision)
-	}
-}
-
-func TestParseEPUBCFI(t *testing.T) {
-	tests := []struct {
-		input      string
-		wantSpine  int
-		wantSteps  int
-	}{
-		{"epubcfi(/6/12!/4/2/90/1:7)", 5, 4},
-		{"epubcfi(/6/4!/4/2/1:0)", 1, 3},
-		{"epubcfi(/6/2!/4)", 0, 1},
-	}
-
-	for _, tt := range tests {
-		spineIndex, steps, err := parseEPUBCFI(tt.input)
-		if err != nil {
-			t.Errorf("parseEPUBCFI(%q) error: %v", tt.input, err)
-			continue
-		}
-		if spineIndex != tt.wantSpine {
-			t.Errorf("spineIndex = %d, want %d", spineIndex, tt.wantSpine)
-		}
-		if len(steps) != tt.wantSteps {
-			t.Errorf("len(steps) = %d, want %d", len(steps), tt.wantSteps)
-		}
-	}
-}
-
-func TestParseEPUBCFIRange(t *testing.T) {
-	spineIndex, steps, err := parseEPUBCFI("epubcfi(/6/40!/4,/24/20,/40/5:61)")
-	if err != nil {
-		t.Fatalf("parseEPUBCFI range error: %v", err)
-	}
-	if spineIndex != 19 {
-		t.Errorf("spineIndex = %d, want 19", spineIndex)
-	}
-	t.Logf("Range CFI steps: %d", len(steps))
-	for i, s := range steps {
-		t.Logf("  step %d: index=%d offset=%d hasOffset=%v", i, s.Index, s.Offset, s.HasOffset)
-	}
-}
-
-func TestParseEPUBCFIInvalid(t *testing.T) {
-	_, _, err := parseEPUBCFI("not-a-cfi")
-	if err == nil {
-		t.Error("expected error for invalid CFI")
-	}
-	_, _, err = parseEPUBCFI("epubcfi(/6/12)")
-	if err == nil {
-		t.Error("expected error for CFI without indirection")
-	}
-}
-
-func TestRoundTrip1984(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/George Orwell/1984 (126)/1984 - George Orwell.epub"
-	c := NewCFIConverter(epubPath)
-
-	originalXP := "/body/DocFragment[2]/body/div/p[5]/text().500"
-	forward, err := c.ConvertCREToStandard(originalXP, 0.01, "")
-	if err != nil {
-		t.Fatalf("forward conversion error: %v", err)
-	}
-	if forward.EPUBCFI == "" {
-		t.Fatal("forward conversion produced empty epubcfi")
-	}
-	t.Logf("Forward: %s → %s", originalXP, forward.EPUBCFI)
-
-	reverse, err := c.ConvertStandardToCRE(forward.EPUBCFI, forward.Percentage, "")
-	if err != nil {
-		t.Fatalf("reverse conversion error: %v", err)
-	}
-	if reverse.XPointer == "" {
-		t.Fatal("reverse conversion produced empty XPointer")
-	}
-	t.Logf("Reverse: %s → %s", forward.EPUBCFI, reverse.XPointer)
-	t.Logf("Reverse precision: %s", reverse.Precision)
-
-	if reverse.Precision != "exact" {
-		t.Errorf("expected exact precision, got %s", reverse.Precision)
-	}
-}
-
-func TestRoundTripCP(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/Fyodor Dostoyevsky/Crime and Punishment (103)/Crime and Punishment - Fyodor Dostoyevsky.epub"
-	c := NewCFIConverter(epubPath)
-
-	originalXP := "/body/DocFragment[6]/body/div/p[47]/text().2399"
-	contextText := "Raskolnikov was not used to crowds, and, as we said before, he avoided society of every sort, more especially of l"
-	forward, err := c.ConvertCREToStandard(originalXP, 0.0579, contextText)
-	if err != nil {
-		t.Fatalf("forward conversion error: %v", err)
-	}
-	if forward.EPUBCFI == "" {
-		t.Fatal("forward conversion produced empty epubcfi")
-	}
-	t.Logf("Forward: %s → %s", originalXP, forward.EPUBCFI)
-
-	reverse, err := c.ConvertStandardToCRE(forward.EPUBCFI, forward.Percentage, contextText)
-	if err != nil {
-		t.Fatalf("reverse conversion error: %v", err)
-	}
-	if reverse.XPointer == "" {
-		t.Fatal("reverse conversion produced empty XPointer")
-	}
-	t.Logf("Reverse: %s → %s", forward.EPUBCFI, reverse.XPointer)
-	t.Logf("Reverse precision: %s", reverse.Precision)
-
-	if reverse.Precision != "exact" {
-		t.Errorf("expected exact precision, got %s", reverse.Precision)
-	}
-}
-
-func TestReverseTextSearchFallback(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/Fyodor Dostoyevsky/Crime and Punishment (103)/Crime and Punishment - Fyodor Dostoyevsky.epub"
-	c := NewCFIConverter(epubPath)
-
-	contextText := "Raskolnikov was not used to crowds, and, as we said before, he avoided society of every sort, more especially of l"
-	reverse, err := c.ConvertStandardToCRE("epubcfi(/6/12!/4/99999/1:0)", 0.0579, contextText)
-	if err != nil {
-		t.Fatalf("reverse conversion error: %v", err)
-	}
-	t.Logf("Text search fallback XPointer: %s", reverse.XPointer)
-	t.Logf("Precision: %s", reverse.Precision)
-
-	if reverse.Precision != "exact" {
-		t.Errorf("expected exact precision from text search, got %s", reverse.Precision)
-	}
-	if reverse.XPointer == "" {
-		t.Error("expected non-empty XPointer from text search")
-	}
-}
-
-func TestReversePercentageFallback(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/George Orwell/1984 (126)/1984 - George Orwell.epub"
-	c := NewCFIConverter(epubPath)
-
-	reverse, err := c.ConvertStandardToCRE("epubcfi(/6/12!/4/99999/1:0)", 0.5, "")
-	if err != nil {
-		t.Fatalf("reverse conversion error: %v", err)
-	}
-	t.Logf("Percentage fallback precision: %s", reverse.Precision)
-
-	if reverse.Precision != "percentage" {
-		t.Errorf("expected percentage precision, got %s with XPointer %s", reverse.Precision, reverse.XPointer)
-	}
-	if reverse.XPointer != "" {
-		t.Error("expected empty XPointer for percentage fallback")
-	}
-}
-
-func TestFindTextInNode_SingleTextNode(t *testing.T) {
-	doc := parseTestHTML(`<html><body><p>Hello world this is a test</p></body></html>`)
-	body := findBody(doc)
-
-	node, offset := findTextInNode(body, "Hello world")
-	if node == nil {
-		t.Fatal("expected to find text")
-	}
-	if offset != 0 {
-		t.Errorf("offset = %d, want 0", offset)
-	}
-}
-
-func TestFindTextInNode_CrossEmElement(t *testing.T) {
-	doc := parseTestHTML(`<html><body><p>the countries <em>Vokalia</em> and <em>Consonantia</em> live here</p></body></html>`)
-	body := findBody(doc)
-
-	node, offset := findTextInNode(body, "Vokalia and Consonantia")
-	if node == nil {
-		t.Fatal("expected to find text across <em> elements")
-	}
-	if node.Data != "Vokalia" {
-		t.Errorf("expected match in 'Vokalia' text node, got %q", node.Data)
-	}
-	if offset != 0 {
-		t.Errorf("offset = %d, want 0", offset)
-	}
-}
-
-func TestFindTextInNode_CrossStrongElement(t *testing.T) {
-	doc := parseTestHTML(`<html><body><p>Some <strong>bold and italic</strong> text here</p></body></html>`)
-	body := findBody(doc)
-
-	node, _ := findTextInNode(body, "bold and italic text")
-	if node == nil {
-		t.Fatal("expected to find text across <strong> boundary")
-	}
-	if node.Data != "bold and italic" {
-		t.Errorf("expected match in 'bold and italic' text node, got %q", node.Data)
-	}
-}
-
-func TestFindTextInNode_DoesNotCrossParagraphs(t *testing.T) {
-	doc := parseTestHTML(`<html><body><p>first paragraph</p><p>second paragraph</p></body></html>`)
-	body := findBody(doc)
-
-	node, _ := findTextInNode(body, "paragraph second")
-	if node != nil {
-		t.Error("should not match text across <p> boundaries")
-	}
-}
-
-func TestFindTextInNode_NestedFormatting(t *testing.T) {
-	doc := parseTestHTML(`<html><body><p>before <em><strong>bold italic</strong></em> after</p></body></html>`)
-	body := findBody(doc)
-
-	node, offset := findTextInNode(body, "bold italic after")
-	if node == nil {
-		t.Fatal("expected to find text across nested formatting")
-	}
-	if node.Data != "bold italic" {
-		t.Errorf("expected match in 'bold italic' text node, got %q", node.Data)
-	}
-	_ = offset
-}
-
-func TestFindBlockParent(t *testing.T) {
-	doc := parseTestHTML(`<html><body><p>text <em>inside <strong>deep</strong></em></p></body></html>`)
-	body := findBody(doc)
-
-	var deepNode *html.Node
-	var walk func(*html.Node)
-	walk = func(n *html.Node) {
-		if n.Type == html.TextNode && n.Data == "deep" {
-			deepNode = n
-			return
-		}
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			walk(c)
-		}
-	}
-	walk(body)
-
-	if deepNode == nil {
-		t.Fatal("could not find 'deep' text node")
-	}
-
-	block := findBlockParent(deepNode)
-	if block == nil {
-		t.Fatal("expected block parent")
-	}
-	if block.Data != "p" {
-		t.Errorf("block parent = %q, want 'p'", block.Data)
-	}
-}
-
-func TestCollectInlineText(t *testing.T) {
-	doc := parseTestHTML(`<html><body><p>the countries <em>Vokalia</em> and <em>Consonantia</em> live</p></body></html>`)
-	body := findBody(doc)
-
-	var p *html.Node
-	var walk func(*html.Node)
-	walk = func(n *html.Node) {
-		if n.Type == html.ElementNode && n.Data == "p" {
-			p = n
-			return
-		}
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			walk(c)
-		}
-	}
-	walk(body)
-
-	if p == nil {
-		t.Fatal("could not find <p> element")
-	}
-
-	segments := collectInlineText(p)
-
-	var collected []rune
-	for _, seg := range segments {
-		collected = append(collected, seg.runes...)
-	}
-
-	flattened := strings.TrimSpace(string(collected))
-	if flattened != "the countries Vokalia and Consonantia live" {
-		t.Errorf("collected text = %q", flattened)
-	}
-}
-
-func parseTestHTML(s string) *html.Node {
-	doc, err := html.Parse(strings.NewReader(s))
-	if err != nil {
-		panic(err)
-	}
-	return doc
-}

internal/sync/kepub_cfi_converter.go

@@ -1,321 +0,0 @@
-package sync
-
-import (
-	"fmt"
-	"log"
-
-	"golang.org/x/net/html"
-)
-
-type KEPUBCFIConverter struct {
-	epubConverter  *CFIConverter
-	kepubConverter *CFIConverter
-}
-
-type KEPUBConversionResult struct {
-	CFI               string
-	ExtractedContext  string
-	Percentage        float64
-	Precision         string
-}
-
-func NewKEPUBCFIConverter(epubPath, kepubPath string) *KEPUBCFIConverter {
-	return &KEPUBCFIConverter{
-		epubConverter:  NewCFIConverter(epubPath),
-		kepubConverter: NewCFIConverter(kepubPath),
-	}
-}
-
-func (k *KEPUBCFIConverter) ConvertKEPUBCFIToStandard(kepubCFI string, percentage float64, contextText string) (*KEPUBConversionResult, error) {
-	if !IsStandardEPUBCFI(kepubCFI) {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	spineIndex, steps, err := parseEPUBCFI(kepubCFI)
-	if err != nil {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	kepubDoc, _, docErr := k.kepubConverter.getContentDoc(spineIndex + 1)
-	if docErr != nil {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	kepubTextNode, kepubOffset, resolveErr := resolveCFIToNode(kepubDoc, steps)
-	if resolveErr != nil {
-		return k.kepubToStandardByPercentage(spineIndex, percentage)
-	}
-
-	var searchText string
-	if contextText != "" {
-		searchText = normalizeWhitespace(contextText)
-	} else if kepubTextNode != nil && kepubTextNode.Type == html.TextNode {
-		searchText = extractSurroundingText(kepubTextNode, kepubOffset, 80)
-	}
-
-	if searchText != "" {
-		epubDoc, _, docErr := k.epubConverter.getContentDoc(spineIndex + 1)
-		if docErr == nil {
-			epubBody := findBody(epubDoc)
-			if epubBody != nil {
-				matchNode, matchOffset := findTextInNode(epubBody, searchText)
-				if matchNode != nil {
-					cfi, buildErr := buildCFI(spineIndex, matchNode, matchOffset)
-					if buildErr == nil && cfi != "" {
-						return &KEPUBConversionResult{
-							CFI:              cfi,
-							ExtractedContext: searchText,
-							Percentage:       percentage,
-							Precision:        "exact",
-						}, nil
-					}
-				}
-			}
-		}
-	}
-
-	result, _ := k.kepubToStandardByPercentage(spineIndex, percentage)
-	result.ExtractedContext = searchText
-	return result, nil
-}
-
-func (k *KEPUBCFIConverter) ConvertStandardCFIToKEPUB(standardCFI string, percentage float64, contextText string) (*KEPUBConversionResult, error) {
-	if !IsStandardEPUBCFI(standardCFI) {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	spineIndex, steps, err := parseEPUBCFI(standardCFI)
-	if err != nil {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	epubDoc, _, docErr := k.epubConverter.getContentDoc(spineIndex + 1)
-	if docErr != nil {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	epubTextNode, epubOffset, resolveErr := resolveCFIToNode(epubDoc, steps)
-	if resolveErr != nil {
-		return k.standardToKEPUBByPercentage(spineIndex, percentage)
-	}
-
-	var searchText string
-	if contextText != "" {
-		searchText = normalizeWhitespace(contextText)
-	} else if epubTextNode != nil && epubTextNode.Type == html.TextNode {
-		searchText = extractSurroundingText(epubTextNode, epubOffset, 80)
-	}
-
-	if searchText != "" {
-		kepubDoc, _, docErr := k.kepubConverter.getContentDoc(spineIndex + 1)
-		if docErr == nil {
-			kepubBody := findBody(kepubDoc)
-			if kepubBody != nil {
-				matchNode, matchOffset := findTextInNode(kepubBody, searchText)
-				if matchNode != nil {
-					cfi, buildErr := buildCFI(spineIndex, matchNode, matchOffset)
-					if buildErr == nil && cfi != "" {
-						return &KEPUBConversionResult{
-							CFI:              cfi,
-							ExtractedContext: searchText,
-							Percentage:       percentage,
-							Precision:        "exact",
-						}, nil
-					}
-				}
-			}
-		}
-	}
-
-	result, _ := k.standardToKEPUBByPercentage(spineIndex, percentage)
-	result.ExtractedContext = searchText
-	return result, nil
-}
-
-func (k *KEPUBCFIConverter) kepubToStandardByPercentage(spineIndex int, percentage float64) (*KEPUBConversionResult, error) {
-	if percentage <= 0 {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	epubDoc, _, docErr := k.epubConverter.getContentDoc(spineIndex + 1)
-	if docErr != nil {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	epubBody := findBody(epubDoc)
-	if epubBody == nil {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	totalChars := countTextChars(epubBody)
-	if totalChars <= 0 {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	targetOffset := int(float64(totalChars) * percentage)
-	targetNode, foundOffset := findNodeAtCharOffset(epubBody, targetOffset)
-	if targetNode == nil {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	charInNode := targetOffset - foundOffset
-	cfi, err := buildCFI(spineIndex, targetNode, charInNode)
-	if err != nil || cfi == "" {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	return &KEPUBConversionResult{
-		CFI:        cfi,
-		Percentage: percentage,
-		Precision:  "percentage",
-	}, nil
-}
-
-func (k *KEPUBCFIConverter) standardToKEPUBByPercentage(spineIndex int, percentage float64) (*KEPUBConversionResult, error) {
-	if percentage <= 0 {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	kepubDoc, _, docErr := k.kepubConverter.getContentDoc(spineIndex + 1)
-	if docErr != nil {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	kepubBody := findBody(kepubDoc)
-	if kepubBody == nil {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	totalChars := countTextChars(kepubBody)
-	if totalChars <= 0 {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	targetOffset := int(float64(totalChars) * percentage)
-	targetNode, foundOffset := findNodeAtCharOffset(kepubBody, targetOffset)
-	if targetNode == nil {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	charInNode := targetOffset - foundOffset
-	cfi, err := buildCFI(spineIndex, targetNode, charInNode)
-	if err != nil || cfi == "" {
-		return &KEPUBConversionResult{Percentage: percentage, Precision: "percentage"}, nil
-	}
-
-	return &KEPUBConversionResult{
-		CFI:        cfi,
-		Percentage: percentage,
-		Precision:  "percentage",
-	}, nil
-}
-
-func extractSurroundingText(textNode *html.Node, offset int, window int) string {
-	if textNode == nil || textNode.Type != html.TextNode {
-		return ""
-	}
-
-	block := findBlockParent(textNode)
-	if block == nil {
-		text := textNode.Data
-		runes := []rune(text)
-		start := offset - window
-		if start < 0 {
-			start = 0
-		}
-		end := offset + window
-		if end > len(runes) {
-			end = len(runes)
-		}
-		if start >= end {
-			return normalizeWhitespace(text)
-		}
-		return normalizeWhitespace(string(runes[start:end]))
-	}
-
-	segments := collectInlineText(block)
-
-	globalOffset := 0
-	for _, seg := range segments {
-		if seg.node == textNode {
-			globalOffset += offset
-			break
-		}
-		globalOffset += len(seg.runes)
-	}
-
-	var allRunes []rune
-	for _, seg := range segments {
-		allRunes = append(allRunes, seg.runes...)
-	}
-
-	start := globalOffset - window
-	if start < 0 {
-		start = 0
-	}
-	end := globalOffset + window
-	if end > len(allRunes) {
-		end = len(allRunes)
-	}
-
-	if start >= end {
-		return normalizeWhitespace(string(allRunes))
-	}
-
-	return normalizeWhitespace(string(allRunes[start:end]))
-}
-
-func (k *KEPUBCFIConverter) ComputeKEPUBPercentage(kepubCFI string) (float64, error) {
-	if !IsStandardEPUBCFI(kepubCFI) {
-		return -1, fmt.Errorf("not a standard epubcfi")
-	}
-
-	spineIndex, steps, err := parseEPUBCFI(kepubCFI)
-	if err != nil {
-		return -1, err
-	}
-
-	kepubDoc, _, docErr := k.kepubConverter.getContentDoc(spineIndex + 1)
-	if docErr != nil {
-		return -1, docErr
-	}
-
-	kepubBody := findBody(kepubDoc)
-	if kepubBody == nil {
-		return -1, fmt.Errorf("no body in kepub doc")
-	}
-
-	textNode, textOffset, resolveErr := resolveCFIToNode(kepubBody, steps)
-	if resolveErr != nil {
-		return -1, resolveErr
-	}
-
-	charOffset := countTextCharsBefore(textNode) + textOffset
-
-	total := 0
-	kepubSpine, spineErr := k.kepubConverter.loadSpine()
-	if spineErr != nil {
-		return -1, spineErr
-	}
-
-	for i := range kepubSpine.items {
-		doc, _, dErr := k.kepubConverter.getContentDoc(i + 1)
-		if dErr != nil {
-			continue
-		}
-		b := findBody(doc)
-		if b != nil {
-			total += countTextChars(b)
-		}
-	}
-
-	if total <= 0 {
-		return -1, fmt.Errorf("no text in kepub")
-	}
-
-	return float64(charOffset) / float64(total), nil
-}
-
-func init() {
-	_ = log.Printf
-}

internal/sync/kepub_cfi_converter_test.go

@@ -1,884 +0,0 @@
-package sync
-
-import (
-	"archive/zip"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/html"
-)
-
-const epubChapter1 = `<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops">
-<head><title>Test Book</title></head>
-<body>
-<h1 id="ch1">Chapter One</h1>
-<p>It was the best of times, it was the worst of times, it was the age of wisdom, it was the age of foolishness, it was the epoch of belief, it was the epoch of incredulity, it was the season of Light, it was the season of Darkness, it was the spring of hope, it was the winter of despair.</p>
-<p id="p2">The quick brown fox jumps over the lazy dog. Pack my box with five dozen liquor jugs. How vexingly quick daft zebras jump.</p>
-<p>Far far away, behind the word mountains, far from the countries <em>Vokalia</em> and <em>Consonantia</em>, there live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean.</p>
-<p>A wonderful serenity has taken possession of my entire soul, like these sweet mornings of spring which I enjoy with my whole heart. I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine.</p>
-<p>I should be incapable of drawing a single stroke at the present moment; and yet I feel that I never was a greater artist than now. When, while the lovely valley teems with vapour around me.</p>
-</body>
-</html>`
-
-const epubChapter2 = `<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops">
-<head><title>Test Book</title></head>
-<body>
-<h1 id="ch2">Chapter Two</h1>
-<p>Call me Ishmael. Some years ago—never mind how long precisely—having little or no money in my purse, and nothing particular to interest me on shore, I thought I would sail about a little and see the watery part of the world.</p>
-<p>It is a way I have of driving off the spleen and regulating the circulation. Whenever I find myself growing grim about the mouth; whenever it is a damp, drizzly November in my soul.</p>
-</body>
-</html>`
-
-const kepubChapter1 = `<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops">
-<head><title>Test Book</title></head>
-<body>
-<h1 id="ch1">Chapter One</h1>
-<p><span class="koboSpan" id="kobo.1.1">It was the best of times, it was the worst of times, it was the age of wisdom, it was the age of foolishness, it was the epoch of belief, it was the epoch of incredulity, it was the season of Light, it was the season of Darkness, it was the spring of hope, it was the winter of despair.</span></p>
-<p id="p2"><span class="koboSpan" id="kobo.2.1">The quick brown fox jumps over the lazy dog. Pack my box with five dozen liquor jugs. How vexingly quick daft zebras jump.</span></p>
-<p><span class="koboSpan" id="kobo.3.1">Far far away, behind the word mountains, far from the countries </span><em><span class="koboSpan" id="kobo.3.2">Vokalia</span></em><span class="koboSpan" id="kobo.3.3"> and </span><em><span class="koboSpan" id="kobo.3.4">Consonantia</span></em><span class="koboSpan" id="kobo.3.5">, there live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean.</span></p>
-<p><span class="koboSpan" id="kobo.4.1">A wonderful serenity has taken possession of my entire soul, like these sweet mornings of spring which I enjoy with my whole heart. I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine.</span></p>
-<p><span class="koboSpan" id="kobo.5.1">I should be incapable of drawing a single stroke at the present moment; and yet I feel that I never was a greater artist than now. When, while the lovely valley teems with vapour around me.</span></p>
-</body>
-</html>`
-
-const kepubChapter2 = `<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops">
-<head><title>Test Book</title></head>
-<body>
-<h1 id="ch2">Chapter Two</h1>
-<p><span class="koboSpan" id="kobo.6.1">Call me Ishmael. Some years ago—never mind how long precisely—having little or no money in my purse, and nothing particular to interest me on shore, I thought I would sail about a little and see the watery part of the world.</span></p>
-<p><span class="koboSpan" id="kobo.7.1">It is a way I have of driving off the spleen and regulating the circulation. Whenever I find myself growing grim about the mouth; whenever it is a damp, drizzly November in my soul.</span></p>
-</body>
-</html>`
-
-const containerXML = `<?xml version="1.0" encoding="UTF-8"?>
-<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
-  <rootfiles>
-    <rootfile full-path="OEBPS/content.opf" media-type="application/oebps-package+xml"/>
-  </rootfiles>
-</container>`
-
-const contentOPF = `<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://www.idpf.org/2007/opf" version="3.0" unique-identifier="uid">
-  <metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
-    <dc:identifier id="uid">urn:uuid:test-book-00000001</dc:identifier>
-    <dc:title>Test Book</dc:title>
-    <dc:language>en</dc:language>
-    <meta property="dcterms:modified">2026-01-01T00:00:00Z</meta>
-  </metadata>
-  <manifest>
-    <item id="ch1" href="chapter1.xhtml" media-type="application/xhtml+xml"/>
-    <item id="ch2" href="chapter2.xhtml" media-type="application/xhtml+xml"/>
-    <item id="nav" href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
-  </manifest>
-  <spine>
-    <itemref idref="ch1"/>
-    <itemref idref="ch2"/>
-  </spine>
-</package>`
-
-const navXHTML = `<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops">
-<head><title>TOC</title></head>
-<body>
-<nav epub:type="toc"><ol><li><a href="chapter1.xhtml">Chapter 1</a></li><li><a href="chapter2.xhtml">Chapter 2</a></li></ol></nav>
-</body>
-</html>`
-
-func createTestEPUB(t *testing.T, dir, name, ch1Content, ch2Content string) string {
-	t.Helper()
-	epubPath := filepath.Join(dir, name)
-	f, err := os.Create(epubPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-
-	w := zip.NewWriter(f)
-
-	files := map[string]string{
-		"mimetype":            "application/epub+zip",
-		"META-INF/container.xml": containerXML,
-		"OEBPS/content.opf":   contentOPF,
-		"OEBPS/nav.xhtml":     navXHTML,
-		"OEBPS/chapter1.xhtml": ch1Content,
-		"OEBPS/chapter2.xhtml": ch2Content,
-	}
-
-	mimetype, _ := w.Create("mimetype")
-	mimetype.Write([]byte("application/epub+zip"))
-
-	for path, content := range files {
-		if path == "mimetype" {
-			continue
-		}
-		fw, err := w.Create(path)
-		if err != nil {
-			t.Fatal(err)
-		}
-		fw.Write([]byte(content))
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	return epubPath
-}
-
-func setupKEPUBTestEnv(t *testing.T) (epubPath, kepubPath string) {
-	t.Helper()
-	dir := t.TempDir()
-	epubPath = createTestEPUB(t, dir, "test.epub", epubChapter1, epubChapter2)
-	kepubPath = createTestEPUB(t, dir, "test.kepub.epub", kepubChapter1, kepubChapter2)
-	return epubPath, kepubPath
-}
-
-func TestKEPUBConvertKEPUBToStandard_TextSearch(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-	converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-
-	epubOnly := NewCFIConverter(epubPath)
-	epubSpine, err := epubOnly.loadSpine()
-	if err != nil {
-		t.Fatalf("load epub spine: %v", err)
-	}
-	if len(epubSpine.items) < 1 {
-		t.Fatal("expected at least 1 spine item")
-	}
-
-	epubDoc, _, err := epubOnly.getContentDoc(1)
-	if err != nil {
-		t.Fatalf("get epub content doc: %v", err)
-	}
-	epubBody := findBody(epubDoc)
-	if epubBody == nil {
-		t.Fatal("no body in epub doc")
-	}
-
-	searchText := normalizeWhitespace("it was the worst of times")
-	epubNode, epubOffset := findTextInNode(epubBody, searchText)
-	if epubNode == nil {
-		t.Fatal("could not find target text in EPUB")
-	}
-
-	standardCFI, err := buildCFI(0, epubNode, epubOffset)
-	if err != nil {
-		t.Fatalf("build standard CFI: %v", err)
-	}
-	t.Logf("Standard EPUB CFI: %s", standardCFI)
-
-	kepubOnly := NewCFIConverter(kepubPath)
-	kepubDoc, _, err := kepubOnly.getContentDoc(1)
-	if err != nil {
-		t.Fatalf("get kepub content doc: %v", err)
-	}
-	kepubBody := findBody(kepubDoc)
-	if kepubBody == nil {
-		t.Fatal("no body in kepub doc")
-	}
-
-	kepubNode, kepubOffset := findTextInNode(kepubBody, searchText)
-	if kepubNode == nil {
-		t.Fatal("could not find target text in KEPUB")
-	}
-
-	kepubCFI, err := buildCFI(0, kepubNode, kepubOffset)
-	if err != nil {
-		t.Fatalf("build kepub CFI: %v", err)
-	}
-	t.Logf("KEPUB CFI: %s", kepubCFI)
-
-	if standardCFI == kepubCFI {
-		t.Error("KEPUB and standard CFIs should differ due to koboSpan wrappers")
-	}
-
-	result, err := converter.ConvertKEPUBCFIToStandard(kepubCFI, 0.05, searchText)
-	if err != nil {
-		t.Fatalf("ConvertKEPUBCFIToStandard error: %v", err)
-	}
-	t.Logf("Converted CFI: %s (precision: %s)", result.CFI, result.Precision)
-
-	if result.Precision != "exact" {
-		t.Errorf("expected exact precision, got %s", result.Precision)
-	}
-	if result.CFI == "" {
-		t.Fatal("expected non-empty CFI")
-	}
-
-	spineIdx1, steps1, _ := parseEPUBCFI(result.CFI)
-	spineIdx2, steps2, _ := parseEPUBCFI(standardCFI)
-	if spineIdx1 != spineIdx2 {
-		t.Errorf("spine indices differ: %d vs %d", spineIdx1, spineIdx2)
-	}
-
-	resultNode, _, err := resolveCFIToNode(epubDoc, steps1)
-	if err != nil {
-		t.Fatalf("resolve converted CFI: %v", err)
-	}
-	expectedNode, _, _ := resolveCFIToNode(epubDoc, steps2)
-
-	if resultNode != expectedNode {
-		t.Errorf("resolved to different text nodes: got %q, want %q",
-			truncateText(resultNode.Data, 40),
-			truncateText(expectedNode.Data, 40))
-	}
-}
-
-func TestKEPUBConvertStandardToKEPUB_TextSearch(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-	converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-
-	epubOnly := NewCFIConverter(epubPath)
-	epubDoc, _, err := epubOnly.getContentDoc(1)
-	if err != nil {
-		t.Fatalf("get epub doc: %v", err)
-	}
-	epubBody := findBody(epubDoc)
-
-	searchText := normalizeWhitespace("The quick brown fox jumps over the lazy dog")
-	epubNode, epubOffset := findTextInNode(epubBody, searchText)
-	if epubNode == nil {
-		t.Fatal("could not find target text in EPUB")
-	}
-
-	standardCFI, err := buildCFI(0, epubNode, epubOffset)
-	if err != nil {
-		t.Fatalf("build CFI: %v", err)
-	}
-	t.Logf("Standard CFI: %s", standardCFI)
-
-	result, err := converter.ConvertStandardCFIToKEPUB(standardCFI, 0.1, searchText)
-	if err != nil {
-		t.Fatalf("ConvertStandardCFIToKEPUB error: %v", err)
-	}
-	t.Logf("KEPUB CFI: %s (precision: %s)", result.CFI, result.Precision)
-
-	if result.Precision != "exact" {
-		t.Errorf("expected exact precision, got %s", result.Precision)
-	}
-	if result.CFI == "" {
-		t.Fatal("expected non-empty CFI")
-	}
-
-	if !strings.Contains(result.CFI, "kobo") {
-		t.Errorf("KEPUB CFI should contain koboSpan step: %s", result.CFI)
-	}
-
-	backResult, err := converter.ConvertKEPUBCFIToStandard(result.CFI, 0.1, searchText)
-	if err != nil {
-		t.Fatalf("KEPUB→standard round-trip: %v", err)
-	}
-	if backResult.CFI != standardCFI {
-		t.Errorf("round-trip mismatch: got %s, want %s", backResult.CFI, standardCFI)
-	}
-}
-
-func TestKEPUBRoundTrip(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-	converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-
-	epubOnly := NewCFIConverter(epubPath)
-	epubDoc, _, err := epubOnly.getContentDoc(1)
-	if err != nil {
-		t.Fatalf("get epub doc: %v", err)
-	}
-	epubBody := findBody(epubDoc)
-
-	phrases := []string{
-		"It was the best of times",
-		"The quick brown fox jumps",
-		"A wonderful serenity has taken possession",
-	}
-
-	for _, phrase := range phrases {
-		t.Run(phrase, func(t *testing.T) {
-			searchText := normalizeWhitespace(phrase)
-			epubNode, epubOffset := findTextInNode(epubBody, searchText)
-			if epubNode == nil {
-				t.Fatalf("could not find %q in epub", phrase)
-			}
-
-			originalCFI, err := buildCFI(0, epubNode, epubOffset)
-			if err != nil {
-				t.Fatalf("build CFI: %v", err)
-			}
-			t.Logf("Original standard CFI: %s", originalCFI)
-
-			toKEPUB, err := converter.ConvertStandardCFIToKEPUB(originalCFI, 0.1, searchText)
-			if err != nil {
-				t.Fatalf("standard→KEPUB: %v", err)
-			}
-			if toKEPUB.Precision != "exact" {
-				t.Fatalf("expected exact precision in standard→KEPUB, got %s", toKEPUB.Precision)
-			}
-			t.Logf("KEPUB CFI: %s", toKEPUB.CFI)
-
-			backToStandard, err := converter.ConvertKEPUBCFIToStandard(toKEPUB.CFI, 0.1, searchText)
-			if err != nil {
-				t.Fatalf("KEPUB→standard: %v", err)
-			}
-			if backToStandard.Precision != "exact" {
-				t.Fatalf("expected exact precision in KEPUB→standard, got %s", backToStandard.Precision)
-			}
-			t.Logf("Round-trip standard CFI: %s", backToStandard.CFI)
-
-			origSpine, origSteps, _ := parseEPUBCFI(originalCFI)
-			rtSpine, rtSteps, _ := parseEPUBCFI(backToStandard.CFI)
-
-			if origSpine != rtSpine {
-				t.Errorf("spine mismatch: original=%d roundtrip=%d", origSpine, rtSpine)
-			}
-
-			origNode, _, _ := resolveCFIToNode(epubDoc, origSteps)
-			rtNode, _, _ := resolveCFIToNode(epubDoc, rtSteps)
-
-			if origNode != rtNode {
-				t.Errorf("resolved to different nodes:\n  original: %q\n  roundtrip: %q",
-					truncateText(origNode.Data, 50),
-					truncateText(rtNode.Data, 50))
-			}
-		})
-	}
-}
-
-func TestKEPUBConvertKEPUBToStandard_Chapter2(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-	converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-
-	searchText := normalizeWhitespace("Call me Ishmael")
-
-	kepubOnly := NewCFIConverter(kepubPath)
-	kepubDoc, _, err := kepubOnly.getContentDoc(2)
-	if err != nil {
-		t.Fatalf("get kepub doc ch2: %v", err)
-	}
-	kepubBody := findBody(kepubDoc)
-	kepubNode, kepubOffset := findTextInNode(kepubBody, searchText)
-	if kepubNode == nil {
-		t.Fatal("could not find text in kepub ch2")
-	}
-
-	kepubCFI, err := buildCFI(1, kepubNode, kepubOffset)
-	if err != nil {
-		t.Fatalf("build kepub CFI: %v", err)
-	}
-	t.Logf("KEPUB CFI (ch2): %s", kepubCFI)
-
-	result, err := converter.ConvertKEPUBCFIToStandard(kepubCFI, 0.55, searchText)
-	if err != nil {
-		t.Fatalf("ConvertKEPUBCFIToStandard: %v", err)
-	}
-
-	if result.Precision != "exact" {
-		t.Errorf("expected exact precision, got %s", result.Precision)
-	}
-
-	epubOnly := NewCFIConverter(epubPath)
-	epubDoc, _, _ := epubOnly.getContentDoc(2)
-	epubBody := findBody(epubDoc)
-
-	epubNode, epubOffset := findTextInNode(epubBody, searchText)
-	expectedCFI, _ := buildCFI(1, epubNode, epubOffset)
-	t.Logf("Expected standard CFI: %s", expectedCFI)
-	t.Logf("Got standard CFI:      %s", result.CFI)
-
-	_, resultSteps, _ := parseEPUBCFI(result.CFI)
-	resultNode, _, resolveErr := resolveCFIToNode(epubDoc, resultSteps)
-	if resolveErr != nil {
-		t.Fatalf("resolve result CFI: %v", resolveErr)
-	}
-
-	if resultNode == nil {
-		t.Fatal("resolved to nil node")
-	}
-
-	if !strings.Contains(strings.ToLower(resultNode.Data), "call me ishmael") {
-		t.Errorf("resolved to wrong text: %q", truncateText(resultNode.Data, 50))
-	}
-}
-
-func TestKEPUBConvertWithEmElements(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-	converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-
-	searchText := normalizeWhitespace("Vokalia and Consonantia")
-
-	epubOnly := NewCFIConverter(epubPath)
-	epubDoc, _, err := epubOnly.getContentDoc(1)
-	if err != nil {
-		t.Fatalf("get epub doc: %v", err)
-	}
-	epubBody := findBody(epubDoc)
-
-	epubNode, epubOffset := findTextInNode(epubBody, searchText)
-	if epubNode == nil {
-		t.Fatalf("findTextInNode should find text spanning <em> elements: %q", searchText)
-	}
-
-	standardCFI, err := buildCFI(0, epubNode, epubOffset)
-	if err != nil {
-		t.Fatalf("build CFI: %v", err)
-	}
-	t.Logf("Standard CFI (em): %s", standardCFI)
-
-	result, err := converter.ConvertStandardCFIToKEPUB(standardCFI, 0.2, searchText)
-	if err != nil {
-		t.Fatalf("ConvertStandardCFIToKEPUB: %v", err)
-	}
-	t.Logf("KEPUB CFI (em elements): %s (precision: %s)", result.CFI, result.Precision)
-
-	if result.CFI == "" {
-		t.Error("expected non-empty CFI")
-	}
-	if result.Precision != "exact" {
-		t.Errorf("expected exact precision for cross-element text, got %s", result.Precision)
-	}
-
-	backResult, err := converter.ConvertKEPUBCFIToStandard(result.CFI, 0.2, searchText)
-	if err != nil {
-		t.Fatalf("KEPUB→standard round-trip: %v", err)
-	}
-	if backResult.Precision != "exact" {
-		t.Errorf("expected exact precision on round-trip, got %s", backResult.Precision)
-	}
-}
-
-func TestKEPUBConvertInvalidCFI(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-	converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-
-	result, err := converter.ConvertKEPUBCFIToStandard("not-a-cfi", 0.5, "some text")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if result.Precision != "percentage" {
-		t.Errorf("expected percentage fallback, got %s", result.Precision)
-	}
-
-	result, err = converter.ConvertStandardCFIToKEPUB("not-a-cfi", 0.5, "some text")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if result.Precision != "percentage" {
-		t.Errorf("expected percentage fallback, got %s", result.Precision)
-	}
-}
-
-func TestKEPUBConvertNoContextText(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-	converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-
-	epubOnly := NewCFIConverter(epubPath)
-	epubDoc, _, err := epubOnly.getContentDoc(1)
-	if err != nil {
-		t.Fatalf("get epub doc: %v", err)
-	}
-	epubBody := findBody(epubDoc)
-
-	epubNode, epubOffset := findTextInNode(epubBody, normalizeWhitespace("It was the best of times"))
-	if epubNode == nil {
-		t.Fatal("could not find text")
-	}
-
-	standardCFI, err := buildCFI(0, epubNode, epubOffset)
-	if err != nil {
-		t.Fatalf("build CFI: %v", err)
-	}
-
-	result, err := converter.ConvertStandardCFIToKEPUB(standardCFI, 0.1, "")
-	if err != nil {
-		t.Fatalf("ConvertStandardCFIToKEPUB (no context): %v", err)
-	}
-	t.Logf("No-context result: CFI=%s precision=%s", result.CFI, result.Precision)
-
-	if result.CFI == "" {
-		t.Error("expected non-empty CFI even without context text")
-	}
-}
-
-func TestKEPUBConvertKEPUBToStandard_NoContextText(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-	converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-
-	kepubOnly := NewCFIConverter(kepubPath)
-	kepubDoc, _, err := kepubOnly.getContentDoc(1)
-	if err != nil {
-		t.Fatalf("get kepub doc: %v", err)
-	}
-	kepubBody := findBody(kepubDoc)
-
-	kepubNode, kepubOffset := findTextInNode(kepubBody, normalizeWhitespace("It was the best of times"))
-	if kepubNode == nil {
-		t.Fatal("could not find text in kepub")
-	}
-
-	kepubCFI, err := buildCFI(0, kepubNode, kepubOffset)
-	if err != nil {
-		t.Fatalf("build CFI: %v", err)
-	}
-	t.Logf("KEPUB CFI: %s", kepubCFI)
-
-	result, err := converter.ConvertKEPUBCFIToStandard(kepubCFI, 0.05, "")
-	if err != nil {
-		t.Fatalf("ConvertKEPUBCFIToStandard (no context): %v", err)
-	}
-	t.Logf("No-context result: CFI=%s precision=%s", result.CFI, result.Precision)
-
-	if result.CFI == "" {
-		t.Error("expected non-empty CFI even without context text")
-	}
-
-	if result.Precision == "exact" {
-		epubOnly := NewCFIConverter(epubPath)
-		epubDoc, _, _ := epubOnly.getContentDoc(1)
-		epubBody := findBody(epubDoc)
-
-		expectedNode, _ := findTextInNode(epubBody, normalizeWhitespace("It was the best of times"))
-		_, resultSteps, _ := parseEPUBCFI(result.CFI)
-		actualNode, _, _ := resolveCFIToNode(epubDoc, resultSteps)
-
-		if actualNode != expectedNode {
-			t.Errorf("resolved to wrong node: got %q, want text containing 'It was the best of times'",
-				truncateText(actualNode.Data, 40))
-		}
-	}
-}
-
-func TestKEPUBPercentageFallback(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-	converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-
-	badCFI := "epubcfi(/6/2!/4/99999/1:0)"
-	result, err := converter.ConvertKEPUBCFIToStandard(badCFI, 0.5, "")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if result.Precision != "percentage" {
-		t.Errorf("expected percentage precision for unresolvable CFI, got %s", result.Precision)
-	}
-
-	result2, err := converter.ConvertStandardCFIToKEPUB(badCFI, 0.5, "")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if result2.Precision != "percentage" {
-		t.Errorf("expected percentage precision for unresolvable CFI, got %s", result2.Precision)
-	}
-}
-
-func TestExtractSurroundingText(t *testing.T) {
-	text := "Hello world, this is a test of the surrounding text extraction function."
-	runes := []rune(text)
-
-	tests := []struct {
-		offset int
-		window int
-		want   string
-	}{
-		{30, 10, "a test of the surro"},
-		{0, 5, "Hello"},
-		{len(runes) - 1, 5, "ction."},
-		{15, 100, text},
-	}
-
-	for _, tt := range tests {
-		node := &html.Node{Type: html.TextNode, Data: text}
-		got := extractSurroundingText(node, tt.offset, tt.window)
-		if got != tt.want {
-			t.Errorf("extractSurroundingText(offset=%d, window=%d) = %q, want %q", tt.offset, tt.window, got, tt.want)
-		}
-	}
-}
-
-func TestKEPUBMultipleParagraphsRoundTrip(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-	converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-
-	epubOnly := NewCFIConverter(epubPath)
-	epubDoc, _, _ := epubOnly.getContentDoc(1)
-	epubBody := findBody(epubDoc)
-
-	type testCase struct {
-		name       string
-		searchText string
-		percentage float64
-	}
-
-	cases := []testCase{
-		{"first paragraph", "It was the best of times", 0.01},
-		{"second paragraph", "Pack my box with five dozen", 0.15},
-		{"third paragraph", "Far far away, behind the word mountains", 0.25},
-		{"fourth paragraph", "A wonderful serenity has taken possession", 0.55},
-		{"fifth paragraph", "I should be incapable of drawing", 0.80},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			text := normalizeWhitespace(tc.searchText)
-			epubNode, epubOffset := findTextInNode(epubBody, text)
-			if epubNode == nil {
-				t.Fatalf("could not find %q in epub", tc.searchText)
-			}
-
-			standardCFI, _ := buildCFI(0, epubNode, epubOffset)
-
-			kepubResult, err := converter.ConvertStandardCFIToKEPUB(standardCFI, tc.percentage, text)
-			if err != nil {
-				t.Fatalf("standard→KEPUB: %v", err)
-			}
-
-			backResult, err := converter.ConvertKEPUBCFIToStandard(kepubResult.CFI, tc.percentage, text)
-			if err != nil {
-				t.Fatalf("KEPUB→standard: %v", err)
-			}
-
-			if backResult.Precision != "exact" {
-				t.Errorf("round-trip precision = %s, want exact (CFI: %s)", backResult.Precision, backResult.CFI)
-			}
-
-			_, origSteps, _ := parseEPUBCFI(standardCFI)
-			_, rtSteps, _ := parseEPUBCFI(backResult.CFI)
-
-			origNode, _, _ := resolveCFIToNode(epubDoc, origSteps)
-			rtNode, _, _ := resolveCFIToNode(epubDoc, rtSteps)
-
-			if origNode != rtNode {
-				t.Errorf("round-trip resolved to different nodes:\n  orig: %q\n  rt:   %q",
-					truncateText(origNode.Data, 40),
-					truncateText(rtNode.Data, 40))
-			}
-		})
-	}
-}
-
-func TestKEPUBCFIsDifferFromStandard(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-
-	epubOnly := NewCFIConverter(epubPath)
-	epubDoc, _, _ := epubOnly.getContentDoc(1)
-	epubBody := findBody(epubDoc)
-
-	kepubOnly := NewCFIConverter(kepubPath)
-	kepubDoc, _, _ := kepubOnly.getContentDoc(1)
-	kepubBody := findBody(kepubDoc)
-
-	text := normalizeWhitespace("It was the best of times")
-
-	epubNode, epubOffset := findTextInNode(epubBody, text)
-	kepubNode, kepubOffset := findTextInNode(kepubBody, text)
-
-	if epubNode == nil || kepubNode == nil {
-		t.Fatal("could not find text in one or both docs")
-	}
-
-	epubCFI, _ := buildCFI(0, epubNode, epubOffset)
-	kepubCFI, _ := buildCFI(0, kepubNode, kepubOffset)
-
-	t.Logf("EPUB CFI:  %s", epubCFI)
-	t.Logf("KEPUB CFI: %s", kepubCFI)
-
-	if epubCFI == kepubCFI {
-		t.Error("EPUB and KEPUB CFIs should differ due to koboSpan wrappers")
-	}
-
-	_, epubSteps, _ := parseEPUBCFI(epubCFI)
-	_, kepubSteps, _ := parseEPUBCFI(kepubCFI)
-
-	if len(kepubSteps) <= len(epubSteps) {
-		t.Errorf("KEPUB CFI should have more steps than EPUB CFI (koboSpan adds nesting): epub=%d kepub=%d",
-			len(epubSteps), len(kepubSteps))
-	}
-}
-
-func truncateText(s string, maxRunes int) string {
-	runes := []rune(s)
-	if len(runes) <= maxRunes {
-		return s
-	}
-	return string(runes[:maxRunes]) + "..."
-}
-
-func TestKEPUBChapterSpineIndices(t *testing.T) {
-	epubPath, kepubPath := setupKEPUBTestEnv(t)
-
-	epubOnly := NewCFIConverter(epubPath)
-	kepubOnly := NewCFIConverter(kepubPath)
-
-	epubSpine, err := epubOnly.loadSpine()
-	if err != nil {
-		t.Fatalf("load epub spine: %v", err)
-	}
-	kepubSpine, err := kepubOnly.loadSpine()
-	if err != nil {
-		t.Fatalf("load kepub spine: %v", err)
-	}
-
-	if len(epubSpine.items) != len(kepubSpine.items) {
-		t.Errorf("spine count mismatch: epub=%d kepub=%d", len(epubSpine.items), len(kepubSpine.items))
-	}
-
-	for i := range epubSpine.items {
-		if epubSpine.items[i].href != kepubSpine.items[i].href {
-			t.Errorf("spine item %d href mismatch: epub=%s kepub=%s",
-				i, epubSpine.items[i].href, kepubSpine.items[i].href)
-		}
-	}
-
-	t.Logf("Both files have %d spine items, matching correctly", len(epubSpine.items))
-}
-
-func TestKEPUBRealBookConvert(t *testing.T) {
-	epubPath := "/home/nymusicman/Code/bookhoard/uploads/Ebooks/Charles Dickens/A Tale of Two Cities (111)/A Tale of Two Cities - Charles Dickens.epub"
-	if _, err := os.Stat(epubPath); err != nil {
-		t.Skipf("EPUB not found: %s", epubPath)
-	}
-
-	dir := t.TempDir()
-	kepubPath := filepath.Join(dir, "test.kepub.epub")
-
-	epubOnly := NewCFIConverter(epubPath)
-	epubDoc, _, err := epubOnly.getContentDoc(1)
-	if err != nil {
-		t.Fatalf("get epub doc: %v", err)
-	}
-	epubBody := findBody(epubDoc)
-	if epubBody == nil {
-		t.Fatal("no body")
-	}
-
-	createMinimalKEPUBFromEPUB(t, epubPath, kepubPath)
-
-	kepubOnly := NewCFIConverter(kepubPath)
-	kepubDoc, _, err := kepubOnly.getContentDoc(1)
-	if err != nil {
-		t.Fatalf("get kepub doc: %v", err)
-	}
-	kepubBody := findBody(kepubDoc)
-
-	searchText := normalizeWhitespace("It was the best of times")
-	epubNode, epubOffset := findTextInNode(epubBody, searchText)
-	if epubNode == nil {
-		t.Skip("phrase not found in epub")
-	}
-
-	standardCFI, err := buildCFI(0, epubNode, epubOffset)
-	if err != nil {
-		t.Fatalf("build standard CFI: %v", err)
-	}
-	t.Logf("Standard CFI: %s", standardCFI)
-
-	kepubNode, kepubOffset := findTextInNode(kepubBody, searchText)
-	if kepubNode == nil {
-		t.Skip("phrase not found in kepub")
-	}
-	kepubCFI, _ := buildCFI(0, kepubNode, kepubOffset)
-	t.Logf("KEPUB CFI:    %s", kepubCFI)
-
-	if standardCFI == kepubCFI {
-		t.Log("Note: CFIs are same (koboSpan wrappers may not have changed structure in this position)")
-	}
-
-	converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-	result, err := converter.ConvertKEPUBCFIToStandard(kepubCFI, 0.01, searchText)
-	if err != nil {
-		t.Fatalf("ConvertKEPUBCFIToStandard: %v", err)
-	}
-	t.Logf("Converted: CFI=%s precision=%s", result.CFI, result.Precision)
-
-	if result.Precision != "exact" {
-		t.Errorf("expected exact precision, got %s", result.Precision)
-	}
-}
-
-func createMinimalKEPUBFromEPUB(t *testing.T, epubPath, kepubPath string) {
-	t.Helper()
-
-	r, err := zip.OpenReader(epubPath)
-	if err != nil {
-		t.Fatalf("open epub: %v", err)
-	}
-	defer r.Close()
-
-	f, err := os.Create(kepubPath)
-	if err != nil {
-		t.Fatalf("create kepub: %v", err)
-	}
-	defer f.Close()
-
-	w := zip.NewWriter(f)
-
-	for _, file := range r.File {
-		rc, err := file.Open()
-		if err != nil {
-			t.Fatalf("open %s: %v", file.Name, err)
-		}
-
-		fw, err := w.Create(file.Name)
-		if err != nil {
-			rc.Close()
-			t.Fatalf("create %s: %v", file.Name, err)
-		}
-
-		if isXHTML(file.Name) {
-			var buf []byte
-			buf, err = readZipFileData(rc)
-			if err != nil {
-				rc.Close()
-				t.Fatalf("read %s: %v", file.Name, err)
-			}
-
-			kepubContent := addKoboSpans(string(buf))
-			fw.Write([]byte(kepubContent))
-		} else {
-			buf := make([]byte, 4096)
-			for {
-				n, err := rc.Read(buf)
-				if n > 0 {
-					fw.Write(buf[:n])
-				}
-				if err != nil {
-					break
-				}
-			}
-		}
-		rc.Close()
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatalf("close kepub writer: %v", err)
-	}
-}
-
-func isXHTML(name string) bool {
-	return strings.HasSuffix(strings.ToLower(name), ".xhtml") ||
-		strings.HasSuffix(strings.ToLower(name), ".html") ||
-		strings.HasSuffix(strings.ToLower(name), ".htm")
-}
-
-func addKoboSpans(xhtmlContent string) string {
-	result := xhtmlContent
-	result = strings.ReplaceAll(result, "</p>", "</span></p>")
-	result = strings.ReplaceAll(result, "<p>", "<p><span class=\"koboSpan\">")
-	return result
-}
-
-func readZipFileData(rc io.ReadCloser) ([]byte, error) {
-	defer rc.Close()
-	return io.ReadAll(rc)
-}
-
-var _ = io.ReadAll

internal/sync/locators.go

@@ -1,133 +0,0 @@
-package sync
-
-import "log"
-
-type LocatorSource string
-
-const (
-	LocatorSourceKOReader LocatorSource = "koreader"
-	LocatorSourceKobo     LocatorSource = "kobo"
-	LocatorSourceWeb      LocatorSource = "web"
-)
-
-type CanonicalLocator struct {
-	CFI        string
-	Precision  string
-	Percentage float64
-}
-
-type DeviceLocator struct {
-	Position   string
-	Precision  string
-	Percentage float64
-}
-
-func isConvertible(formatGroup string) bool {
-	return formatGroup == string(FormatGroupReflowable)
-}
-
-func ConvertToCanonical(
-	source LocatorSource,
-	devicePos string,
-	percentage float64,
-	contextText string,
-	formatGroup string,
-	epubPath string,
-	kepubPath string,
-) CanonicalLocator {
-	if !isConvertible(formatGroup) || epubPath == "" {
-		return CanonicalLocator{
-			CFI:        devicePos,
-			Precision:  "passthrough",
-			Percentage: percentage,
-		}
-	}
-
-	switch source {
-	case LocatorSourceKOReader:
-		if !IsCREXPointer(devicePos) {
-			return CanonicalLocator{CFI: devicePos, Precision: "already-standard", Percentage: percentage}
-		}
-		converter := NewCFIConverter(epubPath)
-		result, err := converter.ConvertCREToStandard(devicePos, percentage, contextText)
-		if err != nil || result == nil {
-			log.Printf("Bookhoard: locator CRE→CFI conversion failed: %v", err)
-			return CanonicalLocator{CFI: devicePos, Precision: "fallback", Percentage: percentage}
-		}
-		if result.EPUBCFI != "" {
-			return CanonicalLocator{CFI: result.EPUBCFI, Precision: result.Precision, Percentage: result.Percentage}
-		}
-		if result.Href != "" {
-			return CanonicalLocator{CFI: result.Href, Precision: result.Precision, Percentage: result.Percentage}
-		}
-		return CanonicalLocator{CFI: devicePos, Precision: result.Precision, Percentage: percentage}
-
-	case LocatorSourceKobo:
-		if kepubPath == "" {
-			return CanonicalLocator{CFI: devicePos, Precision: "no-kepub", Percentage: percentage}
-		}
-		converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-		result, err := converter.ConvertKEPUBCFIToStandard(devicePos, percentage, contextText)
-		if err != nil || result == nil {
-			log.Printf("Bookhoard: locator KEPUB→CFI conversion failed: %v", err)
-			return CanonicalLocator{CFI: devicePos, Precision: "fallback", Percentage: percentage}
-		}
-		if result.CFI != "" {
-			return CanonicalLocator{CFI: result.CFI, Precision: result.Precision, Percentage: result.Percentage}
-		}
-		return CanonicalLocator{CFI: devicePos, Precision: result.Precision, Percentage: percentage}
-
-	default:
-		return CanonicalLocator{CFI: devicePos, Precision: "passthrough", Percentage: percentage}
-	}
-}
-
-func ConvertFromCanonical(
-	source LocatorSource,
-	canonicalCFI string,
-	percentage float64,
-	contextText string,
-	formatGroup string,
-	epubPath string,
-	kepubPath string,
-) DeviceLocator {
-	if !isConvertible(formatGroup) || epubPath == "" || canonicalCFI == "" {
-		return DeviceLocator{
-			Position:   canonicalCFI,
-			Precision:  "passthrough",
-			Percentage: percentage,
-		}
-	}
-
-	switch source {
-	case LocatorSourceKOReader:
-		converter := NewCFIConverter(epubPath)
-		result, err := converter.ConvertStandardToCRE(canonicalCFI, percentage, contextText)
-		if err != nil || result == nil {
-			log.Printf("Bookhoard: locator CFI→CRE conversion failed: %v", err)
-			return DeviceLocator{Position: canonicalCFI, Precision: "fallback", Percentage: percentage}
-		}
-		if result.XPointer != "" {
-			return DeviceLocator{Position: result.XPointer, Precision: result.Precision, Percentage: result.Percentage}
-		}
-		return DeviceLocator{Position: canonicalCFI, Precision: result.Precision, Percentage: percentage}
-
-	case LocatorSourceKobo:
-		if kepubPath == "" {
-			return DeviceLocator{Position: canonicalCFI, Precision: "no-kepub", Percentage: percentage}
-		}
-		converter := NewKEPUBCFIConverter(epubPath, kepubPath)
-		result, err := converter.ConvertStandardCFIToKEPUB(canonicalCFI, percentage, contextText)
-		if err != nil || result == nil {
-			log.Printf("Bookhoard: locator CFI→KEPUB conversion failed: %v", err)
-			return DeviceLocator{Position: canonicalCFI, Precision: "fallback", Percentage: percentage}
-		}
-		if result.CFI != "" {
-			return DeviceLocator{Position: result.CFI, Precision: result.Precision, Percentage: result.Percentage}
-		}
-		return DeviceLocator{Position: canonicalCFI, Precision: result.Precision, Percentage: percentage}
-
-	default:
-		return DeviceLocator{Position: canonicalCFI, Precision: "passthrough", Percentage: percentage}
-	}
-}

internal/sync/progress.go

@@ -288,7 +288,6 @@ type SaveProgressRequest struct {
 
 	Percentage      *float64
 	Epubcfi         *string
-	ContextText     *string
 	CharacterOffset *int64
 	Chapter         *int
 	ChapterProgress *float64
@@ -335,7 +334,6 @@ func (s *ProgressService) SaveProgress(ctx context.Context, req SaveProgressRequ
 		params.Percentage = existing.Percentage
 		params.CharacterOffset = existing.CharacterOffset
 		params.Epubcfi = existing.Epubcfi
-		params.ContextText = existing.ContextText
 		params.Chapter = existing.Chapter
 		params.ChapterProgress = existing.ChapterProgress
 		params.ViewportX = existing.ViewportX
@@ -357,9 +355,6 @@ func (s *ProgressService) SaveProgress(ctx context.Context, req SaveProgressRequ
 	if req.Epubcfi != nil {
 		params.Epubcfi = pgtype.Text{String: *req.Epubcfi, Valid: *req.Epubcfi != ""}
 	}
-	if req.ContextText != nil {
-		params.ContextText = pgtype.Text{String: *req.ContextText, Valid: *req.ContextText != ""}
-	}
 	if req.CharacterOffset != nil {
 		params.CharacterOffset = pgtype.Int8{Int64: *req.CharacterOffset, Valid: true}
 	}
@@ -400,39 +395,21 @@ func (s *ProgressService) SaveProgress(ctx context.Context, req SaveProgressRequ
 	params.LastSyncDevice = pgtype.Text{String: req.Source, Valid: true}
 	params.LastSyncSource = pgtype.Text{String: req.Source, Valid: true}
 
-	formatGroup := FormatGroup(mediaItem.FormatGroup)
-	isFixed := formatGroup == FormatGroupFixedLayout || formatGroup == FormatGroupComicArchive
-	if isFixed {
-		// Fixed-layout & comic formats: the page index is the canonical locator.
-		// CFI/character-offset are meaningless for image-based content, so clear
-		// any stale value that may have been stored by the web reader (which
-		// generates fake CFIs for comics).
-		params.Epubcfi = pgtype.Text{}
-		params.CharacterOffset = pgtype.Int8{}
-		if params.CurrentPage.Valid && params.TotalPages.Valid && params.TotalPages.Int32 > 0 {
-			pct := PageToPercentage(int(params.CurrentPage.Int32), int(params.TotalPages.Int32))
-			params.Percentage = pgtype.Float8{Float64: pct, Valid: true}
-		} else if params.Percentage.Valid && params.TotalPages.Valid && params.TotalPages.Int32 > 0 && !params.CurrentPage.Valid {
-			page := PercentageToPage(params.Percentage.Float64, int(params.TotalPages.Int32))
-			params.CurrentPage = pgtype.Int4{Int32: int32(page), Valid: true}
-		}
-	} else {
-		if params.Percentage.Valid && !params.CharacterOffset.Valid && mediaItem.TotalCharacters.Valid && mediaItem.TotalCharacters.Int64 > 0 {
-			charOff := PercentageToCharacter(params.Percentage.Float64, mediaItem.TotalCharacters.Int64)
-			params.CharacterOffset = pgtype.Int8{Int64: charOff, Valid: true}
-		}
-		if params.Percentage.Valid && !params.CurrentPage.Valid && params.TotalPages.Valid && params.TotalPages.Int32 > 0 {
-			page := PercentageToPage(params.Percentage.Float64, int(params.TotalPages.Int32))
-			params.CurrentPage = pgtype.Int4{Int32: int32(page), Valid: true}
-		}
-		if params.CurrentPage.Valid && params.TotalPages.Valid && params.TotalPages.Int32 > 0 && !params.Percentage.Valid {
-			pct := PageToPercentage(int(params.CurrentPage.Int32), int(params.TotalPages.Int32))
-			params.Percentage = pgtype.Float8{Float64: pct, Valid: true}
-		}
-		if params.CharacterOffset.Valid && mediaItem.TotalCharacters.Valid && mediaItem.TotalCharacters.Int64 > 0 && !params.Percentage.Valid {
-			pct := CharacterToPercentage(params.CharacterOffset.Int64, mediaItem.TotalCharacters.Int64)
-			params.Percentage = pgtype.Float8{Float64: pct, Valid: true}
-		}
+	if params.Percentage.Valid && !params.CharacterOffset.Valid && mediaItem.TotalCharacters.Valid && mediaItem.TotalCharacters.Int64 > 0 {
+		charOff := PercentageToCharacter(params.Percentage.Float64, mediaItem.TotalCharacters.Int64)
+		params.CharacterOffset = pgtype.Int8{Int64: charOff, Valid: true}
+	}
+	if params.Percentage.Valid && !params.CurrentPage.Valid && params.TotalPages.Valid && params.TotalPages.Int32 > 0 {
+		page := PercentageToPage(params.Percentage.Float64, int(params.TotalPages.Int32))
+		params.CurrentPage = pgtype.Int4{Int32: int32(page), Valid: true}
+	}
+	if params.CurrentPage.Valid && params.TotalPages.Valid && params.TotalPages.Int32 > 0 && !params.Percentage.Valid {
+		pct := PageToPercentage(int(params.CurrentPage.Int32), int(params.TotalPages.Int32))
+		params.Percentage = pgtype.Float8{Float64: pct, Valid: true}
+	}
+	if params.CharacterOffset.Valid && mediaItem.TotalCharacters.Valid && mediaItem.TotalCharacters.Int64 > 0 && !params.Percentage.Valid {
+		pct := CharacterToPercentage(params.CharacterOffset.Int64, mediaItem.TotalCharacters.Int64)
+		params.Percentage = pgtype.Float8{Float64: pct, Valid: true}
 	}
 
 	conflictDetected := false
@@ -453,13 +430,7 @@ func (s *ProgressService) SaveProgress(ctx context.Context, req SaveProgressRequ
 					diff = -diff
 				}
 				if diff > 0.01 {
-					recentlyResolved, _ := s.db.HasRecentConflictResolution(ctx, database.HasRecentConflictResolutionParams{
-						MediaItemID: req.MediaItemID,
-						UserID:      req.UserID,
-					})
-					if !recentlyResolved {
-						conflictDetected = true
-					}
+					conflictDetected = true
 				}
 			}
 		}
@@ -471,24 +442,26 @@ func (s *ProgressService) SaveProgress(ctx context.Context, req SaveProgressRequ
 	}
 
 	if conflictDetected {
+		newData := map[string]interface{}{
+			"source":    req.Source,
+			"timestamp": time.Now().Format(time.RFC3339),
+			"data":      buildProgressSnapshot(req),
+		}
+		existingData := map[string]interface{}{
+			"source":    existing.LastSyncSource.String,
+			"timestamp": existing.LastSyncTimestamp.Time.Format(time.RFC3339),
+			"data": map[string]interface{}{
+				"percentage":  float64Ptr(existing.Percentage),
+				"epubcfi":     textPtr(existing.Epubcfi),
+				"chapter":     int32Ptr(existing.Chapter),
+				"character":   int64Ptr(existing.CharacterOffset),
+				"page":        int32Ptr(existing.CurrentPage),
+				"total_pages": int32Ptr(existing.TotalPages),
+			},
+		}
 		conflictData := map[string]interface{}{
-			req.Source: map[string]interface{}{
-				"source":    req.Source,
-				"timestamp": time.Now().Format(time.RFC3339),
-				"data":      buildProgressSnapshot(req),
-			},
-			existing.LastSyncSource.String: map[string]interface{}{
-				"source":    existing.LastSyncSource.String,
-				"timestamp": existing.LastSyncTimestamp.Time.Format(time.RFC3339),
-				"data": map[string]interface{}{
-					"percentage":  float64Ptr(existing.Percentage),
-					"epubcfi":     textPtr(existing.Epubcfi),
-					"chapter":     int32Ptr(existing.Chapter),
-					"character":   int64Ptr(existing.CharacterOffset),
-					"page":        int32Ptr(existing.CurrentPage),
-					"total_pages": int32Ptr(existing.TotalPages),
-				},
-			},
+			"new":      newData,
+			"existing": existingData,
 		}
 		conflictJSON, _ := json.Marshal(conflictData)
 		_, err := s.db.CreateSyncConflict(ctx, database.CreateSyncConflictParams{
@@ -535,9 +508,6 @@ func buildProgressSnapshot(req SaveProgressRequest) map[string]interface{} {
 	if req.Epubcfi != nil {
 		data["epubcfi"] = *req.Epubcfi
 	}
-	if req.ContextText != nil {
-		data["context_text"] = *req.ContextText
-	}
 	if req.Chapter != nil {
 		data["chapter"] = *req.Chapter
 	}

internal/sync/queue.go

@@ -35,12 +35,11 @@ const (
 )
 
 type SyncQueueProcessor struct {
-	db            *database.Queries
-	progressSvc   *ProgressService
-	annotationSvc *AnnotationService
-	progressChan  chan *ProgressUpdate
-	interval      time.Duration
-	batchSize     int
+	db           *database.Queries
+	progressSvc  *ProgressService
+	progressChan chan *ProgressUpdate
+	interval     time.Duration
+	batchSize    int
 }
 
 type ProgressUpdate struct {
@@ -49,7 +48,6 @@ type ProgressUpdate struct {
 	UserID      pgtype.UUID
 	Percentage  float64
 	Epubcfi     *string
-	ContextText *string
 	Chapter     *int
 	Character   *int64
 	Page        *int
@@ -74,18 +72,11 @@ type SyncQueueItem struct {
 }
 
 func NewSyncQueueProcessor(db *database.Queries) *SyncQueueProcessor {
-	return NewSyncQueueProcessorWithConfig(db, 5*time.Second, 50)
-}
-
-// NewSyncQueueProcessorWithConfig constructs a processor with the given flush
-// interval and batch size. Used at startup to source values from the settings
-// registry.
-func NewSyncQueueProcessorWithConfig(db *database.Queries, interval time.Duration, batchSize int) *SyncQueueProcessor {
 	return &SyncQueueProcessor{
 		db:           db,
 		progressChan: make(chan *ProgressUpdate, 100),
-		interval:     interval,
-		batchSize:    batchSize,
+		interval:     5 * time.Second,
+		batchSize:    50,
 	}
 }
 
@@ -93,10 +84,6 @@ func (p *SyncQueueProcessor) SetProgressService(svc *ProgressService) {
 	p.progressSvc = svc
 }
 
-func (p *SyncQueueProcessor) SetAnnotationService(svc *AnnotationService) {
-	p.annotationSvc = svc
-}
-
 func (p *SyncQueueProcessor) Start(ctx context.Context) {
 	log.Printf("Starting sync queue processor (interval: %v, batch: %d)", p.interval, p.batchSize)
 
@@ -125,100 +112,6 @@ func (p *SyncQueueProcessor) EnqueueProgress(update *ProgressUpdate) error {
 	}
 }
 
-type HighlightUpdate struct {
-	DeviceID       pgtype.UUID
-	MediaItemID    pgtype.UUID
-	UserID         pgtype.UUID
-	SelectionText  string
-	StartPosition  string
-	EndPosition    string
-	Color          string
-	NoteText       string
-	EpubcfiStart   string
-	EpubcfiEnd     string
-	PercentageStart float64
-	PercentageEnd   float64
-	Source         string
-	DeviceSyncData map[string]interface{}
-}
-
-type NoteUpdate struct {
-	DeviceID     pgtype.UUID
-	MediaItemID  pgtype.UUID
-	UserID       pgtype.UUID
-	Content      string
-	Position     string
-	Source       string
-	DeviceSyncData map[string]interface{}
-}
-
-type BookmarkUpdate struct {
-	DeviceID       pgtype.UUID
-	MediaItemID    pgtype.UUID
-	UserID         pgtype.UUID
-	Title          string
-	Position       string
-	Notes          string
-	Source         string
-	DeviceSyncData map[string]interface{}
-}
-
-func (p *SyncQueueProcessor) EnqueueHighlight(ctx context.Context, update *HighlightUpdate) error {
-	syncData := map[string]interface{}{
-		"selection_text":   update.SelectionText,
-		"start_position":   update.StartPosition,
-		"end_position":     update.EndPosition,
-		"color":            update.Color,
-		"note_text":        update.NoteText,
-		"source":           update.Source,
-		"epubcfi_start":    update.EpubcfiStart,
-		"epubcfi_end":      update.EpubcfiEnd,
-		"percentage_start": update.PercentageStart,
-		"percentage_end":   update.PercentageEnd,
-		"device_sync_data": update.DeviceSyncData,
-	}
-	return p.enqueueAnnotation(ctx, update.DeviceID, update.MediaItemID, SyncTypeHighlight, syncData)
-}
-
-func (p *SyncQueueProcessor) EnqueueNote(ctx context.Context, update *NoteUpdate) error {
-	syncData := map[string]interface{}{
-		"content":          update.Content,
-		"position":         update.Position,
-		"source":           update.Source,
-		"device_sync_data": update.DeviceSyncData,
-	}
-	return p.enqueueAnnotation(ctx, update.DeviceID, update.MediaItemID, SyncTypeNote, syncData)
-}
-
-func (p *SyncQueueProcessor) EnqueueBookmark(ctx context.Context, update *BookmarkUpdate) error {
-	syncData := map[string]interface{}{
-		"title":            update.Title,
-		"position":         update.Position,
-		"notes":            update.Notes,
-		"source":           update.Source,
-		"device_sync_data": update.DeviceSyncData,
-	}
-	return p.enqueueAnnotation(ctx, update.DeviceID, update.MediaItemID, SyncTypeBookmark, syncData)
-}
-
-func (p *SyncQueueProcessor) enqueueAnnotation(ctx context.Context, deviceID, mediaItemID pgtype.UUID, syncType string, syncData map[string]interface{}) error {
-	syncDataJSON, err := json.Marshal(syncData)
-	if err != nil {
-		return fmt.Errorf("marshal sync data: %w", err)
-	}
-
-	_, err = p.db.CreateSyncQueueItem(ctx, database.CreateSyncQueueItemParams{
-		DeviceID:    deviceID,
-		MediaItemID: mediaItemID,
-		SyncType:    syncType,
-		SyncData:    syncDataJSON,
-		Priority:    pgtype.Int4{Int32: int32(PriorityCriticalNote), Valid: true},
-		MaxAttempts: pgtype.Int4{Int32: 3, Valid: true},
-		Status:      pgtype.Text{String: SyncStatusPending, Valid: true},
-	})
-	return err
-}
-
 func (p *SyncQueueProcessor) enqueueProgressUpdate(ctx context.Context, update *ProgressUpdate) {
 	syncData := map[string]interface{}{
 		"percentage": update.Percentage,
@@ -229,9 +122,6 @@ func (p *SyncQueueProcessor) enqueueProgressUpdate(ctx context.Context, update *
 	if update.Epubcfi != nil {
 		syncData["epubcfi"] = *update.Epubcfi
 	}
-	if update.ContextText != nil {
-		syncData["context_text"] = *update.ContextText
-	}
 	if update.Chapter != nil {
 		syncData["chapter"] = *update.Chapter
 	}
@@ -414,8 +304,6 @@ func (p *SyncQueueProcessor) executeSync(ctx context.Context, item SyncQueueItem
 		return p.syncNote(ctx, device.UserID, item.MediaItemID, syncData)
 	case SyncTypeHighlight:
 		return p.syncHighlight(ctx, device.UserID, item.MediaItemID, syncData)
-	case SyncTypeBookmark:
-		return p.syncBookmark(ctx, device.UserID, item.MediaItemID, syncData)
 	default:
 		return fmt.Errorf("unsupported sync type: %s", item.SyncType)
 	}
@@ -443,9 +331,6 @@ func (p *SyncQueueProcessor) syncProgress(ctx context.Context, userID pgtype.UUI
 		if v, ok := syncData["epubcfi"].(string); ok {
 			req.Epubcfi = &v
 		}
-		if v, ok := syncData["context_text"].(string); ok {
-			req.ContextText = &v
-		}
 		if v, ok := syncData["chapter"].(float64); ok {
 			ch := int(v)
 			req.Chapter = &ch
@@ -515,138 +400,11 @@ func (p *SyncQueueProcessor) syncProgress(ctx context.Context, userID pgtype.UUI
 }
 
 func (p *SyncQueueProcessor) syncNote(ctx context.Context, userID pgtype.UUID, mediaItemID pgtype.UUID, syncData map[string]interface{}) error {
-	if p.annotationSvc == nil {
-		return fmt.Errorf("annotation service not available")
-	}
-
-	req := SaveNoteRequest{
-		MediaItemID: mediaItemID,
-		UserID:      userID,
-	}
-
-	if v, ok := syncData["content"].(string); ok {
-		req.Content = v
-	}
-	if v, ok := syncData["position"].(string); ok {
-		req.Position = v
-	}
-	if v, ok := syncData["source"].(string); ok {
-		req.Source = v
-	}
-	if v, ok := syncData["epubcfi_location"].(string); ok {
-		req.EpubcfiLocation = v
-	}
-	if v, ok := syncData["percentage_location"].(float64); ok {
-		req.PercentageLocation = v
-	}
-	if v, ok := syncData["chapter_reference"].(float64); ok {
-		req.ChapterReference = int32(v)
-	}
-	if v, ok := syncData["device_sync_data"].(map[string]interface{}); ok {
-		req.DeviceSyncData, _ = json.Marshal(v)
-	}
-
-	_, err := p.annotationSvc.SaveNote(ctx, req)
-	return err
+	return fmt.Errorf("note sync not yet implemented")
 }
 
 func (p *SyncQueueProcessor) syncHighlight(ctx context.Context, userID pgtype.UUID, mediaItemID pgtype.UUID, syncData map[string]interface{}) error {
-	if p.annotationSvc == nil {
-		return fmt.Errorf("annotation service not available")
-	}
-
-	req := SaveHighlightRequest{
-		MediaItemID: mediaItemID,
-		UserID:      userID,
-	}
-
-	if v, ok := syncData["selection_text"].(string); ok {
-		req.SelectionText = v
-	}
-	if v, ok := syncData["start_position"].(string); ok {
-		req.StartPosition = v
-	}
-	if v, ok := syncData["end_position"].(string); ok {
-		req.EndPosition = v
-	}
-	if v, ok := syncData["color"].(string); ok {
-		req.Color = v
-	}
-	if v, ok := syncData["note_text"].(string); ok {
-		req.NoteText = v
-	}
-	if v, ok := syncData["source"].(string); ok {
-		req.Source = v
-	}
-	if v, ok := syncData["epubcfi_start"].(string); ok {
-		req.EpubcfiStart = v
-	}
-	if v, ok := syncData["epubcfi_end"].(string); ok {
-		req.EpubcfiEnd = v
-	}
-	if v, ok := syncData["percentage_start"].(float64); ok {
-		req.PercentageStart = v
-	}
-	if v, ok := syncData["percentage_end"].(float64); ok {
-		req.PercentageEnd = v
-	}
-	if v, ok := syncData["chapter_reference"].(float64); ok {
-		req.ChapterReference = int32(v)
-	}
-	if v, ok := syncData["device_sync_data"].(map[string]interface{}); ok {
-		req.DeviceSyncData, _ = json.Marshal(v)
-	}
-
-	_, err := p.annotationSvc.SaveHighlight(ctx, req)
-	return err
-}
-
-func (p *SyncQueueProcessor) syncBookmark(ctx context.Context, userID pgtype.UUID, mediaItemID pgtype.UUID, syncData map[string]interface{}) error {
-	if p.annotationSvc == nil {
-		return fmt.Errorf("annotation service not available")
-	}
-
-	req := SaveBookmarkRequest{
-		MediaItemID: mediaItemID,
-		UserID:      userID,
-	}
-
-	if v, ok := syncData["title"].(string); ok {
-		req.Title = v
-	}
-	if v, ok := syncData["position"].(string); ok {
-		req.Position = v
-	}
-	if v, ok := syncData["notes"].(string); ok {
-		req.Notes = v
-	}
-	if v, ok := syncData["source"].(string); ok {
-		req.Source = v
-	}
-	if v, ok := syncData["cfi_position"].(string); ok {
-		req.CFIPosition = v
-	}
-	if v, ok := syncData["epubcfi_location"].(string); ok {
-		req.EpubcfiLocation = v
-	}
-	if v, ok := syncData["percentage_loc"].(float64); ok {
-		req.PercentageLoc = v
-	}
-	if v, ok := syncData["page_number"].(float64); ok {
-		req.PageNumber = int32(v)
-	}
-	if v, ok := syncData["chapter_number"].(float64); ok {
-		req.ChapterNumber = int32(v)
-	}
-	if v, ok := syncData["chapter_reference"].(float64); ok {
-		req.ChapterReference = int32(v)
-	}
-	if v, ok := syncData["device_sync_data"].(map[string]interface{}); ok {
-		req.DeviceSyncData, _ = json.Marshal(v)
-	}
-
-	_, err := p.annotationSvc.SaveBookmark(ctx, req)
-	return err
+	return fmt.Errorf("highlight sync not yet implemented")
 }
 
 func (p *SyncQueueProcessor) markItemFailed(ctx context.Context, item SyncQueueItem, errMsg string) {

internal/utils/tags.go

@@ -4,8 +4,14 @@ import (
 	"sort"
 	"strings"
 	"unicode"
+
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
+// titleCaser is a global caser for titlecase conversion
+var titleCaser = cases.Title(language.Und)
+
 // titlecase converts a string to title case while preserving hyphenation and apostrophes
 // Example: "science fiction" → "Science Fiction", "non-fiction" → "Non-Fiction", "o'reilly" → "O'Reilly"
 func titlecase(s string) string {
@@ -28,12 +34,7 @@ func titlecase(s string) string {
 			}
 			words[i] = result.String()
 		} else {
-			runes := []rune(word)
-			runes[0] = unicode.ToUpper(runes[0])
-			for j := 1; j < len(runes); j++ {
-				runes[j] = unicode.ToLower(runes[j])
-			}
-			words[i] = string(runes)
+			words[i] = titleCaser.String(word)
 		}
 	}
 	return strings.Join(words, " ")

package.json

@@ -5,14 +5,14 @@
   "scripts": {
     "build:css": "tailwindcss -i ./web/static/input.css -o ./web/static/style.css --watch",
     "build:css:prod": "tailwindcss -i ./web/static/input.css -o ./web/static/style.css --minify",
-    "build:ts": "cp node_modules/htmx.org/dist/htmx.min.js web/static/htmx.min.js && vite build",
-    "build:ts:dev": "cp node_modules/htmx.org/dist/htmx.min.js web/static/htmx.min.js && vite build --mode development",
-    "build:ts:watch": "cp node_modules/htmx.org/dist/htmx.min.js web/static/htmx.min.js && vite build --watch",
+    "build:ts": "cp node_modules/htmx.org/dist/htmx.min.js web/static/htmx.min.js && mkdir -p web/static/vendor/pdfjs && cp -r node_modules/@bookhoard/foliate-js/vendor/pdfjs/standard_fonts web/static/vendor/pdfjs/ && vite build",
+    "build:ts:dev": "cp node_modules/htmx.org/dist/htmx.min.js web/static/htmx.min.js && mkdir -p web/static/vendor/pdfjs && cp -r node_modules/@bookhoard/foliate-js/vendor/pdfjs/standard_fonts web/static/vendor/pdfjs/ && vite build --mode development",
+    "build:ts:watch": "cp node_modules/htmx.org/dist/htmx.min.js web/static/htmx.min.js && mkdir -p web/static/vendor/pdfjs && cp -r node_modules/@bookhoard/foliate-js/vendor/pdfjs/standard_fonts web/static/vendor/pdfjs/ && vite build --watch",
     "build": "npm run build:ts && npm run build:css:prod",
     "dev": "npm run build:ts:dev && npm run build:css"
   },
   "dependencies": {
-    "@bookhoard/foliate-js": "git+https://github.com/john-okeefe/foliate-js.git#e448d36",
+    "@bookhoard/foliate-js": "github:john-okeefe/foliate-js#74c317d58c2cedb53811da2973d0bf9bb6a70dcb",
     "alpinejs": "^3.15.8",
     "chart.js": "^4.5.1",
     "highlight.js": "^11.11.1",

plans/2026-04-20-fish-to-zsh-conversion-1.0.md

@@ -0,0 +1,276 @@
+# Convert Fish config.fish to Zsh .zshrc
+
+## Objective
+
+Translate all functional content from `~/.config/fish/config.fish` into equivalent Zsh syntax, append it **below** the existing Forge-managed block in `~/.config/zsh/.zshrc`, and leave the existing content untouched.
+
+## Source Analysis
+
+### Fish config breakdown (`~/.config/fish/config.fish`, 178 lines)
+
+| Lines | Category | Notes |
+|-------|----------|-------|
+| 1 | Comment (collapsed) | Multi-line comment got collapsed into one line; contains `set fish_greeting`, `set VIRTUAL_ENV_DISABLE_PROMPT`, `set -x SHELL /usr/bin/fish` |
+| 2-3 | Man pager (bat) | `set -xU` universal env vars |
+| 5-6 | Paru pager | `set -x` exported env var |
+| 8-10 | Done plugin settings | `set -U` universal vars for `done` notification plugin |
+| 12-16 | Source `~/.fish_profile` | Fish-specific profile file |
+| 18-23 | PATH: `~/.local/bin` | Already in .zshrc (line 2) |
+| 25-30 | PATH: `depot_tools` | Conditional PATH prepend |
+| 32-37 | Starship + zoxide + atuin | Interactive-only init |
+| 39-40 | find-the-command hook | Fish-specific (`ftc.fish`) |
+| 42-76 | Bang-bang + history functions | `!!` and `!$` support + history formatting |
+| 78-80 | `backup` function | Simple `cp` backup |
+| 83-92 | `copy` function | Smart `cp` with directory detection |
+| 94-102 | `cleanup` function | Remove orphaned pacman packages |
+| 104-163 | Aliases & abbreviations | Many aliases, some with Fish-specific syntax |
+| 165-168 | Fastfetch on interactive | Run fastfetch if available |
+| 170-172 | PATH: opencode + local bin | PATH additions (local bin already covered) |
+| 174-178 | Qt/KDE theming | Conditional `QT_STYLE_OVERRIDE` |
+
+### Existing .zshrc breakdown (`~/.config/zsh/.zshrc`, 48 lines)
+
+Lines 1-47 are Forge-managed and must remain untouched. The new content should be appended **after line 48** (end of file).
+
+## Implementation Plan
+
+- [ ] **Step 1.** Append all converted content below the existing Forge block (after line 48). Do not modify any existing lines.
+
+## Converted Zsh Code (to append after line 48 of `~/.config/zsh/.zshrc`)
+
+```zsh
+# ============================================================
+# Converted from ~/.config/fish/config.fish
+# ============================================================
+
+# --- Environment Variables ---
+
+# Hide welcome message (Zsh equivalent: set empty PS1 greeting or just skip)
+VIRTUAL_ENV_DISABLE_PROMPT="1"
+export VIRTUAL_ENV_DISABLE_PROMPT
+
+# Use bat for man pages
+export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+export MANROFFOPT="-c"
+
+# Hint to exit PKGBUILD review in Paru
+export PARU_PAGER="less -P \"Press 'q' to exit the PKGBUILD review.\""
+
+# --- PATH Additions ---
+
+# Add ~/.local/bin to PATH (already present via Forge, but kept for completeness)
+if [[ -d ~/.local/bin ]]; then
+    case ":${PATH}:" in
+        *:"$HOME/.local/bin":*) ;;
+        *) export PATH="$HOME/.local/bin:$PATH" ;;
+    esac
+fi
+
+# Add depot_tools to PATH
+if [[ -d ~/Applications/depot_tools ]]; then
+    case ":${PATH}:" in
+        *:"$HOME/Applications/depot_tools":*) ;;
+        *) export PATH="$HOME/Applications/depot_tools:$PATH" ;;
+    esac
+fi
+
+# Add opencode to PATH
+if [[ -d ~/.opencode/bin ]]; then
+    case ":${PATH}:" in
+        *:"$HOME/.opencode/bin":*) ;;
+        *) export PATH="$HOME/.opencode/bin:$PATH" ;;
+    esac
+fi
+
+# --- Interactive Shell Setup ---
+
+if [[ -o interactive ]]; then
+    # Zoxide (smart cd)
+    eval "$(zoxide init zsh)"
+
+    # Atuin (shell history)
+    eval "$(atuin init zsh)"
+
+    # Starship prompt
+    eval "$(starship init zsh)"
+fi
+
+# --- Bang-Bang Support (!!) ---
+
+# Zsh has built-in bang-bang via `setopt bang_hist` (default on).
+# Enable history expansion:
+setopt bang_hist
+setopt hist_expand
+
+# --- History Settings ---
+
+HISTFILE=~/.config/zsh/.zsh_history
+HISTSIZE=10000
+SAVEHIST=10000
+setopt extended_history       # Record timestamps (equivalent to --show-time='%F %T ')
+setopt share_history          # Share history across sessions
+setopt hist_ignore_all_dups   # Remove older duplicate entries
+setopt hist_ignore_space      # Ignore commands starting with space
+setopt hist_save_no_dups      # Don't save duplicates
+
+# --- Functions ---
+
+# Create a backup of a file
+backup() {
+    cp "$1" "${1}.bak"
+}
+
+# Smart copy: if source is a directory and exactly 2 args, copy recursively
+copy() {
+    if [[ $# -eq 2 && -d "$1" ]]; then
+        command cp -r "${1%/}" "$2"
+    else
+        command cp "$@"
+    fi
+}
+
+# Cleanup orphaned packages
+cleanup() {
+    local orphans
+    orphans=$(pacman -Qdtq 2>/dev/null)
+    while [[ -n "$orphans" ]]; do
+        sudo pacman -R $orphans || break
+        orphans=$(pacman -Qdtq 2>/dev/null)
+    done
+}
+
+# --- Aliases ---
+
+# Replace ls with eza
+alias ls='eza -al --color=always --group-directories-first --icons'
+alias lsz='eza -al --color=always --total-size --group-directories-first --icons'
+alias la='eza -a --color=always --group-directories-first --icons'
+alias ll='eza -l --color=always --group-directories-first --icons'
+alias lt='eza -aT --color=always --group-directories-first --icons'
+alias l.='eza -ald --color=always --group-directories-first --icons .*'
+
+# Replace cat with bat
+alias cat='bat --style header,snip,changes'
+
+# Use paru as yay if yay is not installed
+if ! command -v yay &>/dev/null && command -v paru &>/dev/null; then
+    alias yay='paru'
+fi
+
+# Directory navigation
+alias ..='cd ..'
+alias ...='cd ../..'
+alias ....='cd ../../..'
+alias .....='cd ../../../..'
+alias ......='cd ../../../../..'
+
+# Package management
+alias big='expac -H M "%m\t%n" | sort -h | nl'
+alias fixpacman='sudo rm /var/lib/pacman/db.lck'
+alias gitpkg='pacman -Q | grep -i "\-git" | wc -l'
+alias rmpkg='sudo pacman -Rdd'
+alias upd='/usr/bin/garuda-update'
+
+# Grep replacements (ugrep)
+alias grep='ugrep --color=auto'
+alias egrep='ugrep -E --color=auto'
+alias fgrep='ugrep -F --color=auto'
+
+# Tar
+alias tarnow='tar -acf '
+alias untar='tar -zxvf '
+
+# Misc
+alias dir='dir --color=auto'
+alias grubup='sudo update-grub'
+alias hw='hwinfo --short'
+alias ip='ip -color'
+alias psmem='ps auxf | sort -nr -k 4'
+alias psmem10='ps auxf | sort -nr -k 4 | head -10'
+alias vdir='vdir --color=auto'
+alias wget='wget -c '
+
+# Mirror management (reflector)
+alias mirror='sudo reflector -f 30 -l 30 --number 10 --verbose --save /etc/pacman.d/mirrorlist'
+alias mirrora='sudo reflector --latest 50 --number 20 --sort age --save /etc/pacman.d/mirrorlist'
+alias mirrord='sudo reflector --latest 50 --number 20 --sort delay --save /etc/pacman.d/mirrorlist'
+alias mirrors='sudo reflector --latest 50 --number 20 --sort score --save /etc/pacman.d/mirrorlist'
+
+# Help for newcomers to Arch
+alias apt='man pacman'
+alias apt-get='man pacman'
+alias please='sudo'
+alias tb='nc termbin.com 9999'
+alias helpme='echo "To print basic information about a command use tldr <command>"'
+alias pacdiff='sudo -H DIFFPROG=meld pacdiff'
+
+# Journalctl errors
+alias jctl='journalctl -p 3 -xb'
+
+# Recent installed packages
+alias rip='expac --timefmt="%Y-%m-%d %T" "%l\t%n %v" | sort | tail -200 | nl'
+
+# --- Run fastfetch if session is interactive ---
+
+if [[ -o interactive ]] && command -v fastfetch &>/dev/null; then
+    fastfetch --config dr460nized.jsonc
+fi
+
+# --- Qt/KDE Theming ---
+
+# Set for non-Plasma sessions (Hyprland, etc.)
+if [[ -z "$XDG_CURRENT_DESKTOP" ]] || [[ "$XDG_CURRENT_DESKTOP" != "KDE" ]]; then
+    export QT_STYLE_OVERRIDE=kvantum
+fi
+```
+
+## Items Intentionally Excluded
+
+| Fish Line(s) | Item | Reason for Exclusion |
+|---|---|---|
+| 1 | `set -x SHELL /usr/bin/fish` | Fish-specific; should be `SHELL=/usr/bin/zsh` if anything, but zsh sets this automatically |
+| 1 | `set fish_greeting` | Fish-specific; Zsh has no equivalent greeting mechanism |
+| 8-10 | `__done_*` settings | These are Fish `done` plugin variables; Zsh equivalent would need a different notification plugin |
+| 12-16 | Source `~/.fish_profile` | Fish-specific profile file; if needed, convert to `~/.zprofile` or source a zsh-compatible profile |
+| 39-40 | `source /usr/share/doc/find-the-command/ftc.fish` | Fish-specific command-not-found hook; Zsh has `command-not-found-handler` or uses pkgfile |
+| 42-76 | `__history_previous_command` / `__history_previous_command_arguments` + bind | Fish-specific bang-bang plugin; Zsh has built-in `!!` and `!$` via `setopt bang_hist hist_expand` |
+
+## Verification Criteria
+
+- [ ] All aliases work: open a new zsh shell and run `alias` to confirm they are loaded
+- [ ] `eza` aliases produce colored output with icons
+- [ ] `bat` alias shows headers/snippets
+- [ ] `backup testfile.txt` creates `testfile.txt.bak`
+- [ ] `copy dir1 dir2` copies recursively; `copy file1 file2` copies normally
+- [ ] `cleanup` removes orphaned pacman packages without error
+- [ ] `fastfetch` runs on interactive shell launch
+- [ ] `QT_STYLE_OVERRIDE=kvantum` is set when not in KDE
+- [ ] PATH includes `~/.local/bin`, `~/Applications/depot_tools`, and `~/.opencode/bin` (when dirs exist)
+- [ ] `zoxide`, `atuin`, and `starship` initialize in interactive sessions
+- [ ] Existing Forge-managed block (lines 1-47) is completely untouched
+- [ ] History expansion works: try `!!` to repeat last command
+
+## Potential Risks and Mitigations
+
+1. **Alias name conflicts with existing commands**
+   Mitigation: All aliases use the same names as the Fish config, which was already working. The `cat` alias overriding `cat` with `bat` is intentional but could break scripts that call `cat` and expect raw output. Use `\cat` or `command cat` when needed.
+
+2. **Forge-managed block interference**
+   Mitigation: The Forge block already sets up `compinit`, zsh-autosuggestions, zsh-syntax-highlighting, and a prompt theme. The converted Starship init will override the Forge prompt theme. If you want to keep the Forge prompt, remove the `eval "$(starship init zsh)"` line.
+
+3. **`cleanup` function subshell variable scope**
+   Mitigation: The Fish version used a while loop with `$status`. The Zsh version captures orphan list in a variable and uses the `-n` test instead, which is more reliable.
+
+4. **`garuda-update` alias may not exist**
+   Mitigation: The alias is a direct path reference. If the binary doesn't exist, the alias simply won't work when invoked — same behavior as Fish.
+
+5. **Fastfetch config path**
+   Mitigation: `fastfetch --config dr460nized.jsonc` uses a relative config name. Ensure the config file is discoverable by fastfetch (typically in `~/.config/fastfetch/`).
+
+## Alternative Approaches
+
+1. **Use a framework (oh-my-zsh / zinit)**: Instead of manual conversion, use a Zsh framework that provides bang-bang, aliases, and plugin management out of the box. Trade-off: adds framework dependency and complexity.
+
+2. **Use `babelfish` or `fish2zsh` tools**: Automated Fish-to-Zsh converters exist but may not handle all Fish-specific constructs correctly. Trade-off: faster but less reliable for edge cases.
+
+3. **Source a separate file**: Instead of appending to `.zshrc`, place converted content in `~/.config/zsh/.zshrc.fish-converted` and source it from `.zshrc`. Trade-off: cleaner separation but adds an extra file to manage.

plans/series-cover-mockup.html

@@ -0,0 +1,279 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Series Cover Layout Options</title>
+<style>
+  body {
+    font-family: system-ui, sans-serif;
+    background: #1a1b26;
+    color: #c0caf5;
+    padding: 40px;
+    max-width: 1200px;
+    margin: 0 auto;
+  }
+  h1 { margin-bottom: 10px; }
+  .subtitle { color: #9aa5ce; margin-bottom: 40px; }
+
+  .options {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 40px;
+  }
+  .option {
+    background: #24283b;
+    border-radius: 12px;
+    padding: 24px;
+    text-align: center;
+  }
+  .option h2 { margin: 0 0 8px 0; font-size: 1.1rem; color: #7aa2f7; }
+  .option .desc { color: #9aa5ce; font-size: 0.85rem; margin-bottom: 20px; }
+
+  /* === Common book cover placeholder === */
+  .cover {
+    width: 80px;
+    height: 120px;
+    border-radius: 4px;
+    box-shadow: 0 2px 8px rgba(0,0,0,0.4);
+    background: linear-gradient(135deg, #414868, #1a1b26);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 11px;
+    color: #565f89;
+    font-weight: bold;
+    flex-shrink: 0;
+  }
+
+  /* ============================================================
+     OPTION A: Stacked Cascade (pile of books, top-left offset)
+     ============================================================ */
+  .stacked-cascade {
+    position: relative;
+    width: 260px;
+    height: 200px;
+    margin: 0 auto;
+  }
+  .stacked-cascade .cover {
+    position: absolute;
+  }
+  .stacked-cascade .cover:nth-child(1) { top: 0; left: 0; z-index: 7; }
+  .stacked-cascade .cover:nth-child(2) { top: 8px; left: 8px; z-index: 6; opacity: 0.92; }
+  .stacked-cascade .cover:nth-child(3) { top: 16px; left: 16px; z-index: 5; opacity: 0.85; }
+  .stacked-cascade .cover:nth-child(4) { top: 24px; left: 24px; z-index: 4; opacity: 0.78; }
+  .stacked-cascade .cover:nth-child(5) { top: 32px; left: 32px; z-index: 3; opacity: 0.7; }
+  .stacked-cascade .cover:nth-child(6) { top: 40px; left: 40px; z-index: 2; opacity: 0.65; }
+  .stacked-cascade .cover:nth-child(7) { top: 48px; left: 48px; z-index: 1; opacity: 0.6; }
+
+  .stacked-cascade:hover .cover:nth-child(1) { top: 0; left: 0; }
+  .stacked-cascade:hover .cover:nth-child(2) { top: 6px; left: 12px; }
+  .stacked-cascade:hover .cover:nth-child(3) { top: 14px; left: 24px; }
+  .stacked-cascade:hover .cover:nth-child(4) { top: 22px; left: 36px; }
+  .stacked-cascade:hover .cover:nth-child(5) { top: 30px; left: 50px; }
+  .stacked-cascade:hover .cover:nth-child(6) { top: 40px; left: 64px; }
+  .stacked-cascade:hover .cover:nth-child(7) { top: 50px; left: 78px; }
+  .stacked-cascade .cover { transition: all 0.3s ease; }
+
+  /* ============================================================
+     OPTION B: Grid Mosaic (mini bookshelf grid)
+     ============================================================ */
+  .grid-mosaic {
+    width: 200px;
+    height: 200px;
+    margin: 0 auto;
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-template-rows: repeat(3, 1fr);
+    gap: 4px;
+    padding: 8px;
+    background: #1a1b26;
+    border-radius: 8px;
+    box-shadow: inset 0 2px 4px rgba(0,0,0,0.3);
+  }
+  .grid-mosaic .cover {
+    width: 100%;
+    height: 100%;
+    border-radius: 3px;
+    font-size: 9px;
+  }
+  .grid-mosaic .cover.spacer {
+    background: transparent;
+    box-shadow: none;
+  }
+
+  /* ============================================================
+     OPTION C: Fanned Bottom (arc from bottom center, upward)
+     ============================================================ */
+  .fanned-bottom {
+    position: relative;
+    width: 280px;
+    height: 200px;
+    margin: 0 auto;
+  }
+  .fanned-bottom .cover {
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    margin-left: -40px; /* half cover width */
+    transform-origin: bottom center;
+  }
+  .fanned-bottom .cover:nth-child(1) { z-index: 7; transform: rotate(0deg); }
+  .fanned-bottom .cover:nth-child(2) { z-index: 6; transform: rotate(-12deg); opacity: 0.92; }
+  .fanned-bottom .cover:nth-child(3) { z-index: 5; transform: rotate(12deg); opacity: 0.92; }
+  .fanned-bottom .cover:nth-child(4) { z-index: 4; transform: rotate(-24deg); opacity: 0.82; }
+  .fanned-bottom .cover:nth-child(5) { z-index: 3; transform: rotate(24deg); opacity: 0.82; }
+  .fanned-bottom .cover:nth-child(6) { z-index: 2; transform: rotate(-36deg); opacity: 0.72; }
+  .fanned-bottom .cover:nth-child(7) { z-index: 1; transform: rotate(36deg); opacity: 0.72; }
+
+  .fanned-bottom:hover .cover:nth-child(1) { transform: rotate(0deg); }
+  .fanned-bottom:hover .cover:nth-child(2) { transform: rotate(-15deg); }
+  .fanned-bottom:hover .cover:nth-child(3) { transform: rotate(15deg); }
+  .fanned-bottom:hover .cover:nth-child(4) { transform: rotate(-30deg); }
+  .fanned-bottom:hover .cover:nth-child(5) { transform: rotate(30deg); }
+  .fanned-bottom:hover .cover:nth-child(6) { transform: rotate(-42deg); }
+  .fanned-bottom:hover .cover:nth-child(7) { transform: rotate(42deg); }
+  .fanned-bottom .cover { transition: all 0.3s ease; }
+
+  /* ============================================================
+     OPTION D: Perspective Shelf (3D standing books)
+     ============================================================ */
+  .perspective-shelf {
+    width: 280px;
+    height: 200px;
+    margin: 0 auto;
+    perspective: 600px;
+    display: flex;
+    align-items: flex-end;
+    justify-content: center;
+    gap: 3px;
+    padding-bottom: 20px;
+  }
+  .perspective-shelf .cover {
+    transform: rotateY(-15deg);
+    transition: transform 0.3s ease;
+  }
+  .perspective-shelf:hover .cover {
+    transform: rotateY(0deg);
+  }
+  .perspective-shelf .cover:nth-child(odd) {
+    transform: rotateY(-18deg) translateZ(2px);
+  }
+  .perspective-shelf .cover:nth-child(even) {
+    transform: rotateY(-12deg) translateZ(-1px);
+  }
+  .perspective-shelf:hover .cover:nth-child(odd) {
+    transform: rotateY(-5deg) translateZ(4px);
+  }
+  .perspective-shelf:hover .cover:nth-child(even) {
+    transform: rotateY(-5deg) translateZ(2px);
+  }
+
+  /* === Demo colors for covers === */
+  .c1 { background: linear-gradient(135deg, #f7768e, #c53b53) !important; color: #fff !important; }
+  .c2 { background: linear-gradient(135deg, #ff9e64, #c97423) !important; color: #fff !important; }
+  .c3 { background: linear-gradient(135deg, #e0af68, #b08830) !important; color: #fff !important; }
+  .c4 { background: linear-gradient(135deg, #9ece6a, #6d9c3a) !important; color: #fff !important; }
+  .c5 { background: linear-gradient(135deg, #73daca, #3fb0a5) !important; color: #fff !important; }
+  .c6 { background: linear-gradient(135deg, #7aa2f7, #4070d4) !important; color: #fff !important; }
+  .c7 { background: linear-gradient(135deg, #bb9af7, #8b6fd4) !important; color: #fff !important; }
+
+  .series-label {
+    margin-top: 16px;
+    font-size: 14px;
+    font-weight: 600;
+    color: #c0caf5;
+  }
+  .series-meta {
+    font-size: 12px;
+    color: #565f89;
+    margin-top: 4px;
+  }
+
+  .hover-hint {
+    font-size: 11px;
+    color: #565f89;
+    margin-top: 12px;
+    font-style: italic;
+  }
+</style>
+</head>
+<body>
+  <h1>Series Card Cover Layouts</h1>
+  <p class="subtitle">4 options for displaying multi-cover composites on the /series browse page. Hover to see animation.</p>
+
+  <div class="options">
+    <!-- Option A -->
+    <div class="option">
+      <h2>A. Stacked Cascade</h2>
+      <p class="desc">Covers stacked diagonally with small offset, like a pile of books on a table</p>
+      <div class="stacked-cascade">
+        <div class="cover c1">#1</div>
+        <div class="cover c2">#2</div>
+        <div class="cover c3">#3</div>
+        <div class="cover c4">#4</div>
+        <div class="cover c5">#5</div>
+        <div class="cover c6">#6</div>
+        <div class="cover c7">#7</div>
+      </div>
+      <div class="series-label">The Expanse</div>
+      <div class="series-meta">7 of 9 books</div>
+      <div class="hover-hint">hover to spread</div>
+    </div>
+
+    <!-- Option B -->
+    <div class="option">
+      <h2>B. Grid Mosaic</h2>
+      <p class="desc">Covers tiled in a 3x3 grid, like a mini bookshelf. Clean and dense.</p>
+      <div class="grid-mosaic">
+        <div class="cover c1">#1</div>
+        <div class="cover c2">#2</div>
+        <div class="cover c3">#3</div>
+        <div class="cover c4">#4</div>
+        <div class="cover c5">#5</div>
+        <div class="cover c6">#6</div>
+        <div class="cover c7">#7</div>
+        <div class="cover spacer"></div>
+        <div class="cover spacer"></div>
+      </div>
+      <div class="series-label">The Expanse</div>
+      <div class="series-meta">7 of 9 books</div>
+    </div>
+
+    <!-- Option C -->
+    <div class="option">
+      <h2>C. Fanned Bottom Arc</h2>
+      <p class="desc">Like a hand of cards fanned from the bottom center, spreading upward</p>
+      <div class="fanned-bottom">
+        <div class="cover c1">#1</div>
+        <div class="cover c2">#2</div>
+        <div class="cover c3">#3</div>
+        <div class="cover c4">#4</div>
+        <div class="cover c5">#5</div>
+        <div class="cover c6">#6</div>
+        <div class="cover c7">#7</div>
+      </div>
+      <div class="series-label">The Expanse</div>
+      <div class="series-meta">7 of 9 books</div>
+      <div class="hover-hint">hover to spread wider</div>
+    </div>
+
+    <!-- Option D -->
+    <div class="option">
+      <h2>D. Perspective Shelf</h2>
+      <p class="desc">Books standing side-by-side with CSS 3D perspective, like a real shelf viewed at angle</p>
+      <div class="perspective-shelf">
+        <div class="cover c1">#1</div>
+        <div class="cover c2">#2</div>
+        <div class="cover c3">#3</div>
+        <div class="cover c4">#4</div>
+        <div class="cover c5">#5</div>
+        <div class="cover c6">#6</div>
+        <div class="cover c7">#7</div>
+      </div>
+      <div class="series-label">The Expanse</div>
+      <div class="series-meta">7 of 9 books</div>
+      <div class="hover-hint">hover to flatten</div>
+    </div>
+  </div>
+</body>
+</html>

release

@@ -1,15 +0,0 @@
-#!/usr/bin/env sh
-# Project-attached wrapper around `make release` so you can run:
-#   ./release v0.3.0   (or)   ./release 0.3.0
-# instead of:
-#   make release VERSION=v0.3.0
-# Lives in the repo (no machine-specific alias needed).
-set -eu
-
-[ "$#" -ge 1 ] || { echo "Usage: ./release v0.3.0" >&2; exit 1; }
-
-# Accept "0.3.0" or "v0.3.0"; ensure the tag starts with 'v' (the workflow
-# only triggers on v* tags).
-VERSION="v${1#v}"
-
-exec make release "VERSION=${VERSION}"

scripts/dedup_media_items.sql

@@ -1,213 +0,0 @@
--- scripts/dedup_media_items.sql
---
--- Detects and removes duplicate media_items, re-parenting all child rows
--- (reading progress, highlights, collections, etc.) onto a single survivor
--- before deleting the losers.
---
--- Two kinds of duplicates are handled:
---   1. PATH duplicates  — same (library_id, file_path), multiple rows.
---                         These block the UNIQUE(library_id, file_path)
---                         constraint added by the schema migration.
---   2. CONTENT duplicates — same file_sha256 within a library, different paths.
---                         Same file imported twice under two names.
---
--- This script is IDEMPOTENT: re-running it is a no-op once the data is clean.
--- It is safe to run against any Bookhoard database, before or after upgrading.
---
--- Usage:
---   psql -h <host> -U postgres -d bookhoard -f scripts/dedup_media_items.sql
---
--- The first section is a DRY-RUN report (SELECTs only, no writes). The cleanup
--- runs inside an explicit transaction. Comment out the cleanup block to inspect
--- first.
-
--- =====================================================================
--- DRY RUN: report duplicates (no writes)
--- ======================================================================
-
-\echo '=== PATH duplicates (library_id + file_path) ==='
-SELECT library_id,
-       file_path,
-       COUNT(*) AS dupes,
-       array_agg(id::text) AS media_item_ids,
-       array_agg(COALESCE(file_sha256::text, 'NULL')) AS hashes
-FROM media_items
-GROUP BY library_id, file_path
-HAVING COUNT(*) > 1
-ORDER BY COUNT(*) DESC;
-
-\echo '=== CONTENT duplicates (same file_sha256 within a library, different paths) ==='
-SELECT library_id,
-       file_sha256::text AS hash,
-       COUNT(*) AS dupes,
-       array_agg(file_path) AS paths,
-       array_agg(id::text) AS media_item_ids
-FROM media_items
-WHERE file_sha256 IS NOT NULL
-GROUP BY library_id, file_sha256
-HAVING COUNT(*) > 1
-ORDER BY COUNT(*) DESC;
-
-\echo '=== Child-row counts per duplicate candidate (helps confirm survivor choice) ==='
-SELECT mi.id,
-       mi.library_id,
-       mi.file_path,
-       (SELECT COUNT(*) FROM reading_progress   rp WHERE rp.media_item_id = mi.id) AS progress,
-       (SELECT COUNT(*) FROM media_highlights    mh WHERE mh.media_item_id = mi.id) AS highlights,
-       (SELECT COUNT(*) FROM media_bookmarks     mb WHERE mb.media_item_id = mi.id) AS bookmarks,
-       (SELECT COUNT(*) FROM media_notes         mn WHERE mn.media_item_id = mi.id) AS notes,
-       (SELECT COUNT(*) FROM reading_history     rh WHERE rh.media_item_id = mi.id) AS history,
-       (SELECT COUNT(*) FROM collection_items    ci WHERE ci.media_item_id = mi.id) AS collections
-FROM media_items mi
-WHERE (mi.library_id, mi.file_path) IN (
-    SELECT library_id, file_path FROM media_items
-    GROUP BY library_id, file_path HAVING COUNT(*) > 1
-)
-ORDER BY mi.library_id, mi.file_path, mi.id;
-
--- =====================================================================
--- HELPER FUNCTIONS (also defined by schema.sql; CREATE OR REPLACE keeps them in sync)
--- ======================================================================
-
--- Move every child row that points at p_source so it points at p_target,
--- deleting any source rows that would violate a UNIQUE constraint on the
--- target. Idempotent; no-op when p_target = p_source.
-CREATE OR REPLACE FUNCTION reparent_media_item_children(p_target UUID, p_source UUID)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-    IF p_target IS NULL OR p_source IS NULL OR p_target = p_source THEN
-        RETURN;
-    END IF;
-
-    -- reading_progress (UNIQUE media_item_id, user_id)
-    DELETE FROM reading_progress
-    WHERE media_item_id = p_source
-      AND user_id IN (SELECT user_id FROM reading_progress WHERE media_item_id = p_target);
-    UPDATE reading_progress SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    -- reading_speed (UNIQUE user_id, media_item_id)
-    DELETE FROM reading_speed
-    WHERE media_item_id = p_source
-      AND user_id IN (SELECT user_id FROM reading_speed WHERE media_item_id = p_target);
-    UPDATE reading_speed SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    -- media_ratings (UNIQUE media_item_id, user_id)
-    DELETE FROM media_ratings
-    WHERE media_item_id = p_source
-      AND user_id IN (SELECT user_id FROM media_ratings WHERE media_item_id = p_target);
-    UPDATE media_ratings SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    -- media_bookmarks (UNIQUE media_item_id, user_id, title)
-    DELETE FROM media_bookmarks
-    WHERE media_item_id = p_source
-      AND (user_id, title) IN (SELECT user_id, title FROM media_bookmarks WHERE media_item_id = p_target);
-    UPDATE media_bookmarks SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    -- media_item_formats (UNIQUE media_item_id, format_type)
-    DELETE FROM media_item_formats
-    WHERE media_item_id = p_source
-      AND format_type IN (SELECT format_type FROM media_item_formats WHERE media_item_id = p_target);
-    UPDATE media_item_formats SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    -- collection_items (UNIQUE collection_id, media_item_id)
-    DELETE FROM collection_items
-    WHERE media_item_id = p_source
-      AND collection_id IN (SELECT collection_id FROM collection_items WHERE media_item_id = p_target);
-    UPDATE collection_items SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    -- kobo_shelves (UNIQUE device_id, media_item_id)
-    DELETE FROM kobo_shelves
-    WHERE media_item_id = p_source
-      AND device_id IN (SELECT device_id FROM kobo_shelves WHERE media_item_id = p_target);
-    UPDATE kobo_shelves SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    -- panel_data (UNIQUE media_item_id, page_number)
-    DELETE FROM panel_data
-    WHERE media_item_id = p_source
-      AND page_number IN (SELECT page_number FROM panel_data WHERE media_item_id = p_target);
-    UPDATE panel_data SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    -- processing_issues (UNIQUE media_item_id, issue_type)
-    DELETE FROM processing_issues
-    WHERE media_item_id = p_source
-      AND issue_type IN (SELECT issue_type FROM processing_issues WHERE media_item_id = p_target);
-    UPDATE processing_issues SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    -- device_file_aliases (UNIQUE device_id, file_path) — paths may collide
-    DELETE FROM device_file_aliases
-    WHERE media_item_id = p_source
-      AND (device_id, file_path) IN (SELECT device_id, file_path FROM device_file_aliases WHERE media_item_id = p_target);
-    UPDATE device_file_aliases SET media_item_id = p_target WHERE media_item_id = p_source;
-
-    -- Tables whose UNIQUE keys do not include media_item_id: plain re-parent.
-    UPDATE device_catalogs   SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE kobo_entitlements SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE media_highlights  SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE media_notes       SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE reading_history   SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE sync_conflicts    SET media_item_id = p_target WHERE media_item_id = p_source;
-    UPDATE sync_queue        SET media_item_id = p_target WHERE media_item_id = p_source;
-END;
-$$;
-
--- Collapse every (library_id, file_path) group into a single row.
--- Survivor = the row with the most user data; ties broken by lowest id.
-CREATE OR REPLACE FUNCTION dedup_media_items_by_path() RETURNS void
-LANGUAGE plpgsql
-AS $$
-DECLARE
-    g        RECORD;
-    v_surv   UUID;
-    v_loser  UUID;
-BEGIN
-    FOR g IN
-        SELECT library_id, file_path
-        FROM media_items
-        GROUP BY library_id, file_path
-        HAVING COUNT(*) > 1
-    LOOP
-        SELECT mi.id INTO v_surv
-        FROM media_items mi
-        WHERE mi.library_id = g.library_id AND mi.file_path = g.file_path
-        ORDER BY
-            ((SELECT COUNT(*) FROM reading_progress  rp WHERE rp.media_item_id = mi.id)
-           + (SELECT COUNT(*) FROM media_highlights   mh WHERE mh.media_item_id = mi.id)
-           + (SELECT COUNT(*) FROM media_bookmarks    mb WHERE mb.media_item_id = mi.id)
-           + (SELECT COUNT(*) FROM media_notes        mn WHERE mn.media_item_id = mi.id)
-           + (SELECT COUNT(*) FROM reading_history    rh WHERE rh.media_item_id = mi.id)
-           + (SELECT COUNT(*) FROM collection_items   ci WHERE ci.media_item_id = mi.id)) DESC,
-            mi.id ASC
-        LIMIT 1;
-
-        FOR v_loser IN
-            SELECT id FROM media_items
-            WHERE library_id = g.library_id AND file_path = g.file_path AND id <> v_surv
-            ORDER BY id
-        LOOP
-            PERFORM reparent_media_item_children(v_surv, v_loser);
-            DELETE FROM media_items WHERE id = v_loser;
-        END LOOP;
-    END LOOP;
-END;
-$$;
-
--- ======================================================================
--- CLEANUP: collapse path duplicates (required before the UNIQUE constraint)
--- ======================================================================
-
-\echo '=== Collapsing path duplicates ===';
-BEGIN;
-    SELECT dedup_media_items_by_path();
-COMMIT;
-
-\echo '=== Done. Remaining PATH duplicates (should be empty): ===';
-SELECT library_id, file_path, COUNT(*) AS dupes
-FROM media_items
-GROUP BY library_id, file_path
-HAVING COUNT(*) > 1;
-
-\echo 'NOTE: CONTENT duplicates (same hash, different paths) are NOT auto-deleted.'
-\echo '      They do not violate the UNIQUE constraint. Review the dry-run output'
-\echo '      above and merge them manually if desired.'

tailwind.config.ts

@@ -21,66 +21,26 @@ const config: Config = {
   ],
   theme: {
     extend: {
-      screens: {
-        nav: "970px",
-      },
-      fontFamily: {
-        sans: [
-          "ui-sans-serif",
-          "system-ui",
-          "sans-serif",
-          '"Noto Sans SC"',
-          '"Noto Sans TC"',
-          '"Noto Sans JP"',
-          '"Noto Sans KR"',
-          '"PingFang SC"',
-          '"Microsoft YaHei"',
-          '"Hiragino Sans"',
-          '"Apple SD Gothic Neo"',
-          "Apple Color Emoji",
-          "Segoe UI Emoji",
-          "Segoe UI Symbol",
-          "Noto Color Emoji",
-        ],
-      },
       colors: {
-        // Semantic surface tokens (page bg, cards, raised layers)
-        surface: {
-          DEFAULT: "var(--bg-primary)",
-          raised: "var(--bg-secondary)",
-          hover: "var(--surface-hover)",
-          overlay: "var(--surface-overlay)",
+        primary: {
+          DEFAULT: "#7aa2f7",
+          50: "#f0f9ff",
+          100: "#e0f2fe",
+          200: "#bae6fd",
+          300: "#7dd3fc",
+          400: "#38bdf8",
+          500: "#0ea5e9",
+          600: "#0284c7",
+          700: "#0369a1",
+          800: "#075985",
+          900: "#0c4a6e",
         },
-        // Text tokens
-        content: {
-          DEFAULT: "var(--text-primary)",
-          muted: "var(--text-secondary)",
-        },
-        // Accent / brand
-        brand: {
-          DEFAULT: "var(--accent)",
-          muted: "var(--accent-muted)",
-        },
-        // Borders / hairlines
-        line: {
-          DEFAULT: "var(--border)",
-          strong: "var(--border-strong)",
-        },
-        // Status colors (theme-aware via vars, fall back to fixed)
-        success: "var(--status-success)",
-        warning: "var(--status-warning)",
-        danger: "var(--status-danger)",
-        info: "var(--status-info)",
-      },
-      borderRadius: {
-        xl: "0.875rem",
-        "2xl": "1.25rem",
-      },
-      boxShadow: {
-        card: "var(--shadow-card)",
-        "card-hover": "var(--shadow-card-hover)",
-        pop: "var(--shadow-pop)",
-        bar: "var(--shadow-bar)",
+        "bg-primary": "var(--bg-primary)",
+        "bg-secondary": "var(--bg-secondary)",
+        "text-primary": "var(--text-primary)",
+        "text-secondary": "var(--text-secondary)",
+        accent: "var(--accent)",
+        border: "var(--border)",
       },
       backgroundImage: {
         "wood-light": "url('/static/textures/wood-light.png')",

templates/admin.templ

@@ -1,136 +1,118 @@
 package templates
 
-templ Admin(user User, stats AdminStats) {
+templ Admin(user User) {
 	<!DOCTYPE html>
 	<html lang="en">
 		<head>
 			<meta charset="UTF-8"/>
 			<title>Admin Dashboard - Bookhoard</title>
+			<script src="/static/htmx.min.js"></script>
 			<link href="/static/style.css" rel="stylesheet"/>
-			<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
 		</head>
-		<body x-data="admin" x-init="loadWatchStatus()" class="theme-{ user.Theme }">
+		<body x-data="admin" x-init="loadWatchStatus(); initializeScanWebSocket()" class="theme-tokyo-night">
 			@Header(user, "/admin")
-			<main class="p-8">
-				<div class="max-w-4xl">
-					<div class="mb-8">
-						<div class="flex items-center gap-3 mb-1">
-							<span class="grid place-items-center h-10 w-10 rounded-xl" style="background-color: var(--accent-muted); color: var(--accent);">
-								@Icon("grid", "h-5 w-5")
-							</span>
-							<h1 class="text-2xl font-bold tracking-tight" style="color: var(--text-primary)">Dashboard</h1>
+			<div class="flex min-h-screen" style="background-color: var(--bg-primary)">
+				@AdminSidebar(user, "/admin")
+				<main class="flex-1 p-8">
+					<div class="max-w-4xl">
+						<div class="mb-8">
+							<h1 class="text-3xl font-bold mb-2" style="color: var(--text-primary)">Dashboard</h1>
+							<p style="color: var(--text-secondary)">Overview of your Bookhoard library and settings</p>
 						</div>
-						<p class="text-sm" style="color: var(--text-secondary)">Overview of your Bookhoard instance</p>
-					</div>
-					<!-- Stats Grid -->
-					<div class="grid grid-cols-2 md:grid-cols-4 gap-4 mb-6">
-						<div class="stat-card">
-							<div class="flex items-center gap-2 mb-2" style="color: var(--text-secondary);">
-								@Icon("library", "h-4 w-4")
-								<span class="text-xs font-semibold uppercase tracking-wide">Libraries</span>
+						<div class="grid grid-cols-1 md:grid-cols-2 gap-6 mb-8">
+							<div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
+								<div class="flex items-center space-x-3">
+									<div class="text-3xl">📖</div>
+									<div>
+										<h3 class="font-semibold" style="color: var(--text-primary)">Library</h3>
+										<p style="color: var(--text-secondary)" class="text-sm">Manage your ebook collection</p>
+									</div>
+								</div>
+								<a href="/" class="mt-4 inline-block text-sm btn-secondary px-3 py-1 rounded">View Library</a>
+							</div>
+							<div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
+								<div class="flex items-center space-x-3">
+									<div class="text-3xl">👁️</div>
+									<div>
+										<h3 class="font-semibold" style="color: var(--text-primary)">Scan Watch Status</h3>
+										<p style="color: var(--text-secondary)" class="text-sm">Auto-detecting new files</p>
+									</div>
+								</div>
+								<div id="watch-status" class="mt-4 text-sm" style="color: var(--text-secondary)">
+									<span class="inline-block w-2 h-2 rounded-full bg-green-500 mr-2"></span>
+									Watching <span id="watch-count">0</span> libraries
+								</div>
 							</div>
-							<p class="text-2xl font-bold" style="color: var(--text-primary)">{ stats.LibraryCount }</p>
 						</div>
-						<div class="stat-card">
-							<div class="flex items-center gap-2 mb-2" style="color: var(--text-secondary);">
-								@Icon("book", "h-4 w-4")
-								<span class="text-xs font-semibold uppercase tracking-wide">Books</span>
+						<div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
+							<h3 class="text-xl font-semibold mb-4" style="color: var(--text-primary)">Quick Actions</h3>
+							<div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
+								<button @click="scanAllLibraries()" class="btn-primary p-4 rounded-lg text-left">
+									<div class="font-medium">Rescan Library</div>
+									<div style="color: var(--text-secondary)" class="text-sm">Re-scan existing files and fix metadata</div>
+								</button>
+								<a href="/admin/library" class="btn-secondary p-4 rounded-lg text-left block">
+									<div class="font-medium">Manage Libraries and Folders</div>
+									<div style="color: var(--text-secondary)" class="text-sm">Add or remove libraries and scan directories</div>
+								</a>
 							</div>
-							<p class="text-2xl font-bold" style="color: var(--text-primary)">{ stats.MediaCount }</p>
 						</div>
-						<div class="stat-card">
-							<div class="flex items-center gap-2 mb-2" style="color: var(--text-secondary);">
-								@Icon("users", "h-4 w-4")
-								<span class="text-xs font-semibold uppercase tracking-wide">Users</span>
+						<!-- Scan Progress Section -->
+						<div id="scan-progress-container" class="hidden mt-6 p-6 rounded-lg border opacity-0 -translate-y-2.5 transition-all duration-300 ease-out" style="background-color: var(--bg-secondary); border-color: var(--border);">
+							<div class="flex justify-between items-center mb-4">
+								<h3 class="text-lg font-semibold" style="color: var(--text-primary)">
+									📚 Scanning Libraries
+								</h3>
+								<button @click="hideScanProgress()" class="p-2 hover:bg-gray-700 rounded">
+									✕
+								</button>
 							</div>
-							<p class="text-2xl font-bold" style="color: var(--text-primary)">{ stats.UserCount }</p>
-						</div>
-						<div class="stat-card">
-							<div class="flex items-center gap-2 mb-2" style="color: var(--text-secondary);">
-								@Icon("device", "h-4 w-4")
-								<span class="text-xs font-semibold uppercase tracking-wide">Devices</span>
+							<!-- Overall Progress -->
+							<div class="mb-4">
+								<div class="flex justify-between text-sm mb-2">
+									<span style="color: var(--text-secondary)">Overall Progress</span>
+									<span id="scan-progress-text" style="color: var(--text-primary)">0%</span>
+								</div>
+								<div class="w-full bg-gray-700 rounded-full h-3">
+									<div
+										id="scan-progress-bar"
+										class="h-3 rounded-full transition-all duration-500"
+										style="width: 0%; background-color: var(--accent);"
+									></div>
+								</div>
+								<div id="scan-status" class="text-sm mt-2" style="color: var(--text-secondary)">
+									Starting scan...
+								</div>
 							</div>
-							<p class="text-2xl font-bold" style="color: var(--text-primary)">{ stats.DeviceCount }</p>
-						</div>
-					</div>
-					<!-- Watch Status -->
-					<div class="stat-card mb-6">
-						<div class="flex items-center gap-3">
-							<span class="grid place-items-center h-11 w-11 rounded-xl shrink-0" style="background-color: var(--accent-muted); color: var(--accent);">
-								@Icon("sync", "h-5 w-5")
-							</span>
-							<div class="flex-1">
-								<h3 class="font-semibold" style="color: var(--text-primary)">File Watcher</h3>
-								<p class="text-sm" style="color: var(--text-secondary)">Auto-detects new files in library folders</p>
+							<!-- Per-Library Progress -->
+							<div id="library-progress-list" class="space-y-3">
+								<!-- Dynamically populated -->
 							</div>
-							<div class="text-right text-sm" style="color: var(--text-secondary)">
-								<span class="inline-block w-2 h-2 rounded-full mr-2" style="background-color: var(--status-success);"></span>
-								Watching <span id="watch-count">0</span> libraries
+							<!-- Results Summary -->
+							<div id="scan-results" class="hidden mt-6 p-4 rounded-lg border" style="background-color: var(--bg-primary); border-color: var(--border);">
+								<h4 class="font-semibold mb-2" style="color: var(--text-primary)">✅ Scan Complete!</h4>
+								<div id="scan-results-content" style="color: var(--text-secondary)">
+									<!-- Results populated by JS -->
+								</div>
+								<div class="mt-4 flex gap-2">
+									<button
+										@click="window.location.reload()"
+										class="btn-primary px-4 py-2 rounded-lg"
+									>
+										Refresh to View Books
+									</button>
+									<button
+										@click="hideScanProgress()"
+										class="btn-secondary px-4 py-2 rounded-lg"
+									>
+										Dismiss
+									</button>
+								</div>
 							</div>
 						</div>
 					</div>
-					<!-- Quick Actions -->
-					<div class="card p-6">
-						<h3 class="text-lg font-semibold mb-4" style="color: var(--text-primary)">Quick Actions</h3>
-						<div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
-							<button @click="scanAllLibraries()" class="btn btn-primary py-4 flex-col items-start gap-1">
-								<span class="flex items-center gap-2 font-medium">
-									@Icon("refresh", "h-5 w-5")
-									Scan All Libraries
-								</span>
-								<span class="text-xs font-normal opacity-80">Re-scan existing files and detect new items</span>
-							</button>
-							<a href="/admin/library" class="btn btn-secondary py-4 flex-col items-start gap-1">
-								<span class="flex items-center gap-2 font-medium">
-									@Icon("library", "h-5 w-5")
-									Manage Libraries
-								</span>
-								<span class="text-xs font-normal opacity-80">Add or remove libraries and folders</span>
-							</a>
-						</div>
-					</div>
-					<!-- Scan Progress Section -->
-					<div id="scan-progress-container" class="card hidden mt-6 p-6 opacity-0 -translate-y-2.5 transition-all duration-300 ease-out">
-						<div class="flex justify-between items-center mb-4">
-							<h3 class="text-lg font-semibold flex items-center gap-2" style="color: var(--text-primary)">
-								@Icon("refresh", "h-5 w-5")
-								Scanning Libraries
-							</h3>
-							<button @click="hideScanProgress()" class="icon-btn" aria-label="Close">
-								@Icon("close", "h-5 w-5")
-							</button>
-						</div>
-						<div class="mb-4">
-							<div class="flex justify-between text-sm mb-2">
-								<span style="color: var(--text-secondary)">Overall Progress</span>
-								<span id="scan-progress-text" style="color: var(--text-primary)">0%</span>
-							</div>
-							<div class="w-full rounded-full h-3" style="background-color: var(--surface-hover);">
-								<div
-									id="scan-progress-bar"
-									class="h-3 rounded-full transition-all duration-500"
-									style="width: 0%; background-color: var(--accent);"
-								></div>
-							</div>
-							<div id="scan-status" class="text-sm mt-2" style="color: var(--text-secondary)">
-								Starting scan...
-							</div>
-						</div>
-						<div id="library-progress-list" class="space-y-3"></div>
-						<div id="scan-results" class="hidden mt-6 p-4 rounded-xl border" style="background-color: var(--bg-primary); border-color: var(--border);">
-							<h4 class="font-semibold mb-2 flex items-center gap-2" style="color: var(--status-success);">
-								@Icon("check-circle", "h-5 w-5")
-								Scan Complete!
-							</h4>
-							<div id="scan-results-content" style="color: var(--text-secondary)"></div>
-							<div class="mt-4 flex gap-2">
-								<button @click="window.location.reload()" class="btn btn-primary">Refresh to View Books</button>
-								<button @click="hideScanProgress()" class="btn btn-secondary">Dismiss</button>
-							</div>
-						</div>
-					</div>
-				</div>
-			</main>
+				</main>
+			</div>
 		</body>
 	</html>
 }

templates/admin_hash_conflicts.templ

@@ -1,144 +0,0 @@
-package templates
-
-import "fmt"
-
-// HashConflictItemData is one copy in a conflict group.
-type HashConflictItemData struct {
-	ID              string
-	Title           string
-	Author          string
-	FilePath        string
-	FileSize        int64
-	UsageSummary    string
-	HasReadingData  bool
-}
-
-// HashConflictData is one pending conflict group.
-type HashConflictData struct {
-	ID          string
-	LibraryName string
-	SHA256      string
-	SHAShort    string
-	CreatedAt   string
-	Items       []HashConflictItemData
-}
-
-templ HashConflictCard(conflict HashConflictData) {
-	<div class="card p-6" id={ "conflict-" + conflict.ID }>
-		<div class="mb-4 flex items-start justify-between gap-4">
-			<div class="min-w-0">
-				<div class="mb-1 flex items-center gap-2">
-					@Icon("copy", "h-5 w-5 shrink-0")
-					<h4 class="text-lg font-semibold" style="color: var(--text-primary)">Duplicate content</h4>
-					<span class="badge status-pending">{ fmt.Sprintf("%d copies", len(conflict.Items)) }</span>
-				</div>
-				<p class="text-sm" style="color: var(--text-secondary)">
-					Library: <span class="font-medium">{ conflict.LibraryName }</span>
-					<span class="mx-2">·</span>
-					SHA-256: <code class="text-xs">{ conflict.SHAShort }</code>
-				</p>
-				<p class="mt-1 text-xs" style="color: var(--text-secondary)">
-					These files are byte-identical. Keep one copy (reading data from the others is merged in), or keep both if the duplicates are intentional.
-				</p>
-			</div>
-			<div class="shrink-0">
-				<button
-					hx-post={ "/api/admin/hash-conflicts/" + conflict.ID + "/resolve" }
-					hx-vals='{"action": "keep_all"}'
-					hx-target={ "#conflict-" + conflict.ID }
-					hx-swap="outerHTML"
-					hx-confirm="Keep all copies and stop flagging this group?"
-					class="btn btn-secondary text-sm"
-				>
-					@Icon("check-circle", "h-4 w-4")
-					Keep both
-				</button>
-			</div>
-		</div>
-		<div class="space-y-3">
-			for _, item := range conflict.Items {
-				@HashConflictItemCardWrapper(item, conflict.ID)
-			}
-		</div>
-	</div>
-}
-
-// HashConflictItemCardWrapper renders an item card with its parent conflict ID
-// for the resolve endpoint targeting.
-templ HashConflictItemCardWrapper(item HashConflictItemData, conflictID string) {
-	<div class="flex items-start justify-between gap-4 rounded-lg border p-4" style="border-color: var(--border);">
-		<div class="min-w-0 flex-1">
-			<p class="font-medium truncate" style="color: var(--text-primary)">{ item.Title }</p>
-			if item.Author != "" {
-				<p class="text-sm truncate" style="color: var(--text-secondary)">{ item.Author }</p>
-			}
-			<p class="mt-1 text-xs break-all" style="color: var(--text-secondary)">{ item.FilePath }</p>
-			<p class="mt-1 text-xs" style="color: var(--text-secondary)">
-				{ fmt.Sprintf("%.1f MB", float64(item.FileSize)/(1024*1024)) }
-				if item.HasReadingData {
-					<span class="ml-2 font-medium" style="color: var(--accent);">{ item.UsageSummary }</span>
-				} else {
-					<span class="ml-2">{ item.UsageSummary }</span>
-				}
-			</p>
-		</div>
-		<div class="shrink-0">
-			<button
-				hx-post={ "/api/admin/hash-conflicts/" + conflictID + "/resolve" }
-				hx-vals={ fmt.Sprintf(`{"action": "keep", "keep_uuid": "%s"}`, item.ID) }
-				hx-target={ "#conflict-" + conflictID }
-				hx-swap="outerHTML"
-				hx-confirm="Keep this copy and merge the other copy's reading data into it?"
-				class="btn btn-secondary text-sm"
-			>
-				@Icon("check", "h-4 w-4")
-				Keep this copy
-			</button>
-		</div>
-	</div>
-}
-
-// HashConflictResolved is swapped in place of a card after resolution.
-templ AdminHashConflicts(user User, conflicts []HashConflictData) {
-	<!DOCTYPE html>
-	<html lang="en">
-		<head>
-			<meta charset="UTF-8"/>
-			<title>Hash Conflicts - Bookhoard</title>
-			<link href="/static/style.css" rel="stylesheet"/>
-			<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
-		</head>
-	<body class={ "theme-" + user.Theme }>
-		@Header(user, "/admin/hash-conflicts")
-		<main class="p-8">
-			<div class="mx-auto max-w-4xl">
-				<div class="mb-8">
-					<div>
-						<div class="mb-1 flex items-center gap-3">
-							<span class="grid h-10 w-10 place-items-center rounded-xl" style="background-color: var(--accent-muted); color: var(--accent);">
-								@Icon("copy", "h-5 w-5")
-							</span>
-							<h1 class="text-2xl font-bold tracking-tight" style="color: var(--text-primary)">Hash Conflicts</h1>
-						</div>
-						<p class="text-sm" style="color: var(--text-secondary)">Books with identical content stored at more than one path</p>
-					</div>
-				</div>
-				if len(conflicts) == 0 {
-					<div class="card p-8 text-center">
-						<span class="mx-auto mb-3 grid h-12 w-12 place-items-center rounded-2xl" style="background-color: var(--accent-muted); color: var(--accent);">
-							@Icon("check-circle", "h-6 w-6")
-						</span>
-						<p class="text-sm" style="color: var(--text-secondary)">No content duplicates detected.</p>
-					</div>
-				} else {
-					<div class="space-y-4">
-						for _, conflict := range conflicts {
-							@HashConflictCard(conflict)
-						}
-					</div>
-				}
-			</div>
-		</main>
-	</body>
-	</html>
-}

templates/admin_hash_conflicts_templ.go

@@ -1,449 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.3.1020
-package templates
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
-import "fmt"
-
-// HashConflictItemData is one copy in a conflict group.
-type HashConflictItemData struct {
-	ID             string
-	Title          string
-	Author         string
-	FilePath       string
-	FileSize       int64
-	UsageSummary   string
-	HasReadingData bool
-}
-
-// HashConflictData is one pending conflict group.
-type HashConflictData struct {
-	ID          string
-	LibraryName string
-	SHA256      string
-	SHAShort    string
-	CreatedAt   string
-	Items       []HashConflictItemData
-}
-
-func HashConflictCard(conflict HashConflictData) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"card p-6\" id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.ResolveAttributeValue("conflict-" + conflict.ID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 27, Col: 53}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var2)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "\"><div class=\"mb-4 flex items-start justify-between gap-4\"><div class=\"min-w-0\"><div class=\"mb-1 flex items-center gap-2\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("copy", "h-5 w-5 shrink-0").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<h4 class=\"text-lg font-semibold\" style=\"color: var(--text-primary)\">Duplicate content</h4><span class=\"badge status-pending\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%d copies", len(conflict.Items)))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 33, Col: 87}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</span></div><p class=\"text-sm\" style=\"color: var(--text-secondary)\">Library: <span class=\"font-medium\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var4 string
-		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(conflict.LibraryName)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 36, Col: 62}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</span> <span class=\"mx-2\">·</span> SHA-256: <code class=\"text-xs\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var5 string
-		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(conflict.SHAShort)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 38, Col: 55}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</code></p><p class=\"mt-1 text-xs\" style=\"color: var(--text-secondary)\">These files are byte-identical. Keep one copy (reading data from the others is merged in), or keep both if the duplicates are intentional.</p></div><div class=\"shrink-0\"><button hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var6 string
-		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.ResolveAttributeValue("/api/admin/hash-conflicts/" + conflict.ID + "/resolve")
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 46, Col: 70}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var6)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "\" hx-vals='{\"action\": \"keep_all\"}' hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var7 string
-		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.ResolveAttributeValue("#conflict-" + conflict.ID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 48, Col: 43}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "\" hx-swap=\"outerHTML\" hx-confirm=\"Keep all copies and stop flagging this group?\" class=\"btn btn-secondary text-sm\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("check-circle", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "Keep both</button></div></div><div class=\"space-y-3\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		for _, item := range conflict.Items {
-			templ_7745c5c3_Err = HashConflictItemCardWrapper(item, conflict.ID).Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-// HashConflictItemCardWrapper renders an item card with its parent conflict ID
-// for the resolve endpoint targeting.
-func HashConflictItemCardWrapper(item HashConflictItemData, conflictID string) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var8 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var8 == nil {
-			templ_7745c5c3_Var8 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<div class=\"flex items-start justify-between gap-4 rounded-lg border p-4\" style=\"border-color: var(--border);\"><div class=\"min-w-0 flex-1\"><p class=\"font-medium truncate\" style=\"color: var(--text-primary)\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var9 string
-		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(item.Title)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 71, Col: 82}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "</p>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if item.Author != "" {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<p class=\"text-sm truncate\" style=\"color: var(--text-secondary)\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var10 string
-			templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(item.Author)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 73, Col: 82}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<p class=\"mt-1 text-xs break-all\" style=\"color: var(--text-secondary)\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var11 string
-		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(item.FilePath)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 75, Col: 89}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</p><p class=\"mt-1 text-xs\" style=\"color: var(--text-secondary)\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var12 string
-		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.1f MB", float64(item.FileSize)/(1024*1024)))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 77, Col: 64}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, " ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if item.HasReadingData {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "<span class=\"ml-2 font-medium\" style=\"color: var(--accent);\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var13 string
-			templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(item.UsageSummary)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 79, Col: 85}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</span>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<span class=\"ml-2\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var14 string
-			templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(item.UsageSummary)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 81, Col: 43}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</span>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</p></div><div class=\"shrink-0\"><button hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var15 string
-		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.ResolveAttributeValue("/api/admin/hash-conflicts/" + conflictID + "/resolve")
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 87, Col: 68}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\" hx-vals=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var16 string
-		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.ResolveAttributeValue(fmt.Sprintf(`{"action": "keep", "keep_uuid": "%s"}`, item.ID))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 88, Col: 75}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var16)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var17 string
-		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.ResolveAttributeValue("#conflict-" + conflictID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 89, Col: 41}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var17)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "\" hx-swap=\"outerHTML\" hx-confirm=\"Keep this copy and merge the other copy's reading data into it?\" class=\"btn btn-secondary text-sm\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("check", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "Keep this copy</button></div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-// HashConflictResolved is swapped in place of a card after resolution.
-func AdminHashConflicts(user User, conflicts []HashConflictData) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var18 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var18 == nil {
-			templ_7745c5c3_Var18 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><title>Hash Conflicts - Bookhoard</title><link href=\"/static/style.css\" rel=\"stylesheet\"><link rel=\"icon\" type=\"image/svg+xml\" href=\"/static/favicon.svg\"></head>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var19 = []any{"theme-" + user.Theme}
-		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var19...)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<body class=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var20 string
-		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var19).String())
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_hash_conflicts.templ`, Line: 1, Col: 0}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var20)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Header(user, "/admin/hash-conflicts").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<main class=\"p-8\"><div class=\"mx-auto max-w-4xl\"><div class=\"mb-8\"><div><div class=\"mb-1 flex items-center gap-3\"><span class=\"grid h-10 w-10 place-items-center rounded-xl\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("copy", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "</span><h1 class=\"text-2xl font-bold tracking-tight\" style=\"color: var(--text-primary)\">Hash Conflicts</h1></div><p class=\"text-sm\" style=\"color: var(--text-secondary)\">Books with identical content stored at more than one path</p></div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if len(conflicts) == 0 {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "<div class=\"card p-8 text-center\"><span class=\"mx-auto mb-3 grid h-12 w-12 place-items-center rounded-2xl\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = Icon("check-circle", "h-6 w-6").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "</span><p class=\"text-sm\" style=\"color: var(--text-secondary)\">No content duplicates detected.</p></div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<div class=\"space-y-4\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			for _, conflict := range conflicts {
-				templ_7745c5c3_Err = HashConflictCard(conflict).Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "</div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "</div></main></body></html>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

templates/admin_library.templ

@@ -6,414 +6,150 @@ templ AdminLibrary(user User, libraries []LibraryData, users []User) {
 		<head>
 			<meta charset="UTF-8"/>
 			<title>Library Management - Bookhoard</title>
-			<script src="/static/htmx.min.js"></script>
 			<link href="/static/style.css" rel="stylesheet"/>
-			<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
 		</head>
-		<body class="theme-{ user.Theme }">
+		<body x-data="library" x-init="initializeLibraryAdmin" class="theme-{ user.Theme }">
 			@Header(user, "/admin/library")
-			<main class="p-8">
-				<div class="max-w-4xl">
-					<div class="mb-8">
-						<div class="flex items-center justify-between gap-4 flex-wrap mb-4">
-							<div>
-								<div class="flex items-center gap-3 mb-1">
-									<span class="grid place-items-center h-10 w-10 rounded-xl" style="background-color: var(--accent-muted); color: var(--accent);">
-										@Icon("library", "h-5 w-5")
-									</span>
-									<h1 class="text-2xl font-bold tracking-tight" style="color: var(--text-primary)">Libraries</h1>
+			<div class="flex min-h-screen" style="background-color: var(--bg-primary)">
+				@AdminSidebar(user, "/admin/library")
+				<main class="flex-1 p-8">
+					<div class="w-full">
+						<div class="mb-8">
+							<div class="flex items-center justify-between mb-4">
+								<a href="/admin" class="btn-secondary px-4 py-2 rounded-lg font-medium">
+									← Back to Dashboard
+								</a>
+								<button data-action="show-create-modal" class="btn-primary px-4 py-2 rounded-lg font-medium">
+									+ Create Library
+								</button>
+							</div>
+							<h1 class="text-3xl font-bold mb-2" style="color: var(--text-primary)">Library Management</h1>
+							<p style="color: var(--text-secondary)">Manage libraries and configure media scanning</p>
+						</div>
+						<div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
+							<!-- Libraries Section -->
+							<div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
+								<h3 class="text-xl font-semibold mb-6" style="color: var(--text-primary)">Libraries</h3>
+								<p style="color: var(--text-secondary)" class="mb-4">Manage media libraries and their folders</p>
+								<div id="libraries-list" class="space-y-3 mb-6">
+									if len(libraries) == 0 {
+										<p style="color: var(--text-secondary)" class="text-center py-8">
+											No libraries yet. Create your first library to get started.
+										</p>
+									} else {
+										for _, library := range libraries {
+											<div class="p-4 border rounded-lg" style="background-color: var(--bg-primary); border-color: var(--border)">
+												<div class="flex justify-between items-start mb-2">
+													<div>
+														<h4 class="font-semibold" style="color: var(--text-primary)">{ library.Name }</h4>
+														if library.Description != "" {
+															<p class="text-sm" style="color: var(--text-secondary)">{ library.Description }</p>
+														}
+														<span class="inline-block px-2 py-1 text-xs rounded" style="background-color: var(--accent); color: var(--bg-primary)">
+															{ library.TypeName }
+														</span>
+													</div>
+													<div class="flex space-x-2">
+														<button data-library-id={ library.ID } data-action="show-folders" class="text-xs px-2 py-1 rounded" style="background-color: var(--bg-secondary); color: var(--text-primary)">Folders</button>
+														<button data-library-id={ library.ID } data-action="edit" class="text-xs px-2 py-1 rounded" style="background-color: var(--accent); color: var(--bg-primary)">Edit</button>
+														<button data-library-id={ library.ID } data-action="delete" class="text-xs px-2 py-1 rounded text-red-500">Delete</button>
+													</div>
+												</div>
+												<div id={ "library-folders-" + library.ID } class="hidden mt-3 space-y-2"></div>
+											</div>
+										}
+									}
 								</div>
-								<p class="text-sm" style="color: var(--text-secondary)">Manage media libraries, folders, and scanning</p>
+							</div>
+							<!-- User Library Visibility Section -->
+							<div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
+								<h3 class="text-xl font-semibold mb-6" style="color: var(--text-primary)">Library Visibility</h3>
+								<p style="color: var(--text-secondary)" class="mb-4">Control which libraries are visible to users</p>
+								<div id="visibility-controls" class="space-y-4">
+									<!-- Visibility controls will be loaded here -->
+								</div>
+							</div>
+						</div>
+						<!-- User Visibility Management -->
+						<div class="mt-8 card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
+							<h3 class="text-xl font-semibold mb-6" style="color: var(--text-primary)">User Library Access</h3>
+							<p style="color: var(--text-secondary)" class="mb-4">Manage individual user access to specific libraries</p>
+							<div class="mb-4">
+								<select id="user-select" onchange="loadUserVisibility()" class="px-3 py-2 border rounded" style="background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border)">
+									<option value="">Select a user...</option>
+									for _, user := range users {
+										<option value="{ user.ID }">{ user.Username } ({ user.Email })</option>
+									}
+								</select>
+							</div>
+							<div id="user-libraries" class="space-y-3">
+								<!-- User library checkboxes will be loaded here -->
 							</div>
-						<button
-							onclick="document.getElementById('create-library-modal').classList.remove('hidden')"
-							class="btn btn-primary"
-						>
-							@Icon("plus", "h-4 w-4")
-							Create Library
-						</button>
 						</div>
 					</div>
-					<div id="libraries-container">
-						@LibraryList(user, libraries, users)
-					</div>
-				</div>
-			</main>
-			<!-- Create / Edit Library Modal -->
-			<div id="create-library-modal" class="hidden fixed inset-0 z-50 flex items-center justify-center p-4" style="background-color: var(--surface-overlay);">
-				<div class="card p-6 w-full max-w-md" style="box-shadow: var(--shadow-pop);">
+				</main>
+			</div>
+			<!-- Create Library Modal -->
+			<div id="create-library-modal" class="hidden fixed inset-0 z-50 flex items-center justify-center" style="background-color: rgba(0, 0, 0, 0.7);">
+				<div class="card rounded-lg p-6 w-full max-w-md mx-4" style="background-color: var(--bg-secondary); border-color: var(--border);">
 					<div class="flex justify-between items-center mb-6">
 						<h2 class="text-xl font-bold" style="color: var(--text-primary)">Create Library</h2>
-						<button type="button" onclick="document.getElementById('create-library-modal').classList.add('hidden')" class="icon-btn" aria-label="Close">
-							@Icon("close", "h-5 w-5")
-						</button>
+						<button type="button" data-action="hide-create-modal" class="p-2 hover:opacity-80 rounded" style="color: var(--text-primary)">✕</button>
 					</div>
-					<form
-						hx-post="/admin/library/create"
-						hx-target="#libraries-container"
-						hx-swap="innerHTML"
-						onsubmit="document.getElementById('create-library-modal').classList.add('hidden')"
-					>
+					<form id="create-library-form">
+						<input type="hidden" id="library-id" name="id"/>
 						<div class="mb-4">
-							<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Library Name</label>
-							<input type="text" name="name" placeholder="My Ebook Library" class="input" required/>
+							<label class="block text-sm font-medium mb-2" style="color: var(--text-primary)">Library Name</label>
+							<input type="text" name="name" placeholder="My Ebook Library" class="w-full px-3 py-2 border rounded-lg" style="background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border)" required/>
 						</div>
 						<div class="mb-4">
-							<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Description</label>
-							<textarea name="description" placeholder="Optional description" rows="3" class="input"></textarea>
+							<label class="block text-sm font-medium mb-2" style="color: var(--text-primary)">Description</label>
+							<textarea name="description" placeholder="Optional description" rows="3" class="w-full px-3 py-2 border rounded-lg" style="background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border)"></textarea>
 						</div>
-						<div class="mb-6">
-							<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Library Type</label>
-							<select name="type" class="input" required>
-								<option value="ebooks">Ebooks</option>
-								<option value="comics">Comics</option>
-								<option value="manga">Manga</option>
+						<div class="mb-4">
+							<label class="block text-sm font-medium mb-2" style="color: var(--text-primary)">Library Type</label>
+							<select name="type" class="w-full px-3 py-2 border rounded-lg" style="background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border)" required>
+								<option value="ebooks">📚 Ebooks</option>
+								<option value="comics">📖 Comics</option>
+								<option value="manga">🗾 Manga</option>
 							</select>
 						</div>
 						<div class="flex justify-end space-x-3">
-							<button type="button" onclick="document.getElementById('create-library-modal').classList.add('hidden')" class="btn btn-secondary">Cancel</button>
-							<button type="submit" class="btn btn-primary">
-								@Icon("plus", "h-4 w-4")
-								Create
-							</button>
-						</div>
-					</form>
-				</div>
-			</div>
-			<!-- Edit Library Modal -->
-			<div id="edit-library-modal" class="hidden fixed inset-0 z-50 flex items-center justify-center p-4" style="background-color: var(--surface-overlay);">
-				<div class="card p-6 w-full max-w-md" style="box-shadow: var(--shadow-pop);">
-					<div class="flex justify-between items-center mb-6">
-						<h2 class="text-xl font-bold" style="color: var(--text-primary)">Edit Library</h2>
-						<button type="button" onclick="document.getElementById('edit-library-modal').classList.add('hidden')" class="icon-btn" aria-label="Close">
-							@Icon("close", "h-5 w-5")
-						</button>
-					</div>
-					<form id="edit-library-form" hx-target="#libraries-container" hx-swap="innerHTML" onsubmit="document.getElementById('edit-library-modal').classList.add('hidden')">
-						<div class="mb-4">
-							<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Library Name</label>
-							<input type="text" name="name" id="edit-library-name" class="input" required/>
-						</div>
-						<div class="mb-6">
-							<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Description</label>
-							<textarea name="description" id="edit-library-desc" rows="3" class="input"></textarea>
-						</div>
-						<div class="flex justify-end space-x-3">
-							<button type="button" onclick="document.getElementById('edit-library-modal').classList.add('hidden')" class="btn btn-secondary">Cancel</button>
-							<button type="submit" class="btn btn-primary">
-								@Icon("save", "h-4 w-4")
-								Save
-							</button>
+							<button type="button" data-action="hide-create-modal" class="btn-secondary px-4 py-2 rounded-lg">Cancel</button>
+							<button type="submit" class="btn-primary px-4 py-2 rounded-lg">Create</button>
 						</div>
 					</form>
 				</div>
 			</div>
 			<!-- Folder Browser Modal -->
-			<div id="folder-browser-modal" class="hidden fixed inset-0 z-50 flex items-center justify-center p-4" style="background-color: var(--surface-overlay);">
-				<div class="card p-6 w-full max-w-lg mx-4" style="box-shadow: var(--shadow-pop);">
+			<div id="folder-browser-modal" class="hidden fixed inset-0 z-50 flex items-center justify-center" style="background-color: rgba(0, 0, 0, 0.7);">
+				<div class="card rounded-lg p-6 w-full max-w-md mx-4" style="background-color: var(--bg-secondary); border-color: var(--border);">
 					<div class="flex justify-between items-center mb-4">
 						<h2 class="text-xl font-bold" style="color: var(--text-primary)">Browse Folders</h2>
-						<button type="button" onclick="document.getElementById('folder-browser-modal').classList.add('hidden')" class="icon-btn" aria-label="Close">
-							@Icon("close", "h-5 w-5")
-						</button>
+						<button type="button" data-action="browse-cancel" class="p-2 hover:opacity-80 rounded" style="color: var(--text-primary)">✕</button>
+					</div>
+					<div id="folder-browser-content">
+						<!-- Directory listings will be rendered here -->
 					</div>
-					<div id="folder-browser-content"></div>
 				</div>
 			</div>
-			<!-- Delete Library Modal -->
-			<div id="delete-library-modal" class="hidden fixed inset-0 z-50 flex items-center justify-center p-4" style="background-color: var(--surface-overlay);">
-				<div class="card p-6 w-full max-w-md mx-4" style="box-shadow: var(--shadow-pop);">
+			<!-- Delete Library Confirmation Modal -->
+			<div id="delete-library-modal" class="hidden fixed inset-0 z-50 flex items-center justify-center" style="background-color: rgba(0, 0, 0, 0.7);">
+				<div class="card rounded-lg p-6 w-full max-w-md mx-4" style="background-color: var(--bg-secondary); border-color: var(--border);">
 					<div class="flex justify-between items-center mb-4">
 						<h2 class="text-xl font-bold" style="color: var(--text-primary)">Delete Library</h2>
-						<button type="button" onclick="document.getElementById('delete-library-modal').classList.add('hidden')" class="icon-btn" aria-label="Close">
-							@Icon("close", "h-5 w-5")
-						</button>
+						<button type="button" data-action="hide-delete-modal" class="p-2 hover:opacity-80 rounded" style="color: var(--text-primary)">✕</button>
+					</div>
+					<div id="delete-modal-content" class="mb-6" style="color: var(--text-primary)">
+						<!-- Dynamic content will be injected here -->
 					</div>
-					<p class="mb-6" style="color: var(--text-primary)">
-						Are you sure you want to delete <strong id="delete-library-name"></strong>?
-						This will remove the library and all its folder mappings. Media files will not be deleted.
-					</p>
 					<div class="flex justify-end space-x-3">
-						<button type="button" onclick="document.getElementById('delete-library-modal').classList.add('hidden')" class="btn btn-secondary">Cancel</button>
-						<button type="button" id="delete-library-confirm" class="btn btn-danger">
-							@Icon("trash", "h-4 w-4")
-							Delete
-						</button>
+						<button type="button" data-action="hide-delete-modal" class="btn-secondary px-4 py-2 rounded-lg">Cancel</button>
+						<button type="button" data-action="confirm-delete" class="btn-primary px-4 py-2 rounded-lg bg-red-500 hover:bg-red-600">Delete</button>
 					</div>
 				</div>
 			</div>
-			<script>
-				function toggleLibraryPanel(btn) {
-					var libId = btn.dataset.libId;
-					var panel = document.getElementById('library-panel-' + libId);
-					if (panel.innerHTML.trim() !== '') {
-						panel.innerHTML = '';
-					} else {
-						htmx.ajax('GET', '/admin/library/' + libId + '/panel', {
-							target: '#library-panel-' + libId,
-							swap: 'innerHTML'
-						});
-					}
-				}
-				function openEditModal(id, name, description) {
-					document.getElementById('edit-library-form').setAttribute('hx-put', '/admin/library/' + id);
-					document.getElementById('edit-library-name').value = name;
-					document.getElementById('edit-library-desc').value = description;
-					htmx.process(document.getElementById('edit-library-form'));
-					document.getElementById('edit-library-modal').classList.remove('hidden');
-				}
-				function openDeleteModal(id, name) {
-					const btn = document.getElementById('delete-library-confirm');
-					btn.setAttribute('hx-delete', '/admin/library/' + id);
-					btn.setAttribute('hx-target', '#libraries-container');
-					btn.setAttribute('hx-swap', 'innerHTML');
-					document.getElementById('delete-library-name').textContent = name;
-					htmx.process(btn);
-					document.getElementById('delete-library-modal').classList.remove('hidden');
-				}
-				function openFolderBrowser(targetInputId, libraryId) {
-					const content = document.getElementById('folder-browser-content');
-					content.setAttribute('hx-get', '/admin/library/browse');
-					content.setAttribute('hx-vals', '{"target_input": "' + targetInputId + '", "library_id": "' + libraryId + '"}');
-					content.setAttribute('hx-trigger', 'load');
-					htmx.process(content);
-					document.getElementById('folder-browser-modal').classList.remove('hidden');
-				}
-			</script>
+			<script src="/static/htmx.min.js"></script>
 		</body>
 	</html>
 }
-
-templ LibraryList(user User, libraries []LibraryData, users []User) {
-	if len(libraries) == 0 {
-		<div class="card text-center py-16">
-			<span class="grid place-items-center h-14 w-14 mx-auto mb-4 rounded-2xl" style="background-color: var(--accent-muted); color: var(--accent);">
-				@Icon("library", "h-7 w-7")
-			</span>
-			<h3 class="text-xl font-semibold mb-2" style="color: var(--text-primary)">No Libraries Yet</h3>
-			<p class="mb-4 text-sm" style="color: var(--text-secondary)">Create your first library to get started</p>
-			<button onclick="document.getElementById('create-library-modal').classList.remove('hidden')" class="btn btn-primary">Create Your First Library</button>
-		</div>
-	} else {
-		<div class="space-y-4">
-			for _, library := range libraries {
-				<div class="card overflow-hidden">
-					<div class="flex items-center justify-between gap-4 p-5">
-						<div class="flex items-center gap-3 min-w-0 flex-1">
-							<span class="grid place-items-center h-10 w-10 rounded-xl shrink-0" style="background-color: var(--accent-muted); color: var(--accent);">
-								@Icon("library", "h-5 w-5")
-							</span>
-							<div class="min-w-0">
-								<h3 class="font-semibold truncate" style="color: var(--text-primary)">{ library.Name }</h3>
-								if library.Description != "" {
-									<p class="text-sm truncate" style="color: var(--text-secondary)">{ library.Description }</p>
-								}
-							</div>
-							<span class="chip shrink-0">
-								@Icon("tag", "h-3 w-3")
-								{ library.TypeName }
-							</span>
-							if library.FolderCount > 0 {
-								<span class="chip shrink-0">
-									@Icon("folder", "h-3 w-3")
-									{ library.FolderCount } folders
-								</span>
-							}
-						</div>
-						<div class="flex items-center gap-2 shrink-0">
-							<button
-								hx-post={ "/api/libraries/" + library.ID + "/scan" }
-								hx-vals='{"force": "true"}'
-								hx-target="#scan-indicator"
-								hx-swap="innerHTML"
-								class="btn btn-secondary text-xs px-3 py-1.5"
-							>
-								@Icon("refresh", "h-4 w-4")
-								Scan
-							</button>
-							<button
-								data-lib-id={ library.ID }
-								onclick="toggleLibraryPanel(this)"
-								class="btn btn-secondary text-xs px-3 py-1.5"
-							>
-								@Icon("chevron-down", "h-4 w-4")
-								Manage
-							</button>
-						</div>
-					</div>
-					<div id={ "library-panel-" + library.ID }></div>
-				</div>
-			}
-		</div>
-	}
-	<div id="scan-indicator"></div>
-}
-
-templ LibraryPanel(user User, libraryID string, library LibraryData, folders []FolderData, users []User, visibility []UserVisibilityData, issueCount int) {
-	<div class="border-t p-5 space-y-6" style="border-color: var(--border);">
-		<!-- Folders -->
-		<div>
-			<div class="flex items-center gap-2 mb-3">
-				@Icon("folder", "h-4 w-4 shrink-0")
-				<h4 class="text-sm font-semibold uppercase tracking-wide" style="color: var(--text-secondary)">Folders</h4>
-			</div>
-			if len(folders) == 0 {
-				<p class="text-sm mb-3" style="color: var(--text-secondary)">No folders configured. Add a folder to enable scanning.</p>
-			} else {
-				<div class="space-y-2 mb-3">
-					for _, folder := range folders {
-						<div class="flex items-center justify-between gap-2 p-2 rounded-lg" style="background-color: var(--bg-primary);">
-							<code class="text-xs flex-1 truncate" style="color: var(--text-primary)">{ folder.FolderPath }</code>
-							<button
-								class="icon-btn h-7 w-7 shrink-0"
-								hx-delete={ "/admin/library/" + libraryID + "/folders" }
-								hx-vals={ `{"folder_path": "` + folder.FolderPath + `"}` }
-								hx-target={ "#library-panel-" + libraryID }
-								hx-swap="innerHTML"
-								hx-confirm="Remove this folder from the library?"
-							>
-								@Icon("trash", "h-3.5 w-3.5")
-							</button>
-						</div>
-					}
-				</div>
-			}
-			<form class="flex gap-2" hx-post={ "/admin/library/" + libraryID + "/folders" } hx-target={ "#library-panel-" + libraryID } hx-swap="innerHTML">
-				<input
-					type="text"
-					name="folder_path"
-					id={ "folder-input-" + libraryID }
-					placeholder="/path/to/books"
-					class="input flex-1"
-					required
-				/>
-				<button
-					type="button"
-					data-library-id={ libraryID }
-					data-target-input={ "folder-input-" + libraryID }
-					onclick="openFolderBrowser(this.dataset.targetInput, this.dataset.libraryId)"
-					class="btn btn-secondary text-sm shrink-0"
-				>
-					@Icon("folder", "h-4 w-4")
-					Browse
-				</button>
-				<button type="submit" class="btn btn-primary text-sm shrink-0">
-					@Icon("plus", "h-4 w-4")
-					Add
-				</button>
-			</form>
-		</div>
-		<!-- User Visibility -->
-		if len(users) > 0 {
-			<div>
-				<div class="flex items-center gap-2 mb-3">
-					@Icon("users", "h-4 w-4 shrink-0")
-					<h4 class="text-sm font-semibold uppercase tracking-wide" style="color: var(--text-secondary)">User Access</h4>
-				</div>
-				<div class="space-y-1">
-					for _, u := range users {
-						<label class="flex items-center gap-3 cursor-pointer p-2 rounded-lg transition-colors hover:bg-surface-hover">
-							<input
-								type="checkbox"
-								class="w-4 h-4 rounded"
-								name="is_visible"
-								value="true"
-								checked?={ isUserVisible(u.ID, visibility) }
-								hx-post={ "/admin/library/" + libraryID + "/visibility" }
-								hx-vals={ `{"user_id": "` + u.ID + `"}` }
-								hx-trigger="change"
-								hx-target={ "#library-panel-" + libraryID }
-								hx-swap="innerHTML"
-							/>
-							<span class="text-sm" style="color: var(--text-primary)">{ u.Username }</span>
-							<span class="text-xs" style="color: var(--text-secondary)">{ u.Email }</span>
-						</label>
-					}
-				</div>
-			</div>
-		}
-		<!-- Processing Issues -->
-		if issueCount > 0 {
-			<div>
-				<a href={ "/admin/libraries/" + libraryID + "/issues" } class="flex items-center gap-2 text-sm" style="color: var(--status-warning);">
-					@Icon("alert", "h-4 w-4")
-					if issueCount == 1 {
-						<span>1 processing issue</span>
-					} else {
-						<span>{ issueCount } processing issues</span>
-					}
-					@Icon("chevron-right", "h-4 w-4")
-				</a>
-			</div>
-		}
-		<!-- Actions -->
-		<div class="flex gap-2 pt-2 border-t" style="border-color: var(--border);">
-			<button
-				data-edit-id={ libraryID }
-				data-edit-name={ library.Name }
-				data-edit-desc={ library.Description }
-				onclick="openEditModal(this.dataset.editId, this.dataset.editName, this.dataset.editDesc)"
-				class="btn btn-secondary text-sm"
-			>
-				@Icon("edit", "h-4 w-4")
-				Edit Details
-			</button>
-			<button
-				data-delete-id={ libraryID }
-				data-delete-name={ library.Name }
-				onclick="openDeleteModal(this.dataset.deleteId, this.dataset.deleteName)"
-				class="btn btn-danger text-sm"
-			>
-				@Icon("trash", "h-4 w-4")
-				Delete Library
-			</button>
-		</div>
-	</div>
-}
-
-templ FolderBrowserContent(currentPath string, parentPath string, entries []DirEntry, targetInput string, libraryID string) {
-	<div>
-		<div class="flex items-center gap-2 mb-3 p-2 rounded-lg" style="background-color: var(--bg-primary);">
-			@Icon("folder", "h-4 w-4 shrink-0")
-			<code class="text-xs flex-1 truncate" style="color: var(--text-primary)">{ currentPath }</code>
-		</div>
-		if parentPath != "" {
-			<button
-				class="w-full flex items-center gap-2 px-3 py-2 rounded-lg text-sm transition-colors hover:bg-surface-hover"
-				style="color: var(--text-secondary);"
-				hx-get={ "/admin/library/browse?path=" + parentPath + "&target_input=" + targetInput + "&library_id=" + libraryID }
-				hx-target="#folder-browser-content"
-				hx-swap="innerHTML"
-			>
-				@Icon("arrow-left", "h-4 w-4")
-				<span>..</span>
-			</button>
-		}
-		<div class="space-y-1 max-h-64 overflow-y-auto">
-			for _, entry := range entries {
-				<button
-					class="w-full flex items-center gap-2 px-3 py-2 rounded-lg text-sm transition-colors hover:bg-surface-hover"
-					style="color: var(--text-primary);"
-					hx-get={ "/admin/library/browse?path=" + entry.Path + "&target_input=" + targetInput + "&library_id=" + libraryID }
-					hx-target="#folder-browser-content"
-					hx-swap="innerHTML"
-				>
-					@Icon("folder", "h-4 w-4 shrink-0")
-					<span class="truncate">{ entry.Name }</span>
-				</button>
-			}
-		</div>
-		<div class="mt-4 flex justify-end">
-			<button
-				type="button"
-				data-target-input={ targetInput }
-				data-current-path={ currentPath }
-				onclick="document.getElementById(this.dataset.targetInput).value = this.dataset.currentPath; document.getElementById('folder-browser-modal').classList.add('hidden')"
-				class="btn btn-primary text-sm"
-			>
-				@Icon("check", "h-4 w-4")
-				Select This Folder
-			</button>
-		</div>
-	</div>
-}

templates/admin_library_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.1020
+// templ: version: v0.3.1001
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -29,7 +29,7 @@ func AdminLibrary(user User, libraries []LibraryData, users []User) templ.Compon
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><title>Library Management - Bookhoard</title><script src=\"/static/htmx.min.js\"></script><link href=\"/static/style.css\" rel=\"stylesheet\"><link rel=\"icon\" type=\"image/svg+xml\" href=\"/static/favicon.svg\"></head><body class=\"theme-{ user.Theme }\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><title>Library Management - Bookhoard</title><link href=\"/static/style.css\" rel=\"stylesheet\"></head><body x-data=\"library\" x-init=\"initializeLibraryAdmin\" class=\"theme-{ user.Theme }\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -37,893 +37,169 @@ func AdminLibrary(user User, libraries []LibraryData, users []User) templ.Compon
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<main class=\"p-8\"><div class=\"max-w-4xl\"><div class=\"mb-8\"><div class=\"flex items-center justify-between gap-4 flex-wrap mb-4\"><div><div class=\"flex items-center gap-3 mb-1\"><span class=\"grid place-items-center h-10 w-10 rounded-xl\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"flex min-h-screen\" style=\"background-color: var(--bg-primary)\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = Icon("library", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = AdminSidebar(user, "/admin/library").Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</span><h1 class=\"text-2xl font-bold tracking-tight\" style=\"color: var(--text-primary)\">Libraries</h1></div><p class=\"text-sm\" style=\"color: var(--text-secondary)\">Manage media libraries, folders, and scanning</p></div><button onclick=\"document.getElementById('create-library-modal').classList.remove('hidden')\" class=\"btn btn-primary\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<main class=\"flex-1 p-8\"><div class=\"w-full\"><div class=\"mb-8\"><div class=\"flex items-center justify-between mb-4\"><a href=\"/admin\" class=\"btn-secondary px-4 py-2 rounded-lg font-medium\">← Back to Dashboard</a> <button data-action=\"show-create-modal\" class=\"btn-primary px-4 py-2 rounded-lg font-medium\">+ Create Library</button></div><h1 class=\"text-3xl font-bold mb-2\" style=\"color: var(--text-primary)\">Library Management</h1><p style=\"color: var(--text-secondary)\">Manage libraries and configure media scanning</p></div><div class=\"grid grid-cols-1 lg:grid-cols-2 gap-8\"><!-- Libraries Section --><div class=\"card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border)\"><h3 class=\"text-xl font-semibold mb-6\" style=\"color: var(--text-primary)\">Libraries</h3><p style=\"color: var(--text-secondary)\" class=\"mb-4\">Manage media libraries and their folders</p><div id=\"libraries-list\" class=\"space-y-3 mb-6\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = Icon("plus", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "Create Library</button></div></div><div id=\"libraries-container\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = LibraryList(user, libraries, users).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</div></div></main><!-- Create / Edit Library Modal --><div id=\"create-library-modal\" class=\"hidden fixed inset-0 z-50 flex items-center justify-center p-4\" style=\"background-color: var(--surface-overlay);\"><div class=\"card p-6 w-full max-w-md\" style=\"box-shadow: var(--shadow-pop);\"><div class=\"flex justify-between items-center mb-6\"><h2 class=\"text-xl font-bold\" style=\"color: var(--text-primary)\">Create Library</h2><button type=\"button\" onclick=\"document.getElementById('create-library-modal').classList.add('hidden')\" class=\"icon-btn\" aria-label=\"Close\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("close", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</button></div><form hx-post=\"/admin/library/create\" hx-target=\"#libraries-container\" hx-swap=\"innerHTML\" onsubmit=\"document.getElementById('create-library-modal').classList.add('hidden')\"><div class=\"mb-4\"><label class=\"block text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary)\">Library Name</label> <input type=\"text\" name=\"name\" placeholder=\"My Ebook Library\" class=\"input\" required></div><div class=\"mb-4\"><label class=\"block text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary)\">Description</label> <textarea name=\"description\" placeholder=\"Optional description\" rows=\"3\" class=\"input\"></textarea></div><div class=\"mb-6\"><label class=\"block text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary)\">Library Type</label> <select name=\"type\" class=\"input\" required><option value=\"ebooks\">Ebooks</option> <option value=\"comics\">Comics</option> <option value=\"manga\">Manga</option></select></div><div class=\"flex justify-end space-x-3\"><button type=\"button\" onclick=\"document.getElementById('create-library-modal').classList.add('hidden')\" class=\"btn btn-secondary\">Cancel</button> <button type=\"submit\" class=\"btn btn-primary\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("plus", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "Create</button></div></form></div></div><!-- Edit Library Modal --><div id=\"edit-library-modal\" class=\"hidden fixed inset-0 z-50 flex items-center justify-center p-4\" style=\"background-color: var(--surface-overlay);\"><div class=\"card p-6 w-full max-w-md\" style=\"box-shadow: var(--shadow-pop);\"><div class=\"flex justify-between items-center mb-6\"><h2 class=\"text-xl font-bold\" style=\"color: var(--text-primary)\">Edit Library</h2><button type=\"button\" onclick=\"document.getElementById('edit-library-modal').classList.add('hidden')\" class=\"icon-btn\" aria-label=\"Close\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("close", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "</button></div><form id=\"edit-library-form\" hx-target=\"#libraries-container\" hx-swap=\"innerHTML\" onsubmit=\"document.getElementById('edit-library-modal').classList.add('hidden')\"><div class=\"mb-4\"><label class=\"block text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary)\">Library Name</label> <input type=\"text\" name=\"name\" id=\"edit-library-name\" class=\"input\" required></div><div class=\"mb-6\"><label class=\"block text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary)\">Description</label> <textarea name=\"description\" id=\"edit-library-desc\" rows=\"3\" class=\"input\"></textarea></div><div class=\"flex justify-end space-x-3\"><button type=\"button\" onclick=\"document.getElementById('edit-library-modal').classList.add('hidden')\" class=\"btn btn-secondary\">Cancel</button> <button type=\"submit\" class=\"btn btn-primary\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("save", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "Save</button></div></form></div></div><!-- Folder Browser Modal --><div id=\"folder-browser-modal\" class=\"hidden fixed inset-0 z-50 flex items-center justify-center p-4\" style=\"background-color: var(--surface-overlay);\"><div class=\"card p-6 w-full max-w-lg mx-4\" style=\"box-shadow: var(--shadow-pop);\"><div class=\"flex justify-between items-center mb-4\"><h2 class=\"text-xl font-bold\" style=\"color: var(--text-primary)\">Browse Folders</h2><button type=\"button\" onclick=\"document.getElementById('folder-browser-modal').classList.add('hidden')\" class=\"icon-btn\" aria-label=\"Close\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("close", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</button></div><div id=\"folder-browser-content\"></div></div></div><!-- Delete Library Modal --><div id=\"delete-library-modal\" class=\"hidden fixed inset-0 z-50 flex items-center justify-center p-4\" style=\"background-color: var(--surface-overlay);\"><div class=\"card p-6 w-full max-w-md mx-4\" style=\"box-shadow: var(--shadow-pop);\"><div class=\"flex justify-between items-center mb-4\"><h2 class=\"text-xl font-bold\" style=\"color: var(--text-primary)\">Delete Library</h2><button type=\"button\" onclick=\"document.getElementById('delete-library-modal').classList.add('hidden')\" class=\"icon-btn\" aria-label=\"Close\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("close", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</button></div><p class=\"mb-6\" style=\"color: var(--text-primary)\">Are you sure you want to delete <strong id=\"delete-library-name\"></strong>? This will remove the library and all its folder mappings. Media files will not be deleted.</p><div class=\"flex justify-end space-x-3\"><button type=\"button\" onclick=\"document.getElementById('delete-library-modal').classList.add('hidden')\" class=\"btn btn-secondary\">Cancel</button> <button type=\"button\" id=\"delete-library-confirm\" class=\"btn btn-danger\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("trash", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "Delete</button></div></div></div><script>\n\t\t\t\tfunction toggleLibraryPanel(btn) {\n\t\t\t\t\tvar libId = btn.dataset.libId;\n\t\t\t\t\tvar panel = document.getElementById('library-panel-' + libId);\n\t\t\t\t\tif (panel.innerHTML.trim() !== '') {\n\t\t\t\t\t\tpanel.innerHTML = '';\n\t\t\t\t\t} else {\n\t\t\t\t\t\thtmx.ajax('GET', '/admin/library/' + libId + '/panel', {\n\t\t\t\t\t\t\ttarget: '#library-panel-' + libId,\n\t\t\t\t\t\t\tswap: 'innerHTML'\n\t\t\t\t\t\t});\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tfunction openEditModal(id, name, description) {\n\t\t\t\t\tdocument.getElementById('edit-library-form').setAttribute('hx-put', '/admin/library/' + id);\n\t\t\t\t\tdocument.getElementById('edit-library-name').value = name;\n\t\t\t\t\tdocument.getElementById('edit-library-desc').value = description;\n\t\t\t\t\thtmx.process(document.getElementById('edit-library-form'));\n\t\t\t\t\tdocument.getElementById('edit-library-modal').classList.remove('hidden');\n\t\t\t\t}\n\t\t\t\tfunction openDeleteModal(id, name) {\n\t\t\t\t\tconst btn = document.getElementById('delete-library-confirm');\n\t\t\t\t\tbtn.setAttribute('hx-delete', '/admin/library/' + id);\n\t\t\t\t\tbtn.setAttribute('hx-target', '#libraries-container');\n\t\t\t\t\tbtn.setAttribute('hx-swap', 'innerHTML');\n\t\t\t\t\tdocument.getElementById('delete-library-name').textContent = name;\n\t\t\t\t\thtmx.process(btn);\n\t\t\t\t\tdocument.getElementById('delete-library-modal').classList.remove('hidden');\n\t\t\t\t}\n\t\t\t\tfunction openFolderBrowser(targetInputId, libraryId) {\n\t\t\t\t\tconst content = document.getElementById('folder-browser-content');\n\t\t\t\t\tcontent.setAttribute('hx-get', '/admin/library/browse');\n\t\t\t\t\tcontent.setAttribute('hx-vals', '{\"target_input\": \"' + targetInputId + '\", \"library_id\": \"' + libraryId + '\"}');\n\t\t\t\t\tcontent.setAttribute('hx-trigger', 'load');\n\t\t\t\t\thtmx.process(content);\n\t\t\t\t\tdocument.getElementById('folder-browser-modal').classList.remove('hidden');\n\t\t\t\t}\n\t\t\t</script></body></html>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-func LibraryList(user User, libraries []LibraryData, users []User) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var2 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var2 == nil {
-			templ_7745c5c3_Var2 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
 		if len(libraries) == 0 {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<div class=\"card text-center py-16\"><span class=\"grid place-items-center h-14 w-14 mx-auto mb-4 rounded-2xl\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = Icon("library", "h-7 w-7").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</span><h3 class=\"text-xl font-semibold mb-2\" style=\"color: var(--text-primary)\">No Libraries Yet</h3><p class=\"mb-4 text-sm\" style=\"color: var(--text-secondary)\">Create your first library to get started</p><button onclick=\"document.getElementById('create-library-modal').classList.remove('hidden')\" class=\"btn btn-primary\">Create Your First Library</button></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<p style=\"color: var(--text-secondary)\" class=\"text-center py-8\">No libraries yet. Create your first library to get started.</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<div class=\"space-y-4\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
 			for _, library := range libraries {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<div class=\"card overflow-hidden\"><div class=\"flex items-center justify-between gap-4 p-5\"><div class=\"flex items-center gap-3 min-w-0 flex-1\"><span class=\"grid place-items-center h-10 w-10 rounded-xl shrink-0\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<div class=\"p-4 border rounded-lg\" style=\"background-color: var(--bg-primary); border-color: var(--border)\"><div class=\"flex justify-between items-start mb-2\"><div><h4 class=\"font-semibold\" style=\"color: var(--text-primary)\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = Icon("library", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
+				var templ_7745c5c3_Var2 string
+				templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(library.Name)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 44, Col: 89}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</span><div class=\"min-w-0\"><h3 class=\"font-semibold truncate\" style=\"color: var(--text-primary)\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var3 string
-				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(library.Name)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 207, Col: 92}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</h3>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</h4>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				if library.Description != "" {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<p class=\"text-sm truncate\" style=\"color: var(--text-secondary)\">")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<p class=\"text-sm\" style=\"color: var(--text-secondary)\">")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
-					var templ_7745c5c3_Var4 string
-					templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(library.Description)
+					var templ_7745c5c3_Var3 string
+					templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(library.Description)
 					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 209, Col: 95}
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 46, Col: 92}
 					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "</p>")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "</p>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</div><span class=\"chip shrink-0\">")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<span class=\"inline-block px-2 py-1 text-xs rounded\" style=\"background-color: var(--accent); color: var(--bg-primary)\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = Icon("tag", "h-3 w-3").Render(ctx, templ_7745c5c3_Buffer)
+				var templ_7745c5c3_Var4 string
+				templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(library.TypeName)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 49, Col: 33}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</span></div><div class=\"flex space-x-2\"><button data-library-id=\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var5 string
-				templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(library.TypeName)
+				templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(library.ID)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 214, Col: 26}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 53, Col: 50}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</span> ")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "\" data-action=\"show-folders\" class=\"text-xs px-2 py-1 rounded\" style=\"background-color: var(--bg-secondary); color: var(--text-primary)\">Folders</button> <button data-library-id=\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				if library.FolderCount > 0 {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "<span class=\"chip shrink-0\">")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					templ_7745c5c3_Err = Icon("folder", "h-3 w-3").Render(ctx, templ_7745c5c3_Buffer)
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					var templ_7745c5c3_Var6 string
-					templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(library.FolderCount)
-					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 219, Col: 30}
-					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, " folders</span>")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
+				var templ_7745c5c3_Var6 string
+				templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(library.ID)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 54, Col: 50}
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "</div><div class=\"flex items-center gap-2 shrink-0\"><button hx-post=\"")
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\" data-action=\"edit\" class=\"text-xs px-2 py-1 rounded\" style=\"background-color: var(--accent); color: var(--bg-primary)\">Edit</button> <button data-library-id=\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var7 string
-				templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.ResolveAttributeValue("/api/libraries/" + library.ID + "/scan")
+				templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(library.ID)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 225, Col: 58}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 55, Col: 50}
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7)
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "\" hx-vals='{\"force\": \"true\"}' hx-target=\"#scan-indicator\" hx-swap=\"innerHTML\" class=\"btn btn-secondary text-xs px-3 py-1.5\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = Icon("refresh", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "Scan</button> <button data-lib-id=\"")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "\" data-action=\"delete\" class=\"text-xs px-2 py-1 rounded text-red-500\">Delete</button></div></div><div id=\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var8 string
-				templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.ResolveAttributeValue(library.ID)
+				templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs("library-folders-" + library.ID)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 235, Col: 32}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 58, Col: 53}
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var8)
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "\" onclick=\"toggleLibraryPanel(this)\" class=\"btn btn-secondary text-xs px-3 py-1.5\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = Icon("chevron-down", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "Manage</button></div></div><div id=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var9 string
-				templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.ResolveAttributeValue("library-panel-" + library.ID)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 244, Col: 44}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var9)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "\"></div></div>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "\" class=\"hidden mt-3 space-y-2\"></div></div>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "</div>")
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</div></div><!-- User Library Visibility Section --><div class=\"card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border)\"><h3 class=\"text-xl font-semibold mb-6\" style=\"color: var(--text-primary)\">Library Visibility</h3><p style=\"color: var(--text-secondary)\" class=\"mb-4\">Control which libraries are visible to users</p><div id=\"visibility-controls\" class=\"space-y-4\"><!-- Visibility controls will be loaded here --></div></div></div><!-- User Visibility Management --><div class=\"mt-8 card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border)\"><h3 class=\"text-xl font-semibold mb-6\" style=\"color: var(--text-primary)\">User Library Access</h3><p style=\"color: var(--text-secondary)\" class=\"mb-4\">Manage individual user access to specific libraries</p><div class=\"mb-4\"><select id=\"user-select\" onchange=\"loadUserVisibility()\" class=\"px-3 py-2 border rounded\" style=\"background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border)\"><option value=\"\">Select a user...</option> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, user := range users {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<option value=\"{ user.ID }\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var9 string
+			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(user.Username)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 81, Col: 53}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, " (")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var10 string
+			templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(user.Email)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 81, Col: 69}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, ")</option>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "<div id=\"scan-indicator\"></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-func LibraryPanel(user User, libraryID string, library LibraryData, folders []FolderData, users []User, visibility []UserVisibilityData, issueCount int) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var10 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var10 == nil {
-			templ_7745c5c3_Var10 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<div class=\"border-t p-5 space-y-6\" style=\"border-color: var(--border);\"><!-- Folders --><div><div class=\"flex items-center gap-2 mb-3\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("folder", "h-4 w-4 shrink-0").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<h4 class=\"text-sm font-semibold uppercase tracking-wide\" style=\"color: var(--text-secondary)\">Folders</h4></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if len(folders) == 0 {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "<p class=\"text-sm mb-3\" style=\"color: var(--text-secondary)\">No folders configured. Add a folder to enable scanning.</p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "<div class=\"space-y-2 mb-3\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			for _, folder := range folders {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "<div class=\"flex items-center justify-between gap-2 p-2 rounded-lg\" style=\"background-color: var(--bg-primary);\"><code class=\"text-xs flex-1 truncate\" style=\"color: var(--text-primary)\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var11 string
-				templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(folder.FolderPath)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 266, Col: 99}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "</code> <button class=\"icon-btn h-7 w-7 shrink-0\" hx-delete=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var12 string
-				templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.ResolveAttributeValue("/admin/library/" + libraryID + "/folders")
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 269, Col: 62}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "\" hx-vals=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var13 string
-				templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.ResolveAttributeValue(`{"folder_path": "` + folder.FolderPath + `"}`)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 270, Col: 64}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var13)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "\" hx-target=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var14 string
-				templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.ResolveAttributeValue("#library-panel-" + libraryID)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 271, Col: 49}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var14)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "\" hx-swap=\"innerHTML\" hx-confirm=\"Remove this folder from the library?\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = Icon("trash", "h-3.5 w-3.5").Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "</button></div>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "</div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "<form class=\"flex gap-2\" hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var15 string
-		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.ResolveAttributeValue("/admin/library/" + libraryID + "/folders")
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 281, Col: 80}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var16 string
-		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.ResolveAttributeValue("#library-panel-" + libraryID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 281, Col: 124}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var16)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, "\" hx-swap=\"innerHTML\"><input type=\"text\" name=\"folder_path\" id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var17 string
-		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.ResolveAttributeValue("folder-input-" + libraryID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 285, Col: 37}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var17)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "\" placeholder=\"/path/to/books\" class=\"input flex-1\" required> <button type=\"button\" data-library-id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var18 string
-		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.ResolveAttributeValue(libraryID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 292, Col: 32}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var18)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "\" data-target-input=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var19 string
-		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.ResolveAttributeValue("folder-input-" + libraryID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 293, Col: 52}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var19)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, "\" onclick=\"openFolderBrowser(this.dataset.targetInput, this.dataset.libraryId)\" class=\"btn btn-secondary text-sm shrink-0\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("folder", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "Browse</button> <button type=\"submit\" class=\"btn btn-primary text-sm shrink-0\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("plus", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "Add</button></form></div><!-- User Visibility -->")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if len(users) > 0 {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "<div><div class=\"flex items-center gap-2 mb-3\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = Icon("users", "h-4 w-4 shrink-0").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "<h4 class=\"text-sm font-semibold uppercase tracking-wide\" style=\"color: var(--text-secondary)\">User Access</h4></div><div class=\"space-y-1\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			for _, u := range users {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, "<label class=\"flex items-center gap-3 cursor-pointer p-2 rounded-lg transition-colors hover:bg-surface-hover\"><input type=\"checkbox\" class=\"w-4 h-4 rounded\" name=\"is_visible\" value=\"true\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				if isUserVisible(u.ID, visibility) {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, " checked")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, " hx-post=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var20 string
-				templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.ResolveAttributeValue("/admin/library/" + libraryID + "/visibility")
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 322, Col: 63}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var20)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 57, "\" hx-vals=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var21 string
-				templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.ResolveAttributeValue(`{"user_id": "` + u.ID + `"}`)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 323, Col: 47}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 58, "\" hx-trigger=\"change\" hx-target=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var22 string
-				templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.ResolveAttributeValue("#library-panel-" + libraryID)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 325, Col: 49}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 59, "\" hx-swap=\"innerHTML\"> <span class=\"text-sm\" style=\"color: var(--text-primary)\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var23 string
-				templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(u.Username)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 328, Col: 76}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 60, "</span> <span class=\"text-xs\" style=\"color: var(--text-secondary)\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var24 string
-				templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(u.Email)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 329, Col: 75}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 61, "</span></label>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 62, "</div></div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 63, "<!-- Processing Issues -->")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if issueCount > 0 {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 64, "<div><a href=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var25 templ.SafeURL
-			templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinURLErrs("/admin/libraries/" + libraryID + "/issues")
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 338, Col: 57}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 65, "\" class=\"flex items-center gap-2 text-sm\" style=\"color: var(--status-warning);\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = Icon("alert", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			if issueCount == 1 {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 66, "<span>1 processing issue</span>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			} else {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 67, "<span>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var26 string
-				templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(issueCount)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 343, Col: 24}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 68, " processing issues</span>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-			templ_7745c5c3_Err = Icon("chevron-right", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 69, "</a></div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 70, "<!-- Actions --><div class=\"flex gap-2 pt-2 border-t\" style=\"border-color: var(--border);\"><button data-edit-id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var27 string
-		templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.ResolveAttributeValue(libraryID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 352, Col: 28}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var27)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 71, "\" data-edit-name=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var28 string
-		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.ResolveAttributeValue(library.Name)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 353, Col: 33}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var28)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 72, "\" data-edit-desc=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var29 string
-		templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.ResolveAttributeValue(library.Description)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 354, Col: 40}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var29)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 73, "\" onclick=\"openEditModal(this.dataset.editId, this.dataset.editName, this.dataset.editDesc)\" class=\"btn btn-secondary text-sm\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("edit", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 74, "Edit Details</button> <button data-delete-id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var30 string
-		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.ResolveAttributeValue(libraryID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 362, Col: 30}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var30)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 75, "\" data-delete-name=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var31 string
-		templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.ResolveAttributeValue(library.Name)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 363, Col: 35}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var31)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 76, "\" onclick=\"openDeleteModal(this.dataset.deleteId, this.dataset.deleteName)\" class=\"btn btn-danger text-sm\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("trash", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 77, "Delete Library</button></div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-func FolderBrowserContent(currentPath string, parentPath string, entries []DirEntry, targetInput string, libraryID string) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var32 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var32 == nil {
-			templ_7745c5c3_Var32 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 78, "<div><div class=\"flex items-center gap-2 mb-3 p-2 rounded-lg\" style=\"background-color: var(--bg-primary);\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("folder", "h-4 w-4 shrink-0").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 79, "<code class=\"text-xs flex-1 truncate\" style=\"color: var(--text-primary)\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var33 string
-		templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(currentPath)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 378, Col: 89}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 80, "</code></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if parentPath != "" {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 81, "<button class=\"w-full flex items-center gap-2 px-3 py-2 rounded-lg text-sm transition-colors hover:bg-surface-hover\" style=\"color: var(--text-secondary);\" hx-get=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var34 string
-			templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.ResolveAttributeValue("/admin/library/browse?path=" + parentPath + "&target_input=" + targetInput + "&library_id=" + libraryID)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 384, Col: 117}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var34)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 82, "\" hx-target=\"#folder-browser-content\" hx-swap=\"innerHTML\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = Icon("arrow-left", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 83, "<span>..</span></button>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 84, "<div class=\"space-y-1 max-h-64 overflow-y-auto\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		for _, entry := range entries {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 85, "<button class=\"w-full flex items-center gap-2 px-3 py-2 rounded-lg text-sm transition-colors hover:bg-surface-hover\" style=\"color: var(--text-primary);\" hx-get=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var35 string
-			templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.ResolveAttributeValue("/admin/library/browse?path=" + entry.Path + "&target_input=" + targetInput + "&library_id=" + libraryID)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 397, Col: 118}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var35)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 86, "\" hx-target=\"#folder-browser-content\" hx-swap=\"innerHTML\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = Icon("folder", "h-4 w-4 shrink-0").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 87, "<span class=\"truncate\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var36 string
-			templ_7745c5c3_Var36, templ_7745c5c3_Err = templ.JoinStringErrs(entry.Name)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 402, Col: 40}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var36))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 88, "</span></button>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 89, "</div><div class=\"mt-4 flex justify-end\"><button type=\"button\" data-target-input=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var37 string
-		templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.ResolveAttributeValue(targetInput)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 409, Col: 35}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var37)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 90, "\" data-current-path=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var38 string
-		templ_7745c5c3_Var38, templ_7745c5c3_Err = templ.ResolveAttributeValue(currentPath)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_library.templ`, Line: 410, Col: 35}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var38)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 91, "\" onclick=\"document.getElementById(this.dataset.targetInput).value = this.dataset.currentPath; document.getElementById('folder-browser-modal').classList.add('hidden')\" class=\"btn btn-primary text-sm\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("check", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 92, "Select This Folder</button></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</select></div><div id=\"user-libraries\" class=\"space-y-3\"><!-- User library checkboxes will be loaded here --></div></div></div></main></div><!-- Create Library Modal --><div id=\"create-library-modal\" class=\"hidden fixed inset-0 z-50 flex items-center justify-center\" style=\"background-color: rgba(0, 0, 0, 0.7);\"><div class=\"card rounded-lg p-6 w-full max-w-md mx-4\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><div class=\"flex justify-between items-center mb-6\"><h2 class=\"text-xl font-bold\" style=\"color: var(--text-primary)\">Create Library</h2><button type=\"button\" data-action=\"hide-create-modal\" class=\"p-2 hover:opacity-80 rounded\" style=\"color: var(--text-primary)\">✕</button></div><form id=\"create-library-form\"><input type=\"hidden\" id=\"library-id\" name=\"id\"><div class=\"mb-4\"><label class=\"block text-sm font-medium mb-2\" style=\"color: var(--text-primary)\">Library Name</label> <input type=\"text\" name=\"name\" placeholder=\"My Ebook Library\" class=\"w-full px-3 py-2 border rounded-lg\" style=\"background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border)\" required></div><div class=\"mb-4\"><label class=\"block text-sm font-medium mb-2\" style=\"color: var(--text-primary)\">Description</label> <textarea name=\"description\" placeholder=\"Optional description\" rows=\"3\" class=\"w-full px-3 py-2 border rounded-lg\" style=\"background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border)\"></textarea></div><div class=\"mb-4\"><label class=\"block text-sm font-medium mb-2\" style=\"color: var(--text-primary)\">Library Type</label> <select name=\"type\" class=\"w-full px-3 py-2 border rounded-lg\" style=\"background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border)\" required><option value=\"ebooks\">📚 Ebooks</option> <option value=\"comics\">📖 Comics</option> <option value=\"manga\">🗾 Manga</option></select></div><div class=\"flex justify-end space-x-3\"><button type=\"button\" data-action=\"hide-create-modal\" class=\"btn-secondary px-4 py-2 rounded-lg\">Cancel</button> <button type=\"submit\" class=\"btn-primary px-4 py-2 rounded-lg\">Create</button></div></form></div></div><!-- Folder Browser Modal --><div id=\"folder-browser-modal\" class=\"hidden fixed inset-0 z-50 flex items-center justify-center\" style=\"background-color: rgba(0, 0, 0, 0.7);\"><div class=\"card rounded-lg p-6 w-full max-w-md mx-4\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><div class=\"flex justify-between items-center mb-4\"><h2 class=\"text-xl font-bold\" style=\"color: var(--text-primary)\">Browse Folders</h2><button type=\"button\" data-action=\"browse-cancel\" class=\"p-2 hover:opacity-80 rounded\" style=\"color: var(--text-primary)\">✕</button></div><div id=\"folder-browser-content\"><!-- Directory listings will be rendered here --></div></div></div><!-- Delete Library Confirmation Modal --><div id=\"delete-library-modal\" class=\"hidden fixed inset-0 z-50 flex items-center justify-center\" style=\"background-color: rgba(0, 0, 0, 0.7);\"><div class=\"card rounded-lg p-6 w-full max-w-md mx-4\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><div class=\"flex justify-between items-center mb-4\"><h2 class=\"text-xl font-bold\" style=\"color: var(--text-primary)\">Delete Library</h2><button type=\"button\" data-action=\"hide-delete-modal\" class=\"p-2 hover:opacity-80 rounded\" style=\"color: var(--text-primary)\">✕</button></div><div id=\"delete-modal-content\" class=\"mb-6\" style=\"color: var(--text-primary)\"><!-- Dynamic content will be injected here --></div><div class=\"flex justify-end space-x-3\"><button type=\"button\" data-action=\"hide-delete-modal\" class=\"btn-secondary px-4 py-2 rounded-lg\">Cancel</button> <button type=\"button\" data-action=\"confirm-delete\" class=\"btn-primary px-4 py-2 rounded-lg bg-red-500 hover:bg-red-600\">Delete</button></div></div></div><script src=\"/static/htmx.min.js\"></script></body></html>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

templates/admin_processing_issues.templ

@@ -1,3 +1,4 @@
+
 package templates
 
 templ AdminProcessingIssues(user User, libraryID string, issues []ProcessingIssueData, stats IssueStats) {
@@ -7,107 +8,87 @@ templ AdminProcessingIssues(user User, libraryID string, issues []ProcessingIssu
 			<meta charset="UTF-8"/>
 			<title>Processing Issues - Bookhoard</title>
 			<link href="/static/style.css" rel="stylesheet"/>
-			<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
 		</head>
-	<body class="theme-{ user.Theme }">
-		@Header(user, "/admin/library")
-		<main class="p-8">
-			<div class="mx-auto max-w-4xl">
+		<body x-data="processingIssues" x-init="initializeProcessingIssues('{ libraryID }')" class="theme-{ user.Theme }">
+			@Header(user, "/admin/libraries/"+libraryID)
+			<main class="flex-1 p-8">
 				<div class="mb-8">
-					<div>
-						<div class="flex items-center gap-3 mb-1">
-							<span class="grid place-items-center h-10 w-10 rounded-xl" style="background-color: var(--accent-muted); color: var(--accent);">
-								@Icon("alert", "h-5 w-5")
-							</span>
-							<h1 class="text-2xl font-bold tracking-tight" style="color: var(--text-primary)">Processing Issues</h1>
+					<div class="flex items-center justify-between mb-4">
+						<div>
+							<h1 class="text-3xl font-bold mb-2">Processing Issues</h1>
+							<p class="text-gray-600">Items that couldn't be processed in this library</p>
 						</div>
-						<p class="text-sm" style="color: var(--text-secondary)">Items that couldn't be processed in this library</p>
+						<a href="/admin/libraries/{ libraryID }" class="btn-secondary px-4 py-2 rounded-lg">
+							← Back to Library
+						</a>
 					</div>
 				</div>
-					if stats.ErrorCount > 0 || stats.WarningCount > 0 || stats.InfoCount > 0 {
-						<!-- Stats Cards -->
-						<div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-8">
-							if stats.ErrorCount > 0 {
-								<div class="stat-card" style="border-left: 4px solid var(--status-danger);">
-									<div class="flex items-center gap-2 mb-2" style="color: var(--status-danger);">
-										@Icon("x-circle", "h-5 w-5")
-										<h3 class="text-sm font-semibold uppercase tracking-wide">Errors</h3>
-									</div>
-									<p class="text-3xl font-bold" style="color: var(--text-primary)">{ stats.ErrorCount }</p>
-								</div>
-							}
-							if stats.WarningCount > 0 {
-								<div class="stat-card" style="border-left: 4px solid var(--status-warning);">
-									<div class="flex items-center gap-2 mb-2" style="color: var(--status-warning);">
-										@Icon("alert", "h-5 w-5")
-										<h3 class="text-sm font-semibold uppercase tracking-wide">Warnings</h3>
-									</div>
-									<p class="text-3xl font-bold" style="color: var(--text-primary)">{ stats.WarningCount }</p>
-								</div>
-							}
-							if stats.InfoCount > 0 {
-								<div class="stat-card" style="border-left: 4px solid var(--status-info);">
-									<div class="flex items-center gap-2 mb-2" style="color: var(--status-info);">
-										@Icon("info", "h-5 w-5")
-										<h3 class="text-sm font-semibold uppercase tracking-wide">Info</h3>
-									</div>
-									<p class="text-3xl font-bold" style="color: var(--text-primary)">{ stats.InfoCount }</p>
-								</div>
-							}
-						</div>
-					}
-					if len(issues) == 0 {
-						<div class="card p-8 text-center">
-							<span class="grid place-items-center h-12 w-12 mx-auto mb-3 rounded-2xl" style="background-color: var(--accent-muted); color: var(--accent);">
-								@Icon("check-circle", "h-6 w-6")
-							</span>
-							<p class="text-sm" style="color: var(--text-secondary)">No processing issues found for this library.</p>
-						</div>
-					} else {
-						<!-- Issues List -->
-						<div class="space-y-4">
-							for _, issue := range issues {
-								<div class="card p-6" id={ "issue-" + issue.ID }>
-									<div class="flex justify-between items-start gap-4 mb-4">
-										<div class="flex-1 min-w-0">
-											<h4 class="text-lg font-semibold mb-2" style="color: var(--text-primary)">{ issue.Title }</h4>
-											<p class="mb-3 text-sm" style="color: var(--text-secondary)">{ issue.IssueDescription }</p>
-											<div class="text-sm space-y-1" style="color: var(--text-secondary)">
-												<p><span class="font-medium uppercase tracking-wide text-xs" style="color: var(--text-secondary)">Type:</span> { issue.IssueType }</p>
-												<p><span class="font-medium uppercase tracking-wide text-xs" style="color: var(--text-secondary)">Format:</span> { issue.FormatGroup }</p>
-												<p><span class="font-medium uppercase tracking-wide text-xs" style="color: var(--text-secondary)">File:</span> { issue.FilePath }</p>
-												<p><span class="font-medium uppercase tracking-wide text-xs" style="color: var(--text-secondary)">Library:</span> { issue.LibraryTypeName }</p>
-											</div>
-										</div>
-										<div class="ml-2 shrink-0">
-											if issue.Severity == "error" {
-												<span class="badge status-failed">{ issue.Severity }</span>
-											} else if issue.Severity == "warning" {
-												<span class="badge status-pending">{ issue.Severity }</span>
-											} else {
-												<span class="badge status-processing">{ issue.Severity }</span>
-											}
+				if stats.ErrorCount > 0 || stats.WarningCount > 0 || stats.InfoCount > 0 {
+					<!-- Stats Cards -->
+					<div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-8">
+						if stats.ErrorCount > 0 {
+							<div class="card p-6 rounded-lg border-l-4 border-red-500">
+								<h3 class="text-lg font-semibold text-red-600 mb-2">Errors</h3>
+								<p class="text-3xl font-bold">{ stats.ErrorCount }</p>
+							</div>
+						}
+						if stats.WarningCount > 0 {
+							<div class="card p-6 rounded-lg border-l-4 border-yellow-500">
+								<h3 class="text-lg font-semibold text-yellow-600 mb-2">Warnings</h3>
+								<p class="text-3xl font-bold">{ stats.WarningCount }</p>
+							</div>
+						}
+						if stats.InfoCount > 0 {
+							<div class="card p-6 rounded-lg border-l-4 border-blue-500">
+								<h3 class="text-lg font-semibold text-blue-600 mb-2">Info</h3>
+								<p class="text-3xl font-bold">{ stats.InfoCount }</p>
+							</div>
+						}
+					</div>
+				}
+				if len(issues) == 0 {
+					<div class="card p-8 rounded-lg text-center">
+						<p class="text-gray-600">No processing issues found for this library.</p>
+					</div>
+				} else {
+					<!-- Issues List -->
+					<div class="space-y-4">
+						for _, issue := range issues {
+							<div class="card p-6 rounded-lg">
+								<div class="flex justify-between items-start mb-4">
+									<div class="flex-1">
+										<h4 class="text-lg font-semibold mb-2">{ issue.Title }</h4>
+										<p class="text-gray-700 mb-3">{ issue.IssueDescription }</p>
+										<div class="text-sm text-gray-500 space-y-1">
+											<p><strong>Type:</strong> { issue.IssueType }</p>
+											<p><strong>Format:</strong> { issue.FormatGroup }</p>
+											<p><strong>File:</strong> { issue.FilePath }</p>
+											<p><strong>Library:</strong> { issue.LibraryTypeName }</p>
 										</div>
 									</div>
+									<div class="ml-4">
+										<span
+											class="inline-block px-3 py-1 text-sm rounded-full font-medium"
+											style="background-color: var(--accent); color: white;"
+										>
+											{ issue.Severity }
+										</span>
+									</div>
+								</div>
 								<div class="flex gap-3 mt-4">
 									if issue.Severity == "warning" || issue.Severity == "info" {
 										<button
-											hx-post={ "/api/libraries/" + libraryID + "/issues/" + issue.ID + "/" + issue.MediaItemID + "/resolve" }
-											hx-target={ "#issue-" + issue.ID }
-											hx-swap="outerHTML"
-											hx-confirm="Dismiss this issue?"
-											class="btn btn-secondary text-sm"
+											@click="dismissIssue('{ issue.ID }', '{ issue.MediaItemID }')"
+											class="btn-secondary px-4 py-2 rounded text-sm"
 										>
-											@Icon("close", "h-4 w-4")
 											Dismiss
 										</button>
 									}
 								</div>
-								</div>
-							}
-						</div>
-					}
-				</div>
+							</div>
+						}
+					</div>
+				}
 			</main>
 		</body>
 	</html>

templates/admin_processing_issues_templ.go

@@ -1,6 +1,7 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.1020
+// templ: version: v0.3.1001
+
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -29,341 +30,208 @@ func AdminProcessingIssues(user User, libraryID string, issues []ProcessingIssue
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><title>Processing Issues - Bookhoard</title><link href=\"/static/style.css\" rel=\"stylesheet\"><link rel=\"icon\" type=\"image/svg+xml\" href=\"/static/favicon.svg\"></head><body class=\"theme-{ user.Theme }\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><title>Processing Issues - Bookhoard</title><link href=\"/static/style.css\" rel=\"stylesheet\"></head><body x-data=\"processingIssues\" x-init=\"initializeProcessingIssues('{ libraryID }')\" class=\"theme-{ user.Theme }\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = Header(user, "/admin/library").Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = Header(user, "/admin/libraries/"+libraryID).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<main class=\"p-8\"><div class=\"mx-auto max-w-4xl\"><div class=\"mb-8\"><div><div class=\"flex items-center gap-3 mb-1\"><span class=\"grid place-items-center h-10 w-10 rounded-xl\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("alert", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</span><h1 class=\"text-2xl font-bold tracking-tight\" style=\"color: var(--text-primary)\">Processing Issues</h1></div><p class=\"text-sm\" style=\"color: var(--text-secondary)\">Items that couldn't be processed in this library</p></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<main class=\"flex-1 p-8\"><div class=\"mb-8\"><div class=\"flex items-center justify-between mb-4\"><div><h1 class=\"text-3xl font-bold mb-2\">Processing Issues</h1><p class=\"text-gray-600\">Items that couldn't be processed in this library</p></div><a href=\"/admin/libraries/{ libraryID }\" class=\"btn-secondary px-4 py-2 rounded-lg\">← Back to Library</a></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		if stats.ErrorCount > 0 || stats.WarningCount > 0 || stats.InfoCount > 0 {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<!-- Stats Cards --> <div class=\"grid grid-cols-1 md:grid-cols-3 gap-6 mb-8\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<!-- Stats Cards --> <div class=\"grid grid-cols-1 md:grid-cols-3 gap-6 mb-8\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			if stats.ErrorCount > 0 {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<div class=\"stat-card\" style=\"border-left: 4px solid var(--status-danger);\"><div class=\"flex items-center gap-2 mb-2\" style=\"color: var(--status-danger);\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = Icon("x-circle", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<h3 class=\"text-sm font-semibold uppercase tracking-wide\">Errors</h3></div><p class=\"text-3xl font-bold\" style=\"color: var(--text-primary)\">")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<div class=\"card p-6 rounded-lg border-l-4 border-red-500\"><h3 class=\"text-lg font-semibold text-red-600 mb-2\">Errors</h3><p class=\"text-3xl font-bold\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var2 string
 				templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(stats.ErrorCount)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 36, Col: 92}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 32, Col: 56}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</p></div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			if stats.WarningCount > 0 {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<div class=\"card p-6 rounded-lg border-l-4 border-yellow-500\"><h3 class=\"text-lg font-semibold text-yellow-600 mb-2\">Warnings</h3><p class=\"text-3xl font-bold\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var3 string
+				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(stats.WarningCount)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 38, Col: 58}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
 				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "</p></div>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-			if stats.WarningCount > 0 {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<div class=\"stat-card\" style=\"border-left: 4px solid var(--status-warning);\"><div class=\"flex items-center gap-2 mb-2\" style=\"color: var(--status-warning);\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = Icon("alert", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<h3 class=\"text-sm font-semibold uppercase tracking-wide\">Warnings</h3></div><p class=\"text-3xl font-bold\" style=\"color: var(--text-primary)\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var3 string
-				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(stats.WarningCount)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 45, Col: 94}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</p></div>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
 			if stats.InfoCount > 0 {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<div class=\"stat-card\" style=\"border-left: 4px solid var(--status-info);\"><div class=\"flex items-center gap-2 mb-2\" style=\"color: var(--status-info);\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = Icon("info", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<h3 class=\"text-sm font-semibold uppercase tracking-wide\">Info</h3></div><p class=\"text-3xl font-bold\" style=\"color: var(--text-primary)\">")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<div class=\"card p-6 rounded-lg border-l-4 border-blue-500\"><h3 class=\"text-lg font-semibold text-blue-600 mb-2\">Info</h3><p class=\"text-3xl font-bold\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var4 string
 				templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(stats.InfoCount)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 54, Col: 91}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 44, Col: 55}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</p></div>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</p></div>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
 		if len(issues) == 0 {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<div class=\"card p-8 text-center\"><span class=\"grid place-items-center h-12 w-12 mx-auto mb-3 rounded-2xl\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = Icon("check-circle", "h-6 w-6").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</span><p class=\"text-sm\" style=\"color: var(--text-secondary)\">No processing issues found for this library.</p></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<div class=\"card p-8 rounded-lg text-center\"><p class=\"text-gray-600\">No processing issues found for this library.</p></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<!-- Issues List --> <div class=\"space-y-4\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<!-- Issues List --> <div class=\"space-y-4\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			for _, issue := range issues {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "<div class=\"card p-6\" id=\"")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<div class=\"card p-6 rounded-lg\"><div class=\"flex justify-between items-start mb-4\"><div class=\"flex-1\"><h4 class=\"text-lg font-semibold mb-2\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var5 string
-				templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.ResolveAttributeValue("issue-" + issue.ID)
+				templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(issue.Title)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 70, Col: 54}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 60, Col: 62}
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5)
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\"><div class=\"flex justify-between items-start gap-4 mb-4\"><div class=\"flex-1 min-w-0\"><h4 class=\"text-lg font-semibold mb-2\" style=\"color: var(--text-primary)\">")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</h4><p class=\"text-gray-700 mb-3\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var6 string
-				templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(issue.Title)
+				templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(issue.IssueDescription)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 73, Col: 98}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 61, Col: 64}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "</h4><p class=\"mb-3 text-sm\" style=\"color: var(--text-secondary)\">")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</p><div class=\"text-sm text-gray-500 space-y-1\"><p><strong>Type:</strong> ")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var7 string
-				templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(issue.IssueDescription)
+				templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(issue.IssueType)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 74, Col: 96}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 63, Col: 54}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</p><div class=\"text-sm space-y-1\" style=\"color: var(--text-secondary)\"><p><span class=\"font-medium uppercase tracking-wide text-xs\" style=\"color: var(--text-secondary)\">Type:</span> ")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</p><p><strong>Format:</strong> ")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var8 string
-				templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(issue.IssueType)
+				templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(issue.FormatGroup)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 76, Col: 140}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 64, Col: 58}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</p><p><span class=\"font-medium uppercase tracking-wide text-xs\" style=\"color: var(--text-secondary)\">Format:</span> ")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</p><p><strong>File:</strong> ")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var9 string
-				templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(issue.FormatGroup)
+				templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(issue.FilePath)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 77, Col: 144}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 65, Col: 53}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "</p><p><span class=\"font-medium uppercase tracking-wide text-xs\" style=\"color: var(--text-secondary)\">File:</span> ")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</p><p><strong>Library:</strong> ")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var10 string
-				templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(issue.FilePath)
+				templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(issue.LibraryTypeName)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 78, Col: 139}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 66, Col: 63}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</p><p><span class=\"font-medium uppercase tracking-wide text-xs\" style=\"color: var(--text-secondary)\">Library:</span> ")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</p></div></div><div class=\"ml-4\"><span class=\"inline-block px-3 py-1 text-sm rounded-full font-medium\" style=\"background-color: var(--accent); color: white;\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var11 string
-				templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(issue.LibraryTypeName)
+				templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(issue.Severity)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 79, Col: 149}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 74, Col: 27}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "</p></div></div><div class=\"ml-2 shrink-0\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				if issue.Severity == "error" {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "<span class=\"badge status-failed\">")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					var templ_7745c5c3_Var12 string
-					templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(issue.Severity)
-					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 84, Col: 62}
-					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "</span>")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-				} else if issue.Severity == "warning" {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<span class=\"badge status-pending\">")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					var templ_7745c5c3_Var13 string
-					templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(issue.Severity)
-					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 86, Col: 63}
-					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "</span>")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-				} else {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<span class=\"badge status-processing\">")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					var templ_7745c5c3_Var14 string
-					templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(issue.Severity)
-					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 88, Col: 66}
-					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "</span>")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "</div></div><div class=\"flex gap-3 mt-4\">")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "</span></div></div><div class=\"flex gap-3 mt-4\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				if issue.Severity == "warning" || issue.Severity == "info" {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<button hx-post=\"")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					var templ_7745c5c3_Var15 string
-					templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.ResolveAttributeValue("/api/libraries/" + libraryID + "/issues/" + issue.ID + "/" + issue.MediaItemID + "/resolve")
-					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 95, Col: 113}
-					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15)
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "\" hx-target=\"")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					var templ_7745c5c3_Var16 string
-					templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.ResolveAttributeValue("#issue-" + issue.ID)
-					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_processing_issues.templ`, Line: 96, Col: 43}
-					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var16)
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "\" hx-swap=\"outerHTML\" hx-confirm=\"Dismiss this issue?\" class=\"btn btn-secondary text-sm\">")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					templ_7745c5c3_Err = Icon("close", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "Dismiss</button>")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<button @click=\"dismissIssue('{ issue.ID }', '{ issue.MediaItemID }')\" class=\"btn-secondary px-4 py-2 rounded text-sm\">Dismiss</button>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "</div></div>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</div></div>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "</div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "</div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "</div></main></body></html>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</main></body></html>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

templates/admin_settings.templ

@@ -1,8 +1,6 @@
 package templates
 
-import "fmt"
-
-templ AdminSettings(user User, systemConfig map[string]string, scanSettings ScanSettingsData, liveGroups []SettingGroup, restartGroups []SettingGroup, errorMessage string) {
+templ AdminSettings(user User, systemConfig map[string]string, errorMessage string) {
 	<!DOCTYPE html>
 	<html lang="en">
 		<head>
@@ -10,63 +8,58 @@ templ AdminSettings(user User, systemConfig map[string]string, scanSettings Scan
 			<title>System Settings - Bookhoard</title>
 			<script src="/static/htmx.min.js"></script>
 			<link href="/static/style.css" rel="stylesheet"/>
-			<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
 		</head>
-	<body class="theme-{ user.Theme }">
-		@Header(user, "/admin/settings")
-		<main class="p-8">
-			<div class="max-w-4xl">
-				<div class="mb-8">
-					<div class="flex items-center gap-3 mb-1">
-						<span class="grid place-items-center h-10 w-10 rounded-xl" style="background-color: var(--accent-muted); color: var(--accent);">
-							@Icon("gear", "h-5 w-5")
-						</span>
-						<h1 class="text-2xl font-bold tracking-tight" style="color: var(--text-primary)">System Settings</h1>
-					</div>
-					<p class="text-sm" style="color: var(--text-secondary)">Configure your Bookhoard instance</p>
-				</div>
+		<body class="theme-{ user.Theme }" x-data="adminSettings">
+			@Header(user, "/admin/settings")
+			<div class="flex min-h-screen" style="background-color: var(--bg-primary)">
+				@AdminSidebar(user, "/admin/settings")
+				<main class="flex-1 p-8">
+					<div class="max-w-4xl">
+						<div class="mb-8">
+							<div class="flex items-center justify-between mb-4">
+								<a href="/admin" class="btn-secondary px-4 py-2 rounded-lg font-medium">
+									← Back to Dashboard
+								</a>
+							</div>
+							<h1 class="text-3xl font-bold mb-2" style="color: var(--text-primary)">System Settings</h1>
+							<p style="color: var(--text-secondary)">Configure your Bookhoard instance</p>
+						</div>
 						if errorMessage != "" {
-							<div class="mb-6 p-4 rounded-xl border flex items-start gap-3" style="background-color: color-mix(in srgb, var(--status-danger) 12%, var(--bg-secondary)); border-color: var(--status-danger); color: var(--status-danger);">
-								@Icon("alert", "h-5 w-5 shrink-0 mt-0.5")
-								<span>{ errorMessage }</span>
+							<div class="mb-6 p-4 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--error); color: var(--error);">
+								{ errorMessage }
 							</div>
 						}
 						<form id="settings-form" hx-put="/api/system/config" hx-target="#settings-form" hx-swap="outerHTML">
-							<div class="card p-6">
-								<div class="flex items-center gap-2 mb-6">
-									@Icon("globe", "h-5 w-5 shrink-0")
-									<h3 class="text-lg font-semibold" style="color: var(--text-primary)">Base URL</h3>
-								</div>
+							<div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border);">
+								<h3 class="text-xl font-semibold mb-6" style="color: var(--text-primary)">Base URL</h3>
 								<div>
-									<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Base URL</label>
+									<label class="block text-sm font-medium mb-2" style="color: var(--text-primary)">Base URL</label>
 									<input
 										type="url"
 										name="base_url"
 										value={ systemConfig["base_url"] }
 										placeholder="https://books.example.com"
-										class="input"
+										class="w-full px-4 py-2 rounded-lg border"
+										style="background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border);"
 										required
 									/>
-									<p class="text-sm mt-2" style="color: var(--text-secondary)">The public URL of your Bookhoard instance (e.g., https://books.example.com). Used for device sync, OPDS, and API endpoints.</p>
+									<p class="text-sm mt-1" style="color: var(--text-secondary)">The public URL of your Bookhoard instance (e.g., https://books.example.com). Used for device sync, OPDS, and API endpoints.</p>
 								</div>
 								<div class="mt-6 flex justify-end">
-									<button type="submit" class="btn btn-primary">
-										@Icon("save", "h-4 w-4")
+									<button type="submit" class="btn-primary px-6 py-2 rounded-lg font-medium">
 										Save Settings
 									</button>
 								</div>
 							</div>
-							<div class="mt-6 card p-6">
-								<div class="flex items-center gap-2 mb-6">
-									@Icon("clock", "h-5 w-5 shrink-0")
-									<h3 class="text-lg font-semibold" style="color: var(--text-primary)">System Defaults</h3>
-								</div>
+							<div class="mt-8 card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border);">
+								<h3 class="text-xl font-semibold mb-6" style="color: var(--text-primary)">System Defaults</h3>
 								<div>
-									<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Default Timezone</label>
+									<label class="block text-sm font-medium mb-2" style="color: var(--text-primary)">Default Timezone</label>
 									<select
 										name="default_timezone"
 										id="default_timezone"
-										class="input"
+										class="w-full px-4 py-2 rounded-lg border"
+										style="background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border);"
 									>
 										<option value="UTC" selected?={ systemConfig["default_timezone"] == "UTC" }>UTC (UTC+0)</option>
 										<option value="Pacific/Honolulu" selected?={ systemConfig["default_timezone"] == "Pacific/Honolulu" }>Hawaii (UTC-10)</option>
@@ -93,165 +86,21 @@ templ AdminSettings(user User, systemConfig map[string]string, scanSettings Scan
 										<option value="Australia/Sydney" selected?={ systemConfig["default_timezone"] == "Australia/Sydney" }>Australian Eastern (UTC+10/+11)</option>
 										<option value="Pacific/Auckland" selected?={ systemConfig["default_timezone"] == "Pacific/Auckland" }>New Zealand (UTC+12/+13)</option>
 									</select>
-									<p class="text-sm mt-2" style="color: var(--text-secondary)">Default timezone for users who haven't set their own.</p>
+									<p class="text-sm mt-1" style="color: var(--text-secondary)">Default timezone for users who haven't set their own.</p>
 								</div>
 							</div>
 						</form>
-						<div class="mt-6 card p-6">
-							<div class="flex items-center gap-2 mb-4">
-								@Icon("external", "h-5 w-5 shrink-0")
-								<h3 class="text-lg font-semibold" style="color: var(--text-primary)">URL Paths</h3>
-							</div>
+						<div class="mt-8 card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border);">
+							<h3 class="text-xl font-semibold mb-4" style="color: var(--text-primary)">URL Paths</h3>
 							<div class="space-y-2 text-sm" style="color: var(--text-secondary);">
-								<p><span class="font-medium uppercase tracking-wide text-xs" style="color: var(--text-secondary)">OPDS:</span> { systemConfig["base_url"] }/opds</p>
-								<p><span class="font-medium uppercase tracking-wide text-xs" style="color: var(--text-secondary)">API:</span> { systemConfig["base_url"] }/api</p>
-								<p><span class="font-medium uppercase tracking-wide text-xs" style="color: var(--text-secondary)">Device Sync:</span> { systemConfig["base_url"] }/api/sync</p>
+								<p><strong>OPDS:</strong> { systemConfig["base_url"] }/opds</p>
+								<p><strong>API:</strong> { systemConfig["base_url"] }/api</p>
+								<p><strong>Device Sync:</strong> { systemConfig["base_url"] }/api/sync</p>
 							</div>
 						</div>
-				@ScanSettingsSection(scanSettings)
-				@TunableSettingsSection(liveGroups, false)
-				@TunableSettingsSection(restartGroups, true)
+					</div>
+				</main>
 			</div>
-		</main>
-	</body>
+		</body>
 	</html>
 }
-
-templ ScanSettingsSection(scanSettings ScanSettingsData) {
-	<div id="scan-settings-section" class="mt-6 card p-6">
-		<div class="flex items-center gap-2 mb-6">
-			@Icon("refresh", "h-5 w-5 shrink-0")
-			<h3 class="text-lg font-semibold" style="color: var(--text-primary)">Scanning</h3>
-		</div>
-		<form
-			hx-put="/admin/settings/scan"
-			hx-target="#scan-settings-section"
-			hx-swap="outerHTML"
-		>
-			<div class="space-y-4">
-				<div class="flex items-center justify-between gap-4">
-					<div>
-						<label class="block text-xs font-semibold uppercase tracking-wide mb-1" style="color: var(--text-secondary)">Auto-Scan</label>
-						<p class="text-sm" style="color: var(--text-secondary)">Watch libraries for file changes on startup</p>
-					</div>
-					<label class="relative inline-flex items-center cursor-pointer shrink-0">
-						<input
-							type="checkbox"
-							name="auto_scan_enabled"
-							value="true"
-							checked?={ scanSettings.AutoScanEnabled }
-							class="sr-only peer"
-						/>
-						<div class="w-11 h-6 rounded-full peer peer-checked:bg-brand transition-colors" style="background-color: color-mix(in srgb, var(--text-primary) 15%, transparent);"></div>
-						<div class="absolute left-0.5 top-0.5 bg-white rounded-full w-5 h-5 transition-transform peer-checked:translate-x-5"></div>
-					</label>
-				</div>
-				<div>
-					<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Scan Interval (seconds)</label>
-					<input
-						type="number"
-						name="scan_poll_interval_seconds"
-						value={ fmt.Sprintf("%d", scanSettings.ScanPollIntervalSeconds) }
-						min="1"
-						max="3600"
-						class="input"
-						required
-					/>
-					<p class="text-sm mt-2" style="color: var(--text-secondary)">How often to poll libraries for changes (1–3600 seconds). Default: 60.</p>
-				</div>
-				<div class="flex justify-end">
-					<button type="submit" class="btn btn-primary">
-						@Icon("save", "h-4 w-4")
-						Save Scan Settings
-					</button>
-				</div>
-			</div>
-		</form>
-	</div>
-}
-
-// TunableSettingsSection renders the editable tunables for a given bucket
-// (live vs restart-required). Within the card, settings are clustered into
-// labeled sub-sections by Group (e.g. "Password Quality", "Device Rate Limits").
-templ TunableSettingsSection(groups []SettingGroup, restartRequired bool) {
-	<div class="mt-6 card p-6">
-		<div class="flex items-center gap-2 mb-2">
-			if restartRequired {
-				@Icon("alert", "h-5 w-5 shrink-0")
-				<h3 class="text-lg font-semibold" style="color: var(--text-primary)">Tunable Settings — Restart Required</h3>
-			} else {
-				@Icon("settings", "h-5 w-5 shrink-0")
-				<h3 class="text-lg font-semibold" style="color: var(--text-primary)">Tunable Settings — Live</h3>
-			}
-		</div>
-		if restartRequired {
-			<p class="text-sm mb-4" style="color: var(--status-warning)">Changes are saved immediately but only take effect after the server restarts.</p>
-		} else {
-			<p class="text-sm mb-4" style="color: var(--text-secondary)">Changes apply immediately — no restart needed.</p>
-		}
-		for _, g := range groups {
-			<div class="mt-5 first:mt-0">
-				<h4 class="text-xs font-semibold uppercase tracking-wide mb-1" style="color: var(--text-secondary)">{ g.Name }</h4>
-				<div>
-					for _, e := range g.Entries {
-						@TunableSettingRow(e)
-					}
-				</div>
-			</div>
-		}
-	</div>
-}
-
-// TunableSettingRow renders a single editable setting as an inline HTMX form.
-templ TunableSettingRow(e SettingEntry) {
-	<div class="flex flex-col sm:flex-row sm:items-center gap-3 py-3" style="border-top: 1px solid color-mix(in srgb, var(--text-primary) 7%, transparent);">
-		<div class="flex-1 min-w-0">
-			<label class="block text-sm font-medium" style="color: var(--text-primary)">{ e.Description }</label>
-			if !e.IsDefault {
-				<p class="text-xs mt-0.5" style="color: var(--text-secondary)">{ e.Key } — modified from default</p>
-			} else {
-				<p class="text-xs mt-0.5" style="color: var(--text-secondary)">{ e.Key }</p>
-			}
-		</div>
-		<form
-			class="flex items-center gap-2 shrink-0"
-			hx-put="/admin/settings/tunable"
-			hx-target={ "#status-" + e.Key }
-			hx-swap="innerHTML"
-			hx-disinherit="*"
-		>
-			<input type="hidden" name="key" value={ e.Key }/>
-			if e.Type == "bool" {
-				<select name="value" class="input py-1.5 text-sm w-28">
-					<option value="true" selected?={ e.Value == "true" }>Yes</option>
-					<option value="false" selected?={ e.Value != "true" }>No</option>
-				</select>
-			} else if e.Type == "int" {
-				<input
-					type="number"
-					name="value"
-					value={ e.Value }
-					if e.Min != "" {
-						min={ e.Min }
-					}
-					if e.Max != "" {
-						max={ e.Max }
-					}
-					class="input py-1.5 text-sm w-32"
-				/>
-			} else {
-				<input
-					type="text"
-					name="value"
-					value={ e.Value }
-					class="input py-1.5 text-sm w-40"
-				/>
-			}
-			<button type="submit" class="btn btn-secondary px-3 py-1.5 text-sm">
-				@Icon("save", "h-3.5 w-3.5")
-				Save
-			</button>
-		</form>
-		<span id={ "status-" + e.Key } class="text-xs w-24 text-right" style="color: var(--text-secondary)"></span>
-	</div>
-}

templates/admin_settings_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.1020
+// templ: version: v0.3.1001
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -8,9 +8,7 @@ package templates
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import "fmt"
-
-func AdminSettings(user User, systemConfig map[string]string, scanSettings ScanSettingsData, liveGroups []SettingGroup, restartGroups []SettingGroup, errorMessage string) templ.Component {
+func AdminSettings(user User, systemConfig map[string]string, errorMessage string) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -31,7 +29,7 @@ func AdminSettings(user User, systemConfig map[string]string, scanSettings ScanS
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><title>System Settings - Bookhoard</title><script src=\"/static/htmx.min.js\"></script><link href=\"/static/style.css\" rel=\"stylesheet\"><link rel=\"icon\" type=\"image/svg+xml\" href=\"/static/favicon.svg\"></head><body class=\"theme-{ user.Theme }\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><title>System Settings - Bookhoard</title><script src=\"/static/htmx.min.js\"></script><link href=\"/static/style.css\" rel=\"stylesheet\"></head><body class=\"theme-{ user.Theme }\" x-data=\"adminSettings\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -39,792 +37,330 @@ func AdminSettings(user User, systemConfig map[string]string, scanSettings ScanS
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<main class=\"p-8\"><div class=\"max-w-4xl\"><div class=\"mb-8\"><div class=\"flex items-center gap-3 mb-1\"><span class=\"grid place-items-center h-10 w-10 rounded-xl\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"flex min-h-screen\" style=\"background-color: var(--bg-primary)\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = Icon("gear", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = AdminSidebar(user, "/admin/settings").Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</span><h1 class=\"text-2xl font-bold tracking-tight\" style=\"color: var(--text-primary)\">System Settings</h1></div><p class=\"text-sm\" style=\"color: var(--text-secondary)\">Configure your Bookhoard instance</p></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<main class=\"flex-1 p-8\"><div class=\"max-w-4xl\"><div class=\"mb-8\"><div class=\"flex items-center justify-between mb-4\"><a href=\"/admin\" class=\"btn-secondary px-4 py-2 rounded-lg font-medium\">← Back to Dashboard</a></div><h1 class=\"text-3xl font-bold mb-2\" style=\"color: var(--text-primary)\">System Settings</h1><p style=\"color: var(--text-secondary)\">Configure your Bookhoard instance</p></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		if errorMessage != "" {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<div class=\"mb-6 p-4 rounded-xl border flex items-start gap-3\" style=\"background-color: color-mix(in srgb, var(--status-danger) 12%, var(--bg-secondary)); border-color: var(--status-danger); color: var(--status-danger);\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = Icon("alert", "h-5 w-5 shrink-0 mt-0.5").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<span>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<div class=\"mb-6 p-4 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--error); color: var(--error);\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var2 string
 			templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(errorMessage)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 31, Col: 28}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 29, Col: 22}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</span></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<form id=\"settings-form\" hx-put=\"/api/system/config\" hx-target=\"#settings-form\" hx-swap=\"outerHTML\"><div class=\"card p-6\"><div class=\"flex items-center gap-2 mb-6\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("globe", "h-5 w-5 shrink-0").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<h3 class=\"text-lg font-semibold\" style=\"color: var(--text-primary)\">Base URL</h3></div><div><label class=\"block text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary)\">Base URL</label> <input type=\"url\" name=\"base_url\" value=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<form id=\"settings-form\" hx-put=\"/api/system/config\" hx-target=\"#settings-form\" hx-swap=\"outerHTML\"><div class=\"card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><h3 class=\"text-xl font-semibold mb-6\" style=\"color: var(--text-primary)\">Base URL</h3><div><label class=\"block text-sm font-medium mb-2\" style=\"color: var(--text-primary)\">Base URL</label> <input type=\"url\" name=\"base_url\" value=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.ResolveAttributeValue(systemConfig["base_url"])
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(systemConfig["base_url"])
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 45, Col: 42}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 40, Col: 42}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var3)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "\" placeholder=\"https://books.example.com\" class=\"input\" required><p class=\"text-sm mt-2\" style=\"color: var(--text-secondary)\">The public URL of your Bookhoard instance (e.g., https://books.example.com). Used for device sync, OPDS, and API endpoints.</p></div><div class=\"mt-6 flex justify-end\"><button type=\"submit\" class=\"btn btn-primary\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("save", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "Save Settings</button></div></div><div class=\"mt-6 card p-6\"><div class=\"flex items-center gap-2 mb-6\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("clock", "h-5 w-5 shrink-0").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<h3 class=\"text-lg font-semibold\" style=\"color: var(--text-primary)\">System Defaults</h3></div><div><label class=\"block text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary)\">Default Timezone</label> <select name=\"default_timezone\" id=\"default_timezone\" class=\"input\"><option value=\"UTC\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "\" placeholder=\"https://books.example.com\" class=\"w-full px-4 py-2 rounded-lg border\" style=\"background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border);\" required><p class=\"text-sm mt-1\" style=\"color: var(--text-secondary)\">The public URL of your Bookhoard instance (e.g., https://books.example.com). Used for device sync, OPDS, and API endpoints.</p></div><div class=\"mt-6 flex justify-end\"><button type=\"submit\" class=\"btn-primary px-6 py-2 rounded-lg font-medium\">Save Settings</button></div></div><div class=\"mt-8 card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><h3 class=\"text-xl font-semibold mb-6\" style=\"color: var(--text-primary)\">System Defaults</h3><div><label class=\"block text-sm font-medium mb-2\" style=\"color: var(--text-primary)\">Default Timezone</label> <select name=\"default_timezone\" id=\"default_timezone\" class=\"w-full px-4 py-2 rounded-lg border\" style=\"background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border);\"><option value=\"UTC\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		if systemConfig["default_timezone"] == "UTC" {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, " selected")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, ">UTC (UTC+0)</option> <option value=\"Pacific/Honolulu\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if systemConfig["default_timezone"] == "Pacific/Honolulu" {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, " selected")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, ">Hawaii (UTC-10)</option> <option value=\"America/Anchorage\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if systemConfig["default_timezone"] == "America/Anchorage" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, ">UTC (UTC+0)</option> <option value=\"Pacific/Honolulu\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, ">Alaska (UTC-9/-8)</option> <option value=\"America/Los_Angeles\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Pacific/Honolulu" {
+		if systemConfig["default_timezone"] == "America/Los_Angeles" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, ">Hawaii (UTC-10)</option> <option value=\"America/Anchorage\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, ">Pacific (UTC-8/-7)</option> <option value=\"America/Denver\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "America/Anchorage" {
+		if systemConfig["default_timezone"] == "America/Denver" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, ">Alaska (UTC-9/-8)</option> <option value=\"America/Los_Angeles\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, ">Mountain (UTC-7/-6)</option> <option value=\"America/Phoenix\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "America/Los_Angeles" {
+		if systemConfig["default_timezone"] == "America/Phoenix" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, ">Pacific (UTC-8/-7)</option> <option value=\"America/Denver\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, ">Mountain - no DST (UTC-7)</option> <option value=\"America/Chicago\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "America/Denver" {
+		if systemConfig["default_timezone"] == "America/Chicago" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, ">Mountain (UTC-7/-6)</option> <option value=\"America/Phoenix\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, ">Central (UTC-6/-5)</option> <option value=\"America/New_York\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "America/Phoenix" {
+		if systemConfig["default_timezone"] == "America/New_York" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, ">Mountain - no DST (UTC-7)</option> <option value=\"America/Chicago\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, ">Eastern (UTC-5/-4)</option> <option value=\"America/Sao_Paulo\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "America/Chicago" {
+		if systemConfig["default_timezone"] == "America/Sao_Paulo" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, ">Central (UTC-6/-5)</option> <option value=\"America/New_York\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, ">Brasilia (UTC-3/-2)</option> <option value=\"Europe/London\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "America/New_York" {
+		if systemConfig["default_timezone"] == "Europe/London" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, ">Eastern (UTC-5/-4)</option> <option value=\"America/Sao_Paulo\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, ">British (UTC+0/+1)</option> <option value=\"Europe/Paris\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "America/Sao_Paulo" {
+		if systemConfig["default_timezone"] == "Europe/Paris" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, ">Brasilia (UTC-3/-2)</option> <option value=\"Europe/London\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, ">Central European (UTC+1/+2)</option> <option value=\"Europe/Helsinki\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Europe/London" {
+		if systemConfig["default_timezone"] == "Europe/Helsinki" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, ">British (UTC+0/+1)</option> <option value=\"Europe/Paris\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, ">Eastern European (UTC+2/+3)</option> <option value=\"Europe/Moscow\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Europe/Paris" {
+		if systemConfig["default_timezone"] == "Europe/Moscow" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, ">Central European (UTC+1/+2)</option> <option value=\"Europe/Helsinki\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, ">Moscow (UTC+3)</option> <option value=\"Asia/Tehran\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Europe/Helsinki" {
+		if systemConfig["default_timezone"] == "Asia/Tehran" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, ">Eastern European (UTC+2/+3)</option> <option value=\"Europe/Moscow\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, ">Iran (UTC+3:30)</option> <option value=\"Asia/Dubai\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Europe/Moscow" {
+		if systemConfig["default_timezone"] == "Asia/Dubai" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, ">Moscow (UTC+3)</option> <option value=\"Asia/Tehran\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, ">Gulf (UTC+4)</option> <option value=\"Asia/Karachi\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Asia/Tehran" {
+		if systemConfig["default_timezone"] == "Asia/Karachi" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, ">Iran (UTC+3:30)</option> <option value=\"Asia/Dubai\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, ">Pakistan (UTC+5)</option> <option value=\"Asia/Kolkata\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Asia/Dubai" {
+		if systemConfig["default_timezone"] == "Asia/Kolkata" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, ">Gulf (UTC+4)</option> <option value=\"Asia/Karachi\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, ">India (UTC+5:30)</option> <option value=\"Asia/Dhaka\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Asia/Karachi" {
+		if systemConfig["default_timezone"] == "Asia/Dhaka" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, ">Pakistan (UTC+5)</option> <option value=\"Asia/Kolkata\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, ">Bangladesh (UTC+6)</option> <option value=\"Asia/Bangkok\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Asia/Kolkata" {
+		if systemConfig["default_timezone"] == "Asia/Bangkok" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, ">India (UTC+5:30)</option> <option value=\"Asia/Dhaka\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, ">Indochina (UTC+7)</option> <option value=\"Asia/Shanghai\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Asia/Dhaka" {
+		if systemConfig["default_timezone"] == "Asia/Shanghai" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, ">Bangladesh (UTC+6)</option> <option value=\"Asia/Bangkok\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, ">China (UTC+8)</option> <option value=\"Asia/Tokyo\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Asia/Bangkok" {
+		if systemConfig["default_timezone"] == "Asia/Tokyo" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, ">Indochina (UTC+7)</option> <option value=\"Asia/Shanghai\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, ">Japan/Korea (UTC+9)</option> <option value=\"Australia/Darwin\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Asia/Shanghai" {
+		if systemConfig["default_timezone"] == "Australia/Darwin" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, ">China (UTC+8)</option> <option value=\"Asia/Tokyo\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, ">Australian Central (UTC+9:30)</option> <option value=\"Australia/Sydney\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Asia/Tokyo" {
+		if systemConfig["default_timezone"] == "Australia/Sydney" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, ">Japan/Korea (UTC+9)</option> <option value=\"Australia/Darwin\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, ">Australian Eastern (UTC+10/+11)</option> <option value=\"Pacific/Auckland\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if systemConfig["default_timezone"] == "Australia/Darwin" {
+		if systemConfig["default_timezone"] == "Pacific/Auckland" {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, ">Australian Central (UTC+9:30)</option> <option value=\"Australia/Sydney\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if systemConfig["default_timezone"] == "Australia/Sydney" {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, " selected")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 57, ">Australian Eastern (UTC+10/+11)</option> <option value=\"Pacific/Auckland\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if systemConfig["default_timezone"] == "Pacific/Auckland" {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 58, " selected")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 59, ">New Zealand (UTC+12/+13)</option></select><p class=\"text-sm mt-2\" style=\"color: var(--text-secondary)\">Default timezone for users who haven't set their own.</p></div></div></form><div class=\"mt-6 card p-6\"><div class=\"flex items-center gap-2 mb-4\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("external", "h-5 w-5 shrink-0").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 60, "<h3 class=\"text-lg font-semibold\" style=\"color: var(--text-primary)\">URL Paths</h3></div><div class=\"space-y-2 text-sm\" style=\"color: var(--text-secondary);\"><p><span class=\"font-medium uppercase tracking-wide text-xs\" style=\"color: var(--text-secondary)\">OPDS:</span> ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, ">New Zealand (UTC+12/+13)</option></select><p class=\"text-sm mt-1\" style=\"color: var(--text-secondary)\">Default timezone for users who haven't set their own.</p></div></div></form><div class=\"mt-8 card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><h3 class=\"text-xl font-semibold mb-4\" style=\"color: var(--text-primary)\">URL Paths</h3><div class=\"space-y-2 text-sm\" style=\"color: var(--text-secondary);\"><p><strong>OPDS:</strong> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var4 string
 		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(systemConfig["base_url"])
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 106, Col: 145}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 96, Col: 60}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 61, "/opds</p><p><span class=\"font-medium uppercase tracking-wide text-xs\" style=\"color: var(--text-secondary)\">API:</span> ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, "/opds</p><p><strong>API:</strong> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var5 string
 		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(systemConfig["base_url"])
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 107, Col: 144}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 97, Col: 59}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 62, "/api</p><p><span class=\"font-medium uppercase tracking-wide text-xs\" style=\"color: var(--text-secondary)\">Device Sync:</span> ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 57, "/api</p><p><strong>Device Sync:</strong> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var6 string
 		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(systemConfig["base_url"])
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 108, Col: 152}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 98, Col: 67}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 63, "/api/sync</p></div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = ScanSettingsSection(scanSettings).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = TunableSettingsSection(liveGroups, false).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = TunableSettingsSection(restartGroups, true).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 64, "</div></main></body></html>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-func ScanSettingsSection(scanSettings ScanSettingsData) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var7 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var7 == nil {
-			templ_7745c5c3_Var7 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 65, "<div id=\"scan-settings-section\" class=\"mt-6 card p-6\"><div class=\"flex items-center gap-2 mb-6\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("refresh", "h-5 w-5 shrink-0").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 66, "<h3 class=\"text-lg font-semibold\" style=\"color: var(--text-primary)\">Scanning</h3></div><form hx-put=\"/admin/settings/scan\" hx-target=\"#scan-settings-section\" hx-swap=\"outerHTML\"><div class=\"space-y-4\"><div class=\"flex items-center justify-between gap-4\"><div><label class=\"block text-xs font-semibold uppercase tracking-wide mb-1\" style=\"color: var(--text-secondary)\">Auto-Scan</label><p class=\"text-sm\" style=\"color: var(--text-secondary)\">Watch libraries for file changes on startup</p></div><label class=\"relative inline-flex items-center cursor-pointer shrink-0\"><input type=\"checkbox\" name=\"auto_scan_enabled\" value=\"true\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if scanSettings.AutoScanEnabled {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 67, " checked")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 68, " class=\"sr-only peer\"><div class=\"w-11 h-6 rounded-full peer peer-checked:bg-brand transition-colors\" style=\"background-color: color-mix(in srgb, var(--text-primary) 15%, transparent);\"></div><div class=\"absolute left-0.5 top-0.5 bg-white rounded-full w-5 h-5 transition-transform peer-checked:translate-x-5\"></div></label></div><div><label class=\"block text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary)\">Scan Interval (seconds)</label> <input type=\"number\" name=\"scan_poll_interval_seconds\" value=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.ResolveAttributeValue(fmt.Sprintf("%d", scanSettings.ScanPollIntervalSeconds))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 154, Col: 69}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var8)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 69, "\" min=\"1\" max=\"3600\" class=\"input\" required><p class=\"text-sm mt-2\" style=\"color: var(--text-secondary)\">How often to poll libraries for changes (1–3600 seconds). Default: 60.</p></div><div class=\"flex justify-end\"><button type=\"submit\" class=\"btn btn-primary\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("save", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 70, "Save Scan Settings</button></div></div></form></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-// TunableSettingsSection renders the editable tunables for a given bucket
-// (live vs restart-required). Within the card, settings are clustered into
-// labeled sub-sections by Group (e.g. "Password Quality", "Device Rate Limits").
-func TunableSettingsSection(groups []SettingGroup, restartRequired bool) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var9 == nil {
-			templ_7745c5c3_Var9 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 71, "<div class=\"mt-6 card p-6\"><div class=\"flex items-center gap-2 mb-2\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if restartRequired {
-			templ_7745c5c3_Err = Icon("alert", "h-5 w-5 shrink-0").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 72, " <h3 class=\"text-lg font-semibold\" style=\"color: var(--text-primary)\">Tunable Settings — Restart Required</h3>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			templ_7745c5c3_Err = Icon("settings", "h-5 w-5 shrink-0").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 73, " <h3 class=\"text-lg font-semibold\" style=\"color: var(--text-primary)\">Tunable Settings — Live</h3>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 74, "</div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if restartRequired {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 75, "<p class=\"text-sm mb-4\" style=\"color: var(--status-warning)\">Changes are saved immediately but only take effect after the server restarts.</p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 76, "<p class=\"text-sm mb-4\" style=\"color: var(--text-secondary)\">Changes apply immediately — no restart needed.</p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		for _, g := range groups {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 77, "<div class=\"mt-5 first:mt-0\"><h4 class=\"text-xs font-semibold uppercase tracking-wide mb-1\" style=\"color: var(--text-secondary)\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var10 string
-			templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(g.Name)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 194, Col: 112}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 78, "</h4><div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			for _, e := range g.Entries {
-				templ_7745c5c3_Err = TunableSettingRow(e).Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 79, "</div></div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 80, "</div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-// TunableSettingRow renders a single editable setting as an inline HTMX form.
-func TunableSettingRow(e SettingEntry) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var11 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var11 == nil {
-			templ_7745c5c3_Var11 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 81, "<div class=\"flex flex-col sm:flex-row sm:items-center gap-3 py-3\" style=\"border-top: 1px solid color-mix(in srgb, var(--text-primary) 7%, transparent);\"><div class=\"flex-1 min-w-0\"><label class=\"block text-sm font-medium\" style=\"color: var(--text-primary)\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var12 string
-		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(e.Description)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 209, Col: 94}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 82, "</label> ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !e.IsDefault {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 83, "<p class=\"text-xs mt-0.5\" style=\"color: var(--text-secondary)\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var13 string
-			templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(e.Key)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 211, Col: 74}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 84, " — modified from default</p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 85, "<p class=\"text-xs mt-0.5\" style=\"color: var(--text-secondary)\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var14 string
-			templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(e.Key)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 213, Col: 74}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 86, "</p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 87, "</div><form class=\"flex items-center gap-2 shrink-0\" hx-put=\"/admin/settings/tunable\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var15 string
-		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.ResolveAttributeValue("#status-" + e.Key)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 219, Col: 33}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 88, "\" hx-swap=\"innerHTML\" hx-disinherit=\"*\"><input type=\"hidden\" name=\"key\" value=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var16 string
-		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.ResolveAttributeValue(e.Key)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 223, Col: 48}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var16)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 89, "\"> ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if e.Type == "bool" {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 90, "<select name=\"value\" class=\"input py-1.5 text-sm w-28\"><option value=\"true\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			if e.Value == "true" {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 91, " selected")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 92, ">Yes</option> <option value=\"false\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			if e.Value != "true" {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 93, " selected")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 94, ">No</option></select> ")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else if e.Type == "int" {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 95, "<input type=\"number\" name=\"value\" value=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var17 string
-			templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.ResolveAttributeValue(e.Value)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 233, Col: 20}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var17)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 96, "\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			if e.Min != "" {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 97, " min=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var18 string
-				templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.ResolveAttributeValue(e.Min)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 235, Col: 17}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var18)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 98, "\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-			if e.Max != "" {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 99, " max=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var19 string
-				templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.ResolveAttributeValue(e.Max)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 238, Col: 17}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var19)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 100, "\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 101, " class=\"input py-1.5 text-sm w-32\"> ")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 102, "<input type=\"text\" name=\"value\" value=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var20 string
-			templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.ResolveAttributeValue(e.Value)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 246, Col: 20}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var20)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 103, "\" class=\"input py-1.5 text-sm w-40\"> ")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 104, "<button type=\"submit\" class=\"btn btn-secondary px-3 py-1.5 text-sm\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("save", "h-3.5 w-3.5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 105, "Save</button></form><span id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var21 string
-		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.ResolveAttributeValue("status-" + e.Key)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_settings.templ`, Line: 255, Col: 30}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 106, "\" class=\"text-xs w-24 text-right\" style=\"color: var(--text-secondary)\"></span></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 58, "/api/sync</p></div></div></div></main></div></body></html>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

templates/admin_sidebar.templ

@@ -0,0 +1,23 @@
+package templates
+
+templ AdminSidebar(user User, currentPath string) {
+	<aside class="w-64 border-r" style="background-color: var(--bg-secondary); border-color: var(--border)">
+		<div class="p-6">
+			<h2 class="text-lg font-semibold mb-6" style="color: var(--text-primary)">Admin Panel</h2>
+			<nav class="space-y-2">
+				<a href="/admin" class={activeClass(currentPath, "/admin")} style="color: var(--text-primary)">
+					🏠 Dashboard
+				</a>
+				<a href="/admin/users" class={activeClass(currentPath, "/admin/users")} style="color: var(--text-primary)">
+					👤 User Administration
+				</a>
+				<a href="/admin/library" class={activeClass(currentPath, "/admin/library")} style="color: var(--text-primary)">
+					📚 Library Management
+				</a>
+				<a href="/admin/settings" class={activeClass(currentPath, "/admin/settings")} style="color: var(--text-primary)">
+					⚙️ System Settings
+				</a>
+			</nav>
+		</div>
+	</aside>
+}   

templates/admin_sidebar_templ.go

@@ -0,0 +1,128 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.3.1001
+package templates
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+func AdminSidebar(user User, currentPath string) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<aside class=\"w-64 border-r\" style=\"background-color: var(--bg-secondary); border-color: var(--border)\"><div class=\"p-6\"><h2 class=\"text-lg font-semibold mb-6\" style=\"color: var(--text-primary)\">Admin Panel</h2><nav class=\"space-y-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 = []any{activeClass(currentPath, "/admin")}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var2...)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<a href=\"/admin\" class=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var2).String())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_sidebar.templ`, Line: 1, Col: 0}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "\" style=\"color: var(--text-primary)\">🏠 Dashboard</a> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 = []any{activeClass(currentPath, "/admin/users")}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var4...)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<a href=\"/admin/users\" class=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var4).String())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_sidebar.templ`, Line: 1, Col: 0}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\" style=\"color: var(--text-primary)\">👤 User Administration</a> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 = []any{activeClass(currentPath, "/admin/library")}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var6...)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<a href=\"/admin/library\" class=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var6).String())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_sidebar.templ`, Line: 1, Col: 0}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "\" style=\"color: var(--text-primary)\">📚 Library Management</a> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 = []any{activeClass(currentPath, "/admin/settings")}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var8...)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<a href=\"/admin/settings\" class=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var8).String())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_sidebar.templ`, Line: 1, Col: 0}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "\" style=\"color: var(--text-primary)\">⚙️ System Settings</a></nav></div></aside>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

templates/admin_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.1020
+// templ: version: v0.3.1001
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -8,7 +8,7 @@ package templates
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-func Admin(user User, stats AdminStats) templ.Component {
+func Admin(user User) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -29,7 +29,7 @@ func Admin(user User, stats AdminStats) templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><title>Admin Dashboard - Bookhoard</title><link href=\"/static/style.css\" rel=\"stylesheet\"><link rel=\"icon\" type=\"image/svg+xml\" href=\"/static/favicon.svg\"></head><body x-data=\"admin\" x-init=\"loadWatchStatus()\" class=\"theme-{ user.Theme }\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><title>Admin Dashboard - Bookhoard</title><script src=\"/static/htmx.min.js\"></script><link href=\"/static/style.css\" rel=\"stylesheet\"></head><body x-data=\"admin\" x-init=\"loadWatchStatus(); initializeScanWebSocket()\" class=\"theme-tokyo-night\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -37,147 +37,15 @@ func Admin(user User, stats AdminStats) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<main class=\"p-8\"><div class=\"max-w-4xl\"><div class=\"mb-8\"><div class=\"flex items-center gap-3 mb-1\"><span class=\"grid place-items-center h-10 w-10 rounded-xl\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"flex min-h-screen\" style=\"background-color: var(--bg-primary)\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = Icon("grid", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = AdminSidebar(user, "/admin").Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</span><h1 class=\"text-2xl font-bold tracking-tight\" style=\"color: var(--text-primary)\">Dashboard</h1></div><p class=\"text-sm\" style=\"color: var(--text-secondary)\">Overview of your Bookhoard instance</p></div><!-- Stats Grid --><div class=\"grid grid-cols-2 md:grid-cols-4 gap-4 mb-6\"><div class=\"stat-card\"><div class=\"flex items-center gap-2 mb-2\" style=\"color: var(--text-secondary);\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("library", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<span class=\"text-xs font-semibold uppercase tracking-wide\">Libraries</span></div><p class=\"text-2xl font-bold\" style=\"color: var(--text-primary)\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(stats.LibraryCount)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin.templ`, Line: 32, Col: 92}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</p></div><div class=\"stat-card\"><div class=\"flex items-center gap-2 mb-2\" style=\"color: var(--text-secondary);\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("book", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<span class=\"text-xs font-semibold uppercase tracking-wide\">Books</span></div><p class=\"text-2xl font-bold\" style=\"color: var(--text-primary)\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(stats.MediaCount)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin.templ`, Line: 39, Col: 90}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "</p></div><div class=\"stat-card\"><div class=\"flex items-center gap-2 mb-2\" style=\"color: var(--text-secondary);\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("users", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<span class=\"text-xs font-semibold uppercase tracking-wide\">Users</span></div><p class=\"text-2xl font-bold\" style=\"color: var(--text-primary)\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var4 string
-		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(stats.UserCount)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin.templ`, Line: 46, Col: 89}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</p></div><div class=\"stat-card\"><div class=\"flex items-center gap-2 mb-2\" style=\"color: var(--text-secondary);\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("device", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<span class=\"text-xs font-semibold uppercase tracking-wide\">Devices</span></div><p class=\"text-2xl font-bold\" style=\"color: var(--text-primary)\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var5 string
-		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(stats.DeviceCount)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin.templ`, Line: 53, Col: 91}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</p></div></div><!-- Watch Status --><div class=\"stat-card mb-6\"><div class=\"flex items-center gap-3\"><span class=\"grid place-items-center h-11 w-11 rounded-xl shrink-0\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("sync", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "</span><div class=\"flex-1\"><h3 class=\"font-semibold\" style=\"color: var(--text-primary)\">File Watcher</h3><p class=\"text-sm\" style=\"color: var(--text-secondary)\">Auto-detects new files in library folders</p></div><div class=\"text-right text-sm\" style=\"color: var(--text-secondary)\"><span class=\"inline-block w-2 h-2 rounded-full mr-2\" style=\"background-color: var(--status-success);\"></span> Watching <span id=\"watch-count\">0</span> libraries</div></div></div><!-- Quick Actions --><div class=\"card p-6\"><h3 class=\"text-lg font-semibold mb-4\" style=\"color: var(--text-primary)\">Quick Actions</h3><div class=\"grid grid-cols-1 sm:grid-cols-2 gap-4\"><button @click=\"scanAllLibraries()\" class=\"btn btn-primary py-4 flex-col items-start gap-1\"><span class=\"flex items-center gap-2 font-medium\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("refresh", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "Scan All Libraries</span> <span class=\"text-xs font-normal opacity-80\">Re-scan existing files and detect new items</span></button> <a href=\"/admin/library\" class=\"btn btn-secondary py-4 flex-col items-start gap-1\"><span class=\"flex items-center gap-2 font-medium\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("library", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "Manage Libraries</span> <span class=\"text-xs font-normal opacity-80\">Add or remove libraries and folders</span></a></div></div><!-- Scan Progress Section --><div id=\"scan-progress-container\" class=\"card hidden mt-6 p-6 opacity-0 -translate-y-2.5 transition-all duration-300 ease-out\"><div class=\"flex justify-between items-center mb-4\"><h3 class=\"text-lg font-semibold flex items-center gap-2\" style=\"color: var(--text-primary)\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("refresh", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "Scanning Libraries</h3><button @click=\"hideScanProgress()\" class=\"icon-btn\" aria-label=\"Close\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("close", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</button></div><div class=\"mb-4\"><div class=\"flex justify-between text-sm mb-2\"><span style=\"color: var(--text-secondary)\">Overall Progress</span> <span id=\"scan-progress-text\" style=\"color: var(--text-primary)\">0%</span></div><div class=\"w-full rounded-full h-3\" style=\"background-color: var(--surface-hover);\"><div id=\"scan-progress-bar\" class=\"h-3 rounded-full transition-all duration-500\" style=\"width: 0%; background-color: var(--accent);\"></div></div><div id=\"scan-status\" class=\"text-sm mt-2\" style=\"color: var(--text-secondary)\">Starting scan...</div></div><div id=\"library-progress-list\" class=\"space-y-3\"></div><div id=\"scan-results\" class=\"hidden mt-6 p-4 rounded-xl border\" style=\"background-color: var(--bg-primary); border-color: var(--border);\"><h4 class=\"font-semibold mb-2 flex items-center gap-2\" style=\"color: var(--status-success);\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("check-circle", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "Scan Complete!</h4><div id=\"scan-results-content\" style=\"color: var(--text-secondary)\"></div><div class=\"mt-4 flex gap-2\"><button @click=\"window.location.reload()\" class=\"btn btn-primary\">Refresh to View Books</button> <button @click=\"hideScanProgress()\" class=\"btn btn-secondary\">Dismiss</button></div></div></div></div></main></body></html>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<main class=\"flex-1 p-8\"><div class=\"max-w-4xl\"><div class=\"mb-8\"><h1 class=\"text-3xl font-bold mb-2\" style=\"color: var(--text-primary)\">Dashboard</h1><p style=\"color: var(--text-secondary)\">Overview of your Bookhoard library and settings</p></div><div class=\"grid grid-cols-1 md:grid-cols-2 gap-6 mb-8\"><div class=\"card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border)\"><div class=\"flex items-center space-x-3\"><div class=\"text-3xl\">📖</div><div><h3 class=\"font-semibold\" style=\"color: var(--text-primary)\">Library</h3><p style=\"color: var(--text-secondary)\" class=\"text-sm\">Manage your ebook collection</p></div></div><a href=\"/\" class=\"mt-4 inline-block text-sm btn-secondary px-3 py-1 rounded\">View Library</a></div><div class=\"card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border)\"><div class=\"flex items-center space-x-3\"><div class=\"text-3xl\">👁️</div><div><h3 class=\"font-semibold\" style=\"color: var(--text-primary)\">Scan Watch Status</h3><p style=\"color: var(--text-secondary)\" class=\"text-sm\">Auto-detecting new files</p></div></div><div id=\"watch-status\" class=\"mt-4 text-sm\" style=\"color: var(--text-secondary)\"><span class=\"inline-block w-2 h-2 rounded-full bg-green-500 mr-2\"></span> Watching <span id=\"watch-count\">0</span> libraries</div></div></div><div class=\"card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border)\"><h3 class=\"text-xl font-semibold mb-4\" style=\"color: var(--text-primary)\">Quick Actions</h3><div class=\"grid grid-cols-1 sm:grid-cols-2 gap-4\"><button @click=\"scanAllLibraries()\" class=\"btn-primary p-4 rounded-lg text-left\"><div class=\"font-medium\">Rescan Library</div><div style=\"color: var(--text-secondary)\" class=\"text-sm\">Re-scan existing files and fix metadata</div></button> <a href=\"/admin/library\" class=\"btn-secondary p-4 rounded-lg text-left block\"><div class=\"font-medium\">Manage Libraries and Folders</div><div style=\"color: var(--text-secondary)\" class=\"text-sm\">Add or remove libraries and scan directories</div></a></div></div><!-- Scan Progress Section --><div id=\"scan-progress-container\" class=\"hidden mt-6 p-6 rounded-lg border opacity-0 -translate-y-2.5 transition-all duration-300 ease-out\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><div class=\"flex justify-between items-center mb-4\"><h3 class=\"text-lg font-semibold\" style=\"color: var(--text-primary)\">📚 Scanning Libraries</h3><button @click=\"hideScanProgress()\" class=\"p-2 hover:bg-gray-700 rounded\">✕</button></div><!-- Overall Progress --><div class=\"mb-4\"><div class=\"flex justify-between text-sm mb-2\"><span style=\"color: var(--text-secondary)\">Overall Progress</span> <span id=\"scan-progress-text\" style=\"color: var(--text-primary)\">0%</span></div><div class=\"w-full bg-gray-700 rounded-full h-3\"><div id=\"scan-progress-bar\" class=\"h-3 rounded-full transition-all duration-500\" style=\"width: 0%; background-color: var(--accent);\"></div></div><div id=\"scan-status\" class=\"text-sm mt-2\" style=\"color: var(--text-secondary)\">Starting scan...</div></div><!-- Per-Library Progress --><div id=\"library-progress-list\" class=\"space-y-3\"><!-- Dynamically populated --></div><!-- Results Summary --><div id=\"scan-results\" class=\"hidden mt-6 p-4 rounded-lg border\" style=\"background-color: var(--bg-primary); border-color: var(--border);\"><h4 class=\"font-semibold mb-2\" style=\"color: var(--text-primary)\">✅ Scan Complete!</h4><div id=\"scan-results-content\" style=\"color: var(--text-secondary)\"><!-- Results populated by JS --></div><div class=\"mt-4 flex gap-2\"><button @click=\"window.location.reload()\" class=\"btn-primary px-4 py-2 rounded-lg\">Refresh to View Books</button> <button @click=\"hideScanProgress()\" class=\"btn-secondary px-4 py-2 rounded-lg\">Dismiss</button></div></div></div></div></main></div></body></html>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

templates/admin_users.templ

@@ -8,131 +8,127 @@ templ AdminUsers(currentUser User, users []User, adminCount int) {
 			<title>Users - Bookhoard Admin</title>
 			<script src="/static/htmx.min.js"></script>
 			<link href="/static/style.css" rel="stylesheet"/>
-			<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
 		</head>
 		<body class="theme-{ currentUser.Theme }">
-		@Header(currentUser, "/admin/users")
-		<!-- Modal Container (populated by HTMX) -->
-		<div id="modal-container"></div>
-		<main class="p-8">
-			<div class="max-w-5xl">
-				<div class="mb-8">
-							<div class="flex items-center gap-3 mb-1">
-								<span class="grid place-items-center h-10 w-10 rounded-xl" style="background-color: var(--accent-muted); color: var(--accent);">
-									@Icon("users", "h-5 w-5")
-								</span>
-								<h1 class="text-2xl font-bold tracking-tight" style="color: var(--text-primary)">User Management</h1>
-							</div>
-							<p class="text-sm" style="color: var(--text-secondary)">Manage user accounts and permissions</p>
-						</div>
-						<!-- Users Table -->
-						<div class="card overflow-hidden">
-							<table class="w-full">
-								<thead style="background-color: var(--bg-primary)">
-									<tr>
-										<th class="px-6 py-3 text-left text-xs font-semibold uppercase tracking-wide" style="color: var(--text-secondary)">Username</th>
-										<th class="px-6 py-3 text-left text-xs font-semibold uppercase tracking-wide" style="color: var(--text-secondary)">Email</th>
-										<th class="px-6 py-3 text-left text-xs font-semibold uppercase tracking-wide" style="color: var(--text-secondary)">Role</th>
-										<th class="px-6 py-3 text-left text-xs font-semibold uppercase tracking-wide" style="color: var(--text-secondary)">Created</th>
-										<th class="px-6 py-3 text-right text-xs font-semibold uppercase tracking-wide" style="color: var(--text-secondary)">Actions</th>
-									</tr>
-								</thead>
-								<tbody class="divide-y" style="divide-color: var(--border)">
-									for _, user := range users {
-										<tr id={ "user-" + user.ID } class="transition-colors hover:bg-surface-hover">
-											<!-- Username -->
-											<td class="px-6 py-4 whitespace-nowrap">
-												<div class="flex items-center gap-2">
-													<span class="grid place-items-center h-8 w-8 rounded-full shrink-0" style="background-color: var(--accent-muted); color: var(--accent);">
-														@Icon("user", "h-4 w-4")
-													</span>
-													<div>
-														<div class="text-sm font-medium" style="color: var(--text-primary)">{ user.Username }</div>
-														if user.ID == currentUser.ID {
-															<span class="badge" style="background-color: var(--accent-muted); color: var(--accent);">You</span>
-														}
-													</div>
-												</div>
-											</td>
-											<!-- Email -->
-											<td class="px-6 py-4 whitespace-nowrap">
-												<div class="text-sm" style="color: var(--text-primary)">{ user.Email }</div>
-											</td>
-											<!-- Role Toggle (with last-admin protection) -->
-											<td class="px-6 py-4 whitespace-nowrap">
-												if user.Role == "admin" && adminCount == 1 {
-													<!-- Last admin - disabled -->
-													<div class="relative">
-														<select
-															disabled
-															class="input w-auto py-1 pr-7 text-xs opacity-50 cursor-not-allowed"
-															title="Cannot demote the last admin"
-														>
-															<option value="user">User</option>
-															<option value="admin" selected>Admin</option>
-														</select>
-													</div>
-												} else {
-													<select
-														hx-put={ "/api/auth/profile/" + user.ID }
-														hx-target={ "#role-result-" + user.ID }
-														hx-swap="innerHTML"
-														hx-trigger="change"
-														name="role"
-														class="input w-auto py-1 pr-7 text-xs"
-													>
-														<option value="user" selected?={ user.Role == "user" }>User</option>
-														<option value="admin" selected?={ user.Role == "admin" }>Admin</option>
-													</select>
-													<div id={ "role-result-" + user.ID } class="text-xs mt-1"></div>
-												}
-											</td>
-											<!-- Created -->
-											<td class="px-6 py-4 whitespace-nowrap">
-												<div class="text-sm" style="color: var(--text-secondary)">{ FormatInTimezone(user.CreatedAt, currentUser.Timezone) }</div>
-											</td>
-											<!-- Actions -->
-											<td class="px-6 py-4 whitespace-nowrap text-right">
-												<div class="inline-flex items-center gap-1">
-													<button
-														hx-get={ "/admin/users/" + user.ID + "/profile-modal" }
-														hx-target="#modal-container"
-														hx-swap="innerHTML"
-														class="btn btn-secondary text-xs px-2.5 py-1"
-													>
-														@Icon("edit", "h-4 w-4")
-														Edit
-													</button>
-													if user.Role == "admin" && adminCount == 1 {
-														<button
-															disabled
-															class="btn btn-danger text-xs px-2.5 py-1"
-															title="Cannot delete the last admin"
-														>
-															@Icon("trash", "h-4 w-4")
-															Delete
-														</button>
-													} else {
-														<button
-															hx-delete={ "/api/auth/profile/" + user.ID }
-															hx-target={ "#user-" + user.ID }
-															hx-swap="outerHTML swap:0.5s"
-															hx-confirm="Are you sure you want to delete this user? This action cannot be undone."
-															class="btn btn-danger text-xs px-2.5 py-1"
-														>
-															@Icon("trash", "h-4 w-4")
-															Delete
-														</button>
+			@Header(currentUser, "/admin/users")
+			<!-- Modal Container (populated by HTMX) -->
+			<div id="modal-container"></div>
+			<div class="flex min-h-screen" style="background-color: var(--bg-primary)">
+				@AdminSidebar(currentUser, "/admin/users")
+				<main class="flex-1 p-8">
+					<div class="w-full">
+						<h1 class="text-3xl font-bold mb-2" style="color: var(--text-primary)">User Management</h1>
+						<p style="color: var(--text-secondary)">Manage user accounts and permissions</p>
+					</div>
+					<!-- Users Table -->
+					<div class="card rounded-lg border overflow-hidden" style="background-color: var(--bg-secondary); border-color: var(--border)">
+						<table class="w-full">
+							<thead style="background-color: var(--bg-primary)">
+								<tr>
+									<th class="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider" style="color: var(--text-secondary)">Username</th>
+									<th class="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider" style="color: var(--text-secondary)">Email</th>
+									<th class="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider" style="color: var(--text-secondary)">Role</th>
+									<th class="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider" style="color: var(--text-secondary)">Created</th>
+									<th class="px-6 py-3 text-right text-xs font-medium uppercase tracking-wider" style="color: var(--text-secondary)">Actions</th>
+								</tr>
+							</thead>
+							<tbody class="divide-y" style="divide-color: var(--border)">
+								for _, user := range users {
+									<tr id={ "user-" + user.ID } class="hover:bg-opacity-50" style="transition: background-color 0.2s;">
+										<!-- Username -->
+										<td class="px-6 py-4 whitespace-nowrap">
+											<div class="flex items-center">
+												<div>
+													<div class="text-sm font-medium" style="color: var(--text-primary)">{ user.Username }</div>
+													if user.ID == currentUser.ID {
+														<span class="text-xs px-2 py-1 rounded" style="background-color: var(--accent); color: white;">You</span>
 													}
 												</div>
-											</td>
-										</tr>
-									}
-								</tbody>
-							</table>
-						</div>
+											</div>
+										</td>
+										<!-- Email -->
+										<td class="px-6 py-4 whitespace-nowrap">
+											<div class="text-sm" style="color: var(--text-primary)">{ user.Email }</div>
+										</td>
+										<!-- Role Toggle (with last-admin protection) -->
+										<td class="px-6 py-4 whitespace-nowrap">
+											if user.Role == "admin" && adminCount == 1 {
+												<!-- Last admin - disabled -->
+												<div class="relative">
+													<select
+														disabled
+														class="text-sm rounded px-2 py-1 cursor-not-allowed opacity-50"
+														style="background-color: var(--bg-primary); color: var(--text-secondary); border: 1px solid var(--border);"
+														title="Cannot demote the last admin"
+													>
+														<option value="user">User</option>
+														<option value="admin" selected>Admin</option>
+													</select>
+												</div>
+											} else {
+												<select
+													hx-put={ "/api/auth/profile/" + user.ID }
+													hx-headers='{"Authorization": "Bearer " + localStorage.getItem("token")}'
+													hx-target={ "#role-result-" + user.ID }
+													hx-swap="innerHTML"
+													name="role"
+													class="text-sm rounded px-2 py-1"
+													style="background-color: var(--bg-primary); color: var(--text-primary); border: 1px solid var(--border);"
+													onchange="this.dispatchEvent(new Event('htmx:trigger'))"
+													hx-trigger="change"
+													hx-vals='{"role": this.value}'
+												>
+													<option value="user" selected?={ user.Role == "user" }>User</option>
+													<option value="admin" selected?={ user.Role == "admin" }>Admin</option>
+												</select>
+												<div id={ "role-result-" + user.ID } class="text-xs mt-1"></div>
+											}
+										</td>
+										<!-- Created -->
+										<td class="px-6 py-4 whitespace-nowrap">
+											<div class="text-sm" style="color: var(--text-secondary)">{ FormatInTimezone(user.CreatedAt, currentUser.Timezone) }</div>
+										</td>
+										<!-- Actions -->
+										<td class="px-6 py-4 whitespace-nowrap text-right">
+											<button
+												hx-get={ "/admin/users/" + user.ID + "/profile-modal" }
+												hx-target="#modal-container"
+												hx-swap="innerHTML"
+												class="text-sm px-3 py-1 rounded mr-2"
+												style="background-color: var(--accent); color: white;"
+											>
+												Edit
+											</button>
+											if user.Role == "admin" && adminCount == 1 {
+												<button
+													disabled
+													class="text-sm px-3 py-1 rounded cursor-not-allowed opacity-50"
+													style="background-color: #dc2626; color: white;"
+													title="Cannot delete the last admin"
+												>
+													Delete
+												</button>
+											} else {
+												<button
+													hx-delete={ "/api/auth/profile/" + user.ID }
+													hx-headers='{"Authorization": "Bearer " + localStorage.getItem("token")}'
+													hx-target={ "#user-" + user.ID }
+													hx-swap="outerHTML swap:0.5s"
+													hx-confirm="Are you sure you want to delete this user? This action cannot be undone."
+													class="text-sm px-3 py-1 rounded"
+													style="background-color: #dc2626; color: white;"
+												>
+													Delete
+												</button>
+											}
+										</td>
+									</tr>
+								}
+							</tbody>
+						</table>
+					</div>
+				</main>
 			</div>
-		</main>
-	</body>
+		</body>
 	</html>
 }

templates/admin_users_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.1020
+// templ: version: v0.3.1001
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -29,7 +29,7 @@ func AdminUsers(currentUser User, users []User, adminCount int) templ.Component
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><title>Users - Bookhoard Admin</title><script src=\"/static/htmx.min.js\"></script><link href=\"/static/style.css\" rel=\"stylesheet\"><link rel=\"icon\" type=\"image/svg+xml\" href=\"/static/favicon.svg\"></head><body class=\"theme-{ currentUser.Theme }\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><title>Users - Bookhoard Admin</title><script src=\"/static/htmx.min.js\"></script><link href=\"/static/style.css\" rel=\"stylesheet\"></head><body class=\"theme-{ currentUser.Theme }\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -37,15 +37,15 @@ func AdminUsers(currentUser User, users []User, adminCount int) templ.Component
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<!-- Modal Container (populated by HTMX) --><div id=\"modal-container\"></div><main class=\"p-8\"><div class=\"max-w-5xl\"><div class=\"mb-8\"><div class=\"flex items-center gap-3 mb-1\"><span class=\"grid place-items-center h-10 w-10 rounded-xl\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<!-- Modal Container (populated by HTMX) --><div id=\"modal-container\"></div><div class=\"flex min-h-screen\" style=\"background-color: var(--bg-primary)\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = Icon("users", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = AdminSidebar(currentUser, "/admin/users").Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</span><h1 class=\"text-2xl font-bold tracking-tight\" style=\"color: var(--text-primary)\">User Management</h1></div><p class=\"text-sm\" style=\"color: var(--text-secondary)\">Manage user accounts and permissions</p></div><!-- Users Table --><div class=\"card overflow-hidden\"><table class=\"w-full\"><thead style=\"background-color: var(--bg-primary)\"><tr><th class=\"px-6 py-3 text-left text-xs font-semibold uppercase tracking-wide\" style=\"color: var(--text-secondary)\">Username</th><th class=\"px-6 py-3 text-left text-xs font-semibold uppercase tracking-wide\" style=\"color: var(--text-secondary)\">Email</th><th class=\"px-6 py-3 text-left text-xs font-semibold uppercase tracking-wide\" style=\"color: var(--text-secondary)\">Role</th><th class=\"px-6 py-3 text-left text-xs font-semibold uppercase tracking-wide\" style=\"color: var(--text-secondary)\">Created</th><th class=\"px-6 py-3 text-right text-xs font-semibold uppercase tracking-wide\" style=\"color: var(--text-secondary)\">Actions</th></tr></thead> <tbody class=\"divide-y\" style=\"divide-color: var(--border)\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<main class=\"flex-1 p-8\"><div class=\"w-full\"><h1 class=\"text-3xl font-bold mb-2\" style=\"color: var(--text-primary)\">User Management</h1><p style=\"color: var(--text-secondary)\">Manage user accounts and permissions</p></div><!-- Users Table --><div class=\"card rounded-lg border overflow-hidden\" style=\"background-color: var(--bg-secondary); border-color: var(--border)\"><table class=\"w-full\"><thead style=\"background-color: var(--bg-primary)\"><tr><th class=\"px-6 py-3 text-left text-xs font-medium uppercase tracking-wider\" style=\"color: var(--text-secondary)\">Username</th><th class=\"px-6 py-3 text-left text-xs font-medium uppercase tracking-wider\" style=\"color: var(--text-secondary)\">Email</th><th class=\"px-6 py-3 text-left text-xs font-medium uppercase tracking-wider\" style=\"color: var(--text-secondary)\">Role</th><th class=\"px-6 py-3 text-left text-xs font-medium uppercase tracking-wider\" style=\"color: var(--text-secondary)\">Created</th><th class=\"px-6 py-3 text-right text-xs font-medium uppercase tracking-wider\" style=\"color: var(--text-secondary)\">Actions</th></tr></thead> <tbody class=\"divide-y\" style=\"divide-color: var(--border)\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -55,229 +55,197 @@ func AdminUsers(currentUser User, users []User, adminCount int) templ.Component
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var2 string
-			templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.ResolveAttributeValue("user-" + user.ID)
+			templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs("user-" + user.ID)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 42, Col: 36}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 37, Col: 35}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var2)
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\" class=\"transition-colors hover:bg-surface-hover\"><!-- Username --><td class=\"px-6 py-4 whitespace-nowrap\"><div class=\"flex items-center gap-2\"><span class=\"grid place-items-center h-8 w-8 rounded-full shrink-0\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = Icon("user", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</span><div><div class=\"text-sm font-medium\" style=\"color: var(--text-primary)\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\" class=\"hover:bg-opacity-50\" style=\"transition: background-color 0.2s;\"><!-- Username --><td class=\"px-6 py-4 whitespace-nowrap\"><div class=\"flex items-center\"><div><div class=\"text-sm font-medium\" style=\"color: var(--text-primary)\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var3 string
 			templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(user.Username)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 50, Col: 97}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 42, Col: 96}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "</div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			if user.ID == currentUser.ID {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<span class=\"badge\" style=\"background-color: var(--accent-muted); color: var(--accent);\">You</span>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<span class=\"text-xs px-2 py-1 rounded\" style=\"background-color: var(--accent); color: white;\">You</span>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</div></div></td><!-- Email --><td class=\"px-6 py-4 whitespace-nowrap\"><div class=\"text-sm\" style=\"color: var(--text-primary)\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "</div></div></td><!-- Email --><td class=\"px-6 py-4 whitespace-nowrap\"><div class=\"text-sm\" style=\"color: var(--text-primary)\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var4 string
 			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(user.Email)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 59, Col: 80}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 51, Col: 79}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</div></td><!-- Role Toggle (with last-admin protection) --><td class=\"px-6 py-4 whitespace-nowrap\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</div></td><!-- Role Toggle (with last-admin protection) --><td class=\"px-6 py-4 whitespace-nowrap\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			if user.Role == "admin" && adminCount == 1 {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<!-- Last admin - disabled --> <div class=\"relative\"><select disabled class=\"input w-auto py-1 pr-7 text-xs opacity-50 cursor-not-allowed\" title=\"Cannot demote the last admin\"><option value=\"user\">User</option> <option value=\"admin\" selected>Admin</option></select></div>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<!-- Last admin - disabled --> <div class=\"relative\"><select disabled class=\"text-sm rounded px-2 py-1 cursor-not-allowed opacity-50\" style=\"background-color: var(--bg-primary); color: var(--text-secondary); border: 1px solid var(--border);\" title=\"Cannot demote the last admin\"><option value=\"user\">User</option> <option value=\"admin\" selected>Admin</option></select></div>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			} else {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<select hx-put=\"")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<select hx-put=\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var5 string
-				templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.ResolveAttributeValue("/api/auth/profile/" + user.ID)
+				templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs("/api/auth/profile/" + user.ID)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 77, Col: 53}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 70, Col: 52}
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5)
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "\" hx-target=\"")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\" hx-headers='{\"Authorization\": \"Bearer \" + localStorage.getItem(\"token\")}' hx-target=\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var6 string
-				templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.ResolveAttributeValue("#role-result-" + user.ID)
+				templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs("#role-result-" + user.ID)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 78, Col: 51}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 72, Col: 50}
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var6)
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "\" hx-swap=\"innerHTML\" hx-trigger=\"change\" name=\"role\" class=\"input w-auto py-1 pr-7 text-xs\"><option value=\"user\"")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "\" hx-swap=\"innerHTML\" name=\"role\" class=\"text-sm rounded px-2 py-1\" style=\"background-color: var(--bg-primary); color: var(--text-primary); border: 1px solid var(--border);\" onchange=\"this.dispatchEvent(new Event('htmx:trigger'))\" hx-trigger=\"change\" hx-vals='{\"role\": this.value}'><option value=\"user\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				if user.Role == "user" {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, " selected")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, " selected")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, ">User</option> <option value=\"admin\"")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, ">User</option> <option value=\"admin\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				if user.Role == "admin" {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, " selected")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, " selected")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, ">Admin</option></select><div id=\"")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, ">Admin</option></select><div id=\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var7 string
-				templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.ResolveAttributeValue("role-result-" + user.ID)
+				templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs("role-result-" + user.ID)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 87, Col: 47}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 84, Col: 46}
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7)
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\" class=\"text-xs mt-1\"></div>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "\" class=\"text-xs mt-1\"></div>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "</td><!-- Created --><td class=\"px-6 py-4 whitespace-nowrap\"><div class=\"text-sm\" style=\"color: var(--text-secondary)\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</td><!-- Created --><td class=\"px-6 py-4 whitespace-nowrap\"><div class=\"text-sm\" style=\"color: var(--text-secondary)\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var8 string
 			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(FormatInTimezone(user.CreatedAt, currentUser.Timezone))
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 92, Col: 126}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 89, Col: 125}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</div></td><!-- Actions --><td class=\"px-6 py-4 whitespace-nowrap text-right\"><div class=\"inline-flex items-center gap-1\"><button hx-get=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "</div></td><!-- Actions --><td class=\"px-6 py-4 whitespace-nowrap text-right\"><button hx-get=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var9 string
-			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.ResolveAttributeValue("/admin/users/" + user.ID + "/profile-modal")
+			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs("/admin/users/" + user.ID + "/profile-modal")
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 98, Col: 67}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 94, Col: 65}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var9)
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "\" hx-target=\"#modal-container\" hx-swap=\"innerHTML\" class=\"btn btn-secondary text-xs px-2.5 py-1\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = Icon("edit", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "Edit</button> ")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "\" hx-target=\"#modal-container\" hx-swap=\"innerHTML\" class=\"text-sm px-3 py-1 rounded mr-2\" style=\"background-color: var(--accent); color: white;\">Edit</button> ")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			if user.Role == "admin" && adminCount == 1 {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<button disabled class=\"btn btn-danger text-xs px-2.5 py-1\" title=\"Cannot delete the last admin\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = Icon("trash", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "Delete</button>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<button disabled class=\"text-sm px-3 py-1 rounded cursor-not-allowed opacity-50\" style=\"background-color: #dc2626; color: white;\" title=\"Cannot delete the last admin\">Delete</button>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			} else {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "<button hx-delete=\"")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "<button hx-delete=\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var10 string
-				templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.ResolveAttributeValue("/api/auth/profile/" + user.ID)
+				templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("/api/auth/profile/" + user.ID)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 117, Col: 57}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 113, Col: 55}
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var10)
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "\" hx-target=\"")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "\" hx-headers='{\"Authorization\": \"Bearer \" + localStorage.getItem(\"token\")}' hx-target=\"")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var11 string
-				templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.ResolveAttributeValue("#user-" + user.ID)
+				templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs("#user-" + user.ID)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 118, Col: 45}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/admin_users.templ`, Line: 115, Col: 43}
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var11)
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "\" hx-swap=\"outerHTML swap:0.5s\" hx-confirm=\"Are you sure you want to delete this user? This action cannot be undone.\" class=\"btn btn-danger text-xs px-2.5 py-1\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = Icon("trash", "h-4 w-4").Render(ctx, templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "Delete</button>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "\" hx-swap=\"outerHTML swap:0.5s\" hx-confirm=\"Are you sure you want to delete this user? This action cannot be undone.\" class=\"text-sm px-3 py-1 rounded\" style=\"background-color: #dc2626; color: white;\">Delete</button>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "</div></td></tr>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "</td></tr>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "</tbody></table></div></div></main></body></html>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "</tbody></table></div></main></div></body></html>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

templates/analytics.templ

@@ -9,79 +9,81 @@ templ Analytics(user User) {
 			<title>Reading Analytics - Bookhoard</title>
 			<script src="/static/htmx.min.js"></script>
 			<link href="/static/style.css" rel="stylesheet"/>
-			<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
 		</head>
 		<body x-data="analytics" x-init="loadAnalytics" class="theme-{ user.Theme }">
 			@Header(user, "/analytics")
-			<div class="mx-auto container px-4 sm:px-6 lg:px-8 py-8">
+			<div class="w-full px-4 sm:px-6 lg:px-8 py-8">
 				<div class="mb-8">
-					<div class="flex items-center gap-3 mb-1">
-						<span class="grid place-items-center h-10 w-10 rounded-xl" style="background-color: var(--accent-muted); color: var(--accent);">
-							@Icon("chart", "h-5 w-5")
-						</span>
-						<h1 class="text-2xl font-bold tracking-tight" style="color: var(--text-primary)">Reading Analytics</h1>
-					</div>
-					<p class="text-sm" style="color: var(--text-secondary)">Track your reading habits and device usage</p>
+					<h1 class="text-3xl font-bold mb-2" style="color: var(--text-primary)">📊 Reading Analytics</h1>
+					<p style="color: var(--text-secondary)">Track your reading habits and device usage</p>
 				</div>
-				<div class="card p-4 mb-6">
-					<div class="flex flex-wrap gap-4 items-end">
+				<!-- Date Range Picker -->
+				<div class="card p-4 rounded-lg border mb-6" style="background-color: var(--bg-secondary); border-color: var(--border);">
+					<div class="flex flex-wrap gap-4 items-center">
 						<div class="flex-1 min-w-[200px]">
-							<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary);">Start Date</label>
+							<label class="block text-sm font-medium mb-2" style="color: var(--text-secondary);">Start Date</label>
 							<input
 								type="date"
 								id="start-date"
 								onchange="loadAnalytics()"
-								class="input"
+								class="w-full px-4 py-2 border rounded-lg"
+								style="background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border);"
 							/>
 						</div>
 						<div class="flex-1 min-w-[200px]">
-							<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary);">End Date</label>
+							<label class="block text-sm font-medium mb-2" style="color: var(--text-secondary);">End Date</label>
 							<input
 								type="date"
 								id="end-date"
 								onchange="loadAnalytics()"
-								class="input"
+								class="w-full px-4 py-2 border rounded-lg"
+								style="background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border);"
 							/>
 						</div>
-						<div>
-							<button @click="loadAnalytics()" class="btn btn-primary">Update</button>
+						<div class="flex items-end">
+							<button @click="loadAnalytics()" class="btn-primary px-6 py-2 rounded-lg">Update</button>
 						</div>
 					</div>
 				</div>
-				<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 mb-8" id="stats-container">
-					<div class="stat-card">
-						<h3 class="text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary);">Books Read</h3>
-						<p id="total-books" class="text-3xl font-bold" style="color: var(--accent);">-</p>
+				<!-- Stats Cards -->
+				<div class="grid grid-cols-1 md:grid-cols-4 gap-6 mb-8" id="stats-container">
+					<div class="card p-6 rounded-lg border transition-all duration-200 ease hover:-translate-y-0.5 hover:shadow-lg" style="background-color: var(--bg-secondary); border-color: var(--border);">
+						<h3 class="text-lg font-semibold mb-2" style="color: var(--text-secondary);">Books Read</h3>
+						<p id="total-books" class="text-3xl font-bold" style="color: var(--text-primary);">-</p>
 					</div>
-					<div class="stat-card">
-						<h3 class="text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary);">Pages Read</h3>
-						<p id="total-pages" class="text-3xl font-bold" style="color: var(--accent);">-</p>
+					<div class="card p-6 rounded-lg border transition-all duration-200 ease hover:-translate-y-0.5 hover:shadow-lg" style="background-color: var(--bg-secondary); border-color: var(--border);">
+						<h3 class="text-lg font-semibold mb-2" style="color: var(--text-secondary);">Pages Read</h3>
+						<p id="total-pages" class="text-3xl font-bold" style="color: var(--text-primary);">-</p>
 					</div>
-					<div class="stat-card">
-						<h3 class="text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary);">Reading Time</h3>
-						<p id="reading-time" class="text-3xl font-bold" style="color: var(--accent);">-</p>
+					<div class="card p-6 rounded-lg border transition-all duration-200 ease hover:-translate-y-0.5 hover:shadow-lg" style="background-color: var(--bg-secondary); border-color: var(--border);">
+						<h3 class="text-lg font-semibold mb-2" style="color: var(--text-secondary);">Reading Time</h3>
+						<p id="reading-time" class="text-3xl font-bold" style="color: var(--text-primary);">-</p>
 					</div>
-					<div class="stat-card">
-						<h3 class="text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary);">Completion Rate</h3>
-						<p id="completion-rate" class="text-3xl font-bold" style="color: var(--accent);">-</p>
+					<div class="card p-6 rounded-lg border transition-all duration-200 ease hover:-translate-y-0.5 hover:shadow-lg" style="background-color: var(--bg-secondary); border-color: var(--border);">
+						<h3 class="text-lg font-semibold mb-2" style="color: var(--text-secondary);">Completion Rate</h3>
+						<p id="completion-rate" class="text-3xl font-bold" style="color: var(--text-primary);">-</p>
 					</div>
 				</div>
+				<!-- Charts Row -->
 				<div class="grid grid-cols-1 lg:grid-cols-2 gap-6 mb-8">
-					<div class="card p-6">
-						<h3 class="text-sm font-semibold uppercase tracking-wide mb-4" style="color: var(--text-secondary);">Daily Reading Minutes</h3>
+					<!-- Daily Reading Chart -->
+					<div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border);">
+						<h3 class="text-lg font-semibold mb-4" style="color: var(--text-primary);">Daily Reading Minutes</h3>
 						<div class="h-80">
 							<canvas id="daily-reading-chart"></canvas>
 						</div>
 					</div>
-					<div class="card p-6">
-						<h3 class="text-sm font-semibold uppercase tracking-wide mb-4" style="color: var(--text-secondary);">Device Usage</h3>
+					<!-- Device Usage Chart -->
+					<div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border);">
+						<h3 class="text-lg font-semibold mb-4" style="color: var(--text-primary);">Device Usage</h3>
 						<div class="h-80">
 							<canvas id="device-usage-chart"></canvas>
 						</div>
 					</div>
 				</div>
-				<div class="card p-6">
-					<h3 class="text-sm font-semibold uppercase tracking-wide mb-4" style="color: var(--text-secondary);">Most Read Books</h3>
+				<!-- Popular Books -->
+				<div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border);">
+					<h3 class="text-lg font-semibold mb-4" style="color: var(--text-primary);">Most Read Books</h3>
 					<div id="popular-books" class="space-y-3">
 						<div class="text-center py-8" style="color: var(--text-secondary);">
 							<div class="loading-spinner mx-auto mb-4"></div>

templates/analytics_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.1020
+// templ: version: v0.3.1001
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -29,7 +29,7 @@ func Analytics(user User) templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><title>Reading Analytics - Bookhoard</title><script src=\"/static/htmx.min.js\"></script><link href=\"/static/style.css\" rel=\"stylesheet\"><link rel=\"icon\" type=\"image/svg+xml\" href=\"/static/favicon.svg\"></head><body x-data=\"analytics\" x-init=\"loadAnalytics\" class=\"theme-{ user.Theme }\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><title>Reading Analytics - Bookhoard</title><script src=\"/static/htmx.min.js\"></script><link href=\"/static/style.css\" rel=\"stylesheet\"></head><body x-data=\"analytics\" x-init=\"loadAnalytics\" class=\"theme-{ user.Theme }\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -37,15 +37,7 @@ func Analytics(user User) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"mx-auto container px-4 sm:px-6 lg:px-8 py-8\"><div class=\"mb-8\"><div class=\"flex items-center gap-3 mb-1\"><span class=\"grid place-items-center h-10 w-10 rounded-xl\" style=\"background-color: var(--accent-muted); color: var(--accent);\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = Icon("chart", "h-5 w-5").Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</span><h1 class=\"text-2xl font-bold tracking-tight\" style=\"color: var(--text-primary)\">Reading Analytics</h1></div><p class=\"text-sm\" style=\"color: var(--text-secondary)\">Track your reading habits and device usage</p></div><div class=\"card p-4 mb-6\"><div class=\"flex flex-wrap gap-4 items-end\"><div class=\"flex-1 min-w-[200px]\"><label class=\"block text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary);\">Start Date</label> <input type=\"date\" id=\"start-date\" onchange=\"loadAnalytics()\" class=\"input\"></div><div class=\"flex-1 min-w-[200px]\"><label class=\"block text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary);\">End Date</label> <input type=\"date\" id=\"end-date\" onchange=\"loadAnalytics()\" class=\"input\"></div><div><button @click=\"loadAnalytics()\" class=\"btn btn-primary\">Update</button></div></div></div><div class=\"grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 mb-8\" id=\"stats-container\"><div class=\"stat-card\"><h3 class=\"text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary);\">Books Read</h3><p id=\"total-books\" class=\"text-3xl font-bold\" style=\"color: var(--accent);\">-</p></div><div class=\"stat-card\"><h3 class=\"text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary);\">Pages Read</h3><p id=\"total-pages\" class=\"text-3xl font-bold\" style=\"color: var(--accent);\">-</p></div><div class=\"stat-card\"><h3 class=\"text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary);\">Reading Time</h3><p id=\"reading-time\" class=\"text-3xl font-bold\" style=\"color: var(--accent);\">-</p></div><div class=\"stat-card\"><h3 class=\"text-xs font-semibold uppercase tracking-wide mb-2\" style=\"color: var(--text-secondary);\">Completion Rate</h3><p id=\"completion-rate\" class=\"text-3xl font-bold\" style=\"color: var(--accent);\">-</p></div></div><div class=\"grid grid-cols-1 lg:grid-cols-2 gap-6 mb-8\"><div class=\"card p-6\"><h3 class=\"text-sm font-semibold uppercase tracking-wide mb-4\" style=\"color: var(--text-secondary);\">Daily Reading Minutes</h3><div class=\"h-80\"><canvas id=\"daily-reading-chart\"></canvas></div></div><div class=\"card p-6\"><h3 class=\"text-sm font-semibold uppercase tracking-wide mb-4\" style=\"color: var(--text-secondary);\">Device Usage</h3><div class=\"h-80\"><canvas id=\"device-usage-chart\"></canvas></div></div></div><div class=\"card p-6\"><h3 class=\"text-sm font-semibold uppercase tracking-wide mb-4\" style=\"color: var(--text-secondary);\">Most Read Books</h3><div id=\"popular-books\" class=\"space-y-3\"><div class=\"text-center py-8\" style=\"color: var(--text-secondary);\"><div class=\"loading-spinner mx-auto mb-4\"></div><p>Loading analytics...</p></div></div></div></div></body></html>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"w-full px-4 sm:px-6 lg:px-8 py-8\"><div class=\"mb-8\"><h1 class=\"text-3xl font-bold mb-2\" style=\"color: var(--text-primary)\">📊 Reading Analytics</h1><p style=\"color: var(--text-secondary)\">Track your reading habits and device usage</p></div><!-- Date Range Picker --><div class=\"card p-4 rounded-lg border mb-6\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><div class=\"flex flex-wrap gap-4 items-center\"><div class=\"flex-1 min-w-[200px]\"><label class=\"block text-sm font-medium mb-2\" style=\"color: var(--text-secondary);\">Start Date</label> <input type=\"date\" id=\"start-date\" onchange=\"loadAnalytics()\" class=\"w-full px-4 py-2 border rounded-lg\" style=\"background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border);\"></div><div class=\"flex-1 min-w-[200px]\"><label class=\"block text-sm font-medium mb-2\" style=\"color: var(--text-secondary);\">End Date</label> <input type=\"date\" id=\"end-date\" onchange=\"loadAnalytics()\" class=\"w-full px-4 py-2 border rounded-lg\" style=\"background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border);\"></div><div class=\"flex items-end\"><button @click=\"loadAnalytics()\" class=\"btn-primary px-6 py-2 rounded-lg\">Update</button></div></div></div><!-- Stats Cards --><div class=\"grid grid-cols-1 md:grid-cols-4 gap-6 mb-8\" id=\"stats-container\"><div class=\"card p-6 rounded-lg border transition-all duration-200 ease hover:-translate-y-0.5 hover:shadow-lg\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><h3 class=\"text-lg font-semibold mb-2\" style=\"color: var(--text-secondary);\">Books Read</h3><p id=\"total-books\" class=\"text-3xl font-bold\" style=\"color: var(--text-primary);\">-</p></div><div class=\"card p-6 rounded-lg border transition-all duration-200 ease hover:-translate-y-0.5 hover:shadow-lg\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><h3 class=\"text-lg font-semibold mb-2\" style=\"color: var(--text-secondary);\">Pages Read</h3><p id=\"total-pages\" class=\"text-3xl font-bold\" style=\"color: var(--text-primary);\">-</p></div><div class=\"card p-6 rounded-lg border transition-all duration-200 ease hover:-translate-y-0.5 hover:shadow-lg\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><h3 class=\"text-lg font-semibold mb-2\" style=\"color: var(--text-secondary);\">Reading Time</h3><p id=\"reading-time\" class=\"text-3xl font-bold\" style=\"color: var(--text-primary);\">-</p></div><div class=\"card p-6 rounded-lg border transition-all duration-200 ease hover:-translate-y-0.5 hover:shadow-lg\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><h3 class=\"text-lg font-semibold mb-2\" style=\"color: var(--text-secondary);\">Completion Rate</h3><p id=\"completion-rate\" class=\"text-3xl font-bold\" style=\"color: var(--text-primary);\">-</p></div></div><!-- Charts Row --><div class=\"grid grid-cols-1 lg:grid-cols-2 gap-6 mb-8\"><!-- Daily Reading Chart --><div class=\"card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><h3 class=\"text-lg font-semibold mb-4\" style=\"color: var(--text-primary);\">Daily Reading Minutes</h3><div class=\"h-80\"><canvas id=\"daily-reading-chart\"></canvas></div></div><!-- Device Usage Chart --><div class=\"card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><h3 class=\"text-lg font-semibold mb-4\" style=\"color: var(--text-primary);\">Device Usage</h3><div class=\"h-80\"><canvas id=\"device-usage-chart\"></canvas></div></div></div><!-- Popular Books --><div class=\"card p-6 rounded-lg border\" style=\"background-color: var(--bg-secondary); border-color: var(--border);\"><h3 class=\"text-lg font-semibold mb-4\" style=\"color: var(--text-primary);\">Most Read Books</h3><div id=\"popular-books\" class=\"space-y-3\"><div class=\"text-center py-8\" style=\"color: var(--text-secondary);\"><div class=\"loading-spinner mx-auto mb-4\"></div><p>Loading analytics...</p></div></div></div></div></body></html>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}